From patchwork Wed Oct 3 05:38:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Roy X-Patchwork-Id: 978369 X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=osuosl.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jUDXfxVd"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42QJYP6Lx9zB2xk for ; Thu, 4 Oct 2018 00:38:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E6BE4872D3; Wed, 3 Oct 2018 14:38:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LmuCCEiKXpNl; Wed, 3 Oct 2018 14:38:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BAE3E87251; Wed, 3 Oct 2018 14:38:46 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9BA121C0CE2 for ; Wed, 3 Oct 2018 05:39:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 98B85884ED for ; Wed, 3 Oct 2018 05:39:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y9cS0lsnsJix for ; Wed, 3 Oct 2018 05:39:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id 371C6884D8 for ; Wed, 3 Oct 2018 05:39:55 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id m77-v6so1098473pfi.8 for ; Tue, 02 Oct 2018 22:39:55 -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:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=rSXE1F6VacTevCbA7egalmTDNA0MErWNqJnY+ifDMwQ=; b=jUDXfxVdqUFnZtdJAEhM4hzwXAEGFrcxsY6v+9x2o4ijs85qMDop7/69XgOYDFdpVn eKfshoQT4EG4LZQyx443xvkcu61gba0PrvfiN7y13E7BMyDo3aBBsjNpF/BqDwuYqamG Q2C/w4/wKArA5VhGoDxOp5V3N3MpepFyEWbzrcPMjGdLKtDNxG/e3H9T9a3Qa8WY/XfQ 6urXryjZ4fUXgNPvmFtDhmvkEms6rKoazZZQKwt0TljJfUOocSoCFDGxcoiQd2ZekjtV MhR+XXj8j0s0TgoREKHJwZNWmnKLfj1gZRuQ6BVQLqfQsjL3rkjZhsPVB9UaglRwZ+k8 xq0A== 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:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=rSXE1F6VacTevCbA7egalmTDNA0MErWNqJnY+ifDMwQ=; b=N7hPmc5a9DkMxXwzem7SIpRBSRd7OSuqMCP9/zZRAZ0LhRAA5K6SXT4B4VsO8Qc3vO vo8ZFPevZal72c5eGx7bq/nLxEoRq1CmWA7zBlA0elRJYpZ3ks3pEh/KwQEkU0pgxht1 R7PqjAJSM30Obo5AZOB2fDm5WVGp4HuaZm/CI/K3piTA3SEjaWqyLAeEg9D8jKLzOMMc h9lY/7dj9s7K8U/tbFObjDNKz9g0nG+RAdoEhIs6lTWcuc4dbzR5WTxEiNVIJopTNm+S Ri4C5erprdV4ROCOFeZVSczmB++/JxHKfYldjPrclxFNhYjumxOYQubbxlb+BmEMP2Vi 92YQ== X-Gm-Message-State: ABuFfoiJYuI1SvOWElwjhCnPIW/E8Ujb7miJD/DQc81KCA8k5VkrG6YG pUwBG5GRRyX45qI6dNpIbpo= X-Google-Smtp-Source: ACcGV63B529bQti4/dQpF5WT4ee8bJ6QnNse28ZOnylttGqDYxJ/L76jzbvbkIqohfW1mY4plx2IXw== X-Received: by 2002:a62:8145:: with SMTP id t66-v6mr19285852pfd.192.1538545194832; Tue, 02 Oct 2018 22:39:54 -0700 (PDT) Received: from E570.localdomain (c-24-21-68-121.hsd1.or.comcast.net. [24.21.68.121]) by smtp.gmail.com with ESMTPSA id x69-v6sm499091pff.175.2018.10.02.22.39.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 22:39:54 -0700 (PDT) Received: by E570.localdomain (Postfix, from userid 1000) id 9EEA61643D0; Tue, 2 Oct 2018 22:39:53 -0700 (PDT) From: Lance Roy To: linux-kernel@vger.kernel.org Date: Tue, 2 Oct 2018 22:38:51 -0700 Message-Id: <20181003053902.6910-6-ldr709@gmail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181003053902.6910-1-ldr709@gmail.com> References: <20181003053902.6910-1-ldr709@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 03 Oct 2018 14:38:45 +0000 Subject: [Intel-wired-lan] [PATCH 05/16] igbvf: Replace spin_is_locked() with lockdep X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Lance Roy Cc: netdev@vger.kernel.org, Lance Roy , intel-wired-lan@lists.osuosl.org, "Paul E. McKenney" , "David S. Miller" Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" lockdep_assert_held() is better suited to checking locking requirements, since it won't get confused when someone else holds the lock. This is also a step towards possibly removing spin_is_locked(). Signed-off-by: Lance Roy Cc: Jeff Kirsher Cc: "David S. Miller" Cc: intel-wired-lan@lists.osuosl.org Cc: Tested-by: Aaron Brown --- drivers/net/ethernet/intel/igbvf/mbx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/igbvf/mbx.c b/drivers/net/ethernet/intel/igbvf/mbx.c index 163e5838f7c2..a3cd7ac48d4b 100644 --- a/drivers/net/ethernet/intel/igbvf/mbx.c +++ b/drivers/net/ethernet/intel/igbvf/mbx.c @@ -241,7 +241,7 @@ static s32 e1000_write_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size) s32 err; u16 i; - WARN_ON_ONCE(!spin_is_locked(&hw->mbx_lock)); + lockdep_assert_held(&hw->mbx_lock); /* lock the mailbox to prevent pf/vf race condition */ err = e1000_obtain_mbx_lock_vf(hw); @@ -279,7 +279,7 @@ static s32 e1000_read_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size) s32 err; u16 i; - WARN_ON_ONCE(!spin_is_locked(&hw->mbx_lock)); + lockdep_assert_held(&hw->mbx_lock); /* lock the mailbox to prevent pf/vf race condition */ err = e1000_obtain_mbx_lock_vf(hw);