From patchwork Tue May 23 00:25:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 9700 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1816463vqo; Mon, 22 May 2023 18:02:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6XRZgR2k9Xejn3UW3L7I2Q8DFgH1fvaaMWYQFoGQ47R1ww7Lq5pbmUE1+DUBnqft3nLkQ5 X-Received: by 2002:a05:6a20:a115:b0:100:b137:3563 with SMTP id q21-20020a056a20a11500b00100b1373563mr12194504pzk.32.1684803775396; Mon, 22 May 2023 18:02:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684803775; cv=none; d=google.com; s=arc-20160816; b=uTybAq549Jjo1fvJnd7W1HnZ9p+lyxSaNsVxoBuco2u1DCuVyS6Zqhg0k7DnNRwhmC G9g3zphobxzR+S1uUeTkMsScoLiD27Xaue2L5p22SlWoSa5+3b38bDpLm9/cdGvZFT+1 aXkpQ7sDCo2CPQd9kVhEGCKcBzBrE9Lu7dCRC3u7jxY3a/lqS5XMNuFwRDdYDF1lJmWD vDZS3/Yg1h0mz9WeGxKwlM2wOQr9iWUpIu/11Bykuq3vBFTWPbKdjB61olUxNBp2R/h9 vP2MsuaZn29s5Xu0brHAXSXSV8LSbKNEuuIYXEtMjZ653JEJPVB/iEdTM+FCF7xJwEeY Fmeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:mime-version:message-id:date :dkim-signature; bh=SK35moxCE6AhlCZl4FimQ53XrewZjdQKUPUW9jfTNhI=; b=FnAtuam/vVoz9bbo+rpfWs7gHaoS9YyJQZ5qUj9H1XPVwHogpY8cf3yJWLeuqoAYXk 1/IQxnSCJO0LvzqdpSomtueI290xpNv5bwAgm6gKLvAtXWUBwR0jKBK6rFRJYtJnK9Ur VRMUk2r94NjmmQMDfIEOXTBB+HoIkUJUbH8OBZa4r+yM+raD5qpehb0K+dIa9oltm2ip Bg4ZEvjZjTP+hEXUyKaPlXSAmdas6v9Eya2BgVzTqFjT5439b30OOFJgojBU2b4Ze1Yk FKuLe4BOhh+1lnYwwSknqxT7YnFGtZP7k3YNQ+XvUl85BDn/aqmQEXCnq4sB3gE2sDIR iU4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=mquAyoja; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 16-20020a630110000000b0052cc089e2fdsi5462041pgb.607.2023.05.22.18.02.42; Mon, 22 May 2023 18:02:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=mquAyoja; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235053AbjEWAsB (ORCPT + 99 others); Mon, 22 May 2023 20:48:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232760AbjEWAro (ORCPT ); Mon, 22 May 2023 20:47:44 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4C9830DD for ; Mon, 22 May 2023 17:26:29 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-ba83fed50e1so9020025276.1 for ; Mon, 22 May 2023 17:26:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684801525; x=1687393525; h=cc:to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=SK35moxCE6AhlCZl4FimQ53XrewZjdQKUPUW9jfTNhI=; b=mquAyojadKZpounQOGCyO7aFy35Kd3gvWi/UH5BXhIZkz7tVHOTirDJcDjYG/+Pe0k PwLyo+tt3Lcs8Wt+IbcvNqnR95+2QVcsjtU2z20V1u6zihM0vSHu11VGWJe8iqXhoGRd zXt6V/zFvWazT8SskHdOr3yYcVdhnbScknjPGsxuuM5tCLYnemBLeotCSSZUK/NfGkui Y6O5KmQyVmMpmurc15Kk6+FQa6XGpSluc8K9btxF+G2ADQ8v1cr+z3KhX4nFsNxh2DBR J6j+yljeE33xePrLQmQMDd01yNnZxKWlEaAWc9ta0x6f7M0C7h+CizkiyY2F7w4LZzGN uuWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684801525; x=1687393525; h=cc:to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SK35moxCE6AhlCZl4FimQ53XrewZjdQKUPUW9jfTNhI=; b=NoJaaCOlgjML1cmncRyemjlw+Ku9sohHsTvc7bJMetTXF4vy8H6fsOPxV8fi+m8PTj e/his4XU3GID2fEfFb0Gg2khZwYPpOmN4nbF4A98NEIj1q3d1l24sVoL6DujnR1QgWjL 1uxd7RSt7RHuwZVNiPAnRwTGLy4izhGMeoPKjf1/VSnvE97UXgFFBVgfkIl+Shbh+kOJ ywGVcady0FJOZSNW13c8qYGGOKLd+A7nZCWoXpN1+4rxFILDYnjq+MDtwg6J82aCfqPu 6CsddjvYzlPza+KzM3VP+5qV53ofbVXSiURMTz7nqLuC/smM2KpoV4uPJBR+slpeAdg9 NCwg== X-Gm-Message-State: AC+VfDw/pbfu6VkpbecneRBUyRio4QFr0hN/hJQZkwIjdjkB0ABCD7OQ MJZNV4pK1XJCyOtsQ+ZkHRsOnZA= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2d3:205:3d33:90fe:6f02:afdd]) (user=pcc job=sendgmr) by 2002:a05:6902:1343:b0:ba8:4d1c:dd04 with SMTP id g3-20020a056902134300b00ba84d1cdd04mr7758275ybu.1.1684801525229; Mon, 22 May 2023 17:25:25 -0700 (PDT) Date: Mon, 22 May 2023 17:25:14 -0700 Message-Id: <20230523002518.1799481-1-pcc@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog Subject: [PATCH v4 0/3] mm: Fix bug affecting swapping in MTE tagged pages From: Peter Collingbourne To: Catalin Marinas Cc: Peter Collingbourne , " =?utf-8?b?UXVuLXdlaSBMaW4gKA==?= =?utf-8?b?5p6X576k5bS0KQ==?= " , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "surenb@google.com" , "david@redhat.com" , " =?utf-8?b?Q2hpbndlbiBDaGFuZyAo5by1?= =?utf-8?b?6Yym5paHKQ==?= " , "kasan-dev@googlegroups.com" , " =?utf-8?b?S3Vh?= =?utf-8?b?bi1ZaW5nIExlZSAo5p2O5Yag56mOKQ==?= " , " =?utf-8?b?Q2FzcGVyIExpICjmnY7kuK3mpq4p?= " , "gregkh@linuxfoundation.org" , vincenzo.frascino@arm.com, Alexandru Elisei , will@kernel.org, eugenis@google.com, Steven Price X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766644803480630467?= X-GMAIL-MSGID: =?utf-8?q?1766644803480630467?= This patch series reworks the logic that handles swapping in page metadata to fix a reported bug [1] where metadata can sometimes not be swapped in correctly after commit c145e0b47c77 ("mm: streamline COW logic in do_swap_page()"). - Patch 1 fixes the bug itself, but still requires architectures to restore metadata in both arch_swap_restore() and set_pte_at(). - Patch 2 makes it so that architectures only need to restore metadata in arch_swap_restore(). - Patch 3 changes arm64 to remove support for restoring metadata in set_pte_at(). [1] https://lore.kernel.org/all/5050805753ac469e8d727c797c2218a9d780d434.camel@mediatek.com/ v4: - Rebased onto v6.4-rc3 - Reverted change to arch/arm64/mm/mteswap.c; this change was not valid because swapcache pages can have arch_swap_restore() called on them multiple times v3: - Added patch to call arch_swap_restore() from unuse_pte() - Rebased onto arm64/for-next/fixes v2: - Call arch_swap_restore() directly instead of via arch_do_swap_page() Peter Collingbourne (3): mm: Call arch_swap_restore() from do_swap_page() mm: Call arch_swap_restore() from unuse_pte() arm64: mte: Simplify swap tag restoration logic arch/arm64/include/asm/mte.h | 4 ++-- arch/arm64/include/asm/pgtable.h | 14 ++---------- arch/arm64/kernel/mte.c | 37 ++++++-------------------------- mm/memory.c | 7 ++++++ mm/swapfile.c | 7 ++++++ 5 files changed, 25 insertions(+), 44 deletions(-)