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 14C4DC4167B for ; Thu, 7 Dec 2023 01:35:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 95B2B6B009A; Wed, 6 Dec 2023 20:35:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E5AD6B00B3; Wed, 6 Dec 2023 20:35:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7AC046B00A5; Wed, 6 Dec 2023 20:35:53 -0500 (EST) 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 67E5B6B00B3 for ; Wed, 6 Dec 2023 20:35:53 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 44FA3402F3 for ; Thu, 7 Dec 2023 01:35:53 +0000 (UTC) X-FDA: 81538305786.20.20FFD88 Received: from mail-oo1-f51.google.com (mail-oo1-f51.google.com [209.85.161.51]) by imf21.hostedemail.com (Postfix) with ESMTP id 79C011C0018 for ; Thu, 7 Dec 2023 01:35:51 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QuqMBEcO; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf21.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.161.51 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701912951; a=rsa-sha256; cv=none; b=ZLcwQpnb/3RfNaJO2nD3T7UseJCjDcbDTNDkp5ysbYSjfKTmfmYHoVWhDM8/ZwnxLMrOMw l2EuSwZ5fPznXVzIcbkjK65Sp83iCCU4Z9gjZKEesZyvqOuvWk/3+8Ld5V8jjIG8SKFgIK O3j5BNGbaIzP54jR2ApOPWNx4fb5B+0= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=QuqMBEcO; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf21.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.161.51 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701912951; 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=d4xrwcnzIgg/3xKCyJBP6G5sTr9I0S6hKhfLAnFc++o=; b=aGh32BRR9+HPCSbGXLFDmAptE2vHCk4EzMmtjdCwQdFmA5oRiiz1eBjX+KkGPacutWYuC5 ilWTpEiQ9uD1Fa2v+fJdi7CC6EwCRSOVdBRAvhNKt+BCv5W7L3vt7mLb+lyYKht/5P+iIA G7O7uPNZZWanOD+Br4LxDGees/UKkSE= Received: by mail-oo1-f51.google.com with SMTP id 006d021491bc7-58df5988172so104017eaf.0 for ; Wed, 06 Dec 2023 17:35:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701912950; x=1702517750; 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=d4xrwcnzIgg/3xKCyJBP6G5sTr9I0S6hKhfLAnFc++o=; b=QuqMBEcOpCu6bqysLEB9IDjLBBW3n02c553rfoz0ziU/WBU60w37XQeWjBs7qQyP+q vmRlNTRaJElXettjgposKzJ4tMmlSJN7UP2ijuv56G0MH0J7EYrHR0uYJxbuiLBK8x47 +kZlnwfCzYdQNClmUOk7rSCJ/im17qUMdBSxatLxUspIjK9agyzDbZCQlhLIMzNIPLde 3gUnCXPOW+LdAkOXZhYr1yrHjyiP/nL/LlD2BHOAcDlAYcJbF+y+cqQ1Hi98K4Gbu9n1 aWl2QY3iJ38X6iqq5vjQ7aBrDE/1DHNKRprGYlOJI7JrveTNCrytUEuOtBEyZ+IERQqw kBgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701912950; x=1702517750; 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=d4xrwcnzIgg/3xKCyJBP6G5sTr9I0S6hKhfLAnFc++o=; b=SDQ3lUMol80lQ+/BPVJ2hPhStC3fm9kMB+rTQEjea5ZnJ6f2pDuJ5Xm4rNHX1UXpGg RDqbOywJF4ZiiGjbjdmNqsCNJAs4Zjdte5HfkRcC/CF2pKgZt4ft9gdHDKbVc9rLZxL4 7claVbMgXR+pNdmDnMy1YOhh30dn/lIgF1D6BsVYdvkmXhin2KlDJ6trfxqyLI8rOWTB G4JjpTk8GBeD/DIkSw6r/XJnfFVU+V6LPMjYXBspKp9QEHBfHxJcBB3TIRHcencd/rvL rIPVaA0OAtl2LUWpr7PpD9hHFLR9g5395GHhia/HtVrs9EY79yvup5pVMfMF7qlFj+8L HVrA== X-Gm-Message-State: AOJu0YwwuSCKuwXRfcDxKKyFydNMD8NercRL2JhFGdAkeuGvo9Tddo3B uoYef3g+/3uz+ZXyBDpAr0s= X-Google-Smtp-Source: AGHT+IGcqLPfXRlpGNUCb8LOOq3jN1nQ6GAu9BviQ+ei2oeEpmxl3kVJY3jAC786rB+FiaHsdAc3dA== X-Received: by 2002:a05:6359:2d96:b0:170:17eb:203c with SMTP id rn22-20020a0563592d9600b0017017eb203cmr1939426rwb.37.1701912950403; Wed, 06 Dec 2023 17:35:50 -0800 (PST) Received: from localhost.localdomain ([1.245.180.67]) by smtp.gmail.com with ESMTPSA id g3-20020a056a0023c300b006c0685422e0sm149828pfc.214.2023.12.06.17.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 17:35:49 -0800 (PST) Date: Thu, 7 Dec 2023 10:35:41 +0900 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Vlastimil Babka Cc: David Rientjes , Christoph Lameter , Pekka Enberg , Joonsoo Kim , Andrew Morton , Roman Gushchin , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Marco Elver , Johannes Weiner , Michal Hocko , Shakeel Butt , Muchun Song , Kees Cook , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH v2 19/21] mm/slub: remove slab_alloc() and __kmem_cache_alloc_lru() wrappers Message-ID: References: <20231120-slab-remove-slab-v2-0-9c9c70177183@suse.cz> <20231120-slab-remove-slab-v2-19-9c9c70177183@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231120-slab-remove-slab-v2-19-9c9c70177183@suse.cz> X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 79C011C0018 X-Stat-Signature: 9edyyojuzeqhm4j8pmwyi8fozpar8n7x X-HE-Tag: 1701912951-271047 X-HE-Meta: U2FsdGVkX19eY+m/E34N7pihVNoUSdjpxRbLMrCIG3Fj66g+3Pyi9PN4lePJyMc1lPMiCUdjwA84vErvixyq255kz9T2zmp6Ouaf9mYsus6SjUotewykG5szbl93rp8BJxIZuEbuFfpdUB2MksZ7Rgj8A7DxiZwTx62/X3R1rb4/d6evqe8Blf+RdO4Ldjhr28CEnxiHgjjxibO/+/tFZs46Hsu9pD8qahXAvibLA/viDV1qhdAxAsWHuEDschctZB7osfUj2wk4Sx4XsQC339e+jbtjSr5D3+wBqy1WmrbHUYCpds0OJFdp8qwSkJm6cqhbxJFyMqTlT2hsZXRICYqtrFiNXJvj/FKcuTXSqymNotWNpO5BTrhRY0bSUSA2CYpuLA9xyjnirJkauwZLhfDyYo+yAsNvidRYubck950Q7A2pwvTSoCiHVouZ+eMaCoSP3np03J+7ZU95QUff1WTEGd02pIODbKJ2k5DJqjZn66vAnPnwSfUWryDOqfADhtUE8a1ZJgZo8XV9pqWN9pMGLPm8Ae8ac5a/QWrADjB53TEYaLGqV2Yaanxui0oPxGp2aCOZT8Ptx+obvoiYIw6yRQ946MQXDLHjaI8QwfyPsie9SabMN0zuGdYets0YibtPlccHIvrPDcblftV8JVcWwiCKRveKfVQxL98Fwt4iFmfgm/+s6K8r46bJ6w1uH4l8RrMBFARAJaJnGiWdbSrMW2KwkzjGbfqFXHIbAUF1AmR0enTBEkJToVGVVZDpQ5IOfDuXJ6qKtNQzZq6UTYYMngXtxeIInWW1sUK1YqjkGpWyI87ErKMi7yVriRYpQQh5zmk2UvL8CGMq8dQLhb0AkPv3MyoiWLjZlYFJhW5QdWt+i6R+5dphBeDLa2kvDpDSsrYMYT6APVbO+UK2fWK+HIFrRn1oWWqJrG0motEexnvkQ5B8hxfXrKZ06hOSlmMIT7/qju4Lgp0uOHm bKfOJPXV 8aBOLllpXuTnOy+zXOL96DtyQsikDOkSoI/LOSFGD7kyxXNTHo0890BRDm/jD57zX5WnjVLsWdU10+W7y87J1LAYPOJ52ZmqLKv1PWO0lTy9W+7uWmGnn50rr3kq0yh67HKDP+BkQQ6Bk1v/z9cP8qMWSTYjqLtkW31e2giX1ah4x4j7DdR9JO/5Lf+cI+Scrj0ROB2D3mgnr5xaDIgnob9Xw8+CWdlb8IsdcnWIKZBnrsd/NxredDzEUAszcBNw/59yr+pYyi4CSOYjat6WaOdKx1wu2mZY5aed0YX2VuPCQyU8XW6tP8sGeLqEn04Zw7cIfCWzDlqVbeX+vRAy1FoMkkV0nDWd9ySm2zJB8ton+GD0IoCa3gE1Z3wf1uaCzgGiYlUtZzJ8ut1fmtPy3XKCLNGtOSWflYrzMt1SCcg729gL+jvnIQGWqOx840cZQrUtVpb1sYqXcXxF+U/pCmkXMKMY0JycCW5DVJYfV0xPr9/U3vuO261wLj9d7KjbkT2FoIWH5y9vk2l04BjOfVvXiWKepJqUZv4m6UfLU/Gwf8EE6La0yVhNVvavyJQ+1FZcA8oHBSz4Y/rl97kGnM0m5C3oFrGEKXznBLGpKVcKelj4TvP2GQAog4A== 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: On Mon, Nov 20, 2023 at 07:34:30PM +0100, Vlastimil Babka wrote: > slab_alloc() is a thin wrapper around slab_alloc_node() with only one > caller. Replace with direct call of slab_alloc_node(). > __kmem_cache_alloc_lru() itself is a thin wrapper with two callers, > so replace it with direct calls of slab_alloc_node() and > trace_kmem_cache_alloc(). > > This also makes sure _RET_IP_ has always the expected value and not > depending on inlining decisions. > > Reviewed-by: Kees Cook > Signed-off-by: Vlastimil Babka > --- > mm/slub.c | 25 +++++++++---------------- > 1 file changed, 9 insertions(+), 16 deletions(-) > > diff --git a/mm/slub.c b/mm/slub.c > index d6bc15929d22..5683f1d02e4f 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -3821,33 +3821,26 @@ static __fastpath_inline void *slab_alloc_node(struct kmem_cache *s, struct list > return object; > } > > -static __fastpath_inline void *slab_alloc(struct kmem_cache *s, struct list_lru *lru, > - gfp_t gfpflags, unsigned long addr, size_t orig_size) > -{ > - return slab_alloc_node(s, lru, gfpflags, NUMA_NO_NODE, addr, orig_size); > -} > - > -static __fastpath_inline > -void *__kmem_cache_alloc_lru(struct kmem_cache *s, struct list_lru *lru, > - gfp_t gfpflags) > +void *kmem_cache_alloc(struct kmem_cache *s, gfp_t gfpflags) > { > - void *ret = slab_alloc(s, lru, gfpflags, _RET_IP_, s->object_size); > + void *ret = slab_alloc_node(s, NULL, gfpflags, NUMA_NO_NODE, _RET_IP_, > + s->object_size); > > trace_kmem_cache_alloc(_RET_IP_, ret, s, gfpflags, NUMA_NO_NODE); > > return ret; > } > - > -void *kmem_cache_alloc(struct kmem_cache *s, gfp_t gfpflags) > -{ > - return __kmem_cache_alloc_lru(s, NULL, gfpflags); > -} > EXPORT_SYMBOL(kmem_cache_alloc); > > void *kmem_cache_alloc_lru(struct kmem_cache *s, struct list_lru *lru, > gfp_t gfpflags) > { > - return __kmem_cache_alloc_lru(s, lru, gfpflags); > + void *ret = slab_alloc_node(s, lru, gfpflags, NUMA_NO_NODE, _RET_IP_, > + s->object_size); > + > + trace_kmem_cache_alloc(_RET_IP_, ret, s, gfpflags, NUMA_NO_NODE); > + > + return ret; > } > EXPORT_SYMBOL(kmem_cache_alloc_lru); Looks good to me, Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > > > -- > 2.42.1 > >