From mboxrd@z Thu Jan 1 00:00:00 1970 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 4C734C3ABD2 for ; Mon, 12 May 2025 12:34:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BEAAC6B010C; Mon, 12 May 2025 08:34:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B71326B010E; Mon, 12 May 2025 08:34:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7F2DA6B010F; Mon, 12 May 2025 08:34:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id F3E616B010C for ; Mon, 12 May 2025 08:34:51 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 362B0BEB32 for ; Mon, 12 May 2025 12:34:52 +0000 (UTC) X-FDA: 83434200024.03.3B830F0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 189501C0002 for ; Mon, 12 May 2025 12:34:49 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="DHO+2sU/"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf20.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747053290; a=rsa-sha256; cv=none; b=MR8y38v8G6EVoCHw0xoS7IhS8jvEa0ogP2kI806VZ7dlJ5SYXxd6JbTr7hI4QOwLzU7BeZ XrR8visu5OqRkdWVCbumw+sg9tqZp1unS+IFbdI8V+5p9ZQGJhymuHZenTPelBF2Gyej4i nir8pGjA7KrCr68u+u1Fp3BGF+UpNyE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="DHO+2sU/"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf20.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747053290; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WLXTuxdzeoCOS7HE06BqHxnwP6g0cDhZW8Z+d4gkxmw=; b=D7S1mgWkQuYhlvnv3pOsaaM2Qbm3ThaKPasjcWwXr0C2MYxlN4SW+neMQjlbZ9tgmyIS4h V6SA3ukvBrB6sFzheChhnPp+NyY9sLv7xM85oRQZX04I2PrSw16Da5Dx4QN4Hsh1sp4OCP bcH71rF0nrzr2i8cBMx0iVbB4oDN7jc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747053289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WLXTuxdzeoCOS7HE06BqHxnwP6g0cDhZW8Z+d4gkxmw=; b=DHO+2sU/t7SO7brZHEemrXNlXAL4g6R9b6gipgl5xMCiFZBWbYfYKSocFnQlNWuYiJ6/FO dG63K7ZakAmrfblWCHyyaqU/vFq0LCCwhe+22rCd3oAarcROsObnHWzRZKOZ0jdv0wdEO/ 6NyF4eH5vNKCznec9V9LhsSU94Q/PLc= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-133-QJci3EYGOBKaiG64qZvUFw-1; Mon, 12 May 2025 08:34:48 -0400 X-MC-Unique: QJci3EYGOBKaiG64qZvUFw-1 X-Mimecast-MFC-AGG-ID: QJci3EYGOBKaiG64qZvUFw_1747053287 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3a1c86b62e8so1431968f8f.1 for ; Mon, 12 May 2025 05:34:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747053287; x=1747658087; 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=WLXTuxdzeoCOS7HE06BqHxnwP6g0cDhZW8Z+d4gkxmw=; b=MuaGJGwQn/RMKXnPPzQ3QnmiGDoAY54UYeEZbhNuFUaPhSOnq+gCFBsghsqktIZj4t HNmNVQXfdNonGVJK7AHR7P/CyfvmZrqiVx6EApj7G3T/ZzjtvDn90eqniqip3bneSDQE xmC606MGfxgjrNRAqDEsqn52KSYJnuprxRk8UazlecTfEFOcim9ebWz7J66Lkh8PX3iL dU8gTD+fFsFayFN1vOeDE5PbaFNG+8+hiM42W889KgnIqnp0n02yDb02YXvf+Pd/Z9iX OSZmBqozgsnH2zG6O5vk1J5hU1iJNH0SHW0s6W1hzOR5nAWiC3Od/ftiyh1fzQ9bYOX4 flHA== X-Gm-Message-State: AOJu0Yx4AA4mOoG4U3iWpy/kRylTgdLy8M0o9fVpdC9dHLUhL9F1bUpx Z3tOPNvFpLMw35xFpVhMhkyZg+CaceVDkPf1fZ7keQ63+OGjYaeZpmxOknbLk3o57WTw8q2pZrY 2HF6qyMPME7UpD5keF5onHwZ8qy2xDLvxFJqFOejRLBgLDb2y X-Gm-Gg: ASbGncsBOGpJuiYeZDqSl6MIoZjJfaebPHEysOTR1wngc18/vglgqKag3bZ7vi8HGkO X2Omfrlh3Yo22QjvLyeCy3uLnTDkjDy8Lhftc6DtOZUQl/rpKEoZHDABwYMXXyTijOKND4VsmXK p9g4IJV63nQngNly1xGptxL/I9NhH8aIf/3rwpmFpW8Ks5JnMHj1B+yuFVfen3EQLA2FjL18FC8 hdzYCqmhFmNBTRFysSLSMjPSg5hwh9yH4s8T2ZE75L86QCUMNH1bZpyVYhjtMu4wCCRuzZPZakB 8I8XZqQPyRroSsoDg6tLYi2fpcavQBDkuHqQO4ljuEwGdh/syl9KAPbzeD7wZsZAr00pwmP0 X-Received: by 2002:a5d:5f56:0:b0:39e:dce8:1c07 with SMTP id ffacd0b85a97d-3a1f64a43a5mr11025598f8f.46.1747053287249; Mon, 12 May 2025 05:34:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGXC2JTlHqMNEkDQGwHpsMemWHOSr9CrtHgYnjEcClwN7Gy0FNgR8cW6E5jpqWqORj+so6DMQ== X-Received: by 2002:a5d:5f56:0:b0:39e:dce8:1c07 with SMTP id ffacd0b85a97d-3a1f64a43a5mr11025549f8f.46.1747053286815; Mon, 12 May 2025 05:34:46 -0700 (PDT) Received: from localhost (p200300d82f4a5800f1ae8e20d7f451b0.dip0.t-ipconnect.de. [2003:d8:2f4a:5800:f1ae:8e20:d7f4:51b0]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a1f58ebd43sm12647639f8f.37.2025.05.12.05.34.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 May 2025 05:34:46 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, x86@kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-trace-kernel@vger.kernel.org, David Hildenbrand , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Simona Vetter , Andrew Morton , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , Pedro Falcato , Peter Xu , Ingo Molnar Subject: [PATCH v2 08/11] x86/mm/pat: remove MEMTYPE_*_MATCH Date: Mon, 12 May 2025 14:34:21 +0200 Message-ID: <20250512123424.637989-9-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250512123424.637989-1-david@redhat.com> References: <20250512123424.637989-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: fzO5lRUkFFIaNNrfg7jjMWOV0LD-_ByoV9Tf-tJeORM_1747053287 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 189501C0002 X-Stat-Signature: wpdtfaq77rrqi9xhqwatnc6iymdfix6s X-HE-Tag: 1747053289-417716 X-HE-Meta: U2FsdGVkX19O9nzsjyIvIjFWkGbxyFSY7aKWx3QFhHOk51wGX/v5tmF5EP4YSH1OpzM03K0qqRxOTl3U40ETIFCi5s0QYAyd5C1NCdKiac8BYcJGcEvzoH9mS0Qut8aeCAFZ22l+86nmyEHdSmt82VuluFOJ1FeSsubXT1r4k8/lZODFhypxGyZlcGcoC/1IIpPjFmjqmOvQHymreM3ZGx53tkbFUYN5Fb6PQGbnEROJ6EONN2mcGFyubKsUEf8+xUkYQBRTbLkeUDpg3QyXWKs4GplVIIRyPpiXun3H4M8qiVxqM0LmiNqs+zSiXW/3d/R2C1cxUUznVRu91stipPxS/NOU+3wffCJ+KtckT6fPJtWnyICp29a/wFWYIVbnGMg3NQb15Zv7ORavweAt0PstlByWDCY1xMul4DQdOhngv/u+6vVEyigY5Zkf/KkFs2zwyHhb5BO7f8ugkv9Ail/eTvL+3W3JqnAfyKpR81axYMsm9lxpzj0lXX3QKM83HlOfQLw24PWtbY0QfnBH/YQ+PLItf/apJBwv4F73ds4M3Gh5KkZooWi8qcPCbIbf9m6QHiKiUtlYGT1kxtAGWoc15hni8RUgLMAIjD0wwhrQc2yjTEYc8sKtUw8BxeYdHUWMpHOe5hF1H2GgzYcmn8RArdq2aTdCobtDOoPtpFvnyU9+D6ufkI59Wdu3yJbuubjYfit6AdNelwgNcnW1FyAQw6S5eH98u3Eye5eeHFIfPgPoX/kskI3uQSxDEpmXBiblVHRBfoW1oLYZdch8kg39ADI15YIxFzqCSr8Yd3QRt+L8B7qg9IEit6+Z5u+Uew3EiFrlSHKDqnNZSwoVFKAf6PGEDEOrLrH51G8JP7wHjME7Cl+3QJ5dT7LwJaRUKtKQ+9XT/JpXgWuW+ek4kPhpT4d+gvjyG1TbWpKGOuw8awOhe9ZzzmdWv3O2zhWrgkhY0M8F976MN0o3v/1 jvUpRJkp Cdjaoup9MeEMos/wNOuKtwgod2r6aNkAPPl8xmKpyXD8LsthnEQQegZH+zW7iqbatqFgHGbKbJpzPXrk1sI9yK3K1TFRJpd+c8VGq5AGHXLtwinQbeFL+jo/6kMT5ayq1aA7MHZp58duWpMOqZK3iRjltP0eaTySoR4+Rq74CqzrJtI17hZ9oKqkq7AGN9ZO3C6HfO5X9FW9EtDyp/BTVTa8+PBPkNoNDGjRDuWFnfh5WaJ7KhOF2h3MmsC+LP4pBR+sJGu5tllcNTWwntzwD+14YR+fW+crWlV4YKmtIbpYjQqTezLU+6bhMHDr2T7V+1jga6TtqtMCCGZqXbsjx3xwyWdnaShY9fRv6ZTH3m/alyUznFJ9jxc4C+wOCgyqteniXeYEvrW31oPfY42yZf5IwdcwsET0ngyzT9bPzgQ+if/Vt5gDwPnNtflxyEXCKRqdsPThLr7KNsFv5DZ+J8c92R51/nrBScNIUXxhcWbPRJGdFO2vhbezbIWTGqr3zFRv4Owh0j6E9cJ7+IqTLLJN+v6PFLnonMRA40aX9kdQWomaJY25/SQ148pn0eRn/iNTOzsBgTALt0nbaHeOTu7tc0GsisfS5HEoJykNlCiygk9GJoAd1S+ClHvsT4SBNQSGpOrfMxN2+hg7yUgTFsY9o5pvZ6GPv8oGQPq0jAccytFkI3Rc8ZG1nlx/FaW0YAoBW0jvOjUWzJ/g= 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: List-Subscribe: List-Unsubscribe: The "memramp() shrinking" scenario no longer applies, so let's remove that now-unnecessary handling. Reviewed-by: Lorenzo Stoakes Acked-by: Ingo Molnar # x86 bits Signed-off-by: David Hildenbrand --- arch/x86/mm/pat/memtype_interval.c | 44 ++++-------------------------- 1 file changed, 6 insertions(+), 38 deletions(-) diff --git a/arch/x86/mm/pat/memtype_interval.c b/arch/x86/mm/pat/memtype_interval.c index 645613d59942a..9d03f0dbc4715 100644 --- a/arch/x86/mm/pat/memtype_interval.c +++ b/arch/x86/mm/pat/memtype_interval.c @@ -49,26 +49,15 @@ INTERVAL_TREE_DEFINE(struct memtype, rb, u64, subtree_max_end, 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, u64 end) { 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; } -- 2.49.0