DPDK patches and discussions
 help / color / mirror / Atom feed
From: Romain Delhomel <romain.delhomel@6wind.com>
To: dev@dpdk.org
Cc: elias.boutaleb@6wind.com, guillaume.gaudonville@6wind.com,
	hemant.agrawal@nxp.com, olivier.matz@6wind.com,
	sachin.saxena@oss.nxp.com, stephane.gonauer@6wind.com,
	stable@dpdk.org
Subject: [PATCH] bus/fslmc: fix invalid use of default VFIO config
Date: Fri,  3 Jun 2022 17:18:30 +0200	[thread overview]
Message-ID: <20220603151830.26845-1-romain.delhomel@6wind.com> (raw)
In-Reply-To: <CAC9qv4BEL9c80k7s6SF6n53v_kXU=EvuOC2CHSNOZpqyPavfDw@mail.gmail.com>

At device probe, the fslmc bus driver calls rte_vfio_get_group_fd() to
get a fd associated to a vfio group. This function first checks if the
group is already opened, else it opens /dev/vfio/%u, and increases the
number of active groups in default_vfio_cfg (which references the
default vfio container).

When adding the first group to a vfio_cfg, the caller is supposed to
pick an IOMMU type and set up DMA mappings for container, as it's done
by pci bus, but it is not done here. Instead, a new container is created
and used.

This prevents the pci bus driver, which uses the default_vfio_cfg
container, to configure the container because
default_vfio_cfg->active_group > 1.

This patch fixes the issue by always creating a new container (and its
associated vfio_cfg) and binding the group to it.

Fixes: a69f79300262 ("bus/fslmc: support multi VFIO group")
Cc: stable@dpdk.org

Signed-off-by: Romain Delhomel <romain.delhomel@6wind.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/bus/fslmc/fslmc_vfio.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index b4704eeae4e2..abe1cab2ee20 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -979,6 +979,7 @@ fslmc_vfio_setup_group(void)
 {
 	int groupid;
 	int ret;
+	int vfio_container_fd;
 	struct vfio_group_status status = { .argsz = sizeof(status) };
 
 	/* if already done once */
@@ -997,8 +998,15 @@ fslmc_vfio_setup_group(void)
 		return 0;
 	}
 
+	ret = rte_vfio_container_create();
+	if (ret < 0) {
+		DPAA2_BUS_ERR("Failed to open VFIO container");
+		return ret;
+	}
+	vfio_container_fd = ret;
+
 	/* Get the actual group fd */
-	ret = rte_vfio_get_group_fd(groupid);
+	ret = rte_vfio_container_group_bind(vfio_container_fd, groupid);
 	if (ret < 0)
 		return ret;
 	vfio_group.fd = ret;
-- 
2.30.2


  parent reply	other threads:[~2022-06-03 15:19 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-27  8:28 [RFC] bus/fslmc: fix invalid use of default vfio config Romain Delhomel
2022-05-27  8:34 ` Romain Delhomel
2022-05-27  8:38   ` Romain Delhomel
2022-05-31  9:27 ` [RFC v2] bus/fslmc: fix invalid use of default VFIO config Romain Delhomel
2022-06-03 13:58   ` Hemant Agrawal
2022-06-03 15:18 ` Romain Delhomel [this message]
2022-06-07 15:41   ` [PATCH] " 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=20220603151830.26845-1-romain.delhomel@6wind.com \
    --to=romain.delhomel@6wind.com \
    --cc=dev@dpdk.org \
    --cc=elias.boutaleb@6wind.com \
    --cc=guillaume.gaudonville@6wind.com \
    --cc=hemant.agrawal@nxp.com \
    --cc=olivier.matz@6wind.com \
    --cc=sachin.saxena@oss.nxp.com \
    --cc=stable@dpdk.org \
    --cc=stephane.gonauer@6wind.com \
    /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).