Commit 7ee0c3e3 authored by Jason J. Herne's avatar Jason J. Herne Committed by Cornelia Huck
Browse files

s390x: Dump storage keys qmp command 



Provide a dump-skeys qmp command to allow the end user to dump storage
keys. This is useful for debugging problems with guest storage key support
within Qemu and for guest operating system developers.

Reviewed-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarJason J. Herne <jjherne@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 0f5f6691

hw/s390x/s390-skeys.c

+89 −2
Original line number Diff line number Diff line
@@ -10,9 +10,12 @@ 
 */



#include "hw/boards.h"

#include "qmp-commands.h"

#include "hw/s390x/storage-keys.h"

#include "qemu/error-report.h"



#define S390_SKEYS_BUFFER_SIZE 131072  /* Room for 128k storage keys */



S390SKeysState *s390_get_skeys_device(void)

{

    S390SKeysState *ss;
@@ -38,6 +41,90 @@ void s390_skeys_init(void) 
    qdev_init_nofail(DEVICE(obj));

}



static void write_keys(QEMUFile *f, uint8_t *keys, uint64_t startgfn,

                       uint64_t count, Error **errp)

{

    uint64_t curpage = startgfn;

    uint64_t maxpage = curpage + count - 1;

    const char *fmt = "page=%03" PRIx64 ": key(%d) => ACC=%X, FP=%d, REF=%d,"

                      " ch=%d, reserved=%d\n";

    char buf[128];

    int len;



    for (; curpage <= maxpage; curpage++) {

        uint8_t acc = (*keys & 0xF0) >> 4;

        int fp =  (*keys & 0x08);

        int ref = (*keys & 0x04);

        int ch = (*keys & 0x02);

        int res = (*keys & 0x01);



        len = snprintf(buf, sizeof(buf), fmt, curpage,

                       *keys, acc, fp, ref, ch, res);

        assert(len < sizeof(buf));

        qemu_put_buffer(f, (uint8_t *)buf, len);

        keys++;

    }

}



void qmp_dump_skeys(const char *filename, Error **errp)

{

    S390SKeysState *ss = s390_get_skeys_device();

    S390SKeysClass *skeyclass = S390_SKEYS_GET_CLASS(ss);

    const uint64_t total_count = ram_size / TARGET_PAGE_SIZE;

    uint64_t handled_count = 0, cur_count;

    Error *lerr = NULL;

    vaddr cur_gfn = 0;

    uint8_t *buf;

    int ret;

    QEMUFile *f;



    /* Quick check to see if guest is using storage keys*/

    if (!skeyclass->skeys_enabled(ss)) {

        error_setg(errp, "This guest is not using storage keys - "

                         "nothing to dump");

        return;

    }



    f = qemu_fopen(filename, "wb");

    if (!f) {

        error_setg_file_open(errp, errno, filename);

        return;

    }



    buf = g_try_malloc(S390_SKEYS_BUFFER_SIZE);

    if (!buf) {

        error_setg(errp, "Could not allocate memory");

        goto out;

    }



    /* we'll only dump initial memory for now */

    while (handled_count < total_count) {

        /* Calculate how many keys to ask for & handle overflow case */

        cur_count = MIN(total_count - handled_count, S390_SKEYS_BUFFER_SIZE);



        ret = skeyclass->get_skeys(ss, cur_gfn, cur_count, buf);

        if (ret < 0) {

            error_setg(errp, "get_keys error %d", ret);

            goto out_free;

        }



        /* write keys to stream */

        write_keys(f, buf, cur_gfn, cur_count, &lerr);

        if (lerr) {

            goto out_free;

        }



        cur_gfn += cur_count;

        handled_count += cur_count;

    }



out_free:

    error_propagate(errp, lerr);

    g_free(buf);

out:

    qemu_fclose(f);

}



static void qemu_s390_skeys_init(Object *obj)

{

    QEMUS390SKeysState *skeys = QEMU_S390_SKEYS(obj);
@@ -66,7 +153,7 @@ static int qemu_s390_skeys_set(S390SKeysState *ss, uint64_t start_gfn, 
    /* Check for uint64 overflow and access beyond end of key data */

    if (start_gfn + count > skeydev->key_count || start_gfn + count < count) {

        error_report("Error: Setting storage keys for page beyond the end "

                "of memory. gfn=%" PRIx64 " count=%" PRId64 "\n", start_gfn,

                "of memory: gfn=%" PRIx64 " count=%" PRId64 "\n", start_gfn,

                count);

        return -EINVAL;

    }
@@ -86,7 +173,7 @@ static int qemu_s390_skeys_get(S390SKeysState *ss, uint64_t start_gfn, 
    /* Check for uint64 overflow and access beyond end of key data */

    if (start_gfn + count > skeydev->key_count || start_gfn + count < count) {

        error_report("Error: Getting storage keys for page beyond the end "

                "of memory. gfn=%" PRIx64 " count=%" PRId64 "\n", start_gfn,

                "of memory: gfn=%" PRIx64 " count=%" PRId64 "\n", start_gfn,

                count);

        return -EINVAL;

    }

monitor.c

+7 −0
Original line number Diff line number Diff line
@@ -5361,3 +5361,10 @@ void qmp_rtc_reset_reinjection(Error **errp) 
    error_setg(errp, QERR_FEATURE_DISABLED, "rtc-reset-reinjection");

}

#endif



#ifndef TARGET_S390X

void qmp_dump_skeys(const char *filename, Error **errp)

{

    error_setg(errp, QERR_FEATURE_DISABLED, "dump-skeys");

}

#endif

qapi-schema.json

+14 −0
Original line number Diff line number Diff line
@@ -2057,6 +2057,20 @@ 
{ 'command': 'query-dump-guest-memory-capability',

  'returns': 'DumpGuestMemoryCapability' }



##

# @dump-skeys

#

# Dump guest's storage keys

#

# @filename: the path to the file to dump to

#

# This command is only supported on s390 architecture.

#

# Since: 2.5

##

{ 'command': 'dump-skeys',

  'data': { 'filename': 'str' } }



##

# @netdev_add:

#

qmp-commands.hx

+25 −0
Original line number Diff line number Diff line
@@ -870,6 +870,31 @@ Example: 
<- { "return": { "formats":

                    ["elf", "kdump-zlib", "kdump-lzo", "kdump-snappy"] }



EQMP



#if defined TARGET_S390X

    {

        .name       = "dump-skeys",

        .args_type  = "filename:F",

        .mhandler.cmd_new = qmp_marshal_input_dump_skeys,

    },

#endif



SQMP

dump-skeys

----------



Save guest storage keys to file.



Arguments:



- "filename": file path (json-string)



Example:



-> { "execute": "dump-skeys", "arguments": { "filename": "/tmp/skeys" } }

<- { "return": {} }



EQMP



    {