From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f175.google.com (mail-wr0-f175.google.com [209.85.128.175]) by dpdk.org (Postfix) with ESMTP id 80FF9FB78 for ; Thu, 30 Mar 2017 14:45:58 +0200 (CEST) Received: by mail-wr0-f175.google.com with SMTP id l43so60344943wre.1 for ; Thu, 30 Mar 2017 05:45:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=M1DiPEttPw9OM6eVQubzYInySvCpLZnewZb9fLzQcxw=; b=AscTO3pP7L3Z1UmUL30LfyDDHAiWNuWywNglYF25SMb6CYV36YfaxnRBuSD9m7R71u g5Ez25P5ojkmZUC1aTmxKsWXprKTgu7QtUnaChlFjdZDc42NhtFd//U8E+A5TI2Sti6+ 4L6N1LB4vNKT8IiwJ69HcThSigjsI3JfrTDONHFU9JxSmQuP1bIUKBUMrJWTl6LVD8j5 GNeVyy1tXrsEofPEQSHNG8f4ndwFf9Z0iwwViLkYaC6zNBvSdfq66J7N+rsu2IuyC/1y DKla5pkQvYiGGyeiEKwIuKhCDmX4zzyr+RKf5nZwXLTTR8So0c4+SGBnPLzWd0bZkhgU DuYg== 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; bh=M1DiPEttPw9OM6eVQubzYInySvCpLZnewZb9fLzQcxw=; b=qzxkq9z+SdfEbn9k6YUWgNh8A8SN1uyg9fViABJMEADS7kq5zMgyZIo48N841fFjO+ BrPW68Onyp7WYs8WYR9gdeTRx/TGsZeLpRXCZe+XsdiRKpQkFNTZJ8QQ4/6PSPWP8C3K kfvMAvJTUR70XsUL4yoG+ndxW+DDBQzxsWn3YnmRJ/KrxdHCMm9kOwAkV9MtzeLtpdbw puNvVZ92C8oMwY2kfstcaTOaaGMIfbPtGUUfK9jE0GHRSSHfwb1yQE3Dpg/10p83V7oX K5FvJO8dyTRTwMPEmEbHBeX83lQ0TW9R4njwEVeDooTN8FVCM9N0OPYNNE5DEk3A9woz 4wKQ== X-Gm-Message-State: AFeK/H2meYVc+ZtHwETnB3j9odlqdpFK5l2v18V7tFgJE5gs7ZFWTQcmhkgmNDRrPMWHuJSV X-Received: by 10.223.139.5 with SMTP id n5mr5639498wra.200.1490877958115; Thu, 30 Mar 2017 05:45:58 -0700 (PDT) Received: from ping.vm.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id t85sm3124632wmt.23.2017.03.30.05.45.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Mar 2017 05:45:57 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Adrien Mazarguil , stable@dpdk.org Date: Thu, 30 Mar 2017 14:45:37 +0200 Message-Id: <8c418fadb50791eecab5f3613b3a7c4920158875.1490877879.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 Subject: [dpdk-stable] [PATCH] net/mlx5: fix mark id retrieval 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, 30 Mar 2017 12:45:58 -0000 Mark ID in the completion queue entry is 24 bits, the remaining 8 bits are reserved and may be nonzero. Do not take them into account when looking for marked packets. CC: stable@dpdk.org Fixes: ea3bc3b1df94 ("net/mlx5: support mark flow action") Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_prm.h | 7 +++++++ drivers/net/mlx5/mlx5_rxtx.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_prm.h b/drivers/net/mlx5/mlx5_prm.h index 155bdba..608072f 100644 --- a/drivers/net/mlx5/mlx5_prm.h +++ b/drivers/net/mlx5/mlx5_prm.h @@ -138,6 +138,13 @@ /* Inner L4 checksum offload (Tunneled packets only). */ #define MLX5_ETH_WQE_L4_INNER_CSUM (1u << 5) +/* Is flow mark valid. */ +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN +#define MLX5_FLOW_MARK_IS_VALID(val) ((val) & 0xffffff00) +#else +#define MLX5_FLOW_MARK_IS_VALID(val) ((val) & 0xffffff) +#endif + /* INVALID is used by packets matching no flow rules. */ #define MLX5_FLOW_MARK_INVALID 0 diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index a1dd84a..1c5311c 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -1953,8 +1953,8 @@ mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) pkt->hash.rss = rss_hash_res; pkt->ol_flags = PKT_RX_RSS_HASH; } - if (rxq->mark && (cqe->sop_drop_qpn != - htonl(MLX5_FLOW_MARK_INVALID))) { + if (rxq->mark && + MLX5_FLOW_MARK_IS_VALID(cqe->sop_drop_qpn)) { pkt->ol_flags |= PKT_RX_FDIR; if (cqe->sop_drop_qpn != htonl(MLX5_FLOW_MARK_DEFAULT)) { -- 2.1.4