From patchwork Fri Mar 17 10:43:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 13178864 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 19F2BC76195 for ; Fri, 17 Mar 2023 10:43:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F6B46B007B; Fri, 17 Mar 2023 06:43:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 957E66B007D; Fri, 17 Mar 2023 06:43:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81DC46B007E; Fri, 17 Mar 2023 06:43:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 6D7636B007D for ; Fri, 17 Mar 2023 06:43:28 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 398901A1727 for ; Fri, 17 Mar 2023 10:43:28 +0000 (UTC) X-FDA: 80578053696.04.952ED1A Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf25.hostedemail.com (Postfix) with ESMTP id 50FF4A0013 for ; Fri, 17 Mar 2023 10:43:26 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=NmQ1hyth; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=+NeEMil1; spf=pass (imf25.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 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=1679049806; 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=deQFA7TD3kp7a2tFPZHUMYv9MT3jjYq+TC4fiGinDEs=; b=NDnEBycxHMcCnMW2oHt5X5McfM5Z3q+caUHnr6E6qKyVacIELQAmTY5a2R6TDYnQvx2LJQ 0S27IU6p0L07kbeaVLHDJQxR0z32BTPg8HIFQCSfAQCAcpXYhXRB5fw/MpD6TRz9CQaeZE Nw6kXz6wqS7sq2gWmMc8ZCnsr399Gos= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=NmQ1hyth; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=+NeEMil1; spf=pass (imf25.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679049806; a=rsa-sha256; cv=none; b=zcd9uXkhf3/BUJGjSkB8LQ60nccX1X85xQIRx7qvoEFhhqcUwGSWSt8Bkb4DEpmfLGlOd8 ewt5vFQnTmE1S/lDcOlXPXpWhmmtxwb5npwozZy6ZEWypNnemrGZE+aS6EUx4SGLVT36BK 7rsehinHGl9KKaohTIhb9KKEP7c281M= 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-out2.suse.de (Postfix) with ESMTPS id 449631FE73; 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=deQFA7TD3kp7a2tFPZHUMYv9MT3jjYq+TC4fiGinDEs=; b=NmQ1hyth5qRE678Uo3LQnyTdg0QQSYpHOUPH7Uhuc4G43s/Q0vvr/DUvri19hj91joa5LE hFCEleVrUuJbUsG+BimyBZBOCIfxBJiIDV80Z9fsxXw1oySqpE4cp+/zsI1b/NzEN98+ko T131W4JpotVd1/+2SSdSDPm2mvLWoZM= 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=deQFA7TD3kp7a2tFPZHUMYv9MT3jjYq+TC4fiGinDEs=; b=+NeEMil1mpgbidAjq5vNwGwIMLmjxya2mK0WEBJXywic5vP42eTHWjt9xpdFzGx4iMCyG/ Za3BUsW4qdht6PCg== 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 1478B13A3E; Fri, 17 Mar 2023 10:43:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id gEpjBEtEFGRgdwAAMHmgww (envelope-from ); Fri, 17 Mar 2023 10:43:23 +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 3/6] mm, pagemap: remove SLOB and SLQB from comments and documentation Date: Fri, 17 Mar 2023 11:43:04 +0100 Message-Id: <20230317104307.29328-4-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-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 6xi7o771b553cp7jo5tb6w88cb5mq6um X-Rspamd-Queue-Id: 50FF4A0013 X-HE-Tag: 1679049806-721024 X-HE-Meta: U2FsdGVkX1+bGfAfQ4EHQvR2jZz6kJ/8iYlvrzUBPmy/Cue40krH8DW4VIZSCN/K1folW8eSUfq65fpqb3WAr6aJnxdjNlNfwJL5F8oIIWolT7D9iKBW4G3881iSpaE+h4dQkC5jn8xDlGNErKTLw1J2yGqi6xYzNVnCkDHBcBH+fJHXXTCuoGdGvLO4KgzAtKC/IPscf/Zs5w0nIIR5p7Hbnu5hoXQ3IhkfBnqX10pRmOkOiEs3/Plhotb2vTexmUckoN0DE6YjzQH7lKwTPwTT8qln/Zl23gG5IYOWY6EPk4M2QvMV91PuOkICi6DIzJw2YZo52RqfosPNZRJnZ3CNf4VXTddIp/2HyebH1ZPQ9GWzexpnLnysBJ9cUaz7cKkWU7Orxo5vCcAYQRcfMrciss0olCzc9vVWL+uRz/BFhnyenDOTkeLoCd/N2kEo+ehlFZvrQKiFdHx9S3aFNr/JFhzw4TTbLQ4QWS/HiXVBlNQAWEM+NlHmBZCEunzW2e6796B9K283C7+ufHrJ6zt3JPBjyADpwUQXW5pXEldZRgjLZ0W4Loj/dxgX2PmDLjf1RRefEj4dQzFsf84Y3ZzMvoeeO7L2JRVJ1wHNVA70jqqLHiia4kAkIanDKtDJ6Opmrnvx/RkqT1cI9LPahwNI2nbPW9WFDJQwXD4G+5KObOw7HzGSWL6EmEqiQ9NMCVbHPBkqeTTQhHrimO8+VEQHlfjucKGLl4xzNCdXEgaCjiOd8Vdm/GgUpmPrj/A7uXNZ/ZDh8dv9WxDSTC7IvP9eMRgVdkk5lPzPYmNcFMNpN1vUTIJ1CZg9A0UxqGXgMXCOqRr/bAv/3efEiRPq4TDuxE6Ht+vJZwvliQXpVvP4oQhA/bI+yznXKDRlGfjh+nGRZPnBW15swRre2zNccliS0k3bZCVMM1KboGYsKs6alrp6cXBjYlssD2wp7USmgpWsmRbwu1XYgPXCA7r WbyBxZqz 6OisEj+ypLmEN4KO8Ir4dN9rC6LgbPcq7/up6PqGJFFPC6jsiFMgdQwjdYbwyOoVtV7JlXLvckmn5fkgPLfK68OEytF2OA4yzgIRaAhjB1yqnZ+m3q+Epp5ef2UjADq5TfllppwBNg3VpIzCQDNShW+G34D1ERCptRpcd6fvhnTDPlMe/6zeJt5M601LITSvCY2M+AZs38FQK72V+IkT56l4jSTuRBdLYUgYplLOLQRWwiKsZNV6Ry8tREMB3y9E8OIHyMY5+VdOc30DuorgbAvwtn2y4T8qbZdgif5T1m4O+pr8= 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: SLOB has been removed and SLQB never merged, so remove their mentions from comments and documentation of pagemap. In stable_page_flags() also correct an outdated comment mentioning that PageBuddy() means a page->_refcount of -1, and remove compound_head() from the PageSlab() call, as that's already implicitly there thanks to PF_NO_TAIL. Signed-off-by: Vlastimil Babka Acked-by: Lorenzo Stoakes Acked-by: Mike Rapoport (IBM) --- Documentation/admin-guide/mm/pagemap.rst | 6 +++--- fs/proc/page.c | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Documentation/admin-guide/mm/pagemap.rst b/Documentation/admin-guide/mm/pagemap.rst index b5f970dc91e7..c8f380271cad 100644 --- a/Documentation/admin-guide/mm/pagemap.rst +++ b/Documentation/admin-guide/mm/pagemap.rst @@ -91,9 +91,9 @@ Short descriptions to the page flags The page is being locked for exclusive access, e.g. by undergoing read/write IO. 7 - SLAB - The page is managed by the SLAB/SLOB/SLUB/SLQB kernel memory allocator. - When compound page is used, SLUB/SLQB will only set this flag on the head - page; SLOB will not flag it at all. + The page is managed by the SLAB/SLUB kernel memory allocator. + When compound page is used, either will only set this flag on the head + page. 10 - BUDDY A free memory block managed by the buddy system allocator. The buddy system organizes free memory in blocks of various orders. diff --git a/fs/proc/page.c b/fs/proc/page.c index 6249c347809a..195b077c0fac 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -125,7 +125,7 @@ u64 stable_page_flags(struct page *page) /* * pseudo flags for the well known (anonymous) memory mapped pages * - * Note that page->_mapcount is overloaded in SLOB/SLUB/SLQB, so the + * Note that page->_mapcount is overloaded in SLAB, so the * simple test in page_mapped() is not enough. */ if (!PageSlab(page) && page_mapped(page)) @@ -165,9 +165,8 @@ u64 stable_page_flags(struct page *page) /* - * Caveats on high order pages: page->_refcount will only be set - * -1 on the head page; SLUB/SLQB do the same for PG_slab; - * SLOB won't set PG_slab at all on compound pages. + * Caveats on high order pages: PG_buddy and PG_slab will only be set + * on the head page. */ if (PageBuddy(page)) u |= 1 << KPF_BUDDY; @@ -185,7 +184,7 @@ u64 stable_page_flags(struct page *page) u |= kpf_copy_bit(k, KPF_LOCKED, PG_locked); u |= kpf_copy_bit(k, KPF_SLAB, PG_slab); - if (PageTail(page) && PageSlab(compound_head(page))) + if (PageTail(page) && PageSlab(page)) u |= 1 << KPF_SLAB; u |= kpf_copy_bit(k, KPF_ERROR, PG_error);