Bug 322245, Bug 330019

(Portage version: 2.1.8.3/cvs/Linux x86_64)

8 files changed, 340 insertions, 4 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index c88f5cbe2504..afe7cb2c7cba 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.57 2010/05/03 16:53:39 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.58 2010/08/04 19:01:30 vadimk Exp $
+
+  04 Aug 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  +files/1.0.0.24-sk_sleep.patch, vmware-modules-1.0.0.24-r1.ebuild,
+  +files/1.0.0.25-sk_sleep.patch, vmware-modules-1.0.0.25-r1.ebuild,
+  +files/1.0.0.26-iommu_map.patch, vmware-modules-1.0.0.26.ebuild,
+  +files/1.0.0.26-sk_sleep.patch:
+  patches for 2.6.35 kernel. Bug 322245, Bug 330019
 
   03 May 2010; Vadim Kuznetsov <vadimk@gentoo.org>
   vmware-modules-1.0.0.25-r1.ebuild, vmware-modules-1.0.0.26.ebuild,
diff --git a/app-emulation/vmware-modules/files/1.0.0.24-sk_sleep.patch b/app-emulation/vmware-modules/files/1.0.0.24-sk_sleep.patch
new file mode 100644
index 000000000000..cdf76b0d8983
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.24-sk_sleep.patch
@@ -0,0 +1,92 @@
+--- vsock-only/linux/af_vsock.c.orig	2009-03-27 01:34:32.000000000 -0400
++++ vsock-only/linux/af_vsock.c	2010-08-04 14:12:13.000000000 -0400
+@@ -3149,7 +3149,7 @@
+     * a notification of an error.
+     */
+    timeout = sock_sndtimeo(sk, flags & O_NONBLOCK);
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) {
+       if (timeout == 0) {
+@@ -3172,7 +3172,7 @@
+          goto outWaitError;
+       }
+ 
+-      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+    }
+ 
+    if (sk->compat_sk_err) {
+@@ -3184,7 +3184,7 @@
+    }
+ 
+ outWait:
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;
+@@ -3391,7 +3391,7 @@
+ 
+    sk = sock->sk;
+ 
+-   poll_wait(file, sk->compat_sk_sleep, wait);
++   poll_wait(file, compat_sk_sleep(sk), wait);
+    mask = 0;
+ 
+    if (sk->compat_sk_err) {
+@@ -3992,7 +3992,7 @@
+     * Wait for room in the produce queue to enqueue our user's data.
+     */
+    timeout = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while (totalWritten < len) {
+       Bool sentWrote;
+@@ -4031,7 +4031,7 @@
+             goto outWait;
+          }
+ 
+-         compat_cont_prepare_to_wait(sk->compat_sk_sleep,
++         compat_cont_prepare_to_wait(compat_sk_sleep(sk),
+                                      &wait, TASK_INTERRUPTIBLE);
+       }
+ 
+@@ -4114,7 +4114,7 @@
+    if (totalWritten > 0) {
+       err = totalWritten;
+    }
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;
+@@ -4337,7 +4337,7 @@
+    timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
+    copied = 0;
+ 
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while ((ready = VMCIQueue_BufReady(vsk->consumeQ,
+                                       vsk->produceQ,
+@@ -4380,7 +4380,7 @@
+          goto outWait;
+       }
+ 
+-      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+    }
+ 
+    if (sk->compat_sk_err) {
+@@ -4472,7 +4472,7 @@
+    err = copied;
+ 
+ outWait:
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;
diff --git a/app-emulation/vmware-modules/files/1.0.0.25-sk_sleep.patch b/app-emulation/vmware-modules/files/1.0.0.25-sk_sleep.patch
new file mode 100644
index 000000000000..d1697a2d419f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.25-sk_sleep.patch
@@ -0,0 +1,92 @@
+--- vsock-only/linux/af_vsock.c.orig	2010-08-04 14:07:01.000000000 -0400
++++ vsock-only/linux/af_vsock.c	2010-08-04 14:07:42.000000000 -0400
+@@ -3188,7 +3188,7 @@
+     * a notification of an error.
+     */
+    timeout = sock_sndtimeo(sk, flags & O_NONBLOCK);
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) {
+       if (timeout == 0) {
+@@ -3211,7 +3211,7 @@
+          goto outWaitError;
+       }
+ 
+-      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+    }
+ 
+    if (sk->compat_sk_err) {
+@@ -3223,7 +3223,7 @@
+    }
+ 
+ outWait:
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;
+@@ -3430,7 +3430,7 @@
+ 
+    sk = sock->sk;
+ 
+-   poll_wait(file, sk->compat_sk_sleep, wait);
++   poll_wait(file, compat_sk_sleep(sk), wait);
+    mask = 0;
+ 
+    if (sk->compat_sk_err) {
+@@ -4041,7 +4041,7 @@
+     * Wait for room in the produce queue to enqueue our user's data.
+     */
+    timeout = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while (totalWritten < len) {
+       Bool sentWrote;
+@@ -4080,7 +4080,7 @@
+             goto outWait;
+          }
+ 
+-         compat_cont_prepare_to_wait(sk->compat_sk_sleep,
++         compat_cont_prepare_to_wait(compat_sk_sleep(sk),
+                                      &wait, TASK_INTERRUPTIBLE);
+       }
+ 
+@@ -4163,7 +4163,7 @@
+    if (totalWritten > 0) {
+       err = totalWritten;
+    }
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;
+@@ -4386,7 +4386,7 @@
+    timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
+    copied = 0;
+ 
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while ((ready = VMCIQueue_BufReady(vsk->consumeQ,
+                                       vsk->produceQ,
+@@ -4429,7 +4429,7 @@
+          goto outWait;
+       }
+ 
+-      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+    }
+ 
+    if (sk->compat_sk_err) {
+@@ -4521,7 +4521,7 @@
+    err = copied;
+ 
+ outWait:
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;
diff --git a/app-emulation/vmware-modules/files/1.0.0.26-iommu_map.patch b/app-emulation/vmware-modules/files/1.0.0.26-iommu_map.patch
new file mode 100644
index 000000000000..0690ac38f5f3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.26-iommu_map.patch
@@ -0,0 +1,20 @@
+--- vmmon-only/linux/iommu.c.orig	2010-01-22 23:50:32.000000000 -0500
++++ vmmon-only/linux/iommu.c	2010-08-04 14:18:34.000000000 -0400
+@@ -153,7 +153,7 @@
+          map_to =  PPN_2_PA(mpn);
+          map_prot = IOMMU_READ | IOMMU_WRITE;
+       }
+-      if ((status = iommu_map_range(vmLinux->iommuDomain,
++      if ((status = iommu_map(vmLinux->iommuDomain,
+                                     PPN_2_PA(ppn),
+                                     map_to, PAGE_SIZE, map_prot))) {
+          printk(KERN_ERR "%s: IOMMU Mapping of PPN 0x%x -> MPN 0x%x "
+@@ -400,7 +400,7 @@
+ 
+    /* Relinquish the IOMMU domain used by this VM. */
+    for (ppn = 0; ppn < vmLinux->numPages; ppn++) {
+-      iommu_unmap_range(vmLinux->iommuDomain, PPN_2_PA(ppn), PAGE_SIZE);
++      iommu_unmap(vmLinux->iommuDomain, PPN_2_PA(ppn), PAGE_SIZE);
+    }
+    if (vmLinux->iommuDomain) {
+       iommu_domain_free(vmLinux->iommuDomain);
diff --git a/app-emulation/vmware-modules/files/1.0.0.26-sk_sleep.patch b/app-emulation/vmware-modules/files/1.0.0.26-sk_sleep.patch
new file mode 100644
index 000000000000..93b3df62b8c8
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.26-sk_sleep.patch
@@ -0,0 +1,119 @@
+--- vsock-only/linux/af_vsock.c.orig	2010-01-22 20:09:09.000000000 -0500
++++ vsock-only/linux/af_vsock.c	2010-08-04 14:16:34.000000000 -0400
+@@ -3221,7 +3221,7 @@
+     * a notification of an error.
+     */
+    timeout = sock_sndtimeo(sk, flags & O_NONBLOCK);
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) {
+       if (timeout == 0) {
+@@ -3244,7 +3244,7 @@
+          goto outWaitError;
+       }
+ 
+-      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+    }
+ 
+    if (sk->compat_sk_err) {
+@@ -3256,7 +3256,7 @@
+    }
+ 
+ outWait:
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;
+@@ -3316,7 +3316,7 @@
+     * upon connection establishment.
+     */
+    timeout = sock_sndtimeo(listener, flags & O_NONBLOCK);
+-   compat_init_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE);
+ 
+    while ((connected = VSockVmciDequeueAccept(listener)) == NULL &&
+           listener->compat_sk_err == 0) {
+@@ -3332,7 +3332,7 @@
+          goto outWait;
+       }
+ 
+-      compat_cont_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++      compat_cont_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE);
+    }
+ 
+    if (listener->compat_sk_err) {
+@@ -3366,7 +3366,7 @@
+    }
+ 
+ outWait:
+-   compat_finish_wait(listener->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(listener), &wait, TASK_RUNNING);
+ out:
+    release_sock(listener);
+    return err;
+@@ -3464,7 +3464,7 @@
+    sk = sock->sk;
+    vsk = vsock_sk(sk);
+ 
+-   poll_wait(file, sk->compat_sk_sleep, wait);
++   poll_wait(file, compat_sk_sleep(sk), wait);
+    mask = 0;
+ 
+    if (sk->compat_sk_err) {
+@@ -4104,7 +4104,7 @@
+       goto out;
+    }
+ 
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while (totalWritten < len) {
+       Bool sentWrote;
+@@ -4141,7 +4141,7 @@
+             goto outWait;
+          }
+ 
+-         compat_cont_prepare_to_wait(sk->compat_sk_sleep,
++         compat_cont_prepare_to_wait(compat_sk_sleep(sk),
+                                      &wait, TASK_INTERRUPTIBLE);
+       }
+ 
+@@ -4194,7 +4194,7 @@
+    if (totalWritten > 0) {
+       err = totalWritten;
+    }
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;
+@@ -4428,7 +4428,7 @@
+       goto out;
+    }
+ 
+-   compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+ 
+    while ((ready = VSockVmciStreamHasData(vsk)) < target &&
+           sk->compat_sk_err == 0 &&
+@@ -4468,7 +4468,7 @@
+          goto outWait;
+       }
+ 
+-      compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++      compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+    }
+ 
+    if (sk->compat_sk_err) {
+@@ -4534,7 +4534,7 @@
+    err = copied;
+ 
+ outWait:
+-   compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING);
+ out:
+    release_sock(sk);
+    return err;
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
index 4a2895b8169d..830cb5ca72a6 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild,v 1.3 2010/02/26 14:54:32 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild,v 1.4 2010/08/04 19:01:30 vadimk Exp $
 
 EAPI="2"
 
@@ -62,6 +62,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-vmnet-2.6.31.patch"
 	epatch "${FILESDIR}/sched_h-2.6.32.patch"
 	epatch "${FILESDIR}/${PV}-autoconf-generated.patch"
+	kernel_is 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch"
 }
 
 src_install() {
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
index d14da828ccb5..5e8e0a994d8f 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.3 2010/05/03 16:53:39 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.4 2010/08/04 19:01:30 vadimk Exp $
 
 EAPI="2"
 
@@ -61,6 +61,9 @@ src_prepare() {
 	epatch "${FILESDIR}/sched_h-2.6.32.patch"
 	epatch "${FILESDIR}/${PV}-autoconf-generated.patch"
 	epatch "${FILESDIR}/apic.patch"
+	#kernel_is 2 6 35 && epatch "${FILESDIR}/iommu_map.patch"
+	kernel_is 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch"
+
 }
 
 src_install() {
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild
index 3c3e6235b511..0435c38030f3 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.2 2010/05/03 16:53:39 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.3 2010/08/04 19:01:30 vadimk Exp $
 
 EAPI="2"
 
@@ -59,6 +59,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
 	epatch "${FILESDIR}/${PV}-makefile-include.patch"
 	epatch "${FILESDIR}/apic.patch"
+	kernel_is 2 6 35 && epatch "${FILESDIR}/${PV}-iommu_map.patch"
+	kernel_is 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch"
 }
 
 src_install() {