From patchwork Thu Aug 1 12:21:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 1140437 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="wQbtPdl2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45zqD40LMRz9sDQ for ; Thu, 1 Aug 2019 22:21:56 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731167AbfHAMVz (ORCPT ); Thu, 1 Aug 2019 08:21:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:32984 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728791AbfHAMVy (ORCPT ); Thu, 1 Aug 2019 08:21:54 -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 1761520838; Thu, 1 Aug 2019 12:21:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564662113; bh=cdIzpma59+8ccw4pf9IkQYTsoLRo13CbMbJywDBJas4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wQbtPdl2mA5rriIOnvjPjrRsULhDZlV7jTX97S3BV3tQ8bqFITOV8wCsDGhkdVBpO sd+VP7PwZVchZm6mzVmqiPxU4mPvXxV60lWQoDMtOAt6UeDOvM6A9jxoQwrH/vbzzz eO0y3FcEDMGwnPV1GY3RJOs1W/NjEyQqMJOEtLhM= 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 3/3] IB/mlx5: Add page fault handler for DC initiator WQE Date: Thu, 1 Aug 2019 15:21:39 +0300 Message-Id: <20190801122139.25224-4-leon@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190801122139.25224-1-leon@kernel.org> References: <20190801122139.25224-1-leon@kernel.org> MIME-Version: 1.0 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);