From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id 75FB61DBB for ; Mon, 30 Apr 2018 16:54:37 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id v15-v6so8315232wrm.10 for ; Mon, 30 Apr 2018 07:54:37 -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; bh=vHp8X+boXe68LxbIGRbxtyI3mLS6SGZaoqXM+oLoFGs=; b=lBM00gRYqerhAUMUqpYqugG2R+f3z3VCMIYYC5j9siw3YUHDBAhn+puBiVcZdsoqLl kumPLfbVweJsWzHIN2DZoBYzfaDJuRe9qgoEuDkcUo9sJ1fPHuBJ6xuiCFtmi4VF2p0a MlYRXvvG0Brn1mjz9BT4ayQqXT0mw1C9UdlU7srO2HLv3OVIA4QnFIqIQj4uHBdY6LxZ R55ljREjOhdUbyVMcH73kTHXAMVP7d1SEHu5SM/BkM/FdrOkodf0I6zfUVw6gAhrDHJM EEJXg+4nZMUKDSA6dQiV9R1JZ2m9nZIT7EdHahaT0kQrucXUTzm4+Yv9UG2J9hs0Hf8a dP8Q== 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; bh=vHp8X+boXe68LxbIGRbxtyI3mLS6SGZaoqXM+oLoFGs=; b=PhjkZjQA0gy3ewB+XTutOMYU28ONpCEU2QB5i1cJROAHNz4+/Nth1OHoOG+eNmqdnP Axe9n2cJMjYh1gM/4DbUTcq8WvLw3dE+sTRZ3Y6vEiklpHzJjW3hgY8EDdSfczibYgkB NWgUl9Dm+SkaTG0C34phrJg7J1inMskmPsgy1e1xeSk2EnmOkzUFjhaBonXF9WsfREqg FyyUItmK3kJAnQ9vXw3wUa+8NarYLePfeifRn1QQstmUY49lCZRM4LRXuQ8+cLqYU1qp 00V4zg7sR9MQ/Ati2wEq5wtmlMM5Z/jZ/C6TYTCK9niN5zYSQ3Zl9eZeg1AxOqC2WDpP kMUg== X-Gm-Message-State: ALQs6tCwXrfa4S9346YPAH37ZhYDcDfYFPL9ZMTDCaaAG9FqDUg7h+vY DWZn0dROaiLc1VgIZPwqdbU= X-Google-Smtp-Source: AB8JxZoEvS6XYfqIpmu+1tDTuW9eSAwqyBMa7S53ssd0Xa2CeJp0JyGAlWJOWsut9euItLxekjmIrg== X-Received: by 2002:adf:e4cc:: with SMTP id v12-v6mr9666793wrm.243.1525100077172; Mon, 30 Apr 2018 07:54:37 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id k79sm9762046wmg.39.2018.04.30.07.54.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Apr 2018 07:54:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Adrien Mazarguil Cc: Nelio Laranjeiro , Ferruh Yigit , dpdk stable Date: Mon, 30 Apr 2018 15:53:40 +0100 Message-Id: <20180430145402.23057-21-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180430145402.23057-1-luca.boccassi@gmail.com> References: <20180430144223.18657-85-luca.boccassi@gmail.com> <20180430145402.23057-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'app/testpmd: fix lack of flow action configuration' has been queued to stable release 18.02.2 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: , X-List-Received-Date: Mon, 30 Apr 2018 14:54:37 -0000 Hi, FYI, your patch has been queued to stable release 18.02.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 05/02/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 1038cd07e6234f3db2b5acc2be0f67447806061c Mon Sep 17 00:00:00 2001 From: Adrien Mazarguil Date: Thu, 19 Apr 2018 12:07:35 +0200 Subject: [PATCH] app/testpmd: fix lack of flow action configuration [ upstream commit e153717a2614858768eb9a3ed63f7d665ab8864b ] Configuration structure is not optional with flow rule actions that expect one; this pointer is not supposed to be NULL and PMDs should not have to verify it. Like pattern item spec/last/mask fields, it is currently set when at least one configuration parameter is provided on the command line. This patch sets it as soon as an action is created instead. Fixes: 7a91969ad35e ("app/testpmd: add various actions to flow command") Signed-off-by: Adrien Mazarguil Acked-by: Nelio Laranjeiro Acked-by: Ferruh Yigit --- app/test-pmd/cmdline_flow.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 9cac8e9bf..c2cf415ef 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -1909,6 +1909,7 @@ parse_vc(struct context *ctx, const struct token *token, return -1; *action = (struct rte_flow_action){ .type = priv->type, + .conf = data_size ? data : NULL, }; ++out->args.vc.actions_n; ctx->object = action; @@ -1989,7 +1990,6 @@ parse_vc_conf(struct context *ctx, const struct token *token, void *buf, unsigned int size) { struct buffer *out = buf; - struct rte_flow_action *action; (void)size; /* Token name must match. */ @@ -1998,14 +1998,9 @@ parse_vc_conf(struct context *ctx, const struct token *token, /* Nothing else to do if there is no buffer. */ if (!out) return len; - if (!out->args.vc.actions_n) - return -1; - action = &out->args.vc.actions[out->args.vc.actions_n - 1]; /* Point to selected object. */ ctx->object = out->args.vc.data; ctx->objmask = NULL; - /* Update configuration pointer. */ - action->conf = ctx->object; return len; } -- 2.14.2