github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 02:56:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #225 from Pennyzct/memory-hotplug

Browse Source 
memory_hotplug: MEM_BOUNDARY_MB should be arch-dependent
This commit is contained in:
James O. D. Hunt 2019-01-17 11:18:29 +00:00 committed by GitHub
commit 1e89f7ed68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
image-builder/image_builder.sh
View File

@ -50,8 +50,12 @@ MAX_IMG_SIZE_MB=2048
FS_TYPE=${FS_TYPE:-"ext4"} FS_TYPE=${FS_TYPE:-"ext4"}
# In order to support memory hotplug, image must be aligned to 128M # In order to support memory hotplug, image must be aligned to memory section(size in MB) according to different architecture.
MEM_BOUNDARY=128 ARCH=$(arch)
case "$ARCH" in
aarch64) MEM_BOUNDARY_MB=1024 ;;
*) MEM_BOUNDARY_MB=128 ;;
esac
# Maximum no of attempts to create a root disk before giving up # Maximum no of attempts to create a root disk before giving up
MAX_ATTEMPTS=5 MAX_ATTEMPTS=5
@ -139,20 +143,21 @@ OK "Agent installed"
ROOTFS_SIZE=$(du -B 1MB -s "${ROOTFS}" | awk '{print $1}') ROOTFS_SIZE=$(du -B 1MB -s "${ROOTFS}" | awk '{print $1}')
BLOCK_SIZE=${BLOCK_SIZE:-4096} BLOCK_SIZE=${BLOCK_SIZE:-4096}
OLD_IMG_SIZE=0 OLD_IMG_SIZE=0
ORIG_MEM_BOUNDARY_MB=${MEM_BOUNDARY_MB}
align_memory() align_memory()
{ {
remaining=$(($IMG_SIZE % $MEM_BOUNDARY)) remaining=$(($IMG_SIZE % $MEM_BOUNDARY_MB))
if [ "$remaining" != "0" ];then if [ "$remaining" != "0" ];then
warning "image size '$IMG_SIZE' is not aligned to memory boundary '$MEM_BOUNDARY', aligning it" warning "image size '$IMG_SIZE' is not aligned to memory boundary '$MEM_BOUNDARY_MB', aligning it"
IMG_SIZE=$(($IMG_SIZE + $MEM_BOUNDARY - $remaining)) IMG_SIZE=$(($IMG_SIZE + $MEM_BOUNDARY_MB - $remaining))
fi fi
} }
# Calculate image size based on the rootfs # Calculate image size based on the rootfs
calculate_img_size() calculate_img_size()
{ {
IMG_SIZE=${IMG_SIZE:-$MEM_BOUNDARY} IMG_SIZE=${IMG_SIZE:-$MEM_BOUNDARY_MB}
align_memory align_memory
if [ -n "$ROOT_FREE_SPACE" ] && [ "$IMG_SIZE" -gt "$ROOTFS_SIZE" ]; then if [ -n "$ROOT_FREE_SPACE" ] && [ "$IMG_SIZE" -gt "$ROOTFS_SIZE" ]; then
info "Ensure that root partition has at least ${ROOT_FREE_SPACE}MB of free space" info "Ensure that root partition has at least ${ROOT_FREE_SPACE}MB of free space"
@ -258,8 +263,8 @@ create_rootfs_disk()
# if the available disk space is less than rootfs size, repeat the process # if the available disk space is less than rootfs size, repeat the process
# of disk creation by adding 5% in the inital assumed value $ROOTFS_SIZE # of disk creation by adding 5% in the inital assumed value $ROOTFS_SIZE
if [ $ROOTFS_SIZE -gt $AVAIL_DISK ]; then if [ $ROOTFS_SIZE -gt $AVAIL_DISK ]; then
# Increase the size but remain aligned to 128 # Increase the size but remain aligned to the original MEM_BOUNDARY_MB, which is stored in $ORIG_MEM_BOUNDARY_MB
MEM_BOUNDARY=$(($MEM_BOUNDARY+128)) MEM_BOUNDARY_MB=$(($MEM_BOUNDARY_MB+$ORIG_MEM_BOUNDARY_MB))
OLD_IMG_SIZE=${IMG_SIZE} OLD_IMG_SIZE=${IMG_SIZE}
unset IMG_SIZE unset IMG_SIZE
unmount unmount