From: Hangbin Liu <liuhangbin@gmail.com>
To: netdev@vger.kernel.org
Cc: Jay Vosburgh <j.vosburgh@gmail.com>,
Veaceslav Falico <vfalico@gmail.com>,
Andy Gospodarek <andy@greyhouse.net>,
Jarod Wilson <jarod@redhat.com>, Jakub Kicinski <kuba@kernel.org>,
Jiri Pirko <jiri@resnulli.us>,
davem@davemloft.net, Denis Kirjanov <dkirjanov@suse.de>,
David Ahern <dsahern@gmail.com>,
Hangbin Liu <liuhangbin@gmail.com>
Subject: [PATCH draft] bond: add ns_ip6_target option
Date: Wed, 24 Nov 2021 15:18:54 +0800 [thread overview]
Message-ID: <20211124071854.1400032-2-liuhangbin@gmail.com> (raw)
In-Reply-To: <20211124071854.1400032-1-liuhangbin@gmail.com>
Similar with arp_ip_target, this option add bond IPv6 NS/NA monitor
support. When IPv6 target was set, the ARP target will be disabled.
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
ip/iplink_bond.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 51 insertions(+), 1 deletion(-)
diff --git a/ip/iplink_bond.c b/ip/iplink_bond.c
index 2bfdf82f..c795c6d7 100644
--- a/ip/iplink_bond.c
+++ b/ip/iplink_bond.c
@@ -136,6 +136,7 @@ static void print_explain(FILE *f)
" [ arp_validate ARP_VALIDATE ]\n"
" [ arp_all_targets ARP_ALL_TARGETS ]\n"
" [ arp_ip_target [ ARP_IP_TARGET, ... ] ]\n"
+ " [ ns_ip6_target [ NS_IP6_TARGET, ... ] ]\n"
" [ primary SLAVE_DEV ]\n"
" [ primary_reselect PRIMARY_RESELECT ]\n"
" [ fail_over_mac FAIL_OVER_MAC ]\n"
@@ -248,6 +249,25 @@ static int bond_parse_opt(struct link_util *lu, int argc, char **argv,
addattr_nest_end(n, nest);
}
addattr_nest_end(n, nest);
+ } else if (matches(*argv, "ns_ip6_target") == 0) {
+ struct rtattr *nest = addattr_nest(n, 1024,
+ IFLA_BOND_NS_IP6_TARGET);
+ if (NEXT_ARG_OK()) {
+ NEXT_ARG();
+ char *targets = strdupa(*argv);
+ char *target = strtok(targets, ",");
+ int i;
+
+ for (i = 0; target && i < BOND_MAX_ARP_TARGETS; i++) {
+ inet_prefix ip6_addr;
+
+ get_addr(&ip6_addr, target, AF_INET6);
+ addattr_l(n, 1024, i, ip6_addr.data, sizeof(struct in6_addr));
+ target = strtok(NULL, ",");
+ }
+ addattr_nest_end(n, nest);
+ }
+ addattr_nest_end(n, nest);
} else if (matches(*argv, "arp_validate") == 0) {
NEXT_ARG();
if (get_index(arp_validate_tbl, *argv) < 0)
@@ -404,6 +424,8 @@ static int bond_parse_opt(struct link_util *lu, int argc, char **argv,
static void bond_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
{
+ int i;
+
if (!tb)
return;
@@ -469,7 +491,6 @@ static void bond_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_BOND_ARP_IP_TARGET]) {
struct rtattr *iptb[BOND_MAX_ARP_TARGETS + 1];
- int i;
parse_rtattr_nested(iptb, BOND_MAX_ARP_TARGETS,
tb[IFLA_BOND_ARP_IP_TARGET]);
@@ -497,6 +518,35 @@ static void bond_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
}
}
+ if (tb[IFLA_BOND_NS_IP6_TARGET]) {
+ struct rtattr *ip6tb[BOND_MAX_ARP_TARGETS + 1];
+
+ parse_rtattr_nested(ip6tb, BOND_MAX_ARP_TARGETS,
+ tb[IFLA_BOND_NS_IP6_TARGET]);
+
+ if (ip6tb[0]) {
+ open_json_array(PRINT_JSON, "ns_ip6_target");
+ print_string(PRINT_FP, NULL, "ns_ip6_target ", NULL);
+ }
+
+ for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) {
+ if (ip6tb[i])
+ print_string(PRINT_ANY,
+ NULL,
+ "%s",
+ rt_addr_n2a_rta(AF_INET6, ip6tb[i]));
+ if (!is_json_context()
+ && i < BOND_MAX_ARP_TARGETS-1
+ && ip6tb[i+1])
+ fprintf(f, ",");
+ }
+
+ if (ip6tb[0]) {
+ print_string(PRINT_FP, NULL, " ", NULL);
+ close_json_array(PRINT_JSON, NULL);
+ }
+ }
+
if (tb[IFLA_BOND_ARP_VALIDATE]) {
__u32 arp_v = rta_getattr_u32(tb[IFLA_BOND_ARP_VALIDATE]);
const char *arp_validate = get_name(arp_validate_tbl, arp_v);
--
2.31.1
next prev parent reply other threads:[~2021-11-24 7:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 7:18 [PATCH draft] bonding: add IPv6 NS/NA monitor support Hangbin Liu
2021-11-24 7:18 ` Hangbin Liu [this message]
2021-12-02 10:09 ` Hangbin Liu
2021-12-15 7:09 ` Hangbin Liu
2022-01-18 9:33 ` Hangbin Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211124071854.1400032-2-liuhangbin@gmail.com \
--to=liuhangbin@gmail.com \
--cc=andy@greyhouse.net \
--cc=davem@davemloft.net \
--cc=dkirjanov@suse.de \
--cc=dsahern@gmail.com \
--cc=j.vosburgh@gmail.com \
--cc=jarod@redhat.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vfalico@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).