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 D6F37C4332F for ; Fri, 10 Nov 2023 03:34:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6DF644401C0; Thu, 9 Nov 2023 22:34:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 68EF24401BF; Thu, 9 Nov 2023 22:34:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57E6C4401C0; Thu, 9 Nov 2023 22:34:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 4A07F4401BF for ; Thu, 9 Nov 2023 22:34:42 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 301BC40235 for ; Fri, 10 Nov 2023 03:34:42 +0000 (UTC) X-FDA: 81440627604.22.9828AD5 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf02.hostedemail.com (Postfix) with ESMTP id 19D8C8000B for ; Fri, 10 Nov 2023 03:34:38 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf02.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699587280; 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=wl3f0dMey2iPkg5BQNRHLLycD41VYwvBbiVoQfJeshQ=; b=AJKunIELf9oS+p2mr/ksHCh7vZh2duMgLaP67ODikB1AK1g+F6Qct0dXKNmVhkwdMloxNB mt6R4FEacS53/vWdgRxr/xg9e6b5xBgg42EjVVf8OcRT3tYe6WN50eLqvg2c2Osz0js1Hq yLz7OpX8SqBOBMO8c756sZkzNMBKNDM= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf02.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699587280; a=rsa-sha256; cv=none; b=R5nwHNTYWAb2pS308CnfBxPOJ1YEMn7RiYUAAtgYQ+q6u+ofK0JM+UtZ+ns/o4wDC3qbBO WA/WMr6djyfwUW52l+Db4Z5J4S3byiKwlWYkroXn3Tq9190CL6qMa00u747wy9j0hBbqD4 z2V8gBx4Bk7qlv2rP4Is/eeeDEQm9fY= Received: from dggpemm100001.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4SRPV46W0Gz1P89B; Fri, 10 Nov 2023 11:30:36 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Fri, 10 Nov 2023 11:33:49 +0800 From: Kefeng Wang To: Andrew Morton CC: , , Matthew Wilcox , David Hildenbrand , Gregory Price , Kefeng Wang Subject: [PATCH v2 3/7] fs/proc/page: respect folio head-page flag placement Date: Fri, 10 Nov 2023 11:33:20 +0800 Message-ID: <20231110033324.2455523-4-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20231110033324.2455523-1-wangkefeng.wang@huawei.com> References: <20231110033324.2455523-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100001.china.huawei.com (7.185.36.93) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 19D8C8000B X-Stat-Signature: cjhm9m9i1kzfhhdzo8t81wcf5m9zu66z X-HE-Tag: 1699587278-454247 X-HE-Meta: U2FsdGVkX18SJ4asTffVPm0rlfvZfEYW6CowkB07msw+5pZtU7eVvP2cj7OZL34zhT/lIc4oxCQKotkuys5m9iBfHjeuH0GiMFP4OU7a/3mBrpyJ0BO4SuBAgb9IpNER3CDGN5le/8Pp+go+gw8jM8hu3K42IH1NdEx5MZ+aJ+bUJmns+9NuMYGmmOk5Q7pfeoCUDobG8zHTktybY5FzVQ9+M4Jlxisu15Y3H2hiciVuNenci/BD1wWtKRnEhXMlVWEK4iNrKHkad1Mh0VZ2/P9NLvNEj3MBfVAIaq4m/8U5X1GqEzgWKAQB9XRhEfZC5Bt74qXeWQpy1k+ELxrTUZ2cqgqsvAhqJ79l+BzpkvNcHuZdHD3yvWKcRQX37wC/vI9q6kTX4F4rfxpuO7dv89k5tqKTK01gU1wrTI680Cr+xgWfJ+0DSX5BtNUUHAGbUPODEnDQw1PC8e/O6TrqPSDpBKgaLHSIa7t20f0OIAddIloBEK/hz4o9L3nLgJf8tF7X+AykhFUYTvUZA+ldlArU+YevNrGfR3pE6z6AZmRbEPU5vzubftp5KyAM1+5jUSZOQSrNp83CLKVA5oKuiic49j/XGDXEliPKARLGAgb2LKXXsHCN6/pSuFk7ws///czJR1Kzi5OxODXlYSAjGr5JMN/tBWzcRAyCjUfAJvkqH0k4c6wekAhwEVyc63X10PIX3kLZLsFvfDIZG6I7JMfg1KrPmthiiuEH7hlo/ETLALVU4X14Ft4Hs/eWnTYsucJ2zvYXzXkFGuF/MFEp96Qfe1bRAqqNVoNyIgEH22OIJPqEp1yaVQixMqOLzIh5QKXxmgJhYN7dVFNIR57At3O/xyEIeiaQzSuay7PLe9pcSpn1S/YNbyxImNFkBMbjXrryH3aHO6bOmJzE35Pz8bnQl+Lnj4ij7dB38M4qgtR8miJ0jjn1+X2+ZpZflqNZbIh9Cvq/TASe9YQCVzU p55GPT2B VcypNyrteRK7zVj/jNqaIWUx15uLgNH3D2FF1+K+C1ETi43pkTCDolQQ/dRlQxs2x5qnkVtVr3lveUQAlIfYLiilBBBpM8CXo8eflfRX6OMmNy0CBY95IAUV3Y5npPzXWdYlR+2cVOeJZeUpywpIP+h1E+r8L5hbQ6M2Nr7cgyKENORGttgg4NC8HDLUDs5v0Mmymq8j0UVsSWpqqJXj+mlesZeEtvmomSRqlv4mzGJxk34oxgaXyBfSNSwOPdlC3D4in 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: kpageflags reads page-flags directly from the page, even when the respective flag is only updated on the headpage of a folio. Since most flags are stored in head flags, make k = folio->flags, and add new p = page->flags used for per-page flags. Originally-from: Gregory Price Suggested-by: Matthew Wilcox Signed-off-by: Kefeng Wang --- fs/proc/page.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index dcef02471f91..553a7c921cb4 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -110,8 +110,7 @@ static inline u64 kpf_copy_bit(u64 kflags, int ubit, int kbit) u64 stable_page_flags(struct page *page) { struct folio *folio; - u64 k; - u64 u; + u64 k, p, u; /* * pseudo flag: KPF_NOPAGE @@ -121,7 +120,8 @@ u64 stable_page_flags(struct page *page) return 1 << KPF_NOPAGE; folio = page_folio(page); - k = page->flags; + k = folio->flags; + p = page->flags; u = 0; /* @@ -202,7 +202,7 @@ u64 stable_page_flags(struct page *page) u |= kpf_copy_bit(k, KPF_MLOCKED, PG_mlocked); #ifdef CONFIG_MEMORY_FAILURE - u |= kpf_copy_bit(k, KPF_HWPOISON, PG_hwpoison); + u |= kpf_copy_bit(p, KPF_HWPOISON, PG_hwpoison); #endif #ifdef CONFIG_ARCH_USES_PG_UNCACHED @@ -211,13 +211,13 @@ u64 stable_page_flags(struct page *page) u |= kpf_copy_bit(k, KPF_RESERVED, PG_reserved); u |= kpf_copy_bit(k, KPF_MAPPEDTODISK, PG_mappedtodisk); - u |= kpf_copy_bit(k, KPF_PRIVATE, PG_private); - u |= kpf_copy_bit(k, KPF_PRIVATE_2, PG_private_2); - u |= kpf_copy_bit(k, KPF_OWNER_PRIVATE, PG_owner_priv_1); + u |= kpf_copy_bit(p, KPF_PRIVATE, PG_private); + u |= kpf_copy_bit(p, KPF_PRIVATE_2, PG_private_2); + u |= kpf_copy_bit(p, KPF_OWNER_PRIVATE, PG_owner_priv_1); u |= kpf_copy_bit(k, KPF_ARCH, PG_arch_1); #ifdef CONFIG_ARCH_USES_PG_ARCH_X - u |= kpf_copy_bit(k, KPF_ARCH_2, PG_arch_2); - u |= kpf_copy_bit(k, KPF_ARCH_3, PG_arch_3); + u |= kpf_copy_bit(p, KPF_ARCH_2, PG_arch_2); + u |= kpf_copy_bit(p, KPF_ARCH_3, PG_arch_3); #endif return u; -- 2.27.0