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 4BDE94301E for ; Thu, 10 Aug 2023 01:55:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 451CA40DD8; Thu, 10 Aug 2023 01:55:03 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id A5412406B6 for ; Thu, 10 Aug 2023 01:55:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UAkk8SNw6ceXJTHTnVqu8Y1SGuwHdIf+Wbn3KiTwavpWapTWF88KE+neCU8/ZJ3VApHQZc6It4nz2P6gKM4rRoecDDIOZ2u5MvdyhnXG3u2lv363RI7zYAPPL7KIiBCTjjrxNTSUZ3cVmKwn7BLsVnaqZinBJqIkLRlm2mWIxv+pJxeFQP/UI1BG3WUJLkLnGdFas5s2G0OvzmxvuhIn9hmmsfg1ZZ1+MNfBnVjnVcOBUBQYS9/8dFOENmt8yiWxBqh3lz4aWbCzCjl1ufh9qJSmXB2YxjWZcaoIZ/2cDZqqJQ5dnjwaTkFRsYtZwLsFZVI96CQ5cfWnQdv3Aped8g== 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=qjmbtRw7gbECWpx3nSpe4N8/y4Ut9XiWI8Qmnxw1ljw=; b=mHy6VhHJf908H3tKgU5/vYm9WM5xxaRaxCsHSA1i50R61aj8MOOotU8MEUfInIc9IjHYJCFccBLM7d726LbD3IcYaQ5+xyGqa+886kmz4Dwx/kb0OH4E+spWZyANm9g2Zc8+3ErZHD6a8MajJ9p6rCnWRRTSb1Ads8UpNLA3Dbyq0yEiWvYdBHnA6n3rIli2ykIiPMjxeG/D5QRsXkNZAUDRHfVJGCO6TARyEAyytqcQiVLuWzfh7Ipsds+eQ7/bznlK/5BGfTCMYyH8+MvJq8MFAENoWtQBbZ+P64oevZLEQmvRzd2zgLg4LE7usZhvGLx4vbFKVFGvORFZs1eDJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=qjmbtRw7gbECWpx3nSpe4N8/y4Ut9XiWI8Qmnxw1ljw=; b=cF3CkBKi4XD5bmtwZrWfZtQuNwOWZ6qoxR5R8W5u+3AoiUNjGo7A+JzoETZJRIwufflkHWHxAh2hTEIYskA039IDOoLz47s84HjHSDN3d/pPTK8w8izaJY1CegQnN/o3mACcjTlyQZg21HKFn8cqsiHpKHnM3wH72y2iiYEnhJ3GBCnLTOViUNZKGXnREr3yjXUjste75/WNThieESA/WGeSDiV0xQnrSzJETAm0twp38IhcpivZMA/Lya6TPEug5zmm9gp3j/fLh/ZSrHP5C9xPm9/iQ9Aykhs0flh290iPgsdesSqS7AOJGTWSvP/1KMftRDBPHGjKQWjNxk/GRQ== Received: from PH0PR07CA0072.namprd07.prod.outlook.com (2603:10b6:510:f::17) by CH3PR12MB8236.namprd12.prod.outlook.com (2603:10b6:610:121::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:54:58 +0000 Received: from SA2PEPF000015CB.namprd03.prod.outlook.com (2603:10b6:510:f:cafe::9b) by PH0PR07CA0072.outlook.office365.com (2603:10b6:510:f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:54: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 SA2PEPF000015CB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 23:54: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.5; Wed, 9 Aug 2023 16:54:46 -0700 Received: from nvidia.com (10.126.230.37) 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.37; Wed, 9 Aug 2023 16:54:44 -0700 From: Xueming Li To: Junfeng Guo CC: Wei Ling , Jingjing Wu , "dpdk stable" Subject: patch 'raw/ntb: avoid disabling interrupt twice' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:48:14 +0800 Message-ID: <20230809234930.32424-53-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015CB:EE_|CH3PR12MB8236:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e27fb2d-db5b-4734-533e-08db99340925 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3JK1VtYzINYEjF3HQOJW160FsBwC730lComf3KjUKfGQo5DzBASiYfvEr3Rek/xqAOuEuaeSRUwxW1Zv2RYQ6yS1ICgmfehYVUcnneATO4tzZTrXrcABJHZ3/23bJBD7k5DPBXY8MfuvRlzsCQyao0cG06i+LDvuB+KUec8P+jEmML23HKICDtlzF3KyFzp3NLRK9f3fy+Yrcs8+UTpNsuStbPCWToeiKCzDRp3LrSTsog+vNHUDT+MuLzeIMR0ztH3WPdH3OqtjgoY7aBcFoTYCZeqGneoGruKvQABOL84BLZ87xf/duLz7D2lj+fI+cfawTUCBhf++K5Y+wHMpmHZ8ZMDOMy4SauFWCn906R7h2zPgHADlluTDhCDfKxSDNujZ854Q0zmEozk81WW4iZmcWP9tomIyOmmE8eytUPlXipPpdBFGPaN466EtaDfsW1CJ4ht4CbvzRDwQ4Pr1/oPb0KxZyquZVCae9MABaE7Jqu8mhHEmVJ0pUG8QA7R/9yQ6LOPBtHz0+5lIy3unCDjS7Bv5A6Nxh/ogWhXcJraRKTF2Jy32Waw+d/WAnhcH3C0eLBoVyx45EIiXkFWCsdmvS5Ge0VtBTYG2Ci12cTNMiG/n5Akpc7ZLrV9U/+A9hmLSEEsibcmJ6IZu++EMVKQy6AKDe5XZkuUYMf/WsvKh1Yi7UWo0+8C+Qp95MqU0ZLahJX5/CRwecoNwzfQadRIWqTr9WHeDoNsNQgvyZtGg8hsgCbWdiwCdc8pKar+7d6qFRwZYa739z8df0K46Gg== 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:(13230028)(4636009)(396003)(39860400002)(136003)(346002)(376002)(1800799006)(451199021)(82310400008)(186006)(36840700001)(40470700004)(46966006)(40460700003)(55016003)(40480700001)(26005)(1076003)(54906003)(70586007)(70206006)(6916009)(966005)(16526019)(53546011)(6286002)(336012)(478600001)(6666004)(36756003)(36860700001)(47076005)(83380400001)(426003)(2616005)(7696005)(8936002)(316002)(8676002)(4326008)(2906002)(41300700001)(86362001)(82740400003)(356005)(7636003)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:54:57.2441 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8e27fb2d-db5b-4734-533e-08db99340925 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: SA2PEPF000015CB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8236 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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=008fdd0e07b47e782154c8142c7d930ef1798cdd Thanks. Xueming Li --- >From 008fdd0e07b47e782154c8142c7d930ef1798cdd Mon Sep 17 00:00:00 2001 From: Junfeng Guo Date: Wed, 28 Jun 2023 17:12:18 +0800 Subject: [PATCH] raw/ntb: avoid disabling interrupt twice Cc: Xueming Li [ upstream commit a10529f4025eaef0c9803d845b9afc1d5fb17b59 ] During EAL cleanup stage, all bus devices are cleaned up properly. In the meantime, the ntb example app will also do the device cleanup process, which may call the dev ops '*dev->dev_ops->dev_close' twice. If this dev ops for ntb was called twice, the interrupt handle for EAL will be disabled twice and will lead to error for the second time. Like this: "EAL: Error disabling MSI-X interrupts for fd xx" Thus, this patch added the check process for disabling interrupt in dev_close ops, to ensure that interrupt only be disabled once. Fixes: 1cab1a40ea9b ("bus: cleanup devices on shutdown") Signed-off-by: Junfeng Guo Tested-by: Wei Ling Acked-by: Jingjing Wu --- drivers/raw/ntb/ntb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c index 76e98fe515..0ed4c14592 100644 --- a/drivers/raw/ntb/ntb.c +++ b/drivers/raw/ntb/ntb.c @@ -1045,6 +1045,11 @@ ntb_dev_close(struct rte_rawdev *dev) hw->queue_pairs = 0; intr_handle = hw->pci_dev->intr_handle; + /* Disable interrupt only once */ + if (!rte_intr_nb_efd_get(intr_handle) && + !rte_intr_max_intr_get(intr_handle)) + return 0; + /* Clean datapath event and vec mapping */ rte_intr_efd_disable(intr_handle); rte_intr_vec_list_free(intr_handle); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.545301600 +0800 +++ 0052-raw-ntb-avoid-disabling-interrupt-twice.patch 2023-08-09 21:51:18.194352000 +0800 @@ -1 +1 @@ -From a10529f4025eaef0c9803d845b9afc1d5fb17b59 Mon Sep 17 00:00:00 2001 +From 008fdd0e07b47e782154c8142c7d930ef1798cdd Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a10529f4025eaef0c9803d845b9afc1d5fb17b59 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org