Received: by 2002:ac0:de83:0:0:0:0:0 with SMTP id b3csp1406576imk; Mon, 4 Jul 2022 02:23:31 -0700 (PDT) X-Google-Smtp-Source: AGRyM1thK5h8x7UU0h8Cm8TzNXy0Ljc4/ljl6Kgb14IsXA4wjH+U3raNd7GV+FDtKrxNxa0VxUMN X-Received: by 2002:aa7:c0c4:0:b0:43a:20cf:3c68 with SMTP id j4-20020aa7c0c4000000b0043a20cf3c68mr9876020edp.172.1656926611049; Mon, 04 Jul 2022 02:23:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656926611; cv=none; d=google.com; s=arc-20160816; b=IsxaIj84SgQRrFHpg1sj7OymVUMoG0GVzmcJvgITiGEhT9wrmWn3P7GMIp5lLAxQyM vMJS59ZFoH/8P7GETc/FhEZmq+4P/ZpUUumDvt6zPLVLqIWi9Nj+ozo9Yh1+XFyoa9P5 wUbVY5hPdtzcKExQuPo/ug/4l/5hdmBeiq14gyJ0KaRmKmZO3GvcjovnMBpW26070hG4 pFWjY4SwgqP741lXznBhvTf8b3wfQ9UgL7YwVTy573K4w408hbbh9BnXousOeDOCSsPY LHeVoUgtNEmkhiHqeC+9SdxAVuD7jbh/lV8OUHyYQNoN87Rs4Ka8yCoLgcvlPFbXdFay do2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:references:in-reply-to :message-id:date:subject:cc:to:from; bh=i0Vxsy+HlTyvszwEV7hvNC63DIl5n393lRlKWuV0s74=; b=CCsH5ZkBDhK7zNNnofGPYmdX82za2+vLYmvn3LfHsk+/EKsEqhXQW6yXOg6PMTDrfC Pup40XQgr4wwOCZ4rHDJpXqF9yl3AKXHzDj8bPkSoAd3Isbmbp0HEoiFJT7vMofmB4b4 iEcsKtaL97ZcbwaCIkBnDDuB+OiFStQyj3G05TmvfsBmziHBwELXjaslSquQEZ+TGe+C CIPBj4OA7+gLFzBcAQo/UhplaBYUFJxESHrVE9Q9gA4nmsrgnuN7hDjVn3ePjBt9enhk ay/bpM4VLRxi9wpnu07qdeLArl+gY9hwHmN+5cdmGzElnU2M//CiBs4G3iBG18gANY2y xZWw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mb8-20020a170906eb0800b0072629f08048si13971853ejb.303.2022.07.04.02.23.06; Mon, 04 Jul 2022 02:23:31 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233316AbiGDI6P (ORCPT + 99 others); Mon, 4 Jul 2022 04:58:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230499AbiGDI6G (ORCPT ); Mon, 4 Jul 2022 04:58:06 -0400 Received: from out30-44.freemail.mail.aliyun.com (out30-44.freemail.mail.aliyun.com [115.124.30.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2B81BE04; Mon, 4 Jul 2022 01:58:04 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R211e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=mqaio@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0VIJ4YHV_1656925081; Received: from localhost(mailfrom:mqaio@linux.alibaba.com fp:SMTPD_---0VIJ4YHV_1656925081) by smtp.aliyun-inc.com; Mon, 04 Jul 2022 16:58:01 +0800 From: Qiao Ma To: davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, kuba@kernel.org, gustavoars@kernel.org, cai.huoqing@linux.dev, aviad.krawczyk@huawei.com, zhaochen6@huawei.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 2/3] net: hinic: avoid kernel hung in hinic_get_stats64() Date: Mon, 4 Jul 2022 16:57:45 +0800 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <7e3115e81cd5cab71a4a79b8061062e9d25eb5af.1656921519.git.mqaio@linux.alibaba.com> References: <7e3115e81cd5cab71a4a79b8061062e9d25eb5af.1656921519.git.mqaio@linux.alibaba.com> In-Reply-To: References: X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL 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 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 --- drivers/net/ethernet/huawei/hinic/hinic_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c index 84d957692442..ef4765d73925 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c @@ -849,10 +849,8 @@ static void hinic_get_stats64(struct net_device *netdev, u64_stats_init(&nic_rx_stats.syncp); u64_stats_init(&nic_tx_stats.syncp); - 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; -- 1.8.3.1