From: Romain Delhomel <romain.delhomel@6wind.com>
To: hemant.agrawal@nxp.com, sachin.saxena@oss.nxp.com
Cc: dev@dpdk.org, Olivier Matz <olivier.matz@6wind.com>
Subject: [RFC] bus/fslmc: fix invalid use of default vfio config
Date: Fri, 27 May 2022 10:28:38 +0200 [thread overview]
Message-ID: <CAC9qv4BEL9c80k7s6SF6n53v_kXU=EvuOC2CHSNOZpqyPavfDw@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1825 bytes --]
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 use 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 bind the group to it.
Fixes: a69f79300262 ("bus/fslmc: support multi VFIO group")
Signed-off-by: Romain Delhomel <romain.delhomel@6wind.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
[-- Attachment #2: Type: text/html, Size: 2119 bytes --]
next reply other threads:[~2022-05-27 8:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-27 8:28 Romain Delhomel [this message]
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 ` [PATCH] " Romain Delhomel
2022-06-07 15:41 ` 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='CAC9qv4BEL9c80k7s6SF6n53v_kXU=EvuOC2CHSNOZpqyPavfDw@mail.gmail.com' \
--to=romain.delhomel@6wind.com \
--cc=dev@dpdk.org \
--cc=hemant.agrawal@nxp.com \
--cc=olivier.matz@6wind.com \
--cc=sachin.saxena@oss.nxp.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).