From patchwork Fri Apr 30 21:07:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 12234377 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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,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 7AB9EC43460 for ; Fri, 30 Apr 2021 21:07:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C19E06145B for ; Fri, 30 Apr 2021 21:07:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C19E06145B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 15F076B0036; Fri, 30 Apr 2021 17:07:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 136BA6B006E; Fri, 30 Apr 2021 17:07:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F40706B0070; Fri, 30 Apr 2021 17:07:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0251.hostedemail.com [216.40.44.251]) by kanga.kvack.org (Postfix) with ESMTP id DC8816B0036 for ; Fri, 30 Apr 2021 17:07:48 -0400 (EDT) Received: from smtpin35.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 9B720824999B for ; Fri, 30 Apr 2021 21:07:48 +0000 (UTC) X-FDA: 78090270216.35.F32286D Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by imf06.hostedemail.com (Postfix) with ESMTP id D4767C0007E3 for ; Fri, 30 Apr 2021 21:07:50 +0000 (UTC) Received: by mail-pj1-f46.google.com with SMTP id gj14so5207520pjb.5 for ; Fri, 30 Apr 2021 14:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=53bzAf1u6JW5+ZWhmzMnt7EtP/jXlqbD8WQc/gJHHsU=; b=JmsMhoTpI0+TSwVGnU4CF2vZzkoRyGe/DvdJjvEhutMZ1eRxJXQHQOVEauAnHhJp4F 1nWQogpFyj8imgLEZWUuewf1cpy4MjclZ0g8lQ2EyCU4SwnFN/4NL7MfTkEfVCDVs3+Q 0ENcaxTlnGvnQ/tDLU1K86u9ug7Vj1s9VDkfl3Ua1/14L6tvZAZNjG1lFUkugEXrb7lX ArdkBg75K19ybReQV4x8S4vEzZwihKJS8AJNpkDBIG+z5OeTBlfYpeL8UEHCNmQGHzpg SixvO1Og3gWAe7ytI5dH0xUd866GXCPMA4l4jS1s9f/Z+SgPvWiUeMtFDZZdziDvDygJ 9e2g== 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:mime-version :content-transfer-encoding; bh=53bzAf1u6JW5+ZWhmzMnt7EtP/jXlqbD8WQc/gJHHsU=; b=qQYVxOpRfgweqcVb73qGTFqn4eWUPLrYFiXuiIkJQCjnnrCYFDUQgdq0sNR6HP/kH8 5+k3kGLwsksgDgRahwNSrmXc7ZHs66k/JXRfZO+XatiobH7LNBK8jqoDQYyZpqaLN+h1 cEDbvtfw1EbbRyFKOZ/Udsb6z/P09I08ogumPwL7wEVKoUc8X0u0xmnys9BooDBdtd7W lOZ7p7XNndm4kRmRJOnxE+n1gJscw0kb0CxQZcCkfhwkX/r2n5GdNCiMKoccO18jKieF KS02V0/0vnpPDmz36Ck5w+vOb9L9jcWNUkyqkEKqDqjXcL9P1WpIAog7PkqjZeD7r/Hi yUmw== X-Gm-Message-State: AOAM531PUAmUbMYCrqBtdbZBLgbZLYa6CYa5X/4BMu1i+9xSOPsCIOmG UBwk4O1CbhyrH4vIhvn6nUgdnL/v9JQ0fg== X-Google-Smtp-Source: ABdhPJzkU6Vr1uJDTQW28yS3VNZ/g/UPHb8qUUGaniLy4HHglcude70O4HJsgRRIgWAZSON2M8K+Fw== X-Received: by 2002:a17:902:7281:b029:ea:afe2:b356 with SMTP id d1-20020a1709027281b02900eaafe2b356mr7284919pll.16.1619816867376; Fri, 30 Apr 2021 14:07:47 -0700 (PDT) Received: from localhost.localdomain (c-73-93-239-127.hsd1.ca.comcast.net. [73.93.239.127]) by smtp.gmail.com with ESMTPSA id w1sm2746698pfu.153.2021.04.30.14.07.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 14:07:46 -0700 (PDT) From: Yang Shi To: kirill.shutemov@linux.intel.com, wangyugui@e16-tech.com, ziy@nvidia.com, hughd@google.com, akpm@linux-foundation.org Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: thp: check total_mapcount instead of page_mapcount Date: Fri, 30 Apr 2021 14:07:44 -0700 Message-Id: <20210430210744.216095-1-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=JmsMhoTp; spf=pass (imf06.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.46 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: D4767C0007E3 X-Stat-Signature: 75fzgbom4kow6w3ihjhqyubzjufy4d3j Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf06; identity=mailfrom; envelope-from=""; helo=mail-pj1-f46.google.com; client-ip=209.85.216.46 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619816870-515891 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: When debugging the bug reported by Wang Yugui [1], try_to_unmap() may return false positive for PTE-mapped THP since page_mapcount() is used to check if the THP is unmapped, but it just checks compound mapount and head page's mapcount. If the THP is PTE-mapped and head page is not mapped, it may return false positive. Use total_mapcount() instead of page_mapcount() and do so for the VM_BUG_ON_PAGE in split_huge_page_to_list as well. [1] https://lore.kernel.org/linux-mm/20210412180659.B9E3.409509F4@e16-tech.com/ Signed-off-by: Yang Shi --- mm/huge_memory.c | 2 +- mm/rmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 63ed6b25deaa..2122c3e853b9 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2718,7 +2718,7 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) } unmap_page(head); - VM_BUG_ON_PAGE(compound_mapcount(head), head); + VM_BUG_ON_PAGE(total_mapcount(head), head); /* block interrupt reentry in xa_lock and spinlock */ local_irq_disable(); diff --git a/mm/rmap.c b/mm/rmap.c index 693a610e181d..2e547378ab5f 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1777,7 +1777,7 @@ bool try_to_unmap(struct page *page, enum ttu_flags flags) else rmap_walk(page, &rwc); - return !page_mapcount(page) ? true : false; + return !total_mapcount(page) ? true : false; } /**