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 144BFA0353; Mon, 4 Nov 2019 07:31:52 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7F50F58C4; Mon, 4 Nov 2019 07:31:51 +0100 (CET) Received: from huawei.com (szxga01-in.huawei.com [45.249.212.187]) by dpdk.org (Postfix) with ESMTP id 0AEA04C8B for ; Mon, 4 Nov 2019 07:31:50 +0100 (CET) Received: from DGGEMM402-HUB.china.huawei.com (unknown [172.30.72.57]) by Forcepoint Email with ESMTP id 8BA18D9662CD9F0CAF42 for ; Mon, 4 Nov 2019 14:31:48 +0800 (CST) Received: from DGGEMM422-HUB.china.huawei.com (10.1.198.39) by DGGEMM402-HUB.china.huawei.com (10.3.20.210) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 4 Nov 2019 14:31:48 +0800 Received: from DGGEMM533-MBX.china.huawei.com ([169.254.5.114]) by dggemm422-hub.china.huawei.com ([10.1.198.39]) with mapi id 14.03.0439.000; Mon, 4 Nov 2019 14:31:40 +0800 From: "Wangyu (Turing Solution Development Dep)" To: "dev@dpdk.org" CC: "ferruh.yigit@intel.com" , Linuxarm , "humin (Q)" , "Liyuan (Larry)" , dengxiaofeng Thread-Topic: [PATCH] bus/pci: resolve multiple NICs address conflicts Thread-Index: AQHVkVGqZXW2PbHorUKooYFZruxxHqd6kDjg Date: Mon, 4 Nov 2019 06:31:39 +0000 Message-ID: <78A93308629D474AA53B84C5879E84D24B0FF99F@DGGEMM533-MBX.china.huawei.com> References: <1572680245-89705-1-git-send-email-dengxiaofeng@huawei.com> In-Reply-To: <1572680245-89705-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] 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 w= ill mmap 64K pagesize for NIC, but dev->mem_resource[i].len is 16K. Signed-off-by: Beard-627 Acked-by: Eric wang Acked-by: Wei Hu Acked-by: Min Hu --- drivers/bus/pci/linux/pci.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c inde= x 43debaa..afaa68d 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -201,6 +201,11 @@ if (flags & IORESOURCE_MEM) { dev->mem_resource[i].phys_addr =3D phys_addr; dev->mem_resource[i].len =3D end_addr - phys_addr + 1; + if (dev->mem_resource[i].len < + (unsigned int)getpagesize()) + + dev->mem_resource[i].len =3D + (unsigned int)getpagesize(); /* not mapped for now */ dev->mem_resource[i].addr =3D NULL; } -- 1.8.3.1