From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34D47C3DA7A for ; Thu, 5 Jan 2023 10:19:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B3A3940018; Thu, 5 Jan 2023 05:19:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 83277940008; Thu, 5 Jan 2023 05:19:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6AAF8940018; Thu, 5 Jan 2023 05:19:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 56F01940008 for ; Thu, 5 Jan 2023 05:19:36 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 107D41608EE for ; Thu, 5 Jan 2023 10:19:36 +0000 (UTC) X-FDA: 80320348752.23.C19D188 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf30.hostedemail.com (Postfix) with ESMTP id 7DDB88000F for ; Thu, 5 Jan 2023 10:19:34 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=rEGgdMvu; spf=pass (imf30.hostedemail.com: domain of 3NaS2YwoKCHwoymtzlmytslttlqj.htrqnsz2-rrp0fhp.twl@flex--jthoughton.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3NaS2YwoKCHwoymtzlmytslttlqj.htrqnsz2-rrp0fhp.twl@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672913974; a=rsa-sha256; cv=none; b=1a35SpcFKhYIIe2W8vN0xClZQOffu27Yi/bMBvy2FAKd7xMdcmRodmi89j+Xsb635x7ddR I8Y/np6go9y16xT6S9QeelLnHlc2RwlvidPdEGvzgCcswatX83q2DtuoVnyY+FDKmfuP+o dBK872ke3F41oBmbRYLj2MTDpxalucI= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=rEGgdMvu; spf=pass (imf30.hostedemail.com: domain of 3NaS2YwoKCHwoymtzlmytslttlqj.htrqnsz2-rrp0fhp.twl@flex--jthoughton.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3NaS2YwoKCHwoymtzlmytslttlqj.htrqnsz2-rrp0fhp.twl@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672913974; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NW6wHLpIenfZ4H83ugQ2cvHsKjvU5VzZf+cgjAGHY40=; b=LeGp/ZE9VqAheKisYAXbmcB21tTF1f/I2ooAwHlfmS+bdD+X3PcITeOmdHtT4vmhAkmlx5 68brKwCjiMpSZOVjrg/gRo9JDG2qpwX8EqoM1RsZil7wgJ4CLWigiNbDAJDBmkb9mtQO08 fvAZAQLJMK8m5Ff9mqbLhMqyEbq89yE= Received: by mail-yb1-f202.google.com with SMTP id z17-20020a25e311000000b00719e04e59e1so36650128ybd.10 for ; Thu, 05 Jan 2023 02:19:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NW6wHLpIenfZ4H83ugQ2cvHsKjvU5VzZf+cgjAGHY40=; b=rEGgdMvuu+27Ici8qii/KRILsHn9RlUYSO9K/TJzur40T3t5kesN5ok/NY1HloAU4L Z7iSC9U8uLAkzjnzBDCE6RwQaxIdaGRfRBI7Ay4/uqsXEpMpfJH5fXmrdGe8jBMdebhB PTfqNSSWxeBYlcJ/n89QdrXzg+3piVs9cMRx16JezvMUtD4M+SLYVIhAlR6VJsoaz/0q LIveRtwE+XWa1auke1aNsrJsM9rgwGQVMhxbEoL1PGm2s5/+Us9MZpK3VqY68e/ucGb6 rLqEJyLAlrwQyolGVPX3aLH9GGNSXJQpX581J5jygzsuQLpiwPMUgm2Gwf8Q06CukAiZ 8Rdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NW6wHLpIenfZ4H83ugQ2cvHsKjvU5VzZf+cgjAGHY40=; b=Izo9yU3eAoeBdxHiEy4V7rEgmGbOh8oU1/X8hfObagiJYBMsa0jl2Q6nW2YZPJov2y DNBcnUnOkU91DiUTzaNs4drZyITXOuokVyFhwowZWM7q+PRACy6yfF88JqIacYQ/Tavg 99alezJgORjTjAsO3Z12p6XxtASCipnBNknQkNWH+CcsRyxuFXo0s6qPc+y1oRDG0CGe 2aw5QArHcV/Dz9w9ceXM4Uk4ZUsQDbe1mZT9jiV3Cd90jH8RR+IbSa5JHURIzNuxP0SY y4JgHsG6IsTZAN//pg8bVH4DxDP7xa/mZYBbrf6qIIVSwvKxKgscOaWo/h4r8miFeye0 JDoQ== X-Gm-Message-State: AFqh2krt9c7eTNv1gcXJJenquIZamsFmKFjvkU5i1ZS/rLyrGT3yhgyN nnYvL8IxHfSdcuX1XFoS+dJ4ft8sfN2B0IT/ X-Google-Smtp-Source: AMrXdXsgAfnLGLH/tQnO5IQRR4cK4f4YIvu7i1V91wP/6Pz7HgI4U5X4q/x6mDIyEA8c+u2ZnwHVp4g63zKjZ7Sk X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a25:4bc4:0:b0:794:4ff7:1111 with SMTP id y187-20020a254bc4000000b007944ff71111mr1789851yba.603.1672913973763; Thu, 05 Jan 2023 02:19:33 -0800 (PST) Date: Thu, 5 Jan 2023 10:18:25 +0000 In-Reply-To: <20230105101844.1893104-1-jthoughton@google.com> Mime-Version: 1.0 References: <20230105101844.1893104-1-jthoughton@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230105101844.1893104-28-jthoughton@google.com> Subject: [PATCH 27/46] hugetlb: add HGM support for move_hugetlb_page_tables From: James Houghton To: Mike Kravetz , Muchun Song , Peter Xu Cc: David Hildenbrand , David Rientjes , Axel Rasmussen , Mina Almasry , "Zach O'Keefe" , Manish Mishra , Naoya Horiguchi , "Dr . David Alan Gilbert" , "Matthew Wilcox (Oracle)" , Vlastimil Babka , Baolin Wang , Miaohe Lin , Yang Shi , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 7DDB88000F X-Stat-Signature: a3hq911i83ks3zioerwr5u7qtj4wkihg X-HE-Tag: 1672913974-163857 X-HE-Meta: U2FsdGVkX192UnPGMWoxgKj7E0Q55rnoXKciE7wxlj4nQqXE/vZrz6Rh64Fnlu4oyLMCwmqHmlROlQGyQdC9mIkygICiv/hROzbtOBMxsHUm12n7rdfV/vr9jDnbVx8Ynrp40xSH9+NPqq5mYzDR6I7WS74wNL1FJ/FLy29dzY39SnNsbVTVyjAq+rTU8kN1/3LyfGMjy/8Sl1IDn2O5M3KiukeocMJhWCJ0AUzgQ3MTFw8PF27rHHEaSuhrM7nmGi2mcXqpariLRSmFWkpyywRBN1SzBGlEBj2C/X/YeVMhYk9rQuBHA3gCL66O8nvEF8jdTJXhTpAIsJZmiqRo74cNBW+jMF+unNwP17N5Nd5V6MpYHgTSitnih8oEBkvXheJOv+1EWz4EkOfmISiggYOGm115mIS0EMPD21smdJPL39PaaOmMf3R1JWoP+5Xf4/CuHls7+/rJ1jzTaYftBLhi/D6xji1xo3ne+YhfQOKaGs3x0awXqB907tGfbpS2alTEy/LRYfAYjTm9HyIEvG4zZpkRdxabXRdzWalQys0+TF7TcnYid2I4mknNLqmS60TE9pLSg9+plfmYTKRSH6gXuk0i+PULg0jQj9CO+8eb7r737LySXnxmxVDd/axoMxyDMrb3AuDNCST/rS6OMjm8C6JUXz3/Lg7hi8c2ItFOPeNRvQQ4QXr/Nz0F4kqhXbjg0ro1upOoYgQ548y5iJtxemL9Cq9GJEB1x9MkMqqGRYIOZalB6GO6rdFDLDcShf+n5166TB8MQP0MdSo7zytFa0/+jQoeMeNw8TZF9OrDgP991qujboPIiWWOM9aTljMHUjUivE8NKcnqzEYArFUKgbdjnBKlICY/GhOYHHjXQrPTQjgGzXcA8EP31nk6GsXAYkaHhjsfxW50ZC3lJ3lQIS8wG0o/wAOzlyjyTmegYJRv1MTT4AfUGx5o07xg6LyLFJ8qkquMKWPFSFW I7yzcFzC mTnDP2C+jJKQgwT7MBJHOtLZRnQwktZ/Mbz627hs8f9950kc3rKP1BfzYX3lZV+qRv3+bbrx31358pUI6ijDrbSAwVDlAyjTTPdjU70gIyagw5u/Wneey+U3Bzs+JrJeYjqqjb+z6gbzpZ+gciz0ioox5rijaKSzxU8Ooj9sVS/H8EXrD99o8LnYUmgxXEK+DaNKd9jDAc1JU8s4E0GsqMWuiDbLpn/1QXNF+2TV2Y1CatyUADh0iW9xjPx+hLOE1+ZHOLUPHPNKiC+kwk7NsRoraPha1M4vB/lQ5MebrpJcnByo5PAdCKoqtiautndr6SFhTyzKz+j051/5eEYMOf3qL5KNJbScfSW7TclMlCSDEN5ZyWZJlXbfJuWHV/7Qmo6XxbrkVHH2xv1wwDbRZEoLfoONmRoir/B1A2+q8RQeO/8qTKcOVhjs0Rkju0ENFV42y X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This is very similar to the support that was added to copy_hugetlb_page_range. We simply do a high-granularity walk now, and most of the rest of the code stays the same. Signed-off-by: James Houghton --- mm/hugetlb.c | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 21a5116f509b..582d14a206b5 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5313,16 +5313,16 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, return ret; } -static void move_huge_pte(struct vm_area_struct *vma, unsigned long old_addr, - unsigned long new_addr, pte_t *src_pte, pte_t *dst_pte) +static void move_hugetlb_pte(struct vm_area_struct *vma, unsigned long old_addr, + unsigned long new_addr, struct hugetlb_pte *src_hpte, + struct hugetlb_pte *dst_hpte) { - struct hstate *h = hstate_vma(vma); struct mm_struct *mm = vma->vm_mm; spinlock_t *src_ptl, *dst_ptl; pte_t pte; - dst_ptl = huge_pte_lock(h, mm, dst_pte); - src_ptl = huge_pte_lockptr(huge_page_shift(h), mm, src_pte); + dst_ptl = hugetlb_pte_lock(dst_hpte); + src_ptl = hugetlb_pte_lockptr(src_hpte); /* * We don't have to worry about the ordering of src and dst ptlocks @@ -5331,8 +5331,8 @@ static void move_huge_pte(struct vm_area_struct *vma, unsigned long old_addr, if (src_ptl != dst_ptl) spin_lock_nested(src_ptl, SINGLE_DEPTH_NESTING); - pte = huge_ptep_get_and_clear(mm, old_addr, src_pte); - set_huge_pte_at(mm, new_addr, dst_pte, pte); + pte = huge_ptep_get_and_clear(mm, old_addr, src_hpte->ptep); + set_huge_pte_at(mm, new_addr, dst_hpte->ptep, pte); if (src_ptl != dst_ptl) spin_unlock(src_ptl); @@ -5350,9 +5350,9 @@ int move_hugetlb_page_tables(struct vm_area_struct *vma, struct mm_struct *mm = vma->vm_mm; unsigned long old_end = old_addr + len; unsigned long last_addr_mask; - pte_t *src_pte, *dst_pte; struct mmu_notifier_range range; bool shared_pmd = false; + struct hugetlb_pte src_hpte, dst_hpte; mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma, mm, old_addr, old_end); @@ -5368,28 +5368,35 @@ int move_hugetlb_page_tables(struct vm_area_struct *vma, /* Prevent race with file truncation */ hugetlb_vma_lock_write(vma); i_mmap_lock_write(mapping); - for (; old_addr < old_end; old_addr += sz, new_addr += sz) { - src_pte = hugetlb_walk(vma, old_addr, sz); - if (!src_pte) { - old_addr |= last_addr_mask; - new_addr |= last_addr_mask; + while (old_addr < old_end) { + if (hugetlb_full_walk(&src_hpte, vma, old_addr)) { + /* The hstate-level PTE wasn't allocated. */ + old_addr = (old_addr | last_addr_mask) + sz; + new_addr = (new_addr | last_addr_mask) + sz; continue; } - if (huge_pte_none(huge_ptep_get(src_pte))) + + if (huge_pte_none(huge_ptep_get(src_hpte.ptep))) { + old_addr += hugetlb_pte_size(&src_hpte); + new_addr += hugetlb_pte_size(&src_hpte); continue; + } - if (huge_pmd_unshare(mm, vma, old_addr, src_pte)) { + if (hugetlb_pte_size(&src_hpte) == sz && + huge_pmd_unshare(mm, vma, old_addr, src_hpte.ptep)) { shared_pmd = true; - old_addr |= last_addr_mask; - new_addr |= last_addr_mask; + old_addr = (old_addr | last_addr_mask) + sz; + new_addr = (new_addr | last_addr_mask) + sz; continue; } - dst_pte = huge_pte_alloc(mm, new_vma, new_addr, sz); - if (!dst_pte) + if (hugetlb_full_walk_alloc(&dst_hpte, new_vma, new_addr, + hugetlb_pte_size(&src_hpte))) break; - move_huge_pte(vma, old_addr, new_addr, src_pte, dst_pte); + move_hugetlb_pte(vma, old_addr, new_addr, &src_hpte, &dst_hpte); + old_addr += hugetlb_pte_size(&src_hpte); + new_addr += hugetlb_pte_size(&src_hpte); } if (shared_pmd) -- 2.39.0.314.g84b9a713c41-goog