diff options
author | Martin Klozik <martinx.klozik@intel.com> | 2016-01-15 08:06:20 +0000 |
---|---|---|
committer | Maryam Tahhan <maryam.tahhan@intel.com> | 2016-01-21 09:41:56 +0000 |
commit | a64311b5ba40d31e438732979eb97cc8e94e7a6e (patch) | |
tree | be89417369f5199422d0faad59f899c63c8f69d0 /tools | |
parent | 0b2d023df7c2ab79a39260d85fe3c775f7d618bc (diff) |
bugfix: mount hugepages for PVP and PVVP scenarios
Hugepages are used by both DPDK and Qemu. However they were mounted
only in case, that OVS with DPDK support was detected. Thus code
has been modified to mount hugepages in case that either DPDK usage
or QEMU usage is detected.
Change-Id: I662a6f0918b7b8d4fc38c2ce3d0d82bba0b8b2b0
JIRA: VSPERF-170
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/hugepages.py | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/tools/hugepages.py b/tools/hugepages.py new file mode 100644 index 00000000..71535922 --- /dev/null +++ b/tools/hugepages.py @@ -0,0 +1,102 @@ +# Copyright 2015-2016 Intel Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Automation of hugepages management +""" + +import os +import re +import subprocess +import logging +import locale + +from tools import tasks +from conf import settings + +_LOGGER = logging.getLogger(__name__) + +# +# hugepage management +# + + +def is_hugepage_available(): + """Check if hugepages are available on the system. + """ + hugepage_re = re.compile(r'^HugePages_Free:\s+(?P<num_hp>\d+)$') + + # read in meminfo + with open('/proc/meminfo') as mem_file: + mem_info = mem_file.readlines() + + # first check if module is loaded + for line in mem_info: + result = hugepage_re.match(line) + if not result: + continue + + num_huge = result.group('num_hp') + if not num_huge: + _LOGGER.info('No free hugepages.') + else: + _LOGGER.info('Found \'%s\' free hugepage(s).', num_huge) + return True + + return False + + +def is_hugepage_mounted(): + """Check if hugepages are mounted. + """ + output = subprocess.check_output(['mount'], shell=True) + my_encoding = locale.getdefaultlocale()[1] + for line in output.decode(my_encoding).split('\n'): + if 'hugetlbfs' in line: + return True + + return False + + +def mount_hugepages(): + """Ensure hugepages are mounted. + """ + if not is_hugepage_available(): + return + + if is_hugepage_mounted(): + return + + if not os.path.exists(settings.getValue('HUGEPAGE_DIR')): + os.makedirs(settings.getValue('HUGEPAGE_DIR')) + try: + tasks.run_task(['sudo', 'mount', '-t', 'hugetlbfs', 'nodev', + settings.getValue('HUGEPAGE_DIR')], + _LOGGER, 'Mounting hugepages...', True) + except subprocess.CalledProcessError: + _LOGGER.error('Unable to mount hugepages.') + + +def umount_hugepages(): + """Ensure hugepages are unmounted. + """ + if not is_hugepage_mounted(): + return + + try: + tasks.run_task(['sudo', 'umount', settings.getValue('HUGEPAGE_DIR')], + _LOGGER, 'Unmounting hugepages...', True) + except subprocess.CalledProcessError: + _LOGGER.error('Unable to umount hugepages.') + + |