From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8FCCC04E69 for ; Wed, 2 Aug 2023 13:09:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 249CF280177; Wed, 2 Aug 2023 09:09:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F913280143; Wed, 2 Aug 2023 09:09:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 09917280177; Wed, 2 Aug 2023 09:09:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F0E28280143 for ; Wed, 2 Aug 2023 09:09:53 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CACEB140EA3 for ; Wed, 2 Aug 2023 13:09:53 +0000 (UTC) X-FDA: 81079197066.30.29320F5 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf12.hostedemail.com (Postfix) with ESMTP id A975D40067 for ; Wed, 2 Aug 2023 13:09:33 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; spf=none (imf12.hostedemail.com: domain of thunder.leizhen@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=thunder.leizhen@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690981775; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0nk7bUtAc02hcxrxal931rzQcd2gznHcWA7gc6Db6c4=; b=f4NhyIktlthiJ2OO2d+teACyDX/2wU8h5wXhvkhNtMJnZ+jBQOoy+/AJq3Xyyce7w8wDYk 5q4uLyt/r9YJVhB/m/sRkujE3MdtVi99r0ysOKxsa5rKcNejqfrYOQztSLEFtgANAyjlbK SKintKLn/PNW7noWPswDJ01SIBvzz4E= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; spf=none (imf12.hostedemail.com: domain of thunder.leizhen@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=thunder.leizhen@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690981775; a=rsa-sha256; cv=none; b=PdMhf8yyzSakVw3+vS4Wo54NyDDJE5L6jyynohY3YQco2uv03i61dsA2VLrPiwwH810kx0 F43dcDvlTp1R6K/AU6PbkTR/QBHup0fPclFDCarWeMkCT+o0ATzed1IuDcVh5I7fOlxwrt qyXL/hKJAhq8d7ri1zXv0BjwPrf4jJ8= Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RGC463Z72z4f3k6P for ; Wed, 2 Aug 2023 21:09:26 +0800 (CST) Received: from huaweicloud.com (unknown [10.174.178.55]) by APP4 (Coremail) with SMTP id gCh0CgAHvbCBVcpkDKSVPQ--.59231S5; Wed, 02 Aug 2023 21:09:26 +0800 (CST) From: thunder.leizhen@huaweicloud.com To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, "Paul E . McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Boqun Feng , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , rcu@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Zhen Lei Subject: [PATCH v4 1/2] mm: Remove kmem_valid_obj() Date: Wed, 2 Aug 2023 21:09:17 +0800 Message-Id: <20230802130918.1132-2-thunder.leizhen@huaweicloud.com> X-Mailer: git-send-email 2.37.3.windows.1 In-Reply-To: <20230802130918.1132-1-thunder.leizhen@huaweicloud.com> References: <20230802130918.1132-1-thunder.leizhen@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:gCh0CgAHvbCBVcpkDKSVPQ--.59231S5 X-Coremail-Antispam: 1UD129KBjvJXoWxZr1ftry5Jr4fXr1fuFW5GFg_yoWrAF13pw nxGr9xJrWkJr17GrsrJF1kury5Zr4kuF17Ca9aqw18Ar1UXrs7ur1kG3s2qF98JFW8X3W0 ya1vkF43uryUArDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBEb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6r1S6rWUM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGw A2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1lw4CEc2x0rVAKj4 xxMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVW8ZVWrXwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07Ut8n5UUUUU = X-CM-SenderInfo: hwkx0vthuozvpl2kv046kxt4xhlfz01xgou0bp/ X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: A975D40067 X-Rspam-User: X-Stat-Signature: izm58bwdbqkfr8frpa8expyjeaimmekn X-Rspamd-Server: rspam01 X-HE-Tag: 1690981773-833629 X-HE-Meta: U2FsdGVkX18GttdH/ZFgvEMOknfGQ3g21+9KG60lMcHBrmoOwA2BVZtqXufJdXO/g+dTxqi+cra2syLc2VBPgFn6PbiAgjx84G2A/S+ZclJEbwdDhlwrrMdwE5eOuWvhyNCfZTHHk4HEoAK95+U85WJ6AgA1vNmG/ObXQ3XUlLUq7r+sDt6F287hxoJFb1nBTE5o47aAhOj7mrCTkQZ2gT+0KIkg4rPToMmvDv409ShQvmctb+945gGWpVE5ClUqov52lI8YKPjbPbz4rM0/lxxG4OG/BJnUvGaKyWsHCAQJFTSwi9b5rcu+8KUWKzwH18y0fDo8Vz+a6KK8lbshgoeASmkD3jSeR1zOzA3V1k2q8WACJFYiA3R4jasihPF+RCzf9lVlndmCr9nnCOfWwoDYlliz/J7ZFqH0u+eG3Ba4EEK2X9qNGNoC6mP0nZltXpjjo7hL+UPKROO91JI/mD3L/M4SUN4+PsSjBAcUB+XjZNkGg0Uz4IwEzd7k1oFHP//5DKk5xbZrUWQ6bC5DNBG+E8DS2TLlkcXMXPMkyVb/X4uVk3TZe+P1taK3eLQiSNMCvr7fu9JSxXWlnM/7URDmSm5WXBYlSws1wD3YKnk+1YIsBj5q83KbXLB03Wieoaqrb4dsZVRq4dwkR1yFIjqs0SgvbFqn5PkebQqHpIAZZaBLo335VPuAxan970jv3o9fDD796DOIJrV53QGQC/6XOMkOEeLXjPFJFGrUctERyitmQs2epTSz2trCttz60qACuf5vwa0O2YKHJ+ZTQUblCQ3UPa6vTMxalsT5ViwYMq4lm8xuiB6Tconx0yggMZO7UQzrf4U/nWDAx8VY7ocxiA4D9MLjsqlPx8zYJsFAvbxgHv19Pnb+FaeOziLJTm+7x/pe/I10XXISo8Q2jg31VkNrhhYTv/owz9xh+mcrP/kbds3tNqGvz1a1fmuQodglRoxY3QQjJaxbUak Fnt+MqPa HWULANcUJ3g8Vmy+k4lGPbjcvwAbdLDJe7z4LPak+tFFqmLjFC3d0uysdQ7R5pCeGXLjFv2lHjLLdvMpNuCK8xbnHNsm8beeA2wDEnurgjmRtHXuLhdHrSTo4wdyNE6h7zptvgpRKHM+k1H+Zdx4uYWNfOcgyxDEYDSDuayizljNvyCXObg7iXFyDZ6o9rcqYcQ9p8+c8PCT6Xd/CQJuXu23F7caqkazt7jFP+w0uDw9Fmn3bXHdf8R1BfgQMtxMtXrIkS0aBmNX4/HojRKsQ9WRYNzWgow9ye4cL4RgdX3lud5hURK8Tk+L+A6nxLFu0Emsy/ZxNItbgQDE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Zhen Lei Function kmem_dump_obj() will splat if passed a pointer to a non-slab object. So no one will call it directly. It is always necessary to call kmem_valid_obj() first to determine whether the passed pointer to a valid slab object. Then merging kmem_valid_obj() into kmem_dump_obj() will make the code more concise. So convert kmem_dump_obj() to work the same way as vmalloc_dump_obj(). After this, no one calls kmem_valid_obj() anymore, and it can be safely removed. Suggested-by: Matthew Wilcox Signed-off-by: Zhen Lei --- 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 848c7c82ad5ad0b..d8ed2e810ec4448 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -244,8 +244,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 d1555ea2981ac51..ee6ed6dd7ba9fa5 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 dd12b9531ac4cad..ddfbb22dc1876d3 100644 --- a/mm/util.c +++ b/mm/util.c @@ -1063,10 +1063,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; -- 2.34.1