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 DACC7C4332F for ; Sat, 5 Nov 2022 01:09:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 158566B0071; Fri, 4 Nov 2022 21:09:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 108BD6B0073; Fri, 4 Nov 2022 21:09:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F121E8E0001; Fri, 4 Nov 2022 21:09:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DE8A56B0071 for ; Fri, 4 Nov 2022 21:09:42 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A95F716041C for ; Sat, 5 Nov 2022 01:09:42 +0000 (UTC) X-FDA: 80097606204.20.241E20E Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf10.hostedemail.com (Postfix) with ESMTP id 5BA98C0002 for ; Sat, 5 Nov 2022 01:09:42 +0000 (UTC) Received: by mail-pl1-f177.google.com with SMTP id l2so6340951pld.13 for ; Fri, 04 Nov 2022 18:09:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=UZRKTfzUgUmUoDMmXtLNWbH1d7SRg9NOYtTV2ieREGk=; b=WEeQ3oedxebSq3TylgaXd4uhHZ9fSf85t4y+VbXKEnRu/7HDBOu+78DX1+z7CCi5y7 iXRQ9RG1+Zg01X1PRF7ztSjuRtPSWejAzJyKjVmW5vQBGjgN+PSGGvaFgNrjYR/yHXLH sn53T4Ne/NmwBRYJ5cRZM4YACVxoe+c7TnndsA9ak7FT4Nk/uRjxeR9Kgv2Ji9Kwf4GZ ZSwkypKIL9HoKD6Va65PrJYvi1yFVSeWLvEEoMsWeLDq5B7KPzuGinuq4ql9AMXKXWPu tMeggNh/G7KLz4CDnMCUtPkiNqH/satSpu6aMojsrEmZbKZLfg2X2ZK94qwSx3yGOOOC l90A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=UZRKTfzUgUmUoDMmXtLNWbH1d7SRg9NOYtTV2ieREGk=; b=O3vP7gRWHI5PCdYkPOgZ5QE1Vg8Lv8cMsPCMhROZnrzY+VtgWXbX9J6OVLnO5r93/Q FkqhDxO5gB4Ee1/zBYN1RfYoe+hFAeEeQdmjkuUI2OJ3MNAGlMYHH3Uo5fWBz+/AFvz7 yvj6UvDQY7wQJff9nSuk17fB4ph80sEUsB4bUhUjHXAv1A/QPRil/3/hMU8G0o5Zd0gL /6rjrI3HJBreBcfCOYSP0zQZCXTPwvkyDS51bXZigqsEg1+ubBgjMStVCMhq7KbgRmkC GgXZuGVXpBTF7RQS5KtVwuPJ6zO1bTBD12lFJIxNGlF1TmJ3w904FP4dNAn2ULPAgDbe VHdg== X-Gm-Message-State: ACrzQf07LfjIdcsRBooWLFQ7PFwJmVib2bNScpAAbDfapfES4zxS3Mrk RVnDZi2pycwTZBHStjKvN1k= X-Google-Smtp-Source: AMsMyM7rn2BtRhnzi3h+OsA0B40E06ImoWbABI8HcmyJhN73GZyM7ao3+XvXzCg/8TYVD9EkwCIrNg== X-Received: by 2002:a17:90a:ba85:b0:212:d644:fc28 with SMTP id t5-20020a17090aba8500b00212d644fc28mr39973129pjr.72.1667610581148; Fri, 04 Nov 2022 18:09:41 -0700 (PDT) Received: from hyeyoo ([114.29.91.56]) by smtp.gmail.com with ESMTPSA id u7-20020a63ef07000000b004393c5a8006sm310615pgh.75.2022.11.04.18.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 18:09:40 -0700 (PDT) Date: Sat, 5 Nov 2022 10:09:32 +0900 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Kees Cook Cc: Vlastimil Babka , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , linux-mm@kvack.org, David Gow , Rasmus Villemoes , Guenter Roeck , Andy Shevchenko , Paolo Abeni , Geert Uytterhoeven , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, llvm@lists.linux.dev Subject: Re: [PATCH 3/6] slab: Provide functional __alloc_size() hints to kmalloc_trace*() Message-ID: References: <20221101222520.never.109-kees@kernel.org> <20221101223321.1326815-3-keescook@chromium.org> <202211041121.2F1639D2@keescook> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202211041121.2F1639D2@keescook> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667610582; a=rsa-sha256; cv=none; b=W7b76x7NYxuVEo3VXR5ZiW110P98HLe0/4fv3ZgVYhhuDo6cpE0aEp3Vq/bhejNiF0Llk8 g91AA3qdAYdfIZIQEXnPNRXgqiGldO3f9vA3rxN8PZbS5XHxRYE8KN91UiDtFBGCcQNlBi S2tTfanevC5uDb6R167Vq7j16iPCVK4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=WEeQ3oed; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.177 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=1667610582; 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=UZRKTfzUgUmUoDMmXtLNWbH1d7SRg9NOYtTV2ieREGk=; b=DIl5rMYyaSWu5O3InhrhBfmrjKXS8iAHXtgFda5D+qFUdUJKFHvIdWaQKWcH/1/rlWF59Q ji1dyWVSOi2+ZfFyeIjzkEx0PBYFAwutgf1Ndpbk2kEyGuxZHHjHp7GDPR/XZuxpGRfsnN J+kHSrYPGmD2waTqsuP/1m2sWQ8H2j4= X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 5BA98C0002 X-Rspam-User: Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=WEeQ3oed; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com X-Stat-Signature: mqfz8z3ijpyxsrru463jkbh4dynds6ks X-HE-Tag: 1667610582-203803 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, Nov 04, 2022 at 11:22:42AM -0700, Kees Cook wrote: > On Thu, Nov 03, 2022 at 11:16:53PM +0900, Hyeonggon Yoo wrote: > > On Tue, Nov 01, 2022 at 03:33:11PM -0700, Kees Cook wrote: > > > Since GCC cannot apply the __alloc_size attributes to inlines[1], all > > > allocator inlines need to explicitly call into extern functions that > > > contain a size argument. Provide these wrappers that end up just > > > ignoring the size argument for the actual allocation. > > > > > > This allows CONFIG_FORTIFY_SOURCE=y to see all various dynamic allocation > > > sizes under GCC 12+ and all supported Clang versions. > > > > > > [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96503 > > > > > > Cc: Vlastimil Babka > > > Cc: Christoph Lameter > > > Cc: Pekka Enberg > > > Cc: David Rientjes > > > Cc: Joonsoo Kim > > > Cc: Andrew Morton > > > Cc: Roman Gushchin > > > Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> > > > Cc: linux-mm@kvack.org > > > Signed-off-by: Kees Cook > > > --- > > > include/linux/slab.h | 8 ++++++-- > > > mm/slab_common.c | 14 ++++++++++++++ > > > 2 files changed, 20 insertions(+), 2 deletions(-) > > > > > > diff --git a/include/linux/slab.h b/include/linux/slab.h > > > index 970e9504949e..051d86ca31a8 100644 > > > --- a/include/linux/slab.h > > > +++ b/include/linux/slab.h > > > @@ -442,6 +442,8 @@ static_assert(PAGE_SHIFT <= 20); > > > > > > void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __alloc_size(1); > > > void *kmem_cache_alloc(struct kmem_cache *s, gfp_t flags) __assume_slab_alignment __malloc; > > > +void *kmem_cache_alloc_sized(struct kmem_cache *s, gfp_t flags, size_t size) > > > + __assume_slab_alignment __alloc_size(3); > > > void *kmem_cache_alloc_lru(struct kmem_cache *s, struct list_lru *lru, > > > gfp_t gfpflags) __assume_slab_alignment __malloc; > > > void kmem_cache_free(struct kmem_cache *s, void *objp); > > > @@ -469,6 +471,8 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignm > > > __alloc_size(1); > > > void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t flags, int node) __assume_slab_alignment > > > __malloc; > > > +void *kmem_cache_alloc_node_sized(struct kmem_cache *s, gfp_t flags, int node, size_t size) > > > + __assume_slab_alignment __alloc_size(4); > > > > > > #ifdef CONFIG_TRACING > > > void *kmalloc_trace(struct kmem_cache *s, gfp_t flags, size_t size) > > > @@ -482,7 +486,7 @@ void *kmalloc_node_trace(struct kmem_cache *s, gfp_t gfpflags, > > > static __always_inline __alloc_size(3) > > > void *kmalloc_trace(struct kmem_cache *s, gfp_t flags, size_t size) > > > { > > > - void *ret = kmem_cache_alloc(s, flags); > > > + void *ret = kmem_cache_alloc_sized(s, flags, size); > > > > > > ret = kasan_kmalloc(s, ret, size, flags); > > > return ret; > > > @@ -492,7 +496,7 @@ static __always_inline __alloc_size(4) > > > void *kmalloc_node_trace(struct kmem_cache *s, gfp_t gfpflags, > > > int node, size_t size) > > > { > > > - void *ret = kmem_cache_alloc_node(s, gfpflags, node); > > > + void *ret = kmem_cache_alloc_node_sized(s, gfpflags, node, size); > > > > > > ret = kasan_kmalloc(s, ret, size, gfpflags); > > > return ret; > > > diff --git a/mm/slab_common.c b/mm/slab_common.c > > > index 33b1886b06eb..5fa547539a6a 100644 > > > --- a/mm/slab_common.c > > > +++ b/mm/slab_common.c > > > @@ -1457,6 +1457,20 @@ size_t ksize(const void *objp) > > > } > > > EXPORT_SYMBOL(ksize); > > > > > > +/* Wrapper so __alloc_size() can see the actual allocation size. */ > > > +void *kmem_cache_alloc_sized(struct kmem_cache *s, gfp_t flags, size_t size) > > > +{ > > > + return kmem_cache_alloc(s, flags); > > > +} > > > +EXPORT_SYMBOL(kmem_cache_alloc_sized); > > > + > > > +/* Wrapper so __alloc_size() can see the actual allocation size. */ > > > +void *kmem_cache_alloc_node_sized(struct kmem_cache *s, gfp_t flags, int node, size_t size) > > > +{ > > > + return kmem_cache_alloc_node(s, flags, node); > > > +} > > > +EXPORT_SYMBOL(kmem_cache_alloc_node_sized); > > > > The reason that we have two implementations of kmalloc_trace* > > depending on CONFIG_TRACING is to save additional function call when > > CONFIG_TRACING is not set. > > > > With this patch there is no reason to keep both. > > So let's drop #ifdefs and use single implementation in mm/slab_common.c. > > Okay, I'll respin... > > -- > Kees Cook Oh, it seems Vlastimil already did that. Maybe simply drop this patch in next spin? https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git/commit/?h=slab/for-6.1-rc4/fixes&id=eb4940d4adf590590a9d0c47e38d2799c2ff9670 Thanks! -- Hyeonggon