From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A41C8F5D for ; Sun, 16 Jul 2023 20:37:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82A56C433C8; Sun, 16 Jul 2023 20:37:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689539865; bh=ylzs9bovlwddSU1dIP4bGc3d8m0t7NEgvWJbKtvEyE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s29FU9+1oxOWsXKIAiRWJNrSP3XOVqmQoqrBW+FBbUvcnox0Bp2HYJnONP4NQS364 6EHW2WadWhhbhsNGQKDuGYmW17oeLJLmS/AJ/JzWpHwMWvjgKLjij/K+X0p7Xb/cE+ BaY/Y+WwNeoI2RWBO7jJ43ozQ0x71RvBCVNPI5LE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Peter Collingbourne , Qun-wei Lin , David Hildenbrand , "Huang, Ying" , Steven Price , Catalin Marinas , Andrew Morton Subject: [PATCH 6.1 159/591] mm: call arch_swap_restore() from do_swap_page() Date: Sun, 16 Jul 2023 21:44:58 +0200 Message-ID: <20230716194927.979530602@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230716194923.861634455@linuxfoundation.org> References: <20230716194923.861634455@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Peter Collingbourne commit 6dca4ac6fc91fd41ea4d6c4511838d37f4e0eab2 upstream. 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(). Link: https://lkml.kernel.org/r/20230523004312.1807357-2-pcc@google.com Link: https://linux-review.googlesource.com/id/I6470efa669e8bd2f841049b8c61020c510678965 Fixes: c145e0b47c77 ("mm: streamline COW logic in do_swap_page()") Signed-off-by: Peter Collingbourne 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 Cc: [6.1+] Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/memory.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/mm/memory.c +++ b/mm/memory.c @@ -3981,6 +3981,13 @@ vm_fault_t do_swap_page(struct vm_fault } /* + * 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 * yet.