From patchwork Fri Mar 10 10:32:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 13169123 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 B2109C64EC4 for ; Fri, 10 Mar 2023 10:32:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C14F36B0072; Fri, 10 Mar 2023 05:32:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B010F6B0074; Fri, 10 Mar 2023 05:32:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B1588E0002; Fri, 10 Mar 2023 05:32:18 -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 68CEA6B0072 for ; Fri, 10 Mar 2023 05:32:18 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3B1A11C6D06 for ; Fri, 10 Mar 2023 10:32:18 +0000 (UTC) X-FDA: 80552623956.20.C173543 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf14.hostedemail.com (Postfix) with ESMTP id 30367100005 for ; Fri, 10 Mar 2023 10:32:15 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=QZUez2xQ; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=6Z79qYSG; spf=pass (imf14.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678444336; 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=ynur/BmfAMIVmRdtwJq2oWLnRqKGEqStLCEoP0mvCEk=; b=RWk3a0P98avJxPzzCsfChplmgeuFbkbEdWEATzuUallKYXqD/a/Yk1xVJwrmn5GIffNTcT geIOKGppZZUOLj93GT3hdgaATo87AjtJM63dDfwBLUHH4duU6RDj+TL5olb/uE2424nvna Ehhj1JVlhAplfrG5nZyDdA3GGToSNZQ= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=QZUez2xQ; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=6Z79qYSG; spf=pass (imf14.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678444336; a=rsa-sha256; cv=none; b=0b4068Mm017vomdBlaLvsHNxAXpixcYrhHQUhtpKgz/3DDEnUwdpL2ne1Vtlz17ZbI5KUl yqTMGm84A1M96TYRUP5ZbRQqBjg7MLOTVMCe1tQnqA+m2bU5EghCAtCkZMg/4hfvktnsrH IpOnz6W8wKfpJCitxjXIIDf/VVL/vaU= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 05EA922A63; Fri, 10 Mar 2023 10:32:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1678444335; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ynur/BmfAMIVmRdtwJq2oWLnRqKGEqStLCEoP0mvCEk=; b=QZUez2xQfWCqt88eXGyNmcCVFR+o4XrrQNVUvQAQC/gEF+ZnoGWlvqfW173ZktqDIya0KM u7XqzWIx/f89HNDO83sLN6bThJZxwxp1m/86qDIFrPF8PQS+hjBI21MXT96fg2uEKNHTqg 3VIb01dFL8+mA7J4ebsbtB44Rhs+7+s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1678444335; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ynur/BmfAMIVmRdtwJq2oWLnRqKGEqStLCEoP0mvCEk=; b=6Z79qYSGrVUYEvCogt8O06nAIvmuaiI9MxaAVBbTvrKtYfNLDNSRW2zjRe6BzTeZchX+gP 1d3ni6+77ilnXoCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C9A91139F9; Fri, 10 Mar 2023 10:32:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id WEKPMC4HC2SsXQAAMHmgww (envelope-from ); Fri, 10 Mar 2023 10:32:14 +0000 From: Vlastimil Babka To: Christoph Lameter , David Rientjes , Joonsoo Kim , Pekka Enberg Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>, Roman Gushchin , Andrew Morton , linux-mm@kvack.org, rcu@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, netdev@vger.kernel.org, linux-doc@vger.kernel.org, Vlastimil Babka Subject: [PATCH 3/7] mm, page_flags: remove PG_slob_free Date: Fri, 10 Mar 2023 11:32:05 +0100 Message-Id: <20230310103210.22372-4-vbabka@suse.cz> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310103210.22372-1-vbabka@suse.cz> References: <20230310103210.22372-1-vbabka@suse.cz> MIME-Version: 1.0 X-Rspamd-Queue-Id: 30367100005 X-Stat-Signature: zc1zoqe4rd53w5xof3trt4pzg53zywip X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1678444335-927306 X-HE-Meta: U2FsdGVkX19IFCmzPCteOvwKyqBih69eZEL/0wobf5tlQjr2cgIy6FjLNvx2hoR9VlpekWNrbYHLoRWztIl/QIjORCgTI4erG4KS6Qe0tbLRSdDvYdU9JaW+AMef/Km8vUP+ThuR/dIqlxZBAlulqy+AnGfazFYDQ9yWSrSTPvgl1fShshY3eKmwgfjkTStkqisHdD4ho2SriNDA0ThgWBwFmu7sRbO3m1E0WAemrAkxMGSbMoYTNoftWDaWZ944xAoJRJkQb+9CsxuW6ML8HGKgpQXugKQUakcaNGH8kS+pYa1flcjNzdYMT0Nt/0VOtAu8ZVpwxAZyV3A4yF823omGdjm6mXsG5rMp63x5jpkW3JnfBZKin+Y/LIM9sXCbysZxYM4DQVLzqlTJ+yfG4NYhifh0Kidk2b2TJJbU1j1zNYVgvTQy9IsuqM3uBWyTrw2ZxrKbho/TE2iPRXY9q8pyEBzOsdkE2wRnUxkhcU8A/rHtM3Xy15PGaOAPtpM2eBJYRs0DOrlEqlR/Zf3rPdG0/8wXf4j61NBV7EAyA/QiUZsDFD1zQX4tHzHznhluLUhBSBM8evggaXmepDoWyY+FcfFR2rZyujdhUCo4ycm1ReTVj8Mk1UJYwKftINgSNi0ZBd/9A0itV0J3OWwdyfpiBpn8k2nm8rdlHADcKHEKrBGUTCFiGjNTjNoBn5Bv3uxIEWOVM1dDdDXW0VLSvLfhMawbGimjRg94XfYDVGokWueB8wLHUbFdwD8ZnMkTaChqvtbYebwx54yuCfOdTDVaZHyHe/e+D1GRSTAJ/AQje5VadIibJJv6excJ/uV8hm/+0II9esGyPYbBrcxqrtGr04yBYlhd3SMi4YWj0BV2BLzahkL4F9oLmnWbEHIq3vf5pMDg3ca0PnmKAAmW17HMb1KxJtrlF3kMsGbdOu/ZE1LftOHS4xLxqBLO1aFi+AvYwATRH8LGqQKPuMm k5fK3202 MaDXJhI78aSMjzhxVV9F3q120PTn4d2zRFUJtCMRB3yELUwNbCrtE1Dlfvnc9ZuldN3YQKXXWcOyRwmNZvT8WSo//Z+40dC84JGteh9DQ0AyR1r2k0wWvedCsuL1NkPHWTXVbxw8K6fUQzQOg7JzWE3xRR5SKFzkqp56uplUNaMM95mdin/0F1rOzEnV6aZOTgSn58xqvCHDYwKmDnGoPhnpouHpJl7z5qyq74LIv0Zen1o5D521aBBCXLDGSC0MDik10l87A8XYyQm5Mav5vCLROw9FgAFA898PJlbBzxhdafSr5EWed3fSs3etwDQi4o/f8 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: With SLOB removed we no longer need the PG_slob_free alias for PG_private. Also update tools/mm/page-types. Signed-off-by: Vlastimil Babka Acked-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Acked-by: Lorenzo Stoakes --- include/linux/page-flags.h | 4 ---- tools/mm/page-types.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index a7e3a3405520..2bdc41cb0594 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -174,9 +174,6 @@ enum pageflags { /* Remapped by swiotlb-xen. */ PG_xen_remapped = PG_owner_priv_1, - /* SLOB */ - PG_slob_free = PG_private, - #ifdef CONFIG_MEMORY_FAILURE /* * Compound pages. Stored in first tail page's flags. @@ -483,7 +480,6 @@ PAGEFLAG(Active, active, PF_HEAD) __CLEARPAGEFLAG(Active, active, PF_HEAD) PAGEFLAG(Workingset, workingset, PF_HEAD) TESTCLEARFLAG(Workingset, workingset, PF_HEAD) __PAGEFLAG(Slab, slab, PF_NO_TAIL) -__PAGEFLAG(SlobFree, slob_free, PF_NO_TAIL) PAGEFLAG(Checked, checked, PF_NO_COMPOUND) /* Used by some filesystems */ /* Xen */ diff --git a/tools/mm/page-types.c b/tools/mm/page-types.c index 381dcc00cb62..8d5595b6c59f 100644 --- a/tools/mm/page-types.c +++ b/tools/mm/page-types.c @@ -85,7 +85,6 @@ */ #define KPF_ANON_EXCLUSIVE 47 #define KPF_READAHEAD 48 -#define KPF_SLOB_FREE 49 #define KPF_SLUB_FROZEN 50 #define KPF_SLUB_DEBUG 51 #define KPF_FILE 61 @@ -141,7 +140,6 @@ static const char * const page_flag_names[] = { [KPF_ANON_EXCLUSIVE] = "d:anon_exclusive", [KPF_READAHEAD] = "I:readahead", - [KPF_SLOB_FREE] = "P:slob_free", [KPF_SLUB_FROZEN] = "A:slub_frozen", [KPF_SLUB_DEBUG] = "E:slub_debug", @@ -478,10 +476,8 @@ static uint64_t expand_overloaded_flags(uint64_t flags, uint64_t pme) if ((flags & BIT(ANON)) && (flags & BIT(MAPPEDTODISK))) flags ^= BIT(MAPPEDTODISK) | BIT(ANON_EXCLUSIVE); - /* SLOB/SLUB overload several page flags */ + /* SLUB overloads several page flags */ if (flags & BIT(SLAB)) { - if (flags & BIT(PRIVATE)) - flags ^= BIT(PRIVATE) | BIT(SLOB_FREE); if (flags & BIT(ACTIVE)) flags ^= BIT(ACTIVE) | BIT(SLUB_FROZEN); if (flags & BIT(ERROR))