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 73C0BCD1288 for ; Sat, 30 Mar 2024 09:20:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 099476B009D; Sat, 30 Mar 2024 05:20:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 021166B009F; Sat, 30 Mar 2024 05:20:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E51BC6B009E; Sat, 30 Mar 2024 05:20:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C697E6B009C for ; Sat, 30 Mar 2024 05:20:56 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 535831A0B0F for ; Sat, 30 Mar 2024 09:20:56 +0000 (UTC) X-FDA: 81953160912.01.F67B1C2 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf07.hostedemail.com (Postfix) with ESMTP id 2753B40007 for ; Sat, 30 Mar 2024 09:20:53 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=xxI8plQy; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf07.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711790454; 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:dkim-signature; bh=lJ4gM3hLIcwSqjYBj3L/UG/M0emXi1d/+6LQ2jCQrfY=; b=xYmXNefVswupmHvdjKS0T900YzYq8OjX4qhYv0gNUX+E1bu73fZEMHiEroaqEbnwX/tVUY PTWYY2EeNCF53xo+tC6axP/Y+gPadiCe/zk2dzh/C5xMq+uOMYnx5wjSKZAQ5IMSfdo18k SGaIpM4GmR025sVsxrLdGDvC0WF/2Ps= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=xxI8plQy; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf07.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711790454; a=rsa-sha256; cv=none; b=Ovs9fhqHlMxrHbDBAfxuyM3g2CjtbK9CaI/GpylHDVI/OqPz8SlXSyjDqfSvRRYibgzUWW AV7bhzekELVU6SNYUwtZPHNlaZN9SMxlUXv1F/JnFEuNfaq6+cfilFuiI6blvj7EoqiP1s 5m6I02M2ZYgW1orzjS+7IZ6IzV3wkCY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 09906CE0022; Sat, 30 Mar 2024 09:20:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE008C433C7; Sat, 30 Mar 2024 09:20:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711790450; bh=M27+PXNCdgAP5Zv/wPLYAEhu5OEdDmTjo5MmS2fHZYM=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=xxI8plQyBtqoGWK74qEAH796XTilkjEL5dI7HFkq0C2EjNSKBt3sy/L/ZGg8nCrVc NpY5OsdMzFtnyPdfEQyrP2Z8zqsk1v4D4UV6SR36yobo88yZwC8FrzPbpAAEJvjk2B kBJwvC7vBzmWzayFMu6iT2nYX2l53cofIdkfSRXA= Subject: Patch "mm/migrate: set swap entry values of THP tail pages properly." has been added to the 5.15-stable tree To: 1707814102-22682-1-git-send-email-quic_charante@quicinc.com,akpm@linux-foundation.org,david@redhat.com,gregkh@linuxfoundation.org,linux-mm@kvack.org,naoya.horiguchi@linux.dev,quic_charante@quicinc.com,willy@infradead.org,ying.huang@intel.com,zi.yan@sent.com,ziy@nvidia.com Cc: From: Date: Sat, 30 Mar 2024 10:20:40 +0100 In-Reply-To: <20240306155157.118343-1-zi.yan@sent.com> Message-ID: <2024033040-scorecard-exploring-dfe0@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 2753B40007 X-Stat-Signature: u1ek3sj45cc3jyn71h7c5tzgnyp7c98p X-HE-Tag: 1711790453-360894 X-HE-Meta: U2FsdGVkX1/muiEkeOFcggQLQgKzwz/J3ElfA0CdyPh0+j0OG8dFjpgV157aTsmrZ7FZBaB7I7gaN7ZxX3aO7Y/HZ/+kPQJ7O7XZFGTqmYmRo7mTGKLX3GsDCRP5Rvs6QeMN9ydFfndz3TT8nVbcttB2PDjr/B3ZdCgfqwlkqA7cwVSLwrWeG0LgCFfj6lgG9y43XEwGegaZawT8lnHIKb0we/0LqqgUKA2/4+j7KbqwqmgdT2C4u2MDvEUhG2iwmRWWQXIDZmbgBlvEbc25C1cvPOjztkIpZbgZYk71LiTX/mkxxgFK33FyVNBTgk/m/B2k3Dg/33aSSgZXwpIpOyaniYlTc9OhsP49UhuLG4v0CqBEvXNUm/QngAQl3eQySECupMgdthJlyoYPFE5Xkqlw9/Axte95IFsBBUmHR5VZ8uYuQHk+1sc/JXF6ZmbvJrtasg87VG1FZ4YUiyh0FlLTYJW7LTk3NwoZgXxjhbo3S/ioNRo5P+c3+3RrbmdVkBpZWIRoCQGPkiXPTYPppsdJDPeQX0BJ6Lkz4Cmn7is+MGXTfA+TI1pgkFEr6NPwyitMyZm+05Rb0cwp/WOzphxHrGZPpxVhPLuJzqrzfm4DPRLqLd+qxmHUe4CrzgAbZL71LHpP8u+1O3pgZ/ru2v2MNy9PAxnHTPzxiJiILDhqEfh6Ca+T0Q+OyVUU4/VxO1E5twEAObFQ9JBeWnsSEMt38GpuvittGpKTWC2SIpzMOua1T1Dlzy0euAyqq7wvFJDTpH+Pg65HU0alkuoZhxDj8lex20u8VKoftMhE9Ma3MHvJfbGZ8QWUkZAgwhp2k56gEuF9f6U5UhEc+2M865r27Pck7H2BNs3AhfK4bi6iep+7rC6eSCwLxNd7SIhqVjubNo9t0MHySPPWhMQYyMBxokcSiKGO 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: List-Subscribe: List-Unsubscribe: This is a note to let you know that I've just added the patch titled mm/migrate: set swap entry values of THP tail pages properly. to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mm-migrate-set-swap-entry-values-of-thp-tail-pages-properly.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable+bounces-27000-greg=kroah.com@vger.kernel.org Wed Mar 6 16:52:16 2024 From: Zi Yan Date: Wed, 6 Mar 2024 10:51:57 -0500 Subject: mm/migrate: set swap entry values of THP tail pages properly. To: gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: Zi Yan , linux-mm@kvack.org, Charan Teja Kalla , "Matthew Wilcox (Oracle)" , David Hildenbrand , Andrew Morton , Huang Ying , Naoya Horiguchi Message-ID: <20240306155157.118343-1-zi.yan@sent.com> From: Zi Yan The tail pages in a THP can have swap entry information stored in their private field. When migrating to a new page, all tail pages of the new page need to update ->private to avoid future data corruption. This fix is stable-only, since after commit 07e09c483cbe ("mm/huge_memory: work on folio->swap instead of page->private when splitting folio"), subpages of a swapcached THP no longer requires the maintenance. Adding THPs to the swapcache was introduced in commit 38d8b4e6bdc87 ("mm, THP, swap: delay splitting THP during swap out"), where each subpage of a THP added to the swapcache had its own swapcache entry and required the ->private field to point to the correct swapcache entry. Later, when THP migration functionality was implemented in commit 616b8371539a6 ("mm: thp: enable thp migration in generic path"), it initially did not handle the subpages of swapcached THPs, failing to update their ->private fields or replace the subpage pointers in the swapcache. Subsequently, commit e71769ae5260 ("mm: enable thp migration for shmem thp") addressed the swapcache update aspect. This patch fixes the update of subpage ->private fields. Closes: https://lore.kernel.org/linux-mm/1707814102-22682-1-git-send-email-quic_charante@quicinc.com/ Fixes: 616b8371539a ("mm: thp: enable thp migration in generic path") Signed-off-by: Zi Yan Acked-by: David Hildenbrand Signed-off-by: Greg Kroah-Hartman --- mm/migrate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/mm/migrate.c +++ b/mm/migrate.c @@ -424,8 +424,12 @@ int migrate_page_move_mapping(struct add if (PageSwapBacked(page)) { __SetPageSwapBacked(newpage); if (PageSwapCache(page)) { + int i; + SetPageSwapCache(newpage); - set_page_private(newpage, page_private(page)); + for (i = 0; i < (1 << compound_order(page)); i++) + set_page_private(newpage + i, + page_private(page + i)); } } else { VM_BUG_ON_PAGE(PageSwapCache(page), page); Patches currently in stable-queue which might be from kroah.com@vger.kernel.org are queue-5.15/x86-rfds-mitigate-register-file-data-sampling-rfds.patch queue-5.15/vfio-pci-create-persistent-intx-handler.patch queue-5.15/x86-entry_32-add-verw-just-before-userspace-transition.patch queue-5.15/vfio-fsl-mc-block-calling-interrupt-handler-without-trigger.patch queue-5.15/x86-bugs-add-asm-helpers-for-executing-verw.patch queue-5.15/x86-asm-differentiate-between-code-and-function-alignment.patch queue-5.15/vfio-pci-disable-auto-enable-of-exclusive-intx-irq.patch queue-5.15/vfio-pci-lock-external-intx-masking-ops.patch queue-5.15/x86-alternatives-teach-text_poke_bp-to-patch-jcc.d32-instructions.patch queue-5.15/vfio-introduce-interface-to-flush-virqfd-inject-workqueue.patch queue-5.15/kvm-x86-export-rfds_no-and-rfds_clear-to-guests.patch queue-5.15/x86-asm-add-_asm_rip-macro-for-x86-64-rip-suffix.patch queue-5.15/x86-entry_64-add-verw-just-before-userspace-transition.patch queue-5.15/x86-alternatives-introduce-int3_emulate_jcc.patch queue-5.15/x86-mmio-disable-kvm-mitigation-when-x86_feature_clear_cpu_buf-is-set.patch queue-5.15/x86-bugs-use-alternative-instead-of-mds_user_clear-static-key.patch queue-5.15/documentation-hw-vuln-add-documentation-for-rfds.patch queue-5.15/kvm-vmx-use-bt-jnc-i.e.-eflags.cf-to-select-vmresume-vs.-vmlaunch.patch queue-5.15/mm-migrate-set-swap-entry-values-of-thp-tail-pages-properly.patch queue-5.15/kvm-vmx-move-verw-closer-to-vmentry-for-mds-mitigation.patch queue-5.15/arch-introduce-config_function_alignment.patch queue-5.15/x86-static_call-add-support-for-jcc-tail-calls.patch queue-5.15/vfio-platform-create-persistent-irq-handlers.patch