* [PATCH iwl-net 0/2] idpf: Preserve IRQ affinity and sync IRQ @ 2024-11-09 0:12 Ahmed Zaki 2024-11-09 0:12 ` [PATCH iwl-net 1/2] idpf: preserve IRQ affinity settings across resets Ahmed Zaki 2024-11-09 0:12 ` [PATCH iwl-net 2/2] idpf: finish pending IRQ handling before freeing interrupt Ahmed Zaki 0 siblings, 2 replies; 8+ messages in thread From: Ahmed Zaki @ 2024-11-09 0:12 UTC (permalink / raw) To: intel-wired-lan; +Cc: netdev, Ahmed Zaki Currently the IRQ affinity settings fallback to defaults when interface goes through a soft reset. Use irq_set_affinity_notifier() callbacks to fix it. Also, wait for pending IRQ handler before interrupt configuration is removed. Sudheer Mogilappagari (2): idpf: preserve IRQ affinity settings across resets idpf: finish pending IRQ handling before freeing interrupt drivers/net/ethernet/intel/idpf/idpf_txrx.c | 36 +++++++++++++++++++-- drivers/net/ethernet/intel/idpf/idpf_txrx.h | 6 +++- 2 files changed, 39 insertions(+), 3 deletions(-) -- 2.43.0 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH iwl-net 1/2] idpf: preserve IRQ affinity settings across resets 2024-11-09 0:12 [PATCH iwl-net 0/2] idpf: Preserve IRQ affinity and sync IRQ Ahmed Zaki @ 2024-11-09 0:12 ` Ahmed Zaki 2024-11-12 2:53 ` Jakub Kicinski 2024-11-09 0:12 ` [PATCH iwl-net 2/2] idpf: finish pending IRQ handling before freeing interrupt Ahmed Zaki 1 sibling, 1 reply; 8+ messages in thread From: Ahmed Zaki @ 2024-11-09 0:12 UTC (permalink / raw) To: intel-wired-lan; +Cc: netdev, Sudheer Mogilappagari, Ahmed Zaki From: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> Currently the IRQ affinity settings are getting lost when interface goes through a soft reset (due to MTU configuration, changing number of queues etc). Use irq_set_affinity_notifier() callbacks to keep the IRQ affinity info in sync between driver and kernel. Fixes: d4d558718266 ("idpf: initialize interrupts and enable vport") Reviewed-by: Ahmed Zaki <ahmed.zaki@intel.com> Signed-off-by: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> Signed-off-by: Ahmed Zaki <ahmed.zaki@intel.com> --- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 35 +++++++++++++++++++-- drivers/net/ethernet/intel/idpf/idpf_txrx.h | 6 +++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c index a8989dd98272..82e0e3698f10 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c @@ -3583,7 +3583,7 @@ static void idpf_vport_intr_rel_irq(struct idpf_vport *vport) irq_num = adapter->msix_entries[vidx].vector; /* clear the affinity_mask in the IRQ descriptor */ - irq_set_affinity_hint(irq_num, NULL); + irq_set_affinity_notifier(irq_num, NULL); kfree(free_irq(irq_num, q_vector)); } } @@ -3723,6 +3723,33 @@ void idpf_vport_intr_update_itr_ena_irq(struct idpf_q_vector *q_vector) writel(intval, q_vector->intr_reg.dyn_ctl); } +/** + * idpf_irq_affinity_notify - Callback for affinity changes + * @notify: context as to what irq was changed + * @mask: the new affinity mask + * + * Callback function registered via irq_set_affinity_notifier function + * so that river can receive changes to the irq affinity masks. + */ +static void +idpf_irq_affinity_notify(struct irq_affinity_notify *notify, + const cpumask_t *mask) +{ + struct idpf_q_vector *q_vector = + container_of(notify, struct idpf_q_vector, affinity_notify); + + cpumask_copy(q_vector->affinity_mask, mask); +} + +/** + * idpf_irq_affinity_release - Callback for affinity notifier release + * @ref: internal core kernel usage + * + * Callback function registered via irq_set_affinity_notifier function + * to inform the driver that it will no longer receive notifications. + */ +static void idpf_irq_affinity_release(struct kref __always_unused *ref) {} + /** * idpf_vport_intr_req_irq - get MSI-X vectors from the OS for the vport * @vport: main vport structure @@ -3730,6 +3757,7 @@ void idpf_vport_intr_update_itr_ena_irq(struct idpf_q_vector *q_vector) static int idpf_vport_intr_req_irq(struct idpf_vport *vport) { struct idpf_adapter *adapter = vport->adapter; + struct irq_affinity_notify *affinity_notify; const char *drv_name, *if_name, *vec_name; int vector, err, irq_num, vidx; @@ -3763,7 +3791,10 @@ static int idpf_vport_intr_req_irq(struct idpf_vport *vport) goto free_q_irqs; } /* assign the mask for this irq */ - irq_set_affinity_hint(irq_num, q_vector->affinity_mask); + affinity_notify = &q_vector->affinity_notify; + affinity_notify->notify = idpf_irq_affinity_notify; + affinity_notify->release = idpf_irq_affinity_release; + irq_set_affinity_notifier(irq_num, affinity_notify); } return 0; diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.h b/drivers/net/ethernet/intel/idpf/idpf_txrx.h index b59aa7d8de2c..48cb58d14eff 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.h +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.h @@ -379,6 +379,7 @@ struct idpf_intr_reg { * @rx_itr_idx: RX ITR index * @v_idx: Vector index * @affinity_mask: CPU affinity mask + * @affinity_notify: struct with callbacks for notification of affinity changes */ struct idpf_q_vector { __cacheline_group_begin_aligned(read_mostly); @@ -416,12 +417,15 @@ struct idpf_q_vector { u16 v_idx; cpumask_var_t affinity_mask; + struct irq_affinity_notify affinity_notify; __cacheline_group_end_aligned(cold); }; + libeth_cacheline_set_assert(struct idpf_q_vector, 112, 24 + sizeof(struct napi_struct) + 2 * sizeof(struct dim), - 8 + sizeof(cpumask_var_t)); + 8 + sizeof(cpumask_var_t) + + sizeof(struct irq_affinity_notify)); struct idpf_rx_queue_stats { u64_stats_t packets; -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH iwl-net 1/2] idpf: preserve IRQ affinity settings across resets 2024-11-09 0:12 ` [PATCH iwl-net 1/2] idpf: preserve IRQ affinity settings across resets Ahmed Zaki @ 2024-11-12 2:53 ` Jakub Kicinski 2024-12-02 13:03 ` Ahmed Zaki 0 siblings, 1 reply; 8+ messages in thread From: Jakub Kicinski @ 2024-11-12 2:53 UTC (permalink / raw) To: Ahmed Zaki; +Cc: intel-wired-lan, netdev, Sudheer Mogilappagari On Fri, 8 Nov 2024 17:12:05 -0700 Ahmed Zaki wrote: > From: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> > > Currently the IRQ affinity settings are getting lost when interface > goes through a soft reset (due to MTU configuration, changing number > of queues etc). Use irq_set_affinity_notifier() callbacks to keep > the IRQ affinity info in sync between driver and kernel. Could you try doing this in the core? Store the mask in napi_struct if it has IRQ associated with it? Barely any drivers get this right. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH iwl-net 1/2] idpf: preserve IRQ affinity settings across resets 2024-11-12 2:53 ` Jakub Kicinski @ 2024-12-02 13:03 ` Ahmed Zaki 2024-12-02 14:26 ` Jakub Kicinski 0 siblings, 1 reply; 8+ messages in thread From: Ahmed Zaki @ 2024-12-02 13:03 UTC (permalink / raw) To: Jakub Kicinski; +Cc: intel-wired-lan, netdev On 2024-11-11 7:53 p.m., Jakub Kicinski wrote: > On Fri, 8 Nov 2024 17:12:05 -0700 Ahmed Zaki wrote: >> From: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> >> >> Currently the IRQ affinity settings are getting lost when interface >> goes through a soft reset (due to MTU configuration, changing number >> of queues etc). Use irq_set_affinity_notifier() callbacks to keep >> the IRQ affinity info in sync between driver and kernel. > > Could you try doing this in the core? Store the mask in napi_struct > if it has IRQ associated with it? > > Barely any drivers get this right. The napi structs are allocated/freed with open/close ndos. I don't think we should expect the user to re-set CPU affinity after link down/up. netdev->_rx perhaps? ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH iwl-net 1/2] idpf: preserve IRQ affinity settings across resets 2024-12-02 13:03 ` Ahmed Zaki @ 2024-12-02 14:26 ` Jakub Kicinski 0 siblings, 0 replies; 8+ messages in thread From: Jakub Kicinski @ 2024-12-02 14:26 UTC (permalink / raw) To: Ahmed Zaki; +Cc: intel-wired-lan, netdev On Mon, 2 Dec 2024 06:03:45 -0700 Ahmed Zaki wrote: > On 2024-11-11 7:53 p.m., Jakub Kicinski wrote: > > On Fri, 8 Nov 2024 17:12:05 -0700 Ahmed Zaki wrote: > >> From: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> > >> > >> Currently the IRQ affinity settings are getting lost when interface > >> goes through a soft reset (due to MTU configuration, changing number > >> of queues etc). Use irq_set_affinity_notifier() callbacks to keep > >> the IRQ affinity info in sync between driver and kernel. > > > > Could you try doing this in the core? Store the mask in napi_struct > > if it has IRQ associated with it? > > > > Barely any drivers get this right. > > The napi structs are allocated/freed with open/close ndos. I don't think > we should expect the user to re-set CPU affinity after link down/up. The napi_config struct is persistent. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH iwl-net 2/2] idpf: finish pending IRQ handling before freeing interrupt 2024-11-09 0:12 [PATCH iwl-net 0/2] idpf: Preserve IRQ affinity and sync IRQ Ahmed Zaki 2024-11-09 0:12 ` [PATCH iwl-net 1/2] idpf: preserve IRQ affinity settings across resets Ahmed Zaki @ 2024-11-09 0:12 ` Ahmed Zaki 2024-11-12 2:54 ` Jakub Kicinski 1 sibling, 1 reply; 8+ messages in thread From: Ahmed Zaki @ 2024-11-09 0:12 UTC (permalink / raw) To: intel-wired-lan; +Cc: netdev, Sudheer Mogilappagari, Ahmed Zaki From: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> Wait for pending IRQs to be handled before an interrupt is free'd up. Fixes: d4d558718266 ("idpf: initialize interrupts and enable vport") Reviewed-by: Ahmed Zaki <ahmed.zaki@intel.com> Signed-off-by: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> Signed-off-by: Ahmed Zaki <ahmed.zaki@intel.com> --- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c index 82e0e3698f10..08acdd383b8d 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c @@ -3584,6 +3584,7 @@ static void idpf_vport_intr_rel_irq(struct idpf_vport *vport) /* clear the affinity_mask in the IRQ descriptor */ irq_set_affinity_notifier(irq_num, NULL); + synchronize_irq(irq_num); kfree(free_irq(irq_num, q_vector)); } } -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH iwl-net 2/2] idpf: finish pending IRQ handling before freeing interrupt 2024-11-09 0:12 ` [PATCH iwl-net 2/2] idpf: finish pending IRQ handling before freeing interrupt Ahmed Zaki @ 2024-11-12 2:54 ` Jakub Kicinski 2024-12-02 13:11 ` Ahmed Zaki 0 siblings, 1 reply; 8+ messages in thread From: Jakub Kicinski @ 2024-11-12 2:54 UTC (permalink / raw) To: Ahmed Zaki; +Cc: intel-wired-lan, netdev, Sudheer Mogilappagari On Fri, 8 Nov 2024 17:12:06 -0700 Ahmed Zaki wrote: > From: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> > > Wait for pending IRQs to be handled before an interrupt is free'd up. read the kdoc on free_irq(), please ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH iwl-net 2/2] idpf: finish pending IRQ handling before freeing interrupt 2024-11-12 2:54 ` Jakub Kicinski @ 2024-12-02 13:11 ` Ahmed Zaki 0 siblings, 0 replies; 8+ messages in thread From: Ahmed Zaki @ 2024-12-02 13:11 UTC (permalink / raw) To: Jakub Kicinski; +Cc: intel-wired-lan, netdev On 2024-11-11 7:54 p.m., Jakub Kicinski wrote: > On Fri, 8 Nov 2024 17:12:06 -0700 Ahmed Zaki wrote: >> From: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> >> >> Wait for pending IRQs to be handled before an interrupt is free'd up. > > read the kdoc on free_irq(), please IIUC, this patch applies synchronize_irq() after the IRQ is disabled. But I will move it there for clarity. Thanks. ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-12-02 14:26 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-11-09 0:12 [PATCH iwl-net 0/2] idpf: Preserve IRQ affinity and sync IRQ Ahmed Zaki 2024-11-09 0:12 ` [PATCH iwl-net 1/2] idpf: preserve IRQ affinity settings across resets Ahmed Zaki 2024-11-12 2:53 ` Jakub Kicinski 2024-12-02 13:03 ` Ahmed Zaki 2024-12-02 14:26 ` Jakub Kicinski 2024-11-09 0:12 ` [PATCH iwl-net 2/2] idpf: finish pending IRQ handling before freeing interrupt Ahmed Zaki 2024-11-12 2:54 ` Jakub Kicinski 2024-12-02 13:11 ` Ahmed Zaki
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).