From patchwork Mon May 17 11:20:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 12261635 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DC54C43460 for ; Mon, 17 May 2021 11:21:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CB03961221 for ; Mon, 17 May 2021 11:21:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB03961221 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 664406B0070; Mon, 17 May 2021 07:21:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EDEF6B0071; Mon, 17 May 2021 07:21:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 37D336B0072; Mon, 17 May 2021 07:21:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0089.hostedemail.com [216.40.44.89]) by kanga.kvack.org (Postfix) with ESMTP id F3B0E6B0070 for ; Mon, 17 May 2021 07:21:49 -0400 (EDT) Received: from smtpin38.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 97C16181BCF04 for ; Mon, 17 May 2021 11:21:49 +0000 (UTC) X-FDA: 78150483138.38.9047CD1 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80051.outbound.protection.outlook.com [40.107.8.51]) by imf06.hostedemail.com (Postfix) with ESMTP id 44CB7C0007E9 for ; Mon, 17 May 2021 11:21:48 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bu7ZTRkX2fs9uP1x38tZg3xlV6h2CIh86Wz1tDK4TExm+7qVjQAfH/ihqdivkXrORKXajqZXvqZ4g0U0L25MRWnxLJpsQWhPAyOdcMxSmhl4eluUo2vb+iOp/6HXkKrgVWawDXcYF1h4IblQICY8rHSzhScbj/ob295IqMbjFDULWm3Hf5PMasVKxRF61Wfd0bCrD2TJ8y3UghQKCk7Mkgv/511l1CX+z7IH8+TwmeF6mX3BDaNJLVdCB15/gNL5YyDzOycAnP09c5/AGrVIbRnpeV8z79LQGK1I2Q87OeB+17Tyl8w8hMQPehr3vKV4IM6mfYMzYBdJCOC32tvYWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LwW92HBJU5WjrGe7Btqq0B/Cfc7JuiDDyJ4PvMDwULg=; b=nMtSpqvB0MIu1tRVBb2SAK0G1zACQZKOgdvnxHJdK9Ed+dlZlc9P433rsftCjyWU+7kc6/H13PaJhlMNFprKGinGcZ3HYzo5aLo4OuQtDWsFoH1hXoBP2eZt1WHhjJXQbxGbe//N8Um7KJKWHaV8JzjvnMfHhZ0RU/N+LqOje9jJY9IWtVG6Is5/lhu1sX0xUbjTFWGU+oP+h91FWmO5Iofk1EYEO5XMgV9/17SpNJufvKOP7xxs6/luHFqvpujVgk8JfuKVuYS1vQHV0tKa0PvXBrMRAfl/GFJVzBekLbpoNoB84d9Bgagm6v2zh77lEex5yECwieLti8HVOI4zPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LwW92HBJU5WjrGe7Btqq0B/Cfc7JuiDDyJ4PvMDwULg=; b=PT6m3w0VzTeE1vXWw90wf1s8l0UX4C8lmID3Di47fZaM6cDd1LK8QzG5PAfCO10YnAKr+oeP/DKHT60PgpF4Pc5U3ZXUj/UaWmHOG0N7J1InnwLuBozYAQ0eShJMt++qVkJNFmXdQaEmwDytqSkN4LeFiUsl2tZLdwqkYDJAueY= Received: from AM6PR04MB4966.eurprd04.prod.outlook.com (2603:10a6:20b:2::14) by AM7PR04MB6776.eurprd04.prod.outlook.com (2603:10a6:20b:103::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.26; Mon, 17 May 2021 11:21:47 +0000 Received: from AM6PR04MB4966.eurprd04.prod.outlook.com ([fe80::b10a:ad0:a6f5:db9b]) by AM6PR04MB4966.eurprd04.prod.outlook.com ([fe80::b10a:ad0:a6f5:db9b%2]) with mapi id 15.20.4129.031; Mon, 17 May 2021 11:21:47 +0000 From: Dong Aisheng To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, dongas86@gmail.com, Dong Aisheng , Andrew Morton , Yu Zhao , Andrey Konovalov , Catalin Marinas , Kees Cook Subject: [PATCH 1/5] mm: correct SECTION_SHIFT name in code comments Date: Mon, 17 May 2021 19:20:40 +0800 Message-Id: <20210517112044.233138-2-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210517112044.233138-1-aisheng.dong@nxp.com> References: <20210517112044.233138-1-aisheng.dong@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR01CA0132.apcprd01.prod.exchangelabs.com (2603:1096:4:40::36) To AM6PR04MB4966.eurprd04.prod.outlook.com (2603:10a6:20b:2::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR01CA0132.apcprd01.prod.exchangelabs.com (2603:1096:4:40::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 17 May 2021 11:21:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86e53752-c17a-49d0-568f-08d91925f549 X-MS-TrafficTypeDiagnostic: AM7PR04MB6776: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: frxuYLbM5SH2XRzEdVeK2t+LUa85GFcVA/wfk2hKtIt2KnQammEBnRIcnekhDgCfXyRbrsYjxDFJY8T/rQVmVI5dMhLehW6X9fh0ru3kjtJ/szcA8pCHFTxIZ0hdgWAlGA5vk/0GzYZY0OJ+vhn+DpJJIDS1i+Y/hH9PkAgq2PE9QP3Ir/G0loicYAqI945ruclr/ou9GZB+Tgfxww8Etmm/dnVTCam43sii6iT/6ICHdNj+f+Xtyzb44sluj5nduEtGDQMY93ppFKpYYplxQnXCrt3TXBOV/JAmhY3UqXcKWxNkk2ovl8ihUKTWqJgnP/qM3wyfZFW/iM5HNv8HifSTKq1Geqz2xDikFtPkf+rQMIiL2U7ckYPSmInRgLasDgOV+OPuqp4fX9U8sv6yc77I1ioI/MyT1QQdhSTuQl+UJ+wJ4Qu9z8hJOeJiYjsGQm/fRivOic9UKWYXLEQMdj17RCBL5s82FlP71A2j0sLtv2Ko+XlJ7UpZVQm40qogibwyYQBqwyYTd/0LWzOsz0QgMJKSBRv9iYa2bhoYJNGqm1LHzUSKUJs9wWtgu9LkAhDFjJMAlk7lc7VrNOBf2M1Ajl6asHwEmUQkL1dV1tJEd7u/LMUz8yhoBQz8lV1YcxI9OUoPM4G9BtM2GSc+q2JhP/OH1V/gFHadTFtVbiX+ZPho3vwl8i+bxXbSnm8A X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4966.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(376002)(136003)(346002)(366004)(39860400002)(6486002)(52116002)(54906003)(16526019)(66556008)(66476007)(2616005)(956004)(36756003)(8676002)(2906002)(5660300002)(186003)(6916009)(478600001)(8936002)(4326008)(26005)(1076003)(6506007)(83380400001)(38100700002)(38350700002)(66946007)(6512007)(6666004)(316002)(86362001)(69590400013);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: n6ExkmGs+j+hgxt6IjW0fDSof6vev0+LpGk54SIVdMaXVfWqY8v7dZpWGlP7YqkLswxHLaSOWE5wZNmmna2iGzgOy4MS7IGsk8/nLvhK2K/jxq2nEFFc54LLzjZvhsCXIWtLHh1HkBWTvM9KTMRLErJ9DIwBOWCK3obz0uIktJJcEneEq2Y4NB5xhCuYSzw5yj9XAMKFn+jzbAzjP48a95wuIVp1xxA/kdFrMNdsnTWGKe55IwjRAFCRd0zPt9kB8W47hxx1tFApbgAY+QtEkNT2U6DT9AHHHu9awq9pW+J3STL80MME8FJH+QvdYpgc6pi4N7f7JVwOpaMjZrpoetSgxZl/XcisrkfymY5Bmwgo7VxkTKxw5P+HQucjwT6taiZ4koA9JZnA++OR1P0pgu3Ek76gXJAbvfopfX8uIVHkv4tbUTJpOLxBaV/Qcd9EJrKENrZ6PeV66qik6afH2PDQOxqx21Sz8ca9tME8OzfOGh4+SmgrormoB15Ikbi8iIOjXGiVSE5Gbco4Hzt1GQ752v9UREkdIEbgAwrXS/jiZvv6wHV3Gz0kTFbL60bqOoSUzQX5RRvXWROoVWu9sgZb0TLkTT4n/ss7Ui7W/3jWjlFMMvrVsYD90GuDgnJhjcLfKRMYe23e3TEDDbR1edtMRosoxRHb1qp/LWrfVB+y+Ci7gGk2dw6K4nALQf4C0HhB/1H6trJPYXffxO8j6BPRzzfpabc5UoOEtr+/y7kTY82LesrF8YW7VHQtnJhrbuc1mry7jWo1i2Iujm41DKjINxA3zffEaN/8AGKLJbKj1Cf1/gItvcFfebaftz6zHrbLZ/8lrgIsPti5qkMq8zFiYPZ/dPYJ2AbvJKq9BxkmTToPYXmul/FlGdpNzfSdnYTtJxcsGKl1z+oc5QZUyZZv2L55s9cshuicHBmK0zvhUN+3MFs/0hgjWHJYjbSSDPk2ccpn+9Bxe0b8nMsRVCfq5Jy42OPXCgw6ia0CFuFjWLNk7zKAmi75CwseDkp/M2AsJqP8F7nx1uPwJ/tbedc5U51DTc7RkTExaP/E5PawziolpLGnI6qjGTDEoQ+MsUGviKqTpp0KbvcnrtmJuLm41GEHwx9ot4ZMRVfU5D9z8IrBqrtsizcGgGwCsBQ4nCHgke3BOO5qYi3bANG3rH8hbzYkoITIrxXhpxVBW17XxmwLv41sNPzwW2h+MIfsWxygR5IIvc2GtGu4U3lgrj7odkY9VcOaefuFBioJ2f8lnFJEMGDytI2NeTXwOCVo50OYK4dBjaOBCSqBvUaU4s0ShDmuEcuWI9pSmXMKuEe1MR6PimWliGrJitvFsDko X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86e53752-c17a-49d0-568f-08d91925f549 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4966.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2021 11:21:47.1003 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6V1HzG2EK68nue8aH7x3sBCSSiwoepvqynfDVnIiQPp8HkQb9XcXM36vs3TL7FwKufJU5XiGdmY1aO6TWklP7A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6776 Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=nxp.com header.s=selector2 header.b=PT6m3w0V; spf=pass (imf06.hostedemail.com: domain of aisheng.dong@nxp.com designates 40.107.8.51 as permitted sender) smtp.mailfrom=aisheng.dong@nxp.com; dmarc=pass (policy=none) header.from=nxp.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 44CB7C0007E9 X-Stat-Signature: co4yiuwaaxi9864sx5neqc8n1qzzzdxh X-HE-Tag: 1621250508-125194 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: Actually SECTIONS_SHIFT is used in the kernel code, fixed the code comments. BTW, also moved the code comment to where it's defined. Also fixed a checkpatch complain derived from the original code: WARNING: please, no space before tabs + * SECTIONS_SHIFT ^I^I#bits space required to store a section #$ Cc: Andrew Morton Cc: Yu Zhao Cc: Andrey Konovalov Cc: Catalin Marinas Cc: Kees Cook Signed-off-by: Dong Aisheng --- include/linux/mmzone.h | 2 -- include/linux/page-flags-layout.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 9cdc88d09f2b..fc23e36cb165 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1198,8 +1198,6 @@ static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist, #ifdef CONFIG_SPARSEMEM /* - * SECTION_SHIFT #bits space required to store a section # - * * PA_SECTION_SHIFT physical address to/from section number * PFN_SECTION_SHIFT pfn to/from section number */ diff --git a/include/linux/page-flags-layout.h b/include/linux/page-flags-layout.h index ef1e3e736e14..aff616855492 100644 --- a/include/linux/page-flags-layout.h +++ b/include/linux/page-flags-layout.h @@ -26,6 +26,9 @@ #define ZONES_WIDTH ZONES_SHIFT +/* + * SECTIONS_SHIFT #bits space required to store a section # + */ #ifdef CONFIG_SPARSEMEM #include #define SECTIONS_SHIFT (MAX_PHYSMEM_BITS - SECTION_SIZE_BITS) From patchwork Mon May 17 11:20:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 12261637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39F5AC433B4 for ; Mon, 17 May 2021 11:21:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BFEBD6100C for ; Mon, 17 May 2021 11:21:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BFEBD6100C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 619956B0071; Mon, 17 May 2021 07:21:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A0686B0072; Mon, 17 May 2021 07:21:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3A4616B0073; Mon, 17 May 2021 07:21:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0060.hostedemail.com [216.40.44.60]) by kanga.kvack.org (Postfix) with ESMTP id 068A46B0071 for ; Mon, 17 May 2021 07:21:51 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A1E9C9409 for ; Mon, 17 May 2021 11:21:51 +0000 (UTC) X-FDA: 78150483222.28.315F1C8 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80047.outbound.protection.outlook.com [40.107.8.47]) by imf20.hostedemail.com (Postfix) with ESMTP id 7D6A03E4 for ; Mon, 17 May 2021 11:21:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BdJX8B8NswK80fqPOEM4VUe72Ik5qytgmAgkWAhAjGZOaY1UibBDnVNd13JHIUmprv6yltAQKeINk+fkoghFT/npN7GBZkmTwB9tHO2s/g+Quy9XSV50Ful9MtC0LrIwb6uSGCQI6DtG2+AP29KEobHPpQ78Lq+r0yhmzcKtV0mMbk4s6nyjyoJj3KjZBLCmHQA69s8NJxAagr0e3Cq8ZB4d9tlR5mLYoEf3t3Y0RnMAh2VodRUGmTwRJ+9DIu1zDRUuP4zRZU0lJeN3jklAt0pys/Q+vlnPGJQbo9EYv00msaMd7V70+cR0ePDNlg2NEWXr2QUyVWA/bfOPOIJ7Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MwTo37MKmumsaPZd8TpE7gyYg35cqVRnokGbVfuznbo=; b=eGvTaM5CODleNXr8nWV+MXnrpnG1q6dgUoONJdMzlMxIZMBcbuQqMn2k9c00KaQgRWAjxnO07Re9wgDnoLObeUysXoKwGfx53r2dUZqWjUsPKcmWJNO4hGVDlqLwPQnOVw2z+pbQg3woMPWCVyvrrXDO6tUrOEDhfFpgnMgwVo/9TaGdCaWfwqqFYnA7ttFVRc07UOkycmBv5TxHSR1Mc9SlCpJOVQdNW3i1hiyZjptoHoW7Yep2OR5hJ5L3sJJPqJOq257HIc7BHQnVOjj4ebu4/QAiMhK+9W+FbrV174n94NpCJOvAuaEtOfhoPZJO5MuLtXxoOehsc6JbHDve4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MwTo37MKmumsaPZd8TpE7gyYg35cqVRnokGbVfuznbo=; b=Bo9pkB+m00uKcGqEuLuiEXMm00oHg75x7FmfJOTy+VI2J8VyVioOep9S0mR8rsn/6dLi1uykpB9ei+yzolnE2RREdMODf35GRxAg5GPV+DZM535Sgz3rSUeL3k8aYDb+FBB0gKAdu2SK4RbT7WPwsl5s+Udbplwe7/LwkMAzl4g= Received: from AM6PR04MB4966.eurprd04.prod.outlook.com (2603:10a6:20b:2::14) by AM7PR04MB6776.eurprd04.prod.outlook.com (2603:10a6:20b:103::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.26; Mon, 17 May 2021 11:21:49 +0000 Received: from AM6PR04MB4966.eurprd04.prod.outlook.com ([fe80::b10a:ad0:a6f5:db9b]) by AM6PR04MB4966.eurprd04.prod.outlook.com ([fe80::b10a:ad0:a6f5:db9b%2]) with mapi id 15.20.4129.031; Mon, 17 May 2021 11:21:49 +0000 From: Dong Aisheng To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, dongas86@gmail.com, Dong Aisheng , Andrew Morton Subject: [PATCH 2/5] mm/sparse: free section usage memory in case populate_section_memmap failed Date: Mon, 17 May 2021 19:20:41 +0800 Message-Id: <20210517112044.233138-3-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210517112044.233138-1-aisheng.dong@nxp.com> References: <20210517112044.233138-1-aisheng.dong@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR01CA0132.apcprd01.prod.exchangelabs.com (2603:1096:4:40::36) To AM6PR04MB4966.eurprd04.prod.outlook.com (2603:10a6:20b:2::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR01CA0132.apcprd01.prod.exchangelabs.com (2603:1096:4:40::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 17 May 2021 11:21:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: beaa3da1-ad0a-424f-b483-08d91925f68d X-MS-TrafficTypeDiagnostic: AM7PR04MB6776: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2582; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b3neWdpCRsfayWkGgqY7W+f4Pn+hS+R2qIIHn4XrNzQ1SX4leOs+Mf3EBhpqLUyJ8PJMqEEFWwieuL5vLhwkjEdlyP7eJqhkeYPi2Ht/hd8VtcX3Ml1TvaDg4FY9vamtiDHyE8zqr7BxaP3Y5lFTy0kgatnIfNJtPdckKsdVAy2zTvBAImyg1GtFTvvvCiOwDUnYQjpTQ82HrMikcO/Zl0xQgTdl5vHPFeH/7a0mKUEnDDXcbxVSho7SZ1BYCeC4tTYww8gVBdFUL3tl4ibY/H/1O/lOC1v8BOkDIArgN7vPaTF8/vVK+rk4eWhGkw9LDiCRKp8Rxn84svys/ZE0ZYEJkn9tHUJZiRb7KnV5qJGo9T7vcyDlTkKFbRP3M+Jn5LaHB9bZP8pyfJIdxOZDv0nWwgoKfIQWRGNA1kg+VNbQy50l5VNP8rUCf77u3CNExQLD7Ptr+v9WXe4hJW141iUG/cgQcR+RbgZ51eeGmmhyfUrebQ4xcaUGihUmJdaDyk+564VuHtkhEGI1uKCIWFl6AxdSrdiB0CClpgXkmjOmFXVi3+1EG5fAP7OpjI1NjnA240D3F/5UcjWFkW1HfGHD075Xy7jW4W4U18kzKrsLJ2w1obhmvW/fY5nUWUJ9KIci56IIV0xWXbBN3hwFA7x3kt+9KhORKBwncvFrhXrb7k/BU6pwM1zjzr3Z9oGV X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4966.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(376002)(136003)(346002)(366004)(39860400002)(6486002)(52116002)(54906003)(16526019)(66556008)(66476007)(2616005)(956004)(36756003)(8676002)(2906002)(5660300002)(186003)(6916009)(478600001)(8936002)(4326008)(26005)(1076003)(6506007)(83380400001)(38100700002)(38350700002)(66946007)(6512007)(4744005)(6666004)(316002)(86362001)(69590400013);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: xXXM0cOMRrL9+xi5veKW2g6XOmQ1HvZSp5DLFsSbW0IEUrEQNaCu7MPlh0bwvDWVhq+FRS11D8E8WKma9kJrAeV0zPbjtVcBMWJbzFygd978PAs7uxn52fCMAA2JFATVZHit0lG032gG/f+f0G9sFLAdMCEeDKxVCFvNb67oaTJiq7LRnTCkCEZSqXK6HgU3dEJEix7OIi07E9K/8odv4ukzhawvihariMTZLHK+TdfVVCxvoBuEXbkWl1iCcX5uh/xvR5ye94xGayrBpid1efhmhk8dkGa7+wNMfg3JbkIrKmq2DqJ3WRcBl5cGyzTcoZmQFD4Hh9U4hC53lgBDdUzbqXKTp5PPS5atgoaZEhVOh+KbdvhGhjLdoPhBaZ/Hze9Q8zvZhdPdH+ZtwWhUsC2FoepP//fAUYV+JRWB5UWJeYn9nXnxJm3u2jvvlrJiW5mVjyPniGYvcvxsv8JvFtIgtSsGwDdt2PGrf00r48RORNVy1zUV6f11M0ISk1bUtFG+W83Y2y7HVzaE/oBQ8N1lmmmAtpmUvPUM7Q/78GXLtOWEtQQA9qOL7ZzxIluYmbiTVpsw9PY4EP6Fblxza19VYPjS+cCyIMV/K1TWzDzP0iVwjWQDbyqSFjdTaMtupmMVODW79JRlRzdPXqJhO4jBvSA/gNc+CP9iTC12XdixQqL6qrZwnHt53XITV1ak4iemTlvlocrQD9pg6LEL+1gGh9sq8c7JGd7EzzPviNqyLxd/MX/7qe5jfQAHcGLOn+XntLzdw+AsiZwsDrDeuPKk8GNghMOSDS+v/np+vrMbz15HfsCR+8akIuk0g9DgRIVu+7nM3Ki5FBH006EZdiYGL1yshVNWsA3cPXHmYB6cPmdveGjlZDJqZzxfZf7UsgDdj4YUu1XFqhlVMkFP+X4GeZJFpjlppFezaksj0jw0QIUMz9zFwEYfz10oL00g6SpHGay5Gxcv7WnnUYB/FnZrHp1mftZ0R2EpELnBd7PTOC68jYm8WUgKD1wZSyR4OBjB+mH9/VcX2PlrAeuLUk7Iwo/YEOIx8HrUM9hKB7memjSnEOseVZ4BYRvZvM3X9SYzTQamuPSXvWL4w6+gecstnFcz3CQLgtVzTS3Kcjxi4rSN1d1IX9Bypm/3Fp2uNTULB8zvojBdB51AHunx9wrEonW5dZsDeDU6k7LWFC2d6fFYTlvDpgBHG/6A2W/tZ6LgjbRE4El7tsh/3GeG1fo7AhpkBMYPM4NbaJF9vLHa+xzKYFEYNk8aWJNTpf1d+qyXi+rQbuEIPRB5ccdnMJEXEBWgycnm71D6Bks+87PKvsvTd+u/DA0v8bscrZUJ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: beaa3da1-ad0a-424f-b483-08d91925f68d X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4966.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2021 11:21:49.3540 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: eOzftBDfICmQtQk67bvL9DSc+rnrVLA43PJUAj+dYcPbxtmWk/8uDMk+pM+P0uO8MtT+989TCRaqDfE7i4WZSw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6776 Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=nxp.com header.s=selector2 header.b=Bo9pkB+m; dmarc=pass (policy=none) header.from=nxp.com; spf=pass (imf20.hostedemail.com: domain of aisheng.dong@nxp.com designates 40.107.8.47 as permitted sender) smtp.mailfrom=aisheng.dong@nxp.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 7D6A03E4 X-Stat-Signature: 6jgsrdb9e9ozhi1reqimxwqnnxg18j5h X-HE-Tag: 1621250510-980779 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: Free section usage memory in case populate_section_memmap failed. We use map_count to track the remain unused memory to be freed. Cc: Andrew Morton Signed-off-by: Dong Aisheng --- mm/sparse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/sparse.c b/mm/sparse.c index 7ac481353b6b..98bfacc763da 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -549,12 +549,14 @@ static void __init sparse_init_nid(int nid, unsigned long pnum_begin, __func__, nid); pnum_begin = pnum; sparse_buffer_fini(); + memblock_free_early(__pa(usage), map_count * mem_section_usage_size()); goto failed; } check_usemap_section_nr(nid, usage); sparse_init_one_section(__nr_to_section(pnum), pnum, map, usage, SECTION_IS_EARLY); usage = (void *) usage + mem_section_usage_size(); + map_count--; } sparse_buffer_fini(); return; From patchwork Mon May 17 11:20:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 12261639 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42717C433ED for ; Mon, 17 May 2021 11:21:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DD31761166 for ; Mon, 17 May 2021 11:21:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD31761166 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7EF706B0072; Mon, 17 May 2021 07:21:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 775F66B0073; Mon, 17 May 2021 07:21:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 554C06B0074; Mon, 17 May 2021 07:21:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0110.hostedemail.com [216.40.44.110]) by kanga.kvack.org (Postfix) with ESMTP id 21AC66B0072 for ; Mon, 17 May 2021 07:21:54 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id B30B49409 for ; Mon, 17 May 2021 11:21:53 +0000 (UTC) X-FDA: 78150483306.16.373E915 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80054.outbound.protection.outlook.com [40.107.8.54]) by imf06.hostedemail.com (Postfix) with ESMTP id 53A8EC0007E0 for ; Mon, 17 May 2021 11:21:52 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cUjeY3S0PKM2n3PmUA6AnGE15lra0VO/JJ5rWO4MjYwjLaCk5593NcimvzNlG/nysNIKvYLQh0Ln/mQTz2jm+p/eOt2ZAtJENDcyDU8QOHy/g3hd71JBNeBjumJ1/MkYpMtvA7MyW1NSiBr+H3tMGKd629pNGB38nngRIlksdoV5erj+wst71viPeZ4Typm8kusk0LLv3C2uX9d0HIJe0I5jUH3o9qkoDbJZtzyxUAXcOC0t8BFZXfy79eh6O5WZuqySfeUc348Ok96O0LT6F9eY5/fsyXVVdxKxpJ8YRWYNqBHEouYsAAutrXVpEesYsKTxIw4EbYlQ5zVW73YThQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OlYcp0Xygv4qpBBJemid501wet146ZqvF1270Bb7/zI=; b=N/WTSPJkvHLKWto6oQaVlTpxaPjd2+KZP/282hgh1/uTAThoWl2OEqTUpkxBw++W45nVFKse8Fi29uTeAWFayZX8gbvrmGYw2fTPtu0Pzi6GZ8xaETGnPy1ipdCTKKqRQFkl4J9FOfftd9ttASP1NP97htS/IWNcaH59TZ4aLpaFG6W6rxHZAzdyvGJR+uVqllFAz8Cv6/RMohH4s6BQXcfJu52ZWZ6dT/YRjxAejw0qplbQ3lLwPssoFb2FhlUb/KDoMFLk7RzaMVAILKMBYs46aA0uQUbBZWkuDBax7diWDpAfDoHTaF0Zks4T97H30/0bJ5gzlyphRmLV17Y9tA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OlYcp0Xygv4qpBBJemid501wet146ZqvF1270Bb7/zI=; b=S2frfLpsYn6d4RfQbsyNHfjsZnYuFznyrwy59Cpjmez+pPV1C1gNaecu+J7wUAa60XAeDY65BJj2udlNqSf5W42rhy+FZLFVookhBOmPGIrjQlgsg6FchevOTuxIU/ZT/nBiQ47TY0cV2jtCXTLl4mb2oWAzEt/CSakKzP2KJcA= Received: from AM6PR04MB4966.eurprd04.prod.outlook.com (2603:10a6:20b:2::14) by AM7PR04MB6776.eurprd04.prod.outlook.com (2603:10a6:20b:103::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.26; Mon, 17 May 2021 11:21:51 +0000 Received: from AM6PR04MB4966.eurprd04.prod.outlook.com ([fe80::b10a:ad0:a6f5:db9b]) by AM6PR04MB4966.eurprd04.prod.outlook.com ([fe80::b10a:ad0:a6f5:db9b%2]) with mapi id 15.20.4129.031; Mon, 17 May 2021 11:21:51 +0000 From: Dong Aisheng To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, dongas86@gmail.com, Dong Aisheng , Andrew Morton Subject: [PATCH 3/5] mm/sparse: move mem_sections allocation out of memory_present() Date: Mon, 17 May 2021 19:20:42 +0800 Message-Id: <20210517112044.233138-4-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210517112044.233138-1-aisheng.dong@nxp.com> References: <20210517112044.233138-1-aisheng.dong@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR01CA0132.apcprd01.prod.exchangelabs.com (2603:1096:4:40::36) To AM6PR04MB4966.eurprd04.prod.outlook.com (2603:10a6:20b:2::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR01CA0132.apcprd01.prod.exchangelabs.com (2603:1096:4:40::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 17 May 2021 11:21:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 97fbd5dc-284c-4009-264c-08d91925f7ec X-MS-TrafficTypeDiagnostic: AM7PR04MB6776: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:529; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0F0WlVQ3z5o7aMzYWQM5gV5VBSszuy9w8OQdPpzLU+5zBsedBaAC0VAReDEjQr24FhSiXoPSkehbrUoTPnR1lclTk0icWX+DnYxiZ35EByv8W9Rwj75tpQ/Bys132M+nsE2L041O1nquOux6IUYqNPWxLhbxCDWWPnJFVf+Ouv9GnWU2B8Vzre3UYTdymS6TF/d4sVRA2pgueCJ4iH/G8ssaH8bE5d52UFsW23CaLK9Elcd+Qaa823A1iFVFqNrwx54P4am7xyiPxpHcweBsrCW5lwt25BnOct995UAqqW9t4jyqOKIVOxJ4Y9Kdcw7d6wUsAE9e1JWLlLTPDw3XsGJoIOhvWMzPeuc5Tzi1MhvgFnlAz/xjP4v7RPOzh+cIS0SPWUdRzDjEY4rLyRikuO88jtV87mngtQyWZ2xwtCiFUPW1/BU5UaiiUp3AqJ7k4jrgJ1kHeyjHLolU7YkUEVV/UKkVtSQMcXYzGV4Q4obyooTfG5y/HClOvGL8NnN/lf984JuUED2FnQFZcsbBTRGJl5DNYu9l6D9+QGiEhqra11MKD8OVKlCzrIXJKbI3s08IUD2TOe5D3nUkypAdpLf67e3q/DQoNx5IzTY1w+HbtAfByg6LwGQwdfFoZzBgWDBOIy0JxBegvxfA7aOqzmKhqLf+KWNAK6khumdyWhE8qTzQaJiOlUy3w5EqerYf X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4966.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(376002)(136003)(346002)(366004)(39860400002)(6486002)(52116002)(54906003)(16526019)(66556008)(66476007)(2616005)(956004)(36756003)(8676002)(2906002)(5660300002)(186003)(6916009)(478600001)(8936002)(4326008)(26005)(1076003)(6506007)(83380400001)(38100700002)(38350700002)(66946007)(6512007)(6666004)(316002)(86362001)(69590400013);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: L1bCWrm2J5Xzk3z+1FXLQX111w1xPNRgvxbednKoa/vjM2Amk+TG7lWT8Tbw+ZYpW3U2w/lMaYJ+K/6fd6LOS/J3tHUJbS57Sl8mqWYFQdBH+8fhwzl6HtkPAjEWnXHxfqczp5QZdrn5X/0o/6AwwIIzK2nqrz8ND5jYlDKuD/CeJ0pasZC0qFFUV2gjqOf28RXyBa/Gx73HIEkjBbxsqFwmw1hmaJouqCb8rnPsFcrgnYEl/gjnpF9PjNLFC1znNnMG8PHYjVVnvRB04UaSyd1FpaPnBEk2QCLfcw75SJ4DtvoXVfpObp+fTvYq9eTTX3RGCMNOH0ASrF5kWtt56Ihoh1qPmk1WKrpIlD6ifIWckvoU4IMBnkVAadRu9zrcwOhuXyrF4UHTLfzFIkyB+u+srECrQ1LxHo+gFC5OQTFPnYY+Pt82LVuYEuuQkLl1uNnv4UBPt0GwfqZr2l5t9aBkVRMS4nU4WxvUqCQMdfZK8mKAuoJBRWCDE874aC9VJR3LUVBHiiGSwLy16lkTOmnJmx4BthOwjrwSSo2Zz0ALxp36x8kmAnp+zBkpHQMaEOmJhGctueeYZ1fDT0/6q2Rtv6/GN/kfdSN7vg+5yi2L5cN0vtoQ/DgaUJxSVsU/P7kExtchSaVWKIDXQw21mM/ZiY2I7WTlMPJ+2XGwPPDXvnwFDsWAK32sr+Wvn+tBV6spjQHD6BWJ49LwjtXPhq/odASVphPnb0eH5lpBRmRUnCgIgiyRUW3awl7s8G/Ykug0cJWkcFV+bcH/CUsLqofaajL9epk6lhhBA2CmqaUQP8H282Rz0qyO0VgC8wwnKLzKFeQKZuuKx3BAwcoEPEcFf9/gaFW243Pnfv2vI1a40jkKQEkvYOnU0MZx5nCiSYxl7wMP5MyZznnjmfNtR2BWJrl/CpJWr09wr16QinrpqQdIha+akS/KM6zAvZARl/YbLyRx9zC/hHnlnOKZB3GM4KSb7GGayjyVJ9nk6vQ0gj9fygB2JJ1jedvfEs6T8pwfUWp/VJ0R8/Vuiu9u53l6ItzWjKQyM9bQ/o1zcT/W2MSWJ3UKRI53Eb/zbQrqBH6PAq8MCvw2ps5ihbm5eVBI7Pn8ExMpmchl24Qx/PsVVuuYnTrTT63Agr1S5Mqsn1csuE7JXAc1EWF44k/rF65hHvbpzbW9of84awr6Hd8wF5jjDT4m6WCYZM2qtWZqjerqOAZnpnodFN1qBNkXhKXVLEmwEYzAOQoaspNDQn/6cYUOft0Bk7yRtM0dgL3IHmDZ28NA9j7xA9S4Zvh+39k4xREbZhI7P5J0b4fjsWwo5hIhSKqE6mzZPewAYpZO X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97fbd5dc-284c-4009-264c-08d91925f7ec X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4966.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2021 11:21:51.5877 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: S72XU62DYXiYo2czs4+zfWfiimBycxcY9XROW/7pNKUleQ3A/QXztpAvnSTacOBV0fWvYO47zzJhwbKrsEU/qg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6776 Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=nxp.com header.s=selector2 header.b=S2frfLps; spf=pass (imf06.hostedemail.com: domain of aisheng.dong@nxp.com designates 40.107.8.54 as permitted sender) smtp.mailfrom=aisheng.dong@nxp.com; dmarc=pass (policy=none) header.from=nxp.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 53A8EC0007E0 X-Stat-Signature: rnemqqqkqfhgpq3axs56hmn9d78xt4h3 X-HE-Tag: 1621250512-385849 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: The only path to call memory_present() is from memblocks_present(). The struct mem_section **mem_section only needs to be initialized once, so no need put the initialization/allocation code in memory_present() which will be called multiple times for each section. After moving, the 'unlikely' condition statement becomes to be meaningless as it's only initialized one time, so dropped as well. Cc: Andrew Morton Signed-off-by: Dong Aisheng --- mm/sparse.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/mm/sparse.c b/mm/sparse.c index 98bfacc763da..df4418c12f04 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -254,19 +254,6 @@ static void __init memory_present(int nid, unsigned long start, unsigned long en { unsigned long pfn; -#ifdef CONFIG_SPARSEMEM_EXTREME - if (unlikely(!mem_section)) { - unsigned long size, align; - - size = sizeof(struct mem_section *) * NR_SECTION_ROOTS; - align = 1 << (INTERNODE_CACHE_SHIFT); - mem_section = memblock_alloc(size, align); - if (!mem_section) - panic("%s: Failed to allocate %lu bytes align=0x%lx\n", - __func__, size, align); - } -#endif - start &= PAGE_SECTION_MASK; mminit_validate_memmodel_limits(&start, &end); for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION) { @@ -292,9 +279,19 @@ static void __init memory_present(int nid, unsigned long start, unsigned long en */ static void __init memblocks_present(void) { + unsigned long __maybe_unused size, align; unsigned long start, end; int i, nid; +#ifdef CONFIG_SPARSEMEM_EXTREME + size = sizeof(struct mem_section *) * NR_SECTION_ROOTS; + align = 1 << (INTERNODE_CACHE_SHIFT); + mem_section = memblock_alloc(size, align); + if (!mem_section) + panic("%s: Failed to allocate %lu bytes align=0x%lx\n", + __func__, size, align); +#endif + for_each_mem_pfn_range(i, MAX_NUMNODES, &start, &end, &nid) memory_present(nid, start, end); } From patchwork Mon May 17 11:20:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 12261641 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2379C433ED for ; Mon, 17 May 2021 11:21:58 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6594260FD8 for ; Mon, 17 May 2021 11:21:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6594260FD8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 099856B0073; Mon, 17 May 2021 07:21:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 04AA96B0074; Mon, 17 May 2021 07:21:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DB6266B0075; Mon, 17 May 2021 07:21:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0039.hostedemail.com [216.40.44.39]) by kanga.kvack.org (Postfix) with ESMTP id A48086B0073 for ; Mon, 17 May 2021 07:21:57 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 3F946181BC081 for ; Mon, 17 May 2021 11:21:57 +0000 (UTC) X-FDA: 78150483474.27.5BE3908 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2082.outbound.protection.outlook.com [40.107.20.82]) by imf27.hostedemail.com (Postfix) with ESMTP id 0DD5E8019382 for ; Mon, 17 May 2021 11:21:54 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OeUFGxC4OBPF6xpefDbwkvtAnykEZ+rSIcQWiTo5/+U6W9+DtjLh6tTfs1kWiMK1wv0mRVl30YlL9gfxQgsVl8txOuXELlONbpkZ6P9HwQaHFPo2n7nlODxgGLa/egoM1nN6R9fe9Q/1DEGN4Yedf7R9R40pD6VRQ7fQhYyS0CxNbNLohKjI4VcBJpw/VhbKpijX/UaWnZJ/7cPSUvcz5VRA6wOAyzqh3z4zydW4Fh1PXOwSqR3NMOLEfwUvMQGcaxdi6Pd/2MX23nc9C8vVbU22Vci2S6jD8/hwQPGaHKdy+ZTeo3spPUcTv5q3pY7r4u4ZfYz8nbBUrb+8Nd1XZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WM5Sym2nO2CWtQiqJ9BW5If8ZC+fKi/yN/cPhMRlUGg=; b=iPkQsyGL7xzQINX2Lgko+7+Ht0LgCtA8EEAb6H1FBEEZMpkfdFSAsPLUzKC6VnykY6QHMsteGnnaXiwB/9ZHfiwjdmJpsDzZS0sMksfkhNluZsr2RHKr7391QWwEXhnXqVYkAtF8z0psKH9t5+BblUBw7cErAHJoL3Br9bivnnESzY4/ZupmVRBdNdkdKaQKGzshYznx3aOuTAaUlKDLbrlzCy13b+t4fJ6u1D2xqGYzGMpJ5SBIu+D9BWNWVHic3Ri5S/THJvzkEItrOkrJxZaSPLesU35/s3MulT+/fdX66ZFm25cfUnJwDuhQvFgIN5iKMkpWzUksTMRN/RCMKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WM5Sym2nO2CWtQiqJ9BW5If8ZC+fKi/yN/cPhMRlUGg=; b=Xmdr1IpoUS64jL8bH+eho2sXt2wiQMP88nHR7nVFANNGKx7uB8zIkxFMxEBvqDuzKC/TtSgTxaRnVSXuW4oXnC0lkPIzSS1GVm+L3BZ4TSj3LIKkGrFUvq1brKbSc5NlGfmD5/XJlUjhaFz6NmMnZnLW/mC3D+tMRc7N8DXCdKE= Received: from AM6PR04MB4966.eurprd04.prod.outlook.com (2603:10a6:20b:2::14) by AM7PR04MB6776.eurprd04.prod.outlook.com (2603:10a6:20b:103::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.26; Mon, 17 May 2021 11:21:54 +0000 Received: from AM6PR04MB4966.eurprd04.prod.outlook.com ([fe80::b10a:ad0:a6f5:db9b]) by AM6PR04MB4966.eurprd04.prod.outlook.com ([fe80::b10a:ad0:a6f5:db9b%2]) with mapi id 15.20.4129.031; Mon, 17 May 2021 11:21:54 +0000 From: Dong Aisheng To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, dongas86@gmail.com, Dong Aisheng , Andrew Morton , Dave Young , Baoquan He , Vivek Goyal , kexec@lists.infradead.org Subject: [PATCH 4/5] mm: rename the global section array to mem_sections Date: Mon, 17 May 2021 19:20:43 +0800 Message-Id: <20210517112044.233138-5-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210517112044.233138-1-aisheng.dong@nxp.com> References: <20210517112044.233138-1-aisheng.dong@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR01CA0132.apcprd01.prod.exchangelabs.com (2603:1096:4:40::36) To AM6PR04MB4966.eurprd04.prod.outlook.com (2603:10a6:20b:2::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR01CA0132.apcprd01.prod.exchangelabs.com (2603:1096:4:40::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 17 May 2021 11:21:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3c17ff12-8f5a-4548-9388-08d91925f9c6 X-MS-TrafficTypeDiagnostic: AM7PR04MB6776: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nrNYlm82hoExt9ZOqLg8ncYl2sjOy79Q1MzXPzHJvq9Zmf9/vGIf9TlHwFdHG4UjCzX0fEyXYly7JV46pf7gzFwkCNa632wnp5AvyUHuriU6WyuiG5NiUEnLQtwXGeubQLdFrl609nCgoXlTq1vw58H/i4YrUa5XDBLHS1zRIM+JHnqHudLSYZqMWTeVxPxNnzRiIzi/RUEtrcUF3jezmeAjDtMpe5M0P5eIbStiq6HytRyvYB2XybFQkDshUopD+uPtfzGHdyf9mAPZs+KVW/yPE3zoyPMWGy8aBBnxLSMDtPsX3ZsF5ZaWPQE4MuX3DT9OvjKjGetJD2E5o5hYFSZtUX57B8VX2o8cUs0kTRmmI89SatnXcfmdUZkxL/klQOwmYF2jlgn+HKCAV2AAQen5kf0/50l3v2ACPndecIkeXKEp/PhY6LSHH7Z+6HyPahcaGLc/SucWot0wNaZUZNmsOtpvQe5myDHVaLtTW4B8Q7Fh5vw51gmFEZB8S/XM70TMP0vRhnnc7jFcxlOfO5onz57FFPvPypG/2WolBXyi+QBP1M7SJ5zR2sxH1M7l5J2YDO49cYIU+EWhv5Cc7Vruo1beP1Uk9gypUg4x2Gyf7CdhZqW8SEEbV54869kjNKMposec9JfqLDqZWD2UwdslMrvUmWsC/9QPPOAFFgcwdX0+LfS6oqf3/mDaTHju X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4966.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(376002)(136003)(346002)(366004)(39860400002)(6486002)(52116002)(54906003)(16526019)(66556008)(66476007)(2616005)(956004)(36756003)(8676002)(2906002)(5660300002)(186003)(6916009)(478600001)(8936002)(4326008)(26005)(1076003)(6506007)(83380400001)(38100700002)(38350700002)(66946007)(6512007)(6666004)(316002)(86362001)(69590400013);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: n/pv+IJ2EQYG1S5QE5r7Jvk+08s/O5DgHq92VHYhn9znQw8BDlNlBCtL6EB/qeD4jf0ofHlFqJXtvgqw1ewqbFTQ+0YQGGygVFbRhUUXXRNjR6Zt6Kwd8+vx0mzMkH5MSCHHjBP7bj/PkMRbE0tMh+kKd3vhODczUiS+1VmFIswN6Vq0PH59HfmBpZth2bY8Ke4c/MW4Ll9EGw1pJ2bEawbxWPDwKz/N8y6OyoZg35PD5nHPO1fDcq7OOgxZARQor35JS4e3XSXZmc7C0UsJtzyhTMH2ljdvKYIdaAmzp5HCxGBREJSaI//F3+T7YspDwMyP8eY7gvbU9iKmZi5BCgheFUp2aqFDGNWske2DHTz9NJTZJqLbAXg+URqS5ds2Zk474o4SwZ4Fv7LpwvXcQhcPXXlZwKxriC00DCV5CIthUyyYZZfz/4Qe6UJHq4bosf1ykeENu4JNjFMbvdFJ2Gohg68R3spdqZVFsi6+y0xdFby/BbSZP1qfR1iJuMpkD57XinTd++tT2YKlGGHszbzxsnSJ8glwZMX4lK9fOGat63bguYbSVmw/sCHTsTmBlR2GTo/Fi0Gqj6F5qOmgd9CRRO5If3/oVdTcfeDEbBYZQZyl8ISMtL+HtWdlgYRBGL9m5nhFeKupSqgAC08HVlzlm445a1X4/hf35LOSHZ9DSu/w6009Ot8XkHwbePC538D1ouEucSrspddVDnGkcNbzo8ff1hpbq6rC8bPOC+OqVKMCiird498spqwNvO5AJeJwV5U1YwwPy8iblkoq60NWk6E9MVe120Z7JVn3e1XBAPWHHwBVmPx1zbGG6CMj80cZbqdrhsZQuMrGa0tENcHI27n0tN6GtufIuOBPrWykGZZT/7IzhZhrrsKJGS9ThReJRrigHIHet+5nBOxW0KATHlTsQSWIQZaZtNGrLAt8qjToAs6O1A7Cl3C78d8F00RhhZOXPdRZNxXKMCvyM46S4olbulKEpGNAJLuTMIpo9Jk266zHuBMfYMeVnpNFJ9vNUEJnSHAmtoXm5evPWUGEG9Cf0PeNIAKYjJfTGJs3heTpQH4bLBCrDIv9X0uPxHv9hef6rWunK8ptsgvdn0r+TJ9voCJeIoNGTlup5rm7BS8x2Tv3EOij9cBwVXD2ssTW6AvxL2yZF28XJVEBP/2DDddMP3uRR0E59sarC3n5XjDdMthJp+OPBWT3LBzGrnsiOQE6IKvbefWWhVKBU0uigAOHZF+N4LsYMYsffbZizetyHhzNFYgxrk/fpfuEW49pjvycJmHieHyUJT812eXdY+m01cwEDz4y/d8GRXs6OMJtAjHeP5+IaZ/EwNCX X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c17ff12-8f5a-4548-9388-08d91925f9c6 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4966.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2021 11:21:54.6259 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rJee0HshXdl2vW5Y/IBG3y76h0R/2MUmJc+4ogrP0Efs62TDhyWcM9xVteq75BlWdM4bFTfjyHewypcDw/yJbQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6776 Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=nxp.com header.s=selector2 header.b=Xmdr1Ipo; dmarc=pass (policy=none) header.from=nxp.com; spf=pass (imf27.hostedemail.com: domain of aisheng.dong@nxp.com designates 40.107.20.82 as permitted sender) smtp.mailfrom=aisheng.dong@nxp.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 0DD5E8019382 X-Stat-Signature: y48qrxundmorpcuzkfiu3qsostkapqdh X-HE-Tag: 1621250514-651447 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: In order to distinguish the struct mem_section for a better code readability and align with kernel doc [1] name below, change the global mem section name to 'mem_sections' from 'mem_section'. [1] Documentation/vm/memory-model.rst "The `mem_section` objects are arranged in a two-dimensional array called `mem_sections`." Cc: Andrew Morton Cc: Dave Young Cc: Baoquan He Cc: Vivek Goyal Cc: kexec@lists.infradead.org Signed-off-by: Dong Aisheng --- include/linux/mmzone.h | 10 +++++----- kernel/crash_core.c | 4 ++-- mm/sparse.c | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index fc23e36cb165..b348a06915c5 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1297,9 +1297,9 @@ struct mem_section { #define SECTION_ROOT_MASK (SECTIONS_PER_ROOT - 1) #ifdef CONFIG_SPARSEMEM_EXTREME -extern struct mem_section **mem_section; +extern struct mem_section **mem_sections; #else -extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT]; +extern struct mem_section mem_sections[NR_SECTION_ROOTS][SECTIONS_PER_ROOT]; #endif static inline unsigned long *section_to_usemap(struct mem_section *ms) @@ -1310,12 +1310,12 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms) static inline struct mem_section *__nr_to_section(unsigned long nr) { #ifdef CONFIG_SPARSEMEM_EXTREME - if (!mem_section) + if (!mem_sections) return NULL; #endif - if (!mem_section[SECTION_NR_TO_ROOT(nr)]) + if (!mem_sections[SECTION_NR_TO_ROOT(nr)]) return NULL; - return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK]; + return &mem_sections[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK]; } extern unsigned long __section_nr(struct mem_section *ms); extern size_t mem_section_usage_size(void); diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 29cc15398ee4..fb1180d81b5a 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -414,8 +414,8 @@ static int __init crash_save_vmcoreinfo_init(void) VMCOREINFO_SYMBOL(contig_page_data); #endif #ifdef CONFIG_SPARSEMEM - VMCOREINFO_SYMBOL_ARRAY(mem_section); - VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); + VMCOREINFO_SYMBOL_ARRAY(mem_sections); + VMCOREINFO_LENGTH(mem_sections, NR_SECTION_ROOTS); VMCOREINFO_STRUCT_SIZE(mem_section); VMCOREINFO_OFFSET(mem_section, section_mem_map); VMCOREINFO_NUMBER(MAX_PHYSMEM_BITS); diff --git a/mm/sparse.c b/mm/sparse.c index df4418c12f04..a96e7e65475f 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -24,12 +24,12 @@ * 1) mem_section - memory sections, mem_map's for valid memory */ #ifdef CONFIG_SPARSEMEM_EXTREME -struct mem_section **mem_section; +struct mem_section **mem_sections; #else -struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT] +struct mem_section mem_sections[NR_SECTION_ROOTS][SECTIONS_PER_ROOT] ____cacheline_internodealigned_in_smp; #endif -EXPORT_SYMBOL(mem_section); +EXPORT_SYMBOL(mem_sections); #ifdef NODE_NOT_IN_PAGE_FLAGS /* @@ -91,14 +91,14 @@ static int __meminit sparse_index_init(unsigned long section_nr, int nid) * * The mem_hotplug_lock resolves the apparent race below. */ - if (mem_section[root]) + if (mem_sections[root]) return 0; section = sparse_index_alloc(nid); if (!section) return -ENOMEM; - mem_section[root] = section; + mem_sections[root] = section; return 0; } @@ -131,7 +131,7 @@ unsigned long __section_nr(struct mem_section *ms) #else unsigned long __section_nr(struct mem_section *ms) { - return (unsigned long)(ms - mem_section[0]); + return (unsigned long)(ms - mem_sections[0]); } #endif @@ -286,8 +286,8 @@ static void __init memblocks_present(void) #ifdef CONFIG_SPARSEMEM_EXTREME size = sizeof(struct mem_section *) * NR_SECTION_ROOTS; align = 1 << (INTERNODE_CACHE_SHIFT); - mem_section = memblock_alloc(size, align); - if (!mem_section) + mem_sections = memblock_alloc(size, align); + if (!mem_sections) panic("%s: Failed to allocate %lu bytes align=0x%lx\n", __func__, size, align); #endif From patchwork Mon May 17 11:20:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 12261643 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64DBDC433ED for ; Mon, 17 May 2021 11:22:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1077B610CB for ; Mon, 17 May 2021 11:22:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1077B610CB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A5E416B0074; Mon, 17 May 2021 07:22:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A0BCC6B0075; Mon, 17 May 2021 07:22:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E9BC6B0078; Mon, 17 May 2021 07:22:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0025.hostedemail.com [216.40.44.25]) by kanga.kvack.org (Postfix) with ESMTP id 4D1126B0074 for ; Mon, 17 May 2021 07:22:00 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id E7F356D95 for ; Mon, 17 May 2021 11:21:59 +0000 (UTC) X-FDA: 78150483558.17.AD10650 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2081.outbound.protection.outlook.com [40.107.22.81]) by imf09.hostedemail.com (Postfix) with ESMTP id 78E7F6000114 for ; Mon, 17 May 2021 11:21:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SS1UT9jUWKq9re1CmR/MbqronzDJkniTCcjJZ30F+dh7G3DjdUwDVZkAKG8kpp/kYh2AbtZe8oBJuaOWPDrEA31Oc2xojsTamRIuqiAQLpvFjneWuNMEGXsFFavY3mSqeoGc5c6Mv66Ydg9P/wsTr9pSAWq9iNVkaXTTB4F5rkBNUoL0/Ps3MpV6vbrHTkbdWwtmN4tINbfvMdifVHU/sH1ENOy1gaDqlPNyMweJq/yXqDFO0YKtLYG4HlQZTFIZqBLh6OqPRlm37Efyro/1CVCZyXDZEUlxuTnc3sQzGd8etEHnl4dUvIXLjIx1o3Lob3i63dGEwS2pGXTM6BfRag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qgKm3n2FMXJ0wWUVkRm96IhBO2Hn8MPzkr3GFvuD29g=; b=LkEZPAliqIfl9BIeWw6vvYjPZ/Kh0RPyWpkbJL/Fo9CtR637G9WWACTHpglA2J+ZGHgrwkYSjrotlrwN1VLyJidH+39ULzFO/Y754yocMmCuA0AODEr2yuzzLHhyz51oDf4GQ4qvei7Pg+X6/rkY1IW/FO5ZbYdWHZKHrUocfemC3YFkKwXoFSrpNn/saTzYJX3x1q+Z1RksEMs7mU8Ep7UUfE2v41F7CDEnwm8QS0XWCiHa7lJ6/1V1TPo5zuKn5NmRjOaLFCxlXUTE7I+4vSe5jXm4S2HGJSwo26TWWoDXTpmG/c6m7q5GdY9dYffobNn0/kCGCEQv0JGxHi9ptw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qgKm3n2FMXJ0wWUVkRm96IhBO2Hn8MPzkr3GFvuD29g=; b=HOTt+OOly6QPDSlPJyo5mpVUCu2W3WQS2UCPQm8UtxMflkGUt6Nu1TFpMDQJUpG6IhdEt+0RSEqPM+dR0uq6Jfo2cArDpHTLpPdqgRQfv3Bym/xAigD6XE2DJVlEPzvxh701EYWRoKtX4e98KmIz+05WUnfQa97dA+ySmmyAqWE= Received: from AM6PR04MB4966.eurprd04.prod.outlook.com (2603:10a6:20b:2::14) by AM6PR04MB6519.eurprd04.prod.outlook.com (2603:10a6:20b:fb::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.26; Mon, 17 May 2021 11:21:57 +0000 Received: from AM6PR04MB4966.eurprd04.prod.outlook.com ([fe80::b10a:ad0:a6f5:db9b]) by AM6PR04MB4966.eurprd04.prod.outlook.com ([fe80::b10a:ad0:a6f5:db9b%2]) with mapi id 15.20.4129.031; Mon, 17 May 2021 11:21:56 +0000 From: Dong Aisheng To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, dongas86@gmail.com, Dong Aisheng , Andrew Morton Subject: [PATCH 5/5] mm/page_alloc: improve memmap_pages and dma_reserve dbg msg Date: Mon, 17 May 2021 19:20:44 +0800 Message-Id: <20210517112044.233138-6-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210517112044.233138-1-aisheng.dong@nxp.com> References: <20210517112044.233138-1-aisheng.dong@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: SG2PR01CA0132.apcprd01.prod.exchangelabs.com (2603:1096:4:40::36) To AM6PR04MB4966.eurprd04.prod.outlook.com (2603:10a6:20b:2::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR01CA0132.apcprd01.prod.exchangelabs.com (2603:1096:4:40::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 17 May 2021 11:21:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d6d8e86e-126a-4f1d-20e6-08d91925fb10 X-MS-TrafficTypeDiagnostic: AM6PR04MB6519: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:183; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vKG5u/JBoHqQWUofJwuFavrAWkKHQWU6nffP2HLVLxI1LCfo46Pw5tXSyr1WquEF2jzjkUp5nOj28eq6v5JGTYF4b+/qfmZEKkTTzOShTHZJi9H1PEfPeV024vvIZkfeJeQOSP5Swbl44aKxoWHvaADGK/sgJsrnR+n+2jLHTZL06m4JKyaNtxwc/K1DN0OzFRV9JXGEhxpWkVdn7ETrIfN8DwOLR9tVuc1NXhDhu5a17nKTcqiVqgQn/BEJHlnlcAvQOGgDyOKAT7iUe/pB1h4nwL7tW0+EypwW5cll9ikisHBmTl/ZlEgorLTE8Kyj2RwBAIbuUxeWIf+nI3ssENoVEvCjhi3Ml+V3aZ1fNUfWjY7n4iFQkcNentvqfkeEQbr2nfArMlV9EqCbIz1Vsypj4bUpQ2otOw2kS/t+HE2lmzn8TGLXRE4/kKmPt+pyEBfQe29Il5t0uocg7ae8jLkAibq8yDh7N8i/+SjhFOLi9Hkt0ysPprY/UNjgWFGzy9rpukGqakypBUxJmeXnVZwYPU05wEwpi9gXMQO/lQZe6CfrxUmLrmajGUr+PFOdqgYy93O63Qq8f6eQWZAcor/jNGLMlVxJLXVrqhsU0o75Rfaa1ApDZDkjNRoys9HgGppPiUyJGJNVbDuDUD2JoxpOiNE4KIrcTAS+1u1HOy6u+1KazcxZ9KzB5F2H6+u8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4966.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(136003)(396003)(376002)(366004)(346002)(6916009)(5660300002)(6666004)(316002)(66556008)(186003)(16526019)(2906002)(956004)(36756003)(66476007)(26005)(66946007)(38100700002)(38350700002)(6506007)(83380400001)(86362001)(52116002)(4326008)(478600001)(54906003)(6512007)(1076003)(8936002)(2616005)(4744005)(8676002)(6486002)(69590400013);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: r63b0vMd8nxY3G3lA0Zc9gK2AX7YICqpEiSZd51swituFXLIbEdeSSAXk/cHHtU2DHJqaY/ilppY0tBh2nL1hqXLIrnHVQfdTY6o8zS8IGd5+CfQqA8bGmJegAPv4FxRE5nav9K0lM9e1pSA7S0SfwSLaALe3iqmz4fIgYFocV8P9uTi3MmtfyBC2ylwXWOmCnY6QrS8NLiv1R8G94qaxYonVICzO0xSDGquL+QGMQC+mxpxLL6j0ETmWVbp0OfAgS2sL1uKwhttIAoVgYIaOJSOag3dj++D3/F2qzCDTTHAzTg1KQAoNucWER34ObURZbR7+2mhLY7CLJn3RkOK8PZPNTJHribZdqFN3MXcXEdRLWyylvABpdUOGSZWQvkUVU0DyMhu2Tv8JK5/ZbXBfS5KP0bdhnNohXG605Fqtul52J8/Kb4k/6ukEGiVMfByU9nBlZXlVkEEi6/94FIHiepbvuOU2JpY1o2Z3hsO+SyQTBgOWINQMGacdpmy1HtKCXRiDYWRdOm4TY/+CnZJsZtJxWfta8T+TyWBd0fHh1X4NXCspoGxvCUl8DpiVsEVeEG1hfiYiqzHt/Zh4Kshgh1wdlOKIAjl/YVFyU7q8qGY9jzbLvxB169LBfiuqRne8PYYc2JjDuzHY8iHcVJ0dFUXhGfUiflGD1JLj/7fApGQHy1TLA9GB6jtM8h3r5zPJ6uOGwBDG1IsdOoZjMDNs26NkfW+VGWChQy3zff/j4lEKyDtzJBBSxXiH5K657q9nInUIHFol4ieMMlbpeOKcXqaBV6yqydOcNymn+zQYzgwMPVdB9P/FlhK9iixe/RdQA9wEld7zX7PNV1yAM/kdJP9mHdwYHHUv1vr22NfvBAw5sz6hxkSroVDyTZLjwp8NkpEFK+WSwp/VX7hRsBdpQUhFyu+DBUNuuqcW+Zl0iof9m5cYmXV0es7c/xw6wXX8Vr1ApHt0EgPn5rJzvuSXa+ZKeZbLdecJfJtrEPR/aFE5TwQwWbQgfN4uRHvBkMntqO9BBWHR+gGDveAUY0l8y+2J0OBWGaLb0iCHFx2OsF1/XaDoJzTe/YrjjsYHYFAHQvL+AxeblyydZzUy16u1DkKqd0//CBjLuybld/ag1GjyLMNxnm29Mx8bu4f6lXuRQqMN1y932b9Paz4V5pKXn5heMTVz2CKTJtRgjhjM2PnfTMBoErVY6BbcxLP1stnrc/1GK7XiiUgaVPgaxx0ew3cRdZRnXgKabIc3qBslWuLB37jATLUoMhNhK+DLSnFBDPayr2BCgeffxxJIf+9fjzecLwDyDdtFvsZYQaPQgNhFNnhvFmfJD1gAxtJltXd X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6d8e86e-126a-4f1d-20e6-08d91925fb10 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4966.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2021 11:21:56.9126 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: T0ynK7/8hxe3kei+jDedtAw1CJrFLfTIX99rc2ZGC9/J7kVs70Rsszotf+IxhBSZA0kpfM8GUbzuOEKEeYWHsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB6519 X-Rspamd-Queue-Id: 78E7F6000114 Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=nxp.com header.s=selector2 header.b=HOTt+OOl; spf=pass (imf09.hostedemail.com: domain of aisheng.dong@nxp.com designates 40.107.22.81 as permitted sender) smtp.mailfrom=aisheng.dong@nxp.com; dmarc=pass (policy=none) header.from=nxp.com X-Rspamd-Server: rspam04 X-Stat-Signature: k5yedknip3567m6pbk5znu4ut9mycmpw X-HE-Tag: 1621250517-545572 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: Make debug message more accurately. Cc: Andrew Morton Signed-off-by: Dong Aisheng --- mm/page_alloc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 3100fcb08500..16f494352f58 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7263,14 +7263,15 @@ static void __init free_area_init_core(struct pglist_data *pgdat) pr_debug(" %s zone: %lu pages used for memmap\n", zone_names[j], memmap_pages); } else - pr_warn(" %s zone: %lu pages exceeds freesize %lu\n", + pr_warn(" %s zone: %lu memmap pages exceeds freesize %lu\n", zone_names[j], memmap_pages, freesize); } /* Account for reserved pages */ if (j == 0 && freesize > dma_reserve) { freesize -= dma_reserve; - pr_debug(" %s zone: %lu pages reserved\n", zone_names[0], dma_reserve); + pr_debug(" %s zone: %lu pages reserved for dma\n", + zone_names[0], dma_reserve); } if (!is_highmem_idx(j))