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 A2268CD1288 for ; Sat, 30 Mar 2024 09:20:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 37DCC6B0092; Sat, 30 Mar 2024 05:20:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 32D846B0093; Sat, 30 Mar 2024 05:20:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F71E6B0095; Sat, 30 Mar 2024 05:20:30 -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 F3D9A6B0092 for ; Sat, 30 Mar 2024 05:20:29 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 833078127E for ; Sat, 30 Mar 2024 09:20:29 +0000 (UTC) X-FDA: 81953159778.21.23AF87F Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf27.hostedemail.com (Postfix) with ESMTP id 2D0354001A for ; Sat, 30 Mar 2024 09:20:26 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=hkPShegn; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf27.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=1711790427; 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=ZaGnoKo/gYWoKoE4LRUTyQj6rm2S83Mzc0eB2WpX9P8=; b=WnpruT0zAHneowD4cgnVBiHwbS9hGcCyclk3bl1vcaPTQZiuJ32ask0Ywe8cZJ2ebINVWN EEjTPty4XGa1sScvOvgz0IMI2HM/6ghEHkTcwZmSYtnv+yMDpSZQ70RGTf2z/0s275bfpr jJHSuWrggLYl3gtHj6iW+OCbelGBMTQ= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=hkPShegn; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf27.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=1711790427; a=rsa-sha256; cv=none; b=2dNOJVQ9hw+Jz1+h5LXVHvrsCrjC4A0txy1FJgM2BnE4JphMTQMJb/Yt618wvlVZ9dH2A/ YnlCHCExx45YbgZ/R1hqw+mHyisPyK6ZvYLRLVFsqtoLEeuZhhazoak9m9YoIQF244o3Wr eZrbvvELzjwOXzUQyUIxyhPXdh9HPGo= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 1B1FECE013C; Sat, 30 Mar 2024 09:20:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0B3BC433F1; Sat, 30 Mar 2024 09:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711790423; bh=8ztIFoSNsiV5vqrJ4zWnowgZcRYoZaxR0h4l503IJU8=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=hkPShegn61tsyB2Li3RSE6S+yvZS0upPHiTdIUHNjHVfwLZuOhVOBx+uUvAj+PPFr 06po10e8vhVzNFXeqNCYhhbrxwcDTEGayWcoDovMUqNISsBz0qb6EM2IaEh/hz46Yn 1uwsyo6HYly1gUSJiOnXLbKITy+dqZJ3yaoYW2ZA= Subject: Patch "mm/migrate: set swap entry values of THP tail pages properly." has been added to the 5.4-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:20 +0100 In-Reply-To: <20240306155113.118119-1-zi.yan@sent.com> Message-ID: <2024033020-usage-submerge-ca79@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-Rspamd-Queue-Id: 2D0354001A X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: fpj3mud5nn3bfmtiimwbih7ty5d9wquk X-HE-Tag: 1711790426-738147 X-HE-Meta: U2FsdGVkX192dt5OVGwQljUSmlVDXOcDkRmKKDkPo02hIX0trhpI1y6l0CjDQ3jMdNoqCadHXBs+FQp2uk73go6kHGIc6qxBKBZJEekgsNsm87043LFNgSbH0CzqJOlB2cy4bWc+JHht/Gy92voZ58LJRW5mj3MTvRLw2WBp55Zz+ii265K134k7O+BEuPhjrLcEsktVCK/7nn8NLZjfenSszYv0S29yFAACKeq10U2kf6lH+ZzEA9tk80GQSeQzTg65AGPZOqi7RN7a3jSkOLLXT//bqwrexdRHq4dKbZg5lgfb+3vw3L9lk7ax6fdZJbUHN90v0PArUZ3TGdl8ei87XSHyZrNh/XUek0BBgEcLEatGYGxhgQ4i+UdxJpAM2bGLfmoEmQNozVcOVEn5xp4m0P9b35KJ59ZQ78qvCMteMA6/eBJQ9Zv4FqlHVhPtPwWCJ2yroOMu/rAS5iZ2hs00onHqURCzgWZX8uUs+MoSyGRSr29trjW6LZHKkzHfWOEuiN107VnwgvjYVy4Tww2NcYJJLuZV05iNvyV5csX2B1QZH5BVnI4/zPR/o3t5aEP6oIPQdu1S8pHg783NYTSkSQxCXDjs/snDJgfxqIMaqINxSkhs7mdUwaDJ6k2nPnIRmqptcH21xU/umIXqi8IYz4OAMFFQrYRZWIp0CdUQAIhG/YB6KPtBV9Jwdur2mr7NCcyzns5cqnqfFXkTnL5ljySRg6TZZ9pInFYXSDIOS9tc/+FeZZIoJ4HD3niQe6Jfam4q231etbVnbazqx9LzjyPaVsFaFJGyBUEqeuiwiVKGDkdHgSUrtcSPvB5tOVAf15vJBD4W65g29tOmaTeiVWSSic/JAN4HQnRArAHP0rk0OezrwCduvH+d+DjgZs7GlR1WpcUFSN0STvX0AHX+DCrFQQhgWhRABCuj98yaKm5zmOEbdkYZeWk2WNvxKH1+0L+2lzeYYDFB+km wtUvlA4M NTtHBJuUQwOKutTYcyxF6cl0+wY1YQ6JUzSetAwvAjGH0GvdwS9cGNFSHNqk1QpEDx19TLo8AN9jXIH3DicT38YEHYaGSa/B6kWpJ/RuNpcKz7JNkd8FjEdiKuQIemwsafwMYI3W0Oaigq8U9AGq2GPwjCfqv8EYNHo5DOQuHMlDm7RUQfyoGBowqYxBYqeUEK9KurDpsT0vvrUw/YxOyprj368WVzFIeN5ycfasZCUhIX2s/0vyLcKVnqLFbEEf1NexP6yhgI6SXSKIM4HzLwTfafPCX9Fn2c5nk3ubSbtXMDhFCjF5CvG47PLkyEvzVBWkeufg8erF3ttabcucUM3VS1sqiv6C6NZCb9kHrx/ExyGisX4ZKCr0O16qwDl9ifKhuqi1WPCLc9JHuRIfD5SwMaq6kLW6CJJ7Mp8nuWxZAzvPWUQdsQjDAs5ZrBsPAnFYBPM/y3Dp206D6DbAR1Hz+FMHijIvH7W74vPzsXEWDkdJrhk9RsXuFS3IGODYY/zyN0LulJRSA5AEMTiMl3g+DpveCH5xMz5+L6SibrZcl25nn1PdyoGvdBRorlPjg2ygfwDRJ8u0LoY0XIAMckcVhRKkPqHo2YUNtA0pPdwjWrudu+YDEtC+e3cnw+xdLA8SychsE2eWUzW8mk58gOtD0bPDMT1NA9p2YcThir6Fg4b/rfDOxezeJO2r3gT3xYM6I 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.4-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.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable+bounces-26998-greg=kroah.com@vger.kernel.org Wed Mar 6 16:51:22 2024 From: Zi Yan Date: Wed, 6 Mar 2024 10:51:13 -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: <20240306155113.118119-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 @@ -441,8 +441,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.4/loop-factor-out-configuring-loop-from-status.patch queue-5.4/loop-call-loop_config_discard-only-after-new-config-is-applied.patch queue-5.4/loop-refactor-loop_set_status-size-calculation.patch queue-5.4/loop-factor-out-setting-loop-device-size.patch queue-5.4/loop-check-for-overflow-while-configuring-loop.patch queue-5.4/loop-remove-sector_t-truncation-checks.patch queue-5.4/revert-loop-check-for-overflow-while-configuring-loop.patch queue-5.4/loop-loop_set_status_from_info-check-before-assignment.patch queue-5.4/mm-migrate-set-swap-entry-values-of-thp-tail-pages-properly.patch