Commit 8e36d27c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-06-06-1' into staging 



Merge tpm 2018/06/06 v1

# gpg: Signature made Wed 06 Jun 2018 20:48:33 BST
# gpg:                using RSA key 75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE  C66B 75AD 6580 2A0B 4211

* remotes/stefanberger/tags/pull-tpm-2018-06-06-1:
  test: Add swtpm migration test for the TPM TIS interface
  test: Pass TPM interface model to functions creating command line
  test: Move common TPM test functions to tpm-tests.c
  test: Move reusable code from tpm-crb-swtpm-test.c to tpm-util.c

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5d328d7d 70663851

tests/Makefile.include

+4 −1
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ check-qtest-x86_64-$(CONFIG_VHOST_USER_NET_TEST_x86_64) += tests/vhost-user-test 
endif

check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-swtpm-test$(EXESUF)

check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-test$(EXESUF)

check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-swtpm-test$(EXESUF)

check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-test$(EXESUF)

check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)

check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
@@ -724,8 +725,10 @@ tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y) 
tests/test-io-channel-socket$(EXESUF): tests/test-io-channel-socket.o \

        tests/io-channel-helpers.o tests/socket-helpers.o $(test-io-obj-y)

tests/tpm-crb-swtpm-test$(EXESUF): tests/tpm-crb-swtpm-test.o tests/tpm-emu.o \

	tests/tpm-util.o $(test-io-obj-y)

	tests/tpm-util.o tests/tpm-tests.o $(test-io-obj-y)

tests/tpm-crb-test$(EXESUF): tests/tpm-crb-test.o tests/tpm-emu.o $(test-io-obj-y)

tests/tpm-tis-swtpm-test$(EXESUF): tests/tpm-tis-swtpm-test.o tests/tpm-emu.o \

	tests/tpm-util.o tests/tpm-tests.o $(test-io-obj-y)

tests/tpm-tis-test$(EXESUF): tests/tpm-tis-test.o tests/tpm-emu.o $(test-io-obj-y)

tests/test-io-channel-file$(EXESUF): tests/test-io-channel-file.o \

        tests/io-channel-helpers.o $(test-io-obj-y)

tests/tpm-crb-swtpm-test.c

+4 −185
Original line number Diff line number Diff line
@@ -15,12 +15,8 @@ 
#include "qemu/osdep.h"

#include <glib/gstdio.h>



#include "hw/acpi/tpm.h"

#include "io/channel-socket.h"

#include "libqtest.h"

#include "tpm-util.h"

#include "sysemu/tpm.h"

#include "qapi/qmp/qdict.h"

#include "tpm-tests.h"



typedef struct TestState {

    char *src_tpm_path;
@@ -28,196 +24,19 @@ typedef struct TestState { 
    char *uri;

} TestState;



bool got_stop;



static void migrate(QTestState *who, const char *uri)

{

    QDict *rsp;

    gchar *cmd;



    cmd = g_strdup_printf("{ 'execute': 'migrate',"

                          "'arguments': { 'uri': '%s' } }",

                          uri);

    rsp = qtest_qmp(who, cmd);

    g_free(cmd);

    g_assert(qdict_haskey(rsp, "return"));

    qobject_unref(rsp);

}



/*

 * Events can get in the way of responses we are actually waiting for.

 */

static QDict *wait_command(QTestState *who, const char *command)

{

    const char *event_string;

    QDict *response;



    response = qtest_qmp(who, command);



    while (qdict_haskey(response, "event")) {

        /* OK, it was an event */

        event_string = qdict_get_str(response, "event");

        if (!strcmp(event_string, "STOP")) {

            got_stop = true;

        }

        qobject_unref(response);

        response = qtest_qmp_receive(who);

    }

    return response;

}



static void wait_for_migration_complete(QTestState *who)

{

    while (true) {

        QDict *rsp, *rsp_return;

        bool completed;

        const char *status;



        rsp = wait_command(who, "{ 'execute': 'query-migrate' }");

        rsp_return = qdict_get_qdict(rsp, "return");

        status = qdict_get_str(rsp_return, "status");

        completed = strcmp(status, "completed") == 0;

        g_assert_cmpstr(status, !=,  "failed");

        qobject_unref(rsp);

        if (completed) {

            return;

        }

        usleep(1000);

    }

}



static void migration_start_qemu(QTestState **src_qemu, QTestState **dst_qemu,

                                 SocketAddress *src_tpm_addr,

                                 SocketAddress *dst_tpm_addr,

                                 const char *miguri)

{

    char *src_qemu_args, *dst_qemu_args;



    src_qemu_args = g_strdup_printf(

        "-chardev socket,id=chr,path=%s "

        "-tpmdev emulator,id=dev,chardev=chr "

        "-device tpm-crb,tpmdev=dev ",

        src_tpm_addr->u.q_unix.path);



    *src_qemu = qtest_init(src_qemu_args);



    dst_qemu_args = g_strdup_printf(

        "-chardev socket,id=chr,path=%s "

        "-tpmdev emulator,id=dev,chardev=chr "

        "-device tpm-crb,tpmdev=dev "

        "-incoming %s",

        dst_tpm_addr->u.q_unix.path,

        miguri);



    *dst_qemu = qtest_init(dst_qemu_args);



    free(src_qemu_args);

    free(dst_qemu_args);

}



static void tpm_crb_swtpm_test(const void *data)

{

    char *args = NULL;

    QTestState *s;

    SocketAddress *addr = NULL;

    gboolean succ;

    GPid swtpm_pid;

    GError *error = NULL;

    const TestState *ts = data;



    succ = tpm_util_swtpm_start(ts->src_tpm_path, &swtpm_pid, &addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        return;

    }



    args = g_strdup_printf(

        "-chardev socket,id=chr,path=%s "

        "-tpmdev emulator,id=dev,chardev=chr "

        "-device tpm-crb,tpmdev=dev",

        addr->u.q_unix.path);



    s = qtest_start(args);

    g_free(args);



    tpm_util_startup(s, tpm_util_crb_transfer);

    tpm_util_pcrextend(s, tpm_util_crb_transfer);



    unsigned char tpm_pcrread_resp[] =

        "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"

        "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"

        "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"

        "\xa4\x2f\x9a\xae\xa8\xc7\xb7\xaa\x79\xa8\x62\x56\xc1\xde";

    tpm_util_pcrread(s, tpm_util_crb_transfer, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    qtest_end();

    tpm_util_swtpm_kill(swtpm_pid);



    if (addr) {

        g_unlink(addr->u.q_unix.path);

        qapi_free_SocketAddress(addr);

    }

    tpm_test_swtpm_test(ts->src_tpm_path, tpm_util_crb_transfer, "tpm-crb");

}



static void tpm_crb_swtpm_migration_test(const void *data)

{

    const TestState *ts = data;

    gboolean succ;

    GPid src_tpm_pid, dst_tpm_pid;

    SocketAddress *src_tpm_addr = NULL, *dst_tpm_addr = NULL;

    GError *error = NULL;

    QTestState *src_qemu, *dst_qemu;



    succ = tpm_util_swtpm_start(ts->src_tpm_path, &src_tpm_pid,

                                &src_tpm_addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        return;

    }



    succ = tpm_util_swtpm_start(ts->dst_tpm_path, &dst_tpm_pid,

                                &dst_tpm_addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        goto err_src_tpm_kill;

    }



    migration_start_qemu(&src_qemu, &dst_qemu, src_tpm_addr, dst_tpm_addr,

                         ts->uri);



    tpm_util_startup(src_qemu, tpm_util_crb_transfer);

    tpm_util_pcrextend(src_qemu, tpm_util_crb_transfer);



    unsigned char tpm_pcrread_resp[] =

        "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"

        "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"

        "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"

        "\xa4\x2f\x9a\xae\xa8\xc7\xb7\xaa\x79\xa8\x62\x56\xc1\xde";

    tpm_util_pcrread(src_qemu, tpm_util_crb_transfer, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    migrate(src_qemu, ts->uri);

    wait_for_migration_complete(src_qemu);



    tpm_util_pcrread(dst_qemu, tpm_util_crb_transfer, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    qtest_quit(dst_qemu);

    qtest_quit(src_qemu);



    tpm_util_swtpm_kill(dst_tpm_pid);

    if (dst_tpm_addr) {

        g_unlink(dst_tpm_addr->u.q_unix.path);

        qapi_free_SocketAddress(dst_tpm_addr);

    }



err_src_tpm_kill:

    tpm_util_swtpm_kill(src_tpm_pid);

    if (src_tpm_addr) {

        g_unlink(src_tpm_addr->u.q_unix.path);

        qapi_free_SocketAddress(src_tpm_addr);

    }

    tpm_test_swtpm_migration_test(ts->src_tpm_path, ts->dst_tpm_path, ts->uri,

                                  tpm_util_crb_transfer, "tpm-crb");

}



int main(int argc, char **argv)

tests/tpm-tests.c

0 → 100644
+127 −0
Original line number Diff line number Diff line 
/*

 * QTest TPM commont test code

 *

 * Copyright (c) 2018 IBM Corporation

 * Copyright (c) 2018 Red Hat, Inc.

 *

 * Authors:

 *   Stefan Berger <stefanb@linux.vnet.ibm.com>

 *   Marc-André Lureau <marcandre.lureau@redhat.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include <glib/gstdio.h>



#include "libqtest.h"

#include "tpm-tests.h"



void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx,

                         const char *ifmodel)

{

    char *args = NULL;

    QTestState *s;

    SocketAddress *addr = NULL;

    gboolean succ;

    GPid swtpm_pid;

    GError *error = NULL;



    succ = tpm_util_swtpm_start(src_tpm_path, &swtpm_pid, &addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        return;

    }



    args = g_strdup_printf(

        "-chardev socket,id=chr,path=%s "

        "-tpmdev emulator,id=dev,chardev=chr "

        "-device %s,tpmdev=dev",

        addr->u.q_unix.path, ifmodel);



    s = qtest_start(args);

    g_free(args);



    tpm_util_startup(s, tx);

    tpm_util_pcrextend(s, tx);



    unsigned char tpm_pcrread_resp[] =

        "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"

        "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"

        "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"

        "\xa4\x2f\x9a\xae\xa8\xc7\xb7\xaa\x79\xa8\x62\x56\xc1\xde";

    tpm_util_pcrread(s, tx, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    qtest_end();

    tpm_util_swtpm_kill(swtpm_pid);



    if (addr) {

        g_unlink(addr->u.q_unix.path);

        qapi_free_SocketAddress(addr);

    }

}



void tpm_test_swtpm_migration_test(const char *src_tpm_path,

                                   const char *dst_tpm_path,

                                   const char *uri, tx_func *tx,

                                   const char *ifmodel)

{

    gboolean succ;

    GPid src_tpm_pid, dst_tpm_pid;

    SocketAddress *src_tpm_addr = NULL, *dst_tpm_addr = NULL;

    GError *error = NULL;

    QTestState *src_qemu, *dst_qemu;



    succ = tpm_util_swtpm_start(src_tpm_path, &src_tpm_pid,

                                &src_tpm_addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        return;

    }



    succ = tpm_util_swtpm_start(dst_tpm_path, &dst_tpm_pid,

                                &dst_tpm_addr, &error);

    /* succ may be false if swtpm is not available */

    if (!succ) {

        goto err_src_tpm_kill;

    }



    tpm_util_migration_start_qemu(&src_qemu, &dst_qemu,

                                  src_tpm_addr, dst_tpm_addr, uri,

                                  ifmodel);



    tpm_util_startup(src_qemu, tx);

    tpm_util_pcrextend(src_qemu, tx);



    unsigned char tpm_pcrread_resp[] =

        "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"

        "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"

        "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"

        "\xa4\x2f\x9a\xae\xa8\xc7\xb7\xaa\x79\xa8\x62\x56\xc1\xde";

    tpm_util_pcrread(src_qemu, tx, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    tpm_util_migrate(src_qemu, uri);

    tpm_util_wait_for_migration_complete(src_qemu);



    tpm_util_pcrread(dst_qemu, tx, tpm_pcrread_resp,

                     sizeof(tpm_pcrread_resp));



    qtest_quit(dst_qemu);

    qtest_quit(src_qemu);



    tpm_util_swtpm_kill(dst_tpm_pid);

    if (dst_tpm_addr) {

        g_unlink(dst_tpm_addr->u.q_unix.path);

        qapi_free_SocketAddress(dst_tpm_addr);

    }



err_src_tpm_kill:

    tpm_util_swtpm_kill(src_tpm_pid);

    if (src_tpm_addr) {

        g_unlink(src_tpm_addr->u.q_unix.path);

        qapi_free_SocketAddress(src_tpm_addr);

    }

}

tests/tpm-tests.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * QTest TPM commont test code

 *

 * Copyright (c) 2018 IBM Corporation

 *

 * Authors:

 *   Stefan Berger <stefanb@linux.vnet.ibm.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#ifndef TESTS_TPM_TESTS_H

#define TESTS_TPM_TESTS_H



#include "tpm-util.h"



void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx,

                         const char *ifmodel);



void tpm_test_swtpm_migration_test(const char *src_tpm_path,

                                   const char *dst_tpm_path,

                                   const char *uri, tx_func *tx,

                                   const char *ifmodel);



#endif /* TESTS_TPM_TESTS_H */

tests/tpm-tis-swtpm-test.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * QTest testcase for TPM TIS talking to external swtpm and swtpm migration

 *

 * Copyright (c) 2018 IBM Corporation

 *  with parts borrowed from migration-test.c that is:

 *     Copyright (c) 2016-2018 Red Hat, Inc. and/or its affiliates

 *

 * Authors:

 *   Stefan Berger <stefanb@linux.vnet.ibm.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include <glib/gstdio.h>



#include "libqtest.h"

#include "tpm-tests.h"



typedef struct TestState {

    char *src_tpm_path;

    char *dst_tpm_path;

    char *uri;

} TestState;



static void tpm_tis_swtpm_test(const void *data)

{

    const TestState *ts = data;



    tpm_test_swtpm_test(ts->src_tpm_path, tpm_util_tis_transfer, "tpm-tis");

}



static void tpm_tis_swtpm_migration_test(const void *data)

{

    const TestState *ts = data;



    tpm_test_swtpm_migration_test(ts->src_tpm_path, ts->dst_tpm_path, ts->uri,

                                  tpm_util_tis_transfer, "tpm-tis");

}



int main(int argc, char **argv)

{

    int ret;

    TestState ts = { 0 };



    ts.src_tpm_path = g_dir_make_tmp("qemu-tpm-tis-swtpm-test.XXXXXX", NULL);

    ts.dst_tpm_path = g_dir_make_tmp("qemu-tpm-tis-swtpm-test.XXXXXX", NULL);

    ts.uri = g_strdup_printf("unix:%s/migsocket", ts.src_tpm_path);



    module_call_init(MODULE_INIT_QOM);

    g_test_init(&argc, &argv, NULL);



    qtest_add_data_func("/tpm/tis-swtpm/test", &ts, tpm_tis_swtpm_test);

    qtest_add_data_func("/tpm/tis-swtpm-migration/test", &ts,

                        tpm_tis_swtpm_migration_test);

    ret = g_test_run();



    g_rmdir(ts.dst_tpm_path);

    g_free(ts.dst_tpm_path);

    g_rmdir(ts.src_tpm_path);

    g_free(ts.src_tpm_path);

    g_free(ts.uri);



    return ret;

}