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 3077DA00C2 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 29BBC4068B; 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 7A790406A2 for ; Tue, 8 Mar 2022 15:16:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748991; 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=0SC24IJoNo6cmwg8aRpQ3xa2WgkKb/5kVGeii//6suM=; b=YMwGsxRBqk9kM/zctMo++i7+ZZqG393IU+/GJrpsMorTbQYqaAhvm1kNOAlLAK56H4SZ8z vLcd9ZvAhWaoD4G76nzXfQZ5gG3aNR5rhg4TrLaKxBap5PPUeK20GvmuCmtFH0a5VW/uN3 MpWaVqyEPF8C8le7lYqZRjPRvJEFZ0Q= 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-613-MUzbJTWUN4WxZsgZSas4QQ-1; Tue, 08 Mar 2022 09:16:28 -0500 X-MC-Unique: MUzbJTWUN4WxZsgZSas4QQ-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 006BD801DDC; Tue, 8 Mar 2022 14:16:27 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7A04865A4; Tue, 8 Mar 2022 14:16:25 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Konstantin Ananyev , dpdk stable Subject: patch 'test/bpf: skip dump if conversion fails' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:57 +0000 Message-Id: <20220308141500.286915-42-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/e2b0823a95ba389906b46b90979fc0f2d142b87c Thanks. Kevin --- >From e2b0823a95ba389906b46b90979fc0f2d142b87c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 10 Feb 2022 15:09:05 -0800 Subject: [PATCH] test/bpf: skip dump if conversion fails [ upstream commit 78e7b29ff10c234b44f20fe7d031d60748920c2d ] If conversion of cBPF to eBPF fails (in rte_bpf_convert) then the test should not try and print the result. Coverity issue: 373661 Fixes: 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF") Signed-off-by: Stephen Hemminger Acked-by: Konstantin Ananyev --- app/test/test_bpf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c index 2d755a872f..c422fedf1f 100644 --- a/app/test/test_bpf.c +++ b/app/test/test_bpf.c @@ -3260,6 +3260,8 @@ test_bpf_dump(struct bpf_program *cbf, const struct rte_bpf_prm *prm) bpf_dump(cbf, 1); - printf("\neBPF program (%u insns)\n", prm->nb_ins); - rte_bpf_dump(stdout, prm->ins, prm->nb_ins); + if (prm != NULL) { + printf("\neBPF program (%u insns)\n", prm->nb_ins); + rte_bpf_dump(stdout, prm->ins, prm->nb_ins); + } } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:29.406818767 +0000 +++ 0042-test-bpf-skip-dump-if-conversion-fails.patch 2022-03-08 13:55:28.514315213 +0000 @@ -1 +1 @@ -From 78e7b29ff10c234b44f20fe7d031d60748920c2d Mon Sep 17 00:00:00 2001 +From e2b0823a95ba389906b46b90979fc0f2d142b87c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 78e7b29ff10c234b44f20fe7d031d60748920c2d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index d1e10adab5..805cce6406 100644 +index 2d755a872f..c422fedf1f 100644 @@ -23 +24 @@ -@@ -3274,6 +3274,8 @@ test_bpf_dump(struct bpf_program *cbf, const struct rte_bpf_prm *prm) +@@ -3260,6 +3260,8 @@ test_bpf_dump(struct bpf_program *cbf, const struct rte_bpf_prm *prm)