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 4C8E5C77B75 for ; Wed, 17 May 2023 08:37:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B50A900009; Wed, 17 May 2023 04:37:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9645E900006; Wed, 17 May 2023 04:37:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 82C41900009; Wed, 17 May 2023 04:37:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 74753900006 for ; Wed, 17 May 2023 04:37:30 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4D065160434 for ; Wed, 17 May 2023 08:37:30 +0000 (UTC) X-FDA: 80799093060.05.BFAFDC6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 8430310000F for ; Wed, 17 May 2023 08:37:27 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TAb2R3YA; spf=pass (imf14.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=1684312648; 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=2WdsMZLBHDWxr+KE0TdL6QcbjY/uUPjF0RV3EGhnsZw=; b=Qqa7/Y3WyXfWoNPFb3tSgX+nkYAKXPKYIrJujgFtNiwHyYthN/ceBgSMoaO6el5G9NeZW1 j50UZ+XM2pnvfLJXIJLHAdA6GwiihvinQR6Gl0vsfZQTclRvo2ce+kpB0LXGKNfVAZUPlt lo6ib30JJeBXbWzrMiLD/R+J5tsj3hE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684312648; a=rsa-sha256; cv=none; b=0jIZjo+NTveXCw/w6vSJg5or1W8IzDvsQcZ7iW3fgx/Eqp4JoNst8ohTbWoxzZSGYts7Ys ppLzaGQdd4kFhO/rhOErQtuSsbwirSRKbcauPzny00AtJkvY9Asp68x9eEF8zdkbWBrpFs dAOZVfqyjBb11VyNc5I7bOBFbgAo/dA= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TAb2R3YA; spf=pass (imf14.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=1684312646; 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=2WdsMZLBHDWxr+KE0TdL6QcbjY/uUPjF0RV3EGhnsZw=; b=TAb2R3YAlxD+J3V+rwAS9leQCJT1F2UbtKCvW5vUwX1X0+tDNuZwap9wMTsJg1fsHsOnHB JbA73bZi+VrHbQ1HOyQ/GNMRDUzCgmBujJcTdu1C22tl3pkC9FcRvyfGFWALpTAL9ado7a HBheBedFNgj5tYW0dC2RZdQIZxIxfXI= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-491-3X-uc5G_OL-ZOUFCOLhcbg-1; Wed, 17 May 2023 04:37:25 -0400 X-MC-Unique: 3X-uc5G_OL-ZOUFCOLhcbg-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3f422150893so3076485e9.2 for ; Wed, 17 May 2023 01:37:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684312644; x=1686904644; 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=2WdsMZLBHDWxr+KE0TdL6QcbjY/uUPjF0RV3EGhnsZw=; b=dym5eM8098wC4Y1czrX6YpnNos/QVX8gWLFqziRGsi1R59l0RxzikaPxzv/Tyz6upR 2ElH8t2LmRHufTkQj26vwkbagWqZUjWLgNoouPxnXJnK1fRpS4WK2iL6agKvmpp+TR/H PqqVCdPyv02Fo8dDgg5fC854ToVcGYdss+hQTURfK9Df2zaVe/m0d+QyULD0KFT0pGWX e7ay3StrKuXD6ZjAkZFIiEqlfvUZhR+6CHxPOryuW2bwahxIhnM8BgavQ1/gHbg/AWVb 4Tm4X2hLiNxBuvlAybbZ5uE/XkoPeSQL8kDk8D7yu3f+kUK6YuvYfqkZUvDyRUMw7mE3 CIfw== X-Gm-Message-State: AC+VfDy7hgalXy27em6UwJkwj/RPlbW1gYVWkMprvR/cA9yk7OUWVILP VAWZnVX+vdOfOFWbj+FfDhyT84fsSlSYBK0FsWHoqn1qz4aFiRFzpmLjyvko30RIp/L0pi6NCiG kwgLXDt/F6ms= X-Received: by 2002:a1c:c917:0:b0:3f5:e88:3c47 with SMTP id f23-20020a1cc917000000b003f50e883c47mr4936708wmb.16.1684312644148; Wed, 17 May 2023 01:37:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5seF8sdv4aMaOlfOfXp3k6cNnu+uya6/Hj+LErqDQsaKaN6SKX7/RsdZpo0rj3XBuvVgPmIg== X-Received: by 2002:a1c:c917:0:b0:3f5:e88:3c47 with SMTP id f23-20020a1cc917000000b003f50e883c47mr4936689wmb.16.1684312643761; Wed, 17 May 2023 01:37:23 -0700 (PDT) Received: from ?IPV6:2003:cb:c707:3900:757e:83f8:a99d:41ae? (p200300cbc7073900757e83f8a99d41ae.dip0.t-ipconnect.de. [2003:cb:c707:3900:757e:83f8:a99d:41ae]) by smtp.gmail.com with ESMTPSA id g3-20020a5d6983000000b0030795b2be15sm1962333wru.103.2023.05.17.01.37.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 May 2023 01:37:23 -0700 (PDT) Message-ID: <12704c8f-6727-62ec-d48b-31246755dbdd@redhat.com> Date: Wed, 17 May 2023 10:37:22 +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 v3 1/3] mm: Call arch_swap_restore() from do_swap_page() To: "Huang, Ying" , Peter Collingbourne Cc: Catalin Marinas , =?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: <20230517022115.3033604-1-pcc@google.com> <20230517022115.3033604-2-pcc@google.com> <87353v7hh1.fsf@yhuang6-desk2.ccr.corp.intel.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <87353v7hh1.fsf@yhuang6-desk2.ccr.corp.intel.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: 8430310000F X-Stat-Signature: shte8pup1eoa3utrthu7yiedrx6ptnpq X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1684312647-620569 X-HE-Meta: U2FsdGVkX19/tIqMkrFWpxjJjEeKk5WaaTTUNoXXqhzyFZhO2E1Wx4YyTfinLbTRhDlf0WX+yOxWlug4aKhNHW8Lvo2a+Pm86FDe/6OBt9rYkvgA6hnabs0J8DBQ6lBbC9g8yselzUqnDjC675XDZua4MJ5D+b4NloqJNLUj7pp+iYa7iw/3z9hYfkiuHPyOZxKb7aiEX/acWauf2hlk6LVV0nNDcusDOHuVMmhvJbh+4U0RMtFrf2FKzO9umnzagN63DDg6RDx79QG/EnJK9P3zFAwX8H7MqWzQWWASefqMe8RMhyMzLNCvblldMsWXaCc2KHRHQoU7dHlwpofia4tVVsNI9dQjpE+ESeGnx9DVqNHjShOWvZhHH7HCxbuC9S+WMVTGUeJOkThDxhinW+P17UKlY4bRoqEH+8+9cA8gsdKrkDC7gFvEcOTINcv2+gGfqDfwvz+il7UYERqbahk9gA3730+DbwkkJTRQTIC0lhabLALdjVG1TsVAS+mkSeE56PVLpWv4uZ4bV88z91vo8HD4+w0JhcHi7NetG6s5mHuNEroUjp9ufsPnNMvwi7H6X8t5d0nEeyQ86X8syOtoakVhm8hGOvy6vZ4HUkH4LLxSog5QDT+jRfuN5H9bPPGNXoz+Ykd56ywzQPZJqfBMuWUdAkmTkFELAGtXfYXioChD7QMCmiHyPbPtFgTw9iuzzrpeBi9FUlCfj6dzeaLc5hbgH6EdlQC+uFFsHRP6U6PVHVe6cwh1DoQ5vmwc5t88cVT/P95jjW/Z8AQNUb9Pzkz0hpYtzrqOSzX3bnsDEFKP1NiyF4NDJqKNTL+e9xC/cAuAs7tamTmGR8dobO5Y3NEbDnu0kwOkHdmNqoHqr10oksF06pUQ6GOa/9G2TYwev+phtjt8Frk1xzCivD0ZkD4qJI2Zdas8XOh+MNhXrNGeKswPAp0g73m1jRxOWXTQb7qHUT/DrerDIAH SRS+tZW2 l7gpQLyMJjF1g50ZNdvBRb3LEPnBzhujmwSOZBmHCY109FSCl0MSZMOK4tv0tTKlmYZ6NEpWMHLxctpRVC7yzHqgz3BSdSpaeCJCtvYSqmD9sk0ktHQEMC2197YorgqOXUZCNJNRBR8XDjOWfYLrjhzNxwEiRLyob+K+LDIIVFlEJG2E4k21cBrQqrmoOfznEdGsPrnm/HjUjDxR/EvV9TzOm6tYYbDHFim2DQNF/ft7DcKMjNg9Kj+8I66fUvnbpOZ3zwoCUh8nKKZYeRcGLAO1jWVKSHxXnha++JyMeRIlNQWQtX/abugiErnD6VMWU1aAvik7/1DtMSn3MUJYk+Kb6HsixwvKlI/k8aZQlyh6+iM+GRVckZYTZgdwYlsLZLFCqHjjjh+rsajYXvZDxKxpzPIkjWtn+LgfAvRzk+5ua+8heq6Hqg1usfoZJBSyNu/8q0ndCUW3eTGBi/b4g16YrwENFBdO6J5fn4CUlFOhi6ysi8v+RGQB8C1zQp9ndsW1KMRTArk7xIC3cBguvHGIy710ABcIQS3I0qQWAb2RwL+5FpEynh6d7suqWEtRj/0t9HDAAchUPF9Q+WTRpMGj3F8EKdlhSIHYat124wb9BSFb1spEHRg8YDt5ELvzlWpkUYyjDp6w9fh3Imdh+vXvoFsejNglv72YqP+IJhLXKKcoStTWC1zgEVhiEJWsCim80 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.23 05:40, Huang, Ying wrote: > Peter Collingbourne writes: > >> 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/ >> --- >> 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 > > Should you add > > Suggested-by: David Hildenbrand > > for 1/3 and 2/3. For 1/3, I think I rather only explained the problem in the first patch and didn't really suggest this. Acked-by: David Hildenbrand -- Thanks, David / dhildenb