From patchwork Tue May 16 02:35:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 9379 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp129172vqo; Mon, 15 May 2023 19:54:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7AAr6Gmgt+Az5qUNoC+4zV2rJGFKe6D8dWZ77CQlbjNrQ5Fn5x7Pbd1ivgiwbJf0UNWYQS X-Received: by 2002:a05:6a00:4290:b0:63f:2959:a271 with SMTP id bx16-20020a056a00429000b0063f2959a271mr43699633pfb.6.1684205690523; Mon, 15 May 2023 19:54:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684205690; cv=none; d=google.com; s=arc-20160816; b=rKFS9/RQKalbCrtg7bzmHuJ9zVTcHw8FPqd8ud2TSaVYNkCR+tMF2ortp8wY8853hr +xNBUp5LywRTtJrGhqwvezT8qX9ar+tIU0hYQfkIDwx1ifoW0JHzda2hCfiMIzT7uKLS h/syy1TAlyhIGBAz3zqbOdgj1cdTD88dBjR55LaTWdv01DZaKnK4U3nA2L2KMIHSJj9Y aRIF0t7zDQ6rXyC8r3bsHPBaSoqtQUvL3togSh5nDT4uppIAOCkKc3+AyNoWiY1KHHsE oVh86U1PNiy21+cYSu6SGc+lSqKPMiBf8FzGCuZ3kLzm6fOSKuzcohT9EBPujSn+gyX8 +hbw== 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=9idPu53ZjVHtwYigNYCClhylP4MevS6nQx9iaoA1FqE=; b=krEtAUSqCTaz5XmFMrHIiokVlEkzGQv4n+ZBPEA4zbcsMoNlJllo6ClTHwsowefKDE N7yct8osFFUJJ3IB+gztV+oZxAwOj0bpAKNM4TVxTV3+iTzOSW8vouvmLInraumKkcVZ Ssr1st9PGelJgaWt/dW+hhI253e2SMn7TV1MFGd4IJkVekDiLLlyhHPKO9uA8285pyhD 6Cn2NDYg4h1F+4QhvJWYFVOXTGGzTC7q33ijG0Hd6iPX+66fKFrgOJQ8ddvAyy/KMF6C cuaEOvm3eaQjXu5jS+DJTY6B/i0hEB4jxo2eg8PlLlOYCYbxutSkefjAbZyUBNlYne9e Oi6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="qg1/oXxW"; 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 h18-20020aa79f52000000b0064aef84eb1esi9155842pfr.51.2023.05.15.19.54.38; Mon, 15 May 2023 19:54:50 -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="qg1/oXxW"; 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 S229689AbjEPCfY (ORCPT + 99 others); Mon, 15 May 2023 22:35:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229452AbjEPCfX (ORCPT ); Mon, 15 May 2023 22:35:23 -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 73B8C19BC for ; Mon, 15 May 2023 19:35:21 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-ba81b24c1deso590865276.3 for ; Mon, 15 May 2023 19:35:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684204520; x=1686796520; h=cc:to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=9idPu53ZjVHtwYigNYCClhylP4MevS6nQx9iaoA1FqE=; b=qg1/oXxW4HMIEgzqfnFQltjTLrihl9n8+ZqSP2kxW3MUyySEJep6tZEI0JAp2d2Ov4 vqPhyhZVxB50nViGKe3SSdGBMiIyAeNywyKZakLWog1hEmPCYMUjvQw/Vx+RcjwtSSCW RTFesV5A/gVb7ZHHlX9moH2DQvP+U2oGZPMsfStL2GZ/hIfQp54Tl+zXMhAbbh5mZohK vZlzAMNjC0oBGwNVPe/VV3bXPcx36IK9qzqt61WEofdqh2C7U/G3YJmdpUMQhSAr38KR h3xmrYYTXbvTbG81E49RACeVJkzvkoDx70wyFJmq7L26xzqeZHedYFCioT2FurgwftFY zteg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684204520; x=1686796520; h=cc:to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=9idPu53ZjVHtwYigNYCClhylP4MevS6nQx9iaoA1FqE=; b=WSo2N+Dd1E+r3PH788CnUMht1VMur9FnlKBhMRgi7I6YFJX1+KPd2E1XM0ZAIbn0Lb D2Glmsnyl59otlDKAWd2ON5Av+jqc7eVR8xGYF1nAejeKEfTKwSW+cAboTzid1BYQvo0 qJRZ2PpMYxhy/QXxcM0PY1j7zOjVladtqEoMn1+ZoIbGSfrOVtJ42rZELeqiOy6AzvwR O/DekWz5kWXwdjnyHLFCQvuka2r56e0Co24VMwBlxGmI/jUzubAuGK3jdUbFTH8fTYQx q+xI3GIwOcffUms/kPuYmRbCPgSjkqdbb+tI58w8lg9T/+xSak7R6XOMpqqPOefUjITr W3+w== X-Gm-Message-State: AC+VfDyc60TjEFD41nGBF09MWV2YdaVAfh5r/ineKM55wFs3aGn5knLL A0M9GIS0jnDKJMN5fMRKm96cuFw= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2d3:205:c825:9c0b:b4be:8ee4]) (user=pcc job=sendgmr) by 2002:a25:6542:0:b0:b95:4128:bff6 with SMTP id z63-20020a256542000000b00b954128bff6mr21566342ybb.1.1684204520689; Mon, 15 May 2023 19:35:20 -0700 (PDT) Date: Mon, 15 May 2023 19:35:11 -0700 Message-Id: <20230516023514.2643054-1-pcc@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Subject: [PATCH v2 0/2] 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?1766017666203865901?= X-GMAIL-MSGID: =?utf-8?q?1766017666203865901?= 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()"). [1] https://lore.kernel.org/all/5050805753ac469e8d727c797c2218a9d780d434.camel@mediatek.com/ v2: - Call arch_swap_restore() directly instead of via arch_do_swap_page() Peter Collingbourne (2): mm: Call arch_swap_restore() from do_swap_page() arm64: mte: Simplify swap tag restoration logic and fix uninitialized tag issue arch/arm64/include/asm/mte.h | 4 ++-- arch/arm64/include/asm/pgtable.h | 14 ++------------ arch/arm64/kernel/mte.c | 32 +++----------------------------- arch/arm64/mm/mteswap.c | 7 +++---- mm/memory.c | 7 +++++++ 5 files changed, 17 insertions(+), 47 deletions(-)