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 E13D2A034F for ; Tue, 1 Mar 2022 11:45:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA718407FF; Tue, 1 Mar 2022 11:45:41 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id CE998426DD for ; Tue, 1 Mar 2022 11:45:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131540; 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=1d0vVldKXSGrtp70CO78aAkOtdRz0xybLeoAStwmF9Y=; b=K/N92vp8vZrFiyLr9ur8SDEmQWEEGIeJWwGBLe08XkldpHmO0sxvlVwYhG2f3LkS9pYoDL jMZgUwLzJPGhXzatCN2hIDwgx7t+BuruZoKm2EV7m0YZTXW+3tgaZSR1kpkEU/Tcbk37GD dCMImsQnuYNT3L1NVx7QBdEWe0iVZSM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-673-6Uux6U9mPU6uPTDGq0277w-1; Tue, 01 Mar 2022 05:45:38 -0500 X-MC-Unique: 6Uux6U9mPU6uPTDGq0277w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F0F76100C609; Tue, 1 Mar 2022 10:45:36 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA2DD6FB08; Tue, 1 Mar 2022 10:45:35 +0000 (UTC) From: Kevin Traynor To: Michal Krawczyk Cc: Shai Brandes , dpdk stable Subject: patch 'net/ena: skip timer if reset is triggered' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:30 +0000 Message-Id: <20220301104300.334382-74-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.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 03/06/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c443512e3de007f49b5d0a5313d73c20d5e13d3d Thanks. Kevin --- >From c443512e3de007f49b5d0a5313d73c20d5e13d3d 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 0b7699454b..b3a9cccd40 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1628,4 +1628,7 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer, struct ena_adapter *adapter = dev->data->dev_private; + if (unlikely(adapter->trigger_reset)) + return; + check_for_missing_keep_alive(adapter); check_for_admin_com_state(adapter); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.450899717 +0000 +++ 0074-net-ena-skip-timer-if-reset-is-triggered.patch 2022-03-01 10:41:01.390244115 +0000 @@ -1 +1 @@ -From e2174a54469febb2905f06d5c942ff76c492c2ff Mon Sep 17 00:00:00 2001 +From c443512e3de007f49b5d0a5313d73c20d5e13d3d 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 0b7699454b..b3a9cccd40 100644 @@ -26 +27 @@ -@@ -1625,4 +1625,7 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer, +@@ -1628,4 +1628,7 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer,