Attachment 156585 Details for Bug 235760 – new patch

new patch

ipvs.patch (text/x-patch), 2.56 KB, created by Neil Horman on 2007-06-08 15:36:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-06-08 15:36:32 UTC

Size: 2.56 KB

patch

obsolete

>--- linux-2.6.9/net/ipv4/ipvs/ip_vs_sync.c.orig	2007-06-08 09:25:18.000000000 -0400
>+++ linux-2.6.9/net/ipv4/ipvs/ip_vs_sync.c	2007-06-08 09:44:02.000000000 -0400
>@@ -65,6 +65,11 @@
> 	struct ip_vs_seq        out_seq;        /* outgoing seq. struct */
> };
> 
>+struct ip_vs_sync_thread_data {
>+	struct completion *startup;
>+	int state;
>+};
>+
> #define IP_VS_SYNC_CONN_TIMEOUT (3*60*HZ)
> #define SIMPLE_CONN_SIZE  (sizeof(struct ip_vs_sync_conn))
> #define FULL_CONN_SIZE  \
>@@ -743,6 +748,7 @@
> 	mm_segment_t oldmm;
> 	int state;
> 	const char *name;
>+	struct ip_vs_sync_thread_data *tinfo = startup;
> 
> 	/* increase the module use count */
> 	ip_vs_use_count_inc();
>@@ -781,7 +787,14 @@
> 	add_wait_queue(&sync_wait, &wait);
> 
> 	set_sync_pid(state, current->pid);
>-	complete((struct completion *)startup);
>+	complete(tinfo->startup);
>+
>+	/*
>+	 * once we call the completion queue above, we should
>+	 * null out that reference, since its allocated on the
>+	 * stack of the creating kernel thread
>+	 */
>+	tinfo->startup = NULL;
> 
> 	/* processing master/backup loop here */
> 	if (state == IP_VS_STATE_MASTER)
>@@ -793,6 +806,14 @@
> 	remove_wait_queue(&sync_wait, &wait);
> 
> 	/* thread exits */
>+
>+	/*
>+	 * If we weren't explicitly stopped, then we
>+	 * exited in error, and should undo our state
>+	 */
>+	if ((!stop_master_sync) && (!stop_backup_sync))
>+		ip_vs_sync_state -= tinfo->state;
>+
> 	set_sync_pid(state, 0);
> 	IP_VS_INFO("sync thread stopped!\n");
> 
>@@ -804,6 +825,11 @@
> 	set_stop_sync(state, 0);
> 	wake_up(&stop_sync_wait);
> 
>+	/*
>+	 * we need to free the structure that was allocated 
>+	 * for us in start_sync_thread
>+	 */
>+	kfree(tinfo);
> 	return 0;
> }
> 
>@@ -831,11 +857,19 @@
> {
> 	DECLARE_COMPLETION(startup);
> 	pid_t pid;
>+	struct ip_vs_sync_thread_data *tinfo;
> 
> 	if ((state == IP_VS_STATE_MASTER && sync_master_pid) ||
> 	    (state == IP_VS_STATE_BACKUP && sync_backup_pid))
> 		return -EEXIST;
> 
>+	/*
>+	 * Note that tinfo will be freed in sync_thread on exit
>+	 */
>+	tinfo = kmalloc(sizeof(struct ip_vs_sync_thread_data), GFP_KERNEL);
>+	if (!tinfo)
>+		return -ENOMEM;
>+
> 	IP_VS_DBG(7, "%s: pid %d\n", __FUNCTION__, current->pid);
> 	IP_VS_DBG(7, "Each ip_vs_sync_conn entry need %Zd bytes\n",
> 		  sizeof(struct ip_vs_sync_conn));
>@@ -849,8 +883,11 @@
> 		ip_vs_backup_syncid = syncid;
> 	}
> 
>+	tinfo->state = state;
>+	tinfo->startup = &startup;
>+
>   repeat:
>-	if ((pid = kernel_thread(fork_sync_thread, &startup, 0)) < 0) {
>+	if ((pid = kernel_thread(fork_sync_thread, tinfo, 0)) < 0) {
> 		IP_VS_ERR("could not create fork_sync_thread due to %d... "
> 			  "retrying.\n", pid);
> 		current->state = TASK_UNINTERRUPTIBLE;

Actions: View

Attachments on bug 235760: 156574 | 156575 | 156585