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 84E3A25C6EE for ; Wed, 21 May 2025 16:57:14 +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=1747846634; cv=none; b=hLUleU8MqAvt/SGOskmOIrq/4iLBQOD8DXj0G8QKVnUQf5Gi66LpkTwZt0aLDw9gSRxzkbBb36PodP3w5TexStOOU5nFIVKZChEPmOMnp6G6UKgyzy5mmpNWOrwPh9jaK20V9rwjlrYYHBKLRfmrTNqlAaS+z3n58oSyR6BCFhI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747846634; c=relaxed/simple; bh=6Tcf9qdPtErYrHG4ldRl2AfqZg73Mz1QovpSUod4OKM=; h=Date:To:From:Subject:Message-Id; b=M9Imd+pwYI1bX2ZPNrilFwaHO2qjzb1D2zuDsKvxq2kyTpyVCMNAq0mBpEuPWXREsrAYfS4eOAw2S/bdN6czkfe9O1oILIaO8vjx6XY3y2N9QDFhUQRjPnFNtX6O926eAeUJtue0SxL9e+AJgKFLvPXBiHwPVw0FC9FEHfDAZzU= 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=NikbzGhB; 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="NikbzGhB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51ACEC4CEE4; Wed, 21 May 2025 16:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1747846634; bh=6Tcf9qdPtErYrHG4ldRl2AfqZg73Mz1QovpSUod4OKM=; h=Date:To:From:Subject:From; b=NikbzGhBprcU0y/IFVCGWUfzV7c4XCsWKlBcToZFowxIv+QhZk7buJURR0R8XUQzi Nv3hyE2MqL3r/vqlzRkmlQWW/kQprGABj829cnKAC6/f99Ok21DCcNxu319iFU/qAv u1vTxdyp0ueNYX6Rphc9Y0S+jVcN35sOsJiozK2Y= Date: Wed, 21 May 2025 09:57:13 -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: [merged mm-stable] x86-mm-pat-remove-memtype__match.patch removed from -mm tree Message-Id: <20250521165714.51ACEC4CEE4@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: x86/mm/pat: remove MEMTYPE_*_MATCH has been removed from the -mm tree. Its filename was x86-mm-pat-remove-memtype__match.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ 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] Reviewed-by: Liam R. Howlett Cc: Andy Lutomirski Cc: Borislav Betkov Cc: Dave Airlie Cc: "H. Peter Anvin" Cc: Jani Nikula Cc: Jann Horn Cc: Jonas Lahtinen 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