lib/ukalloc: Add entry IDs and update static entry definitions

Introduce header for definitions related to uk_store. Add
entry IDs for stats tracked by uk_alloc, and update static
entry definitions to pass entry IDs.

Signed-off-by: Michalis Pappas <michalis@unikraft.io>
Reviewed-by: Simon Kuenzer <simon@unikraft.io>
Reviewed-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io>
Approved-by: Simon Kuenzer <simon@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #939

diff --git a/lib/ukalloc/include/uk/alloc_store.h b/lib/ukalloc/include/uk/alloc_store.h
new file mode 100644 (file)
index 0000000..32cdd90
--- /dev/null
+++ b/lib/ukalloc/include/uk/alloc_store.h
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+/* Copyright (c) 2023, Unikraft GmbH and The Unikraft Authors.
+ * Licensed under the BSD-3-Clause License (the "License").
+ * You may not use this file except in compliance with the License.
+ */
+#ifndef __UK_ALLOC_STORE_H__
+#define __UK_ALLOC_STORE_H__
+
+/* stats entry IDs */
+#define UK_ALLOC_STATS_CUR_MEM_FREE            0x01
+#define UK_ALLOC_STATS_LAST_ALLOC_SIZE         0x02
+#define UK_ALLOC_STATS_MAX_ALLOC_SIZE          0x03
+#define UK_ALLOC_STATS_MIN_ALLOC_SIZE          0x04
+#define UK_ALLOC_STATS_TOTAL_NUM_ALLOCS                0x05
+#define UK_ALLOC_STATS_TOTAL_NUM_FREES         0x06
+#define UK_ALLOC_STATS_CUR_NUM_ALLOCS          0x07
+#define UK_ALLOC_STATS_MAX_NUM_ALLOCS          0x08
+#define UK_ALLOC_STATS_CUR_MEM_USE             0x09
+#define UK_ALLOC_STATS_MAX_MEM_USE             0x0a
+#define UK_ALLOC_STATS_NUM_ENOMEM              0x0b
+
+#endif /* __UK_ALLOC_STORE_H__ */

diff --git a/lib/ukalloc/stats.c b/lib/ukalloc/stats.c
index 606034454a6a5f4a07e19987eec52326e786b91d..ee885964990f121fabf2a6e4824ba65823a5091c 100644 (file)
--- a/lib/ukalloc/stats.c
+++ b/lib/ukalloc/stats.c
@@ -33,6 +33,7 @@
 
 #include <uk/store.h>
 #include <uk/alloc_impl.h>
+#include <uk/alloc_store.h>
 
 #if CONFIG_LIBUKALLOC_IFSTATS_GLOBAL
 struct uk_alloc_stats _uk_alloc_stats_global = { 0 };
@@ -54,7 +55,8 @@ static int get_cur_mem_free(void *cookie __unused, __u64 *out)
        *out = (__u64) uk_alloc_availmem_total();
        return 0;
 }
-UK_STORE_STATIC_ENTRY(cur_mem_free, u64, get_cur_mem_free, NULL);
+UK_STORE_STATIC_ENTRY(UK_ALLOC_STATS_CUR_MEM_FREE, cur_mem_free, u64,
+                     get_cur_mem_free, NULL);
 
 #if CONFIG_LIBUKALLOC_IFSTATS_GLOBAL
 void uk_alloc_stats_get_global(struct uk_alloc_stats *dst)
@@ -71,69 +73,79 @@ static int get_last_alloc_size(void *cookie __unused, __u64 *out)
        *out = (__u64) _uk_alloc_stats_global.last_alloc_size;
        return 0;
 }
-UK_STORE_STATIC_ENTRY(last_alloc_size, u64, get_last_alloc_size, NULL);
+UK_STORE_STATIC_ENTRY(UK_ALLOC_STATS_LAST_ALLOC_SIZE, last_alloc_size, u64,
+                     get_last_alloc_size, NULL);
 
 static int get_max_alloc_size(void *cookie __unused, __u64 *out)
 {
        *out = (__u64) _uk_alloc_stats_global.max_alloc_size;
        return 0;
 }
-UK_STORE_STATIC_ENTRY(max_alloc_size, u64, get_max_alloc_size, NULL);
+UK_STORE_STATIC_ENTRY(UK_ALLOC_STATS_MAX_ALLOC_SIZE, max_alloc_size, u64,
+                     get_max_alloc_size, NULL);
 
 static int get_min_alloc_size(void *cookie __unused, __u64 *out)
 {
        *out = (__u64) _uk_alloc_stats_global.min_alloc_size;
        return 0;
 }
-UK_STORE_STATIC_ENTRY(min_alloc_size, u64, get_min_alloc_size, NULL);
+UK_STORE_STATIC_ENTRY(UK_ALLOC_STATS_MIN_ALLOC_SIZE, min_alloc_size, u64,
+                     get_min_alloc_size, NULL);
 
 static int get_tot_nb_allocs(void *cookie __unused, __u64 *out)
 {
        *out = (__u64) _uk_alloc_stats_global.tot_nb_allocs;
        return 0;
 }
-UK_STORE_STATIC_ENTRY(tot_nb_allocs, u64, get_tot_nb_allocs, NULL);
+UK_STORE_STATIC_ENTRY(UK_ALLOC_STATS_TOTAL_NUM_ALLOCS, tot_nb_allocs, u64,
+                     get_tot_nb_allocs, NULL);
 
 static int get_tot_nb_frees(void *cookie __unused, __u64 *out)
 {
        *out = (__u64) _uk_alloc_stats_global.tot_nb_frees;
        return 0;
 }
-UK_STORE_STATIC_ENTRY(tot_nb_frees, u64, get_tot_nb_frees, NULL);
+UK_STORE_STATIC_ENTRY(UK_ALLOC_STATS_TOTAL_NUM_FREES, tot_nb_frees, u64,
+                     get_tot_nb_frees, NULL);
 
 static int get_cur_nb_allocs(void *cookie __unused, __s64 *out)
 {
        *out = (__s64) _uk_alloc_stats_global.cur_nb_allocs;
        return 0;
 }
-UK_STORE_STATIC_ENTRY(cur_nb_allocs, s64, get_cur_nb_allocs, NULL);
+UK_STORE_STATIC_ENTRY(UK_ALLOC_STATS_CUR_NUM_ALLOCS, cur_nb_allocs, s64,
+                     get_cur_nb_allocs, NULL);
 
 static int get_max_nb_allocs(void *cookie __unused, __s64 *out)
 {
        *out = (__s64) _uk_alloc_stats_global.max_nb_allocs;
        return 0;
 }
-UK_STORE_STATIC_ENTRY(max_nb_allocs, s64, get_max_nb_allocs, NULL);
+UK_STORE_STATIC_ENTRY(UK_ALLOC_STATS_MAX_NUM_ALLOCS, max_nb_allocs, s64,
+                     get_max_nb_allocs, NULL);
 
 static int get_cur_mem_use(void *cookie __unused, __s64 *out)
 {
        *out = (__s64) _uk_alloc_stats_global.cur_mem_use;
        return 0;
 }
-UK_STORE_STATIC_ENTRY(cur_mem_use, s64, get_cur_mem_use, NULL);
+UK_STORE_STATIC_ENTRY(UK_ALLOC_STATS_CUR_MEM_USE, cur_mem_use, s64,
+                     get_cur_mem_use, NULL);
 
 static int get_max_mem_use(void *cookie __unused, __s64 *out)
 {
        *out = (__s64) _uk_alloc_stats_global.max_mem_use;
        return 0;
 }
-UK_STORE_STATIC_ENTRY(max_mem_use, s64, get_max_mem_use, NULL);
+UK_STORE_STATIC_ENTRY(UK_ALLOC_STATS_MAX_MEM_USE, max_mem_use, s64,
+                     get_max_mem_use, NULL);
 
 static int get_nb_enomem(void *cookie __unused, __u64 *out)
 {
        *out = (__u64) _uk_alloc_stats_global.nb_enomem;
        return 0;
 }
-UK_STORE_STATIC_ENTRY(nb_enomem, u64, get_nb_enomem, NULL);
+UK_STORE_STATIC_ENTRY(UK_ALLOC_STATS_NUM_ENOMEM, nb_enomem, u64,
+                     get_nb_enomem, NULL);
 
 #endif