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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 E5101C433DB for ; Fri, 26 Mar 2021 02:13:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B6CA861A2B for ; Fri, 26 Mar 2021 02:13:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230439AbhCZCNH (ORCPT ); Thu, 25 Mar 2021 22:13:07 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:14905 "EHLO szxga06-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230013AbhCZCMg (ORCPT ); Thu, 25 Mar 2021 22:12:36 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4F656m2S9Qzkg4x; Fri, 26 Mar 2021 10:10:56 +0800 (CST) Received: from [10.174.178.163] (10.174.178.163) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.498.0; Fri, 26 Mar 2021 10:12:32 +0800 Subject: Re: [PATCH 8/8] hugetlb: add lockdep_assert_held() calls for hugetlb_lock To: Mike Kravetz , , CC: Roman Gushchin , Michal Hocko , Shakeel Butt , Oscar Salvador , David Hildenbrand , Muchun Song , David Rientjes , Peter Zijlstra , Matthew Wilcox , HORIGUCHI NAOYA , "Aneesh Kumar K . V" , Waiman Long , Peter Xu , Mina Almasry , "Hillf Danton" , Andrew Morton References: <20210325002835.216118-1-mike.kravetz@oracle.com> <20210325002835.216118-9-mike.kravetz@oracle.com> From: Miaohe Lin Message-ID: Date: Fri, 26 Mar 2021 10:12:32 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20210325002835.216118-9-mike.kravetz@oracle.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.178.163] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021/3/25 8:28, 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. > Looks good to me. Thanks. Reviewed-by: Miaohe Lin > Signed-off-by: Mike Kravetz > --- > 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) { >