Re: [PATCH v5 12/12] RFC: monitor: add 'info ramblock-attributes' command

* Marc-André Lureau ([email protected]) wrote:
> Add a new 'info ramblock-attributes' HMP command and the corresponding
> 'x-query-ramblock-attributes' QMP command to display the shared/private
> memory attributes for ram blocks.
> 
> The QMP command returns structured data (RamBlockAttributesInfo list
> with per-range shared/populated attributes), while HMP formats it for
> human consumption.
> 
> This is useful for debugging confidential guests (TDX, SNP) to inspect
> which memory regions are shared vs private, and their population state
> when a RamDiscardManager is present (e.g. virtio-mem).
> 
> Signed-off-by: Marc-André Lureau <[email protected]>
> ---
>  qapi/machine.json             | 56 ++++++++++++++++++++++++++++++++++
>  include/monitor/hmp.h         |  1 +
>  hw/core/machine-hmp-cmds.c    | 32 +++++++++++++++++++
>  system/ram-block-attributes.c | 71 +++++++++++++++++++++++++++++++++++++++++++
>  hmp-commands-info.hx          | 13 ++++++++
>  5 files changed, 173 insertions(+)
> 

<snip>

For HMP,

Acked-by: Dr. David Alan Gilbert <[email protected]>

however, you might consider whether it would be better to add it
to the existing "info ramblock"

Dave

> +void hmp_info_ramblock_attributes(Monitor *mon, const QDict *qdict)
> +{
> +    Error *err = NULL;
> +    g_autoptr(RamBlockAttributesInfoList) list = NULL;
> +    RamBlockAttributesInfoList *it;
> +
> +    list = qmp_x_query_ramblock_attributes(&err);
> +    if (hmp_handle_error(mon, err)) {
> +        return;
> +    }
> +
> +    for (it = list; it; it = it->next) {
> +        RamBlockAttributesInfo *rba = it->value;
> +        RamBlockAttributeRangeList *r;
> +
> +        monitor_printf(mon, "%s:\n", rba->name);
> +        for (r = rba->ranges; r; r = r->next) {
> +            RamBlockAttributeRange *range = r->value;
> +            const char *shared = range->shared ? "shared" : "private";
> +            const char *pop = range->has_populated ?
> +                (range->populated ? "+populated" : "-populated") : "";
> +
> +            monitor_printf(mon,
> +                           "  0x%016" PRIx64 "-0x%016" PRIx64 " %s%s\n",
> +                           range->start,
> +                           range->start + range->length - 1,
> +                           shared, pop);
> +        }
> +    }
> +}
> diff --git a/system/ram-block-attributes.c b/system/ram-block-attributes.c
> index 59ec7a28eb0..fb657ffca35 100644
> --- a/system/ram-block-attributes.c
> +++ b/system/ram-block-attributes.c
> @@ -11,6 +11,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "qemu/error-report.h"
> +#include "qapi/qapi-commands-machine.h"
>  #include "system/ramblock.h"
>  #include "trace.h"
>  
> @@ -221,3 +222,73 @@ static void ram_block_attributes_class_init(ObjectClass *klass,
>      rdsc->get_min_granularity = ram_block_attributes_rds_get_min_granularity;
>      rdsc->is_populated = ram_block_attributes_rds_is_populated;
>  }
> +
> +RamBlockAttributesInfoList *qmp_x_query_ramblock_attributes(Error **errp)
> +{
> +    RamBlockAttributesInfoList *head = NULL, **tail = &head;
> +    RAMBlock *block;
> +    size_t rba_block_size = ram_block_attributes_get_block_size();
> +
> +    RCU_READ_LOCK_GUARD();
> +
> +    RAMBLOCK_FOREACH(block) {
> +        RamBlockAttributesInfo *rba;
> +        RamBlockAttributeRangeList **range_tail;
> +        RamBlockAttributes *attr = block->attributes;
> +        RamDiscardManager *rdm;
> +        unsigned long pos;
> +
> +        if (!attr) {
> +            continue;
> +        }
> +
> +        rdm = memory_region_get_ram_discard_manager(block->mr);
> +        g_assert(rdm);
> +
> +        rba = g_new0(RamBlockAttributesInfo, 1);
> +        rba->name = g_strdup(block->idstr);
> +        range_tail = &rba->ranges;
> +
> +        pos = 0;
> +        while (pos < attr->bitmap_size) {
> +            bool is_shared = test_bit(pos, attr->bitmap);
> +            unsigned long next;
> +            uint64_t start_offset, length;
> +            RamBlockAttributeRange *range;
> +
> +            if (is_shared) {
> +                next = find_next_zero_bit(attr->bitmap,
> +                                          attr->bitmap_size, pos);
> +            } else {
> +                next = find_next_bit(attr->bitmap,
> +                                     attr->bitmap_size, pos);
> +            }
> +
> +            start_offset = (uint64_t)pos * rba_block_size;
> +            length = (uint64_t)(next - pos) * rba_block_size;
> +
> +            range = g_new0(RamBlockAttributeRange, 1);
> +            range->start = start_offset;
> +            range->length = length;
> +            range->shared = is_shared;
> +
> +            {
> +                MemoryRegionSection section = {
> +                    .mr = block->mr,
> +                    .offset_within_region = start_offset,
> +                    .size = int128_make64(length),
> +                };
> +                range->has_populated = true;
> +                range->populated =
> +                    ram_discard_manager_is_populated(rdm, &section);
> +            }
> +
> +            QAPI_LIST_APPEND(range_tail, range);
> +            pos = next;
> +        }
> +
> +        QAPI_LIST_APPEND(tail, rba);
> +    }
> +
> +    return head;
> +}
> diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
> index 82134eb6c21..f119b9cfebc 100644
> --- a/hmp-commands-info.hx
> +++ b/hmp-commands-info.hx
> @@ -761,6 +761,19 @@ SRST
>      Dump all the ramblocks of the system.
>  ERST
>  
> +    {
> +        .name       = "ramblock-attributes",
> +        .args_type  = "",
> +        .params     = "",
> +        .help       = "Display ramblock shared/private attributes",
> +        .cmd        = hmp_info_ramblock_attributes,
> +    },
> +
> +SRST
> +  ``info ramblock-attributes``
> +    Display the shared/private memory attributes for ram blocks.
> +ERST
> +
>      {
>          .name       = "hotpluggable-cpus",
>          .args_type  = "",
> 
> -- 
> 2.54.0
> 
-- 
 -----Open up your eyes, open up your mind, open up your code -------   
/ Dr. David Alan Gilbert    |       Running GNU/Linux       | Happy  \ 
\        dave @ treblig.org |                               | In Hex /
 \ _________________________|_____ http://www.treblig.org   |_______/