From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:38712 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752474AbdFRB2S (ORCPT ); Sat, 17 Jun 2017 21:28:18 -0400 Subject: Patch "swap: cond_resched in swap_cgroup_prepare()" has been added to the 3.18-stable tree To: yuzhao@google.com, akpm@linux-foundation.org, gregkh@linuxfoundation.org, mhocko@suse.com, torvalds@linux-foundation.org, vdavydov.dev@gmail.com Cc: , From: Date: Sun, 18 Jun 2017 09:23:02 +0800 Message-ID: <1497748982249106@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled swap: cond_resched in swap_cgroup_prepare() to the 3.18-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: swap-cond_resched-in-swap_cgroup_prepare.patch and it can be found in the queue-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From ef70762948dde012146926720b70e79736336764 Mon Sep 17 00:00:00 2001 From: Yu Zhao Date: Fri, 16 Jun 2017 14:02:31 -0700 Subject: swap: cond_resched in swap_cgroup_prepare() From: Yu Zhao commit ef70762948dde012146926720b70e79736336764 upstream. I saw need_resched() warnings when swapping on large swapfile (TBs) because continuously allocating many pages in swap_cgroup_prepare() took too long. We already cond_resched when freeing page in swap_cgroup_swapoff(). Do the same for the page allocation. Link: http://lkml.kernel.org/r/20170604200109.17606-1-yuzhao@google.com Signed-off-by: Yu Zhao Acked-by: Michal Hocko Acked-by: Vladimir Davydov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/page_cgroup.c | 3 +++ 1 file changed, 3 insertions(+) --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c @@ -368,6 +368,9 @@ static int swap_cgroup_prepare(int type) if (!page) goto not_enough_page; ctrl->map[idx] = page; + + if (!(idx % SWAP_CLUSTER_MAX)) + cond_resched(); } return 0; not_enough_page: Patches currently in stable-queue which might be from yuzhao@google.com are queue-3.18/swap-cond_resched-in-swap_cgroup_prepare.patch