| Message ID | 20190716030637.5634-3-kevin.laatz@intel.com |
|---|---|
| State | Superseded |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | XDP unaligned chunk placement support | expand |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Kevin Laatz > Sent: Monday, July 15, 2019 8:06 PM > To: netdev@vger.kernel.org; ast@kernel.org; daniel@iogearbox.net; Topel, > Bjorn <bjorn.topel@intel.com>; Karlsson, Magnus > <magnus.karlsson@intel.com>; jakub.kicinski@netronome.com; > jonathan.lemon@gmail.com > Cc: Richardson, Bruce <bruce.richardson@intel.com>; Loftus, Ciara > <ciara.loftus@intel.com>; intel-wired-lan@lists.osuosl.org; > bpf@vger.kernel.org; Laatz, Kevin <kevin.laatz@intel.com> > Subject: [Intel-wired-lan] [PATCH v2 02/10] ixgbe: simplify Rx buffer recycle > > Currently, the dma, addr and handle are modified when we reuse Rx buffers > in zero-copy mode. However, this is not required as the inputs to the > function are copies, not the original values themselves. As we use the copies > within the function, we can use the original 'obi' values directly without > having to mask and add the headroom. > > Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c index 6b609553329f..bc86057628c8 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c @@ -201,8 +201,6 @@ ixgbe_rx_buffer *ixgbe_get_rx_buffer_zc(struct ixgbe_ring *rx_ring, static void ixgbe_reuse_rx_buffer_zc(struct ixgbe_ring *rx_ring, struct ixgbe_rx_buffer *obi) { - unsigned long mask = (unsigned long)rx_ring->xsk_umem->chunk_mask; - u64 hr = rx_ring->xsk_umem->headroom + XDP_PACKET_HEADROOM; u16 nta = rx_ring->next_to_alloc; struct ixgbe_rx_buffer *nbi; @@ -212,14 +210,9 @@ static void ixgbe_reuse_rx_buffer_zc(struct ixgbe_ring *rx_ring, rx_ring->next_to_alloc = (nta < rx_ring->count) ? nta : 0; /* transfer page from old buffer to new buffer */ - nbi->dma = obi->dma & mask; - nbi->dma += hr; - - nbi->addr = (void *)((unsigned long)obi->addr & mask); - nbi->addr += hr; - - nbi->handle = obi->handle & mask; - nbi->handle += rx_ring->xsk_umem->headroom; + nbi->dma = obi->dma; + nbi->addr = obi->addr; + nbi->handle = obi->handle; obi->addr = NULL; obi->skb = NULL;
Currently, the dma, addr and handle are modified when we reuse Rx buffers in zero-copy mode. However, this is not required as the inputs to the function are copies, not the original values themselves. As we use the copies within the function, we can use the original 'obi' values directly without having to mask and add the headroom. Signed-off-by: Kevin Laatz <kevin.laatz@intel.com> --- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)