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 1A022CD37AA for ; Fri, 15 Sep 2023 21:02:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8BEC28D002C; Fri, 15 Sep 2023 17:02:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 86EE88D0005; Fri, 15 Sep 2023 17:02:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7368F8D002C; Fri, 15 Sep 2023 17:02:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 64ADE8D0005 for ; Fri, 15 Sep 2023 17:02:17 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4710B1CA805 for ; Fri, 15 Sep 2023 21:02:17 +0000 (UTC) X-FDA: 81240054714.19.A33A040 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf01.hostedemail.com (Postfix) with ESMTP id 6A5824002B for ; Fri, 15 Sep 2023 21:02:15 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=U28jN4pS; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf01.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.179 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694811735; a=rsa-sha256; cv=none; b=ur7kfK71qMmff+qivsGtUBZQLtAyVZSUc0HHtKFqSdxhoKxLb33Mj4W632OAIYSqjkrSYr y2Ur8mSbiX1KWEYgimZu6X5YfKun+2Qldw0rIahsxeJmRqWnSST430ECiMBOOaNHQispxS kbdPmojfaNs5uUp3c4tbv+riPkGuObE= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=U28jN4pS; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf01.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.179 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=1694811735; 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=xIW8YzBnPzjMwFioxgcY2G/FS0UtBiM6jL3TdyU9mWA=; b=ShR5uDLy1y6aK3NGJOWBLjBJmyMEwnGW71U4GIlmn2cMVao3qQio2FIlrq89wFo2gSGMGW dz+uaWNEn80LEdIJfwf0vCUKz2JdH3F9oF29gv/rVBsONZB0NU2GZnqEG1lo1K4CasN8FV VdACaTTuY1zIt1Z5k1iUBE57jl00Rbk= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1c39f2b4f5aso21770265ad.0 for ; Fri, 15 Sep 2023 14:02:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694811734; x=1695416534; 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=xIW8YzBnPzjMwFioxgcY2G/FS0UtBiM6jL3TdyU9mWA=; b=U28jN4pSeDUzr2P5JrS3Sik8w2+pMODMSJRiTbm9wSx/K5sDN6ik+HpTqamqQgRGXN UWlZ1rjZci0xBgTPjzoMHPPKSJl9egTd8WmLEvOeo9RrULPlojRG4vWyoCOBrtWO1kgM x1PlpCjaEHI9n7ZsoI8slaw+T4b8t7Rca7fqI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694811734; x=1695416534; 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=xIW8YzBnPzjMwFioxgcY2G/FS0UtBiM6jL3TdyU9mWA=; b=u9lMkaGBjiUhqtNYkxvdMw8636wuZkJLbTa5ZRWn7aKXVS6JAc4rsztFndRhOwtMp8 Xx/PEQHf8vllUsGeucvtsppC62X+aQcXahTPsLeozOKJ4yqw1e9tGp+AzzJSt0pZXY7F /brPyRdXU6bGuj1uZPBvcatTNWPkG0RBmEpX1SSGYRQFF4P9FvrRz8FTOT1YzwjLm0DU RUiWjxlGLJLH+PwUYmvVaHgdnTq88U8pI1YNRf5oTnv1v1jpokqRLNxfXp2I5oH0Yzm+ m3DCHe1InL5Iaycs5i9EErXmLq0IYVX/47TmES6iDjzs43+Ll6TFc/PAAh9rg+KuBEb2 Sdvg== X-Gm-Message-State: AOJu0YyvijNNWtd/1+zYn7vjvNbbR3LV/E2Jbv6Cq3bB8gTOwV5ep2N9 X+td41n+Q65mY3R9PuYiuGjfYA== X-Google-Smtp-Source: AGHT+IGnL4Eg/UbrsjZtb65Tqj96GTr48RD7WqWC+PhqArwGW32wNsPvpvJK3pY3wbLoK553JZFM+w== X-Received: by 2002:a17:903:455:b0:1c0:b17a:7554 with SMTP id iw21-20020a170903045500b001c0b17a7554mr2433786plb.64.1694811734323; Fri, 15 Sep 2023 14:02:14 -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 q15-20020a17090311cf00b001c3267ae317sm3902440plh.165.2023.09.15.14.02.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 14:02:13 -0700 (PDT) Date: Fri, 15 Sep 2023 14:02:13 -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 05/14] mm/slub: create folio_set/clear_slab helpers Message-ID: <202309151401.C49DDCE8@keescook> References: <20230915105933.495735-1-matteorizzo@google.com> <20230915105933.495735-6-matteorizzo@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230915105933.495735-6-matteorizzo@google.com> X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6A5824002B X-Stat-Signature: bufc8m6gcihgx61qgd7pamwuph8ygyj6 X-HE-Tag: 1694811735-38022 X-HE-Meta: U2FsdGVkX18G0306EW2E45IyiIZ/RoGvBW7NJmyUMr9FCH1WRE1oHyLE6bR1lh1Wt6bfSDGc1+XkNUhgw00r7I1yPNKLRTdu7llY3ZqAfgd07ChOGCNMZh5WiVA1zkJq4nOb5JTNJxu0g7eGawQByg+asxFmI6TntT0Lu1/w23fIFVjdQ82p4RjH6faG+KVVCK8WRSCT8lgTQO6U/Th+4tiulK/74wxk3ZBpDWbOC4zEZfa417THvkohjSIWouBEa09eJHVCfJeVniWSfZbunOCvnaAAts0tt1cXhlYRVW59m1LtrlFlaG/RaTI3gpTlMmV4e2L0ayZ2vAdWwJba46FjagiROSuNHBs6/R2O0nJ8UoBF5IWXsHj3IQ6S6WVHJnEd3OybI9vlxq7iruTH0eb0cS6aZ/3VCej7mRt/HbynXkh6V0UZKTPv3j0fHn66jAmxT0Y7GVON9GscaIO7yVcsxUqsKa/Da4ukIwLez1O9MR+BjEgpCt0iKWP3Dx0LlO/eVwAjfNSpL6jQbyrEhON2aVVoYMVezRpiKM+FoBYqDJN19i9jVKDz1ZhZWSDurOA7thdwJWBflwBLEzYnDE4micsJKHyxFw4q+kFYepeMpS64+JQUhM2eHIceon43Z5Okyvr5220+e+pDCx7atkCfxdN0nuCkVDAF5un6BEoSdSyKE1Vd3km3D2BKXJGOZcrN38CcSamV/GVQT9b4e/ONlVecWQ+Lfqgn6TvXTWzDUKCCuZulXUfYj+XOZlimyE2Dv2LHfp2/Vp4m88DYfuRuJE6Ae7hPTgJVHgZtrcQ0Y9FShsJHrfBzNHOIdeU7hOw27snV7S9P/X3cI7Kp2JyUk/7t+ZFWwgvxkpi0oEHAZJdYzlgrOpb+N9DYKDMUB1ITHKyUS/t+1bhy15tidn0OQ4LLGtNKFqX/L669pPeYN1JnNRW5o5fSnpzlNqiWq8flwLvwpaJ38/qWMY1 fZ1WahSZ fZ8btajxx6Hbc8ql1T+vRXpKMbVghVDfZrwnC3r448ZpR7zjBR6vKHmKaUFh6GZ+gj8SvX2hQq3WmuwGOlvhIVW+gHQkSGiEpR6eZb9G/vZLN01qPH5NL/Ki0hrGkcJI1/UC+DCsph7PXlW7tRiKQXD7vEoqyJlYZntrUB2EKxabU0w6wAqUfSN9aUleU1CgMYn9BvJdoB4NgWpUbh/880gFaX1UZ0YwEkR/Sykf7FeGo1hrVWnkE7o9KV2hX0FEEW/Dhb8THwi3b0BeWL1jwCsXdhivjO41iVKzIQxUJ1vXzLJAWlmULMRTeb4do08ZQdjDV/GDe78FxofNPcyMiJYjr4cQCfEO/uCPfslX5+J/l9vz6hAyFPsCHMiYPj9nYdIj7MQb3RODSR+yjGCVvUZVXcQw7wqzPUZ0/7GaaQKqGqiCQb/fivsp1GOUXba1Xo+NxStbWkZpbtA2YI5Ur6M9aRsC3ELH+XDmpNtItd2tTF/b9NWjBZ4uwEvNthh2hMagYBUnccbE3QsnxRC6pZfhVPKh/IlvH3wjWsAPklyAOh+0= 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:24AM +0000, Matteo Rizzo wrote: > From: Jann Horn > > This is refactoring in preparation for SLAB_VIRTUAL. Extract this code > to separate functions so that it's not duplicated in the code that > allocates and frees page with SLAB_VIRTUAL enabled. > > Signed-off-by: Jann Horn > Co-developed-by: Matteo Rizzo > Signed-off-by: Matteo Rizzo > --- > mm/slub.c | 32 ++++++++++++++++++++++---------- > 1 file changed, 22 insertions(+), 10 deletions(-) > > diff --git a/mm/slub.c b/mm/slub.c > index ad33d9e1601d..9b87afade125 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -1849,6 +1849,26 @@ static void *setup_object(struct kmem_cache *s, void *object) > /* > * Slab allocation and freeing > */ > + > +static void folio_set_slab(struct folio *folio, struct slab *slab) > +{ > + __folio_set_slab(folio); > + /* Make the flag visible before any changes to folio->mapping */ > + smp_wmb(); > + > + if (folio_is_pfmemalloc(folio)) > + slab_set_pfmemalloc(slab); > +} > + > +static void folio_clear_slab(struct folio *folio, struct slab *slab) > +{ > + __slab_clear_pfmemalloc(slab); > + folio->mapping = NULL; > + /* Make the mapping reset visible before clearing the flag */ > + smp_wmb(); > + __folio_clear_slab(folio); > +} Perhaps these should be explicitly marked as inlines? > + > static inline struct slab *alloc_slab_page(gfp_t flags, int node, > struct kmem_cache_order_objects oo) > { > @@ -1865,11 +1885,7 @@ static inline struct slab *alloc_slab_page(gfp_t flags, int node, > return NULL; > > slab = folio_slab(folio); > - __folio_set_slab(folio); > - /* Make the flag visible before any changes to folio->mapping */ > - smp_wmb(); > - if (folio_is_pfmemalloc(folio)) > - slab_set_pfmemalloc(slab); > + folio_set_slab(folio, slab); > > return slab; > } > @@ -2067,11 +2083,7 @@ static void __free_slab(struct kmem_cache *s, struct slab *slab) > int order = folio_order(folio); > int pages = 1 << order; > > - __slab_clear_pfmemalloc(slab); > - folio->mapping = NULL; > - /* Make the mapping reset visible before clearing the flag */ > - smp_wmb(); > - __folio_clear_slab(folio); > + folio_clear_slab(folio, slab); > mm_account_reclaimed_pages(pages); > unaccount_slab(slab, order, s); > __free_pages(&folio->page, order); > -- > 2.42.0.459.ge4e396fd5e-goog Otherwise this is a straight function extraction. Reviewed-by: Kees Cook -- Kees Cook