tools/testing/scatterlist: Fix test to compile and run
PATCH 1/1 tools/testing/scatterlist: Fix test to compile and run
From: Maor Gottlieb <[email protected]>
Add missing define of ALIGN_DOWN to make the test build and run. In addition, __sg_alloc_table_from_pages now support unaligned maximum segment, so adapt the test result accordingly.
Fixes 07da1223ec93 ("lib/scatterlist: Add support in dynamic allocation of SG table from pages")
Signed-off-by Maor Gottlieb <[email protected]>
Signed-off-by Leon Romanovsky <[email protected]>
--- tools/testing/scatterlist/linux/mm.h | 1 + tools/testing/scatterlist/main.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
tools/testing/scatterlist/linux/mm.h +1 -0
@@ -33,6 +33,7 @@ typedef unsigned long dma_addr_t;#define __ALIGN_KERNEL (x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)#define __ALIGN_KERNEL_MASK (x, mask) (((x) + (mask)) & ~(mask))#define ALIGN (x, a) __ALIGN_KERNEL((x), (a)) +#define ALIGN_DOWN (x, a) __ALIGN_KERNEL((x) - ((a) - 1), (a))#define PAGE_ALIGN (addr) ALIGN(addr, PAGE_SIZE)
tools/testing/scatterlist/main.c +2 -2
@@ -52,9 +52,9 @@ int main(void) {const unsigned int sgmax =SCATTERLIST_MAX_SEGMENT ;struct test *test, tests[] = { - { -EINVAL ,1 ,pfn (0 ),PAGE_SIZE ,PAGE_SIZE +1 ,1 }, { -EINVAL ,1 ,pfn (0 ),PAGE_SIZE ,0 ,1 }, - { -EINVAL ,1 ,pfn (0 ),PAGE_SIZE , sgmax +1 ,1 }, + {0 ,1 ,pfn (0 ),PAGE_SIZE ,PAGE_SIZE +1 ,1 }, + {0 ,1 ,pfn (0 ),PAGE_SIZE , sgmax +1 ,1 }, {0 ,1 ,pfn (0 ),PAGE_SIZE , sgmax,1 }, {0 ,1 ,pfn (0 ),1 , sgmax,1 }, {0 ,2 ,pfn (0 ,1 ),2 *PAGE_SIZE , sgmax,1 },
--
2.28.0
Quoted 6 lines · Leon Romanovsky
From: Maor Gottlieb <[email protected]>
Add missing define of
ALIGN_DOWNto make the test build and run. In addition,__sg_alloc_table_from_pagesnow support unaligned maximum segment, so adapt the test result accordingly.
Quoted 7 lines
Fixes 07da1223ec93 ("lib/scatterlist: Add support in dynamic allocation of SG table from pages")Signed-off-by Maor Gottlieb <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>--- tools/testing/scatterlist/linux/mm.h | 1 + tools/testing/scatterlist/main.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
Applied to for-rc, thanks
Jason