Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4670551pxv; Tue, 20 Jul 2021 09:00:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4pm4FIu6w0yGFhBi3bkBIzjhtaflf+o+MA/l90k5EdP3MZ23PClkjPJD+iFZWEpIW0jIU X-Received: by 2002:a17:906:9719:: with SMTP id k25mr33647945ejx.460.1626796828479; Tue, 20 Jul 2021 09:00:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626796828; cv=none; d=google.com; s=arc-20160816; b=C1hNCWGeoYQWGveF6RzfCbZRBhB7IXf5g1NXvf5N3sUKC1yclxgNY/kIkeTnNKA6Je spPskdJZp8Oi09xqA0OpYI0bBJgyGbh/26Uy48xcymzqRgYGkC1AMolalyqFsA+iTMsy bA81GfQ6Ta3FW5o7Is/YjNOC3Fhr5WQha7ohVpCIi1UtU7G5yXg/l0r5R2+9Q1efhJrL K/k/so4xrTWcDKNnnZBjnoxGD1xAR7EBWIefHInovE/07K7zXnt0oRgCjQHqaBgbpmnl eNWa04U7gtkxf3+clymy1zQUKKcM/wBbV96oZNdxhUe3VRihS1nIM3uqR/qVBDAE+KV9 O+Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wvbgt8bgFi4UrfnwLKyGLkkhsgSh4h/OpNZ9UZYODgk=; b=r743HJaefwHKAv3Zy7lwFzX82GaBGDRDtqDSEwTQc8GgTHt6IXKXPiCuO96E/KaKnq 0BavknJwL6inPSOcCQoJqlB75kQkJK+wZrbmZnvqfKcCv4GCNq2ZkCeOCO+DKC28ddP9 /xiZ2bUZturumAa2WpsUIIRUcMq8DqzPFBXuBrQZim5uHFBQ5PoweCqQhOIhEHrolsJ1 az+mS6NFTcCj4jAggTKXf5QDQS57h/0sKgTElb+Rduj0X19FmCFqEuE3mDvnKB8/Ryru 8q+TROvHPVER5CfsDvO6slcBiwDttkImjS7i6KeXcvLjZGsPbko3o+dZLZa/xzD+DSUp 48zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NoH0ewiK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x4si16740728ejw.729.2021.07.20.09.00.04; Tue, 20 Jul 2021 09:00:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NoH0ewiK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239778AbhGTPR6 (ORCPT + 99 others); Tue, 20 Jul 2021 11:17:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42090 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242655AbhGTPLV (ORCPT ); Tue, 20 Jul 2021 11:11:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626796316; 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=wvbgt8bgFi4UrfnwLKyGLkkhsgSh4h/OpNZ9UZYODgk=; b=NoH0ewiKbg7b81flumBFSbzclg2r3QES7z+rtet5Ur0q36dVFCUxzFTs8RhMdvoAwgW2Mi XpkLJG+hM7ch7DD+KLLrHZmEiJ6EDDW1KHK65byhNgcAZ96pbiioIAR/fvRReTrzdyQOuq o57hbQ37edR987m4wpfgNPTaCh9xJ6E= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-140-SKfbbWMiNsOUOa3WX-94hA-1; Tue, 20 Jul 2021 11:51:55 -0400 X-MC-Unique: SKfbbWMiNsOUOa3WX-94hA-1 Received: by mail-qv1-f71.google.com with SMTP id l4-20020a0ce8440000b02902d89f797d08so19629362qvo.17 for ; Tue, 20 Jul 2021 08:51:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wvbgt8bgFi4UrfnwLKyGLkkhsgSh4h/OpNZ9UZYODgk=; b=AYXajTZzQyZWSRoAqcOctqVlSHh7ebHy0zC+FyoTcU8jaArUkgtOxhYbl2NGC4iFq3 O0OH3xYdTj0eeFZtwkKYNce3Je+7UD5SyenvozlduBoT9D+US8mDjVS5gue9UcIy2KVs VyudbL81u6cgD2peDcLkw2Kg4YbYfd4XErOwKIZGCOeuxrVaFyvsO6eiBTqJOnmCAAlh LY72wWFKz0DBpWWDFIU2aiVk0FpRY/CwTTaKT0s3rmu2ZAXw4aZ9kmS4ZuFmxUYn8GSw wRxWI98Mw4jzLuplM9FGz87HyN4rTYWJen79IrLMfaZgDHlorANDDtw3/BMu5VlZMAxX U7xw== X-Gm-Message-State: AOAM533IodqF/GCMSSUn/WRxQhUmFFMeVRoyAMGKouqnKaE/v3mKW5Sf 6B97JyKua51IrUHiZdkXYGFf5BKYmUAPiZMB5oEqZv/LSPyEZRYHVuLHWBEPj7VC99NqaELGnxU +A458IHCE8stJsWRpzOpKJ2xv X-Received: by 2002:a0c:d644:: with SMTP id e4mr30635655qvj.45.1626796314845; Tue, 20 Jul 2021 08:51:54 -0700 (PDT) X-Received: by 2002:a0c:d644:: with SMTP id e4mr30635629qvj.45.1626796314654; Tue, 20 Jul 2021 08:51:54 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-65-184-144-111-238.dsl.bell.ca. [184.144.111.238]) by smtp.gmail.com with ESMTPSA id c15sm5467012qtc.37.2021.07.20.08.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 08:51:53 -0700 (PDT) From: Peter Xu To: stable@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Hugh Dickins , Axel Rasmussen , Andrew Morton , peterx@redhat.com, Hillf Danton , Igor Raits Subject: [PATCH stable 5.13.y/5.12.y 0/2] mm/thp: Fix uffd-wp with fork(); crash on pmd migration entry on fork Date: Tue, 20 Jul 2021 11:51:48 -0400 Message-Id: <20210720155150.497148-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <796cbb7-5a1c-1ba0-dde5-479aba8224f2@google.com> References: <796cbb7-5a1c-1ba0-dde5-479aba8224f2@google.com> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In summary: this series should be needed for 5.10/5.12/5.13. This is the=0D 5.13.y/5.12.y backport of the series, and it should be able to be applied o= n=0D both of the branches. Patch 1 is a dependency of patch 2, while patch 2 sh= ould=0D be the real fix.=0D =0D This series should be able to fix a rare race that mentioned in thread:=0D =0D https://lore.kernel.org/linux-mm/796cbb7-5a1c-1ba0-dde5-479aba8224f2@google= .com/=0D =0D This fact wasn't discovered when the fix got proposed and merged, because t= he=0D fix was originally about uffd-wp and its fork event. However it turns out = that=0D the problematic commit b569a1760782f3d is also causing crashing on fork() o= f=0D pmd migration entries which is even more severe than the original uffd-wp=0D problem.=0D =0D Stable kernels at least on 5.12.y has the crash reproduced, and it's possib= le=0D 5.13.y and 5.10.y could hit it due to having the problematic commit=0D b569a1760782f3d but lacking of the uffd-wp fix patch (8f34f1eac382, which i= s=0D also patch 2 of this series).=0D =0D The pmd entry crash problem was reported by Igor Raits = and=0D debugged by Hugh Dickins .=0D =0D Please review, thanks.=0D =0D Peter Xu (2):=0D mm/thp: simplify copying of huge zero page pmd when fork=0D mm/userfaultfd: fix uffd-wp special cases for fork()=0D =0D include/linux/huge_mm.h | 2 +-=0D include/linux/swapops.h | 2 ++=0D mm/huge_memory.c | 36 +++++++++++++++++-------------------=0D mm/memory.c | 25 +++++++++++++------------=0D 4 files changed, 33 insertions(+), 32 deletions(-)=0D =0D -- =0D 2.31.1=0D =0D