From mboxrd@z Thu Jan 1 00:00:00 1970 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 AF09E293B72 for ; Mon, 12 May 2025 12:34:37 +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=1747053279; cv=none; b=mEQozSVuEMdbI8eusazug1KFRajQpzC7SwDAcgKmM7Hf94XRRrmoOi5vm8KBZvdSsG/V5WA+2zxmyKyHZewRHA0rcz44QqFxXjSmbtO1/b+OKLR40ymoGJPhMQw+2haOvj3C0Nav+iALUAmNv+YknCocy98oD8mYMwvQ44D6kFg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747053279; c=relaxed/simple; bh=7m+BzEd74yqLbmLjeWAIwrgcejBZOMr6mqnEZdo2IKg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=DIm3GaN6RMr6hROa9bRbk6OFKI0XomGJFIZ4GgUQEaotlo956svWjXVUj6RNk1R4/hMV8bq/+Ce4f0N6aI6gKbAf/3xsW4F5dAJPT5fZj9qB3ONy+bTmC/e3skYGPxM21BNbgZJIlxjwjmO0MMeS+HY+tRp998b2ISBMUYt30LQ= 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=BsnME54R; 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="BsnME54R" 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-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-216-a03TSD5_NSKQWfuAVYRJkA-1; Mon, 12 May 2025 08:34:35 -0400 X-MC-Unique: a03TSD5_NSKQWfuAVYRJkA-1 X-Mimecast-MFC-AGG-ID: a03TSD5_NSKQWfuAVYRJkA_1747053274 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-43d209dc2d3so21225845e9.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=ADA6xrEKLPmN8OMFIiw2U0IbuxGt6UxCVyejq/M63IB/sOCGA3PjO5SCOohP7oIfpu J/J70pnGCr55fPv1o8xgTFR8904x/CQL23vWwBF5XDK9YpUgwfKL0bIZIPmTIfqw9/mF RVm6Yd1+Pn0cTlw3ELHB9gk32+XnrMoez6T4tnFTuRHXibVStpsz8DvZGyIhdNmu44Kh KYtPJnxl/DSiGY1Iz4bZCDniMIJ/R/lu5UZlxOPqc2agFhDOPCwh7mkXVNpEVp5couRU jni5XNJMVk3yBtfLEIjGEZcXit+y4F21rkO6Xtcv2SUXGflCjdiSXWk1iLuHyWXfGUy7 /zKw== X-Forwarded-Encrypted: i=1; AJvYcCVdmRXJOngSjmxj+8TIKowCuCF+1RTQcEd57RkYqbGTKOlUhQGejZMcUJL8QToSQDMkREzW5v2rviAjdp+c4RcwITs=@vger.kernel.org X-Gm-Message-State: AOJu0YzZT705KIyQj+mfXlJ/BDtiyKj5riq6NDy4TtAPXg/Sr31Gt5kJ xAB/047hs708aRU1lS/aljmFAE4YkP/OlKuNqCjNEWPZskYhQ/bfpMhSxtr/KAQkePtN0nJC0Qn phS3PyK9bMQLHnyak28u3jQ85mXtL0c5a2qBdsp3PSlMAk+jUNchFg5h7HhxrAWGSvqA/hQ== X-Gm-Gg: ASbGncv8vMjiHqPUHPwxS2TITTQuOqO+VaTi8awEcmAbglgCy8sFPLMlq6TWSjjtRdQ 9BP1aioXJ9LulDvVsZGZrfjjoyBFgGZFP4v6c4/yWbk3XoDcsQmILQoxdB6KtshZ7j+kCVnPopA 5moRJsy5cN+dDc6x4/ZBlR9FJyxsf2xQF6GJG5d+wxeZhtIvsYXdOZ0AHtME/7w2Mh/wW9I6g4B sEX2Zdzuu/fLSp49NDq7ryE9T4dC6bzBm+W4RjbXFi+m4LFOunN8wQ0JCfLBxWXVNpEQlx8UoBD ho9MyxMAEvMUKJqDXRVXJOUYn+z/cNGhNcD+CTpPp6aPcUVNky4khfMykKoFCFCpHz1EOWoz X-Received: by 2002:a05:600c:5118:b0:43d:cc9:b09d with SMTP id 5b1f17b1804b1-442d6dc539cmr82258575e9.20.1747053274329; 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> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: nEnbkWzJ_M_C9LhRrUQyKnjzuzgimR4FoRU_rpUMPws_1747053274 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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