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 C1A1ACD128A for ; Wed, 3 Apr 2024 17:31:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5363E6B0089; Wed, 3 Apr 2024 13:31:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4E6BD6B008A; Wed, 3 Apr 2024 13:31:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D4CF6B008C; Wed, 3 Apr 2024 13:31:18 -0400 (EDT) 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 2019E6B0089 for ; Wed, 3 Apr 2024 13:31:18 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D1D4880C6D for ; Wed, 3 Apr 2024 17:31:17 +0000 (UTC) X-FDA: 81968911794.02.8221726 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id 133F840010 for ; Wed, 3 Apr 2024 17:31:15 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=c1FOnxEy; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712165476; 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=Glh2+m0GluHCKKgMqQxPNBPRFvPRykAuz1Z2/b326Oo=; b=XeI21hjqoNzRbUixGuePSDsgTiF2wG6TQeNYP4cGgpbgEycu/n5fLG+7jAxdEtDjkJSmv6 sR9e2knQaGOLCEPiDINj813P535bY7lnZvdNyrAEqQaApI2aZcyqLDkbrAmvsEYGrSbNmM DskjMn153yyKQhRqSIm+YLAGjMXRc3k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712165476; a=rsa-sha256; cv=none; b=vP1GGrmnOduN1/05squooSb1G72iYzNy7WYHZ0SpHmp/tXBybmjW6YucsqsZAYZFeQkqAs 8zkZ6tlPFAUQbjZDzvXjMFtTZd5A713mAgbtZe7gdzF3EkomZpMZMspwrvmMdoAU/kkTvX iC84+dDA23oiYAXb3quIrKpHgdCuan4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=c1FOnxEy; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=Glh2+m0GluHCKKgMqQxPNBPRFvPRykAuz1Z2/b326Oo=; b=c1FOnxEy7h9BU/WDvKTt1mpuop HwU+iHg/HJpcs29tZaSkx0PIN+hiNNbfOdmDFJELvT/asYTKIU8gvcZptuaofyZ3MoWYtZpYzdgbW 9kRSIuTG+1c/TEd9jGf3VgexMs5X2H9V6mAksIHq5GemQikafrMvWQ4sb1uST2Qk7+MY1mCKzxWgS FlXK/SNXVDSG39VUoL98M9orDM3u4BKdUKXUT5ePAgF7gV5awaiHs3YhsnCjoWYeLtAIHqUNGbQpB 3+FMPobzUQZrrCVAUn+ytVnrk8I/DyaBpT4pViuMQpuZP6tLl560h07EtHzqTyGaOLih1vK5WPSnn KtqkooTQ==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs4SA-000000065cN-1c2K; Wed, 03 Apr 2024 17:31:14 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , Dan Carpenter , linux-mm@kvack.org Subject: [PATCH] fix-proc-page Date: Wed, 3 Apr 2024 18:31:11 +0100 Message-ID: <20240403173112.1450721-1-willy@infradead.org> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 133F840010 X-Rspam-User: X-Stat-Signature: jg1xhhgeefdr4cnfft3zxd78pm5ri449 X-Rspamd-Server: rspam03 X-HE-Tag: 1712165475-406869 X-HE-Meta: U2FsdGVkX18Wc1WIiq9F7zn3SgOTzZ5FIWW9sLvzlr3DOzFdR7QDlzD76rN3qjWnP4Z4c4fjvyDdaTad8rfBYZ47vCf6w8kV7g6nCTnm0tEpTyb+LVqaX7Q/sT2VE7CgwQOmrydo01nYY2Bp+pBmYdoLtPiCHLiZHvrS1WU4AnCeQ73rKnh9w3aDxpAfPyuADTaO+2tc1vPCSKCSdcu3N3vCuEJSdkfiULGe+FWDoc37CbnCfojQjMOfsZOfjwWxGAyeWb6kbCvAxGMQz/8V9WvhLkNrsskbBTIxZL7eKwGw5tmozlHuuznAtts+IMZ+3NmWde+PR0N4UfE/OPSNP2qLFXqzO0O0KnwABjH2unHX1Fn7/NHL3a8NCcL1rycB/UyQBfefrL1a3BNTpiyEWPzJzd9VlAnNxdQy/EUA+f1Msql8ndpKk8rmik/PuLUXecV7NnMlRqYcLdmcnbZX9Cl33BbXLxxy0ORoiFevhA1NChzZIxle4Jsgm7fB4UZ1RLRJ2sKLK3usogVJMRDLvEdD7bVZ1wcs2VLsTwgXHR1fe7RFjuFhPpufD63/oDeNDgCbhWBaBwBBILxG6RM7De5QpuXNe5I3J1u8bWajbgSeYkU28s8U0UFkLqudlmORpY7jiVapBy/3p7vc4FU3pIfjH7/zr6a8RRyCjAuYGWlfcbWpPBlKRV42zfvHe/CH5/xyOIIHAEy/SyFRbQvhpriSfrGWAJcYvXtDNbsLcRqAKtZVrrIMI3+y7pXjPY8ZPLrL5apKwYRbGv2sB7mCMSToQmVUnKWVshFudOYu0RGFzQUgHteYkZD8CoxeiKbdEMV+3cqBTaDOyfFIxrG2pYo2y7DGuWkcPajH+HR+fgd55gX0mbArXFt2aL68AlcAmZs8ZmFT69E2hkw+YePtLPG4w0IJl2RNLj/947YQ1lPRDBiDsY7/v7kQCS4+owb11NbTtY3/rSPjnYPTVA/ BzgoG3OV hKwEyWNe539/U+PzTSOlEY7mqnfPbTITMjfk3cwzSB8EtOnt87teTWgHBfQnwGWsicnFYz5sB4bSW3zUJVqMx6xoBCxMrD2Rj5O/iFjA0DAdlDmF6gYYsmsTPYW21C3ML+nrkZ55WDbyjxIeM6lKvTwnegp8ip3IONuoLb1p4RcphkKg0KLj0g8ziIw== 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: Dan reported I'd messed up some bits vs masks here: https://lore.kernel.org/linux-fsdevel/1a6dc6a5-b5b6-494c-b94b-f6655da51bb9@moroto.mountain/T/#u Please add as a fix for "proc: rewrite stable_page_flags()" --- fs/proc/page.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index 55b01535eb22..2fb64bdb64eb 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -153,7 +153,7 @@ u64 stable_page_flags(const struct page *page) * to make sure a given page is a thp, not a non-huge compound page. */ else if (folio_test_large(folio)) { - if ((k & PG_lru) || is_anon) + if ((k & (1 << PG_lru)) || is_anon) u |= 1 << KPF_THP; else if (is_huge_zero_folio(folio)) { u |= 1 << KPF_ZERO_PAGE; @@ -205,7 +205,7 @@ u64 stable_page_flags(const struct page *page) u |= kpf_copy_bit(k, KPF_MLOCKED, PG_mlocked); #ifdef CONFIG_MEMORY_FAILURE - if (u & KPF_HUGE) + if (u & (1 << KPF_HUGE)) u |= kpf_copy_bit(k, KPF_HWPOISON, PG_hwpoison); else u |= kpf_copy_bit(page->flags, KPF_HWPOISON, PG_hwpoison); -- 2.43.0