|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen stable-4.6] tools/libxl: return socket id from libxl_psr_cat_get_l3_info
commit 029375fe5e08cff5fe2634878ae62ed4780a6fcf
Author: Chao Peng <chao.p.peng@xxxxxxxxxxxxxxx>
AuthorDate: Tue Sep 29 15:49:52 2015 +0800
Commit: Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Sep 29 10:59:53 2015 +0100
tools/libxl: return socket id from libxl_psr_cat_get_l3_info
The entries returned from libxl_psr_cat_get_l3_info are assumed
to be socket-continuous. But this is not true in the hotplug case.
This patch gets the socket bitmap for all the sockets on the system
first and stores the socket id in the structure libxl_psr_cat_info in
libxl_psr_cat_get_l3_info. The xl or similar consumers then can display
socket information correctly.
Signed-off-by: Chao Peng <chao.p.peng@xxxxxxxxxxxxxxx>
Reviewed-by: Dario Faggioli <dario.faggioli@xxxxxxxxxx>
Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
(cherry picked from commit 30e7a6fde8d4810a230324b89125b4bdc8e5374d)
---
tools/libxl/libxl_psr.c | 23 ++++++++++++++++++-----
tools/libxl/libxl_types.idl | 1 +
tools/libxl/xl_cmdimpl.c | 41 ++++++++++++++++++++---------------------
3 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c
index 3378239..30740a1 100644
--- a/tools/libxl/libxl_psr.c
+++ b/tools/libxl/libxl_psr.c
@@ -339,30 +339,43 @@ int libxl_psr_cat_get_l3_info(libxl_ctx *ctx,
libxl_psr_cat_info **info,
{
GC_INIT(ctx);
int rc;
- int i, nr_sockets;
+ int i = 0, socket, nr_sockets;
+ libxl_bitmap socketmap;
libxl_psr_cat_info *ptr;
+ libxl_bitmap_init(&socketmap);
+
rc = libxl__count_physical_sockets(gc, &nr_sockets);
if (rc) {
LOGE(ERROR, "failed to get system socket count");
goto out;
}
+ libxl_socket_bitmap_alloc(ctx, &socketmap, nr_sockets);
+ rc = libxl_get_online_socketmap(ctx, &socketmap);
+ if (rc < 0) {
+ LOGE(ERROR, "failed to get available sockets");
+ goto out;
+ }
+
ptr = libxl__malloc(NOGC, nr_sockets * sizeof(libxl_psr_cat_info));
- for (i = 0; i < nr_sockets; i++) {
- if (xc_psr_cat_get_l3_info(ctx->xch, i, &ptr[i].cos_max,
- &ptr[i].cbm_len)) {
+ libxl_for_each_set_bit(socket, socketmap) {
+ ptr[i].id = socket;
+ if (xc_psr_cat_get_l3_info(ctx->xch, socket, &ptr[i].cos_max,
+ &ptr[i].cbm_len)) {
libxl__psr_cat_log_err_msg(gc, errno);
rc = ERROR_FAIL;
free(ptr);
goto out;
}
+ i++;
}
*info = ptr;
- *nr = nr_sockets;
+ *nr = i;
out:
+ libxl_bitmap_dispose(&socketmap);
GC_FREE;
return rc;
}
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index ef346e7..502a148 100644
--- a/tools/libxl/libxl_types.idl
+++ b/tools/libxl/libxl_types.idl
@@ -790,6 +790,7 @@ libxl_psr_cbm_type = Enumeration("psr_cbm_type", [
])
libxl_psr_cat_info = Struct("psr_cat_info", [
+ ("id", uint32),
("cos_max", uint32),
("cbm_len", uint32),
])
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index c61d2dc..a4a168b 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -8375,35 +8375,35 @@ int main_psr_cmt_show(int argc, char **argv)
static int psr_cat_hwinfo(void)
{
int rc;
- int socketid, nr_sockets;
+ int i, nr;
uint32_t l3_cache_size;
libxl_psr_cat_info *info;
printf("Cache Allocation Technology (CAT):\n");
- rc = libxl_psr_cat_get_l3_info(ctx, &info, &nr_sockets);
+ rc = libxl_psr_cat_get_l3_info(ctx, &info, &nr);
if (rc) {
fprintf(stderr, "Failed to get cat info\n");
return rc;
}
- for (socketid = 0; socketid < nr_sockets; socketid++) {
- rc = libxl_psr_cmt_get_l3_cache_size(ctx, socketid, &l3_cache_size);
+ for (i = 0; i < nr; i++) {
+ rc = libxl_psr_cmt_get_l3_cache_size(ctx, info[i].id, &l3_cache_size);
if (rc) {
fprintf(stderr, "Failed to get l3 cache size for socket:%d\n",
- socketid);
+ info[i].id);
goto out;
}
- printf("%-16s: %u\n", "Socket ID", socketid);
+ printf("%-16s: %u\n", "Socket ID", info[i].id);
printf("%-16s: %uKB\n", "L3 Cache", l3_cache_size);
- printf("%-16s: %u\n", "Maximum COS", info->cos_max);
- printf("%-16s: %u\n", "CBM length", info->cbm_len);
+ printf("%-16s: %u\n", "Maximum COS", info[i].cos_max);
+ printf("%-16s: %u\n", "CBM length", info[i].cbm_len);
printf("%-16s: %#llx\n", "Default CBM",
- (1ull << info->cbm_len) - 1);
+ (1ull << info[i].cbm_len) - 1);
}
out:
- libxl_psr_cat_info_list_free(info, nr_sockets);
+ libxl_psr_cat_info_list_free(info, nr);
return rc;
}
@@ -8445,47 +8445,46 @@ static int psr_cat_print_domain_cbm(uint32_t domid,
uint32_t socketid)
return 0;
}
-static int psr_cat_print_socket(uint32_t domid, uint32_t socketid,
- libxl_psr_cat_info *info)
+static int psr_cat_print_socket(uint32_t domid, libxl_psr_cat_info *info)
{
int rc;
uint32_t l3_cache_size;
- rc = libxl_psr_cmt_get_l3_cache_size(ctx, socketid, &l3_cache_size);
+ rc = libxl_psr_cmt_get_l3_cache_size(ctx, info->id, &l3_cache_size);
if (rc) {
fprintf(stderr, "Failed to get l3 cache size for socket:%d\n",
- socketid);
+ info->id);
return -1;
}
- printf("%-16s: %u\n", "Socket ID", socketid);
+ printf("%-16s: %u\n", "Socket ID", info->id);
printf("%-16s: %uKB\n", "L3 Cache", l3_cache_size);
printf("%-16s: %#llx\n", "Default CBM", (1ull << info->cbm_len) - 1);
printf("%5s%25s%16s\n", "ID", "NAME", "CBM");
- return psr_cat_print_domain_cbm(domid, socketid);
+ return psr_cat_print_domain_cbm(domid, info->id);
}
static int psr_cat_show(uint32_t domid)
{
- int socketid, nr_sockets;
+ int i, nr;
int rc;
libxl_psr_cat_info *info;
- rc = libxl_psr_cat_get_l3_info(ctx, &info, &nr_sockets);
+ rc = libxl_psr_cat_get_l3_info(ctx, &info, &nr);
if (rc) {
fprintf(stderr, "Failed to get cat info\n");
return rc;
}
- for (socketid = 0; socketid < nr_sockets; socketid++) {
- rc = psr_cat_print_socket(domid, socketid, info + socketid);
+ for (i = 0; i < nr; i++) {
+ rc = psr_cat_print_socket(domid, info + i);
if (rc)
goto out;
}
out:
- libxl_psr_cat_info_list_free(info, nr_sockets);
+ libxl_psr_cat_info_list_free(info, nr);
return rc;
}
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |