From patchwork Mon Nov 6 20:10:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 13447418 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 C9864C4167B for ; Mon, 6 Nov 2023 20:10:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E4776B0288; Mon, 6 Nov 2023 15:10:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 793FE6B028A; Mon, 6 Nov 2023 15:10:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A7DE6B028C; Mon, 6 Nov 2023 15:10:39 -0500 (EST) 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 271506B0288 for ; Mon, 6 Nov 2023 15:10:39 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 01C8B1607F3 for ; Mon, 6 Nov 2023 20:10:38 +0000 (UTC) X-FDA: 81428622198.25.3F89AF5 Received: from out-183.mta1.migadu.com (out-183.mta1.migadu.com [95.215.58.183]) by imf02.hostedemail.com (Postfix) with ESMTP id 2EEC480016 for ; Mon, 6 Nov 2023 20:10:35 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=L3cpdQsl; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf02.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.183 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699301437; 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:dkim-signature; bh=5zUveeaHubKwNWv/mUHyod8asGDxf8HEl2nDgxq3m5s=; b=oN6KsAwmHhatRHPAp6bqteDNUy8QaLaThSVGTjx8O3fGeOcYkRsbMS4YgKS83gLzmG504I IhLV+c9yJd2ftxQNbbcm0w5QmqdfmaHR3IM6mh2yZmzXUQr5ZII0sFDVRSm7rv8zzmqTlP 0lGCOH7Wl4P+IzJbIrvxaZvyOJ5vZvA= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=L3cpdQsl; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf02.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.183 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699301437; a=rsa-sha256; cv=none; b=oW8/aTpfwQAiGeJLMO8vZFCUhLgsQNHArIjh/E3BmSlBc3Sk577nG/YHzzFvcDBw395m6K YncWCHJZuxyY1D8eHY0l+JHzxdeuLUv+3THSXBljZU5MhHH6kC6NVwrv3E1z8PktQKAHyT xn+Gr6iwZrQnGV6cHeFGqudxDaLBu1U= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1699301434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5zUveeaHubKwNWv/mUHyod8asGDxf8HEl2nDgxq3m5s=; b=L3cpdQsl8rkb7JZtwAIC4eCSnezYGVtiw98SxiDVzYCV5xe1AfbsSj6usun1a4l+c+qqRu z1J/4gwLmo5D3p+Kwl2i4n8TQXJgQGILOLkaKmpXlQWt0svPMKOeoNq+e2E1zahPLmA8Hc UdUKlPDzpckCJ729haSLr62Qg8EuqI4= From: andrey.konovalov@linux.dev To: Marco Elver , Alexander Potapenko Cc: Andrey Konovalov , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Evgenii Stepanov , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH RFC 01/20] kasan: rename kasan_slab_free_mempool to kasan_mempool_poison_object Date: Mon, 6 Nov 2023 21:10:10 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 2EEC480016 X-Stat-Signature: g5833qtidzw5gbykbmjaept55u7xuam3 X-Rspam-User: X-HE-Tag: 1699301435-588197 X-HE-Meta: U2FsdGVkX1/8x8Pime02bJt4AgsQ27ZOavk4N6b52U3xcxvFZEwwsRFs9sZRah3dp/hE1ENrq5kvBJtHfXy18mddveiONduKho1Fr6uhIudI9HLXbhHMB4fsstM13hwIogKOZrACuGw0hC7wkR6GLNPwua6VEI5MacTBivfLu2O9TEyR4QBSgMNo6WUUasdxPT2Y/K+f6zAZQSpfyYHQI2V2Be+YyG0npI8DyrYYfq63kaLBuW0bNN/OE4/QrNuMTpdW/+xOXbcDFBQ/KXUpzLWnGkSa+cKNj9w3cj7KNtUjg7PgqCa/lvSmfzqkYlYmNuAl9q196WclNWaLOU7PvmqAkMSLIM9YyApkeRSgdYqS+2B0VftTADjRQcI2W5nhrBUHB3OZNueKx8t4Qz6ZsMMn1jJMBVgFOCJaC45++JLQexUWxn4F502qw2Ik5xlntqe82u3rsKyLZZ7zj1YnrSqh3ONUpKb+DBmt/2ubkzTRcSsIb62U0dvzLOdEfuaI/aIuhyCMPjiaB52iUoCBiFbzt/t7s16Ux5s1Qm3O/kxb7RQ8S+iHVfFX5Kgb9AHKF1pqA8zrv2VYhFzfkA331TgkPsOu0Of7sXcmJsBd2awfZgGw6p/hdU4JdUr1W2G+BTKvQVUcma9B3iopRl8HgKhx/w6wrJC7GJt399Vp0HPewyqCK5/u4hFBl0oI61dhg62jWTEiMsqn95Nwu5nTS/p0fItmJUJ8eQ9fm6T+VjGfi9aurejcD4iNy58H2zHoIppQUJi4Gpe8dVo9HsFo2FzVB8EtHtdT8bg6KpHaKnQ+R1Ff7aZp16+yVqecO3VOGNt1qcc3fSrS0PYW6BxU8BevibdNxFaOBdfeMi4r3OBxQXWyFvp13pgP8bpvoirVbYvazyxjxt7FaKFZTKdY/1W+Wm+mlUWl+peL3dJ9GO/w+bTX7oB4f/PxKocxefygM52AF4t64+WbTrm4Gwd Ax1nz1Wi RW2zh5u11XwzWIAaAdIrneTa7+rVtsKNd/1F43KsTMT8U2MPtSSkEdKywhSO9uKAKX373KggbJIffpvyFO2HhRCvWYQA65f5ynagnSJm3ircPbjv9eCnUECW3kPzx1qLwEvEM6elOBt+s2uVZypsNB0ivWdxMBsA/5r5P3J+czgA+B3gVHJVi0A63iMKrW4q9LHKg+DEmivdI784= 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: List-Subscribe: List-Unsubscribe: From: Andrey Konovalov Rename kasan_slab_free_mempool to kasan_mempool_poison_object. kasan_slab_free_mempool is a slightly confusing name: it is unclear whether this function poisons the object when it is freed into mempool or does something when the object is freed from mempool to the underlying allocator. The new name also aligns with other mempool-related KASAN hooks added in the following patches in this series. Signed-off-by: Andrey Konovalov --- include/linux/kasan.h | 8 ++++---- io_uring/alloc_cache.h | 3 +-- mm/kasan/common.c | 4 ++-- mm/mempool.c | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 72cb693b075b..6310435f528b 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -172,11 +172,11 @@ static __always_inline void kasan_kfree_large(void *ptr) __kasan_kfree_large(ptr, _RET_IP_); } -void __kasan_slab_free_mempool(void *ptr, unsigned long ip); -static __always_inline void kasan_slab_free_mempool(void *ptr) +void __kasan_mempool_poison_object(void *ptr, unsigned long ip); +static __always_inline void kasan_mempool_poison_object(void *ptr) { if (kasan_enabled()) - __kasan_slab_free_mempool(ptr, _RET_IP_); + __kasan_mempool_poison_object(ptr, _RET_IP_); } void * __must_check __kasan_slab_alloc(struct kmem_cache *s, @@ -256,7 +256,7 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, bool init return false; } static inline void kasan_kfree_large(void *ptr) {} -static inline void kasan_slab_free_mempool(void *ptr) {} +static inline void kasan_mempool_poison_object(void *ptr) {} static inline void *kasan_slab_alloc(struct kmem_cache *s, void *object, gfp_t flags, bool init) { diff --git a/io_uring/alloc_cache.h b/io_uring/alloc_cache.h index 241245cb54a6..8de0414e8efe 100644 --- a/io_uring/alloc_cache.h +++ b/io_uring/alloc_cache.h @@ -16,8 +16,7 @@ static inline bool io_alloc_cache_put(struct io_alloc_cache *cache, if (cache->nr_cached < cache->max_cached) { cache->nr_cached++; wq_stack_add_head(&entry->node, &cache->list); - /* KASAN poisons object */ - kasan_slab_free_mempool(entry); + kasan_mempool_poison_object(entry); return true; } return false; diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 256930da578a..e42d6f349ae2 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -261,7 +261,7 @@ static inline bool ____kasan_kfree_large(void *ptr, unsigned long ip) /* * The object will be poisoned by kasan_poison_pages() or - * kasan_slab_free_mempool(). + * kasan_mempool_poison_object(). */ return false; @@ -272,7 +272,7 @@ void __kasan_kfree_large(void *ptr, unsigned long ip) ____kasan_kfree_large(ptr, ip); } -void __kasan_slab_free_mempool(void *ptr, unsigned long ip) +void __kasan_mempool_poison_object(void *ptr, unsigned long ip) { struct folio *folio; diff --git a/mm/mempool.c b/mm/mempool.c index 734bcf5afbb7..768cb39dc5e2 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -107,7 +107,7 @@ static inline void poison_element(mempool_t *pool, void *element) static __always_inline void kasan_poison_element(mempool_t *pool, void *element) { if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) - kasan_slab_free_mempool(element); + kasan_mempool_poison_object(element); else if (pool->alloc == mempool_alloc_pages) kasan_poison_pages(element, (unsigned long)pool->pool_data, false);