Re: [RFC] ipvs: Cleanup sync daemon code

From: Sven Wegener
Date: Sun Feb 10 2008 - 06:52:13 EST


On Sat, 9 Feb 2008, Christoph Hellwig wrote:

On Sun, Feb 10, 2008 at 12:38:11AM +0100, Sven Wegener wrote:
struct ip_vs_sync_thread_data {
- struct completion *startup;
+ struct completion *startup; /* set to NULL once completed */

This is not needed anmore. kthread_run guarantees that the newly
creates thread is run before returning to the caller.

The completion is currently used to return an error code for errors that happen during initialization in the threads (open socket, allocate memory). We could move the setup code out of the threads and have them only run an error-safe loop.

+/* wait queue for master sync daemon */
+static DECLARE_WAIT_QUEUE_HEAD(sync_master_wait);

I don't think you need this one either. You can use wake_up_process
on the task_struct pointer instead.

Thanks, now using schedule_timeout with wake_up_process.

spin_lock(&ip_vs_sync_lock);
list_add_tail(&sb->list, &ip_vs_sync_queue);
+ if (++ip_vs_sync_count == 10)
+ wake_up_interruptible(&sync_master_wait);
spin_unlock(&ip_vs_sync_lock);
}

-static int sync_thread(void *startup)
+static int sync_thread(void *data)

Btw, it might make sense to remove sync_thread and just call the
master and backup threads directly.

When the setup code has been moved out of the threads, the code gets much simpler.

+void __init ip_vs_sync_init(void)
+{
+ /* set up multicast address */
+ mcast_addr.sin_family = AF_INET;
+ mcast_addr.sin_port = htons(IP_VS_SYNC_PORT);
+ mcast_addr.sin_addr.s_addr = htonl(IP_VS_SYNC_GROUP);
}

Why can't this be initialized at compile time by:

static struct sockaddr_in mcast_addr = {
.sin_family = AF_INET,
.sin_port = htons(IP_VS_SYNC_PORT),
.sin_addr.s_addr = htonl(IP_VS_SYNC_GROUP),
}

(the hton* might need __constant_hton* also I'm not sure without trying)

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/