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 92B892DAFCB for ; Mon, 25 May 2026 05:08:57 +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=1779685739; cv=none; b=lHysdJeBjB/1xJbb95ogayh+ly/ULfBkR+pYtNJbKcy9fCYLd5X6APqRq/Aw/+nuYFeOv9VxPu0LVn0kAF1NbnhG7MX0z998VpaxCOH/MpzLCON1tyvJL1L6TklZKFmo21C9ntaNiAVMUlLl67VO9zgyTtS5eYlk2mxXxRsuYBw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779685739; c=relaxed/simple; bh=ZcfqQ43NQg5Zi9mCcIRS72eLvUY3tzrZ6rrhc/E/AA4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uHvoREiPJ/QGd8QwkLBLxj55DXgtE3DZHu1DBa6SUM3HE+nFPhsvadCFa+Fx+bF7MGDvoezB/yiMCpBs2gZI4hlWvGz5UJ7BgLZflslEpGQnGe+Xd5XwvlLhK3hjjva3Yy/EUwQOwXdShDXt11QIKcTafDI/nAolROa6ncCJ0Ns= 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=cLwdiNo7; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=DHn2ItxQ; 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="cLwdiNo7"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="DHn2ItxQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779685736; 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=xqQpQ/GF7r/UpbjClH/YEY/g/tI3n+T6qxGAQdsX9zg=; b=cLwdiNo7GN3HLDt2er1JJKyKnK84CYetercTcoNyVrxsaniWQtxLUZ7m7y88pLQuCOqllD yulwbJahbEUmWrW5fRt2MqejWaZMCmxKZgqtpIWRxH18+Aura2m8VPCrlHftU0DsHcjWbt EsfSQe1hvbnrc9OdhknFFttY2IhZ85A= 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-470-fMK02nZiMbmeWQIlec7B1Q-1; Mon, 25 May 2026 01:08:54 -0400 X-MC-Unique: fMK02nZiMbmeWQIlec7B1Q-1 X-Mimecast-MFC-AGG-ID: fMK02nZiMbmeWQIlec7B1Q_1779685733 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-5a880c25d05so5525076e87.0 for ; Sun, 24 May 2026 22:08:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779685733; x=1780290533; 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=xqQpQ/GF7r/UpbjClH/YEY/g/tI3n+T6qxGAQdsX9zg=; b=DHn2ItxQ7K9cheaLvYfWCN2FNzAwYOPX0yXDcWqqvL1k5rhXvHlDZlnJEuk14ge5JV sb/pgzyxP70sD+98oMf8OCkSBP0fAS8gnVfworoXid0FSA981a9XrC+VyXMQ88CHgx+n VcdNxXG+Ye3nVRlQlhHaP+HOk0a+ddAAgBEawRzysyvVe3YdllT8sc0CxEllYhlLTvx/ d+diNsoZgPlnmb8sCoDB3PByaZBgyaVGuXGqXtTHReh4zyUXGB4rFPCEkHIcFaUkr6CR h9NI0B2hwS3AbaI9EYiOIN7vVv0GbSk3u32VvtmEkQMGmrxZyJcoJWIZf3PYQUDrFlA7 QpLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779685733; x=1780290533; 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=xqQpQ/GF7r/UpbjClH/YEY/g/tI3n+T6qxGAQdsX9zg=; b=P+/u6hV/2MywIBgGyoy7TxGpF4hrTxoKuuMhEOUAUOKdLJT1IrTzGrQuVN8x32mn20 mbu1aOtG2KZOyCqaYZ63xV3vW/hdrkQHP1ws+ICjQ+Jl4UkENda3HveA5w0GBqDw128T 36pzlaOSIcmkdCL7TZtzpJnTGUl1Su0VgCrniUDDjgJRUtCtA4WS74y9wdVrdZDFR9q8 MeDiOrkqu2Bwv83/lNbtITfJNvCFPj/SEM2U9krclpAMm+7TH/GB+frFO/q6EuPPuc/a HwRUvff1MBf8bI56Sp8QvNv4gm2fOcgkTYAbgDdqREDL194UC/jOIy8hnL6oSq3qhCp+ fBzA== X-Forwarded-Encrypted: i=1; AFNElJ/xHuO+IVhiw4unkIL14QqT2KUcbh8F8zSKG0NMTLSbnQwSknhyUSQpCvmlvOpgcYAtn3qmv2pMRrDoKvA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyi07iHfYiI9nVyIwVl2VUfUpGIPQ5y8Vw9AQoib8EVKIHF3o3i 6GPmsnPP1Mz8kIdVR0mP/X24NZ0aqxT/tc6jJsaxA4iUssdQB8DWdUlDmQa2SP/DMXTsG4RTWhd QkzDWAGh0041u6wFFyG5QSGOaLdHf2Gac7JKZCx/dBEJJ20FQX9JIrjJEUkOWgIzc X-Gm-Gg: Acq92OGdYyOxo5WMvh8geWJzeTbmm9stuLK7HKIxlSIU7S5EO2AyWY0U2SOXGEqEA9T YZIDve50tXkdZY5ZShxj/d94M98S0s6sGUQxP7wyVG6fsjbSK97rRzcG1Ln7M85Kto2/b/vIXHD gitMBsANIc6AguspdduUmwj/kzs1vAQ0FGyz6lEu3YJLBO2c6qPzuz1kic5C9yca1SrKVHwHdvE wsCID4AHtGWva9a7Z00aplC+fAkICxAua++laoCKVuMSXWqEj3sSv4uRyW1/nJ/rhN2EiTaxmyR w69QiDtCKI55811jLdH4dpf+GajcHR2rfsO3bVOxjYhnGpp7SDGf6IUguCyR25Pf1jBo44vuO/B hS6oSyZbNyZRc2aV7nDIWroVREQvoEIwX3pz3 X-Received: by 2002:a05:6512:3409:b0:5a8:881c:9cec with SMTP id 2adb3069b0e04-5aa323a49c5mr2990038e87.1.1779685732736; Sun, 24 May 2026 22:08:52 -0700 (PDT) X-Received: by 2002:a05:6512:3409:b0:5a8:881c:9cec with SMTP id 2adb3069b0e04-5aa323a49c5mr2990014e87.1.1779685732203; Sun, 24 May 2026 22:08:52 -0700 (PDT) Received: from fedora (85-23-51-1.bb.dnainternet.fi. [85.23.51.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-395dca7bcddsm20698161fa.16.2026.05.24.22.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 May 2026 22:08: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 v11 2/5] mm: Add helper to convert HMM pfn to migrate pfn Date: Mon, 25 May 2026 08:08:27 +0300 Message-ID: <20260525050830.100254-3-mpenttil@redhat.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20260525050830.100254-1-mpenttil@redhat.com> References: <20260525050830.100254-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 ab49d4dcdb60..deb6c944cf15 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.50.0