udevd: control log-priority of the running daemon with udevcontrol
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
This commit is contained in:
parent
3632a36858
commit
8ab44e3fd0
2
Makefile
2
Makefile
|
@ -388,7 +388,7 @@ install: install-config install-man install-dev.d all
|
||||||
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
|
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
|
||||||
ifndef DESTDIR
|
ifndef DESTDIR
|
||||||
- killall $(DAEMON)
|
- killall $(DAEMON)
|
||||||
- $(sbindir)/$(DAEMON) -d
|
- $(sbindir)/$(DAEMON) --daemon
|
||||||
- rm -rf $(udevdb)
|
- rm -rf $(udevdb)
|
||||||
endif
|
endif
|
||||||
@extras="$(EXTRAS)" ; for target in $$extras ; do \
|
@extras="$(EXTRAS)" ; for target in $$extras ; do \
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# udev.conf
|
# udev.conf
|
||||||
#
|
|
||||||
|
|
||||||
# Where in the filesystem to place the device nodes
|
# Where in the filesystem to place the device nodes
|
||||||
udev_root="@udevdir@"
|
udev_root="@udevdir@"
|
||||||
|
|
2
udev.c
2
udev.c
|
@ -109,7 +109,7 @@ int main(int argc, char *argv[], char *envp[])
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* export log_level , as called programs may want to do the same as udev */
|
/* export log_priority , as called programs may want to do the same as udev */
|
||||||
if (udev_log_priority) {
|
if (udev_log_priority) {
|
||||||
char priority[32];
|
char priority[32];
|
||||||
|
|
||||||
|
|
|
@ -409,10 +409,10 @@ int execute_command(const char *command, const char *subsystem)
|
||||||
close(devnull);
|
close(devnull);
|
||||||
}
|
}
|
||||||
retval = execv(arg, argv);
|
retval = execv(arg, argv);
|
||||||
err("exec of child failed");
|
err("exec of child '%s' failed", command);
|
||||||
_exit(1);
|
_exit(1);
|
||||||
case -1:
|
case -1:
|
||||||
dbg("fork of child failed");
|
dbg("fork of child '%s' failed", command);
|
||||||
break;
|
break;
|
||||||
return -1;
|
return -1;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -37,18 +37,23 @@
|
||||||
#include "udev.h"
|
#include "udev.h"
|
||||||
#include "udev_version.h"
|
#include "udev_version.h"
|
||||||
#include "udevd.h"
|
#include "udevd.h"
|
||||||
|
#include "udev_utils.h"
|
||||||
#include "logging.h"
|
#include "logging.h"
|
||||||
|
|
||||||
/* global variables */
|
/* global variables */
|
||||||
static int sock = -1;
|
static int sock = -1;
|
||||||
|
static int log = 0;
|
||||||
|
|
||||||
#ifdef USE_LOG
|
#ifdef USE_LOG
|
||||||
void log_message (int level, const char *format, ...)
|
void log_message (int priority, const char *format, ...)
|
||||||
{
|
{
|
||||||
va_list args;
|
va_list args;
|
||||||
|
|
||||||
|
if (priority > log)
|
||||||
|
return;
|
||||||
|
|
||||||
va_start(args, format);
|
va_start(args, format);
|
||||||
vsyslog(level, format, args);
|
vsyslog(priority, format, args);
|
||||||
va_end(args);
|
va_end(args);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -59,25 +64,37 @@ int main(int argc, char *argv[], char *envp[])
|
||||||
static struct udevd_msg usend_msg;
|
static struct udevd_msg usend_msg;
|
||||||
struct sockaddr_un saddr;
|
struct sockaddr_un saddr;
|
||||||
socklen_t addrlen;
|
socklen_t addrlen;
|
||||||
|
const char *env;
|
||||||
int retval = 1;
|
int retval = 1;
|
||||||
|
|
||||||
|
env = getenv("UDEV_LOG");
|
||||||
|
if (env)
|
||||||
|
log = log_priority(env);
|
||||||
|
|
||||||
logging_init("udevcontrol");
|
logging_init("udevcontrol");
|
||||||
dbg("version %s", UDEV_VERSION);
|
dbg("version %s", UDEV_VERSION);
|
||||||
|
|
||||||
if (argc != 2) {
|
if (argc != 2) {
|
||||||
info("usage: udevcontrol <cmd>\n");
|
info("usage: udevcontrol <cmd>");
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
|
memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
|
||||||
strcpy(usend_msg.magic, UDEV_MAGIC);
|
strcpy(usend_msg.magic, UDEV_MAGIC);
|
||||||
|
|
||||||
if (strstr(argv[1], "stop_exec_queue"))
|
if (!strcmp(argv[1], "stop_exec_queue"))
|
||||||
usend_msg.type = UDEVD_STOP_EXEC_QUEUE;
|
usend_msg.type = UDEVD_STOP_EXEC_QUEUE;
|
||||||
else if (strstr(argv[1], "start_exec_queue"))
|
else if (!strcmp(argv[1], "start_exec_queue"))
|
||||||
usend_msg.type = UDEVD_START_EXEC_QUEUE;
|
usend_msg.type = UDEVD_START_EXEC_QUEUE;
|
||||||
else {
|
else if (!strncmp(argv[1], "log_priority=", strlen("log_priority="))) {
|
||||||
info("unknown command\n");
|
int *level = (int *) usend_msg.envbuf;
|
||||||
|
char *prio = &argv[1][strlen("log_priority=")];
|
||||||
|
|
||||||
|
usend_msg.type = UDEVD_SET_LOG_LEVEL;
|
||||||
|
*level = log_priority(prio);
|
||||||
|
dbg("send log_priority=%i", *level);
|
||||||
|
} else {
|
||||||
|
err("unknown command\n");
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,7 +116,7 @@ int main(int argc, char *argv[], char *envp[])
|
||||||
info("error sending message (%s)", strerror(errno));
|
info("error sending message (%s)", strerror(errno));
|
||||||
retval = 1;
|
retval = 1;
|
||||||
} else {
|
} else {
|
||||||
dbg("sent message '%x' (%u bytes sent)\n", usend_msg.type, retval);
|
dbg("sent message '%x' (%u bytes sent)", usend_msg.type, retval);
|
||||||
retval = 0;
|
retval = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
70
udevd.c
70
udevd.c
|
@ -50,7 +50,7 @@
|
||||||
|
|
||||||
/* global variables*/
|
/* global variables*/
|
||||||
static int udevd_sock;
|
static int udevd_sock;
|
||||||
static int uevent_nl_sock;
|
static int uevent_netlink_sock;
|
||||||
static pid_t sid;
|
static pid_t sid;
|
||||||
|
|
||||||
static int pipefds[2];
|
static int pipefds[2];
|
||||||
|
@ -173,8 +173,8 @@ static void execute_udev(struct uevent_msg *msg)
|
||||||
switch (pid) {
|
switch (pid) {
|
||||||
case 0:
|
case 0:
|
||||||
/* child */
|
/* child */
|
||||||
if (uevent_nl_sock != -1)
|
if (uevent_netlink_sock != -1)
|
||||||
close(uevent_nl_sock);
|
close(uevent_netlink_sock);
|
||||||
close(udevd_sock);
|
close(udevd_sock);
|
||||||
logging_close();
|
logging_close();
|
||||||
|
|
||||||
|
@ -362,6 +362,9 @@ static void exec_queue_manager(void)
|
||||||
struct uevent_msg *tmp_msg;
|
struct uevent_msg *tmp_msg;
|
||||||
int running;
|
int running;
|
||||||
|
|
||||||
|
if (list_empty(&exec_list))
|
||||||
|
return;
|
||||||
|
|
||||||
running = running_processes();
|
running = running_processes();
|
||||||
dbg("%d processes runnning on system", running);
|
dbg("%d processes runnning on system", running);
|
||||||
if (running < 0)
|
if (running < 0)
|
||||||
|
@ -506,6 +509,7 @@ static struct uevent_msg *get_udevd_msg(void)
|
||||||
struct ucred *cred;
|
struct ucred *cred;
|
||||||
char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
|
char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
|
||||||
int envbuf_size;
|
int envbuf_size;
|
||||||
|
int *intval;
|
||||||
|
|
||||||
memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
|
memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
|
||||||
iov.iov_base = &usend_msg;
|
iov.iov_base = &usend_msg;
|
||||||
|
@ -541,10 +545,10 @@ static struct uevent_msg *get_udevd_msg(void)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (usend_msg.type) {
|
switch (usend_msg.type) {
|
||||||
case UDEVD_UDEVSEND:
|
case UDEVD_UEVENT_UDEVSEND:
|
||||||
case UDEVD_INITSEND:
|
case UDEVD_UEVENT_INITSEND:
|
||||||
dbg("udevd event message received");
|
info("udevd event message received");
|
||||||
envbuf_size = size - offsetof(struct udevd_msg, envbuf);
|
envbuf_size = size - offsetof(struct udevd_msg, envbuf);
|
||||||
dbg("envbuf_size=%i", envbuf_size);
|
dbg("envbuf_size=%i", envbuf_size);
|
||||||
msg = get_msg_from_envbuf(usend_msg.envbuf, envbuf_size);
|
msg = get_msg_from_envbuf(usend_msg.envbuf, envbuf_size);
|
||||||
|
@ -553,14 +557,24 @@ switch (usend_msg.type) {
|
||||||
msg->type = usend_msg.type;
|
msg->type = usend_msg.type;
|
||||||
return msg;
|
return msg;
|
||||||
case UDEVD_STOP_EXEC_QUEUE:
|
case UDEVD_STOP_EXEC_QUEUE:
|
||||||
dbg("udevd message (STOP_EXEC_QUEUE) received");
|
info("udevd message (STOP_EXEC_QUEUE) received");
|
||||||
stop_exec_q = 1;
|
stop_exec_q = 1;
|
||||||
break;
|
break;
|
||||||
case UDEVD_START_EXEC_QUEUE:
|
case UDEVD_START_EXEC_QUEUE:
|
||||||
dbg("udevd message (START_EXEC_QUEUE) received");
|
info("udevd message (START_EXEC_QUEUE) received");
|
||||||
stop_exec_q = 0;
|
stop_exec_q = 0;
|
||||||
exec_queue_manager();
|
exec_queue_manager();
|
||||||
break;
|
break;
|
||||||
|
case UDEVD_SET_LOG_LEVEL:
|
||||||
|
intval = (int *) usend_msg.envbuf;
|
||||||
|
info("udevd message (SET_LOG_PRIORITY) received, udev_log_priority=%i", *intval);
|
||||||
|
udev_log_priority = *intval;
|
||||||
|
break;
|
||||||
|
case UDEVD_SET_MAX_CHILDS:
|
||||||
|
intval = (int *) usend_msg.envbuf;
|
||||||
|
info("udevd message (UDEVD_SET_MAX_CHILDS) received, max_childs=%i", *intval);
|
||||||
|
max_childs = *intval;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
dbg("unknown message type");
|
dbg("unknown message type");
|
||||||
}
|
}
|
||||||
|
@ -568,7 +582,7 @@ switch (usend_msg.type) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* receive the kernel user event message and do some sanity checks */
|
/* receive the kernel user event message and do some sanity checks */
|
||||||
static struct uevent_msg *get_nl_msg(void)
|
static struct uevent_msg *get_netlink_msg(void)
|
||||||
{
|
{
|
||||||
struct uevent_msg *msg;
|
struct uevent_msg *msg;
|
||||||
int bufpos;
|
int bufpos;
|
||||||
|
@ -576,7 +590,7 @@ static struct uevent_msg *get_nl_msg(void)
|
||||||
static char buffer[UEVENT_BUFFER_SIZE + 512];
|
static char buffer[UEVENT_BUFFER_SIZE + 512];
|
||||||
char *pos;
|
char *pos;
|
||||||
|
|
||||||
size = recv(uevent_nl_sock, &buffer, sizeof(buffer), 0);
|
size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
|
||||||
if (size < 0) {
|
if (size < 0) {
|
||||||
if (errno != EINTR)
|
if (errno != EINTR)
|
||||||
dbg("unable to receive udevd message");
|
dbg("unable to receive udevd message");
|
||||||
|
@ -593,7 +607,7 @@ static struct uevent_msg *get_nl_msg(void)
|
||||||
msg = get_msg_from_envbuf(&buffer[bufpos], size-bufpos);
|
msg = get_msg_from_envbuf(&buffer[bufpos], size-bufpos);
|
||||||
if (msg == NULL)
|
if (msg == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
msg->type = UDEVD_NL;
|
msg->type = UDEVD_UEVENT_NETLINK;
|
||||||
|
|
||||||
/* validate message */
|
/* validate message */
|
||||||
pos = strchr(buffer, '@');
|
pos = strchr(buffer, '@');
|
||||||
|
@ -732,7 +746,7 @@ static int init_udevd_socket(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int init_uevent_nl_sock(void)
|
static int init_uevent_netlink_sock(void)
|
||||||
{
|
{
|
||||||
struct sockaddr_nl snl;
|
struct sockaddr_nl snl;
|
||||||
int retval;
|
int retval;
|
||||||
|
@ -742,18 +756,18 @@ static int init_uevent_nl_sock(void)
|
||||||
snl.nl_pid = getpid();
|
snl.nl_pid = getpid();
|
||||||
snl.nl_groups = 0xffffffff;
|
snl.nl_groups = 0xffffffff;
|
||||||
|
|
||||||
uevent_nl_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
|
uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
|
||||||
if (uevent_nl_sock == -1) {
|
if (uevent_netlink_sock == -1) {
|
||||||
dbg("error getting socket, %s", strerror(errno));
|
dbg("error getting socket, %s", strerror(errno));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
retval = bind(uevent_nl_sock, (struct sockaddr *) &snl,
|
retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl,
|
||||||
sizeof(struct sockaddr_nl));
|
sizeof(struct sockaddr_nl));
|
||||||
if (retval < 0) {
|
if (retval < 0) {
|
||||||
dbg("bind failed, %s", strerror(errno));
|
dbg("bind failed, %s", strerror(errno));
|
||||||
close(uevent_nl_sock);
|
close(uevent_netlink_sock);
|
||||||
uevent_nl_sock = -1;
|
uevent_netlink_sock = -1;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -768,7 +782,7 @@ int main(int argc, char *argv[], char *envp[])
|
||||||
struct sigaction act;
|
struct sigaction act;
|
||||||
fd_set readfds;
|
fd_set readfds;
|
||||||
const char *value;
|
const char *value;
|
||||||
int uevent_nl_active = 0;
|
int uevent_netlink_active = 0;
|
||||||
int daemonize = 0;
|
int daemonize = 0;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -788,7 +802,7 @@ int main(int argc, char *argv[], char *envp[])
|
||||||
daemonize = 1;
|
daemonize = 1;
|
||||||
}
|
}
|
||||||
if (strcmp(arg, "--stop-exec-queue") == 0) {
|
if (strcmp(arg, "--stop-exec-queue") == 0) {
|
||||||
info("will not execute event until START_EXEC_QUEUE is received");
|
info("will not execute events until START_EXEC_QUEUE is received");
|
||||||
stop_exec_q = 1;
|
stop_exec_q = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -865,7 +879,7 @@ int main(int argc, char *argv[], char *envp[])
|
||||||
sigaction(SIGALRM, &act, NULL);
|
sigaction(SIGALRM, &act, NULL);
|
||||||
sigaction(SIGCHLD, &act, NULL);
|
sigaction(SIGCHLD, &act, NULL);
|
||||||
|
|
||||||
if (init_uevent_nl_sock() < 0) {
|
if (init_uevent_netlink_sock() < 0) {
|
||||||
dbg("uevent socket not available");
|
dbg("uevent socket not available");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -918,8 +932,8 @@ int main(int argc, char *argv[], char *envp[])
|
||||||
|
|
||||||
FD_ZERO(&readfds);
|
FD_ZERO(&readfds);
|
||||||
FD_SET(udevd_sock, &readfds);
|
FD_SET(udevd_sock, &readfds);
|
||||||
if (uevent_nl_sock != -1)
|
if (uevent_netlink_sock != -1)
|
||||||
FD_SET(uevent_nl_sock, &readfds);
|
FD_SET(uevent_netlink_sock, &readfds);
|
||||||
FD_SET(pipefds[0], &readfds);
|
FD_SET(pipefds[0], &readfds);
|
||||||
maxsockplus = udevd_sock+1;
|
maxsockplus = udevd_sock+1;
|
||||||
while (1) {
|
while (1) {
|
||||||
|
@ -938,7 +952,7 @@ int main(int argc, char *argv[], char *envp[])
|
||||||
msg = get_udevd_msg();
|
msg = get_udevd_msg();
|
||||||
if (msg) {
|
if (msg) {
|
||||||
/* discard kernel messages if netlink is active */
|
/* discard kernel messages if netlink is active */
|
||||||
if (uevent_nl_active && msg->type == UDEVD_UDEVSEND && msg->seqnum != 0) {
|
if (uevent_netlink_active && msg->type == UDEVD_UEVENT_UDEVSEND && msg->seqnum != 0) {
|
||||||
dbg("skip uevent_helper message, netlink is active");
|
dbg("skip uevent_helper message, netlink is active");
|
||||||
free(msg);
|
free(msg);
|
||||||
continue;
|
continue;
|
||||||
|
@ -947,14 +961,14 @@ int main(int argc, char *argv[], char *envp[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (FD_ISSET(uevent_nl_sock, &workreadfds)) {
|
if (FD_ISSET(uevent_netlink_sock, &workreadfds)) {
|
||||||
msg = get_nl_msg();
|
msg = get_netlink_msg();
|
||||||
if (msg) {
|
if (msg) {
|
||||||
msg_queue_insert(msg);
|
msg_queue_insert(msg);
|
||||||
/* disable udevsend with first netlink message */
|
/* disable udevsend with first netlink message */
|
||||||
if (!uevent_nl_active) {
|
if (!uevent_netlink_active) {
|
||||||
info("uevent_nl message received, disable udevsend messages");
|
info("uevent_nl message received, disable udevsend messages");
|
||||||
uevent_nl_active = 1;
|
uevent_netlink_active = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
8
udevd.h
8
udevd.h
|
@ -50,11 +50,13 @@
|
||||||
|
|
||||||
enum udevd_msg_type {
|
enum udevd_msg_type {
|
||||||
UDEVD_UNKNOWN,
|
UDEVD_UNKNOWN,
|
||||||
UDEVD_UDEVSEND,
|
UDEVD_UEVENT_UDEVSEND,
|
||||||
UDEVD_INITSEND,
|
UDEVD_UEVENT_INITSEND,
|
||||||
UDEVD_NL,
|
UDEVD_UEVENT_NETLINK,
|
||||||
UDEVD_STOP_EXEC_QUEUE,
|
UDEVD_STOP_EXEC_QUEUE,
|
||||||
UDEVD_START_EXEC_QUEUE,
|
UDEVD_START_EXEC_QUEUE,
|
||||||
|
UDEVD_SET_LOG_LEVEL,
|
||||||
|
UDEVD_SET_MAX_CHILDS,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -100,7 +100,7 @@ static int udevsend(char *filename, int sock, int disable_loop_detection)
|
||||||
|
|
||||||
memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
|
memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
|
||||||
strcpy(usend_msg.magic, UDEV_MAGIC);
|
strcpy(usend_msg.magic, UDEV_MAGIC);
|
||||||
usend_msg.type = UDEVD_INITSEND;
|
usend_msg.type = UDEVD_UEVENT_INITSEND;
|
||||||
|
|
||||||
ls = fdmap;
|
ls = fdmap;
|
||||||
ch = le = ls;
|
ch = le = ls;
|
||||||
|
|
|
@ -146,7 +146,7 @@ int main(int argc, char *argv[], char *envp[])
|
||||||
|
|
||||||
memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
|
memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
|
||||||
strcpy(usend_msg.magic, UDEV_MAGIC);
|
strcpy(usend_msg.magic, UDEV_MAGIC);
|
||||||
usend_msg.type = UDEVD_UDEVSEND;
|
usend_msg.type = UDEVD_UEVENT_UDEVSEND;
|
||||||
|
|
||||||
/* copy all keys to send buffer */
|
/* copy all keys to send buffer */
|
||||||
for (i = 0; envp[i]; i++) {
|
for (i = 0; envp[i]; i++) {
|
||||||
|
|
Loading…
Reference in a new issue