From patchwork Wed May 17 02:21:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 94999 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp830149vqo; Tue, 16 May 2023 19:28:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ52IFOVDP/pny4gchJwDF1058M62mufN9tW2iiiAYMsAy5rjS1glNvpjA25GZTsaQOZLXeW X-Received: by 2002:a05:6a20:7492:b0:100:b137:3563 with SMTP id p18-20020a056a20749200b00100b1373563mr35580010pzd.32.1684290486587; Tue, 16 May 2023 19:28:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684290486; cv=none; d=google.com; s=arc-20160816; b=bnc3b+9+9vyEmPlgNHdgdtYyIp1Aw9fO2u9z00px30T3jkK3E17NLYycMPHpko2IPJ 0GE60Ixb2siogJGIHO7t1nVP9pFnzBludd6UJkwIIoghrq9WX2F39caDEU7BwkDPzSkX mM8fQhggEfHwS2AVG7np5ZqxOdMIIkv+3NCxgzdSLFqldRbzKXSfadU9bi2CGJe6zMvG Kk1rVy1+Qsl8wc4vWGE653B89zKPTthHqVIWhhaklblbrobP9C45dbtmZg57n0E9jKP9 N4K18Nrl6rA63lERvt8zjxgYHiSr4/Um8mc3wBhGwPoX1wzosk7dznqeLehNuqZxE/Lf w2AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:from:subject :references:mime-version:message-id:in-reply-to:date:dkim-signature; bh=icy+EhZ3UBgzX+LkBKZmwy9I7D5yLVOL3MyBuUnW0II=; b=di0s+mBZ9ET+szi6Ddll5tpFc7K4QB3pdcHNihlRyywCAW/RUpxZ7rXdDsMQsLLdR/ Hkq2AaGvRBQ40IlMS3S01f3A24BoWBgYAMwED1xHare8xdurbu3vTgmpsZK4J43nMlsQ oavC0NtPNEdGU705qXA+FAcuj2/EJ35DbpmspUjCmH1MEDvknTJmu2VYS7seelbM3iNI Yu5LhkxgiCk3h3D07s1Zl6g852c5U3euFWUJCfB473O5RL5/oJLhrVaN5YxbOgaS9sTo MP+PY4aLHx4FhC5YY9P25LQp95kOGc88rhG/sIVZUIj4P5DUy8rI120NFK3/wfHjzOWZ fRrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="kU3u/jVP"; 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 c19-20020a637253000000b0052c81b183a8si20446041pgn.385.2023.05.16.19.27.52; Tue, 16 May 2023 19:28:06 -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="kU3u/jVP"; 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 S231902AbjEQCVa (ORCPT + 99 others); Tue, 16 May 2023 22:21:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230176AbjEQCV1 (ORCPT ); Tue, 16 May 2023 22:21:27 -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 2E6BA171E for ; Tue, 16 May 2023 19:21:26 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-ba81b37d9d2so220670276.3 for ; Tue, 16 May 2023 19:21:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684290085; x=1686882085; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:from:to:cc:subject:date :message-id:reply-to; bh=icy+EhZ3UBgzX+LkBKZmwy9I7D5yLVOL3MyBuUnW0II=; b=kU3u/jVPNbJOPkDSOv1M9xE9gA7eqoTFhSdZQD4qt7SNgcYJYLu77i/2peyYkaoM+E 1CklaeTAYSmTwv8Km5dGKi7C0WCfutgqDI2sGNHRkPp+sdYNdJ963Ikhl8N6lfTWY03r Jc0A1tNgoUDHR5FiwBDbsHV8XCGmQ1kAqZSfPSuC5DautA1wUknPrMKD4FBEPRXJM1cI zDV47+hqam9u7nttpZOONvGIAgOZpyS9w/3N1M0W8GoFsxZc0Tu51VmRu5U30nbsUdLv KRfdPlHe57ebRvFOgibo1B8s53lcdE03PGn3ebRw8zfKd/8XLAR3q4VID38yQeldPd39 cHzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684290085; x=1686882085; h=content-transfer-encoding:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=icy+EhZ3UBgzX+LkBKZmwy9I7D5yLVOL3MyBuUnW0II=; b=Q8iFC7Wn+liBu/RpKPShQUgrIsbC2BiPVqKQJ4ow151j0pZ2Pyn2rOccHXiFGrvBCJ pEDhrlL4R+n/qi885dix8svSDM0nDb5I3bTrd+usVawrwYIRgDPdN9UeHaRVJjhBBGHs 1VZqthVsY00X8Mp4w28l8/SyQ2Ysl/NGIoHuL0QwHQgSB/HzxUqI1KKVDm7BVFntyqyI hp4F+ai4umGdi+9dIBma+oKRsxhcM2Djt1t/ELhKDazz5JbfGBA9lsVQ7XLkkfUjkupv ATatYWCKatBo3KEscrJuwBUXafcMamFHiPf4O4NnzXz1EBtFfgi/VYFOVaYQ6DYcQyhH Xc1A== X-Gm-Message-State: AC+VfDwVEBvmyRt1+NqG5V9q1BQXHbmZ3LIKGCXWf2q9Zc01X61Av/GQ E77G+DuJEoCNBcrrfLCy2DUCUcc= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2d3:205:b3a7:7c59:b96b:adaa]) (user=pcc job=sendgmr) by 2002:a5b:309:0:b0:ba6:a54d:1cae with SMTP id j9-20020a5b0309000000b00ba6a54d1caemr8869621ybp.0.1684290085477; Tue, 16 May 2023 19:21:25 -0700 (PDT) Date: Tue, 16 May 2023 19:21:11 -0700 In-Reply-To: <20230517022115.3033604-1-pcc@google.com> Message-Id: <20230517022115.3033604-2-pcc@google.com> Mime-Version: 1.0 References: <20230517022115.3033604-1-pcc@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Subject: [PATCH v3 1/3] mm: Call arch_swap_restore() from do_swap_page() 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 , stable@vger.kernel.org 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,URIBL_BLOCKED, USER_IN_DEF_DKIM_WL autolearn=unavailable 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?1766106581188509556?= X-GMAIL-MSGID: =?utf-8?q?1766106581188509556?= Commit c145e0b47c77 ("mm: streamline COW logic in do_swap_page()") moved the call to swap_free() before the call to set_pte_at(), which meant that the MTE tags could end up being freed before set_pte_at() had a chance to restore them. Fix it by adding a call to the arch_swap_restore() hook before the call to swap_free(). Signed-off-by: Peter Collingbourne Link: https://linux-review.googlesource.com/id/I6470efa669e8bd2f841049b8c61020c510678965 Cc: # 6.1 Fixes: c145e0b47c77 ("mm: streamline COW logic in do_swap_page()") Reported-by: Qun-wei Lin (林群崴) Closes: https://lore.kernel.org/all/5050805753ac469e8d727c797c2218a9d780d434.camel@mediatek.com/ Acked-by: "Huang, Ying" Acked-by: David Hildenbrand Reviewed-by: Steven Price Acked-by: Catalin Marinas --- v2: - Call arch_swap_restore() directly instead of via arch_do_swap_page() mm/memory.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index f69fbc251198..fc25764016b3 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3932,6 +3932,13 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) } } + /* + * Some architectures may have to restore extra metadata to the page + * when reading from swap. This metadata may be indexed by swap entry + * so this must be called before swap_free(). + */ + arch_swap_restore(entry, folio); + /* * Remove the swap entry and conditionally try to free up the swapcache. * We're already holding a reference on the page but haven't mapped it