From patchwork Mon Nov 6 20:10:17 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: 13447424 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 957D0C4167B for ; Mon, 6 Nov 2023 20:11:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E60F6B0296; Mon, 6 Nov 2023 15:11:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 770696B0297; Mon, 6 Nov 2023 15:11:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5CBA46B029A; Mon, 6 Nov 2023 15:11:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4A0FA6B0297 for ; Mon, 6 Nov 2023 15:11:44 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 14E0F140942 for ; Mon, 6 Nov 2023 20:11:44 +0000 (UTC) X-FDA: 81428624928.26.329333C Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) by imf12.hostedemail.com (Postfix) with ESMTP id 5766940006 for ; Mon, 6 Nov 2023 20:11:41 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=vvDAFFN6; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf12.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.188 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=1699301501; 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=XVuFmnWl7Ai+GOwJv1yuDcJd9SrRUciNhjDptmGZnZI=; b=VVFyi+imOwDDLV2fJoJftz5YZg2w9CW4ydhQJVBAtH17R7RJ5lIh34KFO+J6h+FiASp+YM fxyyHyAjIdt7PMP1YdCa6BSey/TQd9ojBt+FyfvD3Y/DIpD+MhIAmZVLJT1FrcTX6GADL1 cvkzMYjdyGtfTAm8mmldaLe87JBeLxw= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=vvDAFFN6; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf12.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.188 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699301501; a=rsa-sha256; cv=none; b=4XrpTH8i+hrtIAfT0RTx3vxo2NJgh2RtMDynyfwVVxKQzEYh2pbANY78JEJ/Ux2/by2y8D Ov9wQhjvFfCxIumgifo6dw82lzojkXq2ZIYy73JS1ULRR3ttVUk9h69Z32h63ywGKdzQzh ui0iPW2hE1cgC6xhLlQzWP10y6OF9+M= 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=1699301499; 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=XVuFmnWl7Ai+GOwJv1yuDcJd9SrRUciNhjDptmGZnZI=; b=vvDAFFN6FcYKWYAGx5sCoYZo2aE996ZHT27ORsBGzAXwAllc9a/mweQGGLH+tNqC9ukgoo kfT6X1bqAgw8fHV/cuj8owqV2YMiINk9I1HHRRwNCkZiOyFphUoExea/Wc88Wdh/Xw3yFD ieHf70kObAwysIDH+u5fgJoaxYfbcAM= 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 08/20] kasan: clean up __kasan_mempool_poison_object Date: Mon, 6 Nov 2023 21:10:17 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 5766940006 X-Stat-Signature: wdu96chniiyyghk5icga57mri8iphtnx X-Rspam-User: X-HE-Tag: 1699301501-131148 X-HE-Meta: U2FsdGVkX19qRcUdRSVjIaKG4PLJ96lVEenZNyc4COCq5Zu9W7GmfQGwoFmc+UkpzZnBiexRNRdFkpVwghJKm50YNC+ltBFm1+5TZPZ5bGRxvzMTUvD+O1dSX9GkZVPoDD2Bwi4erwBmwXM/xd+HRh9eDvOge5wHzs4dUUVssTqtmR/dpvRE/N11hP9ot/rSSDf+48slVlCLOp3NhBy4ACfzWATxv9HlwsgPPWPOt0aJ9SfJpF6ZGz6SGaYJy1u5EEQgsFJr+3J/9Y19Vvcj6CChS4cA4bNpzkElrDyVsZ8v42uujz6zxg2/MMYYdWQQira78LiaYvhQ/KtSMfT3NIo3vB0SkGQWris6Mxvq5+6IXIo4HmsELCI2cpwZVqwvBT02VTddqyTLpMlYp9fGWDrehHRLWMcIGjudplesaxHXlcV8ajJK5IAvgSHbGcIubbNK9KlE9LRqMLfv/mgvGpum4xCxWYOf3smyVWzcNaN2jBRb6SoWNdNmwVDXYVrTmOso2AzOz+gglc95ddpR3R7v+ZSBk8gBtIwiSmK7GsZsU3+dNZIUIsZZYMVyBKDk96+jD4K+lp/S9RyBcJWhgSCsO4ZJbMykSHQL9aigosfnUb/0wgIdtq75ELCoD9HbMP1DYANkiSOk/oBSXi7cmbUtAoHtWVBWt370YqagaUJYBhCXdxsfiFoNSSpPXervYdJvIcfdRP7DfWL89ltQlTHcOZdnGo1UYavvVKxhiEmxJloIFMh+bABpHnr3g2PpJANe4ifmvETOVVYJxbpINzvNaHsqzPM9VbOOlivN+Bobgv0et4rS+B/uGnA97Dootktf1E8hk1vgB/yW9GSJsbErPTfeb5xrtxewAYKuUyLBgfK8TsmGarYm8f5Qrx0nXfUXzYHwWCbiL9kCQNT98udr5cnV7OHEz4UAWzFZrYd5oleSYsLSDlW6w9KSR29YBBbvIdDKSIZd6hnP+kd L4/1jSuo CLLbGp9M+b7cv3AGY6RtdBNSH+rO+JtEOLkEYDExxOvAxGIuL6AzbXli4GdbYhAwCf7njzJUV9SMI7gRFM+1rcLnNM6a2JWk1RhY0cfmRNcCn8054sUtkq1yBIiIyGFQiU8hvXNspZpTKSlMYcVcOc37Bjef27hVLGFAfIYKA0IP6fLi3Bn5sfdocCuCh1VSjkvTOx9RMvcb61uo= 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 Reorganize the code and reword the comment in __kasan_mempool_poison_object to improve the code readability. Signed-off-by: Andrey Konovalov --- mm/kasan/common.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 6283f0206ef6..7c28d0a5af2c 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -447,27 +447,22 @@ void __kasan_mempool_unpoison_pages(struct page *page, unsigned int order, bool __kasan_mempool_poison_object(void *ptr, unsigned long ip) { - struct folio *folio; - - folio = virt_to_folio(ptr); + struct folio *folio = virt_to_folio(ptr); + struct slab *slab; /* - * Even though this function is only called for kmem_cache_alloc and - * kmalloc backed mempool allocations, those allocations can still be - * !PageSlab() when the size provided to kmalloc is larger than - * KMALLOC_MAX_SIZE, and kmalloc falls back onto page_alloc. + * This function can be called for large kmalloc allocation that get + * their memory from page_alloc. Thus, the folio might not be a slab. */ if (unlikely(!folio_test_slab(folio))) { if (check_page_allocation(ptr, ip)) return false; kasan_poison(ptr, folio_size(folio), KASAN_PAGE_FREE, false); return true; - } else { - struct slab *slab = folio_slab(folio); - - return !____kasan_slab_free(slab->slab_cache, ptr, ip, - false, false); } + + slab = folio_slab(folio); + return !____kasan_slab_free(slab->slab_cache, ptr, ip, false, false); } void __kasan_mempool_unpoison_object(void *ptr, size_t size, unsigned long ip)