From patchwork Tue Aug 4 07:02:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 11699803 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D4B07913 for ; Tue, 4 Aug 2020 07:04:18 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 DE98822B45 for ; Tue, 4 Aug 2020 07:04:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cxlSLwVS"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IcudVeWr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE98822B45 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=b+AUYHvYwP4wUxkV3Q06VktNpAjaU9GZ2GRtoHpPSNY=; b=cxlSLwVSvP2pTbpoeMyzDfL40Y 3t8MEt73XNv3zXA4+FEFNLoL3TJ2EfJW/C6VhIG0bPWviD+8qWTVWyGsurh31c/2x6Fn7/zIi8/TR z24la2Ktunm12GoW1Y4SLERKhZRzbsLm8jSNlHoZG8TlxOIFAycpaoMAMMxd+5w56EE4Cjzy8+yCP VldgqJj+BxXtgVTivBiiqwnboSwmiX0O13pP8CSl8F2uIHQKbSatYYvS10L3D1mCu9XNpON37FC7W 3yWhVWhpVf1k7r+N9MORMfQzBZK1f0WBSDnmuwIOIvFO/eHE98wjZ8iwa8Oypnp8qFqeggXa5EZ7m BwmKwdLw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2qyJ-0004Nt-BL; Tue, 04 Aug 2020 07:02:51 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2qyD-0004N7-Nh for linux-arm-kernel@lists.infradead.org; Tue, 04 Aug 2020 07:02:50 +0000 Received: by mail-pg1-x541.google.com with SMTP id x6so6405363pgx.12 for ; Tue, 04 Aug 2020 00:02:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=KwzYEz8QDEZpIN6Vw8GeaQReHKRrUa12ee8r7FthIiA=; b=IcudVeWrL7dQCqVgD8n2ApWnl67uaLGGGI3LtrWdjEiCi2YPbYoHP9Gn1ASDHMjoyn Cc2b60mFkOyN5k8Bt7L9W2Em2/qYvIWEYF0GYmQtGa0h99XGhs2DWEvsXzhcI0a2I3lQ GC0+g9wPiiiIPIqQ/9BH76uOWIdWurjQs1DWDon9+5FOJiI+4dDcxG7hiPmO+q3AwTb1 bJtUahWWAPhvRzvEsNKLbCyl50YTELWsrrZHP2As6zwqMXfzDzuyGXYKpZjc8yWaAfs+ ufPsyYok/nwmt51jesuPWTdxaTLu3HhK9KBXLohAsTDp3+IC/n1mFrPLsdLQxlUdHenN pOdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KwzYEz8QDEZpIN6Vw8GeaQReHKRrUa12ee8r7FthIiA=; b=ROz1BsELGlQswSaMRp/TcllikOz1hv1wGN8MkC7rDevAFtd4uigBhq798s/D0Hzsdb Fol4qP64YCLUSOUjmcTIHFW0nHMM1AmmRnTAolHo3ke7+QP4XS89zM9VO0MRKtt3+Rb/ 46HF0jRpVRKlmIZVVrH/mGuSgG1s6OEgn+ggtqq32ZYg9/vzvvvReEyOvQmoVdckPH5O 94nvr3IOpA3V/kcJVnw1Wnqq1yZcgKQSURHgjskJlseDP96hwr2QoZDy4GDJMnMv/mm0 LkVWoe4e26MBL1RjFrSI15m01MUwGRHRZ9GxeBcw50Wjzb4yr9RnbLqSNAogN9wWcgvy F78A== X-Gm-Message-State: AOAM531kYv9aCjQ+OIcjW/RO6A/jkqOOP4Y1VnRqLVv4X1N7L10w/Gbe NTNqLZviOjaIaZTHZj0lAbk8tsrPDRk= X-Google-Smtp-Source: ABdhPJySYRULaAKMmcocmEbFK3D9UAkViitwF1QBq/YnSfBp/c32JDqNlLSLRzsMD9tmJVHxwSMRrA== X-Received: by 2002:a05:6a00:84d:: with SMTP id q13mr19730886pfk.167.1596524558367; Tue, 04 Aug 2020 00:02:38 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id 144sm11396484pfu.114.2020.08.04.00.02.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Aug 2020 00:02:37 -0700 (PDT) From: Xin Long To: network dev Subject: [PATCHv2 net] net: thunderx: use spin_lock_bh in nicvf_set_rx_mode_task() Date: Tue, 4 Aug 2020 15:02:30 +0800 Message-Id: <9809b6b99bf5ba2dc8d1440c7d4fc93d04a7504a.1596524550.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200804_030245_840493_762B6D6D X-CRM114-Status: GOOD ( 14.13 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:541 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lucien.xin[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sunil Goutham , Robert Richter , dnelson@redhat.com, Paolo Abeni , davem@davemloft.net, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org A dead lock was triggered on thunderx driver: CPU0 CPU1 ---- ---- [01] lock(&(&nic->rx_mode_wq_lock)->rlock); [11] lock(&(&mc->mca_lock)->rlock); [12] lock(&(&nic->rx_mode_wq_lock)->rlock); [02] lock(&(&mc->mca_lock)->rlock); The path for each is: [01] worker_thread() -> process_one_work() -> nicvf_set_rx_mode_task() [02] mld_ifc_timer_expire() [11] ipv6_add_dev() -> ipv6_dev_mc_inc() -> igmp6_group_added() -> [12] dev_mc_add() -> __dev_set_rx_mode() -> nicvf_set_rx_mode() To fix it, it needs to disable bh on [1], so that the timer on [2] wouldn't be triggered until rx_mode_wq_lock is released. So change to use spin_lock_bh() instead of spin_lock(). Thanks to Paolo for helping with this. v1->v2: - post to netdev. Reported-by: Rafael P. Tested-by: Dean Nelson Fixes: 469998c861fa ("net: thunderx: prevent concurrent data re-writing by nicvf_set_rx_mode") Signed-off-by: Xin Long --- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index 2ba0ce1..a82c708 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -2042,11 +2042,11 @@ static void nicvf_set_rx_mode_task(struct work_struct *work_arg) /* Save message data locally to prevent them from * being overwritten by next ndo_set_rx_mode call(). */ - spin_lock(&nic->rx_mode_wq_lock); + spin_lock_bh(&nic->rx_mode_wq_lock); mode = vf_work->mode; mc = vf_work->mc; vf_work->mc = NULL; - spin_unlock(&nic->rx_mode_wq_lock); + spin_unlock_bh(&nic->rx_mode_wq_lock); __nicvf_set_rx_mode_task(mode, mc, nic); }