Skip to content

Commit 2374f60

Browse files
committed
chore(virtio-pmem): new guest kernel config
Add new file with options enabling virtio-pmem support in guest kernels Signed-off-by: Egor Lazarchuk <[email protected]>
1 parent 896a5cf commit 2374f60

File tree

2 files changed

+28
-5
lines changed

2 files changed

+28
-5
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Needed for DAX on aarch64. Will be ignored on x86_64
2+
CONFIG_ARM64_PMEM=y
3+
4+
CONFIG_DEVICE_MIGRATION=y
5+
CONFIG_ZONE_DEVICE=y
6+
CONFIG_VIRTIO_PMEM=y
7+
CONFIG_LIBNVDIMM=y
8+
CONFIG_BLK_DEV_PMEM=y
9+
CONFIG_ND_CLAIM=y
10+
CONFIG_ND_BTT=y
11+
CONFIG_BTT=y
12+
CONFIG_ND_PFN=y
13+
CONFIG_NVDIMM_PFN=y
14+
CONFIG_NVDIMM_DAX=y
15+
CONFIG_OF_PMEM=y
16+
CONFIG_NVDIMM_KEYS=y
17+
CONFIG_DAX=y
18+
CONFIG_DEV_DAX=y
19+
CONFIG_DEV_DAX_PMEM=y
20+
CONFIG_DEV_DAX_KMEM=y
21+
CONFIG_FS_DAX=y
22+
CONFIG_FS_DAX_PMD=y

resources/rebuild.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,16 @@ function build_al_kernels {
248248

249249
CI_CONFIG="$PWD/guest_configs/ci.config"
250250
PCIE_CONFIG="$PWD/guest_configs/pcie.config"
251+
PMEM_CONFIG="$PWD/guest_configs/virtio-pmem.config"
251252

252253
if [[ "$KERNEL_VERSION" == @(all|5.10) ]]; then
253-
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config "$CI_CONFIG" "$PCIE_CONFIG"
254+
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG"
254255
fi
255256
if [[ $ARCH == "x86_64" && "$KERNEL_VERSION" == @(all|5.10-no-acpi) ]]; then
256-
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10-no-acpi.config "$CI_CONFIG" "$PCIE_CONFIG"
257+
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10-no-acpi.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG"
257258
fi
258259
if [[ "$KERNEL_VERSION" == @(all|6.1) ]]; then
259-
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config "$CI_CONFIG" "$PCIE_CONFIG"
260+
build_al_kernel $PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG"
260261
fi
261262

262263
# Build debug kernels
@@ -265,11 +266,11 @@ function build_al_kernels {
265266
OUTPUT_DIR=$OUTPUT_DIR/debug
266267
mkdir -pv $OUTPUT_DIR
267268
if [[ "$KERNEL_VERSION" == @(all|5.10) ]]; then
268-
build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config" "$CI_CONFIG" "$PCIE_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG"
269+
build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-5.10.config" "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG"
269270
vmlinux_split_debuginfo $OUTPUT_DIR/vmlinux-5.10.*
270271
fi
271272
if [[ "$KERNEL_VERSION" == @(all|6.1) ]]; then
272-
build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config" "$CI_CONFIG" "$PCIE_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG"
273+
build_al_kernel "$PWD/guest_configs/microvm-kernel-ci-$ARCH-6.1.config" "$CI_CONFIG" "$PCIE_CONFIG" "$PMEM_CONFIG" "$FTRACE_CONFIG" "$DEBUG_CONFIG"
273274
vmlinux_split_debuginfo $OUTPUT_DIR/vmlinux-6.1.*
274275
fi
275276
}

0 commit comments

Comments
 (0)