[pve-devel] r6149 - pve-kernel-2.6.32-rh/trunk

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Jun 24 08:54:42 CEST 2011


Author: dietmar
Date: 2011-06-24 08:54:42 +0200 (Fri, 24 Jun 2011)
New Revision: 6149

Added:
   pve-kernel-2.6.32-rh/trunk/aoe6-77.tar.gz
   pve-kernel-2.6.32-rh/trunk/ovz-fix-slow-fsync.patch
Removed:
   pve-kernel-2.6.32-rh/trunk/aoe6-73.tar.gz
Modified:
   pve-kernel-2.6.32-rh/trunk/Makefile
   pve-kernel-2.6.32-rh/trunk/README
   pve-kernel-2.6.32-rh/trunk/assemble-firmware.pl
   pve-kernel-2.6.32-rh/trunk/changelog.Debian
Log:


Modified: pve-kernel-2.6.32-rh/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32-rh/trunk/Makefile	2011-06-24 06:19:21 UTC (rev 6148)
+++ pve-kernel-2.6.32-rh/trunk/Makefile	2011-06-24 06:54:42 UTC (rev 6149)
@@ -29,7 +29,7 @@
 FW_REL=13
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
-AOEDIR=aoe6-73
+AOEDIR=aoe6-77
 AOESRC=${AOEDIR}.tar.gz
 
 E1000EDIR=e1000e-1.3.17
@@ -41,8 +41,8 @@
 IXGBEDIR=ixgbe-3.3.9
 IXGBESRC=${IXGBEDIR}.tar.gz
 
-BNX2DIR=netxtreme2-6.2.23
-BNX2SRC=${BNX2DIR}.tar.gz
+#BNX2DIR=netxtreme2-6.2.23
+#BNX2SRC=${BNX2DIR}.tar.gz
 
 ARECADIR=arcmsr.1.20.0X.15-110330
 ARECASRC=${ARECADIR}.zip
@@ -93,7 +93,7 @@
 	./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
 	mv fwlist.tmp $@
 
-data: .compile_mark ${KERNEL_CFG} arcmsr.ko aoe.ko e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi-scst.ko scst-modules.tar
+data: .compile_mark ${KERNEL_CFG} arcmsr.ko aoe.ko e1000e.ko igb.ko ixgbe.ko iscsi-scst.ko scst-modules.tar
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
@@ -111,9 +111,9 @@
 	# install latest ibg driver
 	install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/igb/
 	# install bnx2 and tg3 drivers
-	install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
-	install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
-	install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
+	#install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
+	#install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
+	#install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/
 	# install areca driver
 	install -m 644 arcmsr.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/arcmsr/
 	# install scst modules
@@ -157,6 +157,7 @@
 	cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/io_context-2.6.32.patch
 	#cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/readahead-2.6.32.patch
 	#cd ${KERNEL_SRC}; patch -p1 <../put_page_callback-2.6.32.patch
+	cd ${KERNEL_SRC}; patch -p1 <../ovz-fix-slow-fsync.patch
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	touch $@
 
@@ -206,13 +207,13 @@
 	cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
 	cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
 
-bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC}
-	rm -rf ${BNX2DIR}
-	tar xf ${BNX2SRC}
-	mkdir -p /lib/modules/${KVNAME}
-	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-	cd ${BNX2DIR}; make KVER=${KVNAME}
-	cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.ko` .
+#bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC}
+#	rm -rf ${BNX2DIR}
+#	tar xf ${BNX2SRC}
+#	mkdir -p /lib/modules/${KVNAME}
+#	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+#	cd ${BNX2DIR}; make KVER=${KVNAME}
+#	cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.ko` .
 
 arcmsr.ko: ${ARECASRC}
 	rm -rf ${ARECADIR}
@@ -320,6 +321,6 @@
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} ${ISCSI_DEB} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata fwlist.tmp iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko fwlist-${KVNAME} ${ARECADIR} arcmsr.ko 
+	rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} ${ISCSI_DEB} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata fwlist.tmp iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} ${ARECADIR} arcmsr.ko 
 
 

Modified: pve-kernel-2.6.32-rh/trunk/README
===================================================================
--- pve-kernel-2.6.32-rh/trunk/README	2011-06-24 06:19:21 UTC (rev 6148)
+++ pve-kernel-2.6.32-rh/trunk/README	2011-06-24 06:54:42 UTC (rev 6149)
@@ -20,11 +20,6 @@
 
 - include latest e1000e driver from intel/sourceforge
 
-- include latest broadcom bnx2 drivers
-        
-  * original file linux-6.2.23.zip contains
-    netxtreme2-6.2.23.tar.gz (added to repository)
-
 - include update for ARECA RAID cards
 
   * ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/DRIVER/SourceCode/arcmsr.1.20.0X.15-110330.zip

Deleted: pve-kernel-2.6.32-rh/trunk/aoe6-73.tar.gz
===================================================================
(Binary files differ)

Added: pve-kernel-2.6.32-rh/trunk/aoe6-77.tar.gz
===================================================================
(Binary files differ)


Property changes on: pve-kernel-2.6.32-rh/trunk/aoe6-77.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pve-kernel-2.6.32-rh/trunk/assemble-firmware.pl
===================================================================
--- pve-kernel-2.6.32-rh/trunk/assemble-firmware.pl	2011-06-24 06:19:21 UTC (rev 6148)
+++ pve-kernel-2.6.32-rh/trunk/assemble-firmware.pl	2011-06-24 06:54:42 UTC (rev 6149)
@@ -113,6 +113,7 @@
 mwl8k/fmimage_8363.fw
 mwl8k/helper_8363.fw
 iwlwifi-6000g2a-4.ucode
+iwlwifi-130-5.ucode
 cxgb4/t4fw.bin
 
 )) {

Modified: pve-kernel-2.6.32-rh/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-06-24 06:19:21 UTC (rev 6148)
+++ pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-06-24 06:54:42 UTC (rev 6149)
@@ -1,7 +1,13 @@
 pve-kernel-2.6.32 (2.6.32-36) unstable; urgency=low
 
   * use kernel from OpenVZ project as base
+  
+  * update AOE drover to aoe6-77.tar.gz  
 
+  * remove bnx2 custom driver - use driver provided by kernel
+  
+  * include ovz-fix-slow-fsync.patch
+  
  -- Proxmox Support Team <support at proxmox.com>  Fri, 24 Jun 2011 08:01:39 +0200
 
 pve-kernel-2.6.32 (2.6.32-35) unstable; urgency=low

Added: pve-kernel-2.6.32-rh/trunk/ovz-fix-slow-fsync.patch
===================================================================
--- pve-kernel-2.6.32-rh/trunk/ovz-fix-slow-fsync.patch	                        (rev 0)
+++ pve-kernel-2.6.32-rh/trunk/ovz-fix-slow-fsync.patch	2011-06-24 06:54:42 UTC (rev 6149)
@@ -0,0 +1,42 @@
+cfq: allow cross group sync noidle preemption
+
+From: Konstantin Khlebnikov <khlebnikov at openvz.org>
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1913
+
+Signed-off-by: Konstantin Khlebnikov <khlebnikov at openvz.org>
+---
+ block/cfq-iosched.c |   14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
+index b4cf30b..9d80168 100644
+--- a/block/cfq-iosched.c
++++ b/block/cfq-iosched.c
+@@ -3273,19 +3273,19 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,
+ 	if (rq_is_sync(rq) && !cfq_cfqq_sync(cfqq))
+ 		return true;
+ 
+-	if (new_cfqq->cfqg != cfqq->cfqg)
+-		return false;
+-
+-	if (cfq_slice_used(cfqq))
+-		return true;
+-
+ 	/* Allow preemption only if we are idling on sync-noidle tree */
+ 	if (cfqd->serving_type == SYNC_NOIDLE_WORKLOAD &&
+ 	    cfqq_type(new_cfqq) == SYNC_NOIDLE_WORKLOAD &&
+-	    new_cfqq->service_tree->count == 2 &&
++	    new_cfqq->service_tree->count == 1 + (new_cfqq->cfqg == cfqq->cfqg) &&
+ 	    RB_EMPTY_ROOT(&cfqq->sort_list))
+ 		return true;
+ 
++	if (new_cfqq->cfqg != cfqq->cfqg)
++		return false;
++
++	if (cfq_slice_used(cfqq))
++		return true;
++
+ 	/*
+ 	 * So both queues are sync. Let the new request get disk time if
+ 	 * it's a metadata request and the current queue is doing regular IO.



More information about the pve-devel mailing list