Skip to content

Commit

Permalink
Stop bumping aarch64 to 8G automatically
Browse files Browse the repository at this point in the history
The aarch64 RHEL8 kernel used a page size of 64K. In RHEL9, this was
lowered to the usual 4K and a separate kernel was added for 64K.

For testing, this now means that we no longer need to double the memory
for aarch64 by default like we do for ppc64le. If we write tests that
make use of the 64K kernel, we can have them request more memory as
needed.
  • Loading branch information
jlebon authored and dustymabe committed Sep 15, 2023
1 parent cf33fdb commit c9e0d52
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions mantle/kola/harness.go
Original file line number Diff line number Diff line change
Expand Up @@ -1204,10 +1204,10 @@ ExecStart=%s
config.AddSystemdUnit(unitName, unit, conf.NoState)

// Architectures using 64k pages use slightly more memory, ask for more than requested
// to make sure that we don't run out of it. Currently ppc64le and aarch64 use 64k pages.
// to make sure that we don't run out of it. Currently, only ppc64le uses 64k pages by default.
// See similar logic in boot-mirror.go and luks.go.
switch coreosarch.CurrentRpmArch() {
case "ppc64le", "aarch64":
case "ppc64le":
if targetMeta.MinMemory <= 4096 {
targetMeta.MinMemory = targetMeta.MinMemory * 2
}
Expand Down
4 changes: 2 additions & 2 deletions mantle/kola/tests/ignition/luks.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ func runTest(c cluster.TestCluster, tpm2 bool, threshold int, killTangAfterFirst
opts := platform.MachineOptions{
MinMemory: 4096,
}
// ppc64le and aarch64 use 64K pages; see similar logic in harness.go and boot-mirror.go
// ppc64le uses 64K pages; see similar logic in harness.go and boot-mirror.go
switch coreosarch.CurrentRpmArch() {
case "ppc64le", "aarch64":
case "ppc64le":
opts.MinMemory = 8192
}
m, err := c.NewMachineWithOptions(ignition, opts)
Expand Down
8 changes: 4 additions & 4 deletions mantle/kola/tests/misc/boot-mirror.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ func runBootMirrorTest(c cluster.TestCluster) {
MinMemory: 4096,
},
}
// ppc64le and aarch64 use 64K pages; see similar logic in harness.go and luks.go
// ppc64le uses 64K pages; see similar logic in harness.go and luks.go
switch coreosarch.CurrentRpmArch() {
case "ppc64le", "aarch64":
case "ppc64le":
options.MinMemory = 8192
}
// FIXME: for QEMU tests kola currently assumes the host CPU architecture
Expand Down Expand Up @@ -152,9 +152,9 @@ func runBootMirrorLUKSTest(c cluster.TestCluster) {
MinMemory: 4096,
},
}
// ppc64le and aarch64 use 64K pages; see similar logic in harness.go and luks.go
// ppc64le uses 64K pages; see similar logic in harness.go and luks.go
switch coreosarch.CurrentRpmArch() {
case "ppc64le", "aarch64":
case "ppc64le":
options.MinMemory = 8192
}
// FIXME: for QEMU tests kola currently assumes the host CPU architecture
Expand Down

0 comments on commit c9e0d52

Please sign in to comment.