Skip to content

Commit e6daf12

Browse files
wdebruijdavem330
authored andcommitted
net: gso_test: support CONFIG_MAX_SKB_FRAGS up to 45
The test allocs a single page to hold all the frag_list skbs. This is insufficient on kernels with CONFIG_MAX_SKB_FRAGS=45, due to the increased skb_shared_info frags[] array length. gso_test_func: ASSERTION FAILED at net/core/gso_test.c:210 Expected alloc_size <= ((1UL) << 12), but alloc_size == 5075 (0x13d3) ((1UL) << 12) == 4096 (0x1000) Simplify the logic. Just allocate a page for each frag_list skb. Fixes: 4688ecb ("net: expand skb_segment unit test with frag_list coverage") Signed-off-by: Willem de Bruijn <willemb@google.com> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 438cbcd commit e6daf12

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

net/core/gso_test.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,18 +180,17 @@ static void gso_test_func(struct kunit *test)
180180
}
181181

182182
if (tcase->frag_skbs) {
183-
unsigned int total_size = 0, total_true_size = 0, alloc_size = 0;
183+
unsigned int total_size = 0, total_true_size = 0;
184184
struct sk_buff *frag_skb, *prev = NULL;
185185

186-
page = alloc_page(GFP_KERNEL);
187-
KUNIT_ASSERT_NOT_NULL(test, page);
188-
page_ref_add(page, tcase->nr_frag_skbs - 1);
189-
190186
for (i = 0; i < tcase->nr_frag_skbs; i++) {
191187
unsigned int frag_size;
192188

189+
page = alloc_page(GFP_KERNEL);
190+
KUNIT_ASSERT_NOT_NULL(test, page);
191+
193192
frag_size = tcase->frag_skbs[i];
194-
frag_skb = build_skb(page_address(page) + alloc_size,
193+
frag_skb = build_skb(page_address(page),
195194
frag_size + shinfo_size);
196195
KUNIT_ASSERT_NOT_NULL(test, frag_skb);
197196
__skb_put(frag_skb, frag_size);
@@ -204,11 +203,8 @@ static void gso_test_func(struct kunit *test)
204203

205204
total_size += frag_size;
206205
total_true_size += frag_skb->truesize;
207-
alloc_size += frag_size + shinfo_size;
208206
}
209207

210-
KUNIT_ASSERT_LE(test, alloc_size, PAGE_SIZE);
211-
212208
skb->len += total_size;
213209
skb->data_len += total_size;
214210
skb->truesize += total_true_size;

0 commit comments

Comments
 (0)