octeontx2-pf: Remove xdp queues on program detach
Geetha sowjanya
maintainerPATCH 1/1 octeontx2-pf: Remove xdp queues on program detach
XDP queues are created/destroyed when a XDP program is attached/detached. In current driver xdp_queues are not getting destroyed on program exit due to incorrect xdp_queue and tot_tx_queue count values.
This patch fixes the issue by setting tot_tx_queue and xdp_queue count to correct values. It also fixes xdp.data_hard_start address.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 1 - drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 3 +-- drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 7 +++---- 3 files changed, 4 insertions(+), 7 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c +0 -1
@@ -314,7 +314,6 @@ static int otx2_set_channels(struct net_device *dev, pfvf->hw.tx_queues = channel->tx_count;if (pfvf->xdp_prog) pfvf->hw.xdp_queues = channel->rx_count; - pfvf->hw.non_qos_queues = pfvf->hw.tx_queues + pfvf->hw.xdp_queues;if (if_up) err = dev->netdev_ops->ndo_open (dev);
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +1 -2
@@ -1744,6 +1744,7 @@ int otx2_open(struct net_device *netdev)/* RQ and SQs are mapped to different CQs, * so find out max CQ IRQs (i.e CINTs) needed. */ + pf->hw.non_qos_queues = pf->hw.tx_queues + pf->hw.xdp_queues; pf->hw.cint_cnt =max3 (pf->hw.rx_queues, pf->hw.tx_queues, pf->hw.tc_tx_queues);
@@ -2643,8 +2644,6 @@ static int otx2_xdp_setup(struct otx2_nic *pf, struct bpf_prog *prog)xdp_features_clear_redirect_target (dev); } - pf->hw.non_qos_queues += pf->hw.xdp_queues; -if (if_up)otx2_open (pf->netdev);
drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c +3 -4
@@ -1403,7 +1403,7 @@ static bool otx2_xdp_rcv_pkt_handler(struct otx2_nic *pfvf,struct otx2_cq_queue *cq, bool *need_xdp_flush) { - unsigned char *hard_start, *data; + unsigned char *hard_start;int qidx = cq->cq_idx;struct xdp_buff xdp;struct page *page;
@@ -1417,9 +1417,8 @@ static bool otx2_xdp_rcv_pkt_handler(struct otx2_nic *pfvf,xdp_init_buff (&xdp, pfvf->rbsize, &cq->xdp_rxq); - data = (unsigned char *)phys_to_virt (pa); - hard_start =page_address (page); -xdp_prepare_buff (&xdp, hard_start, data - hard_start, + hard_start = (unsigned char *)phys_to_virt (pa); +xdp_prepare_buff (&xdp, hard_start,OTX2_HEAD_ROOM , cqe->sg.seg_size, false); act =bpf_prog_run_xdp (prog, &xdp);
Signature · 1 line
2.25.1
This patch was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 9 lines · On Tue, 30 Jan 2024 17:36:10 +0530 you wrote:
XDP queues are created/destroyed when a XDP program is attached/detached. In current driver
xdp_queuesare not getting destroyed on program exit due to incorrectxdp_queueandtot_tx_queuecount values.This patch fixes the issue by setting
tot_tx_queueandxdp_queuecount to correct values. It also fixes xdp.data_hard_start address.[...]
Here is the summary with links:
- [net] octeontx2-pf: Remove xdp queues on program detach
https://git.kernel.org/netdev/net/c/04f647c8e456
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html