DPDK patches and discussions
 help / color / mirror / Atom feed
From: "Kadam, Pallavi" <pallavi.kadam@intel.com>
To: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Cc: <dev@dpdk.org>, <thomas@monjalon.net>, <ranjit.menon@intel.com>,
	<Narcisa.Vasile@microsoft.com>, <roretzla@linux.microsoft.com>,
	<qiao.liu@intel.com>
Subject: Re: [dpdk-kmods] windows/netuio: fix bar parsing
Date: Mon, 8 Aug 2022 13:40:17 -0700	[thread overview]
Message-ID: <d0af9976-f1c2-26d7-6b30-0438349b28f0@intel.com> (raw)
In-Reply-To: <20220807000113.4f773581@sovereign>

[-- Attachment #1: Type: text/plain, Size: 4057 bytes --]

Hi Dmitry,

On 8/6/2022 2:01 PM, Dmitry Kozlyuk wrote:
> 2022-08-02 12:10 (UTC-0700), Pallavi Kadam:
>> For certain PCIe devices, BAR values are not continuous.
>> This patch maps all the BARs and avoids skipping the next BAR addresses.
>>
>> Fixes: e28aabd88279 ("windows/netuio: introduce NetUIO kernel driver")
>> Cc:navasile@microsoft.com
>>
>> Signed-off-by: Qiao Liu<qiao.liu@intel.com>
>> Signed-off-by: Pallavi Kadam<pallavi.kadam@intel.com>
>> ---
>>   windows/netuio/netuio_dev.c | 5 ++++-
>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/windows/netuio/netuio_dev.c b/windows/netuio/netuio_dev.c
>> index b2deb10..e2cac3e 100644
>> --- a/windows/netuio/netuio_dev.c
>> +++ b/windows/netuio/netuio_dev.c
>> @@ -172,6 +172,7 @@ netuio_map_hw_resources(WDFDEVICE Device, WDFCMRESLIST Resources, WDFCMRESLIST R
>>       ULONG next_descriptor = 0;
>>       ULONG curr_bar = 0;
>>       ULONG prev_bar = 0;
>> +    BOOLEAN bar_done = FALSE;
>>   
>>      /*
>>       * ResourcesTranslated report MMIO BARs in the correct order, but their
>> @@ -197,7 +198,8 @@ netuio_map_hw_resources(WDFDEVICE Device, WDFCMRESLIST Resources, WDFCMRESLIST R
>>       for (INT bar_index = 0; bar_index < PCI_MAX_BAR; bar_index++) {
>>           prev_bar = curr_bar;
>>           curr_bar = pci_config.u.type0.BaseAddresses[bar_index];
>> -        if (curr_bar == 0 || (prev_bar & PCI_TYPE_64BIT)) {
>> +        if (curr_bar == 0 || ((prev_bar & PCI_TYPE_64BIT) && (bar_done))) {
>> +            bar_done = FALSE;
>>               continue;
>>           }
>>   
>> @@ -219,6 +221,7 @@ netuio_map_hw_resources(WDFDEVICE Device, WDFCMRESLIST Resources, WDFCMRESLIST R
>>           ctx->bar[bar_index].virt_addr = MmMapIoSpace(descriptor->u.Memory.Start,
>>                                                        descriptor->u.Memory.Length,
>>                                                        MmNonCached);
>> +        bar_done = TRUE;
>>           if (ctx->bar[bar_index].virt_addr == NULL) {
>>               status = STATUS_INSUFFICIENT_RESOURCES;
>>               goto end;
> Hi Pallavi,
>
> In the first place, it was wrong to always test `prev_bar & PCI_TYPE_64BIT`
> because only the first BAR slot of a 64-bit BAR contains flags.
> The current code has a state to track (curr_bar, prev_bar),
> and the fix is complicating it even more without solving the root cause.
> I suggest a simpler fix (not tested!)
> that eliminates both the incorrectness and the state to maintain:

Thank you for these changes. Will test the patch and let you know.

>
> diff --git a/windows/netuio/netuio_dev.c b/windows/netuio/netuio_dev.c
> index d4662b6..8761d31 100644
> --- a/windows/netuio/netuio_dev.c
> +++ b/windows/netuio/netuio_dev.c
> @@ -273,8 +273,6 @@ netuio_map_hw_resources(WDFDEVICE Device, WDFCMRESLIST
> Resources, WDFCMRESLIST R
>   
>       PCM_PARTIAL_RESOURCE_DESCRIPTOR descriptor;
>       ULONG next_descriptor = 0;
> -    ULONG curr_bar = 0;
> -    ULONG prev_bar = 0;
>   
>      /*
>       * ResourcesTranslated report MMIO BARs in the correct order, but their
> @@ -298,9 +296,9 @@ netuio_map_hw_resources(WDFDEVICE Device, WDFCMRESLIST
> Resources, WDFCMRESLIST R
>       * searching for the next MMIO resource each time.
>       */
>       for (INT bar_index = 0; bar_index < PCI_MAX_BAR; bar_index++) {
> -        prev_bar = curr_bar;
> -        curr_bar = pci_config.u.type0.BaseAddresses[bar_index];
> -        if (curr_bar == 0 || (prev_bar & PCI_TYPE_64BIT)) {
> +        ULONG bar_value = pci_config.u.type0.BaseAddresses[bar_index];
> +
> +        if (bar_value == 0) {
>               continue;
>           }
>   
> @@ -339,6 +337,11 @@ netuio_map_hw_resources(WDFDEVICE Device, WDFCMRESLIST
> Resources, WDFCMRESLIST R
>           }
>   
>           ctx->dpdk_hw[bar_index].mem.size = ctx->bar[bar_index].size;
> +
> +        // Skip the next BAR slot used by the current 64-bit address.
> +        if (bar_value & PCI_TYPE_64BIT) {
> +            bar_index++;
> +        }
>       } // for bar_index
>   end_of_loop:

[-- Attachment #2: Type: text/html, Size: 4734 bytes --]

  reply	other threads:[~2022-08-08 20:40 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-02 19:10 Pallavi Kadam
2022-08-06 21:01 ` Dmitry Kozlyuk
2022-08-08 20:40   ` Kadam, Pallavi [this message]
2022-08-09  0:33   ` Kadam, Pallavi
2022-08-09  9:15     ` Dmitry Kozlyuk
2022-08-11 22:21       ` Kadam, Pallavi
2022-08-11 22:17 ` [dpdk-kmods v2] windows/netuio: fix BAR parsing Pallavi Kadam
2022-08-18  2:51   ` Liu, Qiao
2022-08-19 18:13   ` Menon, Ranjit
2022-08-29  8:04     ` 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=d0af9976-f1c2-26d7-6b30-0438349b28f0@intel.com \
    --to=pallavi.kadam@intel.com \
    --cc=Narcisa.Vasile@microsoft.com \
    --cc=dev@dpdk.org \
    --cc=dmitry.kozliuk@gmail.com \
    --cc=qiao.liu@intel.com \
    --cc=ranjit.menon@intel.com \
    --cc=roretzla@linux.microsoft.com \
    --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).