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 B3BB3CD37AC for ; Fri, 15 Sep 2023 20:55:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 167298D0029; Fri, 15 Sep 2023 16:55:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 118878D0005; Fri, 15 Sep 2023 16:55:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F21B58D0029; Fri, 15 Sep 2023 16:55:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E02D58D0005 for ; Fri, 15 Sep 2023 16:55:47 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B74141607D3 for ; Fri, 15 Sep 2023 20:55:47 +0000 (UTC) X-FDA: 81240038334.29.8FB4753 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf13.hostedemail.com (Postfix) with ESMTP id E4F7C20025 for ; Fri, 15 Sep 2023 20:55:45 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=N2kRUY4+; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf13.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.174 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694811346; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=FkxHnFcmMcOMVwxYBLP2mYBTJKUa1NHaUTZS5wLWw3k=; b=DlwhhK3J/mwKYqu4rThCteW60k6SKzsrgEdr3qwIDx/I0iOqD7hjWzUcmyCzuCwyf9mOHG C2dCn5d3+b7zatBAzpuoS/WyiVyjtmP3NBjlilY6xO9PJYBxn6Ztr43xDEiZQaPebKe8a3 S0cMQ29k/RvN2ULi8g7QUQ+kYrdZRwI= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=N2kRUY4+; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf13.hostedemail.com: domain of keescook@chromium.org designates 209.85.210.174 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694811346; a=rsa-sha256; cv=none; b=BaY96l4NL7KJ57txnA8RjKVba037jIDhk2mqoQC5Cm7/MOS0jRhmjsJJmsLSJec6bha2wb uX9CDaB4j+Ws+iJD5WqG8pXkPZmuz1bzIwr/c0b9iwNLcU0Q2K0Ae0ifdQS3C7zZcSa8OM SXIFgiU4zdx1trdZ9r9SMPZJ9MsbamI= Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-68fe39555a0so2333155b3a.3 for ; Fri, 15 Sep 2023 13:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694811345; x=1695416145; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=FkxHnFcmMcOMVwxYBLP2mYBTJKUa1NHaUTZS5wLWw3k=; b=N2kRUY4+BkvmJeUs8ajlkrwDVt0OpHtE0y3C2/jaQXvDFsaYIkhG5wABMFdP0tWQ+4 riPL1xMdHsKojHqLc3nPnj+uTXYbJP8bEnVhJop4ge3XZAIT2XHhMbOiFIFt4V51t26/ AbaumrzdXDWChxLyepgJXFe8yU89NNiI2ZW+U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694811345; x=1695416145; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FkxHnFcmMcOMVwxYBLP2mYBTJKUa1NHaUTZS5wLWw3k=; b=C8VFTp/OpLIXXfyZsdbqlzPsHi+xMnVVgnpEj+9j5F6HAANU1x1RZrrYk/cYXmPKjR yDqdGDJCAPvOhCHJ/YSfbPbpgaG6v2UVADKpmH2hgYXZPZTH155iIl0wE93m8oTKmGnp jsoFBG+jRbVTs/yIs7D5HeyJAJ1fQseOPe22QbhrAZ6Fxp0bBLWq+3T8bwupdIgMb+s1 qKdNbMH1zD+c9LPx2n5yCfIObJEjIFMYxAgfg9rtNVqglDn1dHy4PPKXLjbmKQRF8Vr7 OZ6zQuP5WVXpMcw5T5JUBQUuAzpn6XSASQP5I1CbroO8U7SRO/GbOjsmFbeADHvGx0KC JG0g== X-Gm-Message-State: AOJu0YxPMo5Na4AUzkRRBhL1s+GAPGGw1try7LmrfZQ4dE9Zvlpw8EUb Q2Tt359h6uy/IB3vGg8wyalOMvuNKzjekfQd30yFxA== X-Google-Smtp-Source: AGHT+IEWf+tiuaN2sB9BwwhWDVl5qRolxLbhhN34fVp1i+GI+ZpJ7Ao1dY1bFuryOX1Ec+j32p2RgQ== X-Received: by 2002:a05:6a00:1996:b0:68f:dfea:9100 with SMTP id d22-20020a056a00199600b0068fdfea9100mr3137209pfl.21.1694811344659; Fri, 15 Sep 2023 13:55:44 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id i2-20020a63bf42000000b0056368adf5e2sm2768520pgo.87.2023.09.15.13.55.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 13:55:44 -0700 (PDT) Date: Fri, 15 Sep 2023 13:55:43 -0700 From: Kees Cook To: Matteo Rizzo Cc: cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, vbabka@suse.cz, roman.gushchin@linux.dev, 42.hyeyoo@gmail.com, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-hardening@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, corbet@lwn.net, luto@kernel.org, peterz@infradead.org, jannh@google.com, evn@google.com, poprdi@google.com, jordyzomer@google.com Subject: Re: [RFC PATCH 02/14] mm/slub: add is_slab_addr/is_slab_page helpers Message-ID: <202309151352.9803BA1@keescook> References: <20230915105933.495735-1-matteorizzo@google.com> <20230915105933.495735-3-matteorizzo@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230915105933.495735-3-matteorizzo@google.com> X-Rspam-User: X-Stat-Signature: p3by3h5adnsk15h3x5j7foxrxkjgbwhq X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E4F7C20025 X-HE-Tag: 1694811345-623111 X-HE-Meta: U2FsdGVkX19tSVvGeuoEXbxdRA4rhOPsO76fW9NCP21r6yUH5owqyGEGhQ5w9SInw+QfaJTKgoZz/Fu0AmJTXj/SdrQWlneE31nGg4oLaFAGHXsblmb01F/PfJmDG6bKurUHTHcxWsssQ75uGntqWE/q4YTwa5Ou4tgg46I5O+cOvMQO9CGisaIV3zPP4oF8tU1+YCiUIbrgoxuiK6o77nhFMSKBGpUlY/LrHlluQNlsammC5KwIZVoWOqyMSWgN1oscoSVLcEDV1GUBseX4fkmsD9o+4Ot5VSRlkqJ9+5cvWO70qWaZL3FrxHH9gGDb2DQlIZJXakflRZRY+uE3tjBAJLLcJufr1XGMJ6669DklNr5jbMvbGTXPgkGOx4mYJU3kK+weIj3WUGU6Pxd5IPmMULVP6zaKdZwcebW8DsyDi7EZRSPz99ixjtra/M55PBQN/6DctDjzhM7wFUq7H0q/cTzciIjaI8mzzwOj2r59GcXBc7cemMacim6AvyL0OKrEQ+Fh4gYGmLuTjLDRpTpUaxj/8neGvSqa5Jj/zhVliFHaJesEmAT/rXYEQMj3z+Jzoik1CYwC7vAQdUoVAi4Xi6v5CSN/1EzGuEvbMVWULrMkaGP82QUcpokt0UMahVhlPcL74IPX9GCUVxhSbD0fhRSPGcDj+llFCJRi3dIwnQw7fUwX1W7GbyFqKAYW0VGjinkT4Ax45/t6/8O+kfZCFJKJtZlmTSKlrIV/w/WGwT0TXbS5EUihk44QPMGvDZMWB8Ohzomy55dZmOOovkyxZAqWXUiL5hEj0jOTaEqlFx+1ZWwq7ykaLxiX1o3zVPIfThhs9LdP7BhkLEErBjiGmNHcgzKhYlSSxgWEQ7XFxnrnVxQ2wImiY989wX2l50DSA3BlpNF1oBmJM1AP7JOrTw8wstbuymY/uw7+WjlQc5f+SsFNY24ChWk9tPEqwEKw68GDHl/rsnX9VGC OcKtI+UV Jv0bEJt3yq1BMuIyZR05ImooVfAOCgsB9QazKjWzRybhTOwdZhuTE2yQEiT645g9LjwKAwz7zLYYSxnaxQWChGiu9gO0vWOXPwOqSUD8LHIYtXCNVR4gXSoZA4eddVxOkB+v45+Cx9Y32kVacE/3xDk6KlBNfxuhOv4C5z0cvTVU7VBiIfr+G7whJqDwehj9hY4RDuVHUPrUHC4VQIdbWR379qn2WfSWt87QHKOW/1tK6TKttxKT0Hfg5x+39E+tfnUI0U9gLABB+JHqohTC6mmFwp0CJBOw1lRg6fYcVMohLyH4kjz1A+ybe3xXL5uYblL8ZCQ3HreHYuWzi0mmLAb44lENHpxueP1rzZgbz9ZzmE3MNyjjOYKJl5NzItgQy1g4PT72iOVqz7pf1MEa9SA3x1MoV5/j6MoE8JlYhnHYigYTUnP/sw5R8JCBwEx4pNbQdSL8ZM7+0QNKbuq7X9hkrDud++IM42WXIfWVekx7LBog2ZOVI6QL5f4XO5uwUaLbqjVAazz5RYRWyl8SyYCyjxUY/LAPxq8djLTsD9XDIUig= 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 Fri, Sep 15, 2023 at 10:59:21AM +0000, Matteo Rizzo wrote: > From: Jann Horn > > This is refactoring in preparation for adding two different > implementations (for SLAB_VIRTUAL enabled and disabled). > > virt_to_folio(x) expands to _compound_head(virt_to_page(x)) and > virt_to_head_page(x) also expands to _compound_head(virt_to_page(x)) > > so PageSlab(virt_to_head_page(res)) should be equivalent to > is_slab_addr(res). Perhaps add a note that redundant calls to virt_to_folio() will be removed in following patches? > > Signed-off-by: Jann Horn > Co-developed-by: Matteo Rizzo > Signed-off-by: Matteo Rizzo > --- > include/linux/slab.h | 1 + > kernel/resource.c | 2 +- > mm/slab.h | 9 +++++++++ > mm/slab_common.c | 5 ++--- > mm/slub.c | 6 +++--- > 5 files changed, 16 insertions(+), 7 deletions(-) > > diff --git a/include/linux/slab.h b/include/linux/slab.h > index 8228d1276a2f..a2d82010d269 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -793,4 +793,5 @@ int slab_dead_cpu(unsigned int cpu); > #define slab_dead_cpu NULL > #endif > > +#define is_slab_addr(addr) folio_test_slab(virt_to_folio(addr)) > #endif /* _LINUX_SLAB_H */ > diff --git a/kernel/resource.c b/kernel/resource.c > index b1763b2fd7ef..c829e5f97292 100644 > --- a/kernel/resource.c > +++ b/kernel/resource.c > @@ -158,7 +158,7 @@ static void free_resource(struct resource *res) > * buddy and trying to be smart and reusing them eventually in > * alloc_resource() overcomplicates resource handling. > */ > - if (res && PageSlab(virt_to_head_page(res))) > + if (res && is_slab_addr(res)) > kfree(res); > } > > diff --git a/mm/slab.h b/mm/slab.h > index 799a315695c6..25e41dd6087e 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -169,6 +169,15 @@ static_assert(IS_ALIGNED(offsetof(struct slab, freelist), sizeof(freelist_aba_t) > */ > #define slab_page(s) folio_page(slab_folio(s), 0) > > +/** > + * is_slab_page - Checks if a page is really a slab page > + * @s: The slab > + * > + * Checks if s points to a slab page. > + * > + * Return: true if s points to a slab and false otherwise. > + */ > +#define is_slab_page(s) folio_test_slab(slab_folio(s)) > /* > * If network-based swap is enabled, sl*b must keep track of whether pages > * were allocated from pfmemalloc reserves. > diff --git a/mm/slab_common.c b/mm/slab_common.c > index e99e821065c3..79102d24f099 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -1063,7 +1063,7 @@ void kfree(const void *object) > return; > > folio = virt_to_folio(object); > - if (unlikely(!folio_test_slab(folio))) { > + if (unlikely(!is_slab_addr(object))) { > free_large_kmalloc(folio, (void *)object); > return; > } > @@ -1094,8 +1094,7 @@ size_t __ksize(const void *object) > return 0; > > folio = virt_to_folio(object); > - > - if (unlikely(!folio_test_slab(folio))) { > + if (unlikely(!is_slab_addr(object))) { > if (WARN_ON(folio_size(folio) <= KMALLOC_MAX_CACHE_SIZE)) > return 0; > if (WARN_ON(object != folio_address(folio))) In the above 2 hunks we're doing virt_to_folio() twice, but I see in patch 4 that these go away. > diff --git a/mm/slub.c b/mm/slub.c > index a7dae207c2d2..b69916ab7aa8 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -1259,7 +1259,7 @@ static int check_slab(struct kmem_cache *s, struct slab *slab) > { > int maxobj; > > - if (!folio_test_slab(slab_folio(slab))) { > + if (!is_slab_page(slab)) { > slab_err(s, slab, "Not a valid slab page"); > return 0; > } > @@ -1454,7 +1454,7 @@ static noinline bool alloc_debug_processing(struct kmem_cache *s, > return true; > > bad: > - if (folio_test_slab(slab_folio(slab))) { > + if (is_slab_page(slab)) { > /* > * If this is a slab page then lets do the best we can > * to avoid issues in the future. Marking all objects > @@ -1484,7 +1484,7 @@ static inline int free_consistency_checks(struct kmem_cache *s, > return 0; > > if (unlikely(s != slab->slab_cache)) { > - if (!folio_test_slab(slab_folio(slab))) { > + if (!is_slab_page(slab)) { > slab_err(s, slab, "Attempt to free object(0x%p) outside of slab", > object); > } else if (!slab->slab_cache) { > -- > 2.42.0.459.ge4e396fd5e-goog This all looks nice and mechanical. :P Reviewed-by: Kees Cook -- Kees Cook