@@ -314,6 +314,7 @@ vhdx=""
numa=""
tcmalloc="no"
jemalloc="no"
+unknown_balloon_stats="no"
# parse CC options first
for opt do
@@ -1141,6 +1142,10 @@ for opt do
;;
--enable-jemalloc) jemalloc="yes"
;;
+ --enable-unknown-balloon-stats) unknown_balloon_stats="yes"
+ ;;
+ --disable-unknown-balloon-stats) unknown_balloon_stats="no"
+ ;;
*)
echo "ERROR: unknown option $opt"
echo "Try '$0 --help' for more information"
@@ -1363,6 +1368,8 @@ disabled with --disable-FEATURE, default is enabled if available:
numa libnuma support
tcmalloc tcmalloc support
jemalloc jemalloc support
+ unknown-balloon-stats report unknown balloon statistics counters
+ ;;
NOTE: The object files are built at the place where configure is launched
EOF
@@ -4776,6 +4783,7 @@ echo "bzip2 support $bzip2"
echo "NUMA host support $numa"
echo "tcmalloc support $tcmalloc"
echo "jemalloc support $jemalloc"
+echo "unknown balloon stat counters support $unknown_balloon_stats"
if test "$sdl_too_old" = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -5324,6 +5332,10 @@ if test "$rdma" = "yes" ; then
echo "CONFIG_RDMA=y" >> $config_host_mak
fi
+if test "$unknown_balloon_stats" = "yes" ; then
+ echo "CONFIG_UNKNOWN_BALLOON_STATS=y" >> $config_host_mak
+fi
+
# Hold two types of flag:
# CONFIG_THREAD_SETNAME_BYTHREAD - we've got a way of setting the name on
# a thread we have a handle to
@@ -66,8 +66,7 @@ static const char *balloon_stat_names[] = {
*/
static inline void reset_stats(VirtIOBalloon *dev)
{
- int i;
- for (i = 0; i < VIRTIO_BALLOON_S_NR; dev->stats[i++] = -1);
+ dev->stats_cnt = 0;
}
static bool balloon_stats_supported(const VirtIOBalloon *s)
@@ -133,12 +132,22 @@ static void balloon_stats_get_all(Object *obj, Visitor *v, const char *name,
if (err) {
goto out_end;
}
- for (i = 0; i < VIRTIO_BALLOON_S_NR; i++) {
- visit_type_uint64(v, balloon_stat_names[i], &s->stats[i], &err);
+ for (i = 0; i < s->stats_cnt; i++) {
+ if (s->stats[i].tag < VIRTIO_BALLOON_S_NR) {
+ visit_type_uint64(v, balloon_stat_names[s->stats[i].tag],
+ &s->stats[i].val, &err);
+ } else {
+#if defined(CONFIG_UNKNOWN_BALLOON_STATS)
+ gchar *str = g_strdup_printf("x-stat-%04x", s->stats[i].tag);
+ visit_type_uint64(v, str, &s->stats[i].val, &err);
+ g_free(str);
+#endif
+ }
if (err) {
break;
}
}
+
error_propagate(errp, err);
err = NULL;
visit_end_struct(v, &err);
@@ -273,10 +282,21 @@ static void virtio_balloon_receive_stats(VirtIODevice *vdev, VirtQueue *vq)
== sizeof(stat)) {
uint16_t tag = virtio_tswap16(vdev, stat.tag);
uint64_t val = virtio_tswap64(vdev, stat.val);
+ int i;
offset += sizeof(stat);
- if (tag < VIRTIO_BALLOON_S_NR)
- s->stats[tag] = val;
+ for (i = 0; i < s->stats_cnt; i++) {
+ if (s->stats[i].tag == tag) {
+ break;
+ }
+ }
+ if (i < ARRAY_SIZE(s->stats)) {
+ s->stats[i].tag = tag;
+ s->stats[i].val = val;
+ if (s->stats_cnt <= i) {
+ s->stats_cnt = i + 1;
+ }
+ }
}
s->stats_vq_offset = offset;
@@ -36,7 +36,8 @@ typedef struct VirtIOBalloon {
VirtQueue *ivq, *dvq, *svq;
uint32_t num_pages;
uint32_t actual;
- uint64_t stats[VIRTIO_BALLOON_S_NR];
+ VirtIOBalloonStatModern stats[VIRTIO_BALLOON_S_NR + 32];
+ uint16_t stats_cnt;
VirtQueueElement *stats_vq_elem;
size_t stats_vq_offset;
QEMUTimer *stats_timer;