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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8693CC00528 for ; Thu, 27 Jul 2023 20:46:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 97BBC6B0078; Thu, 27 Jul 2023 16:46:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8B9806B007B; Thu, 27 Jul 2023 16:46:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66D5C6B007D; Thu, 27 Jul 2023 16:46:38 -0400 (EDT) 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 5882A6B0078 for ; Thu, 27 Jul 2023 16:46:38 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 23F78C0378 for ; Thu, 27 Jul 2023 20:46:38 +0000 (UTC) X-FDA: 81058575276.04.9426962 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by imf03.hostedemail.com (Postfix) with ESMTP id 230F720010 for ; Thu, 27 Jul 2023 20:46:35 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="BuN5xyW/"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf03.hostedemail.com: domain of usama.arif@bytedance.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=usama.arif@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690490796; 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=R/2kTGP5bmExpEckq+8Rz1vqcaG4uRUICK5uorcV/EQ=; b=4P+aiaNG7QjThvkHmooYk7/QhfcCp9AiZTYlopsjh9rXBurzQi4pNGjYcHjPyLtD8gPmfF zMphq5LrQKrKTZZviooPBkUd6VW6BwevzTPaT0MIlYgVBwjAn6Y3VJZBnC9ZZQxCEMM04c 2yan5qIWqrNyULICM/yO0o/lJpgZXcw= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="BuN5xyW/"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf03.hostedemail.com: domain of usama.arif@bytedance.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=usama.arif@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690490796; a=rsa-sha256; cv=none; b=r/LD2fzbkiCZ7N1ncj+AE+TsGmo0lGGmSRxHHm6IJGIgxQ8+NPU3nx+KYVvlYEorYPv3X/ TzO1imZf/FBsKtjBoRa972gL5v1GIHE8erTHgQ5zNjFiki0vghx5rmcpHhti6maHPKMtAS c6hVC0vSU5PAZTmAjIaPPtq14IbPSAo= Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-3fbea14700bso14132795e9.3 for ; Thu, 27 Jul 2023 13:46:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690490794; x=1691095594; 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=R/2kTGP5bmExpEckq+8Rz1vqcaG4uRUICK5uorcV/EQ=; b=BuN5xyW/6weGNXRlIjeHAIrAgftiJaDdwcAFdinE25QOj+gk0KxhfbPi6NDrWScFMY VMJS1fp/fwlHj4io7fNeedGnL3Vq6LPtuewysLC8Sjo6xuSSwb5C7A3QVA6pUp3BuGal peUgBBXdkLuyAG0r0MtOAu8bJxWihdBSiUkx7+JUoxmU92FDCSc3+a203D99Te3djvrE GFjNEAyNZJnsGcpwIVLN7dd8/TClS2qfeDsn0scV9uZaGKj9iuXLvZP5q+GVR9jZNOl4 uoPcfh3+yJsGI/CKwLu45iuV0qqJWtVosbUaOpv+ylvrytQ2cUfc7YMZnclJk3oiesVt HmMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690490794; x=1691095594; 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=R/2kTGP5bmExpEckq+8Rz1vqcaG4uRUICK5uorcV/EQ=; b=TbfUAppZvZdT/Dz2E//q52WGCRWCeuWGNjtLwSx7yApkfhvbUnTTlTc9msYRBxwYgD Uk0h6RniC4hMyrblom5bACdWTtQEeWltJEZReYAwabO9PN0w+7PLL9+mQ73hM+rgVsL5 wcRcljlazZg13cZbnQrBJHwWbj/SzFZXLb4RDx062piCzXHrrbrsJkdeU9IJ00NC7k/d +T8w8gNDc1OL1iSuf0Y8oIoUp7dt8rbIc37QkOXaHDxAsBfKnIpc5coQifZ/xnlauWax Ma/j9w2nAYfMlxcrg9kTmjZZVdmzJShCbrwvH741Cf7Rj0t+pB70vB6WAiAYL9y7Qe5U UeAA== X-Gm-Message-State: ABy/qLaynQk0/h4ydsrx6CcRAGqEpklmtLS3iorsupAcz1iKpYG0JeGo aN/3DxswIFeJRpNem8GKBn/QO0AoU5HiqOtiRSU= X-Google-Smtp-Source: APBJJlFsQ9jv1pf3Fn+r5CYo5PNZoF1WnIrPiX/ItiAceHqurCAQzDyFXe3uUVsJ5LM8vIz8zQ9d8g== X-Received: by 2002:a05:600c:21cf:b0:3fd:ee50:d6a4 with SMTP id x15-20020a05600c21cf00b003fdee50d6a4mr141098wmj.17.1690490794119; Thu, 27 Jul 2023 13:46:34 -0700 (PDT) Received: from localhost.localdomain ([2a02:6b6a:b465:0:7e3e:db9e:70fa:9ccb]) by smtp.gmail.com with ESMTPSA id k1-20020a7bc401000000b003fc06169abdsm2701400wmi.2.2023.07.27.13.46.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 13:46:33 -0700 (PDT) From: Usama Arif To: linux-mm@kvack.org, muchun.song@linux.dev, mike.kravetz@oracle.com, rppt@kernel.org Cc: linux-kernel@vger.kernel.org, fam.zheng@bytedance.com, liangma@liangbit.com, simon.evans@bytedance.com, punit.agrawal@bytedance.com, Usama Arif Subject: [v1 3/6] memblock: add parameter to memblock_setclr_flag for selecting memblock_type Date: Thu, 27 Jul 2023 21:46:21 +0100 Message-Id: <20230727204624.1942372-4-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230727204624.1942372-1-usama.arif@bytedance.com> References: <20230727204624.1942372-1-usama.arif@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 230F720010 X-Stat-Signature: ijqmg7tzfuyqzzwcfsugcep6qun76bmj X-HE-Tag: 1690490795-559953 X-HE-Meta: U2FsdGVkX1+QeaycMItyDEU0OXprhd3Pvgm4gfFe5NruqAmmPfozXcGuZhcppcFkA+n9T8g/hLuZm0xcjZ6XlHgNzflUmKHkTuHNXmsFfEAmZ4Cl75nr7kPn7u6fC+dwA/t11mYVmdrDuO3tCzDw5JKelGzhS5OymjEaOqFWMLoifTMfplmcxtW35bN8/N6RbCUpr9BwXe7OFLrpQPyAQtgyzZ4MB1LJUl6LhILpsvBegWhEZJ+AK2rd2D4njKejzAjWBUgSgNNaXoI4czJnm3B7kzZQZ4ieZPZj04okN2OYK7ojq9IuiIrC06VYEDVjslJDcSML6UW5KRdt3iBPBD6N4YLjf6Wq7dvnWr1CcceCbga2Oi2GpC8SoMIzW8F6QHtUzqYl7p4PNIL7OK5VvPpNGpd+SAc2g12bKuEOOE5smZwflFtcQPtD2uMT3dAq/GEvOHGhj1DtsAhpvkWsc9joe4Z7jbv4QE3Uke4S8Dgv6m7NjIzREqhT99ETRHry8PBzOZ/hl8odW7pN+CMsqG6FemHOt+xnsSdPWPNBKdrr1c2qotRSmQL4zJbNRBKNR0jLdbfNaVkK4NInWGRakocmqWix/OfaT81F2zPuurKwD66noT17ytfn+szXf+TtDf4EsYKqPI11nUAIVpKJp3uL9vG+A8KWQsDSGWWwWKUfarUvaGa4HNZXR+VabUJ69Dt2ETrM1VYXfEcAxc9BYPL9oJ1gSWreTA8RkFP4BLaDCGoKYvApGZdp5r7emWYzWzsYmpZvA4T0uYVlWhj2EK1HcpVvKjZ5Cqs5xdPS7opXrRP+ABE0I3KEL+tjFRfQlQA5KPj0/fF1KQzJr+EgY4EQ134yVCm3DKa+PfbtVTK2U7OAugtg9u4C/gNIQ14o05dXXTnfy897gpmTReU+pXZiaRzkh55mG6w9xvm6k15Y800m6CUkUdHeMeTRNatJshN5QxK0pIGMV5NRsUX qLad38FK IIN7XuPFYQN2T9lUf1H+MdwTDCrX6weTP1XEDexcSciZRwwW5+tdsYiHsbeYJztujVzuA/mJJQrTkyFpLJrGrr1ubBg1w6c1J3n2N+ZgaE5TmKnj+5I/UPp4ygRNCIPiii+MqFgS7yr5Rp2I9aDeMjEirxdOJz/8cO9s6+M7GsFZhqe0jFrK3tJaRFSlU8U45IKOi28dvWW50yrWRLLkeHbtpbGxaibRv2w1gRnwcE72hDEDzpOmElW6oSJmK3KrUCsB4yKAv53dKXzEODWQL7IxfblCEfELL93+lqHphcCHgBWlEHVzlzVN9nswsFrHETFvybc62z0tM7GbT1vdRppIvkr7zj1kwxHCTjtro2m6OxqM8hosv60m9gqzZPlx/QDULgsSbi3wyd35m/AQwmMNxk7OBKfULSBkFZA5MeSlRN5cuJD8qmy9WIacRnKM8fgA9NyB1lgp3/LG4NbYAz5lL9Q== 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: This is in preparation for setting flags (for e.g. to not initialize struct pages) on reserved memory region. Signed-off-by: Usama Arif --- mm/memblock.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index f9e61e565a53..4fd431d16ef2 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -897,11 +897,16 @@ int __init_memblock memblock_physmem_add(phys_addr_t base, phys_addr_t size) * Return: 0 on success, -errno on failure. */ static int __init_memblock memblock_setclr_flag(phys_addr_t base, - phys_addr_t size, int set, int flag) + phys_addr_t size, int set, int flag, bool reserved) { - struct memblock_type *type = &memblock.memory; + struct memblock_type *type; int i, ret, start_rgn, end_rgn; + if (reserved) + type = &memblock.reserved; + else + type = &memblock.memory; + ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn); if (ret) return ret; @@ -928,7 +933,7 @@ static int __init_memblock memblock_setclr_flag(phys_addr_t base, */ int __init_memblock memblock_mark_hotplug(phys_addr_t base, phys_addr_t size) { - return memblock_setclr_flag(base, size, 1, MEMBLOCK_HOTPLUG); + return memblock_setclr_flag(base, size, 1, MEMBLOCK_HOTPLUG, 0); } /** @@ -940,7 +945,7 @@ int __init_memblock memblock_mark_hotplug(phys_addr_t base, phys_addr_t size) */ int __init_memblock memblock_clear_hotplug(phys_addr_t base, phys_addr_t size) { - return memblock_setclr_flag(base, size, 0, MEMBLOCK_HOTPLUG); + return memblock_setclr_flag(base, size, 0, MEMBLOCK_HOTPLUG, 0); } /** @@ -957,7 +962,7 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size) system_has_some_mirror = true; - return memblock_setclr_flag(base, size, 1, MEMBLOCK_MIRROR); + return memblock_setclr_flag(base, size, 1, MEMBLOCK_MIRROR, 0); } /** @@ -977,7 +982,7 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size) */ int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size) { - return memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP); + return memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP, 0); } /** @@ -989,7 +994,7 @@ int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size) */ int __init_memblock memblock_clear_nomap(phys_addr_t base, phys_addr_t size) { - return memblock_setclr_flag(base, size, 0, MEMBLOCK_NOMAP); + return memblock_setclr_flag(base, size, 0, MEMBLOCK_NOMAP, 0); } static bool should_skip_region(struct memblock_type *type, -- 2.25.1