Commit e127ce76 authored by William Tu's avatar William Tu Committed by Paolo Abeni
Browse files

vmxnet3: Fix missing reserved tailroom 



Use rbi->len instead of rcd->len for non-dataring packet.

Found issue:
  XDP_WARN: xdp_update_frame_from_buff(line:278): Driver BUG: missing reserved tailroom
  WARNING: CPU: 0 PID: 0 at net/core/xdp.c:586 xdp_warn+0xf/0x20
  CPU: 0 PID: 0 Comm: swapper/0 Tainted: G        W  O       6.5.1 #1
  RIP: 0010:xdp_warn+0xf/0x20
  ...
  ? xdp_warn+0xf/0x20
  xdp_do_redirect+0x15f/0x1c0
  vmxnet3_run_xdp+0x17a/0x400 [vmxnet3]
  vmxnet3_process_xdp+0xe4/0x760 [vmxnet3]
  ? vmxnet3_tq_tx_complete.isra.0+0x21e/0x2c0 [vmxnet3]
  vmxnet3_rq_rx_complete+0x7ad/0x1120 [vmxnet3]
  vmxnet3_poll_rx_only+0x2d/0xa0 [vmxnet3]
  __napi_poll+0x20/0x180
  net_rx_action+0x177/0x390

Reported-by: default avatarMartin Zaharinov <micron10@gmail.com>
Tested-by: default avatarMartin Zaharinov <micron10@gmail.com>
Link: https://lore.kernel.org/netdev/74BF3CC8-2A3A-44FF-98C2-1E20F110A92E@gmail.com/


Fixes: 54f00cce ("vmxnet3: Add XDP support.")
Signed-off-by: default avatarWilliam Tu <witu@nvidia.com>
Link: https://lore.kernel.org/r/20240309183147.28222-1-witu@nvidia.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 04d9d1fc

drivers/net/vmxnet3/vmxnet3_xdp.c

+3 −3
Original line number Diff line number Diff line
@@ -382,12 +382,12 @@ vmxnet3_process_xdp(struct vmxnet3_adapter *adapter, 
	page = rbi->page;

	dma_sync_single_for_cpu(&adapter->pdev->dev,

				page_pool_get_dma_addr(page) +

				rq->page_pool->p.offset, rcd->len,

				rq->page_pool->p.offset, rbi->len,

				page_pool_get_dma_dir(rq->page_pool));



	xdp_init_buff(&xdp, rbi->len, &rq->xdp_rxq);

	xdp_init_buff(&xdp, PAGE_SIZE, &rq->xdp_rxq);

	xdp_prepare_buff(&xdp, page_address(page), rq->page_pool->p.offset,

			 rcd->len, false);

			 rbi->len, false);

	xdp_buff_clear_frags_flag(&xdp);



	xdp_prog = rcu_dereference(rq->adapter->xdp_bpf_prog);