From f573a5226aa09eadd9cef7849b857a2bcea7443b Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 14 Jan 2011 09:53:22 +0000 Subject: tools/misc/xen-hptool: Silently retry on CPU hotplug EBUSY failure. EBUSY is a legitimate soft failure, due to inability to acquire a lock, or because RCU work has not been done since a CPU was last offlined. Signed-off-by: Keir Fraser --- tools/misc/xen-hptool.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'tools/misc') diff --git a/tools/misc/xen-hptool.c b/tools/misc/xen-hptool.c index 374d88315d..24c3e956c0 100644 --- a/tools/misc/xen-hptool.c +++ b/tools/misc/xen-hptool.c @@ -2,6 +2,7 @@ #include #include #include +#include #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) @@ -241,6 +242,20 @@ static int hp_mem_offline_func(int argc, char *argv[]) return ret; } +static int exec_cpu_hp_fn(int (*hp_fn)(xc_interface *, int), int cpu) +{ + int ret; + + for ( ; ; ) + { + ret = (*hp_fn)(xch, cpu); + if ( (ret >= 0) || (errno != EBUSY) ) + break; + usleep(100000); /* 100ms */ + } + + return ret; +} static int hp_cpu_online_func(int argc, char *argv[]) { @@ -254,7 +269,7 @@ static int hp_cpu_online_func(int argc, char *argv[]) cpu = atoi(argv[0]); printf("Prepare to online CPU %d\n", cpu); - ret = xc_cpu_online(xch, cpu); + ret = exec_cpu_hp_fn(xc_cpu_online, cpu); if (ret < 0) fprintf(stderr, "CPU %d online failed (error %d: %s)\n", cpu, errno, strerror(errno)); @@ -275,7 +290,7 @@ static int hp_cpu_offline_func(int argc, char *argv[]) } cpu = atoi(argv[0]); printf("Prepare to offline CPU %d\n", cpu); - ret = xc_cpu_offline(xch, cpu); + ret = exec_cpu_hp_fn(xc_cpu_offline, cpu); if (ret < 0) fprintf(stderr, "CPU %d offline failed (error %d: %s)\n", cpu, errno, strerror(errno)); -- cgit v1.2.3