net/ena: fix PCI BAR mapping on 64K page size
PATCH v2 9/20 net/ena: fix PCI BAR mapping on 64K page size
On 64K page systems, DPDK pci_uio driver aligns the physical address to a 64K boundary before assigning a virtual address.
If the original physical BAR address is not 64K-aligned, this adjustment leads to an incorrect mapping.
This patch ensures the BAR virtual address received in the driver accounts for both PAGE size and BAR physical offset to correctly map each BAR. The fix is compatible for every PAGE size, applies to every used BAR, and supports both 32/64 bit DPDK builds.
Example issue:
- BAR0 physical address: 0x80208000 (not 64K-aligned)
- DPDK aligned physical address: 0x80208000 -> 0x80200000 (masking 0x8000 offset)
- DPDK mapped physical to virtual address: 0x80200000 -> 0x1140000000
- Driver accessed BAR0 virtual address = 0x1140000000 (causing init failure)
- Resolution is to add correct offset to driver BAR0 address:
0x1140000000 + 0x8000
--- doc/guides/rel_notes/release_25_11.rst | 1 + drivers/net/ena/ena_ethdev.c | 28 ++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-)
doc/guides/rel_notes/release_25_11.rst +1 -0
@@ -58,6 +58,7 @@ New Features * **Updated Amazon ENA (Elastic Network Adapter) net driver.** * Added support for retrieving HW timestamps for Rx packets with nanosecond resolution. + * Fixed PCI BAR mapping on 64K page size. * **Added speed 800G.**
drivers/net/ena/ena_ethdev.c +24 -4
@@ -9,6 +9,7 @@#include <rte_version.h> #include <rte_net.h> #include <rte_kvargs.h> +#include <rte_eal_paging.h> #include "ena_ethdev.h" #include "ena_logs.h"
@@ -2364,6 +2365,24 @@ static int ena_init_once(void)return 0 ; } +/* +* Returns PCI BAR virtual address. +* If the physical address is not page-aligned, +* adjusts the virtual address by the page offset. +* Assumes page size is a power of 2. +*/ +static void *pci_bar_addr (struct rte_pci_device *dev,uint32_t bar) +{ +const struct rte_mem_resource *res = &dev->mem_resource[bar]; +size_t offset = res->phys_addr %rte_mem_page_size (); +void *vaddr =RTE_PTR_ADD (res->addr, offset); + +PMD_INIT_LOG_LINE (INFO ,"PCI BAR [%u]: phys_addr=0x%" PRIx64", addr=%p, offset=0x%zx, adjusted_addr=%p" , + bar, res->phys_addr, res->addr, offset, vaddr); + +return vaddr; +} +static int eth_ena_dev_init (struct rte_eth_dev *eth_dev) {struct ena_calc_queue_size_ctx calc_queue_ctx = {0 };
@@ -2409,16 +2428,17 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev) intr_handle = pci_dev->intr_handle; - adapter->regs = pci_dev->mem_resource[ENA_REGS_BAR ].addr; - adapter->dev_mem_base = pci_dev->mem_resource[ENA_MEM_BAR ].addr; - + adapter->regs =pci_bar_addr (pci_dev,ENA_REGS_BAR );if (!adapter->regs) {PMD_INIT_LOG_LINE (CRIT ,"Failed to access registers BAR(%d)" ,ENA_REGS_BAR );return -ENXIO ; } - ena_dev->reg_bar = adapter->regs; + +/* Memory BAR may be NULL on non LLQ supported devices */ + adapter->dev_mem_base =pci_bar_addr (pci_dev,ENA_MEM_BAR ); +/* Pass device data as a pointer which can be passed to the IO functions * by the ena_com (for example - the memory allocation). */
Signature · 1 line
2.17.1