From patchwork Wed Mar 16 09:08:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenpeng Liang X-Patchwork-Id: 12782463 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 174C5C433EF for ; Wed, 16 Mar 2022 09:09:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237421AbiCPJKM (ORCPT ); Wed, 16 Mar 2022 05:10:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232911AbiCPJKL (ORCPT ); Wed, 16 Mar 2022 05:10:11 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42AB65BD2D for ; Wed, 16 Mar 2022 02:08:57 -0700 (PDT) Received: from dggpeml500023.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4KJPTT40NXz1GCNJ; Wed, 16 Mar 2022 17:03:57 +0800 (CST) Received: from dggpeml500017.china.huawei.com (7.185.36.243) by dggpeml500023.china.huawei.com (7.185.36.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Wed, 16 Mar 2022 17:08:55 +0800 Received: from localhost.localdomain (10.69.192.56) by dggpeml500017.china.huawei.com (7.185.36.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Wed, 16 Mar 2022 17:08:55 +0800 From: Wenpeng Liang To: , CC: , , Subject: [RFC for-next] RDMA/hns: Add NOP operation for sending WR Date: Wed, 16 Mar 2022 17:08:35 +0800 Message-ID: <20220316090835.54369-1-liangwenpeng@huawei.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500017.china.huawei.com (7.185.36.243) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Yangyang Li The NOP operation is a no-op, mainly used in scenarios where SQWQE requires page alignment or WQE size alignment. Each NOP WR consumes one SQWQE, but the hardware does not operate and directly generates a CQE. The IB specification does not specify this type of WR. Signed-off-by: Yangyang Li Signed-off-by: Wenpeng Liang --- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 9 +++++++++ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 9 +++++++++ 2 files changed, 18 insertions(+) -- 2.33.0 diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index 06eb4f00428c..05b6008a7393 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -73,6 +73,9 @@ static inline void set_data_seg_v2(struct hns_roce_v2_wqe_data_seg *dseg, #define HR_OPC_MAP(ib_key, hr_key) \ [IB_WR_ ## ib_key] = 1 + HNS_ROCE_V2_WQE_OP_ ## hr_key +#define HR_PRIV_OPC_MAP(hr_key) \ + [HNS_ROCE_WR_ ## hr_key] = 1 + HNS_ROCE_V2_WQE_OP_ ## hr_key + static const u32 hns_roce_op_code[] = { HR_OPC_MAP(RDMA_WRITE, RDMA_WRITE), HR_OPC_MAP(RDMA_WRITE_WITH_IMM, RDMA_WRITE_WITH_IMM), @@ -86,6 +89,7 @@ static const u32 hns_roce_op_code[] = { HR_OPC_MAP(MASKED_ATOMIC_CMP_AND_SWP, ATOM_MSK_CMP_AND_SWAP), HR_OPC_MAP(MASKED_ATOMIC_FETCH_AND_ADD, ATOM_MSK_FETCH_AND_ADD), HR_OPC_MAP(REG_MR, FAST_REG_PMR), + HR_PRIV_OPC_MAP(NOP), }; static u32 to_hr_opcode(u32 ib_opcode) @@ -540,6 +544,7 @@ static int set_rc_opcode(struct hns_roce_dev *hr_dev, break; case IB_WR_SEND: case IB_WR_SEND_WITH_IMM: + case HNS_ROCE_WR_NOP: break; case IB_WR_ATOMIC_CMP_AND_SWP: case IB_WR_ATOMIC_FETCH_AND_ADD: @@ -3572,6 +3577,9 @@ static int get_cur_qp(struct hns_roce_cq *hr_cq, struct hns_roce_v2_cqe *cqe, #define HR_WC_OP_MAP(hr_key, ib_key) \ [HNS_ROCE_V2_WQE_OP_ ## hr_key] = 1 + IB_WC_ ## ib_key +#define HR_PRIV_WC_OP_MAP(hr_key) \ + [HNS_ROCE_V2_WQE_OP_ ## hr_key] = 1 + HNS_ROCE_WC_ ## hr_key + static const u32 wc_send_op_map[] = { HR_WC_OP_MAP(SEND, SEND), HR_WC_OP_MAP(SEND_WITH_INV, SEND), @@ -3586,6 +3594,7 @@ static const u32 wc_send_op_map[] = { HR_WC_OP_MAP(ATOM_MSK_FETCH_AND_ADD, MASKED_FETCH_ADD), HR_WC_OP_MAP(FAST_REG_PMR, REG_MR), HR_WC_OP_MAP(BIND_MW, REG_MR), + HR_PRIV_WC_OP_MAP(NOP), }; static int to_ib_wc_send_op(u32 hr_opcode) diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h index 12be85f0986e..5abef5c0396d 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h @@ -158,6 +158,14 @@ enum { #define GID_LEN_V2 16 +enum { + HNS_ROCE_WR_NOP = IB_WR_RESERVED4, +}; + +enum { + HNS_ROCE_WC_NOP = HNS_ROCE_WR_NOP, +}; + enum { HNS_ROCE_V2_WQE_OP_SEND = 0x0, HNS_ROCE_V2_WQE_OP_SEND_WITH_INV = 0x1, @@ -172,6 +180,7 @@ enum { HNS_ROCE_V2_WQE_OP_FAST_REG_PMR = 0xa, HNS_ROCE_V2_WQE_OP_LOCAL_INV = 0xb, HNS_ROCE_V2_WQE_OP_BIND_MW = 0xc, + HNS_ROCE_V2_WQE_OP_NOP = 0x13, HNS_ROCE_V2_WQE_OP_MASK = 0x1f, };