Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp2165366imm; Tue, 2 Oct 2018 22:42:03 -0700 (PDT) X-Google-Smtp-Source: ACcGV61sp58lOevmx1rAp699hlNuxYN2YxZvtPBlNnUv80d2U7Cg+L9jMcBqj1dHgsbkTGOT6Fsb X-Received: by 2002:a62:449b:: with SMTP id m27-v6mr19505098pfi.82.1538545323413; Tue, 02 Oct 2018 22:42:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538545323; cv=none; d=google.com; s=arc-20160816; b=rwmSNe3bgN8LasnYEaiQQO493TuciLVuHjpwm9JMjE2y8WYbytM8lS0ZZYRwFpIoer jklMY8dlCi9rtztrhIsYFWxklaUA1J78hVKFsnvH+gzmpj6GqaXtpllj2KFQ4eg+zlpz z6L7eq27jo2hoWNZpBae8L0oKIETBZNDL+tRcy5Sy7aStvfCFIsJkcWecddW0WICJwga zaRtLJK6yt7yA2ZvGzr33pFdCDyYnFgkmdYAH2cckn1kB/pLwIN6vLo0Ac6Tz1LizWPa PICe1NhqjT8k99ahd01v0T2EA2LIFFw9tbXmzUVN3r8mihPJC1DGK0QoPX8OCw+DS2r8 Vwnw== 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=Cqq0i7ylJe74jn1ACvsUK1e2rkXVgkxFIlsiUTu7808=; b=nOIl59Sztbi4AQNs4Ii84ebEf1JxrTRAbzbcbsLaqtpZSkqtKsU2K1F4EnVHO4Y+mz cd0zL0P/UsYY+AtxE4Dvi64361tgAx7DSNlf5YDmbJBw5CtTFznbSkKRWbE3QulchvjG wpmZQtns0amtUU3EqRwGp6B8GCkq6aAxfpaZbYBUqDmousKrmAokUzx4BYIDp6BThfEN Iwc7k16I1tG9P/aL7U/KdGdgnTlGNFz/MaLWlK14sjHNe5QB++d16nQmib13mXtV5kzV yDlHfEbvtfnxtcqD9JepkZk11BzHWb95IK+aCcisOA+7330zSNW5+GbmSwhpq5PKEW+k EVTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TODim2kQ; 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 t64-v6si355534pgd.8.2018.10.02.22.41.48; Tue, 02 Oct 2018 22:42:03 -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=TODim2kQ; 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 S1727464AbeJCM1F (ORCPT + 99 others); Wed, 3 Oct 2018 08:27:05 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:40215 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727261AbeJCM1E (ORCPT ); Wed, 3 Oct 2018 08:27:04 -0400 Received: by mail-pg1-f196.google.com with SMTP id n31-v6so1018528pgm.7 for ; Tue, 02 Oct 2018 22:40:15 -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=Cqq0i7ylJe74jn1ACvsUK1e2rkXVgkxFIlsiUTu7808=; b=TODim2kQ0afi2Mzt2YdnDn6Rd872JEy7oTwTxo1OODFL08Ry8tps1uF79sXC/cAvd0 QGlleUfkBuog4XVObc41agp74je4ye8Mb1IqPALPtYXmjrw0m7YGsTOsLEWt1Bazd6HR NUXo4TLexP6xAiFrvWB96e1MSTC98VAnKdSqFlmbAgAcJ9hxsd7avHg6HgVk+YIb+efN MAj/bgk77ItIjY8nUbFIY5hKQNBrmUjVcysmQarBYnJPkxJ4Yg8lEKav80lw+rjwIgv9 aRCg8Nk/xUeBWqkrykkWNKCcUsAVAnTF8zPK8oDC3FncjA8iFrHgn69nOMf3m58sNO0C +S4g== 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=Cqq0i7ylJe74jn1ACvsUK1e2rkXVgkxFIlsiUTu7808=; b=a+u+2tTcX0cBEQUCUD7VdawCF5lDfkVYA65kH+6TkSN6E/vfRFm/Wdt7F1pOyr+Iiw Km6P8smavzi6OjFDjODyMVorGIqnYZtkFx+fAhRuampq0eY1DJU7ARrMqfaf4Ipvnc3c Jq03jcqugqyp817LGuU4vvIMJNzEoYeB7LzP0NpKCnHN4fAJeu74PlJtHDCydSMJR22X prc+pWAGUzghkBHj2ILA6mJWIUzdalCbeDyl8OZT26F0xqvhigPmqCG38ge+GJEQUnc8 lwfrEwZ+64COz2Pc0huUBShOPL5P7lT7sWf25AYrulBAIb6df4TAoRY+c9aOnlYUe/zf dmqg== X-Gm-Message-State: ABuFfogUbxP4R/0OGifYS/37stARroTsNQMStFubLrGpkzvm/WndRlrm e56wr26X6jRkw2Z5IZfj0j8= X-Received: by 2002:a65:498b:: with SMTP id r11-v6mr17528524pgs.153.1538545214843; Tue, 02 Oct 2018 22:40:14 -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 k63-v6sm481663pga.36.2018.10.02.22.40.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 22:40:14 -0700 (PDT) Received: by E570.localdomain (Postfix, from userid 1000) id 85EDD1643D0; Tue, 2 Oct 2018 22:40:13 -0700 (PDT) From: Lance Roy To: linux-kernel@vger.kernel.org Cc: "Paul E. McKenney" , Lance Roy , Andrew Morton , "Kirill A. Shutemov" , Yang Shi , Matthew Wilcox , Mel Gorman , Vlastimil Babka , Jan Kara , Shakeel Butt , linux-mm@kvack.org Subject: [PATCH 13/16] mm: Replace spin_is_locked() with lockdep Date: Tue, 2 Oct 2018 22:38:59 -0700 Message-Id: <20181003053902.6910-14-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: Andrew Morton Cc: "Kirill A. Shutemov" Cc: Yang Shi Cc: Matthew Wilcox Cc: Mel Gorman Cc: Vlastimil Babka Cc: Jan Kara Cc: Shakeel Butt Cc: --- mm/khugepaged.c | 4 ++-- mm/swap.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index a31d740e6cd1..80f12467ccb3 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1225,7 +1225,7 @@ static void collect_mm_slot(struct mm_slot *mm_slot) { struct mm_struct *mm = mm_slot->mm; - VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&khugepaged_mm_lock)); + lockdep_assert_held(&khugepaged_mm_lock); if (khugepaged_test_exit(mm)) { /* free mm_slot */ @@ -1665,7 +1665,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int progress = 0; VM_BUG_ON(!pages); - VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&khugepaged_mm_lock)); + lockdep_assert_held(&khugepaged_mm_lock); if (khugepaged_scan.mm_slot) mm_slot = khugepaged_scan.mm_slot; diff --git a/mm/swap.c b/mm/swap.c index 26fc9b5f1b6c..c89eb442c0bf 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -824,8 +824,7 @@ void lru_add_page_tail(struct page *page, struct page *page_tail, VM_BUG_ON_PAGE(!PageHead(page), page); VM_BUG_ON_PAGE(PageCompound(page_tail), page); VM_BUG_ON_PAGE(PageLRU(page_tail), page); - VM_BUG_ON(NR_CPUS != 1 && - !spin_is_locked(&lruvec_pgdat(lruvec)->lru_lock)); + lockdep_assert_held(&lruvec_pgdat(lruvec)->lru_lock); if (!list) SetPageLRU(page_tail); -- 2.19.0