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 D2B81C77B7D for ; Wed, 17 May 2023 03:42:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14A10900004; Tue, 16 May 2023 23:42:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0FA00900003; Tue, 16 May 2023 23:42:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F0570900004; Tue, 16 May 2023 23:42:20 -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 E1A6F900003 for ; Tue, 16 May 2023 23:42:20 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id AA020C0420 for ; Wed, 17 May 2023 03:42:20 +0000 (UTC) X-FDA: 80798349240.30.AFED222 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by imf07.hostedemail.com (Postfix) with ESMTP id 7C10C40007 for ; Wed, 17 May 2023 03:42:17 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=nWRRvi1o; spf=pass (imf07.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684294938; 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=hdlcW41rB/yh+usMP/g3GGVgQlKjKQ6/xZXXMkuGzdg=; b=ZIMXAa11TshLXXpul9oPB5V/928HIBH0102tBjchsLgUrsU5MoEifygyA4s9e2/qtZRt+0 BifxkVLO7ruauB+VSsRm9MqfHBQb7Dm/GzC6Lo5R6C3WClEKiOeUeIzkrebrimsSbaw07h z4wApyeGiuwzpCBGHfw+Pd6Ia0eTrX8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684294938; a=rsa-sha256; cv=none; b=eya0MevhZ6BBqPlA0UuRYSn0wyUtMb21OrIImyDdcLRuNHbgYzVaNVIThyZC46pKVenbGn Z1YRyxnxgZ/+4h5eX1hWyi9u3/7810IMLqnOcarVdEv+Ah4GOa9fbtpRb17vCKkm/Y6Mcu sB0SJD+AQnI6JHQeP1rwJplRYX5biKM= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=nWRRvi1o; spf=pass (imf07.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684294937; x=1715830937; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version:content-transfer-encoding; bh=bEq3/lkC7Pzz/AEGPXybBFp4PDg/dC0oORu6X+NdoEA=; b=nWRRvi1oS1n2ka6QcaXU3xokelxk4ghDJh6/82jIqMlOTNosBfGVqpT7 XMxkQzQWQhoPdeo32YSbiBmz3c368OBDqDE60wNf3JvXjokWTdwtYesGw E5wkBIbZ1u3WVbOiP+Fo4VUlI7V1ouJ5IOFFdbjY6/xJw4Uxixq4oMH4u TerKikQvOGneoQ2n9TzI6aJRyoES0ZOGogUsg1Hwn8C8NFiBGnWd504AE tCMGfWm/7zFqDp8bmRVMr9syjU7a1SbNTDmV91rm2b+fAeER9j3uzs9wI t+7vvcoK4qQNwjYxUUwDNaE7tA/kNC2pqnT6v398KJY8ZnuHnY1CfjZc+ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10712"; a="379842595" X-IronPort-AV: E=Sophos;i="5.99,280,1677571200"; d="scan'208";a="379842595" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2023 20:42:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10712"; a="948103305" X-IronPort-AV: E=Sophos;i="5.99,280,1677571200"; d="scan'208";a="948103305" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2023 20:42:11 -0700 From: "Huang, Ying" To: Peter Collingbourne Cc: Catalin Marinas , =?utf-8?B?UXVuLXdlaSBMaW4g?= =?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" , =?utf-8?Q?C?= =?utf-8?Q?hinwen_Chang_=28=E5=BC=B5=E9=8C=A6=E6=96=87=29?= , "kasan-dev@googlegroups.com" , =?utf-8?Q?Kuan-Ying_Lee_=28=E6=9D=8E?= =?utf-8?Q?=E5=86=A0=E7=A9=8E=29?= , =?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 Subject: Re: [PATCH v3 1/3] mm: Call arch_swap_restore() from do_swap_page() References: <20230517022115.3033604-1-pcc@google.com> <20230517022115.3033604-2-pcc@google.com> Date: Wed, 17 May 2023 11:40:58 +0800 In-Reply-To: <20230517022115.3033604-2-pcc@google.com> (Peter Collingbourne's message of "Tue, 16 May 2023 19:21:11 -0700") Message-ID: <87353v7hh1.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Stat-Signature: my4s1kpyk1kbu9eze8k178sc8dpbzm9j X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7C10C40007 X-Rspam-User: X-HE-Tag: 1684294937-457032 X-HE-Meta: U2FsdGVkX1/osvbmiqc5cCZML+6JFdvX4KpUh5pZPqqHnjmRmVNY+DeODu/8VIh8YNaHty/ucjrEXvsH9vsRVbzY8ut1YNt0HZeo3azbTPKgj/UaVd/a4qXeTTPgFD+fq6SMrD5gP4IsO1zMp7xbhdZQqE++/5aYTcyozQUKUWIRWt8t5rkjoTdFgQsU57vN5dBvpdKgKo4fsXt102aePcjMeBzcQRi7xOvPefYwenkpxe8iw1EBnm0UzuNXv7QqTyzTSA7KoM711nsoe6gGufmnLosUfwJu5SRtxJLwBy8eiope4l3ek0PFPbuTwTZyG+jCV//CLVqjGsektFNPiJ2oM7bxZaicrOS0jyKwt0QNjt07ByKEeIk5Jb/aLbPGi/y25GUGYGuIKez5f7EZN7Fuw32EXvdw5v9NCX58vl5gPt/vxuiEj1cscWOyLi1W2/isGZRjBLZT0KGqIp03arJXCVZToSZw+JUqsjb7rLXRFXCe9u6K1d8rFinHpp0luCInJqME9zfx/q/4S0qFSD7Zps+W/JeEMtyHiG/oxIQYwmGTLiituUOUXAy3VK+GcbOkhRgTTVe9be3OnOmvtwc0XwX98x0r2aQN45f572mqaUKPHIuMkTpH7Ge06vFcXUtc/3dXrkaj9xmWCqrglT3RHMJm+aV9uOp2HFztFnHJF309FEB7uGI7NUgex6AUwydm/hufmsST39/taxEwhX9mz+HnvfqJMArVPeHcCkBNMN1NtMZVVfP2N5LQiuUcqVI2nY5UWNVd/RUjiT5mLGH4yc7t/LuiWZDPmq5D4BJbKEOJIXFOhARO8lA0WcGb1I5Rhp7K5JPD3PR/G8DZ+UPYpThrNnW6NL9j4j6yKxKI7u0xxtFZopd59k1MoFx3V874CTKNN+qJGGeaXMHcFDpOWDagDUKC6fa67hNrCz6okdlAOcoMGSWK7EIliPu87p6tmh9kNh+cIVH7S2e e8+Y4ves vr5+k/SUUNFf+WaWMpv056mEs1VCYCLk/oNXCVnblosWMWGIMWmzUntcOAvS1K4nsXtiyYHrWO/WCP5Fk8kuvL2+yu6dZKTHbWAMWvSOBDYAjau0hQkUiSmuzuJ2Drd35kGIKlm1CqmmxQDkkIeCKuDYmapF05tgpyMTfwXnYjQFrzrU9t5nzXKlmoswU8D0OQ2epLF105VStcmSUNVOR7qr6th1SXUt1mQeRoEWw2BwLK/HlHrmCCuh6aVEvm9DSbvt8suu6H4+P8n1Q7JoFCD/O6F3/fbmDJnFe8A0ssfSh3yS/B/35cMEiUc1UOqqy7vDjOsuxF0f5IsKV8IWeMRjxtarYKZ8dRhm3ev9l5VUCo8DZnRQH0B15wlGeqtIbOAwynePGM+ukB82VTUWfRPh/64rn71PPvKFwJwJweJtKoCTt9uq3Zoosi+q7j30D8kBYH/2nJfFI0syRV0hwRhj6Yl9JnDUML7o6 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: 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/I6470efa669e8bd2f841049b8c= 61020c510678965 > Cc: # 6.1 > Fixes: c145e0b47c77 ("mm: streamline COW logic in do_swap_page()") > Reported-by: Qun-wei Lin (=E6=9E=97=E7=BE=A4=E5=B4=B4) > Closes: https://lore.kernel.org/all/5050805753ac469e8d727c797c2218a9d780d= 434.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) > } > } >=20=20 > + /* > + * 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. It looks good for me for swap code related part. Feel free to add Acked-by: "Huang, Ying" to 1/3 and 2/3. Best Regards, Huang, Ying