From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by dpdk.org (Postfix) with ESMTP id 4F8539978 for ; Mon, 21 Aug 2017 11:38:26 +0200 (CEST) Received: by mail-pg0-f49.google.com with SMTP id n4so33274781pgn.1 for ; Mon, 21 Aug 2017 02:38:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1aWPEncXyp4Cvyqm4SuHgzZTT0XD29raqRcsOYt7bFc=; b=q5TUPotoXC3foeUxmdPCf7GJWg7kjQqWNHjl9MQw2m+un0MOCVxBla13eLq/oW6uq8 qEjTkdwC/2bMljDwaanW1ssUcwkBvxgwCuroEK/Mm1gxtU8moG1iGTLR39Q3TCBV6K5E jaPwrepmlgfCG/HkGD2yFlfg/3UjbRzKW3KoRJQCyCEisUY3f2kzMgjHGjfv9f6bbpRx hK+wz3SR8t5KZcPJC3DecNfktDLCfWIQrUReTEkKSaTEhGvCfpKAFS0feQNmrnA0zg3+ V2BkoYMJpi4dYe2jv1ADfDCOtAohH4POcjfCxy7RJ2vKtKvehHHTlf8feu3kf1Z5ULQL 7bjA== 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=1aWPEncXyp4Cvyqm4SuHgzZTT0XD29raqRcsOYt7bFc=; b=D7dAw+RUzVxGonaNaMY/uTCbMbfiwmUEDSLaS396dmpnz/2WnOp+4uYwS91mrdKudB h8uEjiJ0BW0v6CZPobJ8GLeNUlOIhjjH1rHwc0ZxOX7zVfabtALae9aJ+bff7rll6FOP mtaG14033FLlU8OBs0eLx11TbV5tEfOYwYsuVCHAXs4t1iHuHe+SZQN0cr7uwvMIZVbQ rhvFiWr4C9/+UEwgwsp83B3JGE6NqWA8wS9gti4AQe9AltNmidP5S4YYaFjZyvvDsm+a NaTEj6dUNjKYRPghT2OgFfZdwbZ2vp8+21eMTe7BGh8KXVCgIXHva16XdCI/LyjD0s0D NLvQ== X-Gm-Message-State: AHYfb5h+kagDMxS9GsBgpmDxedwviRJOd+iUgO52wsH3VWylA9qunLRx Nb04rtPRE2mTInkPLAvCeQ== X-Received: by 10.99.113.66 with SMTP id b2mr16482655pgn.216.1503308305678; Mon, 21 Aug 2017 02:38:25 -0700 (PDT) Received: from localhost.localdomain ([45.63.61.64]) by smtp.gmail.com with ESMTPSA id 69sm23355087pfh.186.2017.08.21.02.38.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Aug 2017 02:38:24 -0700 (PDT) From: Yuanhan Liu To: Qi Zhang Cc: dpdk stable , Yuanhan Liu Date: Mon, 21 Aug 2017 17:31:15 +0800 Message-Id: <1503307878-16728-61-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503307878-16728-1-git-send-email-yliu@fridaylinux.org> References: <1503307878-16728-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/ixgbe: fix mask flag on flow rule creation' has been queued to stable release 17.05.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, 21 Aug 2017 09:38:26 -0000 Hi, FYI, your patch has been queued to stable release 17.05.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 08/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From ea84aaf2625f062b8eabed15b084822e84dda8d1 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Thu, 3 Aug 2017 05:38:09 +0800 Subject: [PATCH] net/ixgbe: fix mask flag on flow rule creation [ upstream commit d769655450ac31842b78837ddf9849a3aee707c6 ] After fail to create a flow and if this is the first flow, the mask_added flag should be reset, or it will prevent a new flow which require different mask be created, since the mask config remains impact. Fixes: 72c135a89f8 ("net/ixgbe: create consistent filter") Signed-off-by: Qi Zhang --- drivers/net/ixgbe/ixgbe_flow.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index 9aeb71e..3a5f979 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -2414,6 +2414,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev, struct ixgbe_eth_l2_tunnel_conf_ele *l2_tn_filter_ptr; struct ixgbe_fdir_rule_ele *fdir_rule_ptr; struct ixgbe_flow_mem *ixgbe_flow_mem_ptr; + uint8_t first_mask = FALSE; flow = rte_zmalloc("ixgbe_rte_flow", sizeof(struct rte_flow), 0); if (!flow) { @@ -2510,6 +2511,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev, goto out; fdir_info->mask_added = TRUE; + first_mask = TRUE; } else { /** * Only support one global mask, @@ -2540,8 +2542,15 @@ ixgbe_flow_create(struct rte_eth_dev *dev, return flow; } - if (ret) + if (ret) { + /** + * clean the mask_added flag if fail to + * program + **/ + if (first_mask) + fdir_info->mask_added = FALSE; goto out; + } } goto out; -- 2.7.4