From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 460E3431D5 for ; Sun, 22 Oct 2023 16:29:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3F9EB402E2; Sun, 22 Oct 2023 16:29:01 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2061.outbound.protection.outlook.com [40.107.96.61]) by mails.dpdk.org (Postfix) with ESMTP id 87410402C5 for ; Sun, 22 Oct 2023 16:28:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U+oCjPEX0QcloKdeeOIKkiQCP15fS8KR4BavULccWXXl8tSSaOD7f7HnZQ0RbTW/DP2+KFG9ii6ZS/qMJiM7KpJ6LomRa6doYZa243GocdKuiI+eyZsv2BDbjKTLxyPIcJidp6nSxcd0Y0/8Xj6Zkic99A8MKaVAwPsv25VszdvlnaMnaqKtHxEfnwRj3WoIGihlLOxu+zBQfmn9hwGaWycsD1NfNKTqCo1f+1DZmemhlWUY1IchCmIo5Y1+tRnuzSS9hfsPJSCRw/kqicXblAf2qowkibxYdVixS89LzZi8QWuwLMaJTXzrK6DfDaxaCxfaGylbdsMMMTEemgaL0Q== 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=fABWDUFQyW92KlHJS8BCCiNhYqcG1/ruSO/N99EpKWI=; b=jN7r21VWRz6gvJfEmuwxM/I85RylJX1LditYGxk4Bw1KbfcYjFy6YlmeJmwDG/VQmqIgAm3v5VrxhKNh5TeMu3KS40VXAg3XDGnVV4UyOEMO3c5wkRmW/Uc3NPXcevrUbkATQnJnSDZqzPvukS/Z7FnV/64cOz6YZY++B6/P9LCnQvgcO6MF89WIkdxMYHzSb/z5OCEhpdeUyAJLGJg4ZIY8WvHnmjY4sJF9RgjT40dNVLi+QS1GCaFE8+4nqtxi1a+POx5YnSNXRJYF9F0IOp5lNbt6GkplYN5SATqF4cu6urVpzzcVSRJfiS3fLQPeUo8hkfwATltt9bdvgrqNMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fABWDUFQyW92KlHJS8BCCiNhYqcG1/ruSO/N99EpKWI=; b=T1fuMJRYcYRbizWW91tbipD9IrLgp7hkpeuWCdX7NvdZ8XlUoUTaLInEBFVxx9G4K37v82ex5xYmv6t2pQ/YMCYPQSn6eMVI3pVZAVWZcXEGjBD/Y33QH3Mj/utc0tep6gci87mZV1/1BUA5HdVuc+xIxcwspsCQnA5DO9k430xCkxnbNHC4OiE4KeczG4Uxpk4KBiOsg8FU+nyWiGnUFATJxXkP19RIuiKYG2iYaTKs2HRBpepTzhhEMIgftzxtGZs6OUbkAkWgy/HSZCoxM/5CMSszum9Z3ZQI13Ev0FjfojyARcSBTiRXb2iwAU6sazRIFE9MB6FnOxVGO3GaGA== Received: from MW4PR03CA0060.namprd03.prod.outlook.com (2603:10b6:303:8e::35) by LV8PR12MB9133.namprd12.prod.outlook.com (2603:10b6:408:188::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31; Sun, 22 Oct 2023 14:28:57 +0000 Received: from CO1PEPF000044EF.namprd05.prod.outlook.com (2603:10b6:303:8e:cafe::17) by MW4PR03CA0060.outlook.office365.com (2603:10b6:303:8e::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31 via Frontend Transport; Sun, 22 Oct 2023 14:28:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000044EF.mail.protection.outlook.com (10.167.241.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:28:57 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:28:53 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:28:51 -0700 From: Xueming Li To: Amit Prakash Shukla CC: Radha Mohan Chintakuntla , dpdk stable Subject: patch 'common/cnxk: fix DPI memzone name' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:37 +0800 Message-ID: <20231022142250.10324-69-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044EF:EE_|LV8PR12MB9133:EE_ X-MS-Office365-Filtering-Correlation-Id: e83d039b-becd-44db-410c-08dbd30b39fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qCaKu2Uq3PEUYi9eKa0/ahwc1a+ZzqTMYNi0XQzxhu/Uvfz75WAB8t3FhHdfMWSwLA48Ocb9G0u2g3IzAIm0hfUDkPAxjz4DB0y6y80+w7PJwUslaJTpdfG4HxtVFOWEP2NKt3pn53iYmYeDAcraDk8U3v0oxCdAtobS/9V/4vOrLntc0h7VO8i/2YwL6Nrzw3ZM0NhpdjyDN8KiUYp63B9tvOFzDAgTpEe8cvg3giWyVNSd5pZkar/5a9K3WDkg7F/vuRdz6SVcRfTnfmtPHGnKIxWn0nUS15IjzFDCbj84vC9mcuPfg9nhi8hx6couRvW7IQDXB9qvrbYo5/Av4MTo37u/pRwyUZ1raaNswANMNZXKSuXnqJcZVX63BxWIVvH5SOc9cMGyo6+nZ2rDqiob1hjp5+bozhCAnCGA4smUQtplZjnsRtyv7D/ND9v4q1ejLT0TFUNBeemY2zG8Ct+H4txu+nW5DljEofVS9dUPIW4ZvKilD7e+jc1326rzPC4qoFRRc6liBwDNcVyuZLdrNYAHNSYI+NNVjWhsFdWOVTREBQBxgbJpE1Vkhx37RtK/7ruoqwHI0qbyrkinXkpyudgiWwA1rNqmomO5lAY/Ku+O+EqQLjmhihIzuEP2m0ZCMmgDH/4X7DSquwyZ3Px5fC5zOatyVFNYOvgKwsIcGbT/wHTpXBlW2hzd6I6EGCKhFkd56YfWbQvHVsPtlinyW0Togfio2OSkNrWjEuQ7Na/0VQtgsfezjbjkAOpz4gbA5FNj9ZqHBJbikkQ/eGhCt9dQAP54tk1wSl59JTo= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(376002)(39860400002)(396003)(136003)(230922051799003)(451199024)(82310400011)(64100799003)(186009)(1800799009)(46966006)(40470700004)(36840700001)(55016003)(40460700003)(40480700001)(70586007)(70206006)(54906003)(41300700001)(86362001)(5660300002)(6916009)(316002)(6666004)(7696005)(966005)(478600001)(36756003)(8936002)(4326008)(8676002)(2906002)(4001150100001)(36860700001)(356005)(7636003)(6286002)(16526019)(2616005)(426003)(336012)(26005)(1076003)(53546011)(47076005)(82740400003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:28:57.2922 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e83d039b-becd-44db-410c-08dbd30b39fa X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044EF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9133 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=ab0aa8b245c03765d48ddb3fa569850a0cf66816 Thanks. Xueming Li --- >From ab0aa8b245c03765d48ddb3fa569850a0cf66816 Mon Sep 17 00:00:00 2001 From: Amit Prakash Shukla Date: Wed, 23 Aug 2023 16:45:14 +0530 Subject: [PATCH] common/cnxk: fix DPI memzone name Cc: Xueming Li [ upstream commit 7ca20b053cb739d021d2ff33a5ba75651048c322 ] roc_dpi was using vfid as part of name for memzone allocation. This led to memzone allocation failure in case of multiple physical functions. vfid is not unique by itself since multiple physical functions can have the same virtual function indices. So use complete DBDF as part of memzone name to make it unique. Fixes: b6e395692b6d ("common/cnxk: add DPI DMA support") Signed-off-by: Radha Mohan Chintakuntla Signed-off-by: Amit Prakash Shukla --- drivers/common/cnxk/roc_dpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/common/cnxk/roc_dpi.c b/drivers/common/cnxk/roc_dpi.c index 93c8318a3d..0e2f803077 100644 --- a/drivers/common/cnxk/roc_dpi.c +++ b/drivers/common/cnxk/roc_dpi.c @@ -81,10 +81,10 @@ roc_dpi_configure(struct roc_dpi *roc_dpi) return rc; } - snprintf(name, sizeof(name), "dpimem%d", roc_dpi->vfid); + snprintf(name, sizeof(name), "dpimem%d:%d:%d:%d", pci_dev->addr.domain, pci_dev->addr.bus, + pci_dev->addr.devid, pci_dev->addr.function); buflen = DPI_CMD_QUEUE_SIZE * DPI_CMD_QUEUE_BUFS; - dpi_mz = plt_memzone_reserve_aligned(name, buflen, 0, - DPI_CMD_QUEUE_SIZE); + dpi_mz = plt_memzone_reserve_aligned(name, buflen, 0, DPI_CMD_QUEUE_SIZE); if (dpi_mz == NULL) { plt_err("dpi memzone reserve failed"); rc = -ENOMEM; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:36.890362500 +0800 +++ 0068-common-cnxk-fix-DPI-memzone-name.patch 2023-10-22 22:17:34.286723700 +0800 @@ -1 +1 @@ -From 7ca20b053cb739d021d2ff33a5ba75651048c322 Mon Sep 17 00:00:00 2001 +From ab0aa8b245c03765d48ddb3fa569850a0cf66816 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7ca20b053cb739d021d2ff33a5ba75651048c322 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org