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 EC46E313E38 for ; Tue, 14 Apr 2026 04:13:10 +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=1776139992; cv=none; b=uLR5BkOcEMZg9+I4/lOaN4kOPOj7zJ55GUCjKlBRKc5NkffZiWTwDw5qvmzH/b9jGcVRc0AnlV4V/c3ZHw6EHo61vu8XozLXNB+JUf0+Q2LVMw1dbX/CABB/t1SEjTLpOLyxlSJrQ8i6NYt2Rfz6salM4hjzJDGpW6RM+pomd4Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776139992; c=relaxed/simple; bh=buU39e/KveNeQaoI7ya4ZRHfzZXSsbZIl5SzIJoyvQY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=utXmCK3pKOhvy8Wlpu1Ahoc4+zXRSHKi6U8dRxqfjAN11IX+mOzdp8fTS/+5Ifm30WGjsB+R/MJLlQYgYPm+RkgdghIw8aQjjecGQL3p6vo0yhkIntjoHCrCD9w0ViaZEj+wxQ+O7VmhBVOfjAArFc9v5PYsJs/xSsXUz4BdqGw= 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=Jef6imkp; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=WPz4YQ4n; 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="Jef6imkp"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="WPz4YQ4n" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776139990; 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=CqAgQ7voDB4XQLOQB9ROSGvc4WcHbi476o0Iju78Gg0=; b=Jef6imkpZsb9je8ffLYA2Qqz19Dgu136OKp3VrNKuhMvl40fNKGFWAFbbBJhpJAoFrSicH iqJgWz8xGvshz4UakDsVG88zd6g4dP8y1ZAguNvYnMz/L1UurKxwuTcMPBUiXDeRA4bK9f yRIJ/jYDEFIfteiM6FpR6JtQtx0nUD8= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-90-wjh4ScL_PaywMad0Js6Tog-1; Tue, 14 Apr 2026 00:13:06 -0400 X-MC-Unique: wjh4ScL_PaywMad0Js6Tog-1 X-Mimecast-MFC-AGG-ID: wjh4ScL_PaywMad0Js6Tog_1776139985 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-59e11fb980fso3468834e87.2 for ; Mon, 13 Apr 2026 21:13:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1776139985; x=1776744785; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CqAgQ7voDB4XQLOQB9ROSGvc4WcHbi476o0Iju78Gg0=; b=WPz4YQ4nLPW9IOpFEjzyNCRmgtoApwr1RSRpZAKP04v5PEoxpRVJaMEiS5gos+dO7U 4z1b0nQtZ2lrTKnw8bNgo2Z3HLL6rJSgsfjjUgvAYrg1T294FTdU4uM9yWvJihQ/J46S QXvM8vnWXDVnjoUYDwQT9cRW6N05jCJZq1xGVSAs3OWRkyzYceXsDuaNjpH5JXFki2Zq 4FvVI4d7rluPXIHfRqtdLmKm74I3CsS96Kcs0XDBwDwD4KIE2SViDIDtMKFMpgRk2l62 dNgAahKU3rPgH9sQRCVllC9reVxK+Du2ensw5KmhYTJWK2jQCa7LXDjggIN4AJxrLS0L uRaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776139985; x=1776744785; h=content-transfer-encoding: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; bh=CqAgQ7voDB4XQLOQB9ROSGvc4WcHbi476o0Iju78Gg0=; b=F/ZvsLuRx9PEjioTpoQ4e8aKMdb6c4BsMcJ0qFyW+ovz6ooGB8iGATLitPsKPRzikJ txszBhcOy+4bKODWps4blw+dcFuEO4hhuIPPl6hfNO8OJ75p9tmGn0iJ4SnAOx8d9UEv aAmcb0Xi8qaNRxV6Km1f6xZJOWuOKD5PezTZFIPFfY4y/FLRqQLyiPDbdU8Z70LZKMBu 4z3SKwIxS5NDaQVUH1ZuEXp2WyLiHlBbeav74hkRE965648sdJTZNurpMqZ/pG7/h/bE eqOYj5YeGzsE+5V1YMMf8Hjpdy05dTXaeUh138RMWCCy+DJ3HMdVDvjEaVmb+fKcCLO1 rxtA== X-Gm-Message-State: AOJu0Yw6gfo2HNeR9gTLm0BO5Uh2D8/U2QZdd/MPyEIoJC/0swTj9nH+ Cd6RRMp1LhyEJtG2F72CcMHA0YIZC5zsR5ueb84DnW7nkohAxtvyanMywhZ36xibedKMAjnFpiW fNaljZoL3DMw3c3LzYlJ91JoB2HIMEMEECgixH+zG1KWUDXJXQK759mKq6LrCLCqk X-Gm-Gg: AeBDieuzxy2neQdj0ohiEsX7xl6ZWnw1JRQn+3G1q9/L2/NFZoSKAdN2Z4gqTE9sXXf vg1plurGfqm5SHHQM5kVTNGoKUJ+w7IQlr6YTSaqLNDGZvvbOtl6SPR4yAWpuy8Vke05Bu/Yg+t gn6Gsz2vlsdhmrJpRvwBiCBYlKYRvcV0ADmvDe7ue8xFhN3uThvCETszlN8etqliyE/WicvJF+M fKT64szch9rHDacHsUNj2qGs0/A/Hk1L/o9KUAtewrtmdV/aWCdxsw8ticE6I271chsShnLlfBT man6PB8QnaEb7cwUhaOfOnN6eOKPK76lnXLYkPtRMk7hfqvOl6uGcWDBllZ1vFor8t+aGWVGxic 6HI5RoKhIWo6uVjL/pwlcJ9IObEs/SbehnULJ X-Received: by 2002:a05:6512:3094:b0:5a4:d8:ce6e with SMTP id 2adb3069b0e04-5a400d8cef0mr1739030e87.41.1776139984813; Mon, 13 Apr 2026 21:13:04 -0700 (PDT) X-Received: by 2002:a05:6512:3094:b0:5a4:d8:ce6e with SMTP id 2adb3069b0e04-5a400d8cef0mr1739017e87.41.1776139984213; Mon, 13 Apr 2026 21:13:04 -0700 (PDT) Received: from fedora (85-23-51-1.bb.dnainternet.fi. [85.23.51.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a3eee865e7sm3040666e87.10.2026.04.13.21.13.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 21:13:03 -0700 (PDT) From: mpenttil@redhat.com To: linux-mm@kvack.org Cc: 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 v8 2/5] mm: Add helper to convert HMM pfn to migrate pfn Date: Tue, 14 Apr 2026 07:12:23 +0300 Message-ID: <20260414041226.1539439-3-mpenttil@redhat.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20260414041226.1539439-1-mpenttil@redhat.com> References: <20260414041226.1539439-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 8079676c8f1f..6c50cf2d80ca 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -1489,3 +1489,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))) + | MIGRATE_PFN_MIGRATE; + else + 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.50.0