From: gowrishankar muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
To: dev@dpdk.org, Anatoly Burakov <anatoly.burakov@intel.com>
Cc: Andrew Rybchenko <arybchenko@solarflare.com>,
Alejandro Lucero <alejandro.lucero@netronome.com>,
Alexey Kardashevskiy <aik@ozlabs.ru>,
Thomas Monjalon <thomas@monjalon.net>
Subject: Re: [dpdk-dev] [PATCH] vfio: set IOMMU type for the container once
Date: Fri, 21 Apr 2017 14:42:26 +0530 [thread overview]
Message-ID: <d511fdb1-1213-5ee7-bf1c-8594e7013f7c@linux.vnet.ibm.com> (raw)
In-Reply-To: <1491321976-27290-1-git-send-email-arybchenko@solarflare.com>
Could this patch be reviewed and merged for 17.05 rc3 ?. It solved
regression with i40e pmd
bring up in one of our ppc64le server models through vfio-pci pci module.
Thanks Alexey pointing out this in one of your patches.
Regards,
Gowrishankar
On Tuesday 04 April 2017 09:36 PM, Andrew Rybchenko wrote:
> If more than one used PCI device belongs to one IOMMU group,
> it is still one IOMMU group and the container IOMMU type
> should be set only once.
>
> Fixes: 94c0776b1bad ("vfio: support hotplug")
>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> ---
> My testing of the patch is limitted to my configuration with 2 PCI
> functions which belong to one IOMMU group.
>
> lib/librte_eal/linuxapp/eal/eal_vfio.c | 54 ++++++++++++++++++----------------
> 1 file changed, 29 insertions(+), 25 deletions(-)
>
> diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c
> index 6e2e84c..dd59c1c 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_vfio.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c
> @@ -298,33 +298,37 @@ vfio_setup_device(const char *sysfs_base, const char *dev_addr,
> clear_group(vfio_group_fd);
> return -1;
> }
> - }
>
> - /*
> - * pick an IOMMU type and set up DMA mappings for container
> - *
> - * needs to be done only once, only when first group is assigned to
> - * a container and only in primary process. Note this can happen several
> - * times with the hotplug functionality.
> - */
> - if (internal_config.process_type == RTE_PROC_PRIMARY &&
> - vfio_cfg.vfio_active_groups == 1) {
> - /* select an IOMMU type which we will be using */
> - const struct vfio_iommu_type *t =
> + /*
> + * pick an IOMMU type and set up DMA mappings for container
> + *
> + * needs to be done only once, only when first group is
> + * assigned to a container and only in primary process.
> + * Note this can happen several times with the hotplug
> + * functionality.
> + */
> + if (internal_config.process_type == RTE_PROC_PRIMARY &&
> + vfio_cfg.vfio_active_groups == 1) {
> + /* select an IOMMU type which we will be using */
> + const struct vfio_iommu_type *t =
> vfio_set_iommu_type(vfio_cfg.vfio_container_fd);
> - if (!t) {
> - RTE_LOG(ERR, EAL, " %s failed to select IOMMU type\n", dev_addr);
> - close(vfio_group_fd);
> - clear_group(vfio_group_fd);
> - return -1;
> - }
> - ret = t->dma_map_func(vfio_cfg.vfio_container_fd);
> - if (ret) {
> - RTE_LOG(ERR, EAL, " %s DMA remapping failed, "
> - "error %i (%s)\n", dev_addr, errno, strerror(errno));
> - close(vfio_group_fd);
> - clear_group(vfio_group_fd);
> - return -1;
> + if (!t) {
> + RTE_LOG(ERR, EAL,
> + " %s failed to select IOMMU type\n",
> + dev_addr);
> + close(vfio_group_fd);
> + clear_group(vfio_group_fd);
> + return -1;
> + }
> + ret = t->dma_map_func(vfio_cfg.vfio_container_fd);
> + if (ret) {
> + RTE_LOG(ERR, EAL,
> + " %s DMA remapping failed, error %i (%s)\n",
> + dev_addr, errno, strerror(errno));
> + close(vfio_group_fd);
> + clear_group(vfio_group_fd);
> + return -1;
> + }
> }
> }
>
next prev parent reply other threads:[~2017-04-21 9:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-04 16:06 Andrew Rybchenko
2017-04-21 9:12 ` gowrishankar muthukrishnan [this message]
2017-04-21 9:23 ` Alejandro Lucero
2017-04-26 10:36 ` gowrishankar muthukrishnan
2017-04-26 10:52 ` Alejandro Lucero
2017-04-28 13:24 ` Burakov, Anatoly
2017-04-30 17:25 ` Thomas Monjalon
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=d511fdb1-1213-5ee7-bf1c-8594e7013f7c@linux.vnet.ibm.com \
--to=gowrishankar.m@linux.vnet.ibm.com \
--cc=aik@ozlabs.ru \
--cc=alejandro.lucero@netronome.com \
--cc=anatoly.burakov@intel.com \
--cc=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).