From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 5ED78C4708F for ; Wed, 2 Jun 2021 11:11:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46FE6611CC for ; Wed, 2 Jun 2021 11:11:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231462AbhFBLNC (ORCPT ); Wed, 2 Jun 2021 07:13:02 -0400 Received: from mail-sn1anam02on2067.outbound.protection.outlook.com ([40.107.96.67]:36054 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229603AbhFBLMz (ORCPT ); Wed, 2 Jun 2021 07:12:55 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fKI9OgsdUUWYcTcgv/8V3ZAOWcLZh3nR1rRy9QFbu0p1mypS0eWCTohsDykWbB94YsXiYCL1oyWHq6Hfjc5DcuuZOEcJlK8P53dalUexpLro1qt27zSfjCo0vZwTt4FNkXh9mmfsTZXKCLEtbE5afRi3sF5VoaRcmGdqpxkpFtu8NFFJwAmIwSPcwGvmkdNfvGR9SzGwpvWiDw1qpOIKjLurote2IryQcUIv4irlDGR20N0e1G6sAcycCO0No7GF/+R1SB45YT20I8qPI7PlsOHOSbaviAsmJAqH7ntLmup/vHk/h1KVuJhDJ7jlvI2krSVuZPJT40QYcvlEZumjvQ== 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=dWLZrSPPs2xcmex5XRXU+Es+Jq9BcI/nCSfgQmVEd8Y=; b=nOqqB+JoJB8Qbss8/KeVhHFIOyc/OFebVcjWttWfiXl6csz4YKSNSGu32+uL391bUGqxhtJ0iApP0ps2BsatlcaJY3h9aCmAdbncpegNxwMNbNu8XXYHYXkXKdOrExF5wATAlBwo1oxCK0LpftDa2unAzt/kveSYftr9S7o3npeoa2Y9WXeFaxgNB8LWfzkOwuHzZ0MvveNE17oEFr/diZgs+iVLafTmhr6g5GylNWmiBQ0hwMdD5ZvQ03HoPDBua6QDGSCM2R4t+q3PtLysmx/HyLd2CnrG3B7EGjedBkXpm8axDeaCa1S3nxavXiXD8JXVKk07ulbG4bTR7QZkqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.32) smtp.rcpttodomain=deltatee.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dWLZrSPPs2xcmex5XRXU+Es+Jq9BcI/nCSfgQmVEd8Y=; b=jdOyaWBeapWYkQ7NdOwfA8cedCkhWFsgsZ5BQGvjmMLeCSlB9Z9eiHxmxnAGfMTkFonZuFFTDhOkIWCPga+gteRMkjHyivqTJ8w1cHm0qc2wY9H+VTdSuNugqwjXtcdGrcdKcYAQABaZusR9kxqGZkX8PuaxaokLJkSDPWAMNMaNAZdXMToCDDB1WWRk5Era5MVB81Jn1i/O+EjcAybIOhABo/GPWpgysrUtBvZHWi3uLiuq9xbM/0MKNix/R5GWEbnQLy+2SEcR21EYw5kWDOaWYjAzc4ptyaPpHotvRrQ39RN9DHHiuC6kmOj+lNgOsRlRT9Qsw7ZptK9bDQ0Fog== Received: from BN6PR13CA0011.namprd13.prod.outlook.com (2603:10b6:404:10a::21) by DM6PR12MB3244.namprd12.prod.outlook.com (2603:10b6:5:18c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.22; Wed, 2 Jun 2021 11:11:09 +0000 Received: from BN8NAM11FT041.eop-nam11.prod.protection.outlook.com (2603:10b6:404:10a:cafe::20) by BN6PR13CA0011.outlook.office365.com (2603:10b6:404:10a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.10 via Frontend Transport; Wed, 2 Jun 2021 11:11:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.32) smtp.mailfrom=nvidia.com; deltatee.com; dkim=none (message not signed) header.d=none;deltatee.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.32 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.32; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.32) by BN8NAM11FT041.mail.protection.outlook.com (10.13.177.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4150.30 via Frontend Transport; Wed, 2 Jun 2021 11:11:08 +0000 Received: from HQMAIL105.nvidia.com (172.20.187.12) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 2 Jun 2021 04:11:07 -0700 Received: from HQMAIL101.nvidia.com (172.20.187.10) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 2 Jun 2021 11:11:07 +0000 Received: from r-arch-stor03.mtr.labs.mlnx (172.20.187.5) by mail.nvidia.com (172.20.187.10) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 2 Jun 2021 11:11:04 +0000 From: Max Gurtovoy To: , , , , CC: , , , , , Max Gurtovoy Subject: [PATCH 1/3] mm,memory_hotplug: export mhp min alignment Date: Wed, 2 Jun 2021 14:10:53 +0300 Message-ID: <20210602111055.10480-2-mgurtovoy@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210602111055.10480-1-mgurtovoy@nvidia.com> References: <20210602111055.10480-1-mgurtovoy@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1961e6ff-87e5-4867-4430-08d925b71f80 X-MS-TrafficTypeDiagnostic: DM6PR12MB3244: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:247; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qiecgvgCKdjfUKWq8mqcuWaB7Uq05uC3hxqv+M2MEwk+m+mn4TVpc6iVarwFvMIXVQeyHfSAe8lLgPitHnDs7MuLZ+cyB4oUSjPSTFag55SMoOHneD0gm06EdxOlNBiJmXQ0jdU2G/xG10XR7Kd0SWooYecInrYvPYN1Ens6vsBP3trayZuJf+Q+092h5xOjothozJqfBKb/vbCMeW2Qv2dXn0Kn/hG31wpWnxUy0xr0/tDPNmHbU4+SqTt20oEen4Q/yNTCnj64q1FnnM6FuPulGUvgxdpw6gRGKQKJvXUqyNpcphquW/w2pJeQlncjJDn2c53p5QSRuQtiFBs0V1aiWj96bIWEIXCLHsNT+PKFIsc2fLEfbIVS07jif5oPiw6oXCRieUtqdJw13El/sVHWhZxqdQg6GP4d7HL03sMFAqcHcoFs4ax0AD/kdg6Q9lJLUuvnY7Vwr6jugdrMfAs8PiwYHcniay895zRi4sxsRKczASGhCRTNEitoW1L6jbbDxmmxlC6MXkK1HYfvyE7Q0BfPnzNPb9Bou943I6zYHPc002+E7MHuNc1G6Xds3TZdPKte72uxNI7gDKWY/OEiSbPI9Ov9o1182s5ZAf1FBu5eYw2f+BaGKis9Py0z4WHSYHPSewwEtUAlkFxXhkHtJCcgZ9GmZA5rUUByvcs= X-Forefront-Antispam-Report: CIP:216.228.112.32;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:schybrid01.nvidia.com;CAT:NONE;SFS:(4636009)(346002)(396003)(39860400002)(136003)(376002)(46966006)(36840700001)(5660300002)(2906002)(316002)(336012)(82310400003)(107886003)(36860700001)(2616005)(478600001)(70586007)(82740400003)(186003)(86362001)(26005)(426003)(54906003)(110136005)(8936002)(83380400001)(7636003)(356005)(1076003)(4326008)(8676002)(36756003)(70206006)(6666004)(47076005)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2021 11:11:08.5499 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1961e6ff-87e5-4867-4430-08d925b71f80 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.32];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT041.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3244 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hotplugged memory has alignmet restrictions. E.g, it disallows all operations smaller than a sub-section and only allow operations smaller than a section for SPARSEMEM_VMEMMAP. Export the alignment restrictions for mhp users. Signed-off-by: Max Gurtovoy --- include/linux/memory_hotplug.h | 5 +++++ mm/memory_hotplug.c | 33 +++++++++++++++++++-------------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 28f32fd00fe9..c55a9049b11e 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -76,6 +76,7 @@ struct mhp_params { bool mhp_range_allowed(u64 start, u64 size, bool need_mapping); struct range mhp_get_pluggable_range(bool need_mapping); +unsigned long mhp_get_min_align(void); /* * Zone resizing functions @@ -248,6 +249,10 @@ void mem_hotplug_done(void); ___page; \ }) +static inline unsigned long mhp_get_min_align(void) +{ + return 0; +} static inline unsigned zone_span_seqbegin(struct zone *zone) { return 0; diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 9e86e9ee0a10..161bb6704a9b 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -270,24 +270,29 @@ void __init register_page_bootmem_info_node(struct pglist_data *pgdat) } #endif /* CONFIG_HAVE_BOOTMEM_INFO_NODE */ +/* + * Disallow all operations smaller than a sub-section and only + * allow operations smaller than a section for + * SPARSEMEM_VMEMMAP. Note that check_hotplug_memory_range() + * enforces a larger memory_block_size_bytes() granularity for + * memory that will be marked online, so this check should only + * fire for direct arch_{add,remove}_memory() users outside of + * add_memory_resource(). + */ +unsigned long mhp_get_min_align(void) +{ + if (IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP)) + return PAGES_PER_SUBSECTION; + return PAGES_PER_SECTION; +} +EXPORT_SYMBOL_GPL(mhp_get_min_align); + + static int check_pfn_span(unsigned long pfn, unsigned long nr_pages, const char *reason) { - /* - * Disallow all operations smaller than a sub-section and only - * allow operations smaller than a section for - * SPARSEMEM_VMEMMAP. Note that check_hotplug_memory_range() - * enforces a larger memory_block_size_bytes() granularity for - * memory that will be marked online, so this check should only - * fire for direct arch_{add,remove}_memory() users outside of - * add_memory_resource(). - */ - unsigned long min_align; + unsigned long min_align = mhp_get_min_align(); - if (IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP)) - min_align = PAGES_PER_SUBSECTION; - else - min_align = PAGES_PER_SECTION; if (!IS_ALIGNED(pfn, min_align) || !IS_ALIGNED(nr_pages, min_align)) { WARN(1, "Misaligned __%s_pages min_align: %#lx start: %#lx end: %#lx\n", reason, min_align, pfn, pfn + nr_pages - 1); -- 2.18.1