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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FB26C5475B for ; Wed, 6 Mar 2024 09:31:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 063E86B0080; Wed, 6 Mar 2024 04:31:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0136F6B0081; Wed, 6 Mar 2024 04:31:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1E796B0082; Wed, 6 Mar 2024 04:31:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CF13A6B0080 for ; Wed, 6 Mar 2024 04:31:27 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9E2BDA0607 for ; Wed, 6 Mar 2024 09:31:27 +0000 (UTC) X-FDA: 81866096214.05.EDE2F0F Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf21.hostedemail.com (Postfix) with ESMTP id E1A061C0006 for ; Wed, 6 Mar 2024 09:31:24 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf21.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709717486; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aA2gMvgYn/aicb4jrCMgu/zf8+hmHjS9arfEOLLTv/Q=; b=RbGRu2XQtOYYTLprOvQewcWe0wYVLyrlK+IoOO/ngJGIrLIN0CYBM1z5ER9Hc14qfGtgZr C6K9YQBguIbc1mZVzgSKIz9/epeA9sXd8oQasWGoGp1z1WwgQgtfGTcxgdjwkizpXVmmEu t+sqszkLeeMbHp0edB6v4ccaVeJG9O0= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf21.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709717486; a=rsa-sha256; cv=none; b=GHV55jFwOR8gehKbMlUxga5ya9pBdmxVPrOJhOVPDhjlZh0bZ86ms+bs3UyTrlqE+33aQy nQ0u1JkTkYhdQ3KkMkaVKhU3PyHyZREETszBakrBjJ6lA+7NkpE2r42bMAoWissXFVDpuF E3yeaWuxX8WeOnBH1W9XLcncmGpRTwc= Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4TqRxW6TVyz21kdG; Wed, 6 Mar 2024 17:30:39 +0800 (CST) Received: from canpemm500002.china.huawei.com (unknown [7.192.104.244]) by mail.maildlp.com (Postfix) with ESMTPS id 1D1431400DB; Wed, 6 Mar 2024 17:31:20 +0800 (CST) Received: from [10.173.135.154] (10.173.135.154) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 6 Mar 2024 17:31:19 +0800 Subject: Re: [PATCH 4/8] mm/memory-failure: Convert shake_page() to shake_folio() To: "Matthew Wilcox (Oracle)" CC: , Naoya Horiguchi , Andrew Morton References: <20240229212036.2160900-1-willy@infradead.org> <20240229212036.2160900-5-willy@infradead.org> From: Miaohe Lin Message-ID: Date: Wed, 6 Mar 2024 17:31:19 +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: <20240229212036.2160900-5-willy@infradead.org> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.173.135.154] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500002.china.huawei.com (7.192.104.244) X-Rspamd-Queue-Id: E1A061C0006 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: qdbro4otabzosymuad7gxhemewsofwqc X-HE-Tag: 1709717484-757286 X-HE-Meta: U2FsdGVkX1/mPcjvukg6yDRPFxZVW3QbaF5khgElmPfrB+3d6s1wU6cqAB4s1e/Vb4wUiECGEW8jVXI0O86C7YBCvDF2vc+vdcXy25uEE6KhAYDp0ZG0CGhJ6JJnr4u0mAsL7jZ6nVbOuMY/k/iEIlb7XUTmcTEKSrocdZEMV/eMfDVNzSGMxIlvmgNeOkvUEiGp9wMs4cCKpWSZd2uzLGi4LK5AmMU21Xi51mh8nwyxcap4sDXWumkWEE1YpIp+ktFZGU7QPel/7uQOkf4dov5pWMUvjz6F2E+sEPRcH1I+lnQp6DzL066vnZjbjZl+Kb5fEzWS/SQ3TyOfiCqHX8R4/sM9sK/ULXBekq8V6ZqDGsO4TY0zeZjbqjw6kpyK2nwQG8QbGOFjnGWg9UBpJx+HcqbCzo9aVp2cnnGq6OFuIZnS2Tdz4PHX88JfEfX7q9+mxkBr/8lXAbPJknuYEGe4prQIzWFUov4101eAG+bmr/I2HDjdm5p2U7ymeJBV5vunxeJGJoon7Rk7bamnX8ty3liWZlXrdIo6FGCAeXD6B65um5V6bpE/u3qTcEqgGT6YdEeyqtdLlvidwtIE7VFYL9fkTn8TcRx+vQwz+BFFCvBykAcHU68deXYaNbT1cn+dehXKIOvEiGlmJuh0h3Es1PdchVLX1RqDWqnWhzc5VJl98z08Y6FCBTdALZvStO2JbXhWAYmuV3pftuqyJiQkX6DHges74LB2XN8ymWLjIxXo33AC5xMN94nnqH+4NwYrwHbGi5C3NDoxd4hTDcE/6lyd/pRI2SXM7gAeE58H3fIbYxUUkpFUbUCXoyAW+92FrQ70BqLEq5vzdAWpgxD4q30jly3V 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: List-Subscribe: List-Unsubscribe: On 2024/3/1 5:20, Matthew Wilcox (Oracle) wrote: > Removes two calls to compound_head(). Move the prototype to > internal.h; we definitely don't want code outside mm using it. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > include/linux/mm.h | 1 - > mm/hwpoison-inject.c | 11 ++++++----- > mm/internal.h | 1 + > mm/memory-failure.c | 15 ++++++++++----- > 4 files changed, 17 insertions(+), 11 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 03e4841673d7..184f57cdab60 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -3962,7 +3962,6 @@ int mf_dax_kill_procs(struct address_space *mapping, pgoff_t index, > extern int memory_failure(unsigned long pfn, int flags); > extern void memory_failure_queue_kick(int cpu); > extern int unpoison_memory(unsigned long pfn); > -extern void shake_page(struct page *p); > extern atomic_long_t num_poisoned_pages __read_mostly; > extern int soft_offline_page(unsigned long pfn, int flags); > #ifdef CONFIG_MEMORY_FAILURE > diff --git a/mm/hwpoison-inject.c b/mm/hwpoison-inject.c > index d0548e382b6b..c9d653f51e45 100644 > --- a/mm/hwpoison-inject.c > +++ b/mm/hwpoison-inject.c > @@ -15,7 +15,7 @@ static int hwpoison_inject(void *data, u64 val) > { > unsigned long pfn = val; > struct page *p; > - struct page *hpage; > + struct folio *folio; > int err; > > if (!capable(CAP_SYS_ADMIN)) > @@ -25,16 +25,17 @@ static int hwpoison_inject(void *data, u64 val) > return -ENXIO; > > p = pfn_to_page(pfn); > - hpage = compound_head(p); > + folio = page_folio(p); > > if (!hwpoison_filter_enable) > goto inject; > > - shake_page(hpage); > + shake_folio(folio); > /* > * This implies unable to support non-LRU pages except free page. > */ > - if (!PageLRU(hpage) && !PageHuge(p) && !is_free_buddy_page(p)) > + if (!folio_test_lru(folio) && !folio_test_hugetlb(folio) && > + !is_free_buddy_page(p)) > return 0; > > /* > @@ -42,7 +43,7 @@ static int hwpoison_inject(void *data, u64 val) > * the targeted owner (or on a free page). > * memory_failure() will redo the check reliably inside page lock. > */ > - err = hwpoison_filter(hpage); > + err = hwpoison_filter(&folio->page); > if (err) > return 0; > > diff --git a/mm/internal.h b/mm/internal.h > index 13f4d6ccccdf..b900730f43c0 100644 > --- a/mm/internal.h > +++ b/mm/internal.h > @@ -855,6 +855,7 @@ static inline int find_next_best_node(int node, nodemask_t *used_node_mask) > /* > * mm/memory-failure.c > */ > +void shake_folio(struct folio *folio); > extern int hwpoison_filter(struct page *p); > > extern u32 hwpoison_filter_dev_major; > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index 40a8964954e5..27dc21063552 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -358,20 +358,25 @@ static int kill_proc(struct to_kill *tk, unsigned long pfn, int flags) > * Unknown page type encountered. Try to check whether it can turn PageLRU by > * lru_add_drain_all. > */ > -void shake_page(struct page *p) > +void shake_folio(struct folio *folio) It might not be a good idea to convert shake_page() into shake_folio(). shake_page() can be called without holding page refcnt. So the below race could happen: hwpoison_inject folio = page_folio(p); --> assume p is 4k page [1] shake_folio(folio) folio_test_slab(folio) test_bit(PG_slab, folio_flags(folio, FOLIO_PF_NO_TAIL) [2] VM_BUG_ON_PGFLAGS(PageTail(page), page) in folio_flags Between [1] and [2], page can become PageTail of a THP. So the VM_BUG_ON_PGFLAGS will trigger. Or am I miss something? Thanks. > { > - if (PageHuge(p)) > + if (folio_test_hugetlb(folio)) > return; > /* > * TODO: Could shrink slab caches here if a lightweight range-based > * shrinker will be available. > */ > - if (PageSlab(p)) > + if (folio_test_slab(folio)) > return; > > lru_add_drain_all(); > } > -EXPORT_SYMBOL_GPL(shake_page); > +EXPORT_SYMBOL_GPL(shake_folio); > + > +static void shake_page(struct page *page) > +{ > + shake_folio(page_folio(page)); > +} > > static unsigned long dev_pagemap_mapping_shift(struct vm_area_struct *vma, > unsigned long address) > @@ -1639,7 +1644,7 @@ static bool hwpoison_user_mappings(struct page *p, unsigned long pfn, > * shake_page() again to ensure that it's flushed. > */ > if (mlocked) > - shake_page(hpage); > + shake_folio(folio); > > /* > * Now that the dirty bit has been propagated to the >