udev: Implement a way to group devices of a same tree #564
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diconico07
requested review from
bfjelds,
kate-goldenring,
jiria,
Britel,
romoh and
adithyaj
as code owners
|
/version minor |
diconico07
force-pushed
the
tree-grouping
branch
2 times, most recently
from
087bdf9
to
009c01d
Compare
| @@ -543,6 +543,24 @@ fn device_or_parents_have_tag(device: &impl DeviceExt, value_regex: &Regex) -> b | |||
| } | |||
| } | |||
|
|
|||
| /// Retrieve Parent or Children of a device using their sysfs path. | |||
| pub fn get_device_relatives<'a>( | |||
There was a problem hiding this comment.
@diconico07 can you write a few unit tests for this?
There was a problem hiding this comment.
I wrote a test case, tell me if you feel I missed something 😄
| if !discovery_handler_config.group_recursive { | ||
| devpaths.insert(path.0.clone(), vec![path]); | ||
| } else { | ||
| match get_device_relatives(&path.0, devpaths.keys()) { |
There was a problem hiding this comment.
nit: i would put this else block in a separate function so we can unit test it.
There was a problem hiding this comment.
will do this next week, as I'll do the unit tests as well (won't have enough time before that), if you want to merge before that, I'll do it in a separate PR.
This commit adds the `groupRecursive` option to the udev device discovery handler, this configuration switch allows to group devices that share a parent/child relation. This can be used to group into one akri instance a complex device that is split into multiple nodes. It is up to the user to define the boundaries of the device as there are no standard way to do so. It works by comparing sysfs path for a device prefixing another one (i.e `/devices/pci0` is a parent of `/devices/pci0/0.1/0.1.1/0.1.1:1`, this example is obviously fictive) It adds all devnodes to the mounts and add a UDEV_DEVNODE_n property for each one of them. The UDEV_DEVPATH just need the topmost one as all other are subdirectories of it. Signed-off-by: Nicolas Belouin <[email protected]>
Signed-off-by: Nicolas Belouin <[email protected]>
Signed-off-by: Nicolas Belouin <[email protected]>
diconico07
force-pushed
the
tree-grouping
branch
from
009c01d
to
24de50a
Compare
kate-goldenring
approved these changes
Apr 7, 2023
diconico07
added a commit
to diconico07/akri
that referenced
this pull request
Apr 13, 2023
As indicated in project-akri#564 the new grouping behavior could get more test coverage. This commit moves the grouping logic to a separate function and adds relevant tests. Signed-off-by: Nicolas Belouin <[email protected]>
8 tasks
diconico07
added a commit
to diconico07/akri
that referenced
this pull request
Apr 14, 2023
As indicated in project-akri#564 the new grouping behavior could get more test coverage. This commit moves the grouping logic to a separate function and adds relevant tests. Signed-off-by: Nicolas Belouin <[email protected]>
diconico07
added a commit
to diconico07/akri
that referenced
this pull request
Apr 19, 2023
As indicated in project-akri#564 the new grouping behavior could get more test coverage. This commit moves the grouping logic to a separate function and adds relevant tests. Signed-off-by: Nicolas Belouin <[email protected]>
diconico07
added a commit
to diconico07/akri
that referenced
this pull request
Apr 25, 2023
This commit prevents duplicate device node from being listed when multiple rules match the same devices. This fixes a regression introduced by project-akri#564. Signed-off-by: Nicolas Belouin <[email protected]>
diconico07
added a commit
to diconico07/akri
that referenced
this pull request
May 22, 2023
As indicated in project-akri#564 the new grouping behavior could get more test coverage. This commit moves the grouping logic to a separate function and adds relevant tests. Signed-off-by: Nicolas Belouin <[email protected]>
diconico07
added a commit
to diconico07/akri
that referenced
this pull request
May 22, 2023
This commit prevents duplicate device node from being listed when multiple rules match the same devices. This fixes a regression introduced by project-akri#564. Signed-off-by: Nicolas Belouin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
This PR adds the
groupRecursiveoption to the udev device discovery handler, this configuration switch allows to group devices that share a parent/child relation.This can be used to group into one akri instance a complex device that is split into multiple nodes. It is up to the user to define the boundaries of the device as there are no standard way to do so.
It works by comparing sysfs path for a device prefixing another one (i.e
/devices/pci0is a parent of/devices/pci0/0.1/0.1.1/0.1.1:1, this example is obviously fictive)It adds all devnodes to the mounts and add a UDEV_DEVNODE_n property for each one of them.
The UDEV_DEVPATH just need the topmost one as all other are subdirectories of it.
This closes #490
Special notes for your reviewer:
I will cross-link with a documentation PR as soon as I finish writing it.
If applicable:
groupRecursiveoption akri-docs#64cargo fmt)cargo build)cargo clippy)cargo test)cargo doc)