From 5c6e25f50ddac493ab6c61726fb4a1f96b9bf55c Mon Sep 17 00:00:00 2001 From: Nataliia Solomko Date: Mon, 1 Sep 2025 14:08:21 +0300 Subject: T7757: VPP Verify buffers for rx/tx queues --- src/conf_mode/vpp.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/conf_mode/vpp.py b/src/conf_mode/vpp.py index 9517f85f3..b205291f2 100755 --- a/src/conf_mode/vpp.py +++ b/src/conf_mode/vpp.py @@ -58,6 +58,7 @@ from vyos.vpp.config_verify import ( verify_vpp_interfaces_dpdk_num_queues, verify_routes_count, verify_vpp_main_heap_size, + verify_vpp_buffers, ) from vyos.vpp.config_filter import iface_filter_eth from vyos.vpp.utils import EthtoolGDrvinfo @@ -223,10 +224,12 @@ def get_config(config=None): # dictionary retrieved. default_values = conf.get_config_defaults(**config.kwargs, recursive=True) - # delete 'xdp-options' from defaults if driver is DPDK + # delete driver-incompatible defaults for iface, iface_config in config.get('settings', {}).get('interface', {}).items(): if iface_config.get('driver') == 'dpdk': del default_values['settings']['interface'][iface]['xdp_options'] + elif iface_config.get('driver') == 'xdp': + del default_values['settings']['interface'][iface]['dpdk_options'] config = config_dict_merge(default_values, config) @@ -342,15 +345,6 @@ def get_config(config=None): eth_ifaces_persist[iface]['bus_id'] = control_host.get_bus_name(iface) eth_ifaces_persist[iface]['dev_id'] = control_host.get_dev_id(iface) - # Get kernel settings for hugepages - kernel_memory_settings = conf.get_config_dict( - ['system', 'option', 'kernel', 'memory'], - key_mangling=('-', '_'), - get_first_key=True, - no_tag_node_value_mangle=True, - ) - config['kernel_memory_settings'] = kernel_memory_settings - # Return to config dictionary config['persist_config'] = eth_ifaces_persist @@ -411,6 +405,9 @@ def verify(config): verify_vpp_main_heap_size(config['settings']) verify_vpp_statseg_size(config['settings']) + # Check buffers + verify_vpp_buffers(config['settings'], workers) + # Check if available memory is enough for current VPP config verify_vpp_memory(config) -- cgit v1.2.3 From b0ae930a9fcb3093d3069bb8296a2f572e6a3d93 Mon Sep 17 00:00:00 2001 From: Nataliia Solomko Date: Fri, 5 Sep 2025 11:37:55 +0300 Subject: T7757: VPP add auto calculation of buffer-per-numa parameter as default --- interface-definitions/vpp.xml.in | 11 +++++-- python/vyos/vpp/config_resource_checks/memory.py | 7 ++++ python/vyos/vpp/config_verify.py | 8 ++--- src/conf_mode/vpp.py | 41 ++++++++++++++++++++---- 4 files changed, 51 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in index 356345f84..e7a21ecf1 100644 --- a/interface-definitions/vpp.xml.in +++ b/interface-definitions/vpp.xml.in @@ -360,14 +360,19 @@ Number of buffers per numa node - u32:0-4294967295 + u32:16384-4294967295 Number of buffers + + auto + Auto calculate number of buffers per numa node + - + + (auto) - 16384 + auto diff --git a/python/vyos/vpp/config_resource_checks/memory.py b/python/vyos/vpp/config_resource_checks/memory.py index 8b201ef87..ea4697ba2 100644 --- a/python/vyos/vpp/config_resource_checks/memory.py +++ b/python/vyos/vpp/config_resource_checks/memory.py @@ -199,11 +199,18 @@ def buffers_required(settings: dict, workers) -> int: """ buffers_total = 0 for ifname, iface_config in settings.get('interface', {}).items(): + # Do not include XDP interfaces in buffer calculations. + # Unlike DPDK, XDP does not use VPP-managed mbufs for RX/TX rings, + # so buffer requirements cannot be derived from descriptors here. + # Buffers for XDP are handled internally by the kernel/XDP layer, + # not by VPP’s buffer allocator. if iface_config.get('driver') == 'xdp': continue dpdk_options = iface_config.get('dpdk_options', {}) rx_queues = int(dpdk_options.get('num_rx_queues', 1)) rx_desc = int(dpdk_options.get('num_rx_desc')) + # default TX queues is equal to number of worker threads + # plus 1 main thread tx_queues = int(dpdk_options.get('num_tx_queues', workers + 1)) tx_desc = int(dpdk_options.get('num_tx_desc')) diff --git a/python/vyos/vpp/config_verify.py b/python/vyos/vpp/config_verify.py index 78c5d420b..71cf97423 100644 --- a/python/vyos/vpp/config_verify.py +++ b/python/vyos/vpp/config_verify.py @@ -317,7 +317,7 @@ def verify_vpp_cpu_main_core(cpu_settings: dict) -> None: ) -def verify_vpp_settings_cpu_workers(cpu_settings: dict) -> int: +def verify_vpp_settings_cpu_workers(cpu_settings: dict): """ Verify that the system has enough available CPU cores to run a given amount of worker processes (1 worker/core) @@ -331,10 +331,8 @@ def verify_vpp_settings_cpu_workers(cpu_settings: dict) -> int: f'(reduce to {available_cores} or less)' ) - return workers - -def verify_vpp_settings_cpu_corelist_workers(cpu_settings: dict) -> int: +def verify_vpp_settings_cpu_corelist_workers(cpu_settings: dict): """ Verify that the CPU cores provided to the config are free and can be used by VPP """ @@ -366,8 +364,6 @@ def verify_vpp_settings_cpu_corelist_workers(cpu_settings: dict) -> int: if len(all_core_nums) > cpu_checks.available_cores_count(cpu_settings): raise ConfigError(f'{error_msg}: Not enough free CPUs in the system.') - return len(all_core_nums) - def verify_vpp_nat44_workers(workers: int, nat44_workers: list): if workers < 1: diff --git a/src/conf_mode/vpp.py b/src/conf_mode/vpp.py index b205291f2..518860605 100755 --- a/src/conf_mode/vpp.py +++ b/src/conf_mode/vpp.py @@ -60,6 +60,7 @@ from vyos.vpp.config_verify import ( verify_vpp_main_heap_size, verify_vpp_buffers, ) +from vyos.vpp.config_resource_checks import memory from vyos.vpp.config_filter import iface_filter_eth from vyos.vpp.utils import EthtoolGDrvinfo from vyos.vpp.configdb import JSONStorage @@ -148,6 +149,28 @@ def _unload_module(module_name: str): raise +def _get_workers_count(cpu_settings: dict) -> int: + if 'corelist_workers' in cpu_settings: + corelist_workers = [] + for worker_range in cpu_settings['corelist_workers']: + core_numbers = worker_range.split('-') + corelist_workers.extend( + range(int(core_numbers[0]), int(core_numbers[-1]) + 1) + ) + + return len(corelist_workers) + + return int(cpu_settings.get('workers', 0)) + + +def _normalize_buffers(config: dict): + """Replace 'auto' buffers_per_numa with calculated value""" + if config['settings']['buffers']['buffers_per_numa'] == 'auto': + workers = _get_workers_count(config['settings'].get('cpu', {})) + buffers = memory.buffers_required(config['settings'], workers) + config['settings']['buffers']['buffers_per_numa'] = str(buffers) + + def get_config(config=None): # use persistent config to store interfaces data between executions # this is required because some interfaces after they are connected @@ -242,9 +265,10 @@ def get_config(config=None): default_values_effective = conf.get_config_defaults( **effective_config.kwargs, recursive=True ) - config['effective'] = config_dict_merge( - default_values_effective, effective_config - ) + effective_config = config_dict_merge(default_values_effective, effective_config) + # Buffer normalization (auto → computed) + _normalize_buffers(effective_config) + config['effective'] = effective_config if 'settings' in config: if 'interface' in config['settings']: @@ -317,6 +341,9 @@ def get_config(config=None): xdp_api_params['flags'] = 'no_syscall_lock' iface_config['xdp_api_params'] = xdp_api_params + # Buffer normalization (auto → computed) + _normalize_buffers(config) + if removed_ifaces: config['removed_ifaces'] = removed_ifaces config['xconn_members'] = xconn_members @@ -373,8 +400,6 @@ def verify(config): raise ConfigError(f'Interface {iface} does not exist or is not Ethernet!') # Resource usage checks - workers = 0 - if 'cpu' in config['settings']: cpu_settings = config['settings']['cpu'] @@ -388,14 +413,16 @@ def verify(config): # Check if there are enough CPU cores to add workers if 'workers' in cpu_settings: - workers = verify_vpp_settings_cpu_workers(cpu_settings) + verify_vpp_settings_cpu_workers(cpu_settings) if 'main_core' in cpu_settings: verify_vpp_cpu_main_core(cpu_settings) # Check the CPU main core not falling to the corelist-workers if 'corelist_workers' in cpu_settings: - workers = verify_vpp_settings_cpu_corelist_workers(cpu_settings) + verify_vpp_settings_cpu_corelist_workers(cpu_settings) + + workers = _get_workers_count(config['settings'].get('cpu', {})) if 'workers' in config['settings']['nat44']: verify_vpp_nat44_workers( -- cgit v1.2.3