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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 2BFE4C43331 for ; Mon, 11 Nov 2019 18:54:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00FF92184C for ; Mon, 11 Nov 2019 18:54:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498484; bh=pur4SZ1TslIwdXzg0QtfP1E6LnyIzDKBcr/u+XQoe6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Bu4+ATS8GZDNEzDr2QIWTM1VXd6qcAkcYeVlAjGpDiIx/2m7+ldjp6RHKU5dBzGcl /xJ1g6y4tSE4aQ4PJCY7zDjNJdbrAeJWlKIujfWe/KW7Hhsx8pkP8ACYHBmkDRTP+7 JrxNzbIzpFB8/0LIs5S9+LUu6fIYrOieTVPRjq1s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730589AbfKKSym (ORCPT ); Mon, 11 Nov 2019 13:54:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:50848 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729538AbfKKSyj (ORCPT ); Mon, 11 Nov 2019 13:54:39 -0500 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 455E220818; Mon, 11 Nov 2019 18:54:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498479; bh=pur4SZ1TslIwdXzg0QtfP1E6LnyIzDKBcr/u+XQoe6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uk+bzJnQ4DWT5hZA+SyZX1/IcLCyMVaUpXi5Nrwa6IAi5WOwA8CqOb+EndjvQY9Rd Iog6mhInQnd1TsONKQTY4SBcULYItEstPJwzP+2woQGdMvC1x6euYwDsRFpzrb4PXG GK+XDIecDTX8kNEtCwv6YIRE/+PDYCEoXZVR3/nQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Zhang , Leon Romanovsky , Jason Gunthorpe , Sasha Levin Subject: [PATCH 5.3 131/193] RDMA/nldev: Skip counter if port doesnt match Date: Mon, 11 Nov 2019 19:28:33 +0100 Message-Id: <20191111181510.839768118@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Zhang [ Upstream commit a15542bb72a48042f5df7475893d46f725f5f9fb ] The counter resource should return -EAGAIN if it was requested for a different port, this is similar to how QP works if the users provides a port filter. Otherwise port filtering in netlink will return broken counter nests. Fixes: c4ffee7c9bdb ("RDMA/netlink: Implement counter dumpit calback") Link: https://lore.kernel.org/r/20191020062800.8065-1-leon@kernel.org Signed-off-by: Mark Zhang Signed-off-by: Leon Romanovsky Reviewed-by: Jason Gunthorpe Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/core/nldev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c index f42e856f30729..4300e21865845 100644 --- a/drivers/infiniband/core/nldev.c +++ b/drivers/infiniband/core/nldev.c @@ -778,7 +778,7 @@ static int fill_res_counter_entry(struct sk_buff *msg, bool has_cap_net_admin, container_of(res, struct rdma_counter, res); if (port && port != counter->port) - return 0; + return -EAGAIN; /* Dump it even query failed */ rdma_counter_query_stats(counter); -- 2.20.1