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 A6F4DA0524 for ; Fri, 5 Feb 2021 12:37:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E2FB4067B; Fri, 5 Feb 2021 12:37:42 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id A9E9F188A44 for ; Fri, 5 Feb 2021 12:37:38 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id y187so5659509wmd.3 for ; Fri, 05 Feb 2021 03:37:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/6ayTUJbi2j1Wd4Iw7hePaWirD0qzIVB+kfk0rMkZ9Y=; b=I7TfxDyRKoz5+53iC20Ojw4Gj9bNyavbyxboSASo2utntQKhWlWHgYS0mGCyhXffSX TsyLyWq9ZNGPSkt7g4Pdie8JQC3uQFwLJuY9/MIw5AXU1EtpTJILPMmyxVmV2Gv+cVXZ pur6A9rvY5PuLbBiIV1FhUGRncr07wbI/kwTmPvGradJWKs1MiGjLz4LyTDVDkfBEINp fL1GdxUGLk7PZQlIdEZhG/S6U0dEAXOvCnXB9vIC4lU/P1QxAP2RqyKEEi+19KIauLm1 FZsgT0F8AFkvpUgbUONhljoJ0zUKVj+FCqoHgmGfRBL+TExEriB+X27RStkCPSCy4cZC cXRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/6ayTUJbi2j1Wd4Iw7hePaWirD0qzIVB+kfk0rMkZ9Y=; b=GCVbsdcRbn7hmDSvUJ9KyNUj1DH8V4nh2dDYJ0Xwk+nQ5XoOad3QihdhzbuOB6OA5i 8ORbwyo4fP8fD3ryjC+MEw+rCpa7BAQ6xCT4w46raSipo+CPdnc2yU3npe6JoUkkX1o0 vtw0/PHIM5nLaqzJwnZfLDZATOzHDZKL1gNL+sEP6cjIAbBu8zv9JsRqn+vaANns8APs V+vnh39419O5Wk7RBn59FzA/Li1A6kzAudevWkMFMSrfYhfLxKlphpK20KyBhr9m8Mkw zVovaVluuVOSApyKu6FgrwxLXP18jZhzTapHbiZh9Zh6Xzozqai2sJiuzS6pJwXtza6B y1rQ== X-Gm-Message-State: AOAM531rP+ei6p75SsAFe2yJN3rlTyrbBlkaarU51P6VxBydb6erkXxM 1smNSRwelbUpUQallweR1KPMOwek1nXjEYhi X-Google-Smtp-Source: ABdhPJw9JZimcf/ql30xN7O1kxDeEFdOPjzn7QCU3UT/E0j0zI5KpuUvMxuA1HmtZEDqcaSgueRYog== X-Received: by 2002:a1c:8157:: with SMTP id c84mr3297124wmd.24.1612525058429; Fri, 05 Feb 2021 03:37:38 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o18sm656083wmp.19.2021.02.05.03.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:37:37 -0800 (PST) From: luca.boccassi@gmail.com To: Haiyue Wang Cc: Qi Zhang , dpdk stable Date: Fri, 5 Feb 2021 11:18:38 +0000 Message-Id: <20210205111920.1272063-232-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: drain out DCF AdminQ command queue' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/9feafdeb167204d4599c8cf5eff436eb08a6765b Thanks. Luca Boccassi --- >From 9feafdeb167204d4599c8cf5eff436eb08a6765b Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Fri, 22 Jan 2021 01:31:37 +0800 Subject: [PATCH] net/ice: drain out DCF AdminQ command queue [ upstream commit 5d4ca9b0a23585b1fb8d71d7af34fba26369cbea ] The virtchnl message is handled one by one by checking opcode to match the response for the request. The DCF AdminQ command with buffer needs two virtchnl commands, one is to handle the AdminQ descriptor, the other is to the handle AdminQ buffer. If both of them are sent to PF successfully, it needs to wait two responses from PF, even if the AdminQ descriptor command gets the failure response. Since PF will handle them one by one, and send back the response for each. If not wait for the buffer message response until timeout to drain out the virtchnl command queue, it will cause the next AdminQ command with buffer to get the stall buffer response from previous. Fixes: daa714d55c72 ("net/ice: handle AdminQ command by DCF") Signed-off-by: Haiyue Wang Acked-by: Qi Zhang --- drivers/net/ice/ice_dcf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c index 44dbd3bb84..294ddcd2e1 100644 --- a/drivers/net/ice/ice_dcf.c +++ b/drivers/net/ice/ice_dcf.c @@ -504,9 +504,7 @@ ice_dcf_send_aq_cmd(void *dcf_hw, struct ice_aq_desc *desc, } do { - if ((!desc_cmd.pending && !buff_cmd.pending) || - (!desc_cmd.pending && desc_cmd.v_ret != IAVF_SUCCESS) || - (!buff_cmd.pending && buff_cmd.v_ret != IAVF_SUCCESS)) + if (!desc_cmd.pending && !buff_cmd.pending) break; rte_delay_ms(ICE_DCF_ARQ_CHECK_TIME); -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:39.404363273 +0000 +++ 0232-net-ice-drain-out-DCF-AdminQ-command-queue.patch 2021-02-05 11:18:29.210698804 +0000 @@ -1 +1 @@ -From 5d4ca9b0a23585b1fb8d71d7af34fba26369cbea Mon Sep 17 00:00:00 2001 +From 9feafdeb167204d4599c8cf5eff436eb08a6765b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5d4ca9b0a23585b1fb8d71d7af34fba26369cbea ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index dbe42fa3df..d72a6f357e 100644 +index 44dbd3bb84..294ddcd2e1 100644 @@ -33 +34 @@ -@@ -505,9 +505,7 @@ ice_dcf_send_aq_cmd(void *dcf_hw, struct ice_aq_desc *desc, +@@ -504,9 +504,7 @@ ice_dcf_send_aq_cmd(void *dcf_hw, struct ice_aq_desc *desc,