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 319A4C433FE for ; Fri, 18 Nov 2022 11:29:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 877DC8E0001; Fri, 18 Nov 2022 06:29:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 827F76B0072; Fri, 18 Nov 2022 06:29:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EF778E0001; Fri, 18 Nov 2022 06:29:17 -0500 (EST) 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 5F1196B0071 for ; Fri, 18 Nov 2022 06:29:17 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 3038DA12D6 for ; Fri, 18 Nov 2022 11:29:17 +0000 (UTC) X-FDA: 80146341954.21.58DC062 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf29.hostedemail.com (Postfix) with ESMTP id CEC13120011 for ; Fri, 18 Nov 2022 11:29:15 +0000 (UTC) Received: by mail-pj1-f42.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so8036320pjs.4 for ; Fri, 18 Nov 2022 03:29:15 -0800 (PST) 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=c6pa+0i/2gW0CZzxA4RT9DmS5V0eY1vqhUMm1tY+xHk=; b=W4rtUd3eoC1VUscW3kwcMKIkY/VkxFLjhZVPX/KGdSZd+FgtiMNU7qkYplQPT+11Pf RGdFyMXj6V5ypIkOxZPWq61sTZlPnNLl3PKu50X/+2InRbcjETZbGg0LT6dmibMpR5Qj dnr7UfrJk2fTY7XmIqWyHCZYVp4kFZeW+P7oNKhzBqgwJBawzuO01O6KgGoHJMoSFF3T HdOW00SLudrOrld6I0J2niFcBJDxvXVfueRIQHW3ulAJql8Uoc8FcQxTjONl83I3F7lK LsG/rlisIOShHkw8P0FxxFtbY9A952iZGb5OD3pGWcif7LghFBNQGAlcyM+aBYHvTwu2 fy7A== 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=c6pa+0i/2gW0CZzxA4RT9DmS5V0eY1vqhUMm1tY+xHk=; b=KsDQFe/flLnGyqIJXIYfZX6IEyoBW7Fz3hCuEvJ3ogr/538ihQJPBpM/o5vvYWF5UQ DztI7+8Dl3i7BZhwaEkMtnG90GYbnEmZVUVbysH4AvCYJrftwU39gQqJzjhIAsINHxd8 10fQBVTVVM/MBfsJM4DTdvWSA3V4ydzVcbj6cBFgHQv12nTFOWqjSi5JC0fYyI70Lzy4 JAV+Mpg9f+2HGKSKvhX0CKVnNo4/PxGTUmtGVAMEMjbK+gZxW44yPb5CYxdBOe8PqTeK e0zq1T7HvcpUCiAdvX5qA4hmcsdkgZ8C7mnS/5919sGozlCis//ifU/RiwkmyJvKQAvH 2ujg== X-Gm-Message-State: ANoB5pn38LSl8lwy0uYFQLBBBMybNsRTCAAxTnXB72Qmw/JQkTTNJudv x+bMDmPNTxc1OHcNrFqfwbY= X-Google-Smtp-Source: AA0mqf78hu8u0LtNBUUNRLEiEQqHEpYKlWC5OU0vCGq6wlyjoqxy+zKllm3Jn1VAuDnPQfKHpdhtrg== X-Received: by 2002:a17:90a:9e7:b0:213:68c5:5579 with SMTP id 94-20020a17090a09e700b0021368c55579mr13453872pjo.150.1668770954692; Fri, 18 Nov 2022 03:29:14 -0800 (PST) Received: from hyeyoo ([114.29.91.56]) by smtp.gmail.com with ESMTPSA id l7-20020a170902f68700b0017f756563bcsm3475044plg.47.2022.11.18.03.29.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Nov 2022 03:29:13 -0800 (PST) Date: Fri, 18 Nov 2022 20:29:08 +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, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH v2 1/2] slab: Clean up SLOB vs kmalloc() definition Message-ID: References: <20221118034713.gonna.754-kees@kernel.org> <20221118035200.1269184-1-keescook@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221118035200.1269184-1-keescook@chromium.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668770955; 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=c6pa+0i/2gW0CZzxA4RT9DmS5V0eY1vqhUMm1tY+xHk=; b=dTl6urFJQT4iLKc5mi4rMncUvxp1y7Rx1HwD7C87OTvvi0AG0WS5iD4bF/ZAHvAIrsh4+7 iXW8yDZFj55KDGwfUZ/KVNZ78c7TTogl5Ss/4ipkL/JwFmtjVT4WeGExCnJ0TgN75hs5+F KEHQoPF7IwjrxUQ480iguQXBXePe8go= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=W4rtUd3e; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668770955; a=rsa-sha256; cv=none; b=sMUkXLNVq9r29ovwI5zxH6Xh7HK3S7Fx1H20JMkSGLh33kUGoXdU0N1LuiF3VGJNLEg/So +0sydN5opgW0gBZhUdeo5DOs8nNHxfhrAo6vHSoM4sm5FFxFV79D3Ro+oANJ01arKDgMaf C8kJOSFPpHI4efGeVv/5l7s9pG/Ys1o= X-Rspam-User: X-Stat-Signature: x956qgtwib7qz7uynruz4565q6f1nxsb X-Rspamd-Queue-Id: CEC13120011 Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=W4rtUd3e; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com X-Rspamd-Server: rspam07 X-HE-Tag: 1668770955-899728 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 Thu, Nov 17, 2022 at 07:51:58PM -0800, Kees Cook wrote: > As already done for kmalloc_node(), clean up the #ifdef usage in the > definition of kmalloc() so that the SLOB-only version is an entirely > separate and much more readable function. > > 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 | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/include/linux/slab.h b/include/linux/slab.h > index 1c670c16c737..9033937c758e 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -558,15 +558,15 @@ void *kmalloc_large_node(size_t size, gfp_t flags, int node) __assume_page_align > * Try really hard to succeed the allocation but fail > * eventually. > */ > +#ifndef CONFIG_SLOB > static __always_inline __alloc_size(1) void *kmalloc(size_t size, gfp_t flags) > { > if (__builtin_constant_p(size)) { > -#ifndef CONFIG_SLOB > unsigned int index; > -#endif > + > if (size > KMALLOC_MAX_CACHE_SIZE) > return kmalloc_large(size, flags); > -#ifndef CONFIG_SLOB > + > index = kmalloc_index(size); > > if (!index) > @@ -575,10 +575,18 @@ static __always_inline __alloc_size(1) void *kmalloc(size_t size, gfp_t flags) > return kmalloc_trace( > kmalloc_caches[kmalloc_type(flags)][index], > flags, size); > -#endif > } > return __kmalloc(size, flags); > } > +#else > +static __always_inline __alloc_size(1) void *kmalloc(size_t size, gfp_t flags) > +{ > + if (__builtin_constant_p(size) && size > KMALLOC_MAX_CACHE_SIZE) > + return kmalloc_large(size, flags); > + > + return __kmalloc(size, flags); > +} > +#endif > > #ifndef CONFIG_SLOB > static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node) > -- > 2.34.1 Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> -- Thanks, Hyeonggon