From patchwork Wed May 19 06:05:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 443078 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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 0B59DC433ED for ; Wed, 19 May 2021 06:06:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E329F611AD for ; Wed, 19 May 2021 06:06:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243177AbhESGHy (ORCPT ); Wed, 19 May 2021 02:07:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:49328 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238532AbhESGHa (ORCPT ); Wed, 19 May 2021 02:07:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C83B0613AD; Wed, 19 May 2021 06:06:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621404371; bh=BteojUMIh0wQJoonHHZWziOMGkNzXhieAt9oMNJo5Io=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KyBH74uk9W9GGuSv6p+48GGQGB5Bn0WdNHadXvZpAESaiCvs6GZt6U4Nz0MZqx0vt zbT0Plj3YK2w8ZeVh6CYcdcLoWP86gbwWSkg3Gk/dO1UQOldRxBkX0m64pjmxcXdvi RzN4J9IKfoQXUtHq6aqcRxW+kzPod91XhJgO1lmjJE6OnH7YNEjx9QG9iKHb0XeT7D 8PgwyrnsbsWIjgABcXRH+aGPSkDDtcnZxbnSig/UOqR2x2wpN6rmOmvNeoIHRxNN3e CLTQRHNX5Znrk5BW6IGENbgHqkGSK/9D1NWrzrMGlg/lkhlzp0G1sVks/B6nEHzUT0 F00dATQ1zl3gg== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Tariq Toukan , Leon Romanovsky , Aya Levin , Maxim Mikityanskiy , Saeed Mahameed Subject: [net 12/16] net/mlx5e: Fix error path of updating netdev queues Date: Tue, 18 May 2021 23:05:19 -0700 Message-Id: <20210519060523.17875-13-saeed@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210519060523.17875-1-saeed@kernel.org> References: <20210519060523.17875-1-saeed@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Aya Levin Avoid division by zero in the error flow. In the driver TC number can be either 1 or 8. When TC count is set to 1, driver zero netdev->num_tc. Hence, need to convert it back from 0 to 1 in the error flow. Fixes: fa3748775b92 ("net/mlx5e: Handle errors from netif_set_real_num_{tx,rx}_queues") Signed-off-by: Aya Levin Reviewed-by: Maxim Mikityanskiy Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 89937b055070..d1b9a4040d60 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -2697,7 +2697,7 @@ static int mlx5e_update_netdev_queues(struct mlx5e_priv *priv) int err; old_num_txqs = netdev->real_num_tx_queues; - old_ntc = netdev->num_tc; + old_ntc = netdev->num_tc ? : 1; nch = priv->channels.params.num_channels; ntc = priv->channels.params.num_tc;