bnxt_en: Bug fixes
Michael Chan
maintainercover bnxt_en: Bug fixes
This series includes 2 fixes for regressions introduced by the XDP multi-buffer feature, 1 devlink reload bug fix, and 1 SRIOV resource accounting bug fix.
Pavan Chebbi (1):
bnxt_en: Use PAGE_SIZE to init buffer when multi buffer XDP is not in
use
Vikas Gupta (3):
bnxt_en: set missing reload flag in devlink features
bnxt_en: fix NQ resource accounting during vf creation on 57500 chips
bnxt_en: fix LRO/GRO_HW features in ndo_fix_features callback
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +---- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 10 ++++++++-- 5 files changed, 12 insertions(+), 7 deletions(-)
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 1/4 bnxt_en: Use PAGE_SIZE to init buffer when multi buffer XDP is not in use
From: Pavan Chebbi <[email protected]>
Using BNXT_PAGE_MODE_BUF_SIZE + offset as buffer length value is not sufficient when running single buffer XDP programs doing redirect operations. The stack will complain on missing skb tail room. Fix it by using PAGE_SIZE when calling xdp_init_buff() for single buffer programs.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -2130,6 +2130,7 @@ struct bnxt {#define BNXT_DUMP_CRASH 1struct bpf_prog *xdp_prog; +u8 xdp_has_frags;struct bnxt_ptp_cfg *ptp_cfg;u8 ptp_all_rx_tstamp;
drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c +8 -2
@@ -181,6 +181,7 @@ void bnxt_xdp_buff_init(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, struct xdp_buff *xdp) {struct bnxt_sw_rx_bd *rx_buf; +u32 buflen =PAGE_SIZE ;struct pci_dev *pdev;dma_addr_t mapping;u32 offset;
@@ -192,7 +193,10 @@ void bnxt_xdp_buff_init(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, mapping = rx_buf->mapping - bp->rx_dma_offset;dma_sync_single_for_cpu (&pdev->dev, mapping + offset, *len, bp->rx_dir); -xdp_init_buff (xdp,BNXT_PAGE_MODE_BUF_SIZE + offset, &rxr->xdp_rxq); +if (bp->xdp_has_frags) + buflen =BNXT_PAGE_MODE_BUF_SIZE + offset; + +xdp_init_buff (xdp, buflen, &rxr->xdp_rxq);xdp_prepare_buff (xdp, *data_ptr - offset, offset, *len, false); }
@@ -397,8 +401,10 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog)netdev_warn (dev,"ethtool rx/tx channels must be combined to support XDP.\n" );return -EOPNOTSUPP ; } -if (prog) +if (prog) { tx_xdp = bp->rx_nr_rings; + bp->xdp_has_frags = prog->aux->xdp_has_frags; + } tc =netdev_get_num_tc (dev);if (!tc)
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 2/4 bnxt_en: set missing reload flag in devlink features
In reply to Michael ChanFrom: Vikas Gupta <[email protected]>
Add missing devlink_set_features() API for callbacks reload_down and reload_up to function.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +1 -0
@@ -1306,6 +1306,7 @@ int bnxt_dl_register(struct bnxt *bp)if (rc) goto err_dl_port_unreg; +devlink_set_features (dl,DEVLINK_F_RELOAD ); out:devlink_register (dl);return 0 ;
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 3/4 bnxt_en: fix NQ resource accounting during vf creation on 57500 chips
In reply to Michael ChanFrom: Vikas Gupta <[email protected]>
There are 2 issues:
1. We should decrement hw_resc->max_nqs instead of hw_resc->max_irqs with the number of NQs assigned to the VFs. The IRQs are fixed on each function and cannot be re-assigned. Only the NQs are being assigned to the VFs.
2. vf_msix is the total number of NQs to be assigned to the VFs. So we should decrement vf_msix from hw_resc->max_nqs.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c +1 -1
@@ -623,7 +623,7 @@ static int bnxt_hwrm_func_vf_resc_cfg(struct bnxt *bp, int num_vfs, bool reset) hw_resc->max_stat_ctxs -=le16_to_cpu (req->min_stat_ctx) * n; hw_resc->max_vnics -=le16_to_cpu (req->min_vnics) * n;if (bp->flags &BNXT_FLAG_CHIP_P5 ) - hw_resc->max_irqs -= vf_msix * n; + hw_resc->max_nqs -= vf_msix; rc = pf->active_vfs; }
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 4/4 bnxt_en: fix LRO/GRO_HW features in ndo_fix_features callback
In reply to Michael ChanFrom: Vikas Gupta <[email protected]>
LRO/GRO_HW should be disabled if there is an attached XDP program. BNXT_FLAG_TPA is the current setting of the LRO/GRO_HW. Using BNXT_FLAG_TPA to disable LRO/GRO_HW will cause these features to be permanently disabled once they are disabled.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -4
@@ -11178,10 +11178,7 @@ static netdev_features_t bnxt_fix_features(struct net_device *dev,if ((features &NETIF_F_NTUPLE ) && !bnxt_rfs_capable (bp)) features &= ~NETIF_F_NTUPLE ; -if (bp->flags &BNXT_FLAG_NO_AGG_RINGS ) - features &= ~(NETIF_F_LRO |NETIF_F_GRO_HW ); - -if (!(bp->flags &BNXT_FLAG_TPA )) +if ((bp->flags &BNXT_FLAG_NO_AGG_RINGS ) || bp->xdp_prog) features &= ~(NETIF_F_LRO |NETIF_F_GRO_HW );if (!(features &NETIF_F_GRO ))
Signature · 1 line
2.18.1
Quoted 3 lines · On Mon, 22 Aug 2022 11:06:50 -0400 Michael Chan wrote:
This series includes 2 fixes for regressions introduced by the XDP multi-buffer feature, 1 devlink reload bug fix, and 1 SRIOV resource accounting bug fix.
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Mon, 22 Aug 2022 11:06:50 -0400 you wrote:
This series includes 2 fixes for regressions introduced by the XDP multi-buffer feature, 1 devlink reload bug fix, and 1 SRIOV resource accounting bug fix.
Pavan Chebbi (1):
bnxt_en: UsePAGE_SIZEto init buffer when multi buffer XDP is not in
use[...]
Here is the summary with links:
- [net,1/4] bnxt_en: Use PAGE_SIZE to init buffer when multi buffer XDP is not in use
https://git.kernel.org/netdev/net/c/7dd3de7cb1d6 - [net,2/4] bnxt_en: set missing reload flag in devlink features https://git.kernel.org/netdev/net/c/574b2bb9692f - [net,3/4] bnxt_en: fix NQ resource accounting during vf creation on 57500 chips https://git.kernel.org/netdev/net/c/09a89cc59ad6 - [net,4/4] bnxt_en: fix LRO/GRO_HW features in ndo_fix_features callback https://git.kernel.org/netdev/net/c/366c30474172
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html