- Devel - libvirt List Archives

[libvirt] [v2 PATCH] add 802.1Qbh handling for port-profiles based on Stefan's previous patches
by Scott Feldman 25 May '10

25 May '10

From: Scott Feldman <scofeldm(a)cisco.com> This patch builds on the work recently posted by Stefan Berger. It builds on top of Stefan's two posted patches: [PATCH v8] vepa: parsing for 802.1Qb{g|h} XML [RFC][PATCH 1/3] vepa+vsi: Introduce dependency on libnl Stefan's patches 2/3 and 3/3 are incorporated into my patch. Changes from v1 to v2: - Add Stefan's code for getPortProfileStatus - Poll for up to 2 secs for port-profile status, at 1/8 sec intervals: - if status indicates error, abort openMacvtapTap - if status indicates success, exit polling - if status is "in-progress" after 2 secs of polling, exit polling loop silently, without error My patch finishes out the 802.1Qbh parts, which Stefan had mostly complete. I've tested using the recent kernel updates for VF_PORT netlink msgs and enic for Cisco's 10G Ethernet NIC. I tested many VMs, each with several direct interfaces, each configured with a port-profile per the XML. VM-to-VM, and VM-to-external work as expected. VM-to-VM on same host (using same NIC) works same as VM-to-VM where VMs are on diff hosts. I'm able to change settings on the port-profile while the VM is running to change the virtual port behaviour. For example, adjusting a QoS setting like rate limit. All VMs with interfaces using that port-profile immediatly see the effect of the change to the port-profile. I don't have a SR-IOV device to test so source dev is a non-SR-IOV device, but most of the code paths include support for specifing the source dev and VF index. We'll need to complete this by discovering the PF given the VF linkdev. Once we have the PF, we'll also have the VF index. All this info- mation is available from sysfs. Signed-off-by: Scott Feldman <scofeldm(a)cisco.com> --- configure.ac | 16 + src/util/macvtap.c | 778 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 778 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 36ba703..885b0ae 100644 --- a/configure.ac +++ b/configure.ac @@ -2005,13 +2005,26 @@ if test "$with_macvtap" != "no" ; then fi AM_CONDITIONAL([WITH_MACVTAP], [test "$with_macvtap" = "yes"]) +AC_TRY_COMPILE([ #include <sys/socket.h> + #include <linux/rtnetlink.h> ], + [ int x = IFLA_PORT_MAX; ], + [ with_virtualport=yes ], + [ with_virtualport=no ]) +if test "$with_virtualport" = "yes"; then + val=1 +else + val=0 +fi +AC_DEFINE_UNQUOTED([WITH_VIRTUALPORT], $val, [whether vsi vepa support is enabled]) +AM_CONDITIONAL([WITH_VIRTUALPORT], [test "$with_virtualport" = "yes"]) + dnl netlink library LIBNL_CFLAGS="" LIBNL_LIBS="" -if test "$with_macvtap" = "yes"; then +if test "$with_macvtap" = "yes" || "$with_virtualport" = "yes"; then PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ ], [ AC_MSG_ERROR([libnl >= $LIBNL_REQUIRED is required for macvtap support]) @@ -2084,6 +2097,7 @@ AC_MSG_NOTICE([ Network: $with_network]) AC_MSG_NOTICE([Libvirtd: $with_libvirtd]) AC_MSG_NOTICE([ netcf: $with_netcf]) AC_MSG_NOTICE([ macvtap: $with_macvtap]) +AC_MSG_NOTICE([virtport: $with_virtualport]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index da81447..9ecc7f1 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -27,7 +27,7 @@ #include <config.h> -#if WITH_MACVTAP +#if WITH_MACVTAP || WITH_VIRTUALPORT # include <stdio.h> # include <errno.h> @@ -41,6 +41,8 @@ # include <linux/rtnetlink.h> # include <linux/if_tun.h> +# include <netlink/msg.h> + # include "util.h" # include "memory.h" # include "logging.h" @@ -58,15 +60,24 @@ # define MACVTAP_NAME_PREFIX "macvtap" # define MACVTAP_NAME_PATTERN "macvtap%d" +# define MICROSEC_PER_SEC (1000 * 1000) + static int associatePortProfileId(const char *macvtap_ifname, + const char *linkdev, const virVirtualPortProfileDefPtr virtPort, - int vf, - const unsigned char *vmuuid); + const unsigned char *vmuuid, + const unsigned char *hostuuid); static int disassociatePortProfileId(const char *macvtap_ifname, + const char *linkdev, const virVirtualPortProfileDefPtr virtPort); +enum virVirtualPortOp { + ASSOCIATE = 0x1, + DISASSOCIATE = 0x2, +}; + static int nlOpen(void) { @@ -159,6 +170,169 @@ err_exit: } +# ifdef IFLA_VF_PORT_MAX + +/** + * nlCommWaitSuccess: + * + * @nlmsg: pointer to netlink message + * @nl_grousp: the netlink multicast groups to send to + * @respbuf: pointer to pointer where response buffer will be allocated + * @respbuflen: pointer to integer holding the size of the response buffer + * on return of the function. + * @to_usecs: timeout in microseconds to wait for a success message + * to be returned + * + * Send the given message to the netlink multicast group and receive + * responses. Skip responses indicating an error and keep on receiving + * responses until a success response is returned. + * Returns 0 on success, -1 on error. In case of error, no response + * buffer will be returned. + */ +static int +nlCommWaitSuccess(struct nlmsghdr *nlmsg, int nl_groups, + char **respbuf, int *respbuflen, long to_usecs) +{ + int rc = 0; + struct sockaddr_nl nladdr = { + .nl_family = AF_NETLINK, + .nl_pid = getpid(), + .nl_groups = nl_groups, + }; + int rcvChunkSize = 1024; // expecting less than that + int rcvoffset = 0; + ssize_t nbytes; + int n; + struct timeval tv = { + .tv_sec = to_usecs / MICROSEC_PER_SEC, + .tv_usec = to_usecs % MICROSEC_PER_SEC, + }; + fd_set rfds; + bool gotvalid = false; + int fd = nlOpen(); + static uint32_t seq = 0x1234; + uint32_t myseq = seq++; + uint32_t mypid = getpid(); + + if (fd < 0) + return -1; + + nlmsg->nlmsg_pid = mypid; + nlmsg->nlmsg_seq = myseq; + nlmsg->nlmsg_flags |= NLM_F_ACK; + + nbytes = sendto(fd, (void *)nlmsg, nlmsg->nlmsg_len, 0, + (struct sockaddr *)&nladdr, sizeof(nladdr)); + if (nbytes < 0) { + virReportSystemError(errno, + "%s", _("cannot send to netlink socket")); + rc = -1; + goto err_exit; + } + fprintf(stderr,"sent %d bytes\n", (int)nbytes); + + while (!gotvalid) { + rcvoffset = 0; + while (1) { + socklen_t addrlen = sizeof(nladdr); + + if (VIR_REALLOC_N(*respbuf, rcvoffset+rcvChunkSize) < 0) { + virReportOOMError(); + rc = -1; + goto err_exit; + } + + FD_ZERO(&rfds); + FD_SET(fd, &rfds); + + n = select(fd + 1, &rfds, NULL, NULL, &tv); + if (n == 0) { + fprintf(stderr,"Select timed out.\n"); + rc = -1; + goto err_exit; + } + + nbytes = recvfrom(fd, &((*respbuf)[rcvoffset]), rcvChunkSize, 0, + (struct sockaddr *)&nladdr, &addrlen); + fprintf(stderr,"got something... %d bytes\n",(int)nbytes); + if (nbytes < 0) { + if (errno == EAGAIN || errno == EINTR) + continue; + virReportSystemError(errno, "%s", + _("error receiving from netlink socket")); + rc = -1; + goto err_exit; + } + rcvoffset += nbytes; + break; + } + *respbuflen = rcvoffset; + + /* check message for error */ + if (*respbuflen > NLMSG_LENGTH(0) && *respbuf != NULL) { + struct nlmsghdr *resp = (struct nlmsghdr *)*respbuf; + struct nlmsgerr *err; + + fprintf(stderr,"resp->nlmsg_type=%d\n", resp->nlmsg_type); + fprintf(stderr,"resp->nlmsg_flags=0x%x\n", resp->nlmsg_flags); + fprintf(stderr,"resp->nlmsg_seq=%d (%d)\n", resp->nlmsg_seq, myseq); + fprintf(stderr,"resp->nlmsg_pid=%d (%d)\n", resp->nlmsg_pid, mypid); + + if (resp->nlmsg_pid != mypid || + resp->nlmsg_seq != myseq) + continue; + + /* skip reflected message */ + if (resp->nlmsg_type & 0x10) + continue; + + switch (resp->nlmsg_type) { + case NLMSG_ERROR: + err = (struct nlmsgerr *)NLMSG_DATA(resp); + if (resp->nlmsg_len >= NLMSG_LENGTH(sizeof(*err))) { + fprintf(stderr,"error %d\n", -err->error); + if (-err->error != EOPNOTSUPP) { + /* assuming error msg from daemon */ + fprintf(stderr,"Got error %d, but assuming its response from lldpad: len = %d\n", + -err->error, + *respbuflen); + gotvalid = true; + break; + } + } + /* whatever this is, skip it */ + VIR_FREE(*respbuf); + *respbuf = NULL; + *respbuflen = 0; + fprintf(stderr,"Skipping error resp. msg.\n"); + break; + + case NLMSG_DONE: + gotvalid = true; + break; + + default: + VIR_FREE(*respbuf); + *respbuf = NULL; + *respbuflen = 0; + break; + } + } + } + +err_exit: + if (rc == -1) { + VIR_FREE(*respbuf); + *respbuf = NULL; + *respbuflen = 0; + } + + nlClose(fd); + return rc; +} + +#endif + static struct rtattr * rtattrCreate(char *buffer, int bufsize, int type, const void *data, int datalen) @@ -204,6 +378,8 @@ nlAppend(struct nlmsghdr *nlm, int totlen, const void *data, int datalen) } +# if WITH_MACVTAP + static int link_add(const char *type, const unsigned char *macaddress, int macaddrsize, @@ -651,9 +827,10 @@ create_name: } if (associatePortProfileId(cr_ifname, + net->data.direct.linkdev, &net->data.direct.virtPortProfile, - -1, - vmuuid) != 0) { + vmuuid, + NULL /* hostuuid */) != 0) { rc = -1; goto link_del_exit; } @@ -685,6 +862,7 @@ create_name: disassociate_exit: disassociatePortProfileId(cr_ifname, + net->data.direct.linkdev, &net->data.direct.virtPortProfile); link_del_exit: @@ -707,21 +885,572 @@ delMacvtap(virDomainNetDefPtr net) { if (net->ifname) { disassociatePortProfileId(net->ifname, + net->data.direct.linkdev, &net->data.direct.virtPortProfile); link_del(net->ifname); } } -#endif +# endif + + +# ifdef IFLA_PORT_MAX + +static struct nla_policy ifla_policy[IFLA_MAX + 1] = +{ + [IFLA_VF_PORTS] = { .type = NLA_NESTED }, +}; + +static struct nla_policy ifla_vf_ports_policy[IFLA_VF_PORT_MAX + 1] = +{ + [IFLA_VF_PORT] = { .type = NLA_NESTED }, +}; + +static struct nla_policy ifla_port_policy[IFLA_PORT_MAX + 1] = +{ + [IFLA_PORT_RESPONSE] = { .type = NLA_U16 }, +}; + + +static int +link_dump(int ifindex, const char *ifname, struct nlattr **tb, + char **recvbuf) +{ + int rc = 0; + char nlmsgbuf[256] = { 0, }; + struct nlmsghdr *nlm = (struct nlmsghdr *)nlmsgbuf, *resp; + struct nlmsgerr *err; + char rtattbuf[64]; + struct rtattr *rta; + struct ifinfomsg i = { + .ifi_family = AF_UNSPEC, + .ifi_index = ifindex + }; + int recvbuflen; + + *recvbuf = NULL; + + nlInit(nlm, NLM_F_REQUEST, RTM_GETLINK); + + if (!nlAppend(nlm, sizeof(nlmsgbuf), &i, sizeof(i))) + goto buffer_too_small; + + if (ifindex < 0 && ifname != NULL) { + rta = rtattrCreate(rtattbuf, sizeof(rtattbuf), IFLA_IFNAME, + ifname, strlen(ifname) + 1); + if (!rta) + goto buffer_too_small; + + if (!nlAppend(nlm, sizeof(nlmsgbuf), rtattbuf, rta->rta_len)) + goto buffer_too_small; + } + + if (nlComm(nlm, recvbuf, &recvbuflen) < 0) + return -1; + + if (recvbuflen < NLMSG_LENGTH(0) || *recvbuf == NULL) + goto malformed_resp; + + resp = (struct nlmsghdr *)*recvbuf; + + switch (resp->nlmsg_type) { + case NLMSG_ERROR: + err = (struct nlmsgerr *)NLMSG_DATA(resp); + if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) + goto malformed_resp; + + switch (-err->error) { + case 0: + break; + + default: + virReportSystemError(-err->error, + _("error dumping %d interface"), + ifindex); + rc = -1; + } + break; + + case GENL_ID_CTRL: + case NLMSG_DONE: + if (nlmsg_parse(resp, sizeof(struct ifinfomsg), + tb, IFLA_MAX, ifla_policy)) { + goto malformed_resp; + } + break; + + default: + goto malformed_resp; + } + + if (rc != 0) + VIR_FREE(*recvbuf); + + return rc; + +malformed_resp: + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + VIR_FREE(*recvbuf); + return -1; + +buffer_too_small: + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("internal buffer is too small")); + return -1; +} + + +static int +getPortProfileStatus(struct nlattr **tb, int32_t vf, uint16_t *status) +{ + int rc = 1; + const char *msg = NULL; + struct nlattr *tb2[IFLA_VF_PORT_MAX + 1], + *tb3[IFLA_PORT_MAX+1]; + + if (vf == PORT_SELF_VF) { + if (tb[IFLA_PORT_SELF]) { + if (nla_parse_nested(tb3, IFLA_PORT_MAX, tb[IFLA_PORT_SELF], + ifla_port_policy)) { + msg = _("error parsing nested IFLA_VF_PORT part"); + goto err_exit; + } + } + } else { + if (tb[IFLA_VF_PORTS]) { + if (nla_parse_nested(tb2, IFLA_VF_PORT_MAX, tb[IFLA_VF_PORTS], + ifla_vf_ports_policy)) { + msg = _("error parsing nested IFLA_VF_PORTS part"); + goto err_exit; + } + if (tb2[IFLA_VF_PORT]) { + if (nla_parse_nested(tb3, IFLA_PORT_MAX, tb2[IFLA_VF_PORT], + ifla_port_policy)) { + msg = _("error parsing nested IFLA_VF_PORT part"); + goto err_exit; + } + } + } + } + + if (tb3[IFLA_PORT_RESPONSE]) { + *status = *(uint16_t *)RTA_DATA(tb3[IFLA_PORT_RESPONSE]); + rc = 0; + } else { + msg = _("no IFLA_PORT_RESPONSE found in netlink message"); + goto err_exit; + } + +err_exit: + if (msg) + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", msg); + + return rc; +} + + +static int +doPortProfileOpSetLink(bool multicast, + const char *ifname, int ifindex, + const char *profileId, + struct ifla_port_vsi *portVsi, + const unsigned char *instanceId, + const unsigned char *hostUUID, + int32_t vf, + uint8_t op) +{ + int rc = 0; + char nlmsgbuf[256]; + struct nlmsghdr *nlm = (struct nlmsghdr *)nlmsgbuf, *resp; + struct nlmsgerr *err; + char rtattbuf[64]; + struct rtattr *rta, *vfports, *vfport; + struct ifinfomsg ifinfo = { + .ifi_family = AF_UNSPEC, + .ifi_index = ifindex, + }; + char *recvbuf = NULL; + int recvbuflen = 0; + + memset(&nlmsgbuf, 0, sizeof(nlmsgbuf)); + + nlInit(nlm, NLM_F_REQUEST, RTM_SETLINK); + + if (!nlAppend(nlm, sizeof(nlmsgbuf), &ifinfo, sizeof(ifinfo))) + goto buffer_too_small; + + if (vf == PORT_SELF_VF) { + rta = rtattrCreate(rtattbuf, sizeof(rtattbuf), IFLA_PORT_SELF, NULL, 0); + } else { + rta = rtattrCreate(rtattbuf, sizeof(rtattbuf), IFLA_VF_PORTS, NULL, 0); + if (!rta) + goto buffer_too_small; + + if (!(vfports = nlAppend(nlm, sizeof(nlmsgbuf), + rtattbuf, rta->rta_len))) + goto buffer_too_small; + + /* beging nesting vfports */ + rta = rtattrCreate(rtattbuf, sizeof(rtattbuf), IFLA_VF_PORT, NULL, 0); + } + + if (!rta) + goto buffer_too_small; + + if (!(vfport = nlAppend(nlm, sizeof(nlmsgbuf), rtattbuf, rta->rta_len))) + goto buffer_too_small; + + if (profileId) { + rta = rtattrCreate(rtattbuf, sizeof(rtattbuf), IFLA_PORT_PROFILE, + profileId, strlen(profileId) + 1); + if (!rta) + goto buffer_too_small; + + if (!nlAppend(nlm, sizeof(nlmsgbuf), rtattbuf, rta->rta_len)) + goto buffer_too_small; + } + + if (portVsi) { + rta = rtattrCreate(rtattbuf, sizeof(rtattbuf), IFLA_PORT_VSI_TYPE, + portVsi, sizeof(*portVsi)); + if (!rta) + goto buffer_too_small; + + if (!nlAppend(nlm, sizeof(nlmsgbuf), rtattbuf, rta->rta_len)) + goto buffer_too_small; + } + + if (instanceId) { + rta = rtattrCreate(rtattbuf, sizeof(rtattbuf), IFLA_PORT_INSTANCE_UUID, + instanceId, VIR_UUID_BUFLEN); + if (!rta) + goto buffer_too_small; + + if (!nlAppend(nlm, sizeof(nlmsgbuf), rtattbuf, rta->rta_len)) + goto buffer_too_small; + } + + if (hostUUID) { + rta = rtattrCreate(rtattbuf, sizeof(rtattbuf), IFLA_PORT_HOST_UUID, + hostUUID, VIR_UUID_BUFLEN); + if (!rta) + goto buffer_too_small; + + if (!nlAppend(nlm, sizeof(nlmsgbuf), rtattbuf, rta->rta_len)) + goto buffer_too_small; + } + + if (vf != PORT_SELF_VF) { + rta = rtattrCreate(rtattbuf, sizeof(rtattbuf), IFLA_PORT_VF, + &vf, sizeof(vf)); + if (!rta) + goto buffer_too_small; + + if (!nlAppend(nlm, sizeof(nlmsgbuf), rtattbuf, rta->rta_len)) + goto buffer_too_small; + } + + rta = rtattrCreate(rtattbuf, sizeof(rtattbuf), IFLA_PORT_REQUEST, + &op, sizeof(op)); + if (!rta) + goto buffer_too_small; + + if (!nlAppend(nlm, sizeof(nlmsgbuf), rtattbuf, rta->rta_len)) + goto buffer_too_small; + + /* end nesting of vport */ + vfport->rta_len = (char *)nlm + nlm->nlmsg_len - (char *)vfport; + + if (vf != PORT_SELF_VF) { + /* end nesting of vfports */ + vfports->rta_len = (char *)nlm + nlm->nlmsg_len - (char *)vfports; + } + + if (!multicast) { + if (nlComm(nlm, &recvbuf, &recvbuflen) < 0) + return -1; + } else { + if (nlCommWaitSuccess(nlm, RTMGRP_LINK, &recvbuf, &recvbuflen, + 5 * MICROSEC_PER_SEC) < 0) + return -1; + } + + if (recvbuflen < NLMSG_LENGTH(0) || recvbuf == NULL) + goto malformed_resp; + + resp = (struct nlmsghdr *)recvbuf; + + switch (resp->nlmsg_type) { + case NLMSG_ERROR: + err = (struct nlmsgerr *)NLMSG_DATA(resp); + if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) + goto malformed_resp; + + switch (-err->error) { + case 0: + break; + + default: + virReportSystemError(-err->error, + _("error during virtual port configuration of %s interface"), ifname); + rc = -1; + } + break; + + case NLMSG_DONE: + break; + + default: + goto malformed_resp; + } + + VIR_FREE(recvbuf); + + return rc; + +malformed_resp: + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + VIR_FREE(recvbuf); + return -1; + +buffer_too_small: + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("internal buffer is too small")); + return -1; +} + + +static int +doPortProfileOpCommon(bool multicast, + const char *ifname, int ifindex, + const char *profileId, + struct ifla_port_vsi *portVsi, + const unsigned char *instanceId, + const unsigned char *hostUUID, + int32_t vf, + uint8_t op) +{ + int rc; + char *recvbuf = NULL; + struct nlattr *tb[IFLA_MAX + 1]; + int repeats = 16; + uint16_t status; + + rc = doPortProfileOpSetLink(multicast, + ifname, ifindex, + profileId, + portVsi, + instanceId, + hostUUID, + vf, + op); + + if (rc != 0) { + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("sending of PortProfileRequest failed.\n")); + return rc; + } + + if (!multicast) { + while (--repeats) { + rc = link_dump(ifindex, ifname, tb, &recvbuf); + if (rc) + goto err_exit; + rc = getPortProfileStatus(tb, vf, &status); + if (rc == 0) { + if (status == PORT_PROFILE_RESPONSE_SUCCESS || + status == PORT_VDP_RESPONSE_SUCCESS) + break; + if (status != PORT_PROFILE_RESPONSE_INPROGRESS) + rc = 1; + } + usleep(125000); + + VIR_FREE(recvbuf); + } + } + +err_exit: + VIR_FREE(recvbuf); + + return rc; +} + +# endif /* IFLA_PORT_MAX */ + +static int +doPortProfileOp8021Qbg(const char *ifname, + const virVirtualPortProfileDefPtr virtPort, + int32_t vf, + enum virVirtualPortOp virtPortOp) +{ + int rc; + +# ifndef IFLA_VF_PORT_MAX + + (void)ifname; + (void)virtPort; + (void)vf; + (void)virtPortOp; + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Kernel VF Port support was missing at compile time.")); + rc = 1; +# else /* IFLA_VF_PORT_MAX */ + + int op = PORT_REQUEST_ASSOCIATE; + struct ifla_port_vsi portVsi = { + .vsi_mgr_id = virtPort->u.virtPort8021Qbg.managerID, + .vsi_type_version = virtPort->u.virtPort8021Qbg.typeIDVersion, + }; + bool multicast = true; + int ifindex; + + if (ifaceGetIndex(true, ifname, &ifindex) != 0) { + rc = 1; + goto err_exit; + } + + portVsi.vsi_type_id[2] = virtPort->u.virtPort8021Qbg.typeID >> 16; + portVsi.vsi_type_id[1] = virtPort->u.virtPort8021Qbg.typeID >> 8; + portVsi.vsi_type_id[0] = virtPort->u.virtPort8021Qbg.typeID; + + switch (virtPortOp) { + case ASSOCIATE: + op = PORT_REQUEST_ASSOCIATE; + break; + case DISASSOCIATE: + op = PORT_REQUEST_DISASSOCIATE; + break; + default: + macvtapError(VIR_ERR_INTERNAL_ERROR, + _("operation type %d not supported"), op); + rc = 1; + goto err_exit; + } + + rc = doPortProfileOpCommon(multicast, NULL, ifindex, + NULL, + &portVsi, + virtPort->u.virtPort8021Qbg.instanceID, + NULL, + vf, + op); + +err_exit: + +# endif /* IFLA_VF_PORT_MAX */ + + return rc; +} + + +static int +doPortProfileOp8021Qbh(const char *ifname, + const virVirtualPortProfileDefPtr virtPort, + int32_t vf, + const unsigned char *host_uuid, + const unsigned char *vm_uuid, + enum virVirtualPortOp virtPortOp) +{ + int rc; + +# ifndef IFLA_VF_PORT_MAX + + (void)ifname; + (void)virtPort; + (void)host_uuid; + (void)vm_uuid; + (void)virtPortOp; + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Kernel VF Port support was missing at compile time.")); + rc = 1; + +# else /* IFLA_VF_PORT_MAX */ + + int op = PORT_REQUEST_ASSOCIATE; + bool multicast = false; + int ifindex; + + if (ifaceGetIndex(true, ifname, &ifindex) != 0) { + rc = 1; + goto err_exit; + } + + switch (virtPortOp) { + case ASSOCIATE: + op = PORT_REQUEST_ASSOCIATE; + break; + case DISASSOCIATE: + op = PORT_REQUEST_DISASSOCIATE; + break; + default: + macvtapError(VIR_ERR_INTERNAL_ERROR, + _("operation type %d not supported"), op); + rc = 1; + goto err_exit; + } + + rc = doPortProfileOpCommon(multicast, ifname, ifindex, + virtPort->u.virtPort8021Qbh.profileID, + NULL, + vm_uuid, + host_uuid, + vf, + op); + + switch (virtPortOp) { + case ASSOCIATE: + ifaceUp(ifname); + break; + case DISASSOCIATE: + ifaceDown(ifname); + break; + } + +err_exit: + +# endif /* IFLA_VF_PORT_MAX */ + + return rc; +} + +static void +getPhysfn(const char *linkdev, + int32_t *vf, + char **physfndev) +{ + bool virtfn = false; + + if (virtfn) { + + // XXX: if linkdev is SR-IOV VF, then set vf = VF index + // XXX: and set linkdev = PF device + // XXX: need to use get_physical_function_linux() or + // XXX: something like that to get PF + // XXX: device and figure out VF index + + } else { + + /* Not SR-IOV VF: physfndev is linkdev and VF index + * refers to linkdev self + */ + + *vf = PORT_SELF_VF; + *physfndev = (char *)linkdev; + } +} /** * associatePortProfile * * @macvtap_ifname: The name of the macvtap device + * @linkdev: The link device in case of macvtap * @virtPort: pointer to the object holding port profile parameters - * @vf: virtual function number, -1 if to be ignored * @vmuuid : the UUID of the virtual machine + * @hostuuid : the UUID of the host machine * * Associate a port on a swtich with a profile. This function * may notify a kernel driver or an external daemon to run @@ -734,15 +1463,19 @@ delMacvtap(virDomainNetDefPtr net) */ static int associatePortProfileId(const char *macvtap_ifname, + const char *linkdev, const virVirtualPortProfileDefPtr virtPort, - int vf, - const unsigned char *vmuuid) + const unsigned char *vmuuid, + const unsigned char *hostuuid) { + char *physfndev; + int32_t vf; int rc = 0; + VIR_DEBUG("Associating port profile '%p' on link device '%s'", virtPort, macvtap_ifname); - (void)vf; - (void)vmuuid; + + getPhysfn(linkdev, &vf, &physfndev); switch (virtPort->virtPortType) { case VIR_VIRTUALPORT_NONE: @@ -750,11 +1483,14 @@ associatePortProfileId(const char *macvtap_ifname, break; case VIR_VIRTUALPORT_8021QBG: - + rc = doPortProfileOp8021Qbg(macvtap_ifname, virtPort, vf, + ASSOCIATE); break; case VIR_VIRTUALPORT_8021QBH: - + rc = doPortProfileOp8021Qbh(physfndev, virtPort, vf, + hostuuid, vmuuid, + ASSOCIATE); break; } @@ -766,6 +1502,7 @@ associatePortProfileId(const char *macvtap_ifname, * disassociatePortProfile * * @macvtap_ifname: The name of the macvtap device + * @linkdev: The link device in case of macvtap * @virtPort: point to object holding port profile parameters * * Returns 0 in case of success, != 0 otherwise with error @@ -773,25 +1510,36 @@ associatePortProfileId(const char *macvtap_ifname, */ static int disassociatePortProfileId(const char *macvtap_ifname, + const char *linkdev, const virVirtualPortProfileDefPtr virtPort) { + char *physfndev; + int32_t vf; int rc = 0; + VIR_DEBUG("Disassociating port profile id '%p' on link device '%s' ", virtPort, macvtap_ifname); + getPhysfn(linkdev, &vf, &physfndev); + switch (virtPort->virtPortType) { case VIR_VIRTUALPORT_NONE: case VIR_VIRTUALPORT_TYPE_LAST: break; case VIR_VIRTUALPORT_8021QBG: - + rc = doPortProfileOp8021Qbg(macvtap_ifname, virtPort, vf, + DISASSOCIATE); break; case VIR_VIRTUALPORT_8021QBH: - + rc = doPortProfileOp8021Qbh(physfndev, virtPort, vf, + NULL, NULL, + DISASSOCIATE); break; } return rc; } + +#endif

3 2

[libvirt] [PATCH v2] Add host UUID (to libvirt capabilities)
by Stefan Berger 25 May '10

25 May '10

This patch adds the host UUID (to the capabilities of libvirt). The user may provide it in libvirtd.conf overriding whatever sysfs may return. If none or no valid UUID is provided in libvirtd.conf, reading the UUID from sysfs is attempted. If that function doesn't provide a valid (not all digits may be equal), generate a temporary one. virSetHostUUIDStr() should be called first with the UUID read from libvirtd.conf, but may only be called once. Subsequently the functions virGetHostUUID[Str]() can be called to get the UUID of the host. Changes from V1 to V2: - addressing comments from Daniel Berrange: - rewrite/ code to get the UUID from 2 possible sysfs files - got rid of dmidecide dependency - call the newly added virGetHostUUID() function in udevGetDMIData() to get the UUID of the host ( even if it's just a temporary UUID ) Besides that, this patch - adds uuid to the capabilties XML schema - displays the UUID in in 'virsh capabilities' - adds 3 public functions to uuid.h for setting and getting the UUID of the host This patch contains recycled code from Scott Feldman (getDMISystemUUID()). Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- daemon/libvirtd.c | 5 + src/conf/capabilities.c | 4 + src/util/uuid.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/uuid.h | 4 + 4 files changed, 139 insertions(+) Index: libvirt-acl/daemon/libvirtd.c =================================================================== --- libvirt-acl.orig/daemon/libvirtd.c +++ libvirt-acl/daemon/libvirtd.c @@ -57,6 +57,7 @@ #include "dispatch.h" #include "util.h" +#include "uuid.h" #include "remote_driver.h" #include "conf.h" #include "event.h" @@ -2718,6 +2719,7 @@ remoteReadConfigFile (struct qemud_serve char *unix_sock_rw_perms = NULL; char *unix_sock_group = NULL; char *buf = NULL; + char *host_uuid = NULL; #if HAVE_POLKIT /* Change the default back to no auth for non-root */ @@ -2840,6 +2842,10 @@ remoteReadConfigFile (struct qemud_serve GET_CONF_INT (conf, filename, max_requests); GET_CONF_INT (conf, filename, max_client_requests); + GET_CONF_STR (conf, filename, host_uuid); + virSetHostUUIDStr(host_uuid); + VIR_FREE(host_uuid); + virConfFree (conf); return 0; Index: libvirt-acl/src/util/uuid.h =================================================================== --- libvirt-acl.orig/src/util/uuid.h +++ libvirt-acl/src/util/uuid.h @@ -22,6 +22,10 @@ #ifndef __VIR_UUID_H__ # define __VIR_UUID_H__ +int virSetHostUUIDStr(const char *host_uuid); +int virGetHostUUID(unsigned char *host_uuid); +int virGetHostUUIDStr(char *host_uuid); + int virUUIDGenerate(unsigned char *uuid); int virUUIDParse(const char *uuidstr, Index: libvirt-acl/src/util/uuid.c =================================================================== --- libvirt-acl.orig/src/util/uuid.c +++ libvirt-acl/src/util/uuid.c @@ -38,11 +38,14 @@ #include "util.h" #include "virterror_internal.h" #include "logging.h" +#include "memory.h" #ifndef ENODATA # define ENODATA EIO #endif +static unsigned char host_uuid[VIR_UUID_BUFLEN]; + static int virUUIDGenerateRandomBytes(unsigned char *buf, int buflen) @@ -208,3 +211,134 @@ void virUUIDFormat(const unsigned char * uuid[12], uuid[13], uuid[14], uuid[15]); uuidstr[VIR_UUID_STRING_BUFLEN-1] = '\0'; } + + + +/** + * isValidHostUUID + * + * @uuid: The UUID to test + * + * Do some basic tests to check whether the given UUID is + * valid as a host UUID. + * Basic tests: + * - Not all of the digits may be equal + */ +static int +isValidHostUUID(unsigned char *uuid) +{ + unsigned int i, ctr = 1; + unsigned char c; + + if (!uuid) + return 0; + + c = uuid[0]; + + for (i = 1; i < VIR_UUID_BUFLEN; i++) + if (uuid[i] == c) + ctr++; + + return (ctr != VIR_UUID_BUFLEN); +} + +static int +getDMISystemUUID(char *uuid, int len) +{ + unsigned int i = 0; + const char *paths[] = { + "/sys/devices/virtual/dmi/id/product_uuid", + "/sys/class/dmi/id/product_uuid", + NULL + }; + + while (paths[i]) { + int fd = open(paths[i], O_RDONLY); + if (fd > 0) { + if (saferead(fd, uuid, len) == len) { + close(fd); + return 0; + } + close(fd); + } + i++; + } + + return -1; +} + + +/** + * setHostUUID + * + * @host_uuid: UUID that the host is supposed to have + * + * Set the UUID of the host if it hasn't been set, yet + * Returns 0 in case of success, an error code in case of error. + */ +int +virSetHostUUIDStr(const char *uuid) +{ + char dmiuuid[VIR_UUID_STRING_BUFLEN]; + + if (isValidHostUUID(host_uuid)) + return EEXIST; + + if (!uuid) { + if (!getDMISystemUUID(dmiuuid, sizeof(dmiuuid))) { + if (!virUUIDParse(dmiuuid, host_uuid)) { + return 0; + } + } + } else { + if (!virUUIDParse(uuid, host_uuid)) + return 0; + } + + if (!isValidHostUUID(host_uuid)) + return virUUIDGenerate(host_uuid); + return 0; +} + +/** + * getHostUUID: + * + * @host_uuid: memory to store the host_uuid into + * + * Get the UUID of the host. Returns 0 in case of success, + * an error code otherwise. + * Returns 0 in case of success, an error code in case of error. + */ +int virGetHostUUID(unsigned char *uuid) +{ + int ret = 0; + + if (!isValidHostUUID(host_uuid)) + ret = virSetHostUUIDStr(NULL); + + memcpy(uuid, host_uuid, sizeof(host_uuid)); + + return ret; +} + + +/** + * getHostUUID: + * + * @host_uuid: memory to store the host_uuid into + * + * Get the UUID of the host. Returns 0 in case of success, + * an error code otherwise. + * Returns 0 in case of success, an error code in case of error. + */ +int virGetHostUUIDStr(char *uuid) +{ + int ret = 0; + + if (!isValidHostUUID(host_uuid)) + ret = virSetHostUUIDStr(NULL); + + virUUIDFormat(host_uuid, uuid); + + return ret; +} Index: libvirt-acl/src/conf/capabilities.c =================================================================== --- libvirt-acl.orig/src/conf/capabilities.c +++ libvirt-acl/src/conf/capabilities.c @@ -27,6 +27,7 @@ #include "buf.h" #include "memory.h" #include "util.h" +#include "uuid.h" #include "cpu_conf.h" /** @@ -662,9 +663,12 @@ virCapabilitiesFormatXML(virCapsPtr caps { virBuffer xml = VIR_BUFFER_INITIALIZER; int i, j, k; + char host_uuid[VIR_UUID_STRING_BUFLEN]; + virGetHostUUIDStr(host_uuid); virBufferAddLit(&xml, "<capabilities>\n\n"); virBufferAddLit(&xml, " <host>\n"); + virBufferVSprintf(&xml," <uuid>%s</uuid>\n", host_uuid); virBufferAddLit(&xml, " <cpu>\n"); virBufferVSprintf(&xml, " <arch>%s</arch>\n", caps->host.arch); Index: libvirt-acl/docs/schemas/capability.rng =================================================================== --- libvirt-acl.orig/docs/schemas/capability.rng +++ libvirt-acl/docs/schemas/capability.rng @@ -18,6 +18,9 @@ <define name='hostcaps'> <element name='host'> + <element name='uuid'> + <ref name='UUID'/> + </element> <element name='cpu'> <element name='arch'> <ref name='archnames'/> @@ -349,4 +352,15 @@ <param name='pattern'>[a-zA-Z0-9\-_]+</param> </data> </define> + + <define name="UUID"> + <choice> + <data type="string"> + <param name="pattern">[a-fA-F0-9]{32}</param> + </data> + <data type="string"> + <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> + </data> + </choice> + </define> </grammar> Index: libvirt-acl/src/libvirt_private.syms =================================================================== --- libvirt-acl.orig/src/libvirt_private.syms +++ libvirt-acl/src/libvirt_private.syms @@ -708,6 +708,9 @@ usbDeviceFileIterate; virUUIDFormat; virUUIDGenerate; virUUIDParse; +virSetHostUUIDStr; +virGetHostUUID; +virGetHostUUIDStr; # virterror_internal.h Index: libvirt-acl/daemon/libvirtd.conf =================================================================== --- libvirt-acl.orig/daemon/libvirtd.conf +++ libvirt-acl/daemon/libvirtd.conf @@ -312,3 +312,12 @@ # e.g.: # log_outputs="3:syslog:libvirtd" # to log all warnings and errors to syslog under the libvirtd ident + +# UUID of the host: +# Provide the UUID of the host here in case the command +# 'dmidecode -s system-uuid' does not provide a valid uuid. In case +# 'dmidecode' does not provide a valid UUID and none is provided here, a +# temporary UUID will be generated. +# Keep the format of the example UUID below. + +#host_uuid = '8510b1a1-1afa-4da6-8111-785fae202c1d' Index: libvirt-acl/src/node_device/node_device_udev.c =================================================================== --- libvirt-acl.orig/src/node_device/node_device_udev.c +++ libvirt-acl/src/node_device/node_device_udev.c @@ -1473,12 +1473,8 @@ udevGetDMIData(union _virNodeDevCapData goto out; } - if (udevGetStringSysfsAttr(device, - "product_uuid", - &tmp) == PROPERTY_ERROR) { + if (virGetHostUUID(data->system.hardware.uuid)) goto out; - } - virUUIDParse(tmp, data->system.hardware.uuid); if (udevGetStringSysfsAttr(device, "bios_vendor",

4 5

[libvirt] [PATCH] build: fix cppi warnings
by Eric Blake 25 May '10

25 May '10

* src/util/bitmap.h (includes): Placate cppi. --- Pushing as obvious, to keep 'make syntax-check' happy. src/util/bitmap.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/bitmap.h b/src/util/bitmap.h index be897ff..08515d1 100644 --- a/src/util/bitmap.h +++ b/src/util/bitmap.h @@ -23,10 +23,10 @@ #ifndef __BITMAP_H__ # define __BITMAP_H__ -#include "internal.h" +# include "internal.h" -#include <stdbool.h> -#include <sys/types.h> +# include <stdbool.h> +# include <sys/types.h> typedef struct _virBitmap virBitmap; -- 1.7.0.1

2 1

[libvirt] LIbvirt Java Bindings 0.4.5 Released
by Bryan Kearney 25 May '10

25 May '10

I have just released 0.4.5 of the libvirt java bindings. This release rings the supported libvirt API up to 0.8.1. You can access the latest version via the following means: Source Code: http://www.libvirt.org/git/?p=libvirt-java.git;a=summary Bundled Source (tarball and SRPM): http://libvirt.org/sources/java/ Maven: http://libvirt.org/maven2/. They should hit the central repo in a day or two. RPMS are making their way through the Fedora F13 and Rawhide build systems Thank you! -- bk

1 0

[libvirt] [PATCH v2] storage: Combine some duplicate code
by Cole Robinson 25 May '10

25 May '10

Volume detection in the scsi backend was duplicating code already present in storage_backend.c. Let's drop the duplicate code. Also, change the shared function name to be less generic, and remove some error squashing in the other call site. v2: Rebased around other storage changes Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/storage/storage_backend.c | 4 ++-- src/storage/storage_backend.h | 4 ++-- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 32 ++------------------------------ 4 files changed, 7 insertions(+), 35 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 7df61cd..f4124df 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1050,8 +1050,8 @@ static struct diskType const disk_types[] = { int -virStorageBackendUpdateVolTargetFormatFD(virStorageVolTargetPtr target, - int fd) +virStorageBackendDetectBlockVolFormatFD(virStorageVolTargetPtr target, + int fd) { int i; off_t start; diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 766f374..907c4bc 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -92,8 +92,8 @@ int virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target, unsigned long long *allocation, unsigned long long *capacity); int -virStorageBackendUpdateVolTargetFormatFD(virStorageVolTargetPtr target, - int fd); +virStorageBackendDetectBlockVolFormatFD(virStorageVolTargetPtr target, + int fd); char *virStorageBackendStablePath(virStoragePoolObjPtr pool, const char *devpath); diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 78d6b31..8d0a92a 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -59,7 +59,7 @@ virStorageBackendMpathUpdateVolTargetInfo(virStorageVolTargetPtr target, capacity) < 0) goto out; - if (virStorageBackendUpdateVolTargetFormatFD(target, fd) < 0) + if (virStorageBackendDetectBlockVolFormatFD(target, fd) < 0) goto out; ret = 0; diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index cd01f93..40f4fd8 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -135,10 +135,7 @@ virStorageBackendSCSIUpdateVolTargetInfo(virStorageVolTargetPtr target, unsigned long long *allocation, unsigned long long *capacity) { - int fd, i, ret = -1; - off_t start; - unsigned char buffer[1024]; - ssize_t bytes; + int fd, ret = -1; if ((fd = open(target->path, O_RDONLY)) < 0) { virReportSystemError(errno, @@ -153,33 +150,8 @@ virStorageBackendSCSIUpdateVolTargetInfo(virStorageVolTargetPtr target, capacity) < 0) goto cleanup; - /* make sure to set the target format "unknown" to begin with */ - target->format = VIR_STORAGE_POOL_DISK_UNKNOWN; - - start = lseek(fd, 0, SEEK_SET); - if (start < 0) { - virReportSystemError(errno, - _("cannot seek to beginning of file '%s'"), - target->path); - goto cleanup; - } - bytes = saferead(fd, buffer, sizeof(buffer)); - if (bytes < 0) { - virReportSystemError(errno, - _("cannot read beginning of file '%s'"), - target->path); + if (virStorageBackendDetectBlockVolFormatFD(target, fd) < 0) goto cleanup; - } - - for (i = 0; disk_types[i].part_table_type != -1; i++) { - if (disk_types[i].offset + disk_types[i].length > bytes) - continue; - if (memcmp(buffer+disk_types[i].offset, &disk_types[i].magic, - disk_types[i].length) == 0) { - target->format = disk_types[i].part_table_type; - break; - } - } ret = 0; -- 1.6.6.1

2 2

[libvirt] [PATCH v2] storage: mpath: Clean up some error handling
by Cole Robinson 25 May '10

25 May '10

We were squashing error messages in a few cases. Recode to follow common ret = -1 convention. v2: Handle more error squashing issues further up in MakeNewVol and CreateVols. Use ret = -1 convention in MakeVols. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/storage/storage_backend_mpath.c | 40 ++++++++++------------------------ 1 files changed, 12 insertions(+), 28 deletions(-) diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 8318969..78d6b31 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -43,39 +43,26 @@ virStorageBackendMpathUpdateVolTargetInfo(virStorageVolTargetPtr target, unsigned long long *allocation, unsigned long long *capacity) { - int ret = 0; + int ret = -1; int fd = -1; if ((fd = open(target->path, O_RDONLY)) < 0) { virReportSystemError(errno, _("cannot open volume '%s'"), target->path); - ret = -1; goto out; } if (virStorageBackendUpdateVolTargetInfoFD(target, fd, allocation, - capacity) < 0) { - - virStorageReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to update volume target info for '%s'"), - target->path); - - ret = -1; + capacity) < 0) goto out; - } - if (virStorageBackendUpdateVolTargetFormatFD(target, fd) < 0) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to update volume target format for '%s'"), - target->path); - - ret = -1; + if (virStorageBackendUpdateVolTargetFormatFD(target, fd) < 0) goto out; - } + ret = 0; out: if (fd != -1) { close(fd); @@ -112,10 +99,6 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool, if (virStorageBackendMpathUpdateVolTargetInfo(&vol->target, &vol->allocation, &vol->capacity) < 0) { - - virStorageReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to update volume for '%s'"), - vol->target.path); goto cleanup; } @@ -230,7 +213,7 @@ static int virStorageBackendCreateVols(virStoragePoolObjPtr pool, struct dm_names *names) { - int retval = 0, is_mpath = 0; + int retval = -1, is_mpath = 0; char *map_device = NULL; uint32_t minor = -1; @@ -238,7 +221,6 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, is_mpath = virStorageBackendIsMultipath(names->name); if (is_mpath < 0) { - retval = -1; goto out; } @@ -246,18 +228,19 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, if (virAsprintf(&map_device, "mapper/%s", names->name) < 0) { virReportOOMError(); - retval = -1; goto out; } if (virStorageBackendGetMinorNumber(names->name, &minor) < 0) { - retval = -1; + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to get %s minor number"), + names->name); goto out; } - virStorageBackendMpathNewVol(pool, - minor, - map_device); + if (virStorageBackendMpathNewVol(pool, minor, map_device) < 0) { + goto out; + } VIR_FREE(map_device); } @@ -268,6 +251,7 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, } while (names->next); + retval = 0; out: return retval; } -- 1.6.6.1

2 2

[libvirt] [PATCH] [DOCS] nwfilter: documentation
by Stefan Berger 24 May '10

24 May '10

This patch adds documentation of the nwfilter subsystem of libvirt to the existing (web) docs. Previous post with attached PDF of the docs is probably stuck in the mail filter of this list. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- docs/formatnwfilter.html.in | 1407 ++++++++++++++++++++++++++++++++++++++++++++ docs/sitemap.html.in | 6 2 files changed, 1413 insertions(+) Index: libvirt-acl/docs/sitemap.html.in =================================================================== --- libvirt-acl.orig/docs/sitemap.html.in +++ libvirt-acl/docs/sitemap.html.in @@ -97,6 +97,12 @@ <li> <a href="formatnetwork.html">Networks</a> <span>The virtual network XML format</span> + <ul> + <li> + <a href="formatnwfilter.html">Network Filtering</a> + <span>Network filter XML format</span> + </li> + </ul> </li> <li> <a href="formatstorage.html">Storage</a> Index: libvirt-acl/docs/formatnwfilter.html.in =================================================================== --- /dev/null +++ libvirt-acl/docs/formatnwfilter.html.in @@ -0,0 +1,1407 @@ +<html> + <body> + <h1>Network Filters</h1> + + <ul id="toc"> + </ul> + + <p> + This page provides an introduction to libvirt's network filters, + their goals, concepts and XML format. + </p> + + <h2><a name="goals">Goals and background</a></h2> + + <p> + The goal of the network filtering XML is to enable administrators + of virtualized system to configure and enforce network traffic + filtering rules on virtual + machines and manage the parameters of network traffic that + virtual machines + are allowed to send or receive. + The network traffic filtering rules are + applied on the host when a virtual machine is started. Since the + filtering rules + cannot be circumvented from within + the virtual machine, it makes them mandatory from the point of + view of a virtual machine user. + <br><br> + The network filter subsystem allows each virtual machine's network + traffic filtering rules to be configured individually on a per + interface basis. The rules are + applied on the host when the virtual machine is started and can be modified + while the virtual machine is running. The latter can be achieved by + modifying the XML description of a network filter. + <br><br> + Multiple virtual machines can make use of the same generic network filter. + When such a filter is modified, the network traffic filtering rules + of all running virtual machines that reference this filter are updated. + <br><br> + Network filtering support is available <span class="since">since 0.8.1 + (Qemu, KVM)</span> + </p> + + <h2><a name="nwfconcpts">Concepts</a></h2> + <p> + The network traffic filtering subsystem enables configuration + of network traffic filtering rules on individual network + interfaces that are configured for certain types of + network configurations. Supported network types are + </p> + <ul> + <li><code>network</code></li> + <li><code>ethernet</code> -- must be used in bridging mode</li> + <li><code>bridge</code></li> + <li><code>direct</code> -- only protocols mac, arp, ip and ipv6 + can be filtered</li> + </ul> + <p> + The interface XML is used to reference a top-level filter. In the + following example, the interface description references + the filter <code>clean-traffic</code>. + </p> +<pre> + ... + <devices> + <interface type='bridge'> + <mac address='00:16:3e:5d:c7:9e'/> + <filterref filter='clean-traffic'/> + </interface> + </devices> + ...</pre> + + <p> + Network filters are written in XML and may either contain references + to other filters, contain rules for traffic filtering or can + hold a combination of both. The above referenced filter + <code>clean-traffic </code> is a filter that for example only + contains references to + other filters and no actual filtering rules. Since references to + other filters can be used, a <i>tree</i> of filters can be built. + The <code>clean-traffic</code> filter can be viewed using the + command <code>virsh nwfilter-dumpxml clean-traffic</code>. + <br><br> + As previously mentioned, a single network filter can be referenced + by multiple virtual machines. Since interfaces will typically + have individual parameters associated with their respective traffic + filtering rules, the rules described in a filter XML can + be parameterized with variables. In this case, the variable name + is used in the filter XML and the name and value are provided at the + place where the filter is referenced. In the + following example, the interface description has been extended with + the parameter <code>IP</code> and a dotted IP address as value. + </p> +<pre> + ... + <devices> + <interface type='bridge'> + <mac address='00:16:3e:5d:c7:9e'/> + <filterref filter='clean-traffic'> + <parameter name='IP' value='10.0.0.1'/> + </filterref> + </interface> + </devices> + ...</pre> + + <p> + In this particular example, the <code>clean-traffic</code> network + traffic filter will be instantiated with the IP address parameter + 10.0.0.1 and enforce that the traffic from this interface will + always be using 10.0.0.1 as the source IP address, which is + one of the purposes of this particular filter. + <br><br> + </p> + + <h3><a name="nwfconcptsvars">Usage of variables in filters</a></h3> + <p> + + Two variables names have so far been reserved for usage by the + network traffic filtering subsystem: <code>MAC</code> and + <code>IP</code>. + <br><br> + <code>MAC</code> is the MAC address of the + network interface. A filtering rule that references this variable + will automatically be instantiated with the MAC address of the + interface. This works without the user having to explicitly provide + the MAC parameter. Even though it is possible to specify the MAC + parameter similar to the IP parameter above, it is discouraged + since libvirt knows what MAC address an interface will be using. + <br><br> + The parameter <code>IP</code> represents the IP address + that the operating system inside the virtual machine is expected + to use on the given interface. The <code>IP</code> parameter + is special in so far as the libvirt daemon will try to determine + the IP address (and thus the IP parameter's value) that is being + used on an interface if the parameter + is not explicitly provided but referenced. + For current limitations on IP address detection, consult the + <a href="#nwflimits">section on limitations</a> on how to use this + feature and what to expect when using it. + <br><br> + The following is the XML description of the network filer + <code>no-arp-spoofing</code>. It serves as an example for + a network filter XML referencing the <code>MAC</code> and + <code>IP</code> parameters. This particular filter is referenced by the + <code>clean-traffic</code> filter. + </p> +<pre> +<filter name='no-arp-spoofing' chain='arp'> + <uuid>f88f1932-debf-4aa1-9fbe-f10d3aa4bc95</uuid> + <rule action='drop' direction='out' priority='300'> + <mac match='no' srcmacaddr='$MAC'/> + </rule> + <rule action='drop' direction='out' priority='350'> + <arp match='no' arpsrcmacaddr='$MAC'/> + </rule> + <rule action='drop' direction='out' priority='400'> + <arp match='no' arpsrcipaddr='$IP'/> + </rule> + <rule action='drop' direction='in' priority='450'> + <arp opcode='Reply'/> + <arp match='no' arpdstmacaddr='$MAC'/> + </rule> + <rule action='drop' direction='in' priority='500'> + <arp match='no' arpdstipaddr='$IP'/> + </rule> + <rule action='accept' direction='inout' priority='600'> + <arp opcode='Request'/> + </rule> + <rule action='accept' direction='inout' priority='650'> + <arp opcode='Reply'/> + </rule> + <rule action='drop' direction='inout' priority='1000'/> +</filter> +</pre> + + <p> + Note that referenced variables are always prefixed with the + $ (dollar) sign. The format of the value of a variable + must be of the type expected by the filter attribute in the + XML. In the above example, the <code>IP</code> parameter + must hold a dotted IP address in decimal numbers format. + Failure to provide the correct + value type will result in the filter not being instantiatable + and will prevent a virtual machine from starting or the + interface from attaching when hotplugging is used. The types + that are expected for each XML attribute are shown + below. + </p> + + <h2><a name="nwfelems">Element and attribute overview</a></h2> + + <p> + The root element required for all network filters is + named <code>filter</code> with two possible attributes. The + <code>name</code> attribute provides a unique name of the + given filter. The <code>chain</code> attribute is optional but + allows certain filters to be better organized for more efficient + processing by the firewall subsystem of the underlying host. + Currently the system only supports the chains <code>root, + ipv4, ipv6, arp and rarp</code>. + </p> + + <h3><a name="nwfelemsRefs">References to other filers</a></h3> + <p> + Any filter may hold references to other filters. Individual + filters may be referenced multiple times in a filter tree but + references between filters must not introduce loops (directed + acyclic graph). + <br><br> + The following shows the XML of the <code>clean-traffic</code> + network filter referencing several other filters. + </p> +<pre> +<filter name='clean-traffic'> + <uuid>6ef53069-ba34-94a0-d33d-17751b9b8cb1</uuid> + <filterref filter='no-mac-spoofing'/> + <filterref filter='no-ip-spoofing'/> + <filterref filter='allow-incoming-ipv4'/> + <filterref filter='no-arp-spoofing'/> + <filterref filter='no-other-l2-traffic'/> + <filterref filter='qemu-announce-self'/> +</filter> +</pre> + + <p> + To reference another filter, the XML node <code>filterref</code> + needs to be provided inside a <code>filter</code> node. This + node must have the attribute <code>filter</code> whose value contains + the name of the filter to be referenced. + <br><br> + New network filters can be defined at any time and + may contain references to network filters that are + not known to libvirt, yet. However, once a virtual machine + is started or a network interface + referencing a filter is to be hotplugged, all network filters + in the filter tree must be available. Otherwise the virtual + machine will not start or the network interface cannot be + attached. + </p> + + <h3><a name="nwfelemsRules">Filter rules</a></h3> + <p> + The following XML shows a simple example of a network + traffic filter implementing a rule to drop traffic if + the IP address (provided through the value of the + variable IP) in an outgoing IP packet is not the expected + one, thus preventing IP address spoofing by the VM. + </p> +<pre> +<filter name='no-ip-spoofing' chain='ipv4'> + <uuid>fce8ae33-e69e-83bf-262e-30786c1f8072</uuid> + <rule action='drop' direction='out' priority='500'> + <ip match='no' srcipaddr='$IP'/> + </rule> +</filter> +</pre> + + <p> + A traffic filtering rule starts with the <code>rule</code> + node. This node may contain up to three attributes + </p> + <ul> + <li> + action -- mandatory; must either be <code>drop</code> or <code>accept</code> if + the evaluation of the filtering rule is supposed to drop or accept + a packet + </li> + <li> + direction -- mandatory; must either be <code>in</code>, <code>out</code> or + <code>inout</code> if the rule is for incoming, + outgoing or incoming-and-outgoing traffic + </li> + <li> + priority -- optional; the priority of the rule controls the order in + which the rule will be instantiated relative to other rules. + Rules with lower value will be instantiated and therefore evaluated + before rules with higher value. + Valid values are in the range of 0 to 1000. If this attribute is not + provided, the value 500 will automatically be assigned. + </li> + </ul> + <p> + The above example indicates that the traffic of type <code>ip</code> + will be asscociated with the chain 'ipv4' and the rule will have + priority 500. If for example another filter is referenced whose + traffic of type <code>ip</code> is also associated with the chain + 'ipv4' then that filter's rules will be ordered relative to the priority + 500 of the shown rule. + <br><br> + A rule may contain a single rule for filtering of traffic. The + above example shows that traffic of type <code>ip</code> is to be + filtered. + </p> + + <h4><a name="nwfelemsRulesProto">Supported protocols</a></h4> + <p> + The following sections enumerate the list of protocols that + are supported by the network filtering subsystem. The + type of traffic a rule is supposed to filter on is provided + in the <code>rule</code> node as a nested node. Depending + on the traffic type a rule is filtering, the attributes are + different. The above example showed the single + attribute <code>srcipaddr</code> that is valid inside the + <code>ip</code> traffic filtering node. The following sections + show what attributes are valid and what type of data they are + expecting. The following datatypes are available: + </p> + <ul> + <li>UINT8 : 8 bit integer; range 0-255</li> + <li>UINT16: 16 bit integer; range 0-65535</li> + <li>MAC_ADDR: MAC adrress in dotted decimal format, i.e., 00:11:22:33:44:55</li> + <li>MAC_MASK: MAC address mask in MAC address format, i.e., FF:FF:FF:FC:00:00</li> + <li>IP_ADDR: IP address in dotted decimal format, i.e., 10.1.2.3</li> + <li>IP_MASK: IP address mask in either dotted decimal format (255.255.248.0) or CIDR mask (0-32)</li> + <li>IPV6_ADDR: IPv6 address in numbers format, i.e., FFFF::1</li> + <li>IPV6_MASK: IPv6 mask in numbers format (FFFF:FFFF:FC00::) or CIDR mask (0-128)</li> + <li>STRING: A string</li> + </ul> + <p> + <br><br> + Every attribute except for those of type IP_MASK or IPV6_MASK can + be negated using the <code>match</code> + attribute with value <code>no</code>. Multiple negated attributes + may be grouped together. The following + XML fragment shows such an example using abstract attributes. + </p> +<pre> +[...] + <rule action='drop' direction='in'> + <protocol match='no' attribute1='value1' attribute2='value2'/> + <protocol attribute3='value3'/> + </rule> +[...] +</pre> + <p> + Rules perform a logical AND evaluation on all values of the given + protocol attributes. Thus, if a single attribute's value does not match + the one given in the rule, the whole rule will be skipped during + evaluation. Therefore, in the above example incoming traffic + will only be dropped if + the protocol property attribute1 does not match value1 AND + the protocol property attribute2 does not match value2 AND + the protocol property attribute3 matches value3. + <br><br> + </p> + + + <h5><a name="nwfelemsRulesProtoMAC">MAC (Ethernet)</a></h5> + <p> + Protocol ID: <code>mac</code> + <br> + Note: Rules of this type should go into the <code>root</code> chain. + </p> + <table class="top_table"> + <tr> + <th> Attribute </th> + <th> Datatype </th> + <th> Semantics </th> + </tr> + <tr> + <td>srcmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of sender</td> + </tr> + <tr> + <td>srcmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of sender</td> + </tr> + <tr> + <td>dstmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of destination</td> + </tr> + <tr> + <td>dstmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of destination</td> + </tr> + <tr> + <td>protocolid</td> + <td>UINT16 (0x600-0xffff), STRING</td> + <td>Layer 3 protocol ID</td> + </tr> + </table> + <p> + Valid Strings for <code>protocolid</code> are: arp, rarp, ipv4, ipv6 + <br><br> + Example: <pre><mac match='no' srcmacaddr='$MAC'/></pre> + <br><br> + </p> + + <h5><a name="nwfelemsRulesProtoARP">ARP/RARP</a></h5> + <p> + Protocol ID: <code>arp</code> or <code>rarp</code> + <br> + Note: Rules of this type should either go into the + <code>root</code> or <code>arp/rarp</code> chain. + </p> + <table class="top_table"> + <tr> + <th> Attribute </th> + <th> Datatype </th> + <th> Semantics </th> + </tr> + <tr> + <td>srcmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of sender</td> + </tr> + <tr> + <td>srcmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of sender</td> + </tr> + <tr> + <td>dstmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of destination</td> + </tr> + <tr> + <td>dstmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of destination</td> + </tr> + <tr> + <td>hwtype</td> + <td>UINT16</td> + <td>Hardware type</td> + </tr> + <tr> + <td>protocoltype</td> + <td>UINT16</td> + <td>Protocol type</td> + </tr> + <tr> + <td>opcode</td> + <td>UINT16, STRING</td> + <td>Opcode</td> + </tr> + <tr> + <td>arpsrcmacaddr</td> + <td>MAC_ADDR</td> + <td>Source MAC address in ARP/RARP packet</td> + </tr> + <tr> + <td>arpdstmacaddr</td> + <td>MAC_ADDR</td> + <td>Destination MAC address in ARP/RARP packet</td> + </tr> + <tr> + <td>arpsrcipaddr</td> + <td>IP_ADDR</td> + <td>Source IP address in ARP/RARP packet</td> + </tr> + <tr> + <td>arpdstipaddr</td> + <td>IP_ADDR</td> + <td>Destination IP address in ARP/RARP packet</td> + </tr> + </table> + <p> + Valid strings for the <code>Opcode</code> field are: + Request, Reply, Request_Reverse, Reply_Reverse, DRARP_Request, + DRARP_Reply, DRARP_Error, InARP_Request, ARP_NAK + <br><br> + </p> + + <h5><a name="nwfelemsRulesProtoIP">IPv4</a></h5> + <p> + Protocol ID: <code>ip</code> + Note: Rules of this type should either go into the + <code>root</code> or <code>ipv4</code> chain. + </p> + <table class="top_table"> + <tr> + <th> Attribute </th> + <th> Datatype </th> + <th> Semantics </th> + </tr> + <tr> + <td>srcmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of sender</td> + </tr> + <tr> + <td>srcmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of sender</td> + </tr> + <tr> + <td>dstmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of destination</td> + </tr> + <tr> + <td>dstmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of destination</td> + </tr> + <tr> + <td>srcipaddr</td> + <td>IP_ADDR</td> + <td>Source IP address</td> + </tr> + <tr> + <td>srcipmask</td> + <td>IP_MASK</td> + <td>Mask applied to source IP address</td> + </tr> + <tr> + <td>dstipaddr</td> + <td>IP_ADDR</td> + <td>Destination IP address</td> + </tr> + <tr> + <td>dstipmask</td> + <td>IP_MASK</td> + <td>Mask applied to destination IP address</td> + </tr> + <tr> + <td>protocol</td> + <td>UINT8, STRING</td> + <td>Layer 4 protocol identifier</td> + </tr> + <tr> + <td>srcportstart</td> + <td>UINT16</td> + <td>Start of range of valid source ports; requires <code>protocol</code></td> + </tr> + <tr> + <td>srcportend</td> + <td>UINT16</td> + <td>End of range of valid source ports; requires <code>protocol</code></td> + </tr> + <tr> + <td>dstportstart</td> + <td>UINT16</td> + <td>Start of range of valid destination ports; requires <code>protocol</code></td> + </tr> + <tr> + <td>dstportend</td> + <td>UINT16</td> + <td>End of range of valid destination ports; requires <code>protocol</code></td> + </tr> + </table> + <p> + Valid strings for <code>protocol</code> are: + tcp, udp, udplite, esp, ah, icmp, igmp, sctp + <br><br> + </p> + + + <h5><a name="nwfelemsRulesProtoIPv6">IPv6</a></h5> + <p> + Protocol ID: <code>ipv6</code> + Note: Rules of this type should either go into the + <code>root</code> or <code>ipv6</code> chain. + </p> + <table class="top_table"> + <tr> + <th> Attribute </th> + <th> Datatype </th> + <th> Semantics </th> + </tr> + <tr> + <td>srcmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of sender</td> + </tr> + <tr> + <td>srcmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of sender</td> + </tr> + <tr> + <td>dstmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of destination</td> + </tr> + <tr> + <td>dstmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of destination</td> + </tr> + <tr> + <td>srcipaddr</td> + <td>IPV6_ADDR</td> + <td>Source IPv6 address</td> + </tr> + <tr> + <td>srcipmask</td> + <td>IPV6_MASK</td> + <td>Mask applied to source IPv6 address</td> + </tr> + <tr> + <td>dstipaddr</td> + <td>IPV6_ADDR</td> + <td>Destination IPv6 address</td> + </tr> + <tr> + <td>dstipmask</td> + <td>IPV6_MASK</td> + <td>Mask applied to destination IPv6 address</td> + </tr> + <tr> + <td>protocol</td> + <td>UINT8</td> + <td>Layer 4 protocol identifier</td> + </tr> + <tr> + <td>srcportstart</td> + <td>UINT16</td> + <td>Start of range of valid source ports; requires <code>protocol</code></td> + </tr> + <tr> + <td>srcportend</td> + <td>UINT16</td> + <td>End of range of valid source ports; requires <code>protocol</code></td> + </tr> + <tr> + <td>dstportstart</td> + <td>UINT16</td> + <td>Start of range of valid destination ports; requires <code>protocol</code></td> + </tr> + <tr> + <td>dstportend</td> + <td>UINT16</td> + <td>End of range of valid destination ports; requires <code>protocol</code></td> + </tr> + </table> + <p> + Valid strings for <code>protocol</code> are: + tcp, udp, udplite, esp, ah, icmpv6, sctp + <br><br> + </p> + + <h5><a name="nwfelemsRulesProtoTCP-ipv4">TCP/UDP/SCTP</a></h5> + <p> + Protocol ID: <code>tcp</code>, <code>udp</code>, <code>sctp</code> + <br> + Note: The chain parameter is ignored for this type of traffic + and should either be omitted or set to <code>root</code>. + </p> + <table class="top_table"> + <tr> + <th> Attribute </th> + <th> Datatype </th> + <th> Semantics </th> + </tr> + <tr> + <td>srcmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of sender</td> + </tr> + <tr> + <td>srcipaddr</td> + <td>IP_ADDR</td> + <td>Source IP address</td> + </tr> + <tr> + <td>srcipmask</td> + <td>IP_MASK</td> + <td>Mask applied to source IP address</td> + </tr> + <tr> + <td>dstipaddr</td> + <td>IP_ADDR</td> + <td>Destination IP address</td> + </tr> + <tr> + <td>dstipmask</td> + <td>IP_MASK</td> + <td>Mask applied to destination IP address</td> + </tr> + + <tr> + <td>srcipfrom</td> + <td>IP_ADDR</td> + <td>Start of range of source IP address</td> + </tr> + <tr> + <td>srcipto</td> + <td>IP_ADDR</td> + <td>End of range of source IP address</td> + </tr> + <tr> + <td>dstipfrom</td> + <td>IP_ADDR</td> + <td>Start of range of destination IP address</td> + </tr> + <tr> + <td>dstipto</td> + <td>IP_ADDR</td> + <td>End of range of destination IP address</td> + </tr> + + <tr> + <td>srcportstart</td> + <td>UINT16</td> + <td>Start of range of valid source ports</td> + </tr> + <tr> + <td>srcportend</td> + <td>UINT16</td> + <td>End of range of valid source ports</code></td> + </tr> + <tr> + <td>dstportstart</td> + <td>UINT16</td> + <td>Start of range of valid destination ports</code></td> + </tr> + <tr> + <td>dstportend</td> + <td>UINT16</td> + <td>End of range of valid destination ports</td> + </tr> + </table> + <p> + <br><br> + </p> + + + <h5><a name="nwfelemsRulesProtoICMP">ICMP</a></h5> + <p> + Protocol ID: <code>icmp</code> + <br> + Note: The chain parameter is ignored for this type of traffic + and should either be omitted or set to <code>root</code>. + </p> + <table class="top_table"> + <tr> + <th> Attribute </th> + <th> Datatype </th> + <th> Semantics </th> + </tr> + <tr> + <td>srcmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of sender</td> + </tr> + <tr> + <td>srcmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of sender</td> + </tr> + <tr> + <td>dstmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of destination</td> + </tr> + <tr> + <td>dstmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of destination</td> + </tr> + <tr> + <td>srcipaddr</td> + <td>IP_ADDR</td> + <td>Source IP address</td> + </tr> + <tr> + <td>srcipmask</td> + <td>IP_MASK</td> + <td>Mask applied to source IP address</td> + </tr> + <tr> + <td>dstipaddr</td> + <td>IP_ADDR</td> + <td>Destination IP address</td> + </tr> + <tr> + <td>dstipmask</td> + <td>IP_MASK</td> + <td>Mask applied to destination IP address</td> + </tr> + + <tr> + <td>srcipfrom</td> + <td>IP_ADDR</td> + <td>Start of range of source IP address</td> + </tr> + <tr> + <td>srcipto</td> + <td>IP_ADDR</td> + <td>End of range of source IP address</td> + </tr> + <tr> + <td>dstipfrom</td> + <td>IP_ADDR</td> + <td>Start of range of destination IP address</td> + </tr> + <tr> + <td>dstipto</td> + <td>IP_ADDR</td> + <td>End of range of destination IP address</td> + </tr> + <tr> + <td>type</td> + <td>UINT16</td> + <td>ICMP type</td> + </tr> + <tr> + <td>code</td> + <td>UINT16</td> + <td>ICMP code</td> + </tr> + </table> + <p> + <br><br> + </p> + + <h5><a name="nwfelemsRulesProtoMisc">IGMP, ESP, AH, UDPLITE, 'ALL'</a></h5> + <p> + Protocol ID: <code>igmp</code>, <code>esp</code>, <code>ah</code>, <code>udplite</code>, <code>all</code> + <br> + Note: The chain parameter is ignored for this type of traffic + and should either be omitted or set to <code>root</code>. + </p> + <table class="top_table"> + <tr> + <th> Attribute </th> + <th> Datatype </th> + <th> Semantics </th> + </tr> + <tr> + <td>srcmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of sender</td> + </tr> + <tr> + <td>srcmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of sender</td> + </tr> + <tr> + <td>dstmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of destination</td> + </tr> + <tr> + <td>dstmacmask</td> + <td>MAC_MASK</td> + <td>Mask applied to MAC address of destination</td> + </tr> + <tr> + <td>srcipaddr</td> + <td>IP_ADDR</td> + <td>Source IP address</td> + </tr> + <tr> + <td>srcipmask</td> + <td>IP_MASK</td> + <td>Mask applied to source IP address</td> + </tr> + <tr> + <td>dstipaddr</td> + <td>IP_ADDR</td> + <td>Destination IP address</td> + </tr> + <tr> + <td>dstipmask</td> + <td>IP_MASK</td> + <td>Mask applied to destination IP address</td> + </tr> + + <tr> + <td>srcipfrom</td> + <td>IP_ADDR</td> + <td>Start of range of source IP address</td> + </tr> + <tr> + <td>srcipto</td> + <td>IP_ADDR</td> + <td>End of range of source IP address</td> + </tr> + <tr> + <td>dstipfrom</td> + <td>IP_ADDR</td> + <td>Start of range of destination IP address</td> + </tr> + <tr> + <td>dstipto</td> + <td>IP_ADDR</td> + <td>End of range of destination IP address</td> + </tr> + </table> + <p> + <br><br> + </p> + + + <h5><a name="nwfelemsRulesProtoTCP-ipv6">TCP/UDP/SCTP over IPV6</a></h5> + <p> + Protocol ID: <code>tcp-ipv6</code>, <code>udp-ipv6</code>, <code>sctp-ipv6</code> + <br> + Note: The chain parameter is ignored for this type of traffic + and should either be omitted or set to <code>root</code>. + </p> + <table class="top_table"> + <tr> + <th> Attribute </th> + <th> Datatype </th> + <th> Semantics </th> + </tr> + <tr> + <td>srcmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of sender</td> + </tr> + <tr> + <td>srcipaddr</td> + <td>IPV6_ADDR</td> + <td>Source IP address</td> + </tr> + <tr> + <td>srcipmask</td> + <td>IPV6_MASK</td> + <td>Mask applied to source IP address</td> + </tr> + <tr> + <td>dstipaddr</td> + <td>IPV6_ADDR</td> + <td>Destination IP address</td> + </tr> + <tr> + <td>dstipmask</td> + <td>IPV6_MASK</td> + <td>Mask applied to destination IP address</td> + </tr> + + <tr> + <td>srcipfrom</td> + <td>IPV6_ADDR</td> + <td>Start of range of source IP address</td> + </tr> + <tr> + <td>srcipto</td> + <td>IPV6_ADDR</td> + <td>End of range of source IP address</td> + </tr> + <tr> + <td>dstipfrom</td> + <td>IPV6_ADDR</td> + <td>Start of range of destination IP address</td> + </tr> + <tr> + <td>dstipto</td> + <td>IPV6_ADDR</td> + <td>End of range of destination IP address</td> + </tr> + + <tr> + <td>srcportstart</td> + <td>UINT16</td> + <td>Start of range of valid source ports</td> + </tr> + <tr> + <td>srcportend</td> + <td>UINT16</td> + <td>End of range of valid source ports</td> + </tr> + <tr> + <td>dstportstart</td> + <td>UINT16</td> + <td>Start of range of valid destination ports</td> + </tr> + <tr> + <td>dstportend</td> + <td>UINT16</td> + <td>End of range of valid destination ports</td> + </tr> + </table> + <p> + <br><br> + </p> + + + <h5><a name="nwfelemsRulesProtoICMPv6">ICMPv6</a></h5> + <p> + Protocol ID: <code>icmpv6</code> + <br> + Note: The chain parameter is ignored for this type of traffic + and should either be omitted or set to <code>root</code>. + </p> + <table class="top_table"> + <tr> + <th> Attribute </th> + <th> Datatype </th> + <th> Semantics </th> + </tr> + <tr> + <td>srcmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of sender</td> + </tr> + <tr> + <td>srcipaddr</td> + <td>IPV6_ADDR</td> + <td>Source IPv6 address</td> + </tr> + <tr> + <td>srcipmask</td> + <td>IPV6_MASK</td> + <td>Mask applied to source IPv6 address</td> + </tr> + <tr> + <td>dstipaddr</td> + <td>IPV6_ADDR</td> + <td>Destination IPv6 address</td> + </tr> + <tr> + <td>dstipmask</td> + <td>IPV6_MASK</td> + <td>Mask applied to destination IPv6 address</td> + </tr> + + <tr> + <td>srcipfrom</td> + <td>IPV6_ADDR</td> + <td>Start of range of source IP address</td> + </tr> + <tr> + <td>srcipto</td> + <td>IPV6_ADDR</td> + <td>End of range of source IP address</td> + </tr> + <tr> + <td>dstipfrom</td> + <td>IPV6_ADDR</td> + <td>Start of range of destination IP address</td> + </tr> + <tr> + <td>dstipto</td> + <td>IPV6_ADDR</td> + <td>End of range of destination IP address</td> + </tr> + + <tr> + <td>type</td> + <td>UINT16</td> + <td>ICMPv6 type</td> + </tr> + <tr> + <td>code</td> + <td>UINT16</td> + <td>ICMPv6 code</td> + </tr> + </table> + <p> + <br><br> + </p> + + <h5><a name="nwfelemsRulesProtoMiscv6">IGMP, ESP, AH, UDPLITE, 'ALL' over IPv6</a></h5> + <p> + Protocol ID: <code>igmp-ipv6</code>, <code>esp-ipv6</code>, <code>ah-ipv6</code>, <code>udplite-ipv6</code>, <code>all-ipv6</code> + <br> + Note: The chain parameter is ignored for this type of traffic + and should either be omitted or set to <code>root</code>. + </p> + <table class="top_table"> + <tr> + <th> Attribute </th> + <th> Datatype </th> + <th> Semantics </th> + </tr> + <tr> + <td>srcmacaddr</td> + <td>MAC_ADDR</td> + <td>MAC address of sender</td> + </tr> + <tr> + <td>srcipaddr</td> + <td>IPV6_ADDR</td> + <td>Source IPv6 address</td> + </tr> + <tr> + <td>srcipmask</td> + <td>IPV6_MASK</td> + <td>Mask applied to source IPv6 address</td> + </tr> + <tr> + <td>dstipaddr</td> + <td>IPV6_ADDR</td> + <td>Destination IPv6 address</td> + </tr> + <tr> + <td>dstipmask</td> + <td>IPV6_MASK</td> + <td>Mask applied to destination IPv6 address</td> + </tr> + + <tr> + <td>srcipfrom</td> + <td>IPV6_ADDR</td> + <td>Start of range of source IP address</td> + </tr> + <tr> + <td>srcipto</td> + <td>IPV6_ADDR</td> + <td>End of range of source IP address</td> + </tr> + <tr> + <td>dstipfrom</td> + <td>IPV6_ADDR</td> + <td>Start of range of destination IP address</td> + </tr> + <tr> + <td>dstipto</td> + <td>IPV6_ADDR</td> + <td>End of range of destination IP address</td> + </tr> + + </table> + <p> + <br><br> + </p> + + <h2><a name="nwfcli">Command line tools</a></h2> + <p> + The libvirt command line tool <code>virsh</code> has been extended + with life-cycle support for network filters. All commands related + to the network filtering subsystem start with the prefix + <code>nwfilter</code>. The following commands are available: + <p> + <ul> + <li>nwfilter-list : list UUIDs and names of all network filters</li> + <li>nwfilter-define : define a new network filter or update an existing one</li> + <li>nwfilter-undefine : delete a network filter given its name; it must not be currently in use</li> + <li>nwfilter-dumpxml : display a network filter given its name</li> + <li>nwfilter-edit : edit a network filter given its name</li> + </ul> + + <h2><a name="nwfexamples">Example network filters</a></h2> + <p> + The following is a list of example network filters that are + automatically installed with libvirt. </p> + <table class="top_table"> + <tr> + <th> Name </th> + <th> Description </th> + </tr> + <tr> + <td> no-arp-spoofing </td> + <td> Prevent a VM from spoofing ARP traffic; this filter + only allows ARP request and reply messages and enforces + that those packets contain the MAC and IP addresses + of the VM.</td> + </tr> + <tr> + <td> allow-dhcp </td> + <td> Allow a VM to request an IP address via DHCP (from any + DHCP server)</td> + </tr> + <tr> + <td> allow-dhcp-server </td> + <td> Allow a VM to request an IP address from a specified + DHCP server. The dotted decimal IP address of the DHCP + server must be provided in a reference to this filter. + The name of the variable must be <i>DHCPSERVER</i>.</td> + </tr> + <tr> + <td> no-ip-spoofing </td> + <td> Prevent a VM from sending of IP packets with + a source IP address different from the one + in the packet. </td> + </tr> + <tr> + <td> no-ip-multicast </td> + <td> Prevent a VM from sending IP multicast packets. </td> + </tr> + <tr> + <td> clean-traffic </td> + <td> Prevent MAC, IP and ARP spoofing. This filter references + several other filters as building blocks. </td> + </tr> + </table> + <p> + Note that most of the above filters are only building blocks and + require a combination with other filters to provide useful network + traffic filtering. + The most useful one in the above list is the <i>clean-traffic</i> + filter. This filter itself can for example be combined with the + <i>no-ip-multicast</i> + filter to prevent virtual machines from sending IP multicast traffic + on top of the prevention of packet spoofing. + </p> + + <h2><a name="nwfwrite">Writing your own filters</a></h2> + + <p> + Since libvirt only provides a couple of example networking filters, you + may consider writing your own. When planning on doing so + there are a couple of things + you may need to know regarding the network filtering subsystem and how + it works internally. Certainly you also have to know and understand + the protocols very well that you want to be filtering on so that + no further traffic than what you want can pass and that in fact the + traffic you want to allow does pass. + <br><br> + The network filtering subsystem is currently only available on + Linux hosts and only works for Qemu and KVM type of virtual machines. + On Linux + it builds upon the support for <code>ebtables</code>, <code>iptables + </code> and <code>ip6tables</code> and makes use of their features. + From the above list of supported protocols the following ones are + implemented using <code>ebtables</code>: + </p> + <ul> + <li>mac</li> + <li>arp, rarp</li> + <li>ip</li> + <li>ipv6</li> + </uL> + + <p> + All other protocols over IPv4 are supported using iptables, those over + IPv6 are implemented using ip6tables. + <br><br> + On a Linux host, all traffic filtering instantiated by libvirt's network + filter subsystem first passes through the filtering support implemented + by ebtables and only then through iptables or ip6tables filters. If + a filter tree has rules with the protocols <code>mac</code>, + <code>arp</code>, <code>rarp</code>, <code>ip</code>, or <code>ipv6</code> + ebtables rules will automatically be instantiated. + <br> + The role of the <code>chain</code> attribute in the network filter + XML is that internally a new user-defined ebtables table is created + that then for example receives all <code>arp</code> traffic coming + from or going to a virtual machine, if the chain <code>arp</code> + has been specified. Further, a rule is generated in an interface's + <code>root</code> chain that directs all ipv4 traffic into the + user-defined chain. Therefore, all ARP traffic rules should then be + placed into filters specifying this chain. This type of branching + into user-define tables is only supported with filtering on the ebtables + layer. + <br> + As an example, it is + possible to filter on UDP traffic by source and destination ports using + the <code>ip</code> protocol filter and specifying attributes for the + protocol, source and destination IP addresses and ports of UDP packets + that are to be accepted. This allows + early filtering of UDP traffic with ebtables. However, once an IP or IPv6 + packet, such as a UDP packet, + has passed the ebtables layer and there is at least one rule in a filter + tree that instantiates iptables or ip6tables rules, a rule to let + the UDP packet pass will also be necessary to be provided for those + filtering layers. This can be + achieved with a rule containing an approriate <code>udp</code> or + <code>udp-ipv6</code> traffic filtering node. + </p> + + <h3><a name="nwfwriteexample">Example custom filter</a></h3> + <p> + As an example we want to now build a filter that fulfills the following + list of requirements: + </p> + <ul> + <li>prevents a VM's interface from MAC, IP and ARP spoofing</li> + <li>opens only TCP ports 22 and 80 of a VM's interface</li> + <li>allows the VM to send ping traffic from an interface + but no let the VM be pinged on the interface</li> + </ul> + <p> + The requirement to prevent spoofing is fulfilled by the existing + <code>clean-traffic</code> network filter, thus we will reference this + filter from our custom filter. + <br> + To enable traffic for TCP ports 22 and 80 we will add 2 rules to + enable this type of traffic. To allow the VM to send ping traffic + we will add a rule for ICMP traffic. For simplicity reasons + we allow general ICMP traffic to be initated from the VM, not + just ICMP echo request and response messages. To then + disallow all other traffic to reach or be initated by the + VM we will then need to add a rule that drops all other traffic. + Assuming our VM is called <i>test</i> and + the interface we want to associate our filter with is called <i>eth0</i>, + we name our filter <i>test-eth0</i>. + The result of these considerations is the following network filter XML: + </p> +<pre> +<filter name='test-eth0'> +  + <filterref filter='clean-traffic'/> + +  + <rule action='accept' direction='in'> + <tcp dstportstart='22'/> + </rule> + + <rule action='accept' direction='in'> + <tcp dstportstart='80'/> + </rule> + +  + <rule action='accept' direction='out'> + <icmp/> + </rule> + +  + <rule action='drop' direction='inout'> + <all/> + </rule> + +</filter> +</pre> + <p> + Note that none of the rules in the above XML contain the + IP address of the VM as either source or destination address, yet + the filtering of the traffic works correctly. The reason is that + the evaluation of the rules internally happens on a + per-interface basis and the rules are evaluated based on the knowledge + about which (tap) interface has sent or will receive the packet rather + than what their source or destination IP address may be. + <br><br> + An XML fragment for a possible network interface description inside + the domain XML of the <code>test</code> VM could then look like this: + </p> +<pre> + [...] + <interface type='bridge'> + <source bridge='mybridge'/> + <filterref filter='test-eth0'/> + </interface> + [...] +</pre> + + <p> + To more strictly control the ICMP traffic and enforce that only + ICMP echo requests can be sent from the VM + and only ICMP echo responses be received by the VM, the above + <code>ICMP</code> rule can be replaced with the following two rules: + </p> +<pre> +  + <rule action='accept' direction='out'> + <icmp type='8'/> + </rule> + +  + <rule action='accept' direction='in'> + <icmp type='0'/> + </rule> +</pre> + + + <h2><a name="nwflimits">Limitations</a></h2> + <p> + The following sections list (current) limitations of the network + filtering subsystem. + </p> + + <h3><a name="nwflimitsIP">IP Address Detection</a></h3> + <p> + In case a network filter references the variable + <i>IP</i> and no variable was defined in any higher layer + references to the filter, IP address detection will automatically + be started when the filter is to be instantiated (VM start, interface + hotplug event). Only IPv4 + addresses can be detected and only a single IP address + legitimately in use by a VM on a single interface will be detected. + In case a VM was to use multiple IP address on a single interface + (IP aliasing), + the IP addresses would have to be provided explicitly either + in the network filter itself or as variables used in attributes' + values. These + variables must then be defined in a higher level reference to the filter + and each assigned the value of the IP address that the VM is expected + to be using. + Different IP addresses in use by multiple interfaces of a VM + (one IP address each) will be independently detected. + <br><br> + Once a VM's IP address has been detected, its IP network traffic + may be locked to that address, if for example IP address spoofing + is prevented by one of its filters. In that case the user of the VM + will not be able to change the IP address on the interface inside + the VM, which would be considered IP address spoofing. + <br><br> + In case a VM is resumed after suspension or migrated, IP address + detection will be restarted. + </p> + + <h3><a name="nwflimitsmigr">VM Migration</a></h3> + <p> + VM migration is only supported if the whole filter tree + that is referenced by a virtual machine's top level filter + is also available on the target host. The network filter + <i>clean-traffic</i> + for example should be available on all libvirt installations + of version 0.8.1 or later and thus enable migration of VMs that + for example reference this filter. All other + custom filters must be migrated using higher layer software. It is + outside the scope of libvirt to ensure that referenced filters + on the source system are equivalent to those on the target system + and vice versa. + <br><br> + Migration must occurr between libvirt insallations of version + 0.8.1 or later in order not to loose the network traffic filters + associated with an interface. + </p> + + </body> +</html>

1 0

[libvirt] [PATCH] Add host UUID (to libvirt capabilities)
by Stefan Berger 24 May '10

24 May '10

This patch adds the host UUID (to the capabilities of libvirt). The user may provide it in libvirtd.conf overriding whatever dmidecode may return. If none or no valid UUID is provided in libvirtd.conf, dmidecode is being used. If that function doesn't provide a valid (not all digits may be equal), generate a temporary one. virSetHostUUIDStr() should be called first with the UUID read from libvirtd.conf, but may only be called once. Subsequently the functions virGetHostUUID[Str]() can be called to get the UUID of the host. Besides that, this patch - adds a dependency on the dmidecode package - adds uuid to the capabilties XML schema - displays the UUID in in 'virsh capabilities' - adds 3 public functions to uuid.h for setting and getting the UUID of the host This patch contains recycled code from Scott Feldman (getDMISystemUUID()). Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- daemon/libvirtd.c | 5 + src/conf/capabilities.c | 4 + src/util/uuid.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/uuid.h | 4 + 4 files changed, 139 insertions(+) Index: libvirt-acl/daemon/libvirtd.c =================================================================== --- libvirt-acl.orig/daemon/libvirtd.c +++ libvirt-acl/daemon/libvirtd.c @@ -2718,6 +2718,7 @@ remoteReadConfigFile (struct qemud_serve char *unix_sock_rw_perms = NULL; char *unix_sock_group = NULL; char *buf = NULL; + char *host_uuid = NULL; #if HAVE_POLKIT /* Change the default back to no auth for non-root */ @@ -2840,6 +2841,10 @@ remoteReadConfigFile (struct qemud_serve GET_CONF_INT (conf, filename, max_requests); GET_CONF_INT (conf, filename, max_client_requests); + GET_CONF_STR (conf, filename, host_uuid); + virSetHostUUIDStr(host_uuid); + VIR_FREE(host_uuid); + virConfFree (conf); return 0; Index: libvirt-acl/src/util/uuid.h =================================================================== --- libvirt-acl.orig/src/util/uuid.h +++ libvirt-acl/src/util/uuid.h @@ -22,6 +22,10 @@ #ifndef __VIR_UUID_H__ # define __VIR_UUID_H__ +int virSetHostUUIDStr(const char *host_uuid); +int virGetHostUUID(unsigned char *host_uuid); +int virGetHostUUIDStr(char *host_uuid); + int virUUIDGenerate(unsigned char *uuid); int virUUIDParse(const char *uuidstr, Index: libvirt-acl/src/util/uuid.c =================================================================== --- libvirt-acl.orig/src/util/uuid.c +++ libvirt-acl/src/util/uuid.c @@ -38,11 +38,14 @@ #include "util.h" #include "virterror_internal.h" #include "logging.h" +#include "memory.h" #ifndef ENODATA # define ENODATA EIO #endif +static unsigned char host_uuid[VIR_UUID_BUFLEN]; + static int virUUIDGenerateRandomBytes(unsigned char *buf, int buflen) @@ -208,3 +211,154 @@ void virUUIDFormat(const unsigned char * uuid[12], uuid[13], uuid[14], uuid[15]); uuidstr[VIR_UUID_STRING_BUFLEN-1] = '\0'; } + + + +/** + * isValidHostUUID + * + * @uuid: The UUID to test + * + * Do some basic tests to check whether the given UUID is + * valid as a host UUID. + * Basic tests: + * - Not all of the digits may be equal + */ +static int +isValidHostUUID(unsigned char *uuid) +{ + unsigned int i, ctr = 1; + unsigned char c; + + if (!uuid) + return 0; + + c = uuid[0]; + + for (i = 1; i < VIR_UUID_BUFLEN; i++) + if (uuid[i] == c) + ctr++; + + return (ctr != VIR_UUID_BUFLEN); +} + +static int +getDMISystemUUID(char *uuid, int len) +{ + const char *dmidecodearg[] = { "dmidecode", "-s", "system-uuid", NULL }; + const char *const dmidecodeenv[] = { "LC_ALL=C", NULL }; + char *binary, *newline; + int dmidecodestdout = -1; + int ret = -1; + pid_t child; + + binary = virFindFileInPath(dmidecodearg[0]); + if (binary == NULL || access(binary, X_OK) != 0) { + VIR_FREE(binary); + return -1; + } + dmidecodearg[0] = binary; + + if (virExec(dmidecodearg, dmidecodeenv, NULL, + &child, -1, &dmidecodestdout, NULL, VIR_EXEC_CLEAR_CAPS) < 0) { + ret = -1; + goto cleanup; + } + + if((ret = saferead(dmidecodestdout, uuid, len)) <= 0) { + ret = -1; + goto cleanup; + } + uuid[ret-1] = '\0'; + + /* strip newline */ + newline = strrchr(uuid, '\n'); + if (newline) + *newline = '\0'; + + ret = 0; + +cleanup: + VIR_FREE(binary); + + if (close(dmidecodestdout) < 0) + ret = -1; + + return ret; +} + + +/** + * setHostUUID + * + * @host_uuid: UUID that the host is supposed to have + * + * Set the UUID of the host if it hasn't been set, yet + * Returns 0 in case of success, an error code in case of error. + */ +int +virSetHostUUIDStr(const char *uuid) +{ + char dmiuuid[VIR_UUID_STRING_BUFLEN]; + + if (isValidHostUUID(host_uuid)) + return EEXIST; + + if (!uuid) { + if (!getDMISystemUUID(dmiuuid, sizeof(dmiuuid))) { + if (!virUUIDParse(dmiuuid, host_uuid)) { + return 0; + } + } + } else { + if (!virUUIDParse(uuid, host_uuid)) + return 0; + } + + if (!isValidHostUUID(host_uuid)) + return virUUIDGenerate(host_uuid); + return 0; +} + +/** + * getHostUUID: + * + * @host_uuid: memory to store the host_uuid into + * + * Get the UUID of the host. Returns 0 in case of success, + * an error code otherwise. + * Returns 0 in case of success, an error code in case of error. + */ +int virGetHostUUID(unsigned char *uuid) +{ + int ret = 0; + + if (!isValidHostUUID(host_uuid)) + ret = virSetHostUUIDStr(NULL); + + memcpy(uuid, host_uuid, sizeof(host_uuid)); + + return ret; +} + + +/** + * getHostUUID: + * + * @host_uuid: memory to store the host_uuid into + * + * Get the UUID of the host. Returns 0 in case of success, + * an error code otherwise. + * Returns 0 in case of success, an error code in case of error. + */ +int virGetHostUUIDStr(char *uuid) +{ + int ret = 0; + + if (!isValidHostUUID(host_uuid)) + ret = virSetHostUUIDStr(NULL); + + virUUIDFormat(host_uuid, uuid); + + return ret; +} Index: libvirt-acl/src/conf/capabilities.c =================================================================== --- libvirt-acl.orig/src/conf/capabilities.c +++ libvirt-acl/src/conf/capabilities.c @@ -27,6 +27,7 @@ #include "buf.h" #include "memory.h" #include "util.h" +#include "uuid.h" #include "cpu_conf.h" /** @@ -662,9 +663,12 @@ virCapabilitiesFormatXML(virCapsPtr caps { virBuffer xml = VIR_BUFFER_INITIALIZER; int i, j, k; + char host_uuid[VIR_UUID_STRING_BUFLEN]; + virGetHostUUIDStr(host_uuid); virBufferAddLit(&xml, "<capabilities>\n\n"); virBufferAddLit(&xml, " <host>\n"); + virBufferVSprintf(&xml," <uuid>%s</uuid>\n", host_uuid); virBufferAddLit(&xml, " <cpu>\n"); virBufferVSprintf(&xml, " <arch>%s</arch>\n", caps->host.arch); Index: libvirt-acl/docs/schemas/capability.rng =================================================================== --- libvirt-acl.orig/docs/schemas/capability.rng +++ libvirt-acl/docs/schemas/capability.rng @@ -18,6 +18,9 @@ <define name='hostcaps'> <element name='host'> + <element name='uuid'> + <ref name='UUID'/> + </element> <element name='cpu'> <element name='arch'> <ref name='archnames'/> @@ -349,4 +352,15 @@ <param name='pattern'>[a-zA-Z0-9\-_]+</param> </data> </define> + + <define name="UUID"> + <choice> + <data type="string"> + <param name="pattern">[a-fA-F0-9]{32}</param> + </data> + <data type="string"> + <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> + </data> + </choice> + </define> </grammar> Index: libvirt-acl/src/libvirt_private.syms =================================================================== --- libvirt-acl.orig/src/libvirt_private.syms +++ libvirt-acl/src/libvirt_private.syms @@ -708,6 +708,9 @@ usbDeviceFileIterate; virUUIDFormat; virUUIDGenerate; virUUIDParse; +virSetHostUUIDStr; +virGetHostUUID; +virGetHostUUIDStr; # virterror_internal.h Index: libvirt-acl/daemon/libvirtd.conf =================================================================== --- libvirt-acl.orig/daemon/libvirtd.conf +++ libvirt-acl/daemon/libvirtd.conf @@ -312,3 +312,12 @@ # e.g.: # log_outputs="3:syslog:libvirtd" # to log all warnings and errors to syslog under the libvirtd ident + +# UUID of the host: +# Provide the UUID of the host here in case the command +# 'dmidecode -s system-uuid' does not provide a valid uuid. In case +# 'dmidecode' does not provide a valid UUID and none is provided here, a +# temporary UUID will be generated. +# Keep the format of the example UUID below. + +#host_uuid = '8510b1a1-1afa-4da6-8111-785fae202c1d' Index: libvirt-acl/libvirt.spec.in =================================================================== --- libvirt-acl.orig/libvirt.spec.in +++ libvirt-acl/libvirt.spec.in @@ -192,6 +192,7 @@ Requires: %{name}-client = %{version}-%{ # daemon is present %if %{with_libvirtd} Requires: bridge-utils +Requires: dmidecode %endif %if %{with_network} Requires: dnsmasq

2 1

Re: [libvirt] [PATCH] network: bridge: Don't start network if it collides with host routing
by Neil Wilson 24 May '10

24 May '10

You need to be very careful not to hit a valid use case here. RFC3069 provides for a mechanism whereby a supernet/subnet system is setup to allow better use of available IPv4 address space. This is becoming of increasing concern as IPv4 space exhausts. To implement this you turn on Proxy ARP on a host and inject /32 routes advertised from other hosts into the routing table. The network on the current host has a wide subnet mask (for example 10.0.0.0/8), so that the host responds to ARPs for VM guests that are actually on a completely different host. So you could have the situation where you have routes picked up via a dynamic routing protocol (say OSPF) on a host that are inside the range for the defined network in libvirt. Failing to start the network in that case would be incorrect. -- Neil Wilson -- Neil Wilson

2 3

[libvirt] Question about the libvirt Java bindings
by Dustin Xiong 24 May '10

24 May '10

Dear all: I encounter a problem when I running the libvirt java bindings test program. I download the libvirt-java-0.4.3.tar.gz. Then compiled successful, but the test program can't running. # ant build Buildfile: build.xml init: [copy] Copying 1 file to /home/dustin/libvirt-java-0.4.3 build: BUILD SUCCESSFUL Total time: 0 seconds # javac -classpath /home/dustin/libvirt-java-0.4.3/target/libvirt-0.4.3.jar test.java Note: test.java uses or overrides a deprecated API. Note: Recompile with -Xlint:deprecation for details. (I think this will not affect the use of libvirt library. It‘s just a warning. javac -classpath /home/dustin/libvirt-java-0.4.3/target/libvirt-0.4.3.jar test.java -Xlint:deprecation test.java:142: warning: [deprecation] networkLookupByUUID(int[]) in org.libvirt.Connect has been deprecated testNetwork = conn.networkLookupByUUID(UUIDArray); ^ 1 warning Maybe I am wrong?) # java -classpath .:/usr/share/java/jna.jar:/home/dustin/libvirt-java-0.4.3/target/libvirt-0.4.3.jar test Exception in thread "main" java.lang.UnsatisfiedLinkError: jnidispatch (/com/sun/jna/linux-i386/libjnidispatch.so) not found in resource path at com.sun.jna.Native.loadNativeLibraryFromJar(Native.java:592) at com.sun.jna.Native.loadNativeLibrary(Native.java:574) at com.sun.jna.Native.<clinit>(Native.java:104) at org.libvirt.jna.Libvirt.<clinit>(Unknown Source) at org.libvirt.Connect.<clinit>(Unknown Source) at test.main(test.java:43) I test other test.java, the results are the same. I don't know the libjnidispatch.so can't be find is caused by the libvirt-java or JNA library. How can I resolve the problem? My java environment as below: libjna-java-3.1.0-1 sun-java6-jdk-6-15-1 junit-3.8.2-3 Thank you very much. -Dustin 2010-5-24 _________________________________________________________________ Hotmail: Trusted email with Microsoft’s powerful SPAM protection. https://signup.live.com/signup.aspx?id=60969

2 1