On Sun, 05 Feb 2023 17:03:13 -0800
Dan Williams <dan.j.williams@xxxxxxxxx> wrote:
> In support of the CXL subsystem's use of 'struct range' to track decode
> address ranges, add a common range_contains() implementation with
> identical semantics as resource_contains();
>
> The existing 'range_contains()' in lib/stackinit_kunit.c is namespaced
> with a 'stackinit_' prefix.
>
> Cc: Kees Cook <keescook@xxxxxxxxxxxx>
> Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
Seems reasonable.
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> ---
> drivers/cxl/core/pci.c | 5 -----
> include/linux/range.h | 5 +++++
> lib/stackinit_kunit.c | 6 +++---
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c
> index 1d1492440287..9ed2120dbf8a 100644
> --- a/drivers/cxl/core/pci.c
> +++ b/drivers/cxl/core/pci.c
> @@ -214,11 +214,6 @@ static int devm_cxl_enable_mem(struct device *host, struct cxl_dev_state *cxlds)
> return devm_add_action_or_reset(host, clear_mem_enable, cxlds);
> }
>
> -static bool range_contains(struct range *r1, struct range *r2)
> -{
> - return r1->start <= r2->start && r1->end >= r2->end;
> -}
> -
> /* require dvsec ranges to be covered by a locked platform window */
> static int dvsec_range_allowed(struct device *dev, void *arg)
> {
> diff --git a/include/linux/range.h b/include/linux/range.h
> index 274681cc3154..7efb6a9b069b 100644
> --- a/include/linux/range.h
> +++ b/include/linux/range.h
> @@ -13,6 +13,11 @@ static inline u64 range_len(const struct range *range)
> return range->end - range->start + 1;
> }
>
> +static inline bool range_contains(struct range *r1, struct range *r2)
> +{
> + return r1->start <= r2->start && r1->end >= r2->end;
> +}
> +
> int add_range(struct range *range, int az, int nr_range,
> u64 start, u64 end);
>
> diff --git a/lib/stackinit_kunit.c b/lib/stackinit_kunit.c
> index 4591d6cf5e01..05947a2feb93 100644
> --- a/lib/stackinit_kunit.c
> +++ b/lib/stackinit_kunit.c
> @@ -31,8 +31,8 @@ static volatile u8 forced_mask = 0xff;
> static void *fill_start, *target_start;
> static size_t fill_size, target_size;
>
> -static bool range_contains(char *haystack_start, size_t haystack_size,
> - char *needle_start, size_t needle_size)
> +static bool stackinit_range_contains(char *haystack_start, size_t haystack_size,
> + char *needle_start, size_t needle_size)
> {
> if (needle_start >= haystack_start &&
> needle_start + needle_size <= haystack_start + haystack_size)
> @@ -175,7 +175,7 @@ static noinline void test_ ## name (struct kunit *test) \
> \
> /* Validate that compiler lined up fill and target. */ \
> KUNIT_ASSERT_TRUE_MSG(test, \
> - range_contains(fill_start, fill_size, \
> + stackinit_range_contains(fill_start, fill_size, \
> target_start, target_size), \
> "stack fill missed target!? " \
> "(fill %zu wide, target offset by %d)\n", \
>
