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 B5C61A057F for ; Tue, 28 Jun 2022 17:20:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B02D240042; Tue, 28 Jun 2022 17:20:01 +0200 (CEST) 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 6D9C042825 for ; Tue, 28 Jun 2022 17:19:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656429598; 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=SWnoFtCheP8t32u+xs1drYskzJ2Irerm30ZO+dpeQxA=; b=IpPSQJMb4rL9JSdgkj8GFYtI5PxrS/YOk6/gseftR8nysG+at+tyzbo79VwMhD3APmRkQO J1BtE4l4knJSpZVoHFC0equmb3iq1DXM3QHO9r068Q0Lv6FzLfQoj041gp9Jfz4ekwvEpa w2pSIxp73yc2xjmgaC0pWVqErkzSAWQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-632-BBsL8vQ4Ptazr1rXJHG85Q-1; Tue, 28 Jun 2022 11:19:56 -0400 X-MC-Unique: BBsL8vQ4Ptazr1rXJHG85Q-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4B66683395C; Tue, 28 Jun 2022 15:19:56 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6396E1415108; Tue, 28 Jun 2022 15:19:55 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Viacheslav Ovsiienko , Andrew Rybchenko , dpdk stable Subject: patch 'app/testpmd: fix flex parser destroy command' has been queued to stable release 21.11.2 Date: Tue, 28 Jun 2022 16:19:22 +0100 Message-Id: <20220628151938.2278711-10-ktraynor@redhat.com> In-Reply-To: <20220628151938.2278711-1-ktraynor@redhat.com> References: <20220628151938.2278711-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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-default=true 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/30/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/95b87a53149da82c97849606b4d2ac2c8ae38ff3 Thanks. Kevin --- >From 95b87a53149da82c97849606b4d2ac2c8ae38ff3 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Thu, 16 Jun 2022 12:15:35 +0300 Subject: [PATCH] app/testpmd: fix flex parser destroy command [ upstream commit 8bc3c062b2a4b39d5fde5f7364f857e2cd96dc1c ] Separate flex item destruction function implementation. Setups with installed JSON development library can use any value in range [0, FLEX_MAX_PARSERS_NUM - 1] as input flex item ID. In setups without JSON development library flex item destruction function is resolved to empty stub. Fixes: 2d3d84013508 ("app/testpmd: fix flex item flush") Signed-off-by: Gregory Etelson Reviewed-by: Viacheslav Ovsiienko Reviewed-by: Andrew Rybchenko --- app/test-pmd/cmd_flex_item.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/app/test-pmd/cmd_flex_item.c b/app/test-pmd/cmd_flex_item.c index 1e8dc38594..3e54724237 100644 --- a/app/test-pmd/cmd_flex_item.c +++ b/app/test-pmd/cmd_flex_item.c @@ -21,4 +21,6 @@ struct flex_item *flex_items[RTE_MAX_ETHPORTS][FLEX_MAX_PARSERS_NUM]; struct flex_pattern flex_patterns[FLEX_MAX_PATTERNS_NUM]; +#ifdef RTE_HAS_JANSSON + static struct flex_item * flex_parser_fetch(uint16_t port_id, uint16_t flex_id) @@ -35,5 +37,4 @@ flex_parser_fetch(uint16_t port_id, uint16_t flex_id) } -#ifdef RTE_HAS_JANSSON static __rte_always_inline bool match_strkey(const char *key, const char *pattern) @@ -370,13 +371,4 @@ out: } -#else /* RTE_HAS_JANSSON */ -void flex_item_create(__rte_unused portid_t port_id, - __rte_unused uint16_t flex_id, - __rte_unused const char *filename) -{ - printf("cannot create flex item - no JSON library configured\n"); -} -#endif /* RTE_HAS_JANSSON */ - void flex_item_destroy(portid_t port_id, uint16_t flex_id) @@ -385,6 +377,4 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id) struct rte_flow_error error; struct flex_item *fp = flex_parser_fetch(port_id, flex_id); - if (!flex_id) - return; if (fp == FLEX_PARSER_ERR) { printf("Bad parameters: port_id=%u flex_id=%u\n", @@ -407,4 +397,20 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id) } +#else /* RTE_HAS_JANSSON */ +void flex_item_create(__rte_unused portid_t port_id, + __rte_unused uint16_t flex_id, + __rte_unused const char *filename) +{ + printf("cannot create flex item - no JSON library configured\n"); +} + +void +flex_item_destroy(__rte_unused portid_t port_id, __rte_unused uint16_t flex_id) +{ + +} + +#endif /* RTE_HAS_JANSSON */ + void port_flex_item_flush(portid_t port_id) -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-28 16:18:04.273338145 +0100 +++ 0010-app-testpmd-fix-flex-parser-destroy-command.patch 2022-06-28 16:18:04.011387176 +0100 @@ -1 +1 @@ -From 8bc3c062b2a4b39d5fde5f7364f857e2cd96dc1c Mon Sep 17 00:00:00 2001 +From 95b87a53149da82c97849606b4d2ac2c8ae38ff3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8bc3c062b2a4b39d5fde5f7364f857e2cd96dc1c ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 78a89c0f8a..63593fd456 100644 +index 1e8dc38594..3e54724237 100644 @@ -40 +41 @@ -@@ -369,13 +370,4 @@ out: +@@ -370,13 +371,4 @@ out: @@ -54 +55 @@ -@@ -384,6 +376,4 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id) +@@ -385,6 +377,4 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id) @@ -61 +62 @@ -@@ -406,4 +396,20 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id) +@@ -407,4 +397,20 @@ flex_item_destroy(portid_t port_id, uint16_t flex_id)