Can you specify which branch or commit in the base repo I need to checkout for each committed patch?

[fffmonkeyking-new]

Can you specify which branch or commit in the base repo I need to checkout for each committed patch?

For example:
for https://github.com/intel/tdx-linux.git, when I execute

1. git clone https://github.com/intel/tdx-linux.git
2. cd tdx-linux/
3. git checkout -b device-passthrough 1323f7b

Then,
I can see a README.md file in the tdx-linux/tdx-kvm/ directory. The content of the README.md file is:
“
You should do the following to apply this patch:

1. git clone https://git.kernel.org/pub/scm/linux/kernel/git/vishal/kvm.git
2. cd kvm/
3. git checkout kvm-coco-queue-20240512
4. git am --empty=drop ../tdx-linux/tdx-kvm/tdx_kvm_baseline_698ca1e40357.mbox
   ”

Because, for the latest committed patch, I always have difficulty finding the base repo version that can successfully apply this patch.

[dujh]

Can you specify which branch or commit in the base repo I need to checkout for each committed patch?

For example: for https://github.com/intel/tdx-linux.git, when I execute

1. git clone https://github.com/intel/tdx-linux.git
2. cd tdx-linux/
3. git checkout -b device-passthrough 1323f7b

Then, I can see a README.md file in the tdx-linux/tdx-kvm/ directory. The content of the README.md file is: “ You should do the following to apply this patch:

1. git clone https://git.kernel.org/pub/scm/linux/kernel/git/vishal/kvm.git
2. cd kvm/
3. git checkout kvm-coco-queue-20240512
4. git am --empty=drop ../tdx-linux/tdx-kvm/tdx_kvm_baseline_698ca1e40357.mbox
   ”

Because, for the latest committed patch, I always have difficulty finding the base repo version that can successfully apply this patch.

Refer this for instruction: https://github.com/intel/tdx-linux/tree/device-passthrough?tab=readme-ov-file. For the most recent version of the device-passthrough branch, you should checkout the snapshot written in this instruction: A snapshot of the older version of kvm-coco-queue can be found, for example, here.

[fffmonkeyking-new]

Can you specify which branch or commit in the base repo I need to checkout for each committed patch?
For example: for https://github.com/intel/tdx-linux.git, when I execute

1. git clone https://github.com/intel/tdx-linux.git
2. cd tdx-linux/
3. git checkout -b device-passthrough 1323f7b

Then, I can see a README.md file in the tdx-linux/tdx-kvm/ directory. The content of the README.md file is: “ You should do the following to apply this patch:

1. git clone https://git.kernel.org/pub/scm/linux/kernel/git/vishal/kvm.git
2. cd kvm/
3. git checkout kvm-coco-queue-20240512
4. git am --empty=drop ../tdx-linux/tdx-kvm/tdx_kvm_baseline_698ca1e40357.mbox
   ”

Because, for the latest committed patch, I always have difficulty finding the base repo version that can successfully apply this patch.

Refer this for instruction: https://github.com/intel/tdx-linux/tree/device-passthrough?tab=readme-ov-file. For the most recent version of the device-passthrough branch, you should checkout the snapshot written in this instruction: A snapshot of the older version of kvm-coco-queue can be found, for example, here.

https://github.com/intel/tdx/releases/tag/kvm-coco-queue-snapshot%2Fkvm-coco-queue-snapshot-20250131
：Does that sanpshot code mean that the corresponding patch has been successfully applied?

[dujh]

Can you specify which branch or commit in the base repo I need to checkout for each committed patch?
For example: for https://github.com/intel/tdx-linux.git, when I execute

1. git clone https://github.com/intel/tdx-linux.git
2. cd tdx-linux/
3. git checkout -b device-passthrough 1323f7b

Then, I can see a README.md file in the tdx-linux/tdx-kvm/ directory. The content of the README.md file is: “ You should do the following to apply this patch:

1. git clone https://git.kernel.org/pub/scm/linux/kernel/git/vishal/kvm.git
2. cd kvm/
3. git checkout kvm-coco-queue-20240512
4. git am --empty=drop ../tdx-linux/tdx-kvm/tdx_kvm_baseline_698ca1e40357.mbox
   ”

Because, for the latest committed patch, I always have difficulty finding the base repo version that can successfully apply this patch.

Refer this for instruction: https://github.com/intel/tdx-linux/tree/device-passthrough?tab=readme-ov-file. For the most recent version of the device-passthrough branch, you should checkout the snapshot written in this instruction: A snapshot of the older version of kvm-coco-queue can be found, for example, here.

https://github.com/intel/tdx/releases/tag/kvm-coco-queue-snapshot%2Fkvm-coco-queue-snapshot-20250131 ：Does that sanpshot code mean that the corresponding patch has been successfully applied?

No, you need to apply the patches from the mbox files to the kvm-coco-queue/Qemu. Read the 'Repo Layout' part for details in this instruction: https://github.com/intel/tdx-linux/tree/device-passthrough?tab=readme-ov-file.

[yu-chen-surf]

Can you specify which branch or commit in the base repo I need to checkout for each committed patch?

For example: for https://github.com/intel/tdx-linux.git, when I execute

1. git clone https://github.com/intel/tdx-linux.git
2. cd tdx-linux/
3. git checkout -b device-passthrough 1323f7b

There is no need to switch to 1323f7b, it is recommended to use the latest one.

Then, I can see a README.md file in the tdx-linux/tdx-kvm/ directory. The content of the README.md file is: “ You should do the following to apply this patch:

1. git clone https://git.kernel.org/pub/scm/linux/kernel/git/vishal/kvm.git
2. cd kvm/
3. git checkout kvm-coco-queue-20240512
4. git am --empty=drop ../tdx-linux/tdx-kvm/tdx_kvm_baseline_698ca1e40357.mbox
   ”

Please download the snapshot code base (https://github.com/intel/tdx/releases/tag/) and apply the patches in this repo(https://github.com/intel/tdx-linux.git) directly. It is described here: https://github.com/intel/tdx-linux/blob/device-passthrough/README.md

[fffmonkeyking-new]

Please download the snapshot code base (https://github.com/intel/tdx/releases/tag/) and apply the patches in this repo(https://github.com/intel/tdx-linux.git) directly. It is described here: https://github.com/intel/tdx-linux/blob/device-passthrough/README.md
：

is that so? @yu-chen-surf

$ git clone https://github.com/intel/tdx.git

$ cd tdx

$ git checkout kvm-coco-queue-snapshot/kvm-coco-queue-snapshot-20250131

$ git am --empty=drop ../tdx-linux/tdx-kvm/tdx_kvm_baseline_55f78d925e07.mbox
Skipping: FIRST_TDX_COMMIT
Skipping: The start of TDX KVM patch series: TD vcpu enter/exit
Applying: x86/virt/tdx: Make tdh_vp_enter() noinstr
error: patch failed: arch/x86/virt/vmx/tdx/seamcall.S:41
error: arch/x86/virt/vmx/tdx/seamcall.S: patch does not apply
error: patch failed: arch/x86/virt/vmx/tdx/tdx.c:1511
error: arch/x86/virt/vmx/tdx/tdx.c: patch does not apply
Patch failed at 0003 x86/virt/tdx: Make tdh_vp_enter() noinstr
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

[fffmonkeyking-new]

A successful am log：

$ cd tdx-linux/
$ git checkout -b device-passthrough 1323f7b)

$ cd tdx/
$ git checkout kvm-coco-queue-snapshot/kvm-coco-queue-snapshot-20240512
$ git am --empty=drop ../tdx-linux-1323f7b/tdx-kvm/tdx_kvm_baseline_698ca1e40357.mbox
Applying: Fix AMD build
Applying: Add missing SHADOW_NONPRESENT_VALUE
Applying: KVM: x86/tdp_mmu: Rename REMOVED_SPTE to FROZEN_SPTE
Applying: KVM: Add member to struct kvm_gfn_range for target alias
Applying: KVM: x86: Add a VM type define for TDX
Applying: KVM: x86/mmu: Add an external pointer to struct kvm_mmu_page
Applying: KVM: x86/mmu: Add an is_mirror member for union kvm_mmu_page_role
Applying: KVM: x86/mmu: Make kvm_tdp_mmu_alloc_root() return void
Applying: KVM: x86/tdp_mmu: Take struct kvm in iter loops
Applying: KVM: x86/tdp_mmu: Take a GFN in kvm_tdp_mmu_fast_pf_get_last_sptep()
Applying: KVM: x86/mmu: Support GFN direct bits
Applying: KVM: x86/tdp_mmu: Extract root invalid check from tdx_mmu_next_root()
Applying: KVM: x86/tdp_mmu: Introduce KVM MMU root types to specify page table type
Applying: KVM: x86/tdp_mmu: Take root in tdp_mmu_for_each_pte()
Applying: KVM: x86/tdp_mmu: Support mirror root for TDP MMU
Applying: KVM: x86/tdp_mmu: Propagate attr_filter to MMU notifier callbacks
Applying: KVM: x86/tdp_mmu: Propagate building mirror page tables
Applying: KVM: x86/tdp_mmu: Propagate tearing down mirror page tables
Applying: KVM: x86/tdp_mmu: Take root types for kvm_tdp_mmu_invalidate_all_roots()
Applying: KVM: x86/mmu: Introduce a quirk to control memslot zap behavior
Applying: KVM: selftests: Test slot move/delete with slot zap quirk enabled/disabled
Applying: KVM: selftests: Allow slot modification stress test with quirk disabled
Applying: KVM: selftests: Test memslot move in memslot_perf_test with quirk disabled
Applying: KVM: selftests: Test private access to deleted memslot with quirk disabled
Applying: KVM: x86/mmu: Implement memslot deletion for TDX
Applying: KVM: x86/tdp_mmu: Add a helper function to walk down the TDP MMU
Applying: KVM: x86: design documentation on TDX support of x86 KVM TDP MMU
Applying: KVM: x86: hyper-v: Calculate APIC bus frequency for Hyper-V
Applying: KVM: x86: Make nsec per APIC bus cycle a VM variable
Applying: KVM: x86: Add a capability to configure bus frequency for APIC timer
Applying: KVM: selftests: Add test for configure of x86 APIC bus frequency
Applying: x86/virt/tdx: Rename _offset to _member for TD_SYSINFO_MAP() macro
Applying: x86/virt/tdx: Move TDMR metadata fields map table to local variable
Applying: x86/virt/tdx: Unbind global metadata read with 'struct tdx_tdmr_sysinfo'
Applying: x86/virt/tdx: Support global metadata read for all element sizes
Applying: x86/virt/tdx: Export TDX KeyID information
Applying: x86/virt/tdx: Export SEAMCALL functions
Applying: x86/virt/tdx: Export global metadata read infrastructure
Applying: KVM: VMX: Initialize loaded_vmcss_on_cpu in vmx_init()
Applying: KVM: VMX: Refactor KVM VMX module init/exit functions
Applying: KVM: TDX: Initialize the TDX module when loading the KVM intel kernel module
Applying: KVM: TDX: Add placeholders for TDX VM/vcpu structure
Applying: The start of TDX KVM patch series: TDX architectural definitions
Applying: KVM: TDX: Define TDX architectural definitions
Applying: KVM: TDX: Add TDX "architectural" error codes
Applying: KVM: TDX: Add C wrapper functions for SEAMCALLs to the TDX module
Applying: KVM: TDX: Add helper functions to print TDX SEAMCALL error
Applying: The start of TDX KVM patch series: TD VM creation/destruction
Applying: KVM: TDX: Add helper functions to allocate/free TDX private host key id
Applying: KVM: TDX: Get system-wide info about TDX module on initialization
Applying: KVM: TDX: Add place holder for TDX VM specific mem_enc_op ioctl
Applying: KVM: TDX: x86: Add ioctl to get TDX systemwide parameters
Applying: KVM: TDX: Allow userspace to configure maximum vCPUs for TDX guests
Applying: KVM: TDX: create/destroy VM structure
Applying: KVM: TDX: initialize VM with TDX specific parameters
Applying: KVM: TDX: Make pmu_intel.c ignore guest TD case
Applying: KVM: TDX: Don't offline the last cpu of one package when there's TDX guest
Applying: The start of TDX KVM patch series: TD vcpu creation/destruction
Applying: KVM: TDX: create/free TDX vcpu structure
Applying: KVM: TDX: Do TDX specific vcpu initialization
Applying: The start of TDX KVM patch series: TDX EPT violation
.git/rebase-apply/patch:20: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Applying: KVM: x86/mmu: Do not enable page track for TD guest
Applying: KVM: VMX: Split out guts of EPT violation to common/exposed function
Applying: KVM: TDX: Add accessors VMX VMCS helpers
Applying: KVM: TDX: Add load_mmu_pgd method for TDX
Applying: KVM: TDX: Retry seamcall when TDX_OPERAND_BUSY with operand SEPT
Applying: KVM: TDX: Require TDP MMU and mmio caching for TDX
Applying: KVM: x86/mmu: Add setter for shadow_mmio_value
Applying: KVM: TDX: TDP MMU TDX support
Applying: KVM: TDX: MTRR: implement get_mt_mask() for TDX
Applying: The start of TDX KVM patch series: TD finalization
Applying: KVM: TDX: Create initial guest memory
Applying: VM: TDX: Add an ioctl to create initial guest memory
Applying: KVM: TDX: Finalize VM initialization
Applying: The start of TDX KVM patch series: TD vcpu enter/exit
Applying: KVM: TDX: Implement TDX vcpu enter/exit path
Applying: KVM: TDX: vcpu_run: save/restore host state(host kernel gs)
Applying: KVM: TDX: restore host xsave state when exit from the guest TD
Applying: KVM: x86: Allow to update cached values in kvm_user_return_msrs w/o wrmsr
Applying: KVM: TDX: restore user ret MSRs
Applying: KVM: TDX: Add TSX_CTRL msr into uret_msrs list
Applying: The start of TDX KVM patch series: TD vcpu exits/interrupts/hypercalls
Applying: KVM: TDX: Complete interrupts after TD exit
Applying: KVM: TDX: Handle vCPU migration over logical processor
Applying: KVM: x86: Add a switch_db_regs flag to handle TDX's auto-switched behavior
Applying: KVM: TDX: Add support for find pending IRQ in a protected local APIC
Applying: KVM: x86: Assume timer IRQ was injected if APIC state is proteced
Applying: KVM: TDX: Remove usage of struct vcpu_vmx from posted_intr.c
Applying: KVM: TDX: Disable PI wakeup for IPIv
Applying: KVM: TDX: Implement non-NMI interrupt injection
Applying: KVM: TDX: Wait lapic expire when POSTED_INTR_ON set
Applying: KVM: TDX: Implement methods to inject NMI
Applying: KVM: VMX: Move NMI/exception handler to common helper
Applying: KVM: TDX: Add a place holder to handle TDX VM exit
Applying: KVM: TDX: Handle vmentry failure for INTEL TD guest
Applying: KVM: TDX: Handle EXIT_REASON_OTHER_SMI
Applying: KVM: TDX: handle ept violation/misconfig exit
Applying: KVM: TDX: handle EXCEPTION_NMI and EXTERNAL_INTERRUPT
Skipping: KVM: TDX: Handle EXIT_REASON_OTHER_SMI with MSMI
Applying: KVM: TDX: Add a place holder for handler of TDX hypercalls (TDG.VP.VMCALL)
Applying: KVM: TDX: handle KVM hypercall with TDG.VP.VMCALL
Applying: KVM: TDX: Add KVM Exit for TDX TDG.VP.VMCALL
Applying: KVM: TDX: Handle TDX PV CPUID hypercall
Applying: KVM: TDX: Handle TDX PV HLT hypercall
Applying: KVM: TDX: Handle TDX PV port io hypercall
Applying: KVM: TDX: Handle TDX PV MMIO hypercall
Applying: KVM: x86: Move KVM_MAX_MCE_BANKS to header file
Applying: KVM: TDX: Implement callbacks for MSR operations for TDX
Applying: KVM: TDX: Handle TDX PV rdmsr/wrmsr hypercall
Applying: KVM: TDX: Handle MSR IA32_FEAT_CTL MSR and IA32_MCG_EXT_CTL
Applying: KVM: TDX: Handle TDG.VP.VMCALL hypercall
Applying: KVM: TDX: Handle SMI request as !CONFIG_KVM_SMM
Applying: KVM: TDX: Silently ignore INIT/SIPI
Applying: KVM: TDX: Add methods to ignore accesses to CPU state
Applying: KVM: TDX: Add methods to ignore guest instruction emulation
Applying: KVM: TDX: Add methods to ignore VMX preemption timer
Applying: KVM: TDX: Add methods to ignore accesses to TSC
Applying: KVM: TDX: Ignore setting up mce
Applying: KVM: TDX: Add a method to ignore for TDX to ignore hypercall patch
Applying: KVM: TDX: Add methods to ignore virtual apic related operation
Applying: KVM: TDX: Inhibit APICv for TDX guest
Applying: KVM: TDX: Make TDX VM type supported
Applying: Documentation/virt/kvm: Document on Trust Domain Extensions(TDX)
Applying: the end of (the first phase of) TDX KVM patch series
Applying: x86/virt/tdx: Explicitly save/restore RBP for seamcall_saved_ret()
Applying: KVM: TDX: Don't use NO_RBP_MOD for backward compatibility
Applying: KVM: TDX: Fix possible invalid memory access in tdx_gmem_post_populate
Applying: KVM: selftests: Add function to allow one-to-one GVA to GPA mappings
Applying: KVM: selftests: Expose function that sets up sregs based on VM's mode
Applying: KVM: selftests: Store initial stack address in struct kvm_vcpu
Applying: KVM: selftests: Refactor steps in vCPU descriptor table initialization
Applying: KVM: selftests: Add helper functions to create TDX VMs
Applying: KVM: selftests: TDX: Use KVM_TDX_CAPABILITIES to validate TDs' attribute configuration
Applying: KVM: selftests: TDX: Update load_td_memory_region for VM memory backed by guest memfd
Applying: KVM: selftests: TDX: Add TDX lifecycle test

[yu-chen-surf]

Please download the snapshot code base (https://github.com/intel/tdx/releases/tag/) and apply the patches in this repo(https://github.com/intel/tdx-linux.git) directly. It is described here: https://github.com/intel/tdx-linux/blob/device-passthrough/README.md ：

is that so? @yu-chen-surf

$ git clone https://github.com/intel/tdx.git

$ cd tdx

$ git checkout kvm-coco-queue-snapshot/kvm-coco-queue-snapshot-20250131

Please check the baseline hash in the device-passthroug branch, and rebase to that one, then apply the patches.
I have updated the device-passthrough branch to the latest version. So first you can download the snapshot
https://github.com/intel/tdx/releases/tag/kvm-coco-queue-snapshot%2Fkvm-coco-queue-snapshot-20250220
then reset to 3bd69dc8a4a9 according to the baseline name tdx_kvm_baseline_3bd69dc8a4a9.mbox
Then you can git am the patches.
These have been described in the README, please have a check.

$ git am --empty=drop ../tdx-linux/tdx-kvm/tdx_kvm_baseline_55f78d925e07.mbox Skipping: FIRST_TDX_COMMIT Skipping: The start of TDX KVM patch series: TD vcpu enter/exit Applying: x86/virt/tdx: Make tdh_vp_enter() noinstr error: patch failed: arch/x86/virt/vmx/tdx/seamcall.S:41 error: arch/x86/virt/vmx/tdx/seamcall.S: patch does not apply error: patch failed: arch/x86/virt/vmx/tdx/tdx.c:1511 error: arch/x86/virt/vmx/tdx/tdx.c: patch does not apply Patch failed at 0003 x86/virt/tdx: Make tdh_vp_enter() noinstr hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".

[fffmonkeyking-new]

This is ok:

git clone https://github.com/intel/tdx.git
cd tdx/
git checkout kvm-coco-queue-snapshot/kvm-coco-queue-snapshot-20250220
git reset --hard 3bd69dc8a4a9
git am --empty=drop ../tdx-linux-latest/tdx-kvm/tdx_kvm_baseline_3bd69dc8a4a9.mbox

[fffmonkeyking-new]

This is ok:
git clone https://github.com/intel-staging/qemu-tdx.git
cd qemu-tdx/
git checkout tdx-qemu-wip-2025-02-18
git reset --hard 8b107e0e87
git am --empty=drop ../tdx-linux-latest/tdx-qemu/tdx_qemu_baseline_8b107e0e87.mbox

However, I did not find any branch in https://gitlab.com/qemu-project/qemu.git that could successfully apply the tdx_qemu_baseline_8b107e0e87.mbox patch. @yu-chen-surf