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 13A70EE0206 for ; Wed, 11 Sep 2024 16:44:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8AEC4940070; Wed, 11 Sep 2024 12:44:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 837A4940066; Wed, 11 Sep 2024 12:44:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B186940070; Wed, 11 Sep 2024 12:44:58 -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 E4344940066 for ; Wed, 11 Sep 2024 12:44:51 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8354B410B3 for ; Wed, 11 Sep 2024 16:44:51 +0000 (UTC) X-FDA: 82553031582.14.E52B4D1 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf18.hostedemail.com (Postfix) with ESMTP id 5C07D1C001E for ; Wed, 11 Sep 2024 16:44:49 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fIOi7aSe; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.hostedemail.com: domain of hdegoede@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=hdegoede@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1726073004; a=rsa-sha256; cv=none; b=VZq8XMwyPGmI5HQLx9KIWhi5gADOmi4OI3UCploZ6eGl3jAJrc8t8HeOXoqA5aYXqdV16j hdAUP1MnKo7h+uJAPps2t7sTaSS+2GOKzsb+lD3DtDQ4lb/NbRjx8psLWBNrFFRbbhR3R4 3E1CmE448Qi1TrxGHsZagNgt2GOUUHY= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fIOi7aSe; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.hostedemail.com: domain of hdegoede@redhat.com designates 170.10.133.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=1726073004; 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=KvxdIsxfAzYBcE3ejxiUV1BcDIxlqNJLApqpadVPCTc=; b=FXr9Ct23xsfg0HTrOpl6YxwJ8hIA6S0Y3f3s+vMn11TIJx1DgddDZ0rydky6t7sK1+B3hN V3UN49xrOKVHINk0cqLvSytUuMVK2Q9iRZQss1ZDCpRkdVShDQxfIsTedRv5zCDTcfH8F0 rqpxooaPjI0016HY5d94TvyLsTNRMR0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726073088; 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=KvxdIsxfAzYBcE3ejxiUV1BcDIxlqNJLApqpadVPCTc=; b=fIOi7aSej5iGaXjeLlnIUXgcp7t7lpTM9bcQdeVr3jP2bvLDZGBkBgJ90+eJDgCyhyOXkv woO4h4zACvW21726wt4PpSyWF1h4B3y224OS93hksUmPAgPEDEoWVhL//Aq1TzJ0OIJA2Z xHQL7Rtn4E2tQdK1P1VrhlJVU6oixZA= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-358-Dn9A1xHJNU6sd0k8NwsdgQ-1; Wed, 11 Sep 2024 12:44:47 -0400 X-MC-Unique: Dn9A1xHJNU6sd0k8NwsdgQ-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a8a8d9a2a12so1098966b.3 for ; Wed, 11 Sep 2024 09:44:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726073086; x=1726677886; 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=KvxdIsxfAzYBcE3ejxiUV1BcDIxlqNJLApqpadVPCTc=; b=m3xIATqiKzwz690sFPaDvtP7jpk0ZxCBKaDTbaTZCA38uuf/TE4aXddy/bholnEea1 BuZ7Ez9hLRg+gVMW++y0Co9w+P9DymMdFQnMmkUdcxVF6uxDOAdJHBNnq6q24Lh9qlP0 8yI0uw6Vi3HDNccY0x+SaRqh0OM18U7APWc2NeasDrlQfkT3fkkUAmoRzSG2q+OzCYr/ tLCCELP43eOUj0QHAYNMaLYrFfSAA3BcC4DCiBxNm/RgPYn0FR700PFhtIaBCMezJom1 IFFpar5lU8YD/XmnKsO/eQVh6TqvhZgx1gfsP0ct8VF/6YqXzBISY294tQcK4DFzeTue vNyQ== X-Forwarded-Encrypted: i=1; AJvYcCWb0f52B9SjX+azvE4bVTyWEMP3wnJV1pkyFGCvz9/WbAEuAwcQoksS2MgY9WTo5HNPp68RWVMDLA==@kvack.org X-Gm-Message-State: AOJu0YyTUjr9tRaIpJcVZ0koMqm323nk3DefVTyU8HndgbOH/txRWgWQ oPOK0ItsgOMzq4ozgiVziufhzEcpfiZKVNBXhg3Ifw02f0Qq9b8CbqCUl+GdQja1sT2sJ8VR+3N W5BByVVjSql/+xxbtx+r/XrTM8EOnDHQG7+W5mMKuAy7YFcVxzwGycVOy X-Received: by 2002:a17:906:d7da:b0:a86:812a:d2ca with SMTP id a640c23a62f3a-a9029504e84mr8786266b.25.1726073085911; Wed, 11 Sep 2024 09:44:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFktpKzCa0aKc4C7BgocbZxtL8LJuk2wMgcJlorDEqUL7HtqzMbLcy98KSTxOWnzNfmiPcTLQ== X-Received: by 2002:a17:906:d7da:b0:a86:812a:d2ca with SMTP id a640c23a62f3a-a9029504e84mr8781066b.25.1726073085204; Wed, 11 Sep 2024 09:44:45 -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-a8d25d40e8csm633247166b.196.2024.09.11.09.44.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 11 Sep 2024 09:44:44 -0700 (PDT) Message-ID: <8af6253d-83aa-403a-a383-8fb5f5ee0d78@redhat.com> Date: Wed, 11 Sep 2024 18:44:43 +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 Cc: Andrew Morton , 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> <181dec64-5906-4cdd-bb29-40bc7c02d63e@redhat.com> <3f622e05-9843-4763-9191-c980feb831d2@lucifer.local> From: Hans de Goede In-Reply-To: <3f622e05-9843-4763-9191-c980feb831d2@lucifer.local> 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: 5C07D1C001E X-Stat-Signature: 3d5ifh5mtyiigokucdx9efqp5s9gnecy X-Rspam-User: X-HE-Tag: 1726073089-516998 X-HE-Meta: U2FsdGVkX195kogZ9zZIrdU8pqy5ddyS5yNd9KDepZMsxEhNmpweHS94PfrEprA3p8S7l51h72blxVta28TQrwUfbZviHYtc9bXOm+dzT2AsHLcQ2+02fD35zEyKSElyFIk+FU3wOqhJvkiJzQv8u1EBD/V5Zles7yPwHch0iatJDDnLVBWMm9s3d5iHoaw9VHKpw+sjouOsEkfj7ae79Y1pLKvICUigqPaWgdbWcHRFMhNWqK8BV4DOR/EW701ENZXLTH8lMR9Tvg/4MtaendfxfG6wTZKRaIs40qt86e6SDCXilNpSAoSZNKlBETR9VzLEIAPGSMOMG5MZhugjDdIYRHOstzbfRQPawPCjc7sH0wrIyL9Lidj59nCZjdDpkn+5HMLtYloeFnPhjXqkZYAgRxnmffLlQvj1FCw6WcBj1rBT+kNAIPJPB43XttunVeeZ5FsEsT2QfXBgj30sIqKSkhEACEdu0Ztj94aqwoDemasSqhlXv9BjaTJKyThap3vp74swkhk5ZWZv3dBsSXlpojiL1dsUAmq5uH4kQzIALPUisiagQkIV0u2UjLoqcUXiZN78lKP5/KUbjiQK17cmIyb4K/cVqaFWna8TKlS3xf+KQwBwrG9tFK5px20EQc3fh3O3Kw7XwgfOZjBeaycyEsRGfBtnrlKhi50LCZGb4K3uR5MJZB3gXiNtM1aq8UAKz8kKMqMEucGBh2XLuGbBpVjFmvdhv4qoEViDUpQ8T4yoYcpA4kpvFU7DU6aQeLC9K59o1BI/LQJmOxYqGc8DZ2/il8HmFFQWtlNGCidWOCkqB+qlGteTf6J9QlOswLzlJ16iY7vd+OZQH+oiqYCVn5iHYE5o4SF6/dWuVtLFvnK5gLskCZlyVvW2WsWxY2QIcD9N2oAlKC1OF/6heWvn5cmZuPoYwjo53CeItaD3wA9Avq0cyJyqyk8S0CGyUKgHdhWBWm8G0d9jsYf kOwBn/NQ f0GkGFJv1FMayzljVgt073OsazDjso6onaWIIvR224VIBhA9sgFDRQ5lpt67VsdyypHWDrA7wrHF/db8Rp5hZ7/455XAzaStLOIVIPBZ4Z6JF/qH23ZPh2s85hVKS/G9pNNEgmIC2Prv+A3gBLrg2qfCdDDJqcQRfdtQf0IN88VOpkYm5kO+AKbme33BVUJ0qHlPLqzkelQ0Z6LrU1gjqKs5oNVKRcIlnDikuxQCW1Mj2M6LRkQcptOyZebgsHW1ke9dX6/WydpSjO1C6/dtl6xyfMX/WX+91TB8fIyEMLPfqpzVKd/oIy6yUyPoi+E3Nh9jy4YkrbKquh6sxSoq5mMpVxsEeoB1VE5fq96ntIbal++kateKFnbyqAsZDw29xMzg2LpAEO9rB2N1Qnp4RHQ6VlpcaZMGDnKfrYHX/+sVWBqFCpVrJzsNbrHxrBJhHBPeJfxUoGDnb9fMpNYkXfHiPX61zT1XGqOh0jNL7t5Mk43ANHUSneWpNONiFRAVsRU8+gSudHBGUEPt7f+rlfigXBVaHs77EUHkf3DqfD9CbKog5bnvHh1f7gA== 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, On 9/11/24 6:37 PM, Lorenzo Stoakes wrote: > On Wed, Sep 11, 2024 at 06:24:54PM GMT, Hans de Goede wrote: >> 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. > > Well, I was doing this as a favour to Richard between other work so put > this together quickly, but you're right this is going to be a pain to > backport/revert if issues so absolutely - will do. > > Since this is a hotfix I'm going to risk annoying people and shoot out > a v2 on same day as v1. Sorry in advance. > >> >> 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" > > Yeah I think you're right, it's odd, because it seems that the shift value > and the comments implies that this is a short, but perhaps it's more so > that values are shifted as to obtain 16 bits of precision. > >> >> I think that you can then also replace clamp_t() with clamp() > > The use of clamp_t() is to avoid egregious macro expansion in > clamp(). After the series improving min/max the clamp() is probably > equivalent. But in 5.15 it will likely not be. So this is, in line with the > purpose of this change, I believe necesasry. Ok fair enough. Regards, Hans