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 5EBD1C77B75 for ; Tue, 16 May 2023 12:49:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C33D5900005; Tue, 16 May 2023 08:49:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BE394900002; Tue, 16 May 2023 08:49:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A853E900005; Tue, 16 May 2023 08:49:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 997B9900002 for ; Tue, 16 May 2023 08:49:46 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6F8F51202C1 for ; Tue, 16 May 2023 12:49:46 +0000 (UTC) X-FDA: 80796099972.24.41E2D86 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id EB129140011 for ; Tue, 16 May 2023 12:49:43 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GlT6Imjp; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684241384; 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:dkim-signature; bh=P6ENP1TOkkkwTyntwJbblY7IR/X8Hu2k3+7/H7vMwQQ=; b=ZKD4y+n33DsjDAmyHIhz/BGUsy4qTb6IsSDg7i3R8sjNi4WmTBAfdVuVRrfe0L/wdQA4RC iJcnVqzTLTCVjzai3BWsrjW5htDao1l9MVXHcKdSIwkNtKL0GQ7dKzgFyBLopU6BatK+us 9cuh3lIomVIv53RZ+E+RKvVwKNlSJuA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684241384; a=rsa-sha256; cv=none; b=TNQ5YdqeM+nzJ47wBhqU1szwFRgSh4OmfasY9n2n9u1VmiDr3OPayQypsecTe/bQPJ9cWL ZRmftumVDf9Zq8u/8H9rfZzvUubLNkMgAV9cSWhxR8jmmlXlJrOsD+71zp5M6wbwA3dKQC /LIm2y/xJMwJffV85rtIEQdozmY3fWs= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GlT6Imjp; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684241383; h=from:from: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=P6ENP1TOkkkwTyntwJbblY7IR/X8Hu2k3+7/H7vMwQQ=; b=GlT6ImjpRu0ViHm4NA823p6DWYBzuTQKHtfLAix5/1KfTw8uK8MXb+Wzg9LAuIKJA5pT3p cbmXJTpl0hQU+2onuJ85wSHU+sNiQi6UAPd3JWLTB3MoY62/Y2oGL6ZNsSgXKo/jfZXj2p mAX6VvbtvGDpV0hMukRLpQFY8uq8Jag= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-511-4I33L0rcPj6oyGvdl0X77w-1; Tue, 16 May 2023 08:49:41 -0400 X-MC-Unique: 4I33L0rcPj6oyGvdl0X77w-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-3f426514683so34865645e9.1 for ; Tue, 16 May 2023 05:49:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241381; x=1686833381; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=P6ENP1TOkkkwTyntwJbblY7IR/X8Hu2k3+7/H7vMwQQ=; b=dSjmGFagaGwFTpP3rgetq/Vbq3h0zHlVpmpsTwN4ZvBJlq9mU7I6c5frI5FVVDDgnk +LWtLNSF0Qn5QXBMSJFL8vcm2blcK9H93/jSJVejaQxrp0nvf5Ab8AheU+k+Y6nUxrFR lIgTLvMP3Zrl66JpRGuMHiyydXFCpG2xOMKWyjc4lC3yNn0F0NLYLR3rYRf2bq8AlK6X LBOQ0iaqMzJivtRAX2FSbTT/ir56LXEL9IvEK7Z0T230SKdM9EYv+SDShN06tlESHLnR 8oTGRb/BczK6JYNJDb366TXJZfw0+cPFVkJX74MN2+Va/saEugo2/rjTwkgbE0cDQo2v jP3g== X-Gm-Message-State: AC+VfDy8O+IrpKMaoJiWyUTVEtSnaBrm7tsD/s9ZcKsIrR6K52eeSh9q DvQKqTAJmT1SCjsIjv9EXkjKg4j7BCTc3uKTl5T/+9JEsCP7E3RM3Q25P2Y3fhN/N2NTfk09cD8 PXCElCLQuJOQ= X-Received: by 2002:a7b:c419:0:b0:3f4:a09f:1877 with SMTP id k25-20020a7bc419000000b003f4a09f1877mr14616497wmi.23.1684241380831; Tue, 16 May 2023 05:49:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ivgr8TxNk6sB2ueojEGiFrdWqV+8bm0pJXqlqC+5ftnqODua46zAlXniDLp2NJ1jyPgJ+8A== X-Received: by 2002:a7b:c419:0:b0:3f4:a09f:1877 with SMTP id k25-20020a7bc419000000b003f4a09f1877mr14616472wmi.23.1684241380418; Tue, 16 May 2023 05:49:40 -0700 (PDT) Received: from ?IPV6:2003:cb:c74f:2500:1e3a:9ee0:5180:cc13? (p200300cbc74f25001e3a9ee05180cc13.dip0.t-ipconnect.de. [2003:cb:c74f:2500:1e3a:9ee0:5180:cc13]) by smtp.gmail.com with ESMTPSA id x8-20020a05600c21c800b003f4f8cc4285sm2236830wmj.17.2023.05.16.05.49.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 16 May 2023 05:49:39 -0700 (PDT) Message-ID: <342d76b0-a94f-902a-c701-04a1e477b748@redhat.com> Date: Tue, 16 May 2023 14:49:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v2 1/2] mm: Call arch_swap_restore() from do_swap_page() 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" , =?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, Steven Price , stable@vger.kernel.org References: <20230516023514.2643054-1-pcc@google.com> <20230516023514.2643054-2-pcc@google.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230516023514.2643054-2-pcc@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EB129140011 X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: ts9ooceiadueh5grkjhemrromiyg1r59 X-HE-Tag: 1684241383-3487 X-HE-Meta: U2FsdGVkX1+5PnP8nFxfuv+gLmPtlemA0NhHojAFv6DLAlH1ym/Nz4r/hN9RSs45YIF23Bpm9u0DNqXcAnsR+XIbb2jhNVEZb9hxAhdOQO0cCszk9pxQRQJ4tAuzah7W8M2iKYDM+v6EqPCkcHrMbriVATrDBlPq2P5vmPqO32uIgrLRurZSWiJPDJpAcMpJaQE6KyAjxZ9zS0LrSUVMZPo67CP8Nhrvq5+znYcIKZYicm+QLtOR+E6RFK9w0VyRa7+fkmcL3o+3NfPkKIdXEZnwg7veCap4Z/d1i0XO37PiWKCas+NzshKo0uQ0ZiEB5RWmdJv2PbmWDpgK120UXgAGFzlNCqxId1yrvYy88TyuT1IN/6JAHHeaFEwk/5eYiP3pP7mWebnZYS+o0S3Bo1lBa5Wu0JKOjLZgqc5yPNjQ5ay5TxafkXFT/xLtvzS+A6hAbOdAwr4uIMrk2yL34edmkk/k6yvJROcZZuTOWtZJxgmEUcUnqRJ8t5Md/NyZAZSqcmI3E0O4QPqyQZZ+HUKN+WhdeGzY9pYeG5M+kJl+jn/Ljz818EbaNP3Vyb6pc2Dg0bkrh4T+q5UsZ7GR5z+yyhXan352RdSo5QpjZHFO7qnIFeQz40MNQXLLVw99FLzNbq7Su9lpMTnB24KEnbTfuzOHvE+w4ulyTonilfZXfC+96zHIOYnjIZ+2RywztnMkO2jDoug9Hkjs5aSKOkO2vQcMIAQ5eGHOQoaeJdYElflIp3Y9DkrXgGQrjwrO380ZqcxOrNVUTTeK46efeBi4i/ozF881Zyvh7GQe8IuhjODfZdsT4oPa2XPfebyikBfmgam49tjxiUDOs34VsNZppmN+pB4D+DyNvkhjUF64WsM1bzvsNj+A8p0sp09ISLUXBP5sM+n29VFs1c8Xwp66aVteNX8MmztJmxGQPeyxjscAw81+YIWlS9Q/ApypVZeW93tyQeDvy+EXOZ/ IvHC3Qtv mndwL8UvREXpvY8QYCK0zv+ZpmIYD8E6LS6G8xAufM7qqRb8oxbnz8P49ef0nSEjYntzjxejKMYujPqJzWWii7dMQYVbt2NGZqltKk00OlHJf0wwGaINaO5g4DPGMu5QcSwBcBfynAErQrwuXGOQkkcoKrO3eXhjY4ArCSIykG7WKZi7+wbnux/lZrK9rt2+TxOFZwVVmQi6RMS0BwdWyn9yDArjEYVplrL40ewdekzrzXBcGojLpXgne1sGb7EsRWtSG5k3b/V/EZpbdAfM1WFf6Iyap2BKJakaNEJwFnFa55u9bog31lnkcMI31Q8W0du2row/zUHlEoCx5dDhevJ9LIy2Te/mE0iAqMCdQRwp41tcZSN1Q7MwaX8K4PkVAbqVpeEOfj0o2DGTgv269SehonoSwnywV1J78y0MTvgWRj4zaZCUO5ByqJf4bdzktiiy/SQkGepkgmQNYvh6L5aa3LHgXzE/N3zpiuYEmulVcopep+/1VnFyOE12D1Zzfeu1J49ebP33oB56Bas5ccdaT9gJGlUng53sFVQOEl2s8P2SKErbL0yzyKJfpAfl6Yg1xZgV+6vB+5qbgZkLWjtkaZ/v6Mr03E1ZV7//l+uGAJJ2eiihbhYE4apcsdYdbvCjLlRoXzMe1gqj3WXs51XvPXPP8y0x6miPiRIjYwsVGeN4= 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 16.05.23 04:35, 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 (林群崴) > Link: https://lore.kernel.org/all/5050805753ac469e8d727c797c2218a9d780d434.camel@mediatek.com/ > --- > 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 01a23ad48a04..a2d9e6952d31 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -3914,6 +3914,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 Looks much better to me, thanks :) ... staring at unuse_pte(), I suspect it also doesn't take care of MTE tags and needs fixing? -- Thanks, David / dhildenb