From: Leon Romanovsky <leon@kernel.org>
To: Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>
Cc: Leon Romanovsky <leonro@mellanox.com>,
RDMA mailing list <linux-rdma@vger.kernel.org>,
Bart Van Assche <bvanassche@acm.org>,
Sean Hefty <sean.hefty@intel.com>
Subject: [PATCH rdma-next v1 20/48] RDMA/cm: Simplify QP type to wire protocol translation
Date: Thu, 21 Nov 2019 20:12:45 +0200 [thread overview]
Message-ID: <20191121181313.129430-21-leon@kernel.org> (raw)
In-Reply-To: <20191121181313.129430-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
Simplify QP type to/from wire protocol logic and move it to be near
implementation and not in header file.
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/infiniband/core/cm.c | 25 +++++++++++++++++++++
drivers/infiniband/core/cm_msgs.h | 37 -------------------------------
2 files changed, 25 insertions(+), 37 deletions(-)
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 34654aba638e..f7ed4067743f 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -1247,6 +1247,20 @@ static void cm_format_mad_hdr(struct ib_mad_hdr *hdr,
hdr->tid = tid;
}
+static void cm_req_set_qp_type(struct cm_req_msg *req_msg,
+ enum ib_qp_type qp_type)
+{
+ static const u8 qp_types[IB_QPT_MAX] = {
+ [IB_QPT_UC] = 1,
+ [IB_QPT_XRC_INI] = 3,
+ };
+
+ if (qp_type == IB_QPT_XRC_INI)
+ IBA_SET(CM_REQ_EXTENDED_TRANSPORT_TYPE, req_msg, 0x1);
+
+ IBA_SET(CM_REQ_TRANSPORT_SERVICE_TYPE, req_msg, qp_types[qp_type]);
+}
+
static void cm_format_req(struct cm_req_msg *req_msg,
struct cm_id_private *cm_id_priv,
struct ib_cm_req_param *param)
@@ -1645,6 +1659,17 @@ static void cm_opa_to_ib_sgid(struct cm_work *work,
}
}
+static enum ib_qp_type cm_req_get_qp_type(struct cm_req_msg *req_msg)
+{
+ static const enum ib_qp_type qp_type[] = { IB_QPT_RC, IB_QPT_UC, 0, 0 };
+ u8 transport_type = IBA_GET(CM_REQ_TRANSPORT_SERVICE_TYPE, req_msg);
+
+ if (transport_type == 3 &&
+ (IBA_GET(CM_REQ_EXTENDED_TRANSPORT_TYPE, req_msg) == 1))
+ return IB_QPT_XRC_TGT;
+ return qp_type[transport_type];
+}
+
static void cm_format_req_event(struct cm_work *work,
struct cm_id_private *cm_id_priv,
struct ib_cm_id *listen_id)
diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h
index c348521040a6..5e6dd00c6018 100644
--- a/drivers/infiniband/core/cm_msgs.h
+++ b/drivers/infiniband/core/cm_msgs.h
@@ -70,43 +70,6 @@ struct cm_req_msg {
} __packed;
-static inline enum ib_qp_type cm_req_get_qp_type(struct cm_req_msg *req_msg)
-{
- u8 transport_type = (u8) (be32_to_cpu(req_msg->offset40) & 0x06) >> 1;
- switch(transport_type) {
- case 0: return IB_QPT_RC;
- case 1: return IB_QPT_UC;
- case 3:
- switch (req_msg->offset51 & 0x7) {
- case 1: return IB_QPT_XRC_TGT;
- default: return 0;
- }
- default: return 0;
- }
-}
-
-static inline void cm_req_set_qp_type(struct cm_req_msg *req_msg,
- enum ib_qp_type qp_type)
-{
- switch(qp_type) {
- case IB_QPT_UC:
- req_msg->offset40 = cpu_to_be32((be32_to_cpu(
- req_msg->offset40) &
- 0xFFFFFFF9) | 0x2);
- break;
- case IB_QPT_XRC_INI:
- req_msg->offset40 = cpu_to_be32((be32_to_cpu(
- req_msg->offset40) &
- 0xFFFFFFF9) | 0x6);
- req_msg->offset51 = (req_msg->offset51 & 0xF8) | 1;
- break;
- default:
- req_msg->offset40 = cpu_to_be32(be32_to_cpu(
- req_msg->offset40) &
- 0xFFFFFFF9);
- }
-}
-
static inline u8 cm_req_get_flow_ctrl(struct cm_req_msg *req_msg)
{
return be32_to_cpu(req_msg->offset40) & 0x1;
--
2.20.1
next prev parent reply other threads:[~2019-11-21 18:14 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 18:12 [PATCH rdma-next v1 00/48] Organize code according to IBTA layout Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 01/48] RDMA/cm: Provide private data size to CM users Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 02/48] RDMA/srpt: Use private_data_len instead of hardcoded value Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 03/48] RDMA/ucma: Mask QPN to be 24 bits according to IBTA Leon Romanovsky
2019-11-21 21:38 ` Ira Weiny
2019-11-22 6:53 ` Leon Romanovsky
2019-11-22 18:16 ` Weiny, Ira
2019-11-21 18:12 ` [PATCH rdma-next v1 04/48] RDMA/cm: Add SET/GET implementations to hide IBA wire format Leon Romanovsky
2019-11-21 20:38 ` Jason Gunthorpe
2019-11-22 6:55 ` Leon Romanovsky
2019-11-25 14:40 ` Jason Gunthorpe
2019-11-25 18:22 ` Leon Romanovsky
2019-11-22 16:52 ` Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 05/48] RDMA/cm: Request For Communication (REQ) message definitions Leon Romanovsky
2019-12-08 22:40 ` John Hubbard
2019-12-09 8:09 ` Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 06/48] RDMA/cm: Message Receipt Acknowledgment (MRA) " Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 07/48] RDMA/cm: Reject (REJ) " Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 08/48] RDMA/cm: Reply To Request for communication (REP) definitions Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 09/48] RDMA/cm: Ready To Use (RTU) definitions Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 10/48] RDMA/cm: Request For Communication Release (DREQ) definitions Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 11/48] RDMA/cm: Reply To Request For Communication Release (DREP) definitions Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 12/48] RDMA/cm: Load Alternate Path (LAP) definitions Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 13/48] RDMA/cm: Alternate Path Response (APR) message definitions Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 14/48] RDMA/cm: Service ID Resolution Request (SIDR_REQ) definitions Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 15/48] RDMA/cm: Service ID Resolution Response (SIDR_REP) definitions Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 16/48] RDMA/cm: Convert QPN and EECN to be u32 variables Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 17/48] RDMA/cm: Convert REQ responded resources to the new scheme Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 18/48] RDMA/cm: Convert REQ initiator depth " Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 19/48] RDMA/cm: Convert REQ remote response timeout Leon Romanovsky
2019-11-21 18:12 ` Leon Romanovsky [this message]
2019-11-21 18:12 ` [PATCH rdma-next v1 21/48] RDMA/cm: Convert REQ flow control Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 22/48] RDMA/cm: Convert starting PSN to be u32 variable Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 23/48] RDMA/cm: Update REQ local response timeout Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 24/48] RDMA/cm: Convert REQ retry count to use new scheme Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 25/48] RDMA/cm: Update REQ path MTU field Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 26/48] RDMA/cm: Convert REQ RNR retry timeout counter Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 27/48] RDMA/cm: Convert REQ MAX CM retries Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 28/48] RDMA/cm: Convert REQ SRQ field Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 29/48] RDMA/cm: Convert REQ flow label field Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 30/48] RDMA/cm: Convert REQ packet rate Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 31/48] RDMA/cm: Convert REQ SL fields Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 32/48] RDMA/cm: Convert REQ subnet local fields Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 33/48] RDMA/cm: Convert REQ local ack timeout Leon Romanovsky
2019-11-21 18:12 ` [PATCH rdma-next v1 34/48] RDMA/cm: Convert MRA MRAed field Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 35/48] RDMA/cm: Convert MRA service timeout Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 36/48] RDMA/cm: Update REJ struct to use new scheme Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 37/48] RDMA/cm: Convert REP target ack delay field Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 38/48] RDMA/cm: Convert REP failover accepted field Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 39/48] RDMA/cm: Convert REP flow control field Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 40/48] RDMA/cm: Convert REP RNR retry count field Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 41/48] RDMA/cm: Convert REP SRQ field Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 42/48] RDMA/cm: Delete unused CM LAP functions Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 43/48] RDMA/cm: Convert LAP flow label field Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 44/48] RDMA/cm: Convert LAP fields Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 45/48] RDMA/cm: Delete unused CM ARP functions Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 46/48] RDMA/cm: Convert SIDR_REP to new scheme Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 47/48] RDMA/cm: Add Enhanced Connection Establishment (ECE) bits Leon Romanovsky
2019-11-21 18:13 ` [PATCH rdma-next v1 48/48] RDMA/cm: Convert private_date access Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191121181313.129430-21-leon@kernel.org \
--to=leon@kernel.org \
--cc=bvanassche@acm.org \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=leonro@mellanox.com \
--cc=linux-rdma@vger.kernel.org \
--cc=sean.hefty@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).