From patchwork Sun Dec 18 10:18:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyeonggon Yoo <42.hyeyoo@gmail.com> X-Patchwork-Id: 13076023 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 908D4C4332F for ; Sun, 18 Dec 2022 10:19:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 147508E0003; Sun, 18 Dec 2022 05:19:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D0A98E0001; Sun, 18 Dec 2022 05:19:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB2EC8E0003; Sun, 18 Dec 2022 05:19:32 -0500 (EST) 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 DCCD88E0001 for ; Sun, 18 Dec 2022 05:19:32 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id AE34C405B0 for ; Sun, 18 Dec 2022 10:19:32 +0000 (UTC) X-FDA: 80255030184.27.C9F1419 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf10.hostedemail.com (Postfix) with ESMTP id 1A7CEC0013 for ; Sun, 18 Dec 2022 10:19:30 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=cRiTctr0; spf=pass (imf10.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671358771; 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=uvPBeK/uQOTkS5bCd9KHq/uJNQrs6bRmNyv7cBW90YM=; b=Mi1C4Juah6u2eED3fkIXFISofittCbjJUt2cyWkC1m+8/dme3jQREi6GCgQVGKFfwcBbpA tTY6NZNclp3UYAseQsa6awdpTtBBEOzSxB4/dnv48bvVaQ4F9bqG6AJJLII01qPqkT1JPj P/0Lo4GUmR1ViCx8xpDsaC2AbYUEA3s= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=cRiTctr0; spf=pass (imf10.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671358771; a=rsa-sha256; cv=none; b=U47BJoJYLAQ1Y6ttYU3KxDxq0PwuZxqVSHYamg5T+A7R8f9YcfQBsuneawmkVdFDjvZLZw CBJoit1uv3JfSf0ggbpWEiZkFZzrT66nCfA+tosy0LJO7CgTzPsITWjU7MHwAO1F0lJXM9 8gNHxVAEoxW994XA+cbxz1bcdCFCfgs= Received: by mail-pj1-f47.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so10267929pjs.4 for ; Sun, 18 Dec 2022 02:19:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uvPBeK/uQOTkS5bCd9KHq/uJNQrs6bRmNyv7cBW90YM=; b=cRiTctr0c+Y3PZWbi7kGhJ+34MYU3MF+KKnkl+m0yvYmeh883ce+JGBji2dZkDL2Wo hjL9TAemPLQTDRquzBzZeh7gEX9K3HNYkHV9ZLZRDL/TKyUe+k5cg4kICjxEiUuvvHzT /vjo03Bq5Fa77BDp79CFdE+HJdkWVffsveAnjyPESBtjDEWf9g6LV007LJr9icmfaraT gHoQiwsNbbjf8JegEPhFcZi7XGz0hJeLpj0Vp09qF6fDBlDkBxajEVETAzGafjUiRTKy mugTC9WZqfGT42wqXkQrr+4GNPLFab7/vpOtwly1RRFOOudqMFYz5g8lbt3jqqjaOK5W tGpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uvPBeK/uQOTkS5bCd9KHq/uJNQrs6bRmNyv7cBW90YM=; b=b3Nerx5zRz/OUts15IclMsLxHiud7NKpCPzZe9wD7phXViHOwebOaQnWctKciEJj3e uwQ8RSmg0M4Ri/OXLu4Thqfaiy4X60Nz1N9VjsDg/7UdXF9q3rpA6nP4PDGz6KIetFLR dt1wc/m7y4NRkOAjpUbylREeh8iJiZU5fYhZV5ae5fjyrIUgCfZ+ChUOhe3+Nx+I9wBh RpJYVfs4GaRhylKV8zYIhuUzODnIKxJzpx2CYm1tGb3P2HZYt2rmbh6LleBg5UU2nFS+ WqDBoCQh72RYmds3R2v3ZS36MZT4pACA8dqstkOKcqXW1BN/lI8zmzGbwMNyoIRayyip X35g== X-Gm-Message-State: ANoB5plFN8CS1V/8Bh3FD+gNKoBxQiQzsKoiGTSIP1J4t0pPgtrKIPVt xsc0x/8yt7siZ4XbcosNem4= X-Google-Smtp-Source: AA0mqf6JsU6eO2pxoS+w8HrBGNWmgAWd/51Yb3PiWN6hBjoaQOTnmocm7rbasPDj7XkU/fiBlRC6nw== X-Received: by 2002:a17:902:b618:b0:189:af28:fd8d with SMTP id b24-20020a170902b61800b00189af28fd8dmr37386097pls.1.1671358770040; Sun, 18 Dec 2022 02:19:30 -0800 (PST) Received: from hyeyoo.. ([114.29.91.56]) by smtp.gmail.com with ESMTPSA id ik11-20020a170902ab0b00b001897bfc9800sm4789791plb.53.2022.12.18.02.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 02:19:29 -0800 (PST) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Roman Gushchin Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>, =?utf-8?b?SE9SSUdVQ0hJIE5BT1lBKA==?= =?utf-8?b?5aCA5Y+j44CA55u05LmfKQ==?= , Joe Perches , Petr Mladek , Andy Shevchenko , Matthew WilCox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC v3 1/4] mm/hwpoison: remove MF_MSG_SLAB from action_page_types Date: Sun, 18 Dec 2022 19:18:58 +0900 Message-Id: <20221218101901.373450-2-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20221218101901.373450-1-42.hyeyoo@gmail.com> References: <20221218101901.373450-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 1A7CEC0013 X-Stat-Signature: kd6o8f9padhw6uis58tge4d8cdf49wyd X-Rspam-User: X-HE-Tag: 1671358770-92141 X-HE-Meta: U2FsdGVkX1/zAFu8qQufg1iFCQEtYLV507GEM1W6qmXN1XBuG27RsAWuPYOSRLXFXCAfIIW5lBe/onANkFbObYZELVvf+oZThhZ8fUeKZCKJdMmSgHov4nebpTjO17FpGlhQe+0JBr4I0jR3MCxaeyRaMeuk92SSnv9xlvr6NSIw5tBu2666YAdKdwynshegh+wjkVwwaQ1Zv5aLrlN/Qf6FOVJN7QZZDf/Yp1IFaUTvoEGlrVpqTShoxkOKEnaCalYb5VV0Hbcs1G0Cfjk+1X6AW3ItKLPo3V52Z6leFpSoETF2MJ3STtnoYSTXkEUTSkzdU4Nf02wJDVcXS/gbMUHz/uAE1mRjZSaefFvEc0bOCnv2tEu5df8y5K2bmnk1++63koxVfJvDaM/PXA/uWABVKHoryB1dbadRjKJCOHDV8MFoTgxbF/VstuzqZTAbkZGys7R8I9gbdECTfKTjYJgQgFCXQztcJdf0zIYR2vfvOeYToR80B/83yuTyIL16sTV+eDNbEIDkwUCw39GPrMkwrv9TruzEX9ccs8Xl6M0XW0hO2DJF+8lSDfGYRIsYP+5CzjXO2fxZu7tcLXyLCuZWbJ9nMcmYrsNwodx5cYA+jXwT24n/sAq/rXv2llVkzzOhHdD3DOuYtvAtxgvERePpRE3rtISHNd5JqIT2Vf+RWtKQr0Fwn0uxlfWNLuofQ9b7RWqAfnyI7WphBc1NQ63LEzkCLkoA/Dqo4CzHpiLGbww2ju79tSEANPEcrr6QRNJx5vR/A7eOLYEYyQ5sXsRKKpqGEDVRui5NZxpeN2EVWmxfQOjVftp48LBKG1Ita0Va5xaNnyRG//1CgSFo4warqB6A8dTworcM3hK23SApCnRVeL5vUdWJ9szz4iDJ5ZtExmfIoDGshzTx/fO+hS+YwAF5kjxHBAJ2tP3hdq7PjIH/r76hwlql8PHRfullnqBTQ8xEkahtUuwIOud i2We/WI9 tmMFEXj8NxGlTle7w9KpXVL/YX1UjDUxewa9WxmjfJkTzNwmsbcAmXasqhfwpEvIyPQTjim8PxwzruncBLdJLzaZJL9svpC04Co8awG/fdyyQUbbL0+guZ+cGU5XqTGaL71g0i2Q0b6a8LFgoQmyZXMWB2BkzN1eU8HZ8iqoWjU9XnqZgMpm/TSY4dXaBZO5VEWpFX7oJQwGbZwSgPk2o7KfS7pkvfoHsHctmCJNTmCkiODhfu+iBWsQouarQnUwFwf8/PB+7+stB9B2cGvDar+v4Cg== 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: As suggested by Naoya [1], identify_page_state() is never called when handling memory error on a slab page. Clean this up before moving PG_slab flag to page_type in later patch. [1] https://lore.kernel.org/linux-mm/Y2s+dnBsHAJu19ob@hyeyoo/#r Suggested-by: Naoya Horiguchi Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- mm/memory-failure.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index c77a9e37e27e..74ad1db989e3 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -783,7 +783,6 @@ static const char *action_name[] = { static const char * const action_page_types[] = { [MF_MSG_KERNEL] = "reserved kernel page", [MF_MSG_KERNEL_HIGH_ORDER] = "high-order kernel page", - [MF_MSG_SLAB] = "kernel slab page", [MF_MSG_DIFFERENT_COMPOUND] = "different compound page after locking", [MF_MSG_HUGE] = "huge page", [MF_MSG_FREE_HUGE] = "free huge page", @@ -1146,7 +1145,6 @@ static int me_huge_page(struct page_state *ps, struct page *p) #define mlock (1UL << PG_mlocked) #define lru (1UL << PG_lru) #define head (1UL << PG_head) -#define slab (1UL << PG_slab) #define reserved (1UL << PG_reserved) static struct page_state error_states[] = { @@ -1156,13 +1154,6 @@ static struct page_state error_states[] = { * PG_buddy pages only make a small fraction of all free pages. */ - /* - * Could in theory check if slab page is free or if we can drop - * currently unused objects without touching them. But just - * treat it as standard kernel for now. - */ - { slab, slab, MF_MSG_SLAB, me_kernel }, - { head, head, MF_MSG_HUGE, me_huge_page }, { sc|dirty, sc|dirty, MF_MSG_DIRTY_SWAPCACHE, me_swapcache_dirty }, @@ -1189,7 +1180,6 @@ static struct page_state error_states[] = { #undef mlock #undef lru #undef head -#undef slab #undef reserved /* From patchwork Sun Dec 18 10:18:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyeonggon Yoo <42.hyeyoo@gmail.com> X-Patchwork-Id: 13076024 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 7779DC10F1E for ; Sun, 18 Dec 2022 10:19:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14AC78E0005; Sun, 18 Dec 2022 05:19:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D11E8E0001; Sun, 18 Dec 2022 05:19:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E65E98E0005; Sun, 18 Dec 2022 05:19:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id D3C8E8E0001 for ; Sun, 18 Dec 2022 05:19:37 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AEB4FA08CF for ; Sun, 18 Dec 2022 10:19:37 +0000 (UTC) X-FDA: 80255030394.23.436BF27 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf06.hostedemail.com (Postfix) with ESMTP id 0C2B1180008 for ; Sun, 18 Dec 2022 10:19:35 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=aoHQtnrt; spf=pass (imf06.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671358776; a=rsa-sha256; cv=none; b=RSwAG350f2g0y0WoPuDyDPCNCdxqsp6SUsSaphKbE+qQ0EHD6ZcRsfroBqWRrSAFMep9go 6jyJ3SQs0Wcp5IbZrJV8FAm1/WbaA1nazQcFp9kZ6C1lJxaLtfz43L3JoWjdbTTrkk/KB/ kzimggfdelQtA4w89iXh9VAA3YrOUmw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=aoHQtnrt; spf=pass (imf06.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671358776; 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=raON8voEEt1U55vANTUkVu9dHTe8G6Xzm/P060fD0E0=; b=B2sCbQ8wuSJkc8WSTCezDnRz35nEsusixRtfsTPSIQX3ZavytDLDvTzRr4MkAUsY6g8Mqt +yp6xsPnScQXi1D/z64oOYaai/3/VcMT32IZAxV5l/63DgB0CojKQ/j9X4o67PQuoVKT9V 6v2IAFBNGTCrHYn4veoqagpPbO7+yxg= Received: by mail-pj1-f47.google.com with SMTP id o1-20020a17090a678100b00219cf69e5f0so10291072pjj.2 for ; Sun, 18 Dec 2022 02:19:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=raON8voEEt1U55vANTUkVu9dHTe8G6Xzm/P060fD0E0=; b=aoHQtnrtbDJuR+SHPkln9BK+Ce2XG9X2Tm3OXrkdy7uEqBL/lEDDi7bXc89+RWkOz4 8VsD9FX9V3o9MomGoYZyNUPJu2YXEv3xrSWKToSP7Wgpz26fA6EBSwUgGLBFC0ZLhN5J nWV8AVRwtIkbaFzYu+Z1tlRszVUp/55XiNeRiRvkHZGOOqaLnWCJc7gFcgvcQyoty7I3 DkvhiW1bLiH0EKYDH4rb39wXRLBD08rSf0n7i815kVib3FLUDgD+gjmWEYSPixi0rcZ0 8FvnrZ9JaIKWJ5LxPiEc0/7YNZDN7IU4Pnsu4r6aonF4/T8g2aYCbIRayGwvhn7VqUMs wQlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=raON8voEEt1U55vANTUkVu9dHTe8G6Xzm/P060fD0E0=; b=E4XnsKXdo9ovU6p4taEYEr8ySBQ8vd4Y10m5yBroaW9vT+S8CH2Fii5cSgWWqqqK6M YQr6EyMFjzVlZ2yo4BX60I+Ewdj741rk26loIJngxFtg49hvOm4LbxHbatK87UjqGH/O nFK15OlafINxT2Q8mCMB5Op1njh4b5iKs1MXgxpJPYhnw39IVk4Lku5WET8fGduCYc+2 FwAFIYRzI+qZ/m+wY+HD3SS2mDoQ5hadMf7UtigZJ1KVrg3I4bsedkDO064W8dEbxzUX 1QjPhVg6+ZGTyE/yX9uHafHPYlp5WuIw7tPRarxbYG5YEOztM2ENbBCo09VlN0LOsZF9 epOQ== X-Gm-Message-State: ANoB5pmIMJvw0JVyc8z9SmmASMhxCA5AB2KpOLAYpD0QUXv1BuCtVpqg 3IujJOkQ7Ot+qlbEF8hKl4A= X-Google-Smtp-Source: AA0mqf7v3O1EFl6BaQjH89235amk6nD6VFwkIrC0i6tMopHtMqNOigiE1dKJnbMEdjERJuqBZfzOoQ== X-Received: by 2002:a17:902:bb98:b0:188:edd2:318c with SMTP id m24-20020a170902bb9800b00188edd2318cmr38629112pls.26.1671358774773; Sun, 18 Dec 2022 02:19:34 -0800 (PST) Received: from hyeyoo.. ([114.29.91.56]) by smtp.gmail.com with ESMTPSA id ik11-20020a170902ab0b00b001897bfc9800sm4789791plb.53.2022.12.18.02.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 02:19:33 -0800 (PST) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Roman Gushchin Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>, =?utf-8?b?SE9SSUdVQ0hJIE5BT1lBKA==?= =?utf-8?b?5aCA5Y+j44CA55u05LmfKQ==?= , Joe Perches , Petr Mladek , Andy Shevchenko , Matthew WilCox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC v3 2/4] mm: move PG_slab flag to page_type Date: Sun, 18 Dec 2022 19:18:59 +0900 Message-Id: <20221218101901.373450-3-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20221218101901.373450-1-42.hyeyoo@gmail.com> References: <20221218101901.373450-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 0C2B1180008 X-Stat-Signature: 5sawwek4ygacz5rqar8pg9djruswqbme X-HE-Tag: 1671358775-134809 X-HE-Meta: U2FsdGVkX1+Izq+3KGJY/svs1iSd5gX8g/tfK4xUMYI5v1BjaGVJU4DQ+c7+0grBXZEu2OAYwSpFhsyE2op9UFVXo0/74D0i7Ypk4YSvmDje0TEVJUT0PLoA/pYmUV7ww2pTIPK4gG/lq9llmylPWfGyUnXWzZtXcM4jJdGdXfupUEH42oj1h1VQxWblVrwMCqRwLonqG7YTHOBXNslHS97v35iRhhgGRl+9YaYYE5/gCxaNr1OojtcoAzXHhbjPuQG1FggAX03/wQfuWN75yfa/lHG4ibDpV3ggLuEmrBS56eAPxZsCYAjPGvNuFmDDo2disTnI701GVgi2tuZTvGJsnGZh3HFoQ0X9+VCLan6WkHE/kYixsZGTnTjz0/WXdFp20GgEawjGrz8yDY1xSNXuVr2g6ys4umGNreA6AP5iUKznyed+drM5g6okRpD6Uh14Pw8609Fmlx2xAzaE1x+Eh7kprzoUKIDKOvV8KtIukUihPmOMX907CFgxMuLNltJggTzg2+g7gQsxMnwEgBOdwf+E/eLhZSqKlbUaRoh+yCztsC3W0dCknjr0WBSPsXNaJrMJcMsqulhfkObyhN0P1BMPirQFS/dbLOS0RFL40K4pb4mFyiTH3dI40uWsL2xDmTSm1GmEUHkauzjvu7q/nCUlvgYBZe4MvKvg9WMQ4IZOLoRHWS5Qq97IREjbpw4mLXUq01Y0lNyf0/RWBa4NQsuRj6j46ObywN2+Z2ohBxP5TOkZl62VELEdjoiE24wOtgrreYkiZAqBOAN2PF2YBsgRkZ3QT3Z9v1Sto7Mn136ycrwh1NeRjFFEewcCkkB4CU4yyN34x9k2HjIC7bUL3+B0LmsLbS4ga9CR6zsoHDkjrcQfp/0dtJ53UA5r8TOyZZCuxOmxUqHj8z72nex1IAJiBKbAKJePlbgBrL518zl9rh6FVNg/0yeI1L5iMwmPW6w1jzs/SMKoETe YpU5BGhy vw/qQb026gGzbRDhPVhJKYmyvvEpEwgf0p8gBSKuZVXogZSLN35Aj7950ZlyzPyaFZ4aH8fYh6rPRWh3NMCItm0dZE1SiviSVsDG1rsVcsF8o2zCGReu5B/jT43PBOc/ndVpMzc386aTbuqEVnJQemE8MqtLL9d6TV21iRCVrFWbWnGIaBDsDwLNxSc1O+KTAF9tZ8rj8c3R6AvyV50vslkLR2iIO/H1RBeAQIZsKAGJMffqGibARm++pqHhlRYJnqpyN+8LSjM+O03sRvHCkohGU4FLQPju8bpUg 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: For now, only SLAB uses _mapcount field as a number of active objects in a slab, and other slab allocators do not. As 16 bits are enough for that, use remaining 16 bits of _mapcount as page_type even when SLAB is used. And then move PG_slab flag to page_type. As suggested by Matthew, store number of active objects in negative form and use helper when accessing or modifying it. page_type is always placed in upper half of _mapcount to avoid confusing normal _mapcount as page_type. As underflow (actually I mean, yeah, overflow) is not a concern anymore, use more lower bits. Add more folio helpers for PAGE_TYPE_OPS() not to break existing slab implementations. To preserve current behavior apply page policy in PAGE_TYPE_OPS() and use PF_NO_TAIL for slab pages and PF_ANY for others. Remove PG_slab check from PAGE_FLAGS_CHECK_AT_FREE. buddy will still check if _mapcount is properly set at free. Note that with this change, page_mapped() and folio_mapped() always return false for a slab page. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- fs/proc/page.c | 13 ++---- include/linux/mm_types.h | 11 +++-- include/linux/page-flags.h | 77 ++++++++++++++++++++++++---------- include/trace/events/mmflags.h | 1 - kernel/crash_core.c | 3 +- mm/slab.c | 44 ++++++++++++------- mm/slab.h | 3 +- 7 files changed, 98 insertions(+), 54 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index 6249c347809a..e7524f21cefe 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -67,7 +67,7 @@ static ssize_t kpagecount_read(struct file *file, char __user *buf, */ ppage = pfn_to_online_page(pfn); - if (!ppage || PageSlab(ppage) || page_has_type(ppage)) + if (!ppage || page_has_type(ppage)) pcount = 0; else pcount = page_mapcount(ppage); @@ -124,11 +124,8 @@ 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 - * simple test in page_mapped() is not enough. */ - if (!PageSlab(page) && page_mapped(page)) + if (page_mapped(page)) u |= 1 << KPF_MMAP; if (PageAnon(page)) u |= 1 << KPF_ANON; @@ -178,16 +175,14 @@ u64 stable_page_flags(struct page *page) u |= 1 << KPF_OFFLINE; if (PageTable(page)) u |= 1 << KPF_PGTABLE; + if (PageSlab(page)) + u |= 1 << KPF_SLAB; if (page_is_idle(page)) u |= 1 << KPF_IDLE; 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))) - u |= 1 << KPF_SLAB; - 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); diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 3b8475007734..6b04ae65241d 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -207,10 +207,13 @@ struct page { atomic_t _mapcount; /* - * If the page is neither PageSlab nor mappable to userspace, - * the value stored here may help determine what this page - * is used for. See page-flags.h for a list of page types - * which are currently stored here. + * If the page is not mappable to userspace, the value + * stored here may help determine what this page is used for. + * See page-flags.h for a list of page types which are currently + * stored here. + * + * Note that only upper half is used for page types and lower + * half is reserved for SLAB. */ unsigned int page_type; }; diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 69e93a0c1277..07063d60efe3 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -107,7 +107,6 @@ enum pageflags { PG_workingset, PG_waiters, /* Page has waiters, check its waitqueue. Must be bit #7 and in the same byte as "PG_locked" */ PG_error, - PG_slab, PG_owner_priv_1, /* Owner use. If pagecache, fs may use*/ PG_arch_1, PG_reserved, @@ -482,7 +481,6 @@ PAGEFLAG(Active, active, PF_HEAD) __CLEARPAGEFLAG(Active, active, PF_HEAD) TESTCLEARFLAG(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 */ @@ -906,42 +904,72 @@ static inline bool is_page_hwpoison(struct page *page) } /* - * For pages that are never mapped to userspace (and aren't PageSlab), - * page_type may be used. Because it is initialised to -1, we invert the - * sense of the bit, so __SetPageFoo *clears* the bit used for PageFoo, and - * __ClearPageFoo *sets* the bit used for PageFoo. We reserve a few high and - * low bits so that an underflow or overflow of page_mapcount() won't be - * mistaken for a page type value. + * For pages that are never mapped to userspace, page_type may be used. + * Because it is initialised to -1, we invert the sense of the bit, + * so __SetPageFoo *clears* the bit used for PageFoo, and __ClearPageFoo + * *sets* the bit used for PageFoo. We reserve a few high and low bits + * so that an underflow or overflow of page_mapcount() won't be mistaken + * for a page type value. */ #define PAGE_TYPE_BASE 0xf0000000 -/* Reserve 0x0000007f to catch underflows of page_mapcount */ -#define PAGE_MAPCOUNT_RESERVE -128 -#define PG_buddy 0x00000080 -#define PG_offline 0x00000100 -#define PG_table 0x00000200 -#define PG_guard 0x00000400 +#define PG_buddy 0x00010000 +#define PG_offline 0x00020000 +#define PG_table 0x00040000 +#define PG_guard 0x00080000 +#define PG_slab 0x00100000 #define PageType(page, flag) \ ((page->page_type & (PAGE_TYPE_BASE | flag)) == PAGE_TYPE_BASE) -static inline int page_has_type(struct page *page) +#define PAGE_TYPE_MASK 0xffff0000 + +static inline bool page_type_has_type(unsigned int page_type) { - return (int)page->page_type < PAGE_MAPCOUNT_RESERVE; + return ((int)page_type < (int)PAGE_TYPE_MASK); } -#define PAGE_TYPE_OPS(uname, lname) \ +static inline bool page_has_type(struct page *page) +{ + return page_type_has_type(page->page_type); +} + + +#define PAGE_TYPE_OPS(uname, lname, policy) \ static __always_inline int Page##uname(struct page *page) \ { \ + page = policy(page, 0); \ + return PageType(page, PG_##lname); \ +} \ +static __always_inline int folio_test_##lname(struct folio *folio) \ +{ \ + struct page *page = &folio->page; \ + \ return PageType(page, PG_##lname); \ } \ static __always_inline void __SetPage##uname(struct page *page) \ { \ + page = policy(page, 1); \ + VM_BUG_ON_PAGE(!PageType(page, 0), page); \ + page->page_type &= ~PG_##lname; \ +} \ +static __always_inline void __folio_set_##lname(struct folio *folio) \ +{ \ + struct page *page = &folio->page; \ + \ VM_BUG_ON_PAGE(!PageType(page, 0), page); \ page->page_type &= ~PG_##lname; \ } \ static __always_inline void __ClearPage##uname(struct page *page) \ { \ + page = policy(page, 1); \ + VM_BUG_ON_PAGE(!Page##uname(page), page); \ + page->page_type |= PG_##lname; \ +} \ +static __always_inline void __folio_clear_##lname(struct folio *folio) \ +{ \ + struct page *page = &folio->page; \ + \ VM_BUG_ON_PAGE(!Page##uname(page), page); \ page->page_type |= PG_##lname; \ } @@ -950,7 +978,7 @@ static __always_inline void __ClearPage##uname(struct page *page) \ * PageBuddy() indicates that the page is free and in the buddy system * (see mm/page_alloc.c). */ -PAGE_TYPE_OPS(Buddy, buddy) +PAGE_TYPE_OPS(Buddy, buddy, PF_ANY) /* * PageOffline() indicates that the page is logically offline although the @@ -974,7 +1002,10 @@ PAGE_TYPE_OPS(Buddy, buddy) * pages should check PageOffline() and synchronize with such drivers using * page_offline_freeze()/page_offline_thaw(). */ -PAGE_TYPE_OPS(Offline, offline) +PAGE_TYPE_OPS(Offline, offline, PF_ANY) + +/* PageSlab() indicates that the page is used by slab subsystem. */ +PAGE_TYPE_OPS(Slab, slab, PF_NO_TAIL) extern void page_offline_freeze(void); extern void page_offline_thaw(void); @@ -984,12 +1015,12 @@ extern void page_offline_end(void); /* * Marks pages in use as page tables. */ -PAGE_TYPE_OPS(Table, table) +PAGE_TYPE_OPS(Table, table, PF_ANY) /* * Marks guardpages used with debug_pagealloc. */ -PAGE_TYPE_OPS(Guard, guard) +PAGE_TYPE_OPS(Guard, guard, PF_ANY) extern bool is_free_buddy_page(struct page *page); @@ -1037,8 +1068,8 @@ static __always_inline void __ClearPageAnonExclusive(struct page *page) (1UL << PG_lru | 1UL << PG_locked | \ 1UL << PG_private | 1UL << PG_private_2 | \ 1UL << PG_writeback | 1UL << PG_reserved | \ - 1UL << PG_slab | 1UL << PG_active | \ - 1UL << PG_unevictable | __PG_MLOCKED | LRU_GEN_MASK) + 1UL << PG_active | 1UL << PG_unevictable | \ + __PG_MLOCKED | LRU_GEN_MASK) /* * Flags checked when a page is prepped for return by the page allocator. diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index 412b5a46374c..8301912f8c25 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -113,7 +113,6 @@ {1UL << PG_lru, "lru" }, \ {1UL << PG_active, "active" }, \ {1UL << PG_workingset, "workingset" }, \ - {1UL << PG_slab, "slab" }, \ {1UL << PG_owner_priv_1, "owner_priv_1" }, \ {1UL << PG_arch_1, "arch_1" }, \ {1UL << PG_reserved, "reserved" }, \ diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 87ef6096823f..1ea8198c26e1 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -482,13 +482,14 @@ static int __init crash_save_vmcoreinfo_init(void) VMCOREINFO_NUMBER(PG_private); VMCOREINFO_NUMBER(PG_swapcache); VMCOREINFO_NUMBER(PG_swapbacked); - VMCOREINFO_NUMBER(PG_slab); #ifdef CONFIG_MEMORY_FAILURE VMCOREINFO_NUMBER(PG_hwpoison); #endif VMCOREINFO_NUMBER(PG_head_mask); #define PAGE_BUDDY_MAPCOUNT_VALUE (~PG_buddy) VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE); +#define PAGE_SLAB_MAPCOUNT_VALUE (~PG_slab) + VMCOREINFO_NUMBER(PAGE_SLAB_MAPCOUNT_VALUE); #ifdef CONFIG_HUGETLB_PAGE VMCOREINFO_NUMBER(HUGETLB_PAGE_DTOR); #define PAGE_OFFLINE_MAPCOUNT_VALUE (~PG_offline) diff --git a/mm/slab.c b/mm/slab.c index 7a269db050ee..eee46f71c4b8 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2269,6 +2269,21 @@ void __kmem_cache_release(struct kmem_cache *cachep) } } +static inline unsigned int slab_get_active(struct slab *slab) +{ + return ~(slab->page_type | PG_slab); +} + +static inline void slab_inc_active(struct slab *slab) +{ + slab->page_type--; +} + +static inline void slab_dec_active(struct slab *slab) +{ + slab->page_type++; +} + /* * Get the memory for a slab management obj. * @@ -2291,7 +2306,6 @@ static void *alloc_slabmgmt(struct kmem_cache *cachep, void *addr = slab_address(slab); slab->s_mem = addr + colour_off; - slab->active = 0; if (OBJFREELIST_SLAB(cachep)) freelist = NULL; @@ -2510,8 +2524,8 @@ static void *slab_get_obj(struct kmem_cache *cachep, struct slab *slab) { void *objp; - objp = index_to_obj(cachep, slab, get_free_obj(slab, slab->active)); - slab->active++; + objp = index_to_obj(cachep, slab, get_free_obj(slab, slab_get_active(slab))); + slab_inc_active(slab); return objp; } @@ -2524,7 +2538,7 @@ static void slab_put_obj(struct kmem_cache *cachep, unsigned int i; /* Verify double free bug */ - for (i = slab->active; i < cachep->num; i++) { + for (i = slab_get_active(slab); i < cachep->num; i++) { if (get_free_obj(slab, i) == objnr) { pr_err("slab: double free detected in cache '%s', objp %px\n", cachep->name, objp); @@ -2532,11 +2546,11 @@ static void slab_put_obj(struct kmem_cache *cachep, } } #endif - slab->active--; + slab_dec_active(slab); if (!slab->freelist) slab->freelist = objp + obj_offset(cachep); - set_free_obj(slab, slab->active, objnr); + set_free_obj(slab, slab_get_active(slab), objnr); } /* @@ -2635,14 +2649,14 @@ static void cache_grow_end(struct kmem_cache *cachep, struct slab *slab) raw_spin_lock(&n->list_lock); n->total_slabs++; - if (!slab->active) { + if (!slab_get_active(slab)) { list_add_tail(&slab->slab_list, &n->slabs_free); n->free_slabs++; } else fixup_slab_list(cachep, n, slab, &list); STATS_INC_GROWN(cachep); - n->free_objects += cachep->num - slab->active; + n->free_objects += cachep->num - slab_get_active(slab); raw_spin_unlock(&n->list_lock); fixup_objfreelist_debug(cachep, &list); @@ -2744,7 +2758,7 @@ static inline void fixup_slab_list(struct kmem_cache *cachep, { /* move slabp to correct slabp list: */ list_del(&slab->slab_list); - if (slab->active == cachep->num) { + if (slab_get_active(slab) == cachep->num) { list_add(&slab->slab_list, &n->slabs_full); if (OBJFREELIST_SLAB(cachep)) { #if DEBUG @@ -2783,7 +2797,7 @@ static noinline struct slab *get_valid_first_slab(struct kmem_cache_node *n, /* Move pfmemalloc slab to the end of list to speed up next search */ list_del(&slab->slab_list); - if (!slab->active) { + if (!slab_get_active(slab)) { list_add_tail(&slab->slab_list, &n->slabs_free); n->free_slabs++; } else @@ -2865,9 +2879,9 @@ static __always_inline int alloc_block(struct kmem_cache *cachep, * There must be at least one object available for * allocation. */ - BUG_ON(slab->active >= cachep->num); + BUG_ON(slab_get_active(slab) >= cachep->num); - while (slab->active < cachep->num && batchcount--) { + while (slab_get_active(slab) < cachep->num && batchcount--) { STATS_INC_ALLOCED(cachep); STATS_INC_ACTIVE(cachep); STATS_SET_HIGH(cachep); @@ -3162,7 +3176,7 @@ static void *____cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, STATS_INC_ACTIVE(cachep); STATS_SET_HIGH(cachep); - BUG_ON(slab->active == cachep->num); + BUG_ON(slab_get_active(slab) == cachep->num); obj = slab_get_obj(cachep, slab); n->free_objects--; @@ -3297,7 +3311,7 @@ static void free_block(struct kmem_cache *cachep, void **objpp, STATS_DEC_ACTIVE(cachep); /* fixup slab chains */ - if (slab->active == 0) { + if (slab_get_active(slab) == 0) { list_add(&slab->slab_list, &n->slabs_free); n->free_slabs++; } else { @@ -3352,7 +3366,7 @@ static void cache_flusharray(struct kmem_cache *cachep, struct array_cache *ac) struct slab *slab; list_for_each_entry(slab, &n->slabs_free, slab_list) { - BUG_ON(slab->active); + BUG_ON(slab_get_active(slab)); i++; } diff --git a/mm/slab.h b/mm/slab.h index 7cc432969945..c6ffe6799436 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -20,7 +20,8 @@ struct slab { }; struct rcu_head rcu_head; }; - unsigned int active; + /* lower half of page_type is used as active objects counter */ + unsigned int page_type; #elif defined(CONFIG_SLUB) From patchwork Sun Dec 18 10:19:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyeonggon Yoo <42.hyeyoo@gmail.com> X-Patchwork-Id: 13076025 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 EEAC7C4332F for ; Sun, 18 Dec 2022 10:19:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 899E88E0006; Sun, 18 Dec 2022 05:19:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 854DC8E0001; Sun, 18 Dec 2022 05:19:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EAA98E0006; Sun, 18 Dec 2022 05:19:42 -0500 (EST) 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 5A8548E0001 for ; Sun, 18 Dec 2022 05:19:42 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 32611AACE3 for ; Sun, 18 Dec 2022 10:19:42 +0000 (UTC) X-FDA: 80255030604.23.4CD0D7B Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf26.hostedemail.com (Postfix) with ESMTP id 7B76414000A for ; Sun, 18 Dec 2022 10:19:40 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=GB+cIi5r; spf=pass (imf26.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671358780; 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=D+7GjecAQWYKdyIMijkjG0fslIItZloxZjhPMs3OBpw=; b=MXCrfJJOy90s9UIfLPjRtA8Ru+UTVybzMoNmyK79Mgk6WFOrjswQB2har/6kE/2WybP9nI WpNJ85yIHdrIf+CetjvuZpwzTNVwc4VYXl7znptDK8WF2KCtRkY8ayaom9ClNMeAnVEFrd odE1bT68gThZHjZY7cIk18sWI1PBmHw= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=GB+cIi5r; spf=pass (imf26.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671358780; a=rsa-sha256; cv=none; b=khreLxs3hamtyDxA48q9YP2cXC90qIbgnzvG9hzNmyWqhCEfXAxwXkwYDgf84LFHFJnlRW KRI1oyl/BWzeDgONF/Kmn3Sz1JEwhgYUvPp3fK6y7HUxucECp0ISFgPB/3I7Duydzcajwo 6JW0mM7s+xzze5fbHPMQlApBekhuWgA= Received: by mail-pj1-f47.google.com with SMTP id o12so6441285pjo.4 for ; Sun, 18 Dec 2022 02:19:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D+7GjecAQWYKdyIMijkjG0fslIItZloxZjhPMs3OBpw=; b=GB+cIi5ruQzrbOrlJbNzYlQ1gH9cgIK6ioIhYfetGCqlHswGzIRR+TzMfVrKR0C2sX n+F50/v7rHI0gvqm5BvXZClesXl4zQkvidtIZZF3tTXSePliVaxQ5fsuAGyppWUv0BLl Zx6Tbei1P6+mqoGTku/v3tvi92L60cjrk/4LQXalFfFxBVwUnUyfIIlxqKyrQgRHKJYX 9zv9KGOVZttO1NiJX0T9p/YQlFONDN1Bjr2E3N+qVvpzDLUbKlZK+SLK0LhphmCGBbKd zUUqqJAai4NSOX6qTtT8hN8A00XODki6V9A2BBFy386HS7wkbQr73yRAmuTDPDa91/2M Uviw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D+7GjecAQWYKdyIMijkjG0fslIItZloxZjhPMs3OBpw=; b=Oi4/cb0V8QBBUkoQMYFLFrNibiaXxeibKx83veVtrwC6vwHLjRNAUkP8Vf2rgzlkSU HgmJ/ViE2kDb/jKwmu1rdfQnC+rBqe5LrmhfoTlSnZ7M3VYigUpbUIuO8xPSkFoZfCF6 kZy6/pbKrjX7/v3yI/zHPkop8rP0gbTVONdNEWh54abM7RgpBsfI+mADl1QEro4Ei0+b x/OoAEhhxB5kG3/J051vddR3pEEzgMDEXVqd0fKeAvpoe0tKBvPlpxnQb08hINeOzlkn 2IYZ2TAKvlMJbbYi9mGIH7MJHwUfPp7V+FpCmsqcDj2HkJ9LIquZ9gaCWI4iJizU7PX6 WyyQ== X-Gm-Message-State: ANoB5pkZBG5zSJ7zMF7om0+QuwO2UYQDT+fHgoVUPOEbKTWrH/zJ2lqf JEKmYpRcKpJs9E5wd1hT4bA= X-Google-Smtp-Source: AA0mqf5oVPeB5bhp8aKBFuvgIKkQpspt6mh+LJK000FqqtoAAMJTJ0x6zwvVmJvhrD0/w2mwwG2NjQ== X-Received: by 2002:a17:902:d18b:b0:18f:8f1d:2352 with SMTP id m11-20020a170902d18b00b0018f8f1d2352mr26047426plb.30.1671358779463; Sun, 18 Dec 2022 02:19:39 -0800 (PST) Received: from hyeyoo.. ([114.29.91.56]) by smtp.gmail.com with ESMTPSA id ik11-20020a170902ab0b00b001897bfc9800sm4789791plb.53.2022.12.18.02.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 02:19:38 -0800 (PST) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Roman Gushchin Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>, =?utf-8?b?SE9SSUdVQ0hJIE5BT1lBKA==?= =?utf-8?b?5aCA5Y+j44CA55u05LmfKQ==?= , Joe Perches , Petr Mladek , Andy Shevchenko , Matthew WilCox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC v3 3/4] mm, printk: introduce new format %pGt for page_type Date: Sun, 18 Dec 2022 19:19:00 +0900 Message-Id: <20221218101901.373450-4-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20221218101901.373450-1-42.hyeyoo@gmail.com> References: <20221218101901.373450-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7B76414000A X-Stat-Signature: 66zooeqwsox73r57zoah9z3qu1ubzy51 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1671358780-535251 X-HE-Meta: U2FsdGVkX195glFNZcSEa86Gky7rMqFGtGEfLC2HrTdcaDdfKI9Hg+RLW2j1hupSj5I2yYMKTi8Mkw0Pk1Kd8QMu2VtwxvWDbumzzpP9l/egNqIBn+02MxeT2d1QUnoitfxkVwd9PilPXY4kl3trZFBabo9kaOB0U6FmU28mv51Zr0LrwAouleEtmiZfOmvMEZBoW+lKO40FZjTAVt0gy1jZd92aV6/vwa4SCGOfoOZuU/sWo+7roKMlsnVMtHW+PgBWoG5oS+J2e3zSRYm2BXbBxRV4C83MTP3MEGTINEZVl0WrPK5tqkjJjHXb4i02YdZ40DGJD09MzSrGgbJ1vbWlnEemnSnhfM1Z0G9BVmsaW/YREFla5zerU2vJo/mAuLuuYRqCm5j/HGGq7zSUfwCue2pv+qoZFMDBaD2amqP1KJsszJVaQUE2uxjBoZGYy32t7GQZbEgQc3soNCR4M0pE2jfv/9bO9bCsi6BodhexQol8pG8g2r6AelRCHi701/PnNRVHbnHQSuv7qDRWrT7MT8CeaYi3pSB2I5bAmUWjdHLOxAW7vdt5daB6pVL2S8GFgTLAIVBf9p7mbXAJHZseG2D4AgMoTsfTZAqgsiaQPpOdxrcSc0YiuzVITK2dNAd1CJ6DvC8GE+YJcPFg+Sa215e2TZ2LF+CZJqd2xwxj78/PTwxi3idyNJDOk0OwDq+rnOcz0P28XIt/vFMsXsN8F8nyAV57TUtJAl9AK5V1L+ROmuCVO7JSoSz5zC8GN0EMGzBxSnNAQ85L3jZGb7NtOskwgGVpLt0BCOZhzG6THhc1ylTcz60JIazpwjyOpnGDEFgw8rX0n00de2bsCD11HzNAhXwGSdA3RyNJBR0G5LJJK346cG6GydbRaRHbDDP+MyElesYtXbdfHvixu7aKf9bzwgULk86MnTEMlmkTdMnJc3a6tPNfK0wbfuMUTHzA25hCrPC2DB2CIDZ HXaMND11 KvxIj7Opu3Z39A7xdp4mYNK3US7UjVSpk/P2m7frcr3bG6Pny/nBNswTvW8CACGp4wn7VYLMrRMD1Oe/kJtk+sXZw8g1Ex1FAY6ldgnD1zAjrGJgqcjvX/eB0fO7/n/jk1ZtusQ4ygLrn08dC+O7I4rc3vStv1oPulnOncaNtLNgMu0RqX/WZrNtGiHqEdQNIa6CNtS5GhLbkOZacUKAyNz7hBLurawAEZN9C2GLdZWwJHwR4zW87XjkDotUnlw0F1w7Tram8rwszo3MqAwBH/rQdxi04zrzy2Kzd 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: %pGp format is used to print 'flags' field of struct page. As some page flags (e.g. PG_buddy, see page-flags.h for more details) are set in page_type field, introduce %pGt format which provides human readable output of page_type. Note that the sense of bits are different in page_type. if page_type is 0xffffffff, no flags are set. if PG_slab (0x00100000) flag is set, page_type is 0xffefffff. Clearing a bit means we set the bit. Bits in page_type are inverted when printing page type names. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- Documentation/core-api/printk-formats.rst | 3 ++- include/trace/events/mmflags.h | 7 ++++++ lib/test_printf.c | 26 +++++++++++++++++++++++ lib/vsprintf.c | 21 ++++++++++++++++++ mm/debug.c | 5 +++++ mm/internal.h | 1 + 6 files changed, 62 insertions(+), 1 deletion(-) diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst index dbe1aacc79d0..582e965508eb 100644 --- a/Documentation/core-api/printk-formats.rst +++ b/Documentation/core-api/printk-formats.rst @@ -575,12 +575,13 @@ The field width is passed by value, the bitmap is passed by reference. Helper macros cpumask_pr_args() and nodemask_pr_args() are available to ease printing cpumask and nodemask. -Flags bitfields such as page flags, gfp_flags +Flags bitfields such as page flags, page_type, gfp_flags --------------------------------------------- :: %pGp 0x17ffffc0002036(referenced|uptodate|lru|active|private|node=0|zone=2|lastcpupid=0x1fffff) + %pGt 0xffefffff(slab) %pGg GFP_USER|GFP_DMA32|GFP_NOWARN %pGv read|exec|mayread|maywrite|mayexec|denywrite diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index 8301912f8c25..57f52d00e761 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -138,6 +138,13 @@ IF_HAVE_PG_SKIP_KASAN_POISON(PG_skip_kasan_poison, "skip_kasan_poison") __def_pageflag_names \ ) : "none" +#define __def_pagetype_names \ + {PG_slab, "slab" }, \ + {PG_offline, "offline" }, \ + {PG_guard, "guard" }, \ + {PG_table, "table" }, \ + {PG_buddy, "buddy" } + #if defined(CONFIG_X86) #define __VM_ARCH_SPECIFIC_1 {VM_PAT, "pat" } #elif defined(CONFIG_PPC) diff --git a/lib/test_printf.c b/lib/test_printf.c index d34dc636b81c..e0d0770d5eec 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -642,12 +642,26 @@ page_flags_test(int section, int node, int zone, int last_cpupid, test(cmp_buf, "%pGp", &flags); } +static void __init page_type_test(unsigned int page_type, const char *name, + char *cmp_buf) +{ + unsigned long size; + + size = scnprintf(cmp_buf, BUF_SIZE, "%#x(", page_type); + if (page_type_has_type(page_type)) + size += scnprintf(cmp_buf + size, BUF_SIZE - size, "%s", name); + + snprintf(cmp_buf + size, BUF_SIZE - size, ")"); + test(cmp_buf, "%pGt", &page_type); +} + static void __init flags(void) { unsigned long flags; char *cmp_buffer; gfp_t gfp; + unsigned int page_type; cmp_buffer = kmalloc(BUF_SIZE, GFP_KERNEL); if (!cmp_buffer) @@ -687,6 +701,18 @@ flags(void) gfp |= __GFP_ATOMIC; test(cmp_buffer, "%pGg", &gfp); + page_type = ~0; + page_type_test(page_type, "", cmp_buffer); + + page_type = 10; + page_type_test(page_type, "", cmp_buffer); + + page_type = ~PG_slab; + page_type_test(page_type, "slab", cmp_buffer); + + page_type = ~(PG_slab | PG_table | PG_buddy); + page_type_test(page_type, "slab|table|buddy", cmp_buffer); + kfree(cmp_buffer); } diff --git a/lib/vsprintf.c b/lib/vsprintf.c index be71a03c936a..fbe320b5e89f 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -2052,6 +2052,25 @@ char *format_page_flags(char *buf, char *end, unsigned long flags) return buf; } +static +char *format_page_type(char *buf, char *end, unsigned int page_type) +{ + buf = number(buf, end, page_type, default_flag_spec); + + if (buf < end) + *buf = '('; + buf++; + + if (page_type_has_type(page_type)) + buf = format_flags(buf, end, ~page_type, pagetype_names); + + if (buf < end) + *buf = ')'; + buf++; + + return buf; +} + static noinline_for_stack char *flags_string(char *buf, char *end, void *flags_ptr, struct printf_spec spec, const char *fmt) @@ -2065,6 +2084,8 @@ char *flags_string(char *buf, char *end, void *flags_ptr, switch (fmt[1]) { case 'p': return format_page_flags(buf, end, *(unsigned long *)flags_ptr); + case 't': + return format_page_type(buf, end, *(unsigned int *)flags_ptr); case 'v': flags = *(unsigned long *)flags_ptr; names = vmaflag_names; diff --git a/mm/debug.c b/mm/debug.c index 7f8e5f744e42..5ce6b359004a 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -36,6 +36,11 @@ const struct trace_print_flags pageflag_names[] = { {0, NULL} }; +const struct trace_print_flags pagetype_names[] = { + __def_pagetype_names, + {0, NULL} +}; + const struct trace_print_flags gfpflag_names[] = { __def_gfpflag_names, {0, NULL} diff --git a/mm/internal.h b/mm/internal.h index bcf75a8b032d..b4ba6fd6051c 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -773,6 +773,7 @@ static inline void flush_tlb_batched_pending(struct mm_struct *mm) #endif /* CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH */ extern const struct trace_print_flags pageflag_names[]; +extern const struct trace_print_flags pagetype_names[]; extern const struct trace_print_flags vmaflag_names[]; extern const struct trace_print_flags gfpflag_names[]; From patchwork Sun Dec 18 10:19:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyeonggon Yoo <42.hyeyoo@gmail.com> X-Patchwork-Id: 13076026 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 A8219C4332F for ; Sun, 18 Dec 2022 10:19:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4EFEE8E0007; Sun, 18 Dec 2022 05:19:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 479718E0001; Sun, 18 Dec 2022 05:19:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 319EE8E0007; Sun, 18 Dec 2022 05:19:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 240D28E0001 for ; Sun, 18 Dec 2022 05:19:47 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id F18A81201F5 for ; Sun, 18 Dec 2022 10:19:46 +0000 (UTC) X-FDA: 80255030772.13.882609E Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf21.hostedemail.com (Postfix) with ESMTP id 5545F1C0011 for ; Sun, 18 Dec 2022 10:19:45 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=bWK2HUZi; spf=pass (imf21.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671358785; a=rsa-sha256; cv=none; b=0x71AQUZPqhHk+G7uhOWEWAF+Pgc3UZgsqpaU96eWncFI6nPJ3lv3f+YYQKYY4YTeR88aF UGfy9kMjAoza7pnsnq+/ObWXM4IudcN4q7CeLd/BS5rqLowROt+d7c8exFgKAkFCTe5ZoI +Q69V328LjcOMBBidf1r/hrX1DqoyXE= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=bWK2HUZi; spf=pass (imf21.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671358785; 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=USiySWTOh1CETJ0YaQTua6YhrtEN1JVTOEmqLQEb+nc=; b=Lr7JletZi/x2chqNFRqtnbIaLujsYELqTiTQAX8zTbXXsgubOoTBuFAFUgTzl+jhuHeNvB /S56cTFZUTprybeAJtbMvJ58NoJd3ZQtLkBBcmumySA7ywo2AQFrUDvEe6Jx0sy2GVRQpZ 60/CH0btbeqLV0HTuzqgvdek8jfskuU= Received: by mail-pl1-f171.google.com with SMTP id a9so6394062pld.7 for ; Sun, 18 Dec 2022 02:19:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=USiySWTOh1CETJ0YaQTua6YhrtEN1JVTOEmqLQEb+nc=; b=bWK2HUZitrMe3mACDaUw2c6Wef/saP741RD5s+0F3g7SGx1ocQQGgA3KQo+0LBvYS/ 1AdRIdFNalVr6Szi/z72zeefH3ICn+Qd2dC6Egi/6wkaWWyA+Y8tlGU6Vs47aChPbtx9 O2bhTef3xY1/9W+oenTVALT0gBi6whnKo7eS8DdlerbX94y/feD283qBLf3rKcBD0RWJ Ly8Jz4yocDAlnLz43nG6gfP+R/veNmiX/jkOnAAJSZTii0CEIZwWBfSX3IBcpw3Fh4dY 0ZpF7xElp98dXVYTyhT5eI8lcFhxdm5C6i+8dRC08sLo9plyGPmZI4uv++OYORdWD2hu 8VxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=USiySWTOh1CETJ0YaQTua6YhrtEN1JVTOEmqLQEb+nc=; b=qdeNfMbo+rMgTWbge8zMDFLwDEmAZkRZuu/47EYPm8XezJTo3E2Vu0wuM40AMiYxfG S7qlEZm15+pKtnAJerN707yiBogQa7Wiakahv18/KUTAsh9CkWKH/OGIykGc67mR5J/l wf4Lc9G0Xxd2J+n2WVoWxv+es4r+jvougVKf7ADpnMpg2NoNzF3t4fWE74RHDx9T15KR oTpjKcf5WRXxIS/hu7/iE/aNR1lYWMElB8tRuOYUvRj3+OAme7xQiO4V8RiaquMXy0DE hu/IRfhJlYNeB4yt+o31R8PbfnmWf1N6iG8cRyBDkSXbcQudoWO069sQKgKjg+XozCQS tUqw== X-Gm-Message-State: AFqh2kp6a4x15UdiSqypPBcC2rHtbnktCwByufjdsicwrDUqZORTec6c tcFJlzPJeoWNyt2t14q/pXM= X-Google-Smtp-Source: AMrXdXvKE5/ZFpRCUmyw11BJzvZeV02MBGI0qTsOGM0h4S9hXXpZmBes+89J/16brPjl+7ootVUf/Q== X-Received: by 2002:a17:902:d4c6:b0:191:a19:e768 with SMTP id o6-20020a170902d4c600b001910a19e768mr7877083plg.48.1671358784136; Sun, 18 Dec 2022 02:19:44 -0800 (PST) Received: from hyeyoo.. ([114.29.91.56]) by smtp.gmail.com with ESMTPSA id ik11-20020a170902ab0b00b001897bfc9800sm4789791plb.53.2022.12.18.02.19.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 02:19:43 -0800 (PST) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Roman Gushchin Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>, =?utf-8?b?SE9SSUdVQ0hJIE5BT1lBKA==?= =?utf-8?b?5aCA5Y+j44CA55u05LmfKQ==?= , Joe Perches , Petr Mladek , Andy Shevchenko , Matthew WilCox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC v3 4/4] mm/debug: use %pGt to print page_type in dump_page() Date: Sun, 18 Dec 2022 19:19:01 +0900 Message-Id: <20221218101901.373450-5-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20221218101901.373450-1-42.hyeyoo@gmail.com> References: <20221218101901.373450-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 5545F1C0011 X-Stat-Signature: qq6rd8iot7u7x4ppiohr4i5jt1hf4gww X-HE-Tag: 1671358785-81999 X-HE-Meta: U2FsdGVkX1+OddqGxsljLNtp45nYfS3ujjSbtj9D+5cNihIQhGyHxj1156QbSLzmHVbpdylw7mH+qKMOwUJ4h+B3vMthhza48PIoPROL/27TIIXVFrkMjprneTpnb96PBR3nH2ocl0r8GjNMtPiRimvN0ZsPdYjvRph3oS7d3dLToRSm/xIwsPGESbSGjriA6QGynYKlo1XAuGmQY/6FenmjP1hakbgwz1oJZBX8pkA/0H7EQRrx8E3uZsoeRxyhDzc5/I+fjhMGvCzu5CwPp9FukzrzXz96Oanoz8E86rb+4X3wQN6D5beYXOq7fYNgB+JHfZsJG0S/JBaVYm7w4d0lnLvaB7WCFdMXvj0RcQ0Tjl7lK7VKJ1BVboYcHNOWvHE19JOHOm3aC7HgAQfk5tEtz9wmGdXICBe4T0RDyXA3WrB3DihTnbAJlStbpZf7jOzmR/eBCIMwtKeHm3G8NM2ZquBH2Fm0bLksWrN58C9PYtE/nWmstisuvJtiW5g2ezIWv/GpqQKcq33iFsG9OvA0ltjzqRwg5YhQ/G7c7otKUqy6kJcC4GDejCFrDU6aiRTX2i1Evy2AzAwTq3emsrRhXRuxK6OPfhKhxNGE05sXpt14mVTm8StdR41Kwtes4jMmDUlsWHdPvq3oWv/LI1xWRMgZQsOWhDMYZLI5E7qng7blqVVWsuXzAT+o2IYIx3YP4C8xqfEsauETCWVA/3ALE70wS297vwr0vH1gQy/AU2059n8b+2f301E/uQ9Irj/x23B5H4JMtqOEf9j3sIH0b06tH51Iq2zdxM0P9xFJmLFxtcDnc9j8X9SPvuSka/lp0em1t8AGQr3En4vHpvCEKxAdpIS0Axg9d2sslch95ujRAOffkKjuwo/nP7YyizK/vYmFzgcGWKU2/oHIszA/Fz17SVR/lF8uiRJfas79I+P5h1trG8YHwVlSCuFF/6WBh63VSc4RATIy0aI K8b7aI9c ZU1thDCvDYROwU8AeUVs1ikAo6cQsEEtugc5Slz72rl+53cBE7SLGT7414FO821H1s5o/oBTANqlfyv3J2Jwyr49e56mvvrBYTOFpd1QwQW1H3A/zyUI/2N0v5WdPJEedOojnMJZYgK/mNjN/xOmGOZ3uC3Q5n8IMBnPlpsjThll0LvsZoI8wIneplCZFtD0PD8XS1lKB1evbiDUHrNbMNQJ/wDVQBT3f2nAY0052iDKxyLUUjhguCn01+H3Pqyg4KbYxzSfPlP7cfAyI4JYjBc42ghJ7+jVberdl 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: Some page flags are stored in page_type rather than flags field. Use newly introduced page type %pGt in dump_page(). Below are some examples: page:00000000e47d45a7 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x10175e flags: 0x200000000000000(node=0|zone=2) page_type: 0xffffffff() raw: 0200000000000000 0000000000000000 dead000000000122 0000000000000000 raw: 0000000000000000 0000000000000000 00000001ffffffff 0000000000000000 page dumped because: just after alloc_pages() page:00000000e47d45a7 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x10175e flags: 0x200000000000000(node=0|zone=2) page_type: 0xffefffff(slab) raw: 0200000000000000 0000000000000000 dead000000000122 0000000000000000 raw: 0000000000000000 0000000000000000 00000001ffefffff 0000000000000000 page dumped because: page with PG_slab set page:00000000e47d45a7 refcount:1 mapcount:2 mapping:0000000000000000 index:0x0 pfn:0x10175e flags: 0x200000000000000(node=0|zone=2) page_type: 0x1() raw: 0200000000000000 0000000000000000 dead000000000122 0000000000000000 raw: 0000000000000000 0000000000000000 0000000100000001 0000000000000000 page dumped because: page with _mapcount == 1 Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- mm/debug.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/debug.c b/mm/debug.c index 5ce6b359004a..d6a0eb0a9bb8 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -120,6 +120,8 @@ static void __dump_page(struct page *page) pr_warn("%sflags: %pGp%s\n", type, &head->flags, page_cma ? " CMA" : ""); + pr_warn("page_type: %pGt\n", &head->page_type); + print_hex_dump(KERN_WARNING, "raw: ", DUMP_PREFIX_NONE, 32, sizeof(unsigned long), page, sizeof(struct page), false);