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.129.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 8BDBC3382CD for ; Tue, 4 Aug 2026 04:27:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785817630; cv=none; b=lsL6wdi1QmbgWDgtalV8FOLJADoE4K0CaN2DgZc33d0WxgaVnVMS9CR0SzpGBMbC91NGLmEO+qvzwGCd+c4W2rCqvJrtxDMduRIU+OFPj2Gek3l4sVJSXrCIRGn9r301i87d1VT+GOOZOGLx3YYBv/aMhsxVC5QU5GCwfNlpNv0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785817630; c=relaxed/simple; bh=N+QiSPZQloKU/Gz/pXSk4NHFZ99qjsUrFcKHHiI8jR8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=c9xdiwC8g9VVbr54mgOYr42ACO3VRrcL2V5kh7Ytx2pgB0wgCv7amtTUTF+CI7KM7pMl9LhC8XEytIuYQhrorlkNxLxu2lkw2+CCZXIFFw4Vd0M6eCAkqKIzxjQ4lisFPcGHCxXYYQQsn8yEZoVy7kvacrd64cray7MFJnMuzi8= 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=WIa9IyqH; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=tl0HjgCF; arc=none smtp.client-ip=170.10.129.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="WIa9IyqH"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="tl0HjgCF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785817627; 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=Bp/HOa9o+BFxZP9Tl5+LymilN/hYIUdOgGYp2AmAGQw=; b=WIa9IyqHnitOSikrNKlgrQ06Ws4jvoYl7IAXA+L4vLVf6YjU67CIANS69VoXo2XnAudcIW 1oY2c2U2NZKPea6HbgZ2JiF6c0pKNin5Ect+MX5tbjGfvfDuNGM6hwBGO0MqasaKQyYEyk xgI5BpiadK0zQjHE/9/xDNWHDW33NaQ= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-465-2KfBWpqlPP6h-i5Hj0E4EA-1; Tue, 04 Aug 2026 00:27:06 -0400 X-MC-Unique: 2KfBWpqlPP6h-i5Hj0E4EA-1 X-Mimecast-MFC-AGG-ID: 2KfBWpqlPP6h-i5Hj0E4EA_1785817624 Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-5b2a9f6b0b2so2285331e87.2 for ; Mon, 03 Aug 2026 21:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1785817624; x=1786422424; 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=Bp/HOa9o+BFxZP9Tl5+LymilN/hYIUdOgGYp2AmAGQw=; b=tl0HjgCFY2Q6L1izT/QYxECO0whkG+7g/SEEoDIhUDKC+N+GzBqv2NUJ/0+zo27EC8 rS+cwT+Npjf2U3JS83FgLaSsXQHlFvWLNT0Rr5Gj6BKlRkF33NmJOvctwnmiROU8Crs8 /XJexu/Qcth+ME+plofHrXNBQWQakq5TP0DIPdlT93T/tg9LQBibbKFJvaZBtHUXvB+u BvyJXJjC0hX0EkaTk/1Ky0lJBnFTHknEFsLgwZKo6i/Nq9vh3SHeJIYNPyV7S62SQAor e/RLdrV+zAS7gUC+QN5rAXjvKmrJwvUc5WyHtRAktDACqsA5H7EOIcgk3JT63E2FYxa6 386Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785817624; x=1786422424; 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=Bp/HOa9o+BFxZP9Tl5+LymilN/hYIUdOgGYp2AmAGQw=; b=OM/KnPcCXtrA9Yvt0VqsUCf6HSVvQPFHUPAvQSryBKNjqd8NKwjAuF1xLWkniNjivc epPzGpS6J9h8ksU+McB4wxl+XZzCIeLAq52d5yjO32DBOvxdP1gauD/MsTksiHffF2yB JslO1Ll7om5fUQ08lFEuVaqsifQ5NNTjVa9fvQzZ5y0sZTvSrhj+NfVn6z+gJYjMVVot wwPE3raTcGQz5HwW1r6XOxYahKdYuEXt4XsRnP4fpZUWz1b0T5VV1iv9xOT/k/reYImo 5iO5jETJfnwJpfB108tPglMMgx11l7aTVFCf5QpM4SZ1UogL/XEwl/P7BHc1hUyxZv02 mDkw== X-Forwarded-Encrypted: i=1; AHgh+RpdEbkUwN9ez+xqHwENJHX+JgSucRHgosqchzhNX9+XzQxNk78sEs1RznhdfokTUxIDgftqa/pcwyO2Z24=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4iAba0Uun3b+UBBO9t9mPj3ELluYoGD19d0wEDf7N9A8TWJvO d28m2YeE7xmN5WleEbHuy+vOuS7Y/A7MhJFn7zqOGbgnWHSsQxfvfXVjZbe6922MD2DCwQCyVI4 XEhO2Xrw7+z383SpopWunQuHkKIhVwgxayqs8gMn86LVSU4MCg2kcd3bsloLHXH64 X-Gm-Gg: AR+sD10AUsVLi2kQjf/8Tk7fOVvHHIt6CUjPOkktGvVyZW1umQ6Mi8pbTnhpsI9VCMA H8iEUHSxvsjQ9MY3UBIBxMR9j0DiQIQPVjD+FSRk82po+FWDS85VmJZ8FpSXfEUfeq3J4mOtyE4 dwQQEDHKKl7r6Kelq49axzcYCa8wMm4O2bi3RQdiLNUZ/o+h7L339H6d2Z6QsyJ5Rotrr884I03 tAY9CxkrRzpyCnfwgmP24zV3e/mj21qsImdiX+gOXbr+iq709qAdihOdT1Sstf1QmDfu+QlPb7k /sx0GMF49JG7apUK7OUuCuWO58fTOGfit2w0+gE4hKh3oeyo2mn0y/0Iuzs1CWlryDY055MTqTQ GmsJ/r9h1Ny4Z1x4F X-Received: by 2002:a05:6512:63cb:b0:5b2:b85d:4802 with SMTP id 2adb3069b0e04-5b2e4f19bb8mr1748254e87.4.1785817624369; Mon, 03 Aug 2026 21:27:04 -0700 (PDT) X-Received: by 2002:a05:6512:63cb:b0:5b2:b85d:4802 with SMTP id 2adb3069b0e04-5b2e4f19bb8mr1748235e87.4.1785817623922; Mon, 03 Aug 2026 21:27:03 -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.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2026 21:27:00 -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 03/11] mm/hmm: preparations for HMM to participate in migration Date: Tue, 4 Aug 2026 07:26:23 +0300 Message-ID: <20260804042631.2175585-4-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ä For migration to happen after hmm_range_fault(), the vma has to retrieved. Luckily, pagewalk already resolves that for us, so just have to save it for further use. For migration, mmap_lock has to be hold for the whole operation, so vma stays stable. Take care also of firing the mmu_notifier when migrating. Also, prepare for differencies of how mm_struct * is retrieved in fault and migrate_vma paths. 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/migrate.h | 45 ++++++++++++++++++++- lib/test_hmm.c | 2 +- mm/hmm.c | 86 ++++++++++++++++++++++++++++++++++++++--- 3 files changed, 125 insertions(+), 8 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 425ab5242da0..7380a89756ee 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -106,6 +106,28 @@ static inline void softleaf_entry_wait_on_locked(softleaf_t entry, spinlock_t *p spin_unlock(ptl); } +enum migrate_vma_info { + MIGRATE_VMA_SELECT_NONE = 0, + MIGRATE_VMA_SELECT_COMPOUND = MIGRATE_VMA_SELECT_NONE, +}; + +static inline enum migrate_vma_info hmm_select_migrate(struct hmm_range *range) +{ + return MIGRATE_VMA_SELECT_NONE; +} + +static inline void hmm_fill_migrate_vma(struct hmm_range *range, + struct vm_area_struct *vma, + unsigned long start, + unsigned long end) +{ +} + +static inline struct mm_struct *hmm_range_fault_mm(struct hmm_range *range) +{ + return range->notifier->mm; +} + #endif /* CONFIG_MIGRATION */ #ifdef CONFIG_NUMA_BALANCING @@ -149,7 +171,7 @@ static inline unsigned long migrate_pfn(unsigned long pfn) return (pfn << MIGRATE_PFN_SHIFT) | MIGRATE_PFN_VALID; } -enum migrate_vma_direction { +enum migrate_vma_info { MIGRATE_VMA_SELECT_SYSTEM = 1 << 0, MIGRATE_VMA_SELECT_DEVICE_PRIVATE = 1 << 1, MIGRATE_VMA_SELECT_DEVICE_COHERENT = 1 << 2, @@ -191,6 +213,27 @@ struct migrate_vma { struct page *fault_page; }; +// TODO: enable migration +static inline enum migrate_vma_info hmm_select_migrate(struct hmm_range *range) +{ + return 0; +} + +static inline struct mm_struct *hmm_range_fault_mm(struct hmm_range *range) +{ + return range->notifier ? range->notifier->mm : range->migrate->vma->vm_mm; +} + +static inline void hmm_fill_migrate_vma(struct hmm_range *range, + struct vm_area_struct *vma, + unsigned long start, + unsigned long end) +{ + range->migrate->vma = vma; + range->migrate->start = start; + range->migrate->end = end; +} + int migrate_vma_setup(struct migrate_vma *args); void migrate_vma_pages(struct migrate_vma *migrate); void migrate_vma_finalize(struct migrate_vma *migrate); diff --git a/lib/test_hmm.c b/lib/test_hmm.c index c4adbf98fac7..79cb7487d211 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -145,7 +145,7 @@ static bool dmirror_is_private_zone(struct dmirror_device *mdevice) HMM_DMIRROR_MEMORY_DEVICE_PRIVATE); } -static enum migrate_vma_direction +static enum migrate_vma_info dmirror_select_device(struct dmirror *dmirror) { return (dmirror->mdevice->zone_device_type == diff --git a/mm/hmm.c b/mm/hmm.c index c72c9ddfdb2f..637c00188b3e 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -27,12 +28,17 @@ #include #include #include +#include #include "internal.h" struct hmm_vma_walk { - struct hmm_range *range; - unsigned long last; + struct mmu_notifier_range mmu_range; + struct vm_area_struct *vma; + struct hmm_range *range; + unsigned long start; + unsigned long end; + unsigned long last; }; enum { @@ -393,6 +399,57 @@ static int hmm_vma_handle_absent_pmd(struct mm_walk *walk, unsigned long start, } #endif /* CONFIG_ARCH_ENABLE_THP_MIGRATION */ +static int hmm_vma_capture_migrate_range(unsigned long start, + unsigned long end, + struct mm_walk *walk) +{ + struct hmm_vma_walk *hmm_vma_walk = walk->private; + struct hmm_range *range = hmm_vma_walk->range; + + if (!hmm_select_migrate(range)) + return 0; + + if (hmm_vma_walk->vma && (hmm_vma_walk->vma != walk->vma)) + return -ERANGE; + + hmm_vma_walk->vma = walk->vma; + hmm_vma_walk->start = start; + hmm_vma_walk->end = end; + + if (end - start > range->end - range->start) + return -ERANGE; + + if (!hmm_vma_walk->mmu_range.owner) { + mmu_notifier_range_init_owner(&hmm_vma_walk->mmu_range, MMU_NOTIFY_MIGRATE, 0, + walk->vma->vm_mm, start, end, + range->dev_private_owner); + mmu_notifier_invalidate_range_start(&hmm_vma_walk->mmu_range); + } + + return 0; +} + +static void hmm_vma_post_range_fault(struct hmm_vma_walk *hmm_vma_walk) +{ + + struct hmm_range *range = hmm_vma_walk->range; + + if (hmm_select_migrate(range) && + hmm_vma_walk->mmu_range.owner) { + /* + * The migrate_vma path has the following initialized, + * so take care of fault path below. + */ + if (range->notifier) { + hmm_fill_migrate_vma(range, + hmm_vma_walk->vma, + hmm_vma_walk->start, + hmm_vma_walk->end); + } + mmu_notifier_invalidate_range_end(&hmm_vma_walk->mmu_range); + } +} + static int hmm_vma_walk_pmd(pmd_t *pmdp, unsigned long start, unsigned long end, @@ -600,6 +657,11 @@ static int hmm_vma_walk_test(unsigned long start, unsigned long end, struct hmm_vma_walk *hmm_vma_walk = walk->private; struct hmm_range *range = hmm_vma_walk->range; struct vm_area_struct *vma = walk->vma; + int r; + + r = hmm_vma_capture_migrate_range(start, end, walk); + if (r) + return r; if (!(vma->vm_flags & (VM_IO | VM_PFNMAP)) && vma->vm_flags & VM_READ) @@ -662,16 +724,25 @@ int hmm_range_fault(struct hmm_range *range) .range = range, .last = range->start, }; - struct mm_struct *mm = range->notifier->mm; + /* + * Could be serving a device fault or come from migrate + * entry point. For the former we have not resolved the vma + * yet, and the latter we don't have a notifier (but have a vma). + * + */ + struct mm_struct *mm = hmm_range_fault_mm(range); int ret; mmap_assert_locked(mm); do { /* If range is no longer valid force retry. */ - if (mmu_interval_check_retry(range->notifier, - range->notifier_seq)) - return -EBUSY; + if (range->notifier && mmu_interval_check_retry(range->notifier, + range->notifier_seq)) { + ret = -EBUSY; + break; + } + ret = walk_page_range(mm, hmm_vma_walk.last, range->end, &hmm_walk_ops, &hmm_vma_walk); /* @@ -681,6 +752,9 @@ int hmm_range_fault(struct hmm_range *range) * output, and all >= are still at their input values. */ } while (ret == -EBUSY); + + hmm_vma_post_range_fault(&hmm_vma_walk); + return ret; } EXPORT_SYMBOL(hmm_range_fault); -- 2.55.0