Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com&gt; --- src/util/virprocess.c | 501 +++++++++++++++++++++--------------------- 1 file changed, 249 insertions(+), 252 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 7b0ad9c97b..8288e71f67 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -25,36 +25,36 @@ #include <fcntl.h> #include <signal.h> #ifndef WIN32 -# include <sys/wait.h> +#include <sys/wait.h> #endif #include <unistd.h> #if WITH_SYS_MOUNT_H -# include <sys/mount.h> +#include <sys/mount.h> #endif #if WITH_SETRLIMIT -# include <sys/time.h> -# include <sys/resource.h> +#include <sys/time.h> +#include <sys/resource.h> #endif #if WITH_SCHED_H -# include <sched.h> +#include <sched.h> #endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || WITH_BSD_CPU_AFFINITY -# include <sys/param.h> +#include <sys/param.h> #endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -# include <sys/sysctl.h> -# include <sys/user.h> +#include <sys/sysctl.h> +#include <sys/user.h> #endif #if WITH_BSD_CPU_AFFINITY -# include <sys/cpuset.h> +#include <sys/cpuset.h> #endif #ifdef WIN32 -# define WIN32_LEAN_AND_MEAN -# include <windows.h> +#define WIN32_LEAN_AND_MEAN +#include <windows.h> #endif #include "virprocess.h" @@ -71,41 +71,44 @@ VIR_LOG_INIT("util.process"); #ifdef __linux__ + /* * Workaround older glibc. While kernel may support the setns * syscall, the glibc wrapper might not exist. If that's the * case, use our own. */ -# ifndef __NR_setns -# if defined(__x86_64__) -# define __NR_setns 308 -# elif defined(__i386__) -# define __NR_setns 346 -# elif defined(__arm__) -# define __NR_setns 375 -# elif defined(__aarch64__) -# define __NR_setns 375 -# elif defined(__powerpc__) -# define __NR_setns 350 -# elif defined(__s390__) -# define __NR_setns 339 -# endif -# endif - -# ifndef WITH_SETNS -# if defined(__NR_setns) -# include <sys/syscall.h> - -static inline int setns(int fd, int nstype) +#ifndef __NR_setns +#if defined(__x86_64__) +#define __NR_setns 308 +#elif defined(__i386__) +#define __NR_setns 346 +#elif defined(__arm__) +#define __NR_setns 375 +#elif defined(__aarch64__) +#define __NR_setns 375 +#elif defined(__powerpc__) +#define __NR_setns 350 +#elif defined(__s390__) +#define __NR_setns 339 +#endif +#endif + +#ifndef WITH_SETNS +#if defined(__NR_setns) +#include <sys/syscall.h> + +static inline int +setns(int fd, int nstype) { return syscall(__NR_setns, fd, nstype); } -# else /* !__NR_setns */ -# error Please determine the syscall number for setns on your architecture -# endif -# endif +#else /* !__NR_setns */ +#error Please determine the syscall number for setns on your architecture +#endif +#endif #else /* !__linux__ */ -static inline int setns(int fd G_GNUC_UNUSED, int nstype G_GNUC_UNUSED) +static inline int +setns(int fd G_GNUC_UNUSED, int nstype G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Namespaces are not supported on this platform.")); @@ -115,15 +118,11 @@ static inline int setns(int fd G_GNUC_UNUSED, int nstype G_GNUC_UNUSED) VIR_ENUM_IMPL(virProcessSchedPolicy, VIR_PROC_POLICY_LAST, - "none", - "batch", - "idle", - "fifo", - "rr", -); + "none", "batch", "idle", "fifo", "rr",); #ifndef WIN32 + /** * virProcessTranslateStatus: * @status: child exit status to translate @@ -136,12 +135,11 @@ char * virProcessTranslateStatus(int status) { char *buf; + if (WIFEXITED(status)) { - buf = g_strdup_printf(_("exit status %d"), - WEXITSTATUS(status)); + buf = g_strdup_printf(_("exit status %d"), WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - buf = g_strdup_printf(_("fatal signal %d"), - WTERMSIG(status)); + buf = g_strdup_printf(_("fatal signal %d"), WTERMSIG(status)); } else { buf = g_strdup_printf(_("invalid value %d"), status); } @@ -175,8 +173,7 @@ virProcessAbort(pid_t pid) */ saved_errno = errno; VIR_DEBUG("aborting child process %d", pid); - while ((ret = waitpid(pid, &status, WNOHANG)) == -1 && - errno == EINTR); + while ((ret = waitpid(pid, &status, WNOHANG)) == -1 && errno == EINTR); if (ret == pid) { tmp = virProcessTranslateStatus(status); VIR_DEBUG("process has ended: %s", tmp); @@ -185,8 +182,7 @@ virProcessAbort(pid_t pid) VIR_DEBUG("trying SIGTERM to child process %d", pid); kill(pid, SIGTERM); g_usleep(10 * 1000); - while ((ret = waitpid(pid, &status, WNOHANG)) == -1 && - errno == EINTR); + while ((ret = waitpid(pid, &status, WNOHANG)) == -1 && errno == EINTR); if (ret == pid) { tmp = virProcessTranslateStatus(status); VIR_DEBUG("process has ended: %s", tmp); @@ -194,8 +190,7 @@ virProcessAbort(pid_t pid) } else if (ret == 0) { VIR_DEBUG("trying SIGKILL to child process %d", pid); kill(pid, SIGKILL); - while ((ret = waitpid(pid, &status, 0)) == -1 && - errno == EINTR); + while ((ret = waitpid(pid, &status, 0)) == -1 && errno == EINTR); if (ret == pid) { tmp = virProcessTranslateStatus(status); VIR_DEBUG("process has ended: %s", tmp); @@ -246,8 +241,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) } /* Wait for intermediate process to exit */ - while ((ret = waitpid(pid, &status, 0)) == -1 && - errno == EINTR); + while ((ret = waitpid(pid, &status, 0)) == -1 && errno == EINTR); if (ret == -1) { virReportSystemError(errno, _("unable to wait for process %lld"), @@ -289,7 +283,7 @@ void virProcessAbort(pid_t pid) { /* Not yet ported to mingw. Any volunteers? */ - VIR_DEBUG("failed to reap child %lld, abandoning it", (long long)pid); + VIR_DEBUG("failed to reap child %lld, abandoning it", (long long) pid); } @@ -305,7 +299,8 @@ virProcessWait(pid_t pid, int *exitstatus G_GNUC_UNUSED, bool raw G_GNUC_UNUSED) /* send signal to a single process */ -int virProcessKill(pid_t pid, int sig) +int +virProcessKill(pid_t pid, int sig) { if (pid <= 1) { errno = ESRCH; @@ -315,44 +310,45 @@ int virProcessKill(pid_t pid, int sig) #ifdef WIN32 /* Mingw / Windows don't have many signals (AFAIK) */ switch (sig) { - case SIGINT: - /* This does a Ctrl+C equiv */ - if (!GenerateConsoleCtrlEvent(CTRL_C_EVENT, pid)) { - errno = ESRCH; - return -1; - } - break; + case SIGINT: + /* This does a Ctrl+C equiv */ + if (!GenerateConsoleCtrlEvent(CTRL_C_EVENT, pid)) { + errno = ESRCH; + return -1; + } + break; + + case SIGTERM: + /* Since TerminateProcess is closer to SIG_KILL, we do + * a Ctrl+Break equiv which is more pleasant like the + * good old unix SIGTERM/HUP + */ + if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pid)) { + errno = ESRCH; + return -1; + } + break; - case SIGTERM: - /* Since TerminateProcess is closer to SIG_KILL, we do - * a Ctrl+Break equiv which is more pleasant like the - * good old unix SIGTERM/HUP - */ - if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pid)) { - errno = ESRCH; - return -1; - } - break; - - default: - { - HANDLE proc; - proc = OpenProcess(PROCESS_TERMINATE, FALSE, pid); - if (!proc) { - errno = ESRCH; /* Not entirely accurate, but close enough */ - return -1; - } + default: + { + HANDLE proc; - /* - * TerminateProcess is more or less equiv to SIG_KILL, in that - * a process can't trap / block it - */ - if (sig != 0 && !TerminateProcess(proc, sig)) { - errno = ESRCH; - return -1; - } - CloseHandle(proc); - } + proc = OpenProcess(PROCESS_TERMINATE, FALSE, pid); + if (!proc) { + errno = ESRCH; /* Not entirely accurate, but close enough */ + return -1; + } + + /* + * TerminateProcess is more or less equiv to SIG_KILL, in that + * a process can't trap / block it + */ + if (sig != 0 && !TerminateProcess(proc, sig)) { + errno = ESRCH; + return -1; + } + CloseHandle(proc); + } } return 0; #else @@ -362,7 +358,8 @@ int virProcessKill(pid_t pid, int sig) /* send signal to a process group */ -int virProcessGroupKill(pid_t pid, int sig G_GNUC_UNUSED) +int +virProcessGroupKill(pid_t pid, int sig G_GNUC_UNUSED) { if (pid <= 1) { errno = ESRCH; @@ -379,7 +376,8 @@ int virProcessGroupKill(pid_t pid, int sig G_GNUC_UNUSED) /* get process group from a pid */ -pid_t virProcessGroupGet(pid_t pid) +pid_t +virProcessGroupGet(pid_t pid) { if (pid <= 1) { errno = ESRCH; @@ -406,15 +404,17 @@ pid_t virProcessGroupGet(pid_t pid) * wait longer than the default. */ int -virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay, bool group) +virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay, + bool group) { size_t i; + /* This is in 1/5th seconds since polling is on a 0.2s interval */ - unsigned int polldelay = (force ? 200 : 75) + (extradelay*5); + unsigned int polldelay = (force ? 200 : 75) + (extradelay * 5); const char *signame = "TERM"; VIR_DEBUG("vpid=%lld force=%d extradelay=%u group=%d", - (long long)pid, force, extradelay, group); + (long long) pid, force, extradelay, group); /* This loop sends SIGTERM, then waits a few iterations (10 seconds) * to see if it dies. If the process still hasn't exited, and @@ -432,21 +432,21 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay, boo int rc; if (i == 0) { - signum = SIGTERM; /* kindly suggest it should exit */ + signum = SIGTERM; /* kindly suggest it should exit */ } else if (i == 50 && force) { VIR_DEBUG("Timed out waiting after SIGTERM to process %lld, " - "sending SIGKILL", (long long)pid); + "sending SIGKILL", (long long) pid); /* No SIGKILL kill on Win32 ! Use SIGABRT instead which our * virProcessKill proc will handle more or less like SIGKILL */ #ifdef WIN32 - signum = SIGABRT; /* kill it after a grace period */ + signum = SIGABRT; /* kill it after a grace period */ signame = "ABRT"; #else - signum = SIGKILL; /* kill it after a grace period */ + signum = SIGKILL; /* kill it after a grace period */ signame = "KILL"; #endif } else { - signum = 0; /* Just check for existence */ + signum = 0; /* Just check for existence */ } if (group) @@ -457,8 +457,9 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay, boo if (rc < 0) { if (errno != ESRCH) { virReportSystemError(errno, - _("Failed to terminate process %lld with SIG%s"), - (long long)pid, signame); + _ + ("Failed to terminate process %lld with SIG%s"), + (long long) pid, signame); return -1; } return signum == SIGTERM ? 0 : 1; @@ -469,20 +470,22 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay, boo virReportSystemError(EBUSY, _("Failed to terminate process %lld with SIG%s"), - (long long)pid, signame); + (long long) pid, signame); return 0; } -int virProcessKillPainfully(pid_t pid, bool force) +int +virProcessKillPainfully(pid_t pid, bool force) { return virProcessKillPainfullyDelay(pid, force, 0, false); } #if WITH_DECL_CPU_SET_T -int virProcessSetAffinity(pid_t pid, virBitmap *map, bool quiet) +int +virProcessSetAffinity(pid_t pid, virBitmap * map, bool quiet) { size_t i; int numcpus = 1024; @@ -490,7 +493,7 @@ int virProcessSetAffinity(pid_t pid, virBitmap *map, bool quiet) cpu_set_t *mask; int rv = -1; - VIR_DEBUG("Set process affinity on %lld", (long long)pid); + VIR_DEBUG("Set process affinity on %lld", (long long) pid); /* Not only may the statically allocated cpu_set_t be too small, * but there is no way to ask the kernel what size is large enough. @@ -516,8 +519,7 @@ int virProcessSetAffinity(pid_t pid, virBitmap *map, bool quiet) CPU_FREE(mask); if (rv < 0) { - if (errno == EINVAL && - numcpus < (1024 << 8)) { /* 262144 cpus ought to be enough for anyone */ + if (errno == EINVAL && numcpus < (1024 << 8)) { /* 262144 cpus ought to be enough for anyone */ numcpus = numcpus << 2; goto realloc; } @@ -526,7 +528,8 @@ int virProcessSetAffinity(pid_t pid, virBitmap *map, bool quiet) pid, g_strerror(errno)); } else { virReportSystemError(errno, - _("cannot set CPU affinity on process %d"), pid); + _("cannot set CPU affinity on process %d"), + pid); return -1; } } @@ -574,9 +577,8 @@ virProcessGetAffinity(pid_t pid) #elif defined(WITH_BSD_CPU_AFFINITY) -int virProcessSetAffinity(pid_t pid, - virBitmap *map, - bool quiet) +int +virProcessSetAffinity(pid_t pid, virBitmap * map, bool quiet) { size_t i; cpuset_t mask; @@ -594,7 +596,8 @@ int virProcessSetAffinity(pid_t pid, pid, g_strerror(errno)); } else { virReportSystemError(errno, - _("cannot set CPU affinity on process %d"), pid); + _("cannot set CPU affinity on process %d"), + pid); return -1; } } @@ -628,14 +631,15 @@ virProcessGetAffinity(pid_t pid) #else /* WITH_DECL_CPU_SET_T */ -int virProcessSetAffinity(pid_t pid G_GNUC_UNUSED, - virBitmap *map G_GNUC_UNUSED, - bool quiet G_GNUC_UNUSED) +int +virProcessSetAffinity(pid_t pid G_GNUC_UNUSED, + virBitmap * map G_GNUC_UNUSED, bool quiet G_GNUC_UNUSED) { /* The @quiet parameter is ignored here, it is used only for silencing * actual failures. */ virReportSystemError(ENOSYS, "%s", - _("Process CPU affinity is not supported on this platform")); + _ + ("Process CPU affinity is not supported on this platform")); return -1; } @@ -643,15 +647,18 @@ virBitmap * virProcessGetAffinity(pid_t pid G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", - _("Process CPU affinity is not supported on this platform")); + _ + ("Process CPU affinity is not supported on this platform")); return NULL; } #endif /* WITH_DECL_CPU_SET_T */ -int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) +int +virProcessGetPids(pid_t pid, size_t *npids, pid_t ** pids) { int ret = -1; + g_autoptr(DIR) dir = NULL; int value; struct dirent *ent; @@ -660,7 +667,7 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) *npids = 0; *pids = NULL; - taskPath = g_strdup_printf("/proc/%llu/task", (long long)pid); + taskPath = g_strdup_printf("/proc/%llu/task", (long long) pid); if (virDirOpen(&dir, taskPath) < 0) goto cleanup; @@ -688,9 +695,8 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) } -int virProcessGetNamespaces(pid_t pid, - size_t *nfdlist, - int **fdlist) +int +virProcessGetNamespaces(pid_t pid, size_t *nfdlist, int **fdlist) { size_t i = 0; const char *ns[] = { "user", "ipc", "uts", "net", "pid", "mnt" }; @@ -702,11 +708,11 @@ int virProcessGetNamespaces(pid_t pid, int fd; g_autofree char *nsfile = NULL; - nsfile = g_strdup_printf("/proc/%llu/ns/%s", (long long)pid, ns[i]); + nsfile = g_strdup_printf("/proc/%llu/ns/%s", (long long) pid, ns[i]); if ((fd = open(nsfile, O_RDONLY)) >= 0) { VIR_EXPAND_N(*fdlist, *nfdlist, 1); - (*fdlist)[(*nfdlist)-1] = fd; + (*fdlist)[(*nfdlist) - 1] = fd; } } @@ -714,8 +720,8 @@ int virProcessGetNamespaces(pid_t pid, } -int virProcessSetNamespaces(size_t nfdlist, - int *fdlist) +int +virProcessSetNamespaces(size_t nfdlist, int *fdlist) { size_t i; @@ -733,8 +739,7 @@ int virProcessSetNamespaces(size_t nfdlist, * type passed to setns()'s second param. Since we * pass 0, we know the EINVAL is harmless */ - if (setns(fdlist[i], 0) < 0 && - errno != EINVAL) { + if (setns(fdlist[i], 0) < 0 && errno != EINVAL) { virReportSystemError(errno, "%s", _("Unable to join domain namespace")); return -1; @@ -747,8 +752,7 @@ int virProcessSetNamespaces(size_t nfdlist, static int virProcessPrLimit(pid_t pid, int resource, - const struct rlimit *new_limit, - struct rlimit *old_limit) + const struct rlimit *new_limit, struct rlimit *old_limit) { return prlimit(pid, resource, new_limit, old_limit); } @@ -766,8 +770,7 @@ virProcessPrLimit(pid_t pid G_GNUC_UNUSED, #if WITH_GETRLIMIT static int -virProcessGetRLimit(int resource, - struct rlimit *old_limit) +virProcessGetRLimit(int resource, struct rlimit *old_limit) { return getrlimit(resource, old_limit); } @@ -775,51 +778,49 @@ virProcessGetRLimit(int resource, #if WITH_SETRLIMIT static int -virProcessSetRLimit(int resource, - const struct rlimit *new_limit) +virProcessSetRLimit(int resource, const struct rlimit *new_limit) { return setrlimit(resource, new_limit); } #endif /* WITH_SETRLIMIT */ #if WITH_GETRLIMIT -static const char* +static const char * virProcessLimitResourceToLabel(int resource) { switch (resource) { -# if defined(RLIMIT_MEMLOCK) +#if defined(RLIMIT_MEMLOCK) case RLIMIT_MEMLOCK: return "Max locked memory"; -# endif /* defined(RLIMIT_MEMLOCK) */ +#endif /* defined(RLIMIT_MEMLOCK) */ -# if defined(RLIMIT_NPROC) +#if defined(RLIMIT_NPROC) case RLIMIT_NPROC: return "Max processes"; -# endif /* defined(RLIMIT_NPROC) */ +#endif /* defined(RLIMIT_NPROC) */ -# if defined(RLIMIT_NOFILE) +#if defined(RLIMIT_NOFILE) case RLIMIT_NOFILE: return "Max open files"; -# endif /* defined(RLIMIT_NOFILE) */ +#endif /* defined(RLIMIT_NOFILE) */ -# if defined(RLIMIT_CORE) +#if defined(RLIMIT_CORE) case RLIMIT_CORE: return "Max core file size"; -# endif /* defined(RLIMIT_CORE) */ +#endif /* defined(RLIMIT_CORE) */ default: return NULL; } } -# if defined(__linux__) +#if defined(__linux__) static int -virProcessGetLimitFromProc(pid_t pid, - int resource, - struct rlimit *limit) +virProcessGetLimitFromProc(pid_t pid, int resource, struct rlimit *limit) { g_autofree char *procfile = NULL; g_autofree char *buf = NULL; + g_auto(GStrv) lines = NULL; const char *label; size_t i; @@ -829,7 +830,7 @@ virProcessGetLimitFromProc(pid_t pid, return -1; } - procfile = g_strdup_printf("/proc/%lld/limits", (long long)pid); + procfile = g_strdup_printf("/proc/%lld/limits", (long long) pid); if (virFileReadAllQuiet(procfile, 2048, &buf) < 0) { /* virFileReadAllQuiet() already sets errno, so don't overwrite @@ -873,7 +874,7 @@ virProcessGetLimitFromProc(pid_t pid, errno = EIO; return -1; } -# else /* !defined(__linux__) */ +#else /* !defined(__linux__) */ static int virProcessGetLimitFromProc(pid_t pid G_GNUC_UNUSED, int resource G_GNUC_UNUSED, @@ -882,12 +883,10 @@ virProcessGetLimitFromProc(pid_t pid G_GNUC_UNUSED, errno = ENOSYS; return -1; } -# endif /* !defined(__linux__) */ +#endif /* !defined(__linux__) */ static int -virProcessGetLimit(pid_t pid, - int resource, - struct rlimit *old_limit) +virProcessGetLimit(pid_t pid, int resource, struct rlimit *old_limit) { pid_t current_pid = getpid(); bool same_process = (pid == current_pid); @@ -913,9 +912,7 @@ virProcessGetLimit(pid_t pid, #if WITH_SETRLIMIT static int -virProcessSetLimit(pid_t pid, - int resource, - const struct rlimit *new_limit) +virProcessSetLimit(pid_t pid, int resource, const struct rlimit *new_limit) { pid_t current_pid = getpid(); bool same_process = (pid == current_pid); @@ -931,6 +928,7 @@ virProcessSetLimit(pid_t pid, #endif /* WITH_SETRLIMIT */ #if WITH_SETRLIMIT && defined(RLIMIT_MEMLOCK) + /** * virProcessSetMaxMemLock: * @pid: process to be changed @@ -958,7 +956,7 @@ virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes) virReportSystemError(errno, _("cannot limit locked memory " "of process %lld to %llu"), - (long long int)pid, bytes); + (long long int) pid, bytes); } VIR_DEBUG("Locked memory for process %lld limited to %llu bytes", @@ -977,6 +975,7 @@ virProcessSetMaxMemLock(pid_t pid G_GNUC_UNUSED, #endif /* ! (WITH_SETRLIMIT && defined(RLIMIT_MEMLOCK)) */ #if WITH_GETRLIMIT && defined(RLIMIT_MEMLOCK) + /** * virProcessGetMaxMemLock: * @pid: process to be queried @@ -987,8 +986,7 @@ virProcessSetMaxMemLock(pid_t pid G_GNUC_UNUSED, * Returns: 0 on success, <0 on failure. */ int -virProcessGetMaxMemLock(pid_t pid, - unsigned long long *bytes) +virProcessGetMaxMemLock(pid_t pid, unsigned long long *bytes) { struct rlimit rlim; @@ -998,8 +996,7 @@ virProcessGetMaxMemLock(pid_t pid, if (virProcessGetLimit(pid, RLIMIT_MEMLOCK, &rlim) < 0) { virReportSystemError(errno, _("cannot get locked memory limit " - "of process %lld"), - (long long int) pid); + "of process %lld"), (long long int) pid); return -1; } @@ -1026,6 +1023,7 @@ virProcessGetMaxMemLock(pid_t pid G_GNUC_UNUSED, #endif /* ! (WITH_GETRLIMIT && defined(RLIMIT_MEMLOCK)) */ #if WITH_SETRLIMIT && defined(RLIMIT_NPROC) + /** * virProcessSetMaxProcesses: * @pid: process to be changed @@ -1045,9 +1043,9 @@ virProcessSetMaxProcesses(pid_t pid, unsigned int procs) if (virProcessSetLimit(pid, RLIMIT_NPROC, &rlim) < 0) { virReportSystemError(errno, - _("cannot limit number of subprocesses " - "of process %lld to %u"), - (long long int)pid, procs); + _("cannot limit number of subprocesses " + "of process %lld to %u"), + (long long int) pid, procs); return -1; } return 0; @@ -1063,6 +1061,7 @@ virProcessSetMaxProcesses(pid_t pid G_GNUC_UNUSED, #endif /* ! (WITH_SETRLIMIT && defined(RLIMIT_NPROC)) */ #if WITH_SETRLIMIT && defined(RLIMIT_NOFILE) + /** * virProcessSetMaxFiles: * @pid: process to be changed @@ -1077,21 +1076,21 @@ virProcessSetMaxFiles(pid_t pid, unsigned int files) { struct rlimit rlim; - /* Max number of opened files is one greater than actual limit. See - * man setrlimit. - * - * NB: That indicates to me that we would want the following code - * to say "files - 1", but the original of this code in - * qemu_process.c also had files + 1, so this preserves current - * behavior. - */ + /* Max number of opened files is one greater than actual limit. See + * man setrlimit. + * + * NB: That indicates to me that we would want the following code + * to say "files - 1", but the original of this code in + * qemu_process.c also had files + 1, so this preserves current + * behavior. + */ rlim.rlim_cur = rlim.rlim_max = files + 1; if (virProcessSetLimit(pid, RLIMIT_NOFILE, &rlim) < 0) { virReportSystemError(errno, _("cannot limit number of open files " "of process %lld to %u"), - (long long int)pid, files); + (long long int) pid, files); return -1; } @@ -1099,8 +1098,7 @@ virProcessSetMaxFiles(pid_t pid, unsigned int files) } #else /* ! (WITH_SETRLIMIT && defined(RLIMIT_NOFILE)) */ int -virProcessSetMaxFiles(pid_t pid G_GNUC_UNUSED, - unsigned int files G_GNUC_UNUSED) +virProcessSetMaxFiles(pid_t pid G_GNUC_UNUSED, unsigned int files G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); return -1; @@ -1108,6 +1106,7 @@ virProcessSetMaxFiles(pid_t pid G_GNUC_UNUSED, #endif /* ! (WITH_SETRLIMIT && defined(RLIMIT_NOFILE)) */ #if WITH_SETRLIMIT && defined(RLIMIT_CORE) + /** * virProcessSetMaxCoreSize: * @pid: process to be changed @@ -1126,9 +1125,9 @@ virProcessSetMaxCoreSize(pid_t pid, unsigned long long bytes) if (virProcessSetLimit(pid, RLIMIT_CORE, &rlim) < 0) { virReportSystemError(errno, - _("cannot limit core file size " - "of process %lld to %llu"), - (long long int)pid, bytes); + _("cannot limit core file size " + "of process %lld to %llu"), + (long long int) pid, bytes); return -1; } @@ -1146,19 +1145,20 @@ virProcessSetMaxCoreSize(pid_t pid G_GNUC_UNUSED, #ifdef __linux__ + /* * Port of code from polkitunixprocess.c under terms * of the LGPLv2+ */ -int virProcessGetStartTime(pid_t pid, - unsigned long long *timestamp) +int +virProcessGetStartTime(pid_t pid, unsigned long long *timestamp) { g_auto(GStrv) proc_stat = virProcessGetStat(pid, 0); const char *starttime_str = NULL; if (!proc_stat || g_strv_length(proc_stat) < 22) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find start time for pid %d"), (int)pid); + _("Cannot find start time for pid %d"), (int) pid); return -1; } @@ -1166,14 +1166,14 @@ int virProcessGetStartTime(pid_t pid, if (virStrToLong_ull(starttime_str, NULL, 10, timestamp) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot parse start time %s for pid %d"), - starttime_str, (int)pid); + starttime_str, (int) pid); return -1; } return 0; } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -int virProcessGetStartTime(pid_t pid, - unsigned long long *timestamp) +int +virProcessGetStartTime(pid_t pid, unsigned long long *timestamp) { struct kinfo_proc p; int mib[4]; @@ -1190,19 +1190,21 @@ int virProcessGetStartTime(pid_t pid, return -1; } - *timestamp = (unsigned long long)p.ki_start.tv_sec; + *timestamp = (unsigned long long) p.ki_start.tv_sec; return 0; } #else -int virProcessGetStartTime(pid_t pid, - unsigned long long *timestamp) +int +virProcessGetStartTime(pid_t pid, unsigned long long *timestamp) { static int warned; + if (g_atomic_int_add(&warned, 1) == 0) { - VIR_WARN("Process start time of pid %lld not available on this platform", - (long long) pid); + VIR_WARN + ("Process start time of pid %lld not available on this platform", + (long long) pid); } *timestamp = 0; return 0; @@ -1218,15 +1220,15 @@ struct _virProcessNamespaceHelperData { void *opaque; }; -static int virProcessNamespaceHelper(pid_t pid G_GNUC_UNUSED, - void *opaque) +static int +virProcessNamespaceHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { virProcessNamespaceHelperData *data = opaque; int fd = -1; int ret = -1; g_autofree char *path = NULL; - path = g_strdup_printf("/proc/%lld/ns/mnt", (long long)data->pid); + path = g_strdup_printf("/proc/%lld/ns/mnt", (long long) data->pid); if ((fd = open(path, O_RDONLY)) < 0) { virReportSystemError(errno, "%s", @@ -1235,8 +1237,7 @@ static int virProcessNamespaceHelper(pid_t pid G_GNUC_UNUSED, } if (setns(fd, 0) < 0) { - virReportSystemError(errno, "%s", - _("Unable to enter mount namespace")); + virReportSystemError(errno, "%s", _("Unable to enter mount namespace")); goto cleanup; } @@ -1255,10 +1256,10 @@ static int virProcessNamespaceHelper(pid_t pid G_GNUC_UNUSED, */ int virProcessRunInMountNamespace(pid_t pid, - virProcessNamespaceCallback cb, - void *opaque) + virProcessNamespaceCallback cb, void *opaque) { - virProcessNamespaceHelperData data = {.pid = pid, .cb = cb, .opaque = opaque}; + virProcessNamespaceHelperData data = {.pid = pid, .cb = cb, + .opaque = opaque}; return virProcessRunInFork(virProcessNamespaceHelper, &data); } @@ -1279,8 +1280,9 @@ virProcessRunInMountNamespace(pid_t pid G_GNUC_UNUSED, #ifndef WIN32 + /* We assume that error messages will fit into 1024 chars */ -# define VIR_PROCESS_ERROR_MAX_LENGTH 1024 +#define VIR_PROCESS_ERROR_MAX_LENGTH 1024 typedef struct { int code; int domain; @@ -1296,13 +1298,12 @@ typedef struct { typedef union { errorData data; char bindata[sizeof(errorData)]; -} errorDataBin; +} +errorDataBin; static int virProcessRunInForkHelper(int errfd, - pid_t ppid, - virProcessForkCallback cb, - void *opaque) + pid_t ppid, virProcessForkCallback cb, void *opaque) { int ret = 0; @@ -1355,8 +1356,7 @@ virProcessRunInForkHelper(int errfd, * Otherwise the returned value is the retval of the callback. */ int -virProcessRunInFork(virProcessForkCallback cb, - void *opaque) +virProcessRunInFork(virProcessForkCallback cb, void *opaque) { int ret = -1; pid_t child = -1; @@ -1402,8 +1402,7 @@ virProcessRunInFork(virProcessForkCallback cb, bin->data.str2, bin->data.str3, bin->data.int1, - bin->data.int2, - "%s", bin->data.message); + bin->data.int2, "%s", bin->data.message); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("child didn't write error (status=%d)"), @@ -1426,7 +1425,8 @@ virProcessRunInFork(virProcessForkCallback cb G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", - _("Process spawning is not supported on this platform")); + _ + ("Process spawning is not supported on this platform")); return -1; } @@ -1438,14 +1438,14 @@ int virProcessSetupPrivateMountNS(void) { if (unshare(CLONE_NEWNS) < 0) { - virReportSystemError(errno, "%s", - _("Cannot unshare mount namespace")); + virReportSystemError(errno, "%s", _("Cannot unshare mount namespace")); return -1; } - if (mount("", "/", "none", MS_SLAVE|MS_REC, NULL) < 0) { + if (mount("", "/", "none", MS_SLAVE | MS_REC, NULL) < 0) { virReportSystemError(errno, "%s", - _("Failed disable mount propagation out of the root filesystem")); + _ + ("Failed disable mount propagation out of the root filesystem")); return -1; } @@ -1558,8 +1558,7 @@ virProcessExitWithStatus(int status) struct sigaction act; sigset_t sigs; - if (sigemptyset(&sigs) == 0 && - sigaddset(&sigs, WTERMSIG(status)) == 0) + if (sigemptyset(&sigs) == 0 && sigaddset(&sigs, WTERMSIG(status)) == 0) sigprocmask(SIG_UNBLOCK, &sigs, NULL); memset(&act, 0, sizeof(act)); act.sa_handler = SIG_DFL; @@ -1569,7 +1568,7 @@ virProcessExitWithStatus(int status) value = 128 + WTERMSIG(status); } #else /* WIN32 */ - (void)status; + (void) status; #endif /* WIN32 */ exit(value); } @@ -1580,43 +1579,41 @@ static int virProcessSchedTranslatePolicy(virProcessSchedPolicy policy) { switch (policy) { - case VIR_PROC_POLICY_NONE: - return SCHED_OTHER; + case VIR_PROC_POLICY_NONE: + return SCHED_OTHER; - case VIR_PROC_POLICY_BATCH: -# ifdef SCHED_BATCH - return SCHED_BATCH; -# else - return -1; -# endif + case VIR_PROC_POLICY_BATCH: +#ifdef SCHED_BATCH + return SCHED_BATCH; +#else + return -1; +#endif - case VIR_PROC_POLICY_IDLE: -# ifdef SCHED_IDLE - return SCHED_IDLE; -# else - return -1; -# endif + case VIR_PROC_POLICY_IDLE: +#ifdef SCHED_IDLE + return SCHED_IDLE; +#else + return -1; +#endif - case VIR_PROC_POLICY_FIFO: - return SCHED_FIFO; + case VIR_PROC_POLICY_FIFO: + return SCHED_FIFO; - case VIR_PROC_POLICY_RR: - return SCHED_RR; + case VIR_PROC_POLICY_RR: + return SCHED_RR; - case VIR_PROC_POLICY_LAST: - /* nada */ - break; + case VIR_PROC_POLICY_LAST: + /* nada */ + break; } return -1; } int -virProcessSetScheduler(pid_t pid, - virProcessSchedPolicy policy, - int priority) +virProcessSetScheduler(pid_t pid, virProcessSchedPolicy policy, int priority) { - struct sched_param param = {0}; + struct sched_param param = { 0 }; int pol = virProcessSchedTranslatePolicy(policy); VIR_DEBUG("pid=%lld, policy=%d, priority=%u", @@ -1674,8 +1671,7 @@ virProcessSetScheduler(pid_t pid, int virProcessSetScheduler(pid_t pid G_GNUC_UNUSED, - virProcessSchedPolicy policy, - int priority G_GNUC_UNUSED) + virProcessSchedPolicy policy, int priority G_GNUC_UNUSED) { if (!policy) return 0; @@ -1697,10 +1693,9 @@ virProcessSetScheduler(pid_t pid G_GNUC_UNUSED, * and return them as array of strings. */ GStrv -virProcessGetStat(pid_t pid, - pid_t tid) +virProcessGetStat(pid_t pid, pid_t tid) { - int len = 10 * 1024; /* 10kB ought to be enough for everyone */ + int len = 10 * 1024; /* 10kB ought to be enough for everyone */ g_autofree char *buf = NULL; g_autofree char *path = NULL; GStrv rest = NULL; @@ -1711,12 +1706,13 @@ virProcessGetStat(pid_t pid, if (pid) { if (tid) - path = g_strdup_printf("/proc/%d/task/%d/stat", (int)pid, (int)tid); + path = + g_strdup_printf("/proc/%d/task/%d/stat", (int) pid, (int) tid); else - path = g_strdup_printf("/proc/%d/stat", (int)pid); + path = g_strdup_printf("/proc/%d/stat", (int) pid); } else { if (tid) - path = g_strdup_printf("/proc/self/task/%d/stat", (int)tid); + path = g_strdup_printf("/proc/self/task/%d/stat", (int) tid); else path = g_strdup("/proc/self/stat"); } @@ -1727,7 +1723,7 @@ virProcessGetStat(pid_t pid, /* eliminate trailing spaces */ while (len > 0 && g_ascii_isspace(buf[--len])) - buf[len] = '\0'; + buf[len] = '\0'; /* Find end of the first field */ if (!(comm = strchr(buf, ' '))) @@ -1755,6 +1751,7 @@ virProcessGetStat(pid_t pid, rest = g_strsplit(rparen + 2, " ", 0); nrest = g_strv_length(rest); ret = g_new0(char *, nrest + 3); + ret[0] = g_strdup(buf); ret[1] = g_strdup(comm); memcpy(ret + 2, rest, nrest * sizeof(char *)); -- 2.27.0

On 12/3/2021 11:25 AM, Ján Tomko wrote: It is hard to follow all the formatting guidelines manually. So I primarily relied on running "indent" to handle all formatting as suggested at https://libvirt.org/coding-style.html#code-formatting-especially-for-new-.... Is there a different tool I can manage all formatting with? -- Regards, Praveen K Paladugu

Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com&gt; --- src/ch/ch_domain.c | 130 ++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 66 deletions(-) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index dd4de9e1ea..44f7d26ca4 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -30,16 +30,12 @@ VIR_ENUM_IMPL(virCHDomainJob, CH_JOB_LAST, - "none", - "query", - "destroy", - "modify", -); + "none", "query", "destroy", "modify",); VIR_LOG_INIT("ch.ch_domain"); static int -virCHDomainObjInitJob(virCHDomainObjPrivate *priv) +virCHDomainObjInitJob(virCHDomainObjPrivate * priv) { memset(&priv->job, 0, sizeof(priv->job)); @@ -50,7 +46,7 @@ virCHDomainObjInitJob(virCHDomainObjPrivate *priv) } static void -virCHDomainObjResetJob(virCHDomainObjPrivate *priv) +virCHDomainObjResetJob(virCHDomainObjPrivate * priv) { struct virCHDomainJobObj *job = &priv->job; @@ -59,7 +55,7 @@ virCHDomainObjResetJob(virCHDomainObjPrivate *priv) } static void -virCHDomainObjFreeJob(virCHDomainObjPrivate *priv) +virCHDomainObjFreeJob(virCHDomainObjPrivate * priv) { ignore_value(virCondDestroy(&priv->job.cond)); } @@ -74,7 +70,7 @@ virCHDomainObjFreeJob(virCHDomainObjPrivate *priv) * Successful calls must be followed by EndJob eventually. */ int -virCHDomainObjBeginJob(virDomainObj *obj, enum virCHDomainJob job) +virCHDomainObjBeginJob(virDomainObj * obj, enum virCHDomainJob job) { virCHDomainObjPrivate *priv = obj->privateData; unsigned long long now; @@ -121,13 +117,12 @@ virCHDomainObjBeginJob(virDomainObj *obj, enum virCHDomainJob job) * earlier virCHDomainBeginJob() call */ void -virCHDomainObjEndJob(virDomainObj *obj) +virCHDomainObjEndJob(virDomainObj * obj) { virCHDomainObjPrivate *priv = obj->privateData; enum virCHDomainJob job = priv->job.active; - VIR_DEBUG("Stopping job: %s", - virCHDomainJobTypeToString(job)); + VIR_DEBUG("Stopping job: %s", virCHDomainJobTypeToString(job)); virCHDomainObjResetJob(priv); virCondSignal(&priv->job.cond); @@ -170,8 +165,7 @@ virDomainXMLPrivateDataCallbacks virCHDriverPrivateDataCallbacks = { }; static int -virCHDomainDefPostParseBasic(virDomainDef *def, - void *opaque G_GNUC_UNUSED) +virCHDomainDefPostParseBasic(virDomainDef * def, void *opaque G_GNUC_UNUSED) { /* check for emulator and create a default one if needed */ if (!def->emulator) { @@ -186,71 +180,70 @@ virCHDomainDefPostParseBasic(virDomainDef *def, } static int -virCHDomainDefPostParse(virDomainDef *def, +virCHDomainDefPostParse(virDomainDef * def, unsigned int parseFlags G_GNUC_UNUSED, - void *opaque, - void *parseOpaque G_GNUC_UNUSED) + void *opaque, void *parseOpaque G_GNUC_UNUSED) { virCHDriver *driver = opaque; + g_autoptr(virCaps) caps = virCHDriverGetCapabilities(driver, false); if (!caps) return -1; if (!virCapabilitiesDomainSupported(caps, def->os.type, - def->os.arch, - def->virtType)) + def->os.arch, def->virtType)) return -1; return 0; } static int -chValidateDomainDeviceDef(const virDomainDeviceDef *dev, - const virDomainDef *def G_GNUC_UNUSED, +chValidateDomainDeviceDef(const virDomainDeviceDef * dev, + const virDomainDef * def G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED, void *parseOpaque G_GNUC_UNUSED) { - switch ((virDomainDeviceType)dev->type) { - case VIR_DOMAIN_DEVICE_DISK: - case VIR_DOMAIN_DEVICE_NET: - case VIR_DOMAIN_DEVICE_MEMORY: - case VIR_DOMAIN_DEVICE_VSOCK: - case VIR_DOMAIN_DEVICE_CONTROLLER: - case VIR_DOMAIN_DEVICE_CHR: - break; - - case VIR_DOMAIN_DEVICE_LEASE: - case VIR_DOMAIN_DEVICE_FS: - case VIR_DOMAIN_DEVICE_INPUT: - case VIR_DOMAIN_DEVICE_SOUND: - case VIR_DOMAIN_DEVICE_VIDEO: - case VIR_DOMAIN_DEVICE_HOSTDEV: - case VIR_DOMAIN_DEVICE_WATCHDOG: - case VIR_DOMAIN_DEVICE_GRAPHICS: - case VIR_DOMAIN_DEVICE_HUB: - case VIR_DOMAIN_DEVICE_REDIRDEV: - case VIR_DOMAIN_DEVICE_SMARTCARD: - case VIR_DOMAIN_DEVICE_MEMBALLOON: - case VIR_DOMAIN_DEVICE_NVRAM: - case VIR_DOMAIN_DEVICE_RNG: - case VIR_DOMAIN_DEVICE_SHMEM: - case VIR_DOMAIN_DEVICE_TPM: - case VIR_DOMAIN_DEVICE_PANIC: - case VIR_DOMAIN_DEVICE_IOMMU: - case VIR_DOMAIN_DEVICE_AUDIO: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cloud-Hypervisor doesn't support '%s' device"), - virDomainDeviceTypeToString(dev->type)); - return -1; + switch ((virDomainDeviceType) dev->type) { + case VIR_DOMAIN_DEVICE_DISK: + case VIR_DOMAIN_DEVICE_NET: + case VIR_DOMAIN_DEVICE_MEMORY: + case VIR_DOMAIN_DEVICE_VSOCK: + case VIR_DOMAIN_DEVICE_CONTROLLER: + case VIR_DOMAIN_DEVICE_CHR: + break; + + case VIR_DOMAIN_DEVICE_LEASE: + case VIR_DOMAIN_DEVICE_FS: + case VIR_DOMAIN_DEVICE_INPUT: + case VIR_DOMAIN_DEVICE_SOUND: + case VIR_DOMAIN_DEVICE_VIDEO: + case VIR_DOMAIN_DEVICE_HOSTDEV: + case VIR_DOMAIN_DEVICE_WATCHDOG: + case VIR_DOMAIN_DEVICE_GRAPHICS: + case VIR_DOMAIN_DEVICE_HUB: + case VIR_DOMAIN_DEVICE_REDIRDEV: + case VIR_DOMAIN_DEVICE_SMARTCARD: + case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: + case VIR_DOMAIN_DEVICE_RNG: + case VIR_DOMAIN_DEVICE_SHMEM: + case VIR_DOMAIN_DEVICE_TPM: + case VIR_DOMAIN_DEVICE_PANIC: + case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_AUDIO: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Cloud-Hypervisor doesn't support '%s' device"), + virDomainDeviceTypeToString(dev->type)); + return -1; - case VIR_DOMAIN_DEVICE_NONE: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("unexpected VIR_DOMAIN_DEVICE_NONE")); - return -1; + case VIR_DOMAIN_DEVICE_NONE: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unexpected VIR_DOMAIN_DEVICE_NONE")); + return -1; - case VIR_DOMAIN_DEVICE_LAST: - default: - virReportEnumRangeError(virDomainDeviceType, dev->type); - return -1; + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportEnumRangeError(virDomainDeviceType, dev->type); + return -1; } if ((def->nconsoles && @@ -258,25 +251,30 @@ chValidateDomainDeviceDef(const virDomainDeviceDef *dev, && (def->nserials && def->serials[0]->source->type == VIR_DOMAIN_CHR_TYPE_PTY)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Only a single console or serial can be configured for this domain")); + _ + ("Only a single console or serial can be configured for this domain")); return -1; } else if (def->nconsoles > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Only a single console can be configured for this domain")); + _ + ("Only a single console can be configured for this domain")); return -1; } else if (def->nserials > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Only a single serial can be configured for this domain")); + _ + ("Only a single serial can be configured for this domain")); return -1; } - if (def->nconsoles && def->consoles[0]->source->type != VIR_DOMAIN_CHR_TYPE_PTY) { + if (def->nconsoles + && def->consoles[0]->source->type != VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Console can only be enabled for a PTY")); return -1; } - if (def->nserials && def->serials[0]->source->type != VIR_DOMAIN_CHR_TYPE_PTY) { + if (def->nserials + && def->serials[0]->source->type != VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Serial can only be enabled for a PTY")); return -1; -- 2.27.0

On 12/3/2021 11:28 AM, Ján Tomko wrote: Fixed in v3 Addressed in v3 -- Regards, Praveen K Paladugu

From: Vineeth Pillai <viremana(a)linux.microsoft.com&gt; Signed-off-by: Vineeth Pillai <viremana(a)linux.microsoft.com&gt; Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com&gt; --- src/ch/ch_domain.c | 50 +++++++++++++++++++++++++++++++++++++++++----- src/ch/ch_domain.h | 11 ++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index 7bfe950822..2769d758fe 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -159,11 +159,6 @@ virCHDomainObjPrivateFree(void *data) g_free(priv); } -virDomainXMLPrivateDataCallbacks virCHDriverPrivateDataCallbacks = { - .alloc = virCHDomainObjPrivateAlloc, - .free = virCHDomainObjPrivateFree, -}; - static int virCHDomainDefPostParseBasic(virDomainDef * def, void *opaque G_GNUC_UNUSED) { @@ -179,6 +174,45 @@ virCHDomainDefPostParseBasic(virDomainDef * def, void *opaque G_GNUC_UNUSED) return 0; } +static virClass *virCHDomainVcpuPrivateClass; +static void virCHDomainVcpuPrivateDispose(void *obj); + +static int +virCHDomainVcpuPrivateOnceInit(void) +{ + if (!VIR_CLASS_NEW(virCHDomainVcpuPrivate, virClassForObject())) + return -1; + + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virCHDomainVcpuPrivate); + +static virObject * +virCHDomainVcpuPrivateNew(void) +{ + virCHDomainVcpuPrivate *priv; + + if (virCHDomainVcpuPrivateInitialize() < 0) + return NULL; + + if (!(priv = virObjectNew(virCHDomainVcpuPrivateClass))) + return NULL; + + return (virObject *) priv; +} + + +static void +virCHDomainVcpuPrivateDispose(void *obj) +{ + virCHDomainVcpuPrivate *priv = obj; + + priv->tid = 0; + + return; +} + static int virCHDomainDefPostParse(virDomainDef * def, unsigned int parseFlags G_GNUC_UNUSED, @@ -196,6 +230,12 @@ virCHDomainDefPostParse(virDomainDef * def, return 0; } +virDomainXMLPrivateDataCallbacks virCHDriverPrivateDataCallbacks = { + .alloc = virCHDomainObjPrivateAlloc, + .free = virCHDomainObjPrivateFree, + .vcpuNew = virCHDomainVcpuPrivateNew, +}; + static int chValidateDomainDeviceDef(const virDomainDeviceDef * dev, const virDomainDef * def G_GNUC_UNUSED, diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h index 04d19398b4..75b9933130 100644 --- a/src/ch/ch_domain.h +++ b/src/ch/ch_domain.h @@ -62,6 +62,17 @@ struct _virCHDomainObjPrivate { virCHMonitor *virCHDomainGetMonitor(virDomainObj *vm); +typedef struct _virCHDomainVcpuPrivate virCHDomainVcpuPrivate; +struct _virCHDomainVcpuPrivate { + virObject parent; + + pid_t tid; /* vcpu thread id */ + virTristateBool halted; +}; + +#define CH_DOMAIN_VCPU_PRIVATE(vcpu) \ + ((virCHDomainVcpuPrivate *) (vcpu)->privateData) + extern virDomainXMLPrivateDataCallbacks virCHDriverPrivateDataCallbacks; extern virDomainDefParserConfig virCHDriverDomainDefParserConfig; -- 2.27.0

Signed-off-by: Vineeth Pillai <viremana(a)linux.microsoft.com&gt; Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com&gt; --- src/ch/ch_domain.c | 25 +++++++++ src/ch/ch_domain.h | 4 ++ src/ch/ch_driver.c | 137 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 166 insertions(+) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index 2769d758fe..d81221679e 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -334,3 +334,28 @@ virCHDomainGetMonitor(virDomainObj * vm) { return CH_DOMAIN_PRIVATE(vm)->monitor; } + +pid_t +virCHDomainGetVcpuPid(virDomainObj * vm, unsigned int vcpuid) +{ + virDomainVcpuDef *vcpu = virDomainDefGetVcpu(vm->def, vcpuid); + + return CH_DOMAIN_VCPU_PRIVATE(vcpu)->tid; +} + +bool +virCHDomainHasVcpuPids(virDomainObj * vm) +{ + size_t i; + size_t maxvcpus = virDomainDefGetVcpusMax(vm->def); + virDomainVcpuDef *vcpu; + + for (i = 0; i < maxvcpus; i++) { + vcpu = virDomainDefGetVcpu(vm->def, i); + + if (CH_DOMAIN_VCPU_PRIVATE(vcpu)->tid > 0) + return true; + } + + return false; +} diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h index 75b9933130..d9c9d34a19 100644 --- a/src/ch/ch_domain.h +++ b/src/ch/ch_domain.h @@ -82,3 +82,7 @@ virCHDomainObjBeginJob(virDomainObj *obj, enum virCHDomainJob job) void virCHDomainObjEndJob(virDomainObj *obj); + +int virCHDomainRefreshVcpuInfo(virDomainObj *vm); +pid_t virCHDomainGetVcpuPid(virDomainObj *vm, unsigned int vcpuid); +bool virCHDomainHasVcpuPids(virDomainObj *vm); diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 75c6a15dd6..52c88571af 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -944,6 +944,140 @@ chStateInitialize(bool privileged, return ret; } +static int +chDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) +{ + virDomainObj *vm; + virDomainDef *def; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_GUEST, -1); + + if (!(vm = chDomObjFromDomain(dom))) + return -1; + + if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0) + goto cleanup; + + if (!(def = virDomainObjGetOneDef(vm, flags))) + goto cleanup; + + if (flags & VIR_DOMAIN_VCPU_MAXIMUM) + ret = virDomainDefGetVcpusMax(def); + else + ret = virDomainDefGetVcpus(def); + + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + +static int +chDomainGetMaxVcpus(virDomainPtr dom) +{ + return chDomainGetVcpusFlags(dom, + (VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_VCPU_MAXIMUM)); +} + +static int +chDomainHelperGetVcpus(virDomainObj * vm, + virVcpuInfoPtr info, + unsigned long long *cpuwait, + int maxinfo, unsigned char *cpumaps, int maplen) +{ + size_t ncpuinfo = 0; + size_t i; + + if (maxinfo == 0) + return 0; + + if (!virCHDomainHasVcpuPids(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cpu affinity is not supported")); + return -1; + } + + if (info) + memset(info, 0, sizeof(*info) * maxinfo); + + if (cpumaps) + memset(cpumaps, 0, sizeof(*cpumaps) * maxinfo); + + for (i = 0; i < virDomainDefGetVcpusMax(vm->def) && ncpuinfo < maxinfo; i++) { + virDomainVcpuDef *vcpu = virDomainDefGetVcpu(vm->def, i); + pid_t vcpupid = virCHDomainGetVcpuPid(vm, i); + virVcpuInfoPtr vcpuinfo = info + ncpuinfo; + + if (!vcpu->online) + continue; + + if (info) { + vcpuinfo->number = i; + vcpuinfo->state = VIR_VCPU_RUNNING; + if (virProcessGetStatInfo(&vcpuinfo->cpuTime, + &vcpuinfo->cpu, NULL, + vm->pid, vcpupid) < 0) { + virReportSystemError(errno, "%s", + _ + ("cannot get vCPU placement & pCPU time")); + return -1; + } + } + + if (cpumaps) { + unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, ncpuinfo); + g_autoptr(virBitmap) map = NULL; + + if (!(map = virProcessGetAffinity(vcpupid))) + return -1; + + virBitmapToDataBuf(map, cpumap, maplen); + } + + if (cpuwait) { + if (virProcessGetSchedInfo(&(cpuwait[ncpuinfo]), vm->pid, vcpupid) < + 0) + return -1; + } + + ncpuinfo++; + } + + return ncpuinfo; +} + +static int +chDomainGetVcpus(virDomainPtr dom, + virVcpuInfoPtr info, + int maxinfo, unsigned char *cpumaps, int maplen) +{ + virDomainObj *vm; + int ret = -1; + + if (!(vm = chDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainGetVcpusEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (virDomainObjCheckActive(vm) < 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _ + ("cannot retrieve vcpu information for inactive domain")); + goto cleanup; + } + + ret = chDomainHelperGetVcpus(vm, info, NULL, maxinfo, cpumaps, maplen); + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + /* Function Tables */ static virHypervisorDriver chHypervisorDriver = { .name = "CH", @@ -980,6 +1114,9 @@ static virHypervisorDriver chHypervisorDriver = { .domainIsActive = chDomainIsActive, /* 7.5.0 */ .domainOpenConsole = chDomainOpenConsole, /* 7.8.0 */ .nodeGetInfo = chNodeGetInfo, /* 7.5.0 */ + .domainGetVcpus = chDomainGetVcpus, /* 7.11.0 */ + .domainGetVcpusFlags = chDomainGetVcpusFlags, /* 7.11.0 */ + .domainGetMaxVcpus = chDomainGetMaxVcpus, /* 7.11.0 */ }; static virConnectDriver chConnectDriver = { -- 2.27.0

From: Vineeth Pillai <viremana(a)linux.microsoft.com&gt; Add domainGetVcpuPinInfo and nodeGetCPUMap callbacks to ch driver Signed-off-by: Vineeth Pillai <viremana(a)linux.microsoft.com&gt; Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com&gt; --- src/ch/ch_domain.h | 12 +++++++++-- src/ch/ch_driver.c | 54 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h index d9c9d34a19..e35777a9ec 100644 --- a/src/ch/ch_domain.h +++ b/src/ch/ch_domain.h @@ -23,6 +23,7 @@ #include "ch_conf.h" #include "ch_monitor.h" #include "virchrdev.h" +#include "vircgroup.h" /* Give up waiting for mutex after 30 seconds */ #define CH_JOB_WAIT_TIME (1000ull * 30) @@ -52,9 +53,16 @@ typedef struct _virCHDomainObjPrivate virCHDomainObjPrivate; struct _virCHDomainObjPrivate { struct virCHDomainJobObj job; - virCHMonitor *monitor; + virChrdevs *chrdevs; + + virCgroup *cgroup; - virChrdevs *chrdevs; + virCHDriver *driver; + virCHMonitor *monitor; + char *machineName; + virBitmap *autoNodeset; + virBitmap *autoCpuset; + virChrdevs *devs; }; #define CH_DOMAIN_PRIVATE(vm) \ diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 52c88571af..86d2776354 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -984,7 +984,56 @@ chDomainGetMaxVcpus(virDomainPtr dom) } static int -chDomainHelperGetVcpus(virDomainObj * vm, +chDomainGetVcpuPinInfo(virDomain * dom, + int ncpumaps, + unsigned char *cpumaps, int maplen, unsigned int flags) +{ + virDomainObj *vm = NULL; + virDomainDef *def; + bool live; + int ret = -1; + + g_autoptr(virBitmap) hostcpus = NULL; + virBitmap *autoCpuset = NULL; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (!(vm = chDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainGetVcpuPinInfoEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (!(def = virDomainObjGetOneDefState(vm, flags, &live))) + goto cleanup; + + if (!(hostcpus = virHostCPUGetAvailableCPUsBitmap())) + goto cleanup; + + if (live) + autoCpuset = CH_DOMAIN_PRIVATE(vm)->autoCpuset; + + ret = virDomainDefGetVcpuPinInfoHelper(def, maplen, ncpumaps, cpumaps, + hostcpus, autoCpuset); + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + +static int +chNodeGetCPUMap(virConnectPtr conn, + unsigned char **cpumap, + unsigned int *online, unsigned int flags) +{ + if (virNodeGetCPUMapEnsureACL(conn) < 0) + return -1; + + return virHostCPUGetMap(cpumap, online, flags); +} + + +static int +chDomainHelperGetVcpus(virDomainObj *vm, virVcpuInfoPtr info, unsigned long long *cpuwait, int maxinfo, unsigned char *cpumaps, int maplen) @@ -1030,6 +1079,7 @@ chDomainHelperGetVcpus(virDomainObj * vm, if (cpumaps) { unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, ncpuinfo); + g_autoptr(virBitmap) map = NULL; if (!(map = virProcessGetAffinity(vcpupid))) @@ -1117,6 +1167,8 @@ static virHypervisorDriver chHypervisorDriver = { .domainGetVcpus = chDomainGetVcpus, /* 7.11.0 */ .domainGetVcpusFlags = chDomainGetVcpusFlags, /* 7.11.0 */ .domainGetMaxVcpus = chDomainGetMaxVcpus, /* 7.11.0 */ + .domainGetVcpuPinInfo = chDomainGetVcpuPinInfo, /* 7.11.0 */ + .nodeGetCPUMap = chNodeGetCPUMap, /* 7.11.0 */ }; static virConnectDriver chConnectDriver = { -- 2.27.0

From: Vineeth Pillai <viremana(a)linux.microsoft.com&gt; Signed-off-by: Vineeth Pillai <viremana(a)linux.microsoft.com&gt; Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com&gt; --- src/ch/ch_conf.h | 2 ++ src/ch/ch_domain.c | 27 +++++++++++++- src/ch/ch_domain.h | 4 +-- src/ch/ch_driver.c | 1 + src/ch/ch_monitor.c | 86 +++++++++++++++++++++++++++++++++++++++++---- src/ch/ch_monitor.h | 14 +++++++- src/ch/ch_process.c | 6 +++- src/ch/meson.build | 1 + 8 files changed, 129 insertions(+), 12 deletions(-) diff --git a/src/ch/ch_conf.h b/src/ch/ch_conf.h index 37c36d9a09..8fe69c8545 100644 --- a/src/ch/ch_conf.h +++ b/src/ch/ch_conf.h @@ -44,6 +44,8 @@ struct _virCHDriver { virMutex lock; + bool privileged; + /* Require lock to get a reference on the object, * lockless access thereafter */ virCaps *caps; diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index d81221679e..326c3802c3 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -21,10 +21,12 @@ #include <config.h> #include "ch_domain.h" +#include "domain_driver.h" #include "viralloc.h" #include "virchrdev.h" #include "virlog.h" #include "virtime.h" +#include "virsystemd.h" #define VIR_FROM_THIS VIR_FROM_CH @@ -129,7 +131,7 @@ virCHDomainObjEndJob(virDomainObj * obj) } static void * -virCHDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED) +virCHDomainObjPrivateAlloc(void *opaque) { virCHDomainObjPrivate *priv; @@ -145,6 +147,7 @@ virCHDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED) g_free(priv); return NULL; } + priv->driver = opaque; return priv; } @@ -359,3 +362,25 @@ virCHDomainHasVcpuPids(virDomainObj * vm) return false; } + +char * +virCHDomainGetMachineName(virDomainObj * vm) +{ + virCHDomainObjPrivate *priv = CH_DOMAIN_PRIVATE(vm); + virCHDriver *driver = priv->driver; + char *ret = NULL; + + if (vm->pid > 0) { + ret = virSystemdGetMachineNameByPID(vm->pid); + if (!ret) + virResetLastError(); + } + + if (!ret) + ret = virDomainDriverGenerateMachineName("ch", + NULL, + vm->def->id, vm->def->name, + driver->privileged); + + return ret; +} diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h index e35777a9ec..3ac3421015 100644 --- a/src/ch/ch_domain.h +++ b/src/ch/ch_domain.h @@ -54,9 +54,7 @@ struct _virCHDomainObjPrivate { struct virCHDomainJobObj job; virChrdevs *chrdevs; - virCgroup *cgroup; - virCHDriver *driver; virCHMonitor *monitor; char *machineName; @@ -94,3 +92,5 @@ virCHDomainObjEndJob(virDomainObj *obj); int virCHDomainRefreshVcpuInfo(virDomainObj *vm); pid_t virCHDomainGetVcpuPid(virDomainObj *vm, unsigned int vcpuid); bool virCHDomainHasVcpuPids(virDomainObj *vm); + +char *virCHDomainGetMachineName(virDomainObj *vm); diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 86d2776354..39e754d1ff 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -936,6 +936,7 @@ chStateInitialize(bool privileged, goto cleanup; } + ch_driver->privileged = privileged; ret = VIR_DRV_STATE_INIT_COMPLETE; cleanup: diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 68fa5b30aa..6bc7d035ad 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -236,7 +236,8 @@ virCHMonitorBuildDisksJson(virJSONValue * content, virDomainDef * vmdef) } static int -virCHMonitorBuildNetJson(virJSONValue * nets, virDomainNetDef * netdef) +virCHMonitorBuildNetJson(virJSONValue * nets, virDomainNetDef * netdef, + size_t *nnicindexes, int **nicindexes) { virDomainNetType netType = virDomainNetGetActualType(netdef); char macaddr[VIR_MAC_STRING_BUFLEN]; @@ -275,6 +276,18 @@ virCHMonitorBuildNetJson(virJSONValue * nets, virDomainNetDef * netdef) virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("ethernet type supports a single guest ip")); } + /* network and bridge use a tap device, and direct uses a + * macvtap device + */ + if (nicindexes && nnicindexes && netdef->ifname) { + int nicindex = 0; + + if (virNetDevGetIndex(netdef->ifname, &nicindex) < 0) + return -1; + + VIR_APPEND_ELEMENT(*nicindexes, *nnicindexes, nicindex); + } + break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: if ((virDomainChrType) netdef->data.vhostuser->type != @@ -354,7 +367,8 @@ virCHMonitorBuildNetJson(virJSONValue * nets, virDomainNetDef * netdef) } static int -virCHMonitorBuildNetsJson(virJSONValue * content, virDomainDef * vmdef) +virCHMonitorBuildNetsJson(virJSONValue * content, virDomainDef * vmdef, + size_t *nnicindexes, int **nicindexes) { g_autoptr(virJSONValue) nets = NULL; size_t i; @@ -363,7 +377,8 @@ virCHMonitorBuildNetsJson(virJSONValue * content, virDomainDef * vmdef) nets = virJSONValueNewArray(); for (i = 0; i < vmdef->nnets; i++) { - if (virCHMonitorBuildNetJson(nets, vmdef->nets[i]) < 0) + if (virCHMonitorBuildNetJson(nets, vmdef->nets[i], + nnicindexes, nicindexes) < 0) return -1; } if (virJSONValueObjectAppend(content, "net", &nets) < 0) @@ -374,7 +389,59 @@ virCHMonitorBuildNetsJson(virJSONValue * content, virDomainDef * vmdef) } static int -virCHMonitorBuildVMJson(virDomainDef * vmdef, char **jsonstr) +virCHMonitorBuildDeviceJson(virJSONValue * devices, + virDomainHostdevDef * hostdevdef) +{ + g_autoptr(virJSONValue) device = NULL; + + + if (hostdevdef->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdevdef->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { + g_autofree char *name = NULL; + g_autofree char *path = NULL; + virDomainHostdevSubsysPCI *pcisrc = &hostdevdef->source.subsys.u.pci; + + device = virJSONValueNewObject(); + name = virPCIDeviceAddressAsString(&pcisrc->addr); + path = g_strdup_printf("/sys/bus/pci/devices/%s/", name); + if (!virFileExists(path)) { + virReportError(VIR_ERR_DEVICE_MISSING, + _("host pci device %s not found"), path); + return -1; + } + if (virJSONValueObjectAppendString(device, "path", path) < 0) + return -1; + if (virJSONValueArrayAppend(devices, &device) < 0) + return -1; + } + + return 0; +} + +static int +virCHMonitorBuildDevicesJson(virJSONValue * content, virDomainDef * vmdef) +{ + size_t i; + + g_autoptr(virJSONValue) devices = NULL; + + if (vmdef->nhostdevs == 0) + return 0; + + devices = virJSONValueNewArray(); + for (i = 0; i < vmdef->nhostdevs; i++) { + if (virCHMonitorBuildDeviceJson(devices, vmdef->hostdevs[i]) < 0) + return -1; + } + if (virJSONValueObjectAppend(content, "devices", &devices) < 0) + return -1; + + return 0; +} + +static int +virCHMonitorBuildVMJson(virDomainDef * vmdef, char **jsonstr, + size_t *nnicindexes, int **nicindexes) { g_autoptr(virJSONValue) content = virJSONValueNewObject(); @@ -398,7 +465,11 @@ virCHMonitorBuildVMJson(virDomainDef * vmdef, char **jsonstr) if (virCHMonitorBuildDisksJson(content, vmdef) < 0) return -1; - if (virCHMonitorBuildNetsJson(content, vmdef) < 0) + + if (virCHMonitorBuildNetsJson(content, vmdef, nnicindexes, nicindexes) < 0) + return -1; + + if (virCHMonitorBuildDevicesJson(content, vmdef) < 0) return -1; if (!(*jsonstr = virJSONValueToString(content, false))) @@ -692,7 +763,7 @@ virCHMonitorShutdownVMM(virCHMonitor * mon) } int -virCHMonitorCreateVM(virCHMonitor * mon) +virCHMonitorCreateVM(virCHMonitor * mon, size_t *nnicindexes, int **nicindexes) { g_autofree char *url = NULL; int responseCode = 0; @@ -704,7 +775,8 @@ virCHMonitorCreateVM(virCHMonitor * mon) headers = curl_slist_append(headers, "Accept: application/json"); headers = curl_slist_append(headers, "Content-Type: application/json"); - if (virCHMonitorBuildVMJson(mon->vm->def, &payload) != 0) + if (virCHMonitorBuildVMJson(mon->vm->def, &payload, + nnicindexes, nicindexes) != 0) return -1; virObjectLock(mon); diff --git a/src/ch/ch_monitor.h b/src/ch/ch_monitor.h index 0f684ca583..8ca9e17a9a 100644 --- a/src/ch/ch_monitor.h +++ b/src/ch/ch_monitor.h @@ -55,10 +55,22 @@ virCHMonitor *virCHMonitorNew(virDomainObj *vm, const char *socketdir); void virCHMonitorClose(virCHMonitor *mon); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCHMonitor, virCHMonitorClose); -int virCHMonitorCreateVM(virCHMonitor *mon); + +int virCHMonitorCreateVM(virCHMonitor *mon, + size_t *nnicindexes, int **nicindexes); int virCHMonitorBootVM(virCHMonitor *mon); int virCHMonitorShutdownVM(virCHMonitor *mon); int virCHMonitorRebootVM(virCHMonitor *mon); int virCHMonitorSuspendVM(virCHMonitor *mon); int virCHMonitorResumeVM(virCHMonitor *mon); int virCHMonitorGetInfo(virCHMonitor *mon, virJSONValue **info); + +typedef struct _virCHMonitorCPUInfo virCHMonitorCPUInfo; +struct _virCHMonitorCPUInfo { + pid_t tid; + bool online; +}; +void virCHMonitorCPUInfoFree(virCHMonitorCPUInfo *cpus); +int virCHMonitorGetCPUInfo(virCHMonitor *mon, + virCHMonitorCPUInfo **vcpus, + size_t maxvcpus); diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index 1a01ca9384..3b7f6fcddf 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -149,6 +149,8 @@ int virCHProcessStart(virCHDriver *driver, { int ret = -1; virCHDomainObjPrivate *priv = vm->privateData; + g_autofree int *nicindexes = NULL; + size_t nnicindexes = 0; if (!priv->monitor) { /* And we can get the first monitor connection now too */ @@ -158,7 +160,8 @@ int virCHProcessStart(virCHDriver *driver, goto cleanup; } - if (virCHMonitorCreateVM(priv->monitor) < 0) { + if (virCHMonitorCreateVM(priv->monitor, + &nnicindexes, &nicindexes) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create guest VM")); goto cleanup; @@ -171,6 +174,7 @@ int virCHProcessStart(virCHDriver *driver, goto cleanup; } + priv->machineName = virCHDomainGetMachineName(vm); vm->pid = priv->monitor->pid; vm->def->id = vm->pid; diff --git a/src/ch/meson.build b/src/ch/meson.build index e34974d56c..e0afdb390a 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -29,6 +29,7 @@ if conf.has('WITH_CH') ], include_directories: [ conf_inc_dir, + hypervisor_inc_dir, ], ) -- 2.27.0

From: Vineeth Pillai <viremana(a)linux.microsoft.com&gt; Signed-off-by: Vineeth Pillai <viremana(a)linux.microsoft.com&gt; Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com&gt; --- src/ch/ch_domain.c | 30 +++++++++ src/ch/ch_domain.h | 1 + src/ch/ch_driver.c | 151 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 182 insertions(+) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index 0a0b1206d6..de084ca15e 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -20,6 +20,7 @@ #include <config.h> +#include "datatypes.h" #include "ch_domain.h" #include "domain_driver.h" #include "viralloc.h" @@ -418,3 +419,32 @@ virCHDomainGetMachineName(virDomainObj * vm) return ret; } + +/** + * virCHDomainObjFromDomain: + * @domain: Domain pointer that has to be looked up + * + * This function looks up @domain and returns the appropriate virDomainObjPtr + * that has to be released by calling virDomainObjEndAPI(). + * + * Returns the domain object with incremented reference counter which is locked + * on success, NULL otherwise. + */ +virDomainObj * +virCHDomainObjFromDomain(virDomainPtr domain) +{ + virDomainObj *vm; + virCHDriver *driver = domain->conn->privateData; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); + if (!vm) { + virUUIDFormat(domain->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s' (%s)"), + uuidstr, domain->name); + return NULL; + } + + return vm; +} diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h index 2ce3e2cef3..db1451405b 100644 --- a/src/ch/ch_domain.h +++ b/src/ch/ch_domain.h @@ -95,3 +95,4 @@ pid_t virCHDomainGetVcpuPid(virDomainObj *vm, unsigned int vcpuid); bool virCHDomainHasVcpuPids(virDomainObj *vm); char *virCHDomainGetMachineName(virDomainObj *vm); +virDomainObj *virCHDomainObjFromDomain(virDomain *domain); diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 39e754d1ff..400dfee766 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -25,6 +25,7 @@ #include "ch_driver.h" #include "ch_monitor.h" #include "ch_process.h" +#include "domain_cgroup.h" #include "datatypes.h" #include "driver.h" #include "viraccessapicheck.h" @@ -1129,6 +1130,154 @@ chDomainGetVcpus(virDomainPtr dom, return ret; } +static int +chDomainPinVcpuLive(virDomainObj *vm, + virDomainDef *def, + int vcpu, + virCHDriver *driver, + virCHDriverConfig *cfg, + virBitmap *cpumap) +{ + virBitmap *tmpmap = NULL; + virDomainVcpuDef *vcpuinfo; + virCHDomainObjPrivate *priv = vm->privateData; + virCgroup *cgroup_vcpu = NULL; + g_autofree char *str = NULL; + int ret = -1; + + if (!virCHDomainHasVcpuPids(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cpu affinity is not supported")); + goto cleanup; + } + + if (!(vcpuinfo = virDomainDefGetVcpu(def, vcpu))) { + virReportError(VIR_ERR_INVALID_ARG, + _("vcpu %d is out of range of live cpu count %d"), + vcpu, virDomainDefGetVcpusMax(def)); + goto cleanup; + } + + if (!(tmpmap = virBitmapNewCopy(cpumap))) + goto cleanup; + + if (!(str = virBitmapFormat(cpumap))) + goto cleanup; + + if (vcpuinfo->online) { + /* Configure the corresponding cpuset cgroup before set affinity. */ + if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) { + if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_VCPU, vcpu, + false, &cgroup_vcpu) < 0) + goto cleanup; + if (virSetupCgroupCpusetCpus(cgroup_vcpu, cpumap) < 0) + goto cleanup; + } + + if (virProcessSetAffinity(virCHDomainGetVcpuPid(vm, vcpu), cpumap, false) < 0) + goto cleanup; + } + + virBitmapFree(vcpuinfo->cpumask); + vcpuinfo->cpumask = tmpmap; + tmpmap = NULL; + + if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virBitmapFree(tmpmap); + virCgroupFree(cgroup_vcpu); + return ret; +} + + +static int +chDomainPinVcpuFlags(virDomainPtr dom, + unsigned int vcpu, + unsigned char *cpumap, + int maplen, + unsigned int flags) +{ + virCHDriver *driver = dom->conn->privateData; + virDomainObj *vm; + virDomainDef *def; + virDomainDef *persistentDef; + int ret = -1; + virBitmap *pcpumap = NULL; + virDomainVcpuDef *vcpuinfo = NULL; + g_autoptr(virCHDriverConfig) cfg = NULL; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + cfg = virCHDriverGetConfig(driver); + + if (!(vm = virCHDomainObjFromDomain(dom))) + goto cleanup; + + if (virDomainPinVcpuFlagsEnsureACL(dom->conn, vm->def, flags) < 0) + goto cleanup; + + if (virCHDomainObjBeginJob(vm, CH_JOB_MODIFY) < 0) + goto cleanup; + + if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) + goto endjob; + + if (persistentDef && + !(vcpuinfo = virDomainDefGetVcpu(persistentDef, vcpu))) { + virReportError(VIR_ERR_INVALID_ARG, + _("vcpu %d is out of range of persistent cpu count %d"), + vcpu, virDomainDefGetVcpus(persistentDef)); + goto endjob; + } + + if (!(pcpumap = virBitmapNewData(cpumap, maplen))) + goto endjob; + + if (virBitmapIsAllClear(pcpumap)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("Empty cpu list for pinning")); + goto endjob; + } + + if (def && + chDomainPinVcpuLive(vm, def, vcpu, driver, cfg, pcpumap) < 0) + goto endjob; + + if (persistentDef) { + virBitmapFree(vcpuinfo->cpumask); + vcpuinfo->cpumask = pcpumap; + pcpumap = NULL; + + // ret = virDomainDefSave(persistentDef, driver->xmlopt, cfg->configDir); + goto endjob; + } + + ret = 0; + + endjob: + virCHDomainObjEndJob(vm); + + cleanup: + virDomainObjEndAPI(&vm); + virBitmapFree(pcpumap); + return ret; +} + +static int +chDomainPinVcpu(virDomainPtr dom, + unsigned int vcpu, + unsigned char *cpumap, + int maplen) +{ + return chDomainPinVcpuFlags(dom, vcpu, cpumap, maplen, + VIR_DOMAIN_AFFECT_LIVE); +} + /* Function Tables */ static virHypervisorDriver chHypervisorDriver = { .name = "CH", @@ -1169,6 +1318,8 @@ static virHypervisorDriver chHypervisorDriver = { .domainGetVcpusFlags = chDomainGetVcpusFlags, /* 7.11.0 */ .domainGetMaxVcpus = chDomainGetMaxVcpus, /* 7.11.0 */ .domainGetVcpuPinInfo = chDomainGetVcpuPinInfo, /* 7.11.0 */ + .domainPinVcpu = chDomainPinVcpu, /* 7.11.0 */ + .domainPinVcpuFlags = chDomainPinVcpuFlags, /* 7.11.0 */ .nodeGetCPUMap = chNodeGetCPUMap, /* 7.11.0 */ }; -- 2.27.0

From: Vineeth Pillai <viremana(a)linux.microsoft.com&gt; Enable support of VIR_DRV_FEATURE_TYPED_PARAM_STRING to enable numatune Signed-off-by: Vineeth Pillai <viremana(a)linux.microsoft.com&gt; Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com&gt; --- src/ch/ch_driver.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 400dfee766..c6dcc33f5e 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -946,6 +946,36 @@ chStateInitialize(bool privileged, return ret; } +/* Which features are supported by this driver? */ +static int +chConnectSupportsFeature(virConnectPtr conn, int feature) +{ + if (virConnectSupportsFeatureEnsureACL(conn) < 0) + return -1; + + switch ((virDrvFeature) feature) { + case VIR_DRV_FEATURE_TYPED_PARAM_STRING: + return 1; + case VIR_DRV_FEATURE_MIGRATION_V2: + case VIR_DRV_FEATURE_MIGRATION_V3: + case VIR_DRV_FEATURE_MIGRATION_P2P: + case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION: + case VIR_DRV_FEATURE_FD_PASSING: + case VIR_DRV_FEATURE_XML_MIGRATABLE: + case VIR_DRV_FEATURE_MIGRATION_OFFLINE: + case VIR_DRV_FEATURE_MIGRATION_PARAMS: + case VIR_DRV_FEATURE_MIGRATION_DIRECT: + case VIR_DRV_FEATURE_MIGRATION_V1: + case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE: + case VIR_DRV_FEATURE_REMOTE: + case VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK: + case VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK: + case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: + default: + return 0; + } +} + static int chDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) { @@ -1291,6 +1321,7 @@ static virHypervisorDriver chHypervisorDriver = { .connectListAllDomains = chConnectListAllDomains, /* 7.5.0 */ .connectListDomains = chConnectListDomains, /* 7.5.0 */ .connectGetCapabilities = chConnectGetCapabilities, /* 7.5.0 */ + .connectSupportsFeature = chConnectSupportsFeature, /* 7.11.0 */ .domainCreateXML = chDomainCreateXML, /* 7.5.0 */ .domainCreate = chDomainCreate, /* 7.5.0 */ .domainCreateWithFlags = chDomainCreateWithFlags, /* 7.5.0 */ -- 2.27.0

using virCHProcessSetupPid Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com&gt; --- src/ch/ch_monitor.c | 60 ++++++++++++++++++++++++++++++++++ src/ch/ch_monitor.h | 2 ++ src/ch/ch_process.c | 78 +++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 138 insertions(+), 2 deletions(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index d7593d4aa6..308487b4ff 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -941,3 +941,63 @@ virCHMonitorGetInfo(virCHMonitor * mon, virJSONValue ** info) { return virCHMonitorGet(mon, URL_VM_INFO, info); } + +/** + * virCHMonitorGetIOThreads: + * @mon: Pointer to the monitor + * @iothreads: Location to return array of IOThreadInfo data + * + * Retrieve the list of iothreads defined/running for the machine + * + * Returns count of IOThreadInfo structures on success + * -1 on error. + */ +int virCHMonitorGetIOThreads(virCHMonitor *mon, + virDomainIOThreadInfo ***iothreads) +{ + size_t nthreads = 0, niothreads = 0; + int thd_index; + virDomainIOThreadInfo **iothreadinfolist = NULL, *iothreadinfo = NULL; + + *iothreads = NULL; + nthreads = virCHMonitorRefreshThreadInfo(mon); + + iothreadinfolist = g_new0(virDomainIOThreadInfo*, nthreads); + + for (thd_index = 0; thd_index < nthreads; thd_index++) { + virBitmap *map = NULL; + if (mon->threads[thd_index].type == virCHThreadTypeIO) { + iothreadinfo = g_new0(virDomainIOThreadInfo, 1); + + iothreadinfo->iothread_id = mon->threads[thd_index].ioInfo.tid; + + if (!(map = virProcessGetAffinity(iothreadinfo->iothread_id))) + goto cleanup; + + if (virBitmapToData(map, &(iothreadinfo->cpumap), + &(iothreadinfo->cpumaplen)) < 0) { + virBitmapFree(map); + goto cleanup; + } + virBitmapFree(map); + //Append to iothreadinfolist + iothreadinfolist[niothreads] = iothreadinfo; + niothreads++; + } + } + VIR_DELETE_ELEMENT_INPLACE(iothreadinfolist, + niothreads, nthreads); + *iothreads = iothreadinfolist; + VIR_DEBUG("niothreads = %ld", niothreads); + return niothreads; + + cleanup: + if (iothreadinfolist) { + for (thd_index = 0; thd_index < niothreads; thd_index++) + VIR_FREE(iothreadinfolist[thd_index]); + VIR_FREE(iothreadinfolist); + } + if (iothreadinfo) + VIR_FREE(iothreadinfo); + return -1; +} diff --git a/src/ch/ch_monitor.h b/src/ch/ch_monitor.h index f8c3fa75e8..98edb0faf9 100644 --- a/src/ch/ch_monitor.h +++ b/src/ch/ch_monitor.h @@ -118,3 +118,5 @@ int virCHMonitorGetCPUInfo(virCHMonitor *mon, size_t maxvcpus); size_t virCHMonitorGetThreadInfo(virCHMonitor *mon, bool refresh, virCHMonitorThreadInfo **threads); +int virCHMonitorGetIOThreads(virCHMonitor *mon, + virDomainIOThreadInfo ***iothreads); diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index 7a51531224..1c0f5d0818 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -41,7 +41,6 @@ VIR_LOG_INIT("ch.ch_process"); #define START_VM_POSTFIX ": starting up vm\n" - static virCHMonitor * virCHProcessConnectMonitor(virCHDriver *driver, virDomainObj *vm) @@ -131,7 +130,6 @@ virCHProcessUpdateInfo(virDomainObj *vm) virCHProcessUpdateConsole(vm, info); virJSONValueFree(info); - return 0; } @@ -312,6 +310,74 @@ virCHProcessSetupPid(virDomainObj *vm, return ret; } +static int +virCHProcessSetupIOThread(virDomainObj *vm, + virDomainIOThreadInfo *iothread) +{ + virCHDomainObjPrivate *priv = vm->privateData; + return virCHProcessSetupPid(vm, iothread->iothread_id, + VIR_CGROUP_THREAD_IOTHREAD, + iothread->iothread_id, + priv->autoCpuset, // This should be updated when CLH supports accepting + // iothread settings from input domain definition + vm->def->cputune.iothread_period, + vm->def->cputune.iothread_quota, + NULL); // CLH doesn't allow choosing a scheduler for iothreads. +} + +static int +virCHProcessSetupIOThreads(virDomainObj *vm) +{ + virCHDomainObjPrivate *priv = vm->privateData; + virDomainIOThreadInfo **iothreads = NULL; + size_t i; + size_t niothreads; + + niothreads = virCHMonitorGetIOThreads(priv->monitor, &iothreads); + for (i = 0; i < niothreads; i++) { + VIR_DEBUG("IOThread index = %ld , tid = %d", i, iothreads[i]->iothread_id); + if (virCHProcessSetupIOThread(vm, iothreads[i]) < 0) + return -1; + } + return 0; +} + + +static int +virCHProcessSetupEmulatorThread(virDomainObj *vm, + virCHMonitorEmuThreadInfo emuthread) +{ + return virCHProcessSetupPid(vm, emuthread.tid, VIR_CGROUP_THREAD_EMULATOR, + 0, vm->def->cputune.emulatorpin, + vm->def->cputune.emulator_period, + vm->def->cputune.emulator_quota, + vm->def->cputune.emulatorsched); +} + +static int +virCHProcessSetupEmulatorThreads(virDomainObj *vm) +{ + int thd_index = 0; + virCHDomainObjPrivate *priv = vm->privateData; + /* + * Cloud-hypervisor start 4 Emulator threads by default: + * vmm + * cloud-hypervisor + * http-server + * signal_handler + */ + for (thd_index = 0; thd_index < priv->monitor->nthreads; thd_index++) { + if (priv->monitor->threads[thd_index].type == virCHThreadTypeEmulator) { + VIR_DEBUG("Setup tid = %d (%s) Emulator thread", priv->monitor->threads[thd_index].emuInfo.tid, + priv->monitor->threads[thd_index].emuInfo.thrName); + + if (virCHProcessSetupEmulatorThread(vm, priv->monitor->threads[thd_index].emuInfo) < 0) + return -1; + } + } + return 0; +} + /** * virCHProcessSetupVcpu: * @vm: domain object @@ -443,6 +509,14 @@ virCHProcessStart(virCHDriver * driver, virCHDomainRefreshThreadInfo(vm); + VIR_DEBUG("Setting emulator tuning/settings"); + if (virCHProcessSetupEmulatorThreads(vm) < 0) + goto cleanup; + + VIR_DEBUG("Setting iothread tuning/settings"); + if (virCHProcessSetupIOThreads(vm) < 0) + goto cleanup; + VIR_DEBUG("Setting global CPU cgroup (if required)"); if (virSetupGlobalCpuCgroup(vm, priv->cgroup, priv->autoNodeset) < 0) goto cleanup; -- 2.27.0