From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F36231F23D2; Sun, 24 Mar 2024 22:58:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321100; cv=none; b=hnSj0C5+RQV+pZTheJNgG5KwQYIMZ99+YbDZZ88RZ6LyRL1LkMFdIwbi/FOlIRgmGUpYAOWE/pZXDiZjffRCNSd7WOPG0s6MRdyzSJlTOcGPPB+2eDojNJNIHp8oTn9tZymADkQZMNOUecGKo9raQs0bBEkKV2Wq9RYQ4yS4sdQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321100; c=relaxed/simple; bh=R6+pwYJu5540Q/E08e6Ek8CPjxUBkUAUJJIrsGu+qDU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qWx5RQS1yIMymihIOHvzgEE2mWUjcoESyXL1Vt4jAKt5h3oEEn1xK3aY4hCR1WOnrAFV4cDdzEg7l1zk/6m3H4vghyKBy7HtJC/IMfwhzGAm93olsE9P8OIdtDa2+ZNYy0uVw/L8rlSNAw49j94PsVkMnsunu5AYFt+TBc1cLsk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GGeineil; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GGeineil" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2581DC433C7; Sun, 24 Mar 2024 22:58:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321098; bh=R6+pwYJu5540Q/E08e6Ek8CPjxUBkUAUJJIrsGu+qDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GGeineil9v1pt9UxxTQwWR2Sh6oDGbSFYP8XD0FMKiyqmt0vVxBQJeYTKpvbfs/UJ ZyQhAB+gqiF+WqlIZzbuv9p+lwuq1euYJhj1WaEX2PLZfkBYbIE/0Uyav7WaYPoUQd z+7BoUYl9P34sDJTYttTU4gtb+iDFlzO+zantUKvXjpPXt2HgCG9tq0f9zFztSczA2 5hUMQN+C7s+N0H3PsVA8I0K/79oE4CMrBaLDQREDal+Bj6ZgQg14skPw64nSVyJrb/ COeNOZUNS9tpzTpzEHvWMonpuvjCG1gJJcoW/gUv+xXrmvEJiUfhP+2c7s/AjdsuVI WL6TipV3SkJIQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: William Tu , Martin Zaharinov , Paolo Abeni , Sasha Levin Subject: [PATCH 6.7 661/713] vmxnet3: Fix missing reserved tailroom Date: Sun, 24 Mar 2024 18:46:27 -0400 Message-ID: <20240324224720.1345309-662-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: William Tu [ Upstream commit e127ce7699c1e05279ee5ee61f00893e7bfa9671 ] 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: Martin Zaharinov Tested-by: Martin Zaharinov Link: https://lore.kernel.org/netdev/74BF3CC8-2A3A-44FF-98C2-1E20F110A92E@gmail.com/ Fixes: 54f00cce1178 ("vmxnet3: Add XDP support.") Signed-off-by: William Tu Link: https://lore.kernel.org/r/20240309183147.28222-1-witu@nvidia.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/vmxnet3/vmxnet3_xdp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_xdp.c b/drivers/net/vmxnet3/vmxnet3_xdp.c index 80ddaff759d47..a6c787454a1ae 100644 --- a/drivers/net/vmxnet3/vmxnet3_xdp.c +++ b/drivers/net/vmxnet3/vmxnet3_xdp.c @@ -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); -- 2.43.0