From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 7171A1B1BD for ; Wed, 24 Jan 2018 16:42:39 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 24C8522716; Wed, 24 Jan 2018 10:42:39 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Wed, 24 Jan 2018 10:42:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=JWfqDwpw0CxbFO5S2 g2Q3tKJ/E8B+E65XuN5W5eSwP8=; b=l+ogPeys/i0LPCNFokEQzUoan31QdorJj p76+Zjw4A2FQCAGBzcFhigCGZ/bt4IgTUpim9hkCbCu0MJjcOJol3+w3NX1yuoaO +O3G6kPtEt2jwly6NtVooHrqkm7yVhPraCZHKjpP75SqBVQu6Qm2vojhvKMoL/w3 AdVokTzqVGz7mi4pKjDKXLjZPiDzSjX5pvq/tsC2JYStEfUi7sifN1Pg+5M+vXK8 GtML86/MqkIeSiqy32NVaOui+tF3k9HaLmhnElWG2L96/jyJrDKf2Ni3b8OsROew LcZdCUmQK+TboWA6wpUANmfsOr0yaBGZMPdcNdA3kcIbxDSeilAUg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=JWfqDwpw0CxbFO5S2g2Q3tKJ/E8B+E65XuN5W5eSwP8=; b=eLz1wXO+ ahX8jgLa0yI5Yiqp4NPEXzcgpQA4IT6j008LcGU/9CozCBFBXYQsY4sb61dAbjmL DKv+QVJJ9P4xaDPWQDUACp/joc0oRPt979Wtnxtpx3ecOLHWcW7WRvbtEhfSrYE5 uXfwMyyg4SFWR/8C3C66qncPwZh+1oVoAuLygo9VkqHncH/3kQNymYWwI8v68g7L NynFZNwsIkBK6Z7BLWSzU9U7Ej/qJTNHNenMzK3BJCTzi8Hh/xVkwm5xEXP4XH9j CaSchgYlseqWhJB2+uV/GLVnArDw2qBxtI+8I1EQ23T+yKhD+OjE+bZvG4DmzxGO 4SPSHE8D/Iz7bw== X-ME-Sender: Received: from localhost.localdomain (unknown [115.150.27.206]) by mail.messagingengine.com (Postfix) with ESMTPA id 56E387E354; Wed, 24 Jan 2018 10:42:36 -0500 (EST) From: Yuanhan Liu To: Shachar Beiser Cc: Yongseok Koh , dpdk stable Date: Wed, 24 Jan 2018 23:33:39 +0800 Message-Id: <1516808026-25523-151-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516808026-25523-1-git-send-email-yliu@fridaylinux.org> References: <1516808026-25523-1-git-send-email-yliu@fridaylinux.org> Subject: [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: Wed, 24 Jan 2018 15:42:39 -0000 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