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 5FF9EC61DA4 for ; Thu, 16 Feb 2023 17:05:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D891C6B0073; Thu, 16 Feb 2023 12:05:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D38F46B0074; Thu, 16 Feb 2023 12:05:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C003E6B0075; Thu, 16 Feb 2023 12:05:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B10786B0073 for ; Thu, 16 Feb 2023 12:05:03 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6882C1404F8 for ; Thu, 16 Feb 2023 17:05:03 +0000 (UTC) X-FDA: 80473780086.25.C417CB0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf02.hostedemail.com (Postfix) with ESMTP id AD3D98000C for ; Thu, 16 Feb 2023 17:04:59 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LkUx0EwO; spf=pass (imf02.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1676567100; 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=EAJARXHQNAhyOCCyC2BnQ09ROyHtptUeMjLNwbeK/jY=; b=oV0Qe2/wxsbJPzUiHyRYYh1jBHykoZiSMxU5n0qNPDKx5OjtisqtG6zLwt072W2GoVUzf9 dTEbOiJd+GvXxLVtWXSA78/i5IljKlcEhLgrIBjeGmgDwBsePWNLxvvsiTD3WEL2DdvLAW J7MCm+fOe2Qy7gf5YfeSF9wj/dVaewM= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LkUx0EwO; spf=pass (imf02.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1676567100; a=rsa-sha256; cv=none; b=EDPfYDc0Geiq/VnYLS2EUhMATDr5w/RJOSv6aQVyEiknFwKeU7w6QcpCEjuytUr9NyCbAL YQHOt1LPIF2HLgyil4FvcZgLcOGcFCvweRymnLpT11vmyuZjiYXMbCqriHeo8Gzaw1g8Qj 6JBmJ3BMZlpNKCjLy8vSiFozhoWQog8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676567099; 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=EAJARXHQNAhyOCCyC2BnQ09ROyHtptUeMjLNwbeK/jY=; b=LkUx0EwOsbgSF5yf5VcZHpAhBTCTnllPax46wxXl/1jjiRuq47mCuKB3av/MuUoaKfnFzi lqae7iccGROfkv7Nxs4ld+Vn0Z4Ya7wQ/zI3hHRVotvECQFhsabzvItuS1Tgs61+YCokav xadtUGvMTTb+bjzQ4kkHFIJeTS6Z2SY= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-522-oTw1mwZDPxW1GNU_qLfwMQ-1; Thu, 16 Feb 2023 12:04:57 -0500 X-MC-Unique: oTw1mwZDPxW1GNU_qLfwMQ-1 Received: by mail-wr1-f71.google.com with SMTP id bn14-20020a056000060e00b002c5c4d8ced0so4084wrb.1 for ; Thu, 16 Feb 2023 09:04:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=EAJARXHQNAhyOCCyC2BnQ09ROyHtptUeMjLNwbeK/jY=; b=3C3UbwTEqtGMTh2aD/eVvWm4LbDG/LXKEnApqOLGRhnGayM7BKJvTbfE3hgVOK/lHa 6f9vPncOpb4lU4iYqu3Hs24VVdY86EFwZYtcASGtEsR+MCqtJMVHG9DKziPUv8oKqkkM iU9cIKeZx8C17fdLfSK65CXanBOlDKtabLz9+tJRO8ZXDmriD4L58fcyM2YNhyVQDKHc TzU2HF2DkZuRhETrb/FS6TA/qkryWRe8+aOqc/KdmGFDX32CbfRtRrrfSY0AEA38/x/C lDDAUlWsknpjF6Uzjb9j5KMZqJ8bpZaUmoImgWn1ybACPMu+DYQCg/b/7EhSHZtUIr/a qbNQ== X-Gm-Message-State: AO0yUKWQz4cgqn/IsyHYk+RStY3l+DuTlm+hiWFUMKOPbobhoiTtuEYr SGYaaGfPdRfCHL2ln/aWa3VQZPg1USmdFdsr3NPU0KkJRUUC7q2ecPYdoCGlyTTc9HP9c6W1Cif ICT36SECQYUg= X-Received: by 2002:a05:600c:1d0f:b0:3df:9858:c03f with SMTP id l15-20020a05600c1d0f00b003df9858c03fmr2424327wms.20.1676567095533; Thu, 16 Feb 2023 09:04:55 -0800 (PST) X-Google-Smtp-Source: AK7set9iS3qwiL5Y9tVloR5loMJzSSh/RVxr2XYgvc64ngnOoIKwusZ8GTOPyQ1l0/LCC+Rtrdk7Uw== X-Received: by 2002:a05:600c:1d0f:b0:3df:9858:c03f with SMTP id l15-20020a05600c1d0f00b003df9858c03fmr2424281wms.20.1676567095128; Thu, 16 Feb 2023 09:04:55 -0800 (PST) Received: from ?IPV6:2003:cb:c708:bc00:2acb:9e46:1412:686a? (p200300cbc708bc002acb9e461412686a.dip0.t-ipconnect.de. [2003:cb:c708:bc00:2acb:9e46:1412:686a]) by smtp.gmail.com with ESMTPSA id l14-20020adffe8e000000b002c561805a4csm1966327wrr.45.2023.02.16.09.04.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Feb 2023 09:04:54 -0800 (PST) Message-ID: <3a3ee697-591d-dc3c-7c53-5965da219062@redhat.com> Date: Thu, 16 Feb 2023 18:04:53 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH] mm/migrate: Fix wrongly apply write bit after mkdirty on sparc64 To: Peter Xu , linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Andrew Morton , regressions@leemhuis.info, Nick Bowler References: <20230216153059.256739-1-peterx@redhat.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230216153059.256739-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-Queue-Id: AD3D98000C X-Stat-Signature: dqjj1rpn6u13u9juhptbcnbs6p5gk9m3 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1676567099-352017 X-HE-Meta: U2FsdGVkX18Ql0lpK5qU+ZLyNjK5F45n4k1CPJPnNjQjTqp+n9RVsd7cGUenwiNNki5vPTwWP27zqzbnmj3TPKyJ08uqhqz9PmkgGeliNgppFDv/xH0m1MhT6Xw/5JUqR6EYB9jv4YcIgl2LpPYYiieFSUtTXycf+jp/W6Q50scC4ahY8aUB1qFFpEpawRybnfCDb3f2Vep+zLxVpk+3Cj5Ubh1KTY56j4eiogbxx5kY3v6waUb4MuTIQqL6NXnfzPF8wvW+yMAHrQKlQV/znYNlL1mJMtK/jHsxh6McK3cQq+d1V9w/CgyShdLsjdQ5uOu30pL7/L5QBZj2a22RgHY0de8BKwVF1c+GXRVbY0yllSfsjdF8XhzwcFaiI51bV/B+QLfH99npSTWm3x1z0ZcuBkpQ6NLjTQJtn8543mIGAkO+GGL2svHNK61msYgpMlNleceNyu8na/hHqmI8PJn7ql4geW5sFFfxdnHum70eO/LkKAzIERN/UtJQBwlf8liZCcVKNJbTZD0QATf7n73mtPNstmTdryspFsly31N5p8ml5GUeW9RunbAzfWdCcu6SjXZKSoRbebZn0I772PBLsHHJzGHj/tBP7Gw0U4HRSumSkGFD6oLS11K+c2ISV5VKjlmHUxWg05xDNUy7aH1jTWdSaWu5GkHT0NFzvL9stdqgvKxSjYpLq9dtygBq+hg4wSsJEDOUjH82DSzrc0am7A8sPNUIFpGKUvQngqczTjtkoDfXyfN53oorXlpTKUcnHVJPzm5VeuYLjC7sNwM1sn0uBT4bHdWbn8I4AE5M0jILQ9L4OlfDaMn4DI2laCvQtH/zMYeRscx8ztnvQT1OBhPU61aXTMeu0GMsAFlfkAy1iGCKiUJ0DDNIFWjFsb8eGnGmcW1pez2YQPDrVesGg84BfoPtCNPCeiHfIpRPoha78RdhKFBaxxZgHN7BywkS+6GvKh+QTbIcFN5 Mb7Mm2xW fovyddYIBq44fWLHkTeTqG5k9zv5ieCjcAnI49cw9UdYE7xj2aulvuvRgEI3HjMUv7CAhTsOcNV0Hsd1okXwJHTCMH8aUrK+EHTzjeDGAHy5tVpgSm6fUfYgDTHbjSO6okE9op1CX1k8eGskM0OQgAM1WneeSDwoTI8Sca1kh9ZlKB5oJ+wj9WyprNc9r0M6tayCs+jwOkDljFdWKeUOeUK6JN2E0b2u5GbS30SHB3l3b3AOCY6mUJaBdHZliNxSiy8vOWeV7qdZC2EvdaaBZ8PwNcMV/4EHUpEsFFfN4eb10G+SqyfbtCHLu+DM7zM7/P55bGh/szPFjeD13/9bAz3yQHjW1M+MXDjcMtM6p0R+lYlIuPkbmVZbV+HPTKySMazLS55bifWtPuttJhOM+4hU11HrXk3QJKq5/Q7tlfV/SMMf/HvWhx59LWaLU+ZD/9ZfISouN+dI94HuZVNw8RxoCFzZU+7k36TYo2Npzv3HlG36KDP/y4CZqgteR/Nj9LJd95LypoS6TTdikIM+TYRyC+hXMI/jdUObnSzEoA+YAV9ey1m2GtYbszFWUdNi/tw+iKL07cuan4K4POkB0qCJoR5UMX7AMmQ7ZHLzOueJh1SrY/uYi0PixjhHD9rl3tTMPG9sU/99MTs5CcAOQj872M8IbhpGPu8DAJ2Meg/QuzK93LBb3R1ODFQ== 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 16.02.23 16:30, Peter Xu wrote: > Nick Bowler reported another sparc64 breakage after the young/dirty > persistent work for page migration (per "Link:" below). That's after a > similar report [2]. > > It turns out page migration was overlooked, and it wasn't failing before > because page migration was not enabled in the initial report test environment. > > David proposed another way [2] to fix this from sparc64 side, but that > patch didn't land somehow. Neither did I check whether there's any other > arch that has similar issues. > > Let's fix it for now as simple as moving the write bit handling to be after > dirty, like what we did before. > > Note: this is based on mm-unstable, because the breakage was since 6.1 and > we're at a very late stage of 6.2 (-rc8), so I assume for this specific > case we should target this at 6.3. > > [1] https://lore.kernel.org/all/20221021160603.GA23307@u164.east.ru/ > [2] https://lore.kernel.org/all/20221212130213.136267-1-david@redhat.com/ > > Cc: regressions@leemhuis.info > Fixes: 2e3468778dbe ("mm: remember young/dirty bit for page migrations") > Link: https://lore.kernel.org/all/CADyTPExpEqaJiMGoV+Z6xVgL50ZoMJg49B10LcZ=8eg19u34BA@mail.gmail.com/ > Reported-by: Nick Bowler > Tested-by: Nick Bowler > Signed-off-by: Peter Xu > --- > mm/huge_memory.c | 6 ++++-- > mm/migrate.c | 2 ++ > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 1343a7d88299..4fc43859e59a 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -3274,8 +3274,6 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new) > pmde = mk_huge_pmd(new, READ_ONCE(vma->vm_page_prot)); > if (pmd_swp_soft_dirty(*pvmw->pmd)) > pmde = pmd_mksoft_dirty(pmde); > - if (is_writable_migration_entry(entry)) > - pmde = maybe_pmd_mkwrite(pmde, vma); > if (pmd_swp_uffd_wp(*pvmw->pmd)) > pmde = pmd_mkuffd_wp(pmde); > if (!is_migration_entry_young(entry)) > @@ -3283,6 +3281,10 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new) > /* NOTE: this may contain setting soft-dirty on some archs */ > if (PageDirty(new) && is_migration_entry_dirty(entry)) > pmde = pmd_mkdirty(pmde); > + if (is_writable_migration_entry(entry)) > + pmde = maybe_pmd_mkwrite(pmde, vma); > + else > + pmde = pmd_wrprotect(pmde); > > if (PageAnon(new)) { > rmap_t rmap_flags = RMAP_COMPOUND; > diff --git a/mm/migrate.c b/mm/migrate.c > index ef68a1aff35c..40c63e77e91f 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -225,6 +225,8 @@ static bool remove_migration_pte(struct folio *folio, > pte = maybe_mkwrite(pte, vma); > else if (pte_swp_uffd_wp(*pvmw.pte)) > pte = pte_mkuffd_wp(pte); > + else > + pte = pte_wrprotect(pte); > > if (folio_test_anon(folio) && !is_readable_migration_entry(entry)) > rmap_flags |= RMAP_EXCLUSIVE; I'd really rather focus on fixing the root cause instead, anyhow if my patch won't make it: Acked-by: David Hildenbrand -- Thanks, David / dhildenb