From patchwork Wed Oct 25 20:12:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Price X-Patchwork-Id: 13436679 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 4A18AC0032E for ; Wed, 25 Oct 2023 20:12:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A82058D0014; Wed, 25 Oct 2023 16:12:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A0A858D0001; Wed, 25 Oct 2023 16:12:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 884F28D0014; Wed, 25 Oct 2023 16:12:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 75F248D0001 for ; Wed, 25 Oct 2023 16:12:46 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5671716087A for ; Wed, 25 Oct 2023 20:12:46 +0000 (UTC) X-FDA: 81385081932.12.0469CD7 Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by imf20.hostedemail.com (Postfix) with ESMTP id 89D4F1C0004 for ; Wed, 25 Oct 2023 20:12:44 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XImK2uYS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of gourry.memverge@gmail.com designates 209.85.210.65 as permitted sender) smtp.mailfrom=gourry.memverge@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698264764; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=IfZqbBPDt9YW5gpQ19AuecfZ/UwVOFBirFqhS2+TgdY=; b=kBYI85LBwizFenLl5XUerHXPImWQ3NiHcRRuGJwjGRFTGJi7NVea+94FfRatL5AVFSgXJ6 Cn7vlJCQOx2wVPTqHJlFfn8SzPmxNq3vcC993t3HWAO6m7gPIruDoTDj1BRx471RNgK1YS 19u3v+QKsAoRv0D3I9SoK9lcr6FJf/o= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XImK2uYS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of gourry.memverge@gmail.com designates 209.85.210.65 as permitted sender) smtp.mailfrom=gourry.memverge@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698264764; a=rsa-sha256; cv=none; b=Psld0DeQB22HpmRBRbkNr3ExqUFFJsM2RCb3xcD/doeH9A8jQg1AhaiznZ6H3Ao3AeU7lo s6kHQRnLiE3yTzDe23qtLt/2W/UM4/mwswwzeNYJ9nCmxmLmDCDDLQ4eyHTflcSeW/6rQA M6qkehHa92YKUZ3/VxbiTJeWodTtrpI= Received: by mail-ot1-f65.google.com with SMTP id 46e09a7af769-6ce2eaf7c2bso102535a34.0 for ; Wed, 25 Oct 2023 13:12:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698264763; x=1698869563; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IfZqbBPDt9YW5gpQ19AuecfZ/UwVOFBirFqhS2+TgdY=; b=XImK2uYSV1jWjoUhei+jQcoQGF7jxQuhLdNc3cBUsfpE2i9ovd8il8mhx9/8WCflol CeLhEkMCMCX+B3um3t9RNOwm0PJBqz1zznnUr59vz731cpQhai5Q2sgLdSb/KXekT/wh fNHo5FLxcTs5BFQDotiUbAd2/dUFru51KdQRcqvWs4UCMK3sT37rXP0vyAaUXPTAcMAA k8cShg1HOuBzhNa7m5rkY1ujA20j7Hh3b7dql/am1ONM38O5pVHGydVYPP5xwFAgfXHc TdLGQ+4R1NKFmA5FEUK/OC+8Col0ZkMIpIsvlntw2VCuP48v6nqB3XayMYZM8VnjRBtD /dNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698264763; x=1698869563; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IfZqbBPDt9YW5gpQ19AuecfZ/UwVOFBirFqhS2+TgdY=; b=vzdtnIBB+54T7/zVJ+IYQ98v5ZYu6LFDM0w8XEzND6vGVtuaQg0OqxOax32pgDnzbq uKR1Elujst5k53Z7Qr9NSv52/E0eco+g+1cyq5TiBxPUFYbsYnGQV3GKZmxtbrosXxon ft3zoDkm67Y+k6z7cZ6WzapLb9ALXwGmPIjjhQ7Shv/5b6OyPD2fUmDYRzLAUOxSIKP+ hFfettpDiiaHNw6rZoExwz24Ck/Ymzx+p4FeU9lneTWMXo78Bw6rvvKFoMWk6gE21cPr P/VhrB37CE61xDuATqt9BtcWz3yG5HnXYgWm8bSToKIZXap+EsZC//IGY799g5jGLUyv d/Ow== X-Gm-Message-State: AOJu0Yx0AyiwKAHZYMyyrDn9e9AzHXRO64pzRCRMCJ3yDylEQujPTDLc 4RojQdJRtAItZH4A3KKphVgp6l5d9xcI X-Google-Smtp-Source: AGHT+IHKO2keZsxnyC2gRGZxJPxOiMMDcNjtUVnne3MFD7NareZ1ReXAfwCnFkLgIvbmb3KMwQk7Dw== X-Received: by 2002:a9d:6d91:0:b0:6bd:b0c9:a8d with SMTP id x17-20020a9d6d91000000b006bdb0c90a8dmr17046190otp.25.1698264763510; Wed, 25 Oct 2023 13:12:43 -0700 (PDT) Received: from fedora.mshome.net (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id t62-20020a818341000000b005a7bbd713ddsm5274739ywf.108.2023.10.25.13.12.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 13:12:43 -0700 (PDT) From: Gregory Price X-Google-Original-From: Gregory Price To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, willy@infradead.org, david@redhat.com, vbabka@suse.cz, naoya.horiguchi@linux.dev, linux-kernel@vger.kernel.org, Gregory Price Subject: [PATCH] kpageflags: respect folio head-page flag placement Date: Wed, 25 Oct 2023 16:12:37 -0400 Message-Id: <20231025201237.948993-1-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: 89D4F1C0004 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: orwpgf5ogfy7ehjzpc7kqy8jaqrbqx3t X-HE-Tag: 1698264764-103490 X-HE-Meta: U2FsdGVkX1++T4G6/viO8b+qD6CvHCiifu0lt5Q0L8GR1SgvgNpOQxfH35AUa5rbr+e4BKwcLaqW9EWDsHMbbo1ftlnCpqcEQl9H8/PxLuFswaGnw848dUH5gP+uOuMYpx7qMno/8srVQB1E1iZKRRP/cOVd7OhgQ+aMtJm3qT9EVp1+jne+WMvkxA3u6sytJkLslxuZxzAZE2vfnpmf7ZkpryYs+7mOowPvAX9nwjUGCaE9O53FdPr9uUug3MS+jxxNQbbOHEEDS2/N/WryJaHM/jxbXfw5IIT0nhRdXmaXHGZL1p4uqE6l7UxOhJ9WPSRwaxDr9VscEDYji8DSbRn9W/Q/UPZsKykq9SrxL1PNymlUn7LD6i+Y0tQMz5Dgz9vPdBhQEFfOw7nHSFazTl14Gf0M3cNUl9ha1slsxGYnI2Eb2rOaCTj+lWhwLDQcqgzldSUk19Mr+Gy6KDDMUx4i/o7MiGBz4bZGY5J7qUTD+B5xdJGXDm8HQRrxFRwWBEuM6AWxYJq0q5beHsQgRk2CcRlJAlekomPB53hSyj9o6dPRSEdhKQqfxDco3ELDQW9H5lsYBRMjwnof18V7j2Cn5EQ8ir/gxyuOEn5JHNUVnJTuYIV8ohokjeRsPgF9PJ8qvThXExiJc2LCTNMlnoyBP9sOEPMzYHLGjrWT2fYIt7FX2reK/TtP3He1aPb94m7JjI3DSFxaSxbF2BTqybd/oywyGPlKvk8MRE04rqSlvEDVApfP44Qt5WxTbfK8JU6Rv34x6nnthYanoSytzviDNkmgy7PVYl4lwv2AoCOLLHROz3hmPopZbT2TWQLhUo0oddWhjn00CnfvycagW8b3N0UpjxA8+EUmdnitvIrPSYrVfDXNxNv9+iIXAlSI0qD09Ksnojadt2yT69YDL8tbnSF1fsPIllOMhIsYKkvTdNM0a+vBwDFRpO+Ht3JXDIerOoT2li9Kqr1zam3 CUO5hqud Kn1oPW+G5sd/KfBOf+6SS3g0A/PiXLkapbOdp7IMc53SkLl9KgO1FTfOPRh5cLetlncyv16onWF5roM95/J7TDw2m+VowbVCTYdRG98H9mK40ziJijXtXB7iT32M31H7a8xawvyIawYfvtSLdhCp74EBLdM9msVMGXV5IGZM6CaxAPk+h978ca8StIZUc7UjQHBe+LEPUOlwDxf9vID4iEfeKpH7NOXf0Fx0XJVm5kCuPBpYDhKi8sy1Qd9kjQHC4aV1UVABt0a9mcETLzcnv9p5E21rXn1eok4xBCQMc2aOJSt0NAvy4Y/tN9RlBXG4jqqSXPufslwsI1sQvu05T++MNZsTT7/cFGKEosvzC5WvhTd4Phzq3/4qh0mKcaf73+eHmQaOcLDOokemFRc6CCgZKMEjIagJ6svUbCaILWTTNBj0u3uToLuRRv0Ebuqo/7P18U6uu/IF9nqT+dlBGXaTBkQ== 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. Update bitchecks to use PAGEFLAG() interfaces to check folio for the referenced, dirty, lru, active, and unevictable bits. Signed-off-by: Gregory Price --- fs/proc/page.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index 195b077c0fac..958fb2311108 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -188,20 +188,31 @@ u64 stable_page_flags(struct page *page) u |= 1 << KPF_SLAB; u |= kpf_copy_bit(k, KPF_ERROR, PG_error); - u |= kpf_copy_bit(k, KPF_DIRTY, PG_dirty); + + if (PageDirty(page)) + u |= 1 << KPF_DIRTY; + u |= kpf_copy_bit(k, KPF_UPTODATE, PG_uptodate); u |= kpf_copy_bit(k, KPF_WRITEBACK, PG_writeback); - u |= kpf_copy_bit(k, KPF_LRU, PG_lru); - u |= kpf_copy_bit(k, KPF_REFERENCED, PG_referenced); - u |= kpf_copy_bit(k, KPF_ACTIVE, PG_active); + if (PageLRU(page)) + u |= 1 << KPF_LRU; + + if (PageReferenced(page)) + u |= 1 << KPF_REFERENCED; + + if (PageActive(page)) + u |= 1 << KPF_ACTIVE; + u |= kpf_copy_bit(k, KPF_RECLAIM, PG_reclaim); if (PageSwapCache(page)) u |= 1 << KPF_SWAPCACHE; u |= kpf_copy_bit(k, KPF_SWAPBACKED, PG_swapbacked); - u |= kpf_copy_bit(k, KPF_UNEVICTABLE, PG_unevictable); + if (PageUnevictable(page)) + u |= 1 << KPF_UNEVICTABLE; + u |= kpf_copy_bit(k, KPF_MLOCKED, PG_mlocked); #ifdef CONFIG_MEMORY_FAILURE