Skip to content
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.

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

Change RPi bootargs order to keep cgroup memory controller enabled #3772

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from

Conversation

sairon
Copy link
Member

@sairon sairon commented Jan 3, 2025

With "cgroup: Use kernel command line to disable memory cgroup" merged to RPi kernel as 86099de [1], the device tree now contains "cgroup_disable=memory" parameter. The parameters are parsed in the order defined in the cmdline and with the previous order, the memory CG ends up disabled. Switching the order fixes that and makes the order similar to what we get with standard bootloader and parameters in cmdline.txt only.

The possible downside is that it won't be possible to override parameters from hardcoded bootargs_hassos using cmdline.txt anymore, however, it's unlikely any of these parameters will need to be adjusted by users.

Fixes #3765

[1] raspberrypi/linux@86099de

Summary by CodeRabbit

  • Improvements
    • Updated boot script for Raspberry Pi devices to modify the order of boot arguments concatenation
    • Adjusted the sequence of bootargs variables to potentially change kernel parameter precedence
    • Changes apply to multiple Raspberry Pi board configurations (standard and Yellow models)

@sairon sairon added board/raspberrypi Raspberry Pi Boards board/yellow Home Assistant Yellow labels Jan 3, 2025
@sairon sairon requested a review from agners January 3, 2025 13:59
With "cgroup: Use kernel command line to disable memory cgroup" merged to RPi
kernel as 86099de [1], the device tree now contains "cgroup_disable=memory"
parameter. The parameters are parsed in the order defined in the cmdline and
with the previous order, the memory CG ends up disabled. Switching the order
fixes that and makes the order similar to what we get with standard bootloader
and parameters in cmdline.txt only.

The possible downside is that it won't be possible to override parameters from
hardcoded bootargs_hassos using cmdline.txt anymore, however, it's unlikely any
of these parameters will need to be adjusted by users.

Fixes #3765

[1] raspberrypi/linux@86099de
@sairon sairon force-pushed the rpi-change-uboot-bootargs-order branch from 19a2860 to 3fd3760 Compare January 3, 2025 13:59
Copy link

coderabbitai bot commented Jan 3, 2025

📝 Walkthrough

Walkthrough

The pull request modifies the boot scripts for Raspberry Pi devices, specifically changing the order of concatenation for the bootargs environment variable. In three different boot script files (uboot-boot.ush, uboot-boot64.ush, and yellow/uboot-boot64.ush), the changes involve reordering how boot arguments are constructed. The modification switches the placement of bootargs_rpi and bootargs_hassos, placing bootargs_rpi first in the concatenation sequence. This alteration affects how boot parameters are assembled for kernel loading across different Raspberry Pi configurations.

Changes

File Change Summary
buildroot-external/board/raspberrypi/uboot-boot.ush Reordered bootargs concatenation, placing bootargs_rpi before bootargs_hassos
buildroot-external/board/raspberrypi/uboot-boot64.ush Reordered bootargs concatenation, placing bootargs_rpi before bootargs_hassos
buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush Reordered bootargs concatenation, placing bootargs_rpi before bootargs_hassos

Assessment against linked issues

Objective Addressed Explanation
DNS Lookup Performance [#3768] Changes to boot scripts do not directly address reverse DNS lookup delays

Note: The linked issue relates to DNS performance, which is not impacted by the boot script modifications in this pull request. The changes appear to be unrelated to the reported DNS resolution problem.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 29c8cf8 and 3fd3760.

📒 Files selected for processing (3)
  • buildroot-external/board/raspberrypi/uboot-boot.ush (1 hunks)
  • buildroot-external/board/raspberrypi/uboot-boot64.ush (1 hunks)
  • buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush (1 hunks)
🔇 Additional comments (6)
buildroot-external/board/raspberrypi/uboot-boot64.ush (2)

45-45: Reordering the arguments ensures the memory cgroup remains enabled.

By placing ${bootargs_rpi} first, you override any undesired cgroup_disable=memory flags. This is consistent with the PR's objective of retaining the memory cgroup controller.


53-53: Maintain consistent logic for slot B.

Reordering the boot args for slot B ensures uniform handling between the two boot slots, keeping the memory cgroup in effect for both.

buildroot-external/board/raspberrypi/uboot-boot.ush (2)

45-45: Consistent concatenation order improves predictability.

Reversing the order to ${bootargs_rpi} ${bootargs_hassos} ... prevents the unwanted disabling of the memory cgroup. This aligns with the standard approach to preserve cgroup configs.


53-53: Uniform parameter order for slot B.

Applying the same ordering ensures both boot slots use the same logic, preventing discrepancies that could disable cgroups on slot B.

buildroot-external/board/raspberrypi/yellow/uboot-boot64.ush (2)

71-71: Corrected argument sequence retains cgroup memory controller.

By placing bootargs_rpi first, this prevents the kernel from applying a disable flag from the device tree.


79-79: Slot B boot argument consistency.

Mirroring the slot A change here ensures no cgroup-related inconsistencies arise during B slot boots.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai or @coderabbitai title anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
board/raspberrypi Raspberry Pi Boards board/yellow Home Assistant Yellow cla-signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

*_memory_percent not working after update to 14.1
1 participant