DPDK patches and discussions
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@redhat.com>
To: Tal Shnaiderman <talshn@mellanox.com>,
	"Burakov, Anatoly" <anatoly.burakov@intel.com>
Cc: dev <dev@dpdk.org>, Beilei Xing <beilei.xing@intel.com>,
	Jeff Guo <jia.guo@intel.com>,
	 "Ma, LihongX" <lihongx.ma@intel.com>,
	"Zhang, AlvinX" <alvinx.zhang@intel.com>
Subject: Re: [dpdk-dev] [PATCH] bus/pci: fix mmap PCI resource
Date: Wed, 8 Jul 2020 11:38:55 +0200	[thread overview]
Message-ID: <CAJFAV8z0U9K+BCcn71DpVhhFoASPTfBvTNC0Q9DJdYoB4jm6ZA@mail.gmail.com> (raw)
In-Reply-To: <20200708092435.9776-1-alvinx.zhang@intel.com>

On Wed, Jul 8, 2020 at 11:26 AM <alvinx.zhang@intel.com> wrote:
>
> From: Alvin Zhang <alvinx.zhang@intel.com>
>
> When mapping a PCI BAR containing an MSI-X table, some devices do not
> need to actually map this BAR or only need to map part of them, which
> may cause the mapping to fail. Now some checks are added and a non-NULL
> initial value is set to the variable to avoid this situation.
>
> Fixes: 2fd3567e5425 ("pci: use OS generic memory mapping functions")
> Cc: talshn@mellanox.com
>
> Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>


I guess this had to do with:
https://bugs.dpdk.org/show_bug.cgi?id=503

Review please.

-- 
David Marchand


> ---
>  drivers/bus/pci/linux/pci_vfio.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
> index fdeb9a8..9143bfc 100644
> --- a/drivers/bus/pci/linux/pci_vfio.c
> +++ b/drivers/bus/pci/linux/pci_vfio.c
> @@ -547,6 +547,14 @@
>                         bar_index,
>                         memreg[0].offset, memreg[0].size,
>                         memreg[1].offset, memreg[1].size);
> +
> +               if (memreg[0].size == 0 && memreg[1].size == 0) {
> +                       /* No need to map this BAR */
> +                       RTE_LOG(DEBUG, EAL, "Skipping BAR%d\n", bar_index);
> +                       bar->size = 0;
> +                       bar->addr = 0;
> +                       return 0;
> +               }
>         } else {
>                 memreg[0].offset = bar->offset;
>                 memreg[0].size = bar->size;
> @@ -556,7 +564,9 @@
>         bar_addr = mmap(bar->addr, bar->size, 0, MAP_PRIVATE |
>                         MAP_ANONYMOUS | additional_flags, -1, 0);
>         if (bar_addr != MAP_FAILED) {
> -               void *map_addr = NULL;
> +               /* Set non NULL initial value for in case of no PCI mapping */
> +               void *map_addr = bar_addr;
> +
>                 if (memreg[0].size) {
>                         /* actual map of first part */
>                         map_addr = pci_map_resource(bar_addr, vfio_dev_fd,
> --
> 1.8.3.1
>


  reply	other threads:[~2020-07-08  9:39 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-08  9:24 alvinx.zhang
2020-07-08  9:38 ` David Marchand [this message]
2020-07-08 13:58 ` Xia, Chenbo
2020-07-09  5:13   ` Zhang, AlvinX
2020-07-09  5:21     ` Xia, Chenbo
2020-07-09  2:25 ` Xiao, QimaiX
2020-07-10  9:54 ` David Marchand
2020-07-10 10:07   ` Thomas Monjalon
2020-07-10 12:31     ` Thomas Monjalon
2020-07-10 12:43     ` [dpdk-dev] [dpdk-ci] " Lincoln Lavoie
2020-09-23  7:34     ` [dpdk-dev] " David Marchand
2020-07-11  6:57   ` Zhang, AlvinX

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=CAJFAV8z0U9K+BCcn71DpVhhFoASPTfBvTNC0Q9DJdYoB4jm6ZA@mail.gmail.com \
    --to=david.marchand@redhat.com \
    --cc=alvinx.zhang@intel.com \
    --cc=anatoly.burakov@intel.com \
    --cc=beilei.xing@intel.com \
    --cc=dev@dpdk.org \
    --cc=jia.guo@intel.com \
    --cc=lihongx.ma@intel.com \
    --cc=talshn@mellanox.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).