Commit 8c964397 authored by David S. Miller's avatar David S. Miller

Merge branch 'add-XDP-support-to-xen-netfront'

Denis Kirjanov says:

====================
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.

v14:
- fixed compilation warnings

v13:
- fixed compilation due to previous rename

v12:
- xen-netback: rename netfront_xdp_headroom to xdp_headroom

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
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6d79dc67 1c9535c7
...@@ -495,6 +495,7 @@ config XEN_NETDEV_FRONTEND ...@@ -495,6 +495,7 @@ config XEN_NETDEV_FRONTEND
tristate "Xen network device frontend driver" tristate "Xen network device frontend driver"
depends on XEN depends on XEN
select XEN_XENBUS_FRONTEND select XEN_XENBUS_FRONTEND
select PAGE_POOL
default y default y
help help
This driver provides support for Xen paravirtual network This driver provides support for Xen paravirtual network
......
...@@ -281,6 +281,9 @@ struct xenvif { ...@@ -281,6 +281,9 @@ struct xenvif {
u8 ipv6_csum:1; u8 ipv6_csum:1;
u8 multicast_control:1; u8 multicast_control:1;
/* headroom requested by xen-netfront */
u16 xdp_headroom;
/* Is this interface disabled? True when backend discovers /* Is this interface disabled? True when backend discovers
* frontend is rogue. * frontend is rogue.
*/ */
...@@ -395,6 +398,7 @@ static inline pending_ring_idx_t nr_pending_reqs(struct xenvif_queue *queue) ...@@ -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); irqreturn_t xenvif_interrupt(int irq, void *dev_id);
extern bool separate_tx_rx_irq; extern bool separate_tx_rx_irq;
extern bool provides_xdp_headroom;
extern unsigned int rx_drain_timeout_msecs; extern unsigned int rx_drain_timeout_msecs;
extern unsigned int rx_stall_timeout_msecs; extern unsigned int rx_stall_timeout_msecs;
......
...@@ -483,6 +483,8 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid, ...@@ -483,6 +483,8 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
vif->queues = NULL; vif->queues = NULL;
vif->num_queues = 0; vif->num_queues = 0;
vif->xdp_headroom = 0;
spin_lock_init(&vif->lock); spin_lock_init(&vif->lock);
INIT_LIST_HEAD(&vif->fe_mcast_addr); INIT_LIST_HEAD(&vif->fe_mcast_addr);
......
...@@ -96,6 +96,13 @@ unsigned int xenvif_hash_cache_size = XENVIF_HASH_CACHE_SIZE_DEFAULT; ...@@ -96,6 +96,13 @@ unsigned int xenvif_hash_cache_size = XENVIF_HASH_CACHE_SIZE_DEFAULT;
module_param_named(hash_cache_size, xenvif_hash_cache_size, uint, 0644); 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"); 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, static void xenvif_idx_release(struct xenvif_queue *queue, u16 pending_idx,
u8 status); u8 status);
......
...@@ -258,6 +258,19 @@ static void xenvif_rx_next_skb(struct xenvif_queue *queue, ...@@ -258,6 +258,19 @@ static void xenvif_rx_next_skb(struct xenvif_queue *queue,
pkt->extra_count++; pkt->extra_count++;
} }
if (queue->vif->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->xdp_headroom;
extra->type = XEN_NETIF_EXTRA_TYPE_XDP;
extra->flags = 0;
pkt->extra_count++;
}
if (skb->sw_hash) { if (skb->sw_hash) {
struct xen_netif_extra_info *extra; struct xen_netif_extra_info *extra;
...@@ -356,7 +369,7 @@ static void xenvif_rx_data_slot(struct xenvif_queue *queue, ...@@ -356,7 +369,7 @@ static void xenvif_rx_data_slot(struct xenvif_queue *queue,
struct xen_netif_rx_request *req, struct xen_netif_rx_request *req,
struct xen_netif_rx_response *rsp) struct xen_netif_rx_response *rsp)
{ {
unsigned int offset = 0; unsigned int offset = queue->vif->xdp_headroom;
unsigned int flags; unsigned int flags;
do { do {
......
...@@ -393,6 +393,24 @@ static void set_backend_state(struct backend_info *be, ...@@ -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->xdp_headroom = 0;
return;
}
if (headroom > XEN_NETIF_MAX_XDP_HEADROOM)
headroom = XEN_NETIF_MAX_XDP_HEADROOM;
vif->xdp_headroom = headroom;
}
/** /**
* Callback received when the frontend's state changes. * Callback received when the frontend's state changes.
*/ */
...@@ -417,6 +435,11 @@ static void frontend_changed(struct xenbus_device *dev, ...@@ -417,6 +435,11 @@ static void frontend_changed(struct xenbus_device *dev,
set_backend_state(be, XenbusStateConnected); set_backend_state(be, XenbusStateConnected);
break; break;
case XenbusStateReconfiguring:
read_xenbus_frontend_xdp(be, dev);
xenbus_switch_state(dev, XenbusStateReconfigured);
break;
case XenbusStateClosing: case XenbusStateClosing:
set_backend_state(be, XenbusStateClosing); set_backend_state(be, XenbusStateClosing);
break; break;
...@@ -947,6 +970,8 @@ static int read_xenbus_vif_flags(struct backend_info *be) ...@@ -947,6 +970,8 @@ static int read_xenbus_vif_flags(struct backend_info *be)
vif->ipv6_csum = !!xenbus_read_unsigned(dev->otherend, vif->ipv6_csum = !!xenbus_read_unsigned(dev->otherend,
"feature-ipv6-csum-offload", 0); "feature-ipv6-csum-offload", 0);
read_xenbus_frontend_xdp(be, dev);
return 0; return 0;
} }
...@@ -1036,6 +1061,15 @@ static int netback_probe(struct xenbus_device *dev, ...@@ -1036,6 +1061,15 @@ static int netback_probe(struct xenbus_device *dev,
goto abort_transaction; 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 /* We don't support rx-flip path (except old guests who
* don't grok this feature flag). * don't grok this feature flag).
*/ */
......
This diff is collapsed.
...@@ -160,6 +160,19 @@ ...@@ -160,6 +160,19 @@
* be applied if it is set. * be applied if it is set.
*/ */
/*
* "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 * Control ring
* ============ * ============
...@@ -846,7 +859,8 @@ struct xen_netif_tx_request { ...@@ -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_ADD (2) /* u.mcast */
#define XEN_NETIF_EXTRA_TYPE_MCAST_DEL (3) /* 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_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. */ /* xen_netif_extra_info_t flags. */
#define _XEN_NETIF_EXTRA_FLAG_MORE (0) #define _XEN_NETIF_EXTRA_FLAG_MORE (0)
...@@ -879,6 +893,10 @@ struct xen_netif_extra_info { ...@@ -879,6 +893,10 @@ struct xen_netif_extra_info {
uint8_t algorithm; uint8_t algorithm;
uint8_t value[4]; uint8_t value[4];
} hash; } hash;
struct {
uint16_t headroom;
uint16_t pad[2];
} xdp;
uint16_t pad[3]; uint16_t pad[3];
} u; } u;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment