diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/vpp/config_resource_checks/memory.py | 41 | ||||
| -rw-r--r-- | python/vyos/vpp/config_verify.py | 20 |
2 files changed, 55 insertions, 6 deletions
diff --git a/python/vyos/vpp/config_resource_checks/memory.py b/python/vyos/vpp/config_resource_checks/memory.py index 9391e21e1..ea4697ba2 100644 --- a/python/vyos/vpp/config_resource_checks/memory.py +++ b/python/vyos/vpp/config_resource_checks/memory.py @@ -28,6 +28,10 @@ from vyos.vpp.utils import ( from vyos.vpp.config_resource_checks.resource_defaults import default_resource_map +# VPP buffers default per NUMA node +MIN_BUFFERS = 16_384 + + def classify_page_size(page_size_bytes: int) -> str: """ Returns one of: '4K', '2M', '1G' based on page size. @@ -187,3 +191,40 @@ def total_memory_required(settings: dict) -> dict: memory[classify_page_size(page_size)] += memory_size return memory + + +def buffers_required(settings: dict, workers) -> int: + """ + Calculate total VPP buffer requirements based on interface settings and workers. + """ + 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')) + + # buffers for RX/TX queues for interface + buffers_total += rx_queues * rx_desc + tx_queues * tx_desc + + # per-thread buffer caches (approx. 256 buffers per worker) + buffers_total += workers * 256 + + # Safety margin for buffer calculations: + # traffic bursts, alignment/metadata overhead etc. + # The factor 2.5 is derived from VPP’s own calculations: + # https://github.com/FDio/vpp/blob/stable/2506/extras/vpp_config/vpplib/AutoConfig.py#L609 + buffers_total = int(buffers_total * 2.5) + + # Enforce minimum required by VPP (16K buffers) + return max(buffers_total, MIN_BUFFERS) diff --git a/python/vyos/vpp/config_verify.py b/python/vyos/vpp/config_verify.py index cf0b923bb..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: @@ -442,3 +438,15 @@ def verify_routes_count(settings: dict, workers: int): 'Extensive use of features like ACLs, NAT and others may reduce the numbers above. ' 'Please read the documentation for details: https://docs.vyos.io/' ) + + +def verify_vpp_buffers(settings: dict, workers: int): + buffers_configured = int(settings['buffers']['buffers_per_numa']) + + buffers_required = mem_checks.buffers_required(settings, workers) + + if buffers_required > buffers_configured: + raise ConfigError( + 'Not enough buffers to initialize RX/TX queues for interfaces. ' + f'Set "vpp settings buffers buffers-per-numa" to {buffers_required} or higher' + ) |