net: export some generic xdp helpers

This patch tries to export some generic xdp helpers to drivers. This
can let driver to do XDP for a specific skb. This is useful for the
case when the packet is hard to be processed at page level directly
(e.g jumbo/GSO frame).

With this patch, there's no need for driver to forbid the XDP set when
configuration is not suitable. Instead, it can defer the XDP for
packets that is hard to be processed directly after skb is created.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 1d238d54c4840da5bdc0e5aa0ec960959b578f9a..0f1c4cb2441ee31e02f924764a9bbd52f722440c 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3243,6 +3243,8 @@ static inline void dev_consume_skb_any(struct sk_buff *skb)
        __dev_kfree_skb_any(skb, SKB_REASON_CONSUMED);
 }
 
+void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog);
+int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff *skb);
 int netif_rx(struct sk_buff *skb);
 int netif_rx_ni(struct sk_buff *skb);
 int netif_receive_skb(struct sk_buff *skb);

diff --git a/net/core/dev.c b/net/core/dev.c
index 1024d3741d1284075ef6e4f1afb001c2ae3d693d..40b28e417072e20df866a6988f048d5262a4b445 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3919,7 +3919,7 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb,
 /* When doing generic XDP we have to bypass the qdisc layer and the
  * network taps in order to match in-driver-XDP behavior.
  */
-static void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog)
+void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog)
 {
        struct net_device *dev = skb->dev;
        struct netdev_queue *txq;
@@ -3940,13 +3940,12 @@ static void generic_xdp_tx(struct sk_buff *skb, struct bpf_prog *xdp_prog)
                kfree_skb(skb);
        }
 }
+EXPORT_SYMBOL_GPL(generic_xdp_tx);
 
 static struct static_key generic_xdp_needed __read_mostly;
 
-static int do_xdp_generic(struct sk_buff *skb)
+int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff *skb)
 {
-       struct bpf_prog *xdp_prog = rcu_dereference(skb->dev->xdp_prog);
-
        if (xdp_prog) {
                u32 act = netif_receive_generic_xdp(skb, xdp_prog);
                int err;
@@ -3971,6 +3970,7 @@ out_redir:
        kfree_skb(skb);
        return XDP_DROP;
 }
+EXPORT_SYMBOL_GPL(do_xdp_generic);
 
 static int netif_rx_internal(struct sk_buff *skb)
 {
@@ -3981,7 +3981,8 @@ static int netif_rx_internal(struct sk_buff *skb)
        trace_netif_rx(skb);
 
        if (static_key_false(&generic_xdp_needed)) {
-               int ret = do_xdp_generic(skb);
+               int ret = do_xdp_generic(rcu_dereference(skb->dev->xdp_prog),
+                                        skb);
 
                /* Consider XDP consuming the packet a success from
                 * the netdev point of view we do not want to count
@@ -4502,7 +4503,8 @@ static int netif_receive_skb_internal(struct sk_buff *skb)
        rcu_read_lock();
 
        if (static_key_false(&generic_xdp_needed)) {
-               int ret = do_xdp_generic(skb);
+               int ret = do_xdp_generic(rcu_dereference(skb->dev->xdp_prog),
+                                        skb);
 
                if (ret != XDP_PASS) {
                        rcu_read_unlock();