From patchwork Thu Mar 16 11:06:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 70735 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp421351wrt; Thu, 16 Mar 2023 04:18:59 -0700 (PDT) X-Google-Smtp-Source: AK7set/m5aEykwYexc6RsjOMyUaMXDX8VKqYMRZGmOTb3yWa9an90wlWOwSpuyqdu6Z6AZYi76/D X-Received: by 2002:a05:6a00:11:b0:625:498b:88c8 with SMTP id h17-20020a056a00001100b00625498b88c8mr2668002pfk.26.1678965539566; Thu, 16 Mar 2023 04:18:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678965539; cv=none; d=google.com; s=arc-20160816; b=Cnd61rV3c1QMlCafedBxkoqd0y/XXC7QFotvWid/QBYb0hFZgH3+HLInAeDs+LgXPu AtcvKJnzDRIXA2SnS2XMQFD3YP5CJmnIafUIFqKrqdCDe0LLN3egXHKmnH8KVa/DKTV3 SYE74VFiVWTMJdfjQ4Hs1fMD+/ohyYNfyKRghggpfzbxOZR3OKesOw0BpQPRVgOZu5mw 042GDi65TPdOKKYtOq+ZxP7F3xJoPSbfZGkhpFMuKEBWOqZsGW9WOln7JopbOi2yV2v8 Terw17AibPsoLlsmY98Bdgfme0rjpgTOdhj8iGL4V39Wzp0N7wIVN9vWLFv2hkl7n0ep LEuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ajTuW8kXGv5xD4rOn8n789tZBhdCK8u+OH6D44lmjYQ=; b=Zc0K6alV5PHI+rgka3MrAWebzUM7KhObuBQ2dR+MGdQFWh+a72Gr1s0EA8j2GOQ24t ubTtziHYvL9BN+KLqHEzIVw4yZE80cVl+g0sRKbQ0Es6QIFFMKdDowO2k2jUfIoXeNbr uhIgopLEezK4bN6MdPp5DFibD/2RDAwp1uNFZIZi81Bby5bG6fridlggvBd6AW2MSFeK Sdm2bJPJ6oRC0gWYC8wYXfmTpjx4s80LEuYuH6MY2MHtknxQgEq7e623jU8wzNyoMLhr BA9OKl5plHCVzWODI8hDoDfbnPc8Y+VeyJSU+RTIzM638/QYSuE8M0oCmAqBbojZjnMN 9reA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b7-20020a656687000000b005033551a700si7746221pgw.438.2023.03.16.04.18.44; Thu, 16 Mar 2023 04:18:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229987AbjCPLHJ (ORCPT + 99 others); Thu, 16 Mar 2023 07:07:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230004AbjCPLHG (ORCPT ); Thu, 16 Mar 2023 07:07:06 -0400 Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73D91856A2 for ; Thu, 16 Mar 2023 04:06:58 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R631e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045176;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0Ve-MbmV_1678964815; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Ve-MbmV_1678964815) by smtp.aliyun-inc.com; Thu, 16 Mar 2023 19:06:55 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, osalvador@suse.de, vbabka@suse.cz, william.lam@bytedance.com, mike.kravetz@oracle.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] mm: compaction: fix the possible deadlock when isolating hugetlb pages Date: Thu, 16 Mar 2023 19:06:47 +0800 Message-Id: <7ab3bffebe59fb419234a68dec1e4572a2518563.1678962352.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <73d6250a90707649cc010731aedc27f946d722ed.1678962352.git.baolin.wang@linux.alibaba.com> References: <73d6250a90707649cc010731aedc27f946d722ed.1678962352.git.baolin.wang@linux.alibaba.com> MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760522969655105181?= X-GMAIL-MSGID: =?utf-8?q?1760522969655105181?= When trying to isolate a migratable pageblock, it can contain several normal pages or several hugetlb pages (e.g. CONT-PTE 64K hugetlb on arm64) in a pageblock. That means we may hold the lru lock of a normal page to continue to isolate the next hugetlb page by isolate_or_dissolve_huge_page() in the same migratable pageblock. However in the isolate_or_dissolve_huge_page(), it may allocate a new hugetlb page and dissolve the old one by alloc_and_dissolve_hugetlb_folio() if the hugetlb's refcount is zero. That means we can still enter the direct compaction path to allocate a new hugetlb page under the current lru lock, which may cause possible deadlock. To avoid this possible deadlock, we should release the lru lock when trying to isolate a hugetbl page. Moreover it does not make sense to take the lru lock to isolate a hugetlb, which is not in the lru list. Fixes: 369fa227c219 ("mm: make alloc_contig_range handle free hugetlb pages") Signed-off-by: Baolin Wang Reviewed-by: Vlastimil Babka Reviewed-by: Mike Kravetz Acked-by: Mel Gorman --- Changes from v1: - Collect reviewed tags. Thanks Mike and Vlastimil. --- mm/compaction.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mm/compaction.c b/mm/compaction.c index 7e645cdfc2e9..3df076716691 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -894,6 +894,11 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, } if (PageHuge(page) && cc->alloc_contig) { + if (locked) { + unlock_page_lruvec_irqrestore(locked, flags); + locked = NULL; + } + ret = isolate_or_dissolve_huge_page(page, &cc->migratepages); /*