From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MIME_HTML_ONLY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A376C433E0 for ; Fri, 5 Mar 2021 22:50:33 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A0716509A for ; Fri, 5 Mar 2021 22:50:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A0716509A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Dsjck5h33z3dLD for ; Sat, 6 Mar 2021 09:50:30 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=dzHvRppa; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=ljp@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=dzHvRppa; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Dsb194kdDz3dDk for ; Sat, 6 Mar 2021 04:52:44 +1100 (AEDT) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 125HYdwG071633; Fri, 5 Mar 2021 12:52:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : mime-version : content-type : from : in-reply-to : date : cc : content-transfer-encoding : message-id : references : to; s=pp1; bh=XYvSGSbFD6hEZvF8XWFNRckdOT7+nEhKdDes9UyeorY=; b=dzHvRppaA6RoUEC6/PcMcDh90PMzUJNPgkLifgKXe2fqscrrr1yrBfVmBXisk00kiip/ imSxf8N71jaCP6m1AHALyTnH4wdcHq5+FjUmQmiXvYWMrAShhXaRJwwwGOAf9IwkBJR1 yJCXMZ99w++8duQDgN8/W5M24ImIh5MA5YEsu2sGMN3kdnaqX3LJ5lHkYzlQgcWMX4wc Q2Pof9dPolaQ40ajdSnbFlLc4tPRGxOPla7Q2goH3ztXiTviCI5pHTxNJ72Y6TL6BejS PXXWZnKZyMP4SYIRRLGuTeXd/tR9vvbnT+1tLoli2tMm+IcGmVzR/e4zTpLTVtRCDFYG cQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 373rejhu7g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Mar 2021 12:52:33 -0500 Received: from m0098399.ppops.net (m0098399.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 125HaD5K076998; Fri, 5 Mar 2021 12:52:33 -0500 Received: from ppma01wdc.us.ibm.com (fd.55.37a9.ip4.static.sl-reverse.com [169.55.85.253]) by mx0a-001b2d01.pphosted.com with ESMTP id 373rejhu6s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Mar 2021 12:52:33 -0500 Received: from pps.filterd (ppma01wdc.us.ibm.com [127.0.0.1]) by ppma01wdc.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 125HZjRK011109; Fri, 5 Mar 2021 17:52:32 GMT Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by ppma01wdc.us.ibm.com with ESMTP id 36ydq9s2rr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Mar 2021 17:52:30 +0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 125HqRvv18416122 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Mar 2021 17:52:27 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D29FA78066; Fri, 5 Mar 2021 17:52:27 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 32E247805E; Fri, 5 Mar 2021 17:52:26 +0000 (GMT) Received: from [9.85.170.191] (unknown [9.85.170.191]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTPS; Fri, 5 Mar 2021 17:52:25 +0000 (GMT) Subject: Re: [PATCH v1] ibmvnic: remove excessive irqsave Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Content-Type: text/html; charset=us-ascii X-Apple-Auto-Saved: 1 X-Apple-Mail-Remote-Attachments: YES From: Lijun Pan X-Apple-Base-Url: x-msg://38/ In-Reply-To: <20210305084839.2405-1-angkery@163.com> X-Apple-Windows-Friendly: 1 Date: Fri, 5 Mar 2021 11:24:47 -0600 X-Apple-Mail-Signature: SKIP_SIGNATURE Content-Transfer-Encoding: quoted-printable Message-Id: References: <20210305084839.2405-1-angkery@163.com> X-Uniform-Type-Identifier: com.apple.mail-draft To: angkery X-Mailer: Apple Mail (2.3608.80.23.2.2) X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.761 definitions=2021-03-05_13:2021-03-03, 2021-03-05 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 impostorscore=0 phishscore=0 spamscore=0 priorityscore=1501 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103050090 X-Mailman-Approved-At: Sat, 06 Mar 2021 09:50:03 +1100 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Junlin Yang , linux-kernel@vger.kernel.org, Jakub Kicinski , netdev@vger.kernel.org, Lijun Pan , Dany Madden , paulus@samba.org, Sukadev Bhattiprolu , linuxppc-dev@lists.ozlabs.org, David Miller Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev"


On Mar 5, 2021, at 2:48 AM, angkery <angkery@163.com> = wrote:

From: Junlin Yang <yangjunlin@yulong.com>

ibmvnic_remove locks multiple spinlocks while disabling = interrupts:
spin_lock_irqsave(&adapter->state_lock, = flags);
spin_lock_irqsave(&adapter->rwi_lock, = flags);

As reported by coccinelle, the = second _irqsave() overwrites the value
saved in 'flags' by = the first _irqsave(),   therefore when the second
_irqrestore() comes,the value in 'flags' is not valid,the = value saved
by the first _irqsave() has been lost.
This likely leads to IRQs remaining disabled. So remove the = second
_irqsave():
spin_lock_irqsave(&adapter->state_lock, flags);
spin_lock(&adapter->rwi_lock);

Generated by: ./scripts/coccinelle/locks/flags.cocci
./drivers/net/ethernet/ibm/ibmvnic.c:5413:1-18:
ERROR: nested lock+irqsave that reuses flags from line = 5404.

Fixes: 4a41c421f367 ("ibmvnic: = serialize access to work queue on remove")
Signed-off-by: = Junlin Yang <yangjunlin@yulong.com>
---

Acked-by: Lijun Pan <ljp@linux.ibm.com>

Changes in = v1:
a.According to Christophe Leroy's = explanation, update the commit information.
b.Add = fixes tags.

= drivers/net/ethernet/ibm/ibmvnic.c | 4 ++--
1 file = changed, 2 insertions(+), 2 deletions(-)

diff= --git a/drivers/net/ethernet/ibm/ibmvnic.c = b/drivers/net/ethernet/ibm/ibmvnic.c
index = 2464c8a..a52668d 100644
--- = a/drivers/net/ethernet/ibm/ibmvnic.c
+++ = b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -5408,9 +5408,9 @@ = static void ibmvnic_remove(struct vio_dev *dev)
* after = setting state, so __ibmvnic_reset() which is called
* from = the flush_work() below, can make progress.
*/
- = spin_lock_irqsave(&adapter->rwi_lock, flags);
+ = spin_lock(&adapter->rwi_lock);
= adapter->state =3D VNIC_REMOVING;
- = spin_unlock_irqrestore(&adapter->rwi_lock, flags);
+ = spin_unlock(&adapter->rwi_lock);

= spin_unlock_irqrestore(&adapter->state_lock, flags);

--
1.9.1



=