packages (LINUX_3_0): kernel/kernel-small_fixes.patch, kernel/kernel.spec -...

arekm arekm at pld-linux.org
Sat Jan 7 14:36:04 CET 2012


Author: arekm                        Date: Sat Jan  7 13:36:04 2012 GMT
Module: packages                      Tag: LINUX_3_0
---- Log message:
- up to 3.0.16

---- Files affected:
packages/kernel:
   kernel-small_fixes.patch (1.43.2.14 -> 1.43.2.15) , kernel.spec (1.987.2.22 -> 1.987.2.23) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.43.2.14 packages/kernel/kernel-small_fixes.patch:1.43.2.15
--- packages/kernel/kernel-small_fixes.patch:1.43.2.14	Thu Dec 22 16:03:54 2011
+++ packages/kernel/kernel-small_fixes.patch	Sat Jan  7 14:35:58 2012
@@ -272,64 +272,6 @@
  			fi
  		done
 
-An integer overflow will happen on 64bit archs if task's sum of rss, swapents
-and nr_ptes exceeds (2^31)/1000 value. This was introduced by commit
-
-f755a04 oom: use pte pages in OOM score
-
-where the oom score computation was divided into several steps and it's no
-longer computed as one expression in unsigned long(rss, swapents, nr_pte are
-unsigned long), where the result value assigned to points(int) is in
-range(1..1000). So there could be an int overflow while computing
-
-176          points *= 1000;
-
-and points may have negative value. Meaning the oom score for a mem hog task
-will be one.
-
-196          if (points <= 0)
-197                  return 1;
-
-For example:
-[ 3366]     0  3366 35390480 24303939   5       0             0 oom01
-Out of memory: Kill process 3366 (oom01) score 1 or sacrifice child
-
-Here the oom1 process consumes more than 24303939(rss)*4096~=92GB physical
-memory, but it's oom score is one.
-
-In this situation the mem hog task is skipped and oom killer kills another and
-most probably innocent task with oom score greater than one.
-
-The points variable should be of type long instead of int to prevent the int
-overflow.
-
-Signed-off-by: Frantisek Hrbata <fhrbata at redhat.com>
----
- mm/oom_kill.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index 626303b..e9a1785 100644
---- a/mm/oom_kill.c
-+++ b/mm/oom_kill.c
-@@ -162,7 +162,7 @@ static bool oom_unkillable_task(struct task_struct *p,
- unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem,
- 		      const nodemask_t *nodemask, unsigned long totalpages)
- {
--	int points;
-+	long points;
- 
- 	if (oom_unkillable_task(p, mem, nodemask))
- 		return 0;
--- 
-1.7.6.4
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
-
 commit 79dfdaccd1d5b40ff7cf4a35a0e63696ebb78b4d
 Author: Michal Hocko <mhocko at suse.cz>
 Date:   Tue Jul 26 16:08:23 2011 -0700
@@ -962,84 +904,4 @@
 -- 
 1.7.4.1
 
-commit 33b8f7c2479dfcbc5c27174e44b5f659d9f33c70
-Author: Christoph Hellwig <hch at lst.de>
-Date:   Fri Jul 8 14:34:39 2011 +0200
-
-    xfs: improve sync behaviour in the face of aggressive dirtying
-    
-    The following script from Wu Fengguang shows very bad behaviour in XFS
-    when aggressively dirtying data during a sync on XFS, with sync times
-    up to almost 10 times as long as ext4.
-    
-    A large part of the issue is that XFS writes data out itself two times
-    in the ->sync_fs method, overriding the livelock protection in the core
-    writeback code, and another issue is the lock-less xfs_ioend_wait call,
-    which doesn't prevent new ioend from being queue up while waiting for
-    the count to reach zero.
-    
-    This patch removes the XFS-internal sync calls and relies on the VFS
-    to do it's work just like all other filesystems do.  Note that the
-    i_iocount wait which is rather suboptimal is simply removed here.
-    We already do it in ->write_inode, which keeps the current supoptimal
-    behaviour.  We'll eventually need to remove that as well, but that's
-    material for a separate commit.
-    
-    ------------------------------ snip ------------------------------
-    #!/bin/sh
-    
-    umount /dev/sda7
-    mkfs.xfs -f /dev/sda7
-    # mkfs.ext4 /dev/sda7
-    # mkfs.btrfs /dev/sda7
-    mount /dev/sda7 /fs
-    
-    echo $((50<<20)) > /proc/sys/vm/dirty_bytes
-    
-    pid=
-    for i in `seq 10`
-    do
-    	dd if=/dev/zero of=/fs/zero-$i bs=1M count=1000 &
-    	pid="$pid $!"
-    done
-    
-    sleep 1
-    
-    tic=$(date +'%s')
-    sync
-    tac=$(date +'%s')
-    
-    echo
-    echo sync time: $((tac-tic))
-    egrep '(Dirty|Writeback|NFS_Unstable)' /proc/meminfo
-    
-    pidof dd > /dev/null && { kill -9 $pid; echo sync NOT livelocked; }
-    ------------------------------ snip ------------------------------
-    
-    Signed-off-by: Christoph Hellwig <hch at lst.de>
-    Reported-by: Wu Fengguang <fengguang.wu at intel.com>
-    Reviewed-by: Alex Elder <aelder at sgi.com>
-    Reviewed-by: Dave Chinner <dchinner at redhat.com>
 
-diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c
-index 8ecad5f..f54e8ee 100644
---- a/fs/xfs/linux-2.6/xfs_sync.c
-+++ b/fs/xfs/linux-2.6/xfs_sync.c
-@@ -359,14 +359,12 @@ xfs_quiesce_data(
- {
- 	int			error, error2 = 0;
- 
--	/* push non-blocking */
--	xfs_sync_data(mp, 0);
- 	xfs_qm_sync(mp, SYNC_TRYLOCK);
--
--	/* push and block till complete */
--	xfs_sync_data(mp, SYNC_WAIT);
- 	xfs_qm_sync(mp, SYNC_WAIT);
- 
-+	/* force out the newly dirtied log buffers */
-+	xfs_log_force(mp, XFS_LOG_SYNC);
-+
- 	/* write superblock and hoover up shutdown errors */
- 	error = xfs_sync_fsdata(mp);
- 

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.987.2.22 packages/kernel/kernel.spec:1.987.2.23
--- packages/kernel/kernel.spec:1.987.2.22	Tue Jan  3 21:13:37 2012
+++ packages/kernel/kernel.spec	Sat Jan  7 14:35:58 2012
@@ -94,7 +94,7 @@
 %endif
 
 %define		basever		3.0
-%define		postver		.15
+%define		postver		.16
 %define		rel		1
 
 %define		_enable_debug_packages			0
@@ -143,7 +143,7 @@
 # Source0-md5:	ecf932280e2441bdd992423ef3d55f8f
 %if "%{postver}" != ".0"
 Patch0:		http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5:	759f5efe7eb8e8672041c1fe388d1ebe
+# Patch0-md5:	7681cc21dd3361d6f3fd2b6a9bcd9092
 %endif
 
 Source3:	kernel-autoconf.h
@@ -1535,6 +1535,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.987.2.23  2012/01/07 13:35:58  arekm
+- up to 3.0.16
+
 Revision 1.987.2.22  2012/01/03 20:13:37  arekm
 - up to 3.0.15; update vserver patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.43.2.14&r2=1.43.2.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.987.2.22&r2=1.987.2.23&f=u



More information about the pld-cvs-commit mailing list