From patchwork Wed May 17 02:21:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 9427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp837869vqo; Tue, 16 May 2023 19:51:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5MO6/J4mUvIOkr8gAEc2tK9sgX8/0nf4/1D/k6x2OrMY3TOfwnlA9Nihl/MK3NZWnzKuVL X-Received: by 2002:a05:6a20:9146:b0:105:393b:5dff with SMTP id x6-20020a056a20914600b00105393b5dffmr16619802pzc.16.1684291892275; Tue, 16 May 2023 19:51:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684291892; cv=none; d=google.com; s=arc-20160816; b=UN89Rd5T3IMsVvkTuzDm0Pi9Hu4ZGsOR/NccOICigeD811X14hstF8klNhDX0sDRhm 9Rkei8BxIiRtm7mZUoskjB5EouIWz2mhluWx5TwzBT6zEhbcda3ylrCoBPSy+9LxvLFV AHuCzafYgHFvlCBK+runjnjpkVOWXjyCDmKOYUZGTvgRXha2v/d4kI6k3Xvlbu3KrkV3 /GaapsR4d36L+ett9W83utzbUdS7kpmK5anBmpW4y0ln6dPIHdiqBZwnrekrUQX0/UpY OGNG9DPuANPrtmqp0FEkBAxm/txldisl6peuhEyxD6QAuXYES0ST0vtaTKWFzktNb//W 79Fg== 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=DbvIotRGfeUI08jv8AEiwlw+JO4JY4xCfZlRx6U3EOo=; b=yWFfAcxmRG9aSxT5+ZxTfYgpyMGwsQD1qnhQpIVlXyY+XzcxJhLdMF7u6TPRFKWWxG GJnFbIIAP6SbeEvDYF1qt1c/9nqedzMNSp2mPN6m3x55xiYC0HojMkXpnUG7lAf3oA/o lPq3WTxk6WBWiq6QDd67IfSuXsAlZKEv6zlIXtSfVhNCWjGuiHMHnwXhUT5GPo218fpG TgJyQXZhrmthUNUY0nt4cuNG3fQ4a59Fpz7aSYV7VfhPQC7mSV8Vn0BMpM8k9b02EAmW kClvpXBn3N3lArlUoEnE71PHeWsBziCnE9739P79w+JfNrOAfO92yE7WgETnbZd56t9N LXKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=KUAjUFSP; 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 l69-20020a633e48000000b0053045acfebbsi18962132pga.48.2023.05.16.19.51.20; Tue, 16 May 2023 19:51:32 -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=KUAjUFSP; 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 S231683AbjEQCV0 (ORCPT + 99 others); Tue, 16 May 2023 22:21:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230176AbjEQCVZ (ORCPT ); Tue, 16 May 2023 22:21:25 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15B5810CF for ; Tue, 16 May 2023 19:21:24 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-ba8338f2103so234765276.1 for ; Tue, 16 May 2023 19:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684290083; x=1686882083; h=cc:to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=DbvIotRGfeUI08jv8AEiwlw+JO4JY4xCfZlRx6U3EOo=; b=KUAjUFSPrTObC3hg/4eFzGEAYHdVyshHZdyrXJc5KM2+ApESlbodJxFclR3YXvSKuy kLOT6ZdR4Ohc4e6WLZv+NG13YniC23eIgKsDzKhXjT4gOGcOJ2uRdUt0pqfkKLiCkksk lkw8+v3lrxIgT5X4LzGBewpBv4Dud1I+wY37cJ3oSnYl/yPDUDK/Up98aTyjDQ04NhMP jTiiQChMP2VXsYI8jCvRhbkJjo5tai4Kx77eSn2JI3ORttioIag8vv05s95dP3/TmsMw MbTWpSFmhHnKx78X/4B6zv31Tl0ERVcNveLr1aTw7w/wCj644yKhpI3JdT9AtVh1ISco lYhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684290083; x=1686882083; h=cc:to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=DbvIotRGfeUI08jv8AEiwlw+JO4JY4xCfZlRx6U3EOo=; b=YgbQZyxEz/NqqkT1dOLxk/5eYzaIP/5Vq8p8cdqDF3AVXaWFMlGsiLzBeEJyqJ+/js kK5SnIsdDAYNjxENQr0dgRVgK0C4GbRSx/VNX2ggZJcvsKMUVM1RGg88Sd98gXnIEppH W4upg6nIJvq/iUWMIYqn9DNxHLWoZ1jowRF8skSRK5PvntEAiFlRh4CXFr1bPsrf7Ru/ 8EMREEULK6ckyw9GgKbxo2AVKoFkv2HbbS0LE1FrRBWZISr+A5zH0UlXX2q1CL+SfQVk JFFY7ruPyqcDZgYn7G8VTwn4hbFLqn4SrmURu4q9wjw3mF0cYnVxxmQvZlr2BMHDR+Zo NJAw== X-Gm-Message-State: AC+VfDy9G+pBoeXzizfyHjMXakVs0PgRskJKowwgTPOvFtANHwvKDSLt ZOVmwpS1Xc5KWwbUM6DPIaacMbk= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2d3:205:b3a7:7c59:b96b:adaa]) (user=pcc job=sendgmr) by 2002:a25:7708:0:b0:ba8:1b23:8e66 with SMTP id s8-20020a257708000000b00ba81b238e66mr1996246ybc.9.1684290083311; Tue, 16 May 2023 19:21:23 -0700 (PDT) Date: Tue, 16 May 2023 19:21:10 -0700 Message-Id: <20230517022115.3033604-1-pcc@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Subject: [PATCH v3 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?1766108055243513115?= X-GMAIL-MSGID: =?utf-8?q?1766108055243513115?= 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/ 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 ++++++-------------------------- arch/arm64/mm/mteswap.c | 7 +++--- mm/memory.c | 7 ++++++ mm/swapfile.c | 7 ++++++ 6 files changed, 28 insertions(+), 48 deletions(-)