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

networkd: add missing bonding options #10542

Merged
merged 1 commit into from
Nov 2, 2018
Merged

Conversation

toanju
Copy link
Contributor

@toanju toanju commented Oct 26, 2018

Add support for bonding options system prio, port key and actor system mac.

These options exist in the linux kernel since 4.2
(torvalds/linux@171a42c38c6e1)

Details:
https://www.kernel.org/doc/Documentation/networking/bonding.txt

@yuwata yuwata added the network label Oct 26, 2018
src/network/netdev/bond.c Outdated Show resolved Hide resolved
src/network/netdev/bond.c Outdated Show resolved Hide resolved
src/network/netdev/bond.c Outdated Show resolved Hide resolved
src/network/netdev/netdev-gperf.gperf Outdated Show resolved Hide resolved
src/network/netdev/netdev-gperf.gperf Outdated Show resolved Hide resolved
man/systemd.netdev.xml Show resolved Hide resolved
src/network/netdev/bond.c Outdated Show resolved Hide resolved
src/network/netdev/bond.c Outdated Show resolved Hide resolved
@yuwata yuwata added the reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks label Oct 26, 2018
@toanju
Copy link
Contributor Author

toanju commented Oct 27, 2018

Targeted most of the comments, besides the one style remark. Rebased as well.

Thanks for the review!

Since it might get lost in the comment above were there any thoughts about the use of clang-format so far?

meson.build Outdated Show resolved Hide resolved
man/systemd.netdev.xml Outdated Show resolved Hide resolved
@toanju
Copy link
Contributor Author

toanju commented Oct 30, 2018

@yuwata any more comments on this?

src/network/netdev/bond.c Outdated Show resolved Hide resolved
src/network/netdev/bond.c Outdated Show resolved Hide resolved
meson.build Outdated Show resolved Hide resolved
src/network/netdev/bond.c Outdated Show resolved Hide resolved
Copy link
Member

@yuwata yuwata left a comment

Choose a reason for hiding this comment

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

LGTM.

@yuwata yuwata added the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Nov 1, 2018
@toanju
Copy link
Contributor Author

toanju commented Nov 1, 2018

thanks for the reviews!

src/network/netdev/bond.c Outdated Show resolved Hide resolved
@evverx evverx removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Nov 1, 2018
@yuwata yuwata added the reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks label Nov 1, 2018
Add support for bonding options system prio, port key and actor system mac.

These options exist in the linux kernel since 4.2
(torvalds/linux@171a42c38c6e1)

Details:
https://www.kernel.org/doc/Documentation/networking/bonding.txt
@yuwata yuwata added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks labels Nov 1, 2018
@yuwata
Copy link
Member

yuwata commented Nov 2, 2018

CI failures seem to be unrelated.

@yuwata yuwata merged commit 99f68ef into systemd:master Nov 2, 2018
src/network/netdev/bond.c Show resolved Hide resolved
src/network/netdev/bond.c Show resolved Hide resolved
src/network/netdev/bond.c Show resolved Hide resolved
@@ -1268,6 +1268,27 @@
</listitem>
</varlistentry>

<varlistentry>
<term><varname>AdActorSysPrio=</varname></term>
Copy link
Member

@poettering poettering Nov 5, 2018

Choose a reason for hiding this comment

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

Please, let's not needlessly abbreviate. Unless some abbreviation is very well established let's write things out, it makes things more self-explanatory for readers, and we generally do so across the tree.

Hence, AdActorSystemPriority maybe?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In principle the names are the same as they are in the sysfs (/sys/class/net/$IFNAME/bonding), besides the CamelCase adaptation. This one is originally ad_actor_sys_prio. The same names are accepted from iproute2 (see ip link help bond). None the less I would not mind changing them.

Copy link
Member

Choose a reason for hiding this comment

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

I'd really prefer the mor verbose naming in this case

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great! Updates are pushed.

<varlistentry>
<term><varname>AdActorSysPrio=</varname></term>
<listitem>
<para>Specifies the 802.3ad system priority. Ranges [1-65535].</para>
Copy link
Member

Choose a reason for hiding this comment

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

how come the word "actor" isn't mentioned in the description, but in the setting name?

@poettering
Copy link
Member

heya, sorry, i was a bit late with my review. added a couple of notes above. any chance you could address those in a quick follow-up PR, @toanju?

@toanju
Copy link
Contributor Author

toanju commented Nov 6, 2018

yep, I'll do so

toanju pushed a commit to toanju/systemd that referenced this pull request Nov 6, 2018
@toanju
Copy link
Contributor Author

toanju commented Nov 6, 2018

Addressed the comments in #10653. Just give me a final conclusion on the AdActorSystemPriority vs AdActorSysPrio.

Thanks!

toanju pushed a commit to toanju/systemd that referenced this pull request Nov 6, 2018
poettering pushed a commit that referenced this pull request Nov 6, 2018
keszybz added a commit to keszybz/systemd that referenced this pull request May 19, 2020
DUID/IAID — systemd#2818, systemd#2890, systemd#3156,
Scope – systemd#6449,
bond options — systemd#10542,
option 119: sd_network_get_domains/sd_network_get_search_domains,
/proc/cmdline parsing – 426c1d3,
wait states — systemd#14536.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed network
Development

Successfully merging this pull request may close these issues.

5 participants