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 D9FE9C63705 for ; Wed, 7 Dec 2022 20:30:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 722DC8E000B; Wed, 7 Dec 2022 15:30:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AD858E0005; Wed, 7 Dec 2022 15:30:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4891A8E000A; Wed, 7 Dec 2022 15:30:53 -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 2FA6B8E0005 for ; Wed, 7 Dec 2022 15:30:53 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D9AC7AB683 for ; Wed, 7 Dec 2022 20:30:52 +0000 (UTC) X-FDA: 80216653944.25.2663362 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 1E4674001E for ; Wed, 7 Dec 2022 20:30:51 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WnJmySBC; spf=pass (imf12.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670445052; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NwIY6qGYW16H7RKgjgoL5wZJoRvSXS6wmhu5l+J439g=; b=2zACSvXljcylKaVy3Xc2HoKvRT9t/qbj8ZX4NZRk7Ptqf6iU1LtUGrq3LyDCN02AL4iEi/ IOIfFRwKelLR1UELF0vx/wqs5+d169+EWBodpTYtNvW80aLF/Y5B+OuDfs9CRoD4dyoKv8 gWCqnxsz4zfnhc4u17bA+usTZ/dWYLE= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WnJmySBC; spf=pass (imf12.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670445052; a=rsa-sha256; cv=none; b=Y7qfyvaPxbTCBit3ltLEVnnMwFd3gXTsh+rGtVT56VAABazSWcm3K1b7Ym1iRSUa10a5Qq HiUXxrwqM3mKH7XcnI8exhR0hSN1zez47ZlwCAAMEmpTlHzK4vO6Ex2WWRgnKB+V0n7RSw kMCERv+10h/kHheF29O+N9tkdpCZ7wQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670445051; 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=NwIY6qGYW16H7RKgjgoL5wZJoRvSXS6wmhu5l+J439g=; b=WnJmySBCHDfTfkxjIFsTO61nvAbyOelrftN2sOY3a+/kjYHomQd9Vy7qVd4d+Y6k9wwraf M+je51BXgp0IegbvO4KgQeI+eP9CPwGuu+Aug0AAcGYV3lj1tqVsKarVQlPHDpDXjzGQ3r 03BZA82z5mFQAFmdq1lDgx83xyo13JY= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-551-Ca5eooBpNsSyDeRqo-b_jQ-1; Wed, 07 Dec 2022 15:30:50 -0500 X-MC-Unique: Ca5eooBpNsSyDeRqo-b_jQ-1 Received: by mail-qk1-f197.google.com with SMTP id h13-20020a05620a244d00b006fb713618b8so25949820qkn.0 for ; Wed, 07 Dec 2022 12:30:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NwIY6qGYW16H7RKgjgoL5wZJoRvSXS6wmhu5l+J439g=; b=IokHajl005tWVCcz/MRL59HWPbiEvgM4HW20Ks/+WZfMcTYqsjeYoYX/8PTpnZDmQz X8x7hOezsefF0JeMvQA9F1wkQsMWg01HXZKagilDfEcOxENDLiJyTXlJnPOi3CER3EZh QbzqHFEEEMHtRxfkgPqFBeGHj6Hq5uX/tUkrTYSQ878WNKxBR3FsVVysvJvuV5AK+5es 2T2KEcrUNRE9Q6xw2F4kHyWap4ulnsDR9GGXzIfl+E7MeaTTGJGl7tCPcqN+aeZC1eOD vIo/xXjG6FMDhkWR+wxQEsea6cfujc9hu2fJXpO7SdFNOdTOp3zG92BZbj0L0doei0yP ea/g== X-Gm-Message-State: ANoB5plgneHFHTSYCdcNI9iHMwaseUzVbE2RpgdSmDKn42H6OnfN6IKO lL4Sizyb9EkvLDA+Y9PQVHWRUsKH1gYqMxKTBOC2tlVrbBOD47kTpc3G2g38U1XRjuqNZ7zapEF e6TGWM9CE5Zmb7EwIoARe5+aUBL4GrRZ6oC8LacTJfvQ+x9glYurjbqNt1kBX X-Received: by 2002:a05:6214:284:b0:4c7:4f6d:d9bd with SMTP id l4-20020a056214028400b004c74f6dd9bdmr1356006qvv.38.1670445049332; Wed, 07 Dec 2022 12:30:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf6gwEUm1ExsgjT3GOzwaF3cPo9sE8A57vdvavUjxQytQjXm37D0mKl9btfYXk/zG1ZmitVzEg== X-Received: by 2002:a05:6214:284:b0:4c7:4f6d:d9bd with SMTP id l4-20020a056214028400b004c74f6dd9bdmr1355984qvv.38.1670445048921; Wed, 07 Dec 2022 12:30:48 -0800 (PST) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-46-70-31-27-79.dsl.bell.ca. [70.31.27.79]) by smtp.gmail.com with ESMTPSA id dc53-20020a05620a523500b006fefa5f7fcesm855594qkb.10.2022.12.07.12.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 12:30:48 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Muchun Song , John Hubbard , Andrea Arcangeli , James Houghton , Jann Horn , Rik van Riel , Miaohe Lin , Andrew Morton , Mike Kravetz , peterx@redhat.com, David Hildenbrand , Nadav Amit Subject: [PATCH v2 07/10] mm/hugetlb: Make follow_hugetlb_page() safe to pmd unshare Date: Wed, 7 Dec 2022 15:30:31 -0500 Message-Id: <20221207203034.650899-8-peterx@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221207203034.650899-1-peterx@redhat.com> References: <20221207203034.650899-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 1E4674001E X-Rspam-User: X-Stat-Signature: g5abdk83rkhbdhn14r1dudj41k1n8cas X-Spamd-Result: default: False [7.67 / 9.00]; SORBS_IRL_BL(3.00)[209.85.222.197:received]; R_MISSING_CHARSET(2.50)[]; SUSPICIOUS_RECIPS(1.50)[]; BAYES_HAM(-1.43)[83.56%]; MID_CONTAINS_FROM(1.00)[]; SUBJECT_HAS_UNDERSCORES(1.00)[]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWELVE(0.00)[14]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_ALLOW(0.00)[redhat.com:s=mimecast20190719]; MIME_TRACE(0.00)[0:+]; TAGGED_RCPT(0.00)[]; DMARC_POLICY_ALLOW(0.00)[redhat.com,none]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; DKIM_TRACE(0.00)[redhat.com:+]; R_SPF_ALLOW(0.00)[+ip4:170.10.129.0/24]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-HE-Tag: 1670445051-60104 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: Since follow_hugetlb_page() walks the pgtable, it needs the vma lock to make sure the pgtable page will not be freed concurrently. Acked-by: David Hildenbrand Reviewed-by: Mike Kravetz Signed-off-by: Peter Xu --- mm/hugetlb.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 3fbbd599d015..f42399522805 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6284,6 +6284,7 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, break; } + hugetlb_vma_lock_read(vma); /* * Some archs (sparc64, sh*) have multiple pte_ts to * each hugepage. We have to make sure we get the @@ -6308,6 +6309,7 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, !hugetlbfs_pagecache_present(h, vma, vaddr)) { if (pte) spin_unlock(ptl); + hugetlb_vma_unlock_read(vma); remainder = 0; break; } @@ -6329,6 +6331,8 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, if (pte) spin_unlock(ptl); + hugetlb_vma_unlock_read(vma); + if (flags & FOLL_WRITE) fault_flags |= FAULT_FLAG_WRITE; else if (unshare) @@ -6388,6 +6392,7 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, remainder -= pages_per_huge_page(h); i += pages_per_huge_page(h); spin_unlock(ptl); + hugetlb_vma_unlock_read(vma); continue; } @@ -6415,6 +6420,7 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, if (WARN_ON_ONCE(!try_grab_folio(pages[i], refs, flags))) { spin_unlock(ptl); + hugetlb_vma_unlock_read(vma); remainder = 0; err = -ENOMEM; break; @@ -6426,6 +6432,7 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, i += refs; spin_unlock(ptl); + hugetlb_vma_unlock_read(vma); } *nr_pages = remainder; /* -- 2.37.3