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 EE33233A02B for ; Tue, 4 Aug 2026 04:27:02 +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=1785817624; cv=none; b=SeIrGm7T8wy5HQY8SzBCBq/SUPgPKfkTz9o3YehVO161J2VCGF5DsLfZx5c3QGTXWyMLMLPXN+dpfMO30NiGictdOA5wYOz1Pgz8qTuo/Kuspmnxbo8LFJzqI1XPaFXim64O//ZVl1/MA9eiM1MTmhvkfzOrKFK8vdAWYs0SEWA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785817624; c=relaxed/simple; bh=mu6vL51u5TRVdfK0l7AImxgf3JCs8ho3Pl4NoaJ4PNs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=l80HP+sPzg60ibWPWirHOZqviibFQALh4HhmtV67h7hEJbYgx2HKSlqHHDhaEHH79/hMZkzIz4AL5tcX3PtdilC5O78xtkHBkY2JdCDQNzrNz7zfY6licGMe1WOtdlkEboWZ8oYzX5d06gVmWU9WMkXjfp+HJny0nTQdhcIziLE= 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=cgANNcrJ; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=Qq/jACnk; 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="cgANNcrJ"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="Qq/jACnk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785817621; 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=ihGGkS1db6JGdRXvy1Z/cqvAlkfUAiXTBTA07KJEz14=; b=cgANNcrJwSKW0d5pENmqC5EXj22CGP04NXzbYcTp9T45OVAV+GBdArZfdTTAKcYp9gKA7K TGq7BNHf1ewBsE3pxpX7KDVa9H0KIV3S3nOn0QKl0jh81Cdn9xFNxbw4339WaMlPx64Mv4 2pnJaxJHzT7lJc7uepFlghewb+0VzY8= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-344-RB4VGqCQPBWFL8K8GzoQvg-1; Tue, 04 Aug 2026 00:26:59 -0400 X-MC-Unique: RB4VGqCQPBWFL8K8GzoQvg-1 X-Mimecast-MFC-AGG-ID: RB4VGqCQPBWFL8K8GzoQvg_1785817618 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-5b109e0a1d8so1963695e87.3 for ; Mon, 03 Aug 2026 21:26:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1785817618; x=1786422418; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=ihGGkS1db6JGdRXvy1Z/cqvAlkfUAiXTBTA07KJEz14=; b=Qq/jACnk1y9lnPXlIHR0w80dycfphVcYqw6NC9oT2kZmH1j3zvZAZxIyDs/H2HxbyJ OphsrK9kF4MZ0oADUq0RLxDr/TnX56eeu+VovZTc3iJZdJMkICuXSXW1ZGQmo01i6FCE PVx9YolZ2C8HW/QPUQKH+yBNn2XwZVknVZscLc2GZ8TD6EPaQzzUXLOXTOwRMJ3OGm9i Pof270stmukLOxH5KUTK6JrtdQDoXrMOI1rtE2MRVAWaERuV0ZK9Cejlc0M/GjXCQMOU l+PKuSpwkTMrbpPOj5vioj4aRHACvOK1Meg4Mct1jhnzlAqxjILghkbmI+2Q+VP+KusC nM7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785817618; x=1786422418; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ihGGkS1db6JGdRXvy1Z/cqvAlkfUAiXTBTA07KJEz14=; b=nN1hGvtzx5IdLgb9ZJsC9MM00Mu8iOTiSeEOssmcXOVqUn6Ra0SsFcKsE0K4EK9HJx 6N8qr/zFc6txkbygUbequiEvgvFsNR85rxB62/6DBSkXQzxogPAXLjQ5fvnb25dly/MG lSBP8O7Nw3Vw2aeDyKHTjkdmXgSUL2cdc8pMvaQDvyGjA1VLOsjbxtd7RiWppT/jBHG+ 1Ej143jmZkvm9iHHVxTexQD3l0rf35bDmiLTaW0RL3MyFuIFSshPatejx6AxTmy0l6sz lMq6EWLQZL8U1Pah+tAI/cmiw5qUMnjRDAa4SAe/+GVpAveeE1FeSzNdeX19mlXW6wLQ 8dEw== X-Forwarded-Encrypted: i=1; AHgh+RqpApLu9X77IOt3OAZYjY3qTZQWds85oFHUv9WQIWXgOtE1VAHfmgtbvK6R0r57Mie+tTWOh0brfVOuqrs=@vger.kernel.org X-Gm-Message-State: AOJu0YwZgIT2Hn91vpd4qytJyZ0Tnkx6I0BPBReoe+w6dCUQ8NcpOjTi 0DFAzzRj7xBXCo3HfIhUh+93Xfq5f4rkGCQHZUvzpNiVBmSPmcbb34pu7ofQmePcGWh1yDGZZX0 ND6+5KQ4SQ0wZoz2nz8jYWIVYI+6eSrZH3B5h3w/ZcUXN+hzSRSIzUUn940i9jyqv X-Gm-Gg: AR+sD101096+8kY9IUjA4DL4Agxk8k0HI0R6py5hWb7KKk+k10f2krbWzWtB3da4feh jg9dHP1zZsPb2TZOdTydNwcC10LjPRlG8E789EVLmfW6FqoEgnPoVEZu0KB4iPZvUApilklaRVC yfTLTMpwMURpojtcGKvZdYd+BRP7SlENSSUsO5sFVcIJNlRUXAGGSrBo9ff1/G5OqTc7UdqA4Ur d9jbd/9S/PD0VQ4DJA2rKkZ8WzbUZ4Aw9yql37ezp47gsmQvKpQCAC0QKVvtxxcZK92D/e4FIDp /l21jx7K8XiAI7Ukjv/XIKnr3kzSYQ94CZvwm9mHHK8rUatXC0ML7LoBfTdRd4+aJaGyYTPthf2 GnNtGA0xqQvCYF0DT X-Received: by 2002:a05:6512:39c3:b0:5ae:bd5e:95f7 with SMTP id 2adb3069b0e04-5b2e4f1aed0mr2402078e87.4.1785817618212; Mon, 03 Aug 2026 21:26:58 -0700 (PDT) X-Received: by 2002:a05:6512:39c3:b0:5ae:bd5e:95f7 with SMTP id 2adb3069b0e04-5b2e4f1aed0mr2402060e87.4.1785817617697; Mon, 03 Aug 2026 21:26:57 -0700 (PDT) Received: from fedora (85-23-51-1.bb.dnainternet.fi. [85.23.51.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b2e23c46c4sm2311351e87.17.2026.08.03.21.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2026 21:26:51 -0700 (PDT) From: mpenttil@redhat.com To: linux-mm@kvack.org Cc: dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Mika=20Penttil=C3=A4?= , David Hildenbrand , Jason Gunthorpe , Leon Romanovsky , Alistair Popple , Balbir Singh , Zi Yan , Matthew Brost , Andrew Morton , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko Subject: [PATCH v13 02/11] mm: add helper to convert HMM pfn to migrate pfn Date: Tue, 4 Aug 2026 07:26:22 +0300 Message-ID: <20260804042631.2175585-3-mpenttil@redhat.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260804042631.2175585-1-mpenttil@redhat.com> References: <20260804042631.2175585-1-mpenttil@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Mika Penttilä The unified HMM/migrate_device pagewalk does the "collecting" on the HMM side, so we need a helper to transfer pfns to the migrate_vma world. Cc: David Hildenbrand Cc: Jason Gunthorpe Cc: Leon Romanovsky Cc: Alistair Popple Cc: Balbir Singh Cc: Zi Yan Cc: Matthew Brost Suggested-by: Alistair Popple Signed-off-by: Mika Penttilä --- include/linux/hmm.h | 19 +++++++++++++- include/linux/migrate.h | 3 ++- mm/migrate_device.c | 55 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 2 deletions(-) diff --git a/include/linux/hmm.h b/include/linux/hmm.h index db75ffc949a7..bfedafc1c143 100644 --- a/include/linux/hmm.h +++ b/include/linux/hmm.h @@ -13,6 +13,8 @@ struct mmu_interval_notifier; +struct migrate_vma; + /* * On output: * 0 - The page is faultable and a future call with @@ -27,6 +29,13 @@ struct mmu_interval_notifier; * HMM_PFN_P2PDMA_BUS - Bus mapped P2P transfer * HMM_PFN_DMA_MAPPED - Flag preserved on input-to-output transformation * to mark that page is already DMA mapped + * HMM_PFN_MIGRATE - The entry is to be migrated. Note, HMM_PFN_MIGRATE + * alone without HMM_PFN_VALID denotes the + * empty page. + * This flag together with HMM_PFN_COMPOUND are + * indicators for migrate_hmm_range_setup() to + * setup the migrate pfns. + * HMM_PFN_COMPOUND - The entry is represents a > 0 order page * * On input: * 0 - Return the current state of the page, do not fault it. @@ -34,6 +43,8 @@ struct mmu_interval_notifier; * will fail * HMM_PFN_REQ_WRITE - The output must have HMM_PFN_WRITE or hmm_range_fault() * will fail. Must be combined with HMM_PFN_REQ_FAULT. + * HMM_PFN_REQ_MIGRATE - For default_flags, request to migrate, according to + * hmm_range.migrate.flags */ enum hmm_pfn_flags { /* Output fields and flags */ @@ -48,11 +59,15 @@ enum hmm_pfn_flags { HMM_PFN_P2PDMA = 1UL << (BITS_PER_LONG - 5), HMM_PFN_P2PDMA_BUS = 1UL << (BITS_PER_LONG - 6), - HMM_PFN_ORDER_SHIFT = (BITS_PER_LONG - 11), + /* Migrate request */ + HMM_PFN_MIGRATE = 1UL << (BITS_PER_LONG - 7), + HMM_PFN_COMPOUND = 1UL << (BITS_PER_LONG - 8), + HMM_PFN_ORDER_SHIFT = (BITS_PER_LONG - 13), /* Input flags */ HMM_PFN_REQ_FAULT = HMM_PFN_VALID, HMM_PFN_REQ_WRITE = HMM_PFN_WRITE, + HMM_PFN_REQ_MIGRATE = HMM_PFN_MIGRATE, HMM_PFN_FLAGS = ~((1UL << HMM_PFN_ORDER_SHIFT) - 1), }; @@ -107,6 +122,7 @@ static inline unsigned int hmm_pfn_to_map_order(unsigned long hmm_pfn) * @default_flags: default flags for the range (write, read, ... see hmm doc) * @pfn_flags_mask: allows to mask pfn flags so that only default_flags matter * @dev_private_owner: owner of device private pages + * @migrate: structure for migrating a range of a VMA */ struct hmm_range { struct mmu_interval_notifier *notifier; @@ -117,6 +133,7 @@ struct hmm_range { unsigned long default_flags; unsigned long pfn_flags_mask; void *dev_private_owner; + struct migrate_vma *migrate; }; /* diff --git a/include/linux/migrate.h b/include/linux/migrate.h index d5af2b7f577b..425ab5242da0 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -3,6 +3,7 @@ #define _LINUX_MIGRATE_H #include +#include #include #include #include @@ -200,7 +201,7 @@ void migrate_device_pages(unsigned long *src_pfns, unsigned long *dst_pfns, unsigned long npages); void migrate_device_finalize(unsigned long *src_pfns, unsigned long *dst_pfns, unsigned long npages); - +void migrate_hmm_range_setup(struct hmm_range *range); #endif /* CONFIG_MIGRATION */ #endif /* _LINUX_MIGRATE_H */ diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 908d2d4ec43a..a6df6566f89e 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -1487,3 +1487,58 @@ int migrate_device_coherent_folio(struct folio *folio) return 0; return -EBUSY; } + +/** + * migrate_hmm_range_setup() - prepare to migrate a range of memory + * @range: contains pointer to struct migrate_vma to be set up. + * + * When collecting has been done with hmm_range_fault(), this + * should be called next, and completes range->migrate by + * populating migrate->src[] and migrate->dst[] + * using range->hmm_pfns[]. + * Also, migrate->cpages and migrate->npages get initialized. + * After migrate_hmm_range_setup(), range->migrate is good + * for the rest of the migrate_vma_* flow. + */ +void migrate_hmm_range_setup(struct hmm_range *range) +{ + struct migrate_vma *migrate = range->migrate; + + if (!migrate) + return; + + migrate->npages = (migrate->end - migrate->start) >> PAGE_SHIFT; + migrate->cpages = 0; + + for (unsigned long i = 0; i < migrate->npages; i++) { + unsigned long pfn = range->hmm_pfns[i]; + + /* + * We are only interested in entries to be + * migrated. + */ + if (!(pfn & HMM_PFN_MIGRATE)) { + migrate->src[i] = 0; + migrate->dst[i] = 0; + continue; + } + + migrate->cpages++; + + /* HMM_PFN_MIGRATE without HMM_PFN_VALID denotes the special zero page */ + if (pfn & HMM_PFN_VALID) + migrate->src[i] = migrate_pfn(page_to_pfn(hmm_pfn_to_page(pfn))); + else + migrate->src[i] = 0; + + migrate->src[i] |= MIGRATE_PFN_MIGRATE; + migrate->src[i] |= (pfn & HMM_PFN_WRITE) ? MIGRATE_PFN_WRITE : 0; + migrate->src[i] |= (pfn & HMM_PFN_COMPOUND) ? MIGRATE_PFN_COMPOUND : 0; + migrate->dst[i] = 0; + } + + if (migrate->cpages) + migrate_vma_unmap(migrate); + +} +EXPORT_SYMBOL(migrate_hmm_range_setup); -- 2.55.0