From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B24ACA0093 for ; Tue, 19 May 2020 15:09:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9FA211D6AC; Tue, 19 May 2020 15:09:10 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 718C41D6A8 for ; Tue, 19 May 2020 15:09:09 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id i15so15789807wrx.10 for ; Tue, 19 May 2020 06:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BLC4n8apNfkOEMdcbgPtKeZvNmdEmQpn67q7zaC0n+0=; b=VDT2ocKe6I0KrSgRkyhHDeqxdn9mLZWCm/NCycXhUYsSsHGRRzT3Vceeg4O8CXrQR+ /5EsxRBiCO1AOdmit4xgbGUj9YhFNnTJT37K4SYVTbUHhcbVxlklToKULJ2Zp3pgI9d+ pK5+dT55qP8s7g1HXf4WmnD+WJLhLvBaoAerofZn1xL862R+ogNT/tOiMN9n6QJ16f4w hR8Qjs3rcjItUBAF/EYRbSJzIjIMBfZQK4uHrzZcDRaWOO75lIPe/z9/J8CbfndM8NtB 5Qk2j8LblN1iDCqHsAuO+Upm8GY8h5FvuRggOXQOmA6ITu/BX7WXeHDgnM9f70Bx6mEr TD4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BLC4n8apNfkOEMdcbgPtKeZvNmdEmQpn67q7zaC0n+0=; b=YOsRcF1f+3RdY5l6SXcoPyqHToaEjVb/n+NHmuOdtEU9PWMjr4sowBEKCT/xgOkXBX KDh6XP/Javv62uV/KCaVZcizMuBkxgW7LPcGpHmUaRA1e4pPqLe9e+binWkfvSgo9A3a uqkh3hkRcQ0MyA2QBLXFgYe9JYJ1heGsN9xkK8iAjMxeucRmYOzgXP1dPFBkpOvfVN4Z KOyHlltRUAhArkUKHuXr37NFGHPaN4gCsaWxssn214Vp4nz4yej8kf8mX+VdsDyzAy7n qOk5t3rX+A6S3orN0DIFtOfvky9N4PC1z16pmYDR3IJZgwWhz82mrlS5sQ+KHnDAK19P 4ggg== X-Gm-Message-State: AOAM532sy5z0FppJXajxmwZB6pP46tBg+xe/yCJlXSARJsRukARejs6V YSJl1iV8zQhg88L0fkAVmC2lqJybvpOl1ROl X-Google-Smtp-Source: ABdhPJwLfwprzJ0gUWSnVuXylpPPjORGSmoHguRUQ8BrVJt5pvjmT2ze45eTGjeP1R68p5SpgaC0KQ== X-Received: by 2002:a5d:6388:: with SMTP id p8mr25329779wru.369.1589893749216; Tue, 19 May 2020 06:09:09 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w9sm23218412wrc.27.2020.05.19.06.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:09:08 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiao Zhang Cc: Ori Kam , dpdk stable Date: Tue, 19 May 2020 14:03:18 +0100 Message-Id: <20200519130549.112823-63-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix PPPoE flow command' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. 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. Thanks. Luca Boccassi --- >From 175f707d92eae1f01ae0412ba22ac0e914e3f6c8 Mon Sep 17 00:00:00 2001 From: Xiao Zhang Date: Tue, 31 Mar 2020 21:29:40 +0800 Subject: [PATCH] app/testpmd: fix PPPoE flow command [ upstream commit c3ea098ae3a99fcf654432154ebc5b7a33866d89 ] The command line to create RTE flow for specific proto_id of PPPOES can not work. It was: testpmd> flow create 0 ingress pattern proto_id proto_id [TOKEN]: match PPPoE session protocol identifier testpmd> flow create 0 ingress pattern proto_id proto_id proto_id [TOKEN]: match PPPoE session protocol identifier testpmd> flow create 0 ingress pattern proto_id proto_id proto_id proto_id [TOKEN]: match PPPoE session protocol identifier The proto_id can not be set with previous implementation. This patch is to fix this issue, and change the command line to: testpmd> flow create 0 pattern pppoe_proto_id is xxxx Fixes: 226c6e60c35b ("ethdev: add PPPoE to flow API") Signed-off-by: Xiao Zhang Acked-by: Ori Kam --- app/test-pmd/cmdline_flow.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index f059978730..deced65016 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -1005,7 +1005,6 @@ static const enum index item_pppoes[] = { }; static const enum index item_pppoe_proto_id[] = { - ITEM_PPPOE_PROTO_ID, ITEM_NEXT, ZERO, }; @@ -2544,11 +2543,14 @@ static const struct token token_list[] = { session_id)), }, [ITEM_PPPOE_PROTO_ID] = { - .name = "proto_id", + .name = "pppoe_proto_id", .help = "match PPPoE session protocol identifier", .priv = PRIV_ITEM(PPPOE_PROTO_ID, sizeof(struct rte_flow_item_pppoe_proto_id)), - .next = NEXT(item_pppoe_proto_id), + .next = NEXT(item_pppoe_proto_id, NEXT_ENTRY(UNSIGNED), + item_param), + .args = ARGS(ARGS_ENTRY_HTON + (struct rte_flow_item_pppoe_proto_id, proto_id)), .call = parse_vc, }, [ITEM_HIGIG2] = { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:47.064381159 +0100 +++ 0063-app-testpmd-fix-PPPoE-flow-command.patch 2020-05-19 14:04:44.220648445 +0100 @@ -1,8 +1,10 @@ -From c3ea098ae3a99fcf654432154ebc5b7a33866d89 Mon Sep 17 00:00:00 2001 +From 175f707d92eae1f01ae0412ba22ac0e914e3f6c8 Mon Sep 17 00:00:00 2001 From: Xiao Zhang Date: Tue, 31 Mar 2020 21:29:40 +0800 Subject: [PATCH] app/testpmd: fix PPPoE flow command +[ upstream commit c3ea098ae3a99fcf654432154ebc5b7a33866d89 ] + The command line to create RTE flow for specific proto_id of PPPOES can not work. @@ -20,7 +22,6 @@ testpmd> flow create 0 pattern pppoe_proto_id is xxxx Fixes: 226c6e60c35b ("ethdev: add PPPoE to flow API") -Cc: stable@dpdk.org Signed-off-by: Xiao Zhang Acked-by: Ori Kam @@ -29,10 +30,10 @@ 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c -index 4877ac6c8a..e6ab8ff2f7 100644 +index f059978730..deced65016 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c -@@ -1037,7 +1037,6 @@ static const enum index item_pppoes[] = { +@@ -1005,7 +1005,6 @@ static const enum index item_pppoes[] = { }; static const enum index item_pppoe_proto_id[] = { @@ -40,7 +41,7 @@ ITEM_NEXT, ZERO, }; -@@ -2649,11 +2648,14 @@ static const struct token token_list[] = { +@@ -2544,11 +2543,14 @@ static const struct token token_list[] = { session_id)), }, [ITEM_PPPOE_PROTO_ID] = {