Message ID | 20230105101844.1893104-21-jthoughton@google.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 E3D92C3DA7A for <linux-mm@archiver.kernel.org>; Thu, 5 Jan 2023 10:19:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6FA7F940011; Thu, 5 Jan 2023 05:19:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6837B940008; Thu, 5 Jan 2023 05:19:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 48876940011; Thu, 5 Jan 2023 05:19:27 -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 2FF1A940008 for <linux-mm@kvack.org>; Thu, 5 Jan 2023 05:19:27 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 03B3D140D61 for <linux-mm@kvack.org>; Thu, 5 Jan 2023 10:19:26 +0000 (UTC) X-FDA: 80320348374.11.2E582DA Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf25.hostedemail.com (Postfix) with ESMTP id 592AEA0006 for <linux-mm@kvack.org>; Thu, 5 Jan 2023 10:19:25 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=LLH1FHQm; spf=pass (imf25.hostedemail.com: domain of 3LKS2YwoKCHMakYflXYkfeXffXcV.TfdcZelo-ddbmRTb.fiX@flex--jthoughton.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3LKS2YwoKCHMakYflXYkfeXffXcV.TfdcZelo-ddbmRTb.fiX@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=1672913965; 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=1YiV8/mi4PL7n0t7wUxWEcBb+colJN0WHKmqKjso6aI=; b=6lxcmGMB5CI/Su2y+zTy5F2b1HuuZAPjQCbm+IGPHFKDqgOLAE3YkLOGt4Qt6QII+g/HO3 pa4UZGof/40VwnF3VR87tijNPVAKNH252l5pFBitC68JC4KExF/wPkVU/xbjWP1hzjrQud wL0Kyw9haZA8+WVyOCpAwwobzWhF1f8= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=LLH1FHQm; spf=pass (imf25.hostedemail.com: domain of 3LKS2YwoKCHMakYflXYkfeXffXcV.TfdcZelo-ddbmRTb.fiX@flex--jthoughton.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3LKS2YwoKCHMakYflXYkfeXffXcV.TfdcZelo-ddbmRTb.fiX@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672913965; a=rsa-sha256; cv=none; b=kRfYCyG4YAF/8j1+UwR3HWQEt4fB9uFWEKhFSHenUPTKzna0JOllGeQX3qtG9j3Q04Um3b e55TCdFXCCiMN+fgxvHM+hcYYidywimvwiHr+8861JFSw1SPT3JIEna7s1aoRqqiLg2ENW WkY7KV2AQkhbon8DaMavTfrUh/kxFcE= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-434eb7c6fa5so374779127b3.14 for <linux-mm@kvack.org>; Thu, 05 Jan 2023 02:19:25 -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=1YiV8/mi4PL7n0t7wUxWEcBb+colJN0WHKmqKjso6aI=; b=LLH1FHQmSuPREM9no8Xr1mrJ+WX7c7pQin9EAc1TvbLcGl/RkRXVwm8E1KdBkYBfGV YIbOE4N1o74dyaPeOKZcf4lLMNNXkB6ntMAbzLwmbHJOP6v9E5qeX1N0aPIuGJxFBbMc DAYDRj/A2/l8+0SDjtsFQpbfETrwBoJUzB2rpy+l5tAr/dFGII17vpR5Red3X2ZytOJ7 oWSpFA1Ze6s9PZS3/XShmJem6/Ne0GdcNEZibyC+1G61SR9BHwKMzCLxkcexZKOZqBmj o+/TsTl7bfdyibV9AZKmqM5CVurcLoGPu4otDexr+01trkvt9Pgocw+EzAHZiG5i0KHf sA1w== 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=1YiV8/mi4PL7n0t7wUxWEcBb+colJN0WHKmqKjso6aI=; b=pYTg3JettkhPcQCtAr6arREV+oVtHk21JEc6IM3vkCqfKmtxe97P+oS1Q5XLzhOP65 dZrJWcj/P2rhTZCYy6R7noJQeBUvBzPXGyJNsaZ/YiSWEMiXS7caQxcgdPO4/6WckDmH 65hJTzlvA0P778WT+eFarx2oEgE23LMsrcMWzRQGaTUwWgwVqilYJCwF109pb0C27CSc /saO862BdvVTX5vhpXVx6Y+NBwcN1nJ+TLyLHAr6XYpxcye0ZbYmAQG6Vi8iuqtTkLRO KIprHhYd6F0wts4qESvr5KXXw1NOtmKhA2dkpcT8nEKH2pcvzF+JwvAYHFgIxWEOAZS9 zexQ== X-Gm-Message-State: AFqh2kpWB9l7fqzQlREs1u60LcbPsgSWv0bROtbwMLAaboWDeORxdhme R981IYvbq1hA6N0yHiuLoR6YYand18slkWUd X-Google-Smtp-Source: AMrXdXsGYdoE5wl2sivs6OdjI5ZSUUexE/Vrq4eXctrFdqUeY9jM31ir5DBKkL0+y1etkakDWP7pB3SgIRai/epT X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a25:d06:0:b0:731:7af4:cc3e with SMTP id 6-20020a250d06000000b007317af4cc3emr3400989ybn.368.1672913964504; Thu, 05 Jan 2023 02:19:24 -0800 (PST) Date: Thu, 5 Jan 2023 10:18:18 +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-21-jthoughton@google.com> Subject: [PATCH 20/46] hugetlb: add HGM support for hugetlb_follow_page_mask From: James Houghton <jthoughton@google.com> To: Mike Kravetz <mike.kravetz@oracle.com>, Muchun Song <songmuchun@bytedance.com>, Peter Xu <peterx@redhat.com> Cc: David Hildenbrand <david@redhat.com>, David Rientjes <rientjes@google.com>, Axel Rasmussen <axelrasmussen@google.com>, Mina Almasry <almasrymina@google.com>, "Zach O'Keefe" <zokeefe@google.com>, Manish Mishra <manish.mishra@nutanix.com>, Naoya Horiguchi <naoya.horiguchi@nec.com>, "Dr . David Alan Gilbert" <dgilbert@redhat.com>, "Matthew Wilcox (Oracle)" <willy@infradead.org>, Vlastimil Babka <vbabka@suse.cz>, Baolin Wang <baolin.wang@linux.alibaba.com>, Miaohe Lin <linmiaohe@huawei.com>, Yang Shi <shy828301@gmail.com>, Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton <jthoughton@google.com> Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 592AEA0006 X-Stat-Signature: 6xrg8wu8i8oy6t58jx6hmhsp4bcq4aty X-Rspam-User: X-HE-Tag: 1672913965-449754 X-HE-Meta: U2FsdGVkX18Jq3F0xwnH9mLt5R0giRXl5hN4DmmSNni6fjoCkY6cLYrU8fbtjP1zAKkPN6CTudsQ1zu8Dansv65ScYjWZFwJt8aCAkcu5NUKPWIj9WtZVuUqf9oOD6630WFiqnvg1+SUQBhkkVgnfvlKIC6BGUdDYLaCkvwOHc4t5ve6qpT1XUs3TcBuj+k8TGzSzRN/MZ6TrJX7x8lMCLqt1dJjiByZWf5I4qUkssDFMdN/QYCDI3WD7JD04Jky/oLETUPCWEhI7Xm75vZY1oreNrQnsczphST9bffUKuObJi6k7skDfQkNvB2uI3BK8TOwE8M1cJzpnx24le+T/dJzGYGObFxx9GvIWRYEuLMllOdbz4lAhKMPo6jHMtLWDnxP5o8PNjCG4GDtxE/ccdP6fwO2mVtq/nXposIck2Q00KTi9mgUI7xhc+O0FPZ9tCmhBc5OI2GA0eo/+i8gHh+W7mwLVVPCtHM/cLHCq6mGXnQIYxd/7wkpjf88pUBAuOHdM5uqFGDC1kS5ahHiSFIs1tR4bAOeI8Qe6JaPhIqzIzMkvd4Fg3e478ovcUSugDHXbUsnYFjzb7f86gq2+PJU4EvQyHfMfSgK0skRVSj3OPFwSKgDzwDXZXoHnLsT6GuRanoN6P1gpaz0CHO9+A45fUguFoesXc7fI+WZd8QVhGBLKmxsuEqL4g1eTdX7L4rY/TvHUdsFJwZmlMHadHNvdNp7yH+cTs6Vlo29p2MybBYkDKk/KthL92mQIJmaOh8+OR45pmJ/SGz7ClC4XbUM6S9NzPELMeA+L4m27JnjTIagXy9YH9YVncfDJ19WQacQ5f0eFxHkLlAeh7Hr7WaPIKWuWCBVZEyboc9Ug9qNJfjAMHdLwR4nI2GmM+tG802ZNlEgBRzN6n57gtokUstpuyGtymrmEeTtuC9y0GScnOnBIcRSRDGfv/pxlmtjJc34UdiWTd1GYt5/Ihp Sle/AwMq 9LPat3CgcGyAbWxrHEhLiThH7e7xgX7SK/F4c/sFKLz2rjqALXyVhs2CJYpbspkeYSO5PGVJivg15WkYgV1USR2kLdNy2LhfSsHnRJ6VI1QMfRMoreyhqEahgF1j4r6f783Ldvb1tQVUTAdOeaNDTWyv3vmIyepEgZgfqxGIj/v4fIELUsms908/biPef/1Lkb//0xDu3hWYy+53dSJ0K6xB6ZvfbvI7oOqaHdM5FHhZUxRFxxJDfM9S1rkjwi6+oPjx0i+vya6+8pGxC42B4j3GxnNq8VVUMH7mWXHuPxzMvawSIYUtVQ6D3kzomXLa3uluP3HqD33S4I35WFtv67JZ8eU5V4lDpJYwxtIELDlLj0Qy9pkXwAUIlXn0cmrPPP2o7+F9ux9/1FkyE7d19fLVB1UmpSmMs6HdpfwRKRIYqyudau4l4Q7cbGAaiSl1eMY90 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: <linux-mm.kvack.org> |
Series |
Based on latest mm-unstable (85b44c25cd1e).
|
expand
|
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 30fea414d9ee..718572444a73 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6553,11 +6553,10 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, unsigned long address, unsigned int flags) { struct hstate *h = hstate_vma(vma); - struct mm_struct *mm = vma->vm_mm; - unsigned long haddr = address & huge_page_mask(h); struct page *page = NULL; spinlock_t *ptl; - pte_t *pte, entry; + pte_t entry; + struct hugetlb_pte hpte; /* * FOLL_PIN is not supported for follow_page(). Ordinary GUP goes via @@ -6567,13 +6566,24 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, return NULL; hugetlb_vma_lock_read(vma); - pte = hugetlb_walk(vma, haddr, huge_page_size(h)); - if (!pte) + + if (hugetlb_full_walk(&hpte, vma, address)) goto out_unlock; - ptl = huge_pte_lock(h, mm, pte); - entry = huge_ptep_get(pte); +retry: + ptl = hugetlb_pte_lock(&hpte); + entry = huge_ptep_get(hpte.ptep); if (pte_present(entry)) { + if (unlikely(!hugetlb_pte_present_leaf(&hpte, entry))) { + /* + * We raced with someone splitting from under us. + * Keep walking to get to the real leaf. + */ + spin_unlock(ptl); + hugetlb_full_walk_continue(&hpte, vma, address); + goto retry; + } + page = pte_page(entry) + ((address & ~huge_page_mask(h)) >> PAGE_SHIFT); /*
The change here is very simple: do a high-granularity walk. Signed-off-by: James Houghton <jthoughton@google.com> --- mm/hugetlb.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)