June 2015 - Devel - libvirt List Archives

[libvirt] [PATCH] libvirt/hooks: Static and dynamic hugepage hooks
by Alex Williamson 29 Jun '15

29 Jun '15

This patch provides scripts for hugepage allocation, as well as a bit of infrastructure and common hook config file that I hope may some day be enabled by default in libvirt. For now, we place the files in /usr/share and ask users to install the config file and copy or link the scripts, more like "contrib" scripts for now. Two methods of hugepage allocation are provided, static and dynamic. The static mechanism allocates pages at libvirt daemon startup and releases them at shutdown. It allows full size, locality, and policy configuration. For instance, if I want to allocate a set of 2M pages exclusively on host NUMA node 1, it can do that, along with plenty more. This is especially useful for 1G hugepages on x86, since they can now be allocated dynamically, but become impractical to allocate due to memory fragmentation as the host runs. Systems dedicated to hosting VMs are also likely to prefer static allocation. Static allocation requires explicit XML entries in the hook config file to be activated. The dynamic method allocates hugepages only around the instantiation of the VM. This is enabled by adding an entry for the domain in the config file and configuring the domain normally for hugepages. The dynamic hugepage script is activated via the QEMU domain prepare hook, reads the domain XML and allocates hugepages as necessary. On domain shutdown, hugepages are freed via the release hook. This model is more appropriate for systems that are not dedicated VM hosts and guests that use hugepage sizes and quantities are are likely to be dynamically allocated as the VM is started. In addition to the documentation provided within each script, a README file is provided with overal instructions and summaries of the individual scripts. Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com> --- Makefile.am | 2 configure.ac | 3 hooks/Makefile.am | 27 ++++ hooks/README | 47 +++++++ hooks/daemon | 33 +++++ hooks/daemon.d/Makefile.am | 21 +++ hooks/daemon.d/static-hugepages.sh | 100 +++++++++++++++ hooks/functions.sh | 180 +++++++++++++++++++++++++++ hooks/libvirt-hook-config.xml | 38 ++++++ hooks/qemu | 40 ++++++ hooks/qemu.d/Makefile.am | 21 +++ hooks/qemu.d/dynamic-hugepages.sh | 238 ++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 13 ++ 13 files changed, 761 insertions(+), 2 deletions(-) create mode 100644 hooks/Makefile.am create mode 100644 hooks/README create mode 100755 hooks/daemon create mode 100644 hooks/daemon.d/Makefile.am create mode 100755 hooks/daemon.d/static-hugepages.sh create mode 100755 hooks/functions.sh create mode 100644 hooks/libvirt-hook-config.xml create mode 100755 hooks/qemu create mode 100644 hooks/qemu.d/Makefile.am create mode 100755 hooks/qemu.d/dynamic-hugepages.sh diff --git a/Makefile.am b/Makefile.am index 9796069..e4a709a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ examples/dominfo examples/domsuspend examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap \ tools/wireshark examples/dommigrate \ - examples/lxcconvert examples/domtop + examples/lxcconvert examples/domtop hooks ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 93f9e38..b0dc035 100644 --- a/configure.ac +++ b/configure.ac @@ -2812,7 +2812,8 @@ AC_CONFIG_FILES([\ examples/xml/nwfilter/Makefile \ examples/lxcconvert/Makefile \ tools/wireshark/Makefile \ - tools/wireshark/src/Makefile]) + tools/wireshark/src/Makefile \ + hooks/Makefile hooks/daemon.d/Makefile hooks/qemu.d/Makefile]) AC_OUTPUT AC_MSG_NOTICE([]) diff --git a/hooks/Makefile.am b/hooks/Makefile.am new file mode 100644 index 0000000..1fe6076 --- /dev/null +++ b/hooks/Makefile.am @@ -0,0 +1,27 @@ +## Copyright (C) 2015 Red Hat, Inc. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +SUBDIRS = daemon.d qemu.d + +hooksdir = $(pkgdatadir)/hooks +hooks_DATA = \ + daemon \ + functions.sh \ + libvirt-hook-config.xml \ + qemu \ + README + +EXTRA_DIST = $(hooks_DATA) diff --git a/hooks/README b/hooks/README new file mode 100644 index 0000000..8114c16 --- /dev/null +++ b/hooks/README @@ -0,0 +1,47 @@ +libivrt contributed and example hook scripts + +libvirt provides several static hooks for use around daemon startup and +shutdown as well as various points around domain and network lifecycle. +See https://www.libvirt.org/hooks.html for formal documentation. + +Summary of scripts available here: + +- daemon: + Supports sub-scripts in daemon.d directory +- qemu: + Supports sub-scripts in qemu.d directory +- daemon.d/static-hugepages.sh: + Supports hugepage allocations around libvirt daemon init + (Requires: xmllint numactl) +- qemu.d/dynamic-hugepages.sh: + Supports hugepage allocations around QEMU domain instantiation + (Requires: xmllint numactl) +- functions.sh: + Shared utility functions for scripts +- libvirt-hook-config.xml: + Base config file for scripts + +Please consult each script for further details. + +To use: + +1) Copy libvirt-hook-config.xml to /etc/sysconfig/ and modify as desired + +2) If only a single sub-script per hook type is needed, it may be copied + directly to /etc/libvirt/hooks, Ex: + cp qemu.d/dynamic-hugepages.sh /etc/libvirt/hooks/qemu + + If multiple sub-scripts per hook type are needed, or to support additional + sub-scripts later, use the stub qemu and daemon scripts here, create + qemu.d and daemon.d sub-directories under /etc/libvirt/hooks/ and copy + the desired scripts to the sub-directories, Ex: + cp qemu /etc/libvirt/hooks/ + mkdir /etc/libvirt/hooks/qemu.d + cp qemu.d/dynamic-hugepages.sh /etc/libvirt/hooks/qemu.d/ + + To easily get all of the scripts, it's possible to simply soft link + the entire directory, Ex: + ln -s /usr/share/libvirt/hooks /etc/libvirt/hooks + +3) Restart the libvirt daemon to re-read hook scripts: + systemctl restart libvirtd.service diff --git a/hooks/daemon b/hooks/daemon new file mode 100755 index 0000000..7b8947d --- /dev/null +++ b/hooks/daemon @@ -0,0 +1,33 @@ +#!/bin/sh + +# Copyright (C) 2015 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. + +# This script is intended to implement a libvirt /etc/libvirt/hooks/daemon +# script and extend daemon execution out to all executable scripts in the +# daemon.d subdirectory. To use, copy to /etc/libvirt/hooks/ and place +# any sub-scripts in a daemon.d subdirectory. + +DIR="/etc/libvirt/hooks/daemon.d/" + +if [ -d $DIR ]; then + for SCRIPT in $(find $DIR -type f -executable); do + $SCRIPT $@ + if [ $? -ne 0 ]; then + exit 1 + fi + done +fi diff --git a/hooks/daemon.d/Makefile.am b/hooks/daemon.d/Makefile.am new file mode 100644 index 0000000..ad9d6cb --- /dev/null +++ b/hooks/daemon.d/Makefile.am @@ -0,0 +1,21 @@ +## Copyright (C) 2015 Red Hat, Inc. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +daemonddir = $(pkgdatadir)/hooks/daemon.d +daemond_DATA = \ + static-hugepages.sh + +EXTRA_DIST = $(daemond_DATA) diff --git a/hooks/daemon.d/static-hugepages.sh b/hooks/daemon.d/static-hugepages.sh new file mode 100755 index 0000000..081209d --- /dev/null +++ b/hooks/daemon.d/static-hugepages.sh @@ -0,0 +1,100 @@ +#!/bin/sh + +# Copyright (C) 2015 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. + +# This script makes use of the libvirt hook interface for the libvirt daemon +# to allocate hugepages for domains during libvirt startup, releasing pages +# at libvirt shutdown. Hugepages are allocated statically, so long as the +# libvirt daemon is running. This mechanism is predominantly useful for +# hosts where the domains use very large hugepages or the majority of host +# memory, making dynamic allocation unreliable. The config file entry to +# enable this hook includes some number of hugepages elements of the form: +# +# <config> +# <daemon> +# <static-hugepages> +# <hugepages size="2048" unit="k" mode="strict" nodeset="0-1">1024</hugepages> +# <hugepages size="1" unit="G" mode="preferred" nodeset="2">4</hugepages> +# </static-hugepages> +# </daemon> +# </config> +# +# The above example allocates 1024, 2M pages (2G total), strictly across nodes +# 0-1 and 4, 1G pages (4G) total with a preferred node policy of node 2. Like +# the numatune elements in libvirt, the @mode may be one of "strict", +# "interleave", or "preferred", matching the libnuma policy. The default mode +# is strict. @size and @unit specify the size of hugepage, using the standard +# libvirt unit values. 1KiB is the default unit size. @nodeset makes use of +# the standard libvirt range support, allowing sets, ranges, and exclusions. +# NB, mode="preferred" requires a singleton nodeset. + +CONFIG="/etc/sysconfig/libvirt-hook-config.xml" + +source /usr/share/libvirt/hooks/functions.sh + +# Utilities required to parse our config file and set NUMA policy +which xmllint > /dev/null 2>&1 +if [ $? -ne 0 ]; then + exit 0 +fi + +which numactl > /dev/null 2>&1 +if [ $? -ne 0 ]; then + exit 0 +fi + +if [ ! -e $CONFIG ]; then + exit 0 +fi + +case "$2" in + start | shutdown) + ;; + *) + exit 0 + ;; +esac + +XMLLINT="xmllint --xpath" + +BASE="/config/daemon/static-hugepages/hugepages" + +for i in $(seq 1 $($XMLLINT "count($BASE)" $CONFIG 2>/dev/null)); do + SIZE=$($XMLLINT "string($BASE[$i]/@size)" $CONFIG 2>/dev/null) + UNIT=$($XMLLINT "string($BASE[$i]/@unit)" $CONFIG 2>/dev/null) + if [ -z "$UNIT" ]; then + UNIT=KiB + fi + COUNT=$($XMLLINT "$BASE[$i]/text()" $CONFIG 2>/dev/null) + + POLICY=$($XMLLINT "string($BASE[$i]/@mode)" $CONFIG 2>/dev/null) + NODESET=$($XMLLINT "string($BASE[$i]/@nodeset)" $CONFIG 2>/dev/null) + if [ -n "$NODESET" ] && [ -z "$POLICY" ]; then + POLICY=strict + fi + + case "$2" in + start) + addhugepages $SIZE $UNIT $COUNT $NODESET $POLICY + ;; + shutdown) + addhugepages $SIZE $UNIT -$COUNT $NODESET $POLICY + ;; + esac +done + +exit 0 diff --git a/hooks/functions.sh b/hooks/functions.sh new file mode 100755 index 0000000..07f52db --- /dev/null +++ b/hooks/functions.sh @@ -0,0 +1,180 @@ +#!/bin/sh + +# Copyright (C) 2015 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. + +# parserange($RANGE) +# +# This takes a libvirt defined range, of the form "1-7,^4,15-17" and +# parses it into an explicit list "1 2 3 5 6 7 15 16 17". The negations +# are only allowed for single numbers, not ranges because that's what +# libvirt does. Ordering is also important, "1-7,^4" is not the same as +# "^4,1-7". We assume a well formed range since we get it from libvirt. +function parserange { + declare -a BITMAP=() + CUR=0 + + while [ $CUR -lt ${#1} ]; do + unset NEGATE + START=0 + END=0 + + if [ ${1:$CUR:1} == ',' ]; then + CUR=$(( $CUR + 1 )) + continue + fi + + if [ ${1:$CUR:1} == '^' ]; then + CUR=$(( $CUR + 1 )) + NEGATE=1 + fi + + while [ $CUR -lt ${#1} ]; do + case ${1:$CUR:1} in + [0-9]) + START=$(( ( $START * 10 ) + ${1:$CUR:1} )) + CUR=$(( $CUR + 1 )) + ;; + *) + break + ;; + esac + done + + if [ $CUR -eq ${#1} ] || [ ${1:$CUR:1} == ',' ]; then + if [ -n "$NEGATE" ]; then + unset BITMAP[$START] + else + BITMAP[$START]=$START + fi + elif [ ${1:$CUR:1} == '-' ]; then + CUR=$(( $CUR + 1 )) + while [ $CUR -lt ${#1} ]; do + case ${1:$CUR:1} in + [0-9]) + END=$(( ( $END * 10 ) + ${1:$CUR:1} )) + CUR=$(( $CUR + 1 )) + ;; + *) + break + ;; + esac + done + + for i in $(seq $START $END); do + BITMAP[$i]=$i + done + fi + done + + echo ${BITMAP[@]} +} + +# parsesize($SIZE [$UNIT]) +# +# This takes a $SIZE and optional $UNIT and returns bytes. If a unit is not +# provided, 1KiB is assumed. +function parsesize { + MULTIPLIER=1024 + if [ -n "$2" ]; then + case "$2" in + b) + MULTIPLIER=1 + ;; + KB) + MULTIPLIER=1000 + ;; + KiB | k | kB) + MULTIPLIER=1024 + ;; + MB) + MULTIPLIER=1000000 + ;; + MiB | M) + MULTIPLIER=$(( 1024 * 1024 )) + ;; + GB) + MULTIPLIER=1000000000 + ;; + GiB | G) + MULTIPLIER=$(( 1024 * 1024 * 1024 )) + ;; + *) + echo "$0: Invalid hugepage unit: $2" >&2 + exit 1 + esac + fi + + echo $(( ( $1 * $MULTIPLIER ) )) +} + +# addhugepages($SIZE $UNIT $COUNT [$NODES [$POLICY]]) +# +# Given a hugepage size, as defined by $SIZE and $UNIT, attempt to allocate +# $COUNT, with an optional $NODES NUMA node range and $POLICY. This uses +# the raw sysfs hugepages interface rather than `virsh allocpages` in order +# to avoid issues with calling libvirt from within a hook function. +function addhugepages { + SYSFSNODE="/sys/kernel/mm/hugepages/hugepages-" + + HUGE=$(parsesize $1 $2) + SYSFSNODE+=$(( $HUGE / 1024 )) + SYSFSNODE+="kB" + + if [ ! -d $SYSFSNODE ]; then + echo "$0: Hugepage size $(( $HUGE / 1024 ))kB not supported by kernel" >&2 + exit 1 + fi + + NR="nr_hugepages" + PREFIX="" + if [ -n "$4" ]; then + NR+="_mempolicy" + + NODES=$(parserange "$4") + NODES=$(echo $NODES | sed -e 's/ /,/g') + + if [ -z "$5" ]; then + PREFIX="numactl -m $NODES" + else + case "$5" in + strict) + PREFIX="numactl -m $NODES" + ;; + interleave) + PREFIX="numactl -i $NODES" + ;; + preferred) + if [ $(expr index "$NODES" ",") -ne 0 ]; then + echo "$0: \"preferred\" memory policy only supports single node" >&2 + exit 1 + fi + PREFIX="numactl --preferred $NODES" + ;; + esac + fi + fi + + # NB: count ($3) can be negative! + NEW=$(( $(cat $SYSFSNODE/$NR) + $3 )) + if [ $NEW -lt 0 ]; then + NEW=0 + fi + $PREFIX echo $NEW > $SYSFSNODE/$NR + + # TBD: should we check for sufficient free pages or go on blindly? + # For now, the latter. +} diff --git a/hooks/libvirt-hook-config.xml b/hooks/libvirt-hook-config.xml new file mode 100644 index 0000000..1d8bdce --- /dev/null +++ b/hooks/libvirt-hook-config.xml @@ -0,0 +1,38 @@ + + +<config> + <daemon> + <static-hugepages> +  + </static-hugepages> + </daemon> + <qemu> + <dynamic-hugepages> +  + </dynamic-hugepages> + </qemu> +</config> diff --git a/hooks/qemu b/hooks/qemu new file mode 100755 index 0000000..2652831 --- /dev/null +++ b/hooks/qemu @@ -0,0 +1,40 @@ +#!/bin/sh + +# Copyright (C) 2015 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. + +# This script is intended to implement a libvirt /etc/libvirt/hooks/qemu +# script and extend qemu execution out to all executable scripts in the +# qemu.d subdirectory. To use, copy to /etc/libvirt/hooks/ and place +# any sub-scripts in a qemu.d subdirectory. + +DIR="/etc/libvirt/hooks/qemu.d/" + +# Domain xml is passed as stdin to the script, supply the same for sub-scripts +XML=$(mktemp) +cat - > $XML + +if [ -d $DIR ]; then + for SCRIPT in $(find $DIR -type f -executable); do + $SCRIPT $@ < $XML + if [ $? -ne 0 ]; then + rm $XML + exit 1 + fi + done +fi + +rm $XML diff --git a/hooks/qemu.d/Makefile.am b/hooks/qemu.d/Makefile.am new file mode 100644 index 0000000..64fe64d --- /dev/null +++ b/hooks/qemu.d/Makefile.am @@ -0,0 +1,21 @@ +## Copyright (C) 2015 Red Hat, Inc. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +qemuddir = $(pkgdatadir)/hooks/qemu.d +qemud_DATA = \ + dynamic-hugepages.sh + +EXTRA_DIST = $(qemud_DATA) diff --git a/hooks/qemu.d/dynamic-hugepages.sh b/hooks/qemu.d/dynamic-hugepages.sh new file mode 100755 index 0000000..438c0c9 --- /dev/null +++ b/hooks/qemu.d/dynamic-hugepages.sh @@ -0,0 +1,238 @@ +#!/bin/sh + +# Copyright (C) 2015 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. + +# This script makes use of the libvirt hook interface for qemu in order to +# attempt to allocate hugepages for a domain around instantiation. We will +# only try to allocate hugepages for VMs both configured for hugepages and +# listed in our config file as enabled for dynamic hugepages. The config file +# entry is simply a list of domain names enabled for dynamic hugepages, ex: +# +# <config> +# <qemu> +# <dynamic-hugepages> +# <domain name="domain1"/> +# <domain name="domain2"/> +# </dynamic-hugepages> +# </qemu> +# </config> +# +# The host system will often be able to accomodate hugepage requests so long +# memory isn't too fragmented. Domains making use of a significant portion of +# host memory or very large hugepages may be better served using static +# hugepage hooks. + +CONFIG="/etc/sysconfig/libvirt-hook-config.xml" + +source /usr/share/libvirt/hooks/functions.sh + +# Utilities required to parse our config file and set NUMA policy +which xmllint > /dev/null 2>&1 +if [ $? -ne 0 ]; then + exit 0 +fi + +which numactl > /dev/null 2>&1 +if [ $? -ne 0 ]; then + exit 0 +fi + +if [ ! -e $CONFIG ]; then + exit 0 +fi + +case "$2" in + prepare | release) + ;; + *) + exit 0 + ;; +esac + +XMLLINT="xmllint --xpath" + +BASE="/config/qemu/dynamic-hugepages/domain" + +# Is this domain enabled in the config file? +$XMLLINT "$BASE[@name=\"$1\"]/@name" $CONFIG > /dev/null 2>&1 +if [ $? -ne 0 ]; then + exit 0 +fi + +# Domain XML is provided via stdin, save it somewhere +XML=$(mktemp) +cat - > $XML + +# Abort if the domain isn't configure for hugepages +$XMLLINT "/domain/memoryBacking/hugepages" $XML > /dev/null 2>&1 +if [ $? -ne 0 ]; then + rm $XML + exit 0 +fi + +# The easy non-NUMA guest case first. If no page size is specified, read the +# default hugepage size from /proc/meminfo. NB, our size parsing needs to +# handle "kB" in addition to the libvirt defined units for this. If page size +# is specified, there can be only one, so parse @size, @unit, and @nodeset and +# do the allocation/deallocation. + +$XMLLINT "/domain/cpu/numa" $XML > /dev/null 2>&1 +if [ $? -ne 0 ]; then + BASE="/domain/memoryBacking/hugepages/page" + $XMLLINT "$BASE/@size" $XML > /dev/null 2>&1 + if [ $? -ne 0 ]; then + # grep Hugepagesize /proc/meminfo + # Hugepagesize: 2048 kB + HPAGESIZE=$(grep Hugepagesize /proc/meminfo | awk '{print $2}') + HPAGEUNIT=$(grep Hugepagesize /proc/meminfo | awk '{print $3}') + else + HPAGESIZE=$($XMLLINT "string($BASE/@size)" $XML 2>/dev/null) + HPAGEUNIT=$($XMLLINT "string($BASE/@unit)" $XML 2>/dev/null) + HPAGENODE=$($XMLLINT "string($BASE/@nodeset)" $XML 2>/dev/null) + fi + + + MEMORY=$($XMLLINT "/domain/memory/text()" $XML 2>/dev/null) + UNIT=$($XMLLINT "string(/domain/memory/@unit)" $XML 2> /dev/null) + MEMORY=$(parsesize $MEMORY $UNIT) + HSIZE=$(parsesize $HPAGESIZE $HPAGEUNIT) + COUNT=$(( $MEMORY / $HSIZE )) + case "$2" in + prepare) + addhugepages $HPAGESIZE $HPAGEUNIT $COUNT $HPAGENODE + ;; + release) + addhugepages $HPAGESIZE $HPAGEUNIT -$COUNT $HPAGENODE + ;; + esac + + rm $XML + exit 0 +fi + +# The harder case, get the guest NUMA id and node memory size from the cpu/numa +# tags. Cross reference this to numatune options to get the host nodeset for +# the memory. Then, figure out which page sizes are allowed on which host +# nodes. The libvirt xml is not well specified here, a numatune nodeset can +# span host nodes, which are not required to use the same page size. We can +# also still have hugepages that are not associated with a node. This code +# assumes that lack of a nodeset matches anything; we don't look for the "best" +# match and that the numatune nodeset must be fully contained within a host +# hugepages size set, or else we skip it. +for ID in $($XMLLINT "/domain/cpu/numa/cell/@id" $XML 2>/dev/null); do + BASE="/domain/cpu/numa/cell" + MEMORY=$($XMLLINT "string($BASE[@$ID]/@memory)" $XML 2>/dev/null) + UNIT=$($XMLLINT "string($BASE[@$ID]/@unit)" $XML 2>/dev/null) + if [ -z "$UNIT" ]; then + UNIT=KiB + fi + CELLID=$($XMLLINT "string($BASE[@$ID]/@id)" $XML 2>/dev/null) + CELLID=$(echo cellid=\"$CELLID\") + + unset POLICY + unset CELLNODE + + # First choice, use a memnode matching this cellid + BASE="/domain/numatune/memnode" + $XMLLINT "$BASE" $XML > /dev/null 2>&1 + if [ $? -eq 0 ]; then + $XMLLINT "$BASE[@$CELLID]" $XML > /dev/null 2>&1 + if [ $? -eq 0 ]; then + POLICY=$($XMLLINT "string($BASE[@$CELLID]/@mode)" $XML 2>/dev/null) + CELLNODE=$($XMLLINT "string($BASE[@$CELLID]/@nodeset)" $XML 2>/dev/null) + if [ -n "$CELLNODE" ] && [ -z "$POLICY" ]; then + POLICY=strict + fi + fi + fi + + # Second choice, use the memory element as the default (if exists) + if [ -z "$POLICY" ]; then + BASE="/domain/numatune/memory" + $XMLLINT "$BASE" $XML > /dev/null 2>&1 + if [ $? -eq 0 ]; then + POLICY=$($XMLLINT "string($BASE/@mode)" $XML 2>/dev/null) + CELLNODE=$($XMLLINT "string($BASE/@nodeset)" $XML 2>/dev/null) + if [ -n "$CELLNODE" ] && [ -z "$POLICY" ]; then + POLICY=strict + fi + fi + fi + + FOUND=0 + BASE="/domain/memoryBacking/hugepages/page" + $XMLLINT "$BASE/@size" $XML > /dev/null 2>&1 + if [ $? -ne 0 ]; then + HPAGESIZE=$(grep Hugepagesize /proc/meminfo | awk '{print $2}') + HPAGEUNIT=$(grep Hugepagesize /proc/meminfo | awk '{print $3}') + FOUND=1 + else + for SIZE in $($XMLLINT "$BASE/@size" $XML 2>/dev/null); do + HPAGESIZE=$($XMLLINT "string($BASE[@$SIZE]/@size)" $XML 2>/dev/null) + HPAGEUNIT=$($XMLLINT "string($BASE[@$SIZE]/@unit)" $XML 2>/dev/null) + HPAGENODE=$($XMLLINT "string($BASE[@$SIZE]/@nodeset)" $XML 2>/dev/null) + + # If the host hugepage size has no node association, we assume it's + # global. If the guest node has no hostnode association take the first + # available hugepage entry. + if [ -z "$HPAGENODE" ] || [ -z "$CELLNODE" ]; then + FOUND=1 + break + fi + + # Create an arry for the nodeset for the hugepages + declare -a NODEMAP=() + for i in $(parserange $HPAGENODE); do + NODEMAP[$i]=$i + done + + FAIL=0 + # Verify that each node of the numatune nodeset is accounted for + for i in $(parserange $CELLNODE); do + if [ -z "${NODEMAP[$i]}" ]; then + FAIL=1 + break + fi + done + if [ $FAIL -ne 0 ]; then + continue + fi + + FOUND=1 + break + done + fi + + if [ $FOUND -eq 0 ]; then + continue + fi + + MEMORY=$(parsesize $MEMORY $UNIT) + HSIZE=$(parsesize $HPAGESIZE $HPAGEUNIT) + COUNT=$(( $MEMORY / $HSIZE )) + case "$2" in + prepare) + addhugepages $HPAGESIZE $HPAGEUNIT $COUNT $CELLNODE $POLICY + ;; + release) + addhugepages $HPAGESIZE $HPAGEUNIT -$COUNT $CELLNODE $POLICY + ;; + esac +done + +rm $XML +exit 0 diff --git a/libvirt.spec.in b/libvirt.spec.in index dcd174a..ac9f07b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2248,6 +2248,9 @@ exit 0 %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/schemas/ +%dir %{_datadir}/libvirt/hooks/ +%dir %{_datadir}/libvirt/hooks/daemon.d/ +%dir %{_datadir}/libvirt/hooks/qemu.d/ %{_datadir}/libvirt/schemas/basictypes.rng %{_datadir}/libvirt/schemas/capability.rng @@ -2268,6 +2271,16 @@ exit 0 %{_datadir}/libvirt/cpu_map.xml %{_datadir}/libvirt/libvirtLogo.png +%{_datadir}/libvirt/hooks/README +%{_datadir}/libvirt/hooks/libvirt-hook-config.xml +%{_datadir}/libvirt/hooks/functions.sh +%attr(0755, root, root) %{_datadir}/libvirt/hooks/daemon +%attr(0755, root, root) %{_datadir}/libvirt/hooks/qemu + +%attr(0755, root, root) %{_datadir}/libvirt/hooks/daemon.d/static-hugepages.sh + +%attr(0755, root, root) %{_datadir}/libvirt/hooks/qemu.d/dynamic-hugepages.sh + %if %{with_systemd} %{_unitdir}/libvirt-guests.service %else

1 1

[libvirt] RFC: add Intel CMT feature support
by Ren, Qiaowei 29 Jun '15

29 Jun '15

Hi All, Some Intel processor families (e.g. the Intel Xeon processor E5 v3 family) introduced some PQos (Platform Qos) features to monitor or control shared resource. - CMT (Cache Monitoring Technology): measure the usage of cache by applications running on the platform. - CAT (Cache Allocation Technology): enable an OS or Hypervisor/VMM to specify the amount of cache space into which an application can fill. - MBM (Memory Bandwidth Monitoring): build on the CMT infrastructure to allow monitoring of bandwidth from one level of the cache hierarchy to the next - in this case focusing on the L3 cache, which is typically backed directly by system memory. As a result of this implementation, memory bandwidth can be monitored. For more information, see "Intel 64 and IA-32 Architectures Software Developer's Manual". Among these PQos features, currently CMT patches has been merged into Linux kernel mainline. So this patch series proposed in this mail will focus on CMT feature support in libvirt. At the library API layer, I plan on adding cache related field into virDomainInfo and virNodeInfo: Add "cache" member into virNodeInfo to get total size of cache in one node. struct virNodeInfo { ... unsigned int cores; /* number of cores per socket, total number of processors in case of unusual NUMA topology*/ unsigned int threads; /* number of threads per core, 1 in case of unusual numa topology */ + unsigned int cache; /* cache size in bytes */ }; Add "cacheOcc" member into virDomainInfo to get cache occupancy for one VM. struct virDomainInfo { ... unsigned short nrVirtCpu; /* the number of virtual CPUs for the domain */ unsigned long long cpuTime; /* the CPU time used in nanoseconds */ + unsigned long long cacheOcc; /* the cache occupancy in Bytes */ }; With this change, those applications like OpenStack based on libvirt can collect cache usage for metering and monitoring (e.g. any VM using more than X% of cache). Because CMT implementation in Linux kernel is based on perf mechanism and there is no nice and public API library for perf, I have to wrapper system call for perf in libvirt to use CMT feature, and enable/disable perf event for CMT when VM is created/destroyed. Any thoughts on this plan before I start submitting code patches? Do you think whether I need add several new APIs and XML element for CMT feature (or more PQos features)? Thanks, Qiaowei

2 2

[libvirt] [PATCH] qemu: event: Fix retrieval of the "service" field from graphics events
by Peter Krempa 29 Jun '15

29 Jun '15

qemu's event has following format: { "timestamp": { "seconds": 1435580974, "microseconds": 82226 }, "event": "SPICE_INITIALIZED", "data": { "server": { "auth": "none", "port": "5900", "family": "ipv4", "host": "127.0.0.1" }, "client": { "port": "53224", "family": "ipv4", "channel-type": 3, "connection-id": 1113096064, "host": "127.0.0.1", "channel-id": 0, "tls": false } } } Our code tried to extract the "service" field but qemu reports it as "port". --- src/qemu/qemu_monitor_json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d3e98d4..bd73b05 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -652,7 +652,7 @@ static void qemuMonitorJSONHandleGraphics(qemuMonitorPtr mon, virJSONValuePtr da VIR_WARN("missing local hostname in graphics event"); return; } - localService = virJSONValueObjectGetString(server, "service"); + localService = virJSONValueObjectGetString(server, "port"); if (!localService) localService = ""; /* Spice has multiple ports, so this isn't provided */ @@ -666,7 +666,7 @@ static void qemuMonitorJSONHandleGraphics(qemuMonitorPtr mon, virJSONValuePtr da VIR_WARN("missing remote hostname in graphics event"); return; } - remoteService = virJSONValueObjectGetString(client, "service"); + remoteService = virJSONValueObjectGetString(client, "port"); if (!remoteService) remoteService = ""; /* Spice has multiple ports, so this isn't provided */ -- 2.4.1

3 7

[libvirt] [PATCH libvirt-python] virPyDictToTypedParams: packing lists of values
by Pavel Boldin 29 Jun '15

29 Jun '15

Pack a list or a tuple of values passed to a Python method to the multi-value parameter. --- libvirt-override.c | 228 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 129 insertions(+), 99 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 588dac1..45c8afc 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -278,6 +278,126 @@ typedef virPyTypedParamsHint *virPyTypedParamsHintPtr; # define libvirt_PyString_Check PyString_Check # endif +static int +virPyDictToTypedParamOne(virTypedParameterPtr *params, + int *n, + int *max, + virPyTypedParamsHintPtr hints, + int nhints, + const char *keystr, + PyObject *value) +{ + int rv = -1, type = -1; + size_t i; + + for (i = 0; i < nhints; i++) { + if (STREQ(hints[i].name, keystr)) { + type = hints[i].type; + break; + } + } + + if (type == -1) { + if (libvirt_PyString_Check(value)) { + type = VIR_TYPED_PARAM_STRING; + } else if (PyBool_Check(value)) { + type = VIR_TYPED_PARAM_BOOLEAN; + } else if (PyLong_Check(value)) { + unsigned long long ull = PyLong_AsUnsignedLongLong(value); + if (ull == (unsigned long long) -1 && PyErr_Occurred()) + type = VIR_TYPED_PARAM_LLONG; + else + type = VIR_TYPED_PARAM_ULLONG; +#if PY_MAJOR_VERSION < 3 + } else if (PyInt_Check(value)) { + if (PyInt_AS_LONG(value) < 0) + type = VIR_TYPED_PARAM_LLONG; + else + type = VIR_TYPED_PARAM_ULLONG; +#endif + } else if (PyFloat_Check(value)) { + type = VIR_TYPED_PARAM_DOUBLE; + } + } + + if (type == -1) { + PyErr_Format(PyExc_TypeError, + "Unknown type of \"%s\" field", keystr); + goto cleanup; + } + + switch ((virTypedParameterType) type) { + case VIR_TYPED_PARAM_INT: + { + int val; + if (libvirt_intUnwrap(value, &val) < 0 || + virTypedParamsAddInt(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_UINT: + { + unsigned int val; + if (libvirt_uintUnwrap(value, &val) < 0 || + virTypedParamsAddUInt(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_LLONG: + { + long long val; + if (libvirt_longlongUnwrap(value, &val) < 0 || + virTypedParamsAddLLong(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_ULLONG: + { + unsigned long long val; + if (libvirt_ulonglongUnwrap(value, &val) < 0 || + virTypedParamsAddULLong(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_DOUBLE: + { + double val; + if (libvirt_doubleUnwrap(value, &val) < 0 || + virTypedParamsAddDouble(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_BOOLEAN: + { + bool val; + if (libvirt_boolUnwrap(value, &val) < 0 || + virTypedParamsAddBoolean(params, n, max, keystr, val) < 0) + goto cleanup; + break; + } + case VIR_TYPED_PARAM_STRING: + { + char *val;; + if (libvirt_charPtrUnwrap(value, &val) < 0 || + !val || + virTypedParamsAddString(params, n, max, keystr, val) < 0) { + VIR_FREE(val); + goto cleanup; + } + VIR_FREE(val); + break; + } + case VIR_TYPED_PARAM_LAST: + break; /* unreachable */ + } + + rv = 0; + + cleanup: + return rv; +} + + /* Automatically convert dict into type parameters based on types reported * by python. All integer types are converted into LLONG (in case of a negative * value) or ULLONG (in case of a positive value). If you need different @@ -300,7 +420,6 @@ virPyDictToTypedParams(PyObject *dict, Py_ssize_t pos = 0; #endif virTypedParameterPtr params = NULL; - size_t i; int n = 0; int max = 0; int ret = -1; @@ -313,112 +432,23 @@ virPyDictToTypedParams(PyObject *dict, return -1; while (PyDict_Next(dict, &pos, &key, &value)) { - int type = -1; - if (libvirt_charPtrUnwrap(key, &keystr) < 0 || !keystr) goto cleanup; - for (i = 0; i < nhints; i++) { - if (STREQ(hints[i].name, keystr)) { - type = hints[i].type; - break; - } - } + if (PyList_Check(value) || PyTuple_Check(value)) { + Py_ssize_t i, size = PySequence_Size(value); - if (type == -1) { - if (libvirt_PyString_Check(value)) { - type = VIR_TYPED_PARAM_STRING; - } else if (PyBool_Check(value)) { - type = VIR_TYPED_PARAM_BOOLEAN; - } else if (PyLong_Check(value)) { - unsigned long long ull = PyLong_AsUnsignedLongLong(value); - if (ull == (unsigned long long) -1 && PyErr_Occurred()) - type = VIR_TYPED_PARAM_LLONG; - else - type = VIR_TYPED_PARAM_ULLONG; -#if PY_MAJOR_VERSION < 3 - } else if (PyInt_Check(value)) { - if (PyInt_AS_LONG(value) < 0) - type = VIR_TYPED_PARAM_LLONG; - else - type = VIR_TYPED_PARAM_ULLONG; -#endif - } else if (PyFloat_Check(value)) { - type = VIR_TYPED_PARAM_DOUBLE; + for (i = 0; i < size; i++) { + PyObject *v = PySequence_ITEM(value, i); + if (virPyDictToTypedParamOne(&params, &n, &max, + hints, nhints, keystr, v) < 0) + goto cleanup; } - } - - if (type == -1) { - PyErr_Format(PyExc_TypeError, - "Unknown type of \"%s\" field", keystr); + } else if (virPyDictToTypedParamOne(&params, &n, &max, + hints, nhints, keystr, value) < 0) goto cleanup; - } - switch ((virTypedParameterType) type) { - case VIR_TYPED_PARAM_INT: - { - int val; - if (libvirt_intUnwrap(value, &val) < 0 || - virTypedParamsAddInt(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_UINT: - { - unsigned int val; - if (libvirt_uintUnwrap(value, &val) < 0 || - virTypedParamsAddUInt(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_LLONG: - { - long long val; - if (libvirt_longlongUnwrap(value, &val) < 0 || - virTypedParamsAddLLong(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_ULLONG: - { - unsigned long long val; - if (libvirt_ulonglongUnwrap(value, &val) < 0 || - virTypedParamsAddULLong(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_DOUBLE: - { - double val; - if (libvirt_doubleUnwrap(value, &val) < 0 || - virTypedParamsAddDouble(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_BOOLEAN: - { - bool val; - if (libvirt_boolUnwrap(value, &val) < 0 || - virTypedParamsAddBoolean(&params, &n, &max, keystr, val) < 0) - goto cleanup; - break; - } - case VIR_TYPED_PARAM_STRING: - { - char *val;; - if (libvirt_charPtrUnwrap(value, &val) < 0 || - !val || - virTypedParamsAddString(&params, &n, &max, keystr, val) < 0) { - VIR_FREE(val); - goto cleanup; - } - VIR_FREE(val); - break; - } - case VIR_TYPED_PARAM_LAST: - break; /* unreachable */ - } VIR_FREE(keystr); } -- 1.9.1

2 1

[libvirt] [[libvirt-php][PATCH v4] qemu-agent-command] add libvirt_domain_qemu_agent_command
by Vasiliy Tolstov 29 Jun '15

29 Jun '15

add another missing libvirt command Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- configure.ac | 3 +++ src/Makefile.am | 5 +++-- src/libvirt-php.c | 29 +++++++++++++++++++++++++++++ src/libvirt-php.h | 2 ++ 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 04ebbdc..b6ef27a 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,9 @@ fi LIBVIRT_REQUIRED=1.2.8 PKG_CHECK_MODULES(LIBVIRT, libvirt >= $LIBVIRT_REQUIRED) +PKG_CHECK_MODULES(QEMU, libvirt-qemu) +AC_SUBST([QEMU_CFLAGS]) +AC_SUBST([QEMU_LIBS]) dnl ========================================================================== dnl required minimum version of libxml2 diff --git a/src/Makefile.am b/src/Makefile.am index 8e6a800..f270ec2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,13 +27,14 @@ uninstall-local: AM_CFLAGS = \ $(PHPINC) $(LIBXML_CFLAGS) \ - $(LIBVIRT_CFLAGS) $(DEFINES) \ + $(LIBVIRT_CFLAGS) $(QEMU_CFLAGS) $(DEFINES) \ -I$(top_srcdir)/winsrc AM_LDFLAGS = \ $(SHLIB_LDFLAGS) \ $(LIBXML_LIBS) \ - $(LIBVIRT_LIBS) + $(LIBVIRT_LIBS) \ + $(QEMU_LIBS) lib_LTLIBRARIES = libvirt-php.la diff --git a/src/libvirt-php.c b/src/libvirt-php.c index d13e5b4..b018cb0 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -242,6 +242,8 @@ static zend_function_entry libvirt_functions[] = { /* Debugging functions */ PHP_FE(libvirt_logfile_set, NULL) PHP_FE(libvirt_print_binding_resources, NULL) + /* Agent functions */ + PHP_FE(libvirt_domain_qemu_agent_command, NULL) {NULL, NULL, NULL} }; @@ -3611,6 +3613,33 @@ PHP_FUNCTION(libvirt_domain_lookup_by_uuid) } /* + * Function name: libvirt_domain_qemu_agent_command + * Since version: 0.5.2(-1) + * Description: Function is used to send qemu-ga command + * Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + * @timeout [int] timeout for waiting (-2 block, -1 default, 0 no wait, >0 wait specific time + * @flags [int]: unknown + * Returns: String on success and FALSE on error + */ +PHP_FUNCTION(libvirt_domain_qemu_agent_command) +{ + php_libvirt_domain *domain=NULL; + zval *zdomain; + const char *cmd; + int cmd_len; + char *ret; + long timeout = -1; + long flags = 0; + + GET_DOMAIN_FROM_ARGS("rs|ll", &zdomain, &cmd, &cmd_len, &timeout, &flags); + + ret = virDomainQemuAgentCommand(domain->domain, cmd, timeout, flags); + if (ret == NULL) RETURN_FALSE; + + RETURN_STRING(ret, 1); +} + +/* * Function name: libvirt_domain_lookup_by_uuid_string * Since version: 0.4.1(-1) * Description: Function is used to get the domain by it's UUID that's accepted in string format diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 8dc5927..eb4b7f4 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -80,6 +80,7 @@ #include <libvirt/libvirt.h> #include <libvirt/virterror.h> +#include <libvirt/libvirt-qemu.h> #include <libxml/parser.h> #include <libxml/xpath.h> #include <fcntl.h> @@ -423,6 +424,7 @@ PHP_FUNCTION(libvirt_domain_send_keys); PHP_FUNCTION(libvirt_domain_send_pointer_event); PHP_FUNCTION(libvirt_domain_get_metadata); PHP_FUNCTION(libvirt_domain_set_metadata); +PHP_FUNCTION(libvirt_domain_qemu_agent_command); /* Domain snapshot functions */ PHP_FUNCTION(libvirt_domain_has_current_snapshot); PHP_FUNCTION(libvirt_domain_snapshot_create); -- 2.3.3

2 1

[libvirt] [PATCH] util:qemu: fix IOThreadinfo always get failed when get running vm status
by Luyao Huang 29 Jun '15

29 Jun '15

When we use iothreadinfo to get iothread information, we will get error like this: # virsh iothreadinfo rhel7.0 --live error: Unable to get domain IOThreads information error: Unable to encode message payload This is because virProcessGetAffinity() return a bitmap which map_len is too big to send via rpc: (gdb) p *map $7 = {max_bit = 262144, map_len = 4096, map = 0x7f9b6c2c0a20} To fix this issue add a new parameter &maxcpu to virProcessGetAffinity() to let callers specify the maxcpu (also in most machine, no need loop 262144 times to check if cpu is set), if set &maxcpu to zero, virProcessGetAffinity() will use default value (262144 or 1024) to create bitmap. This issue was introduced in commit 825df8c. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++-- src/util/virprocess.c | 7 ++++--- src/util/virprocess.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2b530c8..e1ad696 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1459,7 +1459,7 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo, unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, v); virBitmapPtr map = NULL; - if (!(map = virProcessGetAffinity(priv->vcpupids[v]))) + if (!(map = virProcessGetAffinity(priv->vcpupids[v], hostcpus))) return -1; virBitmapToDataBuf(map, cpumap, maplen); @@ -5619,7 +5619,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver, goto endjob; info_ret[i]->iothread_id = iothreads[i]->iothread_id; - if (!(map = virProcessGetAffinity(iothreads[i]->thread_id))) + if (!(map = virProcessGetAffinity(iothreads[i]->thread_id, hostcpus))) goto endjob; if (virBitmapToData(map, &info_ret[i]->cpumap, diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 8fa7a9b..8800623 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -469,7 +469,8 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map) } virBitmapPtr -virProcessGetAffinity(pid_t pid) +virProcessGetAffinity(pid_t pid, + int maxcpu) { size_t i; cpu_set_t *mask; @@ -504,10 +505,10 @@ virProcessGetAffinity(pid_t pid) goto cleanup; } - if (!(ret = virBitmapNew(ncpus))) + if (!(ret = virBitmapNew(maxcpu ? maxcpu : ncpus))) goto cleanup; - for (i = 0; i < ncpus; i++) { + for (i = 0; i < (maxcpu ? maxcpu : ncpus); i++) { # ifdef CPU_ALLOC /* coverity[overrun-local] */ if (CPU_ISSET_S(i, masklen, mask)) diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 1768009..cc903ac 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -58,7 +58,7 @@ int virProcessKillPainfully(pid_t pid, bool force); int virProcessSetAffinity(pid_t pid, virBitmapPtr map); -virBitmapPtr virProcessGetAffinity(pid_t pid); +virBitmapPtr virProcessGetAffinity(pid_t pid, int maxcpu); int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids); -- 1.8.3.1

3 2

[libvirt] [libvirt-php][PATCH v1] add libvirt_domain_qemu_agent_command
by Vasiliy Tolstov 29 Jun '15

29 Jun '15

add another missing libvirt command Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- configure.ac | 3 +++ src/Makefile.am | 5 +++-- src/libvirt-php.c | 28 ++++++++++++++++++++++++++++ src/libvirt-php.h | 2 ++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9e9fee0..0afa2e2 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,9 @@ PKG_PROG_PKG_CONFIG LIBVIRT_REQUIRED=0.6.2 PKG_CHECK_MODULES(LIBVIRT, libvirt >= $LIBVIRT_REQUIRED) +PKG_CHECK_MODULES(QEMU, libvirt-qemu) +AC_SUBST([QEMU_CFLAGS]) +AC_SUBST([QEMU_LIBS]) dnl ========================================================================== dnl required minimum version of libxml2 diff --git a/src/Makefile.am b/src/Makefile.am index 8e6a800..f270ec2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,13 +27,14 @@ uninstall-local: AM_CFLAGS = \ $(PHPINC) $(LIBXML_CFLAGS) \ - $(LIBVIRT_CFLAGS) $(DEFINES) \ + $(LIBVIRT_CFLAGS) $(QEMU_CFLAGS) $(DEFINES) \ -I$(top_srcdir)/winsrc AM_LDFLAGS = \ $(SHLIB_LDFLAGS) \ $(LIBXML_LIBS) \ - $(LIBVIRT_LIBS) + $(LIBVIRT_LIBS) \ + $(QEMU_LIBS) lib_LTLIBRARIES = libvirt-php.la diff --git a/src/libvirt-php.c b/src/libvirt-php.c index d46fbb9..f9d5557 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -161,6 +161,7 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_send_keys, NULL) PHP_FE(libvirt_domain_send_pointer_event, NULL) PHP_FE(libvirt_domain_update_device, NULL) + PHP_FE(libvirt_domain_qemu_agent_command, NULL) /* Domain snapshot functions */ PHP_FE(libvirt_domain_has_current_snapshot, NULL) PHP_FE(libvirt_domain_snapshot_create, NULL) @@ -3943,6 +3944,33 @@ PHP_FUNCTION(libvirt_domain_get_name) } /* + Function name: libvirt_domain_qemu_agent_command + Since version: 0.5.2(-1) + Description: Function is used to send qemu-ga command + Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + @timeout [int]: timeout for waiting (-2 block, -1 default, 0 no wait, >0 wait specific time + @flags [int]: ?? + Returns: String on success and FALSE on error +*/ +PHP_FUNCTION(libvirt_domain_qemu_agent_command) +{ + php_libvirt_domain *domain=NULL; + zval *zdomain; + const char *cmd; + int cmd_len; + char *ret; + long timeout = -1; + long flags = 0; + + GET_DOMAIN_FROM_ARGS("rs|l|l", &zdomain, &cmd, &cmd_len, &timeout, &flags); + + ret = virDomainQemuAgentCommand(domain->domain, cmd, timeout, flags); + if (ret == NULL) RETURN_FALSE; + + RETURN_STRING(ret,1); +} + +/* Function name: libvirt_domain_get_uuid_string Since version: 0.4.1(-1) Description: Function is used to get the domain's UUID in string format diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 7c9a229..1d9c6ab 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -80,6 +80,7 @@ #include <libvirt/libvirt.h> #include <libvirt/virterror.h> +#include <libvirt/libvirt-qemu.h> #include <libxml/parser.h> #include <libxml/xpath.h> #include <fcntl.h> @@ -427,6 +428,7 @@ PHP_FUNCTION(libvirt_domain_send_keys); PHP_FUNCTION(libvirt_domain_send_pointer_event); PHP_FUNCTION(libvirt_domain_get_metadata); PHP_FUNCTION(libvirt_domain_set_metadata); +PHP_FUNCTION(libvirt_domain_qemu_agent_command); /* Domain snapshot functions */ PHP_FUNCTION(libvirt_domain_has_current_snapshot); PHP_FUNCTION(libvirt_domain_snapshot_create); -- 2.3.3

2 2

[libvirt] [sandbox PATCH 00/10] Patches for Libvirt-sandbox
by Eren Yagdiran 29 Jun '15

29 Jun '15

Hello, These patches provide disk support for libvirt-sandbox. Implemented '--disk' parameter will be useful when integrating Docker image support for libvirt-sandbox. --Main diffs compared to previous patches. Since many hypervisors, including kvm, will not even honour requested names for disk devices we link each device under /dev/disk/by-tag e.g /dev/disk/by-tag/foobar -> /dev/sda We populate disks.cfg with tag to device mapping when we build the sandbox. After that, in each init-process {Common,Qemu}, we basically read the configuration and populate the right symlinks under /dev/disk/by-tag The common functions for modifying directories are moved under Init-util. {Common,Qemu} inits are using them. Cédric Bosdonnat (2): Add gvir_sandbox_config_has_disks function qemu: use devtmpfs rather than tmpfs to auto-populate /dev Eren Yagdiran (8): Add an utility function for guessing filetype from file extension Add configuration object for disk support Add disk parameter to virt-sandbox Add disk support to the container builder Add disk support to machine builder Init-util : Common directory functions for init-common and init-qemu Common-init: Building symlink from disks.cfg Common-builder: /dev/disk/by-tag/thetag to /dev/vdN bin/virt-sandbox.c | 37 +++ libvirt-sandbox/Makefile.am | 7 +- .../libvirt-sandbox-builder-container.c | 33 ++- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 44 ++- libvirt-sandbox/libvirt-sandbox-builder.c | 73 ++++- libvirt-sandbox/libvirt-sandbox-config-disk.c | 273 +++++++++++++++++++ libvirt-sandbox/libvirt-sandbox-config-disk.h | 82 ++++++ libvirt-sandbox/libvirt-sandbox-config.c | 300 +++++++++++++++++++++ libvirt-sandbox/libvirt-sandbox-config.h | 11 + libvirt-sandbox/libvirt-sandbox-init-common.c | 54 +++- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 145 ++-------- libvirt-sandbox/libvirt-sandbox-init-util.c | 57 ++++ libvirt-sandbox/libvirt-sandbox-init-util.h | 40 +++ libvirt-sandbox/libvirt-sandbox-util.c | 72 +++++ libvirt-sandbox/libvirt-sandbox-util.h | 5 + libvirt-sandbox/libvirt-sandbox.h | 1 + libvirt-sandbox/libvirt-sandbox.sym | 5 + libvirt-sandbox/tests/test-config.c | 11 + po/POTFILES.in | 1 + 19 files changed, 1105 insertions(+), 146 deletions(-) create mode 100644 libvirt-sandbox/libvirt-sandbox-config-disk.c create mode 100644 libvirt-sandbox/libvirt-sandbox-config-disk.h create mode 100644 libvirt-sandbox/libvirt-sandbox-init-util.c create mode 100644 libvirt-sandbox/libvirt-sandbox-init-util.h create mode 100644 libvirt-sandbox/libvirt-sandbox-util.c -- 2.1.0

3 22

[libvirt] [PATCH 0/9] support multi-thread compress migration.
by ShaoHe Feng 28 Jun '15

28 Jun '15

These series patches support multi-thread compress during live migration. Eli Qiao (4): Add test cases for qemuMonitorJSONGetMigrationParameter remote: Add support for set and get multil thread migration parameters qemu_driver: Add support to set/get migration parameters. virsh: Add set and get multi-thread migration parameters commands ShaoHe Feng (5): qemu_migration: Add support for mutil-thread compressed migration enable qemu: Add monitor API for get/set migration parameters set multi-thread compress params for Migrate3 during live migration virsh: add multi-thread migration option for live migrate command Implement the public APIs for multi-thread compress parameters. daemon/remote.c | 62 +++++++++++ include/libvirt/libvirt-domain.h | 31 ++++++ src/driver-hypervisor.h | 14 +++ src/libvirt-domain.c | 110 +++++++++++++++++++ src/libvirt_public.syms | 5 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 186 ++++++++++++++++++++++++++++++++ src/qemu/qemu_migration.c | 105 ++++++++++++++++++ src/qemu/qemu_migration.h | 18 +++- src/qemu/qemu_monitor.c | 40 ++++++- src/qemu/qemu_monitor.h | 11 ++ src/qemu/qemu_monitor_json.c | 93 ++++++++++++++++ src/qemu/qemu_monitor_json.h | 9 ++ src/qemu/qemu_monitor_text.c | 95 +++++++++++++++++ src/qemu/qemu_monitor_text.h | 10 ++ src/remote/remote_driver.c | 54 ++++++++++ src/remote/remote_protocol.x | 30 +++++- src/remote_protocol-structs | 26 +++++ tests/qemumonitorjsontest.c | 53 +++++++++ tools/virsh-domain.c | 225 ++++++++++++++++++++++++++++++++++++++- tools/virsh.pod | 36 +++++-- 21 files changed, 1206 insertions(+), 10 deletions(-) -- 2.1.4

1 9

[libvirt] [libvirt-glib] More coverage for networking API
by Zeeshan Ali (Khattak) 27 Jun '15

27 Jun '15

This set of patches improve our coverage for networking APIs of Libvirt.

1 5