- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] Make parsing of SELinux labels more robust
by Daniel P. Berrange 13 Mar '13

13 Mar '13

This series fixes a problem parsing SELinux labels which can prevent libvirtd starting VMs when in permissive mode.

2 6

[libvirt] [PATCH] Avoid closing uninitialized FDs when LXC startup fails
by Daniel P. Berrange 13 Mar '13

13 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If an LXC domain failed to start because of a bogus SELinux label, virLXCProcessStart would call VIR_CLOSE(0) by mistake. This is because the code which initializes the member of the ttyFDs array to -1 got moved too far away from the place where the array is first allocated. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index cad6402..942d375 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1077,6 +1077,8 @@ int virLXCProcessStart(virConnectPtr conn, virReportOOMError(); goto cleanup; } + for (i = 0 ; i < vm->def->nconsoles ; i++) + ttyFDs[i] = -1; /* If you are using a SecurityDriver with dynamic labelling, then generate a security label for isolation */ @@ -1096,9 +1098,6 @@ int virLXCProcessStart(virConnectPtr conn, vm->def, NULL) < 0) goto cleanup; - for (i = 0 ; i < vm->def->nconsoles ; i++) - ttyFDs[i] = -1; - for (i = 0 ; i < vm->def->nconsoles ; i++) { char *ttyPath; if (vm->def->consoles[i]->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { -- 1.8.1.4

2 1

[libvirt] [PATCH] Re-add DTrace probes on 'dispose' functions
by Daniel P. Berrange 13 Mar '13

13 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When converting to virObject, the probes on the 'Free' functions were removed on the basis that there is a probe on virObjectFree that suffices. This puts a burden on people writing probe scripts to identify which object is being dispose. This adds back probes in the 'Dispose' functions and updates the rpc monitor systemtap example to use them Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- examples/systemtap/rpc-monitor.stp | 32 +++++++++++++------------------- src/libvirt_probes.d | 10 ++++++---- src/rpc/virkeepalive.c | 3 +++ src/rpc/virnetclient.c | 3 +++ src/rpc/virnetserverclient.c | 3 +++ src/rpc/virnetsocket.c | 4 +++- src/rpc/virnettlscontext.c | 6 ++++++ 7 files changed, 37 insertions(+), 24 deletions(-) diff --git a/examples/systemtap/rpc-monitor.stp b/examples/systemtap/rpc-monitor.stp index 4695c10..c8d5c17 100644 --- a/examples/systemtap/rpc-monitor.stp +++ b/examples/systemtap/rpc-monitor.stp @@ -117,11 +117,9 @@ probe libvirt.rpc.socket_new { remoteAddrs[pid(), sock] = remoteAddr; } -probe libvirt.rpc.socket_free { - if (refs == 1) { - delete localAddrs[pid(), sock]; - delete remoteAddrs[pid(), sock]; - } +probe libvirt.rpc.socket_dispose { + delete localAddrs[pid(), sock]; + delete remoteAddrs[pid(), sock]; } @@ -131,13 +129,11 @@ probe libvirt.rpc.client_new { print_ts(sprintf("C + %-16p local=%s remote=%s", client, localAddrs[pid(), sock], remoteAddrs[pid(), sock])); } -probe libvirt.rpc.client_free { - if (refs == 1) { - print_ts(sprintf("C - %-16p local=%s remote=%s", client, - localAddrs[pid(), clientSocks[pid(), client]], - remoteAddrs[pid(), clientSocks[pid(), client]])); - delete clientSocks[pid(), client]; - } +probe libvirt.rpc.client_dispose { + print_ts(sprintf("C - %-16p local=%s remote=%s", client, + localAddrs[pid(), clientSocks[pid(), client]], + remoteAddrs[pid(), clientSocks[pid(), client]])); + delete clientSocks[pid(), client]; } @@ -147,13 +143,11 @@ probe libvirt.rpc.server_client_new { print_ts(sprintf("+ S %-16p local=%s remote=%s", client, localAddrs[pid(), sock], remoteAddrs[pid(), sock])); } -probe libvirt.rpc.server_client_free { - if (refs == 1) { - print_ts(sprintf("- S %-16p local=%s remote=%s", client, - localAddrs[pid(), serverSocks[pid(), client]], - remoteAddrs[pid(), serverSocks[pid(), client]])); - delete serverSocks[pid(), client]; - } +probe libvirt.rpc.server_client_dispose { + print_ts(sprintf("- S %-16p local=%s remote=%s", client, + localAddrs[pid(), serverSocks[pid(), client]], + remoteAddrs[pid(), serverSocks[pid(), client]])); + delete serverSocks[pid(), client]; } diff --git a/src/libvirt_probes.d b/src/libvirt_probes.d index 9343fa4..340d665 100644 --- a/src/libvirt_probes.d +++ b/src/libvirt_probes.d @@ -26,6 +26,7 @@ provider libvirt { # file: src/rpc/virnetsocket.c # prefix: rpc probe rpc_socket_new(void *sock, int fd, int errfd, pid_t pid, const char *localAddr, const char *remoteAddr); + probe rpc_socket_dispose(void *sock); probe rpc_socket_send_fd(void *sock, int fd); probe rpc_socket_recv_fd(void *sock, int fd); @@ -33,7 +34,7 @@ provider libvirt { # file: src/rpc/virnetserverclient.c # prefix: rpc probe rpc_server_client_new(void *client, void *sock); - + probe rpc_server_client_dispose(void *client); probe rpc_server_client_msg_tx_queue(void *client, int len, int prog, int vers, int proc, int type, int status, int serial); probe rpc_server_client_msg_rx(void *client, int len, int prog, int vers, int proc, int type, int status, int serial); @@ -41,7 +42,7 @@ provider libvirt { # file: src/rpc/virnetclient.c # prefix: rpc probe rpc_client_new(void *client, void *sock); - + probe rpc_client_dispose(void *client); probe rpc_client_msg_tx_queue(void *client, int len, int prog, int vers, int proc, int type, int status, int serial); probe rpc_client_msg_rx(void *client, int len, int prog, int vers, int proc, int type, int status, int serial); @@ -57,14 +58,14 @@ provider libvirt { # prefix: rpc probe rpc_tls_context_new(void *ctxt, const char *cacert, const char *cacrl, const char *cert, const char *key, int sanityCheckCert, int requireValidCert, int isServer); - + probe rpc_tls_context_dispose(void *ctxt); probe rpc_tls_context_session_allow(void *ctxt, void *sess, const char *dname); probe rpc_tls_context_session_deny(void *ctxt, void *sess, const char *dname); probe rpc_tls_context_session_fail(void *ctxt, void *sess); probe rpc_tls_session_new(void *sess, void *ctxt, const char *hostname, int isServer); - + probe rpc_tls_session_dispose(void *sess); probe rpc_tls_session_handshake_pass(void *sess); probe rpc_tls_session_handshake_fail(void *sess); @@ -72,6 +73,7 @@ provider libvirt { # file: src/rpc/virkeepalive.c # prefix: rpc probe rpc_keepalive_new(void *ka, void *client); + probe rpc_keepalive_dispose(void *ka); probe rpc_keepalive_start(void *ka, void *client, int interval, int count); probe rpc_keepalive_stop(void *ka, void *client); probe rpc_keepalive_send(void *ka, void *client, int prog, int vers, int proc); diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index 71dd904..d49082c 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -224,6 +224,9 @@ virKeepAliveDispose(void *obj) { virKeepAlivePtr ka = obj; + PROBE(RPC_KEEPALIVE_DISPOSE, + "ka=%p", ka); + ka->freeCB(ka->client); } diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index bfa1624..1379078 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -596,6 +596,9 @@ void virNetClientDispose(void *obj) virNetClientPtr client = obj; int i; + PROBE(RPC_CLIENT_DISPOSE, + "client=%p", client); + if (client->closeFf) client->closeFf(client->closeOpaque); diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 9e519e6..19063ef 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -704,6 +704,9 @@ void virNetServerClientDispose(void *obj) { virNetServerClientPtr client = obj; + PROBE(RPC_SERVER_CLIENT_DISPOSE, + "client=%p", client); + if (client->privateData && client->privateDataFreeFunc) client->privateDataFreeFunc(client->privateData); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 93980d6..fe4ac71 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -996,7 +996,9 @@ void virNetSocketDispose(void *obj) { virNetSocketPtr sock = obj; - VIR_DEBUG("sock=%p fd=%d", sock, sock->fd); + PROBE(RPC_SOCKET_DISPOSE, + "sock=%p", sock); + if (sock->watch > 0) { virEventRemoveHandle(sock->watch); sock->watch = -1; diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 6665268..ece4620 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1114,6 +1114,9 @@ void virNetTLSContextDispose(void *obj) { virNetTLSContextPtr ctxt = obj; + PROBE(RPC_TLS_CONTEXT_DISPOSE, + "ctxt=%p", ctxt); + gnutls_dh_params_deinit(ctxt->dhParams); gnutls_certificate_free_credentials(ctxt->x509cred); } @@ -1366,6 +1369,9 @@ void virNetTLSSessionDispose(void *obj) { virNetTLSSessionPtr sess = obj; + PROBE(RPC_TLS_SESSION_DISPOSE, + "sess=%p", sess); + VIR_FREE(sess->hostname); gnutls_deinit(sess->session); } -- 1.8.1.4

2 1

[libvirt] [PATCH] Fix generation of systemtap probes for RPC protocols
by Daniel P. Berrange 13 Mar '13

13 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The naming used in the RPC protocols for the LXC monitor and lock daemon confused the script used to generate systemtap helper functions. Rename the LXC monitor protocol symbols to reduce confusion. Adapt the gensystemtap.pl script to cope with the LXC monitor / lock daemon naming conversions. This has no functional impact on RPC wire protocol, since names are only used in the C layer Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/Makefile.am | 8 +++++--- src/lxc/lxc_controller.c | 26 +++++++++++++------------- src/lxc/lxc_monitor.c | 26 +++++++++++++------------- src/lxc/lxc_monitor.h | 2 +- src/lxc/lxc_monitor_protocol.x | 24 ++++++++++++------------ src/lxc/lxc_process.c | 8 ++++---- src/rpc/gensystemtap.pl | 6 +++--- 7 files changed, 51 insertions(+), 49 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index a6cc839..0c0dfb3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -460,12 +460,12 @@ LXC_MONITOR_PROTOCOL = $(srcdir)/lxc/lxc_monitor_protocol.x $(srcdir)/lxc/lxc_monitor_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ $(LXC_MONITOR_PROTOCOL) $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl \ - -k virLXCProtocol VIR_LXC_MONITOR_PROTOCOL $(LXC_MONITOR_PROTOCOL) > $@ + -k virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > $@ $(srcdir)/lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl \ - -b virLXCProtocol VIR_LXC_MONITOR_PROTOCOL $(LXC_MONITOR_PROTOCOL) > $@ + -b virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > $@ EXTRA_DIST += \ $(LXC_MONITOR_PROTOCOL) \ @@ -1591,7 +1591,9 @@ RPC_PROBE_FILES = $(srcdir)/rpc/virnetprotocol.x \ $(srcdir)/rpc/virkeepaliveprotocol.x \ $(srcdir)/remote/remote_protocol.x \ $(srcdir)/remote/lxc_protocol.x \ - $(srcdir)/remote/qemu_protocol.x + $(srcdir)/remote/qemu_protocol.x \ + $(srcdir)/lxc/lxc_monitor_protocol.x \ + $(srcdir)/locking/lock_protocol.x libvirt_functions.stp: $(RPC_PROBE_FILES) $(srcdir)/rpc/gensystemtap.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gensystemtap.pl $(RPC_PROBE_FILES) > $@ diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 5e422ad..becf811 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -713,10 +713,10 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) virObjectUnref(svc); svc = NULL; - if (!(ctrl->prog = virNetServerProgramNew(VIR_LXC_PROTOCOL_PROGRAM, - VIR_LXC_PROTOCOL_PROGRAM_VERSION, - virLXCProtocolProcs, - virLXCProtocolNProcs))) + if (!(ctrl->prog = virNetServerProgramNew(VIR_LXC_MONITOR_PROGRAM, + VIR_LXC_MONITOR_PROGRAM_VERSION, + virLXCMonitorProcs, + virLXCMonitorNProcs))) goto error; virNetServerUpdateServices(ctrl->server, true); @@ -1415,25 +1415,25 @@ static int virLXCControllerEventSendExit(virLXCControllerPtr ctrl, int exitstatus) { - virLXCProtocolExitEventMsg msg; + virLXCMonitorExitEventMsg msg; VIR_DEBUG("Exit status %d (client=%p)", exitstatus, ctrl->client); memset(&msg, 0, sizeof(msg)); switch (exitstatus) { case 0: - msg.status = VIR_LXC_PROTOCOL_EXIT_STATUS_SHUTDOWN; + msg.status = VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN; break; case 1: - msg.status = VIR_LXC_PROTOCOL_EXIT_STATUS_REBOOT; + msg.status = VIR_LXC_MONITOR_EXIT_STATUS_REBOOT; break; default: - msg.status = VIR_LXC_PROTOCOL_EXIT_STATUS_ERROR; + msg.status = VIR_LXC_MONITOR_EXIT_STATUS_ERROR; break; } virLXCControllerEventSend(ctrl, - VIR_LXC_PROTOCOL_PROC_EXIT_EVENT, - (xdrproc_t)xdr_virLXCProtocolExitEventMsg, + VIR_LXC_MONITOR_PROC_EXIT_EVENT, + (xdrproc_t)xdr_virLXCMonitorExitEventMsg, (void*)&msg); if (ctrl->client) { @@ -1451,15 +1451,15 @@ static int virLXCControllerEventSendInit(virLXCControllerPtr ctrl, pid_t initpid) { - virLXCProtocolInitEventMsg msg; + virLXCMonitorInitEventMsg msg; VIR_DEBUG("Init pid %llu", (unsigned long long)initpid); memset(&msg, 0, sizeof(msg)); msg.initpid = initpid; virLXCControllerEventSend(ctrl, - VIR_LXC_PROTOCOL_PROC_INIT_EVENT, - (xdrproc_t)xdr_virLXCProtocolInitEventMsg, + VIR_LXC_MONITOR_PROC_INIT_EVENT, + (xdrproc_t)xdr_virLXCMonitorInitEventMsg, (void*)&msg); return 0; } diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index e3901f8..6d11eda 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -68,15 +68,15 @@ virLXCMonitorHandleEventInit(virNetClientProgramPtr prog, virNetClientPtr client, void *evdata, void *opaque); -static virNetClientProgramEvent virLXCProtocolEvents[] = { - { VIR_LXC_PROTOCOL_PROC_EXIT_EVENT, +static virNetClientProgramEvent virLXCMonitorEvents[] = { + { VIR_LXC_MONITOR_PROC_EXIT_EVENT, virLXCMonitorHandleEventExit, - sizeof(virLXCProtocolExitEventMsg), - (xdrproc_t)xdr_virLXCProtocolExitEventMsg }, - { VIR_LXC_PROTOCOL_PROC_INIT_EVENT, + sizeof(virLXCMonitorExitEventMsg), + (xdrproc_t)xdr_virLXCMonitorExitEventMsg }, + { VIR_LXC_MONITOR_PROC_INIT_EVENT, virLXCMonitorHandleEventInit, - sizeof(virLXCProtocolInitEventMsg), - (xdrproc_t)xdr_virLXCProtocolInitEventMsg }, + sizeof(virLXCMonitorInitEventMsg), + (xdrproc_t)xdr_virLXCMonitorInitEventMsg }, }; @@ -86,7 +86,7 @@ virLXCMonitorHandleEventExit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, void *evdata, void *opaque) { virLXCMonitorPtr mon = opaque; - virLXCProtocolExitEventMsg *msg = evdata; + virLXCMonitorExitEventMsg *msg = evdata; VIR_DEBUG("Event exit %d", msg->status); if (mon->cb.exitNotify) @@ -100,7 +100,7 @@ virLXCMonitorHandleEventInit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, void *evdata, void *opaque) { virLXCMonitorPtr mon = opaque; - virLXCProtocolInitEventMsg *msg = evdata; + virLXCMonitorInitEventMsg *msg = evdata; VIR_DEBUG("Event init %llu", (unsigned long long)msg->initpid); @@ -162,10 +162,10 @@ virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, if (virNetClientRegisterAsyncIO(mon->client) < 0) goto error; - if (!(mon->program = virNetClientProgramNew(VIR_LXC_PROTOCOL_PROGRAM, - VIR_LXC_PROTOCOL_PROGRAM_VERSION, - virLXCProtocolEvents, - ARRAY_CARDINALITY(virLXCProtocolEvents), + if (!(mon->program = virNetClientProgramNew(VIR_LXC_MONITOR_PROGRAM, + VIR_LXC_MONITOR_PROGRAM_VERSION, + virLXCMonitorEvents, + ARRAY_CARDINALITY(virLXCMonitorEvents), mon))) goto error; diff --git a/src/lxc/lxc_monitor.h b/src/lxc/lxc_monitor.h index cc31a9c..a0d6f37 100644 --- a/src/lxc/lxc_monitor.h +++ b/src/lxc/lxc_monitor.h @@ -37,7 +37,7 @@ typedef void (*virLXCMonitorCallbackEOFNotify)(virLXCMonitorPtr mon, virDomainObjPtr vm); typedef void (*virLXCMonitorCallbackExitNotify)(virLXCMonitorPtr mon, - virLXCProtocolExitStatus status, + virLXCMonitorExitStatus status, virDomainObjPtr vm); typedef void (*virLXCMonitorCallbackInitNotify)(virLXCMonitorPtr mon, diff --git a/src/lxc/lxc_monitor_protocol.x b/src/lxc/lxc_monitor_protocol.x index 0f041f6..0926e26 100644 --- a/src/lxc/lxc_monitor_protocol.x +++ b/src/lxc/lxc_monitor_protocol.x @@ -4,24 +4,24 @@ * the libvirt_lxc helper program. */ -enum virLXCProtocolExitStatus { - VIR_LXC_PROTOCOL_EXIT_STATUS_ERROR, - VIR_LXC_PROTOCOL_EXIT_STATUS_SHUTDOWN, - VIR_LXC_PROTOCOL_EXIT_STATUS_REBOOT +enum virLXCMonitorExitStatus { + VIR_LXC_MONITOR_EXIT_STATUS_ERROR, + VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN, + VIR_LXC_MONITOR_EXIT_STATUS_REBOOT }; -struct virLXCProtocolExitEventMsg { - enum virLXCProtocolExitStatus status; +struct virLXCMonitorExitEventMsg { + enum virLXCMonitorExitStatus status; }; -struct virLXCProtocolInitEventMsg { +struct virLXCMonitorInitEventMsg { unsigned hyper initpid; }; -const VIR_LXC_PROTOCOL_PROGRAM = 0x12341234; -const VIR_LXC_PROTOCOL_PROGRAM_VERSION = 1; +const VIR_LXC_MONITOR_PROGRAM = 0x12341234; +const VIR_LXC_MONITOR_PROGRAM_VERSION = 1; -enum virLXCProtocolProcedure { - VIR_LXC_PROTOCOL_PROC_EXIT_EVENT = 1, /* skipgen skipgen */ - VIR_LXC_PROTOCOL_PROC_INIT_EVENT = 2 /* skipgen skipgen */ +enum virLXCMonitorProcedure { + VIR_LXC_MONITOR_PROC_EXIT_EVENT = 1, /* skipgen skipgen */ + VIR_LXC_MONITOR_PROC_INIT_EVENT = 2 /* skipgen skipgen */ }; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 942d375..670a032 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -607,19 +607,19 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon, } static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED, - virLXCProtocolExitStatus status, + virLXCMonitorExitStatus status, virDomainObjPtr vm) { virLXCDomainObjPrivatePtr priv = vm->privateData; switch (status) { - case VIR_LXC_PROTOCOL_EXIT_STATUS_SHUTDOWN: + case VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN: priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; break; - case VIR_LXC_PROTOCOL_EXIT_STATUS_ERROR: + case VIR_LXC_MONITOR_EXIT_STATUS_ERROR: priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_FAILED; break; - case VIR_LXC_PROTOCOL_EXIT_STATUS_REBOOT: + case VIR_LXC_MONITOR_EXIT_STATUS_REBOOT: priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; priv->wantReboot = true; break; diff --git a/src/rpc/gensystemtap.pl b/src/rpc/gensystemtap.pl index a16fa00..2467300 100755 --- a/src/rpc/gensystemtap.pl +++ b/src/rpc/gensystemtap.pl @@ -57,11 +57,11 @@ while (<>) { $auth{$2} = lc $1; } } else { - if (/(\w+)_PROGRAM\s*=\s*0x([a-fA-F0-9]+)\s*;/) { + if (/(?:VIR_)?(\w+?)(?:_PROTOCOL)?_PROGRAM\s*=\s*0x([a-fA-F0-9]+)\s*;/) { $funcs{lc $1} = { id => hex($2), version => undef, progs => [] }; - } elsif (/(\w+)_PROTOCOL_VERSION\s*=\s*(\d+)\s*;/) { + } elsif (/(?:VIR_)?(\w+?)(?:_PROTOCOL)?_(?:PROGRAM|PROTOCOL)_VERSION\s*=\s*(\d+)\s*;/) { $funcs{lc $1}->{version} = $2; - } elsif (/(\w+)_PROC_(.*?)\s+=\s+(\d+)/) { + } elsif (/(?:VIR_)?(\w+?)(?:_PROTOCOL)?_PROC_(.*?)\s+=\s+(\d+)/) { $funcs{lc $1}->{progs}->[$3] = lc $2; } } -- 1.8.1.4

2 1

[libvirt] Race/broken mutex when closing a connection
by Viktor Mihajlovski 13 Mar '13

13 Mar '13

I received a report of a virsh coredump that happened on a heavy loaded system. Debugging the corefile I saw that under certain circumstances the mutex for a connection can be destroyed while another thread is waiting for the lock on that connection. Specifically this seems to happen when vshDeinit is called after the completion of vshRunCommand and at the same time the event loop is receiving a client disconnect. vshDeinit calls virConnectClose which unrefs the connection object destroying the lock mutex before releasing the memory and nulling the callback pointers. At the same time the event loop will call remoteClientCloseFunc which waits for the mutex while the connection is unrefed. It will obtain the (now invalid but non-error checking) mutex, copy the closeCallback pointer (shorty before the connection object is destroyed) and will die upon trying to call closeFreeCallback (NULL by now). First I would like to see whether someone finds an obvious flaw in my reasoning. Then I'd would like to discuss how to get around it. One thought would be to increase the refcount of the connection object in remoteClientCloseFunc before calling the closeCallback. -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martina Köderitz Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 1

[libvirt] [PATCHv5 0/3] DEVICE_DELETED event
by Michael S. Tsirkin 13 Mar '13

13 Mar '13

libvirt has a long-standing bug: when removing the device, it can request removal but does not know when the removal completes. Add an event so we can fix this in a robust way. First patch only adds the event for devices with ID, second path adds it for all devices and adds a path fields. Split this way for ease of backport (stable downstreams without QOM would want to only take the first patch), and also because the 2nd/3rd patches might turn out to be more controversial - if they really turn out such I'd like just the 1st one to get applied while we discuss 2 and 3. Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Changes from v4: - Add extra triggers and extra fields as requested by Markus Changes from v3: - Document that we only emit events for devices with and ID, as suggested by Markus Changes from v2: - move event toward the end of device_unparent, so that parents are reported after their children, as suggested by Paolo Changes from v1: - move to device_unparent - address comments by Andreas and Eric -- Anthony Liguori Michael S. Tsirkin (3): qdev: DEVICE_DELETED event qom: pass original path to unparent method qmp: add path to device_deleted event QMP/qmp-events.txt | 18 ++++++++++++++++++ hw/qdev.c | 15 +++++++++++++-- include/monitor/monitor.h | 1 + include/qom/object.h | 3 ++- monitor.c | 1 + qapi-schema.json | 4 +++- qom/object.c | 4 +++- 7 files changed, 41 insertions(+), 5 deletions(-) -- MST

2 5

Re: [libvirt] if_bridge.h: include in6.h for struct in6_addr use
by Thomas Backlund 13 Mar '13

13 Mar '13

Thomas Backlund skrev 13.1.2013 20:38: > patch both inline and attached as thunderbird tends to mess up ... > ----- > > if_bridge.h uses struct in6_addr ip6; but does not include the in6.h > header. > > Found by trying to build libvirt and connman against 3.8-rc3 headers. > Ok, ignore this patch, it's not the correct fix as it introduces redefinitions... Btw, the error that I hit that made me suggest this fix was libvirt config check bailing out: config.log:/usr/include/linux/if_bridge.h:173:20: error: field 'ip6' has incomplete type > Reported-by: Colin Guthrie <colin(a)mageia.org> > Reported-by: Christiaan Welvaart <cjw(a)daneel.dyndns.org> > Signed-off-by: Thomas Backlund <tmb(a)mageia.org> > > -- > > diff -Nurp linux-3.8-rc3/include/uapi/linux/if_bridge.h > linux-3.8-rc3.fix/include/uapi/linux/if_bridge.h > --- linux-3.8-rc3/include/uapi/linux/if_bridge.h 2013-01-13 > 20:09:54.257271755 +0200 > +++ linux-3.8-rc3.fix/include/uapi/linux/if_bridge.h 2013-01-13 > 20:15:04.153676151 +0200 > @@ -14,6 +14,7 @@ > #define _UAPI_LINUX_IF_BRIDGE_H > > #include <linux/types.h> > +#include <linux/in6.h> > > #define SYSFS_BRIDGE_ATTR "bridge" > #define SYSFS_BRIDGE_FDB "brforward" > > > ----- > Thomas > -- Thomas

9 14

[libvirt] understanding managedsave
by Nicolas Sebrecht 13 Mar '13

13 Mar '13

Hi, I'm trying to understand how the managedsave and restoration features work at the libvirt/qemu level. I'd like to write a little python script to reproduce the feature to learn how it works. So, I start a kvm guest by hand with qemu-kvm [...] -qmp tcp:localhost:4444,server and connect to the QMP with telnet or the qemu qmp-shell for my tests. >From what I've read, libvirt internally does a migration to a file: qemuDomainSaveMemory() -> qemuMonitorToFile() -> qemuMonitorMigrateToFd(). Why do a migration instead of QMP stop/memsave? What whould be the whole QMP/Monitor sequence of commands to handle the process? -- Nicolas Sebrecht

2 2

[libvirt] [PATCH] Apply security label when entering LXC namespaces
by Daniel P. Berrange 13 Mar '13

13 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Add a new virDomainLxcEnterSecurityLabel() function as a counterpart to virDomainLxcEnterNamespaces(), which can change the current calling process to have a new security context. This call runs client side, not in libvirtd so we can't use the security driver infrastructure. When entering a namespace, the process spawned from virsh will default to running with the security label of virsh. The actual desired behaviour is to run with the security label of the container most of the time. So this changes virsh lxc-enter-namespace command to invoke the virDomainLxcEnterSecurityLabel method. The current behaviour is: LABEL PID TTY TIME CMD system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 1 pts/0 00:00:00 systemd system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 3 pts/1 00:00:00 sh system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 24 ? 00:00:00 systemd-journal system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 29 ? 00:00:00 dhclient staff_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 47 ? 00:00:00 ps Note the ps command is running as unconfined_t, After this patch, The new behaviour is this: virsh -c lxc:/// lxc-enter-namespace dan -- /bin/ps -eZ LABEL PID TTY TIME CMD system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 1 pts/0 00:00:00 systemd system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 3 pts/1 00:00:00 sh system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 24 ? 00:00:00 systemd-journal system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 32 ? 00:00:00 dhclient system_u:system_r:svirt_lxc_net_t:s0:c0.c1023 38 ? 00:00:00 ps The '--noseclabel' flag can be used to skip security labelling. --- include/libvirt/libvirt-lxc.h | 4 ++ python/generator.py | 1 + src/libvirt-lxc.c | 96 +++++++++++++++++++++++++++++++++++++++++++ tools/virsh-domain.c | 32 +++++++++++++++ 4 files changed, 133 insertions(+) diff --git a/include/libvirt/libvirt-lxc.h b/include/libvirt/libvirt-lxc.h index f2c87fb..5021813 100644 --- a/include/libvirt/libvirt-lxc.h +++ b/include/libvirt/libvirt-lxc.h @@ -42,6 +42,10 @@ int virDomainLxcEnterNamespace(virDomainPtr domain, unsigned int *noldfdlist, int **oldfdlist, unsigned int flags); +int virDomainLxcEnterSecurityLabel(virSecurityModelPtr model, + virSecurityLabelPtr label, + virSecurityLabelPtr oldlabel, + unsigned int flags); # ifdef __cplusplus } diff --git a/python/generator.py b/python/generator.py index 8236bd2..6a25c2d 100755 --- a/python/generator.py +++ b/python/generator.py @@ -557,6 +557,7 @@ skip_function = ( lxc_skip_function = ( "virDomainLxcEnterNamespace", + "virDomainLxcEnterSecurityLabel", ) qemu_skip_function = ( #"virDomainQemuAttach", diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index f580c3c..c1bf168 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -29,6 +29,9 @@ #include "virlog.h" #include "virprocess.h" #include "datatypes.h" +#ifdef WITH_SELINUX +#include <selinux/selinux.h> +#endif #define VIR_FROM_THIS VIR_FROM_NONE @@ -163,3 +166,96 @@ error: virDispatchError(domain->conn); return -1; } + + +/** + * virDomainLxcEnterSecurityLabel: + * @model: the security model to set + * @label: the security label to apply + * @oldlabel: filled with old security label + * @flags: currently unused, pass 0 + * + * This API is LXC specific, so it will only work with hypervisor + * connections to the LXC driver. + * + * Attaches the process to the security label specified + * by @label. @label is interpreted relative to @model + * Depending on the security driver, this may + * not take effect until the next call to exec(). + * + * If @oldlabel is not NULL, it will be filled with info + * about the current security label. This may let the + * process be moved back to the previous label if no + * exec() has yet been performed. + * + * Returns 0 on success, -1 on error + */ +int +virDomainLxcEnterSecurityLabel(virSecurityModelPtr model, + virSecurityLabelPtr label, + virSecurityLabelPtr oldlabel, + unsigned int flags) +{ + virCheckFlagsGoto(0, error); + + virCheckNonNullArgGoto(model, error); + virCheckNonNullArgGoto(label, error); + + if (oldlabel) + memset(oldlabel, 0, sizeof(*oldlabel)); + + if (STREQ(model->model, "selinux")) { +#ifdef WITH_SELINUX + if (oldlabel) { + security_context_t ctx; + + if (getcon(&ctx) < 0) { + virReportSystemError(errno, + _("unable to get PID %d security context"), + getpid()); + goto error; + } + + if (strlen((char *) ctx) >= VIR_SECURITY_LABEL_BUFLEN) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("security label exceeds " + "maximum length: %d"), + VIR_SECURITY_LABEL_BUFLEN - 1); + freecon(ctx); + goto error; + } + + strcpy(oldlabel->label, (char *) ctx); + freecon(ctx); + + if ((oldlabel->enforcing = security_getenforce()) < 0) { + virReportSystemError(errno, "%s", + _("error calling security_getenforce()")); + goto error; + } + } + + if (setexeccon(label->label) < 0) { + virReportSystemError(errno, + _("Cannot set context %s"), + label->label); + goto error; + } +#else + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("Support for SELinux is not enabled")); + goto error; +#endif + } else { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, + _("Security model %s cannot be entered"), + model->model); + goto error; + } + + return 0; + +error: + virDispatchError(NULL); + return -1; +} diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7caa364..f85e74d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7992,6 +7992,7 @@ static const vshCmdInfo info_lxc_enter_namespace[] = { static const vshCmdOptDef opts_lxc_enter_namespace[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"noseclabel", VSH_OT_BOOL, 0, N_("Do not change process security label")}, {"cmd", VSH_OT_ARGV, VSH_OFLAG_REQ, N_("namespace")}, {NULL, 0, 0, NULL} }; @@ -8008,11 +8009,17 @@ cmdLxcEnterNamespace(vshControl *ctl, const vshCmd *cmd) int nfdlist; int *fdlist; size_t i; + bool setlabel = true; + virSecurityModelPtr secmodel = NULL; + virSecurityLabelPtr seclabel = NULL; dom = vshCommandOptDomain(ctl, cmd, NULL); if (dom == NULL) goto cleanup; + if (vshCommandOptBool(cmd, "noseclabel")) + setlabel = false; + while ((opt = vshCommandOptArgv(cmd, opt))) { if (VIR_EXPAND_N(cmdargv, ncmdargv, 1) < 0) { vshError(ctl, _("%s: %d: failed to allocate argv"), @@ -8029,12 +8036,35 @@ cmdLxcEnterNamespace(vshControl *ctl, const vshCmd *cmd) if ((nfdlist = virDomainLxcOpenNamespace(dom, &fdlist, 0)) < 0) goto cleanup; + if (setlabel) { + fprintf(stderr, "Getr sec\n"); + if (VIR_ALLOC(secmodel) < 0) { + vshError(ctl, "%s", _("Failed to allocate security model")); + goto cleanup; + } + if (VIR_ALLOC(seclabel) < 0) { + vshError(ctl, "%s", _("Failed to allocate security label")); + goto cleanup; + } + if (virNodeGetSecurityModel(ctl->conn, secmodel) < 0) + goto cleanup; + if (virDomainGetSecurityLabel(dom, seclabel) < 0) + goto cleanup; + } + /* Fork once because we don't want to affect * virsh's namespace itself */ if (virFork(&pid) < 0) goto cleanup; if (pid == 0) { + if (setlabel && + virDomainLxcEnterSecurityLabel(secmodel, + seclabel, + NULL, + 0) < 0) + _exit(255); + if (virDomainLxcEnterNamespace(dom, nfdlist, fdlist, @@ -8067,6 +8097,8 @@ cmdLxcEnterNamespace(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: + VIR_FREE(seclabel); + VIR_FREE(secmodel); if (dom) virDomainFree(dom); VIR_FREE(cmdargv); -- 1.8.1.4

3 3

[libvirt] [PATCH] Fix query of LXC security label
by Daniel P. Berrange 13 Mar '13

13 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virDomainGetSecurityLabel method is currently (mistakenly) showing the label of the libvirt_lxc process: ...snip... Security model: selinux Security DOI: 0 Security label: system_u:system_r:virtd_t:s0-s0:c0.c1023 (permissive) when it should be showing the init process label ...snip... Security model: selinux Security DOI: 0 Security label: system_u:system_r:svirt_t:s0:c724,c995 (permissive) --- src/lxc/lxc_driver.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 338b8eb..7791966 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1162,8 +1162,16 @@ static int lxcDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr secla * LXC monitor hasn't seen SIGHUP/ERR on poll(). */ if (virDomainObjIsActive(vm)) { + virLXCDomainObjPrivatePtr priv = vm->privateData; + + if (!priv->initpid) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Init pid is not yet available")); + goto cleanup; + } + if (virSecurityManagerGetProcessLabel(driver->securityManager, - vm->def, vm->pid, seclabel) < 0) { + vm->def, priv->initpid, seclabel) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to get security label")); goto cleanup; -- 1.8.1.4

2 1