tpm: Move getting TPM buffer size to backends

Rather than setting the size of the TPM buffer in the front-end,
query the backend for the size of the buffer. In this patch we
just move the hard-coded buffer size of 4096 to the backends.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Stefan Berger 2017-11-03 18:10:01 -04:00
parent d3fd953f06
commit b21e6aaf4a
5 changed files with 38 additions and 5 deletions

View File

@ -139,6 +139,13 @@ TPMVersion tpm_backend_get_tpm_version(TPMBackend *s)
return k->get_tpm_version(s); return k->get_tpm_version(s);
} }
size_t tpm_backend_get_buffer_size(TPMBackend *s)
{
TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
return k->get_buffer_size(s);
}
TPMInfo *tpm_backend_query_tpm(TPMBackend *s) TPMInfo *tpm_backend_query_tpm(TPMBackend *s)
{ {
TPMInfo *info = g_new0(TPMInfo, 1); TPMInfo *info = g_new0(TPMInfo, 1);

View File

@ -356,6 +356,11 @@ static TPMVersion tpm_emulator_get_tpm_version(TPMBackend *tb)
return tpm_emu->tpm_version; return tpm_emu->tpm_version;
} }
static size_t tpm_emulator_get_buffer_size(TPMBackend *tb)
{
return 4096;
}
static int tpm_emulator_block_migration(TPMEmulator *tpm_emu) static int tpm_emulator_block_migration(TPMEmulator *tpm_emu)
{ {
Error *err = NULL; Error *err = NULL;
@ -556,6 +561,7 @@ static void tpm_emulator_class_init(ObjectClass *klass, void *data)
tbc->get_tpm_established_flag = tpm_emulator_get_tpm_established_flag; tbc->get_tpm_established_flag = tpm_emulator_get_tpm_established_flag;
tbc->reset_tpm_established_flag = tpm_emulator_reset_tpm_established_flag; tbc->reset_tpm_established_flag = tpm_emulator_reset_tpm_established_flag;
tbc->get_tpm_version = tpm_emulator_get_tpm_version; tbc->get_tpm_version = tpm_emulator_get_tpm_version;
tbc->get_buffer_size = tpm_emulator_get_buffer_size;
tbc->get_tpm_options = tpm_emulator_get_tpm_options; tbc->get_tpm_options = tpm_emulator_get_tpm_options;
tbc->handle_request = tpm_emulator_handle_request; tbc->handle_request = tpm_emulator_handle_request;

View File

@ -199,6 +199,11 @@ static TPMVersion tpm_passthrough_get_tpm_version(TPMBackend *tb)
return tpm_pt->tpm_version; return tpm_pt->tpm_version;
} }
static size_t tpm_passthrough_get_buffer_size(TPMBackend *tb)
{
return 4096;
}
/* /*
* Unless path or file descriptor set has been provided by user, * Unless path or file descriptor set has been provided by user,
* determine the sysfs cancel file following kernel documentation * determine the sysfs cancel file following kernel documentation
@ -354,6 +359,7 @@ static void tpm_passthrough_class_init(ObjectClass *klass, void *data)
tbc->reset_tpm_established_flag = tbc->reset_tpm_established_flag =
tpm_passthrough_reset_tpm_established_flag; tpm_passthrough_reset_tpm_established_flag;
tbc->get_tpm_version = tpm_passthrough_get_tpm_version; tbc->get_tpm_version = tpm_passthrough_get_tpm_version;
tbc->get_buffer_size = tpm_passthrough_get_buffer_size;
tbc->get_tpm_options = tpm_passthrough_get_tpm_options; tbc->get_tpm_options = tpm_passthrough_get_tpm_options;
tbc->handle_request = tpm_passthrough_handle_request; tbc->handle_request = tpm_passthrough_handle_request;
} }

View File

@ -88,6 +88,8 @@ typedef struct TPMState {
TPMBackend *be_driver; TPMBackend *be_driver;
TPMVersion be_tpm_version; TPMVersion be_tpm_version;
size_t be_buffer_size;
} TPMState; } TPMState;
#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS) #define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
@ -977,10 +979,9 @@ static int tpm_tis_do_startup_tpm(TPMState *s)
return tpm_backend_startup_tpm(s->be_driver); return tpm_backend_startup_tpm(s->be_driver);
} }
static void tpm_tis_realloc_buffer(TPMSizedBuffer *sb) static void tpm_tis_realloc_buffer(TPMSizedBuffer *sb,
size_t wanted_size)
{ {
size_t wanted_size = 4096; /* Linux tpm.c buffer size */
if (sb->size != wanted_size) { if (sb->size != wanted_size) {
sb->buffer = g_realloc(sb->buffer, wanted_size); sb->buffer = g_realloc(sb->buffer, wanted_size);
sb->size = wanted_size; sb->size = wanted_size;
@ -1011,6 +1012,7 @@ static void tpm_tis_reset(DeviceState *dev)
int c; int c;
s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver); s->be_tpm_version = tpm_backend_get_tpm_version(s->be_driver);
s->be_buffer_size = tpm_backend_get_buffer_size(s->be_driver);
tpm_backend_reset(s->be_driver); tpm_backend_reset(s->be_driver);
@ -1037,9 +1039,9 @@ static void tpm_tis_reset(DeviceState *dev)
s->loc[c].state = TPM_TIS_STATE_IDLE; s->loc[c].state = TPM_TIS_STATE_IDLE;
s->loc[c].w_offset = 0; s->loc[c].w_offset = 0;
tpm_tis_realloc_buffer(&s->loc[c].w_buffer); tpm_tis_realloc_buffer(&s->loc[c].w_buffer, s->be_buffer_size);
s->loc[c].r_offset = 0; s->loc[c].r_offset = 0;
tpm_tis_realloc_buffer(&s->loc[c].r_buffer); tpm_tis_realloc_buffer(&s->loc[c].r_buffer, s->be_buffer_size);
} }
tpm_tis_do_startup_tpm(s); tpm_tis_do_startup_tpm(s);

View File

@ -81,6 +81,8 @@ struct TPMBackendClass {
TPMVersion (*get_tpm_version)(TPMBackend *t); TPMVersion (*get_tpm_version)(TPMBackend *t);
size_t (*get_buffer_size)(TPMBackend *t);
TpmTypeOptions *(*get_tpm_options)(TPMBackend *t); TpmTypeOptions *(*get_tpm_options)(TPMBackend *t);
void (*handle_request)(TPMBackend *s, TPMBackendCmd *cmd); void (*handle_request)(TPMBackend *s, TPMBackendCmd *cmd);
@ -182,6 +184,16 @@ int tpm_backend_reset_tpm_established_flag(TPMBackend *s, uint8_t locty);
*/ */
TPMVersion tpm_backend_get_tpm_version(TPMBackend *s); TPMVersion tpm_backend_get_tpm_version(TPMBackend *s);
/**
* tpm_backend_get_buffer_size:
* @s: the backend to call into
*
* Get the TPM's buffer size.
*
* Returns buffer size.
*/
size_t tpm_backend_get_buffer_size(TPMBackend *s);
/** /**
* tpm_backend_query_tpm: * tpm_backend_query_tpm:
* @s: the backend * @s: the backend