From patchwork Fri Oct 13 11:58:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederic Weisbecker X-Patchwork-Id: 152545 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1834504vqb; Fri, 13 Oct 2023 04:59:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGCtIcVsYDnyHfBimuiqq08PUhJlAgfizmg4XY1Fufg9AKyVcPoYO0fa7xai/QfeSvzQE2/ X-Received: by 2002:a05:6830:4867:b0:6bf:500f:b570 with SMTP id dx7-20020a056830486700b006bf500fb570mr24448537otb.3.1697198396036; Fri, 13 Oct 2023 04:59:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697198396; cv=none; d=google.com; s=arc-20160816; b=M2RzXpRkXnaj9x6nFyYEDdWzIEByEsB3G3lPRSf/DfeOdUKi3cTHxbzF5trMOMB1P8 3wXOdjTkh17XlTGahmzbJmRyqflK4kB3dKEgcxTbY6O/q07zWLnDJQgQ15uO029ONT0F ALJeZelDYhViSGOrEA3TvwWbdqNnFKvqtp6bujiEIZ8X+9uglZ0fBkkpopEUqC4jynSI DzeFAqM5lPFbyWujx6YiNwxbYHBJ4Bg/X4/7AfSVSb00XxvvgAp/c/CrpiPlNvqEAXkH 2XFN7KkEcWuQPwb85fvuWjlYO4BjnJhS+j3uG34+CISvRI8rumZlKfWdo6SKEpZkcjDa l5Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/8U3aRF02bJ7fzsmNWUbZYAT6KRIF+C/zrYHGM42vdQ=; fh=7HigBTpd83qIdgppUAOmIsBzYbBi+/Yg0Z0SyB5wcIE=; b=H/VydAdp8cKimIpfwMPBl199ViawuyaROhyaoDLy0DQDY3eH/GwipyAG376dkRrvlS j6A3eTInOwpqUXWz+xdZkG5LZips2pBLaJYwz4y/VMpcRvIMMJlkmwuBgVfDCTog9CPG 9C9qdxQcu0sUAZhpz8FsjfgfzOGiBWaSGmihqRtr2d9Tk/6sBNHqEo3VTBT7AYzYdRhr Zu/aZ4dQvCyScHutIemSzHGxs8yQ71yeLkez1FwMHLYmfgKsFZ3KoQLiX4ukzXCT9apd iG0yoRz44DYWoLmL77Zlrf5SEKtZB3FN/mN+VyZUMspzeplX1zXQrJDct7nK/Ocj5ISW 5YYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="JzRgL/7G"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id r7-20020a63e507000000b0059b79bf220csi473454pgh.662.2023.10.13.04.59.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 04:59:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="JzRgL/7G"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id ACD2183303FC; Fri, 13 Oct 2023 04:59:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231725AbjJML7o (ORCPT + 19 others); Fri, 13 Oct 2023 07:59:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231714AbjJML7b (ORCPT ); Fri, 13 Oct 2023 07:59:31 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19BD1EA; Fri, 13 Oct 2023 04:59:26 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E070C433C7; Fri, 13 Oct 2023 11:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697198365; bh=661eskRrrn3a2q2Gc7DQU5Vpxig1R977JLUBlgWFz9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JzRgL/7G2NKdgepQIw580jwYQf78okNF3NQ7Yh6KggurGldEHEarYXCCKpmg9vE1U RebNIbFvV5eEneaH4YuaPWr6mA/zAAPf46Pro1qsP7gKq1tO+gKIGKsfpaKS94YZOr qFGwVaOEsFLLb8e7/WM3NDiX+XBFiPnqPCMgfcxgTinx1ySo9Ym4H4fJrxbFAFM+gl 0JWMn/SZnUWxITKP5piPgSM+r65d42sskl7bZc+IrLRndHIDy6sPfGdpZ6i238Mauv m9OOsF+zoIztDofBjvspP8PJoav/zg4OpSSJZRSyLHvaJA5BgjKOYN/KEhCJ/ovgc/ AOo//PccRp3CA== From: Frederic Weisbecker To: LKML Cc: Zhen Lei , Boqun Feng , Joel Fernandes , Josh Triplett , Mathieu Desnoyers , Neeraj Upadhyay , "Paul E . McKenney" , Steven Rostedt , Uladzislau Rezki , rcu , Matthew Wilcox , Vlastimil Babka , Frederic Weisbecker Subject: [PATCH 06/18] mm: Remove kmem_valid_obj() Date: Fri, 13 Oct 2023 13:58:50 +0200 Message-Id: <20231013115902.1059735-7-frederic@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231013115902.1059735-1-frederic@kernel.org> References: <20231013115902.1059735-1-frederic@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 13 Oct 2023 04:59:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779641505248276714 X-GMAIL-MSGID: 1779641505248276714 From: Zhen Lei Function kmem_dump_obj() will splat if passed a pointer to a non-slab object. So nothing calls it directly, instead calling kmem_valid_obj() first to determine whether the passed pointer to a valid slab object. This means that merging kmem_valid_obj() into kmem_dump_obj() will make the code more concise. Therefore, convert kmem_dump_obj() to work the same way as vmalloc_dump_obj(), removing the need for the kmem_dump_obj() caller to check kmem_valid_obj(). After this, there are no remaining calls to kmem_valid_obj() anymore, and it can be safely removed. Suggested-by: Matthew Wilcox Signed-off-by: Zhen Lei Reviewed-by: Matthew Wilcox (Oracle) Acked-by: Vlastimil Babka Signed-off-by: Paul E. McKenney Signed-off-by: Frederic Weisbecker --- include/linux/slab.h | 5 +++-- mm/slab_common.c | 41 +++++++++++------------------------------ mm/util.c | 4 +--- 3 files changed, 15 insertions(+), 35 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 8228d1276a2f..ff56ab804bf6 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -245,8 +245,9 @@ DEFINE_FREE(kfree, void *, if (_T) kfree(_T)) size_t ksize(const void *objp); #ifdef CONFIG_PRINTK -bool kmem_valid_obj(void *object); -void kmem_dump_obj(void *object); +bool kmem_dump_obj(void *object); +#else +static inline bool kmem_dump_obj(void *object) { return false; } #endif /* diff --git a/mm/slab_common.c b/mm/slab_common.c index cd71f9581e67..a425bedf2103 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -528,26 +528,6 @@ bool slab_is_available(void) } #ifdef CONFIG_PRINTK -/** - * kmem_valid_obj - does the pointer reference a valid slab object? - * @object: pointer to query. - * - * Return: %true if the pointer is to a not-yet-freed object from - * kmalloc() or kmem_cache_alloc(), either %true or %false if the pointer - * is to an already-freed object, and %false otherwise. - */ -bool kmem_valid_obj(void *object) -{ - struct folio *folio; - - /* Some arches consider ZERO_SIZE_PTR to be a valid address. */ - if (object < (void *)PAGE_SIZE || !virt_addr_valid(object)) - return false; - folio = virt_to_folio(object); - return folio_test_slab(folio); -} -EXPORT_SYMBOL_GPL(kmem_valid_obj); - static void kmem_obj_info(struct kmem_obj_info *kpp, void *object, struct slab *slab) { if (__kfence_obj_info(kpp, object, slab)) @@ -566,11 +546,11 @@ static void kmem_obj_info(struct kmem_obj_info *kpp, void *object, struct slab * * and, if available, the slab name, return address, and stack trace from * the allocation and last free path of that object. * - * This function will splat if passed a pointer to a non-slab object. - * If you are not sure what type of object you have, you should instead - * use mem_dump_obj(). + * Return: %true if the pointer is to a not-yet-freed object from + * kmalloc() or kmem_cache_alloc(), either %true or %false if the pointer + * is to an already-freed object, and %false otherwise. */ -void kmem_dump_obj(void *object) +bool kmem_dump_obj(void *object) { char *cp = IS_ENABLED(CONFIG_MMU) ? "" : "/vmalloc"; int i; @@ -578,13 +558,13 @@ void kmem_dump_obj(void *object) unsigned long ptroffset; struct kmem_obj_info kp = { }; - if (WARN_ON_ONCE(!virt_addr_valid(object))) - return; + /* Some arches consider ZERO_SIZE_PTR to be a valid address. */ + if (object < (void *)PAGE_SIZE || !virt_addr_valid(object)) + return false; slab = virt_to_slab(object); - if (WARN_ON_ONCE(!slab)) { - pr_cont(" non-slab memory.\n"); - return; - } + if (!slab) + return false; + kmem_obj_info(&kp, object, slab); if (kp.kp_slab_cache) pr_cont(" slab%s %s", cp, kp.kp_slab_cache->name); @@ -621,6 +601,7 @@ void kmem_dump_obj(void *object) pr_info(" %pS\n", kp.kp_free_stack[i]); } + return true; } EXPORT_SYMBOL_GPL(kmem_dump_obj); #endif diff --git a/mm/util.c b/mm/util.c index 8cbbfd3a3d59..6eddd891198e 100644 --- a/mm/util.c +++ b/mm/util.c @@ -1060,10 +1060,8 @@ void mem_dump_obj(void *object) { const char *type; - if (kmem_valid_obj(object)) { - kmem_dump_obj(object); + if (kmem_dump_obj(object)) return; - } if (vmalloc_dump_obj(object)) return;