Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sat, 24 Jun 2023 23:01:38 -0700
From:   Dan Williams <dan.j.williams@intel.com>
To:     <alison.schofield@intel.com>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        "Len Brown" <lenb@kernel.org>,
        Dan Williams <dan.j.williams@intel.com>,
        "Thomas Gleixner" <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "Borislav Petkov" <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Andy Lutomirski <luto@kernel.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        "Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
        Dave Jiang <dave.jiang@intel.com>,
        Mike Rapoport <rppt@kernel.org>
CC:     Alison Schofield <alison.schofield@intel.com>, <x86@kernel.org>,
        <linux-cxl@vger.kernel.org>, <linux-acpi@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>,
        Derick Marks <derick.w.marks@intel.com>
Subject: RE: [PATCH v3 1/2] x86/numa: Introduce numa_fill_memblks()
Message-ID: <6497d8421945c_2ed72941@dwillia2-xfh.jf.intel.com.notmuch>
References: <cover.1687645837.git.alison.schofield@intel.com>
 <2fd3778271d4fd3c4278c75c582daf6df4dcc503.1687645837.git.alison.schofield@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <2fd3778271d4fd3c4278c75c582daf6df4dcc503.1687645837.git.alison.schofield@intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+gHNlAw9z3VMxxMnpo8/G8LIn+pMoSWs3XBxOa5dturlX7nqgd7NtoyIqQZ7?=
 =?us-ascii?Q?0TejteheIoQnmkRbHrbGE4rEks7HlZX4qymFWBflm+ulHUt63BCPMWY+Egdg?=
 =?us-ascii?Q?e6+LND5pzJp/YEhRhp2jwXzId9Ee6SA9KIc2RsK8nFgUVctYAVMI6Eyr6Qux?=
 =?us-ascii?Q?fAk/soQnCsXvr7YPeqvnEbtuZN7uAdPmSTetNMUFiXzURGOT4OzvLlFZC178?=
 =?us-ascii?Q?D6mKL6KLzPb7V/b/Ht6Y5SKnOiD3zzDB6J1Tg1FxVeuKX8+rTs15vXYw9WFH?=
 =?us-ascii?Q?qhWbfDCN8A3104vXyQQzwgPQ/tNeRNBP9s+n0Yk5iaUboYKXLgiVYb6o8+/w?=
 =?us-ascii?Q?1P4MHlPuXYZwUgIKeD4R07ovjOrhL7T3ekTHGVqXISLYQ04sdxNx4WXw5Npf?=
 =?us-ascii?Q?22z/LRd2kloX4z2JvUjX/Rvab6khw1np6snsB49M1KjXeMJoOzgM6cCjkHsP?=
 =?us-ascii?Q?fXAnOlu9TrY6DcGyAzjvn0gzYVH+YDhJEsO5OUEh+7E5bSRNdBaHx9dzHxdL?=
 =?us-ascii?Q?QpL3QvpxpnAtKUnJD7zh5OXjNRQ4FZqgOZqxPtHWQ9TQbRkrLY5OmTva+TVI?=
 =?us-ascii?Q?GUw1LuZjA2x03E8Lbzr8EOAhU6zmTSG27fCH3buyI69vLWW8dUdBifSvjS4D?=
 =?us-ascii?Q?ca1BVpRcA0uAjND3OurGJxU0Lym8WLMWtqc1hbMx3VYFdh5XusA3/PGKXzna?=
 =?us-ascii?Q?E5KOENxBF1+6HmmX5H9S6Q9UF9OaAkTu+t6SrmVFh8dcfEhW1YgPYzETo8fD?=
 =?us-ascii?Q?9LXO6rAi0LRzhgVA8fYzTgZSfU2rjscPxrWkB9yYPu9hrT8IJmtKo6/3nGC3?=
 =?us-ascii?Q?2Jz62ETYPWa+mQqkRdiSwC+m6pGsFw6BPRHMqCWptbLcHmIrLIpsgw0PdyLy?=
 =?us-ascii?Q?R4ebtlvM6Pc5mD72bd4NQCuWkUQNIs0RYk9pb9lDjCyqCqSguQ8Dkk4YWLY1?=
 =?us-ascii?Q?/BCKefATmyUz0VELPBMNogRAh1gtYz1VvCVqnz713xd6gNulXjhz/T/iOiST?=
 =?us-ascii?Q?PxvEnUNXVsJoNWF0dE9hdTZ0eyoSQIvyHekECn2EjG4qqUlycth3aIF0xuu/?=
 =?us-ascii?Q?z7+Wo8gtEUAAsZxQlEutQz+uoPp5Nf1mNRBIxbf0+d4ojwbajDW+8Ju9tRfL?=
 =?us-ascii?Q?Mhm0XNlFPm8DQXV0bu0ws3j53fzVjjhmDxlkDcI0Gt7YGaOrJ06yUhlQpJ/j?=
 =?us-ascii?Q?umE/Z8L5GAa8/0DMt0zVGrdnwD44HlfvFdN5x5oq8Gt/SRI4nqrrVwHqkwTd?=
 =?us-ascii?Q?LOZ6uGXrAYmIjujAe3HDM83bRHpRWYtJ6VP8REv1jl0J3aO7rxgtyzA+3QX2?=
 =?us-ascii?Q?m5XHOCg2BP06TBGHrPaYOmpHC0GltetQjUcGu5tT0aX5aY0KqMzPhs+DOpk3?=
 =?us-ascii?Q?Ei1r0xrii0oXYdCsQKDmhXCCyxIDj2ajo2xRTS9LCR1AGZ+0Gr0L2Wle8fEb?=
 =?us-ascii?Q?1pZA6gkv+3wFV+KglLd0x9fIvkxbVkGgmKOGtY4kirdE6/ttpW2edt/TT2dX?=
 =?us-ascii?Q?lRqZB9In8AA+Jv9fb9NKJ6OZS0Z9EHgJSqiQVmlFlYvZZPbzhdi8+2aLjLW3?=
 =?us-ascii?Q?PKqz+pvqXTD2jbrrkl5Mko/kK/gadfo+VhD2Ye50EtrhlDFDqAIds2lxjvqU?=
 =?us-ascii?Q?SA=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 925a6187-57d7-4ef4-b308-08db7541a58f
X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB8107.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:01:41.5800
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: yZaXeQY5X3VUwuFZZZZAEgm2mTstULr1lqjkb1pzmLUXfkYWH2zjjEi/qT+bN3UxlUEws3XdHElhzjnBbcUitDGdiyWi/VWG2JdBSVsYK1U=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6724
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

alison.schofield@ wrote:
> From: Alison Schofield <alison.schofield@intel.com>
> 
> numa_fill_memblks() fills in the gaps in numa_meminfo memblks
> over an physical address range.
[..]
> diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
> index 2aadb2019b4f..152398bdecc4 100644
> --- a/arch/x86/mm/numa.c
> +++ b/arch/x86/mm/numa.c
[..]
> +int __init numa_fill_memblks(u64 start, u64 end)
> +{
> +	struct numa_memblk **blk = &numa_memblk_list[0];
> +	struct numa_meminfo *mi = &numa_meminfo;
> +	int count = 0;
> +	u64 prev_end;
> +
> +	/*
> +	 * Create a list of pointers to numa_meminfo memblks that
> +	 * overlap start, end. Exclude (start == bi->end) since
> +	 * end addresses in both a CFMWS range and a memblk range
> +	 * are exclusive.
> +	 *
> +	 * This list of pointers is used to make in-place changes
> +	 * that fill out the numa_meminfo memblks.
> +	 */
> +	for (int i = 0; i < mi->nr_blks; i++) {
> +		struct numa_memblk *bi = &mi->blk[i];
> +
> +		if (start < bi->end && end >= bi->start) {
> +			blk[count] = &mi->blk[i];
> +			count++;
> +		}
> +	}
> +	if (!count)
> +		return NUMA_NO_MEMBLK;
> +
> +	/* Sort the list of pointers in memblk->start order */
> +	sort(&blk[0], count, sizeof(blk[0]), cmp_memblk, NULL);
> +
> +	/* Make sure the first/last memblks include start/end */
> +	blk[0]->start = min(blk[0]->start, start);
> +	blk[count - 1]->end = max(blk[count - 1]->end, end);
> +
> +	/*
> +	 * Fill any gaps by tracking the previous memblks
> +	 * end address and backfilling to it if needed.
> +	 */
> +	prev_end = blk[0]->end;
> +	for (int i = 1; i < count; i++) {
> +		struct numa_memblk *curr = blk[i];
> +
> +		if (prev_end >= curr->start) {
> +			if (prev_end < curr->end)
> +				prev_end = curr->end;
> +		} else {
> +			curr->start = prev_end;
> +			prev_end = curr->end;
> +		}
> +	}
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(numa_fill_memblks);

After deleting this export you can add:

Reviewed-by: Dan Williams <dan.j.williams@intel.com>