Skip to content

Add Secure TSC support for SNP guests

Nikunj A Dadhania kvm lkml 16 versions – Applied

Status from this message: The following commit has been merged into the x86/sev branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v16 Latest13 patches 35 repliesApplied
  2. v1513 patches 82 repliesSuperseded
  3. v1413 patches 35 repliesSuperseded
Earlier versions · 13
VersionPostedPatchesRepliesStatus
v1313 patches19 repliesSuperseded
v1219 patches14 repliesApplied
v1120 patches41 repliesApplied
v1024 patches7 repliesSuperseded
v924 patches18 repliesSuperseded
v816 patches28 repliesSuperseded
v716 patches21 repliesSuperseded
v616 patches9 repliesSuperseded
v514 patches36 repliesSuperseded
v414 patches9 repliesSuperseded
v314 patches11 repliesSuperseded
v211 patches21 repliesSuperseded
v1 RFC11 patches2 repliesSuperseded

Changes in v16 from the cover letter

* Rebased on latest tip/master
* prepatch: Remove is_vmpck_empty() and use memchr_inv() instead (Boris)
* prepatch: Uses GFP_KERNEL for snp_init_crypto() (Boris)
* Use memset during cleanup and fix memory leak (Boris/Francesco)
* Use tsp_resp with extra allocation and get rid of buf variable (Francesco)
* Drop RoBs and TBs, comment/commit message update
* Add switch case for #VC Secure TSC MSRs handling (Boris)
* Move CC_ATTR_GUEST_SNP_SECURE_TSC before host defines to group guest defines(Tom)
* Cache the TSC frequency in khz to avoid reading MSR and multiply every time (Tom)
* Drop the patch preventing FW_BUG for not running at P0 frequency (Boris)
* Limit clock rating upgrade to virtualized environments as part of CONFIG_PARAVIRT (Boris)
* Squash patch 9 and 12 to logically merge changes that switches to TSC from kvm-clock (Boris)

Patches in v16 Applied

#Subject and filesSizeRepliesApplied
1/13virt: sev-guest: Remove is_vmpck_empty() helperdrivers/virt/coco/sev-guest/sev-guest.c+2 -121 reply
2/13virt: sev-guest: Replace GFP_KERNEL_ACCOUNT with GFP_KERNELdrivers/virt/coco/sev-guest/sev-guest.c+1 -11 reply
3/13x86/sev: Carve out and export SNP guest messaging init routinesarch/x86/Kconfig arch/x86/coco/sev/core.c arch/x86/include/asm/sev.h +2 more+208 -1750 replies
4/13x86/sev: Relocate SNP guest messaging routines to common codearch/x86/coco/sev/core.c arch/x86/include/asm/sev.h drivers/virt/coco/sev-guest/sev-guest.c+298 -3020 replies
5/13x86/sev: Add Secure TSC support for SNP guestsarch/x86/coco/core.c arch/x86/coco/sev/core.c arch/x86/include/asm/sev-common.h +4 more+147 -211 replies
6/13x86/sev: Change TSC MSR behavior for Secure TSC enabled guestsarch/x86/coco/sev/core.c+38 -11 reply
7/13x86/sev: Prevent GUEST_TSC_FREQ MSR interception for Secure TSC enabled guestsarch/x86/coco/sev/core.c arch/x86/include/asm/msr-index.h+10 -10 replies
8/13x86/sev: Prevent RDTSC/RDTSCP interception for Secure TSC enabled guestsarch/x86/coco/sev/shared.c+10 -00 replies
9/13x86/sev: Mark Secure TSC as reliable clocksourcearch/x86/mm/mem_encrypt_amd.c+4 -00 replies
10/13x86/tsc: Switch Secure TSC guests away from kvm-clockarch/x86/coco/sev/core.c arch/x86/include/asm/sev.h arch/x86/kernel/kvmclock.c +1 more+38 -02 replies
11/13x86/tsc: Upgrade TSC clocksource rating for guestsarch/x86/kernel/tsc.c+21 -01 reply
12/13x86/tsc: Switch to native sched clockarch/x86/kernel/tsc.c+18 -018 replies
13/13x86/sev: Allow Secure TSC feature for SNP guestsarch/x86/boot/compressed/sev.c+2 -10 replies

Reviews trailers per patch

10 of 13 patches have a Reviewed-by or Acked-by.

PatchTom LendackyPeter Gonda
1/13R-b
2/13R-b
3/13R-b
4/13R-b
5/13R-b
6/13R-b
7/13R-b
8/13R-b T-b
9/13R-b T-b
10/13
11/13
12/13
13/13R-b T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v16 thread

Cover letter [PATCH v16 00/13] Add Secure TSC support for SNP guests

This patchset is also available at:

https://github.com/AMDESE/linux-kvm/tree/sectsc-guest-latest

and is based on tip/master

Overview
--------

Secure TSC allows guests to securely use RDTSC/RDTSCP instructions as the parameters being used cannot be changed by hypervisor once the guest is launched. More details in the AMD64 APM Vol 2, Section "Secure TSC".

In order to enable secure TSC, SEV-SNP guests need to send a TSC_INFO guest message before the APs are booted. Details from the TSC_INFO response will then be used to program the VMSA before the APs are brought up. See "SEV Secure Nested Paging Firmware ABI Specification" document (currently at
https://www.amd.com/system/files/TechDocs/56860.pdf) section "TSC Info"

SEV-guest driver has the implementation for guest and AMD Security Processor communication. As the TSC_INFO needs to be initialized during early boot before APs are started, move the guest messaging code from sev-guest driver to sev/core.c and provide well defined APIs to the sev-guest driver.

Patches:
01-02: Prepatch
03-04: Patches moving SNP guest messaging code from SEV guest driver to
SEV common code
05-10: SecureTSC enablement patches
11-12: Generic TSC improvements
15: SecureTSC enablement.

Testing SecureTSC
-----------------

SecureTSC hypervisor patches based on top of SEV-SNP Guest MEMFD series:
https://github.com/AMDESE/linux-kvm/tree/sectsc-host-latest

QEMU changes:
https://github.com/nikunjad/qemu/tree/snp-securetsc-latest

QEMU commandline SEV-SNP with SecureTSC:

  qemu-system-x86_64 -cpu EPYC-Milan-v2 -smp 4 \
    -object memory-backend-memfd,id=ram1,size=1G,share=true,prealloc=false,reserve=false \
    -object sev-snp-guest,id=sev0,cbitpos=51,reduced-phys-bits=1,secure-tsc=on \
    -machine q35,confidential-guest-support=sev0,memory-backend=ram1 \
    ...

Changelog:
----------

v16:
* Rebased on latest tip/master
* prepatch: Remove is_vmpck_empty() and use memchr_inv() instead (Boris)
* prepatch: Uses GFP_KERNEL for snp_init_crypto() (Boris)
* Use memset during cleanup and fix memory leak (Boris/Francesco)
* Use tsp_resp with extra allocation and get rid of buf variable (Francesco)
* Drop RoBs and TBs, comment/commit message update
* Add switch case for #VC Secure TSC MSRs handling (Boris)
* Move CC_ATTR_GUEST_SNP_SECURE_TSC before host defines to group guest defines(Tom)
* Cache the TSC frequency in khz to avoid reading MSR and multiply every time (Tom)
* Drop the patch preventing FW_BUG for not running at P0 frequency (Boris)
* Limit clock rating upgrade to virtualized environments as part of CONFIG_PARAVIRT (Boris)
* Squash patch 9 and 12 to logically merge changes that switches to TSC from kvm-clock (Boris)

v15: https://lore.kernel.org/kvm/[email protected]/
* Rebased on latest tip/master
* Update commits/comments (Boris)
* Add snp_msg_free() to free allocated buffers (Boris)
* Dynamically allocate buffers for sending TSC_INFO (Boris)
* Fix the build issue at patch#1 (Boris)
* Carve out tsc handling in __vc_handle_msr_tsc() (Boris)

Nikunj A Dadhania (13):
virt: sev-guest: Remove is_vmpck_empty() helper
virt: sev-guest: Replace GFP_KERNEL_ACCOUNT with GFP_KERNEL x86/sev: Carve out and export SNP guest messaging init routines x86/sev: Relocate SNP guest messaging routines to common code x86/sev: Add Secure TSC support for SNP guests x86/sev: Change TSC MSR behavior for Secure TSC enabled guests x86/sev: Prevent GUEST_TSC_FREQ MSR interception for Secure TSC
enabled guests
x86/sev: Prevent RDTSC/RDTSCP interception for Secure TSC enabled
guests
x86/sev: Mark Secure TSC as reliable clocksource x86/tsc: Switch Secure TSC guests away from kvm-clock x86/tsc: Upgrade TSC clocksource rating for guests x86/tsc: Switch to native sched clock
x86/sev: Allow Secure TSC feature for SNP guests

 arch/x86/include/asm/msr-index.h        |   1 +
 arch/x86/include/asm/sev-common.h       |   1 +
 arch/x86/include/asm/sev.h              |  48 +-
 arch/x86/include/asm/svm.h              |   6 +-
 include/linux/cc_platform.h             |   8 +
 arch/x86/boot/compressed/sev.c          |   3 +-
 arch/x86/coco/core.c                    |   4 +
 arch/x86/coco/sev/core.c                | 652 +++++++++++++++++++++++-
 arch/x86/coco/sev/shared.c              |  10 +
 arch/x86/kernel/kvmclock.c              |  11 +
 arch/x86/kernel/tsc.c                   |  43 ++
 arch/x86/mm/mem_encrypt.c               |   2 +
 arch/x86/mm/mem_encrypt_amd.c           |   4 +
 drivers/virt/coco/sev-guest/sev-guest.c | 485 +-----------------
 arch/x86/Kconfig                        |   1 +
 drivers/virt/coco/sev-guest/Kconfig     |   1 -
 16 files changed, 791 insertions(+), 489 deletions(-)

base-commit: af2c8596bd2e455ae350ba1585bc938ee85aa38d

Signature · 1 line
2.34.1