[packages/kernel/LINUX_4_1] - up to 4.1.35

arekm arekm at pld-linux.org
Wed Oct 26 21:31:54 CEST 2016


commit b20a8dfcb916e6b72ef171d56ffefc3601b83e80
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Oct 26 21:31:47 2016 +0200

    - up to 4.1.35

 kernel-small_fixes.patch | 93 ------------------------------------------------
 kernel.spec              |  6 ++--
 2 files changed, 3 insertions(+), 96 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ce95e7d..cd13f0c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,9 +71,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		2
+%define		rel		1
 %define		basever		4.1
-%define		postver		.34
+%define		postver		.35
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	-%{basever}
@@ -122,7 +122,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5:	fe9dc0f6729f36400ea81aa41d614c37
 %if "%{postver}" != ".0"
 Patch0:		http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	e164a05dfb7b011f0ea69164a5bc3e02
+# Patch0-md5:	475b55af9ae118ff91cc5483a3df8d5c
 %endif
 Source1:	kernel.sysconfig
 
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 3b5a1a5..8f4f7e0 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -112,96 +112,3 @@ index 29531ec..65fbfb7 100644
 +			WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_fsname);
  	if (!mp->m_eofblocks_workqueue)
  		goto out_destroy_log;
- 
-
-
-commit 1294d355881cc5c3421d24fee512f16974addb6c
-Author: Linus Torvalds <torvalds at linux-foundation.org>
-Date:   Thu Oct 13 13:07:36 2016 -0700
-
-    mm: remove gup_flags FOLL_WRITE games from __get_user_pages()
-    
-    commit 19be0eaffa3ac7d8eb6784ad9bdbc7d67ed8e619 upstream.
-    
-    This is an ancient bug that was actually attempted to be fixed once
-    (badly) by me eleven years ago in commit 4ceb5db9757a ("Fix
-    get_user_pages() race for write access") but that was then undone due to
-    problems on s390 by commit f33ea7f404e5 ("fix get_user_pages bug").
-    
-    In the meantime, the s390 situation has long been fixed, and we can now
-    fix it by checking the pte_dirty() bit properly (and do it better).  The
-    s390 dirty bit was implemented in abf09bed3cce ("s390/mm: implement
-    software dirty bits") which made it into v3.9.  Earlier kernels will
-    have to look at the page state itself.
-    
-    Also, the VM has become more scalable, and what used a purely
-    theoretical race back then has become easier to trigger.
-    
-    To fix it, we introduce a new internal FOLL_COW flag to mark the "yes,
-    we already did a COW" rather than play racy games with FOLL_WRITE that
-    is very fundamental, and then use the pte dirty flag to validate that
-    the FOLL_COW flag is still valid.
-    
-    Reported-and-tested-by: Phil "not Paul" Oester <kernel at linuxace.com>
-    Acked-by: Hugh Dickins <hughd at google.com>
-    Reviewed-by: Michal Hocko <mhocko at suse.com>
-    Cc: Andy Lutomirski <luto at kernel.org>
-    Cc: Kees Cook <keescook at chromium.org>
-    Cc: Oleg Nesterov <oleg at redhat.com>
-    Cc: Willy Tarreau <w at 1wt.eu>
-    Cc: Nick Piggin <npiggin at gmail.com>
-    Cc: Greg Thelen <gthelen at google.com>
-    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
-    Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
-
-diff --git a/include/linux/mm.h b/include/linux/mm.h
-index cfebb74..f0ffa01 100644
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -2112,6 +2112,7 @@ static inline struct page *follow_page(struct vm_area_struct *vma,
- #define FOLL_MIGRATION	0x400	/* wait for page to replace migration entry */
- #define FOLL_TRIED	0x800	/* a retry, previous pass started an IO */
-+#define FOLL_COW	0x1000	/* internal GUP flag */
- 
- typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
- 			void *data);
- extern int apply_to_page_range(struct mm_struct *mm, unsigned long address,
-diff --git a/mm/gup.c b/mm/gup.c
-index deafa2c..4b0b7e7 100644
---- a/mm/gup.c
-+++ b/mm/gup.c
-@@ -58,6 +58,16 @@ static int follow_pfn_pte(struct vm_area_struct *vma, unsigned long address,
- 	return -EEXIST;
- }
- 
-+/*
-+ * FOLL_FORCE can write to even unwritable pte's, but only
-+ * after we've gone through a COW cycle and they are dirty.
-+ */
-+static inline bool can_follow_write_pte(pte_t pte, unsigned int flags)
-+{
-+	return pte_write(pte) ||
-+		((flags & FOLL_FORCE) && (flags & FOLL_COW) && pte_dirty(pte));
-+}
-+
- static struct page *follow_page_pte(struct vm_area_struct *vma,
- 		unsigned long address, pmd_t *pmd, unsigned int flags)
- {
-@@ -92,7 +102,7 @@ retry:
- 	}
- 	if ((flags & FOLL_NUMA) && pte_protnone(pte))
- 		goto no_page;
--	if ((flags & FOLL_WRITE) && !pte_write(pte)) {
-+	if ((flags & FOLL_WRITE) && !can_follow_write_pte(pte, flags)) {
- 		pte_unmap_unlock(ptep, ptl);
- 		return NULL;
- 	}
-@@ -352,7 +362,7 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
- 	 * reCOWed by userspace write).
- 	 */
- 	if ((ret & VM_FAULT_WRITE) && !(vma->vm_flags & VM_WRITE))
--		*flags &= ~FOLL_WRITE;
-+	        *flags |= FOLL_COW;
- 	return 0;
- }
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/b20a8dfcb916e6b72ef171d56ffefc3601b83e80



More information about the pld-cvs-commit mailing list