Skip to content

Commit

Permalink
TSP Add 2nd session support.
Browse files Browse the repository at this point in the history 
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
  • Loading branch information
@jyao1
jyao1 committed Oct 15, 2024
1 parent af7991d commit 6a24456
Show file tree
Hide file tree
Showing 3 changed files with 175 additions and 43 deletions.
4 changes: 4 additions & 0 deletions library/cxl_tsp_device_lib_sample/cxl_tsp_device_get_version.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ libcxltsp_error_code_t cxl_tsp_device_get_version (
if (device_context == NULL) {
return CXL_TSP_ERROR_CODE_UNSPECIFIED;
}
device_context = libcxltsp_get_device_context (pci_doe_context);
if (device_context == NULL) {
return CXL_TSP_ERROR_CODE_UNSPECIFIED;
}
libspdm_copy_mem (version_number_entry,
sizeof(cxl_tsp_version_number_t) * (*version_number_entry_count),
device_context->supported_tsp_versions,
Expand Down
12 changes: 12 additions & 0 deletions library/cxl_tsp_device_lib_sample/cxl_tsp_device_set_configuration.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#include "library/spdm_transport_pcidoe_lib.h"
#include "library/cxl_tsp_device_lib.h"

extern uint8_t m_cxl_tsp_2nd_session_psk[4][0x20];

/**
* Process the TSP request and return the response.
*
Expand All @@ -28,6 +30,7 @@ libcxltsp_error_code_t cxl_tsp_device_set_configuration (
const libcxltsp_device_2nd_session_info_t *device_2nd_session_info)
{
libcxltsp_device_context *device_context;
size_t index;

device_context = libcxltsp_get_device_context (pci_doe_context);
if (device_context == NULL) {
Expand All @@ -42,5 +45,14 @@ libcxltsp_error_code_t cxl_tsp_device_set_configuration (
device_2nd_session_info,
sizeof(libcxltsp_device_2nd_session_info_t));

for (index = 0; index < 4; index++) {
if ((device_context->device_2nd_session_info.configuration_validity_flags & (0x1 << index)) != 0) {
libspdm_copy_mem(
m_cxl_tsp_2nd_session_psk[index],
sizeof(m_cxl_tsp_2nd_session_psk[index]),
&device_context->device_2nd_session_info.secondary_session_psk_key_material[index],
sizeof(device_context->device_2nd_session_info.secondary_session_psk_key_material[index]));
}
}
return CXL_TSP_ERROR_CODE_SUCCESS;
}
202 changes: 159 additions & 43 deletions spdm_emu/spdm_requester_emu/spdm_requester_pci_doe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
void *m_pci_doe_context;
#define DOE_DISCOVERY_VERSION 0

extern uint8_t m_cxl_tsp_2nd_session_psk[4][0x20];

libspdm_return_t do_cxl_tsp_2nd_session_via_spdm(void *spdm_context, size_t index);

libspdm_return_t pci_doe_init_requester()
{
pci_doe_data_object_protocol_t data_object_protocol[6];
Expand Down Expand Up @@ -379,7 +383,7 @@ libspdm_return_t cxl_ide_km_process_session_message(void *spdm_context, uint32_t
return LIBSPDM_STATUS_SUCCESS;
}

libspdm_return_t cxl_tsp_process_session_message(void *spdm_context, uint32_t session_id)
libspdm_return_t cxl_tsp_process_session_message(void *spdm_context, uint32_t session_id, bool is_secondary)
{
libspdm_return_t status;
libcxltsp_device_capabilities_t device_capabilities;
Expand All @@ -391,20 +395,21 @@ libspdm_return_t cxl_tsp_process_session_message(void *spdm_context, uint32_t se
uint8_t configuration_report_buffer[LIBCXLTSP_CONFIGURATION_REPORT_MAX_SIZE];
uint32_t configuration_report_size;
cxl_tsp_target_configuration_report_t *configuration_report;
bool result;

status = cxl_tsp_get_version (m_pci_doe_context, spdm_context, &session_id);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cxl_tsp_get_version done\n"));
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cxl_tsp_get_version(%d) done\n", is_secondary));

libspdm_zero_mem (&device_capabilities, sizeof(device_capabilities));
status = cxl_tsp_get_capabilities (m_pci_doe_context, spdm_context, &session_id,
&device_capabilities);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "device_capabilities:\n"));
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "device_capabilities(%d):\n", is_secondary));
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, " memory_encryption_features_supported - 0x%04x\n",
device_capabilities.memory_encryption_features_supported));
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, " memory_encryption_algorithms_supported - 0x%08x\n",
Expand All @@ -424,37 +429,72 @@ libspdm_return_t cxl_tsp_process_session_message(void *spdm_context, uint32_t se
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, " number_of_secondary_sessions - 0x%02x\n",
device_capabilities.number_of_secondary_sessions));

libspdm_zero_mem (&device_configuration, sizeof(device_configuration));
device_configuration.memory_encryption_features_enable =
CXL_TSP_MEMORY_ENCRYPTION_FEATURES_ENABLE_ENCRYPTION;
device_configuration.memory_encryption_algorithm_select =
CXL_TSP_MEMORY_ENCRYPTION_ALGORITHMS_AES_XTS_256;
device_configuration.te_state_change_and_access_control_features_enable =
CXL_TSP_TE_STATE_CHANGE_AND_ACCESS_CONTROL_FEATURES_READ_ACCESS_CONTROL |
CXL_TSP_TE_STATE_CHANGE_AND_ACCESS_CONTROL_FEATURES_IMPLICIT_TE_STATE_CHANGE |
CXL_TSP_TE_STATE_CHANGE_AND_ACCESS_CONTROL_FEATURES_EXPLICIT_IB_TE_STATE_CHANGE;
device_configuration.explicit_oob_te_state_granularity = 0;
device_configuration.configuration_features_enable =
CXL_TSP_CONFIGURATION_FEATURES_ENABLE_LOCKED_TARGET_FW_UPDATE;
device_configuration.ckid_base = 0;
device_configuration.number_of_ckids = 0;
device_configuration.explicit_ib_te_state_granularity_entry[0].te_state_granularity = 0;
device_configuration.explicit_ib_te_state_granularity_entry[0].length_index = 0;
device_configuration.explicit_ib_te_state_granularity_entry[1].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[2].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[3].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[4].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[5].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[6].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[7].length_index = 0xFF;
libspdm_zero_mem (&device_2nd_session_info, sizeof(device_2nd_session_info));
device_2nd_session_info.configuration_validity_flags = 0x0;
status = cxl_tsp_set_configuration (m_pci_doe_context, spdm_context, &session_id,
&device_configuration, &device_2nd_session_info);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cxl_tsp_set_configuration done\n"));
if (!is_secondary) {
libspdm_zero_mem (&device_configuration, sizeof(device_configuration));
device_configuration.memory_encryption_features_enable =
CXL_TSP_MEMORY_ENCRYPTION_FEATURES_ENABLE_ENCRYPTION;
device_configuration.memory_encryption_algorithm_select =
CXL_TSP_MEMORY_ENCRYPTION_ALGORITHMS_AES_XTS_256;
device_configuration.te_state_change_and_access_control_features_enable =
CXL_TSP_TE_STATE_CHANGE_AND_ACCESS_CONTROL_FEATURES_READ_ACCESS_CONTROL |
CXL_TSP_TE_STATE_CHANGE_AND_ACCESS_CONTROL_FEATURES_IMPLICIT_TE_STATE_CHANGE |
CXL_TSP_TE_STATE_CHANGE_AND_ACCESS_CONTROL_FEATURES_EXPLICIT_IB_TE_STATE_CHANGE;
device_configuration.explicit_oob_te_state_granularity = 0;
device_configuration.configuration_features_enable =
CXL_TSP_CONFIGURATION_FEATURES_ENABLE_LOCKED_TARGET_FW_UPDATE;
device_configuration.ckid_base = 0;
device_configuration.number_of_ckids = 0;
device_configuration.explicit_ib_te_state_granularity_entry[0].te_state_granularity = 0;
device_configuration.explicit_ib_te_state_granularity_entry[0].length_index = 0;
device_configuration.explicit_ib_te_state_granularity_entry[1].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[2].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[3].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[4].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[5].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[6].length_index = 0xFF;
device_configuration.explicit_ib_te_state_granularity_entry[7].length_index = 0xFF;
libspdm_zero_mem (&device_2nd_session_info, sizeof(device_2nd_session_info));
if ((device_capabilities.configuration_features_supported &
CXL_TSP_CONFIGURATION_FEATURES_SUPPORT_TARGET_SUPPORT_ADDITIONAL_SPDM_SESSIONS) != 0) {
switch (device_capabilities.number_of_secondary_sessions) {
case 1:
device_2nd_session_info.configuration_validity_flags = 0x1;
break;
case 2:
device_2nd_session_info.configuration_validity_flags = 0x3;
break;
case 3:
device_2nd_session_info.configuration_validity_flags = 0x7;
break;
case 4:
device_2nd_session_info.configuration_validity_flags = 0xf;
break;
default:
return LIBSPDM_STATUS_INVALID_MSG_FIELD;
}
for (index = 0; index < 4; index++) {
if ((device_2nd_session_info.configuration_validity_flags & (0x1 << index)) != 0) {
result = libspdm_get_random_number(
sizeof(device_2nd_session_info.secondary_session_psk_key_material[index]),
&device_2nd_session_info.secondary_session_psk_key_material[index]);
if (!result) {
return LIBSPDM_STATUS_LOW_ENTROPY;
}
libspdm_copy_mem(
m_cxl_tsp_2nd_session_psk[index],
sizeof(m_cxl_tsp_2nd_session_psk[index]),
&device_2nd_session_info.secondary_session_psk_key_material[index],
sizeof(device_2nd_session_info.secondary_session_psk_key_material[index]));
}
}
}
status = cxl_tsp_set_configuration (m_pci_doe_context, spdm_context, &session_id,
&device_configuration, &device_2nd_session_info);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cxl_tsp_set_configuration(%d) done\n", is_secondary));
}

libspdm_zero_mem (&current_device_configuration, sizeof(current_device_configuration));
current_tsp_state = CXL_TSP_STATE_CONFIG_UNLOCKED;
Expand All @@ -463,7 +503,7 @@ libspdm_return_t cxl_tsp_process_session_message(void *spdm_context, uint32_t se
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "current_device_configuration:\n"));
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "current_device_configuration(%d):\n", is_secondary));
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, " memory_encryption_features_enable - 0x%04x\n",
current_device_configuration.memory_encryption_features_enable));
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, " memory_encryption_algorithm_select - 0x%08x\n",
Expand All @@ -490,7 +530,7 @@ libspdm_return_t cxl_tsp_process_session_message(void *spdm_context, uint32_t se
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, " number_of_ckids - 0x%02x\n",
current_device_configuration.explicit_ib_te_state_granularity_entry[index].length_index));
}
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "current_tsp_state - 0x%02x\n", current_tsp_state));
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "current_tsp_state(%d) - 0x%02x\n", is_secondary, current_tsp_state));

configuration_report_size = sizeof(configuration_report_buffer);
status = cxl_tsp_get_configuration_report (
Expand All @@ -500,26 +540,102 @@ libspdm_return_t cxl_tsp_process_session_message(void *spdm_context, uint32_t se
return status;
}
configuration_report = (cxl_tsp_target_configuration_report_t *)configuration_report_buffer;
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "configuration_report:\n"));
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "configuration_report(%d):\n", is_secondary));
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, " valid_tsp_report_fields - 0x%02x\n", configuration_report->valid_tsp_report_fields));

status = cxl_tsp_lock_configuration (m_pci_doe_context, spdm_context, &session_id);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
if (!is_secondary) {
status = cxl_tsp_lock_configuration (m_pci_doe_context, spdm_context, &session_id);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cxl_tsp_lock_configuration(%d) done\n", is_secondary));
}
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "cxl_tsp_lock_configuration done\n"));

current_tsp_state = CXL_TSP_STATE_CONFIG_UNLOCKED;
status = cxl_tsp_get_configuration (m_pci_doe_context, spdm_context, &session_id,
NULL, &current_tsp_state);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "current_tsp_state - 0x%02x\n", current_tsp_state));
LIBSPDM_DEBUG((LIBSPDM_DEBUG_INFO, "current_tsp_state(%d) - 0x%02x\n", is_secondary, current_tsp_state));

if (!is_secondary) {
/* test CXL_TSP 2nd session */
if ((device_capabilities.configuration_features_supported &
CXL_TSP_CONFIGURATION_FEATURES_SUPPORT_TARGET_SUPPORT_ADDITIONAL_SPDM_SESSIONS) != 0) {
for (index = 0; index < 4; index++) {
if ((device_2nd_session_info.configuration_validity_flags & (0x1 << index)) != 0) {
status = do_cxl_tsp_2nd_session_via_spdm (spdm_context, index);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}
}
}
}
}

return LIBSPDM_STATUS_SUCCESS;
}

libspdm_return_t do_cxl_tsp_2nd_session_via_spdm(void *spdm_context, size_t index)
{
libspdm_return_t status;
uint32_t session_id;
uint8_t heartbeat_period;
uint8_t measurement_hash[LIBSPDM_MAX_HASH_SIZE];
void *psk_hint;
uint16_t psk_hint_size;

switch(index) {
case 0:
psk_hint = CXL_TSP_2ND_SESSION_0_PSK_HINT_STRING;
psk_hint_size = sizeof(CXL_TSP_2ND_SESSION_0_PSK_HINT_STRING);
break;
case 1:
psk_hint = CXL_TSP_2ND_SESSION_1_PSK_HINT_STRING;
psk_hint_size = sizeof(CXL_TSP_2ND_SESSION_1_PSK_HINT_STRING);
break;
case 2:
psk_hint = CXL_TSP_2ND_SESSION_2_PSK_HINT_STRING;
psk_hint_size = sizeof(CXL_TSP_2ND_SESSION_2_PSK_HINT_STRING);
break;
case 3:
psk_hint = CXL_TSP_2ND_SESSION_3_PSK_HINT_STRING;
psk_hint_size = sizeof(CXL_TSP_2ND_SESSION_3_PSK_HINT_STRING);
break;
default:
return LIBSPDM_STATUS_INVALID_PARAMETER;
}

heartbeat_period = 0;
libspdm_zero_mem(measurement_hash, sizeof(measurement_hash));
status = libspdm_start_session(spdm_context, true,
psk_hint,
psk_hint_size,
m_use_measurement_summary_hash_type,
m_use_slot_id, m_session_policy, &session_id,
&heartbeat_period, measurement_hash);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
printf("libspdm_start_session(2nd) - %x\n", (uint32_t)status);
return status;
}

status = cxl_tsp_process_session_message (spdm_context, session_id, true);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
printf("do_app_session_via_spdm(2nd) - %x\n", (uint32_t)status);
return status;
}

status = libspdm_stop_session(spdm_context, session_id,
m_end_session_attributes);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
printf("libspdm_stop_session(2nd) - %x\n", (uint32_t)status);
return status;
}

return status;
}

libspdm_return_t pci_doe_process_session_message(void *spdm_context, uint32_t session_id)
{
libspdm_return_t status;
Expand All @@ -539,7 +655,7 @@ libspdm_return_t pci_doe_process_session_message(void *spdm_context, uint32_t se
return status;
}

status = cxl_tsp_process_session_message (spdm_context, session_id);
status = cxl_tsp_process_session_message (spdm_context, session_id, false);
if (LIBSPDM_STATUS_IS_ERROR(status)) {
return status;
}
Expand Down

0 comments on commit 6a24456

Please sign in to comment.