Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1631405ybl; Fri, 6 Dec 2019 22:51:45 -0800 (PST) X-Google-Smtp-Source: APXvYqwVK4ARvFiE1Edr9FMjmN+7x7HD3Xi4R//vb+SxMokMYhsB1IQIoN+AMy/xlIoRY+Rc1wZV X-Received: by 2002:a05:6830:50:: with SMTP id d16mr14853516otp.155.1575701505528; Fri, 06 Dec 2019 22:51:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575701505; cv=none; d=google.com; s=arc-20160816; b=qTxZahRnloZa4oxVCE8V3BbQm2upFxHxkUFJ0DtUjclmyp5ZDzQyunnS6+WRONMEPX 0O2vrKkgPrebD3s1l5wyHzLECFM0R2Chf0Ykqp6wxw0B3Ic4or0m6yuuzPW/aZJ3vMYw i+BwYHOx0kJ8yebKMCRjpa9f4Rywk9Ez8V+OOXhz3kmQM6vKQ/2IbH2hTuaENxBib6x4 4CxBLjD3ee1dxxOvYhSsFwaS2B5Sk7zn8LJ6+U3YD4Qa3a9qiar4vJNbm/Qv0guloMDk wzHWPnvSLL7ueFws4vI/8r5XlF2wQmnvoAdsEEOIBIl1AjDFclMwrRCeBum1MEV3ZwOx zsHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=gV4GKN+RLesw8qAJG5S03X9k62Gvb23iFXZkQG5BHgk=; b=JaISyS7ic3oppAshOp6GhboC+314I8yVBAIK9ROgtZGRrhKUz0kYfmloYAmOBBrZq1 Ywc2O33hpGaowWL0S9/caS0UwXlk5X+ehNhs1tMMMn1Uduhd0/ljR3frwkMjgzWkVB9j KHgdkSgCPVoyvwQygerULschc9ZctzHH4cZaraEhKzuTZfab+fpVcB9S88yM+XuFlO8Z pc7asJ3hFmqHJYROz5OWn/SGFjWUsu+roYqUSpxh/D5V16C2RJV1qmP0VEJuvsxwKWCI AvKOA9GVUX2SWazmnL2Yd7G/CIrYmaCwGDMZ4N0/iPgcVQ8Hy4B9nX+CHrOrP67h3dyW flPQ== 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 7si8962914otk.79.2019.12.06.22.51.33; Fri, 06 Dec 2019 22:51:45 -0800 (PST) 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 S1726369AbfLGGvF (ORCPT + 99 others); Sat, 7 Dec 2019 01:51:05 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:34128 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725869AbfLGGvE (ORCPT ); Sat, 7 Dec 2019 01:51:04 -0500 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id D3A8565F0DE1928B90D6; Sat, 7 Dec 2019 14:50:51 +0800 (CST) Received: from [127.0.0.1] (10.173.220.183) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Sat, 7 Dec 2019 14:50:44 +0800 Subject: Re: [PATCH V4] scsi: avoid potential deadlock in iscsi_if_rx func To: "wubo (T)" , Lee Duncan , "cleech@redhat.com" , "jejb@linux.ibm.com" , "martin.petersen@oracle.com" , "open-iscsi@googlegroups.com" , "linux-scsi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Ulrich Windl CC: Mingfangsen References: From: "liuzhiqiang (I)" Message-ID: <969e5733-db78-5664-cfad-e6f20d2e1fb4@huawei.com> Date: Sat, 7 Dec 2019 14:50:42 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.173.220.183] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org friendly ping... On 2019/11/20 21:26, wubo (T) wrote: > In iscsi_if_rx func, after receiving one request through iscsi_if_recv_msg func, > iscsi_if_send_reply will be called to try to reply the request in do-loop. > If the return of iscsi_if_send_reply func return -EAGAIN all the time, one deadlock will occur. > > For example, a client only send msg without calling recvmsg func, then it will result in the watchdog soft lockup. > The details are given as follows, > > Details of the special case which can cause deadlock: > > sock_fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ISCSI); > retval = bind(sock_fd, (struct sock addr*) & src_addr, sizeof(src_addr); > while (1) { > state_msg = sendmsg(sock_fd, &msg, 0); > //Note: recvmsg(sock_fd, &msg, 0) is not processed here. > } > close(sock_fd); > > watchdog: BUG: soft lockup - CPU#7 stuck for 22s! [netlink_test:253305] Sample time: 4000897528 ns(HZ: 250) Sample stat: > curr: user: 675503481560, nice: 321724050, sys: 448689506750, idle: 4654054240530, iowait: 40885550700, irq: 14161174020, softirq: 8104324140, st: 0 > deta: user: 0, nice: 0, sys: 3998210100, idle: 0, iowait: 0, irq: 1547170, softirq: 242870, st: 0 Sample softirq: > TIMER: 992 > SCHED: 8 > Sample irqstat: > irq 2: delta 1003, curr: 3103802, arch_timer > CPU: 7 PID: 253305 Comm: netlink_test Kdump: loaded Tainted: G OE > Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015 > pstate: 40400005 (nZcv daif +PAN -UAO) > pc : __alloc_skb+0x104/0x1b0 > lr : __alloc_skb+0x9c/0x1b0 > sp : ffff000033603a30 > x29: ffff000033603a30 x28: 00000000000002dd > x27: ffff800b34ced810 x26: ffff800ba7569f00 > x25: 00000000ffffffff x24: 0000000000000000 > x23: ffff800f7c43f600 x22: 0000000000480020 > x21: ffff0000091d9000 x20: ffff800b34eff200 > x19: ffff800ba7569f00 x18: 0000000000000000 > x17: 0000000000000000 x16: 0000000000000000 > x15: 0000000000000000 x14: 0001000101000100 > x13: 0000000101010000 x12: 0101000001010100 > x11: 0001010101010001 x10: 00000000000002dd > x9 : ffff000033603d58 x8 : ffff800b34eff400 > x7 : ffff800ba7569200 x6 : ffff800b34eff400 > x5 : 0000000000000000 x4 : 00000000ffffffff > x3 : 0000000000000000 x2 : 0000000000000001 > x1 : ffff800b34eff2c0 x0 : 0000000000000300 Call trace: > __alloc_skb+0x104/0x1b0 > iscsi_if_rx+0x144/0x12bc [scsi_transport_iscsi] > netlink_unicast+0x1e0/0x258 > netlink_sendmsg+0x310/0x378 > sock_sendmsg+0x4c/0x70 > sock_write_iter+0x90/0xf0 > __vfs_write+0x11c/0x190 > vfs_write+0xac/0x1c0 > ksys_write+0x6c/0xd8 > __arm64_sys_write+0x24/0x30 > el0_svc_common+0x78/0x130 > el0_svc_handler+0x38/0x78 > el0_svc+0x8/0xc > > Here, we add one limit of retry times in do-loop to avoid the deadlock. > > V4: > - modify the patch subject, no code change. > > V3: > - replace the error with warning as suggested by Ulrich > > V2: > - add some debug kernel message as suggested by Lee Duncan > > Signed-off-by: Bo Wu > Reviewed-by: Zhiqiang Liu > Reviewed-by: Lee Duncan > --- > drivers/scsi/scsi_transport_iscsi.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c > index 417b868d8735..ed8d9709b9b9 100644 > --- a/drivers/scsi/scsi_transport_iscsi.c > +++ b/drivers/scsi/scsi_transport_iscsi.c > @@ -24,6 +24,8 @@ > > #define ISCSI_TRANSPORT_VERSION "2.0-870" > > +#define ISCSI_SEND_MAX_ALLOWED 10 > + > #define CREATE_TRACE_POINTS > #include > > @@ -3682,6 +3684,7 @@ iscsi_if_rx(struct sk_buff *skb) > struct nlmsghdr *nlh; > struct iscsi_uevent *ev; > uint32_t group; > + int retries = ISCSI_SEND_MAX_ALLOWED; > > nlh = nlmsg_hdr(skb); > if (nlh->nlmsg_len < sizeof(*nlh) + sizeof(*ev) || > @@ -3712,6 +3715,10 @@ iscsi_if_rx(struct sk_buff *skb) > break; > err = iscsi_if_send_reply(portid, nlh->nlmsg_type, > ev, sizeof(*ev)); > + if (err == -EAGAIN && --retries < 0) { > + printk(KERN_WARNING "Send reply failed, error %d\n", err); > + break; > + } > } while (err < 0 && err != -ECONNREFUSED && err != -ESRCH); > skb_pull(skb, rlen); > } > -- > 1.8.3.1 > > > . >