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 EA6F5C3ABCD for ; Mon, 12 May 2025 12:34:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9031110E3DC; Mon, 12 May 2025 12:34:39 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="BsnME54R"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8E0AD10E3DC for ; Mon, 12 May 2025 12:34:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747053276; 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=vjnnC5BACKQYADpf3O8+rlLTsN5UNkR42iRu+4jj/5k=; b=BsnME54Rv1eCXLocF4rh7IKowPBcB3g984+fexQfROoFEsj517eRFmiXfbfxqABAf8cp7w +Mqmfhev0RdbHdgZtrVWt+uVgURw4eaLI64pFzTkE8lwkpRACHNqKMDjaJUIYf2Rf7PRbK wHbAcILOrTcpYcQV7hnObkG9K2mzgnk= 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-639-bZfAerMPMOCSWVPdVkCKcA-1; Mon, 12 May 2025 08:34:35 -0400 X-MC-Unique: bZfAerMPMOCSWVPdVkCKcA-1 X-Mimecast-MFC-AGG-ID: bZfAerMPMOCSWVPdVkCKcA_1747053274 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43d209dc2d3so21225895e9.3 for ; Mon, 12 May 2025 05:34:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747053274; x=1747658074; 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=vjnnC5BACKQYADpf3O8+rlLTsN5UNkR42iRu+4jj/5k=; b=CoNqhK17kEvVis9TmMGgTXzZdU/nIWnmOV/cOvIu5HxkIZiZerHprak6Entqh6SJHO qfKj/eMsgtXYPHHmO1SCdakD00ISChpjk7KncXlT6AvqZttImwjDlRCPe3XUwTxJ4G18 Y2SREjgjh8MPYmwOiPleQPDTYDwzT2JvOodo/NVEYgmsv5/+/86Xzpv6Vau1oA3EAVOg 3UF87VV5Esqg7k4b57AyO2qV3u6uwff79HBChaF7ukhZsldDr4b+/E3k4FSVKU5ygVy5 3DVnykEDfMJCxt8LEmqq0i3RKfCxGvXnprOpFNiO2bgVBUlH2rokTHAC64qi1IdV8jx2 H3Mw== X-Forwarded-Encrypted: i=1; AJvYcCVmeglJ4DnZyQu13Drrlx3qa13mhOPAKWOHYluecVtdTz2fdoIVkBCRBxVgFZgb91fduRm96lt5aoQ=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxGpQFC5sKTJj1Mbc0QVvQiFrAMeLoahMsSrbosGYkmAIGYXj8r nMHxjf4zoj2HlXloPFetEnvdwoAVdjcbuvZvIH6V/RqpWZA1GIm7xRT/r/12sQWZVtJiXYM4rwN +mrmlOlz7u9uKBya/YWSccqp14k7N6taevNWO8Sj7a2jtU+JaT40D4eXGRbB7HQMGJg== X-Gm-Gg: ASbGncvVmEdcyn8c9+02jYuOm74D2Aresg+wckAkKC03KUFjWtXPi/YwPh1EayrAdsB +ly/UtXkWW3JkBlfK4JuuXby/dVMS7dymFB+nwL6KukzGTFfMGWr2QNBjBZL7oekQm2KfhIw/QB JJWQfBfCuW2uoxUjpKzwFo+A1sB62XGw7BMPhUfHR9zQmVpMIgSlh2OygR/3H/IfdJ8A0WnRJXT B2i2ibTBWuVdQ1aLs+pTp5WLUZijHdfOFoWoLSu/15WqAuq2kHyq3Jpffhae1KTewc3t03N+Hyi yqNU2nIMfk1QFte7TT8rLe2x7cov7/FB4HyYSpZWHXWe1yIykxA3GGAwpw/pV9c6surtBs2v X-Received: by 2002:a05:600c:5118:b0:43d:cc9:b09d with SMTP id 5b1f17b1804b1-442d6dc539cmr82258345e9.20.1747053274301; Mon, 12 May 2025 05:34:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLHMAxfNnCQj32PB2xBlHRpvgTd61IhRYv44GdPG9fUkbIQCt1pbTkP7UkTO09z7pcUrC5ng== X-Received: by 2002:a05:600c:5118:b0:43d:cc9:b09d with SMTP id 5b1f17b1804b1-442d6dc539cmr82258205e9.20.1747053273921; Mon, 12 May 2025 05:34:33 -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-442d67df5ecsm123693385e9.9.2025.05.12.05.34.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 May 2025 05:34:33 -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 03/11] mm: introduce pfnmap_track() and pfnmap_untrack() and use them for memremap Date: Mon, 12 May 2025 14:34:16 +0200 Message-ID: <20250512123424.637989-4-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: JeGxiT4lzu-p51HOCT2oIOvKoIVJEnfkcnqoZ7uflAY_1747053274 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" Let's provide variants of track_pfn_remap() and untrack_pfn() that won't mess with VMAs, and replace the usage in mm/memremap.c. Add some documentation. Reviewed-by: Lorenzo Stoakes Acked-by: Ingo Molnar # x86 bits Signed-off-by: David Hildenbrand --- arch/x86/mm/pat/memtype.c | 14 ++++++++++++++ include/linux/pgtable.h | 39 +++++++++++++++++++++++++++++++++++++++ mm/memremap.c | 8 ++++---- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index fa78facc6f633..1ec8af6cad6bf 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -1068,6 +1068,20 @@ int pfnmap_setup_cachemode(unsigned long pfn, unsigned long size, pgprot_t *prot return 0; } +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); +} + +void pfnmap_untrack(unsigned long pfn, unsigned long size) +{ + const resource_size_t paddr = (resource_size_t)pfn << PAGE_SHIFT; + + free_pfn_range(paddr, size); +} + /* * 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 be1745839871c..90f72cd358390 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1502,6 +1502,16 @@ static inline int pfnmap_setup_cachemode(unsigned long pfn, unsigned long size, return 0; } +static inline int pfnmap_track(unsigned long pfn, unsigned long size, + pgprot_t *prot) +{ + return 0; +} + +static inline void pfnmap_untrack(unsigned long pfn, unsigned long size) +{ +} + /* * track_pfn_copy is called when a VM_PFNMAP VMA is about to get the page * tables copied during copy_page_range(). Will store the pfn to be @@ -1575,6 +1585,35 @@ extern int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, */ int pfnmap_setup_cachemode(unsigned long pfn, unsigned long size, pgprot_t *prot); + +/** + * pfnmap_track - track a pfn range + * @pfn: the start of the pfn range + * @size: the size of the pfn range in bytes + * @prot: the pgprot to track + * + * Requested the pfn range to be 'tracked' by a hardware implementation and + * setup the cachemode in @prot similar to pfnmap_setup_cachemode(). + * + * This allows for fine-grained control of memory cache behaviour at page + * level granularity. Tracking memory this way is persisted across VMA splits + * (VMA merging does not apply for VM_PFNMAP). + * + * Currently, there is only one implementation for this - x86 Page Attribute + * Table (PAT). See Documentation/arch/x86/pat.rst for more details. + * + * Returns 0 on success and -EINVAL on error. + */ +int pfnmap_track(unsigned long pfn, unsigned long size, pgprot_t *prot); + +/** + * pfnmap_untrack - untrack a pfn range + * @pfn: the start of the pfn range + * @size: the size of the pfn range in bytes + * + * Untrack a pfn range previously tracked through pfnmap_track(). + */ +void pfnmap_untrack(unsigned long pfn, unsigned long size); 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/memremap.c b/mm/memremap.c index 2aebc1b192da9..c417c843e9b1f 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -130,7 +130,7 @@ static void pageunmap_range(struct dev_pagemap *pgmap, int range_id) } mem_hotplug_done(); - untrack_pfn(NULL, PHYS_PFN(range->start), range_len(range), true); + pfnmap_untrack(PHYS_PFN(range->start), range_len(range)); pgmap_array_delete(range); } @@ -211,8 +211,8 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params, if (nid < 0) nid = numa_mem_id(); - error = track_pfn_remap(NULL, ¶ms->pgprot, PHYS_PFN(range->start), 0, - range_len(range)); + error = pfnmap_track(PHYS_PFN(range->start), range_len(range), + ¶ms->pgprot); if (error) goto err_pfn_remap; @@ -277,7 +277,7 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params, if (!is_private) kasan_remove_zero_shadow(__va(range->start), range_len(range)); err_kasan: - untrack_pfn(NULL, PHYS_PFN(range->start), range_len(range), true); + pfnmap_untrack(PHYS_PFN(range->start), range_len(range)); err_pfn_remap: pgmap_array_delete(range); return error; -- 2.49.0