From patchwork Wed Oct 3 05:38:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Roy X-Patchwork-Id: 10624313 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 32E6315A7 for ; Wed, 3 Oct 2018 05:40:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DB0E285FC for ; Wed, 3 Oct 2018 05:40:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1119128608; Wed, 3 Oct 2018 05:40:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D79B9285FC for ; Wed, 3 Oct 2018 05:40:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 016DF6B000C; Wed, 3 Oct 2018 01:40:17 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F185A6B000E; Wed, 3 Oct 2018 01:40:16 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF8E06B000D; Wed, 3 Oct 2018 01:40:16 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id 9F39A6B000A for ; Wed, 3 Oct 2018 01:40:16 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id e6-v6so1543373pge.5 for ; Tue, 02 Oct 2018 22:40:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:reply-to:mime-version :content-transfer-encoding; bh=Cqq0i7ylJe74jn1ACvsUK1e2rkXVgkxFIlsiUTu7808=; b=TUZuQkUI5RaH6dQItWurj9hA04kfzYaZ2eNPFv9w18+nbetNTK6+jCtku/4PeTsk4k uN4/xObc/7DvGTA/osuJqpBbvYxjLdjyhdz1izFwSrQKFz37oZh+VSvot0DjaGEfhRGO SWClFYh6SKtilvBoA6moSempQ+ByXmOI9zFMxB/v5IggJ9m5c0wp876dLIjlMMojMRPl O92IKbhaCo3EBKPPVXjCzd7Wu7PevuaroVqUDcAUtiZkoQ+Oh5fNd9JcyAI3osSphqOJ XVeD53nczkpqBSOiY4pPj5+aLDcr94jyf55gMxlgn/SstLMqtASEdJNZMeRmJtYVlJhn IbCA== X-Gm-Message-State: ABuFfogpcJmEgtVgiz9QytljljsZeDmqCHgd6m5ao3wyiM9bDymq+q/u RXcNmvZ4jYImXr1eAttedMs6Mb8wLczi0EGIj4GtlK1kqrLVFPYW2/I74F3e6DhaBo6TxdiREzp PA3KdD30dWnxglYusRsjlU1IHMtzS7EgX9ukrbEyeFf6FgcGPJK7bVPlaZhWOw8RC9sJLEZRqmM Uu+XlXhzPD16RE87HeqEOwVi5XWSrZyqAA0sLJy/WZTL0lhZmYruoup9M+8drlkZwjqr7l9+iSJ 0FOiOT23MsoKD3ksZoiOj6ncWh3PkA7CUEIajLI3XvRLVM2Z+7+d42WKfnyaVYyHIW8SliwuWDT 7cYplpfuJ+LRJ1vwLCQnOo/+jX97PmnfhYMC/Li2w5AH0VPd0gpgYTcqAT4dNruH/SHM/8YsdD+ u X-Received: by 2002:a62:215b:: with SMTP id h88-v6mr19553180pfh.233.1538545216308; Tue, 02 Oct 2018 22:40:16 -0700 (PDT) X-Received: by 2002:a62:215b:: with SMTP id h88-v6mr19553136pfh.233.1538545215161; Tue, 02 Oct 2018 22:40:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538545215; cv=none; d=google.com; s=arc-20160816; b=w0a+eGq1LJiXb4sY6wMnMm8zAg16W6rUvZNmdTuucsPtcbIx64qYZSaECqmV34k8Sh O20F029EhR0uexSU+uZwahW9YqTXdCOWyNwJMmbqQo5YGWWCUAIgfOMIk6/o93PDPe2u HJN+h6gCtStTX31bZOGHWlbS/ZcwxdXshTDZwvt6c0GY8tr356TuaUvm6RGAu1TtRj/a bQElO4BLubTc3//8bXiIxcMOHatyJOy0pIW7k4Z+hrkY6Ez4DBvYWBN47q+92IS1Se+R R8ZFtoeh7yi2qfb2lsGhsRnftG8/KrS9ZVVA1+7/qVjVoTWWh5AnlaxLAX6lLKkb0VSG c5Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=Cqq0i7ylJe74jn1ACvsUK1e2rkXVgkxFIlsiUTu7808=; b=PZsJXE4eBsfBlau2bxVrg78Su0fIV4ynxb9qHh3WQFX/N9BUcrpxaCeNThYRo4SPnq CXeWaXiSjywpaVWDDkaQ9HkwbTBav7/HfQ7UlHVOk4ZqDxRg/eSljEM+H2cT0R35K+vh 0Fykcb1OJ0WJXNkZnQ6l2BYeb/tO7hclTOtql69Ait6qoHbilyutjWZb9WVXey/qs8Yh wqGPaLC8G9uhV03apcpzuYi/eQ/ppJrVRCFpXs10BcE7qLMVMRF1kLTuR7HwE4WEC8YN VwphfKQABFj7JURfMCuPww59sHXPn764PMnbxtsCDPRyzjfCoFqhU1W/kWa8g5ZSZ02u SABg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TODim2kQ; spf=pass (google.com: domain of ldr709@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ldr709@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id u5-v6sor183634pgq.14.2018.10.02.22.40.15 for (Google Transport Security); Tue, 02 Oct 2018 22:40:15 -0700 (PDT) Received-SPF: pass (google.com: domain of ldr709@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TODim2kQ; spf=pass (google.com: domain of ldr709@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ldr709@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com 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-Smtp-Source: ACcGV630wSmUemq7owD39h99/1VVD3bHq1FR7Vrp6lgXQgUZZ/z0BfAxshyt/MgO22QnN9GF6Qq8Sw== 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 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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: Acked-by: Vlastimil Babka --- 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);