From patchwork Wed Oct 3 05:38:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Roy X-Patchwork-Id: 978368 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="VhDoom+T"; 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 42QJYP6LvszB2xb for ; Thu, 4 Oct 2018 00:38:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 123D987270; 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 mMVBO7Gx_gv2; Wed, 3 Oct 2018 14:38:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 84DD887234; 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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A20E21C0CE2 for ; Wed, 3 Oct 2018 05:39:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9163226536 for ; Wed, 3 Oct 2018 05:39:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YvjSiUZEwbtH for ; Wed, 3 Oct 2018 05:39:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by silver.osuosl.org (Postfix) with ESMTPS id 6B0BF2626E for ; Wed, 3 Oct 2018 05:39:52 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id n31-v6so1018097pgm.7 for ; Tue, 02 Oct 2018 22:39:52 -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=5L6Z4aW4+1t2LE/MND/iINCiEdG9eaFMJEfCbvDLBaQ=; b=VhDoom+TY1K77b9/Qh+vlNgbAUyKBqHN74GHpYz7GAFqydYOaKD9cc7x9P2HLvJgVq vHPbLvZCxfNFff+tmizReKcLb+vIE/2LKf6vsRzY/a3SJl26c0+QaCvImgSslRE6kZdc Tgc72eC+38Sojg0tfUa27CwNHqLk9zxRG4uuR3MblN39ogHvq/s0vKSTyvMLQG47+LbV 4mzfWukTnRP+eQq52vnoeeD85IDsBnPmVrpgsJWWC8LjyUT8DGtb7qPbTz2bOKUCPVXr 1pdeK9VDZKq0f7eKuEHQWgoJEM9iNmZSNqYan2t6PdpV5MJw1h3ax+jhcLk+dI41LWWM Kc+w== 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=5L6Z4aW4+1t2LE/MND/iINCiEdG9eaFMJEfCbvDLBaQ=; b=kgN1fe2lAzloGcYnL6DtUvov92EcQkZDzd0tGSvWv6xNZy6FNGQG3f1DIT0SM4O9hh If5y5rJ5INJ6kT4l9uP2j5lXSNMSnbQuy3AAWjVJg2XHll+4ysAYkWWGTmPh5b15g1JH W63FNv1CMM37cpFuKoPc14GjJ1qNQUJZ5LfLmi1wCEEWX8rQT2iQqqFJnriXn0HkkIUf LiNbAM2GO9yZ0NDc6pnd8plRJupKM70h7dlgtJ3EUTK5mG+GyRX/fBeDgrt2TSPX5Lc+ li12/bAat2ujALYYd2rb8cn5SFV8H6LobiovnX9noGTxW+ooSZQlF7flrqFI1c9s4O06 Vfbg== X-Gm-Message-State: ABuFfoi/5pA2/S6w1pUEMKlp/carvLfQ2X+zAhK8oa4qkoRSJikrz5LL cFCBfc+M/590aDDt8R1xY1E= X-Google-Smtp-Source: ACcGV60WvxLiMsH35V+1rzrINgt5FwS72CIvI4rivm2nYxtxFcPmuEu2cpUg3gQ2PO8XYuwUo4vCOA== X-Received: by 2002:aa7:8598:: with SMTP id w24-v6mr3587383pfn.77.1538545192026; Tue, 02 Oct 2018 22:39:52 -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 w23-v6sm363481pgi.18.2018.10.02.22.39.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 22:39:51 -0700 (PDT) Received: by E570.localdomain (Postfix, from userid 1000) id BAF131643D0; Tue, 2 Oct 2018 22:39:50 -0700 (PDT) From: Lance Roy To: linux-kernel@vger.kernel.org Date: Tue, 2 Oct 2018 22:38:50 -0700 Message-Id: <20181003053902.6910-5-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 04/16] i40e: 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: Andrew Bowers --- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index ac685ad4d877..8ce3471723d3 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -1489,8 +1489,7 @@ int i40e_del_mac_filter(struct i40e_vsi *vsi, const u8 *macaddr) bool found = false; int bkt; - WARN(!spin_is_locked(&vsi->mac_filter_hash_lock), - "Missing mac_filter_hash_lock\n"); + lockdep_assert_held(&vsi->mac_filter_hash_lock); hash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) { if (ether_addr_equal(macaddr, f->macaddr)) { __i40e_del_filter(vsi, f);