Merge "Remove auto-allocation 1G hugepage from ks for vswitch"

This commit is contained in:
Zuul 2019-03-29 14:33:10 +00:00 committed by Gerrit Code Review
commit 31e93caa04
1 changed files with 1 additions and 8 deletions

View File

@ -13,14 +13,7 @@ n_cpus=$(cat /proc/cpuinfo 2>/dev/null | \
n_numa=$(ls -d /sys/devices/system/node/node* 2>/dev/null | wc -l)
KERN_OPTS=" iommu=pt usbcore.autosuspend=-1"
# Add kernel options for hugepages
if grep -q pdpe1gb /proc/cpuinfo
then
KERN_OPTS="${KERN_OPTS} hugepagesz=1G hugepages=${n_numa}"
KERN_OPTS="${KERN_OPTS} hugepagesz=2M hugepages=0 default_hugepagesz=2M"
else
KERN_OPTS="${KERN_OPTS} hugepagesz=2M hugepages=0 default_hugepagesz=2M"
fi
KERN_OPTS="${KERN_OPTS} hugepagesz=2M hugepages=0 default_hugepagesz=2M"
# If this is an all-in-one system, we need at least 4 CPUs
if [ "$system_type" = "All-in-one" -a ${n_cpus} -lt 4 ]; then