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 CBA9CC369D9 for ; Fri, 25 Apr 2025 08:17:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C6E96B002B; Fri, 25 Apr 2025 04:17:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 127966B002C; Fri, 25 Apr 2025 04:17:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6CCD6B002D; Fri, 25 Apr 2025 04:17:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C388D6B002B for ; Fri, 25 Apr 2025 04:17:43 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C1C42120350 for ; Fri, 25 Apr 2025 08:17:44 +0000 (UTC) X-FDA: 83371862448.02.B318A08 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 8D6C1C0012 for ; Fri, 25 Apr 2025 08:17:42 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bQ4LT7Aw; spf=pass (imf10.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745569062; 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=rqCDzyJE3N7q1dfRPTJIKewHsgjJcYj+B7llEZA1rCc=; b=hb6YG9HYCBNEZEXeDzOG2kmbISRRZUSWyEPPPBYqSVBSqZfDv1lDqS5iRZG4n/TMVG/ama 0VplRSqQL8X4iipCSs6T3Q3ma0vD+7vWQhTAsdMLsfV4Baq9gRGdgzpS+X/zOLMmEaoYXv NwhaxVDqAgX3hg0Jf3uv1RFfI9R/D94= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bQ4LT7Aw; spf=pass (imf10.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745569062; a=rsa-sha256; cv=none; b=TpcDkfiDJ+27VT0G6FrGxJXUM1p8OPW1CTd1M8TYChIHr04yHpyQwXaKlwCUqCiA5tJSaB JOMVqUrQejJy4oOUF7TsF7/k3fZKmNuvarLLFfyVX2Id3846I4ZI52mqkHCQQ+/obYv9wz jFGontAuO3yWKmHWpkeyJDKqZAq2p+s= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745569061; 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=rqCDzyJE3N7q1dfRPTJIKewHsgjJcYj+B7llEZA1rCc=; b=bQ4LT7AwLAyp+GymBcgrzB1KEPSTOrTBjzh7//b8kM+1yZyoPtY+WszSunzZvU1IWlKQeT fvaU30jLkvdv/3JBRgqx5KEy9qBMA8XBXdKIg8XQ/CAKnjV/Xn1eH7ZRb1EWkL7fCXQGmL 4whdAxWJEsmoKJzeGo/LVLeEIjTVtKA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-320-CcOV7-X6Ph-4VaEm66OWQg-1; Fri, 25 Apr 2025 04:17:40 -0400 X-MC-Unique: CcOV7-X6Ph-4VaEm66OWQg-1 X-Mimecast-MFC-AGG-ID: CcOV7-X6Ph-4VaEm66OWQg_1745569059 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43d733063cdso11797135e9.0 for ; Fri, 25 Apr 2025 01:17:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745569059; x=1746173859; 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=rqCDzyJE3N7q1dfRPTJIKewHsgjJcYj+B7llEZA1rCc=; b=EklwGdhP7tivn+7i00roAwf+fdLcsfTG22bKiuBJwCl0205JK6S8qgDf7TUGttprSm L0jFD37B5t/wi56MuwPmhRQo/OIE1RYIFJ/wUVey50doKnO/s+SZ/T5vOt8n7Tuc5YK8 v/9YGWroIwATmTiKu8c5Jj06cd3yLHq41Ehq7Ye9InuOM17p1SbkV4K0nZSLz1cS+nPb /Gk2pzWtR7ZonE4WMh4JjWqkrW7oNcGb06qFV8yOmGxGZrMIO8rY3O0U19CWe9jhJ+KR KSnrM4VNbGCFOT3X+MiHaCc+hJgyGbMxSaVg7f1M4XAUQJsxOB1QA4OHNX7uh4lGOvTH 1khg== X-Gm-Message-State: AOJu0YyggkAJgxPSuuGDylRewZf50wO5hi8wKo4Wb7Y/wigP7t3YG7vy 9V7q4X9FWWNm2ke5MrebjifE5PY4Ke/YR3zMFW9/MZHSmchGPX+F+r91itCVhAYxIm92q76gnHn muEOlm1vMpy4PBslQIkzLBzCgAp84Q03uuZZ7LEcfw7aBfYxX X-Gm-Gg: ASbGncsHhov8JV7/86qsjbhSO+ivXUiQ2QUCEXEuSIqicJ189/5Kw0f960utekZwoWO cwCiAKhGEL6/Jb+cXYOmjXDq73zoewsbKsu7I7rYEHGG7KkKc0F8wul7sqW1rkYNEmU1774LDV2 Zz/jlBWogksCodp/eGOu8OMyIvr7x5iNpLzFiGVpWJF/9fOUg0t1u0+u2VmU291RFjYD1Yxf5gp fG8ZhbMCz719GQ3RFz+zQE5Y1aieX13srirmkkxpfYYASGFAo/fG40KxegXpF8F41UWvKWg6x7c jUYTgCTx+N3jrj7xuXFaV20tLq5NE0xKI+RXr017XU6+nS6NfodPlkjhlHvoS8DxSkrUWrs= X-Received: by 2002:a05:6000:4026:b0:38d:badf:9df5 with SMTP id ffacd0b85a97d-3a074e1e7c1mr893881f8f.17.1745569059286; Fri, 25 Apr 2025 01:17:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEeMJVro3CtNN/nAt/kzydgqpqMLMz4QDAdVYj55uYz4S+yOKx9n2ojCFKF9ThYiE7nLuy7NA== X-Received: by 2002:a05:6000:4026:b0:38d:badf:9df5 with SMTP id ffacd0b85a97d-3a074e1e7c1mr893849f8f.17.1745569058900; Fri, 25 Apr 2025 01:17:38 -0700 (PDT) Received: from localhost (p200300cbc70f69006c5680f80c146d2a.dip0.t-ipconnect.de. [2003:cb:c70f:6900:6c56:80f8:c14:6d2a]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4408d8d191bsm78695765e9.1.2025.04.25.01.17.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 25 Apr 2025 01:17:38 -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 Subject: [PATCH v1 09/11] x86/mm/pat: remove MEMTYPE_*_MATCH Date: Fri, 25 Apr 2025 10:17:13 +0200 Message-ID: <20250425081715.1341199-10-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425081715.1341199-1-david@redhat.com> References: <20250425081715.1341199-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: oUzvewO8jqbWKhIfzCb0DMcQSd5Ylr7wlyzKrhc4A7M_1745569059 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: 3wif1nbw5s8kw54wi5nfsprqxop8z4gk X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 8D6C1C0012 X-Rspam-User: X-HE-Tag: 1745569062-72658 X-HE-Meta: U2FsdGVkX18M02+Dx3uOIqpSkUyZlQcrFbr8UDB/jxF/zyDrYrGyXsb9CsmL2iY2AMgNGWWZTGJjpt0bfwx6tWcUwJ/BVLxtiaX34AgbtET6mxiYRdP5bnUyYXCetnzxYtA2DKTNNN0s5pLudNb+GfWbG+M3xMkN9DO5kiO7S8M84019XcOJ/StR2nRLZtZrOiwWAp2oQ+qTI2aRcUi6ge6H5XWfqAuunW1fmkCOhYistJhSlQK3rep0F2w+KJKs2Bq/XNm7Cp8FWoMVnsxXRutpk/rVs5ct6CtGDVoAbzFWPUoIq0zViKL37QUHcNLj0dMf6iCtrKQv4AFdajRKDL30B21icoBd1EQQqd4+H6HFqzn4b1rQQbM0/9QCjkV+qOXZvXjd2msYDgmiMGwGOBrHtpt5+binxpiSP8ymuwdnSA9NTdVZxOuPsaOcBIbDdeCvD+BKM5lcGVYLDNVgmZ9lcWBTIZFKg4Qy8sArnifwcjLPDL387mKjrkdw53W8OQBlQwWKZH4lDzT8nh0app8OGKu0lCq/kRTJxmpKB1iUcKaJng3HOGf2+8SPlIwk8xUoL2ccSRSLZNpatzHo29nzjZCvGWkWGXOxiF2wQu1IfviMuXAkHxkHfEAB7FhmeWWiNwH15gOk+lVCFseH2pEZznxvW4MCQuYAWCZUYaqTRfdRK342B3j+WUr013otWaNpolOsOvWKgJ8Domr4u+1YSJiI3zFzNy+Z2stC6Wg0VE5xB5cXP393zL6GwNMeR/GmB+IH0YYX13o/NfEiGv/Cf7VixiAeFGrHuZiGAIjiMfBePFGxqpkWEGwnponXYzwvKsumQLRT2Ac9LkiFBS+wxYb0vt/pVbu6mBe8mkWJm+UMSKLDC/xIA+hhaWU9hZEjVhH1Oon3Wgh/AHuzJSyr9lae0j2w0AVREoPnZHruUs2lbsmNAVSqduUG9WgKVgNqHwt49eimFgVKhfy tJp3f1uX PDAHzqV+cTBVovlC8xK9xXAryIm4IYkLe42ubsAgq1Abjg5N6DN2N3NMNfKFNSdNKhGok8RTSzY6Lgb8cIi/KHOgdiIjRYcGqvF8hB6GSuxZk/0dpqPhoTJAqRTtXoulyAO8ZUKuRrBy/Vp9qqc/oPTWBvxpVrXiGIXNjZxQG+ZF2fRQ/uUhy/hd6fLRjCZqMFw/85AEXT8htE3YnvoAoD/ptSEfkp10PEbKBLPl54Hj/t4rZKab5EWU3MWwt3+PAMFO59lM8NLhQRJ116cm5EM1VogsYpq14qluXLZq7kh9lnK2csNw94Q7Uv7fMbwyPF0yJ0keS0Y2TFwmQeZ+9mBwPIGtmrNUdtzPEi2xsQgeecZw6BohdL1BsO6ih3HOBl4vJ9X82lIqNNsOd3zoIX7Al+z2TdcbyLXyIJaNdxGSI1dCLifwwODqJgG78X4A6OJPjN1EuiGlPPWiAwzDEm3GOK1A/IzVnkFKh4R54UMKY5VkEuxsR8SozMbJ08PnXYpKwgNEYGKhEz1dIMOLZ5B5f8RKm51b0h36cysbaGy9zR39i7lgD479EEpxN0c81AzSW 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. 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