rtnetlink: Compute and store minimum ifinfo dump size
Subsystems (8)
RFC PATCH v4 1/1 rtnetlink: Compute and store minimum ifinfo dump size
The message size allocated for rtnl info dumps was limited to a single page. This is not enough for additional interface info available with devices that support SR-IOV. Calculate the amount of data required so the dump can allocate enough data to satisfy the request.
V2 added the calcit function to the rtnl_register calls so that dump functions could get the minimum dump allocation size if they needed to.
V3 leverages the fact that the netdev register function ends up calling if_nlmsg_size. We collect the minimum dump allocation size there and keep it in a module static variable so that the calcit function doesn't have to search for the device on every info dump.
V4 fixes the title.
---
include/linux/netlink.h | 6 ++- include/net/rtnetlink.h | 5 ++- net/bridge/br_netlink.c | 15 ++++++--- net/core/fib_rules.c | 6 ++- net/core/neighbour.c | 10 +++--- net/core/rtnetlink.c | 59 ++++++++++++++++++++++++++++------ net/dcb/dcbnl.c | 4 +- net/decnet/dn_dev.c | 6 ++- net/decnet/dn_fib.c | 4 +- net/decnet/dn_route.c | 5 ++- net/ipv4/devinet.c | 6 ++- net/ipv4/fib_frontend.c | 6 ++- net/ipv4/inet_diag.c | 2 + net/ipv4/ipmr.c | 3 +- net/ipv4/route.c | 2 + net/ipv6/addrconf.c | 12 +++---- net/ipv6/addrlabel.c | 6 ++- net/ipv6/ip6_fib.c | 2 + net/ipv6/ip6mr.c | 2 + net/ipv6/route.c | 6 ++- net/netfilter/ipset/ip_set_core.c | 2 + net/netfilter/nf_conntrack_netlink.c | 4 +- net/netlink/af_netlink.c | 17 ++++++---- net/netlink/genetlink.c | 2 + net/phonet/pn_netlink.c | 12 +++---- net/sched/act_api.c | 6 ++- net/sched/cls_api.c | 6 ++- net/sched/sch_api.c | 12 +++---- net/xfrm/xfrm_user.c | 2 + 29 files changed, 141 insertions(+), 89 deletions(-)
include/linux/netlink.h +4 -2
@@ -220,7 +220,8 @@ struct netlink_callback {int (*dump)(struct sk_buff * skb,struct netlink_callback *cb);int (*done)(struct netlink_callback *cb); -int family; +u16 family; +u16 min_dump_alloc;long args[6 ]; };
@@ -258,7 +259,8 @@ __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags)extern int netlink_dump_start (struct sock *ssk,struct sk_buff *skb,const struct nlmsghdr *nlh,int (*dump)(struct sk_buff *skb,struct netlink_callback *), -int (*done)(struct netlink_callback *)); +int (*done)(struct netlink_callback *), +u16 min_dump_alloc);#define NL_NONROOT_RECV 0x1
include/net/rtnetlink.h +3 -2
@@ -6,11 +6,12 @@typedef int (*rtnl_doit_func )(struct sk_buff *,struct nlmsghdr *,void *);typedef int (*rtnl_dumpit_func )(struct sk_buff *,struct netlink_callback *); +typedef u16 (*rtnl_calcit_func )(struct sk_buff *);extern int __rtnl_register (int protocol,int msgtype, -rtnl_doit_func ,rtnl_dumpit_func ); +rtnl_doit_func ,rtnl_dumpit_func ,rtnl_calcit_func );extern void rtnl_register (int protocol,int msgtype, -rtnl_doit_func ,rtnl_dumpit_func ); +rtnl_doit_func ,rtnl_dumpit_func ,rtnl_calcit_func );extern int rtnl_unregister (int protocol,int msgtype);extern void rtnl_unregister_all (int protocol);
net/bridge/br_netlink.c +10 -5
@@ -218,19 +218,24 @@ int __init br_netlink_init(void)if (err <0 ) goto err1; - err =__rtnl_register (PF_BRIDGE ,RTM_GETLINK ,NULL , br_dump_ifinfo); + err =__rtnl_register (PF_BRIDGE ,RTM_GETLINK ,NULL , + br_dump_ifinfo,NULL );if (err) goto err2; - err =__rtnl_register (PF_BRIDGE ,RTM_SETLINK , br_rtm_setlink,NULL ); + err =__rtnl_register (PF_BRIDGE ,RTM_SETLINK , + br_rtm_setlink,NULL ,NULL );if (err) goto err3; - err =__rtnl_register (PF_BRIDGE ,RTM_NEWNEIGH , br_fdb_add,NULL ); + err =__rtnl_register (PF_BRIDGE ,RTM_NEWNEIGH , + br_fdb_add,NULL ,NULL );if (err) goto err3; - err =__rtnl_register (PF_BRIDGE ,RTM_DELNEIGH , br_fdb_delete,NULL ); + err =__rtnl_register (PF_BRIDGE ,RTM_DELNEIGH , + br_fdb_delete,NULL ,NULL );if (err) goto err3; - err =__rtnl_register (PF_BRIDGE ,RTM_GETNEIGH ,NULL , br_fdb_dump); + err =__rtnl_register (PF_BRIDGE ,RTM_GETNEIGH , +NULL , br_fdb_dump,NULL );if (err) goto err3;
net/core/fib_rules.c +3 -3
@@ -739,9 +739,9 @@ static struct pernet_operations fib_rules_net_ops = {static int __init fib_rules_init (void ) {int err; -rtnl_register (PF_UNSPEC ,RTM_NEWRULE , fib_nl_newrule,NULL ); -rtnl_register (PF_UNSPEC ,RTM_DELRULE , fib_nl_delrule,NULL ); -rtnl_register (PF_UNSPEC ,RTM_GETRULE ,NULL , fib_nl_dumprule); +rtnl_register (PF_UNSPEC ,RTM_NEWRULE , fib_nl_newrule,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_DELRULE , fib_nl_delrule,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_GETRULE ,NULL , fib_nl_dumprule,NULL ); err =register_pernet_subsys (&fib_rules_net_ops);if (err <0 )
net/core/neighbour.c +5 -5
@@ -2909,12 +2909,12 @@ EXPORT_SYMBOL(neigh_sysctl_unregister);static int __init neigh_init (void ) { -rtnl_register (PF_UNSPEC ,RTM_NEWNEIGH , neigh_add,NULL ); -rtnl_register (PF_UNSPEC ,RTM_DELNEIGH , neigh_delete,NULL ); -rtnl_register (PF_UNSPEC ,RTM_GETNEIGH ,NULL , neigh_dump_info); +rtnl_register (PF_UNSPEC ,RTM_NEWNEIGH , neigh_add,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_DELNEIGH , neigh_delete,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_GETNEIGH ,NULL , neigh_dump_info,NULL ); -rtnl_register (PF_UNSPEC ,RTM_GETNEIGHTBL ,NULL , neightbl_dump_info); -rtnl_register (PF_UNSPEC ,RTM_SETNEIGHTBL , neightbl_set,NULL ); +rtnl_register (PF_UNSPEC ,RTM_GETNEIGHTBL ,NULL , neightbl_dump_info,NULL ); +rtnl_register (PF_UNSPEC ,RTM_SETNEIGHTBL , neightbl_set,NULL ,NULL );return 0 ; }
net/core/rtnetlink.c +48 -11
133 lines not on this page · raw message
net/dcb/dcbnl.c +2 -2
@@ -1819,8 +1819,8 @@ static int __init dcbnl_init(void) {INIT_LIST_HEAD (&dcb_app_list); -rtnl_register (PF_UNSPEC ,RTM_GETDCB , dcb_doit,NULL ); -rtnl_register (PF_UNSPEC ,RTM_SETDCB , dcb_doit,NULL ); +rtnl_register (PF_UNSPEC ,RTM_GETDCB , dcb_doit,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_SETDCB , dcb_doit,NULL ,NULL );return 0 ; }
net/decnet/dn_dev.c +3 -3
@@ -1419,9 +1419,9 @@ void __init dn_dev_init(void)dn_dev_devices_on (); -rtnl_register (PF_DECnet,RTM_NEWADDR , dn_nl_newaddr,NULL ); -rtnl_register (PF_DECnet,RTM_DELADDR , dn_nl_deladdr,NULL ); -rtnl_register (PF_DECnet,RTM_GETADDR ,NULL , dn_nl_dump_ifaddr); +rtnl_register (PF_DECnet,RTM_NEWADDR , dn_nl_newaddr,NULL ,NULL ); +rtnl_register (PF_DECnet,RTM_DELADDR , dn_nl_deladdr,NULL ,NULL ); +rtnl_register (PF_DECnet,RTM_GETADDR ,NULL , dn_nl_dump_ifaddr,NULL );proc_net_fops_create (&init_net,"decnet_dev" ,S_IRUGO , &dn_dev_seq_fops);
net/decnet/dn_fib.c +2 -2
@@ -763,8 +763,8 @@ void __init dn_fib_init(void)register_dnaddr_notifier (&dn_fib_dnaddr_notifier); -rtnl_register (PF_DECnet,RTM_NEWROUTE , dn_fib_rtm_newroute,NULL ); -rtnl_register (PF_DECnet,RTM_DELROUTE , dn_fib_rtm_delroute,NULL ); +rtnl_register (PF_DECnet,RTM_NEWROUTE , dn_fib_rtm_newroute,NULL ,NULL ); +rtnl_register (PF_DECnet,RTM_DELROUTE , dn_fib_rtm_delroute,NULL ,NULL ); }
net/decnet/dn_route.c +3 -2
@@ -1841,10 +1841,11 @@ void __init dn_route_init(void)proc_net_fops_create (&init_net,"decnet_cache" ,S_IRUGO , &dn_rt_cache_seq_fops);#ifdef CONFIG_DECNET_ROUTER -rtnl_register (PF_DECnet,RTM_GETROUTE , dn_cache_getroute, dn_fib_dump); +rtnl_register (PF_DECnet,RTM_GETROUTE , dn_cache_getroute, + dn_fib_dump,NULL );#else rtnl_register (PF_DECnet,RTM_GETROUTE , dn_cache_getroute, - dn_cache_dump); + dn_cache_dump,NULL );#endif }
net/ipv4/devinet.c +3 -3
@@ -1833,8 +1833,8 @@ void __init devinet_init(void)rtnl_af_register (&inet_af_ops); -rtnl_register (PF_INET ,RTM_NEWADDR , inet_rtm_newaddr,NULL ); -rtnl_register (PF_INET ,RTM_DELADDR , inet_rtm_deladdr,NULL ); -rtnl_register (PF_INET ,RTM_GETADDR ,NULL , inet_dump_ifaddr); +rtnl_register (PF_INET ,RTM_NEWADDR , inet_rtm_newaddr,NULL ,NULL ); +rtnl_register (PF_INET ,RTM_DELADDR , inet_rtm_deladdr,NULL ,NULL ); +rtnl_register (PF_INET ,RTM_GETADDR ,NULL , inet_dump_ifaddr,NULL ); }
net/ipv4/fib_frontend.c +3 -3
@@ -1124,9 +1124,9 @@ static struct pernet_operations fib_net_ops = {void __init ip_fib_init (void ) { -rtnl_register (PF_INET ,RTM_NEWROUTE , inet_rtm_newroute,NULL ); -rtnl_register (PF_INET ,RTM_DELROUTE , inet_rtm_delroute,NULL ); -rtnl_register (PF_INET ,RTM_GETROUTE ,NULL , inet_dump_fib); +rtnl_register (PF_INET ,RTM_NEWROUTE , inet_rtm_newroute,NULL ,NULL ); +rtnl_register (PF_INET ,RTM_DELROUTE , inet_rtm_delroute,NULL ,NULL ); +rtnl_register (PF_INET ,RTM_GETROUTE ,NULL , inet_dump_fib,NULL );register_pernet_subsys (&fib_net_ops);register_netdevice_notifier (&fib_netdev_notifier);
net/ipv4/inet_diag.c +1 -1
@@ -871,7 +871,7 @@ static int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) }return netlink_dump_start (idiagnl, skb, nlh, - inet_diag_dump,NULL ); + inet_diag_dump,NULL ,0 ); }return inet_diag_get_exact (skb, nlh);
net/ipv4/ipmr.c +2 -1
@@ -2544,7 +2544,8 @@ int __init ip_mr_init(void) goto add_proto_fail; }#endif -rtnl_register (RTNL_FAMILY_IPMR ,RTM_GETROUTE ,NULL , ipmr_rtm_dumproute); +rtnl_register (RTNL_FAMILY_IPMR ,RTM_GETROUTE , +NULL , ipmr_rtm_dumproute,NULL );return 0 ;#ifdef CONFIG_IP_PIMSM_V2
net/ipv4/route.c +1 -1
@@ -3312,7 +3312,7 @@ int __init ip_rt_init(void)xfrm_init ();xfrm4_init (ip_rt_max_size);#endif -rtnl_register (PF_INET ,RTM_GETROUTE , inet_rtm_getroute,NULL ); +rtnl_register (PF_INET ,RTM_GETROUTE , inet_rtm_getroute,NULL ,NULL );#ifdef CONFIG_SYSCTL register_pernet_subsys (&sysctl_route_ops);
net/ipv6/addrconf.c +6 -6
@@ -4704,16 +4704,16 @@ int __init addrconf_init(void)if (err <0 ) goto errout_af; - err =__rtnl_register (PF_INET6 ,RTM_GETLINK ,NULL , inet6_dump_ifinfo); + err =__rtnl_register (PF_INET6 ,RTM_GETLINK ,NULL , inet6_dump_ifinfo,NULL );if (err <0 ) goto errout;/* Only the first call to __rtnl_register can fail */ -__rtnl_register (PF_INET6 ,RTM_NEWADDR , inet6_rtm_newaddr,NULL ); -__rtnl_register (PF_INET6 ,RTM_DELADDR , inet6_rtm_deladdr,NULL ); -__rtnl_register (PF_INET6 ,RTM_GETADDR , inet6_rtm_getaddr, inet6_dump_ifaddr); -__rtnl_register (PF_INET6 ,RTM_GETMULTICAST ,NULL , inet6_dump_ifmcaddr); -__rtnl_register (PF_INET6 ,RTM_GETANYCAST ,NULL , inet6_dump_ifacaddr); +__rtnl_register (PF_INET6 ,RTM_NEWADDR , inet6_rtm_newaddr,NULL ,NULL ); +__rtnl_register (PF_INET6 ,RTM_DELADDR , inet6_rtm_deladdr,NULL ,NULL ); +__rtnl_register (PF_INET6 ,RTM_GETADDR , inet6_rtm_getaddr, inet6_dump_ifaddr,NULL ); +__rtnl_register (PF_INET6 ,RTM_GETMULTICAST ,NULL , inet6_dump_ifmcaddr,NULL ); +__rtnl_register (PF_INET6 ,RTM_GETANYCAST ,NULL , inet6_dump_ifacaddr,NULL );ipv6_addr_label_rtnl_register ();
net/ipv6/addrlabel.c +3 -3
@@ -592,8 +592,8 @@ out:void __init ipv6_addr_label_rtnl_register (void ) { -__rtnl_register (PF_INET6 ,RTM_NEWADDRLABEL , ip6addrlbl_newdel,NULL ); -__rtnl_register (PF_INET6 ,RTM_DELADDRLABEL , ip6addrlbl_newdel,NULL ); -__rtnl_register (PF_INET6 ,RTM_GETADDRLABEL , ip6addrlbl_get, ip6addrlbl_dump); +__rtnl_register (PF_INET6 ,RTM_NEWADDRLABEL , ip6addrlbl_newdel,NULL ,NULL ); +__rtnl_register (PF_INET6 ,RTM_DELADDRLABEL , ip6addrlbl_newdel,NULL ,NULL ); +__rtnl_register (PF_INET6 ,RTM_GETADDRLABEL , ip6addrlbl_get, ip6addrlbl_dump,NULL ); }
net/ipv6/ip6_fib.c +1 -1
@@ -1586,7 +1586,7 @@ int __init fib6_init(void)if (ret) goto out_kmem_cache_create; - ret =__rtnl_register (PF_INET6 ,RTM_GETROUTE ,NULL , inet6_dump_fib); + ret =__rtnl_register (PF_INET6 ,RTM_GETROUTE ,NULL , inet6_dump_fib,NULL );if (ret) goto out_unregister_subsys; out:
net/ipv6/ip6mr.c +1 -1
@@ -1354,7 +1354,7 @@ int __init ip6_mr_init(void) goto add_proto_fail; }#endif -rtnl_register (RTNL_FAMILY_IP6MR ,RTM_GETROUTE ,NULL , ip6mr_rtm_dumproute); +rtnl_register (RTNL_FAMILY_IP6MR ,RTM_GETROUTE ,NULL , ip6mr_rtm_dumproute,NULL );return 0 ;#ifdef CONFIG_IPV6_PIMSM_V2 add_proto_fail:
net/ipv6/route.c +3 -3
@@ -2924,9 +2924,9 @@ int __init ip6_route_init(void) goto xfrm6_init; ret = -ENOBUFS ; -if (__rtnl_register (PF_INET6 ,RTM_NEWROUTE , inet6_rtm_newroute,NULL ) || -__rtnl_register (PF_INET6 ,RTM_DELROUTE , inet6_rtm_delroute,NULL ) || -__rtnl_register (PF_INET6 ,RTM_GETROUTE , inet6_rtm_getroute,NULL )) +if (__rtnl_register (PF_INET6 ,RTM_NEWROUTE , inet6_rtm_newroute,NULL ,NULL ) || +__rtnl_register (PF_INET6 ,RTM_DELROUTE , inet6_rtm_delroute,NULL ,NULL ) || +__rtnl_register (PF_INET6 ,RTM_GETROUTE , inet6_rtm_getroute,NULL ,NULL )) goto fib6_rules_init; ret =register_netdevice_notifier (&ip6_route_dev_notifier);
net/netfilter/ipset/ip_set_core.c +1 -1
@@ -1120,7 +1120,7 @@ ip_set_dump(struct sock *ctnl, struct sk_buff *skb,return netlink_dump_start (ctnl, skb, nlh, ip_set_dump_start, - ip_set_dump_done); + ip_set_dump_done,0 ); }/* Add, del and test */
net/netfilter/nf_conntrack_netlink.c +2 -2
@@ -970,7 +970,7 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,if (nlh->nlmsg_flags &NLM_F_DUMP )return netlink_dump_start (ctnl, skb, nlh, ctnetlink_dump_table, - ctnetlink_done); + ctnetlink_done,0 ); err =ctnetlink_parse_zone (cda[CTA_ZONE ], &zone);if (err <0 )
@@ -1840,7 +1840,7 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb,if (nlh->nlmsg_flags &NLM_F_DUMP ) {return netlink_dump_start (ctnl, skb, nlh, ctnetlink_exp_dump_table, - ctnetlink_exp_done); + ctnetlink_exp_done,0 ); } err =ctnetlink_parse_zone (cda[CTA_EXPECT_ZONE ], &zone);
net/netlink/af_netlink.c +11 -6
@@ -1665,13 +1665,10 @@ static int netlink_dump(struct sock *sk) {struct netlink_sock *nlk =nlk_sk (sk);struct netlink_callback *cb; -struct sk_buff *skb; +struct sk_buff *skb =NULL ;struct nlmsghdr *nlh;int len, err = -ENOBUFS ; - - skb =sock_rmalloc (sk,NLMSG_GOODSIZE ,0 ,GFP_KERNEL ); -if (!skb) - goto errout; +int alloc_size;mutex_lock (nlk->cb_mutex);
@@ -1681,6 +1678,12 @@ static int netlink_dump(struct sock *sk) goto errout_skb; } + alloc_size =max_t (int, cb->min_dump_alloc,NLMSG_GOODSIZE ); + + skb =sock_rmalloc (sk, alloc_size,0 ,GFP_KERNEL ); +if (!skb) + goto errout; + len = cb->dump (skb, cb);if (len >0 ) {
@@ -1727,7 +1730,8 @@ int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,const struct nlmsghdr *nlh, int (*dump)(struct sk_buff *skb,struct netlink_callback *), - int (*done)(struct netlink_callback *)) + int (*done)(struct netlink_callback *), + u16 min_dump_alloc) { struct netlink_callback *cb;struct sock *sk;
@@ -1741,6 +1745,7 @@ int netlink_dump_start(struct sock *ssk, struct sk_buff *skb, cb->dump = dump; cb->done = done; cb->nlh = nlh; + cb->min_dump_alloc = min_dump_alloc;atomic_inc (&skb->users); cb->skb = skb;
net/netlink/genetlink.c +1 -1
@@ -525,7 +525,7 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)genl_unlock (); err =netlink_dump_start (net->genl_sock, skb, nlh, - ops->dumpit, ops->done); + ops->dumpit, ops->done,0 );genl_lock ();return err; }
net/phonet/pn_netlink.c +6 -6
@@ -289,15 +289,15 @@ out:int __init phonet_netlink_register (void ) { -int err =__rtnl_register (PF_PHONET ,RTM_NEWADDR , addr_doit,NULL ); +int err =__rtnl_register (PF_PHONET ,RTM_NEWADDR , addr_doit,NULL ,NULL );if (err)return err;/* Further __rtnl_register() cannot fail */ -__rtnl_register (PF_PHONET ,RTM_DELADDR , addr_doit,NULL ); -__rtnl_register (PF_PHONET ,RTM_GETADDR ,NULL , getaddr_dumpit); -__rtnl_register (PF_PHONET ,RTM_NEWROUTE , route_doit,NULL ); -__rtnl_register (PF_PHONET ,RTM_DELROUTE , route_doit,NULL ); -__rtnl_register (PF_PHONET ,RTM_GETROUTE ,NULL , route_dumpit); +__rtnl_register (PF_PHONET ,RTM_DELADDR , addr_doit,NULL ,NULL ); +__rtnl_register (PF_PHONET ,RTM_GETADDR ,NULL , getaddr_dumpit,NULL ); +__rtnl_register (PF_PHONET ,RTM_NEWROUTE , route_doit,NULL ,NULL ); +__rtnl_register (PF_PHONET ,RTM_DELROUTE , route_doit,NULL ,NULL ); +__rtnl_register (PF_PHONET ,RTM_GETROUTE ,NULL , route_dumpit,NULL );return 0 ; }
net/sched/act_api.c +3 -3
@@ -1120,9 +1120,9 @@ nlmsg_failure:static int __init tc_action_init (void ) { -rtnl_register (PF_UNSPEC ,RTM_NEWACTION , tc_ctl_action,NULL ); -rtnl_register (PF_UNSPEC ,RTM_DELACTION , tc_ctl_action,NULL ); -rtnl_register (PF_UNSPEC ,RTM_GETACTION , tc_ctl_action, tc_dump_action); +rtnl_register (PF_UNSPEC ,RTM_NEWACTION , tc_ctl_action,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_DELACTION , tc_ctl_action,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_GETACTION , tc_ctl_action, tc_dump_action,NULL );return 0 ; }
net/sched/cls_api.c +3 -3
@@ -610,10 +610,10 @@ EXPORT_SYMBOL(tcf_exts_dump_stats);static int __init tc_filter_init (void ) { -rtnl_register (PF_UNSPEC ,RTM_NEWTFILTER , tc_ctl_tfilter,NULL ); -rtnl_register (PF_UNSPEC ,RTM_DELTFILTER , tc_ctl_tfilter,NULL ); +rtnl_register (PF_UNSPEC ,RTM_NEWTFILTER , tc_ctl_tfilter,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_DELTFILTER , tc_ctl_tfilter,NULL ,NULL );rtnl_register (PF_UNSPEC ,RTM_GETTFILTER , tc_ctl_tfilter, - tc_dump_tfilter); + tc_dump_tfilter,NULL );return 0 ; }
net/sched/sch_api.c +6 -6
@@ -1794,12 +1794,12 @@ static int __init pktsched_init(void)register_qdisc (&pfifo_head_drop_qdisc_ops);register_qdisc (&mq_qdisc_ops); -rtnl_register (PF_UNSPEC ,RTM_NEWQDISC , tc_modify_qdisc,NULL ); -rtnl_register (PF_UNSPEC ,RTM_DELQDISC , tc_get_qdisc,NULL ); -rtnl_register (PF_UNSPEC ,RTM_GETQDISC , tc_get_qdisc, tc_dump_qdisc); -rtnl_register (PF_UNSPEC ,RTM_NEWTCLASS , tc_ctl_tclass,NULL ); -rtnl_register (PF_UNSPEC ,RTM_DELTCLASS , tc_ctl_tclass,NULL ); -rtnl_register (PF_UNSPEC ,RTM_GETTCLASS , tc_ctl_tclass, tc_dump_tclass); +rtnl_register (PF_UNSPEC ,RTM_NEWQDISC , tc_modify_qdisc,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_DELQDISC , tc_get_qdisc,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_GETQDISC , tc_get_qdisc, tc_dump_qdisc,NULL ); +rtnl_register (PF_UNSPEC ,RTM_NEWTCLASS , tc_ctl_tclass,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_DELTCLASS , tc_ctl_tclass,NULL ,NULL ); +rtnl_register (PF_UNSPEC ,RTM_GETTCLASS , tc_ctl_tclass, tc_dump_tclass,NULL );return 0 ; }
net/xfrm/xfrm_user.c +1 -1
@@ -2299,7 +2299,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)if (link->dump ==NULL )return -EINVAL ; -return netlink_dump_start (net->xfrm.nlsk, skb, nlh, link->dump, link->done); +return netlink_dump_start (net->xfrm.nlsk, skb, nlh, link->dump, link->done,0 ); } err = nlmsg_parse(nlh, xfrm_msg_min[type], attrs, XFRMA_MAX,
David Miller
maintainerFrom: Greg Rose <[email protected]>
Date: Wed, 18 May 2011 08:54:11 -0700
Quoted 9 lines
The message size allocated for rtnl info dumps was limited to a single page. This is not enough for additional interface info available with devices that support SR-IOV. Calculate the amount of data required so the dump can allocate enough data to satisfy the request.
V2 added the calcit function to the
rtnl_registercalls so that dump functions could get the minimum dump allocation size if they needed to.
Quoted 8 lines
V3 leverages the fact that the netdev register function ends up calling
if_nlmsg_size. We collect the minimum dump allocation size there and keep it in a module static variable so that the calcit function doesn't have to search for the device on every info dump.V4 fixes the title.
Signed-off-by Greg Rose <[email protected]>
This only works if someone does a plain GETLINK request on the largest space requiring device before the dump request happens.
Otherwise the value used by the calcit function won't be properly prepared yet.
Quoted 26 lines
-----Original Message-----
From: David Miller [mailto:[email protected]]
Sent: Wednesday, May 18, 2011 3:09 PM
To: Rose, Gregory V
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [RFC V4 PATCH] rtnetlink: Compute and store minimum ifinfo dump sizeFrom: Greg Rose <[email protected]>
Date: Wed, 18 May 2011 08:54:11 -0700Quoted 14 lines
The message size allocated for rtnl info dumps was limited to a single page. This is not enough for additional interface info available with devices that support SR-IOV. Calculate the amount of data required so the dump can allocate enough data to satisfy the request.
V2 added the calcit function to the
rtnl_registercalls so that dump functions could get the minimum dump allocation size if they needed to.V3 leverages the fact that the netdev register function ends up calling
if_nlmsg_size. We collect the minimum dump allocation size there and keep it in a module static variable so that the calcit function doesn't have to search for the device on every info dump.
Quoted 6 lines
Quoted 3 lines
V4 fixes the title.
Signed-off-by Greg Rose <[email protected]>This only works if someone does a plain GETLINK request on the largest space requiring device before the dump request happens.
It looked to me like rtmsg_ifinfo is called when each device is registered through register_netdevice() and rtmsg_ifinfo in turn calls the if_nlmsg_size function returning the ifinfo dump size for each device. In my testing it looked like the proper maximum size was being set after I loaded the drivers for the SR-IOV capable devices.
Perhaps I missed something? Is register_netdevice not always called before a device is used?
- Greg
David Miller
maintainerFrom: "Rose, Gregory V" <[email protected]>
Date: Wed, 18 May 2011 15:35:58 -0700
Quoted 6 lines
It looked to me like
rtmsg_ifinfois called when each device is registered throughregister_netdevice()andrtmsg_ifinfoin turn calls theif_nlmsg_sizefunction returning the ifinfo dump size for each device. In my testing it looked like the proper maximum size was being set after I loaded the drivers for the SR-IOV capable devices.
Aha, indeed you're right. I missed this part. Thanks for explaining.
So as far as I can tell it should work, I'll let others review it to see if they are ok with this approach.
Thanks.
Quoted 19 lines
-----Original Message-----
From: David Miller [mailto:[email protected]]
Sent: Wednesday, May 18, 2011 3:48 PM
To: Rose, Gregory V
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [RFC V4 PATCH] rtnetlink: Compute and store minimum ifinfo dump sizeFrom: "Rose, Gregory V" <[email protected]>
Date: Wed, 18 May 2011 15:35:58 -0700Quoted 6 lines
It looked to me like
rtmsg_ifinfois called when each device is registered throughregister_netdevice()andrtmsg_ifinfoin turn calls theif_nlmsg_sizefunction returning the ifinfo dump size for each device. In my testing it looked like the proper maximum size was being set after I loaded the drivers for the SR-IOV capable devices.
Quoted 4 lines
Aha, indeed you're right. I missed this part. Thanks for explaining.
So as far as I can tell it should work, I'll let others review it to see if they are ok with this approach.
Ok, sure. We'll see if Eric catches anything, he's got an eagle eye.
;^)
- Greg
Quoted 29 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Rose, Gregory V
Sent: Wednesday, May 18, 2011 3:49 PM
To: David Miller
Cc: [email protected]; [email protected]; [email protected]
Subject: RE: [RFC V4 PATCH] rtnetlink: Compute and store minimum ifinfo dump sizeQuoted 19 lines
-----Original Message-----
From: David Miller [mailto:[email protected]]
Sent: Wednesday, May 18, 2011 3:48 PM
To: Rose, Gregory V
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [RFC V4 PATCH] rtnetlink: Compute and store minimum ifinfo dump sizeFrom: "Rose, Gregory V" <[email protected]>
Date: Wed, 18 May 2011 15:35:58 -0700Quoted 6 lines
It looked to me like
rtmsg_ifinfois called when each device is registered throughregister_netdevice()andrtmsg_ifinfoin turn calls theif_nlmsg_sizefunction returning the ifinfo dump size for each device. In my testing it looked like the proper maximum size was being set after I loaded the drivers for the SR-IOV capable devices.
Quoted 6 lines
Quoted 4 lines
Aha, indeed you're right. I missed this part. Thanks for explaining.
So as far as I can tell it should work, I'll let others review it to see if they are ok with this approach.
Ok, sure. We'll see if Eric catches anything, he's got an eagle eye.
Having seen no further comments on this RFC I am going to clean up the patch and submit it to our internal review list for further testing and validation. If/when it passes through that process I'll post it back here.
Thanks to all who commented and made suggestions for improvement.
- Greg