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 659F8A0545 for ; Tue, 20 Dec 2022 16:54:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4DF6B40395; Tue, 20 Dec 2022 16:54:25 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id AF13D40143 for ; Tue, 20 Dec 2022 16:54:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671551663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BpN0ACymBDZbFKSZS76TMc1dTftb8qQ2sxI03HNfZOQ=; b=GYAhvF8nHz/FSSd36gFIw6SGmiNuj0XIBDCP18AJjS3KGPkPmBgtM3UH8WXbxu7rwDpPRf LVHUbSn2EELDZ0cTwduasMXcXbtmxIWFIdlk7iVQf6waPD6Hz1vyTD4tJCIcQh24y1gG/x lxhuZDFAbEyBpMK+ZQEuyyEBwIaBk5E= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-204-WtMSnMsjPcW9PFpv-mywsQ-1; Tue, 20 Dec 2022 10:54:21 -0500 X-MC-Unique: WtMSnMsjPcW9PFpv-mywsQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 43512101A55E; Tue, 20 Dec 2022 15:54:21 +0000 (UTC) Received: from mpattric.remote.csb (unknown [10.22.16.207]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15DAD14152F4; Tue, 20 Dec 2022 15:54:20 +0000 (UTC) From: Mike Pattrick To: dev@dpdk.org Cc: qi.z.zhang@intel.com, thomas@monjalon.net, david.marchand@redhat.com, yidingx.zhou@intel.com, ktraynor@redhat.com, Mike Pattrick , stable@dpdk.org Subject: [PATCH v2] net/iavf: add lock for vf commands Date: Tue, 20 Dec 2022 10:54:14 -0500 Message-Id: <20221220155414.266309-1-mkp@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 iavf admin queue commands aren't thread-safe. Bugs surrounding this issue can manifest in a variety of ways but frequently pend_cmd is over written. Simultaneously executing commands can result in a misconfigured device or DPDK sleeping in a thread for 2 second. Despite this limitation, vf commands may be executed from both iavf_dev_alarm_handler() in a control thread and the applications main thread. This is trivial to simulate in the testpmd application by creating a bond of vf's in active backup mode, and then turning the bond off and then on again repeatedly. Previously [1] was proposed as a potential solution, but this commit did not resolve all potential issues concerning the admin queue and has been reverted from the stable branch. I propose adding locks until a more complete solution is available. [1] commit cb5c1b91f76f ("net/iavf: add thread for event callbacks") Fixes: 48de41ca11f0 ("net/avf: enable link status update") Fixes: 84108425054a ("net/iavf: support asynchronous virtual channel message") Cc: stable@dpdk.org Signed-off-by: Mike Pattrick --- v2: - Added locks around some iavf_execute_vf_cmd calls which were missed in v1 - Changed description to indicate that [1] was only reverted out of the stable branch. --- drivers/net/iavf/iavf.h | 1 + drivers/net/iavf/iavf_vchnl.c | 90 +++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index 1edebab8dc..aa18650ffa 100644 --- a/drivers/net/iavf/iavf.h +++ b/drivers/net/iavf/iavf.h @@ -262,6 +262,7 @@ struct iavf_info { struct iavf_qv_map *qv_map; /* queue vector mapping */ struct iavf_flow_list flow_list; rte_spinlock_t flow_ops_lock; + rte_spinlock_t aq_lock; struct iavf_parser_list rss_parser_list; struct iavf_parser_list dist_parser_list; struct iavf_parser_list ipsec_crypto_parser_list; diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index f92daf97f2..edb74edcac 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -554,7 +554,9 @@ iavf_enable_vlan_strip(struct iavf_adapter *adapter) args.in_args_size = 0; args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); ret = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (ret) PMD_DRV_LOG(ERR, "Failed to execute command of" " OP_ENABLE_VLAN_STRIPPING"); @@ -575,7 +577,9 @@ iavf_disable_vlan_strip(struct iavf_adapter *adapter) args.in_args_size = 0; args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); ret = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (ret) PMD_DRV_LOG(ERR, "Failed to execute command of" " OP_DISABLE_VLAN_STRIPPING"); @@ -604,7 +608,9 @@ iavf_check_api_version(struct iavf_adapter *adapter) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_INIT_LOG(ERR, "Fail to execute command of OP_VERSION"); return err; @@ -665,7 +671,9 @@ iavf_get_vf_resource(struct iavf_adapter *adapter) args.in_args = (uint8_t *)∩︀ args.in_args_size = sizeof(caps); + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, @@ -710,7 +718,9 @@ iavf_get_supported_rxdid(struct iavf_adapter *adapter) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); ret = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (ret) { PMD_DRV_LOG(ERR, "Failed to execute command of OP_GET_SUPPORTED_RXDIDS"); @@ -754,7 +764,9 @@ iavf_config_vlan_strip_v2(struct iavf_adapter *adapter, bool enable) args.in_args_size = sizeof(vlan_strip); args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); ret = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (ret) PMD_DRV_LOG(ERR, "fail to execute command %s", enable ? "VIRTCHNL_OP_ENABLE_VLAN_STRIPPING_V2" : @@ -794,7 +806,9 @@ iavf_config_vlan_insert_v2(struct iavf_adapter *adapter, bool enable) args.in_args_size = sizeof(vlan_insert); args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); ret = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (ret) PMD_DRV_LOG(ERR, "fail to execute command %s", enable ? "VIRTCHNL_OP_ENABLE_VLAN_INSERTION_V2" : @@ -837,7 +851,9 @@ iavf_add_del_vlan_v2(struct iavf_adapter *adapter, uint16_t vlanid, bool add) args.in_args_size = sizeof(vlan_filter); args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "fail to execute command %s", add ? "OP_ADD_VLAN_V2" : "OP_DEL_VLAN_V2"); @@ -858,7 +874,9 @@ iavf_get_vlan_offload_caps_v2(struct iavf_adapter *adapter) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); ret = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (ret) { PMD_DRV_LOG(ERR, "Failed to execute command of VIRTCHNL_OP_GET_OFFLOAD_VLAN_V2_CAPS"); @@ -889,7 +907,9 @@ iavf_enable_queues(struct iavf_adapter *adapter) args.in_args_size = sizeof(queue_select); args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "Failed to execute command of OP_ENABLE_QUEUES"); @@ -917,7 +937,9 @@ iavf_disable_queues(struct iavf_adapter *adapter) args.in_args_size = sizeof(queue_select); args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "Failed to execute command of OP_DISABLE_QUEUES"); @@ -953,7 +975,9 @@ iavf_switch_queue(struct iavf_adapter *adapter, uint16_t qid, args.in_args_size = sizeof(queue_select); args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "Failed to execute command of %s", on ? "OP_ENABLE_QUEUES" : "OP_DISABLE_QUEUES"); @@ -995,7 +1019,9 @@ iavf_enable_queues_lv(struct iavf_adapter *adapter) args.in_args_size = len; args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "Failed to execute command of OP_ENABLE_QUEUES_V2"); @@ -1039,7 +1065,9 @@ iavf_disable_queues_lv(struct iavf_adapter *adapter) args.in_args_size = len; args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "Failed to execute command of OP_DISABLE_QUEUES_V2"); @@ -1085,7 +1113,9 @@ iavf_switch_queue_lv(struct iavf_adapter *adapter, uint16_t qid, args.in_args_size = len; args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "Failed to execute command of %s", on ? "OP_ENABLE_QUEUES_V2" : "OP_DISABLE_QUEUES_V2"); @@ -1117,7 +1147,9 @@ iavf_configure_rss_lut(struct iavf_adapter *adapter) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "Failed to execute command of OP_CONFIG_RSS_LUT"); @@ -1149,7 +1181,9 @@ iavf_configure_rss_key(struct iavf_adapter *adapter) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "Failed to execute command of OP_CONFIG_RSS_KEY"); @@ -1247,7 +1281,9 @@ iavf_configure_queues(struct iavf_adapter *adapter, args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "Failed to execute command of" " VIRTCHNL_OP_CONFIG_VSI_QUEUES"); @@ -1288,7 +1324,9 @@ iavf_config_irq_map(struct iavf_adapter *adapter) args.in_args_size = len; args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "fail to execute command OP_CONFIG_IRQ_MAP"); @@ -1329,7 +1367,9 @@ iavf_config_irq_map_lv(struct iavf_adapter *adapter, uint16_t num, args.in_args_size = len; args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "fail to execute command OP_MAP_QUEUE_VECTOR"); @@ -1389,7 +1429,9 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add) args.in_args_size = len; args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "fail to execute command %s", add ? "OP_ADD_ETHER_ADDRESS" : @@ -1419,7 +1461,9 @@ iavf_query_stats(struct iavf_adapter *adapter, args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "fail to execute command OP_GET_STATS"); *pstats = NULL; @@ -1457,7 +1501,9 @@ iavf_config_promisc(struct iavf_adapter *adapter, args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, @@ -1500,7 +1546,9 @@ iavf_add_del_eth_addr(struct iavf_adapter *adapter, struct rte_ether_addr *addr, args.in_args_size = sizeof(cmd_buffer); args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "fail to execute command %s", add ? "OP_ADD_ETH_ADDR" : "OP_DEL_ETH_ADDR"); @@ -1527,7 +1575,9 @@ iavf_add_del_vlan(struct iavf_adapter *adapter, uint16_t vlanid, bool add) args.in_args_size = sizeof(cmd_buffer); args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "fail to execute command %s", add ? "OP_ADD_VLAN" : "OP_DEL_VLAN"); @@ -1554,7 +1604,9 @@ iavf_fdir_add(struct iavf_adapter *adapter, args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "fail to execute command OP_ADD_FDIR_FILTER"); return err; @@ -1614,7 +1666,9 @@ iavf_fdir_del(struct iavf_adapter *adapter, args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "fail to execute command OP_DEL_FDIR_FILTER"); return err; @@ -1661,7 +1715,9 @@ iavf_fdir_check(struct iavf_adapter *adapter, args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "fail to check flow director rule"); return err; @@ -1704,7 +1760,9 @@ iavf_flow_sub(struct iavf_adapter *adapter, struct iavf_fsub_conf *filter) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "Failed to execute command of " "OP_FLOW_SUBSCRIBE"); @@ -1755,7 +1813,9 @@ iavf_flow_unsub(struct iavf_adapter *adapter, struct iavf_fsub_conf *filter) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "Failed to execute command of " "OP_FLOW_UNSUBSCRIBE"); @@ -1798,7 +1858,9 @@ iavf_flow_sub_check(struct iavf_adapter *adapter, args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "Failed to check flow subscription rule"); return err; @@ -1838,7 +1900,9 @@ iavf_add_del_rss_cfg(struct iavf_adapter *adapter, args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "Failed to execute command of %s", @@ -1861,7 +1925,9 @@ iavf_get_hena_caps(struct iavf_adapter *adapter, uint64_t *caps) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "Failed to execute command of OP_GET_RSS_HENA_CAPS"); @@ -1887,7 +1953,9 @@ iavf_set_hena(struct iavf_adapter *adapter, uint64_t hena) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "Failed to execute command of OP_SET_RSS_HENA"); @@ -1908,7 +1976,9 @@ iavf_get_qos_cap(struct iavf_adapter *adapter) args.in_args_size = 0; args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, @@ -1941,7 +2011,9 @@ int iavf_set_q_tc_map(struct rte_eth_dev *dev, args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "Failed to execute command of" " VIRTCHNL_OP_CONFIG_TC_MAP"); @@ -1964,7 +2036,9 @@ int iavf_set_q_bw(struct rte_eth_dev *dev, args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) PMD_DRV_LOG(ERR, "Failed to execute command of" " VIRTCHNL_OP_CONFIG_QUEUE_BW"); @@ -2009,7 +2083,9 @@ iavf_add_del_mc_addr_list(struct iavf_adapter *adapter, i * sizeof(struct virtchnl_ether_addr); args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "fail to execute command %s", @@ -2054,12 +2130,16 @@ iavf_request_queues(struct rte_eth_dev *dev, uint16_t num) /* disable interrupt to avoid the admin queue message to be read * before iavf_read_msg_from_pf. */ + rte_spinlock_lock(&vf->aq_lock); rte_intr_disable(pci_dev->intr_handle); err = iavf_execute_vf_cmd(adapter, &args, 0); rte_intr_enable(pci_dev->intr_handle); + rte_spinlock_unlock(&vf->aq_lock); } else { rte_eal_alarm_cancel(iavf_dev_alarm_handler, dev); + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); rte_eal_alarm_set(IAVF_ALARM_INTERVAL, iavf_dev_alarm_handler, dev); } @@ -2098,7 +2178,9 @@ iavf_get_max_rss_queue_region(struct iavf_adapter *adapter) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "Failed to execute command of VIRTCHNL_OP_GET_MAX_RSS_QREGION"); return err; @@ -2129,7 +2211,9 @@ iavf_ipsec_crypto_request(struct iavf_adapter *adapter, args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 1); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "fail to execute command %s", "OP_INLINE_IPSEC_CRYPTO"); @@ -2163,7 +2247,9 @@ iavf_set_vf_quanta_size(struct iavf_adapter *adapter, u16 start_queue_id, u16 nu args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "Failed to execute command VIRTCHNL_OP_CONFIG_QUANTA"); return err; @@ -2189,7 +2275,9 @@ iavf_get_ptp_cap(struct iavf_adapter *adapter) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "Failed to execute command of OP_1588_PTP_GET_CAPS"); @@ -2216,8 +2304,10 @@ iavf_get_phc_time(struct iavf_rx_queue *rxq) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; + rte_spinlock_lock(&vf->aq_lock); rte_spinlock_lock(&vf->phc_time_aq_lock); err = iavf_execute_vf_cmd(adapter, &args, 0); + rte_spinlock_unlock(&vf->aq_lock); if (err) { PMD_DRV_LOG(ERR, "Failed to execute command of VIRTCHNL_OP_1588_PTP_GET_TIME"); -- 2.31.1