From patchwork Tue May 23 00:43:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 9702 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1820039vqo; Mon, 22 May 2023 18:11:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6M4n8MFb2RSJGypxCxDkLJIWFiZak56oPFFTLAmBuIAXZXw+ui9CK8SkqnfPFuJex3x+bK X-Received: by 2002:a17:902:e547:b0:1ac:712d:2032 with SMTP id n7-20020a170902e54700b001ac712d2032mr15796144plf.50.1684804275796; Mon, 22 May 2023 18:11:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684804275; cv=none; d=google.com; s=arc-20160816; b=UpU5R82Iqf9pPQg6ymIZzHhk9YBys/enbEyVliogaPyWs4oudsaukgiZ1Cy/K2CpYX 1edA0HN2eP++RZ3s156VwY3gvRSokSFjHzXmwHU2tc8y68maV0ylLrkeTImoETW0p8hq LIpKjdwMFjG+tk6aGI4RNqx16+UtVTFtuRijAW1OwFHb63y/uOKEonKDin/MfO/8DZQR Rwbl1YF4SBJzHdn2zD/jYgK+IvoKmL8kSjDMKmFQxLReV4nMQ1rhVg+xBWDEmWXbwynb GwK090zQwE7iCKmni2OHh9X4I03+EX1A8K6slngqfcn8/WYqLA54HM+WRsUmCL4embzx k8fw== 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=fcd6cwPXCN8bj8UpQdXR606JLOf6sJ1o9T+5PCWanYeb6xd6Kj2NTABlzRu6O/Wqmm FfDsMs629boyx9hc0tOrZlGqz1nUd7Mk5w/YcXu+kVayOpD6BpR0myTqqoUXCp+nuc/m A3l4oEKjCqWCqohdrmHYS+6a/URnADlMW9Lakv93es4TJhyGTTy8Jqbb9ap9uK8bYkrc Rldc92xuh6VZityJ539pGze6/focVwhdJEUFE1EX20ySSupZsd8d069LPzUcckU+cKHt seWNuYr3mj9mLg4lEsaVcdvKp6uxO1L0zIXl5kStFCkb8q1IpGnrQ+mzY5lVD8N9Xj9i v4sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=JF9VmGvn; 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 l5-20020a170902f68500b001afada38c64si864774plg.302.2023.05.22.18.11.03; Mon, 22 May 2023 18:11:15 -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=JF9VmGvn; 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 S231730AbjEWAvy (ORCPT + 99 others); Mon, 22 May 2023 20:51:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235155AbjEWAvi (ORCPT ); Mon, 22 May 2023 20:51:38 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56D3455A9 for ; Mon, 22 May 2023 17:44:54 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-561eb6c66f6so58230817b3.0 for ; Mon, 22 May 2023 17:44:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684802595; x=1687394595; h=cc:to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=SK35moxCE6AhlCZl4FimQ53XrewZjdQKUPUW9jfTNhI=; b=JF9VmGvn6ME+aV3DWd+moD6DHriILl/eHSLrRAVbk557Nfyq2aEPhsaPiGBpDbWYew xfxlvpIcDqTn+OyodXR//4275XAoEeYjxwdP8/SeVRQSlV9QMoEG8a3I0GYpUHbADTXi BO0ai4br/mZs2NpalBibKFHY6KZ4WD2OYLEBP5rVthGV4zZXo73DugZVaCiFg4N10L5J y3ow4VUMSVguwSU9N8aUagGsIBAOX6iR6VVTKqq5fCbzvHjN3f3blh1NFR8W7EXCmsJj sFhkDMgC+eXM3eLCgw3471dz7sjLpCIriVTG3t6mKGIBUQCgosKE3bott3R7ljUVNJdY TnpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684802595; x=1687394595; 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=N6XWR515mEelrHyqBaXRqgFZ0/PhZpLS9ucoVwmZonLknH0wEKQuCRHwtt0Z12ygzi 75AlaPFOQKDBLa1e+mAfbx16NdVg939PtxhsYOXd3QcSKrMrWBzi6oU51YrV5rj5T68I tLYzEJC5UnHUZIk2cs+YAM6krlURHDAxY9KtEdgxCgLI17f2u5vftNvyoce387H9cMYd wdyNcar5REJtMf32hhGs8Ogxs4dzHTIiKiTZOiVGkguLcIVVGo8PKxt4Hw/PTTqDQD4M p0UG17ZzfZKXxuxdt71rev2IYKR/72s33hzmPiJQqydZcWX82K/Hr9rIEpY6hxCzBt+m iwUw== X-Gm-Message-State: AC+VfDztJc/DilLFCrtMGTe8lgExRRI0j0CylK3HnD8WLJ2VEf7f3c3N HGLl7diRj82l1vDtif5peyXOzXU= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2d3:205:3d33:90fe:6f02:afdd]) (user=pcc job=sendgmr) by 2002:a81:e508:0:b0:552:b607:634b with SMTP id s8-20020a81e508000000b00552b607634bmr7917763ywl.4.1684802594841; Mon, 22 May 2023 17:43:14 -0700 (PDT) Date: Mon, 22 May 2023 17:43:07 -0700 Message-Id: <20230523004312.1807357-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?1766645328284124545?= 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(-)