From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id BF4931DA4 for ; Mon, 30 Apr 2018 16:55:06 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id f8so4171006wmc.4 for ; Mon, 30 Apr 2018 07:55:06 -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=ENyUWH6Vj/JXriE/NXk4WXSwOFGH4utYw3TLLRQkurw=; b=aXKRbD9ZY6WlSki7D1hhvhQh6P+9CabDT/QGlT6ba+ixxx6s93IYzZOl7WRMu1CAAG MtGc5zO1oU5xJ+FqJypGA+DBbHmz0/NRvPbVBB10SyJTo/PNA6w5c45rNUb31iaOSode MkkJ4tB7n6SAeSYl2XEUZJV1FXqb0+NKheUFfUjDHoc+w8w818PcnMpJr5Jqjp2kN6Dj IWjIhcvoq04VMlOPZVQ8qo0XqIiMeOUVcrP5vBh+fPhnxHBhNOKLo2RRju/Xw7myXnq2 r9Q4Z8BFRDLVuE0lX1TFTagnFDRjwxfKupO8o0cvDiQtlbwcqLyzjvlfjs+OSWldDosU LOoQ== 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=ENyUWH6Vj/JXriE/NXk4WXSwOFGH4utYw3TLLRQkurw=; b=V9izm+dneOqLvIYM+T6FBBxICwF2jlkh2fizRWPTRlibVJgpnhEtzNtXRk15mpATi/ bfGM0bmo5qzGpq5HF6sk+pzh3SSPmPP/21f8aR/KYPeP/VKWKBrKPDiJCOWpvxmKGH4Q QkQ6M54GjNJyAB+Vuy+PA9+lMzEfoVqU84NPmr/i9hdrH5JL5Q+Yry1SN2UxEKZXHoIK 3rdzEu42n08AK/5UKVCCCiJ1WD+fIGUUnmWa4vQeC71euB0YJ8mvlS7t0JrQd8sYw2bF fx1VgK4Lxg+faeM2OKiD2RJXrB3g3N0b9vOOOpjR184ae35R9F0J13uZ11LJnLS+FceO gpbg== X-Gm-Message-State: ALQs6tAW3/cyMJqMVGHe0o1r05XuSHD6KE2lNVdnHzYL+qgm4v3U+m9P /oK9IUH8cmNo8OGSDmEU9Kh/gexEJY8= X-Google-Smtp-Source: AB8JxZo6vX7qirMO8HXHiALh0a4Siswg3guIKBpoJt+RD/r7/ksTB1bFH3ihCdNlJkpI+dRSgta7KA== X-Received: by 10.28.169.6 with SMTP id s6mr7165145wme.116.1525100106471; Mon, 30 Apr 2018 07:55:06 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id v75-v6sm13908152wrc.65.2018.04.30.07.55.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Apr 2018 07:55:05 -0700 (PDT) From: luca.boccassi@gmail.com To: Andrew Rybchenko Cc: Andy Moreton , Roman Zhukov , dpdk stable Date: Mon, 30 Apr 2018 15:53:59 +0100 Message-Id: <20180430145402.23057-40-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 'net/sfc: ignore spec bits not covered by mask' 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:55:06 -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 7598c6bf9d84398a13a44cf6095e6bdbd01cd7b7 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Wed, 25 Apr 2018 18:18:34 +0100 Subject: [PATCH] net/sfc: ignore spec bits not covered by mask [ upstream commit c43e0f690413fc7233b735e641f22e8eb47c50c0 ] mask is a simple bit-mask applied before interpreting the contents of spec and last. Fixes: a9825ccf5bb8 ("net/sfc: support flow API filters") Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton Reviewed-by: Roman Zhukov --- drivers/net/sfc/sfc_flow.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c index 93cdf8f4c..58adcbca3 100644 --- a/drivers/net/sfc/sfc_flow.c +++ b/drivers/net/sfc/sfc_flow.c @@ -85,7 +85,6 @@ sfc_flow_parse_init(const struct rte_flow_item *item, const uint8_t *spec; const uint8_t *mask; const uint8_t *last; - uint8_t match; uint8_t supp; unsigned int i; @@ -146,12 +145,11 @@ sfc_flow_parse_init(const struct rte_flow_item *item, return -rte_errno; } - /* Check that mask and spec not asks for more match than supp_mask */ + /* Check that mask does not ask for more match than supp_mask */ for (i = 0; i < size; i++) { - match = spec[i] | mask[i]; supp = ((const uint8_t *)supp_mask)[i]; - if ((match | supp) != supp) { + if (~supp & mask[i]) { rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, item, "Item's field is not supported"); -- 2.14.2