xsk: introduce helper to determine rxq->frag_size

walking-machine · Sasha Levin · commit ca35d60d51f8 · 2026-03-12T07:09:59.000-04:00
[ Upstream commit 16394d8 ] rxq->frag_size is basically a step between consecutive strictly aligned frames. In ZC mode, chunk size fits exactly, but if chunks are unaligned, there is no safe way to determine accessible space to grow tailroom. Report frag_size to be zero, if chunks are unaligned, chunk_size otherwise. Fixes: 24ea501 ("xsk: support mbuf on ZC RX") Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com> Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> Link: https://patch.msgid.link/20260305111253.2317394-3-larysa.zaremba@intel.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h
@@ -51,6 +51,11 @@ static inline u32 xsk_pool_get_rx_frame_size(struct xsk_buff_pool *pool)
 	return xsk_pool_get_chunk_size(pool) - xsk_pool_get_headroom(pool);
 }
 
+static inline u32 xsk_pool_get_rx_frag_step(struct xsk_buff_pool *pool)
+{
+	return pool->unaligned ? 0 : xsk_pool_get_chunk_size(pool);
+}
+
 static inline void xsk_pool_set_rxq_info(struct xsk_buff_pool *pool,
 					 struct xdp_rxq_info *rxq)
 {
@@ -337,6 +342,11 @@ static inline u32 xsk_pool_get_rx_frame_size(struct xsk_buff_pool *pool)
 	return 0;
 }
 
+static inline u32 xsk_pool_get_rx_frag_step(struct xsk_buff_pool *pool)
+{
+	return 0;
+}
+
 static inline void xsk_pool_set_rxq_info(struct xsk_buff_pool *pool,
 					 struct xdp_rxq_info *rxq)
 {

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,11 @@ static inline u32 xsk_pool_get_rx_frame_size(struct xsk_buff_pool *pool)`
`51`	`51`	`return xsk_pool_get_chunk_size(pool) - xsk_pool_get_headroom(pool);`
`52`	`52`	`}`
`53`	`53`
	`54`	`+static inline u32 xsk_pool_get_rx_frag_step(struct xsk_buff_pool *pool)`
	`55`	`+{`
	`56`	`+ return pool->unaligned ? 0 : xsk_pool_get_chunk_size(pool);`
	`57`	`+}`
	`58`	`+`
`54`	`59`	`static inline void xsk_pool_set_rxq_info(struct xsk_buff_pool *pool,`
`55`	`60`	`struct xdp_rxq_info *rxq)`
`56`	`61`	`{`
`@@ -337,6 +342,11 @@ static inline u32 xsk_pool_get_rx_frame_size(struct xsk_buff_pool *pool)`
`337`	`342`	`return 0;`
`338`	`343`	`}`
`339`	`344`
	`345`	`+static inline u32 xsk_pool_get_rx_frag_step(struct xsk_buff_pool *pool)`
	`346`	`+{`
	`347`	`+ return 0;`
	`348`	`+}`
	`349`	`+`
`340`	`350`	`static inline void xsk_pool_set_rxq_info(struct xsk_buff_pool *pool,`
`341`	`351`	`struct xdp_rxq_info *rxq)`
`342`	`352`	`{`