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 27365C4332F for ; Thu, 3 Nov 2022 14:17:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A5F736B0072; Thu, 3 Nov 2022 10:17:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A0F6D6B0073; Thu, 3 Nov 2022 10:17:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D7066B0074; Thu, 3 Nov 2022 10:17:04 -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 7C5746B0072 for ; Thu, 3 Nov 2022 10:17:04 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 50FAC160B3E for ; Thu, 3 Nov 2022 14:17:04 +0000 (UTC) X-FDA: 80092332768.07.C158595 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf15.hostedemail.com (Postfix) with ESMTP id EE6CAA000A for ; Thu, 3 Nov 2022 14:17:02 +0000 (UTC) Received: by mail-pl1-f170.google.com with SMTP id v17so2077221plo.1 for ; Thu, 03 Nov 2022 07:17:02 -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=TXM8klCKeS/1DhTbx8K3iCyLUoszcYkLgPKVfT2w3RI=; b=Dj2pPTFC101sAAfrY4zflBUJClmV9LJZxnnCPvVEzazZjXW9x6Iou63wyMzbWWJ89t j7oG7vn2aWB82f9fzyWmPHG63C+CQUm+qwAoUG3K74Fk3xmcvdnvKO4Sp0ycbkbtwPgw JzrIdfcY7mQqqs7S18anyeX4NFJTJnli7LB2jquJ5OItfQTJ45DakgtpHPfWnRHvsNu1 Cr9Mnvcfdfol9a9tH1m/7hBJ7sjSitaRXs0XBuFTZ80eps6WUXOUmeTW5p5KdwfKRcJn kHzY4dj2Gsl7YsbhQno5Uipu6iHZrNsc2ifuvTnubkgmzNCZZn8C3ozR0OLLl1pO4Xqp hC2Q== 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=TXM8klCKeS/1DhTbx8K3iCyLUoszcYkLgPKVfT2w3RI=; b=UYGPqdrYzfloPVJLN7IandBNv6bqj4Uar5TkUY0yvrVqhD8+siKdR/b8eOVTS7HrWn PeRP3tFJVHnTFsp6vSVdXAabCHa7e3G1jazFFbNf9GbXahOsWcFh2Pf3DNjUTv4DIvpS YiT9vD6Y+LZ0UJNcpcweLBPlVuV4fl+tBymY//ZwTG/cynd4wQfST6py+/QuW6fdTw0I 3UnRb+r3slZgGDZrd54EfPDjVPwnN2n9OVliRl0DAIPq9qdrflZL2UWbJJMzyeD41hSe vGHZGCkP0szqSvqUrstju4wMOOfNiTne4cZxpCWr1210JAHW2c6dJAGRWzKMYA2BmtE1 iOrA== X-Gm-Message-State: ACrzQf1juF+c1aSO4jDIDKtumcIb4c6/nUGtPynCgcB3K5UT1YEx49mf Pls7N+bVvI4j1ZLUTsSVMIQ= X-Google-Smtp-Source: AMsMyM5aZCQxn6cjfpIQMj53LX631TQBC0V4f2tlHG5CUeGpwa3qaw2TjwQ+WDAG8nje39/0KAyYqA== X-Received: by 2002:a17:90b:400d:b0:213:be60:b0d2 with SMTP id ie13-20020a17090b400d00b00213be60b0d2mr28215061pjb.75.1667485021870; Thu, 03 Nov 2022 07:17:01 -0700 (PDT) Received: from hyeyoo ([114.29.91.56]) by smtp.gmail.com with ESMTPSA id z8-20020a6553c8000000b0046f6d7dcd1dsm851109pgr.25.2022.11.03.07.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 07:17:01 -0700 (PDT) Date: Thu, 3 Nov 2022 23:16:53 +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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221101223321.1326815-3-keescook@chromium.org> ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Dj2pPTFC; spf=pass (imf15.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667485023; a=rsa-sha256; cv=none; b=icxT3yfHnJdEZxjKF7rqNSLW4Jp+TVmA4xPJqRqJYTUDP1xFW49kRlB3rrEuNhNWVCygBr l97n9kor853GVjDE+qyx5F1irdu2Cjkaq06uzTWTa/2/jwSd61qhtAIBFZFEYK0K/FX7n8 dtP4OeUex9ZoqJy4pD9BushXQz9F/Uw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667485023; 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=TXM8klCKeS/1DhTbx8K3iCyLUoszcYkLgPKVfT2w3RI=; b=2IkHo0kV69vLIVBeroErY9N1hZ9YrPfAibdBGDID+aEn2tm1jRVKS/c0cWWdp5Rt+Q+qQ5 uqbTrKlM0iCUeTKynIjiTipiiqnVkgGRwW46jKmONR/YC7+WdvO27QjzJEnBzXrlDc0kzf iOLUCbkWH+9ej6GnpU2anmpeC8KPsbQ= X-Stat-Signature: kgjmgwsx8ptcy398msyutpyjznfizknr X-Rspamd-Queue-Id: EE6CAA000A Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Dj2pPTFC; spf=pass (imf15.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam03 X-Rspam-User: X-HE-Tag: 1667485022-414322 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 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. Thanks! > /* Tracepoints definitions. */ > EXPORT_TRACEPOINT_SYMBOL(kmalloc); > EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc); > -- > 2.34.1 > -- Hyeonggon