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 C40B8EE57C0 for ; Wed, 11 Sep 2024 16:25:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47EB4940062; Wed, 11 Sep 2024 12:25:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 42F8594004F; Wed, 11 Sep 2024 12:25:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F6B8940062; Wed, 11 Sep 2024 12:25:03 -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 0F5D894004F for ; Wed, 11 Sep 2024 12:25:03 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BACBCC1961 for ; Wed, 11 Sep 2024 16:25:02 +0000 (UTC) X-FDA: 82552981644.29.26FBAA4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 8FF1040015 for ; Wed, 11 Sep 2024 16:24:59 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="JsBGly/s"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of hdegoede@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=hdegoede@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1726071815; a=rsa-sha256; cv=none; b=OkLBTqIjOGGj2B2JTDRwib8bWtJinl8eFX9AcOGbfP5Yv0xbUjnon4kwnl83hRuHZiisZq 5RFL0nwN0FJV9MHT7iRAYXa/0Zj+gz9u1CeH1RBA4422vLSr2cVBqOrAtG2lWhxKEcJVML QP/UhSHvGDxP90d03yg9bnc/BDeFJrs= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="JsBGly/s"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of hdegoede@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=hdegoede@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1726071815; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NPuIsJ7LH/NryQa0KHKubTcC5NBQjBwl3HztcdDab5w=; b=8J6h5DlUK3Ab4IWjqeipjwuLfPbTZnkdsXunGlZbtgsuKaUJZuzTpHMjlc9dG1IB2BTLTV 952iFjcwneKVfjui8Wi9twsIhkYRvV4wZzHg2ucPLHFUYAfJFUZHqq9MYgv1Zd11qJlny7 /MuOQqOtYspLx/lhOUBE7KBilvXWHe8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726071898; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NPuIsJ7LH/NryQa0KHKubTcC5NBQjBwl3HztcdDab5w=; b=JsBGly/sa/jNAApO/gyHOID2EsyBEo6MSf/zJbRnJpyjuBUYdRWsyKvF6SVERhzkRHIf4C Ai3L9o2p5+3fbQBcAXAkwZU47pgrn6d52oiMVsuoFxgbDKukBj3q/aEI45E9vg7miPUT99 /c4n1rbq9rFzeYtSNWuAuogCE+KsSpw= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-463-I1iCXEm2N4-eQnQUAxF6YA-1; Wed, 11 Sep 2024 12:24:57 -0400 X-MC-Unique: I1iCXEm2N4-eQnQUAxF6YA-1 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-53661a13121so2365e87.0 for ; Wed, 11 Sep 2024 09:24:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726071896; x=1726676696; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NPuIsJ7LH/NryQa0KHKubTcC5NBQjBwl3HztcdDab5w=; b=li5EGHuLLm3Vs3ulB3c5dmJxiYnttoR6OaISARQE7oYX9iJ8fyoYCRyfCOnrrEL273 DPWGV834zevDlB6/RSsMLOqSdzU6IceFEi/NGv1aHGY6RfA58aQAx4fpJ3fTnnAZ3DU4 fYekozQkIDUThhRz3ryhNyLZsoT9rJV/7rItRZTy8ERq1U/2hppU4HiIg9DTgiggDuT2 2Gij/voOA1LKMZ2DOPdhguKCjxNe1m426u8fa0S9m0GqCBdAchIeczHS7+pXMaJiUOOm E24+Wr5WQqNGw6lxsu5WOcmoDUWgJpOmJetAeS/rRx4WPDXwnwW+9/l1JNHQpXN7k66v uCOw== X-Forwarded-Encrypted: i=1; AJvYcCUqMVrrrD8aVDqN5ccUWPHWv7lCERpmDvv4QV4aO93hbc025gVtCxM0SVZSHO3sXtlCTwoBztk/LQ==@kvack.org X-Gm-Message-State: AOJu0YwC6QD7uh1RzMU/h4rIg4cwXKXmmf53k46TQlDBGQjUV4Oha73p 0ibYVTMOCsf4kzQUB9KECUfbaOXJ5c6RKhQb94DnFxudyymCptS8rzF2u4NhTT685e+4bsTudWv 4D/55RYOxhwjahnHq/l2x3iPT5LuI+uO7aaEU8+M5gr+I8pKf X-Received: by 2002:a05:6512:1283:b0:52c:e0fb:92c0 with SMTP id 2adb3069b0e04-536587c8177mr12892267e87.34.1726071895997; Wed, 11 Sep 2024 09:24:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHG/2rhUxgQSM96b6JP5Itt5QRcGCTl4PERNI00A/LttGPDuJaR7APim2eBySdgsSLLCiwQCw== X-Received: by 2002:a05:6512:1283:b0:52c:e0fb:92c0 with SMTP id 2adb3069b0e04-536587c8177mr12892232e87.34.1726071895341; Wed, 11 Sep 2024 09:24:55 -0700 (PDT) Received: from ?IPV6:2001:1c00:c32:7800:5bfa:a036:83f0:f9ec? (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25d3597asm629355766b.186.2024.09.11.09.24.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 11 Sep 2024 09:24:54 -0700 (PDT) Message-ID: <181dec64-5906-4cdd-bb29-40bc7c02d63e@redhat.com> Date: Wed, 11 Sep 2024 18:24:54 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH hotfix 6.11] minmax: reduce egregious min/max macro expansion To: Lorenzo Stoakes , Andrew Morton Cc: Richard Narron , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman , Marcin Wojtas , Russell King , "David S . Miller" , Arnd Bergmann , Linus Torvalds , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-mm@kvack.org, stable@vger.kernel.org References: <20240911153457.1005227-1-lorenzo.stoakes@oracle.com> From: Hans de Goede In-Reply-To: <20240911153457.1005227-1-lorenzo.stoakes@oracle.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US, nl Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 8FF1040015 X-Stat-Signature: f7ozwjz68f1orias4t77ks6rqjhx6xtb X-Rspam-User: X-HE-Tag: 1726071899-172179 X-HE-Meta: U2FsdGVkX1+eFgbozo3KQuhiM3p1+x/tN2tl9AdzOwyJFv9StoQ42FW5LS55ZeeiKyk8NYBpovvd6aKBzD4pfwsqSzIHpgmnxSPYPpBjARxkUBLd2zQ9O9Q2anfuimXoWMVIgbrTSB6K620oaOGxJdQdOkFUxkrZmixQmHCmWVEs5dybS8Q2js282puuD1jnmNeAtdihPgIm10TKu+igqGmtvtOjum34lMPeVANnwole70WnhfB6Qe5Q4e9dygS59hFXjYyIX/F5jbt7ljR8wRJnT3T+0fmZKbntrSQKK9vqYqFwloaviL1y7FILuUR/a3QIYoh3Feizs6NR8TedLfpoZ3dkUdDmxiJCJTXsRC8KDK1Jm80o17wvXRS8qOabnXBBcwHPmGSSaSBEwsJ/GcJQMOaAOA1dztydj4PNpCQg5IolhgnnAaTsYPaleYXjEPxoC0y/I67AbDJ86wadeYERH0nBZj+SkNXTyYaUcyyGlwNlHsIMncagVW9wAg7SPDsRKHwct7gVjws/LmX+8fvU62o/Bggl2NroMPUIKuXaLxl9rpZHE760XrzJyE0AnHRh14o3rXejn+VBCsW3aCy4+lM/ehVtNGSa/hdl9t7MQ2UDYaAXP+i0DIknS82Q88QvamagZ+DyxTUjcKISWGzqrRaeAXYZLzS0SmdzZJFpih2/U6VW3i5M2NUlcLsQvLaPyM5XT5YKt8wvALnak9hk+45i6fQGmSzoJweLmRWS/bIO3qKYwmeHEBFiEHp6na4tfAj9LfT6F+4v7pXNBXcGqwA1mBnWiCKrlomrWVNO3tR/S5PvhB/IEUH0SwqEUQhuhsBZI47cNIWrzO11XHmIK7RpdR6QckDI/4u+xO17mf0HQp2nLnXeocDMeeImjjfIyQ6TUx5kZH8e0BwRAfydVMH6P/AyXlsnLts2Cm2OR/GUyRnxxsv3Q2E/TBZdFWv1FDMz+KR4ArrubNj T3Vf7s8/ YoScjO+yxO1P6oiG2u3LXAI+yRqK/bSxk5VaJrt35Sg3nBQjS2AOuRv52W2Xmyazmgpq4HjQjB0zmTXA4wthSwEmWhRb1JRhbjx2sJoHpJm6sYoGi8CAv5PIzUHlui3FUkJ1O2iNIau7sTlkZT7+S/njJGHK4uCSMzFVgO7URaT5priQ0qOxYK/IihOD+zB5GP5LuaMmBOQD2XYLE4qfugGb0wWxMxzfAYuMB83qDByManpaaQrSuFGb27by5HqmcfoFp0eAcxgSMuVyJhPLz/LMRl9Pi583Cz2h972XrIp4DtdCFZI3PN7nOO13z9LmGqSBx/I7Oca8Y3qEr4FL/0BJrDTQ9EC/UQAAz8AAb48iur/Psz3gneCYWP5N3DyhRs6uSBslnze4+I0X7bvrIpbAk+jFAIZaDeFEegmsT8Zn9COpiIBUylSeTYuCtf/qnGRC7OOSnWAh2g65GF3BoKZet+UzVkfyQ4naII5jFMvQ7XYzMiPnPMwVRDgtWmm4k7v8reQhQdFEgUWCg5viS5jvAXvPWjL1D+Q8rw0MwqU4wiqSKwo6VwaEAgJAxThH3I9svTfzUHb0bmiB7R3Bfpz25vQJinX9g2A0I 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: Hi Lorenzo, On 9/11/24 5:34 PM, Lorenzo Stoakes wrote: > Avoid nested min()/max() which results in egregious macro expansion. > > This issue was introduced by commit 867046cc7027 ("minmax: relax check to > allow comparison between unsigned arguments and signed constants") [2]. > > Work has been done to address the issue of egregious min()/max() macro > expansion in commit 22f546873149 ("minmax: improve macro expansion and type > checking") and related, however it appears that some issues remain on more > tightly constrained systems. > > Adjust a few known-bad cases of deeply nested macros to avoid doing so to > mitigate this. Porting the patch first proposed in [1] to Linus's tree. > > Running an allmodconfig build using the methodology described in [2] we > observe a 35 MiB reduction in generated code. > > The difference is much more significant prior to recent minmax fixes which > were not backported. As per [1] prior these the reduction is more like 200 > MiB. > > This resolves an issue with slackware 15.0 32-bit compilation as reported > by Richard Narron. > > Presumably the min/max fixups would be difficult to backport, this patch > should be easier and fix's Richard's problem in 5.15. > > [0]:https://lore.kernel.org/all/b97faef60ad24922b530241c5d7c933c@AcuMS.aculab.com/ > [1]:https://lore.kernel.org/lkml/5882b96e-1287-4390-8174-3316d39038ef@lucifer.local/ > [2]:https://lore.kernel.org/linux-mm/36aa2cad-1db1-4abf-8dd2-fb20484aabc3@lucifer.local/ > > Reported-by: Richard Narron > Closes: https://lore.kernel.org/all/4a5321bd-b1f-1832-f0c-cea8694dc5aa@aaazen.com/ > Fixes: 867046cc7027 ("minmax: relax check to allow comparison between unsigned arguments and signed constants") > Cc: stable@vger.kernel.org > Signed-off-by: Lorenzo Stoakes Thank you for your patch. I must say that I'm not a fan of that this is patching 3 totally unrelated files here in a single patch. This is e.g. going to be a problem if we need to revert one of the changes because of regressions... So I would prefer this to be split into 3 patches. One review comment for the atomisp bits inline / below. > --- > drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 2 +- > .../staging/media/atomisp/pci/sh_css_frac.h | 26 ++++++++++++++----- > include/linux/skbuff.h | 6 ++++- > 3 files changed, 25 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h > index e809f91c08fb..8b431f90efc3 100644 > --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h > +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h > @@ -23,7 +23,7 @@ > /* The PacketOffset field is measured in units of 32 bytes and is 3 bits wide, > * so the maximum offset is 7 * 32 = 224 > */ > -#define MVPP2_SKB_HEADROOM min(max(XDP_PACKET_HEADROOM, NET_SKB_PAD), 224) > +#define MVPP2_SKB_HEADROOM clamp_t(int, XDP_PACKET_HEADROOM, NET_SKB_PAD, 224) > > #define MVPP2_XDP_PASS 0 > #define MVPP2_XDP_DROPPED BIT(0) > diff --git a/drivers/staging/media/atomisp/pci/sh_css_frac.h b/drivers/staging/media/atomisp/pci/sh_css_frac.h > index b90b5b330dfa..a973394c5bc0 100644 > --- a/drivers/staging/media/atomisp/pci/sh_css_frac.h > +++ b/drivers/staging/media/atomisp/pci/sh_css_frac.h > @@ -32,12 +32,24 @@ > #define uISP_VAL_MAX ((unsigned int)((1 << uISP_REG_BIT) - 1)) > > /* a:fraction bits for 16bit precision, b:fraction bits for ISP precision */ > -#define sDIGIT_FITTING(v, a, b) \ > - min_t(int, max_t(int, (((v) >> sSHIFT) >> max(sFRACTION_BITS_FITTING(a) - (b), 0)), \ > - sISP_VAL_MIN), sISP_VAL_MAX) > -#define uDIGIT_FITTING(v, a, b) \ > - min((unsigned int)max((unsigned)(((v) >> uSHIFT) \ > - >> max((int)(uFRACTION_BITS_FITTING(a) - (b)), 0)), \ > - uISP_VAL_MIN), uISP_VAL_MAX) > +static inline int sDIGIT_FITTING(short v, int a, int b) > +{ drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c calls this with ia_css_3a_config.af_fir1_coef / .af_fir2_coef as first argument those are of the ia_css_s0_15 type which is: /* Signed fixed point value, 0 integer bits, 15 fractional bits */ typedef s32 ia_css_s0_15; please replace the "short v" with "int v" I think that you can then also replace clamp_t() with clamp() > + int fit_shift = sFRACTION_BITS_FITTING(a) - b; > + > + v >>= sSHIFT; > + v >>= fit_shift > 0 ? fit_shift : 0; > + > + return clamp_t(int, v, sISP_VAL_MIN, sISP_VAL_MAX); > +} > + > +static inline unsigned int uDIGIT_FITTING(unsigned int v, int a, int b) > +{ > + int fit_shift = uFRACTION_BITS_FITTING(a) - b; > + > + v >>= uSHIFT; > + v >>= fit_shift > 0 ? fit_shift : 0; > + > + return clamp_t(unsigned int, v, uISP_VAL_MIN, uISP_VAL_MAX); > +} Regular clamp() should work here ? all parameters are already unsigned ints. Regards, Hans > > #endif /* __SH_CSS_FRAC_H */ > diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h > index 29c3ea5b6e93..d53b296df504 100644 > --- a/include/linux/skbuff.h > +++ b/include/linux/skbuff.h > @@ -3164,7 +3164,11 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len) > * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) > */ > #ifndef NET_SKB_PAD > -#define NET_SKB_PAD max(32, L1_CACHE_BYTES) > +#if L1_CACHE_BYTES < 32 > +#define NET_SKB_PAD 32 > +#else > +#define NET_SKB_PAD L1_CACHE_BYTES > +#endif > #endif > > int ___pskb_trim(struct sk_buff *skb, unsigned int len); > -- > 2.46.0 >