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 4D25BA00C2 for ; Tue, 8 Mar 2022 15:16:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 47718406B4; Tue, 8 Mar 2022 15:16:34 +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 E4D534068B for ; Tue, 8 Mar 2022 15:16:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748992; 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=Sw+ZpAvBR0EE3w5x7Y+TNpOKx/x3QmxV+mzhY5GBzFg=; b=jVI6rw9OEd3EwbWvY2hhzkFQ6L70sDvGtIDTM402PmDeWBizYBE3VpSnVgh/00TbiIiswP HP++FFGoygpLXQp9luGfXg/3N5OWHqACC7BoRQYX7TBpzYannntTK/UIJl3u9iQ86nZH3m NOTSpNVcWRbc5kPkPLmYvtIgX5JmLEQ= 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-529-J3_peWM3MfGx0m4_6A7syA-1; Tue, 08 Mar 2022 09:16:29 -0500 X-MC-Unique: J3_peWM3MfGx0m4_6A7syA-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 3FB771854E27; Tue, 8 Mar 2022 14:16:28 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67612865A7; Tue, 8 Mar 2022 14:16:27 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'app/dumpcap: check for failure to set promiscuous' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:58 +0000 Message-Id: <20220308141500.286915-43-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/8cac3f5d66cc79047967cd83148e6d569848fd9d Thanks. Kevin --- >From 8cac3f5d66cc79047967cd83148e6d569848fd9d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 10 Feb 2022 15:09:06 -0800 Subject: [PATCH] app/dumpcap: check for failure to set promiscuous [ upstream commit 499b1cbcf9d376a1130550ee61461276c5138a1b ] If the rte_eth_promiscuous_enable() fails, then log the error and continue. Coverity issue: 373662 Fixes: cbb44143be74 ("app/dumpcap: add new packet capture application") Signed-off-by: Stephen Hemminger --- app/dumpcap/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c index c5fe440302..536ec64711 100644 --- a/app/dumpcap/main.c +++ b/app/dumpcap/main.c @@ -680,6 +680,11 @@ static void enable_pdump(struct rte_ring *r, struct rte_mempool *mp) TAILQ_FOREACH(intf, &interfaces, next) { - if (promiscuous_mode) - rte_eth_promiscuous_enable(intf->port); + if (promiscuous_mode) { + ret = rte_eth_promiscuous_enable(intf->port); + if (ret != 0) + fprintf(stderr, + "port %u set promiscuous enable failed: %d\n", + intf->port, ret); + } ret = rte_pdump_enable_bpf(intf->port, RTE_PDUMP_ALL_QUEUES, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:29.427085544 +0000 +++ 0043-app-dumpcap-check-for-failure-to-set-promiscuous.patch 2022-03-08 13:55:28.514315213 +0000 @@ -1 +1 @@ -From 499b1cbcf9d376a1130550ee61461276c5138a1b Mon Sep 17 00:00:00 2001 +From 8cac3f5d66cc79047967cd83148e6d569848fd9d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 499b1cbcf9d376a1130550ee61461276c5138a1b ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org