Skip to contentSkip to conversation

WOLK v2.3 for Kernel v2.6.4

ANNOUNCE Shantanu Goel 3 participants 3 messages Mar 27, 2004 – Mar 31, 2004

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Hi Marc,

I took the patch for a spin and found a few glitches. A patch is attached to fix them.

1. The kernel oops'ed in vt_ioctl due to driver_data being NULL in the tty. I copied the relevant fix from 2.6.5-rc2-mm2.

2. I did not configure the in-kernel statd daemon for NFS. That caused a BUG() in mon.c:nsm_monitor() because the handle was never initialized.

3. A typo fix in ipmi/af_ipmi.c.

Thanks,
Shantanu

__________________________________
Do you Yahoo!?
Yahoo! Finance Tax Center - File online. File on time.
http://taxes.yahoo.com/filing.html

drivers/char/vt.c renamed from drivers/char/vt.c.~1~ +1 -3
@@ -2509,13 +2509,11 @@
 	if (tty && tty->count == 1) {
 		struct vt_struct *vt;
 
+		vcs_remove_devfs(tty);
 		vt = tty->driver_data;
 		if (vt)
 			vc_cons[vt->vc_num].d->vc_tty = NULL;
 		tty->driver_data = 0;
-		release_console_sem();
-		vcs_remove_devfs(tty);
-		return;
 	}
 	release_console_sem();
 }
fs/lockd/host.c renamed from fs/lockd/host.c.~1~ +20 -1
@@ -55,6 +55,25 @@
 }
 
 /*
+ * Allocate an NSM handle
+ */
+struct nsm_handle *
+nsm_alloc(struct sockaddr_in *sin)
+{
+	struct nsm_handle *nsm;
+
+	nsm = (struct nsm_handle *) kmalloc(sizeof(*nsm), GFP_KERNEL);
+	if (nsm == NULL)
+		return NULL;
+
+	memset(nsm, 0, sizeof(*nsm));
+	memcpy(&nsm->sm_addr, sin, sizeof(nsm->sm_addr));
+	atomic_set(&nsm->sm_count, 1);
+
+	return nsm;
+}
+
+/*
  * Common host lookup routine for server & client
  */
 struct nlm_host *
@@ -143,10 +162,10 @@
 			}
 		}
 	}
+#endif
 
 	if (host->h_nsmhandle == NULL)
 		host->h_nsmhandle = nsm_alloc(&host->h_addr);
-#endif
 
 	if (++nrhosts > NLM_HOST_MAX)
 		next_gc = 0;
fs/lockd/mon.c renamed from fs/lockd/mon.c.~1~ +2 -3
@@ -98,7 +98,7 @@
 {
 	struct nsm_handle *nsm;
 	struct nsm_res	res;
-	int		status;
+	int		status = 0;
 
 	nsm = host->h_nsmhandle;
 	host->h_nsmhandle = NULL;
@@ -112,9 +112,8 @@
 		if (status < 0)
 			printk(KERN_NOTICE "lockd: cannot unmonitor %s\n",
 				       	host->h_name);
-		else
-			nsm->sm_monitored = 0;
 	}
+	kfree(nsm);
 	return status;
 }
 
fs/lockd/statd.c renamed from fs/lockd/statd.c.~1~ +0 -19
@@ -189,25 +189,6 @@
 }
 
 /*
- * Allocate an NSM handle
- */
-struct nsm_handle *
-nsm_alloc(struct sockaddr_in *sin)
-{
-	struct nsm_handle *nsm;
-
-	nsm = (struct nsm_handle *) kmalloc(sizeof(*nsm), GFP_KERNEL);
-	if (nsm == NULL)
-		return NULL;
-
-	memset(nsm, 0, sizeof(*nsm));
-	memcpy(&nsm->sm_addr, sin, sizeof(nsm->sm_addr));
-	atomic_set(&nsm->sm_count, 1);
-
-	return nsm;
-}
-
-/*
  * Set up monitoring of a remote host
  * Note we hold the semaphore for the host table while
  * we're here.
net/ipmi/af_ipmi.c renamed from net/ipmi/af_ipmi.c.~1~ +1 -1
@@ -515,7 +515,7 @@
 {
 	struct ipmi_sock *i;
 
-	if (atomic_read(&ipmi_nr_socks) >= 2*files_stat.max_files)
+	if (atomic_read(&ipmi_nr_socks) >= 2*files_stat.max_files_hard)
 		return NULL;
 
 	i = (struct ipmi_sock *)sk_alloc(PF_IPMI, GFP_KERNEL,
#1 lore raw

Just a thought...

If it is supposed to be _working_ overload linux kernel, so maybe Marc should drop the -mm patches as they contain testing code, which is more prone to bugs than vanilla kernels.

Besides that, WOLK is great with all the stuff you might need in there, thanks.

Regards,
Maciej

#2 lore raw
In reply to Shantanu Goel

On Saturday 27 March 2004 06:21, Shantanu Goel wrote:

Hi Shantanu,

Quoted 7 lines

1. The kernel oops'ed in vt_ioctl due to driver_data being NULL in the tty. I copied the relevant fix from 2.6.5-rc2-mm2.
2. I did not configure the in-kernel statd daemon for NFS. That caused a BUG() in mon.c:nsm_monitor() because the handle was never initialized.
3. A typo fix in ipmi/af_ipmi.c.

thank you :) ... Applied.

ciao, Marc