From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 58DCA43EA9
for <public@inbox.dpdk.org>; Fri, 19 Apr 2024 05:26:57 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 444F34067E;
Fri, 19 Apr 2024 05:26:57 +0200 (CEST)
Received: from NAM11-BN8-obe.outbound.protection.outlook.com
(mail-bn8nam11on2108.outbound.protection.outlook.com [40.107.236.108])
by mails.dpdk.org (Postfix) with ESMTP id 16BAB40273;
Fri, 19 Apr 2024 05:26:52 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=NhAG8zlR6op048oW+NevbhJ4kO/1606v6xzYD57Q1S4jlXJprae2QnDUZPEI96krRYMDZzZYhThzmYygZkuJnBw6YBg0nSm3w/ZDc4yDz3px0GltvD+gZRHj429s3wG8SoK3OX29joaU/EI0MlQ3Os4NookVQu6L8bYqHS02xDftshwS7NihkgqvlGfYa13csRpnnGn63C0wOVEEr5STpOZ9M/uhla9mlt7THWrzsOhjPp+gMqmWr75k3oPmsS5G1Qp7/LNjnhyRgthcd2FYRUhKcz0luL1XYw4dx6YeF2E7B0eqZQIeup+ryi83UVdw6rgM3obrHNPkxD2LnTTUqQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector9901;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=xLhataWRZeS2l3E9kPIQQk5JFrqIwPjJx2R0fzhpRnw=;
b=X8e6fmcT5/iNBjVCCZKExB2SpWYg0ipyylt/qrv350gylmOR0U2w4GNBecz00hRfTS4Mej+71YJGnUT8nPiU7PlXgBVfU29wLHEkZ1eEnG+MPY/diXzukLceYXyavIzr8PH7iOF4ymLSMlHa/Uiz1ns1zfB9ppH4WrwFU7TlJRXx35cIDWAaTxEJSgpDqUvWZQ7ppEwIX8zJ2AcmVw3Q7gdgHdKySRVKBvmBGmO8sh0WuYeUeei2Dzr5QvUoCK2dBSzQeXQ4qAAi6K39n16MzCtWevHtKD2McS/sR7GVBVxCjW3XqrMSgKoJdS90AIbTS2DEocvqBdzHOQkiYQC3cA==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;
dkim=pass header.d=corigine.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=xLhataWRZeS2l3E9kPIQQk5JFrqIwPjJx2R0fzhpRnw=;
b=W+pFi9mcHvgC5zy/99RRMd2pKf+0O4fdVPo+EVaj+IcVKHczyga+uCtdieZ/mvOX17wCramtmOoekAbb2zTK2iEK7Fzc3CRVC7Ivwsrdfx6shLpZJLgYEP/EFpAzwSQf+AqoAKmI3VD6vheI5oKNRjH9n7z0JdcZx+4U5z8KGwA=
Authentication-Results: dkim=none (message not signed)
header.d=none;dmarc=none action=none header.from=corigine.com;
Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)
by PH7PR13MB6170.namprd13.prod.outlook.com (2603:10b6:510:241::8)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.41; Fri, 19 Apr
2024 03:26:50 +0000
Received: from SJ0PR13MB5545.namprd13.prod.outlook.com
([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com
([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7472.042; Fri, 19 Apr 2024
03:26:50 +0000
From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, Zerun Fu <zerun.fu@corigine.com>,
mukawa@igel.co.jp, stable@dpdk.org, Chaoyong He <chaoyong.he@corigine.com>,
Long Wu <long.wu@corigine.com>, Peng Zhang <peng.zhang@corigine.com>
Subject: [PATCH v3 1/2] bus/pci: fix secondary process PCI uio resource map
problem
Date: Fri, 19 Apr 2024 11:26:29 +0800
Message-Id: <20240419032630.1215256-2-chaoyong.he@corigine.com>
X-Mailer: git-send-email 2.39.1
In-Reply-To: <20240419032630.1215256-1-chaoyong.he@corigine.com>
References: <20240129092231.3531217-1-chaoyong.he@corigine.com>
<20240419032630.1215256-1-chaoyong.he@corigine.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-ClientProxiedBy: SI2PR01CA0008.apcprd01.prod.exchangelabs.com
(2603:1096:4:191::10) To SJ0PR13MB5545.namprd13.prod.outlook.com
(2603:10b6:a03:424::5)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6170:EE_
X-MS-Office365-Filtering-Correlation-Id: 918d5302-030d-4a17-fd93-08dc60208d42
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?AVd96sVMNnHSCq0LJ8M0LwQge9fmLqyyCTgZHSV0XYn6frath2dcqsLZWvuf?=
=?us-ascii?Q?twisEbCVM90IMNfAG7WKwYSFxZ1Ty8+lwZI/J2fbbNo7hYdUuFe1YgrATqM7?=
=?us-ascii?Q?qP/o1dPJjxTKxYxXZAmOzEZcjWiSW0Q1tEHJ22A3iRbx7mqYkI7tqgYPcNgh?=
=?us-ascii?Q?snQiqQwJm6TXbxQyZv0Ilfw3VdRzNrQMAO57gUOoCt6TetY9MnT4vHrdJSKm?=
=?us-ascii?Q?7OLhwRkhw2X7Z4+1aLzgRgexm/852iDLR66NlPFkM+PcDQ0ilKPSFDOu07J3?=
=?us-ascii?Q?+QmKipEuy+LjFidV3naY+EC0iFLE/Ig/exy2AZATTJaYOR2lus8kfVeby/LO?=
=?us-ascii?Q?kq0YyfPoQtReK0dm5Fu7lifAjrY8M8RjoVIjEakiYslEk0Rd/22ZKL2eOQnH?=
=?us-ascii?Q?H1udEozH044cGXxiNBmvcFxpuhHGZdTHygp41jkU65nGpvGcNHq7NRW7yZ35?=
=?us-ascii?Q?TvKZSJ2/q/n9mrKmVoknNW2zyu13XULmMIC2yvI3sdu+9fEh2oHyofaypQpo?=
=?us-ascii?Q?8ZkuQ1rt8RbF3p84hGlBG2r2tJusn+l9ChBltKjz3XRkQcOGWuh8mADMnJT5?=
=?us-ascii?Q?HOHtq14BA11On1iThRqwRvPK0ludnPyjvpeRclIfo0J8gnF6+gfpSdjjV9BK?=
=?us-ascii?Q?aZlJpb86yWGEmycKt14ZY84jj8ehgWz+Cz3zw19oEE6eYOdqD8Z1JuswxZSP?=
=?us-ascii?Q?vUiV6fKlnlFtsFJie8zpJ6r7iDdPFcNaX2VO1uk360m3tAa2CQSwK8oEWwnz?=
=?us-ascii?Q?2NSaCCyRa9cO3EvsaiVbXs/D26fo8biMFF0SG3cJwE7J0dQx7wdUENF5s+yN?=
=?us-ascii?Q?RQrPPQWELmaNJ9qv6xi9Wm7r2btGEAHemxoYOMPi7pPlzn5Ddp0c8TzhQI34?=
=?us-ascii?Q?ebAt1AgvdfEIALRzisGVkyCoPdJCEg/bxZu8oR2m15MnyQOh/IkU+8nI3I6N?=
=?us-ascii?Q?g5kIBH0xH4yJFpSNfRXUqLMDNcqkOTSgQToWfbPrnS6jMY06QF7arbv7XQN+?=
=?us-ascii?Q?yrbtw41UmBatF1KDAkKUtJEzZODQKpgwQ0USfiQTJ/6DPwwXwuUkA4qN0dT6?=
=?us-ascii?Q?2HohZYRMzlKAH65+FEzIWfgi/kZRd2K/19zdFtEOCzhbt7JmEyzIsCUEiuAF?=
=?us-ascii?Q?XgudkIkXScy+Gn3TF3AlnYAczASYupxh2yjCmu98Hu0gbWu4Ts1n60IPW2ee?=
=?us-ascii?Q?doPYFflAHOtTmWCchw0LJt0jWsu405hAFfRG5RrOQPeBjiG+bGbUpN1QRBgg?=
=?us-ascii?Q?rCKxrImXAJel9bVV3wQpnnkpDFCt6bemQaeGBduYkBgwOxMFHOWqGi5M+Mcd?=
=?us-ascii?Q?yt8oGOZ6lZaO46nljmYAwjYbplyMpWU8sZXyhdrnnhNXng=3D=3D?=
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;
SFS:(13230031)(1800799015)(366007)(376005)(52116005)(38350700005); DIR:OUT;
SFP:1102;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0XP8RBVEeuSbD2KhmquUoFf7fNsN4v61XrY2cvlUx551gf62ZnivMjmMTjdp?=
=?us-ascii?Q?vY/SVIWrlCJw42NU0nt+5IdAeeAg/SShPxC3TV1QStK2NIh6f/K+1qoKabuY?=
=?us-ascii?Q?cVbXyig1FIQj9Jgw0WmQS2BYc4MrminwU0OLvLdEUq7LZ3Ki9opdLXf1plXG?=
=?us-ascii?Q?f4KVAvj0Z6ycVw+1nDJMu9dNosT0rOErZJqGYayOL9N8syEM3sN9Z8x2P4Go?=
=?us-ascii?Q?ly63L/NZkVqmV84WSKbv7/eD1Nc9q6LNALWT0fpCEX/kLgb5jF7SW3iINi9P?=
=?us-ascii?Q?ZRy7GcZPJ5YIuzHmJg26Zr0v9BOZpS03TfUz5SkUKOZ4ywjMsv8BaATPSvGd?=
=?us-ascii?Q?ogyGxIls6TJ4/ltwbCE9+daEcPh1LEMfxcufhULUJX/AENZY4vfljn6EXslF?=
=?us-ascii?Q?YfeNAPmRb/5/541/r3CLU9j2pQyMmtsyeP5HWLUPWgsj9dYGxP4hQ7QvCQyY?=
=?us-ascii?Q?Bd7l0WrqAKptcKaYtIncHewJ+Wrb92I9gFyOkLzxWBr/no95sQSFzaqobXLa?=
=?us-ascii?Q?mKgyXo3+johNJeeYzH2FPqhEzKYPFYUpol3LC8Z4BXT5plZQi6G6ceLq1fqt?=
=?us-ascii?Q?y343Ceji6YdOXC9klSX/9t7mNSmEUux9xgjYg/sNxw+7RpxzL9XxzjNqAG3Q?=
=?us-ascii?Q?KIn0jWdX4pfLrcEdgPxuWY5PGwt9IU1Lqh/rT672bpclcXbJWPpv2V3XTHKv?=
=?us-ascii?Q?lV1+tFijUpNlLer7Dam/4Jv+DD9Nz0kse0PVSdzKRAiHq6SWxf8qqI/HnH8v?=
=?us-ascii?Q?LarGGKcTPi4ldLAlY4embiPcxFKWmAF100M0XAegYfwVaCuvQylzb3LYLtU3?=
=?us-ascii?Q?23Khr/KXuu8W8o8solAeQiM+moR6Fhs8rQ4I5YUhAWcbmnsfaYjP4GyYFJh9?=
=?us-ascii?Q?HdyRTLiPvJ/bA07XXlXaBC41EPwbtZ5TTXLnRCc8rGxZcGCAWLsDHYYo8g/i?=
=?us-ascii?Q?pe2Wa4E9p16iIhU3ibCez1rBA9ongK4ex9DXZAGLZiult14uN51hES4lcyuV?=
=?us-ascii?Q?A7HrVTZLI1b4LQZmzSS3B11QNCf936L0K0TM+Qwcel/9U0xaw6YoFYjxrll4?=
=?us-ascii?Q?vUndvQvoNrlxTguIyqXZKVl9kx7XiKy0O8ADzCMyf/nhmWiRfrFKPZ0xxqZs?=
=?us-ascii?Q?uet+Vj9T544aOLP9GvhALce4Jwi2rG0mHfk4jGTUCFmAe9QNER0trskvmbSe?=
=?us-ascii?Q?qRVCGRya9hH3bp3vzUtMX1UKswjMiRLnD0NNFCzIeyUO6AcJLRZ8q4IrRwsX?=
=?us-ascii?Q?og5QivqD2Yk+bZW2novoGghfSwdlLgNij4fm6bwXgU6g+vVgBDyO9SrROlb5?=
=?us-ascii?Q?b3XnTcOxEyzGdxbpGvPMKTFmxRZzS2zNemGOPblfMDlhk9caGYpyZSRRDmj4?=
=?us-ascii?Q?VvRwhAp0B8AaN3O1Z2GvA68iVi8KiXO8ln2z6tk56gyXRS+AyewnhxfKa2Pk?=
=?us-ascii?Q?DlZjNJeUgFxh5KmrUZ18ka4sWL/cJFHqOTinqQ0dtFHzMa6nlmR+bT/6ALqL?=
=?us-ascii?Q?bZyelwJCScdCvN23b66TU2YREpKof+fF/KbBZEN6r3cPY4JOFjpN6WyUZcfL?=
=?us-ascii?Q?EDkdhKrrW2wMp2CUKVBLHOczG8dkYL5NVXtGRp1uBnee4Dv2HLfLiBMDOhGR?=
=?us-ascii?Q?+w=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 918d5302-030d-4a17-fd93-08dc60208d42
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2024 03:26:50.6358 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Bev7dUSxs/eJI/NpEEHFEXR32x37LMhiteGpNDVp6u9y/SVes6Rv/ZHkN1C2I5rSlCVtnCmJA/okx/3+uKs7xINQ1NJJWjwn1TQIs9ojMu0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6170
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
From: Zerun Fu <zerun.fu@corigine.com>
For the primary process, the logic loops all BARs and will skip
the map of BAR with an invalid physical address (0), also will
assign 'uio_res->nb_maps' with the real mapped BARs number. But
for the secondary process, instead of loops all BARs, the logic
using the 'uio_res->nb_map' as index. If the device uses continuous
BARs there will be no problem, whereas if it uses discrete BARs,
it will lead to mapping errors.
Fix this problem by also loops all BARs and skip the map of BAR
with an invalid physical address in secondary process.
Fixes: 9b957f378abf ("pci: merge uio functions for linux and bsd")
Cc: mukawa@igel.co.jp
Cc: stable@dpdk.org
Signed-off-by: Zerun Fu <zerun.fu@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
Reviewed-by: Peng Zhang <peng.zhang@corigine.com>
---
drivers/bus/pci/pci_common_uio.c | 40 ++++++++++++++++++++------------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/drivers/bus/pci/pci_common_uio.c b/drivers/bus/pci/pci_common_uio.c
index 76c661f054..432d68b12c 100644
--- a/drivers/bus/pci/pci_common_uio.c
+++ b/drivers/bus/pci/pci_common_uio.c
@@ -26,7 +26,7 @@ EAL_REGISTER_TAILQ(rte_uio_tailq)
static int
pci_uio_map_secondary(struct rte_pci_device *dev)
{
- int fd, i, j;
+ int fd, i, map_idx = 0, res_idx;
struct mapped_pci_resource *uio_res;
struct mapped_pci_res_list *uio_res_list =
RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
@@ -37,41 +37,51 @@ pci_uio_map_secondary(struct rte_pci_device *dev)
if (rte_pci_addr_cmp(&uio_res->pci_addr, &dev->addr))
continue;
- for (i = 0; i != uio_res->nb_maps; i++) {
+ /* Map all BARs */
+ for (res_idx = 0; res_idx != PCI_MAX_RESOURCE; res_idx++) {
+ /* skip empty BAR */
+ if (dev->mem_resource[res_idx].phys_addr == 0)
+ continue;
+
+ if (map_idx >= uio_res->nb_maps)
+ return -1;
+
/*
* open devname, to mmap it
*/
- fd = open(uio_res->maps[i].path, O_RDWR);
+ fd = open(uio_res->maps[map_idx].path, O_RDWR);
if (fd < 0) {
RTE_LOG(ERR, EAL, "Cannot open %s: %s\n",
- uio_res->maps[i].path, strerror(errno));
+ uio_res->maps[map_idx].path, strerror(errno));
return -1;
}
- void *mapaddr = pci_map_resource(uio_res->maps[i].addr,
- fd, (off_t)uio_res->maps[i].offset,
- (size_t)uio_res->maps[i].size, 0);
+ void *mapaddr = pci_map_resource(uio_res->maps[map_idx].addr,
+ fd, (off_t)uio_res->maps[map_idx].offset,
+ (size_t)uio_res->maps[map_idx].size, 0);
/* fd is not needed in secondary process, close it */
close(fd);
- if (mapaddr != uio_res->maps[i].addr) {
+ if (mapaddr != uio_res->maps[map_idx].addr) {
RTE_LOG(ERR, EAL,
"Cannot mmap device resource file %s to address: %p\n",
- uio_res->maps[i].path,
- uio_res->maps[i].addr);
+ uio_res->maps[map_idx].path,
+ uio_res->maps[map_idx].addr);
if (mapaddr != NULL) {
/* unmap addrs correctly mapped */
- for (j = 0; j < i; j++)
+ for (i = 0; i < map_idx; i++)
pci_unmap_resource(
- uio_res->maps[j].addr,
- (size_t)uio_res->maps[j].size);
+ uio_res->maps[i].addr,
+ (size_t)uio_res->maps[i].size);
/* unmap addr wrongly mapped */
pci_unmap_resource(mapaddr,
- (size_t)uio_res->maps[i].size);
+ (size_t)uio_res->maps[map_idx].size);
}
return -1;
}
- dev->mem_resource[i].addr = mapaddr;
+ dev->mem_resource[res_idx].addr = mapaddr;
+
+ map_idx++;
}
return 0;
}
--
2.39.1