On Sat, Jan 4, 2025 at 6:13 AM Ahmed Zaki <[email protected]> wrote: > > Delete the driver CPU affinity info and use the core's napi config > instead. > > Signed-off-by: Ahmed Zaki <[email protected]> > --- > drivers/net/ethernet/broadcom/bnxt/bnxt.c | 26 ++++------------------- > drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 -- > 2 files changed, 4 insertions(+), 24 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c > b/drivers/net/ethernet/broadcom/bnxt/bnxt.c > index cc3ca3440b0a..fcf230fde1ec 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c > @@ -11193,14 +11193,8 @@ static void bnxt_free_irq(struct bnxt *bp) > int map_idx = bnxt_cp_num_to_irq_num(bp, i); > > irq = &bp->irq_tbl[map_idx]; > - if (irq->requested) { > - if (irq->have_cpumask) { > - irq_update_affinity_hint(irq->vector, NULL); > - free_cpumask_var(irq->cpu_mask); > - irq->have_cpumask = 0; > - } > + if (irq->requested) > free_irq(irq->vector, bp->bnapi[i]); > - } > > irq->requested = 0; > } > @@ -11229,21 +11223,6 @@ static int bnxt_request_irq(struct bnxt *bp) > > netif_napi_set_irq(&bp->bnapi[i]->napi, irq->vector); > irq->requested = 1; > - > - if (zalloc_cpumask_var(&irq->cpu_mask, GFP_KERNEL)) { > - int numa_node = dev_to_node(&bp->pdev->dev); > - > - irq->have_cpumask = 1; > - cpumask_set_cpu(cpumask_local_spread(i, numa_node), > - irq->cpu_mask); > - rc = irq_update_affinity_hint(irq->vector, > irq->cpu_mask); > - if (rc) { > - netdev_warn(bp->dev, > - "Update affinity hint failed, IRQ > = %d\n", > - irq->vector); > - break; > - } > - } > } > return rc; > } > @@ -13292,6 +13271,7 @@ static int bnxt_set_features(struct net_device *dev, > netdev_features_t features) > bp->flags = old_flags; > } > } > + This change looks unrelated, please remove. > return rc; > } > > @@ -16172,6 +16152,8 @@ static int bnxt_init_one(struct pci_dev *pdev, const > struct pci_device_id *ent) > dev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | > NETDEV_XDP_ACT_RX_SG; > > + netif_enable_irq_affinity(dev); > + > #ifdef CONFIG_BNXT_SRIOV > init_waitqueue_head(&bp->sriov_cfg_wait); > #endif > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h > b/drivers/net/ethernet/broadcom/bnxt/bnxt.h > index 094c9e95b463..7be2f90d0c05 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h > @@ -1228,9 +1228,7 @@ struct bnxt_irq { > irq_handler_t handler; > unsigned int vector; > u8 requested:1; > - u8 have_cpumask:1; > char name[IFNAMSIZ + BNXT_IRQ_NAME_EXTRA]; > - cpumask_var_t cpu_mask; > }; > > #define HWRM_RING_ALLOC_TX 0x1 > -- > 2.43.0 > >
-- Regards, Kalesh AP
smime.p7s
Description: S/MIME Cryptographic Signature
