Udev integration: add cookie support for dmsetup
PATCH 3/4 Udev integration: add cookie support for dmsetup
This patch adds cookie support for dmsetup commands using the semaphore IPC mechanism (we wait for udev rule completion in resume, rename and remove commands).
A new command is added "notify" with the cookie value as the parameter. This is called from udev rule to decrease the value of the semaphore (and so to notify that it is completed).
Peter
tools/dmsetup.c +79 -12
@@ -523,6 +523,7 @@ static int _create(int argc, char **argv, void *data __attribute((unused)))int r =0 ;struct dm_task *dmt;const char *file =NULL ; +uint32_t cookie;if (argc ==3 ) file = argv[2 ];
@@ -565,9 +566,19 @@ static int _create(int argc, char **argv, void *data __attribute((unused))) _read_ahead_flags)) goto out; -if (!dm_task_run (dmt)) +if (!dm_notification_sem_open (&cookie) || + !dm_notification_sem_inc (cookie) || + !dm_task_set_cookie (dmt, cookie)) goto out; +if (!dm_task_run (dmt)) { +dm_notification_sem_close (cookie); + goto out; + } + +dm_notification_sem_wait_zero (cookie); +dm_notification_sem_close (cookie); + r =1 ;if (_switches[VERBOSE_ARG ])
@@ -583,6 +594,7 @@ static int _rename(int argc, char **argv, void *data __attribute((unused))) {int r =0 ;struct dm_task *dmt; +uint32_t cookie;if (!(dmt =dm_task_create (DM_DEVICE_RENAME )))return 0 ;
@@ -597,8 +609,18 @@ static int _rename(int argc, char **argv, void *data __attribute((unused)))if (_switches[NOOPENCOUNT_ARG ] && !dm_task_no_open_count (dmt)) goto out; -if (!dm_task_run (dmt)) +if (!dm_notification_sem_open (&cookie) || + !dm_notification_sem_inc (cookie) || + !dm_task_set_cookie (dmt, cookie)) + goto out; + +if (!dm_task_run (dmt)) { +dm_notification_sem_close (cookie); goto out; + } + +dm_notification_sem_wait_zero (cookie); +dm_notification_sem_close (cookie); r =1 ;
@@ -705,6 +727,19 @@ static int _setgeometry(int argc, char **argv, void *data __attribute((unused)))return r; } +static int _notify (int argc,char **argv,void *data __attribute((unused))) +{ +uint32_t cookie; +char *p; + +if (!(cookie =strtoul (argv[1 ], &p,0 )) || *p) { +err ("Incorrect cookie value" ); +return 0 ; + } + +return dm_notification_sem_dec (cookie); +} +static int _version (int argc __attribute((unused)),char **argv __attribute((unused)),void *data __attribute((unused))) {char version[80 ];
@@ -720,7 +755,8 @@ static int _version(int argc __attribute((unused)), char **argv __attribute((unureturn 1 ; } -static int _simple (int task,const char *name,uint32_t event_nr,int display) +static int _simple (int task,const char *name,uint32_t event_nr, +uint32_t cookie,int display) {int r =0 ;
@@ -749,6 +785,9 @@ static int _simple(int task, const char *name, uint32_t event_nr, int display) _read_ahead_flags)) goto out; +if (cookie && !dm_task_set_cookie (dmt, cookie)) + goto out; + r =dm_task_run (dmt);if (r && display && _switches[VERBOSE_ARG ])
@@ -761,17 +800,31 @@ static int _simple(int task, const char *name, uint32_t event_nr, int display)static int _suspend (int argc,char **argv,void *data __attribute((unused))) { -return _simple (DM_DEVICE_SUSPEND , argc >1 ? argv[1 ] :NULL ,0 ,1 ); +return _simple (DM_DEVICE_SUSPEND , argc >1 ? argv[1 ] :NULL ,0 ,0 ,1 ); }static int _resume (int argc,char **argv,void *data __attribute((unused))) { -return _simple (DM_DEVICE_RESUME , argc >1 ? argv[1 ] :NULL ,0 ,1 ); +uint32_t cookie; + +if (!dm_notification_sem_open (&cookie) || + !dm_notification_sem_inc (cookie)) +return 0 ; + +if (!_simple (DM_DEVICE_RESUME , argc >1 ? argv[1 ] :NULL ,0 , cookie,1 )) { +dm_notification_sem_close (cookie); +return 0 ; + } + +dm_notification_sem_wait_zero (cookie); +dm_notification_sem_close (cookie); + +return 1 ; }static int _clear (int argc,char **argv,void *data __attribute((unused))) { -return _simple (DM_DEVICE_CLEAR , argc >1 ? argv[1 ] :NULL ,0 ,1 ); +return _simple (DM_DEVICE_CLEAR , argc >1 ? argv[1 ] :NULL ,0 ,0 ,1 ); }static int _wait (int argc,char **argv,void *data __attribute((unused)))
@@ -788,7 +841,7 @@ static int _wait(int argc, char **argv, void *data __attribute((unused))) }return _simple (DM_DEVICE_WAITEVENT , name, - (argc >1 ) ? (uint32_t )atoi (argv[argc -1 ]) :0 ,1 ); + (argc >1 ) ? (uint32_t )atoi (argv[argc -1 ]) :0 ,0 ,1 ); } static int _process_all(int argc, char **argv, int silent,
@@ -898,8 +951,8 @@ static int _error_device(int argc __attribute((unused)), char **argv __attributeif (!dm_task_run (dmt)) goto error; -if (!_simple (DM_DEVICE_RESUME , name,0 ,0 )) { -_simple (DM_DEVICE_CLEAR , name,0 ,0 ); +if (!_simple (DM_DEVICE_RESUME , name,0 ,0 ,0 )) { +_simple (DM_DEVICE_CLEAR , name,0 ,0 ,0 ); goto error; }
@@ -913,11 +966,24 @@ error:static int _remove (int argc,char **argv,void *data __attribute((unused))) {int r; +uint32_t cookie;if (_switches[FORCE_ARG ] && argc >1 ) r =_error_device (argc, argv,NULL ); -return _simple (DM_DEVICE_REMOVE , argc >1 ? argv[1 ] :NULL ,0 ,0 ); +if (!dm_notification_sem_open (&cookie) || + !dm_notification_sem_inc (cookie)) +return 0 ; + +if (!_simple (DM_DEVICE_REMOVE , argc >1 ? argv[1 ] :NULL ,0 , cookie,0 )) { +dm_notification_sem_close (cookie); +return 0 ; + } + +dm_notification_sem_wait_zero (cookie); +dm_notification_sem_close (cookie); + +return 1 ; }static int _count_devices (int argc __attribute((unused)),char **argv __attribute((unused)),void *data __attribute((unused)))
@@ -932,7 +998,7 @@ static int _remove_all(int argc __attribute((unused)), char **argv __attribute((int r;/* Remove all closed devices */ - r =_simple (DM_DEVICE_REMOVE_ALL ,"" ,0 ,0 ) |dm_mknodes (NULL ); + r =_simple (DM_DEVICE_REMOVE_ALL ,"" ,0 ,0 ,0 ) |dm_mknodes (NULL );if (!_switches[FORCE_ARG ])return r;
@@ -945,7 +1011,7 @@ static int _remove_all(int argc __attribute((unused)), char **argv __attribute((return r; r |=_process_all (argc, argv,1 , _error_device); - r |=_simple (DM_DEVICE_REMOVE_ALL ,"" ,0 ,0 ) |dm_mknodes (NULL ); + r |=_simple (DM_DEVICE_REMOVE_ALL ,"" ,0 ,0 ,0 ) |dm_mknodes (NULL ); _num_devices =0 ; r |=_process_all (argc, argv,1 , _count_devices);
@@ -2222,6 +2288,7 @@ static struct command _commands[] = { {"table", "[<device>] [--target <target_type>] [--showkeys]", 0, 1, _status}, {"wait", "<device> [<event_nr>]", 0, 2, _wait}, {"mknodes", "[<device>]", 0, 1, _mknodes}, + {"notify", "<cookie>", 1, 1, _notify}, {"targets", "", 0, 0, _targets}, {"version", "", 0, 0, _version}, {"setgeometry", "<device> <cyl> <head> <sect> <start>", 5, 5, _setgeometry},
PATCH 3/4 Udev integration: add cookie support for dmsetup
Quoted 2 lines · Peter Rajnoha
A new command is added "notify" with the cookie value as the parameter.
"Notify" is a very general term and we might want to use something similar in an unrelated way in future: can we think up a more-specific command name?
Alasdair
Signature · 1 line
agk at redhat.com
PATCH 3/4 Udev integration: add cookie support for dmsetup
Quoted 6 lines · Alasdair G Kergon
Quoted 2 lines · Peter Rajnoha
A new command is added "notify" with the cookie value as the parameter.
"Notify" is a very general term and we might want to use something similar in an unrelated way in future: can we think up a more-specific command name?
Ehm, I'm not good at finding new names for new commands, so if anybody has a good idea, speak up! Thanks. :)
Peter
PATCH 3/4 Udev integration: add cookie support for dmsetup
In reply to Peter RajnohaQuoted 11 lines · Peter Rajnoha
tools/dmsetup.c +3
-1if (argc ==3 ) file = argv[2 ];@@ -565,9 +566,19 @@ static int _create(int argc, char **argv, void *data __attribute((unused))) _read_ahead_flags)) goto out; -if (!dm_task_run (dmt)) +if (!dm_notification_sem_open (&cookie) || + !dm_notification_sem_inc (cookie) || + !dm_task_set_cookie (dmt, cookie)) goto out;
tools/dmsetup.c static int _create(int argc, char **argv, void *data __attribute((unused))) · line 582
Quoted 10 lines
tools/dmsetup.c +8
-0+if (!dm_task_run (dmt)) { +dm_notification_sem_close (cookie); + goto out; + } + +dm_notification_sem_wait_zero (cookie); +dm_notification_sem_close (cookie); + r =1 ;
This piece of code could exit without cleanup of the semaphore. Should the first 'if' only check !dm_notification_sem_open, and the sem_inc and set_cookie be '||'d with dm_task_run in the second 'if'?
Quoted 18 lines
tools/dmsetup.c +4
-1if (_switches[VERBOSE_ARG ])@@ -583,6 +594,7 @@ static int _rename(int argc, char **argv, void *data __attribute((unused))) {int r =0 ;struct dm_task *dmt; +uint32_t cookie;if (!(dmt =dm_task_create (DM_DEVICE_RENAME )))return 0 ;@@ -597,8 +609,18 @@ static int _rename(int argc, char **argv, void *data __attribute((unused)))if (_switches[NOOPENCOUNT_ARG ] && !dm_task_no_open_count (dmt)) goto out; -if (!dm_task_run (dmt)) +if (!dm_notification_sem_open (&cookie) || + !dm_notification_sem_inc (cookie) || + !dm_task_set_cookie (dmt, cookie))
tools/dmsetup.c static int _rename(int argc, char **argv, void *data __attribute((unused))) · line 624
Quoted 10 lines
tools/dmsetup.c +8
-0+ goto out; + +if (!dm_task_run (dmt)) { +dm_notification_sem_close (cookie); goto out; + } + +dm_notification_sem_wait_zero (cookie); +dm_notification_sem_close (cookie);
Same comment as above. If open fails, then we don't need close. But in all other cases we should be calling sem_close.
Quoted 10 lines
tools/dmsetup.c +6
-1static int _resume (int argc,char **argv,void *data __attribute((unused))) { -return _simple (DM_DEVICE_RESUME , argc >1 ? argv[1 ] :NULL ,0 ,1 ); +uint32_t cookie; + +if (!dm_notification_sem_open (&cookie) || + !dm_notification_sem_inc (cookie)) +return 0 ; +
tools/dmsetup.c static int _simple(int task, const char *name, uint32_t event_nr, int display) · line 823
Quoted 10 lines
tools/dmsetup.c +9
-0+if (!_simple (DM_DEVICE_RESUME , argc >1 ? argv[1 ] :NULL ,0 , cookie,1 )) { +dm_notification_sem_close (cookie); +return 0 ; + } + +dm_notification_sem_wait_zero (cookie); +dm_notification_sem_close (cookie); + +return 1 ; }
Same comment - if sem_inc fails we keep the semaphore, but !_simple() fails we remove it?
Quoted 15 lines
tools/dmsetup.c +5
-1@@ -913,11 +966,24 @@ error:static int _remove (int argc,char **argv,void *data __attribute((unused))) {int r; +uint32_t cookie;if (_switches[FORCE_ARG ] && argc >1 ) r =_error_device (argc, argv,NULL ); -return _simple (DM_DEVICE_REMOVE , argc >1 ? argv[1 ] :NULL ,0 ,0 ); +if (!dm_notification_sem_open (&cookie) || + !dm_notification_sem_inc (cookie)) +return 0 ; +
tools/dmsetup.c error: · line 987
Quoted 10 lines
tools/dmsetup.c +9
-0+if (!_simple (DM_DEVICE_REMOVE , argc >1 ? argv[1 ] :NULL ,0 , cookie,0 )) { +dm_notification_sem_close (cookie); +return 0 ; + } + +dm_notification_sem_wait_zero (cookie); +dm_notification_sem_close (cookie); + +return 1 ; }
Same comment as above.
PATCH 3/4 Udev integration: add cookie support for dmsetup
Quoted 6 lines · Dave Wysochanski
Quoted 6 lines
tools/dmsetup.c +3
-1-if (!dm_task_run (dmt)) +if (!dm_notification_sem_open (&cookie) || + !dm_notification_sem_inc (cookie) || + !dm_task_set_cookie (dmt, cookie)) goto out;
Quoted 14 lines
tools/dmsetup.c static int _create(int argc, char **argv, void *data __attribute((unused))) · line 582
Quoted 9 lines
tools/dmsetup.c +8
-0+if (!dm_task_run (dmt)) { +dm_notification_sem_close (cookie); + goto out; + } + +dm_notification_sem_wait_zero (cookie); +dm_notification_sem_close (cookie); + r =1 ;This piece of code could exit without cleanup of the semaphore. Should the first 'if' only check !dm_notification_sem_open, and the
sem_incandset_cookiebe '||'d withdm_task_runin the second 'if'?
Oh, sure. I have to correct this. Thanks!
Peter