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=unavailable 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 D7C26C31E40 for ; Tue, 6 Aug 2019 07:48:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4E0A21743 for ; Tue, 6 Aug 2019 07:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565077708; bh=cdIzpma59+8ccw4pf9IkQYTsoLRo13CbMbJywDBJas4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=spHMYdZHvUg6sfJf2USU/JGihWyTn2w9dWS1/w+/xvDlrZ6ZQSfXbiTUPLuWT9spr z7QXbuEBHZ+O54orWVJrmc4FNgtbBn5EZjnvQx5GLqhUEcejdSRaIKG+vGjOMIAq1E 41J1Oy2g58wQsq9Oo4q4daxLZ+CfkXokQ95Sc4i0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732069AbfHFHs1 (ORCPT ); Tue, 6 Aug 2019 03:48:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:44302 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726834AbfHFHs1 (ORCPT ); Tue, 6 Aug 2019 03:48:27 -0400 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 ED005206A2; Tue, 6 Aug 2019 07:48:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565077706; bh=cdIzpma59+8ccw4pf9IkQYTsoLRo13CbMbJywDBJas4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nAdIS12KdWnt06TO+QaSvyTtNLOs5uObHbqvyUQglHtWdrUO0A0q5+Y1zbikE5EWO jhrizk7XIlY/lLqj6LCakdX5Lo16p8dJwM5j7CG6dz90yc4pyM67J2y2wXbVNFKGeP KBDgl58GkPaPQ4Rhhls31I3izlq4Ih/BYLqOSs+A= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Michael Guralnik , Moni Shoua , Saeed Mahameed , linux-netdev Subject: [PATCH rdma-next v2 4/4] IB/mlx5: Add page fault handler for DC initiator WQE Date: Tue, 6 Aug 2019 10:48:07 +0300 Message-Id: <20190806074807.9111-5-leon@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190806074807.9111-1-leon@kernel.org> References: <20190806074807.9111-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Michael Guralnik Parsing DC initiator WQEs upon page fault requires skipping an address vector segment, as in UD WQEs. Signed-off-by: Michael Guralnik Reviewed-by: Moni Shoua Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mlx5/odp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c index 5e87a5e25574..6f1de5edbe8e 100644 --- a/drivers/infiniband/hw/mlx5/odp.c +++ b/drivers/infiniband/hw/mlx5/odp.c @@ -1065,6 +1065,12 @@ static int mlx5_ib_mr_initiator_pfault_handler( case IB_QPT_UD: transport_caps = dev->odp_caps.per_transport_caps.ud_odp_caps; break; + case IB_QPT_DRIVER: + if (qp->qp_sub_type == MLX5_IB_QPT_DCI) { + transport_caps = dev->dc_odp_caps; + break; + } + /* fall through */ default: mlx5_ib_err(dev, "ODP fault on QP of an unsupported transport 0x%x\n", qp->ibqp.qp_type); @@ -1078,7 +1084,8 @@ static int mlx5_ib_mr_initiator_pfault_handler( return -EFAULT; } - if (qp->ibqp.qp_type == IB_QPT_UD) { + if (qp->ibqp.qp_type == IB_QPT_UD || + qp->qp_sub_type == MLX5_IB_QPT_DCI) { av = *wqe; if (av->dqp_dct & cpu_to_be32(MLX5_EXTENDED_UD_AV)) *wqe += sizeof(struct mlx5_av); -- 2.20.1