From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21E6EEB64D9 for ; Thu, 29 Jun 2023 09:57:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6291A8D0002; Thu, 29 Jun 2023 05:57:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D9968D0001; Thu, 29 Jun 2023 05:57:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A14A8D0002; Thu, 29 Jun 2023 05:57:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 37F5C8D0001 for ; Thu, 29 Jun 2023 05:57:25 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id F39AEC0DF9 for ; Thu, 29 Jun 2023 09:57:24 +0000 (UTC) X-FDA: 80955332808.05.1A6BEAA Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf15.hostedemail.com (Postfix) with ESMTP id 23EADA0012 for ; Thu, 29 Jun 2023 09:57:21 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf15.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688032642; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wgFURRDh/R52N2NpZ1Hil8mqsiYjBZRb47jqTE3MxjM=; b=nUlqLIlExlVbK9gsB9POhN3l4xAyLI9GJlvJAXonDhJKt5Nmzmt3zlnfcGOKEdRbCpGzQY 4grdqVIrJWbMT3bFibOMU+Vkkvby6gmAREeFg95EDXJXm9AKsb2TQlfLCFeP7/w4mYLC04 b+94wmaSv8HIySPTnJB9ADNXnZpDd1w= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf15.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688032642; a=rsa-sha256; cv=none; b=XkF04TcP8ph4t8ajncxFgqO/ZZeIi71xy5gnX/pTyOq+SV65xmwQp92VhDsvV/gxJ5p29y f7nbUulVPvSsLb03ZbxfULK8J2PzZpInAPuPSKepp1R5SLWmGgxeuSXhfyuL27j8uUVTBV ygx+u06QR3M61AvNk9F21GzxZ0Km9P0= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D214E61464; Thu, 29 Jun 2023 09:57:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38882C433C8; Thu, 29 Jun 2023 09:57:17 +0000 (UTC) Date: Thu, 29 Jun 2023 10:57:14 +0100 From: Catalin Marinas To: Peter Collingbourne Cc: Will Deacon , akpm@linux-foundation.org, Qun-wei Lin =?utf-8?B?KOael+e+pOW0tCk=?= , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "surenb@google.com" , "david@redhat.com" , Chinwen Chang =?utf-8?B?KOW8temMpuaWhyk=?= , "kasan-dev@googlegroups.com" , Kuan-Ying Lee =?utf-8?B?KOadjuWGoOepjik=?= , Casper Li =?utf-8?B?KOadjuS4reamrik=?= , "gregkh@linuxfoundation.org" , vincenzo.frascino@arm.com, Alexandru Elisei , eugenis@google.com, Steven Price , stable@vger.kernel.org Subject: Re: [PATCH v4 1/3] mm: Call arch_swap_restore() from do_swap_page() Message-ID: References: <20230523004312.1807357-1-pcc@google.com> <20230523004312.1807357-2-pcc@google.com> <20230605140554.GC21212@willie-the-truck> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 23EADA0012 X-Stat-Signature: guog9orjzb86rn88zfmneff7ha9wspet X-HE-Tag: 1688032641-25311 X-HE-Meta: U2FsdGVkX18evHqsFwzg9aWOyY/2sbvjDR+Jxyw3zv3tvTe9OtQcFkKXzSmzniAV7ScLnS78xya8SnWtPeRwfLM2QJyGgtTPbuu/ytKDPDilh99qZcMdIOQJ1ZFyHTq5Vus+bBQfzWogg22Hb7hVwdg8yuIGJoQ/prhO182oTjAJSIM0yLx16OsH0o4gaFtv0G/gLsYWEQjcZX4VsmAexdpbaJ6XqKqnsDBgY8OfOLol6d+wH60bwn8iNqgtBpVPfPGrVRRS+KjAUATJ3osd6fe/XSPoexfGoOtpuoa4HpjJf6/OFzcO0U1nE+EBnPvHBKKwfQaL86XXfFkJs7fKZ5bKK/QlQqWxazdhrD0t66lC0EzM7DluLAApTJruEmfiburuEj8Tc2xnXWh0m9rX3BsmoRvVhI3ydHr4+GqxHGQuJ8W1YnXltH2DzI36Ac2Ru7PVgtM37tBZIXleXMzvFHYosszFH0PBBwtZXk5VFl49/N9IEuVTRewWKUvKdXtPm9p7egf6tEWW9sZLb/DaDr8BNiwPqnpqRAtDzlsz82xySd4HoZQAyifHrui4Zp6QV6v3QPRGNKYyBV1+2vkAq+O53UbcpeewxFIEdkgu2VtSQJEuOWjWqjlV7y7SaJE1AfNkLYe6CpixBLi84ZBdgypZYDGImgBCn57SB0Xsb303LdM4mSkCzilO+E3j5TZbsxgYgcMfLhwJLOm0OGPVgvfdJbM+eNEZi6vOrn2l9sCLx0pGx5viuUfeKmel0EmaGX4vZX4EyFavhOSaruERJLiN57FMVhll0HsXQ9RESPQ04mYDvLgCJipiqFCWqWxaOrbwI7m6BRKJCbdRwKC06yxqTP4pBpvs7+2kunebM+yJHdfZJbVOSrVT5f9xv/Nvb+IpdRb1pVUHmxFGFnzAL2N82XcdDFzwLKz+z5xJMkrDMET4ZiRJkznRkb0XPHQAJPBStQTqZyZH0KZnslf xO0RUFGJ Ki3vfApPK+JtcluAYImmoPMH5t8KmQ4rtNzYH9d71C4UF5WHrVoSw/bdLH3z16JA/P+RXVazd02TSgMBYHFy9SUBLflQDUsNLK83n/OGoPkxsyEistd+sbilRpE7HyeQcsmeSwalwWN05SG5mBFoVHRT0KjBxQIXxvXpGvGoT8YY+BNazAiLfMsSfMQhOufG7JN/NvWcPmTnuT0jhMjVsedezxAtHCK8IzesVSBVyLuN1pjpbYvHqTt3tfrMfu6gLlx27GnTQ2RX87Hf9pzS5XJhejeWLyv9qS+R54q6VVyag8wcJkVybaqfyh/csT4uTu1uLetnTxW8zKZPpvY71/4jZ2N69fF8x8g1kQLq6O1b740hKwsR40+dLpL5SPTTdQyuRTO76IDJZkMcxOuHA7YmadvW2/J4vN+9x3qSfp/ZdqJ4KD5Z7Y2Lmqk4+M+NGLxr3xRDZ+NRO15G23qWo5J1V8g/0AwaarSrEDPYsEktpiLU0lSKJzH0dkpGbfC6R2pfQNx4HvQxcT+4g/DotvrmYVGEb3hFc1/i0oqKp9GybQMjucWcHFuIl8E5piFzj4Z3cc5lYjrQubllbPJkprIpKRNgohbQnErUsi3AC3W4z0aqpWhl2R3VmoOniuUFTg0TkIuxBtHqX2FGd+Yt+W/7/f5ccr5CtgoLRGm32NNC/E3A7KTKvu1VojH47OR/oNB8bJVWQOF2xa5frBYJkpY7tOhce92bsGOd8RAuMQ1lcHQISJPWI0Vo3NI+vvvbWhSlYr2MuUmFnAiilJyrugpvRdg+mdp14lm4+mYp5yZGBIJbSJTvUrFWhLg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, Jun 05, 2023 at 10:41:12AM -0700, Peter Collingbourne wrote: > On Mon, Jun 5, 2023 at 7:06 AM Will Deacon wrote: > > On Mon, May 22, 2023 at 05:43:08PM -0700, Peter Collingbourne wrote: > > > 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: David Hildenbrand > > > Acked-by: "Huang, Ying" > > > 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 > > > > It looks like the intention is for this patch to land in 6.4, whereas the > > other two in the series could go in later, right? If so, I was expecting > > Andrew to pick this one up but he's not actually on CC. I've added him now, > > but you may want to send this as a separate fix so it's obvious what needs > > picking up for this cycle. > > I was expecting that this whole series could be picked up in mm. There > was a previous attempt to apply v3 of this series to mm, but that > failed because a dependent patch (commit c4c597f1b367 ("arm64: mte: Do > not set PG_mte_tagged if tags were not initialized")) hadn't been > merged into Linus's master branch yet. The series should be good to go > in now that that patch has been merged. Did this series fall through the cracks? I can't see it in linux-next (or maybe my grep'ing failed). The commit mentioned above is in 6.4-rc3 AFAICT. Unfortunately Andrew was not cc'ed on the initial post, Will added him later, so he likely missed it. For reference, the series is here: https://lore.kernel.org/r/20230523004312.1807357-1-pcc@google.com/ Andrew, what's your preference for this series? I'd like at least the first patch to go into 6.5 as a fix. The second patch seems to be fairly low risk and I'm happy for the third arm64 patch/cleanup to go in 6.5-rc1 (but it depends on the second patch). If you prefer, I can pick them up and send a pull request to Linus next week before -rc1. Otherwise you (or I) can queue the first patch and leave the other two for 6.6. Thanks. -- Catalin