Introduce the capability to allocate a xdp multi-buff in
bpf_prog_test_run_xdp routine. This is a preliminary patch to introduce
the selftests for new xdp multi-buff ebpf helpers

Signed-off-by: Lorenzo Bianconi <lore...@kernel.org>
---
 net/bpf/test_run.c | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
index 5608d5a902ff..7268542b0f3c 100644
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -532,23 +532,22 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const 
union bpf_attr *kattr,
 {
        u32 tailroom = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
        u32 headroom = XDP_PACKET_HEADROOM;
-       u32 size = kattr->test.data_size_in;
        u32 repeat = kattr->test.repeat;
        struct netdev_rx_queue *rxqueue;
+       struct skb_shared_info *sinfo;
        struct xdp_buff xdp = {};
+       u32 max_data_sz, size;
        u32 retval, duration;
-       u32 max_data_sz;
        void *data;
-       int ret;
+       int i, ret;
 
        if (kattr->test.ctx_in || kattr->test.ctx_out)
                return -EINVAL;
 
-       /* XDP have extra tailroom as (most) drivers use full page */
        max_data_sz = 4096 - headroom - tailroom;
+       size = min_t(u32, kattr->test.data_size_in, max_data_sz);
 
-       data = bpf_test_init(kattr, kattr->test.data_size_in,
-                            max_data_sz, headroom, tailroom);
+       data = bpf_test_init(kattr, size, max_data_sz, headroom, tailroom);
        if (IS_ERR(data))
                return PTR_ERR(data);
 
@@ -558,6 +557,28 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const 
union bpf_attr *kattr,
        xdp.data_end = xdp.data + size;
        xdp.frame_sz = headroom + max_data_sz + tailroom;
 
+       sinfo = xdp_get_shared_info_from_buff(&xdp);
+       if (unlikely(kattr->test.data_size_in > size)) {
+               for (; size < kattr->test.data_size_in; size += PAGE_SIZE) {
+                       skb_frag_t *frag = &sinfo->frags[sinfo->nr_frags];
+                       struct page *page;
+                       int data_len;
+
+                       page = alloc_page(GFP_KERNEL);
+                       if (!page) {
+                               ret = -ENOMEM;
+                               goto out;
+                       }
+
+                       __skb_frag_set_page(frag, page);
+                       data_len = min_t(int, kattr->test.data_size_in - size,
+                                        PAGE_SIZE);
+                       skb_frag_size_set(frag, data_len);
+                       sinfo->nr_frags++;
+               }
+               xdp.mb = 1;
+       }
+
        rxqueue = __netif_get_rx_queue(current->nsproxy->net_ns->loopback_dev, 
0);
        xdp.rxq = &rxqueue->xdp_rxq;
        bpf_prog_change_xdp(NULL, prog);
@@ -569,7 +590,10 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const 
union bpf_attr *kattr,
        ret = bpf_test_finish(kattr, uattr, xdp.data, size, retval, duration);
 out:
        bpf_prog_change_xdp(prog, NULL);
+       for (i = 0; i < sinfo->nr_frags; i++)
+               __free_page(skb_frag_page(&sinfo->frags[i]));
        kfree(data);
+
        return ret;
 }
 
-- 
2.26.2

Reply via email to