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 9E053EE499C for ; Wed, 11 Sep 2024 18:04:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2EB34940085; Wed, 11 Sep 2024 14:04:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2738B940066; Wed, 11 Sep 2024 14:04:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C6F7940085; Wed, 11 Sep 2024 14:04:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DD5D2940066 for ; Wed, 11 Sep 2024 14:04:07 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5199781754 for ; Wed, 11 Sep 2024 18:04:07 +0000 (UTC) X-FDA: 82553231334.06.F438C8F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 2FD51180005 for ; Wed, 11 Sep 2024 18:04:03 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bDFWnCCv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.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=1726077839; a=rsa-sha256; cv=none; b=d3Btz+mYN5STgxgt71NHH90x9UabkqI2q8T826gHTmFOgC7nDnKXYpByPu9/fOdhI2fsQB 1WKhz0e4tqz4Tbraje16PYlz8uH9ZSsue3XeUdzL0y6H/aw7WQpsn4uoSTRjZwN3+ijnT2 qCgJjPaHXDfbdrSh/qAkTzATr1fYNH8= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bDFWnCCv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.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=1726077839; 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=IH+Ib1b5pn8WaOZaeFGsrZvEitMV86mg5/DLE/udy2g=; b=w6kqx+PaZwHpkWlJOu+5psuXM+/jZ1rJjHQP0fmOYJhUjnqsO0UoIIDt1umlFTg0wiyXJO f6XciMW6g6kS7UaXAdCM5DaKHmANqe6uM6OorokdV3QoS6lLoFap99y1yZfgZgR+3Uzh7E q5QQs002XXpZ2dLZrgzGZzrQFH70+LA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726077843; 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=IH+Ib1b5pn8WaOZaeFGsrZvEitMV86mg5/DLE/udy2g=; b=bDFWnCCvvB60JQIRd+w42qxJQafJJc+vmo8olrGucJc1mjdLWnW7ymL8y5l5ign2jf3yGq E6VQOoyHCQgCVQVEAfHyREat8MCx5MXy4jqB5nmgBajJ6FS3IWZCDP5ELKXWAFVQYaaA4m 3b47tpxqH0POARh6rIyEtUhQ85i8WO4= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-672-mOgafYUdOViRMTNkUbJixA-1; Wed, 11 Sep 2024 14:04:02 -0400 X-MC-Unique: mOgafYUdOViRMTNkUbJixA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a8a84b60255so6189866b.1 for ; Wed, 11 Sep 2024 11:04:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726077841; x=1726682641; 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=IH+Ib1b5pn8WaOZaeFGsrZvEitMV86mg5/DLE/udy2g=; b=BrID7jSnO0I4Q6e7X1DYVHtj3doBqMicBOOBeGGqGQ0Mp0KFd+YYsEZLAAPzUj4NZ2 p8AvLGtPkv0AbJHqDwtfq6GKf5xGo7qjlSv93r+35aYrwVLlNBjTqG1elTycaRE35VEK 4OWruVUwzHtooivDrsDL3bQvhEZD5ZkDs9ULjehSkrGTOuFsC9lRpCizIuM3AEgCbxqT 2iKURkhQhEuPlZZaMJ326H3r/4Sf6iJ7+1GXvjhlXWXdmnjHejatQ2a/jWVGzUJ/H1H9 HHeYz/IUNvqsX7cksJZUJ6WiOjCLOR4C+ME1B+Vaxg/TyaHv587AlpxxJSuDvDx/HD2M E7EA== X-Forwarded-Encrypted: i=1; AJvYcCXa7ghLuA5COaE9nhIyrX+cbPQvLJCOdOcLSDIx6C6ionSupyv9gKhXZNEtrkdI3tggH+vXA9+oFg==@kvack.org X-Gm-Message-State: AOJu0Yy+JCBDcgHghlcwhaTw00O+NtfBzjbcaaRus5jgzgNIvP7QweHa RrL9U6NLxFAah38NIxxvkPC0aKHYcwLS1Ku6OJ7Mi4DmEYMuPmft5DnkAUG51uiinCKQdXphzYv 8nHkvCQdtvz5GWOaUaa8GdldsZnO+IfrnbnBqTSPf/CPS7jYd X-Received: by 2002:a17:907:3e1d:b0:a83:8591:7505 with SMTP id a640c23a62f3a-a902966f459mr27778366b.59.1726077840912; Wed, 11 Sep 2024 11:04:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEGiOUHQziAMSw1ySVvdKoiB3VewkXKRFTMsAed1ndUNhLmUSoKhACnYsZh/d6DuW5PXkj6CQ== X-Received: by 2002:a17:907:3e1d:b0:a83:8591:7505 with SMTP id a640c23a62f3a-a902966f459mr27774766b.59.1726077840333; Wed, 11 Sep 2024 11:04:00 -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-a8d25a079bcsm638970366b.83.2024.09.11.11.03.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 11 Sep 2024 11:03:59 -0700 (PDT) Message-ID: Date: Wed, 11 Sep 2024 20:03:58 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH hotfix 6.11 v2 3/3] minmax: reduce min/max macro expansion in atomisp driver 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, Andrew Lunn , Dan Carpenter , stable@vger.kernel.org References: From: Hans de Goede In-Reply-To: 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-Rspam-User: X-Stat-Signature: pptnsk459me77a4oahwiaajjdrt61ujg X-Rspamd-Queue-Id: 2FD51180005 X-Rspamd-Server: rspam02 X-HE-Tag: 1726077843-232590 X-HE-Meta: U2FsdGVkX18StAnNFRaqKkUtJ5jXrNx+LhDmrhdMCZP73xy8hEGyaCouocYsccMVX8AMdfmUd4os5gjRotgK3ufYAMCk0VGyea64NVoOSkOUcxq9Fxqp/tc8MhqIlTF+yTG95a94rorVI4RBeSVBELABXy6gwfpnITPoMErRjMVxAHGidqDymmTkfXd9IrDB88jq7Efyn6XVioYcWtSv985XyYOV7aR8X4lYxkbKxYm3vWMkAbqnr4+nfLzOBMjpeWvYZWPnjHURL7FbS+7xw4sZuweLoTUruvyKQ7UQzDQZSutUm9wn5EAuYSxS19lP8rJXHTf1scg0omQCy+/6ryOH/nBobK9c90rSvM8T7x6zWCQN52G6HZA1xoJNkY2lVP0DATdNzWcyk67Ksk1T5DoQ4yjNgLsW0veth8f1X6omAf3ZnJ/YPM56SE1+A8aVhZs1sAsLbwhtwlICXondOtHppmoR6YrugKEMAKSPSScwj5c2jDuDzqtnvgDQGDJWqmNHSw8stNn9MMxZBREDCMslYoUzk0tyhRu97JH0wcjLZhkcNlh0EfoByR9yaJj7R1K1JVGDllhD+F2mNrMKZJCdl8/En4u432eWK1odf3NsduhTZYP4/mCiyaU2oNjgOdPhJL3J25EapD4prUepN1f6u/JS1t4SDXGxtETBqBrcJ1maT7wrFNzchyDL+wz1JC4KCYhwfLY+LxX1z/R1AaJDnYtqUlYWFkDIcK6ZBe+MLSe/4R9aPJkkquhKZgEafL60FHAFunApvWKOK5xRFI+Qjm41ueQeBUqhPCzRUMGAa/u1pCpArV/idBQFQo5luie+Nx0w7kqmgUKhXYXQp4DNl+qxTdnCi46RoUIj0Eh0CU3QFidVZCxsammr1DXNqU9pw/q8wrhf6u2kCptcUJDl/Sy3J9JP8zdX6n/VOWY3cRGW2lIMHwOWbT+hZY0+M3+t+ts8ErDybfdknki MFFcccqz WcbsTcbRoXp/CFKeT9utLu6u9tTe3IxrkWIu9UjALz63uB559ThBmtasXYiai9yOeYjoXbyr23aCTkNlchsHxW49e+ozjklIcNVxyon2ty5PgRcJh+UXDbx708idy4hWUVlz2RDx3Fo1/DC2v7evVwpo+msxZBHmVDeMDfElBl8lQ+2M+rGCB9QbfGqVfuf1tI9UEXYsPaXaVxrsDuR5TrU0RnmMt56BAwZtkIy10TnU7EmWfesSCFCBpPNpG+q47GdBFJ2XnVJHSDHwtUoEH95E7DRbPXZOC0mfdenAtN2QO9qLRz8StPNKUOh2WqNDFjtkNmH2jucXRFSpWEy03uf1KfcUHx2YdIVNkUWGudc5zZARmjamjECowerOQuPhoS0RmDQEKEx1RZXzGM/lyaCxwsJjDM3OV5U+Y5mJkfuQLG0v5S5KQuGm4UELehXmp/uF53OryKxKS7Tn/ka0wF44KppL/PThuCrC3Ac4ZKXQIE8q98rFskURf5i9il/tAs7NsHdg5PPNV0+kMT0ZcIHQz7lmoBTmrDa8/PjYIe1GjUn1t+XQArvs2mg== 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 7:51 PM, Lorenzo Stoakes wrote: > Avoid unnecessary nested min()/max() which results in egregious macro > expansion. Use clamp_t() as this introduces the least possible expansion. > > Not doing so results in an impact on build times. > > 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. > > 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 Thanks, patch looks good to me: Reviewed-by: Hans de Goede Regards, Hans > --- > .../staging/media/atomisp/pci/sh_css_frac.h | 26 ++++++++++++++----- > 1 file changed, 19 insertions(+), 7 deletions(-) > > diff --git a/drivers/staging/media/atomisp/pci/sh_css_frac.h b/drivers/staging/media/atomisp/pci/sh_css_frac.h > index b90b5b330dfa..8ba65161f7a9 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(int v, int a, int b) > +{ > + 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); > +} > > #endif /* __SH_CSS_FRAC_H */ > -- > 2.46.0 >