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 4378CC77B75 for ; Wed, 17 May 2023 14:57:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C324E900004; Wed, 17 May 2023 10:57:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BE206900003; Wed, 17 May 2023 10:57:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD082900004; Wed, 17 May 2023 10:57:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 923DD900003 for ; Wed, 17 May 2023 10:57:52 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 61C751605E1 for ; Wed, 17 May 2023 14:57:52 +0000 (UTC) X-FDA: 80800051584.10.E6576EF Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf18.hostedemail.com (Postfix) with ESMTP id 25DC31C0007 for ; Wed, 17 May 2023 14:57:48 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=steven.price@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684335469; 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=+Zwx//lOdg6V9D63MW28GsqyK5yhFT+5Pyw49IqDxGo=; b=U3Vf/zHprRflmadpzVbbHes2RBIqcKU1dFSj8bliVK90hOHOM2ZQkr0rgcHLcfMGMvlmjN caAbRwVKcrRBonwWFPnVZqmz+GvcuIA/0e4n3gD+HoTPwhvJ904V9Ce7vMh/pLNHNgIzpW UsL1a8SlbrGsIRsAS+1AVWHjjuCZ0gY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684335469; a=rsa-sha256; cv=none; b=J0P7f92VSK7FrNq2Y36AltGUe2emRzQoVEIYZ1nO09d/wPq83pkjOwk9/IAxYOORAXLQkk H0P14o6hRv1MGqIczDWZ6r6FMR3CNRQs7h4s9uD/eJPmQgF3k0betcHeXA+zwqnmg+BDLi pQ+2X5bV5IaMGdQAphdcvWBTsFFiM9s= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=steven.price@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 620641FB; Wed, 17 May 2023 07:58:32 -0700 (PDT) Received: from [10.57.58.217] (unknown [10.57.58.217]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 66E9D3F73F; Wed, 17 May 2023 07:57:44 -0700 (PDT) Message-ID: <9b9e7fbd-6166-09ce-9aeb-be28e51eaf10@arm.com> Date: Wed, 17 May 2023 15:57:42 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH v3 1/3] mm: Call arch_swap_restore() from do_swap_page() Content-Language: en-GB To: Peter Collingbourne , Catalin Marinas Cc: =?UTF-8?B?UXVuLXdlaSBMaW4gKOael+e+pOW0tCk=?= , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "surenb@google.com" , "david@redhat.com" , =?UTF-8?B?Q2hpbndlbiBDaGFuZyAo5by16Yym5paHKQ==?= , "kasan-dev@googlegroups.com" , =?UTF-8?B?S3Vhbi1ZaW5nIExlZSAo5p2O5Yag56mOKQ==?= , =?UTF-8?B?Q2FzcGVyIExpICjmnY7kuK3mpq4p?= , "gregkh@linuxfoundation.org" , vincenzo.frascino@arm.com, Alexandru Elisei , will@kernel.org, eugenis@google.com, stable@vger.kernel.org References: <20230517022115.3033604-1-pcc@google.com> <20230517022115.3033604-2-pcc@google.com> From: Steven Price In-Reply-To: <20230517022115.3033604-2-pcc@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Stat-Signature: ctab3pzax8176ubyq6wf6tfaoaasmpyy X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 25DC31C0007 X-Rspam-User: X-HE-Tag: 1684335468-545101 X-HE-Meta: U2FsdGVkX18hWEnRl6MBEQMVcvnfES2ITJMFAhVtUaaQVtSXdGTuFR9Q7zpt2Rmx2p7bGZQLSJ2zhFIycjiPv9/+GnfsMIM7VlYk2USuk8W+igsJw88DQ285AvjbM4B1GfSuELPNtOMmuX6s68fmo9had49oPpVw8eddaEWI9La++I6ioCpansclEu9UrIo/z+aVLIWOKvUxzE68reJoVnRvj2CCbyLsbuxAR2qReYAT2VuYCLo9qLbG69WYS//2MkPxoFI/A9S70vrYI7vgvBFqde4cxakz4tIIv7BK36zVJi1yGAj2BQ0m608IHky6DqBjiuOXTnK7yY1dk4q26RVyR6Yq59z/Nh5CRGPsrcZ1LxSKaqFtVQS8gV06MbkHbwsQ6T3uszYxTmBQMTQOdcKGDfAaYfB34G0RHVfjdEiLrl9T1gh14qZ4EPFiJnUp5QT1eAXtxey5sDUlN37+Y5ZhSJ/+Vj6nvlp6dnCJUtsbs5PaA5RLX5129PgTyR37dHr68N5vB3W8DhxabbQmIQJUnnX69JEqkLAExg6+flksGGxxd1dl3iAAQtE0i2hY+ol1a6EcbUcZGJqSLoVC7TF64TPrNLV2920HWOe764VhSbatqt3IzEGa3Y6W35E18ErOXcfC8l17MTsu2B+73UmhBn7PcezXMLocwOXyo0ivT6qXQAnyS2PD9Vp6fuAC6hQagqgY1Uzh2GnQ/wIxfqwAVcZPMMWrhR7dE8dCU2dpKguPi2/MVtj5qLxc/QH9gNpQs+iHX24xiWbLtcZC5zjZnbvjPJeDdn4CVa8C/GBSAQXcK0PfrmkTSImr/DJ7slhWQsoaZGUdjk4bpiFLyx2OJv8ADGhT9upEc97ogAqQXa7HHEPXuRXrNm+ldVVjxyw/fRXr3u/D4ucKaV0W1AWXLph62obKB1uHZpMV3eJir7vmhuVN61EpWoYsuVsRG39tzN65hL9j6a0T9hI npcSphG7 TY85Ye6eB1rohn9OBRl1EzroRCU/Cy+tekRZUTiLMJVn50ZkXRc8NEXikepO+2iqGonh+JekQvVYT7Ks/nXFaxtxo/3NsB5V7EIC4G8uYvd/eoqWNxTqtdLsiNbLVRw2CvtEupgxHk7hH8T/oisW/TlvT7ImrP/693+zM4BouN25UEZ57Mo+3QaGU4nxKwTuk1lYzmEcFkTc6sKaEQUsUGKlSHbDE7mqA0V8oTg+ij61i6IJnk+b+wwMU/vZtBt1MnFnwpHEHrcjBEWwg3lPj5FgTu+iocHwASTVxtCDXWsiOral7rL72GEhVQ6OLrcJ4S2pWbGktaJfxiQ3MCncpYFi2+SwlV3KGebXOapg9sVRap/fM6CLTy/mKqam06W+EEfQj1U3QfLY2R/TIc667FZdxDWD6NFnLg9K/kvNdhBKHt3xzJ4l3wSb+gR4SvB+pn3JMUr4r7NqoUks= 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 17/05/2023 03:21, 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/ Reviewed-by: Steven Price > --- > 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