From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id BF3FCF64 for ; Mon, 30 Apr 2018 16:08:18 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id c14-v6so8173526wrd.4 for ; Mon, 30 Apr 2018 07:08:18 -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=rpcFHfE5bxXUg9whK0yCoEuqeQGNFOkt4WU6eptUAyQ=; b=PDvl52zOCJWk03RqZxaYgiIJ0dea88bPxlRaeaUhWoPrych3XsDSzRhjmLTw/GlCzj wRyTWblkTaiyXwsZNxXimorLU0Pql0L+1htPU7R/x8LK54OgPUnXoXUo0WLIfY5rVCGj DNrW8kkp1LSYnSU9hDteiyV367MpSxsyk38nhfo0yj7JMmTbXBq7rRPyA4wWGlD3kzvZ UpnwNHU4VBDXaimiHEgrfHIPyiZCaL+KwIsUPv4si9ET1k4B+XlmaLDmYx/HsA94e9dA qIyR4UjmSiP0wkwfVz95Wr0HKhNl9GUkvPJycOKPYXEpELTHRgvcrMmtE3cWscD98I2f yhNA== 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=rpcFHfE5bxXUg9whK0yCoEuqeQGNFOkt4WU6eptUAyQ=; b=o9BaUdhyTedzC53pgRFH9dDGuiByZ5jVzg//ps5iELiSX/F+c4nQlsgws42goWtZSM qwc7wn7WIdRQrbcSNTogKILgKZMUc7bOK7xXdnLUISdDghie2KPoY3VgrcbaGsKELWBe szrkohlHI4y1PzlCoiIrzbaT0SGEM+ZbhUcrTJ89Qo4zlrZXBG5c8FHwjrfWd0WNcv3W srxDWP/nzy33TISRKzEAnZghXD/wIJYoK/ncjnGXkR6Po0IpSm0M0FAJtH7cSJJMVYJk rxOYTgq3fNLQ6DRyA4E0bZVuiL49gdR/078Wd2qKZ5Y4GkhDbeYAnPuwBkmyc6Itpf++ mmlQ== X-Gm-Message-State: ALQs6tBKD0vTqAZxq9Xw3O+k+YbW0+Ono3yWNRvOo9Ns/L0ZeZUggSUF qTgfv6Vj61MF6QCuvL78i80= X-Google-Smtp-Source: AB8JxZrwzn/zNMFrxtBZjZXa9zrJlKhS6cq+0CM11itCXOCUFZlbCOb+wlCQNLwiO2MEPjxzFb9D1Q== X-Received: by 2002:adf:af28:: with SMTP id z37-v6mr8823406wrc.72.1525097298483; Mon, 30 Apr 2018 07:08:18 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id q194sm9795271wmd.26.2018.04.30.07.08.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Apr 2018 07:08:17 -0700 (PDT) From: luca.boccassi@gmail.com To: Wei Zhao Cc: Yuan Peng , Qi Zhang , dpdk stable Date: Mon, 30 Apr 2018 15:03:50 +0100 Message-Id: <20180430140606.4615-72-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180430140606.4615-1-luca.boccassi@gmail.com> References: <20180430140606.4615-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/i40e: fix flow RSS configuration error' 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:08:18 -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 68de454de5c6375d24f80b5d4fbf5803c6ee3d9b Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Mon, 26 Mar 2018 09:11:39 +0800 Subject: [PATCH] net/i40e: fix flow RSS configuration error [ upstream commit f324bcfbdbefedcb767b5e1544f4e3f339353026 ] I40e needs a protection for rss rule flow configuration after a rule is set for a port. Fixes: ecad87d22383 ("net/i40e: move RSS to flow API") Signed-off-by: Wei Zhao Tested-by: Yuan Peng Acked-by: Qi Zhang --- drivers/net/i40e/i40e_flow.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 16c47cf73..69d1ba55e 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -4385,14 +4385,15 @@ i40e_config_rss_filter_set(struct rte_eth_dev *dev, { struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); + int ret; if (conf->queue_region_conf) { - i40e_flush_queue_region_all_conf(dev, hw, pf, 1); + ret = i40e_flush_queue_region_all_conf(dev, hw, pf, 1); conf->queue_region_conf = 0; } else { - i40e_config_rss_filter(pf, conf, 1); + ret = i40e_config_rss_filter(pf, conf, 1); } - return 0; + return ret; } static int @@ -4545,6 +4546,8 @@ i40e_flow_create(struct rte_eth_dev *dev, case RTE_ETH_FILTER_HASH: ret = i40e_config_rss_filter_set(dev, &cons_filter.rss_conf); + if (ret) + goto free_flow; flow->rule = &pf->rss_info; break; default: -- 2.14.2