diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-08-19 16:00:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-19 16:00:34 +0100 |
| commit | 4ad89d66634b7aa1464ae3e44bce179be48cc2bf (patch) | |
| tree | ba18ed6d8f6e17ab2d34c457e8c05638fd23dab3 /interface-definitions | |
| parent | 41c9b0427b123041b0df5a2739468befb2f4e2db (diff) | |
| parent | 5fa2ba9bae1f3f86ad9aa5c13eefa0aff49fd7f4 (diff) | |
| download | vyos-1x-4ad89d66634b7aa1464ae3e44bce179be48cc2bf.tar.gz vyos-1x-4ad89d66634b7aa1464ae3e44bce179be48cc2bf.zip | |
Merge pull request #4647 from natali-rs1985/T7678
T7678: Move "vpp settings host-resources" to "system option resource-limits"
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/vpp_host_resources.xml.i | 35 | ||||
| -rw-r--r-- | interface-definitions/system_option.xml.in | 43 | ||||
| -rw-r--r-- | interface-definitions/vpp.xml.in | 1 |
3 files changed, 43 insertions, 36 deletions
diff --git a/interface-definitions/include/vpp_host_resources.xml.i b/interface-definitions/include/vpp_host_resources.xml.i deleted file mode 100644 index 1706c8c87..000000000 --- a/interface-definitions/include/vpp_host_resources.xml.i +++ /dev/null @@ -1,35 +0,0 @@ -<!-- include start from vpp_host_resources.xml.i --> -<node name="host-resources"> - <properties> - <help>Host resources control</help> - </properties> - <children> - <leafNode name="max-map-count"> - <properties> - <help>Maximum number of memory map areas a process may have</help> - <valueHelp> - <format>u32:65535-2147483647</format> - <description>Areas count</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 65535-2147483647"/> - </constraint> - </properties> - <defaultValue>65535</defaultValue> - </leafNode> - <leafNode name="shmmax"> - <properties> - <help>Maximum shared memory segment size that can be created</help> - <valueHelp> - <format>u32:0-18446744073709551612</format> - <description>Size in bytes</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-18446744073709551612"/> - </constraint> - </properties> - <defaultValue>2147483648</defaultValue> - </leafNode> - </children> -</node> -<!-- include end --> diff --git a/interface-definitions/system_option.xml.in b/interface-definitions/system_option.xml.in index 5d385e3d0..e6a2b0b65 100644 --- a/interface-definitions/system_option.xml.in +++ b/interface-definitions/system_option.xml.in @@ -32,6 +32,49 @@ <constraintErrorMessage>Must be ignore, reboot, or poweroff</constraintErrorMessage> </properties> </leafNode> + <node name="resource-limits"> + <properties> + <help>Resource limits</help> + </properties> + <children> + <leafNode name="max-map-count"> + <properties> + <help>Maximum number of memory map areas a process may have</help> + <valueHelp> + <format>u32:65530-2147483647</format> + <description>Areas count</description> + </valueHelp> + <valueHelp> + <format>auto</format> + <description>Auto calculate areas count based on number of hugepages</description> + </valueHelp> + <constraint> + <regex>(auto)</regex> + <validator name="numeric" argument="--range 65530-2147483647"/> + </constraint> + </properties> + <defaultValue>auto</defaultValue> + </leafNode> + <leafNode name="shmmax"> + <properties> + <help>Maximum shared memory segment size that can be created</help> + <valueHelp> + <format>u64:8589934592-18446744073709551615</format> + <description>Size in bytes</description> + </valueHelp> + <valueHelp> + <format>auto</format> + <description>Auto calculate shared memory based on number of hugepages</description> + </valueHelp> + <constraint> + <regex>(auto)</regex> + <validator name="numeric" argument="--range 8589934592-18446744073709551615"/> + </constraint> + </properties> + <defaultValue>auto</defaultValue> + </leafNode> + </children> + </node> <node name="kernel"> <properties> <help>Kernel boot parameters</help> diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in index 2443cebc3..f69e05168 100644 --- a/interface-definitions/vpp.xml.in +++ b/interface-definitions/vpp.xml.in @@ -449,7 +449,6 @@ </leafNode> </children> </node> - #include <include/vpp_host_resources.xml.i> <tagNode name="interface"> <properties> <help>Interface</help> |