Skip to content

Fix csource_test.go #6422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ramosian-glider merged 4 commits into from
Oct 17, 2025
Merged

Fix csource_test.go #6422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5533ccf
executor: s/true/1 in common_kvm_ppc64.h
ramosian-glider Oct 17, 2025
4736e25
executor: common_kvm_ppc64.h: drop kvm_ppc_mmuv3_cfg
ramosian-glider Oct 17, 2025
32020ba
executor: common_kvm.h: fix compilation
ramosian-glider Oct 17, 2025
27ef4be
pkg/csource: run testPseudoSyscalls() for all targets
ramosian-glider Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion executor/common_kvm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "common_kvm_syzos.h"
#include "kvm.h"

#if SYZ_EXECUTOR || __NR_syz_kvm_add_vcpu
#if SYZ_EXECUTOR || __NR_syz_kvm_add_vcpu || __NR_syz_kvm_setup_cpu || __NR_syz_kvm_setup_syzos_vm
extern char* __start_guest;

// executor_fn_guest_addr() is compiled into both the host and the guest code.
Expand Down
8 changes: 1 addition & 7 deletions executor/common_kvm_ppc64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,6 @@
// Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3
#define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)

// For KVM_PPC_CONFIGURE_V3_MMU
struct kvm_ppc_mmuv3_cfg {
__u64 flags;
__u64 process_table; // second doubleword of partition table entry
};

// Flag values for KVM_PPC_CONFIGURE_V3_MMU
#define KVM_PPC_MMUV3_RADIX 1 // 1 = radix mode, 0 = HPT
#define KVM_PPC_MMUV3_GTSE 2 // global translation shootdown enb
Expand Down Expand Up @@ -185,7 +179,7 @@ static volatile long syz_kvm_setup_cpu(volatile long a0, volatile long a1, volat
if (kvm_vcpu_enable_cap(cpufd, KVM_CAP_PPC_PAPR))
return -1;

if (kvm_vm_enable_cap(vmfd, KVM_CAP_PPC_NESTED_HV, true, 0))
if (kvm_vm_enable_cap(vmfd, KVM_CAP_PPC_NESTED_HV, 1, 0))
return -1;

for (uintptr_t i = 0; i < guest_mem_size / page_size; i++) {
Expand Down
15 changes: 7 additions & 8 deletions pkg/csource/csource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,14 @@ func TestGenerate(t *testing.T) {
}
t.Run(target.OS+"/"+target.Arch, func(t *testing.T) {
full := !checked[target.OS]
if !full && testing.Short() {
return
if full || !testing.Short() {
if err := sysTarget.BrokenCompiler; err != "" {
t.Skipf("target compiler is broken: %v", err)
}
checked[target.OS] = true
t.Parallel()
testTarget(t, target, full)
}
if err := sysTarget.BrokenCompiler; err != "" {
t.Skipf("target compiler is broken: %v", err)
}
checked[target.OS] = true
t.Parallel()
testTarget(t, target, full)
testPseudoSyscalls(t, target)
})
}
Expand Down