[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <64fa6e0c14e15a13720e00211da82f56e2e94397.camel@gmail.com>
Date: Mon, 02 Jan 2023 09:02:20 -0800
From: Alexander H Duyck <alexander.duyck@...il.com>
To: William Tu <u9012063@...il.com>, netdev@...r.kernel.org
Cc: tuc@...are.com, gyang@...are.com, doshir@...are.com
Subject: Re: [RFC PATCH v7] vmxnet3: Add XDP support.
On Thu, 2022-12-22 at 07:46 -0800, William Tu wrote:
> The patch adds native-mode XDP support: XDP DROP, PASS, TX, and REDIRECT.
>
> Background:
> The vmxnet3 rx consists of three rings: ring0, ring1, and dataring.
> For r0 and r1, buffers at r0 are allocated using alloc_skb APIs and dma
> mapped to the ring's descriptor. If LRO is enabled and packet size larger
> than 3K, VMXNET3_MAX_SKB_BUF_SIZE, then r1 is used to mapped the rest of
> the buffer larger than VMXNET3_MAX_SKB_BUF_SIZE. Each buffer in r1 is
> allocated using alloc_page. So for LRO packets, the payload will be in one
> buffer from r0 and multiple from r1, for non-LRO packets, only one
> descriptor in r0 is used for packet size less than 3k.
>
> When receiving a packet, the first descriptor will have the sop (start of
> packet) bit set, and the last descriptor will have the eop (end of packet)
> bit set. Non-LRO packets will have only one descriptor with both sop and
> eop set.
>
> Other than r0 and r1, vmxnet3 dataring is specifically designed for
> handling packets with small size, usually 128 bytes, defined in
> VMXNET3_DEF_RXDATA_DESC_SIZE, by simply copying the packet from the backend
> driver in ESXi to the ring's memory region at front-end vmxnet3 driver, in
> order to avoid memory mapping/unmapping overhead. In summary, packet size:
> A. < 128B: use dataring
> B. 128B - 3K: use ring0 (VMXNET3_RX_BUF_SKB)
> C. > 3K: use ring0 and ring1 (VMXNET3_RX_BUF_SKB + VMXNET3_RX_BUF_PAGE)
> As a result, the patch adds XDP support for packets using dataring
> and r0 (case A and B), not the large packet size when LRO is enabled.
>
> XDP Implementation:
> When user loads and XDP prog, vmxnet3 driver checks configurations, such
> as mtu, lro, and re-allocate the rx buffer size for reserving the extra
> headroom, XDP_PACKET_HEADROOM, for XDP frame. The XDP prog will then be
> associated with every rx queue of the device. Note that when using dataring
> for small packet size, vmxnet3 (front-end driver) doesn't control the
> buffer allocation, as a result the XDP frame's headroom is zero.
>
> The receive side of XDP is implemented for case A and B, by invoking the
> bpf program at vmxnet3_rq_rx_complete and handle its returned action.
> The new vmxnet3_run_xdp function handles the difference of using dataring
> or ring0, and decides the next journey of the packet afterward.
>
> For TX, vmxnet3 has split header design. Outgoing packets are parsed
> first and protocol headers (L2/L3/L4) are copied to the backend. The
> rest of the payload are dma mapped. Since XDP_TX does not parse the
> packet protocol, the entire XDP frame is using dma mapped for the
> transmission. Because the actual TX is deferred until txThreshold, it's
> possible that an rx buffer is being overwritten by incoming burst of rx
> packets, before tx buffer being transmitted. As a result, we allocate new
> skb and introduce a copy.
>
> Performance:
> Tested using two VMs inside one ESXi machine, using single core on each
> vmxnet3 device, sender using DPDK testpmd tx-mode attached to vmxnet3
> device, sending 64B or 512B packet.
>
> VM1 txgen:
> $ dpdk-testpmd -l 0-3 -n 1 -- -i --nb-cores=3 \
> --forward-mode=txonly --eth-peer=0,<mac addr of vm2>
> option: add "--txonly-multi-flow"
> option: use --txpkts=512 or 64 byte
>
> VM2 running XDP:
> $ ./samples/bpf/xdp_rxq_info -d ens160 -a <options> --skb-mode
> $ ./samples/bpf/xdp_rxq_info -d ens160 -a <options>
> options: XDP_DROP, XDP_PASS, XDP_TX
>
> To test REDIRECT to cpu 0, use
> $ ./samples/bpf/xdp_redirect_cpu -d ens160 -c 0 -e <drop or pass>
>
> Single core performance comparison with skb-mode.
> 64B: skb-mode -> native-mode (with this patch)
> XDP_DROP: 932Kpps -> 2.0Mpps
> XDP_PASS: 284Kpps -> 314Kpps
> XDP_TX: 591Kpps -> 1.8Mpps
> REDIRECT
> cpu-drop: 435Kpps -> 1.1Mpps
> cpu-pass: 387Kpps -> memory leak
>
> 512B: skb-mode -> native-mode (with this patch)
> XDP_DROP: 890Kpps -> 1.3Mpps
> XDP_PASS: 284Kpps -> 314Kpps
> XDP_TX: 555Kpps -> 1.2Mpps
>
> Limitations:
> a. LRO will be disabled when users load XDP program
> b. MTU will be checked and limit to
> VMXNET3_MAX_SKB_BUF_SIZE(3K) - XDP_PACKET_HEADROOM(256) -
> SKB_DATA_ALIGN(sizeof(struct skb_shared_info))
>
> Signed-off-by: William Tu <u9012063@...il.com>
So after looking over the patch it occurs to me that you may want to
lay some additional ground work before you start trying to natively
enable XDP.
Specifically you may want to look at not using sk_buff as your
structure you store in your Rx rings. Instead it would be better to
just store pages as those can easily be loaded into either an skb or an
xdp_frame without having to do conversion tricks such as taking a page
reference and then freeing the skb.
Likewise you may want to look at cleaning up your Tx path to make
similar changes where you can add a flag and either free an xdp_frame
or an sk_buff so that you don't have to resort to memory copies in
order to convert between types.
> ---
> v6 -> v7:
> work on feedbacks from Alexander Duyck on XDP_TX and XDP_REDIRECT
> - fix memleak of xdp frame when doing ndo_xdp_xmit (vmxnet3_xdp_xmit)
> - at vmxnet3_xdp_xmit_frame, fix return value, -NOSPC and ENOMEM,
> and free skb when dma map fails
> - add xdp_buff_clean_frags_flag since we don't support frag
> - update experiements of XDP_TX and XDP_REDIRECT
> - for XDP_REDIRECT, I assume calling xdp_do_redirect will take
> the buffer and free it, so I need to allocate a new buffer to
> refill the rx ring. However, I hit some OOM when testing using
> ./samples/bpf/xdp_redirect_cpu -d ens160 -c 0 -e <drop or pass>
> - I couldn't find the reason so mark this patch as RFC
>
> v5 -> v6:
> work on feedbacks from Alexander Duyck
> - remove unused skb parameter at vmxnet3_xdp_xmit
> - add trace point for XDP_ABORTED
> - avoid TX packet buffer being overwritten by allocatin
> new skb and memcpy (TX performance drop from 2.3 to 1.8Mpps)
> - update some of the performance number and a demo video
> https://youtu.be/I3nx5wQDTXw
> - pass VMware internal regression test using non-ENS: vmxnet3v2,
> vmxnet3v3, vmxnet3v4, so remove RFC tag.
>
> v4 -> v5:
> - move XDP code to separate file: vmxnet3_xdp.{c, h},
> suggested by Guolin
> - expose vmxnet3_rq_create_all and vmxnet3_adjust_rx_ring_size
> - more test using samples/bpf/{xdp1, xdp2, xdp_adjust_tail}
> - add debug print
> - rebase on commit 65e6af6cebe
>
>
>
<...>
> +static int
> +vmxnet3_xdp_xmit_frame(struct vmxnet3_adapter *adapter,
> + struct xdp_frame *xdpf,
> + struct vmxnet3_tx_queue *tq)
> +{
> + struct vmxnet3_tx_buf_info *tbi = NULL;
> + union Vmxnet3_GenericDesc *gdesc;
> + struct vmxnet3_tx_ctx ctx;
> + int tx_num_deferred;
> + struct sk_buff *skb;
> + u32 buf_size;
> + int ret = 0;
> + u32 dw2;
> +
> + if (vmxnet3_cmd_ring_desc_avail(&tq->tx_ring) == 0) {
> + tq->stats.tx_ring_full++;
> + ret = -ENOSPC;
> + goto exit;
> + }
> +
> + skb = __netdev_alloc_skb(adapter->netdev, xdpf->len, GFP_KERNEL);
> + if (unlikely(!skb)) {
> + ret = -ENOMEM;
> + goto exit;
> + }
> +
> + memcpy(skb->data, xdpf->data, xdpf->len);
Rather than adding all this overhead to copy the frame into an skb it
would be better to look at supporting the xdp_frame format natively in
your Tx path/cleanup.
This extra copy overhead will make things more expensive and kind of
defeat the whole purpose of the XDP code.
> + dw2 = (tq->tx_ring.gen ^ 0x1) << VMXNET3_TXD_GEN_SHIFT;
> + dw2 |= xdpf->len;
> + ctx.sop_txd = tq->tx_ring.base + tq->tx_ring.next2fill;
> + gdesc = ctx.sop_txd;
> +
> + buf_size = xdpf->len;
> + tbi = tq->buf_info + tq->tx_ring.next2fill;
> + tbi->map_type = VMXNET3_MAP_SINGLE;
> + tbi->dma_addr = dma_map_single(&adapter->pdev->dev,
> + skb->data, buf_size,
> + DMA_TO_DEVICE);
> + if (dma_mapping_error(&adapter->pdev->dev, tbi->dma_addr)) {
> + dev_kfree_skb(skb);
> + ret = -EFAULT;
> + goto exit;
> + }
> + tbi->len = buf_size;
> +
> + gdesc = tq->tx_ring.base + tq->tx_ring.next2fill;
> + WARN_ON_ONCE(gdesc->txd.gen == tq->tx_ring.gen);
> +
> + gdesc->txd.addr = cpu_to_le64(tbi->dma_addr);
> + gdesc->dword[2] = cpu_to_le32(dw2);
> +
> + /* Setup the EOP desc */
> + gdesc->dword[3] = cpu_to_le32(VMXNET3_TXD_CQ | VMXNET3_TXD_EOP);
> +
> + gdesc->txd.om = 0;
> + gdesc->txd.msscof = 0;
> + gdesc->txd.hlen = 0;
> + gdesc->txd.ti = 0;
> +
> + tx_num_deferred = le32_to_cpu(tq->shared->txNumDeferred);
> + tq->shared->txNumDeferred += 1;
> + tx_num_deferred++;
> +
> + vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring);
> +
> + /* set the last buf_info for the pkt */
> + tbi->skb = skb;
> + tbi->sop_idx = ctx.sop_txd - tq->tx_ring.base;
> +
> + dma_wmb();
> + gdesc->dword[2] = cpu_to_le32(le32_to_cpu(gdesc->dword[2]) ^
> + VMXNET3_TXD_GEN);
> + if (tx_num_deferred >= le32_to_cpu(tq->shared->txThreshold)) {
> + tq->shared->txNumDeferred = 0;
> + VMXNET3_WRITE_BAR0_REG(adapter,
> + VMXNET3_REG_TXPROD + tq->qid * 8,
> + tq->tx_ring.next2fill);
> + }
> +exit:
> + return ret;
> +}
> +
> +static int
> +vmxnet3_xdp_xmit_back(struct vmxnet3_adapter *adapter,
> + struct xdp_frame *xdpf)
> +{
> + struct vmxnet3_tx_queue *tq;
> + struct netdev_queue *nq;
> + int err = 0, cpu;
> + int tq_number;
> +
> + tq_number = adapter->num_tx_queues;
> + cpu = smp_processor_id();
> + tq = &adapter->tx_queue[cpu % tq_number];
> + if (tq->stopped)
> + return -ENETDOWN;
> +
> + nq = netdev_get_tx_queue(adapter->netdev, tq->qid);
> +
> + __netif_tx_lock(nq, cpu);
> + err = vmxnet3_xdp_xmit_frame(adapter, xdpf, tq);
> + if (err)
> + goto exit;
> +
> +exit:
> + __netif_tx_unlock(nq);
> + return err;
> +}
> +
> +int
> +vmxnet3_xdp_xmit(struct net_device *dev,
> + int n, struct xdp_frame **frames, u32 flags)
> +{
> + struct vmxnet3_adapter *adapter;
> + struct vmxnet3_tx_queue *tq;
> + struct netdev_queue *nq;
> + int i, err, cpu;
> + int nxmit = 0;
> + int tq_number;
> +
> + adapter = netdev_priv(dev);
> +
> + if (unlikely(test_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state)))
> + return -ENETDOWN;
> + if (unlikely(test_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state)))
> + return -EINVAL;
> +
> + tq_number = adapter->num_tx_queues;
> + cpu = smp_processor_id();
> + tq = &adapter->tx_queue[cpu % tq_number];
> + if (tq->stopped)
> + return -ENETDOWN;
> +
> + nq = netdev_get_tx_queue(adapter->netdev, tq->qid);
> +
> + __netif_tx_lock(nq, cpu);
> + for (i = 0; i < n; i++) {
> + err = vmxnet3_xdp_xmit_frame(adapter, frames[i], tq);
> + /* vmxnet3_xdp_xmit_frame has copied the data
> + * to skb, so we free xdp frame below.
> + */
> + get_page(virt_to_page(frames[i]->data));
What is this get_page for? I thought your transmit path was doing a
copy out of the data. This is probably the source of your memory leak.
> + xdp_return_frame(frames[i]);
> + if (err) {
> + tq->stats.xdp_xmit_err++;
> + break;
> + }
> + nxmit++;
> + }
> +
> + tq->stats.xdp_xmit += nxmit;
> + __netif_tx_unlock(nq);
> +
> + return nxmit;
> +}
> +
> +static int
> +__vmxnet3_run_xdp(struct vmxnet3_rx_queue *rq, void *data, int data_len,
> + int headroom, int frame_sz, bool *need_xdp_flush,
> + struct sk_buff *skb)
> +{
> + struct xdp_frame *xdpf;
> + void *buf_hard_start;
> + struct xdp_buff xdp;
> + void *orig_data;
> + int err, delta;
> + int delta_len;
> + u32 act;
> +
> + buf_hard_start = data;
> + xdp_init_buff(&xdp, frame_sz, &rq->xdp_rxq);
> + xdp_prepare_buff(&xdp, buf_hard_start, headroom, data_len, true);
> + xdp_buff_clear_frags_flag(&xdp);
> + orig_data = xdp.data;
> +
> + act = bpf_prog_run_xdp(rq->xdp_bpf_prog, &xdp);
> + rq->stats.xdp_packets++;
> +
> + switch (act) {
> + case XDP_DROP:
> + rq->stats.xdp_drops++;
> + break;
> + case XDP_PASS:
> + /* bpf prog might change len and data position.
> + * dataring does not use skb so not support this.
> + */
> + delta = xdp.data - orig_data;
> + delta_len = (xdp.data_end - xdp.data) - data_len;
> + if (skb) {
> + skb_reserve(skb, delta);
> + skb_put(skb, delta_len);
> + }
> + break;
> + case XDP_TX:
> + xdpf = xdp_convert_buff_to_frame(&xdp);
> + if (!xdpf ||
> + vmxnet3_xdp_xmit_back(rq->adapter, xdpf)) {
> + rq->stats.xdp_drops++;
> + } else {
> + rq->stats.xdp_tx++;
> + }
> + break;
> + case XDP_ABORTED:
> + trace_xdp_exception(rq->adapter->netdev, rq->xdp_bpf_prog,
> + act);
> + rq->stats.xdp_aborted++;
> + break;
> + case XDP_REDIRECT:
> + get_page(virt_to_page(data));
So if I am understanding correctly this get_page is needed because we
are converting the skb into an xdp_buff before you attempt to redirect
it right?
So this additional reference should be released when you free the skb?
Also you might want to add some logic to verify that skb->data is a
head_frag and not allocated from slab memory. Also I'm assuming the
size is a constant?
> + xdp_buff_clear_frags_flag(&xdp);
> + err = xdp_do_redirect(rq->adapter->netdev, &xdp,
> + rq->xdp_bpf_prog);
> + if (!err) {
> + rq->stats.xdp_redirects++;
> + } else {
> + rq->stats.xdp_drops++;
> + trace_xdp_exception(rq->adapter->netdev,
> + rq->xdp_bpf_prog, act);
> + }
> + *need_xdp_flush = true;
> + break;
> + default:
> + bpf_warn_invalid_xdp_action(rq->adapter->netdev,
> + rq->xdp_bpf_prog, act);
> + break;
> + }
> + return act;
> +}
> +
> +static int
> +vmxnet3_run_xdp(struct vmxnet3_rx_queue *rq, struct vmxnet3_rx_buf_info *rbi,
> + struct Vmxnet3_RxCompDesc *rcd, bool *need_flush,
> + bool rxDataRingUsed)
> +{
> + struct vmxnet3_adapter *adapter;
> + struct ethhdr *ehdr;
> + int act = XDP_PASS;
> + void *data;
> + int sz;
> +
> + adapter = rq->adapter;
> + if (rxDataRingUsed) {
> + sz = rcd->rxdIdx * rq->data_ring.desc_size;
> + data = &rq->data_ring.base[sz];
> + ehdr = data;
> + netdev_dbg(adapter->netdev,
> + "XDP: rxDataRing packet size %d, eth proto 0x%x\n",
> + rcd->len, ntohs(ehdr->h_proto));
> + act = __vmxnet3_run_xdp(rq, data, rcd->len, 0,
> + rq->data_ring.desc_size, need_flush,
> + NULL);
> + } else {
> + dma_unmap_single(&adapter->pdev->dev,
> + rbi->dma_addr,
> + rbi->len,
> + DMA_FROM_DEVICE);
> + ehdr = (struct ethhdr *)rbi->skb->data;
> + netdev_dbg(adapter->netdev,
> + "XDP: packet size %d, eth proto 0x%x\n",
> + rcd->len, ntohs(ehdr->h_proto));
> + act = __vmxnet3_run_xdp(rq,
> + rbi->skb->data - XDP_PACKET_HEADROOM,
> + rcd->len, XDP_PACKET_HEADROOM,
> + rbi->len, need_flush, rbi->skb);
> + }
> + return act;
> +}
> +
> +int
> +vmxnet3_process_xdp(struct vmxnet3_adapter *adapter,
> + struct vmxnet3_rx_queue *rq,
> + struct Vmxnet3_RxCompDesc *rcd,
> + struct vmxnet3_rx_buf_info *rbi,
> + struct Vmxnet3_RxDesc *rxd,
> + bool *need_flush)
> +{
> + struct bpf_prog *xdp_prog;
> + dma_addr_t new_dma_addr;
> + struct sk_buff *new_skb;
> + bool reuse_buf = true;
> + bool rxDataRingUsed;
> + int ret, act;
> + int len;
> +
> + ret = VMXNET3_XDP_CONTINUE;
> + if (unlikely(rcd->len == 0))
> + return VMXNET3_XDP_TAKEN;
> +
> + rxDataRingUsed = VMXNET3_RX_DATA_RING(adapter, rcd->rqID);
> + rcu_read_lock();
> + xdp_prog = rcu_dereference(rq->xdp_bpf_prog);
> + if (!xdp_prog) {
> + rcu_read_unlock();
> + return VMXNET3_XDP_CONTINUE;
> + }
> + act = vmxnet3_run_xdp(rq, rbi, rcd, need_flush, rxDataRingUsed);
> + rcu_read_unlock();
> +
> + switch (act) {
> + case XDP_PASS:
> + return VMXNET3_XDP_CONTINUE;
> + case XDP_ABORTED:
> + trace_xdp_exception(rq->adapter->netdev,
> + rq->xdp_bpf_prog, act);
> + fallthrough;
> + case XDP_DROP:
> + case XDP_TX:
> + ret = VMXNET3_XDP_TAKEN;
> + reuse_buf = true;
> + break;
Ideally the XDP_TX would also be freeing the page but you still have
the memcpy in your Tx path. If you could get rid of that and natively
handle xdp_buf structures it would likely improve the overall
throughput for all your XDP cases.
> + case XDP_REDIRECT:
> + ret = VMXNET3_XDP_TAKEN;
> + /* redirect takes buf ownership, so need to refill. */
> + reuse_buf = false;
> + fallthrough;
> + default:
> + break;
> + }
> +
> + ret = VMXNET3_XDP_TAKEN;
> + if (rxDataRingUsed)
> + return ret;
> +
> + if (reuse_buf) {
> + /* reuse the existing buf on rx ring. */
> + new_skb = rbi->skb;
> + } else {
> + /* xdp_do_redirect takes the buf, so need to refill. */
> + new_skb = netdev_alloc_skb_ip_align(adapter->netdev,
> + rbi->len);
> + if (!new_skb) {
> + rq->stats.drop_total++;
> + rq->stats.rx_buf_alloc_failure++;
> + return ret;
> + }
> + skb_reserve(new_skb, XDP_PACKET_HEADROOM);
> + dev_kfree_skb(rbi->skb);
> + }
> + rbi->skb = new_skb;
> + new_dma_addr =
> + dma_map_single(&adapter->pdev->dev,
> + new_skb->data, rbi->len,
> + DMA_FROM_DEVICE);
> + if (dma_mapping_error(&adapter->pdev->dev,
> + new_dma_addr)) {
> + dev_kfree_skb(new_skb);
> + rq->stats.drop_total++;
> + rq->stats.rx_buf_alloc_failure++;
> + return ret;
> + }
> + rbi->dma_addr = new_dma_addr;
> + rxd->addr = cpu_to_le64(rbi->dma_addr);
> + rxd->len = rbi->len;
> + return ret;
> +}
> diff --git a/drivers/net/vmxnet3/vmxnet3_xdp.h b/drivers/net/vmxnet3/vmxnet3_xdp.h
> new file mode 100644
> index 000000000000..6a3c662a4464
> --- /dev/null
> +++ b/drivers/net/vmxnet3/vmxnet3_xdp.h
> @@ -0,0 +1,39 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later
> + *
> + * Linux driver for VMware's vmxnet3 ethernet NIC.
> + * Copyright (C) 2008-2023, VMware, Inc. All Rights Reserved.
> + * Maintained by: pv-drivers@...are.com
> + *
> + */
> +
> +#ifndef _VMXNET3_XDP_H
> +#define _VMXNET3_XDP_H
> +
> +#include <linux/filter.h>
> +#include <linux/bpf_trace.h>
> +#include <linux/netlink.h>
> +#include <net/xdp.h>
> +
> +#include "vmxnet3_int.h"
> +
> +#define VMXNET3_XDP_ROOM (SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) + \
> + XDP_PACKET_HEADROOM)
> +#define VMXNET3_XDP_MAX_MTU (VMXNET3_MAX_SKB_BUF_SIZE - VMXNET3_XDP_ROOM)
> +
> +#define VMXNET3_XDP_CONTINUE 0 /* Pass to the stack, ex: XDP_PASS. */
> +#define VMXNET3_XDP_TAKEN 1 /* Skip the stack, ex: XDP_DROP/TX/REDIRECT */
> +
> +int vmxnet3_xdp(struct net_device *netdev, struct netdev_bpf *bpf);
> +void vmxnet3_unregister_xdp_rxq(struct vmxnet3_rx_queue *rq);
> +int vmxnet3_register_xdp_rxq(struct vmxnet3_rx_queue *rq,
> + struct vmxnet3_adapter *adapter);
> +int vmxnet3_xdp_headroom(struct vmxnet3_adapter *adapter);
> +int vmxnet3_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,
> + u32 flags);
> +int vmxnet3_process_xdp(struct vmxnet3_adapter *adapter,
> + struct vmxnet3_rx_queue *rq,
> + struct Vmxnet3_RxCompDesc *rcd,
> + struct vmxnet3_rx_buf_info *rbi,
> + struct Vmxnet3_RxDesc *rxd,
> + bool *need_flush);
> +#endif
Powered by blists - more mailing lists