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 E2F15A0350 for ; Mon, 28 Feb 2022 22:22:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DCF3740140; Mon, 28 Feb 2022 22:22:43 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 6B0FA40140 for ; Mon, 28 Feb 2022 22:22:43 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id b5so17492263wrr.2 for ; Mon, 28 Feb 2022 13:22:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/S+6oYn54FnyjOdCMk2UxEw5osbqM5f9y27Jfbrg15I=; b=kC2029pL2Qo/Vfc2sBAXc4oySozBPhUbUs//e04qXSvS2z+ht8Tly8PHSZ5G7Rhw84 VZPiLj5sdKPDaqSQZU1d2BoiFbY+ktRQ+4SWMIkKUGajmWjAxqWeowqsGVlh3b39IwsA NJHwPBe9yVvVsTlRdIh4qWnKG6jyM7P9HryJr0ikBuL1CI1fQj+iGGqGLMYlTbmc8ymA rOQ7AASk3fkgQjuQOhW9ZqEF0TxKKonbWQ9MxOIjr5OjR0jms3dNLnDcyGu+MlrlaL5G Lneojtgzr4GT50vdj54xonTTA8GKnSSfh+BKxThGExZCAenAHwuBlpe03D94sMD8Uq7K 90kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/S+6oYn54FnyjOdCMk2UxEw5osbqM5f9y27Jfbrg15I=; b=1I400catrT9jLFCxz8JoUlXmUFWvWEb/muoPwsby4MPYCrZ5i2oQmOJHfFwBb+lSQu /BHbx8/bXpgpOlnRZYOw0inj+4Fc5TmaJ1hZzI9tsl361YYPSlvvX0WZ50ofv8M3pdjs qq7uGyG979hmYnVYB/nq9uD7/3InFrJA2g2/6NPB61EqN9TLHL50FoscfFKHi9orPI67 4km/HrUVfCQALV1rGrF0OZJE0s27vYDv3eU1yuFN/egnPZBZMcmJ9oDG0Dnuwk+1wBoN mJLFszlxhhoLOH6HS2xmt1k2ZMLIqSDczsD43q/e/UdHRd87kgyzTMjpxuLAZC6xtpmU Dm1w== X-Gm-Message-State: AOAM532k8DVtfigZi6CvIa/XDu3aMNtmwu0raTDifWiZYmpp/+5Bhfy+ C0ehXYxZKGy18wbWwn5+XI9xrDcS2kO7zo4x X-Google-Smtp-Source: ABdhPJxkDuennoTZ4F8m4OKPc4MUdMasby9bSsh+AkGjUgNCieB6U8gESHqeUJvOxZD99PnOMZYIOQ== X-Received: by 2002:a5d:56c8:0:b0:1ef:89f4:ae56 with SMTP id m8-20020a5d56c8000000b001ef89f4ae56mr9124998wrw.444.1646083363163; Mon, 28 Feb 2022 13:22:43 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id x3-20020a5d6b43000000b001e317fb86ecsm11791492wrw.57.2022.02.28.13.22.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:22:42 -0800 (PST) From: luca.boccassi@gmail.com To: Michal Krawczyk Cc: Shai Brandes , dpdk stable Subject: patch 'net/ena: skip timer if reset is triggered' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:20:32 +0000 Message-Id: <20220228212047.3341966-36-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/02/22. 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/b1d55a40d6cb397f0d0dd370ce4378b3cfbba80c Thanks. Luca Boccassi --- >From b1d55a40d6cb397f0d0dd370ce4378b3cfbba80c Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Wed, 23 Feb 2022 13:19:30 +0100 Subject: [PATCH] net/ena: skip timer if reset is triggered [ upstream commit e2174a54469febb2905f06d5c942ff76c492c2ff ] Some user applications may not support PMD reset handling. If they will support timer service it could cause a situation, when information about the reset trigger is being showed every time the timer service is being called. Timer service is now being skipped if the reset was already triggered. Fixes: d9b8b106bf9d ("net/ena: add watchdog and keep alive AENQ handler") Signed-off-by: Michal Krawczyk Reviewed-by: Shai Brandes --- drivers/net/ena/ena_ethdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 3359ca79d2..98efea960a 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1652,6 +1652,9 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer, struct ena_adapter *adapter = arg; struct rte_eth_dev *dev = adapter->rte_dev; + if (unlikely(adapter->trigger_reset)) + return; + check_for_missing_keep_alive(adapter); check_for_admin_com_state(adapter); -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:56.855034383 +0000 +++ 0036-net-ena-skip-timer-if-reset-is-triggered.patch 2022-02-28 21:17:53.988932474 +0000 @@ -1 +1 @@ -From e2174a54469febb2905f06d5c942ff76c492c2ff Mon Sep 17 00:00:00 2001 +From b1d55a40d6cb397f0d0dd370ce4378b3cfbba80c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e2174a54469febb2905f06d5c942ff76c492c2ff ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index a2793f13cd..4b82372155 100644 +index 3359ca79d2..98efea960a 100644 @@ -26,3 +27,3 @@ -@@ -1624,6 +1624,9 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer, - struct rte_eth_dev *dev = arg; - struct ena_adapter *adapter = dev->data->dev_private; +@@ -1652,6 +1652,9 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer, + struct ena_adapter *adapter = arg; + struct rte_eth_dev *dev = adapter->rte_dev; @@ -35 +36 @@ - check_for_tx_completions(adapter); +