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 3D566C63703 for ; Wed, 7 Dec 2022 23:44:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 905218E0005; Wed, 7 Dec 2022 18:44:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 88CE58E0001; Wed, 7 Dec 2022 18:44:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72D9B8E0005; Wed, 7 Dec 2022 18:44:40 -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 5F6948E0001 for ; Wed, 7 Dec 2022 18:44:40 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1EF2240A95 for ; Wed, 7 Dec 2022 23:44:40 +0000 (UTC) X-FDA: 80217142320.10.726F01B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 38620A0005 for ; Wed, 7 Dec 2022 23:44:38 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="H/XoZdNR"; spf=pass (imf15.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.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=1670456678; a=rsa-sha256; cv=none; b=1RFOoDRSF/mgrLLioMilyR8k4caSg6F1pE6f2fLhArs258mCFPpyNTLoMhzVHy4z9AXgrE nk4SQzUC4eOqmA561KeujO+lZxCL3Tp0Hr3I1npFDSHzNU/VfWPqdZl9CMDosW7In2WFIp KDoMXTp7yBFraEsO6LBTU9KN6EKGf8E= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="H/XoZdNR"; spf=pass (imf15.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.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=1670456678; 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=U1znsFGAwUqLG+kZktt6UetlzDgCE2gBi75bO1V4Vw8=; b=Lk+U9w2g9UqSgCeczIgSM2lfLq7mSLP1gnnJeyVvKmNfciNAPbEoqosZVwvROg6L8jsOxy FqnetTqynXm4W+nGOEuN+D0k+mKe7EkkX0UONeD6tsUzvRXD7GOA/66vLTpdgU5N+ehidX CL2G1bBQmClRWBFUE41LgygkNye1Qts= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670456677; 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: in-reply-to:in-reply-to:references:references; bh=U1znsFGAwUqLG+kZktt6UetlzDgCE2gBi75bO1V4Vw8=; b=H/XoZdNRCwQH7D+WRp/gwHkDm6w/ICneioVmgPTC3mrYhbs48H/zDGlyhSDac/82VwFYY3 y22c8fegbngDp6+7Q+iwtCAQPnRXtUoXYo9zWNCp47bca5KoJgzKx0SAJwfnIgnioURVBc hY9eqMZDlksAtoNInZMue9/8oZGU4Wo= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-408-pwbOVVJcOCqiBtRe5V7qCA-1; Wed, 07 Dec 2022 18:44:34 -0500 X-MC-Unique: pwbOVVJcOCqiBtRe5V7qCA-1 Received: by mail-qk1-f200.google.com with SMTP id ay43-20020a05620a17ab00b006fa30ed61fdso26227707qkb.5 for ; Wed, 07 Dec 2022 15:44:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=U1znsFGAwUqLG+kZktt6UetlzDgCE2gBi75bO1V4Vw8=; b=u3MJ/A5l/0SdMbMMWW3zwzR6q4niW05UGJY/iCCL9/2Y6ys6T0XjqPsUkdTrBiY/Se 9MEX2gmYczkvkX0FH/7ciRhTGEejz6QcbPFZDe9BozHptVxC9Hf2Z7YMLWFGRX8S/10W vPYznPIVn5qRzm3cL1CEF/Ok63fhelk4EVbdlj7p9CGWjZy/WN7aA66J/R9rwl7w80/G udioqHM/3XIURoK9b6DtOMmAQPxWhH5DJt3kDiFbuMpbRb71XLEzswvINEnbQJ2dSYOx RVT0gb+y58t/L0KJHKd8jknkG3ZYyPISz5wuofJjEc1vXiiPUTa+5ujSDLf2QDHIa/IP XAHQ== X-Gm-Message-State: ANoB5pkgkWCVebu8QkryH4ccYxDW8xaj30rggJ0ASqvM4nau42V3trEz 15eqJT27Nczj9B4YBCbu9rSSFQHWXMCU8hXc8nXhZag2dMtRP7w02JlUpEKfbeGYySDS/iDDU9v iVUrOzhbiHb0= X-Received: by 2002:a05:622a:1c1:b0:3a4:e849:a235 with SMTP id t1-20020a05622a01c100b003a4e849a235mr2156000qtw.34.1670456674096; Wed, 07 Dec 2022 15:44:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf5qazXJBp7t7e+vKfk/GGkwSEO9ydBAP5p90VGRjDUmsbibpQEcZsfVIbf6t+ghGod0ZatQjQ== X-Received: by 2002:a05:622a:1c1:b0:3a4:e849:a235 with SMTP id t1-20020a05622a01c100b003a4e849a235mr2155982qtw.34.1670456673844; Wed, 07 Dec 2022 15:44:33 -0800 (PST) Received: from x1n (bras-base-aurron9127w-grc-46-70-31-27-79.dsl.bell.ca. [70.31.27.79]) by smtp.gmail.com with ESMTPSA id w3-20020ac87183000000b0039cd4d87aacsm13882213qto.15.2022.12.07.15.44.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 15:44:32 -0800 (PST) Date: Wed, 7 Dec 2022 18:44:31 -0500 From: Peter Xu To: John Hubbard Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song , Andrea Arcangeli , James Houghton , Jann Horn , Rik van Riel , Miaohe Lin , Andrew Morton , Mike Kravetz , David Hildenbrand , Nadav Amit Subject: Re: [PATCH v2 05/10] mm/hugetlb: Make userfaultfd_huge_must_wait() safe to pmd unshare Message-ID: References: <20221207203034.650899-1-peterx@redhat.com> <20221207203034.650899-6-peterx@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Rspam-User: X-Rspamd-Queue-Id: 38620A0005 X-Rspamd-Server: rspam01 X-Stat-Signature: zx3cbsbwsb9t67p4nbcizowhpkk6pcig X-HE-Tag: 1670456678-838316 X-HE-Meta: U2FsdGVkX18cuzip/rxJaO+Sk5YapEKlvoKr1FidKX7S2kekmlls6xcScO2ygACYPzRMdKX5JwzdLCkY77ugrGbeT/higVSrQ96/6zFabD5Dw2MO5wMuXo7lOGltrXl8xzyU3r9ozpjm9gsvupKSGLUVCmKsE92rllllyNpoBchWiDCkoFQQfTkuGU+dTlUtFA+LlYcaJ4+3CHG4xxxluyX/tQ4+BvzufYUkXKAVgu5CkS+a25lQ4kdjkdYtpw2IWkGujHw32AtIYXdXycbQzw/Z5P8gj2yizQOQcCV3IvI3esFSFwwiahYzGsd1uMpywTXFDYjH5vZePCRamogGLrLcyUk0lPJ/fRrXXcyqst1+sAPeL9AjkoAp1vr65lPr26LJL3LnFtsprUkr/0HxcSYHAYjsK2XzqCddrGaJ7WszxdBotiUxs0dUEvFEErEQkC3/MYNKLC5wQowBMQvDD2J1J/zEmhm+8uf90KElt2gSqQfNPRAVn/O//Zz8tg2eyYC5Ou3A3a5bpKt/Xks5euf4qElVyCMtzVVXirIvXafFNuLh4H40GCFy0CmOqHbxRbPC0HJ9FPAkAY6gaCUwpRULvzKyjSVSfYgt+3vdCGDp1nC4kZsSol6TPuuEQApGjCvX7QwByFQv/03QOQ/okZoxJ/iE7n/8jXQ7T5x4H11QkKZliPkIS/zNPKIfzhwZ7frpvn/6UrwfOGFuOzIUG/w0mXDmNGxQZN7cYjEKbtFj57JzstCSksQXtsSnuuNgrCX1MjFY0/nDTU3tFlk6niZ0XM99hKP9INHtkJAtV7RUH3051nrbz2Fbl8YhH7pkfmkS3yB5+KwnZOnfzvIY4QFt4t3349ufrsuXskjesZAv0hfS6sUeJa38h4Y3REWQKsdSzv+9MOkQRpENZ8Du31ZrX8LX5plo+esc1WQYHRSGEYFhsX1ltImoNmTZ7NWsGY0stYq1byirHhk5s/l /+qSjNk5 97qWb0B/QjR9GRFNOznrdyvWtnyfz28n8DKUSq5c4auJsanK6aAitrqkjfG0Sv6MJheJf/FZnzPD58chP2g+2vFo/NOmPyzp47xiR/vu+oFrZO2gTozbeshebbbv3elig/mKhOcmA0aWeZDGluEFcCX3NaLRkuEZk53x9j76UhJHw0YzV2w6IBGsT+m0EZMtXjaqRle5AOjo76MWq5xisxHLW1VR8nH76xoqz 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: On Wed, Dec 07, 2022 at 03:19:55PM -0800, John Hubbard wrote: > On 12/7/22 12:30, Peter Xu wrote: > > We can take the hugetlb walker lock, here taking vma lock directly. > > > > Reviewed-by: David Hildenbrand > > Reviewed-by: Mike Kravetz > > Signed-off-by: Peter Xu > > --- > > fs/userfaultfd.c | 18 ++++++++++++++---- > > 1 file changed, 14 insertions(+), 4 deletions(-) > > > > diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c > > index 07c81ab3fd4d..a602f008dde5 100644 > > --- a/fs/userfaultfd.c > > +++ b/fs/userfaultfd.c > > @@ -376,7 +376,8 @@ static inline unsigned int userfaultfd_get_blocking_state(unsigned int flags) > > */ > > vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason) > > { > > - struct mm_struct *mm = vmf->vma->vm_mm; > > + struct vm_area_struct *vma = vmf->vma; > > + struct mm_struct *mm = vma->vm_mm; > > struct userfaultfd_ctx *ctx; > > struct userfaultfd_wait_queue uwq; > > vm_fault_t ret = VM_FAULT_SIGBUS; > > @@ -403,7 +404,7 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason) > > */ > > mmap_assert_locked(mm); > > - ctx = vmf->vma->vm_userfaultfd_ctx.ctx; > > + ctx = vma->vm_userfaultfd_ctx.ctx; > > if (!ctx) > > goto out; > > @@ -493,6 +494,13 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason) > > blocking_state = userfaultfd_get_blocking_state(vmf->flags); > > + /* > > + * This stablizes pgtable for hugetlb on e.g. pmd unsharing. Need > > + * to be before setting current state. > > + */ > > Looking at this code, I am not able to come up with a reason for why the > vma lock/unlock placement is exactly where it is. It looks quite arbitrary. > > Why not, for example, take and drop the vma lock within > userfaultfd_huge_must_wait()? That makes more sense to me, but I'm not familiar > with userfaultfd so of course I'm missing something. > > But the comment above certainly doesn't supply that something. The part that matters in the comment is "need to be before setting current state". blocking_state = userfaultfd_get_blocking_state(vmf->flags); if (is_vm_hugetlb_page(vma)) hugetlb_vma_lock_read(vma); set_current_state(blocking_state); down_read() can sleep and also modify the task state, we cannot take the lock after that point because otherwise the task state will be messed up. -- Peter Xu