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

Add tun to static device list in hardware manager #5547

Merged
merged 1 commit into from
Jan 15, 2025

Conversation

agners
Copy link
Member

@agners agners commented Jan 14, 2025

Some devices are provided by kernel modules which potentially get loaded later at startup. Those are not listed by udev, and hence add-ons do not get permissions for these types of devices as long as the kernel module is not loaded.

Typically, such devices are created by the kmod-static-nodes.service systemd service. Ideally, we would read the output of that service and add those specifically. However, there are very few devices which use static nodes, and we actually only really interested in tun. So let's simply add this static node in case udev does not list it already.

Proposed change

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New feature (which adds functionality to the supervisor)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes OTBR Addon Crashing core#132124
  • This PR is related to issue:
  • Link to documentation pull request:
  • Link to cli pull request:
  • Link to client library pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • The code has been formatted using Ruff (ruff format supervisor tests)
  • Tests have been added to verify that the new code works.

If API endpoints or add-on configuration are added/changed:

Summary by CodeRabbit

  • New Features

    • Enhanced device management by introducing support for static device nodes.
    • Added explicit handling for the "tun" device in the hardware management system.
  • Improvements

    • Improved device detection and integration process.
    • Expanded device management capabilities to ensure comprehensive device tracking.

@agners agners added the bugfix A bug fix label Jan 14, 2025
Copy link

coderabbitai bot commented Jan 14, 2025

📝 Walkthrough

Walkthrough

The changes introduce a new static device node mechanism for the "tun" device in the HardwareManager class. A new list _STATIC_NODES is defined to store static device nodes, specifically adding a "tun" device. The _import_devices method is updated to check and incorporate these static nodes if they are not already present in the device database, ensuring comprehensive device management even when udev fails to list certain devices.

Changes

File Change Summary
supervisor/hardware/manager.py - Added _STATIC_NODES list with a static "tun" device node
- Modified _import_devices method to include static nodes if not found in udev database

Sequence Diagram

sequenceDiagram
    participant HM as HardwareManager
    participant Udev as Udev Database
    participant StaticNodes as Static Nodes

    HM->>Udev: Attempt to import devices
    alt Devices imported successfully
        Udev-->>HM: Return device list
    else Specific device not found
        HM->>StaticNodes: Check static nodes
        StaticNodes-->>HM: Add missing device
    end
Loading

The sequence diagram illustrates the enhanced device import process, showing how static nodes are integrated when udev fails to provide a specific device.


📜 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 9a0d536 and b04d5e7.

📒 Files selected for processing (1)
  • supervisor/hardware/manager.py (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • supervisor/hardware/manager.py
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: Build armhf supervisor
  • GitHub Check: Build aarch64 supervisor
  • GitHub Check: Run tests Python 3.12.8

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.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (3)
supervisor/hardware/manager.py (3)

19-26: Fix typo in comment.

There's a typo in the word "expoesed" on line 24.

-# Which nodes are expoesed by module is system specific, so ideally Supervisor
+# Which nodes are exposed by module is system specific, so ideally Supervisor

27-44: Consider adding a type hint for device attributes.

The implementation looks good! For better code maintainability, consider adding a type hint for the device attributes dictionary.

 _STATIC_NODES: list[Device] = [
     Device(
         "tun",
         Path("/dev/net/tun"),
         Path("/sys/devices/virtual/misc/tun"),
         "misc",
         None,
         [],
-        {
+        dict[str, str]({
             "DEVNAME": "/dev/net/tun",
             "DEVPATH": "/devices/virtual/misc/tun",
             "MAJOR": "10",
             "MINOR": "200",
             "SUBSYSTEM": "misc",
-        },
+        }),
         [],
     )
 ]

144-147: Consider adding debug logging for static node addition.

The implementation looks good! For better observability, consider adding debug logging when a static node is added.

         # Add static nodes if not found through udev (e.g. module not yet loaded)
         for device in _STATIC_NODES:
             if device.name not in self._devices:
+                _LOGGER.debug("Adding static device node: %s", device.name)
                 self._devices[device.name] = device
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between f02d67e and 9a0d536.

📒 Files selected for processing (1)
  • supervisor/hardware/manager.py (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: Run tests Python 3.12.8
🔇 Additional comments (1)
supervisor/hardware/manager.py (1)

27-44: Verify the integration with existing device handling.

Let's verify the usage and impact of the tun device in the codebase:

Also applies to: 144-147

✅ Verification successful

Static tun device implementation follows established patterns

The implementation correctly follows the existing device handling patterns in the codebase. The Device class usage and misc subsystem handling are consistent with other devices, and the static definition won't impact existing functionality.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for tun device usage and potential impacts

# Check for tun device references in the codebase
echo "=== Checking for tun device references ==="
rg -l "tun" --type python

# Check for other static device handling
echo -e "\n=== Checking for similar device handling patterns ==="
rg -l "static.*device" --type python

# Check for Device class usage patterns
echo -e "\n=== Checking Device class usage patterns ==="
ast-grep --pattern 'Device($$$)' --lang python

Length of output: 26506

@agners agners force-pushed the add-static-device-list-to-hardware-manager branch from 9a0d536 to cf9d55e Compare January 14, 2025 13:32
Some devices are provided by kernel modules which potentially get loaded
later at startup. Those are not listed by udev, and hence add-ons do
not get permissions for these types of devices as long as the kernel
module is not loaded.

Typically, such devices are created by the kmod-static-nodes.service
systemd service. Ideally, we would read the output of that service and
add those specifically. However, there are very few devices which
use static nodes, and we actually only really interested in tun. So
let's simply add this static node in case udev does not list it already.
@agners agners force-pushed the add-static-device-list-to-hardware-manager branch from cf9d55e to b04d5e7 Compare January 14, 2025 15:14
Copy link
Member

@sairon sairon left a comment

Choose a reason for hiding this comment

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

LGTM

@agners agners merged commit d4c047b into main Jan 15, 2025
20 checks passed
@agners agners deleted the add-static-device-list-to-hardware-manager branch January 15, 2025 08:56
@github-actions github-actions bot locked and limited conversation to collaborators Jan 17, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OTBR Addon Crashing
2 participants