This is a note to let you know that I've just added the patch titled
vDPA/ifcvf: decouple config/dev IRQ requester and vectors allocator from the adapter
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
vdpa-ifcvf-decouple-config-dev-irq-requester-and-vectors-allocator-from-the-adapter.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a70d833e696e538a0feff5e539086c74a90ddf90 Mon Sep 17 00:00:00 2001
From: Zhu Lingshan <lingshan.zhu@xxxxxxxxx>
Date: Fri, 25 Nov 2022 22:57:19 +0800
Subject: vDPA/ifcvf: decouple config/dev IRQ requester and vectors allocator from the adapter
From: Zhu Lingshan <lingshan.zhu@xxxxxxxxx>
commit a70d833e696e538a0feff5e539086c74a90ddf90 upstream.
This commit decouples the config irq requester, the device
shared irq requester and the MSI vectors allocator from
the adapter. So they can be safely invoked since probe
before the adapter is allocated.
Signed-off-by: Zhu Lingshan <lingshan.zhu@xxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Message-Id: <20221125145724.1129962-8-lingshan.zhu@xxxxxxxxx>
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/vdpa/ifcvf/ifcvf_main.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
--- a/drivers/vdpa/ifcvf/ifcvf_main.c
+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -132,10 +132,9 @@ static void ifcvf_free_irq(struct ifcvf_
* It returns the number of allocated vectors, negative
* return value when fails.
*/
-static int ifcvf_alloc_vectors(struct ifcvf_adapter *adapter)
+static int ifcvf_alloc_vectors(struct ifcvf_hw *vf)
{
- struct pci_dev *pdev = adapter->pdev;
- struct ifcvf_hw *vf = &adapter->vf;
+ struct pci_dev *pdev = vf->pdev;
int max_intr, ret;
/* all queues and config interrupt */
@@ -222,10 +221,9 @@ err:
return -EFAULT;
}
-static int ifcvf_request_dev_irq(struct ifcvf_adapter *adapter)
+static int ifcvf_request_dev_irq(struct ifcvf_hw *vf)
{
- struct pci_dev *pdev = adapter->pdev;
- struct ifcvf_hw *vf = &adapter->vf;
+ struct pci_dev *pdev = vf->pdev;
int i, vector, ret, irq;
vector = 0;
@@ -276,10 +274,9 @@ static int ifcvf_request_vq_irq(struct i
return ret;
}
-static int ifcvf_request_config_irq(struct ifcvf_adapter *adapter)
+static int ifcvf_request_config_irq(struct ifcvf_hw *vf)
{
- struct pci_dev *pdev = adapter->pdev;
- struct ifcvf_hw *vf = &adapter->vf;
+ struct pci_dev *pdev = vf->pdev;
int config_vector, ret;
if (vf->msix_vector_status == MSIX_VECTOR_PER_VQ_AND_CONFIG)
@@ -322,7 +319,7 @@ static int ifcvf_request_irq(struct ifcv
struct ifcvf_hw *vf = &adapter->vf;
int nvectors, ret, max_intr;
- nvectors = ifcvf_alloc_vectors(adapter);
+ nvectors = ifcvf_alloc_vectors(vf);
if (nvectors <= 0)
return -EFAULT;
@@ -333,7 +330,7 @@ static int ifcvf_request_irq(struct ifcv
if (nvectors == 1) {
vf->msix_vector_status = MSIX_VECTOR_DEV_SHARED;
- ret = ifcvf_request_dev_irq(adapter);
+ ret = ifcvf_request_dev_irq(vf);
return ret;
}
@@ -342,7 +339,7 @@ static int ifcvf_request_irq(struct ifcv
if (ret)
return ret;
- ret = ifcvf_request_config_irq(adapter);
+ ret = ifcvf_request_config_irq(vf);
if (ret)
return ret;
Patches currently in stable-queue which might be from lingshan.zhu@xxxxxxxxx are
queue-6.1/vdpa-ifcvf-allocate-the-adapter-in-dev_add.patch
queue-6.1/vdpa-ifcvf-decouple-vq-irq-releasers-from-the-adapter.patch
queue-6.1/vdpa-ifcvf-decouple-vq-irq-requester-from-the-adapter.patch
queue-6.1/vdpa-ifcvf-ifcvf_request_irq-works-on-ifcvf_hw.patch
queue-6.1/vdpa-ifcvf-decouple-config-space-ops-from-the-adapter.patch
queue-6.1/vdpa-ifcvf-decouple-config-irq-releaser-from-the-adapter.patch
queue-6.1/vdpa-ifcvf-alloc-the-mgmt_dev-before-the-adapter.patch
queue-6.1/vdpa-ifcvf-manage-ifcvf_hw-in-the-mgmt_dev.patch
queue-6.1/vdpa-ifcvf-decouple-hw-features-manipulators-from-the-adapter.patch
queue-6.1/vdpa-ifcvf-decouple-config-dev-irq-requester-and-vectors-allocator-from-the-adapter.patch
