Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2929934rwb; Mon, 15 Aug 2022 14:15:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR5jWmbkDgjuxDIWbQ5yktabSxadDIDLc0/7/KEeS5fANwhrRAJASeKuUxpWEV2D4sdOfF+A X-Received: by 2002:a05:6402:64c:b0:43c:ea8e:85d6 with SMTP id u12-20020a056402064c00b0043cea8e85d6mr16417100edx.269.1660598145266; Mon, 15 Aug 2022 14:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660598145; cv=none; d=google.com; s=arc-20160816; b=fA/j0xLm4KPgySt63C9urvU+C9QARpD6vySUI853mg3LkxNrpuVWEN7AljKBT4cF+8 mT8eDNncK+giWbr5QSs++GNzm4KficgCk4y9gqzcdLHVI4sXOtPXty6rAFe5U/OjVLim 8HPHfOTHjWv6VubTWUL5SN0d1FbDzT+/XN84Rlcj5LK7FBC5BWVxbYkTFrLJyHOT4iZW 19pBPsvybeWMbTg4+ZvSDtnev+nrNrphK3zm/ArAhqfBnvf5zViPzINf//xyei5Sf6Qg cwO2BZYqrGusN3AXzCIKoDrJO/fEqtK5Y4/5fOvzzO97pk+qgWM7ty2zyCNIiBIVkehD sSow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xgNvC6bwFsVzzoUxLiRbdoce2h9IgJMQOL9aEc71Pd8=; b=nH4dDnAYvZZymF915P37Sw+PprdTYm3lsy9Ks9uO06aU8FMRRSN6qIbniB0K2dSHDc rXozJ32BZ7oKlzdQVyrPapnKO3z+/JU08WSqrcpImap2hGZM7p5gi3zNJ53GGC4NdBvQ xhT2o3wGwsUf0DPH+EDbtzPvuCAoHsN2hWXcoJVfPIPLDYicr3aWDphlM1/anoGv4spX Nj4CveDUate0mqky9cetgrJXUoM8rt5urTZdbvI8vRDK8Ffea/McqSNjzvwkp7cXpUYo aYs+U3FIUuVBO+2LuGi5Drhy+T7xCI/t5kC5ygJ+isNe13k2a486HoF4sOvv+lDZ4TXu On5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=i7+Bs5w1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bk19-20020a170906b0d300b00730951e6030si7708793ejb.188.2022.08.15.14.15.15; Mon, 15 Aug 2022 14:15:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=i7+Bs5w1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245418AbiHOVLV (ORCPT + 99 others); Mon, 15 Aug 2022 17:11:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347575AbiHOVHF (ORCPT ); Mon, 15 Aug 2022 17:07:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5229B1BEB9; Mon, 15 Aug 2022 12:15:40 -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 92AAE60F6C; Mon, 15 Aug 2022 19:15:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9938FC433C1; Mon, 15 Aug 2022 19:15:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660590939; bh=5D8R5ND/ejMtZ3MKYGCmT1b4bpEsntPeqRPpwjWiHjQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i7+Bs5w11QvtL6pJjPgGFKa9wYyLB50X3n9TGUTTq1D8iR46OtsqajGjRRdMlCMpr vMduVIuYdRNZHXIJvX9TsvXpGKtsz43d/HrWUruvt4iWCnyyQuFyG3pno8D/Db7hRe mRQyTNZP5rJkgegarFUf6c6W0vI4zQMbMZZgJPL8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qiao Ma , "David S. Miller" , Sasha Levin Subject: [PATCH 5.18 0419/1095] net: hinic: avoid kernel hung in hinic_get_stats64() Date: Mon, 15 Aug 2022 19:56:58 +0200 Message-Id: <20220815180447.040497555@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qiao Ma [ Upstream commit 98f9fcdee35add80505b6c73f72de5f750d5c03c ] When using hinic device as a bond slave device, and reading device stats of master bond device, the kernel may hung. The kernel panic calltrace as follows: Kernel panic - not syncing: softlockup: hung tasks Call trace: native_queued_spin_lock_slowpath+0x1ec/0x31c dev_get_stats+0x60/0xcc dev_seq_printf_stats+0x40/0x120 dev_seq_show+0x1c/0x40 seq_read_iter+0x3c8/0x4dc seq_read+0xe0/0x130 proc_reg_read+0xa8/0xe0 vfs_read+0xb0/0x1d4 ksys_read+0x70/0xfc __arm64_sys_read+0x20/0x30 el0_svc_common+0x88/0x234 do_el0_svc+0x2c/0x90 el0_svc+0x1c/0x30 el0_sync_handler+0xa8/0xb0 el0_sync+0x148/0x180 And the calltrace of task that actually caused kernel hungs as follows: __switch_to+124 __schedule+548 schedule+72 schedule_timeout+348 __down_common+188 __down+24 down+104 hinic_get_stats64+44 [hinic] dev_get_stats+92 bond_get_stats+172 [bonding] dev_get_stats+92 dev_seq_printf_stats+60 dev_seq_show+24 seq_read_iter+964 seq_read+220 proc_reg_read+164 vfs_read+172 ksys_read+108 __arm64_sys_read+28 el0_svc_common+132 do_el0_svc+40 el0_svc+24 el0_sync_handler+164 el0_sync+324 When getting device stats from bond, kernel will call bond_get_stats(). It first holds the spinlock bond->stats_lock, and then call hinic_get_stats64() to collect hinic device's stats. However, hinic_get_stats64() calls `down(&nic_dev->mgmt_lock)` to protect its critical section, which may schedule current task out. And if system is under high pressure, the task cannot be woken up immediately, which eventually triggers kernel hung panic. Since previous patch has replaced hinic_dev.tx_stats/rx_stats with local variable in hinic_get_stats64(), there is nothing need to be protected by lock, so just removing down()/up() is ok. Fixes: edd384f682cc ("net-next/hinic: Add ethtool and stats") Signed-off-by: Qiao Ma Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/huawei/hinic/hinic_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c index 89dc52510fdc..c23ee2ddbce3 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c @@ -842,13 +842,9 @@ static void hinic_get_stats64(struct net_device *netdev, struct hinic_rxq_stats nic_rx_stats = {}; struct hinic_txq_stats nic_tx_stats = {}; - down(&nic_dev->mgmt_lock); - if (nic_dev->flags & HINIC_INTF_UP) gather_nic_stats(nic_dev, &nic_rx_stats, &nic_tx_stats); - up(&nic_dev->mgmt_lock); - stats->rx_bytes = nic_rx_stats.bytes; stats->rx_packets = nic_rx_stats.pkts; stats->rx_errors = nic_rx_stats.errors; -- 2.35.1