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 154A0A00C2 for ; Tue, 8 Mar 2022 15:16:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0FCA1407FF; Tue, 8 Mar 2022 15:16:31 +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 027474068E for ; Tue, 8 Mar 2022 15:16:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748988; 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=H8lYvpW64OAENLICZ61JYXjTdq7yfnTdDvCHSs9eb0w=; b=RRfk+0fqjaV93W1kBWkfCjNR8H0MNrYQIEJsfX1UoQBV+CnIcuITi/SeaLj9hIKnVklLcw b5OdS0r2v9/QK5Wv3cyoBrun/HQ4L2DaFMf+LmiAX6fIZOQhiNOXR01UHN4l6olVlvT0jJ QJtO6yWusFA8BFWlqdcUKaJ5b+RmPdg= 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-86-R6mmQQtHOnKOPby-IWFc-Q-1; Tue, 08 Mar 2022 09:16:26 -0500 X-MC-Unique: R6mmQQtHOnKOPby-IWFc-Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7DA6A801AFE; Tue, 8 Mar 2022 14:16:25 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9BE4865A4; Tue, 8 Mar 2022 14:16:24 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'pcapng: handle failure of link status query' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:56 +0000 Message-Id: <20220308141500.286915-41-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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/14/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/23237c380ec2bff9ffdd5b657a983020cb7efb5f Thanks. Kevin --- >From 23237c380ec2bff9ffdd5b657a983020cb7efb5f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 10 Feb 2022 15:09:04 -0800 Subject: [PATCH] pcapng: handle failure of link status query [ upstream commit 442878db2e35ab276a1cd78cd836008e15eccd8b ] If rte_ethlink_get fails, the code can just not add speed to the pcap file. Coverity issue: 373664 Fixes: 8d23ce8f5ee9 ("pcapng: add new library for writing pcapng files") Signed-off-by: Stephen Hemminger --- lib/pcapng/rte_pcapng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c index 03edabe73e..9db058fe42 100644 --- a/lib/pcapng/rte_pcapng.c +++ b/lib/pcapng/rte_pcapng.c @@ -178,6 +178,6 @@ pcapng_add_interface(rte_pcapng_t *self, uint16_t port) /* DPDK reports in units of Mbps */ - rte_eth_link_get(port, &link); - if (link.link_status == RTE_ETH_LINK_UP) + if (rte_eth_link_get(port, &link) == 0 && + link.link_status == RTE_ETH_LINK_UP) speed = link.link_speed * PCAPNG_MBPS_SPEED; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:29.387710308 +0000 +++ 0041-pcapng-handle-failure-of-link-status-query.patch 2022-03-08 13:55:28.512315207 +0000 @@ -1 +1 @@ -From 442878db2e35ab276a1cd78cd836008e15eccd8b Mon Sep 17 00:00:00 2001 +From 23237c380ec2bff9ffdd5b657a983020cb7efb5f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 442878db2e35ab276a1cd78cd836008e15eccd8b ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 5ae96a5bc9..90b2f5bc69 100644 +index 03edabe73e..9db058fe42 100644 @@ -22 +23 @@ -@@ -177,6 +177,6 @@ pcapng_add_interface(rte_pcapng_t *self, uint16_t port) +@@ -178,6 +178,6 @@ pcapng_add_interface(rte_pcapng_t *self, uint16_t port)