deleted file mode 100644
@@ -1,51 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _UAPI_ASM_X86_TDX_H
-#define _UAPI_ASM_X86_TDX_H
-
-#include <linux/types.h>
-#include <linux/ioctl.h>
-
-/* Length of the REPORTDATA used in TDG.MR.REPORT TDCALL */
-#define TDX_REPORTDATA_LEN 64
-
-/* Length of TDREPORT used in TDG.MR.REPORT TDCALL */
-#define TDX_REPORT_LEN 1024
-
-/**
- * struct tdx_report_req: Get TDREPORT using REPORTDATA as input.
- *
- * @subtype : Subtype of TDREPORT (fixed as 0 by TDX Module
- * specification, but added a parameter to handle
- * future extension).
- * @reportdata : User-defined REPORTDATA to be included into
- * TDREPORT. Typically it can be some nonce
- * provided by attestation service, so the
- * generated TDREPORT can be uniquely verified.
- * @rpd_len : Length of the REPORTDATA (fixed as 64 bytes by
- * the TDX Module specification, but parameter is
- * added to handle future extension).
- * @tdreport : TDREPORT output from TDCALL[TDG.MR.REPORT].
- * @tdr_len : Length of the TDREPORT (fixed as 1024 bytes by
- * the TDX Module specification, but a parameter
- * is added to accommodate future extension).
- *
- * Used in TDX_CMD_GET_REPORT IOCTL request.
- */
-struct tdx_report_req {
- __u8 subtype;
- __u64 reportdata;
- __u32 rpd_len;
- __u64 tdreport;
- __u32 tdr_len;
-};
-
-/*
- * TDX_CMD_GET_REPORT - Get TDREPORT using TDCALL[TDG.MR.REPORT]
- *
- * Return 0 on success, -EIO on TDCALL execution failure, and
- * standard errno on other general error cases.
- *
- */
-#define TDX_CMD_GET_REPORT _IOWR('T', 0x01, __u64)
-
-#endif /* _UAPI_ASM_X86_TDX_H */
@@ -69,7 +69,6 @@ TARGETS += sync
TARGETS += syscall_user_dispatch
TARGETS += sysctl
TARGETS += tc-testing
-TARGETS += tdx
TARGETS += timens
ifneq (1, $(quicktest))
TARGETS += timers
deleted file mode 100644
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-top_srcdir = ../../../..
-
-LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/x86/include
-
-CFLAGS += -O3 -Wl,-no-as-needed -Wall -static -I$(LINUX_TOOL_ARCH_INCLUDE)
-
-TEST_GEN_PROGS := tdx_attest_test
-
-include ../lib.mk
deleted file mode 100644
@@ -1 +0,0 @@
-CONFIG_INTEL_TDX_GUEST=y
deleted file mode 100644
@@ -1,156 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Test TDX attestation feature
- *
- * Copyright (C) 2022 Intel Corporation. All rights reserved.
- *
- * Author: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
- */
-
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <uapi/asm/tdx.h>
-
-#include "../kselftest_harness.h"
-
-#define devname "/dev/tdx-guest"
-#define HEX_DUMP_SIZE 8
-#define __packed __attribute__((packed))
-
-/*
- * Trusted Execution Environment (TEE) report (TDREPORT_STRUCT) type,
- * sub type and version. More details can be found in TDX v1.0 Module
- * specification, sec titled "REPORTTYPE".
- */
-struct tdreport_type {
- /* 0 - SGX, 81 -TDX, rest are reserved */
- __u8 type;
- /* Default value is 0 */
- __u8 sub_type;
- /* Default value is 0 */
- __u8 version;
- __u8 reserved;
-} __packed;
-
-/*
- * struct reportmac - First field in the TRDREPORT_STRUCT. It is common
- * to Intel’s TEE's e.g., SGX and TDX. It is MAC-protected and contains
- * hashes of the remainder of the report structure which includes the
- * TEE’s measurements, and where applicable, the measurements of additional
- * TCB elements not reflected in CPUSVN – e.g., a SEAM’s measurements.
- * More details can be found in TDX v1.0 Module specification, sec titled
- * "REPORTMACSTRUCT"
- */
-struct reportmac {
- struct tdreport_type type;
- __u8 reserved1[12];
- /* CPU security version */
- __u8 cpu_svn[16];
- /* SHA384 hash of TEE TCB INFO */
- __u8 tee_tcb_info_hash[48];
- /* SHA384 hash of TDINFO_STRUCT */
- __u8 tee_td_info_hash[48];
- /* User defined unique data passed in TDG.MR.REPORT request */
- __u8 reportdata[64];
- __u8 reserved2[32];
- __u8 mac[32];
-} __packed;
-
-/*
- * struct td_info - It contains the measurements and initial configuration
- * of the TD that was locked at initialization and a set of measurement
- * registers that are run-time extendable. These values are copied from
- * the TDCS by the TDG.MR.REPORT function. More details can be found in
- * TDX v1.0 Module specification, sec titled "TDINFO_STRUCT".
- */
-struct td_info {
- /* TD attributes (like debug, spet_disable, etc) */
- __u8 attr[8];
- __u64 xfam;
- /* Measurement registers */
- __u64 mrtd[6];
- __u64 mrconfigid[6];
- __u64 mrowner[6];
- __u64 mrownerconfig[6];
- /* Runtime measurement registers */
- __u64 rtmr[24];
- __u64 reserved[14];
-} __packed;
-
-struct tdreport {
- /* Common to TDX/SGX of size 256 bytes */
- struct reportmac reportmac;
- __u8 tee_tcb_info[239];
- __u8 reserved[17];
- /* Measurements and configuration data of size 512 byes */
- struct td_info tdinfo;
-} __packed;
-
-#ifdef DEBUG
-static void print_array_hex(const char *title, const char *prefix_str,
- const void *buf, int len)
-{
- const __u8 *ptr = buf;
- int i, rowsize = HEX_DUMP_SIZE;
-
- if (!len || !buf)
- return;
-
- printf("\t\t%s", title);
-
- for (i = 0; i < len; i++) {
- if (!(i % rowsize))
- printf("\n%s%.8x:", prefix_str, i);
- printf(" %.2x", ptr[i]);
- }
-
- printf("\n");
-}
-#endif
-
-TEST(verify_report)
-{
- __u8 reportdata[TDX_REPORTDATA_LEN];
- struct tdreport tdreport;
- struct tdx_report_req req;
- int devfd, i;
-
- devfd = open(devname, O_RDWR | O_SYNC);
-
- ASSERT_LT(0, devfd);
-
- /* Generate sample report data */
- for (i = 0; i < TDX_REPORTDATA_LEN; i++)
- reportdata[i] = i;
-
- /* Initialize IOCTL request */
- req.subtype = 0;
- req.reportdata = (__u64)reportdata;
- req.rpd_len = TDX_REPORTDATA_LEN;
- req.tdreport = (__u64)&tdreport;
- req.tdr_len = sizeof(tdreport);
-
- /* Get TDREPORT */
- ASSERT_EQ(0, ioctl(devfd, TDX_CMD_GET_REPORT, &req));
-
-#ifdef DEBUG
- print_array_hex("\n\t\tTDX report data\n", "",
- reportdata, sizeof(reportdata));
-
- print_array_hex("\n\t\tTDX tdreport data\n", "",
- &tdreport, sizeof(tdreport));
-#endif
-
- /* Make sure TDREPORT data includes the REPORTDATA passed */
- ASSERT_EQ(0, memcmp(&tdreport.reportmac.reportdata[0],
- reportdata, sizeof(reportdata)));
-
- ASSERT_EQ(0, close(devfd));
-}
-
-TEST_HARNESS_MAIN
BugLink: https://bugs.launchpad.net/bugs/2009437 This reverts the following commit, that will be replaced by a new TDX patch set: 0b78a71c7d76 ("UBUNTU: SAUCE: selftests: tdx: Test GetReport TDX attestation feature") Signed-off-by: Andrea Righi <andrea.righi@canonical.com> --- tools/arch/x86/include/uapi/asm/tdx.h | 51 ------ tools/testing/selftests/Makefile | 1 - tools/testing/selftests/tdx/Makefile | 11 -- tools/testing/selftests/tdx/config | 1 - tools/testing/selftests/tdx/tdx_attest_test.c | 156 ------------------ 5 files changed, 220 deletions(-) delete mode 100644 tools/arch/x86/include/uapi/asm/tdx.h delete mode 100644 tools/testing/selftests/tdx/Makefile delete mode 100644 tools/testing/selftests/tdx/config delete mode 100644 tools/testing/selftests/tdx/tdx_attest_test.c