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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 BE2E0C433E0 for ; Sun, 10 Jan 2021 12:41:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 72E2122ADF for ; Sun, 10 Jan 2021 12:41:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 72E2122ADF 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 06D2E8D001C; Sun, 10 Jan 2021 07:41:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0419A8D0019; Sun, 10 Jan 2021 07:41:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E73C08D001C; Sun, 10 Jan 2021 07:41:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0201.hostedemail.com [216.40.44.201]) by kanga.kvack.org (Postfix) with ESMTP id D0CCC8D0019 for ; Sun, 10 Jan 2021 07:41:37 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 9AF22181AEF15 for ; Sun, 10 Jan 2021 12:41:37 +0000 (UTC) X-FDA: 77689826634.18.owl89_28156af27504 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 734CA100ED0FE for ; Sun, 10 Jan 2021 12:41:37 +0000 (UTC) X-HE-Tag: owl89_28156af27504 X-Filterd-Recvd-Size: 6343 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Sun, 10 Jan 2021 12:41:36 +0000 (UTC) Received: by mail-pl1-f175.google.com with SMTP id v3so8041776plz.13 for ; Sun, 10 Jan 2021 04:41:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I3gDuLjEjqpY5hJrgoP0zbm1oa1HSY0dQY30oFlgAYQ=; b=rWeFaHhdx26QIcu4oFq9jt4fdoiwTTEMHiX0GcDFnvXCNSEGXKNUOhSowItykhSP+s MU2lB7VGPKOpR26dagIJbSrZ0z4DQUseP8TI1Hr8218icPt2CE59nrthBPoGc5+2L0py GldzLHOZ/qQ22eoxfirNB/sX7sTFkGnYQS4NQwdHXLZ95tD8fo3K17CN+WvUYYuirXhr TpF+IMj8yyO/hRNwe/nRuTb4oq+CLbVTwC4ZMsGRxI8qPFxdbhi6TNcVuZv0oM+ZLqNg 4jK9h5RHhQ6APoWqIDlwAfx9/2k67z/4jNjM/HkPqSz2S5XOK+/rLaWpDAKaMrYgYVJT m2bg== 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:mime-version:content-transfer-encoding; bh=I3gDuLjEjqpY5hJrgoP0zbm1oa1HSY0dQY30oFlgAYQ=; b=Ks7BOxjb2LhGL+pSmzoJe+m/NHFMinlV/jPc++yitwHNxk0ENIvOKlYRMOcGR5ffaU t25BuIcKyuFDCOgz7wNuCIRnx9NWnuJ+LiId5WWVbtNcRFQYg73desL1e0/aMc79DgEO Ph2/xXnV4KJQON/0OZZyzxvK6ejS7mENpFkTNrAe+Ps5NaB3ePsIMYJUXJ2JJritB1jM wyLY+hT23NmjvLw0grLNDxIugvcQELANBoH1c/Zu6AG75cpqKH7lIkI0ktTp/TabLEEF /tA/4DPCnYwbtD6IkyeGPedPFZ1TEqgORl72mpArO7JAikes8vz58xYXZkiJ2r4FQXju /y6w== X-Gm-Message-State: AOAM532EiIQTR30rVSWgm9WQtNH236Wa0vo+cD0L0FOsbS++11MxipZu VA07/8+fWVYpPka+wzSz3FWCYQ== X-Google-Smtp-Source: ABdhPJzWrZDYsSoIxdfRxNA612sIivazrBh4X8Socv1b7/yltfVgFXyC4/ghwU7KuryYYJvTKH3CpQ== X-Received: by 2002:a17:90a:4402:: with SMTP id s2mr12942473pjg.37.1610282495977; Sun, 10 Jan 2021 04:41:35 -0800 (PST) Received: from localhost.localdomain ([139.177.225.247]) by smtp.gmail.com with ESMTPSA id p9sm16176960pfq.136.2021.01.10.04.41.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jan 2021 04:41:35 -0800 (PST) From: Muchun Song To: mike.kravetz@oracle.com, akpm@linux-foundation.org Cc: n-horiguchi@ah.jp.nec.com, ak@linux.intel.com, mhocko@suse.cz, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song , stable@vger.kernel.org Subject: [PATCH v3 3/6] mm: hugetlb: fix a race between freeing and dissolving the page Date: Sun, 10 Jan 2021 20:40:14 +0800 Message-Id: <20210110124017.86750-4-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210110124017.86750-1-songmuchun@bytedance.com> References: <20210110124017.86750-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: There is a race condition between __free_huge_page() and dissolve_free_huge_page(). CPU0: CPU1: // page_count(page) =3D=3D 1 put_page(page) __free_huge_page(page) dissolve_free_huge_page(page) spin_lock(&hugetlb_lock) // PageHuge(page) && !page_count(page) update_and_free_page(page) // page is freed to the buddy spin_unlock(&hugetlb_lock) spin_lock(&hugetlb_lock) clear_page_huge_active(page) enqueue_huge_page(page) // It is wrong, the page is already freed spin_unlock(&hugetlb_lock) The race windows is between put_page() and dissolve_free_huge_page(). We should make sure that the page is already on the free list when it is dissolved. Fixes: c8721bbbdd36 ("mm: memory-hotplug: enable memory hotplug to handle= hugepage") Signed-off-by: Muchun Song Cc: stable@vger.kernel.org --- mm/hugetlb.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 4741d60f8955..4a9011e12175 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -79,6 +79,21 @@ DEFINE_SPINLOCK(hugetlb_lock); static int num_fault_mutexes; struct mutex *hugetlb_fault_mutex_table ____cacheline_aligned_in_smp; =20 +static inline bool PageHugeFreed(struct page *head) +{ + return page_private(head + 4) =3D=3D -1UL; +} + +static inline void SetPageHugeFreed(struct page *head) +{ + set_page_private(head + 4, -1UL); +} + +static inline void ClearPageHugeFreed(struct page *head) +{ + set_page_private(head + 4, 0); +} + /* Forward declaration */ static int hugetlb_acct_memory(struct hstate *h, long delta); =20 @@ -1028,6 +1043,7 @@ static void enqueue_huge_page(struct hstate *h, str= uct page *page) list_move(&page->lru, &h->hugepage_freelists[nid]); h->free_huge_pages++; h->free_huge_pages_node[nid]++; + SetPageHugeFreed(page); } =20 static struct page *dequeue_huge_page_node_exact(struct hstate *h, int n= id) @@ -1044,6 +1060,7 @@ static struct page *dequeue_huge_page_node_exact(st= ruct hstate *h, int nid) =20 list_move(&page->lru, &h->hugepage_activelist); set_page_refcounted(page); + ClearPageHugeFreed(page); h->free_huge_pages--; h->free_huge_pages_node[nid]--; return page; @@ -1504,6 +1521,7 @@ static void prep_new_huge_page(struct hstate *h, st= ruct page *page, int nid) spin_lock(&hugetlb_lock); h->nr_huge_pages++; h->nr_huge_pages_node[nid]++; + ClearPageHugeFreed(page); spin_unlock(&hugetlb_lock); } =20 @@ -1770,6 +1788,14 @@ int dissolve_free_huge_page(struct page *page) int nid =3D page_to_nid(head); if (h->free_huge_pages - h->resv_huge_pages =3D=3D 0) goto out; + + /* + * We should make sure that the page is already on the free list + * when it is dissolved. + */ + if (unlikely(!PageHugeFreed(head))) + goto out; + /* * Move PageHWPoison flag from head page to the raw error page, * which makes any subpages rather than the error page reusable. --=20 2.11.0