diff mbox series

vfio: fix getting default container

Message ID 9bfc4c6d563f29ca4ef5cca80e650928e51e5514.1572889140.git.anatoly.burakov@intel.com (mailing list archive)
State Accepted, archived
Delegated to: David Marchand
Headers
Series vfio: fix getting default container |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-compilation success Compile Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed

Commit Message

Anatoly Burakov Nov. 4, 2019, 5:41 p.m. UTC 
  When requesting DMA mapping to default container, we are meant to
supply the RTE_VFIO_DEFAULT_CONTAINER_FD value, however this is
not handled correctly by get_vfio_cfg_by_container_fd(), because
it only looks at actual fd values and does not check for this
special case.

Fix it to return default container if the fd requested is the
special RTE_VFIO_DEFAULT_CONTAINER_FD value.

Fixes: 4f5519ed8349 ("vfio: cleanup getting group fd")
Cc: dariuszx.stojaczyk@intel.com
Cc: stable@dpdk.org

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/linux/eal/eal_vfio.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

David Marchand Nov. 4, 2019, 7:35 p.m. UTC | #1 
On Mon, Nov 4, 2019 at 6:41 PM Anatoly Burakov
<anatoly.burakov@intel.com> wrote:
>
> When requesting DMA mapping to default container, we are meant to
> supply the RTE_VFIO_DEFAULT_CONTAINER_FD value, however this is
> not handled correctly by get_vfio_cfg_by_container_fd(), because
> it only looks at actual fd values and does not check for this
> special case.
>
> Fix it to return default container if the fd requested is the
> special RTE_VFIO_DEFAULT_CONTAINER_FD value.
>
> Fixes: 4f5519ed8349 ("vfio: cleanup getting group fd")

RTE_VFIO_DEFAULT_CONTAINER_FD has been introduced in 4106d89a18f8
("vfio: allow DMA map to the default container") (19.05) as part of
the rework deprecating rte_vfio_dma_map.


>
> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> ---
>  lib/librte_eal/linux/eal/eal_vfio.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c
> index d9541b1220..d7887388f9 100644
> --- a/lib/librte_eal/linux/eal/eal_vfio.c
> +++ b/lib/librte_eal/linux/eal/eal_vfio.c
> @@ -412,6 +412,9 @@ get_vfio_cfg_by_container_fd(int container_fd)
>  {
>         int i;
>
> +       if (container_fd == RTE_VFIO_DEFAULT_CONTAINER_FD)
> +               return default_vfio_cfg;
> +
>         for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
>                 if (vfio_cfgs[i].vfio_container_fd == container_fd)
>                         return &vfio_cfgs[i];
> --
> 2.17.1

Reviewed-by: David Marchand <david.marchand@redhat.com>

Shahaf, can you review this patch please?
Thanks.
Shahaf Shuler Nov. 5, 2019, 12:38 p.m. UTC | #2 
Monday, November 4, 2019 9:35 PM, David Marchand:
> Subject: Re: [PATCH] vfio: fix getting default container
> 
> On Mon, Nov 4, 2019 at 6:41 PM Anatoly Burakov
> <anatoly.burakov@intel.com> wrote:
> >
> > When requesting DMA mapping to default container, we are meant to
> > supply the RTE_VFIO_DEFAULT_CONTAINER_FD value, however this is not
> > handled correctly by get_vfio_cfg_by_container_fd(), because it only
> > looks at actual fd values and does not check for this special case.
> >
> > Fix it to return default container if the fd requested is the special
> > RTE_VFIO_DEFAULT_CONTAINER_FD value.
> >
> > Fixes: 4f5519ed8349 ("vfio: cleanup getting group fd")
> 
> RTE_VFIO_DEFAULT_CONTAINER_FD has been introduced in 4106d89a18f8
> ("vfio: allow DMA map to the default container") (19.05) as part of the
> rework deprecating rte_vfio_dma_map.
> 
> 
> >
> > Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> > ---
> >  lib/librte_eal/linux/eal/eal_vfio.c | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/lib/librte_eal/linux/eal/eal_vfio.c
> > b/lib/librte_eal/linux/eal/eal_vfio.c
> > index d9541b1220..d7887388f9 100644
> > --- a/lib/librte_eal/linux/eal/eal_vfio.c
> > +++ b/lib/librte_eal/linux/eal/eal_vfio.c
> > @@ -412,6 +412,9 @@ get_vfio_cfg_by_container_fd(int container_fd)  {
> >         int i;
> >
> > +       if (container_fd == RTE_VFIO_DEFAULT_CONTAINER_FD)
> > +               return default_vfio_cfg;
> > +
> >         for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
> >                 if (vfio_cfgs[i].vfio_container_fd == container_fd)
> >                         return &vfio_cfgs[i];
> > --
> > 2.17.1
> 
> Reviewed-by: David Marchand <david.marchand@redhat.com>
> 
> Shahaf, can you review this patch please?
> Thanks.

Looks good. Thanks for spotting this. 
Acked-by: Shahaf Shuler <shahafs@mellanox.com>


> 
> --
> David Marchand
David Marchand Nov. 6, 2019, 1:44 p.m. UTC | #3 
On Mon, Nov 4, 2019 at 8:35 PM David Marchand <david.marchand@redhat.com> wrote:
>
> On Mon, Nov 4, 2019 at 6:41 PM Anatoly Burakov
> <anatoly.burakov@intel.com> wrote:
> >
> > When requesting DMA mapping to default container, we are meant to
> > supply the RTE_VFIO_DEFAULT_CONTAINER_FD value, however this is
> > not handled correctly by get_vfio_cfg_by_container_fd(), because
> > it only looks at actual fd values and does not check for this
> > special case.
> >
> > Fix it to return default container if the fd requested is the
> > special RTE_VFIO_DEFAULT_CONTAINER_FD value.
> >

Fixes: 4106d89a18f8 ("vfio: allow DMA map to the default container")
Cc: stable@dpdk.org

> > Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> Reviewed-by: David Marchand <david.marchand@redhat.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>

Applied with title "vfio: fix DMA mapping with default container" as
discussed on irc.
Thanks.


--
David Marchand
diff mbox series

Patch

diff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c
index d9541b1220..d7887388f9 100644
--- a/lib/librte_eal/linux/eal/eal_vfio.c
+++ b/lib/librte_eal/linux/eal/eal_vfio.c
@@ -412,6 +412,9 @@  get_vfio_cfg_by_container_fd(int container_fd)
 {
 	int i;
 
+	if (container_fd == RTE_VFIO_DEFAULT_CONTAINER_FD)
+		return default_vfio_cfg;
+
 	for (i = 0; i < VFIO_MAX_CONTAINERS; i++) {
 		if (vfio_cfgs[i].vfio_container_fd == container_fd)
 			return &vfio_cfgs[i];