From patchwork Wed Sep 6 11:26:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 13375567 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 A2AFAEB8FA5 for ; Wed, 6 Sep 2023 11:26:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC39528000D; Wed, 6 Sep 2023 07:26:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B7760280014; Wed, 6 Sep 2023 07:26:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 902CB28000D; Wed, 6 Sep 2023 07:26:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 753A0280013 for ; Wed, 6 Sep 2023 07:26:19 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 321641A0D58 for ; Wed, 6 Sep 2023 11:26:19 +0000 (UTC) X-FDA: 81205944078.03.E119345 Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by imf07.hostedemail.com (Postfix) with ESMTP id 572C640022 for ; Wed, 6 Sep 2023 11:26:17 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=OMt82NQB; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf07.hostedemail.com: domain of usama.arif@bytedance.com designates 209.85.208.177 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=1693999577; 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=HvAW5HglNzFFKY02dQL2QCkQguw1CPVi9WQHfYQdWVQ=; b=5BZi8hycQLm5x21zF1LuJ//eT+t2ea6d/jnszflH22v6qGFamdkToi0O3xeTw3iM2CSFS9 V/vEbM1skF/p7+I57dwJrZtAG9P4a9eBTVOLNND6xXNv7vE8cDbyfYdPQWAUzSSGk2twe1 KI6LQEnsVeDMGqfIH94b1uq1ViZa47A= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=OMt82NQB; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf07.hostedemail.com: domain of usama.arif@bytedance.com designates 209.85.208.177 as permitted sender) smtp.mailfrom=usama.arif@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693999577; a=rsa-sha256; cv=none; b=8bm7t3ByEsAJDIG/dxsSmAN2yBkha+72Oq0YdX7kTd+qYFbai4UEBmmt5ZYgXhq0Zhenw4 Gu94wYwH/14R59tx/mAyYcS8BYncTxNPcMB3la30/2y712RLUAWehCtCR6GbKTbZUh3iHP azIMdyFWcCrwLmtl10TiVFb0XvAroeM= Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-2b9c907bc68so54772011fa.2 for ; Wed, 06 Sep 2023 04:26:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1693999575; x=1694604375; darn=kvack.org; 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=HvAW5HglNzFFKY02dQL2QCkQguw1CPVi9WQHfYQdWVQ=; b=OMt82NQBSKNh20nvfl5KC9eKqbvlQYbaZZYN48fG8HtmmHuScsG8coWTx4G1hB2LVT RNGdqSmWTb26MVPaXZh//L8440nf9StYX0DEhdReX9EufqMseYl98Fuhl0+jqvey2zUz ZzOOqZambulTK+9GkWronHetk+9xOyMqTFFewFuZwYZkrTdkxsDCbr67z4ZoF6NjrWXG LzhPRPLPCzQdgTsI3PBhZI/sYSSwBKXNEqRuMTdh4cBVVnn7zb4mEkzZPJD9786qD5SK COiOG6diE+C03PGEMdVDUGO/lDPkQ6EctjOIOW7U7Gpj5k5XcINDtL25oSk8R1PL9NXR Qrxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693999575; x=1694604375; 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=HvAW5HglNzFFKY02dQL2QCkQguw1CPVi9WQHfYQdWVQ=; b=hutHTxvkyQcaW1D5QTeY3Wf/5mqBQ4Ih8KZj6hCbx5bnOdJ+e8K5nOMm1i7oJuzBK5 suLI0nL1PszOBNvyLp5NLM3DwMTHdIrkQcPX4ohq7fTdtdfZAMBK+vwZd777u9uRKMYK rOYHd+rxQgLt5qOHKL4ZmCvSHGnejsA6aByuwjOnnCRBhULA3zn3P+iFrEsrqp3oYrlK qeRlrM7seREjjQlCkhwBeWrOiiUXWwP7EbpK/B6b18L2oH8MXfszHeC661XCdtJQOA/k 5ZIVUqXC4akfo1o0aICIioDM359LwJkYL0jfIckQrjiMzsQAJNew2ZO/C6/sxgS2cWi5 CO6A== X-Gm-Message-State: AOJu0YxbUcYz4YKiXa02fP28J9wiqg40Bw53ieVAb4qNHPzTksZ2BmtU n2KmZc4x/FV/IvtYrsj24Ctk8QBD0n5YY+a3LAc= X-Google-Smtp-Source: AGHT+IELbss0QLtzg1jVEelmiCJSpw2y8Xgxgu0g1ZmM4E+wM/cWOJ04LOlpRaDfgoONu1e0+ddNrg== X-Received: by 2002:a2e:701a:0:b0:2b9:4413:864e with SMTP id l26-20020a2e701a000000b002b94413864emr2071899ljc.53.1693999575193; Wed, 06 Sep 2023 04:26:15 -0700 (PDT) Received: from localhost.localdomain ([2a02:6b6a:b5c7:0:6dce:31d8:efb1:5d81]) by smtp.gmail.com with ESMTPSA id n9-20020a05600c294900b003feff926fc5sm19517038wmd.17.2023.09.06.04.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 04:26:14 -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, songmuchun@bytedance.com, fam.zheng@bytedance.com, liangma@liangbit.com, punit.agrawal@bytedance.com, Usama Arif Subject: [v4 2/4] memblock: pass memblock_type to memblock_setclr_flag Date: Wed, 6 Sep 2023 12:26:03 +0100 Message-Id: <20230906112605.2286994-3-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230906112605.2286994-1-usama.arif@bytedance.com> References: <20230906112605.2286994-1-usama.arif@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 572C640022 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 9rffuj1x1az6wuecm85upgtiy9u6bzqp X-HE-Tag: 1693999577-762134 X-HE-Meta: U2FsdGVkX1917Gc4eJGMIi5S4/u5cl0rN9YODR9/2CIp+i/jYSXnWyencnP4uc1bWgr2aZWAj0YRI38tWt6vSbGSvLWmKXV2TX2P3G/h3PdHomoWH/krPjajHabG1A5NZSNwzVv/fzeKCJGe9UAXv17cAPJtdzb6rx+lJtC2HmB+zr8XB6ANtBPvapuC5uvMP9N1cZO6MsGJvkrm3Bbe+KEZuAjm0uQC2jpry7LBLXNyy+8GCMeAQ/bZ4xCdJc6pAcEQ9Y9exZJzzntthKvvXHZGo/xBczmYL29ixIpd/iI3oAcjE8zz7ApL7nIJbok6ZYc8cMkJrRy/SWhBwN/r+gzFRAsWX/yvER2IMBrCf5F6+pTahP96jSMRi4nerZTAV5BZ941VqC76VJT1sALkgjHQqMhGwuXfEWQJbixt3qbCjRdRXf92jcMhqjU9p4V9h/TrAVd6IdIR7epZWA48f+O1Pa2vA20CC86ecJWP6+9h8B8itQokXmdW7bUdTZR/+8eWIkGXbcQxgzjtGQ0FAG2TzLIryz1+mHujw6TpZgOqwGzYg6DmwacEGlRcC1bUFpT/1jPJ1cm/FtYcnp7lhn+xRxEE2eJAk4SG3lvYipR+zAWcRcTONWK6gPsiM9cMgcdedwJC1Rhq4I/Lky0LwBm2e5S4sW6bY0KJfMtGa/qlA6YqA//q6vTzve3oZW6SYGTCHe6wv+YLLYkB9aYXsLjuwyhRXpxACOe0SkMyWUxHG8wIjl0JfCv6xZbBWLwgqdpjnijwwOruR0TAGpHGTnIIFaqn1lwtQsp24HdLx6vA1B+WUnocvoiQginH/qb5NOeiRxwmANPLauasUIvCyzGhnHuYNDSfjQdfrAItVuwE78GViRoCrJviQ2ElBW4vmtjPZ9rPDVf0se929vPwyZFDHWmGmaCa1BHk7GzEdfQfHZspLtkMnf3Sxpi3Fitvc1vwcWIoBuhx3SbaTFY URMnmXTt LcHLcCtkxJi6wtDie0zoDe/dlpAHt2E5SqCRiL1YTPI48BXXhVZKR+WWeuSz4xcYPEp6vdP/JrQ5aO5PcTJ917fqeWD2x06k/fKCulR/X++bqowfjc9pU4T3TIwOvH2ogqkWfMBz1P03f3bG0F5gCDjj8E1Q5R0t6iI/qR8hjjRSlXvYVO9czLTSTCmM799iJlddkCJ9UB3c5VAqOVPenbdA2b0b8Yc0ijUGDKvfDxFy1W0EmzQkEvAe2hedgLGGFnVGsmoD3ohTUWOhbHFTJgh+VRrR+jt9XxUrfu6z5OViY7Lou5UCikO087aGdALgsb9e77ScRwGbYI4RUkKnJe9J7AYG0M4ZFCBg1MHkQVC7PLTxnwQwf4cDeR5diiG70tVIujBOPNS9Nfa04nFDr3xp9MoE07RNxU/8OuzSsQCPwwPblAmtm9XwW/xjN/2DeVXqImib2wFrFpB8rJfTCJ9nn1cyhFvDUWZokqfcQCPRoQXq9jCG//yEnjTDsABWn5d1tLpsLzH0JTJaWmiONH5T0z4ctcKjy9OWKvnE2HyaBPd8= 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 allows setting flags to both memblock types and is in preparation for setting flags (for e.g. to not initialize struct pages) on reserved memory region. Signed-off-by: Usama Arif Reviewed-by: Muchun Song Reviewed-by: Mike Rapoport (IBM) Acked-by: Mike Kravetz --- mm/memblock.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 913b2520a9a0..a49efbaee7e0 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -901,10 +901,9 @@ 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) +static int __init_memblock memblock_setclr_flag(struct memblock_type *type, + phys_addr_t base, phys_addr_t size, int set, int flag) { - struct memblock_type *type = &memblock.memory; int i, ret, start_rgn, end_rgn; ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn); @@ -933,7 +932,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(&memblock.memory, base, size, 1, MEMBLOCK_HOTPLUG); } /** @@ -945,7 +944,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(&memblock.memory, base, size, 0, MEMBLOCK_HOTPLUG); } /** @@ -962,7 +961,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(&memblock.memory, base, size, 1, MEMBLOCK_MIRROR); } /** @@ -982,7 +981,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(&memblock.memory, base, size, 1, MEMBLOCK_NOMAP); } /** @@ -994,7 +993,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(&memblock.memory, base, size, 0, MEMBLOCK_NOMAP); } static bool should_skip_region(struct memblock_type *type,