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 A9A61A0093 for ; Wed, 9 Mar 2022 12:02:30 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A0A2F40687; Wed, 9 Mar 2022 12:02:30 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 16061410E6 for ; Wed, 9 Mar 2022 12:02:29 +0100 (CET) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id DB1DD3F4C2 for ; Wed, 9 Mar 2022 11:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823748; bh=e2sMqLT90wcXBzGEcWX4OuDFqb05FJN4ysQUtxPlks4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jShLnLG4LZCZSQjIEEzqKW6uUEqDc8FB/x3upoV85OUoPYa+vRP7dCdpGUo83XTjF FQSPy99QHqogRGSNPcyx5n75J6QqokR4VBu56+z7rcALexQpdkMznWHkGbphNpS3ZG Zz9+Z94kbdxuRU2X9H/IPH7gS0bLdFWpNmlDwtDreP5LQLhA/jj/o7YURSnkQ5c7ad 0eZHhflG4pQBuFmrmK1Lo7rq5UQHenlEcDkRzoacotW6sNQOQZEKshy9LZ4BaIK9iN fepiXHOzuit0K/LWiZ3yk4uGkbWUoHQJx2gb4m8XTCv39Sys+i/KY+PLJPsic/yg3H iVB+Jz5p1HoDg== Received: by mail-wr1-f70.google.com with SMTP id f14-20020adfc98e000000b001e8593b40b0so631125wrh.14 for ; Wed, 09 Mar 2022 03:02:28 -0800 (PST) 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=e2sMqLT90wcXBzGEcWX4OuDFqb05FJN4ysQUtxPlks4=; b=lQyIr/XmwaUbLUYhSPQO0Cl/HTCglJODApyyaVL3IEwr/EJgv7f6EYYl8u8X7Ww3HE PSxFvFFukkxLl+zaortWXeRjXT1gN3/frndnsGICI3zBg4F+A2xamIk3vuY8RTA81Yfe /BcvgWvq5/H2wvvQ0ykiwEfES1C4RsqEda5fF0ivrv+8gcIXjy6c8iXmYhCw1vxUgBDF uEXq05i1Py+o9V9vU/v7MX/EXc2m3iyUMALVS2J0pznNMqT8OZu96ZyQGCNgTUadb5Ce GegjL++1ZWBE3rQvvm5fmG6VLSjqTbjTLECVNQGa7fwHp0OAvMyeMaJ2HR88Hdg01tpn d0DQ== X-Gm-Message-State: AOAM530kTzjhg1/+eRDBLf/DbzcSNnf4b9zSiU12LsH6mW0SRVQqdwRi mH1Oxm3ldF4fmp77tT7mOtvdEDV5Dthmgs8QDJ1EODg5OWmlEKMQctHTvm2BpGL75qoxEPoJsfG CgUW1XWJPY1goqfTyLGD/gLOo X-Received: by 2002:a05:6000:1549:b0:1f1:e564:874c with SMTP id 9-20020a056000154900b001f1e564874cmr14490376wry.668.1646823747255; Wed, 09 Mar 2022 03:02:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxKi/6P4qkWChn8h95ywrhPNlQ9J90mlq6gTlU0pvQsaVC6epYKp9oAzjjpwKGIoLHszTZ47Q== X-Received: by 2002:a05:6000:1549:b0:1f1:e564:874c with SMTP id 9-20020a056000154900b001f1e564874cmr14490360wry.668.1646823747036; Wed, 09 Mar 2022 03:02:27 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id bg42-20020a05600c3caa00b00380deeaae72sm4955385wmb.1.2022.03.09.03.02.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:02:26 -0800 (PST) From: christian.ehrhardt@canonical.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 19.11.12 Date: Wed, 9 Mar 2022 12:00:51 +0100 Message-Id: <20220309110116.1295395-20-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-1-christian.ehrhardt@canonical.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 19.11.12 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/11/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/41d1a8d6c41dec5c1f2393fe909c2f2ead117538 Thanks. Christian Ehrhardt --- >From 41d1a8d6c41dec5c1f2393fe909c2f2ead117538 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 f7eadd3bc8..c73234f838 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1588,6 +1588,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.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:44.426416092 +0100 +++ 0020-net-ena-skip-timer-if-reset-is-triggered.patch 2022-03-09 11:57:43.368938231 +0100 @@ -1 +1 @@ -From e2174a54469febb2905f06d5c942ff76c492c2ff Mon Sep 17 00:00:00 2001 +From 41d1a8d6c41dec5c1f2393fe909c2f2ead117538 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 f7eadd3bc8..c73234f838 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; +@@ -1588,6 +1588,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); +