From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 59FA0A04AB; Tue, 12 Nov 2019 03:22:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ADF4F271; Tue, 12 Nov 2019 03:22:49 +0100 (CET) Received: from huawei.com (szxga01-in.huawei.com [45.249.212.187]) by dpdk.org (Postfix) with ESMTP id 9715923D for ; Tue, 12 Nov 2019 03:22:48 +0100 (CET) Received: from DGGEMM405-HUB.china.huawei.com (unknown [172.30.72.55]) by Forcepoint Email with ESMTP id BDAF3912CAF95BD11EBA for ; Tue, 12 Nov 2019 10:22:46 +0800 (CST) Received: from DGGEMM421-HUB.china.huawei.com (10.1.198.38) by DGGEMM405-HUB.china.huawei.com (10.3.20.213) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 12 Nov 2019 10:22:46 +0800 Received: from DGGEMM533-MBX.china.huawei.com ([169.254.5.114]) by dggemm421-hub.china.huawei.com ([10.1.198.38]) with mapi id 14.03.0439.000; Tue, 12 Nov 2019 10:22:36 +0800 From: "Wangyu (Eric)" To: "dev@dpdk.org" CC: "ferruh.yigit@intel.com" , Linuxarm , "humin (Q)" , dengxiaofeng , "Liyuan (Larry)" Thread-Topic: [PATCH v3] bus/pci: resolve multiple NICs address conflicts Thread-Index: AQHVmPjUMUdRWWdTW0+7wJ3Jd2+giKeGzfYw Date: Tue, 12 Nov 2019 02:22:36 +0000 Message-ID: <78A93308629D474AA53B84C5879E84D24B1086FB@DGGEMM533-MBX.china.huawei.com> References: <1573521821-21173-1-git-send-email-dengxiaofeng@huawei.com> In-Reply-To: <1573521821-21173-1-git-send-email-dengxiaofeng@huawei.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.57.112.122] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH v3] bus/pci: resolve multiple NICs address conflicts X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" NIC address conflicts on 64K pagesize when using multiple NICs, as system will mmap 64K pagesize for NIC, but dev->mem_resource[i].len is 16K. Signed-off-by: beard-627 Signed-off-by: Wangyu (Eric) Acked-by: Wei Hu Acked-by: Min Hu --- drivers/bus/pci/linux/pci_uio.c | 2 ++ drivers/bus/pci/linux/pci_vfio.c = | 3 +++ 2 files changed, 5 insertions(+) diff --git a/drivers/bus/pci/linux/pci_uio.c b/drivers/bus/pci/linux/pci_ui= o.c index 6dca05a..097dc19 100644 --- a/drivers/bus/pci/linux/pci_uio.c +++ b/drivers/bus/pci/linux/pci_uio.c @@ -351,6 +351,8 @@ pci_map_addr =3D RTE_PTR_ADD(mapaddr, (size_t)dev->mem_resource[res_idx].len); =20 + pci_map_addr =3D RTE_PTR_ALIGN(pci_map_addr, sysconf(_SC_PAGE_SIZE)); + maps[map_idx].phaddr =3D dev->mem_resource[res_idx].phys_addr; maps[map_idx].size =3D dev->mem_resource[res_idx].len; maps[map_idx].addr =3D mapaddr; diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_v= fio.c index b8faa23..64cd84a 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -750,6 +750,9 @@ bar_addr =3D pci_map_addr; pci_map_addr =3D RTE_PTR_ADD(bar_addr, (size_t) reg->size); =20 + pci_map_addr =3D RTE_PTR_ALIGN(pci_map_addr, + sysconf(_SC_PAGE_SIZE)); + maps[i].addr =3D bar_addr; maps[i].offset =3D reg->offset; maps[i].size =3D reg->size; -- 1.8.3.1