From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED425253F2D for ; Mon, 12 May 2025 23:34:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747092876; cv=none; b=ABNDUgrQ0gzISlH4PF3iUg30jWAIBpioWY7tDRgx28BLbwIQq8thvebe93ZjtYs37//GJEY1sFzbAK6RjVLRCJcmxQY8OlGUpuFD0y3gSOw8i6hjGEdtGvZL3vWL/n9PWXQb5woAG90TxeK5jF1yoEUjR9Ds2JjpJ7J5ClsFQls= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747092876; c=relaxed/simple; bh=G4u+GbhaeeiqQiZLofGPaXHt+3YmWGz+RLPeIPmUd50=; h=Date:To:From:Subject:Message-Id; b=iklyJ87yDfJMfUqFco5VPUULVj98qabT2Aj8Gv7b969tgmTOEr8Yklb7ePUzNd1spFTD30UYWBIR7vDI9IyHLlKKLlxwWvyBTn4xn1D2VdyiYx1PaluBfTlu7b3t8jtgG+JqnGScZbGIBRlL7aGdoNOAms/4gRavwqBNXwph158= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=SjtfNnbH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="SjtfNnbH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0665C4CEE7; Mon, 12 May 2025 23:34:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1747092875; bh=G4u+GbhaeeiqQiZLofGPaXHt+3YmWGz+RLPeIPmUd50=; h=Date:To:From:Subject:From; b=SjtfNnbHo8dm6qyyU5wKOG2xr4paB2JcL2LqQY26vswsHsWhD4C1Gtfr+By9rCsy3 HTE/fX9IklSB1uzpTXDU/zTfBgUXieRi9w1LccwzwXlmBqN4nrUoFajpjdNvurvzNU dsmpHAXQh3D1I+6d4EmnZBrj2ekperfSq83DUHwM= Date: Mon, 12 May 2025 16:34:35 -0700 To: mm-commits@vger.kernel.org,vbabka@suse.cz,tursulin@ursulin.net,tglx@linutronix.de,rostedt@goodmis.org,rodrigo.vivi@intel.com,peterz@infradead.org,peterx@redhat.com,mingo@kernel.org,mhiramat@kernel.org,mathieu.desnoyers@efficios.com,luto@kernel.org,lorenzo.stoakes@oracle.com,liam.howlett@oracle.com,joonas.lahtinen@linux.intel.com,jannh@google.com,jani.nikula@linux.intel.com,hpa@zytor.com,bp@alien8.de,airlied@gmail.com,david@redhat.com,akpm@linux-foundation.org From: Andrew Morton Subject: + x86-mm-pat-remove-memtype__match.patch added to mm-new branch Message-Id: <20250512233435.C0665C4CEE7@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: x86/mm/pat: remove MEMTYPE_*_MATCH has been added to the -mm mm-new branch. Its filename is x86-mm-pat-remove-memtype__match.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/x86-mm-pat-remove-memtype__match.patch This patch will later appear in the mm-new branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Note, mm-new is a provisional staging ground for work-in-progress patches, and acceptance into mm-new is a notification for others take notice and to finish up reviews. Please do not hesitate to respond to review feedback and post updated versions to replace or incrementally fixup patches in mm-new. Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: David Hildenbrand Subject: x86/mm/pat: remove MEMTYPE_*_MATCH Date: Mon, 12 May 2025 14:34:21 +0200 The "memramp() shrinking" scenario no longer applies, so let's remove that now-unnecessary handling. Link: https://lkml.kernel.org/r/20250512123424.637989-9-david@redhat.com Signed-off-by: David Hildenbrand Reviewed-by: Lorenzo Stoakes Acked-by: Ingo Molnar # x86 bits Cc: Andy Lutomirski Cc: Borislav Betkov Cc: Dave Airlie Cc: "H. Peter Anvin" Cc: Jani Nikula Cc: Jann Horn Cc: Jonas Lahtinen Cc: Liam Howlett Cc: "Masami Hiramatsu (Google)" Cc: Mathieu Desnoyers Cc: Peter Xu Cc: Peter Zijlstra Cc: Rodrigo Vivi Cc: Steven Rostedt Cc: Thomas Gleinxer Cc: Tvrtko Ursulin Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- arch/x86/mm/pat/memtype_interval.c | 44 +++------------------------ 1 file changed, 6 insertions(+), 38 deletions(-) --- a/arch/x86/mm/pat/memtype_interval.c~x86-mm-pat-remove-memtype__match +++ a/arch/x86/mm/pat/memtype_interval.c @@ -49,26 +49,15 @@ INTERVAL_TREE_DEFINE(struct memtype, rb, static struct rb_root_cached memtype_rbroot = RB_ROOT_CACHED; -enum { - MEMTYPE_EXACT_MATCH = 0, - MEMTYPE_END_MATCH = 1 -}; - -static struct memtype *memtype_match(u64 start, u64 end, int match_type) +static struct memtype *memtype_match(u64 start, u64 end) { struct memtype *entry_match; entry_match = interval_iter_first(&memtype_rbroot, start, end-1); while (entry_match != NULL && entry_match->start < end) { - if ((match_type == MEMTYPE_EXACT_MATCH) && - (entry_match->start == start) && (entry_match->end == end)) - return entry_match; - - if ((match_type == MEMTYPE_END_MATCH) && - (entry_match->start < start) && (entry_match->end == end)) + if (entry_match->start == start && entry_match->end == end) return entry_match; - entry_match = interval_iter_next(entry_match, start, end-1); } @@ -132,32 +121,11 @@ struct memtype *memtype_erase(u64 start, { struct memtype *entry_old; - /* - * Since the memtype_rbroot tree allows overlapping ranges, - * memtype_erase() checks with EXACT_MATCH first, i.e. free - * a whole node for the munmap case. If no such entry is found, - * it then checks with END_MATCH, i.e. shrink the size of a node - * from the end for the mremap case. - */ - entry_old = memtype_match(start, end, MEMTYPE_EXACT_MATCH); - if (!entry_old) { - entry_old = memtype_match(start, end, MEMTYPE_END_MATCH); - if (!entry_old) - return ERR_PTR(-EINVAL); - } - - if (entry_old->start == start) { - /* munmap: erase this node */ - interval_remove(entry_old, &memtype_rbroot); - } else { - /* mremap: update the end value of this node */ - interval_remove(entry_old, &memtype_rbroot); - entry_old->end = start; - interval_insert(entry_old, &memtype_rbroot); - - return NULL; - } + entry_old = memtype_match(start, end); + if (!entry_old) + return ERR_PTR(-EINVAL); + interval_remove(entry_old, &memtype_rbroot); return entry_old; } _ Patches currently in -mm which might be from david@redhat.com are selftests-mm-add-simple-vm_pfnmap-tests-based-on-mmaping-dev-mem.patch x86-mm-pat-factor-out-setting-cachemode-into-pgprot_set_cachemode.patch mm-convert-track_pfn_insert-to-pfnmap_setup_cachemode.patch mm-introduce-pfnmap_track-and-pfnmap_untrack-and-use-them-for-memremap.patch mm-convert-vm_pfnmap-tracking-to-pfnmap_track-pfnmap_untrack.patch x86-mm-pat-remove-old-pfnmap-tracking-interface.patch mm-remove-vm_pat.patch x86-mm-pat-remove-strict_prot-parameter-from-reserve_pfn_range.patch x86-mm-pat-remove-memtype__match.patch x86-mm-pat-inline-memtype_match-into-memtype_erase.patch drm-i915-track_pfn-pfnmap-tracking.patch mm-io-mapping-track_pfn-pfnmap-tracking.patch