Re: [GIT preview] for-6.3/cxl-ram-region

[Dan Williams <dan.j.williams@intel.com>]

Gregory Price wrote:
> On Wed, Jan 25, 2023 at 10:25:42PM -0800, Dan Williams wrote:
> > There are still some sharp edges on this patchset, like the missing
> > device-dax hookup, but it is likely enough to show the direction and
> > unblock other testing. Specifically I want to see how this fares with
> > Greg's recent volatile region provisioning in QEMU.
> > 
> > I am hoping to have those last bits ironed out before the end of the
> > week. Note that this topic branch will rebase so do not base any
> > work beyond proof-of-concept on top of it.
> > 
> > https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git/log/?h=for-6.3/cxl-ram-region
> 
> 
> Testing this out now.  Pulled it on top of the recent DOE updates so
> this build error may be related (or not).  But it does look like it's
> just a naming collision.
> 
> 
> 
> 
> lib/stackinit_kunit.c:34:13: error: conflicting types for ‘range_contains’; have ‘bool(char *, size_t,  char *, size_t)’ {aka ‘_Bool(char *, long unsigned int,  char *, long unsigned int)’}
>    34 | static bool range_contains(char *haystack_start, size_t haystack_size,
>       |             ^~~~~~~~~~~~~~
> In file included from ./arch/x86/include/asm/page.h:21,
>                  from ./arch/x86/include/asm/thread_info.h:12,
>                  from ./include/linux/thread_info.h:60,
>                  from ./arch/x86/include/asm/preempt.h:9,
>                  from ./include/linux/preempt.h:78,
>                  from ./include/linux/spinlock.h:56,
>                  from ./include/linux/kref.h:16,
>                  from ./include/kunit/test.h:21,
>                  from lib/stackinit_kunit.c:14:
> ./include/linux/range.h:16:20: note: previous definition of ‘range_contains’ with type ‘bool(struct range *, struct range *)’ {aka ‘_Bool(struct range *, struct range *)’}
>    16 | static inline bool range_contains(struct range *r1, struct range *r2)
>       |
> 
> 
> Was just going recommend renaming contains to envelops for a quick hack
> to fix the build issue.

I think it would be more appropriate to adjust kunit to a less generic
name since a 'struct range' is a kernel-wide data-structure.

I'll propose this in the patch when I send it out.