Received: by 2002:a05:6a10:8395:0:0:0:0 with SMTP id n21csp715447pxh; Tue, 9 Nov 2021 18:02:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxC0godH0JzK5ucLFxpKzIIHgvWQ7v7lIDIa4dEGsHhnflYp7a2HihAgoUe8Xy13NK8k8kJ X-Received: by 2002:a17:906:6443:: with SMTP id l3mr15710658ejn.103.1636509742000; Tue, 09 Nov 2021 18:02:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636509741; cv=none; d=google.com; s=arc-20160816; b=S99PsLLOqNNkMRuWfzqGtK4GEwyGBclfNr6XhDsfQMmn0+XnfZEISrVieQmqVcdon6 5DwlY+Y0X807/LYc0IOWQKYMwYcjzBh7f8KeQVy/VnA1ST4s3gt3+wwK+oDjIuCR0Fo9 STpFGJ54xQrvTT/pIQwraySjGcSOeryhheS2j9AduMIOXNUZqmfc+cY5B4ovOhZKZk0Z aQOOaqnUrPamGWvHHhqGbnODwjRSu7/FKL288yrntSNE1xA0auna/YNVgbht7gy8q/xn e11i9wp0F+UJ1bXxf2XENUjtqo1J3ELQiLosI/IRb/Co0PtsPzBNNfDIN2mPBrfDY913 AaUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject; bh=uyMnKUe+yjuwm58nl4LJxJSJgB+BIpX1LYVB6wfNVAQ=; b=kni3l4ai/NB41agosSBXfdnpn7DGf8LMTP7CHFimAmqB2tJJ4uz42J4bSmPa3fCPDH rWq+uiaoTuwLzPueJKMppvagAVggBZxA609ge+djTr+22UGFzq5Q69ApTutkQQts77Ot Nh1Sie86sQDYt8GP5SVc5FWPjvnlJhIcIAVULUxge+hRvq+Wr+5pyZDoHMhVVq718QZi qu9893iqzPZMBKaIVwnqI8hyQwf+NrC9LQHyPR5LZiswBEOF+IpzxSPxMkWgl+LHG9RZ 72TAhGcLvpF1/1pll6ZZ8z9RJpYcbuMU0g9mHA0ssZIThj6soqPXq55NbZQ4JMY25KX8 cT1Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id sd41si51780924ejc.597.2021.11.09.18.01.57; Tue, 09 Nov 2021 18:02:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229648AbhKJCC6 (ORCPT + 99 others); Tue, 9 Nov 2021 21:02:58 -0500 Received: from szxga01-in.huawei.com ([45.249.212.187]:30931 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbhKJCC6 (ORCPT ); Tue, 9 Nov 2021 21:02:58 -0500 Received: from dggeml757-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Hpnx21Jnvzcb01; Wed, 10 Nov 2021 09:55:18 +0800 (CST) Received: from [10.174.179.200] (10.174.179.200) by dggeml757-chm.china.huawei.com (10.1.199.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.15; Wed, 10 Nov 2021 10:00:07 +0800 Subject: Re: [PATCH net] can: j1939: fix errant WARN_ON_ONCE in j1939_session_deactivate To: Oleksij Rempel , Marc Kleine-Budde CC: , , , , , , , , References: <20210906094200.95868-1-william.xuanziyang@huawei.com> <20210910124005.GJ26100@pengutronix.de> From: "Ziyang Xuan (William)" Message-ID: <17aeff56-716d-3ba5-40cd-b4e1da3f6909@huawei.com> Date: Wed, 10 Nov 2021 10:00:06 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210910124005.GJ26100@pengutronix.de> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.200] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggeml757-chm.china.huawei.com (10.1.199.137) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, I notice that the patch is not applied in upstream. Is it missed or any other problems? Thank you! > On Mon, Sep 06, 2021 at 05:42:00PM +0800, Ziyang Xuan wrote: >> The conclusion "j1939_session_deactivate() should be called with a >> session ref-count of at least 2" is incorrect. In some concurrent >> scenarios, j1939_session_deactivate can be called with the session >> ref-count less than 2. But there is not any problem because it >> will check the session active state before session putting in >> j1939_session_deactivate_locked(). >> >> Here is the concurrent scenario of the problem reported by syzbot >> and my reproduction log. >> >> cpu0 cpu1 >> j1939_xtp_rx_eoma >> j1939_xtp_rx_abort_one >> j1939_session_get_by_addr [kref == 2] >> j1939_session_get_by_addr [kref == 3] >> j1939_session_deactivate [kref == 2] >> j1939_session_put [kref == 1] >> j1939_session_completed >> j1939_session_deactivate >> WARN_ON_ONCE(kref < 2) >> > > Ok, I see, this warning makes sense only if session will actually be > deactivated. > > Acked-by: Oleksij Rempel > > Thank you! > >> ===================================================== >> WARNING: CPU: 1 PID: 21 at net/can/j1939/transport.c:1088 j1939_session_deactivate+0x5f/0x70 >> CPU: 1 PID: 21 Comm: ksoftirqd/1 Not tainted 5.14.0-rc7+ #32 >> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1 04/01/2014 >> RIP: 0010:j1939_session_deactivate+0x5f/0x70 >> Call Trace: >> j1939_session_deactivate_activate_next+0x11/0x28 >> j1939_xtp_rx_eoma+0x12a/0x180 >> j1939_tp_recv+0x4a2/0x510 >> j1939_can_recv+0x226/0x380 >> can_rcv_filter+0xf8/0x220 >> can_receive+0x102/0x220 >> ? process_backlog+0xf0/0x2c0 >> can_rcv+0x53/0xf0 >> __netif_receive_skb_one_core+0x67/0x90 >> ? process_backlog+0x97/0x2c0 >> __netif_receive_skb+0x22/0x80 >> >> Fixes: 0c71437dd50d ("can: j1939: j1939_session_deactivate(): clarify lifetime of session object") >> Reported-by: syzbot+9981a614060dcee6eeca@syzkaller.appspotmail.com >> Signed-off-by: Ziyang Xuan >> --- >> net/can/j1939/transport.c | 4 ---- >> 1 file changed, 4 deletions(-) >> >> diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c >> index bdc95bd7a851..0f8309314075 100644 >> --- a/net/can/j1939/transport.c >> +++ b/net/can/j1939/transport.c >> @@ -1079,10 +1079,6 @@ static bool j1939_session_deactivate(struct j1939_session *session) >> bool active; >> >> j1939_session_list_lock(priv); >> - /* This function should be called with a session ref-count of at >> - * least 2. >> - */ >> - WARN_ON_ONCE(kref_read(&session->kref) < 2); >> active = j1939_session_deactivate_locked(session); >> j1939_session_list_unlock(priv); >> >> -- >> 2.25.1 >> >> >