kernel/range: Uplevel the cxl subsystem's range_contains() helper

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@chromium.org>
Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Gregory Price <gregory.price@memverge.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Tested-by: Fan Ni <fan.ni@samsung.com>
Link: https://lore.kernel.org/r/167601998163.1924368.6067392174077323935.stgit@dwillia2-xfh.jf.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams
2023-02-10 01:06:21 -08:00
parent 9995576cef
commit 93c177fd6f
3 changed files with 8 additions and 8 deletions

View File

@@ -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); 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 */ /* require dvsec ranges to be covered by a locked platform window */
static int dvsec_range_allowed(struct device *dev, void *arg) static int dvsec_range_allowed(struct device *dev, void *arg)
{ {

View File

@@ -13,6 +13,11 @@ static inline u64 range_len(const struct range *range)
return range->end - range->start + 1; 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, int add_range(struct range *range, int az, int nr_range,
u64 start, u64 end); u64 start, u64 end);

View File

@@ -31,8 +31,8 @@ static volatile u8 forced_mask = 0xff;
static void *fill_start, *target_start; static void *fill_start, *target_start;
static size_t fill_size, target_size; static size_t fill_size, target_size;
static bool range_contains(char *haystack_start, size_t haystack_size, static bool stackinit_range_contains(char *haystack_start, size_t haystack_size,
char *needle_start, size_t needle_size) char *needle_start, size_t needle_size)
{ {
if (needle_start >= haystack_start && if (needle_start >= haystack_start &&
needle_start + needle_size <= haystack_start + haystack_size) 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. */ \ /* Validate that compiler lined up fill and target. */ \
KUNIT_ASSERT_TRUE_MSG(test, \ KUNIT_ASSERT_TRUE_MSG(test, \
range_contains(fill_start, fill_size, \ stackinit_range_contains(fill_start, fill_size, \
target_start, target_size), \ target_start, target_size), \
"stack fill missed target!? " \ "stack fill missed target!? " \
"(fill %zu wide, target offset by %d)\n", \ "(fill %zu wide, target offset by %d)\n", \