| Message ID | 20230207210058.2257219-5-pkaligineedi@google.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | gve: Add XDP support for GQI-QPL format | expand |
On Tue, Feb 07, 2023 at 01:00:58PM -0800, Praveen Kaligineedi wrote: > Adding AF_XDP zero-copy support. > > Note: Although these changes support AF_XDP socket in zero-copy > mode, there is still a copy happening within the driver between > XSK buffer pool and QPL bounce buffers in GQI-QPL format. > Please share the perf for copy mode and zero copy mode. As long as ZC outperforms copy mode supporting this makes sense, but to me you're just changing the place where copy mode happens (at least on Rx side). Can you also explain what stops you from feeding buffers from xsk pool to QPL bounce buffers? > This patch contains the following changes: > 1) Enable and disable XSK buffer pool > 2) Copy XDP packets from QPL bounce buffers to XSK buffer on rx > 3) Copy XDP packets from XSK buffer to QPL bounce buffers and > ring the doorbell as part of XDP TX napi poll > 4) ndo_xsk_wakeup callback support > > Signed-off-by: Praveen Kaligineedi <pkaligineedi@google.com> > Reviewed-by: Jeroen de Borst <jeroendb@google.com> > --- > drivers/net/ethernet/google/gve/gve.h | 7 + > drivers/net/ethernet/google/gve/gve_ethtool.c | 14 +- > drivers/net/ethernet/google/gve/gve_main.c | 134 +++++++++++++++++- > drivers/net/ethernet/google/gve/gve_rx.c | 30 ++++ > drivers/net/ethernet/google/gve/gve_tx.c | 58 +++++++- > 5 files changed, 233 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/google/gve/gve.h > index f89b1278db70..793b054580e3 100644 > --- a/drivers/net/ethernet/google/gve/gve.h > +++ b/drivers/net/ethernet/google/gve/gve.h > @@ -248,6 +248,8 @@ struct gve_rx_ring { > > /* XDP stuff */ > struct xdp_rxq_info xdp_rxq; > + struct xdp_rxq_info xsk_rxq; > + struct xsk_buff_pool *xsk_pool; > struct page_frag_cache page_cache; > }; > > @@ -275,6 +277,7 @@ struct gve_tx_buffer_state { > }; > struct { > u16 size; /* size of xmitted xdp pkt */ > + u8 is_xsk; /* xsk buff */ > } xdp; > union { > struct gve_tx_iovec iov[GVE_TX_MAX_IOVEC]; /* segments of this pkt */ > @@ -469,6 +472,10 @@ struct gve_tx_ring { > dma_addr_t q_resources_bus; /* dma address of the queue resources */ > dma_addr_t complq_bus_dqo; /* dma address of the dqo.compl_ring */ > struct u64_stats_sync statss; /* sync stats for 32bit archs */ > + struct xsk_buff_pool *xsk_pool; > + u32 xdp_xsk_wakeup; > + u32 xdp_xsk_done; > + u64 xdp_xsk_sent; > u64 xdp_xmit; > u64 xdp_xmit_errors; > } ____cacheline_aligned; > diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/ethernet/google/gve/gve_ethtool.c > index 57940f90c6be..89accad6c13a 100644 > --- a/drivers/net/ethernet/google/gve/gve_ethtool.c > +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c > @@ -62,8 +62,8 @@ static const char gve_gstrings_rx_stats[][ETH_GSTRING_LEN] = { > static const char gve_gstrings_tx_stats[][ETH_GSTRING_LEN] = { > "tx_posted_desc[%u]", "tx_completed_desc[%u]", "tx_consumed_desc[%u]", "tx_bytes[%u]", > "tx_wake[%u]", "tx_stop[%u]", "tx_event_counter[%u]", > - "tx_dma_mapping_error[%u]", > - "tx_xdp_xmit[%u]", "tx_xdp_xmit_errors[%u]" > + "tx_dma_mapping_error[%u]", "tx_xsk_wakeup[%u]", > + "tx_xsk_done[%u]", "tx_xsk_sent[%u]", "tx_xdp_xmit[%u]", "tx_xdp_xmit_errors[%u]" > }; > > static const char gve_gstrings_adminq_stats[][ETH_GSTRING_LEN] = { > @@ -380,13 +380,17 @@ gve_get_ethtool_stats(struct net_device *netdev, > data[i++] = value; > } > } > + /* XDP xsk counters */ > + data[i++] = tx->xdp_xsk_wakeup; > + data[i++] = tx->xdp_xsk_done; > do { > start = u64_stats_fetch_begin(&priv->tx[ring].statss); > - data[i] = tx->xdp_xmit; > - data[i + 1] = tx->xdp_xmit_errors; > + data[i] = tx->xdp_xsk_sent; > + data[i + 1] = tx->xdp_xmit; > + data[i + 2] = tx->xdp_xmit_errors; > } while (u64_stats_fetch_retry(&priv->tx[ring].statss, > start)); > - i += 2; /* XDP tx counters */ > + i += 3; /* XDP tx counters */ > } > } else { > i += num_tx_queues * NUM_GVE_TX_CNTS; > diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c > index 4398e5887f3b..a0edf94d20db 100644 > --- a/drivers/net/ethernet/google/gve/gve_main.c > +++ b/drivers/net/ethernet/google/gve/gve_main.c > @@ -17,6 +17,7 @@ > #include <linux/utsname.h> > #include <linux/version.h> > #include <net/sch_generic.h> > +#include <net/xdp_sock_drv.h> > #include "gve.h" > #include "gve_dqo.h" > #include "gve_adminq.h" > @@ -983,7 +984,7 @@ static void gve_turnup(struct gve_priv *priv); > > static int gve_reg_xdp_info(struct gve_priv *priv, struct net_device *dev) > { > - int err = 0, i; > + int err = 0, i, tx_qid; > > for (i = 0; i < priv->rx_cfg.num_queues; i++) { > struct gve_rx_ring *rx = &priv->rx[i]; > @@ -998,6 +999,24 @@ static int gve_reg_xdp_info(struct gve_priv *priv, struct net_device *dev) > MEM_TYPE_PAGE_SHARED, NULL); > if (err) > goto out; > + err = xdp_rxq_info_reg(&rx->xsk_rxq, dev, i, > + napi->napi_id); > + if (err) > + goto out; > + err = xdp_rxq_info_reg_mem_model(&rx->xsk_rxq, > + MEM_TYPE_XSK_BUFF_POOL, NULL); I don't like registering this unconditionally, you could at least move this inside if (rx->xsk_pool) below. > + if (err) > + goto out; > + rx->xsk_pool = xsk_get_pool_from_qid(dev, i); > + if (rx->xsk_pool) { > + xsk_pool_set_rxq_info(rx->xsk_pool, > + &rx->xsk_rxq); we normally also pull the frame size from pool via xsk_pool_get_rx_frame_size() and assign this to Rx HW ring as buffer length, but since you implement this ZC support in some quirked way then it doesn't matter at that point > + } > + } > + > + for (i = 0; i < priv->num_xdp_queues; i++) { > + tx_qid = gve_xdp_tx_queue_id(priv, i); > + priv->tx[tx_qid].xsk_pool = xsk_get_pool_from_qid(dev, i); > } > > out: > @@ -1006,12 +1025,19 @@ static int gve_reg_xdp_info(struct gve_priv *priv, struct net_device *dev) > > static void gve_unreg_xdp_info(struct gve_priv *priv) > { > - int i; > + int i, tx_qid; > > for (i = 0; i < priv->rx_cfg.num_queues; i++) { > struct gve_rx_ring *rx = &priv->rx[i]; > > xdp_rxq_info_unreg(&rx->xdp_rxq); > + xdp_rxq_info_unreg(&rx->xsk_rxq); > + rx->xsk_pool = NULL; > + } > + > + for (i = 0; i < priv->num_xdp_queues; i++) { > + tx_qid = gve_xdp_tx_queue_id(priv, i); > + priv->tx[tx_qid].xsk_pool = NULL; > } > } > > @@ -1182,6 +1208,104 @@ static int gve_set_xdp(struct gve_priv *priv, struct bpf_prog *prog, > return 0; > } > > +static int gve_xsk_pool_enable(struct net_device *dev, > + struct xsk_buff_pool *pool, > + u16 qid) > +{ > + struct gve_priv *priv = netdev_priv(dev); > + int tx_qid; > + int err; > + > + if (qid >= priv->rx_cfg.num_queues) { > + dev_err(&priv->pdev->dev, "xsk pool invalid qid %d", qid); > + return -EINVAL; > + } > + if (pool->frame_len < priv->dev->max_mtu + sizeof(struct ethhdr)) { > + dev_err(&priv->pdev->dev, "xsk pool frame_len too small"); > + return -EINVAL; > + } > + > + err = xsk_pool_dma_map(pool, &priv->pdev->dev, > + DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING); > + if (err) > + return err; > + xsk_pool_set_rxq_info(pool, &priv->rx[qid].xsk_rxq); > + tx_qid = gve_xdp_tx_queue_id(priv, qid); > + priv->rx[qid].xsk_pool = pool; > + priv->tx[tx_qid].xsk_pool = pool; > + > + return 0; > +} > + > +static int gve_xsk_pool_disable(struct net_device *dev, > + u16 qid) > +{ > + struct gve_priv *priv = netdev_priv(dev); > + struct napi_struct *napi_tx; > + struct xsk_buff_pool *pool; > + int sleep = 2000; > + int tx_qid; > + > + pool = xsk_get_pool_from_qid(dev, qid); > + if (!pool) > + return -EINVAL; > + if (qid >= priv->rx_cfg.num_queues) > + return -EINVAL; > + > + tx_qid = gve_xdp_tx_queue_id(priv, qid); > + priv->rx[qid].xsk_pool = NULL; > + priv->tx[tx_qid].xsk_pool = NULL; > + > + /* Make sure it is visible to the workers on datapath */ > + smp_mb(); > + > + if (!netif_running(dev) || !priv->xdp_prog) > + goto done; > + > + napi_tx = &priv->ntfy_blocks[priv->tx[tx_qid].ntfy_id].napi; > + napi_disable(napi_tx); /* make sure current tx poll is done */ > + napi_enable(napi_tx); /* simply pair with disable */ > + if (gve_tx_clean_pending(priv, &priv->tx[tx_qid])) > + napi_schedule(napi_tx); > + > + /* make sure no xdp_buff floating */ > + while (pool->free_heads_cnt < pool->heads_cnt && sleep > 0) { please don't access these fields directly from driver and figure out other way of waiting for your napi processing to finish rather then this what we call lately "sleep driven development" - you probably would be good to go with having synchronize_rcu() here? > + usleep_range(1000, 2000); > + sleep--; > + } > + if (sleep <= 0) > + return -EBUSY; return and leave dma mappings dangling? > + > +done: > + xsk_pool_dma_unmap(pool, > + DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING); > + return 0; > +} > + > +static int gve_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags) > +{ > + struct gve_priv *priv = netdev_priv(dev); > + int tx_queue_id = gve_xdp_tx_queue_id(priv, queue_id); > + > + if (queue_id >= priv->rx_cfg.num_queues || !priv->xdp_prog) > + return -EINVAL; > + > + if (flags & XDP_WAKEUP_TX) { > + struct gve_tx_ring *tx = &priv->tx[tx_queue_id]; > + struct napi_struct *napi = > + &priv->ntfy_blocks[tx->ntfy_id].napi; > + > + /* Call local_bh_enable to trigger SoftIRQ processing */ > + local_bh_disable(); > + napi_schedule(napi); > + local_bh_enable(); is this going to honor irq affinity from napi POV? we normally use napi_if_scheduled_mark_missed() so napi stays where it was and move to a cpu that issued ndo_xsk_wakeup() > + > + tx->xdp_xsk_wakeup++; > + } > + > + return 0; > +} > + > static int verify_xdp_configuration(struct net_device *dev) > { > struct gve_priv *priv = netdev_priv(dev); > @@ -1225,6 +1349,11 @@ static int gve_xdp(struct net_device *dev, struct netdev_bpf *xdp) > switch (xdp->command) { > case XDP_SETUP_PROG: > return gve_set_xdp(priv, xdp->prog, xdp->extack); > + case XDP_SETUP_XSK_POOL: > + if (xdp->xsk.pool) > + return gve_xsk_pool_enable(dev, xdp->xsk.pool, xdp->xsk.queue_id); > + else > + return gve_xsk_pool_disable(dev, xdp->xsk.queue_id); > default: > return -EINVAL; > } > @@ -1426,6 +1555,7 @@ static const struct net_device_ops gve_netdev_ops = { > .ndo_set_features = gve_set_features, > .ndo_bpf = gve_xdp, > .ndo_xdp_xmit = gve_xdp_xmit, > + .ndo_xsk_wakeup = gve_xsk_wakeup, > }; > > static void gve_handle_status(struct gve_priv *priv, u32 status) > diff --git a/drivers/net/ethernet/google/gve/gve_rx.c b/drivers/net/ethernet/google/gve/gve_rx.c > index ea833388f895..1ee95c56ce2b 100644 > --- a/drivers/net/ethernet/google/gve/gve_rx.c > +++ b/drivers/net/ethernet/google/gve/gve_rx.c > @@ -10,6 +10,7 @@ > #include <linux/etherdevice.h> > #include <linux/filter.h> > #include <net/xdp.h> > +#include <net/xdp_sock_drv.h> > > static void gve_rx_free_buffer(struct device *dev, > struct gve_rx_slot_page_info *page_info, > @@ -593,6 +594,31 @@ static struct sk_buff *gve_rx_skb(struct gve_priv *priv, struct gve_rx_ring *rx, > return skb; > } > > +static int gve_xsk_pool_redirect(struct net_device *dev, > + struct gve_rx_ring *rx, > + void *data, int len, > + struct bpf_prog *xdp_prog) > +{ > + struct xdp_buff *xdp; > + int err; > + > + if (rx->xsk_pool->frame_len < len) > + return -E2BIG; > + xdp = xsk_buff_alloc(rx->xsk_pool); > + if (!xdp) { > + u64_stats_update_begin(&rx->statss); > + rx->xdp_alloc_fails++; > + u64_stats_update_end(&rx->statss); > + return -ENOMEM; > + } > + xdp->data_end = xdp->data + len; > + memcpy(xdp->data, data, len); > + err = xdp_do_redirect(dev, xdp, xdp_prog); > + if (err) > + xsk_buff_free(xdp); > + return err; > +} > + > static int gve_xdp_redirect(struct net_device *dev, struct gve_rx_ring *rx, > struct xdp_buff *orig, struct bpf_prog *xdp_prog) > { > @@ -602,6 +628,10 @@ static int gve_xdp_redirect(struct net_device *dev, struct gve_rx_ring *rx, > void *frame; > int err; > > + if (rx->xsk_pool) > + return gve_xsk_pool_redirect(dev, rx, orig->data, > + len, xdp_prog); > + > total_len = headroom + SKB_DATA_ALIGN(len) + > SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); > frame = page_frag_alloc(&rx->page_cache, total_len, GFP_ATOMIC); > diff --git a/drivers/net/ethernet/google/gve/gve_tx.c b/drivers/net/ethernet/google/gve/gve_tx.c > index b5261985a1fc..caaae2fe701e 100644 > --- a/drivers/net/ethernet/google/gve/gve_tx.c > +++ b/drivers/net/ethernet/google/gve/gve_tx.c > @@ -11,6 +11,7 @@ > #include <linux/tcp.h> > #include <linux/vmalloc.h> > #include <linux/skbuff.h> > +#include <net/xdp_sock_drv.h> > > static inline void gve_tx_put_doorbell(struct gve_priv *priv, > struct gve_queue_resources *q_resources, > @@ -666,7 +667,7 @@ netdev_tx_t gve_tx(struct sk_buff *skb, struct net_device *dev) > } > > static int gve_tx_fill_xdp(struct gve_priv *priv, struct gve_tx_ring *tx, > - void *data, int len, void *frame_p) > + void *data, int len, void *frame_p, bool is_xsk) > { > int pad, nfrags, ndescs, iovi, offset; > struct gve_tx_buffer_state *info; > @@ -678,6 +679,7 @@ static int gve_tx_fill_xdp(struct gve_priv *priv, struct gve_tx_ring *tx, > info = &tx->info[reqi & tx->mask]; > info->xdp_frame = frame_p; > info->xdp.size = len; > + info->xdp.is_xsk = is_xsk; > > nfrags = gve_tx_alloc_fifo(&tx->tx_fifo, pad + len, > &info->iov[0]); > @@ -755,7 +757,7 @@ int gve_xdp_xmit_one(struct gve_priv *priv, struct gve_tx_ring *tx, > if (!gve_can_tx(tx, len)) > return -EBUSY; > > - nsegs = gve_tx_fill_xdp(priv, tx, data, len, frame_p); > + nsegs = gve_tx_fill_xdp(priv, tx, data, len, frame_p, false); > tx->req += nsegs; > > if (flags & XDP_XMIT_FLUSH) > @@ -771,6 +773,7 @@ static int gve_clean_xdp_done(struct gve_priv *priv, struct gve_tx_ring *tx, > u32 clean_end = tx->done + to_do; > u64 pkts = 0, bytes = 0; > size_t space_freed = 0; > + u32 xsk_complete = 0; > u32 idx; > int i; > > @@ -783,6 +786,7 @@ static int gve_clean_xdp_done(struct gve_priv *priv, struct gve_tx_ring *tx, > > bytes += info->xdp.size; > pkts++; > + xsk_complete += info->xdp.is_xsk; > > info->xdp.size = 0; > if (info->xdp_frame) { > @@ -799,6 +803,8 @@ static int gve_clean_xdp_done(struct gve_priv *priv, struct gve_tx_ring *tx, > } > > gve_tx_free_fifo(&tx->tx_fifo, space_freed); > + if (xsk_complete > 0 && tx->xsk_pool) > + xsk_tx_completed(tx->xsk_pool, xsk_complete); > u64_stats_update_begin(&tx->statss); > tx->bytes_done += bytes; > tx->pkt_done += pkts; > @@ -877,11 +883,43 @@ u32 gve_tx_load_event_counter(struct gve_priv *priv, > return be32_to_cpu(counter); > } > > +static int gve_xsk_tx(struct gve_priv *priv, struct gve_tx_ring *tx, > + int budget) > +{ > + struct xdp_desc desc; > + int sent = 0, nsegs; > + void *data; > + > + spin_lock(&tx->xdp_lock); > + while (sent < budget) { > + if (!gve_can_tx(tx, GVE_TX_START_THRESH)) > + goto out; > + > + if (!xsk_tx_peek_desc(tx->xsk_pool, &desc)) { you could use batch API here > + tx->xdp_xsk_done = tx->xdp_xsk_wakeup; > + goto out; > + } > + > + data = xsk_buff_raw_get_data(tx->xsk_pool, desc.addr); > + nsegs = gve_tx_fill_xdp(priv, tx, data, desc.len, NULL, true); > + tx->req += nsegs; > + sent++; > + } > +out: > + if (sent > 0) { > + gve_tx_put_doorbell(priv, tx->q_resources, tx->req); > + xsk_tx_release(tx->xsk_pool); > + } > + spin_unlock(&tx->xdp_lock); > + return sent; > +} > + > bool gve_xdp_poll(struct gve_notify_block *block, int budget) > { > struct gve_priv *priv = block->priv; > struct gve_tx_ring *tx = block->tx; > u32 nic_done; > + bool repoll; > u32 to_do; > > /* If budget is 0, do all the work */ > @@ -892,7 +930,21 @@ bool gve_xdp_poll(struct gve_notify_block *block, int budget) > nic_done = gve_tx_load_event_counter(priv, tx); > to_do = min_t(u32, (nic_done - tx->done), budget); > gve_clean_xdp_done(priv, tx, to_do); > - return nic_done != tx->done; > + repoll = nic_done != tx->done; > + > + if (tx->xsk_pool) { > + int sent = gve_xsk_tx(priv, tx, budget); > + > + u64_stats_update_begin(&tx->statss); > + tx->xdp_xsk_sent += sent; > + u64_stats_update_end(&tx->statss); > + repoll |= (sent == budget); > + if (xsk_uses_need_wakeup(tx->xsk_pool)) > + xsk_set_tx_need_wakeup(tx->xsk_pool); > + } > + > + /* If we still have work we want to repoll */ > + return repoll; > } > > bool gve_tx_poll(struct gve_notify_block *block, int budget) > -- > 2.39.1.581.gbfd45094c4-goog >
diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/google/gve/gve.h index f89b1278db70..793b054580e3 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -248,6 +248,8 @@ struct gve_rx_ring { /* XDP stuff */ struct xdp_rxq_info xdp_rxq; + struct xdp_rxq_info xsk_rxq; + struct xsk_buff_pool *xsk_pool; struct page_frag_cache page_cache; }; @@ -275,6 +277,7 @@ struct gve_tx_buffer_state { }; struct { u16 size; /* size of xmitted xdp pkt */ + u8 is_xsk; /* xsk buff */ } xdp; union { struct gve_tx_iovec iov[GVE_TX_MAX_IOVEC]; /* segments of this pkt */ @@ -469,6 +472,10 @@ struct gve_tx_ring { dma_addr_t q_resources_bus; /* dma address of the queue resources */ dma_addr_t complq_bus_dqo; /* dma address of the dqo.compl_ring */ struct u64_stats_sync statss; /* sync stats for 32bit archs */ + struct xsk_buff_pool *xsk_pool; + u32 xdp_xsk_wakeup; + u32 xdp_xsk_done; + u64 xdp_xsk_sent; u64 xdp_xmit; u64 xdp_xmit_errors; } ____cacheline_aligned; diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/ethernet/google/gve/gve_ethtool.c index 57940f90c6be..89accad6c13a 100644 --- a/drivers/net/ethernet/google/gve/gve_ethtool.c +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c @@ -62,8 +62,8 @@ static const char gve_gstrings_rx_stats[][ETH_GSTRING_LEN] = { static const char gve_gstrings_tx_stats[][ETH_GSTRING_LEN] = { "tx_posted_desc[%u]", "tx_completed_desc[%u]", "tx_consumed_desc[%u]", "tx_bytes[%u]", "tx_wake[%u]", "tx_stop[%u]", "tx_event_counter[%u]", - "tx_dma_mapping_error[%u]", - "tx_xdp_xmit[%u]", "tx_xdp_xmit_errors[%u]" + "tx_dma_mapping_error[%u]", "tx_xsk_wakeup[%u]", + "tx_xsk_done[%u]", "tx_xsk_sent[%u]", "tx_xdp_xmit[%u]", "tx_xdp_xmit_errors[%u]" }; static const char gve_gstrings_adminq_stats[][ETH_GSTRING_LEN] = { @@ -380,13 +380,17 @@ gve_get_ethtool_stats(struct net_device *netdev, data[i++] = value; } } + /* XDP xsk counters */ + data[i++] = tx->xdp_xsk_wakeup; + data[i++] = tx->xdp_xsk_done; do { start = u64_stats_fetch_begin(&priv->tx[ring].statss); - data[i] = tx->xdp_xmit; - data[i + 1] = tx->xdp_xmit_errors; + data[i] = tx->xdp_xsk_sent; + data[i + 1] = tx->xdp_xmit; + data[i + 2] = tx->xdp_xmit_errors; } while (u64_stats_fetch_retry(&priv->tx[ring].statss, start)); - i += 2; /* XDP tx counters */ + i += 3; /* XDP tx counters */ } } else { i += num_tx_queues * NUM_GVE_TX_CNTS; diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 4398e5887f3b..a0edf94d20db 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -17,6 +17,7 @@ #include <linux/utsname.h> #include <linux/version.h> #include <net/sch_generic.h> +#include <net/xdp_sock_drv.h> #include "gve.h" #include "gve_dqo.h" #include "gve_adminq.h" @@ -983,7 +984,7 @@ static void gve_turnup(struct gve_priv *priv); static int gve_reg_xdp_info(struct gve_priv *priv, struct net_device *dev) { - int err = 0, i; + int err = 0, i, tx_qid; for (i = 0; i < priv->rx_cfg.num_queues; i++) { struct gve_rx_ring *rx = &priv->rx[i]; @@ -998,6 +999,24 @@ static int gve_reg_xdp_info(struct gve_priv *priv, struct net_device *dev) MEM_TYPE_PAGE_SHARED, NULL); if (err) goto out; + err = xdp_rxq_info_reg(&rx->xsk_rxq, dev, i, + napi->napi_id); + if (err) + goto out; + err = xdp_rxq_info_reg_mem_model(&rx->xsk_rxq, + MEM_TYPE_XSK_BUFF_POOL, NULL); + if (err) + goto out; + rx->xsk_pool = xsk_get_pool_from_qid(dev, i); + if (rx->xsk_pool) { + xsk_pool_set_rxq_info(rx->xsk_pool, + &rx->xsk_rxq); + } + } + + for (i = 0; i < priv->num_xdp_queues; i++) { + tx_qid = gve_xdp_tx_queue_id(priv, i); + priv->tx[tx_qid].xsk_pool = xsk_get_pool_from_qid(dev, i); } out: @@ -1006,12 +1025,19 @@ static int gve_reg_xdp_info(struct gve_priv *priv, struct net_device *dev) static void gve_unreg_xdp_info(struct gve_priv *priv) { - int i; + int i, tx_qid; for (i = 0; i < priv->rx_cfg.num_queues; i++) { struct gve_rx_ring *rx = &priv->rx[i]; xdp_rxq_info_unreg(&rx->xdp_rxq); + xdp_rxq_info_unreg(&rx->xsk_rxq); + rx->xsk_pool = NULL; + } + + for (i = 0; i < priv->num_xdp_queues; i++) { + tx_qid = gve_xdp_tx_queue_id(priv, i); + priv->tx[tx_qid].xsk_pool = NULL; } } @@ -1182,6 +1208,104 @@ static int gve_set_xdp(struct gve_priv *priv, struct bpf_prog *prog, return 0; } +static int gve_xsk_pool_enable(struct net_device *dev, + struct xsk_buff_pool *pool, + u16 qid) +{ + struct gve_priv *priv = netdev_priv(dev); + int tx_qid; + int err; + + if (qid >= priv->rx_cfg.num_queues) { + dev_err(&priv->pdev->dev, "xsk pool invalid qid %d", qid); + return -EINVAL; + } + if (pool->frame_len < priv->dev->max_mtu + sizeof(struct ethhdr)) { + dev_err(&priv->pdev->dev, "xsk pool frame_len too small"); + return -EINVAL; + } + + err = xsk_pool_dma_map(pool, &priv->pdev->dev, + DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING); + if (err) + return err; + xsk_pool_set_rxq_info(pool, &priv->rx[qid].xsk_rxq); + tx_qid = gve_xdp_tx_queue_id(priv, qid); + priv->rx[qid].xsk_pool = pool; + priv->tx[tx_qid].xsk_pool = pool; + + return 0; +} + +static int gve_xsk_pool_disable(struct net_device *dev, + u16 qid) +{ + struct gve_priv *priv = netdev_priv(dev); + struct napi_struct *napi_tx; + struct xsk_buff_pool *pool; + int sleep = 2000; + int tx_qid; + + pool = xsk_get_pool_from_qid(dev, qid); + if (!pool) + return -EINVAL; + if (qid >= priv->rx_cfg.num_queues) + return -EINVAL; + + tx_qid = gve_xdp_tx_queue_id(priv, qid); + priv->rx[qid].xsk_pool = NULL; + priv->tx[tx_qid].xsk_pool = NULL; + + /* Make sure it is visible to the workers on datapath */ + smp_mb(); + + if (!netif_running(dev) || !priv->xdp_prog) + goto done; + + napi_tx = &priv->ntfy_blocks[priv->tx[tx_qid].ntfy_id].napi; + napi_disable(napi_tx); /* make sure current tx poll is done */ + napi_enable(napi_tx); /* simply pair with disable */ + if (gve_tx_clean_pending(priv, &priv->tx[tx_qid])) + napi_schedule(napi_tx); + + /* make sure no xdp_buff floating */ + while (pool->free_heads_cnt < pool->heads_cnt && sleep > 0) { + usleep_range(1000, 2000); + sleep--; + } + if (sleep <= 0) + return -EBUSY; + +done: + xsk_pool_dma_unmap(pool, + DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING); + return 0; +} + +static int gve_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags) +{ + struct gve_priv *priv = netdev_priv(dev); + int tx_queue_id = gve_xdp_tx_queue_id(priv, queue_id); + + if (queue_id >= priv->rx_cfg.num_queues || !priv->xdp_prog) + return -EINVAL; + + if (flags & XDP_WAKEUP_TX) { + struct gve_tx_ring *tx = &priv->tx[tx_queue_id]; + struct napi_struct *napi = + &priv->ntfy_blocks[tx->ntfy_id].napi; + + /* Call local_bh_enable to trigger SoftIRQ processing */ + local_bh_disable(); + napi_schedule(napi); + local_bh_enable(); + + tx->xdp_xsk_wakeup++; + } + + return 0; +} + static int verify_xdp_configuration(struct net_device *dev) { struct gve_priv *priv = netdev_priv(dev); @@ -1225,6 +1349,11 @@ static int gve_xdp(struct net_device *dev, struct netdev_bpf *xdp) switch (xdp->command) { case XDP_SETUP_PROG: return gve_set_xdp(priv, xdp->prog, xdp->extack); + case XDP_SETUP_XSK_POOL: + if (xdp->xsk.pool) + return gve_xsk_pool_enable(dev, xdp->xsk.pool, xdp->xsk.queue_id); + else + return gve_xsk_pool_disable(dev, xdp->xsk.queue_id); default: return -EINVAL; } @@ -1426,6 +1555,7 @@ static const struct net_device_ops gve_netdev_ops = { .ndo_set_features = gve_set_features, .ndo_bpf = gve_xdp, .ndo_xdp_xmit = gve_xdp_xmit, + .ndo_xsk_wakeup = gve_xsk_wakeup, }; static void gve_handle_status(struct gve_priv *priv, u32 status) diff --git a/drivers/net/ethernet/google/gve/gve_rx.c b/drivers/net/ethernet/google/gve/gve_rx.c index ea833388f895..1ee95c56ce2b 100644 --- a/drivers/net/ethernet/google/gve/gve_rx.c +++ b/drivers/net/ethernet/google/gve/gve_rx.c @@ -10,6 +10,7 @@ #include <linux/etherdevice.h> #include <linux/filter.h> #include <net/xdp.h> +#include <net/xdp_sock_drv.h> static void gve_rx_free_buffer(struct device *dev, struct gve_rx_slot_page_info *page_info, @@ -593,6 +594,31 @@ static struct sk_buff *gve_rx_skb(struct gve_priv *priv, struct gve_rx_ring *rx, return skb; } +static int gve_xsk_pool_redirect(struct net_device *dev, + struct gve_rx_ring *rx, + void *data, int len, + struct bpf_prog *xdp_prog) +{ + struct xdp_buff *xdp; + int err; + + if (rx->xsk_pool->frame_len < len) + return -E2BIG; + xdp = xsk_buff_alloc(rx->xsk_pool); + if (!xdp) { + u64_stats_update_begin(&rx->statss); + rx->xdp_alloc_fails++; + u64_stats_update_end(&rx->statss); + return -ENOMEM; + } + xdp->data_end = xdp->data + len; + memcpy(xdp->data, data, len); + err = xdp_do_redirect(dev, xdp, xdp_prog); + if (err) + xsk_buff_free(xdp); + return err; +} + static int gve_xdp_redirect(struct net_device *dev, struct gve_rx_ring *rx, struct xdp_buff *orig, struct bpf_prog *xdp_prog) { @@ -602,6 +628,10 @@ static int gve_xdp_redirect(struct net_device *dev, struct gve_rx_ring *rx, void *frame; int err; + if (rx->xsk_pool) + return gve_xsk_pool_redirect(dev, rx, orig->data, + len, xdp_prog); + total_len = headroom + SKB_DATA_ALIGN(len) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); frame = page_frag_alloc(&rx->page_cache, total_len, GFP_ATOMIC); diff --git a/drivers/net/ethernet/google/gve/gve_tx.c b/drivers/net/ethernet/google/gve/gve_tx.c index b5261985a1fc..caaae2fe701e 100644 --- a/drivers/net/ethernet/google/gve/gve_tx.c +++ b/drivers/net/ethernet/google/gve/gve_tx.c @@ -11,6 +11,7 @@ #include <linux/tcp.h> #include <linux/vmalloc.h> #include <linux/skbuff.h> +#include <net/xdp_sock_drv.h> static inline void gve_tx_put_doorbell(struct gve_priv *priv, struct gve_queue_resources *q_resources, @@ -666,7 +667,7 @@ netdev_tx_t gve_tx(struct sk_buff *skb, struct net_device *dev) } static int gve_tx_fill_xdp(struct gve_priv *priv, struct gve_tx_ring *tx, - void *data, int len, void *frame_p) + void *data, int len, void *frame_p, bool is_xsk) { int pad, nfrags, ndescs, iovi, offset; struct gve_tx_buffer_state *info; @@ -678,6 +679,7 @@ static int gve_tx_fill_xdp(struct gve_priv *priv, struct gve_tx_ring *tx, info = &tx->info[reqi & tx->mask]; info->xdp_frame = frame_p; info->xdp.size = len; + info->xdp.is_xsk = is_xsk; nfrags = gve_tx_alloc_fifo(&tx->tx_fifo, pad + len, &info->iov[0]); @@ -755,7 +757,7 @@ int gve_xdp_xmit_one(struct gve_priv *priv, struct gve_tx_ring *tx, if (!gve_can_tx(tx, len)) return -EBUSY; - nsegs = gve_tx_fill_xdp(priv, tx, data, len, frame_p); + nsegs = gve_tx_fill_xdp(priv, tx, data, len, frame_p, false); tx->req += nsegs; if (flags & XDP_XMIT_FLUSH) @@ -771,6 +773,7 @@ static int gve_clean_xdp_done(struct gve_priv *priv, struct gve_tx_ring *tx, u32 clean_end = tx->done + to_do; u64 pkts = 0, bytes = 0; size_t space_freed = 0; + u32 xsk_complete = 0; u32 idx; int i; @@ -783,6 +786,7 @@ static int gve_clean_xdp_done(struct gve_priv *priv, struct gve_tx_ring *tx, bytes += info->xdp.size; pkts++; + xsk_complete += info->xdp.is_xsk; info->xdp.size = 0; if (info->xdp_frame) { @@ -799,6 +803,8 @@ static int gve_clean_xdp_done(struct gve_priv *priv, struct gve_tx_ring *tx, } gve_tx_free_fifo(&tx->tx_fifo, space_freed); + if (xsk_complete > 0 && tx->xsk_pool) + xsk_tx_completed(tx->xsk_pool, xsk_complete); u64_stats_update_begin(&tx->statss); tx->bytes_done += bytes; tx->pkt_done += pkts; @@ -877,11 +883,43 @@ u32 gve_tx_load_event_counter(struct gve_priv *priv, return be32_to_cpu(counter); } +static int gve_xsk_tx(struct gve_priv *priv, struct gve_tx_ring *tx, + int budget) +{ + struct xdp_desc desc; + int sent = 0, nsegs; + void *data; + + spin_lock(&tx->xdp_lock); + while (sent < budget) { + if (!gve_can_tx(tx, GVE_TX_START_THRESH)) + goto out; + + if (!xsk_tx_peek_desc(tx->xsk_pool, &desc)) { + tx->xdp_xsk_done = tx->xdp_xsk_wakeup; + goto out; + } + + data = xsk_buff_raw_get_data(tx->xsk_pool, desc.addr); + nsegs = gve_tx_fill_xdp(priv, tx, data, desc.len, NULL, true); + tx->req += nsegs; + sent++; + } +out: + if (sent > 0) { + gve_tx_put_doorbell(priv, tx->q_resources, tx->req); + xsk_tx_release(tx->xsk_pool); + } + spin_unlock(&tx->xdp_lock); + return sent; +} + bool gve_xdp_poll(struct gve_notify_block *block, int budget) { struct gve_priv *priv = block->priv; struct gve_tx_ring *tx = block->tx; u32 nic_done; + bool repoll; u32 to_do; /* If budget is 0, do all the work */ @@ -892,7 +930,21 @@ bool gve_xdp_poll(struct gve_notify_block *block, int budget) nic_done = gve_tx_load_event_counter(priv, tx); to_do = min_t(u32, (nic_done - tx->done), budget); gve_clean_xdp_done(priv, tx, to_do); - return nic_done != tx->done; + repoll = nic_done != tx->done; + + if (tx->xsk_pool) { + int sent = gve_xsk_tx(priv, tx, budget); + + u64_stats_update_begin(&tx->statss); + tx->xdp_xsk_sent += sent; + u64_stats_update_end(&tx->statss); + repoll |= (sent == budget); + if (xsk_uses_need_wakeup(tx->xsk_pool)) + xsk_set_tx_need_wakeup(tx->xsk_pool); + } + + /* If we still have work we want to repoll */ + return repoll; } bool gve_tx_poll(struct gve_notify_block *block, int budget)