[bpf-next,v5,01/15] xsk: fix xsk_umem_xdp_frame_sz()

Message ID	20200520192103.355233-2-bjorn.topel@gmail.com
State	Accepted
Delegated to:	BPF Maintainers
Headers	show Return-Path: <bpf-owner@vger.kernel.org> From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@gmail.com> To: ast@kernel.org, daniel@iogearbox.net, davem@davemloft.net, kuba@kernel.org, hawk@kernel.org, john.fastabend@gmail.com, netdev@vger.kernel.org, bpf@vger.kernel.org, magnus.karlsson@intel.com, jonathan.lemon@gmail.com, jeffrey.t.kirsher@intel.com Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@intel.com>, maximmi@mellanox.com, maciej.fijalkowski@intel.com Subject: [PATCH bpf-next v5 01/15] xsk: fix xsk_umem_xdp_frame_sz() Date: Wed, 20 May 2020 21:20:49 +0200 Message-Id: <20200520192103.355233-2-bjorn.topel@gmail.com> In-Reply-To: <20200520192103.355233-1-bjorn.topel@gmail.com> References: <20200520192103.355233-1-bjorn.topel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk
Series	Introduce AF_XDP buffer allocation API \| expand [bpf-next,v5,00/15] Introduce AF_XDP buffer allocation API [bpf-next,v5,01/15] xsk: fix xsk_umem_xdp_frame_sz() [bpf-next,v5,02/15] xsk: move xskmap.c to net/xdp/ [bpf-next,v5,03/15] xsk: move driver interface to xdp_sock_drv.h [bpf-next,v5,04/15] xsk: move defines only used by AF_XDP internals to xsk.h [bpf-next,v5,05/15] xsk: introduce AF_XDP buffer allocation API [bpf-next,v5,06/15] i40e: refactor rx_bi accesses [bpf-next,v5,07/15] i40e: separate kernel allocated rx_bi rings from AF_XDP rings [bpf-next,v5,08/15] i40e, xsk: migrate to new MEM_TYPE_XSK_BUFF_POOL [bpf-next,v5,09/15] ice, xsk: migrate to new MEM_TYPE_XSK_BUFF_POOL [bpf-next,v5,10/15] ixgbe, xsk: migrate to new MEM_TYPE_XSK_BUFF_POOL [bpf-next,v5,11/15] mlx5, xsk: migrate to new MEM_TYPE_XSK_BUFF_POOL [bpf-next,v5,12/15] xsk: remove MEM_TYPE_ZERO_COPY and corresponding code [bpf-next,v5,13/15] xdp: simplify xdp_return_{frame,frame_rx_napi,buff} [bpf-next,v5,14/15] xsk: explicitly inline functions and move definitions [bpf-next,v5,15/15] MAINTAINERS, xsk: update AF_XDP section after moves/adds

Message ID

20200520192103.355233-2-bjorn.topel@gmail.com

State

Accepted

Delegated to:

BPF Maintainers

Headers

From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@gmail.com>
To: ast@kernel.org, daniel@iogearbox.net, davem@davemloft.net,
	kuba@kernel.org, hawk@kernel.org, john.fastabend@gmail.com,
	netdev@vger.kernel.org, bpf@vger.kernel.org,
	magnus.karlsson@intel.com, jonathan.lemon@gmail.com,
	jeffrey.t.kirsher@intel.com
Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@intel.com>,
	maximmi@mellanox.com, maciej.fijalkowski@intel.com
Subject: [PATCH bpf-next v5 01/15] xsk: fix xsk_umem_xdp_frame_sz()
Date: Wed, 20 May 2020 21:20:49 +0200
Message-Id: <20200520192103.355233-2-bjorn.topel@gmail.com>
In-Reply-To: <20200520192103.355233-1-bjorn.topel@gmail.com>
References: <20200520192103.355233-1-bjorn.topel@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: bpf-owner@vger.kernel.org
Precedence: bulk

Series

Introduce AF_XDP buffer allocation API | expand

Commit Message

Björn Töpel May 20, 2020, 7:20 p.m. UTC

From: Björn Töpel <bjorn.topel@intel.com>

Calculating the "data_hard_end" for an XDP buffer coming from AF_XDP
zero-copy mode, the return value of xsk_umem_xdp_frame_sz() is added
to "data_hard_start".

Currently, the chunk size of the UMEM is returned by
xsk_umem_xdp_frame_sz(). This is not correct, if the fixed UMEM
headroom is non-zero. Fix this by returning the chunk_size without the
UMEM headroom.

Fixes: 2a637c5b1aaf ("xdp: For Intel AF_XDP drivers add XDP frame_sz")
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
---
 include/net/xdp_sock.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h
index abd72de25fa4..6b1137ce1692 100644
--- a/include/net/xdp_sock.h
+++ b/include/net/xdp_sock.h
@@ -239,7 +239,7 @@  static inline u64 xsk_umem_adjust_offset(struct xdp_umem *umem, u64 address,
 
 static inline u32 xsk_umem_xdp_frame_sz(struct xdp_umem *umem)
 {
-	return umem->chunk_size_nohr + umem->headroom;
+	return umem->chunk_size_nohr;
 }
 
 #else

[bpf-next,v5,01/15] xsk: fix xsk_umem_xdp_frame_sz()

Commit Message

Patch