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 4C8B2438CD for ; Mon, 15 Jan 2024 11:02:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 45AA0402C6; Mon, 15 Jan 2024 11:02:51 +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 363EE402C0 for ; Mon, 15 Jan 2024 11:02:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705312968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=8lUfenZM8jeIkE0Yjv7AvBJViYsKYdxhyhuxfnBZHpk=; b=FFFNYYp1BIC2pT/aiN2z6Gr1bbQsH8iBiDm0XNEBX537ZGjm/khYLAS6cYvMbbOQqS/hTe kX/ZqZMgn8g9r+EHcp6ucNIZLyZuX/dh1ube1CJul4ouEL9vU1hbeRIRZ/AGa5+9XEUK1S 3EgZGJ9XaMmuszbSbi+fg+SVj6zim4w= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-314-s9IT7YkFMvm503lOj2ujXg-1; Mon, 15 Jan 2024 05:02:46 -0500 X-MC-Unique: s9IT7YkFMvm503lOj2ujXg-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-336862fa1a5so5635640f8f.2 for ; Mon, 15 Jan 2024 02:02:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705312965; x=1705917765; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8lUfenZM8jeIkE0Yjv7AvBJViYsKYdxhyhuxfnBZHpk=; b=qXVjUmewt+nHBwMEBXmuGr/rDxHp+LE1xoiYOkQPBuz6cuJYa3KLUWU3fR1QvdTSk4 TxDodynoRmEM+LJGt7zccu1K58m9pH8Zrfc1p3XxU+XDho99pR5mSciqV9N7LmuNvtWX UfwnEnmiQhg2U28c3n9Gog8KYv+49DLaQI8Q75LD/dIo4q3yhc8lh3UF8ZCPp83OcX92 vWsaYcCvv77eLywW1ds+JiINFLifv5kfxLZUUzyTYRI0BEjkiZ8g5iqyIhGIgsE7FgUs YAlJ3x9WXyD118Wxap4Jvzx+RdqnvU/aSJPEtnHm+qcdblGQ1iWiRwqHksPZuqARcwcU oynA== X-Gm-Message-State: AOJu0YzAPiIhDLLIBn7s2phuF+h/z1INENXag44l5ajloEm8AGRmYms9 C6+ftxZGBucbLJ0f1jfun3K6XptggJCch4IEsDND/ql6A4IRJjlvRBIpj8LE3TY+4vvsantwWF9 ZY3JuZyVU856rrCDAmt57/Nw= X-Received: by 2002:a5d:5185:0:b0:336:5dfb:201f with SMTP id k5-20020a5d5185000000b003365dfb201fmr2804856wrv.34.1705312965443; Mon, 15 Jan 2024 02:02:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IGBgBmQTC0TREqKo32O55jPw/cROBRj33tQlAsEZqRU6qqy7v769YG9k2A9AZuIG1SO14mXiw== X-Received: by 2002:a5d:5185:0:b0:336:5dfb:201f with SMTP id k5-20020a5d5185000000b003365dfb201fmr2804849wrv.34.1705312965037; Mon, 15 Jan 2024 02:02:45 -0800 (PST) Received: from [192.168.0.36] ([78.18.19.36]) by smtp.gmail.com with ESMTPSA id d10-20020adfe2ca000000b00337aed83aaasm514336wrj.92.2024.01.15.02.02.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Jan 2024 02:02:44 -0800 (PST) Message-ID: Date: Mon, 15 Jan 2024 10:02:43 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 22.11] Revert "net/iavf: fix abnormal disable HW interrupt" To: "Chris Brezovec (cbrezove)" , "stable@dpdk.org" , "xuemingl@nvidia.com" References: <20240112112046.224346-1-ktraynor@redhat.com> From: Kevin Traynor Autocrypt: addr=ktraynor@redhat.com; keydata= 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 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 On 14/01/2024 23:47, Chris Brezovec (cbrezove) wrote: > Kevin, > > I have a question on this issue. The commit you are looking to back out was committed into v22.11.3. Does that mean that the issue exists in v22.11.3? Or were there some other commits between v22.11.3 and v22.11.4 that exposed this issue, or made it more likely to hit? > It was reported by our validation team when OVS updated from 22.11.1->22.11.3. thanks, Kevin. > Thanks! > -Chris > > From: Kevin Traynor > Date: Friday, January 12, 2024 at 6:21 AM > To: stable@dpdk.org , xuemingl@nvidia.com > Cc: Kevin Traynor > Subject: [PATCH 22.11] Revert "net/iavf: fix abnormal disable HW interrupt" > This reverts commit 2bdeeb53da0dda4e36a022553d3403c1217d677e. > > The change in behaviour [0] for handling some admin queue messages > from polling to interrupt mode has changed the behaviour and is leading > to a deadlock with OVS. > > [0] > commit 2bdeeb53da0dda4e36a022553d3403c1217d677e > Author: Mingjin Ye > Date: Wed Jun 14 09:53:03 2023 +0000 > > net/iavf: fix abnormal disable HW interrupt > > [ upstream commit 675a104e2e940ec476e8b469725e8465d01c0098 ] > > Bugzilla ID: 1337 > Reported-by: Kevin Traynor > Signed-off-by: Kevin Traynor > --- > drivers/net/iavf/iavf_ethdev.c | 25 +++++++++--------- > drivers/net/iavf/iavf_vchnl.c | 48 +++++++++++++++++++++++++++------- > 2 files changed, 50 insertions(+), 23 deletions(-) > > diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c > index 62d72a0155..a12ea39444 100644 > --- a/drivers/net/iavf/iavf_ethdev.c > +++ b/drivers/net/iavf/iavf_ethdev.c > @@ -2760,17 +2760,4 @@ iavf_dev_close(struct rte_eth_dev *dev) > > ret = iavf_dev_stop(dev); > - > - /* > - * Release redundant queue resource when close the dev > - * so that other vfs can re-use the queues. > - */ > - if (vf->lv_enabled) { > - ret = iavf_request_queues(dev, IAVF_MAX_NUM_QUEUES_DFLT); > - if (ret) > - PMD_DRV_LOG(ERR, "Reset the num of queues failed"); > - > - vf->max_rss_qregion = IAVF_MAX_NUM_QUEUES_DFLT; > - } > - > adapter->closed = true; > > @@ -2789,4 +2776,16 @@ iavf_dev_close(struct rte_eth_dev *dev) > iavf_config_promisc(adapter, false, false); > > + /* > + * Release redundant queue resource when close the dev > + * so that other vfs can re-use the queues. > + */ > + if (vf->lv_enabled) { > + ret = iavf_request_queues(dev, IAVF_MAX_NUM_QUEUES_DFLT); > + if (ret) > + PMD_DRV_LOG(ERR, "Reset the num of queues failed"); > + > + vf->max_rss_qregion = IAVF_MAX_NUM_QUEUES_DFLT; > + } > + > iavf_shutdown_adminq(hw); > if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_WB_ON_ITR) { > diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c > index c2f6b617d6..aeffb07cca 100644 > --- a/drivers/net/iavf/iavf_vchnl.c > +++ b/drivers/net/iavf/iavf_vchnl.c > @@ -319,5 +319,4 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args, > switch (args->ops) { > case VIRTCHNL_OP_RESET_VF: > - case VIRTCHNL_OP_REQUEST_QUEUES: > /*no need to wait for response */ > _clear_cmd(vf); > @@ -343,4 +342,31 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args, > _clear_cmd(vf); > break; > + case VIRTCHNL_OP_REQUEST_QUEUES: > + /* > + * ignore async reply, only wait for system message, > + * vf_reset = true if get VIRTCHNL_EVENT_RESET_IMPENDING, > + * if not, means request queues failed. > + */ > + do { > + result = iavf_read_msg_from_pf(adapter, args->out_size, > + args->out_buffer); > + if (result == IAVF_MSG_SYS && vf->vf_reset) { > + break; > + } else if (result == IAVF_MSG_CMD || > + result == IAVF_MSG_ERR) { > + err = -1; > + 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 || > + 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); > + break; > default: > if (rte_thread_is_intr()) { > @@ -2042,9 +2068,9 @@ iavf_request_queues(struct rte_eth_dev *dev, uint16_t num) > IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); > struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); > + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); > struct virtchnl_vf_res_request vfres; > struct iavf_cmd_info args; > uint16_t num_queue_pairs; > int err; > - int i = 0; > > if (!(vf->vf_res->vf_cap_flags & > @@ -2067,5 +2093,14 @@ iavf_request_queues(struct rte_eth_dev *dev, uint16_t num) > > if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_WB_ON_ITR) { > - err = iavf_execute_vf_cmd_safe(adapter, &args, 0); > + /* disable interrupt to avoid the admin queue message to be read > + * before iavf_read_msg_from_pf. > + * > + * don't disable interrupt handler until ready to execute vf cmd. > + */ > + 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); > @@ -2080,11 +2115,4 @@ iavf_request_queues(struct rte_eth_dev *dev, uint16_t num) > } > > - /* wait for interrupt notification vf is resetting */ > - while (i++ < MAX_TRY_TIMES) { > - if (vf->vf_reset) > - break; > - iavf_msec_delay(ASQ_DELAY_MS); > - } > - > /* request queues succeeded, vf is resetting */ > if (vf->vf_reset) { > -- > 2.43.0