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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 BBBB9C433DF for ; Thu, 20 Aug 2020 12:34:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 79D29207DA for ; Thu, 20 Aug 2020 12:34:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597926879; bh=Nahniq3tivwXHlULeR3BZ+n9Or9Il37c18TVMl+h06Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aXtqsDoVttL9jTHec4KIuNpvYV/mm0xQwtbdn0LLhhJpwSrU9IowhVv5FCJKPspc6 nNUHb6QYEZ+4rIlit1GGcgLgSqLdEak8qXA2Db89edPIchnRoFq+Hhv6kbgtEajhr1 6fYsG8SqFy2WS+d1c4uhNsVkpv6WhEYJHMUOspes= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728922AbgHTMee (ORCPT ); Thu, 20 Aug 2020 08:34:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:53974 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729574AbgHTJsq (ORCPT ); Thu, 20 Aug 2020 05:48:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 0F84520724; Thu, 20 Aug 2020 09:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597916926; bh=Nahniq3tivwXHlULeR3BZ+n9Or9Il37c18TVMl+h06Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AxBiNsh3DFkWOYy8sCt/Bv+6SuRlrTJUamQXkVnxNL4iAWDK2BOqoeaUuhP6KB9xt 3X1hbYTgBucc3n6GJftRYq3sB0lYdFtdJq0ktkZ+PrbzpOan04m4CBvJl/hnnZ28XQ T2pcKBivRT10J1FVIt2eZ6hibuYt/mAIN5JeqZvM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Zhang , Maor Gottlieb , Leon Romanovsky , Jason Gunthorpe , Sasha Levin Subject: [PATCH 5.4 094/152] RDMA/counter: Only bind user QPs in auto mode Date: Thu, 20 Aug 2020 11:21:01 +0200 Message-Id: <20200820091558.542037319@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091553.615456912@linuxfoundation.org> References: <20200820091553.615456912@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Zhang [ Upstream commit c9f557421e505f75da4234a6af8eff46bc08614b ] In auto mode only bind user QPs to a dynamic counter, since this feature is mainly used for system statistic and diagnostic purpose, while there's no need to counter kernel QPs so far. Fixes: 99fa331dc862 ("RDMA/counter: Add "auto" configuration mode support") Link: https://lore.kernel.org/r/20200702082933.424537-3-leon@kernel.org Signed-off-by: Mark Zhang Reviewed-by: Maor Gottlieb Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/core/counters.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/core/counters.c b/drivers/infiniband/core/counters.c index 11210bf7fd61b..42809f612c2c4 100644 --- a/drivers/infiniband/core/counters.c +++ b/drivers/infiniband/core/counters.c @@ -284,7 +284,7 @@ int rdma_counter_bind_qp_auto(struct ib_qp *qp, u8 port) struct rdma_counter *counter; int ret; - if (!qp->res.valid) + if (!qp->res.valid || rdma_is_kernel_res(&qp->res)) return 0; if (!rdma_is_port_valid(dev, port)) -- 2.25.1