xen networking: add XDP support to xen-netfront
v11 cover xen networking: add XDP support to xen-netfront
The first patch adds a new extra type to enable proper synchronization between an RX request/response pair.
The second patch implements BFP interface for xen-netfront. The third patch enables extra space for XDP processing.
v11:
- add the new headroom constant to netif.h
- xenbus_scanf check
- lock a bulk of puckets in xennet_xdp_xmit()
v10:
- add a new xen_netif_extra_info type to enable proper synchronization between an RX request/response pair.
- order local variable declarations
v9:
- assign an xdp program before switching to Reconfiguring
- minor cleanups
- address checkpatch issues
v8:
- add PAGE_POOL config dependency
- keep the state of XDP processing in netfront_xdp_enabled
- fixed allocator type in xdp_rxq_info_reg_mem_model()
- minor cleanups in xen-netback
v7:
- use page_pool_dev_alloc_pages() on page allocation
- remove the leftover break statement from netback_changed
v6:
- added the missing SOB line
- fixed subject
v5:
- split netfront/netback changes
- added a sync point between backend/frontend on switching to XDP
- added pagepool API
v4:
- added verbose patch descriprion
- don't expose the XDP headroom offset to the domU guest
- add a modparam to netback to toggle XDP offset
- don't process jumbo frames for now
v3:
- added XDP_TX support (tested with xdping echoserver)
- added XDP_REDIRECT support (tested with modified xdp_redirect_kern)
- moved xdp negotiation to xen-netback
v2:
- avoid data copying while passing to XDP
- tell xen-netback that we need the headroom space
Denis Kirjanov (3):
xen: netif.h: add a new extra type for XDP
xen networking: add basic XDP support for xen-netfront xen networking: add XDP offset adjustment to xen-netback
drivers/net/Kconfig | 1 + drivers/net/xen-netback/common.h | 4 + drivers/net/xen-netback/interface.c | 2 + drivers/net/xen-netback/netback.c | 7 + drivers/net/xen-netback/rx.c | 15 +- drivers/net/xen-netback/xenbus.c | 34 ++++ drivers/net/xen-netfront.c | 337 ++++++++++++++++++++++++++++++++++-- include/xen/interface/io/netif.h | 20 ++- 8 files changed, 408 insertions(+), 12 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v11 1/3 xen: netif.h: add a new extra type for XDP
The patch adds a new extra type to be able to diffirentiate between RX responses on xen-netfront side with the adjusted offset required for XDP processing.
The offset value from a guest is passed via xenstore.
--- include/xen/interface/io/netif.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
include/xen/interface/io/netif.h +19 -1
@@ -161,6 +161,19 @@*/ /* +* "xdp-headroom" is used to request that extra space is added +* for XDP processing. The value is measured in bytes and passed by +* the frontend to be consistent between both ends. +* If the value is greater than zero that means that +* an RX response is going to be passed to an XDP program for processing. +* XEN_NETIF_MAX_XDP_HEADROOM defines the maximum headroom offset in bytes +* +* "feature-xdp-headroom" is set to "1" by the netback side like other features +* so a guest can check if an XDP program can be processed. +*/ +#define XEN_NETIF_MAX_XDP_HEADROOM 0x7FFF + +/* * Control ring * ============ *
@@ -846,7 +859,8 @@ struct xen_netif_tx_request {#define XEN_NETIF_EXTRA_TYPE_MCAST_ADD (2)/* u.mcast */ #define XEN_NETIF_EXTRA_TYPE_MCAST_DEL (3)/* u.mcast */ #define XEN_NETIF_EXTRA_TYPE_HASH (4)/* u.hash */ -#define XEN_NETIF_EXTRA_TYPE_MAX (5) +#define XEN_NETIF_EXTRA_TYPE_XDP (5)/* u.xdp */ +#define XEN_NETIF_EXTRA_TYPE_MAX (6)/* xen_netif_extra_info_t flags. */ #define _XEN_NETIF_EXTRA_FLAG_MORE (0)
@@ -879,6 +893,10 @@ struct xen_netif_extra_info {uint8_t algorithm;uint8_t value[4 ]; } hash; +struct { +uint16_t headroom; +uint16_t pad[2 ]; + } xdp;uint16_t pad[3 ]; } u; };
Signature · 1 line
1.8.3.1
PATCH v11 2/3 xen networking: add basic XDP support for xen-netfront
In reply to Denis KirjanovThe patch adds a basic XDP processing to xen-netfront driver.
We ran an XDP program for an RX response received from netback driver. Also we request xen-netback to adjust data offset for bpf_xdp_adjust_head() header space for custom headers.
synchronization between frontend and backend parts is done by using xenbus state switching:
Reconfiguring -> Reconfigured- > Connected
UDP packets drop rate using xdp program is around 310 kpps using ./pktgen_sample04_many_flows.sh and 160 kpps without the patch.
--- drivers/net/Kconfig | 1 + drivers/net/xen-netfront.c | 337 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 328 insertions(+), 10 deletions(-)
drivers/net/Kconfig +1 -0
@@ -495,6 +495,7 @@ config XEN_NETDEV_FRONTEND tristate "Xen network device frontend driver" depends on XEN select XEN_XENBUS_FRONTEND + select PAGE_POOL default y help This driver provides support for Xen paravirtual network
drivers/net/xen-netfront.c +327 -10
464 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH v11 3/3 xen networking: add XDP offset adjustment to xen-netback
In reply to Denis Kirjanovthe patch basically adds the offset adjustment and netfront state reading to make XDP work on netfront side.
--- drivers/net/xen-netback/common.h | 4 ++++ drivers/net/xen-netback/interface.c | 2 ++ drivers/net/xen-netback/netback.c | 7 +++++++ drivers/net/xen-netback/rx.c | 15 ++++++++++++++- drivers/net/xen-netback/xenbus.c | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 1 deletion(-)
drivers/net/xen-netback/common.h +4 -0
@@ -281,6 +281,9 @@ struct xenvif { u8 ipv6_csum:1; u8 multicast_control:1; +/* headroom requested by xen-netfront */ +u16 netfront_xdp_headroom; +/* Is this interface disabled? True when backend discovers * frontend is rogue. */
@@ -395,6 +398,7 @@ static inline pending_ring_idx_t nr_pending_reqs(struct xenvif_queue *queue)irqreturn_t xenvif_interrupt (int irq,void *dev_id);extern bool separate_tx_rx_irq; +extern bool provides_xdp_headroom;extern unsigned int rx_drain_timeout_msecs;extern unsigned int rx_stall_timeout_msecs;
drivers/net/xen-netback/interface.c +2 -0
@@ -483,6 +483,8 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid, vif->queues =NULL ; vif->num_queues =0 ; + vif->netfront_xdp_headroom =0 ; +spin_lock_init (&vif->lock);INIT_LIST_HEAD (&vif->fe_mcast_addr);
drivers/net/xen-netback/netback.c +7 -0
@@ -96,6 +96,13 @@module_param_named (hash_cache_size, xenvif_hash_cache_size, uint,0644 );MODULE_PARM_DESC (hash_cache_size,"Number of flows in the hash cache" ); +/* The module parameter tells that we have to put data +* for xen-netfront with the XDP_PACKET_HEADROOM offset +* needed for XDP processing +*/ +bool provides_xdp_headroom = true; +module_param (provides_xdp_headroom, bool,0644 ); +static void xenvif_idx_release (struct xenvif_queue *queue,u16 pending_idx,u8 status);
drivers/net/xen-netback/rx.c +14 -1
@@ -258,6 +258,19 @@ static void xenvif_rx_next_skb(struct xenvif_queue *queue, pkt->extra_count++; } +if (queue->vif->netfront_xdp_headroom) { +struct xen_netif_extra_info *extra; + + extra = &pkt->extras[XEN_NETIF_EXTRA_TYPE_XDP -1 ]; + +memset (extra,0 ,sizeof (struct xen_netif_extra_info )); + extra->u.xdp.headroom = queue->vif->netfront_xdp_headroom; + extra->type =XEN_NETIF_EXTRA_TYPE_XDP ; + extra->flags =0 ; + + pkt->extra_count++; + } +if (skb->sw_hash) {struct xen_netif_extra_info *extra;
@@ -356,7 +369,7 @@ static void xenvif_rx_data_slot(struct xenvif_queue *queue,struct xen_netif_rx_request *req, struct xen_netif_rx_response *rsp) { - unsigned int offset = 0; + unsigned int offset = queue->vif->netfront_xdp_headroom;unsigned int flags; do {
drivers/net/xen-netback/xenbus.c +34 -0
@@ -393,6 +393,24 @@ static void set_backend_state(struct backend_info *be, } } +static void read_xenbus_frontend_xdp (struct backend_info *be, +struct xenbus_device *dev) +{ +struct xenvif *vif = be->vif; +u16 headroom; +int err; + + err =xenbus_scanf (XBT_NIL , dev->otherend, +"xdp-headroom" ,"%hu" , &headroom); +if (err !=1 ) { + vif->netfront_xdp_headroom =0 ; +return ; + } +if (headroom >XEN_NETIF_MAX_XDP_HEADROOM ) + headroom =XEN_NETIF_MAX_XDP_HEADROOM ; + vif->netfront_xdp_headroom = headroom; +} +/** * Callback received when the frontend's state changes. */
@@ -417,6 +435,11 @@ static void frontend_changed(struct xenbus_device *dev,set_backend_state (be, XenbusStateConnected);break ; +case XenbusStateReconfiguring: +read_xenbus_frontend_xdp (be, dev); +xenbus_switch_state (dev, XenbusStateReconfigured); +break ; +case XenbusStateClosing:set_backend_state (be, XenbusStateClosing);break ;
@@ -947,6 +970,8 @@ static int read_xenbus_vif_flags(struct backend_info *be) vif->ipv6_csum = !!xenbus_read_unsigned (dev->otherend,"feature-ipv6-csum-offload" ,0 ); +read_xenbus_frontend_xdp (be, dev); +return 0 ; }
@@ -1036,6 +1061,15 @@ static int netback_probe(struct xenbus_device *dev, goto abort_transaction; } +/* we can adjust a headroom for netfront XDP processing */ + err =xenbus_printf (xbt, dev->nodename, +"feature-xdp-headroom" ,"%d" , + provides_xdp_headroom); +if (err) { + message ="writing feature-xdp-headroom" ; + goto abort_transaction; + } +/* We don't support rx-flip path (except old guests who * don't grok this feature flag). */
Signature · 1 line
1.8.3.1
RE: [PATCH net-next v11 3/3] xen networking: add XDP offset adjustment to xen-netback
Quoted 24 lines
-----Original Message-----
From: Denis Kirjanov <[email protected]>
Sent: 26 June 2020 11:35
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: [PATCH net-next v11 3/3] xen networking: add XDP offset adjustment to xen-netbackthe patch basically adds the offset adjustment and netfront state reading to make XDP work on netfront side.
Signed-off-by Denis Kirjanov <[email protected]>--- drivers/net/xen-netback/common.h | 4 ++++ drivers/net/xen-netback/interface.c | 2 ++ drivers/net/xen-netback/netback.c | 7 +++++++ drivers/net/xen-netback/rx.c | 15 ++++++++++++++- drivers/net/xen-netback/xenbus.c | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 1 deletion(-)drivers/net/xen-netback/common.h +0
-0
drivers/net/xen-netback/common.h struct xenvif { · line 285
Quoted 5 lines
drivers/net/xen-netback/common.h +2
-0@@ -281,6 +281,9 @@ struct xenvif { u8 ipv6_csum:1; u8 multicast_control:1; +/* headroom requested by xen-netfront */ +u16 netfront_xdp_headroom;
I'd still prefer the shorter name of 'xdp_headroom'. With that fixed...
Quoted 144 lines
drivers/net/xen-netback/common.h +2
-0+/* Is this interface disabled? True when backend discovers * frontend is rogue. */ @@ -395,6 +398,7 @@ static inline pending_ring_idx_t nr_pending_reqs(struct xenvif_queue *queue)irqreturn_t xenvif_interrupt (int irq,void *dev_id);extern bool separate_tx_rx_irq; +extern bool provides_xdp_headroom;extern unsigned int rx_drain_timeout_msecs;extern unsigned int rx_stall_timeout_msecs;drivers/net/xen-netback/interface.c +2
-0@@ -483,6 +483,8 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid, vif->queues =NULL ; vif->num_queues =0 ; + vif->netfront_xdp_headroom =0 ; +spin_lock_init (&vif->lock);INIT_LIST_HEAD (&vif->fe_mcast_addr);drivers/net/xen-netback/netback.c +7
-0@@ -96,6 +96,13 @@module_param_named (hash_cache_size, xenvif_hash_cache_size, uint,0644 );MODULE_PARM_DESC (hash_cache_size,"Number of flows in the hash cache" ); +/* The module parameter tells that we have to put data +* for xen-netfront with the XDP_PACKET_HEADROOM offset +* needed for XDP processing +*/ +bool provides_xdp_headroom = true; +module_param (provides_xdp_headroom, bool,0644 ); +static void xenvif_idx_release (struct xenvif_queue *queue,u16 pending_idx,u8 status);drivers/net/xen-netback/rx.c +14
-1@@ -258,6 +258,19 @@ static void xenvif_rx_next_skb(struct xenvif_queue *queue, pkt->extra_count++; } +if (queue->vif->netfront_xdp_headroom) { +struct xen_netif_extra_info *extra; + + extra = &pkt->extras[XEN_NETIF_EXTRA_TYPE_XDP -1 ]; + +memset (extra,0 ,sizeof (struct xen_netif_extra_info )); + extra->u.xdp.headroom = queue->vif->netfront_xdp_headroom; + extra->type =XEN_NETIF_EXTRA_TYPE_XDP ; + extra->flags =0 ; + + pkt->extra_count++; + } +if (skb->sw_hash) {struct xen_netif_extra_info *extra;@@ -356,7 +369,7 @@ static void xenvif_rx_data_slot(struct xenvif_queue *queue,struct xen_netif_rx_request *req, struct xen_netif_rx_response *rsp) { - unsigned int offset = 0; + unsigned int offset = queue->vif->netfront_xdp_headroom;unsigned int flags; do {drivers/net/xen-netback/xenbus.c +34
-1@@ -393,6 +393,24 @@ static void set_backend_state(struct backend_info *be, } } +static void read_xenbus_frontend_xdp (struct backend_info *be, +struct xenbus_device *dev) +{ +struct xenvif *vif = be->vif; +u16 headroom; +int err; + + err =xenbus_scanf (XBT_NIL , dev->otherend, +"xdp-headroom" ,"%hu" , &headroom); +if (err !=1 ) { + vif->netfront_xdp_headroom =0 ; +return ; + } +if (headroom >XEN_NETIF_MAX_XDP_HEADROOM ) + headroom =XEN_NETIF_MAX_XDP_HEADROOM ; + vif->netfront_xdp_headroom = headroom; +} +/** * Callback received when the frontend's state changes. */ @@ -417,6 +435,11 @@ static void frontend_changed(struct xenbus_device *dev,set_backend_state (be, XenbusStateConnected);break ; +case XenbusStateReconfiguring: +read_xenbus_frontend_xdp (be, dev); +xenbus_switch_state (dev, XenbusStateReconfigured); +break ; +case XenbusStateClosing:set_backend_state (be, XenbusStateClosing);break ;@@ -947,6 +970,8 @@ static int read_xenbus_vif_flags(struct backend_info *be) vif->ipv6_csum = !!xenbus_read_unsigned (dev->otherend,"feature-ipv6-csum-offload" ,0 ); +read_xenbus_frontend_xdp (be, dev); +return 0 ; }@@ -1036,6 +1061,15 @@ static int netback_probe(struct xenbus_device *dev, goto abort_transaction; } +/* we can adjust a headroom for netfront XDP processing */ + err =xenbus_printf (xbt, dev->nodename, +"feature-xdp-headroom" ,"%d" , + provides_xdp_headroom); +if (err) { + message ="writing feature-xdp-headroom" ; + goto abort_transaction; + } +/* We don't support rx-flip path (except old guests who * don't grok this feature flag). */ --1.8.3.1
Jakub Kicinski
maintainerRe: [PATCH net-next v11 2/3] xen networking: add basic XDP support for xen-netfront
In reply to Denis KirjanovQuoted 6 lines · On Fri, 26 Jun 2020 13:34:33 +0300 Denis Kirjanov wrote:
The patch adds a basic XDP processing to xen-netfront driver.
We ran an XDP program for an RX response received from netback driver. Also we request xen-netback to adjust data offset for
bpf_xdp_adjust_head()header space for custom headers.
Quoted 8 lines
synchronization between frontend and backend parts is done by using xenbus state switching:
Reconfiguring -> Reconfigured- > ConnectedUDP packets drop rate using xdp program is around 310 kpps using ./pktgen_sample04_many_flows.sh and 160 kpps without the patch.
Signed-off-by Denis Kirjanov <[email protected]>
W=1 C=1 produces this warning:
drivers/net/xen-netfront.c: In function xennet_xdp_xmit_one:drivers/net/xen-netfront.c:581:31: warning: variable tx set but not used [-Wunused-but-set-variable]
581 | struct xen_netif_tx_request *tx;
| ^~