From patchwork Fri Mar 17 10:43:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 13178862 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 A619FC74A5B for ; Fri, 17 Mar 2023 10:43:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 560AB6B0074; Fri, 17 Mar 2023 06:43:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5100A6B0078; Fri, 17 Mar 2023 06:43:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D76B6B007B; Fri, 17 Mar 2023 06:43:27 -0400 (EDT) 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 164EE6B0074 for ; Fri, 17 Mar 2023 06:43:27 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C3A76161751 for ; Fri, 17 Mar 2023 10:43:26 +0000 (UTC) X-FDA: 80578053612.17.EDC75E4 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf20.hostedemail.com (Postfix) with ESMTP id B507B1C001E for ; Fri, 17 Mar 2023 10:43:24 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=IIfCQbwF; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=JiVFg+HO; spf=pass (imf20.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=1679049805; 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=NFIOCOGE4+gnWEsQLJoiR09v/cWZg0CYXPe4OxiWK88=; b=Qi8JKt+X9HjGQznEOCZDutIFBkQ7IfIuURPUHyBeE8bE47QlLBemNp7CSaTabjYmOZUgHz ZobKnYHOjjj/TXVUGSUu6GQZbT8knCxSuWku+bFmjkpQi2iphlAor6cYWZR9d0HFmpi7kU Aov/Th5ETm0AUFUyamgBogG7PWxCzZY= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=IIfCQbwF; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=JiVFg+HO; spf=pass (imf20.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=1679049805; a=rsa-sha256; cv=none; b=5/nbbZnLYL3xNnmIXDgUWP056EqrMVKVrc/q/wJ5zn9S/M0pJOuvDeJzeQDOUltj5levJ3 PcjOgrHlV+Jpu678mMKj3WgmNN3VebKJQ8AokOU4fCZbRND8Zk0IiYctt77AZfmozjghFv GKnKFTfFjGq4JVRTXbEu+4GoCu+eMnM= 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 10CAC21A6F; Fri, 17 Mar 2023 10:43:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1679049803; 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=NFIOCOGE4+gnWEsQLJoiR09v/cWZg0CYXPe4OxiWK88=; b=IIfCQbwFMxyjvD3/CEB/1oAWxBEiCEe8ZVXYc+BxqdDZr4rEAmVIICMlkfntfyZG0iIpNa pvMgHTtIa0kumpAKtZ0ZVfIPLijpm6W+EI3FSGS70KqSiQ3RY6VdwY8+X1pSIkczRCWqtz vNEMZoJrBFinL+sXyaunDXV0457vZiQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1679049803; 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=NFIOCOGE4+gnWEsQLJoiR09v/cWZg0CYXPe4OxiWK88=; b=JiVFg+HObo45Zdm5MnMt6MuM1rc2U6pKEKZS8SAZjTDjnbme9BJNB7mMYm+5Dwu42It35u TYOaJ1XwSLDUaZCg== 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 D26751346F; Fri, 17 Mar 2023 10:43:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id aNzYMkpEFGRgdwAAMHmgww (envelope-from ); Fri, 17 Mar 2023 10:43:22 +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, linux-doc@vger.kernel.org, Vlastimil Babka , Lorenzo Stoakes Subject: [PATCH v2 2/6] mm, page_flags: remove PG_slob_free Date: Fri, 17 Mar 2023 11:43:03 +0100 Message-Id: <20230317104307.29328-3-vbabka@suse.cz> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230317104307.29328-1-vbabka@suse.cz> References: <20230317104307.29328-1-vbabka@suse.cz> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: B507B1C001E X-Rspam-User: X-Stat-Signature: rmuatpu6ypr7dfyf3s9jdfnb1xwpupz6 X-HE-Tag: 1679049804-481952 X-HE-Meta: U2FsdGVkX1/NW9SdkfHqrtOHLN+nmvVZbHlxQ4Dx4S0xloqV/gUV2bSWkOn8QkI488dTmyt3I3jLSeBEhFmM2qCGuhFaX3OwIHQordLnxEMwD2CBr+GuZWqYIG2S2xiX5qymWzCTQfkhK0wZI9mjRbPnQJBeRuqbtV/vqNMaA769mzvhGwQV30AMZqqebvgAatMWYhUln+rKXvs9VRQmAq7fDKngggQF+zjO5zLxmRpSxpcNT2ONtHv8WqU+jYWizZNxfmzLb990UQtK9Ews2iayd3pp1RFbOafOsL5dLTohZvgvGjNNvenzNPDEGG5uYlM1lyMghs+9kKQnB6rUkrWKjlLxez0/5KsSAQPWnK0RDPY/SMlq+vSWXVMwqxyee6Dpi4TRP7iL1OA2bVf2MOuSz2ypoDfrl+9CSt0vJSGBIs+xqbMaKzN50vIzddFR4h91MDkC68NbXa/2Fa+9zPm0N9q01FiaYx8JgifrGDGmxPTKVCbeKZzOZDGWXzI8wsIsjPs22G6nOt3Ogp8+5M0AX1K3dU3xMH7G34eZxQl6mNISd6SldIKhvExnsTcNrpFzoGzmvFOx/68xBbHMXgKdXQV1Re8W7xSCPQCEeJiWBmTn3DtlGekcR7lgJ0PsQJgT5eP0f8tBrGWdTc1EDuP0Ye9ViPqCh7YJcN1KjPBCIYimbIOgrsAuPyWLMko0R6edBVIKT5lewKABWiqjl99/ajCgosqyPQGzanGe6dL+lHiwWVeHBoIELLp0vUc/FDfTGDEorbSFsorgahhj3I9Y9t2hkikI9e/oGFQyZH+15AvO6KtiKGEsDhh2YtNIp5y8TpKlqIy9H4pcD/zD79IDXDmHGIYn+suhk/kYRzfIwDSifrIKn8ol52++84VGC1u/mRI4mA5/uAPH0sO9bFjFr0L+oMdo+crJhT6DMYJJaaNEuuEtcIzvCq0tMeGDG3vBWU9WVZelTvzZ0vX fnB+iHLk /Dp1Z7q4G+FPEQWBSY51OiRdn/RvLPY8wcJKaOBrmYkj0uMrDcU3em1rI3NwzGlIOvymHPKRFDWIIKyxD8VntokEplsU4oNf6/1HDIBzwVxqz6G7RKILnUoiUIOn33NgaPYUxNy44eCkpQXoC/fy7HAGIbMGV2FnCVVTFmz+xFxN2TEvbZZ9A/ltRMoRXHRPJtKVkeihQOsWH2kwI+hOPqjzexH1dW4RD5fg2pkNC/Aix7An2OzDZ+gw0yRSUXn78mpCxmeRV/kv0V2xpXkk4FUZOdgvQuf2oWZKzcnxYj3m3itZyRRDbeVNOkrTHqCzxkdb7QLLF8pIMrcn88hpPKFTPPw== 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 Acked-by: Mike Rapoport (IBM) --- 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))