From patchwork Sun Jan 26 17:17:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 11351937 X-Patchwork-Delegate: jgg@ziepe.ca 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 DEBF513A4 for ; Sun, 26 Jan 2020 17:17:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD6612071A for ; Sun, 26 Jan 2020 17:17:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580059034; bh=YPiOgqP92O2Oav7O/mZ8a4y7oO2N3g+fpbgI1soayqw=; h=From:To:Cc:Subject:Date:List-ID:From; b=AcFmYlbpDr4L8SAOh0RQeQpm+DRrE0h+q333uGcNKNE/nZZCS6SfcBqrirfQ3nPdr ISCDfCxCciECvQ4DpeQstQ/FTeJk+aW0il1JXvPsDxymH8SdCEritdhTtxmuk+ZAge scu3FyXB9WuiFtLsRVAjvw+WYA9L7gnc1nlBx1Sw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726275AbgAZRRO (ORCPT ); Sun, 26 Jan 2020 12:17:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:48212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725944AbgAZRRN (ORCPT ); Sun, 26 Jan 2020 12:17:13 -0500 Received: from localhost (unknown [213.57.247.131]) (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 3F7A320702; Sun, 26 Jan 2020 17:17:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580059033; bh=YPiOgqP92O2Oav7O/mZ8a4y7oO2N3g+fpbgI1soayqw=; h=From:To:Cc:Subject:Date:From; b=sSC8StBoqnNg1S4UfDQJ08dx5EX1+LMIQIoAS1bhJPZzeRoZFXuhCna/RwXg/BbMD IiSpU/jlqQHGuKrSoeGVctpTHlGSgVj5mq+nvMqISveK0qepjBDVfZPdTmJEeLXtZT TZ/BT63T4Vm7uexHVTyX2ZrdcmZWPn13jAOjdwAk= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Mark Zhang , RDMA mailing list , Maor Gottlieb , Leon Romanovsky Subject: [PATCH rdma-next] IB/mlx5: Return failure when rts2rts_qp_counters_set_id is not supported Date: Sun, 26 Jan 2020 19:17:08 +0200 Message-Id: <20200126171708.5167-1-leon@kernel.org> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Mark Zhang When bind a QP with a counter and the QP state is not RESET, return failure if the rts2rts_qp_counters_set_id is not supported. This is to prevent cases like manual bind for Connect-IB devices from returning success when the feature is not supported. Fixes: d14133dd4161 ("IB/mlx5: Support set qp counter") Signed-off-by: Mark Zhang Reviewed-by: Maor Gottlieb Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mlx5/qp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.24.1 diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index a4f8e7030787..957f3a52589b 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -3441,9 +3441,6 @@ static int __mlx5_ib_qp_set_counter(struct ib_qp *qp, struct mlx5_ib_qp_base *base; u32 set_id; - if (!MLX5_CAP_GEN(dev->mdev, rts2rts_qp_counters_set_id)) - return 0; - if (counter) set_id = counter->id; else @@ -6576,6 +6573,7 @@ void mlx5_ib_drain_rq(struct ib_qp *qp) */ int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter) { + struct mlx5_ib_dev *dev = to_mdev(qp->device); struct mlx5_ib_qp *mqp = to_mqp(qp); int err = 0; @@ -6585,6 +6583,11 @@ int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter) goto out; } + if (!MLX5_CAP_GEN(dev->mdev, rts2rts_qp_counters_set_id)) { + err = -EOPNOTSUPP; + goto out; + } + if (mqp->state == IB_QPS_RTS) { err = __mlx5_ib_qp_set_counter(qp, counter); if (!err)