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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4AAE4C433FE for ; Tue, 16 Nov 2021 21:41:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B98A661A53 for ; Tue, 16 Nov 2021 21:41:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B98A661A53 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 3EA4F6B006C; Tue, 16 Nov 2021 16:41:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 39A136B0071; Tue, 16 Nov 2021 16:41:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 261B26B0072; Tue, 16 Nov 2021 16:41:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0046.hostedemail.com [216.40.44.46]) by kanga.kvack.org (Postfix) with ESMTP id 166786B006C for ; Tue, 16 Nov 2021 16:41:23 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id CD01F82499B9 for ; Tue, 16 Nov 2021 21:41:12 +0000 (UTC) X-FDA: 78816114384.22.D7FADE7 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf28.hostedemail.com (Postfix) with ESMTP id 744479358D70 for ; Tue, 16 Nov 2021 18:17:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=XWpo6DiVx+RT2K5N/yi44WQQy+KIXMaDGxOohES1JpQ=; b=nGcMxkdwOITS/yVp3Kmmd9DjK8 lJTxIS12/cOflOQNM6zbB5mjh1mUcChDnznYjcUCgW6AvABEUqhquDgXEYChGHwhupnet1RlE4fz9 kVLTzjcg/ASLY8uLkwdpPK/+f7s1ZYLEWGF34KfiIkKPVdPLXrhPPlLboyQXP9+P+RWRnx+cipgj+ Fdn7HgWdaoLsdJGpcUt8tmbAmS+WxbZhwjLUL5V/C72YRYdpnJf4MSEEh4D0dX4jWLvj4C4RH5i8Z B6ZCA+yf1LsxFXpb3PA8INup33YZLLX0T1aHwvDRMNG9qcRYWnfpZsEm/+bBOlczTmAkP0dKlG38g 1jlfFwKg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mn310-006yyT-3p; Tue, 16 Nov 2021 18:17:06 +0000 Date: Tue, 16 Nov 2021 18:17:06 +0000 From: Matthew Wilcox To: Vlastimil Babka Cc: linux-mm@kvack.org, Christoph Lameter , David Rientjes , Joonsoo Kim , Pekka Enberg , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , kasan-dev@googlegroups.com Subject: Re: [RFC PATCH 24/32] mm/kasan: Convert to struct slab Message-ID: References: <20211116001628.24216-1-vbabka@suse.cz> <20211116001628.24216-25-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211116001628.24216-25-vbabka@suse.cz> X-Rspamd-Queue-Id: 744479358D70 X-Stat-Signature: e4gtdxf9y9qzra9zqg4xefr1o6frdyjt Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=nGcMxkdw; spf=none (imf28.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=temperror reason="query timed out" header.from=infradead.org (policy=temperror) X-Rspamd-Server: rspam02 X-HE-Tag: 1637086646-657784 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: On Tue, Nov 16, 2021 at 01:16:20AM +0100, Vlastimil Babka wrote: > @@ -411,12 +412,12 @@ void __kasan_slab_free_mempool(void *ptr, unsigned long ip) > * !PageSlab() when the size provided to kmalloc is larger than > * KMALLOC_MAX_SIZE, and kmalloc falls back onto page_alloc. > */ > - if (unlikely(!PageSlab(page))) { > + if (unlikely(!folio_test_slab(folio))) { > if (____kasan_kfree_large(ptr, ip)) > return; > - kasan_poison(ptr, page_size(page), KASAN_FREE_PAGE, false); > + kasan_poison(ptr, folio_size(folio), KASAN_FREE_PAGE, false); > } else { > - ____kasan_slab_free(page->slab_cache, ptr, ip, false, false); > + ____kasan_slab_free(folio_slab(folio)->slab_cache, ptr, ip, false, false); I'd avoid this long line by doing: struct slab *slab = folio_slab(folio); ____kasan_slab_free(slab->slab_cache, ptr, ip, false, false);