From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:49165 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755801AbcBXDds (ORCPT ); Tue, 23 Feb 2016 22:33:48 -0500 Subject: Patch "drivers/scsi/sg.c: mark VMA as VM_IO to prevent migration" has been added to the 3.14-stable tree To: kirill.shutemov@linux.intel.com, James.Bottomley@HansenPartnership.com, akpm@linux-foundation.org, dgilbert@interlog.com, dvyukov@google.com, glider@google.com, gregkh@linuxfoundation.org, hughd@google.com, kcc@google.com, n-horiguchi@ah.jp.nec.com, rientjes@google.com, sasha.levin@oracle.com, shashim@codeaurora.org, syzkaller@googlegroups.com, torvalds@linux-foundation.org, vbabka@suse.cz Cc: , From: Date: Tue, 23 Feb 2016 19:23:33 -0800 Message-ID: <145628421317685@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 drivers/scsi/sg.c: mark VMA as VM_IO to prevent migration to the 3.14-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: drivers-scsi-sg.c-mark-vma-as-vm_io-to-prevent-migration.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 461c7fa126794157484dca48e88effa4963e3af3 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Tue, 2 Feb 2016 16:57:35 -0800 Subject: drivers/scsi/sg.c: mark VMA as VM_IO to prevent migration From: Kirill A. Shutemov commit 461c7fa126794157484dca48e88effa4963e3af3 upstream. Reduced testcase: #include #include #include #include #define SIZE 0x2000 int main() { int fd; void *p; fd = open("/dev/sg0", O_RDWR); p = mmap(NULL, SIZE, PROT_EXEC, MAP_PRIVATE | MAP_LOCKED, fd, 0); mbind(p, SIZE, 0, NULL, 0, MPOL_MF_MOVE); return 0; } We shouldn't try to migrate pages in sg VMA as we don't have a way to update Sg_scatter_hold::pages accordingly from mm core. Let's mark the VMA as VM_IO to indicate to mm core that the VMA is not migratable. Signed-off-by: Kirill A. Shutemov Reported-by: Dmitry Vyukov Acked-by: Vlastimil Babka Cc: Doug Gilbert Cc: David Rientjes Cc: Naoya Horiguchi Cc: "Kirill A. Shutemov" Cc: Shiraz Hashim Cc: Hugh Dickins Cc: Sasha Levin Cc: syzkaller Cc: Kostya Serebryany Cc: Alexander Potapenko Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/sg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -1258,7 +1258,7 @@ sg_mmap(struct file *filp, struct vm_are } sfp->mmap_called = 1; - vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; + vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; vma->vm_private_data = sfp; vma->vm_ops = &sg_mmap_vm_ops; return 0; Patches currently in stable-queue which might be from kirill.shutemov@linux.intel.com are queue-3.14/drivers-scsi-sg.c-mark-vma-as-vm_io-to-prevent-migration.patch queue-3.14/mm-fix-mlock-accouting.patch queue-3.14/scsi-add-marvell-console-to-vpd-blacklist.patch