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 7D294C3ABC3 for ; Mon, 12 May 2025 12:34:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E8326B010A; Mon, 12 May 2025 08:34:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4467A6B010C; Mon, 12 May 2025 08:34:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1AD336B010D; Mon, 12 May 2025 08:34:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id ECC406B010A for ; Mon, 12 May 2025 08:34:50 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2AA2A1A1146 for ; Mon, 12 May 2025 12:34:51 +0000 (UTC) X-FDA: 83434199982.09.D9040C2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id 09AC81C0004 for ; Mon, 12 May 2025 12:34:48 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HpxbKmxe; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf21.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=1747053289; a=rsa-sha256; cv=none; b=i7FRJOrD5FpFJ4S7S2+3Y1kYvLksM+zqq1/wmyHyhiOSKPJC/K3jXZKAHOaU6QujWsIPCE 8xgbpcfdGe0XcHwc5zjPFIq0gLFx3c1DMVnZc0JzfUJueJfUjifexIEBBtn9oIwMypXAxO Cs/lHhLVKvZmP9fRFux8FWy7t8PznWg= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HpxbKmxe; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf21.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=1747053289; 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=damHjxLzdKBqIDkI5LPVSGeFU6dth6KBhucvp/6hc2Y=; b=DoO0lxD7xogR5+tvxLtTq1Y9mnmdKFo71bas3tzMtpS/DNBuEfI3wuBU1SpoKtAtkDlKdP zRnqNFWrUxxPMfaFql3q4uC4nniifdk/0wvdbK9WKv12WQCR5/Gbxy18LjZNDkWHeLxSMt Azq8t8PnxMzasDquEPhhaK4K+RqkbW4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747053288; 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=damHjxLzdKBqIDkI5LPVSGeFU6dth6KBhucvp/6hc2Y=; b=HpxbKmxeSFOrHzJHCSbsenCFmp/qQxYP1BqOZVUD9ZhtPXgIKeLJ20pV5fk9CTxnWrXxOz OiVYGmsa3kHhcpQbWXT0FbYqChFLLVIaAZLfiXOBq3BmlUgYItRDbWeZswpP70X2oiFFnX qtBsACAw+rwRDpKNjNLmZ4aYU+fdbp0= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-1--vQnZx1lPl2v0clVvIE4bw-1; Mon, 12 May 2025 08:34:46 -0400 X-MC-Unique: -vQnZx1lPl2v0clVvIE4bw-1 X-Mimecast-MFC-AGG-ID: -vQnZx1lPl2v0clVvIE4bw_1747053285 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a205227595so450150f8f.3 for ; Mon, 12 May 2025 05:34:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747053285; x=1747658085; 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=damHjxLzdKBqIDkI5LPVSGeFU6dth6KBhucvp/6hc2Y=; b=RKqq8qx2sCsRsbNPXofABLKd99voR/plWku5OskmSqgsKlz+w7iJ+yx2hBcBFi8fre I1N/g0wPUaAzG1N1EV5u/m877ov5BIkS7VD/vbjBXUN0vMNoa7zlnu8SkdYjDyzx8ISi V08nKHhtNyZFM9cg56+qiTWCcbRlhAhY9TnYG0Qql3SPgUVNs8LqAB9qmtshH8xRAUA0 iuXQVzsfZX3vQnYodIN43TGDiFP75Nb58ujT4FVL0acCUbpRUoM9qc9+RI5Cw0Isu3T8 KG8M3KmWS7lYpCI8jilHRhZGHkMFOXuwORh5ezNAecMKc3pGYsNaAK85WthmFPOhaVpZ YRrQ== X-Gm-Message-State: AOJu0Ywq61AsQ1U0e8iBMUXqJ4tEztGo3Wadc/tDXtUhpV1y0zaNZxNJ hqMWQz+ly8TKHz/kveYEZnREcEYZnSSVdNGMaIM2sPudwytTeg0RCzMKXjvMq88RJAI2X7ZqXhf 4aXjKZo+5wJGM77qXTDqyJF/x0ChbKPWP2cikpS+GlLEOpo23 X-Gm-Gg: ASbGncvTyB/iew40QObsttRY6k8eSuHK12tbROxh4Z2tlU9+LlicWJehXF7+mU6loQi rGQsCOJ0rg4HBaKNlD8NGfK+0w7BEmILcce6tsSw+0vogikFLiVv/uCVAVgRDhJkWl2BUckwoks sGCb2lMGgadfImTbKg+qZHVix7mNn1x4LDmwDJDcb4SwOnLrUIe2Tmuhk+l8Rr5jDxljFYQKa2H 61VD6jgCHOwawP/lfRVh4AvudUnCtr/V3xf0BJ0ubmW6aed/M/meFco8Ob46x3A8Qa41P4LrA+H Iwca/T8WTkCtd54+Lcb3boT6IqzNd9iTxxVJ2Rg5dtCdZfMMHVfnPtwyHkEUCwM4twjMY0rv X-Received: by 2002:a05:6000:2011:b0:3a0:b455:a1fd with SMTP id ffacd0b85a97d-3a1f643d7f2mr9690538f8f.32.1747053285128; Mon, 12 May 2025 05:34:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGnmU3EtVrQ/jxHU8AUaqqw41jpYBGCmzwmgCEh+gCBZD+u2TEH9U2eBlpYNMTeAuFBo11Jgg== X-Received: by 2002:a05:6000:2011:b0:3a0:b455:a1fd with SMTP id ffacd0b85a97d-3a1f643d7f2mr9690506f8f.32.1747053284744; Mon, 12 May 2025 05:34:44 -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 5b1f17b1804b1-442cd32f238sm164887305e9.11.2025.05.12.05.34.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 May 2025 05:34:44 -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 07/11] x86/mm/pat: remove strict_prot parameter from reserve_pfn_range() Date: Mon, 12 May 2025 14:34:20 +0200 Message-ID: <20250512123424.637989-8-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: GfBUSFynr39TCqStIPZyQXoqWD0oXzh3N5H_aeXodwQ_1747053285 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 09AC81C0004 X-Rspam-User: X-Stat-Signature: xqxcwkp4y5wsakrdjwccxo1nemjxtu7i X-HE-Tag: 1747053288-933407 X-HE-Meta: U2FsdGVkX1+dESnY42Gt/utyEzy8ZcbQFfgLXilzURlT3OQpslmesgcHcloqC7mE+lau2cU4d6eNFDQjV5cRqNDbZe0T3KsNjJW6pv8o+q3nBi2ggHSRL3q3AihcAGMJSr0Vgo8FELgOhlmN7+d6t+TX3WHJ7valHWWBmdUOfm431mpdf9YIaTVI5iOsju/P05sGfVCKAJZJk4XIv2KTYcxcHm3eR36/nzHWURTkOTHL68Ga2F3KuSMZ9YEXjSl1a89+NQbIyrSyQr3mNr03gK7XdJqgATk/V7JDLsVzbeXdPAMcpO56XInfcvdz1achveTltUoNdFRfCcN1JK6JnUfqYsi1HgMX0XdEFP6zc1D0ewe17QdzM5IjDMc7GMQZW1d5jRYush4Qk+h6z1aMKistvrcYfuVkSfNwUlMli/YGf8gTT/BfUAHGr5K/paIxWiXRRiV1AQb2Q5NtRTaqMStamIynNfIYFn6xlknDzFutsipAoJBWHADLufDgwfBiD6U2NP1pqqaaAZv3CpBEhlLpGNuFgEPQDhycNnVMkwVNnnT9AtftAXxxnAd8sjPneO/GvPB/PhblSrYvQFesqEg2mb+NUByUXwoP/sZOIGwT7hTZ+OsnpEfPF44NqLfF2YALGIIiiegDALzXXsL5ub8iKIPmpt+ANUoFttcVv2QqKm3yrvqII5HDVCACxQwG/eqmdTzramyfqQrt9fL9MYA7sw9nsP21+vxu6Hq+GY3DvUSxDz0zaUSMYOo2PxOapkC9BrI7cx1jrtEaxrvPr9Brl7H+vmETRtrh1iTgxjiBF5jt83RbSDkPSejp82zNzfC9Emx03n2HYcAF6ZFNGMTWkl5VQdObQpu3eZ4Wp1473A4GHXNeE89ECiCaxn0mAOB3qpkJbFxpFzkuxO52ROiiQPo+mxMUeT1QWuWTLPoDQCzHd4z1iD5qVB+SrIHXzT8hyIe2PRmTxDtxyoZ s4W7hBbO soNPtHuuo5CiwoqIaVNwI72imUKi11+ZaaEGblGj0Ys4N4dsFiGl/3zVGQhbeZ4+KruKi5SCVRTTMGnXhjx8k7WYgfIZxhY1zm6rye9kLSTkG6LixTXCoiLCVvmZib2PJdzCaaniu2hBuk4L4uZfss6f54fuQj5IqXDVr/pZFQn5jMtdtXDcY5HIdYijceLEli5OGeeij9J8ALtyZqsbwmXOs5A+f03VOVOGjAKKAayvDIo5BOv7lhUjrGfVTBA+E/cLr61A8eKu6YHxPEY8/Ssn7h5bA0/gFxh7fOvNTZdC33+fG36/i5C/e+ge8adPOFacvdCzVYLtRS0L9EbQ0s2y4QsNqc1MSiMVsV0N/H6+qxu75h/wlBch6sUagc/71hrB5BVCDlqqwruVeYRjja/ptPnijWuYBPeoM8lgSsw57LISdwIJGgy+geJYjsaq0NkLi2k9fROqxxsXiyRVCdOFg40PWiTDlE84aI+MIriTQVpFheKZ511ctoJ5WiBQFqTgwv+/yrrTVS4lLO8o2bOc5AS4dJGMNT3kZC8dpf2Q1ETYM+x21LFKbOVodh/cy0GPPa5FM6Oz59qkSJrZrDl2DgCfqp3qqa4GgV2qzV+GCBwexd+jFG2cfGJUFy68a+3YUnk49plfZuzv/05ACiwvLpFkeNLzAnckf6TWYTBlfRbBNLGGFeCTeJXZxViw3A2tQXOmCPWUtss0= 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: Always set to 0, so let's remove it. Reviewed-by: Lorenzo Stoakes Acked-by: Ingo Molnar # x86 bits Signed-off-by: David Hildenbrand --- arch/x86/mm/pat/memtype.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index c88d1cbdc1de1..ccc55c00b4c8b 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -858,8 +858,7 @@ int memtype_kernel_map_sync(u64 base, unsigned long size, * Reserved non RAM regions only and after successful memtype_reserve, * this func also keeps identity mapping (if any) in sync with this new prot. */ -static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot, - int strict_prot) +static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot) { int is_ram = 0; int ret; @@ -895,8 +894,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot, return ret; if (pcm != want_pcm) { - if (strict_prot || - !is_new_memtype_allowed(paddr, size, want_pcm, pcm)) { + if (!is_new_memtype_allowed(paddr, size, want_pcm, pcm)) { memtype_free(paddr, paddr + size); pr_err("x86/PAT: %s:%d map pfn expected mapping type %s for [mem %#010Lx-%#010Lx], got %s\n", current->comm, current->pid, @@ -906,10 +904,6 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot, cattr_name(pcm)); return -EINVAL; } - /* - * We allow returning different type than the one requested in - * non strict case. - */ pgprot_set_cachemode(vma_prot, pcm); } @@ -959,7 +953,7 @@ int pfnmap_track(unsigned long pfn, unsigned long size, pgprot_t *prot) { const resource_size_t paddr = (resource_size_t)pfn << PAGE_SHIFT; - return reserve_pfn_range(paddr, size, prot, 0); + return reserve_pfn_range(paddr, size, prot); } void pfnmap_untrack(unsigned long pfn, unsigned long size) -- 2.49.0