Re: FAILED: Patch "bounds: support non-power-of-two CONFIG_NR_CPUS" failed to apply to 5.4-stable tree

[Matthew Wilcox]

On Fri, Mar 29, 2024 at 06:05:20PM +0100, Greg KH wrote:
> On Fri, Mar 29, 2024 at 02:34:43PM +0100, Greg KH wrote:
> > On Wed, Mar 27, 2024 at 02:10:10PM +0000, Matthew Wilcox wrote:
> > > On Wed, Mar 27, 2024 at 08:21:25AM -0400, Sasha Levin wrote:
> > > > The patch below does not apply to the 5.4-stable tree.
> > > > If someone wants it applied there, or to any other stable or longterm
> > > > tree, then please email the backport, including the original git commit
> > > > id to <stable@xxxxxxxxxxxxxxx>.
> > > 
> > > Looks like you just need a little more fuzz on the patch.
> > > 
> > > diff --git a/kernel/bounds.c b/kernel/bounds.c
> > > index 9795d75b09b2..a94e3769347e 100644
> > > --- a/kernel/bounds.c
> > > +++ b/kernel/bounds.c
> > > @@ -19,7 +19,7 @@ int main(void)
> > >  	DEFINE(NR_PAGEFLAGS, __NR_PAGEFLAGS);
> > >  	DEFINE(MAX_NR_ZONES, __MAX_NR_ZONES);
> > >  #ifdef CONFIG_SMP
> > > -	DEFINE(NR_CPUS_BITS, ilog2(CONFIG_NR_CPUS));
> > > +	DEFINE(NR_CPUS_BITS, bits_per(CONFIG_NR_CPUS));
> > >  #endif
> > >  	DEFINE(SPINLOCK_SIZE, sizeof(spinlock_t));
> > >  	/* End of constants */
> > 
> > Now fuzzed, thanks.
> 
> But it breaks the build on 4.19.y, so I'll go drop it from there.  If
> you want it added there, please provide a working fix.

Looks like bits_per() didn't exist in 4.19.  It was added as part of commit 69842cba9ace84849bb9b8edcdf2cefccd97901c
Author: Patrick Bellasi <patrick.bellasi@xxxxxxx>
Date:   Fri Jun 21 09:42:02 2019 +0100

    sched/uclamp: Add CPU's clamp buckets refcounting

Up to you; I can provide bits_per() to 4.19 which will aid backporting
other fixes (we currently have 17 uses of bits_per() in 6.9), or we can
just drop this whole thing for 4.19.