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 5B211C071FD for ; Sat, 20 Apr 2024 02:51:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BEC046B0083; Fri, 19 Apr 2024 22:51:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B9BCF6B0085; Fri, 19 Apr 2024 22:51:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A95956B0087; Fri, 19 Apr 2024 22:51:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8D2D56B0085 for ; Fri, 19 Apr 2024 22:51:09 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E93F61C1D11 for ; Sat, 20 Apr 2024 02:51:08 +0000 (UTC) X-FDA: 82028383416.08.2E81584 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id C55458000B for ; Sat, 20 Apr 2024 02:51:06 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=s3iILuB+; dmarc=none; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713581467; 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:in-reply-to:references:references:dkim-signature; bh=s2FH+8vqQm67u6hInWQscZRvoUgnyhqNAlj8cATZmvM=; b=h10+QSuNUbxWRjeop55M2pwe9c1+/rjR5BeCutqmx1EBgLleBfp6TE7SwXXpDVA2SvrtoT sveKL0T74hnjubuKcFLDxpEhl29PX/c8KfSPATInX/6ZzOc7Dg0u0FyMXDImBHEmeWBtDr K58TpFxcrZnYADVCD+Ae98mfTTE4eSY= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=s3iILuB+; dmarc=none; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713581467; a=rsa-sha256; cv=none; b=8dh/sYPb1Roa4ZgNL/zPkb+wNsCLEfECd0hES3yYaQo4d21AeBwpMziqhD5XBqvDt3ooff I5I8umawn+b5dxh8GWSbv8ZrvmGUHDtEmJ61/NrP7oGnaw1ExbS9CChtGiNviTJUF5OSZd KTTNm1bR9HXm+tDd5cGFqcfxlXyROJ0= 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: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=s2FH+8vqQm67u6hInWQscZRvoUgnyhqNAlj8cATZmvM=; b=s3iILuB+2U9U5Sf+rSqY//nvsg qKv7z72lINSg/Rl6cxNpLaALWFeGolmsQnNBzHaqmn8hI5tmv5N6TELdls0mwGfdIGszHNFspAcu9 PfSYZLR6vcA+6YiVXzrB8j8u1MrsEvKLBzCUDd6SFfuZ2nHrEcyW/NjC/BPL9kANsR4ofd2NPr9+2 arReARGEPhMGwnGz/Ng5n1eOGyh79nnjxnXxG7/jyLEeP5a3k2btQrAbwadEiMyj/icWxAQ1IrtEX HHHkODNqPfrYFDUn2GHAteEQ7J6QO845iY+6zhmmP2EHZCXB2ll9xIgxe45UnyETCfYAp4S4OGwcP q3UNTH3A==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1ry0og-000000095h1-2jVl; Sat, 20 Apr 2024 02:51:02 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 30/30] mm: Remove PG_error Date: Sat, 20 Apr 2024 03:50:25 +0100 Message-ID: <20240420025029.2166544-31-willy@infradead.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240420025029.2166544-1-willy@infradead.org> References: <20240420025029.2166544-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: C55458000B X-Stat-Signature: bu8sz6tc8nk9h8sf4euhyhd3z9sidjfn X-HE-Tag: 1713581466-482874 X-HE-Meta: U2FsdGVkX1825D2h6WO6hfmbC3z/49IuyqGaS2b/0KolW2ZH8YnewOGHvRA2l7kJx3SowpKgOKu1hA34Qxd2ehk6mdQIjrGKJZ9CPX65dWE3o+jBNMn76kQAiLSKh5j3Nz9lgBka2Tdxr5phfDFciTzj/uTREtxiDmY71aH3EQI02OPQGcpIt0qBA1SxJowE6Lj912va5Bc0DFLDht9tlupFdfGYMnqLW4yEC3pp+KQ6IzpNJTx7jJuq271/QhgyNBgCL8VkadGnSacKSS35r/PAM68lveTxUyuHx9/0yfNp3YwHFvL774D8s09XSk4bvWp1MPanZLSFMDcjAY2rCZPfRpSQsGh1bEATM1oF5bKJXelDhLd3kqw9RpezmxS2h9eRHVKX1oHtFwGpNkfWhoDQkRKBxfTwNrWmhlKI1gbpolv1h14ljJXGxVSVB5JKtVOSmBpRKGr9eYI2SHYo87sHodRruw2C5VMCLoKWbMx6lF7uNK7r8tZler73zfeIYLn8epuWFN0GzLrZT5CvtWy9o/4X/td33bKv0LpJCEc4RIL+nGCWiEaTnEdnxryy4wtJ1KQ8CQpH8Q6D91GXU+FPTjuoRveUUAiE5PyAByKyvTbUIieEMsONXz+W7CLPLyWFfLFbZCKQJ94Pw8V8w2Pux+ET6NGbnRjijlc3jN0YwOz58CLwIaXRxbooMrXr/Jl0iDRdyn1OOLd01keuWT0/YsQd5JT9eMpoNm0a0JX7tlP/uvhEPvl0qbdI/YE3nRhTekk5NVbrWWrd83xx2m0dTpbp5VvHckcseHbje9EuM8VMMeQukZkP3wTgBszgznSxSW+ExuI3QqdfP1iLqsdQe5QzIEbpKoPHQWDDETcOw+ymY5zhhmf1//+c50RLxzYS5sCwbMk9ooE3SkwrAh3BP5QHMgpJJKXugejOFBgpbHIiasm1IDCp3RZh/JF315ycIXOvdpbZA3kOrFl RFKfBiJa pWoDTuMAwHII0O0rgphjKrUOAvrjWGv0n4fSTjrQ9P3C+AKJbO8K6VuNxoN8xojHqcZaqLawFUwJDP42tb40wLOU6NWPazs0x/D52dtBaJDP6K0PYAbKUuQeaxVohnh8zRetwfW5xxOVDJyvggbKutw5gegNtlripbVCBQLNJhSI5q6Lk/gEFcoogT/zKcVrWiM4g6/g8xMg37S7LS3ynQh9ZfC8z7YaonN9jYzuGabd5otY59wasl90snFvW3LpgasRdUOExbhOnHt9g1rfq1acCNDMEzdTFVQLY 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: The PG_error bit is now unused; delete it and free up a bit in page->flags. Cc: linux-mm@kvack.org Signed-off-by: Matthew Wilcox (Oracle) --- fs/proc/page.c | 1 - include/linux/page-flags.h | 6 +----- include/trace/events/mmflags.h | 1 - include/uapi/linux/kernel-page-flags.h | 2 +- mm/migrate.c | 2 -- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index 2fb64bdb64eb..05eb6617668a 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -186,7 +186,6 @@ u64 stable_page_flags(const struct page *page) #endif u |= kpf_copy_bit(k, KPF_LOCKED, PG_locked); - u |= kpf_copy_bit(k, KPF_ERROR, PG_error); u |= kpf_copy_bit(k, KPF_DIRTY, PG_dirty); u |= kpf_copy_bit(k, KPF_UPTODATE, PG_uptodate); u |= kpf_copy_bit(k, KPF_WRITEBACK, PG_writeback); diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index a9a6e0f7367e..931820c8ea95 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -71,8 +71,6 @@ * PG_referenced, PG_reclaim are used for page reclaim for anonymous and * file-backed pagecache (see mm/vmscan.c). * - * PG_error is set to indicate that an I/O error occurred on this page. - * * PG_arch_1 is an architecture specific page state bit. The generic code * guarantees that this bit is cleared for a page when it first is entered into * the page cache. @@ -108,7 +106,6 @@ enum pageflags { PG_waiters, /* Page has waiters, check its waitqueue. Must be bit #7 and in the same byte as "PG_locked" */ PG_active, PG_workingset, - PG_error, PG_owner_priv_1, /* Owner use. If pagecache, fs may use*/ PG_arch_1, PG_reserved, @@ -188,7 +185,7 @@ enum pageflags { */ /* At least one page in this folio has the hwpoison flag set */ - PG_has_hwpoisoned = PG_error, + PG_has_hwpoisoned = PG_active, PG_large_rmappable = PG_workingset, /* anon or file-backed */ }; @@ -511,7 +508,6 @@ static inline int TestClearPage##uname(struct page *page) { return 0; } __PAGEFLAG(Locked, locked, PF_NO_TAIL) FOLIO_FLAG(waiters, FOLIO_HEAD_PAGE) -PAGEFLAG(Error, error, PF_NO_TAIL) TESTCLEARFLAG(Error, error, PF_NO_TAIL) PAGEFLAG(Referenced, referenced, PF_HEAD) TESTCLEARFLAG(Referenced, referenced, PF_HEAD) __SETPAGEFLAG(Referenced, referenced, PF_HEAD) diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index e46d6e82765e..4f2a18a11970 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -100,7 +100,6 @@ #define __def_pageflag_names \ DEF_PAGEFLAG_NAME(locked), \ DEF_PAGEFLAG_NAME(waiters), \ - DEF_PAGEFLAG_NAME(error), \ DEF_PAGEFLAG_NAME(referenced), \ DEF_PAGEFLAG_NAME(uptodate), \ DEF_PAGEFLAG_NAME(dirty), \ diff --git a/include/uapi/linux/kernel-page-flags.h b/include/uapi/linux/kernel-page-flags.h index 6f2f2720f3ac..ff8032227876 100644 --- a/include/uapi/linux/kernel-page-flags.h +++ b/include/uapi/linux/kernel-page-flags.h @@ -7,7 +7,7 @@ */ #define KPF_LOCKED 0 -#define KPF_ERROR 1 +#define KPF_ERROR 1 /* Now unused */ #define KPF_REFERENCED 2 #define KPF_UPTODATE 3 #define KPF_DIRTY 4 diff --git a/mm/migrate.c b/mm/migrate.c index 2594a00279f1..c0acb52ac4e4 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -561,8 +561,6 @@ void folio_migrate_flags(struct folio *newfolio, struct folio *folio) { int cpupid; - if (folio_test_error(folio)) - folio_set_error(newfolio); if (folio_test_referenced(folio)) folio_set_referenced(newfolio); if (folio_test_uptodate(folio)) -- 2.43.0