From patchwork Fri Aug 25 11:18:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 13365445 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 42B71C88CB2 for ; Fri, 25 Aug 2023 11:18:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 387748E0011; Fri, 25 Aug 2023 07:18:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2EA2E280091; Fri, 25 Aug 2023 07:18:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13C588E0016; Fri, 25 Aug 2023 07:18:54 -0400 (EDT) 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 EE8168E0011 for ; Fri, 25 Aug 2023 07:18:53 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C8ECDA0614 for ; Fri, 25 Aug 2023 11:18:53 +0000 (UTC) X-FDA: 81162379746.04.12F668B Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by imf30.hostedemail.com (Postfix) with ESMTP id E567B8001A for ; Fri, 25 Aug 2023 11:18:51 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=arFqt1RT; spf=pass (imf30.hostedemail.com: domain of usama.arif@bytedance.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=usama.arif@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692962332; 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=LjF+zN6TJ1BvEvRrI5C4CD8rIkkkthqR+fjsUt4Q8CQ=; b=dGtinzwsLQHityj5Z0jX2Qs/7+vAQkzXf/lyJMfyIVTF1+fbUVVULF++oZgT8jEbzaaWhi L/REQLdVmrIwKE7fhG90r99gNo1SHgFVtGHU75sfY0IMd1/WmA8jpeBqKIl+cp02SUiNYS KPRFiuPPNlMnumSxJHNeQbvr8Sgo9PE= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=arFqt1RT; spf=pass (imf30.hostedemail.com: domain of usama.arif@bytedance.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=usama.arif@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692962332; a=rsa-sha256; cv=none; b=2R0NALmgHEQheETdCEKpCt5I9AApIGACexCkDiMODgj5FykMgmihXovlLKFfHrW9uKXTzd Zr9Zb8caTkQE3reUaAJacYlMnB00yJPeaNbwCrx0OWmkdlhqguNjqYA1eQ8sRgVZsZLThi EKtAtT+zUTnBWhaK/IJ05vU+LFkf0Gs= Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-31aec0a1a8bso554414f8f.0 for ; Fri, 25 Aug 2023 04:18:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1692962330; x=1693567130; 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=LjF+zN6TJ1BvEvRrI5C4CD8rIkkkthqR+fjsUt4Q8CQ=; b=arFqt1RTyp2yJ+qBHYnjbmsTvf9yikTfxTS2ZNvYs2M11Hlpj8DhIjlISwrDnL6HJG WEAKtjAc0kFEN8lxFwik4/1OUesCxPtqjE8+g0XBxBCrsd8wW2t+0KR83Ei7FuHlf3+N q44ZOVmcpl/SM5UrImy/4Zwyb3S4VKAI9MvDv5kHG3Wl49UpTUbepRZ8KnvEAvA+tbHw 6iuQYc0p0a1s7nX0im3kgSKFNlKt2Dpu3gp59UyVHEqsh7BFth7+gIqsiHpq9VZvb1ar YrKNpyAQzfy61sEIwUFBts1gdBuOR47DT+cM+daulfr4gUp3ttCceUtshX1CRUx3IgGV vfdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692962330; x=1693567130; 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=LjF+zN6TJ1BvEvRrI5C4CD8rIkkkthqR+fjsUt4Q8CQ=; b=PVOmCJvQNKQ1vwzbbtSMkYjefnM/e+ERkPGKcu+UQdYBDTOzOF5P8WCGYdS8c4Pr5u khkEViOaBGPc8i1ZQGL6kWEkGPHOK7OofZZh1dGN9ubje3VwgSqoZ7rSCP1gXU5u4sec AdJDiNV65jY6DnoBRm6bEaRmGfgfyQ5F6i5b/cZDqpZ4onnM16Z91UqMzUb9zONYrIlY /AAiHFu0hLNfCWV7qVp+ChPnCQoUo6MiPbNzmxGudFyA9FplUE/tIcfwoSAFs6pSG7Sb y+8361IABhYC+cj2/zKOc0yJfzk0VV8PuQ7Mw6wKDz44GdzRxG+lkz2Id2/0N1J05a05 Zlhg== X-Gm-Message-State: AOJu0Ywyk4YVNJg2WYeJ1jChvp7VCY4inGsqEvEmZ7pEYEcdQnrBndP3 /r8nARJfIc+o5GXxqpuM+RX1uSETiYh0n3JESq8= X-Google-Smtp-Source: AGHT+IFlq4uXcqCHuwCivQQQkMphZFErOKTGJdelk1WSHrPd5grjavTs+RZd4i9P7/+NjTNfRJorLw== X-Received: by 2002:a5d:510f:0:b0:313:df09:acfb with SMTP id s15-20020a5d510f000000b00313df09acfbmr16500274wrt.11.1692962330072; Fri, 25 Aug 2023 04:18:50 -0700 (PDT) Received: from localhost.localdomain ([2a02:6b6a:b5c7:0:9000:8d13:d0bb:ba7d]) by smtp.gmail.com with ESMTPSA id g9-20020a056000118900b0031ad5fb5a0fsm1939502wrx.58.2023.08.25.04.18.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Aug 2023 04:18:49 -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: [v3 2/4] memblock: pass memblock_type to memblock_setclr_flag Date: Fri, 25 Aug 2023 12:18:34 +0100 Message-Id: <20230825111836.1715308-3-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230825111836.1715308-1-usama.arif@bytedance.com> References: <20230825111836.1715308-1-usama.arif@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: E567B8001A X-Rspam-User: X-Stat-Signature: r85ssx5yg6ehpmka5xj7zfgfxey13fnx X-Rspamd-Server: rspam01 X-HE-Tag: 1692962331-744719 X-HE-Meta: U2FsdGVkX19VBA7r67DlKCM1ag8j6oEg88imdg9w4rreVhJvgb3DxSB8S6LmPtnR4WAYW2ZhCIcaazvvpOXBbI6I8V//pRWFP0BESEb18BodkYUgNno74qym7rdna3Kc0SMILDGHXi/Befy8dmvvDVkoiCX0NqfzjpfR1FUHpYyusuQ0saAYGDY37OlNRK0n0bomJEesrY4ddpFfZoQReYgSZt+5b7Rc+yLADUnDLeQRAmBEv+EAr3tQNI4kER4NWwkXdkEGrdmXV0CXNjfjU+pReRWnmsNvT9G04ZVcCsYiydngWBDraOxeqkTG2vTuituTahDXoL5M8L+0jME8TutXG5INIwn+QEG0WFTr2xTr9m4aNsNtmW7ofm4vhtALSop4XKDY+NbJvsA5NkYw6apJZhimYfzaJyh30CKTSVMF+SkPgmDlVQu8jxlJKUG8iwoDMkoGzrzzMH7tPnXtslnZVVUSXgWUubR1eFnJHNAMFO2f4Bo6sCoWSpOg3KYcZCgGjTwC2Zz0gvBugiW9+p0e9xQM9EqdmwLYpf9o18CU0Zis0XRhkpJ7H1k9KuI+sbJsq4rbX6auAAaiECFNXxOO5pmfxSew2VUGNwyrZZwgmPdEooHSrX/4R8x9awUiq5a40PB826gzekvuidRejuJ59DUXHfHE6t3CoooAHbfRgBkQeroQU7YGN2YIXRdV7Fs6kMRM5nmflYGmkdoEOBupIbKrSLUlt9yxbmkKdQLcd4ovoRP1q5UmQUZgggzb8o+//kv3UL5WRjYXartPYvjvp78d4zIXv8S4T+0HexLPNyzK8ZFvjvJYgUz892KXXwZDB21aCsnTEMDOTx5Eqpitox9wDMjxkGKxjCe7glNp9l+9nCj07bOYG0EQCIiY6YR7P8fgVec3EwlmpNjr9VKoiCVIQeEE0xhOdGJLB4UVPXltmj0egbBRE8JasddwgynX5FZJIci9BlQpl9h XMr2S2ef JuRMD58YSyr90CeEF6QFce3t/qHQEQhb8Hrjo3SkZZD6dGuHxYgpFns0+8ePWMOurkIF9T2CQXiCWlXo6LM1crWE3+xS5qAezfPxDS3pAAIBOlBtbL0vNJDxizyPcFD8xp1QCLgfHihSFkpl4iO5QZiWtBajsnn61N+iTZAMtGXwo3ZyW/rNNacOWiVyHBlmlnrSYim3gUPtKBeGcOy2NKvQfKiY49ZW54YuNr3UXqvQLONdgxHEAsoY54wfa8SyWqCMbK5zaFSZz9PuuCbdori27+q+dvih9FewKEfQ0/3mmXlgU5a0qXVhi6nm8mQPjEsUHrmCGb2SNqe5IJqshKyPc27hb5DvYrdlZ0FApS1JXpWvZjUre28YRJeZZ4Iip8H2dkie06peyw67BV3+TOisY0LL6rIC12V+2YNRcSuYKI25GnbDBuYM+1sMb/0glR4lkltGgdQU9JocPeCyoMflvEw== 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 f9e61e565a53..43cb4404d94c 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -896,10 +896,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); @@ -928,7 +927,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); } /** @@ -940,7 +939,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); } /** @@ -957,7 +956,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); } /** @@ -977,7 +976,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); } /** @@ -989,7 +988,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,