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 44F00225771; Mon, 2 Jun 2025 15:17:14 +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=1748877434; cv=none; b=gaXTguxiHhDy1IITwFTiCsxee/Dt8T2P1Tz7V3MAIErk7N12wGS0Xtp+p9zxLMV6N4Sa8Z9Rfr3t5qjswJfwR+0kvVUp+VaAwWWJ6limhR9V+IKfvJF0tQXTn6d5NTe7uyoUOGTVXOym/3l0EWE+XYogNGtwNWAEsyLh3JzARO0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748877434; c=relaxed/simple; bh=pU3zvxMHfuJUT0PIGhhzhazXFJGhqYZLml4DNT9pPqs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i9I4K1/2UpcjVJTGrlp8sPM5EhJjOga0u+fIH1mmdoG4o4KNaa+oqUumCp+m58GyJBm4jpkPpHZnF9Hjne9jq8HP8JYGzu5J/iBf6zcvaWg1V1zGBydwPTeNqtgAaerZNjT8qvl/GB1cAMaBd5rZoUPA4JBM70L3kGXe14Sgun8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xOx6NxF5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xOx6NxF5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA4B8C4CEEE; Mon, 2 Jun 2025 15:17:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748877434; bh=pU3zvxMHfuJUT0PIGhhzhazXFJGhqYZLml4DNT9pPqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xOx6NxF5FARL2Jk7wbezNIaVobV7TD5/pw3HK4U98u8a9OVrhJ+2LHsSWSxAPSftA a7W8OL34ZUvRa5sT4lR3nEt8hHbX0a7pqiyiSYgVvK6/XNbupXr2jqyVOqwIKhA1MB ChtAVixJTf2mpv536yQdTtHVFetK1JbEFY1aTbZY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Suman Ghosh , Paolo Abeni , Sasha Levin Subject: [PATCH 6.1 246/325] octeontx2-pf: Add AF_XDP non-zero copy support Date: Mon, 2 Jun 2025 15:48:42 +0200 Message-ID: <20250602134329.776953528@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134319.723650984@linuxfoundation.org> References: <20250602134319.723650984@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Suman Ghosh [ Upstream commit b4164de5041b51cda3438e75bce668e2556057c3 ] Set xdp rx ring memory type as MEM_TYPE_PAGE_POOL for af-xdp to work. This is needed since xdp_return_frame internally will use page pools. Fixes: 06059a1a9a4a ("octeontx2-pf: Add XDP support to netdev PF") Signed-off-by: Suman Ghosh Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c index 5e11599d13223..59a7e6f376f47 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c @@ -988,6 +988,7 @@ static int otx2_cq_init(struct otx2_nic *pfvf, u16 qidx) int err, pool_id, non_xdp_queues; struct nix_aq_enq_req *aq; struct otx2_cq_queue *cq; + struct otx2_pool *pool; cq = &qset->cq[qidx]; cq->cq_idx = qidx; @@ -996,8 +997,13 @@ static int otx2_cq_init(struct otx2_nic *pfvf, u16 qidx) cq->cq_type = CQ_RX; cq->cint_idx = qidx; cq->cqe_cnt = qset->rqe_cnt; - if (pfvf->xdp_prog) + if (pfvf->xdp_prog) { + pool = &qset->pool[qidx]; xdp_rxq_info_reg(&cq->xdp_rxq, pfvf->netdev, qidx, 0); + xdp_rxq_info_reg_mem_model(&cq->xdp_rxq, + MEM_TYPE_PAGE_POOL, + pool->page_pool); + } } else if (qidx < non_xdp_queues) { cq->cq_type = CQ_TX; cq->cint_idx = qidx - pfvf->hw.rx_queues; -- 2.39.5