From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Mel Gorman <mgorman@suse.de>,
Vlastimil Babka <vbabka@suse.cz>, Michal Hocko <mhocko@suse.com>,
Hillf Danton <hillf.zj@alibaba-inc.com>,
Christoph Lameter <cl@linux.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Jesper Dangaard Brouer <brouer@redhat.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 4.9 54/83] mm, page_alloc: keep pcp count and list contents in sync if struct page is corrupted
Date: Wed, 4 Jan 2017 21:06:46 +0100 [thread overview]
Message-ID: <20170104200448.740670423@linuxfoundation.org> (raw)
In-Reply-To: <20170104200446.541604386@linuxfoundation.org>
4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mel Gorman <mgorman@techsingularity.net>
commit a6de734bc002fe2027ccc074fbbd87d72957b7a4 upstream.
Vlastimil Babka pointed out that commit 479f854a207c ("mm, page_alloc:
defer debugging checks of pages allocated from the PCP") will allow the
per-cpu list counter to be out of sync with the per-cpu list contents if
a struct page is corrupted.
The consequence is an infinite loop if the per-cpu lists get fully
drained by free_pcppages_bulk because all the lists are empty but the
count is positive. The infinite loop occurs here
do {
batch_free++;
if (++migratetype == MIGRATE_PCPTYPES)
migratetype = 0;
list = &pcp->lists[migratetype];
} while (list_empty(list));
What the user sees is a bad page warning followed by a soft lockup with
interrupts disabled in free_pcppages_bulk().
This patch keeps the accounting in sync.
Fixes: 479f854a207c ("mm, page_alloc: defer debugging checks of pages allocated from the PCP")
Link: http://lkml.kernel.org/r/20161202112951.23346-2-mgorman@techsingularity.net
Signed-off-by: Mel Gorman <mgorman@suse.de>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
mm/page_alloc.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2192,7 +2192,7 @@ static int rmqueue_bulk(struct zone *zon
unsigned long count, struct list_head *list,
int migratetype, bool cold)
{
- int i;
+ int i, alloced = 0;
spin_lock(&zone->lock);
for (i = 0; i < count; ++i) {
@@ -2217,13 +2217,21 @@ static int rmqueue_bulk(struct zone *zon
else
list_add_tail(&page->lru, list);
list = &page->lru;
+ alloced++;
if (is_migrate_cma(get_pcppage_migratetype(page)))
__mod_zone_page_state(zone, NR_FREE_CMA_PAGES,
-(1 << order));
}
+
+ /*
+ * i pages were removed from the buddy list even if some leak due
+ * to check_pcp_refill failing so adjust NR_FREE_PAGES based
+ * on i. Do not confuse with 'alloced' which is the number of
+ * pages added to the pcp list.
+ */
__mod_zone_page_state(zone, NR_FREE_PAGES, -(i << order));
spin_unlock(&zone->lock);
- return i;
+ return alloced;
}
#ifdef CONFIG_NUMA
next prev parent reply other threads:[~2017-01-04 20:12 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20170104200710epcas5p1339068db1097bb4b4df5379cb539f508@epcas5p1.samsung.com>
2017-01-04 20:05 ` [PATCH 4.9 00/83] 4.9.1-stable review Greg Kroah-Hartman
2017-01-04 20:05 ` [PATCH 4.9 01/83] hotplug: Make register and unregister notifier API symmetric Greg Kroah-Hartman
2017-01-04 20:05 ` [PATCH 4.9 02/83] btrfs: limit async_work allocation and worker func duration Greg Kroah-Hartman
2017-01-04 20:05 ` [PATCH 4.9 03/83] Btrfs: fix BUG_ON in btrfs_mark_buffer_dirty Greg Kroah-Hartman
2017-01-04 20:05 ` [PATCH 4.9 04/83] Btrfs: fix deadlock caused by fsync when logging directory entries Greg Kroah-Hartman
2017-01-04 20:05 ` [PATCH 4.9 05/83] Btrfs: fix tree search logic when replaying directory entry deletes Greg Kroah-Hartman
2017-01-04 20:05 ` [PATCH 4.9 06/83] Btrfs: fix relocation incorrectly dropping data references Greg Kroah-Hartman
2017-01-04 20:05 ` [PATCH 4.9 07/83] btrfs: store and load values of stripes_min/stripes_max in balance status item Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 08/83] Btrfs: fix emptiness check for dirtied extent buffers at check_leaf() Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 09/83] Btrfs: fix qgroup rescan worker initialization Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 10/83] USB: serial: option: add support for Telit LE922A PIDs 0x1040, 0x1041 Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 11/83] USB: serial: option: add dlink dwm-158 Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 12/83] USB: serial: kl5kusb105: fix open error path Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 13/83] USB: cdc-acm: add device id for GW Instek AFG-125 Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 14/83] usb: dwc3: gadget: set PCM1 field of isochronous-first TRBs Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 15/83] usb: hub: Fix auto-remount of safely removed or ejected USB-3 devices Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 17/83] usb: gadget: f_uac2: fix error handling at afunc_bind Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 18/83] usb: gadget: composite: correctly initialize ep->maxpacket Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 19/83] USB: UHCI: report non-PME wakeup signalling for Intel hardware Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 20/83] usbip: vudc: fix: Clear already_seen flag also for ep0 Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 21/83] ALSA: usb-audio: Add QuickCam Communicate Deluxe/S7500 to volume_control_quirks Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 22/83] ALSA: hiface: Fix M2Tech hiFace driver sampling rate change Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 23/83] ALSA: hda/ca0132 - Add quirk for Alienware 15 R2 2016 Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 24/83] ALSA: hda - ignore the assoc and seq when comparing pin configurations Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 25/83] ALSA: hda - fix headset-mic problem on a Dell laptop Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 26/83] ALSA: hda - Gate the mic jack on HP Z1 Gen3 AiO Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 27/83] ALSA: hda: when comparing pin configurations, ignore assoc in addition to seq Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 28/83] clk: ti: omap36xx: Work around sprz319 advisory 2.1 Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 29/83] exec: Ensure mm->user_ns contains the execed files Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 30/83] fs: exec: apply CLOEXEC before changing dumpable task flags Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 31/83] splice: reinstate SIGPIPE/EPIPE handling Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 32/83] block_dev: dont test bdev->bd_contains when it is not stable Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 33/83] mm: Add a user_ns owner to mm_struct and fix ptrace permission checks Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 34/83] vfs,mm: fix return value of read() at s_maxbytes Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 35/83] ptrace: Capture the ptracers creds not PT_PTRACE_CAP Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 36/83] ptrace: Dont allow accessing an undumpable mm Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 38/83] ext4: dont lock buffer in ext4_commit_super if holding spinlock Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 39/83] ext4: fix mballoc breakage with 64k block size Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 40/83] ext4: fix stack memory corruption " Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 41/83] ext4: use more strict checks for inodes_per_block on mount Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 42/83] ext4: fix in-superblock mount options processing Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 43/83] ext4: add sanity checking to count_overhead() Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 44/83] ext4: reject inodes with negative size Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 45/83] ext4: return -ENOMEM instead of success Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 46/83] ext4: do not perform data journaling when data is encrypted Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 47/83] Revert "f2fs: use percpu_counter for # of dirty pages in inode" Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 48/83] f2fs: set ->owner for debugfs status files file_operations Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 49/83] f2fs: fix overflow due to condition check order Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 50/83] f2fs: fix to determine start_cp_addr by sbi->cur_cp_pack Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 51/83] loop: return proper error from loop_queue_rq() Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 52/83] nvmet: Fix possible infinite loop triggered on hot namespace removal Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 53/83] mm/vmscan.c: set correct defer count for shrinker Greg Kroah-Hartman
2017-01-04 20:06 ` Greg Kroah-Hartman [this message]
2017-01-04 20:06 ` [PATCH 4.9 55/83] usb: gadget: composite: always set ep->mult to a sensible value Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 56/83] PM / OPP: Pass opp_table to dev_pm_opp_put_regulator() Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 57/83] PM / OPP: Dont use OPP structure outside of rcu protected section Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 58/83] blk-mq: Do not invoke .queue_rq() for a stopped queue Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 59/83] dm table: fix all_blk_mq inconsistency when an empty table is loaded Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 60/83] dm table: an all_blk_mq table must be loaded for a blk-mq DM device Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 61/83] dm flakey: return -EINVAL on interval bounds error in flakey_ctr() Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 62/83] dm crypt: mark key as invalid until properly loaded Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 63/83] dm rq: fix a race condition in rq_completed() Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 64/83] dm raid: fix discard support regression Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 65/83] dm space map metadata: fix struct sm_metadata leak on failed create Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 66/83] ASoC: intel: Fix crash at suspend/resume without card registration Greg Kroah-Hartman
2017-01-04 20:06 ` [PATCH 4.9 67/83] cifs: Fix smbencrypt() to stop pointing a scatterlist at the stack Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 68/83] CIFS: Fix a possible memory corruption during reconnect Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 69/83] CIFS: Fix missing nls unload in smb2_reconnect() Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 70/83] CIFS: Fix a possible double locking of mutex during reconnect Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 71/83] CIFS: Decrease verbosity of ioctl call Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 72/83] CIFS: Fix a possible memory corruption in push locks Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 73/83] kernel/watchdog: use nmi registers snapshot in hardlockup handler Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 74/83] watchdog: mei_wdt: request stop on reboot to prevent false positive event Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 75/83] watchdog: qcom: fix kernel panic due to external abort on non-linefetch Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 76/83] kernel/debug/debug_core.c: more properly delay for secondary CPUs Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 77/83] tpm xen: Remove bogus tpm_chip_unregister Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 78/83] xen/gntdev: Use VM_MIXEDMAP instead of VM_IO to avoid NUMA balancing Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 79/83] arm/xen: Use alloc_percpu rather than __alloc_percpu Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 80/83] xfs: fix up xfs_swap_extent_forks inline extent handling Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 81/83] xfs: set AGI buffer type in xlog_recover_clear_agi_bucket Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 82/83] builddeb: fix cross-building to arm64 producing host-arch debs Greg Kroah-Hartman
2017-01-04 20:07 ` [PATCH 4.9 83/83] x86/kbuild: enable modversions for symbols exported from asm Greg Kroah-Hartman
2017-01-05 0:41 ` [PATCH 4.9 00/83] 4.9.1-stable review Shuah Khan
2017-01-05 7:52 ` Greg Kroah-Hartman
2017-01-05 4:50 ` Guenter Roeck
2017-01-05 7:53 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170104200448.740670423@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=brouer@redhat.com \
--cc=cl@linux.com \
--cc=hannes@cmpxchg.org \
--cc=hillf.zj@alibaba-inc.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.com \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).