From patchwork Sun Nov 3 13:24:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 11224349 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BF02915AB for ; Sun, 3 Nov 2019 13:24:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FC26214D8 for ; Sun, 3 Nov 2019 13:24:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572787489; bh=+7hSOc2bIXtxa/UiNZfXHc+u9s5h4oYnkJq0aSPzN5U=; h=From:To:Cc:Subject:Date:List-ID:From; b=a32Vb2Kv4SHc/TwsfyF62c0iQ82psY9g49bbC+WlwBMmn5e9k8g+yw4ZE4Wn6s8KP 28qgaUNY1tyawJa4oHR2loRRzqDFUlqh4G67l1BsgQKBI+GmRSnyfzU0M89XTlCAxJ 6u66oDJyOn0d+eDFSpSMnGmblcxNxyQszG2WCGyw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727501AbfKCNYs (ORCPT ); Sun, 3 Nov 2019 08:24:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:34948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727425AbfKCNYs (ORCPT ); Sun, 3 Nov 2019 08:24:48 -0500 Received: from localhost (unknown [193.47.165.251]) (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 8B20120663; Sun, 3 Nov 2019 13:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572787488; bh=+7hSOc2bIXtxa/UiNZfXHc+u9s5h4oYnkJq0aSPzN5U=; h=From:To:Cc:Subject:Date:From; b=sqjTGpYcVij82hoficJ9nzXRIMN0MMuCUpe+3L8I+nX/LhiUiwT3XnkZWqIoLvT/2 4+KRhBBgA71b+NHt/+UHg9ajjCya1kU8HPuSMwu1gclAiYSlNRGM7qk2ebl0FzgdBE jOrYgVKHKePS0uM/2sdK6xyUUqCxNZKYQWJBo0pA= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Sean Hefty Subject: [PATCH rdma-next v1] RDMA/ucma: Mask QPN to be 24 bits according to IBTA Date: Sun, 3 Nov 2019 15:24:43 +0200 Message-Id: <20191103132443.76423-1-leon@kernel.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Leon Romanovsky IBTA declares QPN as 24bits, mask input to ensure that kernel doesn't get higher bits and ensure by adding WANR_ONCE() that other CM users do the same. Fixes: 75216638572f ("RDMA/cma: Export rdma cm interface to userspace") Signed-off-by: Leon Romanovsky --- Changelog: v0 -> v1: https://lore.kernel.org/linux-rdma/20191031190504.GA5939@ziepe.ca * Squashed patch https://lore.kernel.org/linux-rdma/20191031190504.GA5939@ziepe.ca and https://lore.kernel.org/linux-rdma/20191020071559.9743-5-leon@kernel.org --- drivers/infiniband/core/cm.c | 5 ++++- drivers/infiniband/core/ucma.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 33b384c7df42..acc1e1d80c42 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -2101,7 +2101,10 @@ int ib_send_cm_rep(struct ib_cm_id *cm_id, cm_id_priv->initiator_depth = param->initiator_depth; cm_id_priv->responder_resources = param->responder_resources; cm_id_priv->rq_psn = cm_rep_get_starting_psn(rep_msg); - cm_id_priv->local_qpn = cpu_to_be32(param->qp_num & 0xFFFFFF); + WARN_ONCE(param->qp_num & 0xFF000000, + "IBTA declares QPN to be 24 bits, but it is 0x%X\n", + param->qp_num); + cm_id_priv->local_qpn = cpu_to_be32(param->qp_num); out: spin_unlock_irqrestore(&cm_id_priv->lock, flags); return ret; diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c index 0274e9b704be..57e68491a2fd 100644 --- a/drivers/infiniband/core/ucma.c +++ b/drivers/infiniband/core/ucma.c @@ -1045,7 +1045,7 @@ static void ucma_copy_conn_param(struct rdma_cm_id *id, dst->retry_count = src->retry_count; dst->rnr_retry_count = src->rnr_retry_count; dst->srq = src->srq; - dst->qp_num = src->qp_num; + dst->qp_num = src->qp_num & 0xFFFFFF; dst->qkey = (id->route.addr.src_addr.ss_family == AF_IB) ? src->qkey : 0; }