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 5A0F6C76188 for ; Wed, 5 Apr 2023 15:54:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF7636B0072; Wed, 5 Apr 2023 11:54:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A80D06B0074; Wed, 5 Apr 2023 11:54:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8FA6D6B0075; Wed, 5 Apr 2023 11:54:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 79D896B0072 for ; Wed, 5 Apr 2023 11:54:55 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 77D694024B for ; Wed, 5 Apr 2023 15:54:54 +0000 (UTC) X-FDA: 80647785708.16.53FFF89 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 269F514000B for ; Wed, 5 Apr 2023 15:54:51 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="D1SD/LFI"; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@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=1680710092; 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=vp3w4ancoxCL4bBUeQO/Nr+Lv6anEYF8uurUtTzkQO0=; b=lFNd8V0dvg6ZbwC8Z6QURHImBUQ5Y7kNjvyJR74H0FKTev0syudU/s4m+Pkozrnt12J27i nm7mXEk0qCgnPd9exChTgEIri0Pm+nk1qNmXOpAWEAGcSXxCk9GOXZssRzKz3dVKbzcjRj 7Bzx+IqKLCx6c8bE1Nb5DvTuFlOp7PA= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="D1SD/LFI"; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680710092; a=rsa-sha256; cv=none; b=FNzaY27wO2vX4OgcV8paKMkVtBJSWmnPj+I06LLaPUF+lS6wMtI0IEac/5WUbwkP+X3mgM IyqzCdYD5E6Pz7dUVubghktiDCTKBW2UqswJQdOeO0Y9vwneDdqGaw+9/PF3m57NffIQ86 alFTQ7iD9R7YRIrivJg45YIoVBsCroA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680710091; 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=vp3w4ancoxCL4bBUeQO/Nr+Lv6anEYF8uurUtTzkQO0=; b=D1SD/LFI/xktYCHzgJmeRXgkhrOxW6lB9GWaAhcQpdIMX7TDECoEYsGc71nwYj1bDvY5u7 iqle/KRZRb7Lt0NyRPgQoULjMl2TQCENTnYlZ86D4WjrzcjADVo9CEi16BElR9FIbYLMFD dtZPozeXslyN37kWkBXovycUFfWIp+U= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-SKliL2t0O7urf49uFR5Q9A-1; Wed, 05 Apr 2023 11:54:50 -0400 X-MC-Unique: SKliL2t0O7urf49uFR5Q9A-1 Received: by mail-wm1-f70.google.com with SMTP id bh18-20020a05600c3d1200b003f05a99b571so3103698wmb.8 for ; Wed, 05 Apr 2023 08:54:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680710089; h=content-transfer-encoding:in-reply-to:organization: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=vp3w4ancoxCL4bBUeQO/Nr+Lv6anEYF8uurUtTzkQO0=; b=p05BskTqyEp6ELLlaSFSku0hRpiheEWpjGEGKT06lVxe85S0633R4YtWOJUAC4OpqD m+WELjagA7WeLTSmvNj/nEUPZ2sPj9RaCGbzjxcmqHFz8IEjrB+5fgY+m4HgALYIGuuq wdKMp9/vmWmPogVtkNQ/52e1PUtoGs1H4DN2NAh/I+89xHOFj/FDQwZ4L8OkXlTdlus0 ju89GLQjen5vOGFnGlvj8H2ThohXJi9z3uNULr0zXT2rpAzhrvar3DRy16Xx4Rcu2MBy 6r9OAay6l4oAyOp6rxcCjfWTFzRjh4upgpPmMQvpjFyrthCAJT/cN07j0goEN1MgYBwt S2tA== X-Gm-Message-State: AAQBX9fZBcI5u7P8tOXsymMy+uFvmQjtXy5cLwb24fnTHo0Ly44CiNGm p2QxEOBBzaJigTyIWGcxcsWa08ngkwjVaWmnuyRJR8BP/HPQkaDtHcyXthpz1eEYBc9ahrW40bT x+VUA/TGzARU= X-Received: by 2002:adf:e0c3:0:b0:2cf:e747:b0d4 with SMTP id m3-20020adfe0c3000000b002cfe747b0d4mr4423523wri.40.1680710088969; Wed, 05 Apr 2023 08:54:48 -0700 (PDT) X-Google-Smtp-Source: AKy350bvV4mM6l4icTruP+qcXPPdpwTQeXltyFNrRrLmVB/ZGcHH+qjmdVbXXVCHqfw84CwFj+T03A== X-Received: by 2002:adf:e0c3:0:b0:2cf:e747:b0d4 with SMTP id m3-20020adfe0c3000000b002cfe747b0d4mr4423506wri.40.1680710088611; Wed, 05 Apr 2023 08:54:48 -0700 (PDT) Received: from ?IPV6:2003:cb:c703:d00:ca74:d9ea:11e0:dfb? (p200300cbc7030d00ca74d9ea11e00dfb.dip0.t-ipconnect.de. [2003:cb:c703:d00:ca74:d9ea:11e0:dfb]) by smtp.gmail.com with ESMTPSA id c1-20020adfef41000000b002d322b9a7f5sm15323873wrp.88.2023.04.05.08.54.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Apr 2023 08:54:48 -0700 (PDT) Message-ID: <19dad66f-4ec8-358c-df7f-35481f855c81@redhat.com> Date: Wed, 5 Apr 2023 17:54:46 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: [PATCH] mm/khugepaged: Check again on anon uffd-wp during isolation To: Peter Xu , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Axel Rasmussen , Nadav Amit , Andrew Morton , Andrea Arcangeli , Mike Rapoport , Yang Shi , linux-stable References: <20230405155120.3608140-1-peterx@redhat.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230405155120.3608140-1-peterx@redhat.com> 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: 7bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 269F514000B X-Rspam-User: X-Stat-Signature: nn88xxt7ojtwwwq6bhjk95aqdxy4hdho X-HE-Tag: 1680710091-478472 X-HE-Meta: U2FsdGVkX1/oBPx+5ZWff0DbO3NEwnV2dZvm5pUEF/XwRtq0uC9VDeipbN9Luw/Opfe+ptAdmnYJh2n0H+Q9huMJrIXUROJ2S4PiZvCvrR/HI5rjr+rxtUtBkuxuuXBn383aGFCbxQVt3IsCA4Em6Ebr1VrMu3TVc50GjT3hLRjaHbhB/UDIksFz1cr1X6d/GrPYGP04C9b5K5NWW3WB4qnulPMRZi07Av6I+k1QsWq13e6jpiU4pOrxSyfhkn3Y63WHU3Nrlx4jYQmu3zdUkaxIS5yszgB9yAvU+egZVFJV6dgr72/iM1CBNKL6t+ClLnBVRDuarz5vb6kE3iis4Wf4ABQavFY/mBC3YZProSXFbT/iThBRB9aSTRqbKkSqPUeMDPxz12jPT/FtaJPwnj4yGFahEbL7JPULMUxD0I28RNV6yeW+acmRBuyBAXiWpomi+nEcR22LB390sBsVs6e05sqPi3UNSr604jROB21Apqmgdf8XmfuhO0eRzjfv5auBR8SWKGTVhcVslODlTMgib26vaceIbf6bsSwMwkd5u8VLbieuLO+nz5C28P3D8/PnlyKNM1t8uX2ZEt1g9/M1yq6pzZzyX7j7aEJNXtLq2pWzCIrfYZv8b06zD1UQkHmOBKQeZKKp5vJ4w8IjfXoIj4e2F8qGSlI0p6Hw6rqhSN8pnk7OMOsxKTZRtJ401r811x69G7H76JjwMvky33FMZ8a9oG3kyQRg+WXAbWk7dRQdConqQp5VEvHtj/w86j2bCTmQWIJ8NqliOjC72GXL+m7xMFmb5GYwRvD4pkK+zxamvRYqHDYKIBmBrCok9U9Jy+HyPgBXSSwXMv2hx1EXWYaHzmQ2sNhxuqUl09ifezSzokDTDMInKsrMhYnSqjL+/wNS1wErmL0r8Dd+ZZCULI9tnUvYVcSNV62LSrdJiAZOkil6wBcOmH6oB4pkz5tqUqkj1UcWV3iM51b 7SXFZQQ9 34Pl8eJdl/WryKVJxZhuTzcuDOOm7/vbE25DlpEfFPJDew/m9j67rcyYRIyotW8CE5BPe4ZUcxeEzQUZDeXd9xueYwnngr3M22ec6WTg82Oh9t1b5qtQBtRPOCEhGHNPjgZ/yfisadrlbt3pFzc7VsJjtbyM5sMvCEVAG43wpqJBNMXiiW94Rt/VFkAW3PlMu1iYyTazzehhIcbWVAPxaMIMxt8dyOV32SrRmR4TMPUe1gAcvNoY9eJpdoT6j7OvHfOd+ld1a/G7qbul81KE7v8ixsNtS9JHBWlEMaLfy79vwo9Tqw6mA5MwURBIzT2xUbDRM5l5gjtO45wOrktAv9dMfXYUiFdXWt54IWNnRR8du8ws1zgoUn+dwItB0NI3+c/VSuJODZnvKrNzC848nu4PfDbm4p4EkTylw75CGdObPWY1XPv1YkISMwc95rnbM4iGbvmBaOqdD4qOc6sPG+WwuUo8wdIHWrcSGPna4IicSFekVD/mBV/m0hxDOAS+Jcc0S9ml6KJTcevRWo2oZksvOIFstrYoTdBPTNlfX2Vx6Tpo= 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 05.04.23 17:51, Peter Xu wrote: > Khugepaged collapse an anonymous thp in two rounds of scans. The 2nd round > done in __collapse_huge_page_isolate() after hpage_collapse_scan_pmd(), > during which all the locks will be released temporarily. It means the > pgtable can change during this phase before 2nd round starts. > > It's logically possible some ptes got wr-protected during this phase, and > we can errornously collapse a thp without noticing some ptes are > wr-protected by userfault. e1e267c7928f wanted to avoid it but it only did > that for the 1st phase, not the 2nd phase. > > Since __collapse_huge_page_isolate() happens after a round of small page > swapins, we don't need to worry on any !present ptes - if it existed > khugepaged will already bail out. So we only need to check present ptes > with uffd-wp bit set there. > > This is something I found only but never had a reproducer, I thought it was > one caused a bug in Muhammad's recent pagemap new ioctl work, but it turns > out it's not the cause of that but an userspace bug. However this seems to > still be a real bug even with a very small race window, still worth to have > it fixed and copy stable. > > Cc: linux-stable > Fixes: e1e267c7928f ("khugepaged: skip collapse if uffd-wp detected") > Signed-off-by: Peter Xu > --- > mm/khugepaged.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index a19aa140fd52..42ac93b4bd87 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -575,6 +575,10 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, > result = SCAN_PTE_NON_PRESENT; > goto out; > } > + if (pte_uffd_wp(pteval)) { > + result = SCAN_PTE_UFFD_WP; > + goto out; > + } > page = vm_normal_page(vma, address, pteval); > if (unlikely(!page) || unlikely(is_zone_device_page(page))) { > result = SCAN_PAGE_NULL; Yes, I agree that would be a small race where it could happen. Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb