Skip to content

[yang-model] support reserving mem in high region for crashkernel #24441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ysmanman wants to merge 11 commits into
base: master
Choose a base branch
from
+71 −3
Open

[yang-model] support reserving mem in high region for crashkernel #24441

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8ca9bd8
Use fixed crashkernel offset on OtterLake.
ysmanman Nov 5, 2025
2e71bda
Update yang model for configuring mem offset of crashkernel
ysmanman Nov 6, 2025
e8536bd
Upate yang model to allow setting offset for any range.
ysmanman Nov 6, 2025
5ab5134
Support reserving mem in high region for crashkernel
ysmanman Nov 14, 2025
8cf4feb
The committed change includes both platform-specific and platform-ind…
ysmanman Nov 16, 2025
9581e66
Merge branch 'sonic-net:master' into crashkernel-offset
ysmanman Nov 22, 2025
4ebd991
Merge branch 'sonic-net:master' into crashkernel-offset
ysmanman Nov 24, 2025
910db59
Merge branch 'sonic-net:master' into crashkernel-offset
ysmanman Nov 25, 2025
3f1bfe0
Merge branch 'sonic-net:master' into crashkernel-offset
ysmanman Nov 26, 2025
b85cd1d
Remove unused test case
ysmanman Nov 26, 2025
36aaf9f
Merge branch 'master' into crashkernel-offset
ysmanman Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion files/Aboot/boot0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,12 @@ get_eeprom_value() {
write_kdump_cmdline() {
local sid="$(cmdline_get sid | sed 's/Ssd$//')"
case "$sid" in
Wolverine*|Clearwater2*|OtterLake*|QuartzDd*|Redstart8Mk2Quartz4*|CitrineDd*)
OtterLake*)
if ! cmdline_has crashkernel; then
cmdline_add crashkernel=0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-16G:448M,16G-32G:768M,32G-:1G@960M
fi
;;
Wolverine*|Clearwater2*|QuartzDd*|Redstart8Mk2Quartz4*|CitrineDd*)
if ! cmdline_has crashkernel; then
cmdline_add crashkernel=0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-16G:448M,16G-32G:768M,32G-:1G
fi
Expand Down
10 changes: 10 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/kdump.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
"KDUMP_WITH_VALID_VALUES_4": {
"desc": "Configuring the kdump with valid values."
},
"KDUMP_WITH_VALID_MEM_OFFSET": {
"desc": "Configuring the kdump with valid values and memory offset."
},
"KDUMP_WITH_VALID_MEM_OFFSET_2": {
"desc": "Configuring the kdump with valid values and memory offset."
},
"KDUMP_WITH_INVALID_NUM_DUMPS": {
"desc": "Configuring kdump config with a invalid number of allowed kdumps.",
"eStrKey": "Range"
Expand All @@ -19,6 +25,10 @@
"desc": "Configuring kdump config with invalid memory config.",
"eStrKey": "Pattern"
},
"KDUMP_WITH_INVALID_MEM_OFFSET": {
"desc": "Configuring kdump config with invalid memory offset.",
"eStrKey": "Pattern"
},
"KDUMP_WITH_VALID_REMOTE_VALUES": {
"desc": "Configuring the kdump with valid remote ssh values."
}
Expand Down
42 changes: 42 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/kdump.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,34 @@
}
}
},
"KDUMP_WITH_VALID_MEM_OFFSET": {
"sonic-kdump:sonic-kdump": {
"sonic-kdump:KDUMP": {
"config": {
"enabled": "true",
"num_dumps": "3",
"memory": "512-4G:37M,4G-8G:41M,8G-:59M@960M",
"remote": "true",
"ssh_string" : "[email protected]",
"ssh_path": "/home/ali/.ssh/id_rsa"
}
}
}
},
"KDUMP_WITH_VALID_MEM_OFFSET_2": {
"sonic-kdump:sonic-kdump": {
"sonic-kdump:KDUMP": {
"config": {
"enabled": "true",
"num_dumps": "3",
"memory": "512-4G:37M,4G-8G:41M,8G-:59M@1G",
"remote": "true",
"ssh_string" : "[email protected]",
"ssh_path": "/home/ali/.ssh/id_rsa"
}
}
}
},

"KDUMP_WITH_INVALID_NUM_DUMPS": {
"sonic-kdump:sonic-kdump": {
Expand Down Expand Up @@ -84,6 +112,20 @@
}
}
},
"KDUMP_WITH_INVALID_MEM_OFFSET": {
"sonic-kdump:sonic-kdump": {
"sonic-kdump:KDUMP": {
"config": {
"enabled": "true",
"num_dumps": "3",
"memory": "512-4G:37M,4G-8G:41M,8G-:59M@100",
"remote": "true",
"ssh_string" : "[email protected]",
"ssh_path": "/home/ali/.ssh/id_rsa"
}
}
}
},

"KDUMP_WITH_VALID_REMOTE_VALUES": {
"sonic-kdump:sonic-kdump": {
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-yang-models/yang-models/sonic-kdump.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module sonic-kdump {

leaf memory {
type string {
pattern "(((([0-9]+[MG]?)?(-([0-9]+[MG])?):)?[0-9]+[MG],?)+)";
pattern "(((([0-9]+[MG]?)?(-([0-9]+[MG])?):)?[0-9]+[MG],?)+(@[0-9]+[MG])?)";
Copy link
Copy Markdown
Contributor

@deepak-singhal0408 deepak-singhal0408 Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should have this optional offset inside the big pattern group(currently this regex only will support offset at the end).. What if in future we want to add offsets at other ranges too..

Copy link
Copy Markdown
Contributor Author

@ysmanman ysmanman Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good suggestion. Updated the change.

}
description
"Memory reserved for loading the crash handler kernel. The amount
Expand Down
Loading