From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id C2CE737B7 for ; Thu, 1 Feb 2018 10:17:15 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 528CA20BD3; Thu, 1 Feb 2018 04:17:15 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Thu, 01 Feb 2018 04:17:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:content-type:date:from:message-id:mime-version:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=BJAVna36aKYi6Wcr5 oYmleKQ/m6HeJUkAuqXYy7cd3A=; b=HZG59lGXF6AySmxIv4I2PWhFoweGuzAtX CfFYAMsR7OUWs+5fAh4GeX/DX4Btu1ByGe4tfPfeF/IN8aaqvDlvKRZXu83LAfCM zw7uWeBMLtxEACKx+7YHEDjh5UE6julOuCrVDXrYJ2TNLqlgUvx9HDfeXS7CZ2Ud 95kiBbBWuMmN5DsTmu/t0GR6q68FiND6hxFgrMlHs1qUdoy9nsxn3nioIYiq2hn8 G+kaQMbL89HJQ17aKZxXkINVBLFubTPGQGvLFiPVvIq1IdOARJLAcaVmHHloAoSN Oc59i/YBV+EQMnBDKsOCbaekRNIzDCR/kVuwrCyT5yswOimPryzPQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=BJAVna36aKYi6Wcr5oYmleKQ/m6HeJUkAuqXYy7cd3A=; b=hZVHmaEI LUMqkq5sNJf9OXNj/vvAov7xGkHx7MaVGD+CLVlXgXQPZZrnTwWMWZVvjd7gi63i 6/v2YMtUa9DTLw4d9jXswcOs0RfSmg9fqHezkconHte5EZ6UUUrxfp5oMYAjS71O R+OccYbZR6xGg9hFa9nGB0TMWr4L8OZJ8QlxI5jVqtAB3DSvRS1KGCGFkUh68gMY Wjw14KMymFR9MoZ0E7U1eroWR7bQ/iF+sEXVsQtU8vp05iD1RllHuHAq1K2p+FFZ nL9rHIAc0qYKNvqVoRWRqFCgJIwmk6CXEppx7YiVgW4SheUZbx51yN12jhV1/CjS 7xKW0NkzCgyO1g== X-ME-Sender: Received: from yliu-mob (unknown [115.150.27.200]) by mail.messagingengine.com (Postfix) with ESMTPA id 24A8F7E0FD; Thu, 1 Feb 2018 04:17:13 -0500 (EST) Date: Thu, 1 Feb 2018 17:17:10 +0800 From: Yuanhan Liu To: Shachar Beiser Cc: dpdk stable Message-ID: <20180201091710.GO29540@yliu-mob> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [dpdk-stable] patch 'net/mlx5: fix IPv6 header fields' has been queued to LTS release 17.11.1 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: Thu, 01 Feb 2018 09:17:15 -0000 FYI, this one has been reverted, for it breaks the MLX5 build: drivers/net/mlx5/mlx5_flow.c:1487:37: error: 'IPV6_HDR_FL_MASK' undeclared (first use in this function) If you think it's a must to have for 17.11.1 release, please do backport. Thanks. --yliu On Wed, Jan 24, 2018 at 11:33:39PM +0800, Yuanhan Liu wrote: > Hi, > > FYI, your patch has been queued to LTS release 17.11.1 > > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 01/26/18. So please > shout if anyone has objections. > > Thanks. > > --yliu > > --- > >From ec606da5366e96d020817dc0fb52811204662595 Mon Sep 17 00:00:00 2001 > From: Shachar Beiser > Date: Tue, 16 Jan 2018 11:17:52 +0200 > Subject: [PATCH] net/mlx5: fix IPv6 header fields > > [ upstream commit e8aafd9405b9f1da345abd2d5ff0d7aabc1ce6f3 ] > > There are parameters that are not copy from > spec to verbs structure in the vtc_label > > Fixes: 43e9d9794cde ("net/mlx5: support upstream rdma-core") > > Signed-off-by: Shachar Beiser > Acked-by: Yongseok Koh > --- > drivers/net/mlx5/mlx5_flow.c | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index 00f4bec..654fb1d 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -48,6 +48,7 @@ > #include > #include > #include > +#include > > #include "mlx5.h" > #include "mlx5_defs.h" > @@ -1467,6 +1468,8 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item, > parser->layer = HASH_RXQ_IPV6; > if (spec) { > unsigned int i; > + uint32_t vtc_flow_val; > + uint32_t vtc_flow_mask; > > if (!mask) > mask = default_mask; > @@ -1478,7 +1481,20 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item, > RTE_DIM(ipv6.mask.src_ip)); > memcpy(&ipv6.mask.dst_ip, mask->hdr.dst_addr, > RTE_DIM(ipv6.mask.dst_ip)); > - ipv6.mask.flow_label = mask->hdr.vtc_flow; > + vtc_flow_val = rte_be_to_cpu_32(spec->hdr.vtc_flow); > + vtc_flow_mask = rte_be_to_cpu_32(mask->hdr.vtc_flow); > + ipv6.val.flow_label = > + rte_cpu_to_be_32((vtc_flow_val & IPV6_HDR_FL_MASK) >> > + IPV6_HDR_FL_SHIFT); > + ipv6.val.traffic_class = (vtc_flow_val & IPV6_HDR_TC_MASK) >> > + IPV6_HDR_TC_SHIFT; > + ipv6.val.next_hdr = spec->hdr.proto; > + ipv6.val.hop_limit = spec->hdr.hop_limits; > + ipv6.mask.flow_label = > + rte_cpu_to_be_32((vtc_flow_mask & IPV6_HDR_FL_MASK) >> > + IPV6_HDR_FL_SHIFT); > + ipv6.mask.traffic_class = (vtc_flow_mask & IPV6_HDR_TC_MASK) >> > + IPV6_HDR_TC_SHIFT; > ipv6.mask.next_hdr = mask->hdr.proto; > ipv6.mask.hop_limit = mask->hdr.hop_limits; > /* Remove unwanted bits from values. */ > @@ -1487,6 +1503,7 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item, > ipv6.val.dst_ip[i] &= ipv6.mask.dst_ip[i]; > } > ipv6.val.flow_label &= ipv6.mask.flow_label; > + ipv6.val.traffic_class &= ipv6.mask.traffic_class; > ipv6.val.next_hdr &= ipv6.mask.next_hdr; > ipv6.val.hop_limit &= ipv6.mask.hop_limit; > } > -- > 2.7.4