Commit 3a06abc9 authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

scripts/vagrant: enable hugepages backing for VM memory 



Change-Id: I66c1c965d9de8b4e9625c1f1850cbb28d11138ad
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1684


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
parent 7fe1b36a

scripts/vagrant/Vagrantfile

+4 −0
Original line number Diff line number Diff line
@@ -213,6 +213,10 @@ Vagrant.configure(2) do |config| 
    libvirt.cpus = "#{vmcpu}"

    libvirt.video_type = "cirrus"



    if ENV['VAGRANT_HUGE_MEM'] == "1"

      libvirt.memorybacking :hugepages

    end



    # Optional field if we want use other storage pools than default

    # libvirt.storage_pool_name = "vm"

  end

scripts/vagrant/create_vbox.sh

+8 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ display_help() { 
	echo "                                  Parameters for -b option: <path>,<type>,<namespaces>."

	echo "                                  Available types: nvme, ocssd."

	echo "  -c                              Create all above disk, default 0"

	echo "  -H                              Use hugepages for allocating VM memory. Only for libvirt provider. Default: false."

	echo "  -u                              Use password authentication to the VM instead of SSH keys."

	echo "  -l                              Use a local copy of spdk, don't try to rsync from the host."

	echo "  -a                              Copy spdk/autorun.sh artifacts from VM to host system."
@@ -79,8 +80,9 @@ NVME_AUTO_CREATE=0 
VAGRANTFILE_DIR=""

VAGRANT_PASSWORD_AUTH=0

VAGRANT_PACKAGE_BOX=0

VAGRANT_HUGE_MEM=0



while getopts ":b:n:s:x:p:u:vcraldh-:" opt; do

while getopts ":b:n:s:x:p:u:vcraldHh-:" opt; do

	case "${opt}" in

		-)

		case "${OPTARG}" in
@@ -132,6 +134,9 @@ while getopts ":b:n:s:x:p:u:vcraldh-:" opt; do 
		u)

			VAGRANT_PASSWORD_AUTH=1

		;;

		H)

			VAGRANT_HUGE_MEM=1

		;;

		*)

			echo "  Invalid argument: -$OPTARG" >&2

			echo "  Try: \"$0 -h\"" >&2
@@ -239,6 +244,7 @@ export NVME_DISKS_TYPE 
export NVME_DISKS_NAMESPACES

export NVME_FILE

export VAGRANT_PASSWORD_AUTH

export VAGRANT_HUGE_MEM



if [ -n "$SPDK_VAGRANT_PROVIDER" ]; then

    provider="--provider=${SPDK_VAGRANT_PROVIDER}"
@@ -265,6 +271,7 @@ if [ ${DRY_RUN} = 1 ]; then 
	printenv NVME_DISKS_NAMESPACES

	printenv NVME_FILE

	printenv SPDK_DIR

	printenv VAGRANT_HUGE_MEM

fi

if [ -z "$VAGRANTFILE_DIR" ]; then

	VAGRANTFILE_DIR="${VAGRANT_TARGET}/${SPDK_VAGRANT_DISTRO}-${SPDK_VAGRANT_PROVIDER}"