[PATCH] 2.4.4 breaks VMware

[PATCH] 2.4.4 breaks VMware

[tpepper]

Despite VMware's webpage claiming compatibility issues with 2.4.x kernels I'd
been using it without any problem until I upgraded to 2.4.4.  I couldn't use
their precompiled modules of course but compiling to match the running kernel
worked fine previously.

This patch replaces a wee bit of code vmware wanted in include/linux/skbuff.h
although I'm guessing it was removed for a reason and vmware should be patched
to use the new method.

--- skbuff.h.orig       Tue May  1 18:41:50 2001
+++ skbuff.h    Tue May  1 18:41:55 2001
@@ -244,6 +244,11 @@
 
 /* Internal */
 #define skb_shinfo(SKB)                ((struct skb_shared_info *)((SKB)->end))
+/* for vmware */
+static inline atomic_t *skb_datarefp(struct sk_buff *skb)
+{
+	return (atomic_t *)(skb->end);
+}
 
 /**
  *     skb_queue_empty - check if a queue is empty


Tim

Re: [PATCH] 2.4.4 breaks VMware

[David S. Miller]

tpepper@vato.org writes:
 > --- skbuff.h.orig       Tue May  1 18:41:50 2001
 > +++ skbuff.h    Tue May  1 18:41:55 2001
 > @@ -244,6 +244,11 @@
 >  
 >  /* Internal */
 >  #define skb_shinfo(SKB)                ((struct skb_shared_info *)((SKB)->end))
 > +/* for vmware */
 > +static inline atomic_t *skb_datarefp(struct sk_buff *skb)
 > +{
 > +	return (atomic_t *)(skb->end);
 > +}

No, the equivalent is &skb_shinfo(skb)->dataref

Later,
David S. Miller
davem@redhat.com

Re: [PATCH] 2.4.4 breaks VMware

[Mohammad A. Haque]

[-- Attachment #1: Type: text/plain, Size: 837 bytes --]

tpepper@vato.org wrote:
> This patch replaces a wee bit of code vmware wanted in include/linux/skbuff.h
> although I'm guessing it was removed for a reason and vmware should be patched
> to use the new method.
> 

Better to patch vmware rather than the kernel. Here's a patch thet
should be applied to source files in
/usr/lib/vmware/modules/source/vmnet.tar


-- 

=====================================================================
Mohammad A. Haque                              http://www.haque.net/ 
                                               mhaque@haque.net

  "Alcohol and calculus don't mix.             Project Lead
   Don't drink and derive." --Unknown          http://wm.themes.org/
                                               batmanppc@themes.org
=====================================================================

[-- Attachment #2: vmnet-skbuff.diff --]
[-- Type: text/plain, Size: 692 bytes --]

diff -urw vmnet-only/vnetInt.h vmnet-only-patched/vnetInt.h
--- vmnet-only/vnetInt.h	Wed Nov  1 20:48:28 2000
+++ vmnet-only-patched/vnetInt.h	Tue Apr 17 23:29:47 2001
@@ -16,9 +16,15 @@
 #  define KFREE_SKB(skb, type)		kfree_skb(skb)
 #  define DEV_KFREE_SKB(skb, type)	dev_kfree_skb(skb)
 #  define SKB_INCREF(skb)		atomic_inc(&(skb)->users)
+#  ifdef KERNEL_2_4_0
+#    define SKB_IS_CLONE_OF(clone, skb)    ( \
+         skb_cloned(clone) \
+     )
+#  else
 #  define SKB_IS_CLONE_OF(clone, skb)	( \
       skb_datarefp(clone) == skb_datarefp(skb) \
    )
+#  endif
 #  define SK_ALLOC(pri)			sk_alloc(0, pri, 1)
 #  define DEV_QUEUE_XMIT(skb, dev, pri)	( \
       (skb)->dev = (dev), \

Re: [PATCH] 2.4.4 breaks VMware

[Bjoern A. Zeeb]

On Tue, 1 May 2001, Mohammad A. Haque wrote:

> tpepper@vato.org wrote:
> > This patch replaces a wee bit of code vmware wanted in include/linux/skbuff.h
> > although I'm guessing it was removed for a reason and vmware should be patched
> > to use the new method.
> >
>
> Better to patch vmware rather than the kernel. Here's a patch thet
> should be applied to source files in
> /usr/lib/vmware/modules/source/vmnet.tar

An even better solution would be getting vmware 2.0.4 which seems to
be a bit more 2.4-kernel compliant.
It is not yet announced on their web from what I can see but you may
already fetch it from p.ex. ftp://download1.vmware.com/pub/software/

-- 
Bjoern A. Zeeb				bzeeb at Zabbadoz dot NeT
56 69 73 69 74				http://www.zabbadoz.net/

Re: [PATCH] 2.4.4 breaks VMware

[Gregory T. Norris]

[-- Attachment #1: Type: text/plain, Size: 395 bytes --]

On Wed, May 02, 2001 at 06:53:49AM +0200, Bjoern A. Zeeb wrote:
> An even better solution would be getting vmware 2.0.4 which seems to
> be a bit more 2.4-kernel compliant.
> It is not yet announced on their web from what I can see but you may
> already fetch it from p.ex. ftp://download1.vmware.com/pub/software/

It seems to fix the problem with vmware recognizing older SCSI CDROMs as
well.

[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]