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 B08FAC77B6E for ; Fri, 14 Apr 2023 14:23:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 05E0B900002; Fri, 14 Apr 2023 10:23:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 00D546B0072; Fri, 14 Apr 2023 10:23:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1764900002; Fri, 14 Apr 2023 10:23:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id CE2486B0071 for ; Fri, 14 Apr 2023 10:23:29 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 98AB3A02F9 for ; Fri, 14 Apr 2023 14:23:29 +0000 (UTC) X-FDA: 80680214538.02.0B097AB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 893221C001B for ; Fri, 14 Apr 2023 14:23:26 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=V8Reh+qP; spf=pass (imf20.hostedemail.com: domain of mpenttil@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=mpenttil@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=1681482206; 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=hltDKbvNvHexES28VJ8PrHZ5axydk/DuBFAgC2CjweM=; b=geQDU7XnlbKrZGPGsEX45ADWZzsUkdDFcxJB2uaeL4uYU4I4xfynvOdPBZeIsPAf9HE6pu GZwrNzu80AWA5krEgaSyqWLf0jjft4AA7bGd7En1ALcmhKrisKi3tXE1ZfBXUSg+FdCTxA NVp68pjNaSnTJwhXyUTXbXHyKpFqkhU= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=V8Reh+qP; spf=pass (imf20.hostedemail.com: domain of mpenttil@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=mpenttil@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681482206; a=rsa-sha256; cv=none; b=2JmwUsCD9CA67c1foDH3RVfp+HXNMAAquitu1cHwhRywX0cHU9uPYZWuCF5KZFkTjBinWu 4oKjVnbiDVE4aH7VfOgIvwF8fDv2xjiLhXqaRsydUCI+8MggOsyehqybTL69gFlBayJ9pH 0s347YAIwO0nhkt/VA/6sFT7Lw5qYfA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681482205; 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=hltDKbvNvHexES28VJ8PrHZ5axydk/DuBFAgC2CjweM=; b=V8Reh+qPl/9E0mwSJrYyi3a5ACXmCc8MMw+dNGv+X66tYGGVTh3qmAg+IHiZacIM1EKKsA J/SGwsz6SWu9q3khd/+NO7sGNKNI747UmuH6egz5nPi2rGiawt0bdFx6Kxa2+rNrnrqr6T zTSdawlY4gubuDdClOyAByQBdkE9yik= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-508-xsZzH4pNOh-zKjbcuggQ-g-1; Fri, 14 Apr 2023 10:23:24 -0400 X-MC-Unique: xsZzH4pNOh-zKjbcuggQ-g-1 Received: by mail-lf1-f72.google.com with SMTP id s24-20020a197718000000b004ec89359465so6329132lfc.17 for ; Fri, 14 Apr 2023 07:23:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681482203; x=1684074203; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hltDKbvNvHexES28VJ8PrHZ5axydk/DuBFAgC2CjweM=; b=jAGPkj04OyU4eGFangwPBR17UYSodh5/vYZyXByuCmzz+WxNX/Leu9nGZyQG7lHqHz 3hf8uLmzDmxHzxQyJ6M1Hx+SgYpSaymPML3Lf9SnVn8yDnDRbowQWyjak5vNSJRZUIJe cv44ArAmUzKToSQ2aynTubq9pjxX8zlF7jqIe9Fia22WAkzejvUEAHMfOIrCwMXnPjvo sYVmwofDBF22hp8nxGryi4s4Al8ym27sKaBQSkAqip4gbJlL6vUNUu5Dsn0yS0t9+SUU R9mM+r3bsEqAMzz1bIGV9CFx4A2sptIiqnjOaugpDZZwrORQmqMU/oxsJqPc3zi6+Dn5 POhg== X-Gm-Message-State: AAQBX9fnHf0FOMoKGMCJobOv0xFPfVR5L02h771UgbyiiaaK6fboXo/4 KwjBJG47C8e/EIztVYv5Nvf1DjJybP0Mw5DpcQinc/tmEASKJ4uoGGfwpj36awoBl6DGDkgzCOB RaMvIIs5gxQ== X-Received: by 2002:a2e:a792:0:b0:2a8:ac66:eeab with SMTP id c18-20020a2ea792000000b002a8ac66eeabmr768212ljf.0.1681482203007; Fri, 14 Apr 2023 07:23:23 -0700 (PDT) X-Google-Smtp-Source: AKy350b7VPoQO09O0c49XgZ4B2B4eCvIBorexhqlHcLjtGZkMsk2NCN98yoWaRivKxjs6AR2MoVjZw== X-Received: by 2002:a2e:a792:0:b0:2a8:ac66:eeab with SMTP id c18-20020a2ea792000000b002a8ac66eeabmr768199ljf.0.1681482202680; Fri, 14 Apr 2023 07:23:22 -0700 (PDT) Received: from [192.168.1.121] (85-23-48-202.bb.dnainternet.fi. [85.23.48.202]) by smtp.gmail.com with ESMTPSA id v7-20020a2e87c7000000b002a2b9d9429esm832740ljj.117.2023.04.14.07.23.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Apr 2023 07:23:21 -0700 (PDT) Message-ID: Date: Fri, 14 Apr 2023 17:23:12 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [PATCH 1/6] mm/hugetlb: Fix uffd-wp during fork() To: Peter Xu Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Axel Rasmussen , Andrew Morton , David Hildenbrand , Mike Kravetz , Nadav Amit , Andrea Arcangeli , linux-stable References: <20230413231120.544685-1-peterx@redhat.com> <20230413231120.544685-2-peterx@redhat.com> <9cb84b60-6b51-3117-27cb-a29b3bd9e741@mbosol.com> From: =?UTF-8?Q?Mika_Penttil=c3=a4?= In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 893221C001B X-Stat-Signature: sn4djwbpfgfispn87astddp8eibxd87d X-HE-Tag: 1681482206-309601 X-HE-Meta: U2FsdGVkX192Cu1QaHA0CMZ8eYn5DM23Ni/WJuCU1e0mVc03SBxXTlJfB5xVt6Vlu87amCecIzRntcw8yPDb62Gkm0CiGhxOjtyggY9H3QU6SICsb44y/pCVIuF86OUCqGiaVM2lwA6NTynk9h9Bw4qmcBn38PtYffawqZ4puQXohbnfUcRXjyd9x8knRctUB0/4ZXrWteyojP0RvV/nR5wtwzZzrL5CBazFM/2sYECOULV4dqCLr+y4buQtwErNfmka5/m+tPblZiqNIUg4djd/MIz3xim0bAgpNKfXbrEF0ydtk3Tywv/xv1QVQH4+KqyZns0IkVAzUZWT2dkaShq2I86FoOL0jL7hUbNnEHMFS6Lza0BGD3+zB2tyTSh/FIG+cO8oDUTacpZpfCG91Ij72GGEsPS0ynmTmxNUkSYTDhcbwQDHu8b9RmKUMQoGT2fMY/6vIBnqPjuwf4ALCkQ87MNjrcsUW162ATQEOA5Y07Cp1xjf8936i28nslSmCDDMmAPwwbgOf4mCUc+EwWoXYYcwNOROjViOcfYqnlYSemOg/cfFyLTNt1RxZId+nrmpbUBBMqgEgzzJUfRVv008/5ZRIc/NhC7sAZTx9DNo9Mtujs3nl+YKOqhbUEC6noJWKWOGtdSN/pMID9ZBGdk1pivXZyh1ViNyZ4Ko9u1FIqJ0Sl645mJmZ/qyv6aPrl6yMfrSBcZ38X4lqBRyyfRKbI/YgSmkuy0eWqFCeKkSK0BB3+Oa7KxDnlEdHPF6q7wANjJl6TZYlGYZ5PbfPlocdtSVUgM+fUi+raeYDv7QHGZ/ZC24kaLgO6SjfI4wMT0Hd+/lNCEQY3LXKNPvYmblvL4JCSavyKB5g+XfXalMKJfakKTfZ8l5l3RUTx4iitMz9tMyGz+27RH5ZAaAy/TXB/B43yBJBKwy+gdNE0B4WIMjYHjETSkIjpWTVPfB4Y6agTxDellPG9vG2Ms hF3Kq0qS yUvoLKrFbEDY6GHHTNni/gl6dV+ckA2kCz5Mow7sDgu9/5ccI/w7IERLoZCtWD0MkDwwOrV9412TQFsHhAT7RBaCvPKzU2ebRoD8muhjXRX7B6S3PigOj1kdfKPJ77uSqPgCWcBfwU4rmU9iNwEdDXn5bQmYW/1dETTEeE+j5ayQ3jK0OKcnhB6fdkPS+uc0aQ1NO/4sgq54SjJL9EXou/BpiMsxn0V5WBABFBWqO1b041uaXElDQwmC2MpyU8SMnx5XuBRRm4P3WUTij2ae92KytC5g3WegwWSOyCehi9PX4GeR1EV3Yyb9FDm0+xMjT69G5ohqLU4Bs8GM1dXpTZZX6sabuq43/fN6PoWRpI4mcc7NfsNgNKsZ5KEp2T/FiF/mekOq2QlCTX3zT0WNN3y8uiCq2f8LTGzYcZ+OxmcRz9ApBAPaCvAggL0WdvNdGxFmd0c3AI2J8HB4bu5Qm8OKcaPUAMaN09O8+ 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 14.4.2023 17.09, Peter Xu wrote: > On Fri, Apr 14, 2023 at 12:45:29PM +0300, Mika Penttilä wrote: >>> } else if (unlikely(is_hugetlb_entry_migration(entry))) { >>> swp_entry_t swp_entry = pte_to_swp_entry(entry); >>> - bool uffd_wp = huge_pte_uffd_wp(entry); > > [1] > >>> if (!is_readable_migration_entry(swp_entry) && cow) { >>> /* >>> @@ -5049,11 +5050,12 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, >>> swp_entry = make_readable_migration_entry( >>> swp_offset(swp_entry)); >>> entry = swp_entry_to_pte(swp_entry); > > [2] > >>> - if (userfaultfd_wp(src_vma) && uffd_wp) >>> - entry = huge_pte_mkuffd_wp(entry); >>> + if (userfaultfd_wp(src_vma) && >>> + pte_swp_uffd_wp(entry)) >>> + entry = pte_swp_mkuffd_wp(entry); >> >> >> This looks interesting with pte_swp_uffd_wp and pte_swp_mkuffd_wp ? > > Could you explain what do you mean? > Yes like you noticed also you called pte_swp_mkuffd_wp(entry) iff pte_swp_uffd_wp(entry) which is of course a nop. But the fixup not dropping the temp var should work. > I think these helpers are the right ones to use, as afaict hugetlb > migration should follow the same pte format with !hugetlb. However, I > noticed I did it wrong when dropping the temp var - when at [1], "entry" > still points to the src entry, but at [2] it's already pointing to the > newly created one.. so I think I can't drop the var, a fixup should like: > > ===8<=== > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 083aae35bff8..cd3a9d8f4b70 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -5041,6 +5041,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, > set_huge_pte_at(dst, addr, dst_pte, entry); > } else if (unlikely(is_hugetlb_entry_migration(entry))) { > swp_entry_t swp_entry = pte_to_swp_entry(entry); > + bool uffd_wp = pte_swp_uffd_wp(entry); > > if (!is_readable_migration_entry(swp_entry) && cow) { > /* > @@ -5050,8 +5051,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, > swp_entry = make_readable_migration_entry( > swp_offset(swp_entry)); > entry = swp_entry_to_pte(swp_entry); > - if (userfaultfd_wp(src_vma) && > - pte_swp_uffd_wp(entry)) > + if (userfaultfd_wp(src_vma) && uffd_wp) > entry = pte_swp_mkuffd_wp(entry); > set_huge_pte_at(src, addr, src_pte, entry); > ===8<=== > > Besides, did I miss something else? > > Thanks, > --Mika