From patchwork Sat Jul 25 04:16:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 11684829 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 EBE3613B4 for ; Sat, 25 Jul 2020 04:18:29 +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 BDE6820789 for ; Sat, 25 Jul 2020 04:18:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fNMp7BtZ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RFd7aDnE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDE6820789 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=0KXfYWOJ4QyPaT0nYSnWE3sr38TkLdsIJjgG5vq3W2Q=; b=fNMp7BtZob93i8TbOrEvChK0Pk +m+DPdUXNvjA+HqhjrxHZf89vA7mMszhY8/aV5zMVcCxPd9tz2hG3qDDw0OS/mwOEX9H2OD7E6mbn aO2H/Jk1HQVO6pFL3kNUor1JU91CUH8VL1Btyz9Ds19MXuHpUqLbRnCS2V7aUifSO0HckpoR4ZInm VaBQ5h/CERpFF758lmUzp+d2+odX+YvIyX+l0J416jA7zfljnoSkaR+Olz/aIZpzZE2MJLhPLM0Bt nVD+okZFdUnmmnDt2nCzKCoHE2gTtFDX6nPFRDxUKmD2ub0d0nZcTejFh5VPJkcPlY1PxNlqSsVUw OqBBQQCQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jzBc0-0001ip-6u; Sat, 25 Jul 2020 04:16:40 +0000 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jzBby-0001iU-6y for linux-arm-kernel@lists.infradead.org; Sat, 25 Jul 2020 04:16:39 +0000 Received: by mail-pj1-x1042.google.com with SMTP id gc9so6434674pjb.2 for ; Fri, 24 Jul 2020 21:16:33 -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=135skL5MQ96Dvr/82H3kQKpN9NRg8X3KcJ5GHVzkIjc=; b=RFd7aDnExwysOiwvo2UXHz7Lf4jbmEwjSFLmOZ5X61J70X3zt7EIMzIo7VRK9S9cnp fu025d3o1bE4m9Ttr2eMcu4afZxuC0CLYv41yTm9bnJCS092iSIjjK8byaxZIvidryz1 wugnb5wIl4w+Q0Uk1IWJuRJe0F/MIbLkCDDHXmMMPpofzRhzuiYCvfknpDz6vaudG1LY hJvob+PwuKgnNnE0oadPzvpeBKwVHEVa+8I88hJeFBevqb2HOe8+T34EyW1CGnaRI/8q 3UJWm6RGINkWNvdnE5SjsziubOCOoeVQdvdH5sSJ48SvNekt+IsqKTUeXtvO6kLWFacc vY3w== 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=135skL5MQ96Dvr/82H3kQKpN9NRg8X3KcJ5GHVzkIjc=; b=LwojMboYeNg20d2xi2jhCnVsZSkusElXK2TxVKuqksiZgwDFkdryNRVSHRP9MEEIQI xxeMTMuydKC8vZmUHoiYYGPYhPHX+rGH5pAK+Ugc+59Fwxw8r4PAEi/kuVdIixz01S1h ok7f4zbdA4Jbuv+5PW9xaqEFIusfoD/6vHthCaFyUzJcYtZT3YMhuNd7gTEOoTMxOg8V xfFA+PGlCT1YoiHb+gbW/TDLqhUYp3mu9kOZd04gAdS9861V8x4rXgEd3T26qKNWHxKq tNXxNqLza7jUoINR8JzMQYE+0uph+B3TrBjuHTHpjXv5/hpFh07xJBr57X0sY62i1TO4 mi9w== X-Gm-Message-State: AOAM533YvS59EM6FRGM+N+yocADuZ8RljcXLF1WdWkI8UFGQr6xswLYP 1B+qbU1BknNFPZYqv4/pQbHn7DBgDaM= X-Google-Smtp-Source: ABdhPJwgfsjKmNGiuCQ+pETA2hTJE6EinbIvOGn1RIyyotAGY9ZXW7Ya8L9oCAWE/mv3Nclk9OiHRQ== X-Received: by 2002:a17:90a:eaca:: with SMTP id ev10mr8079294pjb.151.1595650591203; Fri, 24 Jul 2020 21:16:31 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id bg6sm7137096pjb.51.2020.07.24.21.16.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jul 2020 21:16:30 -0700 (PDT) From: Xin Long To: linux-arm-kernel@lists.infradead.org Subject: [PATCH net] net: thunderx: use spin_lock_bh in nicvf_set_rx_mode_task() Date: Sat, 25 Jul 2020 12:16:23 +0800 Message-Id: <2bce353590da44ee2949fd850eb8fda282436c59.1595650583.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-20200725_001638_317378_47D80F57 X-CRM114-Status: GOOD ( 11.48 ) 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:1042 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lucien.xin[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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: Paolo Abeni , Sunil Goutham , Robert Richter , rparrazo@redhat.com 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. Reported-by: Rafael P. 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); }