From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: Sven-Thorsten Dietrich <sven@vyatta.com>,
LKML <linux-kernel@vger.kernel.org>,
Stephen Hemminger <shemminger@vyatta.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Mike Davison <Mike.Davison@vyatta.com>
Subject: Re: [RFC net] netconf: set mulitcast family for multicast forwarding messages
Date: Mon, 01 Jul 2013 14:38:17 +0200 [thread overview]
Message-ID: <51D17839.8010700@6wind.com> (raw)
In-Reply-To: <20130628091338.547bd88d@nehalam.linuxnetplumber.net>
Le 28/06/2013 18:13, Stephen Hemminger a écrit :
> Revised version of Sven's patch. The idea is that multicast forwarding
> should be under the multicast address family like other multicast netlink
> messages.
>
> This version generates each family under separate headers when
> doing dump all.
>
> Compile tested only, this is to show some of the issues that need
> to be covered.
I'm ok with the principle, just some comment below.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
>
>
> --- a/net/ipv4/devinet.c 2013-06-11 09:50:21.550918636 -0700
> +++ b/net/ipv4/devinet.c 2013-06-28 09:07:18.147829543 -0700
> @@ -1685,6 +1685,11 @@ static int inet_netconf_msgsize_devconf(
> size += nla_total_size(4);
> if (type == -1 || type == NETCONFA_RP_FILTER)
> size += nla_total_size(4);
> +
> + /* additional header for MC family */
> + if (type == -1)
> + size += NLMSG_ALIGN(sizeof(struct netconfmsg))
> + + nla_total_size(4);
> if (type == -1 || type == NETCONFA_MC_FORWARDING)
> size += nla_total_size(4);
>
> @@ -1694,7 +1699,7 @@ static int inet_netconf_msgsize_devconf(
> static int inet_netconf_fill_devconf(struct sk_buff *skb, int ifindex,
> struct ipv4_devconf *devconf, u32 portid,
> u32 seq, int event, unsigned int flags,
> - int type)
> + u8 family, int type)
> {
> struct nlmsghdr *nlh;
> struct netconfmsg *ncm;
> @@ -1705,21 +1710,24 @@ static int inet_netconf_fill_devconf(str
> return -EMSGSIZE;
>
> ncm = nlmsg_data(nlh);
> - ncm->ncm_family = AF_INET;
> + ncm->ncm_family = family;
>
> if (nla_put_s32(skb, NETCONFA_IFINDEX, ifindex) < 0)
> goto nla_put_failure;
>
> /* type -1 is used for ALL */
> - if ((type == -1 || type == NETCONFA_FORWARDING) &&
> + if (((type == -1 && family == AF_INET) ||
> + type == NETCONFA_FORWARDING) &&
> nla_put_s32(skb, NETCONFA_FORWARDING,
> IPV4_DEVCONF(*devconf, FORWARDING)) < 0)
> goto nla_put_failure;
> - if ((type == -1 || type == NETCONFA_RP_FILTER) &&
> + if (((type == -1 && family == AF_INET) ||
> + type == NETCONFA_RP_FILTER) &&
> nla_put_s32(skb, NETCONFA_RP_FILTER,
> IPV4_DEVCONF(*devconf, RP_FILTER)) < 0)
> goto nla_put_failure;
> - if ((type == -1 || type == NETCONFA_MC_FORWARDING) &&
> + if (((type == -1 || family == RTNL_FAMILY_IPMR) ||
should be '&&'
> + type == NETCONFA_MC_FORWARDING) &&
> nla_put_s32(skb, NETCONFA_MC_FORWARDING,
> IPV4_DEVCONF(*devconf, MC_FORWARDING)) < 0)
> goto nla_put_failure;
> @@ -1737,12 +1745,17 @@ void inet_netconf_notify_devconf(struct
> struct sk_buff *skb;
> int err = -ENOBUFS;
>
> + BUG_ON(type == -1); /* ALL is not valid for notification */
> +
> skb = nlmsg_new(inet_netconf_msgsize_devconf(type), GFP_ATOMIC);
> if (skb == NULL)
> goto errout;
>
> err = inet_netconf_fill_devconf(skb, ifindex, devconf, 0, 0,
> - RTM_NEWNETCONF, 0, type);
> + RTM_NEWNETCONF, 0,
> + (type == NETCONFA_MC_FORWARDING) ?
> + RTNL_FAMILY_IPMR : AF_INET,
> + type);
> if (err < 0) {
> /* -EMSGSIZE implies BUG in inet_netconf_msgsize_devconf() */
> WARN_ON(err == -EMSGSIZE);
> @@ -1811,13 +1824,23 @@ static int inet_netconf_get_devconf(stru
> err = inet_netconf_fill_devconf(skb, ifindex, devconf,
> NETLINK_CB(in_skb).portid,
> nlh->nlmsg_seq, RTM_NEWNETCONF, 0,
> - -1);
> + AF_INET, -1);
> if (err < 0) {
> /* -EMSGSIZE implies BUG in inet_netconf_msgsize_devconf() */
> WARN_ON(err == -EMSGSIZE);
> kfree_skb(skb);
> goto errout;
> }
> +
> + err = inet_netconf_fill_devconf(skb, ifindex, devconf,
> + NETLINK_CB(in_skb).portid,
> + nlh->nlmsg_seq, RTM_NEWNETCONF, 0,
> + RTNL_FAMILY_IPMR, -1);
> + if (err < 0) {
> + WARN_ON(err == -EMSGSIZE);
> + kfree_skb(skb);
> + goto errout;
> + }
inet_netconf_fill_devconf() is called twice, so to be homogeneous, we can call
inet_netconf_msgsize_devconf() twice too and add a argument 'family' to this
function. Same for IPv6.
> err = rtnl_unicast(skb, net, NETLINK_CB(in_skb).portid);
> errout:
> return err;
> @@ -1855,10 +1878,23 @@ static int inet_netconf_dump_devconf(str
> cb->nlh->nlmsg_seq,
> RTM_NEWNETCONF,
> NLM_F_MULTI,
> + AF_INET,
> + -1) <= 0) {
> + rcu_read_unlock();
> + goto done;
> + }
> + if (inet_netconf_fill_devconf(skb, dev->ifindex,
> + &in_dev->cnf,
> + NETLINK_CB(cb->skb).portid,
> + cb->nlh->nlmsg_seq,
> + RTM_NEWNETCONF,
> + NLM_F_MULTI,
> + RTNL_FAMILY_IPMR,
> -1) <= 0) {
> rcu_read_unlock();
> goto done;
> }
> +
> nl_dump_check_consistent(cb, nlmsg_hdr(skb));
> cont:
> idx++;
> @@ -1871,10 +1907,18 @@ cont:
> NETLINK_CB(cb->skb).portid,
> cb->nlh->nlmsg_seq,
> RTM_NEWNETCONF, NLM_F_MULTI,
> - -1) <= 0)
> + AF_INET, -1) <= 0)
> + goto done;
> +
> + if (inet_netconf_fill_devconf(skb, NETCONFA_IFINDEX_ALL,
> + net->ipv4.devconf_all,
> + NETLINK_CB(cb->skb).portid,
> + cb->nlh->nlmsg_seq,
> + RTM_NEWNETCONF, NLM_F_MULTI,
> + RTNL_FAMILY_IPMR, -1) <= 0)
> goto done;
> - else
> - h++;
> +
> + h++;
> }
> if (h == NETDEV_HASHENTRIES + 1) {
> if (inet_netconf_fill_devconf(skb, NETCONFA_IFINDEX_DEFAULT,
> @@ -1882,10 +1926,18 @@ cont:
> NETLINK_CB(cb->skb).portid,
> cb->nlh->nlmsg_seq,
> RTM_NEWNETCONF, NLM_F_MULTI,
> - -1) <= 0)
> + AF_INET, -1) <= 0)
> goto done;
> - else
> - h++;
> +
> + if (inet_netconf_fill_devconf(skb, NETCONFA_IFINDEX_DEFAULT,
> + net->ipv4.devconf_dflt,
> + NETLINK_CB(cb->skb).portid,
> + cb->nlh->nlmsg_seq,
> + RTM_NEWNETCONF, NLM_F_MULTI,
> + RTNL_FAMILY_IPMR, -1) <= 0)
> + goto done;
> +
> + h++;
> }
> done:
> cb->args[0] = h;
> --- a/net/ipv6/addrconf.c 2013-06-28 08:17:16.424664740 -0700
> +++ b/net/ipv6/addrconf.c 2013-06-28 09:10:32.336959806 -0700
> @@ -471,6 +471,9 @@ static int inet6_netconf_msgsize_devconf
> if (type == -1 || type == NETCONFA_FORWARDING)
> size += nla_total_size(4);
> #ifdef CONFIG_IPV6_MROUTE
> + if (type == -1)
> + size += NLMSG_ALIGN(sizeof(struct netconfmsg))
> + + nla_total_size(4);
> if (type == -1 || type == NETCONFA_MC_FORWARDING)
> size += nla_total_size(4);
> #endif
> @@ -481,7 +484,7 @@ static int inet6_netconf_msgsize_devconf
> static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex,
> struct ipv6_devconf *devconf, u32 portid,
> u32 seq, int event, unsigned int flags,
> - int type)
> + u8 family, int type)
> {
> struct nlmsghdr *nlh;
> struct netconfmsg *ncm;
> @@ -492,17 +495,19 @@ static int inet6_netconf_fill_devconf(st
> return -EMSGSIZE;
>
> ncm = nlmsg_data(nlh);
> - ncm->ncm_family = AF_INET6;
> + ncm->ncm_family = family;
>
> if (nla_put_s32(skb, NETCONFA_IFINDEX, ifindex) < 0)
> goto nla_put_failure;
>
> /* type -1 is used for ALL */
> - if ((type == -1 || type == NETCONFA_FORWARDING) &&
> + if (((type == -1 && family == AF_INET6) ||
> + type == NETCONFA_FORWARDING) &&
> nla_put_s32(skb, NETCONFA_FORWARDING, devconf->forwarding) < 0)
> goto nla_put_failure;
> #ifdef CONFIG_IPV6_MROUTE
> - if ((type == -1 || type == NETCONFA_MC_FORWARDING) &&
> + if (((type == -1 && family == RTNL_FAMILY_IP6MR) ||
> + type == NETCONFA_MC_FORWARDING) &&
> nla_put_s32(skb, NETCONFA_MC_FORWARDING,
> devconf->mc_forwarding) < 0)
> goto nla_put_failure;
> @@ -520,12 +525,23 @@ void inet6_netconf_notify_devconf(struct
> struct sk_buff *skb;
> int err = -ENOBUFS;
>
> + BUG_ON(type == -1);
> +
> skb = nlmsg_new(inet6_netconf_msgsize_devconf(type), GFP_ATOMIC);
> if (skb == NULL)
> goto errout;
>
> +#ifdef CONFIG_IPV6_MROUTE
> + if (type == NETCONFA_MC_FORWARDING)
> + err = inet6_netconf_fill_devconf(skb, ifindex, devconf, 0, 0,
> + RTM_NEWNETCONF, 0,
> + RTNL_FAMILY_IP6MR, type);
> + else
> +#endif
> err = inet6_netconf_fill_devconf(skb, ifindex, devconf, 0, 0,
> - RTM_NEWNETCONF, 0, type);
> + RTM_NEWNETCONF, 0,
> + AF_INET6, type);
> +#endif
> if (err < 0) {
> /* -EMSGSIZE implies BUG in inet6_netconf_msgsize_devconf() */
> WARN_ON(err == -EMSGSIZE);
> @@ -592,13 +608,25 @@ static int inet6_netconf_get_devconf(str
> err = inet6_netconf_fill_devconf(skb, ifindex, devconf,
> NETLINK_CB(in_skb).portid,
> nlh->nlmsg_seq, RTM_NEWNETCONF, 0,
> - -1);
> + AF_INET6, -1);
> + if (err < 0) {
> + /* -EMSGSIZE implies BUG in inet6_netconf_msgsize_devconf() */
> + WARN_ON(err == -EMSGSIZE);
> + kfree_skb(skb);
> + goto errout;
> + }
> +#ifdef CONFIG_IPV6_MROUTE
> + err = inet6_netconf_fill_devconf(skb, ifindex, devconf,
> + NETLINK_CB(in_skb).portid,
> + nlh->nlmsg_seq, RTM_NEWNETCONF, 0,
> + RTNL_FAMILY_IP6MR, -1);
> if (err < 0) {
> /* -EMSGSIZE implies BUG in inet6_netconf_msgsize_devconf() */
> WARN_ON(err == -EMSGSIZE);
> kfree_skb(skb);
> goto errout;
> }
> +#endif
> err = rtnl_unicast(skb, net, NETLINK_CB(in_skb).portid);
> errout:
> return err;
> @@ -636,10 +664,23 @@ static int inet6_netconf_dump_devconf(st
> cb->nlh->nlmsg_seq,
> RTM_NEWNETCONF,
> NLM_F_MULTI,
> + AF_INET6, -1) <= 0) {
> + rcu_read_unlock();
> + goto done;
> + }
> +#ifdef CONFIG_IPV6_MROUTE
> + if (inet6_netconf_fill_devconf(skb, dev->ifindex,
> + &idev->cnf,
> + NETLINK_CB(cb->skb).portid,
> + cb->nlh->nlmsg_seq,
> + RTM_NEWNETCONF,
> + NLM_F_MULTI,
> + RTNL_FAMILY_IP6MR,
> -1) <= 0) {
> rcu_read_unlock();
> goto done;
> }
> +#endif
> nl_dump_check_consistent(cb, nlmsg_hdr(skb));
> cont:
> idx++;
> @@ -652,10 +693,18 @@ cont:
> NETLINK_CB(cb->skb).portid,
> cb->nlh->nlmsg_seq,
> RTM_NEWNETCONF, NLM_F_MULTI,
> - -1) <= 0)
> + AF_INET6, -1) <= 0)
> goto done;
> - else
> - h++;
> +#ifdef CONFIG_IPV6_MROUTE
> + if (inet6_netconf_fill_devconf(skb, NETCONFA_IFINDEX_ALL,
> + net->ipv6.devconf_all,
> + NETLINK_CB(cb->skb).portid,
> + cb->nlh->nlmsg_seq,
> + RTM_NEWNETCONF, NLM_F_MULTI,
> + RTNL_FAMILY_IP6MR, -1) <= 0)
> + goto done;
> +#endif
> + h++;
> }
> if (h == NETDEV_HASHENTRIES + 1) {
> if (inet6_netconf_fill_devconf(skb, NETCONFA_IFINDEX_DEFAULT,
> @@ -663,9 +712,17 @@ cont:
> NETLINK_CB(cb->skb).portid,
> cb->nlh->nlmsg_seq,
> RTM_NEWNETCONF, NLM_F_MULTI,
> - -1) <= 0)
> + AF_INET6, -1) <= 0)
> + goto done;
> +#ifdef CONFIG_IPV6_MROUTE
> + if (inet6_netconf_fill_devconf(skb, NETCONFA_IFINDEX_DEFAULT,
> + net->ipv6.devconf_dflt,
> + NETLINK_CB(cb->skb).portid,
> + cb->nlh->nlmsg_seq,
> + RTM_NEWNETCONF, NLM_F_MULTI,
> + RTNL_FAMILY_IP6MR, -1) <= 0)
> goto done;
> - else
> +#endif
> h++;
This line should be reindent too.
> }
> done:
>
prev parent reply other threads:[~2013-07-01 12:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-27 23:44 [PATCH] Set the correct RTNL family for multicast netconf messages Sven-Thorsten Dietrich
2013-06-27 23:44 ` Sven-Thorsten Dietrich
2013-06-28 1:23 ` Hannes Frederic Sowa
2013-06-28 1:33 ` Stephen Hemminger
2013-06-28 1:51 ` Hannes Frederic Sowa
2013-06-28 10:13 ` Nicolas Dichtel
2013-06-28 15:26 ` Stephen Hemminger
2013-06-28 15:54 ` Nicolas Dichtel
2013-06-28 16:13 ` [RFC net] netconf: set mulitcast family for multicast forwarding messages Stephen Hemminger
2013-07-01 12:38 ` Nicolas Dichtel [this message]
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=51D17839.8010700@6wind.com \
--to=nicolas.dichtel@6wind.com \
--cc=Mike.Davison@vyatta.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shemminger@vyatta.com \
--cc=stephen@networkplumber.org \
--cc=sven@vyatta.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.