Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp1212068ybh; Sat, 3 Aug 2019 20:44:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqyQZzPzhrVsDPt2AzJUQBOL++Dv9EtxNCSE1KuPheTDdbq6CJK0ON97GEq9Yi6yFvBKyi96 X-Received: by 2002:a17:90a:fa12:: with SMTP id cm18mr11829654pjb.137.1564890279553; Sat, 03 Aug 2019 20:44:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564890279; cv=none; d=google.com; s=arc-20160816; b=ucgJ79E8xrozix5bMuCrY3gZ0WIM15i/7G3yVX++CcdO3zmpO46IAuSCLc/mErqyft YcupihlU2AMUajbqby633OZyrWtTpttSktR5r69msmeqVyMjYUaU5AaV1YMpBhWlZ2PT H6Ytftcv+fMTwZsjHmSsccc9VrbKxJ3qP6y7rZC0SMUbbhVz0OwHQmR3XRLJ94x7abTg dRGpG1ivv1YXStLMUvijNgmRuRr4p4xFBk69RczPkRJW9aYbhdVXXibKqc6QhJuRadxS AK3D+dbv8j08vVhJKRJnu41UxNDYmb+VceyZQ3VxnJxsO1SPWbJ2Y39qyg3JJSmggC+2 B7eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=3+NwDp59vCdVYuMxAtiE/Ja/A+VHDL8pBMfqtQlzTNc=; b=Tjjh4XlAh84WtjUSr+mozOyHxFJGM47E5aXXLnOBYQpAz9qETJZoMe97L5hkFI2uul e6h8fT3zx6siCq/mjc/t6VArI9rX7MIM5aUETul67YPhTipHcFuoC9oX7Stj+Rcv3B0i +b1xmtGnslsj0c7z2qMTCjD0TwAUAnhMUY0l0WPp9EE+RbunSCGGjdOBG32myt5Ofxif WET8UIER7Gb5Ze5sbhIA0/9y6/dvmQiiupcT8+cuYkFrNodK63YDLj6CGVOnd6hmzpz1 SYIMkesVqrQim0WubaNR0GxoyUD+/RfCXCczuvkkvqirUZBcHZXeBK3z1WIdvhDKntyV +PvQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 24si44132603pgu.501.2019.08.03.20.44.24; Sat, 03 Aug 2019 20:44:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390602AbfHCMcD (ORCPT + 99 others); Sat, 3 Aug 2019 08:32:03 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4164 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2390359AbfHCMcD (ORCPT ); Sat, 3 Aug 2019 08:32:03 -0400 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 847F6BB1ED0ED0E2D3AB; Sat, 3 Aug 2019 20:31:58 +0800 (CST) Received: from huawei.com (10.67.189.167) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.439.0; Sat, 3 Aug 2019 20:31:50 +0800 From: Jiangfeng Xiao To: , , , CC: , , , , Subject: [PATCH v1 1/3] net: hisilicon: make hip04_tx_reclaim non-reentrant Date: Sat, 3 Aug 2019 20:31:39 +0800 Message-ID: <1564835501-90257-2-git-send-email-xiaojiangfeng@huawei.com> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1564835501-90257-1-git-send-email-xiaojiangfeng@huawei.com> References: <1564835501-90257-1-git-send-email-xiaojiangfeng@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.189.167] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If hip04_tx_reclaim is interrupted while it is running and then __napi_schedule continues to execute hip04_rx_poll->hip04_tx_reclaim, reentrancy occurs and oops is generated. So you need to mask the interrupt during the hip04_tx_reclaim run. The kernel oops exception stack is as follows: Unable to handle kernel NULL pointer dereference at virtual address 00000050 pgd = c0003000 [00000050] *pgd=80000000a04003, *pmd=00000000 Internal error: Oops: 206 [#1] SMP ARM Modules linked in: hip04_eth mtdblock mtd_blkdevs mtd ohci_platform ehci_platform ohci_hcd ehci_hcd vfat fat sd_mod usb_storage scsi_mod usbcore usb_common CPU: 0 PID: 0 Comm: swapper/0 Tainted: G O 4.4.185 #1 Hardware name: Hisilicon A15 task: c0a250e0 task.stack: c0a00000 PC is at hip04_tx_reclaim+0xe0/0x17c [hip04_eth] LR is at hip04_tx_reclaim+0x30/0x17c [hip04_eth] pc : [] lr : [] psr: 600e0313 sp : c0a01d88 ip : 00000000 fp : c0601f9c r10: 00000000 r9 : c3482380 r8 : 00000001 r7 : 00000000 r6 : 000000e1 r5 : c3482000 r4 : 0000000c r3 : f2209800 r2 : 00000000 r1 : 00000000 r0 : 00000000 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 32c5387d Table: 03d28c80 DAC: 55555555 Process swapper/0 (pid: 0, stack limit = 0xc0a00190) Stack: (0xc0a01d88 to 0xc0a02000) [] (hip04_tx_reclaim [hip04_eth]) from [] (hip04_rx_poll+0x88/0x368 [hip04_eth]) [] (hip04_rx_poll [hip04_eth]) from [] (net_rx_action+0x114/0x34c) [] (net_rx_action) from [] (__do_softirq+0x218/0x318) [] (__do_softirq) from [] (irq_exit+0x88/0xac) [] (irq_exit) from [] (msa_irq_exit+0x11c/0x1d4) [] (msa_irq_exit) from [] (__handle_domain_irq+0x110/0x148) [] (__handle_domain_irq) from [] (gic_handle_irq+0xd4/0x118) [] (gic_handle_irq) from [] (__irq_svc+0x40/0x58) Exception stack(0xc0a01f30 to 0xc0a01f78) 1f20: c0ae8b40 00000000 00000000 00000000 1f40: 00000002 ffffe000 c0601f9c 00000000 ffffffff c0a2257c c0a22440 c0831a38 1f60: c0a01ec4 c0a01f80 c0203714 c0203718 600e0213 ffffffff [] (__irq_svc) from [] (arch_cpu_idle+0x20/0x3c) [] (arch_cpu_idle) from [] (cpu_startup_entry+0x244/0x29c) [] (cpu_startup_entry) from [] (rest_init+0xc8/0x10c) [] (rest_init) from [] (start_kernel+0x468/0x514) Code: a40599e5 016086e2 018088e2 7660efe6 (503090e5) ---[ end trace 1db21d6d09c49d74 ]--- Kernel panic - not syncing: Fatal exception in interrupt CPU3: stopping CPU: 3 PID: 0 Comm: swapper/3 Tainted: G D O 4.4.185 #1 Signed-off-by: Jiangfeng Xiao --- drivers/net/ethernet/hisilicon/hip04_eth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c index d604528..1e1b154 100644 --- a/drivers/net/ethernet/hisilicon/hip04_eth.c +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c @@ -585,6 +585,9 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget) u16 len; u32 err; + /* clean up tx descriptors */ + tx_remaining = hip04_tx_reclaim(ndev, false); + while (cnt && !last) { buf = priv->rx_buf[priv->rx_head]; skb = build_skb(buf, priv->rx_buf_size); @@ -645,8 +648,7 @@ static int hip04_rx_poll(struct napi_struct *napi, int budget) } napi_complete_done(napi, rx); done: - /* clean up tx descriptors and start a new timer if necessary */ - tx_remaining = hip04_tx_reclaim(ndev, false); + /* start a new timer if necessary */ if (rx < budget && tx_remaining) hip04_start_tx_timer(priv); -- 1.8.5.6