Update to submount patches
Subsystems (2)
Ian Kent
maintainercover Update to submount patches
Hi Jim,
These two patches replace the autofs-5.0.3-submount-shutdown-recovery-8.patch.
The first patch "make handle_mounts startup condition distinct" is a backport of part of another patch that I'm working on. Since it is related to the mounting and startup of submounts I thought it a good idea to add this now. The updated "submount shutdown handling" patch fixes a bug with using the barriers.
I doubt that these will fix the problem we are seeing but a quick test in your environment would be very much appreciated.
---
Ian Kent (2):
autofs-5.0.3 - fix submount shutdown handling. autofs-5.0.3 - make handle_mounts startup condition distinct
daemon/automount.c | 153 ++++++++++++++++++++++++++++++++++-------------- daemon/direct.c | 4 + daemon/indirect.c | 93 ++++++++++++++++++++++------- daemon/lookup.c | 3 - daemon/state.c | 5 +- include/automount.h | 8 ++- include/master.h | 3 - lib/master.c | 79 +++++++++++-------------- modules/mount_autofs.c | 35 +++++------ 9 files changed, 242 insertions(+), 141 deletions(-)
Ian Kent
maintainerPATCH 1/2 autofs-5.0.3 - make handle_mounts startup condition distinct
autofs-5.0.3-make-handle_mounts-startup-cond-distinct.patch
When starting a number of mounts we can get contention for the startup condition used to synchronize the handle_mounts thread completion. This patch makes the condition used distinct for each thread creation.
---
daemon/automount.c | 62 ++++++++++++++++++++++++++++++++++++++++++++---- include/automount.h | 4 +++ lib/master.c | 29 +++++++++++----------- modules/mount_autofs.c | 35 +++++++++++++-------------- 4 files changed, 92 insertions(+), 38 deletions(-)
daemon/automount.c +57 -5
@@ -1446,6 +1446,55 @@ static void mutex_operation_wait(pthread_mutex_t *mutex)return ; } +int handle_mounts_startup_cond_init (struct startup_cond *suc) +{ +int status; + + status =pthread_mutex_init (&suc->mutex,NULL ); +if (status) +return status; + + status =pthread_cond_init (&suc->cond,NULL ); +if (status) { + status =pthread_mutex_destroy (&suc->mutex); +if (status) +fatal (status); +return status; + } + + status =pthread_mutex_lock (&suc->mutex); +if (status) { + status =pthread_mutex_destroy (&suc->mutex); +if (status) +fatal (status); + status =pthread_cond_destroy (&suc->cond); +if (status) +fatal (status); + } + +return 0 ; +} + +void handle_mounts_startup_cond_destroy (void *arg) +{ +struct startup_cond *suc = (struct startup_cond *) arg; +int status; + + status =pthread_mutex_unlock (&suc->mutex); +if (status) +fatal (status); + + status =pthread_mutex_destroy (&suc->mutex); +if (status) +fatal (status); + + status =pthread_cond_destroy (&suc->cond); +if (status) +fatal (status); + +return ; +} +static void handle_mounts_cleanup (void *arg) {struct autofs_point *ap;
@@ -1497,17 +1546,20 @@ static void handle_mounts_cleanup(void *arg)void *handle_mounts (void *arg) { +struct startup_cond *suc;struct autofs_point *ap;int cancel_state, status =0 ; - ap = (struct autofs_point *) arg; + suc = (struct startup_cond *) arg; + + ap = suc->ap; -pthread_cleanup_push (return_start_status, &suc); +pthread_cleanup_push (return_start_status, suc);pthread_setcancelstate (PTHREAD_CANCEL_DISABLE , &cancel_state);state_mutex_lock (ap); - status =pthread_mutex_lock (&suc.mutex); + status =pthread_mutex_lock (&suc->mutex);if (status) {logerr ("failed to lock startup condition mutex!" );fatal (status);
@@ -1515,7 +1567,7 @@ void *handle_mounts(void *arg)if (mount_autofs (ap) <0 ) {crit (ap->logopt,"mount of %s failed!" , ap->path); - suc.status =1 ; + suc->status =1 ;state_mutex_unlock (ap);umount_autofs (ap,1 );pthread_setcancelstate (cancel_state,NULL );
@@ -1525,7 +1577,7 @@ void *handle_mounts(void *arg)if (ap->ghost && ap->type !=LKP_DIRECT )info (ap->logopt,"ghosting enabled" ); - suc.status =0 ; + suc->status =0 ;pthread_cleanup_pop (1 );/* We often start several automounters at the same time. Add some
include/automount.h +4 -0
@@ -385,10 +385,14 @@ int tree_is_mounted(struct mnt_list *mnts, const char *path, unsigned int type);struct startup_cond {pthread_mutex_t mutex;pthread_cond_t cond; +struct autofs_point *ap;unsigned int done;unsigned int status; }; +int handle_mounts_startup_cond_init (struct startup_cond *suc); +void handle_mounts_startup_cond_destroy (void *arg); +struct master_readmap_cond {pthread_mutex_t mutex;pthread_cond_t cond;
lib/master.c +14 -15
@@ -997,28 +997,31 @@ next:static int master_do_mount (struct master_mapent *entry) { +struct startup_cond suc;struct autofs_point *ap;pthread_t thid;int status; - status =pthread_mutex_lock (&suc.mutex); -if (status) -fatal (status); + ap = entry->ap; + +if (handle_mounts_startup_cond_init (&suc)) { +crit (ap->logopt, +"failed to init startup cond for mount %s" , entry->path); +return 0 ; + } + suc.ap = ap; suc.done =0 ; suc.status =0 ; - ap = entry->ap; -debug (ap->logopt,"mounting %s" , entry->path); -if (pthread_create (&thid, &thread_attr, handle_mounts, ap)) { + status =pthread_create (&thid, &thread_attr, handle_mounts, &suc); +if (status) {crit (ap->logopt,"failed to create mount handler thread for %s" , entry->path); - status =pthread_mutex_unlock (&suc.mutex); -if (status) -fatal (status); +handle_mounts_startup_cond_destroy (&suc);return 0 ; } entry->thid = thid;
@@ -1031,15 +1034,11 @@ static int master_do_mount(struct master_mapent *entry)if (suc.status) {error (ap->logopt,"failed to startup mount" ); - status =pthread_mutex_unlock (&suc.mutex); -if (status) -fatal (status); +handle_mounts_startup_cond_destroy (&suc);return 0 ; } - status =pthread_mutex_unlock (&suc.mutex); -if (status) -fatal (status); +handle_mounts_startup_cond_destroy (&suc);return 1 ; }
modules/mount_autofs.c +17 -18
@@ -46,6 +46,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int name_len, const char *what, const char *fstype, const char *c_options, void *context) { + struct startup_cond suc;pthread_t thid;char *fullpath;const char **argv;
@@ -210,34 +211,34 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, source->mc =cache_init (entry->ap, source);if (!source->mc) {error (ap->logopt,MODPREFIX "failed to init source cache" ); +master_free_map_source (source,0 );master_free_mapent (entry);return 1 ; }mounts_mutex_lock (ap); - status =pthread_mutex_lock (&suc.mutex); -if (status) { -crit (ap->logopt, -MODPREFIX "failed to lock startup condition mutex!" ); -cache_release (source); +if (handle_mounts_startup_cond_init (&suc)) { +crit (ap->logopt,MODPREFIX +"failed to init startup cond for mount %s" , entry->path); +mounts_mutex_unlock (ap); +master_free_map_source (source,1 );master_free_mapent (entry);return 1 ; } + suc.ap = nap; suc.done =0 ; suc.status =0 ; -if (pthread_create (&thid,NULL , handle_mounts, nap)) { +if (pthread_create (&thid, &thread_attr, handle_mounts, &suc)) {crit (ap->logopt,MODPREFIX "failed to create mount handler thread for %s" , fullpath); +handle_mounts_startup_cond_destroy (&suc);mounts_mutex_unlock (ap); - status =pthread_mutex_unlock (&suc.mutex); -if (status) -fatal (status); -cache_release (source); +master_free_map_source (source,1 );master_free_mapent (entry);return 1 ; }
@@ -246,8 +247,10 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name,while (!suc.done) { status =pthread_cond_wait (&suc.cond, &suc.mutex);if (status) { +handle_mounts_startup_cond_destroy (&suc);mounts_mutex_unlock (ap); -pthread_mutex_unlock (&suc.mutex); +master_free_map_source (source,1 ); +master_free_mapent (entry);fatal (status); } }
@@ -255,10 +258,9 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name,if (suc.status) {crit (ap->logopt,MODPREFIX "failed to create submount for %s" , fullpath); +handle_mounts_startup_cond_destroy (&suc);mounts_mutex_unlock (ap); - status =pthread_mutex_unlock (&suc.mutex); -if (status) -fatal (status); +master_free_map_source (source,1 );master_free_mapent (entry);return 1 ; }
@@ -266,12 +268,9 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, ap->submnt_count++;list_add (&nap->mounts, &ap->submounts); +handle_mounts_startup_cond_destroy (&suc);mounts_mutex_unlock (ap); - status =pthread_mutex_unlock (&suc.mutex); -if (status) -fatal (status); -return 0 ; }
Ian Kent
maintainerPATCH 2/2 autofs-5.0.3 - fix submount shutdown handling.
In reply to Ian Kentautofs-5.0.3-submount-shutdown-recovery-9.patch
When using submount maps on a busy system autofs can hang.
This patch improves the submount shutdown logic and allows submounts that become busy during shutdown to recover.
---
daemon/automount.c | 91 +++++++++++++++++++++++++++----------------------- daemon/direct.c | 4 +- daemon/indirect.c | 93 +++++++++++++++++++++++++++++++++++++++------------ daemon/lookup.c | 3 -- daemon/state.c | 5 ++- include/automount.h | 4 +- include/master.h | 3 +- lib/master.c | 50 ++++++++++++--------------- 8 files changed, 150 insertions(+), 103 deletions(-)
daemon/automount.c +50 -41
@@ -1514,13 +1514,11 @@ static void handle_mounts_cleanup(void *arg)/* If we have been canceled then we may hold the state mutex. */ mutex_operation_wait (&ap->state_mutex); -alarm_delete (ap); -st_remove_tasks (ap); - -umount_autofs (ap,1 ); -destroy_logpri_fifo (ap); -master_signal_submount (ap,MASTER_SUBMNT_JOIN ); +if (submount) { +master_source_unlock (ap->parent->entry); +master_signal_submount (ap,MASTER_SUBMNT_SHUTDOWN ); + }master_remove_mapent (ap->entry);master_free_mapent_sources (ap->entry,1 );master_free_mapent (ap->entry);
@@ -1585,71 +1583,82 @@ void *handle_mounts(void *arg)if (!ap->submount && ap->exp_timeout)alarm_add (ap, ap->exp_runfreq +rand () % ap->exp_runfreq); -pthread_cleanup_push (handle_mounts_cleanup, ap); -pthread_setcancelstate (cancel_state,NULL ); -state_mutex_unlock (ap); +pthread_setcancelstate (cancel_state,NULL );while (ap->state !=ST_SHUTDOWN ) {if (handle_packet (ap)) { -int ret, result; +int ret, cur_state; + +/* +* If we're a submount we need to ensure our parent +* doesn't try to mount us again until our shutdown +* is complete and that any outstanding mounts are +* completed before we try to shutdown. +*/ +pthread_setcancelstate (PTHREAD_CANCEL_DISABLE , &cur_state); + +if (ap->submount) +master_source_writelock (ap->parent->entry);state_mutex_lock (ap); + +if (ap->state !=ST_SHUTDOWN ) { +if (!ap->submount) +alarm_add (ap, ap->exp_runfreq); +state_mutex_unlock (ap); +/* Return to ST_READY is done immediately */ +if (ap->submount) +master_source_unlock (ap->parent->entry); +st_add_task (ap,ST_READY ); +pthread_setcancelstate (cur_state,NULL ); +continue ; + } + +alarm_delete (ap); +st_remove_tasks (ap); +/* * For a direct mount map all mounts have already gone -* by the time we get here. +* by the time we get here and since we only ever +* umount direct mounts at shutdown there is no need +* to check for possible recovery. */ if (ap->type ==LKP_DIRECT ) { - status =1 ; +umount_autofs (ap,1 );state_mutex_unlock (ap);break ; }/* -* If the ioctl fails assume the kernel doesn't have -* AUTOFS_IOC_ASKUMOUNT and just continue. +* If umount_autofs returns non-zero it wasn't able +* to complete the umount and has left the mount intact +* so we can continue. This can happen if a lookup +* occurs while we're trying to umount. */ - ret =ioctl (ap->ioctlfd,AUTOFS_IOC_ASKUMOUNT , &result); -if (ret ==-1 ) { + ret =umount_autofs (ap,1 ); +if (!ret) {state_mutex_unlock (ap);break ; } -/* OK to exit */ -if (ap->state ==ST_SHUTDOWN ) { -if (result) { -state_mutex_unlock (ap); -break ; - } -#ifdef ENABLE_IGNORE_BUSY_MOUNTS -/* -* There weren't any active mounts but if the -* filesystem is busy there may be a mount -* request in progress so return to the ready -* state unless a shutdown has been explicitly -* requested. -*/ -if (ap->shutdown) { -state_mutex_unlock (ap); -break ; - } -#endif - } -/* Failed shutdown returns to ready */ warn (ap->logopt,"can't shutdown: filesystem %s still busy" , ap->path);if (!ap->submount)alarm_add (ap, ap->exp_runfreq); -nextstate (ap->state_pipe[1 ],ST_READY ); -state_mutex_unlock (ap); +if (ap->submount) +master_source_unlock (ap->parent->entry); +/* Return to ST_READY is done immediately */ +st_add_task (ap,ST_READY ); +pthread_setcancelstate (cur_state,NULL ); + } } -pthread_cleanup_pop (1 ); -sched_yield (); +handle_mounts_cleanup (ap);return NULL ; }
daemon/direct.c +2 -2
@@ -867,12 +867,12 @@ void *expire_proc_direct(void *arg)if (status)fatal (status); +pthread_cleanup_push (expire_cleanup, &ec); + status =pthread_mutex_unlock (&ea->mutex);if (status)fatal (status); -pthread_cleanup_push (expire_cleanup, &ec); - left =0 ; mnts =tree_make_mnt_tree (_PROC_MOUNTS,"/" );
daemon/indirect.c +71 -22
147 lines not on this page · raw message
daemon/lookup.c +0 -3
@@ -1139,8 +1139,6 @@ int lookup_source_close_ioctlfd(struct autofs_point *ap, const char *key)struct mapent *me;int ret =0 ; -pthread_cleanup_push (master_source_lock_cleanup, entry); -master_source_readlock (entry); map = entry->maps;while (map) { mc = map->mc;
@@ -1158,7 +1156,6 @@ int lookup_source_close_ioctlfd(struct autofs_point *ap, const char *key)cache_unlock (mc); map = map->next; } -pthread_cleanup_pop (1 );return ret; }
daemon/state.c +3 -2
@@ -213,8 +213,10 @@ static unsigned int st_ready(struct autofs_point *ap)debug (ap->logopt,"st_ready(): state = %d path %s" , ap->state, ap->path); +state_mutex_lock (ap); ap->shutdown =0 ; ap->state =ST_READY ; +state_mutex_unlock (ap);if (ap->submount)master_signal_submount (ap,MASTER_SUBMNT_CONTINUE );
@@ -677,9 +679,8 @@ int st_add_task(struct autofs_point *ap, enum states state)/* Task termination marker, poke state machine */ if (state ==ST_READY ) { -state_mutex_lock (ap); +/* NOTE: no state mutex lock here */ st_ready (ap); -state_mutex_unlock (ap);st_mutex_lock ();
include/automount.h +2 -2
@@ -461,8 +461,8 @@ struct autofs_point {* host from which to mount */ struct autofs_point *parent;/* Owner of mounts list for submount */ pthread_mutex_t mounts_mutex;/* Protect mount lists */ -pthread_cond_t mounts_cond;/* Submounts condition variable */ -unsigned int mounts_signaled;/* Submount signals task complete */ +unsigned int submount_wait;/* We need to wait on barrier */ +pthread_barrier_t submount_barrier;/* Submount completion barrier */ struct list_head mounts;/* List of autofs mounts at current level */ unsigned int submount;/* Is this a submount */ unsigned int shutdown;/* Shutdown notification */
include/master.h +1 -2
@@ -20,9 +20,8 @@ #ifndef MASTER_H #define MASTER_H -#define MASTER_SUBMNT_WAIT 0 #define MASTER_SUBMNT_CONTINUE 1 -#define MASTER_SUBMNT_JOIN 2 +#define MASTER_SUBMNT_SHUTDOWN 2 struct map_source { char *type;
lib/master.c +21 -29
104 lines not on this page · raw message