Skip to content

Commit

Permalink
Add static checks for ppc64le
Browse files Browse the repository at this point in the history
  • Loading branch information
Amulyam24 committed Jan 8, 2024
1 parent 3833bda commit ad07d45
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 16 deletions.
1 change: 1 addition & 0 deletions .github/workflows/static-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ jobs:
- "ubuntu-20.04"
- "arm-no-k8s"
- "s390x"
- "ppc64le"
runs-on: ${{ matrix.instance }}
steps:
- name: Adjust a permission for repo
Expand Down
6 changes: 6 additions & 0 deletions src/agent/src/random.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ use std::os::unix::io::{AsRawFd, FromRawFd};
use tracing::instrument;

pub const RNGDEV: &str = "/dev/random";
#[cfg(target_arch = "powerpc64")]
pub const RNDADDTOENTCNT: libc::c_uint = 0x80045201;
#[cfg(target_arch = "powerpc64")]
pub const RNDRESEEDCRNG: libc::c_int = 0x20005207;
#[cfg(not(target_arch = "powerpc64"))]
pub const RNDADDTOENTCNT: libc::c_int = 0x40045201;
#[cfg(not(target_arch = "powerpc64"))]
pub const RNDRESEEDCRNG: libc::c_int = 0x5207;

// Handle the differing ioctl(2) request types for different targets
Expand Down
12 changes: 10 additions & 2 deletions src/agent/src/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2718,8 +2718,16 @@ OtherField:other
fs::write(mount_dir.path().join("file.dat"), "foobar").unwrap();
stats = get_volume_capacity_stats(mount_dir.path().to_str().unwrap()).unwrap();

assert_eq!(stats.used, 4 * 1024);
assert_eq!(stats.available, available - 4 * 1024);
let size = get_block_size(mount_dir.path().to_str().unwrap()).unwrap();

assert_eq!(stats.used, size);
assert_eq!(stats.available, available - size);
}

fn get_block_size(path: &str) -> Result<u64, Errno> {
let stat = statfs::statfs(path)?;
let block_size = stat.block_size() as u64;
Ok(block_size)
}

#[tokio::test]
Expand Down
4 changes: 2 additions & 2 deletions src/dragonball/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ include ../../utils.mk

PROJECT_DIRS := $(shell find . -name Cargo.toml -printf '%h\n' | sort -u)

ifeq ($(ARCH), s390x)
ifeq ($(ARCH), $(filter $(ARCH), s390x ppc64le))
default build check test clippy vendor:
@echo "s390x not support currently"
@echo "$(ARCH) is not support currently"
exit 0
else

Expand Down
2 changes: 1 addition & 1 deletion src/runtime/cmd/kata-runtime/kata-env_ppc64le_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import "testing"

func getExpectedHostDetails(tmpdir string) (HostInfo, error) {
expectedVendor := ""
expectedModel := "POWER8"
expectedModel := "POWER9"
expectedVMContainerCapable := true
return genericGetExpectedHostDetails(tmpdir, expectedVendor, expectedModel, expectedVMContainerCapable)
}
Expand Down
2 changes: 1 addition & 1 deletion src/tools/agent-ctl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include ../../../utils.mk

ifeq ($(ARCH), ppc64le)
override ARCH = powerpc64le
endif
endif

.DEFAULT_GOAL := default
default: build
Expand Down
4 changes: 2 additions & 2 deletions src/tools/kata-ctl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ csv = "1.2"
serde_with = "2.3"
chrono = { version = "0.4", features = ["serde"]}

[target.'cfg(target_arch = "s390x")'.dependencies]
[target.'cfg(target_arch = "powerpc64")'.dependencies]
reqwest = { version = "0.11", default-features = false, features = ["json", "blocking", "native-tls"] }

[target.'cfg(not(target_arch = "s390x"))'.dependencies]
[target.'cfg(not(target_arch = "powerpc64"))'.dependencies]
reqwest = { version = "0.11", default-features = false, features = ["json", "blocking", "rustls-tls"] }

[dev-dependencies]
Expand Down
6 changes: 6 additions & 0 deletions src/tools/kata-ctl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ export COMMIT := $(if $(shell git status --porcelain --untracked-files=no 2>/dev
# Exported to allow cargo to see it
export KATA_CTL_VERSION := $(if $(COMMIT),$(VERSION)-$(COMMIT),$(VERSION))

ifeq ($(ARCH), ppc64le)
default build check test vendor:
@echo "Building kata-ctl on $(ARCH) is currently being skipped"
exit 0
endif

GENERATED_CODE = src/ops/version.rs

GENERATED_REPLACEMENTS= \
Expand Down
10 changes: 5 additions & 5 deletions src/tools/kata-ctl/src/arch/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ pub mod aarch64;
#[cfg(target_arch = "aarch64")]
pub use aarch64 as arch_specific;

#[cfg(target_arch = "powerpc64le")]
pub mod powerpc64le;
#[cfg(target_arch = "powerpc64le")]
pub use powerpc64le as arch_specific;
#[cfg(target_arch = "powerpc64")]
pub mod powerpc64;
#[cfg(target_arch = "powerpc64")]
pub use powerpc64 as arch_specific;

#[cfg(target_arch = "s390x")]
pub mod s390x;
Expand All @@ -25,7 +25,7 @@ pub use x86_64 as arch_specific;

#[cfg(not(any(
target_arch = "aarch64",
target_arch = "powerpc64le",
target_arch = "powerpc64",
target_arch = "s390x",
target_arch = "x86_64"
)))]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//

use crate::types::*;
#[cfg(target_arch = "powerpc64le")]
#[cfg(target_arch = "powerpc64")]
pub use arch_specific::*;

mod arch_specific {
Expand Down
2 changes: 1 addition & 1 deletion src/tools/runk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include ../../../utils.mk

ifeq ($(ARCH), ppc64le)
override ARCH = powerpc64le
endif
endif

TARGET = runk
TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET)
Expand Down
2 changes: 1 addition & 1 deletion src/tools/trace-forwarder/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include ../../../utils.mk

ifeq ($(ARCH), ppc64le)
override ARCH = powerpc64le
endif
endif

.DEFAULT_GOAL := default
default: build
Expand Down

0 comments on commit ad07d45

Please sign in to comment.