From nobody Sun Feb 8 20:00:11 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 434D72343C9 for ; Fri, 25 Apr 2025 08:17:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745569049; cv=none; b=iCde0egZCnkRoZV587ga/mbji5BvWfF3irHYrjVAg8g8dqx6U5xEuRJ5R7qWhGeK5sDarcaqN8BMNKchNWBdpXWKSlxwwmKdrjFU5irQPHPlTPDA065dOgeyq8PWrijiMh9i6HpmFghHHT9a8ypFBjre0Wymq/3g4kEUwD5Qf7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745569049; c=relaxed/simple; bh=rUDJGg2xixsJ9geC17OnQRzeOPjqu3DYWFdT6W++xX0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kEVh1px6GooSVVA3VCNIm9rL3SPdTr6cCcVoTgyW9CO59AUOynhCZ5qYqt1GI6r8AQNGdAUszfGqVd5U9VxtUMNVOuy/8UUIoRScTHTHwP9CNKZWewVMebYg3d5gUA1nF8edm9vF/F/D4OuB1w9DirGmbnMK8almlEBku3qHVpM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=iZrWA8Pa; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iZrWA8Pa" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745569046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Va9GMEIBRGZSICWJDrjnUC4vZ0n+XJyTsP+h0wQhX1w=; b=iZrWA8PaRXx1ED32dbcZb40oz29JN1Yn+jr0ARZt4COGKvlR5pmEQsjkeBOJi9JXdqixeJ GuEt69Nc96AY0HLWMj5gsemcOs3xlHLW77XDR4K+QQwoYQnCgSTBUpAxDYGMLU6PTJiB5i azAa//3BaY6pELBX7VncWWw6ZQhtLAE= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-500-Pac2s1PVOWmzA3KWeNcaIw-1; Fri, 25 Apr 2025 04:17:25 -0400 X-MC-Unique: Pac2s1PVOWmzA3KWeNcaIw-1 X-Mimecast-MFC-AGG-ID: Pac2s1PVOWmzA3KWeNcaIw_1745569044 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-43cf172ff63so9149895e9.3 for ; Fri, 25 Apr 2025 01:17:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745569044; x=1746173844; 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=Va9GMEIBRGZSICWJDrjnUC4vZ0n+XJyTsP+h0wQhX1w=; b=JzVz5FB/7eRmZd+0PFKfOe/817aD/N0FmxXD+MdCz1v/VFXDzHAY3NnCzOEYia96LC OmyybzvVywntEEPKxuDOip2PF8T3LM9p79d9do1FJ97KLCXxcMkyHd9da4Sl+Lc6/RbJ e6lQieMtc3C/pRB+nEYuBNLEaxl3TLJQQV/mG5wPDsC/I4LVUUN11+6SHRqZLuuJywOh 6b01HFvGEHeZ5upVLdWZKvi9gGmNqtLDKdoMhdCyAMCWwhFuvvqUUTv7eyx47jRkYd4C wgGOCDXj0OLpeF0EVWPOGRMPhxAZ4iH3F5DpRAz/656r5nI/gyGvFLtxVKxtKJ0ozck+ PM3Q== X-Gm-Message-State: AOJu0YyAL15mvvV2ENvy1sR8arBoYGXmzygQMClnG+3abuDdqcmRxJyq C6yH3hs4zGFclYy05zzakQxgl5dKW0gE9BhyDGA1ZcaozmkzoapnzJNFwQJKwWQLJomZcyU7zNO oTUHpwO+DqtPF9RPMbJ/w56DM0lQpq6Wq6tbeqfqLdgrz0kLKxoWP9eY1Z0KdFMUrDAlsyEC01P Y2wfdpZeFEVNO9Bixzy0BjyX3AZAjtSzpbiIahiCUEaA== X-Gm-Gg: ASbGncvc713244i9DGEH1P0SuQuyplIXoy+2n9pFNZ9sNEdmH3Ii4EIM0gLNqLDO2By 1Kh2G/hD7CjsN44fZzLhK2LHuuN6ppkRMgbCdGQZYPus7hb0teAa6DeulhXlniFokGgHsc2q3Bm lUPHnvkziPctF56fsyzKjOUo6UyPVzoCUg6nAlwkl/xWoo84nnWu4aAzHwINsFzORD4S8FNmGm7 lwBQHaaceac+tCLAcZ57l+wt4bBm2k3BDqAkIEprrbsnsBE+aozmdEYceF/7Uuk+836EDgHfAAD BB2l8I6oDAy1qvCWC8EAziryYMXR5paOcmvlcIbuoD8fJ0eQyOy5l1erfQvNJ72e1UWzEw0= X-Received: by 2002:a05:600c:468c:b0:43c:f616:f08 with SMTP id 5b1f17b1804b1-440a65dedaemr9657645e9.8.1745569043718; Fri, 25 Apr 2025 01:17:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEI2/wK7u3Fl0eXpHmAGhyuo+dEfVtSzaDltjMj3X9fGs+yaHAUGB9HAX3epv5bPb/ULJhkQA== X-Received: by 2002:a05:600c:468c:b0:43c:f616:f08 with SMTP id 5b1f17b1804b1-440a65dedaemr9657095e9.8.1745569043248; Fri, 25 Apr 2025 01:17:23 -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-4409d2e0241sm48926175e9.37.2025.04.25.01.17.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 25 Apr 2025 01:17:22 -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 02/11] mm: convert track_pfn_insert() to pfnmap_sanitize_pgprot() Date: Fri, 25 Apr 2025 10:17:06 +0200 Message-ID: <20250425081715.1341199-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ... by factoring it out from track_pfn_remap(). For PMDs/PUDs, actually check the full range, and trigger a fallback if we run into this "different memory types / cachemodes" scenario. Add some documentation. Will checking each page result in undesired overhead? We'll have to learn. Not checking each page looks wrong, though. Maybe we could optimize the lookup internally. Signed-off-by: David Hildenbrand --- arch/x86/mm/pat/memtype.c | 24 ++++++++---------------- include/linux/pgtable.h | 28 ++++++++++++++++++++-------- mm/huge_memory.c | 7 +++++-- mm/memory.c | 4 ++-- 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index edec5859651d6..193e33251b18f 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -1031,7 +1031,6 @@ int track_pfn_remap(struct vm_area_struct *vma, pgpro= t_t *prot, unsigned long pfn, unsigned long addr, unsigned long size) { resource_size_t paddr =3D (resource_size_t)pfn << PAGE_SHIFT; - enum page_cache_mode pcm; =20 /* reserve the whole chunk starting from paddr */ if (!vma || (addr =3D=3D vma->vm_start @@ -1044,13 +1043,17 @@ int track_pfn_remap(struct vm_area_struct *vma, pgp= rot_t *prot, return ret; } =20 + return pfnmap_sanitize_pgprot(pfn, size, prot); +} + +int pfnmap_sanitize_pgprot(unsigned long pfn, unsigned long size, pgprot_t= *prot) +{ + resource_size_t paddr =3D (resource_size_t)pfn << PAGE_SHIFT; + enum page_cache_mode pcm; + if (!pat_enabled()) return 0; =20 - /* - * For anything smaller than the vma size we set prot based on the - * lookup. - */ pcm =3D lookup_memtype(paddr); =20 /* Check memtype for the remaining pages */ @@ -1065,17 +1068,6 @@ int track_pfn_remap(struct vm_area_struct *vma, pgpr= ot_t *prot, return 0; } =20 -void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot, pfn_t pf= n) -{ - enum page_cache_mode pcm; - - if (!pat_enabled()) - return; - - pcm =3D lookup_memtype(pfn_t_to_phys(pfn)); - pgprot_set_cachemode(prot, pcm); -} - /* * untrack_pfn is called while unmapping a pfnmap for a region. * untrack can be called for a specific region indicated by pfn and size or diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index b50447ef1c921..91aadfe2515a5 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1500,13 +1500,10 @@ static inline int track_pfn_remap(struct vm_area_st= ruct *vma, pgprot_t *prot, return 0; } =20 -/* - * track_pfn_insert is called when a _new_ single pfn is established - * by vmf_insert_pfn(). - */ -static inline void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *= prot, - pfn_t pfn) +static inline int pfnmap_sanitize_pgprot(unsigned long pfn, unsigned long = size, + pgprot_t *prot) { + return 0; } =20 /* @@ -1556,8 +1553,23 @@ static inline void untrack_pfn_clear(struct vm_area_= struct *vma) extern int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, unsigned long pfn, unsigned long addr, unsigned long size); -extern void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot, - pfn_t pfn); + +/** + * pfnmap_sanitize_pgprot - sanitize the pgprot for a pfn range + * @pfn: the start of the pfn range + * @size: the size of the pfn range + * @prot: the pgprot to sanitize + * + * Sanitize the given pgprot for a pfn range, for example, adjusting the + * cachemode. + * + * This function cannot fail for a single page, but can fail for multiple + * pages. + * + * Returns 0 on success and -EINVAL on error. + */ +int pfnmap_sanitize_pgprot(unsigned long pfn, unsigned long size, + pgprot_t *prot); extern int track_pfn_copy(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, unsigned long *pfn); extern void untrack_pfn_copy(struct vm_area_struct *dst_vma, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index fdcf0a6049b9f..b8ae5e1493315 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1455,7 +1455,9 @@ vm_fault_t vmf_insert_pfn_pmd(struct vm_fault *vmf, p= fn_t pfn, bool write) return VM_FAULT_OOM; } =20 - track_pfn_insert(vma, &pgprot, pfn); + if (pfnmap_sanitize_pgprot(pfn_t_to_pfn(pfn), PAGE_SIZE, &pgprot)) + return VM_FAULT_FALLBACK; + ptl =3D pmd_lock(vma->vm_mm, vmf->pmd); error =3D insert_pfn_pmd(vma, addr, vmf->pmd, pfn, pgprot, write, pgtable); @@ -1577,7 +1579,8 @@ vm_fault_t vmf_insert_pfn_pud(struct vm_fault *vmf, p= fn_t pfn, bool write) if (addr < vma->vm_start || addr >=3D vma->vm_end) return VM_FAULT_SIGBUS; =20 - track_pfn_insert(vma, &pgprot, pfn); + if (pfnmap_sanitize_pgprot(pfn_t_to_pfn(pfn), PAGE_SIZE, &pgprot)) + return VM_FAULT_FALLBACK; =20 ptl =3D pud_lock(vma->vm_mm, vmf->pud); insert_pfn_pud(vma, addr, vmf->pud, pfn, write); diff --git a/mm/memory.c b/mm/memory.c index 424420349bd3c..c737a8625866a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2563,7 +2563,7 @@ vm_fault_t vmf_insert_pfn_prot(struct vm_area_struct = *vma, unsigned long addr, if (!pfn_modify_allowed(pfn, pgprot)) return VM_FAULT_SIGBUS; =20 - track_pfn_insert(vma, &pgprot, __pfn_to_pfn_t(pfn, PFN_DEV)); + pfnmap_sanitize_pgprot(pfn, PAGE_SIZE, &pgprot); =20 return insert_pfn(vma, addr, __pfn_to_pfn_t(pfn, PFN_DEV), pgprot, false); @@ -2626,7 +2626,7 @@ static vm_fault_t __vm_insert_mixed(struct vm_area_st= ruct *vma, if (addr < vma->vm_start || addr >=3D vma->vm_end) return VM_FAULT_SIGBUS; =20 - track_pfn_insert(vma, &pgprot, pfn); + pfnmap_sanitize_pgprot(pfn_t_to_pfn(pfn), PAGE_SIZE, &pgprot); =20 if (!pfn_modify_allowed(pfn_t_to_pfn(pfn), pgprot)) return VM_FAULT_SIGBUS; --=20 2.49.0