Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp2164773imm; Tue, 2 Oct 2018 22:41:15 -0700 (PDT) X-Google-Smtp-Source: ACcGV63EgreGTgn4L5+6oSP10K461ghbF/PpCuCrWSpGmZY2pyUVpYbyB0KI43kHc+UzPDDQVoXU X-Received: by 2002:a62:2542:: with SMTP id l63-v6mr2589096pfl.64.1538545275436; Tue, 02 Oct 2018 22:41:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538545275; cv=none; d=google.com; s=arc-20160816; b=SkrlXMWoiQqt/+u0xNp4dspymogCw2oxFLpklGRjMhy0RDuyBuvJvaMmWfdClEybxH XKoU50bxzWaXqXieSJ/MIMsTIGynjz7wiFNfGoLG6aSrvftBvc+q2ZpuoyZuYfInaHly ewafJW3KSEQXZu/svDxIN4EdR4egdg0QLk7vtQx8NBPb0vs+yx1/yWnzmVRmSv7yY+he lZAR8uL8BlnM6q19B8/KI33LN6lBQ0cNfesgmkkG11AbzP1htXnJu7iSSBCe2M42ASAO Diyzf2ELmZkfievvf/yenP9S1ImlnrMme36zrBP8t5Lk+cOdhOVcPfN7/ALiB+iRDka+ GJpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :reply-to:references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8QtZ6jt/6CJYMtPMbl8SC/kfMWABE44lEN682mSBBk0=; b=lFcDd5R1L7UY4dUEtz459wF4VXxjlANpOQO9U4uaguh6NgVCPtksLRZ2ixy//wyKuA 53muhqieIZvmkCqB+C69/d0QdtJiTbu0RMu2V5W9dcnz4voPBEQg0tGcRDFyrL/Lfoh1 YOCQsg8/BYLEtz+FAbN5YbHUwav54vR1qbGVvGD0eTIH/PGQwhBtKq455o2keyLs36Yk 7mYz0+MvdFnRGVuxI6Vt1m2SJ+YKHhL1h9K9voXjOJr6Vq+34oLcJOTDwvOKLrXMgkim a27sT+BkJlcJzhecru7otCSSMmX4Ez7QnibiblxXv7MCXdzXvvbgBr2Bik6b8L741Cjh NKmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ryFmLg+W; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k12-v6si302426pls.426.2018.10.02.22.41.00; Tue, 02 Oct 2018 22:41:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ryFmLg+W; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727493AbeJCM1I (ORCPT + 99 others); Wed, 3 Oct 2018 08:27:08 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:35880 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727261AbeJCM1H (ORCPT ); Wed, 3 Oct 2018 08:27:07 -0400 Received: by mail-pf1-f193.google.com with SMTP id b7-v6so1116002pfo.3; Tue, 02 Oct 2018 22:40:17 -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=8QtZ6jt/6CJYMtPMbl8SC/kfMWABE44lEN682mSBBk0=; b=ryFmLg+WtWVm/ZllFbDu6a018nOGqPhqNJ6EpieZLYGygICSPpaHr94/LO5YDLzqYu FqT2Jy9a1wFzvEfGv1hkJmFIMoH5dLsTpDeQZouFq5pWqBORq6V0O7a2QkFIDGr7fKOz qyYvYhYzzSETFQVn2elFP6kUreI5SIPtZ4Ok9UoUZps60ATwVe9jbJeFCFYxCqOWr2R+ jMrcUQluc+LdQ51Ss2IxRUWM6l2hTPHIQLlzmsuoF54lraml1J06tBAsyisCzooRGPHw Au//4XIca1qm1YmZbfW66VXrntnpuws042aw3Sk+2bmLebw/oc8QMVWDjBQlSFOlFoZs 42iw== 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=8QtZ6jt/6CJYMtPMbl8SC/kfMWABE44lEN682mSBBk0=; b=LVCEka51PAsh6kJeiaRQ+alS1OK7eF4eUOiVv2bUSc/NIhrKJ3MMUro2CH4DVIfvjZ ZQGRETXKAW72SootVBQWIWktAOyo5xb29vtO6h45qBXbKm99XfRBBMp9jZ8UXtTPkRGG oHczUINd8qWMpIO0BTR7N6kVPGo9N2KFbjYqzsYDVTrqBQOFyzpjDyAXjItvTqnICT6h /GbKjaDzXwGx/cIWHc3rwFSkOPkjvQLGiKt/IrzzCL5+NrNNiFh3rKKEQDFeOAaDnFOk WcvEi8TyWxYaxxrtNuJZ9F0Ks7i1Deb2Ho+9wOGU0xhCoirty5n1B2wMQ1u2+qcyLCqf diLw== X-Gm-Message-State: ABuFfohhFEROd3JklOxSIFHYZ1RQaLltCm3ZwFwGbq8NdsRl/4M0Wt7I STe/a8HB6gC6yiQ0OL03at4= X-Received: by 2002:a63:d444:: with SMTP id i4-v6mr16866887pgj.194.1538545217389; Tue, 02 Oct 2018 22:40:17 -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 19-v6sm735133pft.97.2018.10.02.22.40.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 22:40:16 -0700 (PDT) Received: by E570.localdomain (Postfix, from userid 1000) id 1EC3C1643D0; Tue, 2 Oct 2018 22:40:16 -0700 (PDT) From: Lance Roy To: linux-kernel@vger.kernel.org Cc: "Paul E. McKenney" , Lance Roy , Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH 14/16] netfilter: Replace spin_is_locked() with lockdep Date: Tue, 2 Oct 2018 22:39:00 -0700 Message-Id: <20181003053902.6910-15-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> Reply-To: Lance Roy MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Pablo Neira Ayuso Cc: Jozsef Kadlecsik Cc: Florian Westphal Cc: "David S. Miller" Cc: Cc: Cc: --- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h index 8a33dac4e805..e287da68d5fa 100644 --- a/net/netfilter/ipset/ip_set_hash_gen.h +++ b/net/netfilter/ipset/ip_set_hash_gen.h @@ -15,7 +15,7 @@ #define __ipset_dereference_protected(p, c) rcu_dereference_protected(p, c) #define ipset_dereference_protected(p, set) \ - __ipset_dereference_protected(p, spin_is_locked(&(set)->lock)) + __ipset_dereference_protected(p, lockdep_is_held(&(set)->lock)) #define rcu_dereference_bh_nfnl(p) rcu_dereference_bh_check(p, 1) -- 2.19.0