| Message ID | 173343740777.1074769.15850350070210009497.stgit@dwillia2-xfh.jf.intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | PCI/TSM: Core infrastructure for PCI device security (TDISP) | expand |
On 6/12/24 09:23, Dan Williams wrote: > In preparation for creating a new drivers/virt/coco/host/ directory to > house shared host driver infrastructure for confidential computing, move > configfs-tsm to a guest/ sub-directory. The tsm.ko module is renamed to > tsm_reports.ko. The old tsm.ko module was only ever demand loaded by > kernel internal dependencies, so it should not affect existing userspace > module install scripts. > > The new drivers/virt/coco/guest/ is also a preparatory landing spot for > new / optional TSM Report mechanics like a TCB stability enumeration / > watchdog mechanism. To be added later. > > Cc: Wu Hao <hao.wu@intel.com> > Cc: Yilun Xu <yilun.xu@intel.com> > Cc: Samuel Ortiz <sameo@rivosinc.com> > Cc: Alexey Kardashevskiy <aik@amd.com> > Cc: Tom Lendacky <thomas.lendacky@amd.com> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Reviewed-by: Alexey Kardashevskiy <aik@amd.com> > --- > MAINTAINERS | 2 +- > drivers/virt/coco/Kconfig | 6 ++---- > drivers/virt/coco/Makefile | 2 +- > drivers/virt/coco/guest/Kconfig | 7 +++++++ > drivers/virt/coco/guest/Makefile | 3 +++ > drivers/virt/coco/guest/report.c | 0 > 6 files changed, 14 insertions(+), 6 deletions(-) > create mode 100644 drivers/virt/coco/guest/Kconfig > create mode 100644 drivers/virt/coco/guest/Makefile > rename drivers/virt/coco/{tsm.c => guest/report.c} (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 53f04c499705..0c8f61662836 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -23843,7 +23843,7 @@ M: Dan Williams <dan.j.williams@intel.com> > L: linux-coco@lists.linux.dev > S: Maintained > F: Documentation/ABI/testing/configfs-tsm-report > -F: drivers/virt/coco/tsm.c > +F: drivers/virt/coco/guest/ > F: include/linux/tsm.h > > TRUSTED SERVICES TEE DRIVER > diff --git a/drivers/virt/coco/Kconfig b/drivers/virt/coco/Kconfig > index ff869d883d95..819a97e8ba99 100644 > --- a/drivers/virt/coco/Kconfig > +++ b/drivers/virt/coco/Kconfig > @@ -3,10 +3,6 @@ > # Confidential computing related collateral > # > > -config TSM_REPORTS > - select CONFIGFS_FS > - tristate > - > source "drivers/virt/coco/efi_secret/Kconfig" > > source "drivers/virt/coco/pkvm-guest/Kconfig" > @@ -16,3 +12,5 @@ source "drivers/virt/coco/sev-guest/Kconfig" > source "drivers/virt/coco/tdx-guest/Kconfig" > > source "drivers/virt/coco/arm-cca-guest/Kconfig" > + > +source "drivers/virt/coco/guest/Kconfig" > diff --git a/drivers/virt/coco/Makefile b/drivers/virt/coco/Makefile > index c3d07cfc087e..885c9ef4e9fc 100644 > --- a/drivers/virt/coco/Makefile > +++ b/drivers/virt/coco/Makefile > @@ -2,9 +2,9 @@ > # > # Confidential computing related collateral > # > -obj-$(CONFIG_TSM_REPORTS) += tsm.o > obj-$(CONFIG_EFI_SECRET) += efi_secret/ > obj-$(CONFIG_ARM_PKVM_GUEST) += pkvm-guest/ > obj-$(CONFIG_SEV_GUEST) += sev-guest/ > obj-$(CONFIG_INTEL_TDX_GUEST) += tdx-guest/ > obj-$(CONFIG_ARM_CCA_GUEST) += arm-cca-guest/ > +obj-$(CONFIG_TSM_REPORTS) += guest/ > diff --git a/drivers/virt/coco/guest/Kconfig b/drivers/virt/coco/guest/Kconfig > new file mode 100644 > index 000000000000..ed9bafbdd854 > --- /dev/null > +++ b/drivers/virt/coco/guest/Kconfig > @@ -0,0 +1,7 @@ > +# SPDX-License-Identifier: GPL-2.0-only > +# > +# Confidential computing shared guest collateral > +# > +config TSM_REPORTS > + select CONFIGFS_FS > + tristate > diff --git a/drivers/virt/coco/guest/Makefile b/drivers/virt/coco/guest/Makefile > new file mode 100644 > index 000000000000..b3b217af77cf > --- /dev/null > +++ b/drivers/virt/coco/guest/Makefile > @@ -0,0 +1,3 @@ > +# SPDX-License-Identifier: GPL-2.0 > +obj-$(CONFIG_TSM_REPORTS) += tsm_report.o > +tsm_report-y := report.o > diff --git a/drivers/virt/coco/tsm.c b/drivers/virt/coco/guest/report.c > similarity index 100% > rename from drivers/virt/coco/tsm.c > rename to drivers/virt/coco/guest/report.c >
diff --git a/MAINTAINERS b/MAINTAINERS index 53f04c499705..0c8f61662836 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23843,7 +23843,7 @@ M: Dan Williams <dan.j.williams@intel.com> L: linux-coco@lists.linux.dev S: Maintained F: Documentation/ABI/testing/configfs-tsm-report -F: drivers/virt/coco/tsm.c +F: drivers/virt/coco/guest/ F: include/linux/tsm.h TRUSTED SERVICES TEE DRIVER diff --git a/drivers/virt/coco/Kconfig b/drivers/virt/coco/Kconfig index ff869d883d95..819a97e8ba99 100644 --- a/drivers/virt/coco/Kconfig +++ b/drivers/virt/coco/Kconfig @@ -3,10 +3,6 @@ # Confidential computing related collateral # -config TSM_REPORTS - select CONFIGFS_FS - tristate - source "drivers/virt/coco/efi_secret/Kconfig" source "drivers/virt/coco/pkvm-guest/Kconfig" @@ -16,3 +12,5 @@ source "drivers/virt/coco/sev-guest/Kconfig" source "drivers/virt/coco/tdx-guest/Kconfig" source "drivers/virt/coco/arm-cca-guest/Kconfig" + +source "drivers/virt/coco/guest/Kconfig" diff --git a/drivers/virt/coco/Makefile b/drivers/virt/coco/Makefile index c3d07cfc087e..885c9ef4e9fc 100644 --- a/drivers/virt/coco/Makefile +++ b/drivers/virt/coco/Makefile @@ -2,9 +2,9 @@ # # Confidential computing related collateral # -obj-$(CONFIG_TSM_REPORTS) += tsm.o obj-$(CONFIG_EFI_SECRET) += efi_secret/ obj-$(CONFIG_ARM_PKVM_GUEST) += pkvm-guest/ obj-$(CONFIG_SEV_GUEST) += sev-guest/ obj-$(CONFIG_INTEL_TDX_GUEST) += tdx-guest/ obj-$(CONFIG_ARM_CCA_GUEST) += arm-cca-guest/ +obj-$(CONFIG_TSM_REPORTS) += guest/ diff --git a/drivers/virt/coco/guest/Kconfig b/drivers/virt/coco/guest/Kconfig new file mode 100644 index 000000000000..ed9bafbdd854 --- /dev/null +++ b/drivers/virt/coco/guest/Kconfig @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Confidential computing shared guest collateral +# +config TSM_REPORTS + select CONFIGFS_FS + tristate diff --git a/drivers/virt/coco/guest/Makefile b/drivers/virt/coco/guest/Makefile new file mode 100644 index 000000000000..b3b217af77cf --- /dev/null +++ b/drivers/virt/coco/guest/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_TSM_REPORTS) += tsm_report.o +tsm_report-y := report.o diff --git a/drivers/virt/coco/tsm.c b/drivers/virt/coco/guest/report.c similarity index 100% rename from drivers/virt/coco/tsm.c rename to drivers/virt/coco/guest/report.c
In preparation for creating a new drivers/virt/coco/host/ directory to house shared host driver infrastructure for confidential computing, move configfs-tsm to a guest/ sub-directory. The tsm.ko module is renamed to tsm_reports.ko. The old tsm.ko module was only ever demand loaded by kernel internal dependencies, so it should not affect existing userspace module install scripts. The new drivers/virt/coco/guest/ is also a preparatory landing spot for new / optional TSM Report mechanics like a TCB stability enumeration / watchdog mechanism. To be added later. Cc: Wu Hao <hao.wu@intel.com> Cc: Yilun Xu <yilun.xu@intel.com> Cc: Samuel Ortiz <sameo@rivosinc.com> Cc: Alexey Kardashevskiy <aik@amd.com> Cc: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- MAINTAINERS | 2 +- drivers/virt/coco/Kconfig | 6 ++---- drivers/virt/coco/Makefile | 2 +- drivers/virt/coco/guest/Kconfig | 7 +++++++ drivers/virt/coco/guest/Makefile | 3 +++ drivers/virt/coco/guest/report.c | 0 6 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 drivers/virt/coco/guest/Kconfig create mode 100644 drivers/virt/coco/guest/Makefile rename drivers/virt/coco/{tsm.c => guest/report.c} (100%)