tools/testing/scatterlist: Test dynamic __sg_alloc_table_from_pages
PATCH 1/1 tools/testing/scatterlist: Test dynamic __sg_alloc_table_from_pages
From: Maor Gottlieb <[email protected]>
Add few cases to test the dynamic allocation flow of __sg_alloc_table_from_pages.
Signed-off-by Maor Gottlieb <[email protected]>
Signed-off-by Leon Romanovsky <[email protected]>
--- tools/testing/scatterlist/main.c | 64 ++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 23 deletions(-)
tools/testing/scatterlist/main.c +41 -23
@@ -9,6 +9,7 @@ struct test {int alloc_ret;unsigned num_pages;unsigned *pfn; +unsigned *pfn_app;unsigned size;unsigned int max_seg;unsigned int expected_segments;
@@ -52,31 +53,39 @@ int main(void) {const unsigned int sgmax =SCATTERLIST_MAX_SEGMENT ;struct test *test, tests[] = { - { -EINVAL ,1 ,pfn (0 ),PAGE_SIZE ,0 ,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 }, - {0 ,2 ,pfn (1 ,0 ),2 *PAGE_SIZE , sgmax,2 }, - {0 ,3 ,pfn (0 ,1 ,2 ),3 *PAGE_SIZE , sgmax,1 }, - {0 ,3 ,pfn (0 ,2 ,1 ),3 *PAGE_SIZE , sgmax,3 }, - {0 ,3 ,pfn (0 ,1 ,3 ),3 *PAGE_SIZE , sgmax,2 }, - {0 ,3 ,pfn (1 ,2 ,4 ),3 *PAGE_SIZE , sgmax,2 }, - {0 ,3 ,pfn (1 ,3 ,4 ),3 *PAGE_SIZE , sgmax,2 }, - {0 ,4 ,pfn (0 ,1 ,3 ,4 ),4 *PAGE_SIZE , sgmax,2 }, - {0 ,5 ,pfn (0 ,1 ,3 ,4 ,5 ),5 *PAGE_SIZE , sgmax,2 }, - {0 ,5 ,pfn (0 ,1 ,3 ,4 ,6 ),5 *PAGE_SIZE , sgmax,3 }, - {0 ,5 ,pfn (0 ,1 ,2 ,3 ,4 ),5 *PAGE_SIZE , sgmax,1 }, - {0 ,5 ,pfn (0 ,1 ,2 ,3 ,4 ),5 *PAGE_SIZE ,2 *PAGE_SIZE ,3 }, - {0 ,6 ,pfn (0 ,1 ,2 ,3 ,4 ,5 ),6 *PAGE_SIZE ,2 *PAGE_SIZE ,3 }, - {0 ,6 ,pfn (0 ,2 ,3 ,4 ,5 ,6 ),6 *PAGE_SIZE ,2 *PAGE_SIZE ,4 }, - {0 ,6 ,pfn (0 ,1 ,3 ,4 ,5 ,6 ),6 *PAGE_SIZE ,2 *PAGE_SIZE ,3 }, - {0 ,0 ,NULL ,0 ,0 ,0 }, + { -EINVAL ,1 ,pfn (0 ),NULL ,PAGE_SIZE ,0 ,1 }, + {0 ,1 ,pfn (0 ),NULL ,PAGE_SIZE ,PAGE_SIZE +1 ,1 }, + {0 ,1 ,pfn (0 ),NULL ,PAGE_SIZE , sgmax +1 ,1 }, + {0 ,1 ,pfn (0 ),NULL ,PAGE_SIZE , sgmax,1 }, + {0 ,1 ,pfn (0 ),NULL ,1 , sgmax,1 }, + {0 ,2 ,pfn (0 ,1 ),NULL ,2 *PAGE_SIZE , sgmax,1 }, + {0 ,2 ,pfn (1 ,0 ),NULL ,2 *PAGE_SIZE , sgmax,2 }, + {0 ,3 ,pfn (0 ,1 ,2 ),NULL ,3 *PAGE_SIZE , sgmax,1 }, + {0 ,3 ,pfn (0 ,1 ,2 ),NULL ,3 *PAGE_SIZE , sgmax,1 }, + {0 ,3 ,pfn (0 ,1 ,2 ),pfn (3 ,4 ,5 ),3 *PAGE_SIZE , sgmax,1 }, + {0 ,3 ,pfn (0 ,1 ,2 ),pfn (4 ,5 ,6 ),3 *PAGE_SIZE , sgmax,2 }, + {0 ,3 ,pfn (0 ,2 ,1 ),NULL ,3 *PAGE_SIZE , sgmax,3 }, + {0 ,3 ,pfn (0 ,1 ,3 ),NULL ,3 *PAGE_SIZE , sgmax,2 }, + {0 ,3 ,pfn (1 ,2 ,4 ),NULL ,3 *PAGE_SIZE , sgmax,2 }, + {0 ,3 ,pfn (1 ,3 ,4 ),NULL ,3 *PAGE_SIZE , sgmax,2 }, + {0 ,4 ,pfn (0 ,1 ,3 ,4 ),NULL ,4 *PAGE_SIZE , sgmax,2 }, + {0 ,5 ,pfn (0 ,1 ,3 ,4 ,5 ),NULL ,5 *PAGE_SIZE , sgmax,2 }, + {0 ,5 ,pfn (0 ,1 ,3 ,4 ,6 ),NULL ,5 *PAGE_SIZE , sgmax,3 }, + {0 ,5 ,pfn (0 ,1 ,2 ,3 ,4 ),NULL ,5 *PAGE_SIZE , sgmax,1 }, + {0 ,5 ,pfn (0 ,1 ,2 ,3 ,4 ),NULL ,5 *PAGE_SIZE ,2 *PAGE_SIZE , +3 }, + {0 ,6 ,pfn (0 ,1 ,2 ,3 ,4 ,5 ),NULL ,6 *PAGE_SIZE , +2 *PAGE_SIZE ,3 }, + {0 ,6 ,pfn (0 ,2 ,3 ,4 ,5 ,6 ),NULL ,6 *PAGE_SIZE , +2 *PAGE_SIZE ,4 }, + {0 ,6 ,pfn (0 ,1 ,3 ,4 ,5 ,6 ),pfn (7 ,8 ,9 ,10 ,11 ,12 ), +6 *PAGE_SIZE ,12 *PAGE_SIZE ,2 }, + {0 ,0 ,NULL ,NULL ,0 ,0 ,0 }, };unsigned int i;for (i =0 , test = tests; test->expected_segments; test++, i++) { +int left_pages = test->pfn_app ? test->num_pages :0 ;struct page *pages[MAX_PAGES ];struct sg_table st;struct scatterlist *sg;
@@ -84,14 +93,23 @@ int main(void)set_pages (pages, test->pfn, test->num_pages); sg =__sg_alloc_table_from_pages (&st, pages, test->num_pages,0 , - test->size, test->max_seg,NULL ,0 ,GFP_KERNEL ); + test->size, test->max_seg,NULL , left_pages,GFP_KERNEL );assert (PTR_ERR_OR_ZERO (sg) == test->alloc_ret);if (test->alloc_ret)continue ; +if (test->pfn_app) { +set_pages (pages, test->pfn_app, test->num_pages); + sg =__sg_alloc_table_from_pages (&st, pages, test->num_pages,0 , + test->size, test->max_seg, sg,0 ,GFP_KERNEL ); + +assert (PTR_ERR_OR_ZERO (sg) == test->alloc_ret); + } +VALIDATE (st.nents == test->expected_segments, &st, test); -VALIDATE (st.orig_nents == test->expected_segments, &st, test); +if (!test->pfn_app) +VALIDATE (st.orig_nents == test->expected_segments, &st, test);sg_free_table (&st); }
--
2.28.0
Quoted 10 lines · Leon Romanovsky
From: Maor Gottlieb <[email protected]>
Add few cases to test the dynamic allocation flow of
__sg_alloc_table_from_pages.Signed-off-by Maor Gottlieb <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>--- tools/testing/scatterlist/main.c | 64 ++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 23 deletions(-)
Applied to for-next, thanks
Jason