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 36/48] RDMA/cm: Update REJ struct to use new scheme
Date: Thu, 21 Nov 2019 20:13:01 +0200 [thread overview]
Message-ID: <20191121181313.129430-37-leon@kernel.org> (raw)
In-Reply-To: <20191121181313.129430-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
Convert both message rejected and rejected info length fields.
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/infiniband/core/cm.c | 18 +++++++++---------
drivers/infiniband/core/cm_msgs.h | 21 ---------------------
2 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index a5fc328d6d23..b69611c088b8 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -1501,11 +1501,11 @@ static int cm_issue_rej(struct cm_port *port,
cm_format_mad_hdr(&rej_msg->hdr, CM_REJ_ATTR_ID, rcv_msg->hdr.tid);
rej_msg->remote_comm_id = rcv_msg->local_comm_id;
rej_msg->local_comm_id = rcv_msg->remote_comm_id;
- cm_rej_set_msg_rejected(rej_msg, msg_rejected);
+ IBA_SET(CM_REJ_MESSAGE_REJECTED, rej_msg, msg_rejected);
rej_msg->reason = cpu_to_be16(reason);
if (ari && ari_length) {
- cm_rej_set_reject_info_len(rej_msg, ari_length);
+ IBA_SET(CM_REJ_REJECTED_INFO_LENGTH, rej_msg, ari_length);
memcpy(rej_msg->ari, ari, ari_length);
}
@@ -1768,26 +1768,26 @@ static void cm_format_rej(struct cm_rej_msg *rej_msg,
switch(cm_id_priv->id.state) {
case IB_CM_REQ_RCVD:
rej_msg->local_comm_id = 0;
- cm_rej_set_msg_rejected(rej_msg, CM_MSG_RESPONSE_REQ);
+ IBA_SET(CM_REJ_MESSAGE_REJECTED, rej_msg, CM_MSG_RESPONSE_REQ);
break;
case IB_CM_MRA_REQ_SENT:
rej_msg->local_comm_id = cm_id_priv->id.local_id;
- cm_rej_set_msg_rejected(rej_msg, CM_MSG_RESPONSE_REQ);
+ IBA_SET(CM_REJ_MESSAGE_REJECTED, rej_msg, CM_MSG_RESPONSE_REQ);
break;
case IB_CM_REP_RCVD:
case IB_CM_MRA_REP_SENT:
rej_msg->local_comm_id = cm_id_priv->id.local_id;
- cm_rej_set_msg_rejected(rej_msg, CM_MSG_RESPONSE_REP);
+ IBA_SET(CM_REJ_MESSAGE_REJECTED, rej_msg, CM_MSG_RESPONSE_REP);
break;
default:
rej_msg->local_comm_id = cm_id_priv->id.local_id;
- cm_rej_set_msg_rejected(rej_msg, CM_MSG_RESPONSE_OTHER);
+ IBA_SET(CM_REJ_MESSAGE_REJECTED, rej_msg, CM_MSG_RESPONSE_OTHER);
break;
}
rej_msg->reason = cpu_to_be16(reason);
if (ari && ari_length) {
- cm_rej_set_reject_info_len(rej_msg, ari_length);
+ IBA_SET(CM_REJ_REJECTED_INFO_LENGTH, rej_msg, ari_length);
memcpy(rej_msg->ari, ari, ari_length);
}
@@ -2818,7 +2818,7 @@ static void cm_format_rej_event(struct cm_work *work)
rej_msg = (struct cm_rej_msg *)work->mad_recv_wc->recv_buf.mad;
param = &work->cm_event.param.rej_rcvd;
param->ari = rej_msg->ari;
- param->ari_length = cm_rej_get_reject_info_len(rej_msg);
+ param->ari_length = IBA_GET(CM_REJ_REJECTED_INFO_LENGTH, rej_msg);
param->reason = __be16_to_cpu(rej_msg->reason);
work->cm_event.private_data = &rej_msg->private_data;
work->cm_event.private_data_len = CM_REJ_PRIVATE_DATA_SIZE;
@@ -2849,7 +2849,7 @@ static struct cm_id_private * cm_acquire_rejected_id(struct cm_rej_msg *rej_msg)
cm_id_priv = NULL;
}
spin_unlock_irq(&cm.lock);
- } else if (cm_rej_get_msg_rejected(rej_msg) == CM_MSG_RESPONSE_REQ)
+ } else if (IBA_GET(CM_REJ_MESSAGE_REJECTED, rej_msg) == CM_MSG_RESPONSE_REQ)
cm_id_priv = cm_acquire_id(rej_msg->remote_comm_id, 0);
else
cm_id_priv = cm_acquire_id(rej_msg->remote_comm_id, remote_id);
diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h
index 601b0fd2c86c..5a76b63dde12 100644
--- a/drivers/infiniband/core/cm_msgs.h
+++ b/drivers/infiniband/core/cm_msgs.h
@@ -107,27 +107,6 @@ struct cm_rej_msg {
} __packed;
-static inline u8 cm_rej_get_msg_rejected(struct cm_rej_msg *rej_msg)
-{
- return (u8) (rej_msg->offset8 >> 6);
-}
-
-static inline void cm_rej_set_msg_rejected(struct cm_rej_msg *rej_msg, u8 msg)
-{
- rej_msg->offset8 = (u8) ((rej_msg->offset8 & 0x3F) | (msg << 6));
-}
-
-static inline u8 cm_rej_get_reject_info_len(struct cm_rej_msg *rej_msg)
-{
- return (u8) (rej_msg->offset9 >> 1);
-}
-
-static inline void cm_rej_set_reject_info_len(struct cm_rej_msg *rej_msg,
- u8 len)
-{
- rej_msg->offset9 = (u8) ((rej_msg->offset9 & 0x1) | (len << 1));
-}
-
struct cm_rep_msg {
struct ib_mad_hdr hdr;
--
2.20.1
next prev parent reply other threads:[~2019-11-21 18:15 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 ` [PATCH rdma-next v1 20/48] RDMA/cm: Simplify QP type to wire protocol translation Leon Romanovsky
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 ` Leon Romanovsky [this message]
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-37-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).