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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 24312C3ABC3 for ; Mon, 12 May 2025 12:34:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 74F7910E3E9; Mon, 12 May 2025 12:34:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="HpxbKmxe"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 30A5E10E3E6 for ; Mon, 12 May 2025 12:34:49 +0000 (UTC) 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-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-696-b972tVuePRO0l7TzFX1-6g-1; Mon, 12 May 2025 08:34:46 -0400 X-MC-Unique: b972tVuePRO0l7TzFX1-6g-1 X-Mimecast-MFC-AGG-ID: b972tVuePRO0l7TzFX1-6g_1747053286 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a2046b5e75so363972f8f.1 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=j+T6v5YgmNs3jH7jYlBBFXHveUoOrcJ8fBDldMAjLQ5WT3mhoP+NTs9bMsn+teAZxc qNiplqe/zQbmiK9Ut2lPSGwf9DlVj4tinO04Z8Kw4lU9qSuelY8RGaQBr4msTNwlp5SD Intgmm8LqE1dtRAU+jVIRTcbcnh+tG9hg1c3GRgksti72YA0IUKMYrPV2Ofg/PzT8esf nwmYG133fP5VrJzP6oDBowUuoas4ueA4rMa4v8QBc9vF3vlEjg8tBxNx2YLQehftNHJu ztnyqIY+EVFVoG/Vcg7oA/xhF4snQgmKO0UcukrLOluc+jxEF0fbNs9wtjckF6NsbLRX cJtw== X-Forwarded-Encrypted: i=1; AJvYcCUbf4wHaqCv63wasHtxXcXbTFCwNbwPgLcy/K1V9yItTAt5Vax9+YOVfOzdGidb1f2x7dS4B4vSdSk=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwCSsAj8mRDR5HcFcBXF9ZCnUUf3e6PtH8Rz8aSbEX9mWY8hSYZ bDA9Hy6hpoJcwCtLIYs4/bWOvOlUMHM+FStkA/GPCdqkFhXW8yfuoG4NlBNI8eE3dwh4fg8Og8z kKaTLOMnyYG8DFEjKZ+KfNc7p6+uO4MCphJFYnC2hbY7XrJt9/BGrrkzwcaRIcylEk7TlULgcgu xO X-Gm-Gg: ASbGnctizBdMQlCHRNjgtkKbGt4Xpe+wLkzmCHboqrRv1HhkJ8zbiHtuvgKQjSzmP8i CCC6Hkwbv3aql9fMNrJ60jJaXn+8fK215IrPDHyJEXSasyuWnlK9aGJoQFeQZLw+yV3n1z3EdTM QUdEtIvdDxYhb09VVioGMaqcIHULippNlJ4Bq7S3K0i3Yy3iixSRBVzZafXSMADj9rEa1tLc8AX qdLaqCddKqnQwYF7Fj84s8B0ieNNcZZs6IwvPxhsObCrJ7236hFYK9Jk2nWYilxcctvD8cKcPwk /wqSQcO836WtIlbRb20kqcANT5pF913UZgAPuSZHihzRSY2GA4gU5tyxtiUa7oe53egET89m X-Received: by 2002:a05:6000:2011:b0:3a0:b455:a1fd with SMTP id ffacd0b85a97d-3a1f643d7f2mr9690539f8f.32.1747053285129; 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: fs97Id7hn0Qs_UUgPXYrtRrbEU5Uij468FsDdw5T-G8_1747053286 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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