There is no special need for storing MSI-X info in one array. Instead move this data into q_vector where it is commonly used. With that one layer of accessing correct kernel irq line number can be dropped.
Moving pci_irq_vector() after q_vectors creation will be useful when switching to dynamic irq allocation. Reviewed-by: Aleksandr Loktionov <[email protected]> Reviewed-by: Larysa Zaremba <[email protected]> Reviewed-by: Madhu Chittim <[email protected]> Signed-off-by: Michal Swiatkowski <[email protected]> --- drivers/net/ethernet/intel/idpf/idpf.h | 2 - drivers/net/ethernet/intel/idpf/idpf_lib.c | 45 ++++++--------- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 61 +++++++++++---------- drivers/net/ethernet/intel/idpf/idpf_txrx.h | 5 +- 4 files changed, 51 insertions(+), 62 deletions(-) diff --git a/drivers/net/ethernet/intel/idpf/idpf.h b/drivers/net/ethernet/intel/idpf/idpf.h index 5eafabacd167..86e5bb30ecc6 100644 --- a/drivers/net/ethernet/intel/idpf/idpf.h +++ b/drivers/net/ethernet/intel/idpf/idpf.h @@ -668,7 +668,6 @@ struct idpf_irq_info { * @xnm: Xn transaction manager * @num_avail_msix: Available number of MSIX vectors * @num_msix_entries: Number of entries in MSIX table - * @msix_entries: MSIX table * @num_rdma_msix_entries: Available number of MSIX vectors for RDMA * @rdma_msix_entries: RDMA MSIX table * @irq_info: hardware data needed to setup irq @@ -728,7 +727,6 @@ struct idpf_adapter { struct libie_ctlq_xn_manager *xnm; u16 num_avail_msix; u16 num_msix_entries; - struct msix_entry *msix_entries; u16 num_rdma_msix_entries; struct msix_entry *rdma_msix_entries; struct virtchnl2_alloc_vectors *req_vec_chunks; diff --git a/drivers/net/ethernet/intel/idpf/idpf_lib.c b/drivers/net/ethernet/intel/idpf/idpf_lib.c index 36bb6a268042..5a2975081227 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_lib.c +++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c @@ -73,7 +73,7 @@ void idpf_mb_intr_rel_irq(struct idpf_adapter *adapter) if (!test_and_clear_bit(IDPF_MB_INTR_MODE, adapter->flags)) return; - kfree(free_irq(adapter->msix_entries[0].vector, adapter)); + kfree(free_irq(adapter->mb_vector.irq.virq, adapter)); queue_delayed_work(adapter->mbx_wq, &adapter->mbx_task, 0); } @@ -83,15 +83,10 @@ void idpf_mb_intr_rel_irq(struct idpf_adapter *adapter) */ void idpf_intr_rel(struct idpf_adapter *adapter) { - if (!adapter->msix_entries) - return; - idpf_mb_intr_rel_irq(adapter); pci_free_irq_vectors(adapter->pdev); idpf_send_dealloc_vectors_msg(adapter); idpf_deinit_vector_stack(adapter); - kfree(adapter->msix_entries); - adapter->msix_entries = NULL; kfree(adapter->rdma_msix_entries); adapter->rdma_msix_entries = NULL; } @@ -130,14 +125,14 @@ static void idpf_mb_irq_enable(struct idpf_adapter *adapter) */ static int idpf_mb_intr_req_irq(struct idpf_adapter *adapter) { - int irq_num, mb_vidx = 0, err; + struct msi_map *irq = &adapter->mb_vector.irq; char *name; + int err; - irq_num = adapter->msix_entries[mb_vidx].vector; name = kasprintf(GFP_KERNEL, "%s-%s-%d", dev_driver_string(&adapter->pdev->dev), - "Mailbox", mb_vidx); - err = request_irq(irq_num, adapter->irq_mb_handler, 0, name, adapter); + "Mailbox", irq->index); + err = request_irq(irq->virq, adapter->irq_mb_handler, 0, name, adapter); if (err) { dev_err(&adapter->pdev->dev, "IRQ request for mailbox failed, error: %d\n", err); @@ -156,6 +151,13 @@ static int idpf_mb_intr_req_irq(struct idpf_adapter *adapter) */ static int idpf_mb_intr_init(struct idpf_adapter *adapter) { + struct msi_map *mb_irq = &adapter->mb_vector.irq; + + mb_irq->index = IDPF_MBX_IRQ_INDEX; + mb_irq->virq = pci_irq_vector(adapter->pdev, mb_irq->index); + if (mb_irq->virq < 0) + return mb_irq->virq; + adapter->dev_ops.reg_ops.mb_intr_reg_init(adapter); adapter->irq_mb_handler = idpf_mb_intr_clean; @@ -309,7 +311,6 @@ int idpf_intr_req(struct idpf_adapter *adapter) u16 default_vports = idpf_get_default_vports(adapter); int min_vectors, actual_vecs, min_lan_vecs, err; int num_q_vecs, total_vecs; - unsigned int vector; int i; total_vecs = idpf_get_reserved_vecs(adapter); @@ -368,23 +369,12 @@ int idpf_intr_req(struct idpf_adapter *adapter) } num_lan_vecs = actual_vecs - num_rdma_vecs; - adapter->msix_entries = kzalloc_objs(struct msix_entry, num_lan_vecs); - if (!adapter->msix_entries) { - err = -ENOMEM; - goto free_rdma_msix; - } - for (vector = 0; vector < num_lan_vecs; vector++) { - adapter->msix_entries[vector].entry = - adapter->irq_info.vectors[vector].idx; - adapter->msix_entries[vector].vector = - pci_irq_vector(adapter->pdev, vector); - } - for (i = 0; i < num_rdma_vecs; vector++, i++) { + for (i = 0; i < num_rdma_vecs; i++) { adapter->rdma_msix_entries[i].entry = - adapter->irq_info.vectors[vector].idx; + adapter->irq_info.vectors[num_lan_vecs + i].idx; adapter->rdma_msix_entries[i].vector = - pci_irq_vector(adapter->pdev, vector); + pci_irq_vector(adapter->pdev, num_lan_vecs + i); } /* 'num_avail_msix' is used to distribute excess vectors to the vports @@ -399,7 +389,7 @@ int idpf_intr_req(struct idpf_adapter *adapter) /* Fill MSIX vector lifo stack with vector indexes */ err = idpf_init_vector_stack(adapter); if (err) - goto free_msix; + goto free_rdma_msix; err = idpf_mb_intr_init(adapter); if (err) @@ -410,9 +400,6 @@ int idpf_intr_req(struct idpf_adapter *adapter) deinit_vec_stack: idpf_deinit_vector_stack(adapter); -free_msix: - kfree(adapter->msix_entries); - adapter->msix_entries = NULL; free_rdma_msix: kfree(adapter->rdma_msix_entries); adapter->rdma_msix_entries = NULL; diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c index 00c8fe692821..c75fc1fc4f64 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c @@ -3863,27 +3863,19 @@ static void idpf_q_vector_set_napi(struct idpf_q_vector *q_vector, bool link) /** * idpf_vport_intr_rel_irq - Free the IRQ association with the OS - * @vport: main vport structure * @rsrc: pointer to queue and vector resources */ -static void idpf_vport_intr_rel_irq(struct idpf_vport *vport, - struct idpf_q_vec_rsrc *rsrc) +static void idpf_vport_intr_rel_irq(struct idpf_q_vec_rsrc *rsrc) { - struct idpf_adapter *adapter = vport->adapter; - - for (u16 vector = 0; vector < rsrc->num_q_vectors; vector++) { + for (int vector = 0; vector < rsrc->num_q_vectors; vector++) { struct idpf_q_vector *q_vector = &rsrc->q_vectors[vector]; - int irq_num, vidx; /* free only the irqs that were actually requested */ if (!q_vector) continue; - vidx = rsrc->q_vector_idxs[vector]; - irq_num = adapter->msix_entries[vidx].vector; - idpf_q_vector_set_napi(q_vector, false); - kfree(free_irq(irq_num, q_vector)); + kfree(free_irq(q_vector->irq.virq, q_vector)); } } @@ -4052,7 +4044,7 @@ static int idpf_vport_intr_req_irq(struct idpf_vport *vport, { struct idpf_adapter *adapter = vport->adapter; const char *drv_name, *if_name, *vec_name; - int vector, err, irq_num, vidx; + int vector, err, vidx; vidx = rsrc->q_vector_idxs[rsrc->num_q_vectors]; adapter->dev_ops.reg_ops.noirq_intr_reg_init(adapter, rsrc, vidx); @@ -4062,10 +4054,10 @@ static int idpf_vport_intr_req_irq(struct idpf_vport *vport, for (vector = 0; vector < rsrc->num_q_vectors; vector++) { struct idpf_q_vector *q_vector = &rsrc->q_vectors[vector]; + int virq = q_vector->irq.virq; char *name; vidx = rsrc->q_vector_idxs[vector]; - irq_num = adapter->msix_entries[vidx].vector; adapter->dev_ops.reg_ops.intr_reg_init(adapter, q_vector, vidx); @@ -4081,8 +4073,8 @@ static int idpf_vport_intr_req_irq(struct idpf_vport *vport, name = kasprintf(GFP_KERNEL, "%s-%s-%s-%d", drv_name, if_name, vec_name, vector); - err = request_irq(irq_num, idpf_vport_intr_clean_queues, 0, - name, q_vector); + err = request_irq(virq, idpf_vport_intr_clean_queues, 0, name, + q_vector); if (err) { netdev_err(vport->netdev, "Request_irq failed, error: %d\n", err); @@ -4096,9 +4088,9 @@ static int idpf_vport_intr_req_irq(struct idpf_vport *vport, free_q_irqs: while (--vector >= 0) { - vidx = rsrc->q_vector_idxs[vector]; - irq_num = adapter->msix_entries[vidx].vector; - kfree(free_irq(irq_num, &rsrc->q_vectors[vector])); + int virq = rsrc->q_vectors[vector].irq.virq; + + kfree(free_irq(virq, &rsrc->q_vectors[vector])); } return err; @@ -4194,7 +4186,7 @@ void idpf_vport_intr_deinit(struct idpf_vport *vport, idpf_vport_intr_napi_dis_all(rsrc); idpf_vport_intr_dis_dim_all(rsrc); idpf_vport_intr_napi_del_all(rsrc); - idpf_vport_intr_rel_irq(vport, rsrc); + idpf_vport_intr_rel_irq(rsrc); } /** @@ -4507,18 +4499,30 @@ static void idpf_vport_intr_map_vector_to_qs(struct idpf_vport *vport, * @rsrc: pointer to queue and vector resources * * Initialize vector indexes with values returned over mailbox. + * + * Return: 0 on success, negative on failure */ -static void idpf_vport_intr_init_vec_idx(struct idpf_vport *vport, - struct idpf_q_vec_rsrc *rsrc) +static int idpf_vport_intr_init_vec_idx(struct idpf_vport *vport, + struct idpf_q_vec_rsrc *rsrc) { struct idpf_adapter *adapter = vport->adapter; int i; - for (i = 0; i < rsrc->num_q_vectors; i++) - rsrc->q_vectors[i].v_idx = + for (i = 0; i < rsrc->num_q_vectors; i++) { + struct idpf_q_vector *q_vector = &rsrc->q_vectors[i]; + + q_vector->v_idx = adapter->irq_info.vectors[rsrc->q_vector_idxs[i]].idx; + q_vector->irq.index = rsrc->q_vector_idxs[i]; + q_vector->irq.virq = pci_irq_vector(adapter->pdev, + q_vector->irq.index); + if (q_vector->irq.virq < 0) + return q_vector->irq.virq; + } rsrc->noirq_v_idx = adapter->irq_info.vectors[rsrc->q_vector_idxs[i]].idx; + + return 0; } /** @@ -4530,8 +4534,6 @@ static void idpf_vport_intr_napi_add_all(struct idpf_vport *vport, struct idpf_q_vec_rsrc *rsrc) { int (*napi_poll)(struct napi_struct *napi, int budget); - int irq_num; - u16 qv_idx; if (idpf_is_queue_model_split(rsrc->txq_model)) napi_poll = idpf_vport_splitq_napi_poll; @@ -4541,12 +4543,9 @@ static void idpf_vport_intr_napi_add_all(struct idpf_vport *vport, for (u16 v_idx = 0; v_idx < rsrc->num_q_vectors; v_idx++) { struct idpf_q_vector *q_vector = &rsrc->q_vectors[v_idx]; - qv_idx = rsrc->q_vector_idxs[v_idx]; - irq_num = vport->adapter->msix_entries[qv_idx].vector; - netif_napi_add_config(vport->netdev, &q_vector->napi, napi_poll, v_idx); - netif_napi_set_irq(&q_vector->napi, irq_num); + netif_napi_set_irq(&q_vector->napi, q_vector->irq.virq); } } @@ -4649,7 +4648,9 @@ int idpf_vport_intr_init(struct idpf_vport *vport, struct idpf_q_vec_rsrc *rsrc) { int err; - idpf_vport_intr_init_vec_idx(vport, rsrc); + err = idpf_vport_intr_init_vec_idx(vport, rsrc); + if (err) + return err; idpf_vport_intr_map_vector_to_qs(vport, rsrc); idpf_vport_intr_napi_add_all(vport, rsrc); diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.h b/drivers/net/ethernet/intel/idpf/idpf_txrx.h index ecff84df776d..57e61936ffda 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.h +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.h @@ -6,6 +6,7 @@ #include <linux/dim.h> #include <linux/net/intel/virtchnl2_lan_desc.h> +#include <linux/pci.h> #include <net/libeth/cache.h> #include <net/libeth/types.h> @@ -377,6 +378,7 @@ struct idpf_intr_reg { * @rx_intr_mode: Dynamic ITR or not * @rx_itr_idx: RX ITR index * @v_idx: Vector index + * @irq: kernel and driver irq numbers */ struct idpf_q_vector { __cacheline_group_begin_aligned(read_mostly); @@ -418,12 +420,13 @@ struct idpf_q_vector { __cacheline_group_begin_aligned(cold); u16 v_idx; + struct msi_map irq; __cacheline_group_end_aligned(cold); }; libeth_cacheline_set_assert(struct idpf_q_vector, 136, 56 + sizeof(struct napi_struct) + 2 * sizeof(struct dim), - 8); + 8 + sizeof(struct msi_map)); struct idpf_rx_queue_stats { u64_stats_t packets; -- 2.49.0
