OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/qtest/tpm-emu: Avoid hangs using abort handlers closing channels

Browse Source 
Install abort handlers that close the TPM control and data channels in
case an abort occurs. The purpose of this is to have QEMU terminate
under abnormal test case failures to resolve intermittent hangs on s390x
hosts running TPM tests for QEMU/x86_64.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20230111134547.3959604-1-stefanb@linux.ibm.com
This commit is contained in:
Stefan Berger 2023-01-11 08:45:47 -05:00
parent 82df11e78d
commit 255b00b4de
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/qtest/tpm-emu.c
View File

@ -36,11 +36,18 @@ void tpm_emu_test_wait_cond(TPMTestState *s)
g_mutex_unlock(&s->data_mutex);
}
static void tpm_emu_close_ioc(void *ioc)
{
qio_channel_close(ioc, NULL);
}
static void *tpm_emu_tpm_thread(void *data)
{
TPMTestState *s = data;
QIOChannel *ioc = s->tpm_ioc;
qtest_add_abrt_handler(tpm_emu_close_ioc, ioc);
s->tpm_msg = g_new(struct tpm_hdr, 1);
while (true) {
int minhlen = sizeof(s->tpm_msg->tag) + sizeof(s->tpm_msg->len);
@ -77,6 +84,7 @@ static void *tpm_emu_tpm_thread(void *data)
&error_abort);
}
qtest_remove_abrt_handler(ioc);
g_free(s->tpm_msg);
s->tpm_msg = NULL;
object_unref(OBJECT(s->tpm_ioc));
@ -99,6 +107,7 @@ void *tpm_emu_ctrl_thread(void *data)
qio_channel_wait(QIO_CHANNEL(lioc), G_IO_IN);
ioc = QIO_CHANNEL(qio_channel_socket_accept(lioc, &error_abort));
g_assert(ioc);
qtest_add_abrt_handler(tpm_emu_close_ioc, ioc);
{
uint32_t cmd = 0;
@ -190,6 +199,7 @@ void *tpm_emu_ctrl_thread(void *data)
}
}
qtest_remove_abrt_handler(ioc);
object_unref(OBJECT(ioc));
object_unref(OBJECT(lioc));
return NULL;