From: "Michael S. Tsirkin" <mst@redhat•com>
To: Zhu Lingshan <lingshan.zhu@intel•com>
Cc: jasowang@redhat•com, netdev@vger•kernel.org
Subject: Re: [PATCH 7/7] vDPA/ifcvf: improve irq requester, to handle per_vq/shared/config irq
Date: Mon, 10 Jan 2022 01:04:32 -0500 [thread overview]
Message-ID: <20220110005612-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20220110051851.84807-8-lingshan.zhu@intel.com>
On Mon, Jan 10, 2022 at 01:18:51PM +0800, Zhu Lingshan wrote:
> This commit expends irq requester abilities to handle per vq irq,
> shared irq and config irq.
>
> On some platforms, the device can not get enough vectors for every
> virtqueue and config interrupt, the device needs to work under such
> circumstances.
>
> Normally a device can get enough vectors, so every virtqueue and
> config interrupt can have its own vector/irq. If the total vector
> number is less than all virtqueues + 1(config interrupt), all
> virtqueues need to share a vector/irq and config interrupt is
> enabled. If the total vector number < 2, all vitequeues share
> a vector/irq, and config interrupt is disabled. Otherwise it will
> fail if allocation for vectors fails.
>
> This commit also made necessary chages to the irq cleaner to
> free per vq irq/shared irq and config irq.
>
> Signed-off-by: Zhu Lingshan <lingshan.zhu@intel•com>
In this case, shouldn't you also check VIRTIO_PCI_ISR_CONFIG?
doing that will skip the need
> ---
> drivers/vdpa/ifcvf/ifcvf_base.h | 6 +--
> drivers/vdpa/ifcvf/ifcvf_main.c | 78 +++++++++++++++------------------
> 2 files changed, 38 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h
> index 1d5431040d7d..1d0afb63f06c 100644
> --- a/drivers/vdpa/ifcvf/ifcvf_base.h
> +++ b/drivers/vdpa/ifcvf/ifcvf_base.h
> @@ -27,8 +27,6 @@
>
> #define IFCVF_QUEUE_ALIGNMENT PAGE_SIZE
> #define IFCVF_QUEUE_MAX 32768
> -#define IFCVF_MSI_CONFIG_OFF 0
> -#define IFCVF_MSI_QUEUE_OFF 1
> #define IFCVF_PCI_MAX_RESOURCE 6
>
> #define IFCVF_LM_CFG_SIZE 0x40
> @@ -102,11 +100,13 @@ struct ifcvf_hw {
> u8 notify_bar;
> /* Notificaiton bar address */
> void __iomem *notify_base;
> + u8 vector_per_vq;
> + u16 padding;
What is this padding doing?
> phys_addr_t notify_base_pa;
> u32 notify_off_multiplier;
> + u32 dev_type;
> u64 req_features;
> u64 hw_features;
> - u32 dev_type;
moving things around ... optimization? split out.
> struct virtio_pci_common_cfg __iomem *common_cfg;
> void __iomem *net_cfg;
> struct vring_info vring[IFCVF_MAX_QUEUES];
> diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
> index 414b5dfd04ca..ec76e342bd7e 100644
> --- a/drivers/vdpa/ifcvf/ifcvf_main.c
> +++ b/drivers/vdpa/ifcvf/ifcvf_main.c
> @@ -17,6 +17,8 @@
> #define DRIVER_AUTHOR "Intel Corporation"
> #define IFCVF_DRIVER_NAME "ifcvf"
>
> +static struct vdpa_config_ops ifc_vdpa_ops;
> +
there can be multiple devices thinkably.
reusing a global ops does not sound reasonable.
> static irqreturn_t ifcvf_config_changed(int irq, void *arg)
> {
> struct ifcvf_hw *vf = arg;
> @@ -63,13 +65,20 @@ static void ifcvf_free_irq(struct ifcvf_adapter *adapter, int queues)
> struct ifcvf_hw *vf = &adapter->vf;
> int i;
>
> + if (vf->vector_per_vq)
> + for (i = 0; i < queues; i++) {
> + devm_free_irq(&pdev->dev, vf->vring[i].irq, &vf->vring[i]);
> + vf->vring[i].irq = -EINVAL;
> + }
> + else
> + devm_free_irq(&pdev->dev, vf->vring[0].irq, vf);
>
> - for (i = 0; i < queues; i++) {
> - devm_free_irq(&pdev->dev, vf->vring[i].irq, &vf->vring[i]);
> - vf->vring[i].irq = -EINVAL;
> +
> + if (vf->config_irq != -EINVAL) {
> + devm_free_irq(&pdev->dev, vf->config_irq, vf);
> + vf->config_irq = -EINVAL;
> }
what about other error types?
>
> - devm_free_irq(&pdev->dev, vf->config_irq, vf);
> ifcvf_free_irq_vectors(pdev);
> }
>
> @@ -191,52 +200,35 @@ static int ifcvf_request_config_irq(struct ifcvf_adapter *adapter, int config_ve
>
> static int ifcvf_request_irq(struct ifcvf_adapter *adapter)
> {
> - struct pci_dev *pdev = adapter->pdev;
> struct ifcvf_hw *vf = &adapter->vf;
> - int vector, i, ret, irq;
> - u16 max_intr;
> + u16 nvectors, max_vectors;
> + int config_vector, ret;
>
> - /* all queues and config interrupt */
> - max_intr = vf->nr_vring + 1;
> + nvectors = ifcvf_alloc_vectors(adapter);
> + if (nvectors < 0)
> + return nvectors;
>
> - ret = pci_alloc_irq_vectors(pdev, max_intr,
> - max_intr, PCI_IRQ_MSIX);
> - if (ret < 0) {
> - IFCVF_ERR(pdev, "Failed to alloc IRQ vectors\n");
> - return ret;
> - }
> + vf->vector_per_vq = true;
> + max_vectors = vf->nr_vring + 1;
> + config_vector = vf->nr_vring;
>
> - snprintf(vf->config_msix_name, 256, "ifcvf[%s]-config\n",
> - pci_name(pdev));
> - vector = 0;
> - vf->config_irq = pci_irq_vector(pdev, vector);
> - ret = devm_request_irq(&pdev->dev, vf->config_irq,
> - ifcvf_config_changed, 0,
> - vf->config_msix_name, vf);
> - if (ret) {
> - IFCVF_ERR(pdev, "Failed to request config irq\n");
> - return ret;
> + if (nvectors < max_vectors) {
> + vf->vector_per_vq = false;
> + config_vector = 1;
> + ifc_vdpa_ops.get_vq_irq = NULL;
> }
>
> - for (i = 0; i < vf->nr_vring; i++) {
> - snprintf(vf->vring[i].msix_name, 256, "ifcvf[%s]-%d\n",
> - pci_name(pdev), i);
> - vector = i + IFCVF_MSI_QUEUE_OFF;
> - irq = pci_irq_vector(pdev, vector);
> - ret = devm_request_irq(&pdev->dev, irq,
> - ifcvf_intr_handler, 0,
> - vf->vring[i].msix_name,
> - &vf->vring[i]);
> - if (ret) {
> - IFCVF_ERR(pdev,
> - "Failed to request irq for vq %d\n", i);
> - ifcvf_free_irq(adapter, i);
> + if (nvectors < 2)
> + config_vector = 0;
>
> - return ret;
> - }
> + ret = ifcvf_request_vq_irq(adapter, vf->vector_per_vq);
> + if (ret)
> + return ret;
>
> - vf->vring[i].irq = irq;
> - }
> + ret = ifcvf_request_config_irq(adapter, config_vector);
> +
> + if (ret)
> + return ret;
here on error we need to cleanup vq irq we requested, need we not?
>
> return 0;
> }
> @@ -573,7 +565,7 @@ static struct vdpa_notification_area ifcvf_get_vq_notification(struct vdpa_devic
> * IFCVF currently does't have on-chip IOMMU, so not
> * implemented set_map()/dma_map()/dma_unmap()
> */
> -static const struct vdpa_config_ops ifc_vdpa_ops = {
> +static struct vdpa_config_ops ifc_vdpa_ops = {
> .get_features = ifcvf_vdpa_get_features,
> .set_features = ifcvf_vdpa_set_features,
> .get_status = ifcvf_vdpa_get_status,
> --
> 2.27.0
next prev parent reply other threads:[~2022-01-10 6:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-10 5:18 [PATCH 0/7] Supoort shared irq for virtqueues Zhu Lingshan
2022-01-10 5:18 ` [PATCH 1/7] vDPA/ifcvf: implement IO read/write helpers in the header file Zhu Lingshan
2022-01-10 5:18 ` [PATCH 2/7] vDPA/ifcvf: introduce new helpers to set config vector and vq vectors Zhu Lingshan
2022-01-10 6:15 ` Michael S. Tsirkin
2022-01-10 5:18 ` [PATCH 3/7] vDPA/ifcvf: implement device MSIX vector allocation helper Zhu Lingshan
2022-01-10 6:12 ` Michael S. Tsirkin
2022-01-10 5:18 ` [PATCH 4/7] vDPA/ifcvf: implement shared irq handlers for vqs Zhu Lingshan
2022-01-10 6:10 ` Michael S. Tsirkin
2022-01-10 5:18 ` [PATCH 5/7] vDPA/ifcvf: irq request helpers for both shared and per_vq irq Zhu Lingshan
2022-01-10 6:09 ` Michael S. Tsirkin
2022-01-10 5:18 ` [PATCH 6/7] vDPA/ifcvf: implement config interrupt request helper Zhu Lingshan
2022-01-10 6:07 ` Michael S. Tsirkin
2022-01-10 5:18 ` [PATCH 7/7] vDPA/ifcvf: improve irq requester, to handle per_vq/shared/config irq Zhu Lingshan
2022-01-10 6:04 ` Michael S. Tsirkin [this message]
[not found] ` <bc210134-4b1c-1b23-47f3-c90fb4b91b65@intel.com>
[not found] ` <d7610c1c-611f-86e2-5330-c4783db078f5@intel.com>
2022-01-13 9:52 ` Michael S. Tsirkin
2022-01-13 10:10 ` Zhu, Lingshan
2022-01-13 10:29 ` Michael S. Tsirkin
[not found] ` <7546243d-1561-51fb-55d3-fe0ff1651e48@intel.com>
2022-01-14 13:36 ` Michael S. Tsirkin
2022-01-18 3:07 ` Zhu, Lingshan
2022-01-18 8:07 ` Michael S. Tsirkin
2022-01-13 9:54 ` Michael S. Tsirkin
2022-01-10 6:05 ` [PATCH 0/7] Supoort shared irq for virtqueues Michael S. Tsirkin
2022-01-13 10:30 ` Michael S. Tsirkin
-- strict thread matches above, loose matches on Subject: below --
2022-01-10 5:19 Zhu Lingshan
2022-01-10 5:19 ` [PATCH 7/7] vDPA/ifcvf: improve irq requester, to handle per_vq/shared/config irq Zhu Lingshan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220110005612-mutt-send-email-mst@kernel.org \
--to=mst@redhat$(echo .)com \
--cc=jasowang@redhat$(echo .)com \
--cc=lingshan.zhu@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox