From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E807AC433DB for ; Sat, 27 Mar 2021 08:15:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4145C6192B for ; Sat, 27 Mar 2021 08:15:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4145C6192B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 676906B006C; Sat, 27 Mar 2021 04:15:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 625E16B006E; Sat, 27 Mar 2021 04:15:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C63D6B0070; Sat, 27 Mar 2021 04:15:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0173.hostedemail.com [216.40.44.173]) by kanga.kvack.org (Postfix) with ESMTP id 3230B6B006C for ; Sat, 27 Mar 2021 04:15:04 -0400 (EDT) Received: from smtpin33.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id E0A53B9F4 for ; Sat, 27 Mar 2021 08:15:03 +0000 (UTC) X-FDA: 77964943686.33.BB1FBF1 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by imf17.hostedemail.com (Postfix) with ESMTP id 5393440002D3 for ; Sat, 27 Mar 2021 08:15:01 +0000 (UTC) Received: by mail-pg1-f181.google.com with SMTP id 33so265406pgy.4 for ; Sat, 27 Mar 2021 01:15:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+9SuRsp6Io/cDI1hjneWpkO0uDGTpyrTqoHXxffNgOg=; b=Sm8Qi4ZLNKguLJdP9CxB2MawgHBEIfbU8+D5Cc1+g8m99gbexr/jBgGkd/MgTtxI+4 EL88od/C68WV5Tv/1GrQZCk2E/fZoCyGXna0xQAs3HkQasg1x9pWNxk2AgblMbag9xQD r3QxJ/M+i6sruMHNqMfeM/zZRwl4lGh40epL7dVuZIowt8+tho+ZpmWJvT6A7peZepZ0 6K5ekReujWYPmmLduh3CV//RXP31c7WT6ihyY1kgkyPq4lyUDqz5FhXY+BBnEu4WfhuR w+NFoFaKVlJS5gHTXFssE4FJrsfOB7Pnn+yN8WrR/hyWhRkhq4z4SRgQ6B/fS/ofGWic 0ZBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+9SuRsp6Io/cDI1hjneWpkO0uDGTpyrTqoHXxffNgOg=; b=CLxcgUhRAllyaiWz6mINYcyQVlywTPvFICqSvM8lOcViltMq5Y9Ogoc/krpZJTvY6U 6aS1YS0Jd//HOSqpkzDkEkQapcGPxLVCPuRrX+uGWKey/MSV/9OMuQESnajGj/3nOQV9 KK3OBsECEKb30nHX8AzO1X7Rh7CYIr5Xr3i39t4eAtLafGq9B0l9i+BzC6R6g8ofpcMG IOUavegNRCu4r73Vh22fSGqkf65fgp4d/LzY6dMcGoeQCxzuSD3wHK+Ck8SCtf5iqIMa EKXdRDT0/djkUdBWa8OdDDSoAlx2k0xzwkluxYRLyUgeEyJh6mubwq9Si+p5P2oVFvDB +4Dg== X-Gm-Message-State: AOAM532DDMH6Qz0GNuuIPL9XXVjgQffRRUwWKew/qv85sw+3XkaLT5mT w4x0y5+2K22a4by1Id5/nJg6o6O4h9ZPKfDA5Cctiw== X-Google-Smtp-Source: ABdhPJyPAY4rJVQ8oKa0JIYUA80rdLbdE0GTrkHAaoRoWJHiy2D+bfKN3zaMI/BQjnwjqCc+bPGKo7D8Ysj0UfTcnCM= X-Received: by 2002:aa7:9e5b:0:b029:1f1:5ba4:57a2 with SMTP id z27-20020aa79e5b0000b02901f15ba457a2mr16430493pfq.59.1616832901457; Sat, 27 Mar 2021 01:15:01 -0700 (PDT) MIME-Version: 1.0 References: <20210325002835.216118-1-mike.kravetz@oracle.com> <20210325002835.216118-9-mike.kravetz@oracle.com> In-Reply-To: <20210325002835.216118-9-mike.kravetz@oracle.com> From: Muchun Song Date: Sat, 27 Mar 2021 16:14:25 +0800 Message-ID: Subject: Re: [External] [PATCH 8/8] hugetlb: add lockdep_assert_held() calls for hugetlb_lock To: Mike Kravetz Cc: Linux Memory Management List , LKML , Roman Gushchin , Michal Hocko , Shakeel Butt , Oscar Salvador , David Hildenbrand , David Rientjes , Miaohe Lin , Peter Zijlstra , Matthew Wilcox , HORIGUCHI NAOYA , "Aneesh Kumar K . V" , Waiman Long , Peter Xu , Mina Almasry , Hillf Danton , Andrew Morton Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: pttfqsunscocpiik3mu5ybm1sobbuyzp X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 5393440002D3 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf17; identity=mailfrom; envelope-from=""; helo=mail-pg1-f181.google.com; client-ip=209.85.215.181 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616832901-70232 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: On Thu, Mar 25, 2021 at 8:29 AM Mike Kravetz wrote: > > After making hugetlb lock irq safe and separating some functionality > done under the lock, add some lockdep_assert_held to help verify > locking. > > Signed-off-by: Mike Kravetz Reviewed-by: Muchun Song Thanks. > --- > mm/hugetlb.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index e4c441b878f2..de5b3cf4a155 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1062,6 +1062,8 @@ static bool vma_has_reserves(struct vm_area_struct *vma, long chg) > static void enqueue_huge_page(struct hstate *h, struct page *page) > { > int nid = page_to_nid(page); > + > + lockdep_assert_held(&hugetlb_lock); > list_move(&page->lru, &h->hugepage_freelists[nid]); > h->free_huge_pages++; > h->free_huge_pages_node[nid]++; > @@ -1073,6 +1075,7 @@ static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid) > struct page *page; > bool pin = !!(current->flags & PF_MEMALLOC_PIN); > > + lockdep_assert_held(&hugetlb_lock); > list_for_each_entry(page, &h->hugepage_freelists[nid], lru) { > if (pin && !is_pinnable_page(page)) > continue; > @@ -1345,6 +1348,7 @@ static void remove_hugetlb_page(struct hstate *h, struct page *page, > { > int nid = page_to_nid(page); > > + lockdep_assert_held(&hugetlb_lock); > if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported()) > return; > > @@ -1690,6 +1694,7 @@ static struct page *remove_pool_huge_page(struct hstate *h, > int nr_nodes, node; > struct page *page = NULL; > > + lockdep_assert_held(&hugetlb_lock); > for_each_node_mask_to_free(h, nr_nodes, node, nodes_allowed) { > /* > * If we're returning unused surplus pages, only examine > @@ -1939,6 +1944,7 @@ static int gather_surplus_pages(struct hstate *h, long delta) > long needed, allocated; > bool alloc_ok = true; > > + lockdep_assert_held(&hugetlb_lock); > needed = (h->resv_huge_pages + delta) - h->free_huge_pages; > if (needed <= 0) { > h->resv_huge_pages += delta; > @@ -2032,6 +2038,7 @@ static void return_unused_surplus_pages(struct hstate *h, > struct page *page, *t_page; > struct list_head page_list; > > + lockdep_assert_held(&hugetlb_lock); > /* Uncommit the reservation */ > h->resv_huge_pages -= unused_resv_pages; > > @@ -2527,6 +2534,7 @@ static void try_to_free_low(struct hstate *h, unsigned long count, > struct list_head page_list; > struct page *page, *next; > > + lockdep_assert_held(&hugetlb_lock); > if (hstate_is_gigantic(h)) > return; > > @@ -2573,6 +2581,7 @@ static int adjust_pool_surplus(struct hstate *h, nodemask_t *nodes_allowed, > { > int nr_nodes, node; > > + lockdep_assert_held(&hugetlb_lock); > VM_BUG_ON(delta != -1 && delta != 1); > > if (delta < 0) { > -- > 2.30.2 >