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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5ACB2C32792 for ; Mon, 22 Aug 2022 20:00:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238329AbiHVUAG (ORCPT ); Mon, 22 Aug 2022 16:00:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238318AbiHVT7k (ORCPT ); Mon, 22 Aug 2022 15:59:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8647052E62 for ; Mon, 22 Aug 2022 12:59:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EF0E361237 for ; Mon, 22 Aug 2022 19:59:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4CD42C433D6; Mon, 22 Aug 2022 19:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661198373; bh=u0lbqVwH/4MvSc09o17KMfSdGPa+NEztp4JGbbi4VBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BiYZNPyA0YxlRFonaZuVH8AtYmC0rARdMHaXoiQGkOxrkio5MWKrF4rbstB6bsK4F onPI9cvqB20PcRJv1F8nPjE31/4lZTSiUM2LO09OaF7Pvw52CTs6OzoeljwRtWRxIs PqX7myt++C272Pbbp18mpKYfOdjxg7fAt+qpvy7Wr1us6yZClbTsx8IfNIJPtyFble VbxtOMFJIBdSqbmXqKCbzpC8THPP5WUO+o4MCj4QY906Xr4ofz5Emru5m4sTybPuOT VKDqjH4LdAVDa/v6jQVaxSSLjOxrCGfDSuwXFdRr4CEON+s1pbf8sU9MiyMH7ZBWGw hA22h/QOULZiQ== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: Saeed Mahameed , netdev@vger.kernel.org, Roy Novich , Moshe Shemesh Subject: [net 05/13] net/mlx5: Fix cmd error logging for manage pages cmd Date: Mon, 22 Aug 2022 12:59:09 -0700 Message-Id: <20220822195917.216025-6-saeed@kernel.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220822195917.216025-1-saeed@kernel.org> References: <20220822195917.216025-1-saeed@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Roy Novich When the driver unloads, give/reclaim_pages may fail as PF driver in teardown flow, current code will lead to the following kernel log print 'failed reclaiming pages: err 0'. Fix it to get same behavior as before the cited commits, by calling mlx5_cmd_check before handling error state. mlx5_cmd_check will verify if the returned error is an actual error needed to be handled by the driver or not and will return an appropriate value. Fixes: 8d564292a166 ("net/mlx5: Remove redundant error on reclaim pages") Fixes: 4dac2f10ada0 ("net/mlx5: Remove redundant notify fail on give pages") Signed-off-by: Roy Novich Reviewed-by: Moshe Shemesh Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c index ec76a8b1acc1..60596357bfc7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c @@ -376,8 +376,8 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages, goto out_dropped; } } + err = mlx5_cmd_check(dev, err, in, out); if (err) { - err = mlx5_cmd_check(dev, err, in, out); mlx5_core_warn(dev, "func_id 0x%x, npages %d, err %d\n", func_id, npages, err); goto out_dropped; @@ -524,10 +524,13 @@ static int reclaim_pages(struct mlx5_core_dev *dev, u16 func_id, int npages, dev->priv.reclaim_pages_discard += npages; } /* if triggered by FW event and failed by FW then ignore */ - if (event && err == -EREMOTEIO) + if (event && err == -EREMOTEIO) { err = 0; + goto out_free; + } + + err = mlx5_cmd_check(dev, err, in, out); if (err) { - err = mlx5_cmd_check(dev, err, in, out); mlx5_core_err(dev, "failed reclaiming pages: err %d\n", err); goto out_free; } -- 2.37.1