Skip to contentSkip to conversation

2.4.4 breaks VMware

PATCH In review [email protected] 5 participants 5 messages May 2, 2001 – May 3, 2001

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 2.4.4 breaks VMware

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 Tue May 1 18:41:55 2001 renamed from skbuff.h.orig Tue May 1 18:41:50 2001 +5 -0
@@ -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

#1 lore raw

skbuff.h Tue May 1 18:41:55 2001 line 251

Quoted 11 lines · [email protected] writes:
skbuff.h Tue May 1 18:41:55 2001 renamed from skbuff.h.orig Tue May 1 18:41:50 2001 +5 -0
@@ -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
[email protected]

#2 lore raw
In reply to [email protected]
Quoted 4 lines · [email protected] 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

Signature · 8 lines
=====================================================================
Mohammad A. Haque                              http://www.haque.net/ 
                                               [email protected]

  "Alcohol and calculus don't mix.             Project Lead
   Don't drink and derive." --Unknown          http://wm.themes.org/
                                               [email protected]
=====================================================================
vnetInt.h +6 -0
diff -urw vmnet-only/vnetInt.h vmnet-only-patched/vnetInt.h
@@ -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), \
#3 lore raw
Quoted 9 lines · Mohammad A. Haque
Quoted 4 lines · [email protected] 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/

Signature · 2 lines
Bjoern A. Zeeb				bzeeb at Zabbadoz dot NeT
56 69 73 69 74				http://www.zabbadoz.net/
#4 lore raw
In reply to Mohammad A. Haque
Quoted 4 lines · Bjoern A. Zeeb

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.