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 D8C7542D46 for ; Sun, 25 Jun 2023 08:46:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3D4E42C4D; Sun, 25 Jun 2023 08:46:42 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2041.outbound.protection.outlook.com [40.107.94.41]) by mails.dpdk.org (Postfix) with ESMTP id 6807440A7F for ; Sun, 25 Jun 2023 08:46:41 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IpvISZ/icVMaLypj4gJE5LIr/VBcjnuRr2/OkrNIGyJ1x2KbldNGZrh0Wn5KfhDOk4eQc/cDnDroy7/CFM1HRdVfs0jxeRZtOenwnKD3XS9Y93nW0vlbuKjZh0SDNKwgiTZ3YvAdE/MA8p6wKntVSo4YvTHyIfc8L70x2sVyhX9EACAaz1RUfSDpQcGC+2X6xKEVD3X3pgHqJKqzn3m2lk3kJTnvERYCa+A8SzCtDnNJnu6n+NUuNOHjYVs8OFKrJAoQw17EI+MLffU/zF0/N4ES1dzeGhjMl7QFzLtV09hjv1dQ09AaRYr4uz9mloaASerDMsdWhynySiEOdsahiw== 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=8Frgxr5q/MAtIbOqVCHpZ+yRvJgpFdAuh6g2QZ1JSxc=; b=LmZx6m2DCqhbpVOYYYCn1wcrdYaG3atJSD/SuqXJ+0v3d5uOTBBPXv8V5yQMO7VLp8yeKTo+U6iYeVd3f153g+BY8rVDXlEX7xDIurrXIWZ7PnE0eWOOSVxLJ6dqEhYdyJMdYUbSUiArLEkTibsIgnbvzN7m68tt3o3D6/5krSQ/GTaS3Kz5gSUWznS4gsEOVxN8h7CBJ8FvcQPKU9IVgkK48DoOo0mT3aGCLqiSPkpDlMhkB0F6k8B2DtT/aj5TmabQUUMrXKeN718bp6Zx4vXRUkKaV8CnMm08ePlsYK1C6dq7DoYXIQ1SmXtmKX8OazEYHpgIodgit53jCIjiBA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=8Frgxr5q/MAtIbOqVCHpZ+yRvJgpFdAuh6g2QZ1JSxc=; b=Udu5HWM0xdPXPYmqTlYYRzC+5XZ27ga/AElvvr61Zp97UaEikNyGvHUwPMhtP+MXcKzxb2Xit2i6tJnGuKdVQlcVw0H7faWDRQmDvvxPuxK5qYZHFRmssVPnd90d56zHsiu3twEjb/lXbm2lVsqHc1p27Y38k0EVdwjtbJQ6a0AgzoIzmk+W0f5d5QA/yedjez0wXIQq10i/NPxPUkg2uFSSR8pddGfj2rtmmRC/axRxZLvGQxNEG9lpAaCLZGDF0/lj2LkYeZoO0thnzTUyPUNhqHW4B7uZ/nsN/R9m4AeWUZaI190Snc9PwrR8+Pa44X9joUsc4e8J9lPr6u1wuw== Received: from BN1PR13CA0019.namprd13.prod.outlook.com (2603:10b6:408:e2::24) by MW3PR12MB4554.namprd12.prod.outlook.com (2603:10b6:303:55::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:46:39 +0000 Received: from BN8NAM11FT107.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e2:cafe::2d) by BN1PR13CA0019.outlook.office365.com (2603:10b6:408:e2::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.14 via Frontend Transport; Sun, 25 Jun 2023 06:46:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT107.mail.protection.outlook.com (10.13.176.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.46 via Frontend Transport; Sun, 25 Jun 2023 06:46:38 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:46:23 -0700 Received: from nvidia.com (10.126.230.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.37; Sat, 24 Jun 2023 23:46:21 -0700 From: Xueming Li To: Kaiwen Deng CC: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix virtchnl command called in interrupt' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:40 +0800 Message-ID: <20230625063544.11183-123-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] 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: BN8NAM11FT107:EE_|MW3PR12MB4554:EE_ X-MS-Office365-Filtering-Correlation-Id: fd7ab865-ee13-42f7-4222-08db7547ed78 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yU/oT6GUtj6rLOc635CycxDf63hUSQAiSV045E4CdaNAcvWERvGT6Sjen/qVCCZik+ALWXWPJhWB/iuelFOuVfrPoSOkn0yHA1qzb7ACyIaYZRqwU9DvJDQNemRWsbsvik2dphiCs/ZA4davz95SMTTzrjRAUJWOxltUfLpSP1CfWNqjgoFNMdO7rwHJBMWibWFsfBMlDbQEQrQJl7rdED7lFdkWUEq26JfhELtry5OlbxxBtF0pSCWhdVzdpRb6DITRxPr+Tk14RQt8UUmZlD5XnQBK7TgHx2UyOkwqdXiQ8nvqBGdgdmm+fvNunY6kCvMFwDO30nxH7Vu75xpZV6E47NUdP4gOQAyI0Yq3ZMdGDYgytNsEHyUXtO8DXc2vGKf7ZfdEaN5miF4xycQ28E/r0Hc09dw4uJrFgh2QAaJAex0rnIAgffykNFVW1JZB1dpC4seNMQaKdP7ZwMuH19Ir1qiVs2OZnFxtd0m3gphfC0u2NVx6nESyGYrh3TdUltn2ogoHaHZ3zgzIATtsVQ3o2zzfhsv0NRWxEc707zbF6x+wNh5J2V0unnKs+zjNue9zPIVgontOG50n8fKpJVdzVaw0APqMdtz2Mn6Uag1qQkJYRY+7Oj7sTqQAhxJLN2U09+btg8kPKOuvt1GK+yg6kNJviV+PI18b0454WixiLfd70dqAdeLEdKcCoI1SSU+VvkK9rJHfGe1M4JCypQ3fm4P6YbHwVSpBOZNMFuG5fkyVyybsNVbp5Kil/HGt0ibRYFwD76hbOsksxvbXIA== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(39860400002)(346002)(376002)(451199021)(36840700001)(40470700004)(46966006)(8936002)(8676002)(55016003)(4326008)(6916009)(70206006)(70586007)(41300700001)(316002)(53546011)(1076003)(16526019)(26005)(186003)(6286002)(336012)(2616005)(478600001)(54906003)(6666004)(40460700003)(966005)(7696005)(82310400005)(2906002)(5660300002)(40480700001)(82740400003)(356005)(7636003)(36756003)(86362001)(36860700001)(47076005)(83380400001)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:46:38.8391 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fd7ab865-ee13-42f7-4222-08db7547ed78 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT107.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4554 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 06/27/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=4d116ff1ac5d9b5d03b0265bdee342d3af53de80 Thanks. Xueming Li --- >From 4d116ff1ac5d9b5d03b0265bdee342d3af53de80 Mon Sep 17 00:00:00 2001 From: Kaiwen Deng Date: Thu, 8 Jun 2023 15:27:56 +0800 Subject: [PATCH] net/iavf: fix virtchnl command called in interrupt Cc: Xueming Li [ upstream commit 92a16af4504b67545e91286dfb0a332d58e68eec ] When iavf send virtchnl command in eal-intr-thread, there will be no response received from iavf_dev_virtchnl_handler for this command during block and wait. Because iavf_dev_virtchnl_handler is also registered in eal-intr-thread. This commit add to poll the response for virtchnl command when it is called by eal-intr-thread to fix this issue. Fixes: 22b123a36d07 ("net/avf: initialize PMD") Signed-off-by: Kaiwen Deng Acked-by: Qi Zhang --- drivers/net/iavf/iavf_ethdev.c | 5 ++- drivers/net/iavf/iavf_vchnl.c | 71 +++++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 9c55eaa66e..3cc4b40712 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -2610,6 +2610,9 @@ iavf_dev_init(struct rte_eth_dev *eth_dev) adapter->dev_data = eth_dev->data; adapter->stopped = 1; + if (iavf_dev_event_handler_init()) + goto init_vf_err; + if (iavf_init_vf(eth_dev) != 0) { PMD_INIT_LOG(ERR, "Init vf failed"); return -1; @@ -2637,8 +2640,6 @@ iavf_dev_init(struct rte_eth_dev *eth_dev) rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.addr, ð_dev->data->mac_addrs[0]); - if (iavf_dev_event_handler_init()) - goto init_vf_err; if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_WB_ON_ITR) { /* register callback func to eal lib */ diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 9adaadb173..aeffb07cca 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -256,6 +256,7 @@ iavf_read_msg_from_pf(struct iavf_adapter *adapter, uint16_t buf_len, vf->link_speed = iavf_convert_link_speed(speed); } iavf_dev_link_update(vf->eth_dev, 0); + iavf_dev_event_post(vf->eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL, 0); PMD_DRV_LOG(INFO, "Link status update:%s", vf->link_up ? "up" : "down"); break; @@ -368,28 +369,48 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args, _clear_cmd(vf); break; default: - /* For other virtchnl ops in running time, - * wait for the cmd done flag. - */ - do { - if (vf->pend_cmd == VIRTCHNL_OP_UNKNOWN) - break; - iavf_msec_delay(ASQ_DELAY_MS); - /* If don't read msg or read sys event, continue */ - } while (i++ < MAX_TRY_TIMES); - - if (i >= MAX_TRY_TIMES) { - PMD_DRV_LOG(ERR, "No response for cmd %d", args->ops); + if (rte_thread_is_intr()) { + /* For virtchnl ops were executed in eal_intr_thread, + * need to poll the response. + */ + do { + result = iavf_read_msg_from_pf(adapter, args->out_size, + args->out_buffer); + if (result == IAVF_MSG_CMD) + break; + iavf_msec_delay(ASQ_DELAY_MS); + } while (i++ < MAX_TRY_TIMES); + if (i >= MAX_TRY_TIMES || + vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) { + err = -1; + PMD_DRV_LOG(ERR, "No response or return failure (%d)" + " for cmd %d", vf->cmd_retval, args->ops); + } _clear_cmd(vf); - err = -EIO; - } else if (vf->cmd_retval == - VIRTCHNL_STATUS_ERR_NOT_SUPPORTED) { - PMD_DRV_LOG(ERR, "Cmd %d not supported", args->ops); - err = -ENOTSUP; - } else if (vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) { - PMD_DRV_LOG(ERR, "Return failure %d for cmd %d", - vf->cmd_retval, args->ops); - err = -EINVAL; + } else { + /* For other virtchnl ops in running time, + * wait for the cmd done flag. + */ + do { + if (vf->pend_cmd == VIRTCHNL_OP_UNKNOWN) + break; + iavf_msec_delay(ASQ_DELAY_MS); + /* If don't read msg or read sys event, continue */ + } while (i++ < MAX_TRY_TIMES); + + if (i >= MAX_TRY_TIMES) { + PMD_DRV_LOG(ERR, "No response for cmd %d", args->ops); + _clear_cmd(vf); + err = -EIO; + } else if (vf->cmd_retval == + VIRTCHNL_STATUS_ERR_NOT_SUPPORTED) { + PMD_DRV_LOG(ERR, "Cmd %d not supported", args->ops); + err = -ENOTSUP; + } else if (vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) { + PMD_DRV_LOG(ERR, "Return failure %d for cmd %d", + vf->cmd_retval, args->ops); + err = -EINVAL; + } } break; } @@ -403,8 +424,14 @@ iavf_execute_vf_cmd_safe(struct iavf_adapter *adapter, { struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); int ret; + int is_intr_thread = rte_thread_is_intr(); - rte_spinlock_lock(&vf->aq_lock); + if (is_intr_thread) { + if (!rte_spinlock_trylock(&vf->aq_lock)) + return -EIO; + } else { + rte_spinlock_lock(&vf->aq_lock); + } ret = iavf_execute_vf_cmd(adapter, args, async); rte_spinlock_unlock(&vf->aq_lock); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.737483700 +0800 +++ 0122-net-iavf-fix-virtchnl-command-called-in-interrupt.patch 2023-06-25 14:31:58.585773900 +0800 @@ -1 +1 @@ -From 92a16af4504b67545e91286dfb0a332d58e68eec Mon Sep 17 00:00:00 2001 +From 4d116ff1ac5d9b5d03b0265bdee342d3af53de80 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 92a16af4504b67545e91286dfb0a332d58e68eec ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 96004220a1..b72dbc8ceb 100644 +index 9c55eaa66e..3cc4b40712 100644 @@ -28 +30 @@ -@@ -2647,6 +2647,9 @@ iavf_dev_init(struct rte_eth_dev *eth_dev) +@@ -2610,6 +2610,9 @@ iavf_dev_init(struct rte_eth_dev *eth_dev) @@ -38 +40 @@ -@@ -2674,8 +2677,6 @@ iavf_dev_init(struct rte_eth_dev *eth_dev) +@@ -2637,8 +2640,6 @@ iavf_dev_init(struct rte_eth_dev *eth_dev) @@ -48 +50 @@ -index 8874a08b24..07eb358824 100644 +index 9adaadb173..aeffb07cca 100644 @@ -56,4 +58,4 @@ - if (vf->link_up && !vf->vf_reset) { - iavf_dev_watchdog_disable(adapter); - } else { -@@ -374,28 +375,48 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args, + PMD_DRV_LOG(INFO, "Link status update:%s", + vf->link_up ? "up" : "down"); + break; +@@ -368,28 +369,48 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args, @@ -129 +131 @@ -@@ -409,8 +430,14 @@ iavf_execute_vf_cmd_safe(struct iavf_adapter *adapter, +@@ -403,8 +424,14 @@ iavf_execute_vf_cmd_safe(struct iavf_adapter *adapter,