From patchwork Tue Mar 14 11:15:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yishai Hadas X-Patchwork-Id: 9623049 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D719260492 for ; Tue, 14 Mar 2017 11:16:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCD1D2838E for ; Tue, 14 Mar 2017 11:16:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0C1B28532; Tue, 14 Mar 2017 11:16:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A8592838E for ; Tue, 14 Mar 2017 11:16:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750997AbdCNLQ0 (ORCPT ); Tue, 14 Mar 2017 07:16:26 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:49004 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750960AbdCNLQX (ORCPT ); Tue, 14 Mar 2017 07:16:23 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from yishaih@mellanox.com) with ESMTPS (AES256-SHA encrypted); 14 Mar 2017 13:16:16 +0200 Received: from vnc17.mtl.labs.mlnx (vnc17.mtl.labs.mlnx [10.7.2.17]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v2EBGGOn014211; Tue, 14 Mar 2017 13:16:16 +0200 Received: from vnc17.mtl.labs.mlnx (vnc17.mtl.labs.mlnx [127.0.0.1]) by vnc17.mtl.labs.mlnx (8.13.8/8.13.8) with ESMTP id v2EBGGcg029154; Tue, 14 Mar 2017 13:16:16 +0200 Received: (from yishaih@localhost) by vnc17.mtl.labs.mlnx (8.13.8/8.13.8/Submit) id v2EBGGA8029153; Tue, 14 Mar 2017 13:16:16 +0200 From: Yishai Hadas To: dledford@redhat.com Cc: linux-rdma@vger.kernel.org, yishaih@mellanox.com, noaos@mellanox.com, majd@mellanox.com Subject: [PATCH rdma-core 5/7] mlx5: Add read_cvlan support Date: Tue, 14 Mar 2017 13:15:41 +0200 Message-Id: <1489490143-29018-6-git-send-email-yishaih@mellanox.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1489490143-29018-1-git-send-email-yishaih@mellanox.com> References: <1489490143-29018-1-git-send-email-yishaih@mellanox.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Noa Osherovich When a WQ or a QP is created with cvlan stripping option, the cvlan is stripped from the packet by the hardware and included in the work completion. Add a function to allow reading the cvlan from the work completion. Signed-off-by: Noa Osherovich Reviewed-by: Maor Gottlieb Reviewed-by: Yishai Hadas --- providers/mlx5/cq.c | 9 +++++++++ providers/mlx5/verbs.c | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/providers/mlx5/cq.c b/providers/mlx5/cq.c index 4ecd482..85d0c33 100644 --- a/providers/mlx5/cq.c +++ b/providers/mlx5/cq.c @@ -1189,6 +1189,13 @@ static inline uint64_t mlx5_cq_read_wc_completion_ts(struct ibv_cq_ex *ibcq) return be64toh(cq->cqe64->timestamp); } +static inline uint16_t mlx5_cq_read_wc_cvlan(struct ibv_cq_ex *ibcq) +{ + struct mlx5_cq *cq = to_mcq(ibv_cq_ex_to_cq(ibcq)); + + return be16toh(cq->cqe64->vlan_info); +} + #define BIT(i) (1UL << (i)) #define SINGLE_THREADED BIT(0) @@ -1261,6 +1268,8 @@ void mlx5_cq_fill_pfns(struct mlx5_cq *cq, const struct ibv_cq_init_attr_ex *cq_ cq->ibv_cq.read_dlid_path_bits = mlx5_cq_read_wc_dlid_path_bits; if (cq_attr->wc_flags & IBV_WC_EX_WITH_COMPLETION_TIMESTAMP) cq->ibv_cq.read_completion_ts = mlx5_cq_read_wc_completion_ts; + if (cq_attr->wc_flags & IBV_WC_EX_WITH_CVLAN) + cq->ibv_cq.read_cvlan = mlx5_cq_read_wc_cvlan; } int mlx5_arm_cq(struct ibv_cq *ibvcq, int solicited) diff --git a/providers/mlx5/verbs.c b/providers/mlx5/verbs.c index 4d8f26c..67f9748 100644 --- a/providers/mlx5/verbs.c +++ b/providers/mlx5/verbs.c @@ -327,7 +327,8 @@ static int qp_sig_enabled(void) enum { CREATE_CQ_SUPPORTED_WC_FLAGS = IBV_WC_STANDARD_FLAGS | - IBV_WC_EX_WITH_COMPLETION_TIMESTAMP + IBV_WC_EX_WITH_COMPLETION_TIMESTAMP | + IBV_WC_EX_WITH_CVLAN }; enum {