From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB55CCA9EBC for ; Sun, 27 Oct 2019 07:07:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B079221726 for ; Sun, 27 Oct 2019 07:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572160056; bh=J/UDlsOVS5o9Gmhnuk+5rV7Bd9xi2SK1DPs74jSY9po=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DczFMr+RqXtwMsca2EIoTF2j/uuy/QKDeR8O//QUEc1vtFhT7GQq1V+PKbFqeVRD/ JgNYcs4ILMrmWkCUKgZP5OXc+PrBZfnF8esMAgxyof6HOeHVrxhNOI9bWPk1ZoYHo9 fxBJAyQd1vJgvyBQn9EZuhwhuAfbZTweq8eaaN0k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726479AbfJ0HHg (ORCPT ); Sun, 27 Oct 2019 03:07:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:35078 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725965AbfJ0HHg (ORCPT ); Sun, 27 Oct 2019 03:07:36 -0400 Received: from localhost (unknown [77.137.89.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2426D20578; Sun, 27 Oct 2019 07:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572160054; bh=J/UDlsOVS5o9Gmhnuk+5rV7Bd9xi2SK1DPs74jSY9po=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BfqcHMOkEVntZYgzoQsGQu57VVy8BkPVP+QZEE4FdcjTu5vEX0rQjQPeMB+DUDZdE wDYJj/+tqZclhxfQyurcLKCRfPOliAJDPR0wynuY2qCY/8ANtDq/vK+D4qRViNYEUo hghmHZHjyAxuCjXaEOGwhnRE7fCR9ez8wIL29mZo= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list Subject: [PATCH rdma-next 20/43] RDMA/cm: Update REQ local response timeout Date: Sun, 27 Oct 2019 09:05:58 +0200 Message-Id: <20191027070621.11711-21-leon@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191027070621.11711-1-leon@kernel.org> References: <20191027070621.11711-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Leon Romanovsky Use newly introduces CM_GET/CM_SET to add access REQ local response timeout. Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/cm.c | 8 ++++---- drivers/infiniband/core/cm_msgs.h | 12 ------------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 0367da67501b..b9eec4bf6419 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -1286,8 +1286,8 @@ static void cm_format_req(struct cm_req_msg *req_msg, cm_req_set_qp_type(req_msg, param->qp_type); CM_SET(REQ_END_TO_END_FLOW_CONTROL, req_msg, param->flow_control); CM_SET(REQ_STARTING_PSN, req_msg, param->starting_psn); - cm_req_set_local_resp_timeout(req_msg, - param->local_cm_response_timeout); + CM_SET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg, + param->local_cm_response_timeout); req_msg->pkey = param->primary_path->pkey; cm_req_set_path_mtu(req_msg, param->primary_path->mtu); cm_req_set_max_cm_retries(req_msg, param->max_cm_retries); @@ -1701,7 +1701,7 @@ static void cm_format_req_event(struct cm_work *work, CM_GET(REQ_REMOTE_CM_RESPONSE_TIMEOUT, req_msg); param->flow_control = CM_GET(REQ_END_TO_END_FLOW_CONTROL, req_msg); param->remote_cm_response_timeout = - cm_req_get_local_resp_timeout(req_msg); + CM_GET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg); param->retry_count = cm_req_get_retry_count(req_msg); param->rnr_retry_count = cm_req_get_rnr_retry_count(req_msg); param->srq = cm_req_get_srq(req_msg); @@ -2027,7 +2027,7 @@ static int cm_req_handler(struct cm_work *work) } cm_id_priv->tid = req_msg->hdr.tid; cm_id_priv->timeout_ms = cm_convert_to_ms( - cm_req_get_local_resp_timeout(req_msg)); + CM_GET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg)); cm_id_priv->max_cm_retries = cm_req_get_max_cm_retries(req_msg); cm_id_priv->remote_qpn = CM_GET(REQ_LOCAL_QPN, req_msg); cm_id_priv->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg); diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h index b63bba57394e..2deaed83c9eb 100644 --- a/drivers/infiniband/core/cm_msgs.h +++ b/drivers/infiniband/core/cm_msgs.h @@ -400,18 +400,6 @@ struct cm_req_msg { } __packed; -static inline u8 cm_req_get_local_resp_timeout(struct cm_req_msg *req_msg) -{ - return (u8) ((be32_to_cpu(req_msg->offset44) & 0xF8) >> 3); -} - -static inline void cm_req_set_local_resp_timeout(struct cm_req_msg *req_msg, - u8 resp_timeout) -{ - req_msg->offset44 = cpu_to_be32((resp_timeout << 3) | - (be32_to_cpu(req_msg->offset44) & 0xFFFFFF07)); -} - static inline u8 cm_req_get_retry_count(struct cm_req_msg *req_msg) { return (u8) (be32_to_cpu(req_msg->offset44) & 0x7); -- 2.20.1