Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions base/comps/kernel/6.18-x86_64-azl.config
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,13 @@ CONFIG_PT_RECLAIM=y
#
# Data Access Monitoring
#
# CONFIG_DAMON is not set
CONFIG_DAMON=y

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is there a reason this PR proposes enabling only on x86_64 and not also aarch64?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I can enable it for arm as well. Was not sure if kernel configs were suppose to be mirrored, figured it was a task, only for x86 from my isde

@rlmenge rlmenge Jul 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's mirror to both here and align with Fedora on these configs

CONFIG_DAMON_VADDR=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_SYSFS=y
# CONFIG_DAMON_RECLAIM is not set
# CONFIG_DAMON_LRU_SORT is not set
# CONFIG_DAMON_STAT is not set
# end of Data Access Monitoring
# end of Memory Management options

Expand Down Expand Up @@ -6179,7 +6185,7 @@ CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
CONFIG_INFINIBAND_ADDR_TRANS=y
CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
CONFIG_INFINIBAND_VIRT_DMA=y
# CONFIG_INFINIBAND_BNXT_RE is not set
CONFIG_INFINIBAND_BNXT_RE=m

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this intended as a stacked PR on top of your other one that enables this option?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Yes, given the config was hashed, i wanted to avoid having to regenerate the hash after the bntx module was merged.

# CONFIG_INFINIBAND_CXGB4 is not set
CONFIG_INFINIBAND_EFA=m
CONFIG_INFINIBAND_ERDMA=m
Expand Down
8 changes: 7 additions & 1 deletion base/comps/kernel/kernel.comp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ without = [

[components.kernel.build.defines]
# RPM release number for the Azure Linux kernel package
azl_pkgrelease = "5"
azl_pkgrelease = "7"
# 4th version component from the AZL kernel source (6.18.31.1). Included in specrelease so it appears
# in the RPM Release tag, uname -r, and /lib/modules/ path (e.g. 6.18.31-1.1.azl4.aarch64).
kextraversion = "1"
Expand Down Expand Up @@ -360,6 +360,12 @@ description = "Prepend AZL changelog entries (one per lock-fingerprint change) a
type = "spec-prepend-lines"
section = "%changelog"
lines = [
"* Fri Jul 17 2026 Andreas Zaugg <azaugg@linkedin.com> - 6.18.31-1.7",
"- feat(kernel): enable DAMON core monitoring framework on x86_64",
"",
"* Tue Jun 30 2026 Andreas Zaugg <azaugg@linkedin.com> - 6.18.31-1.6",
"- feat(kernel): enable Broadcom RoCE driver (CONFIG_INFINIBAND_BNXT_RE) as module on x86_64",
"",
"* Wed May 27 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.31-1.5",
"- feat(kernel): add hand-curated changelog entry",
"",
Expand Down
2 changes: 1 addition & 1 deletion locks/kernel.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = '5271a1b047ef402ddee40242e02eda23fc273044'
upstream-commit = '5271a1b047ef402ddee40242e02eda23fc273044'
input-fingerprint = 'sha256:35fd40d8d7ed26e4e80c412fbe33499ead22ceac032a92c1be2f3c2f729f7df3'
input-fingerprint = 'sha256:62d03bf4bd020b0d96c0e786160537a773a7e7d0d54efc12be7c4fdd6e2be799'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
10 changes: 8 additions & 2 deletions specs/k/kernel/6.18-x86_64-azl.config
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,13 @@ CONFIG_PT_RECLAIM=y
#
# Data Access Monitoring
#
# CONFIG_DAMON is not set
CONFIG_DAMON=y
CONFIG_DAMON_VADDR=y
CONFIG_DAMON_PADDR=y
CONFIG_DAMON_SYSFS=y
# CONFIG_DAMON_RECLAIM is not set
# CONFIG_DAMON_LRU_SORT is not set
# CONFIG_DAMON_STAT is not set
# end of Data Access Monitoring
# end of Memory Management options

Expand Down Expand Up @@ -6179,7 +6185,7 @@ CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
CONFIG_INFINIBAND_ADDR_TRANS=y
CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
CONFIG_INFINIBAND_VIRT_DMA=y
# CONFIG_INFINIBAND_BNXT_RE is not set
CONFIG_INFINIBAND_BNXT_RE=m
# CONFIG_INFINIBAND_CXGB4 is not set
CONFIG_INFINIBAND_EFA=m
CONFIG_INFINIBAND_ERDMA=m
Expand Down
2 changes: 1 addition & 1 deletion specs/k/kernel/kernel.azl.macros
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# Do not edit manually; changes will be overwritten.
%_without_debug 1
%_without_selftests 1
%azl_pkgrelease 5
%azl_pkgrelease 7
%kextraversion 1
%nvidia_open_version 595.58.03
6 changes: 6 additions & 0 deletions specs/k/kernel/kernel.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4578,6 +4578,12 @@ fi\

# AZL-KMOD-FILES-ANCHOR — do not remove (kmod overlays chain here)
%changelog
* Fri Jul 17 2026 Andreas Zaugg <azaugg@linkedin.com> - 6.18.31-1.7
- feat(kernel): enable DAMON core monitoring framework on x86_64

* Tue Jun 30 2026 Andreas Zaugg <azaugg@linkedin.com> - 6.18.31-1.6
- feat(kernel): enable Broadcom RoCE driver (CONFIG_INFINIBAND_BNXT_RE) as module on x86_64

* Wed May 27 2026 Daniel McIlvaney <damcilva@microsoft.com> - 6.18.31-1.5
- feat(kernel): add hand-curated changelog entry

Expand Down
Loading