Looks good. Reviewed-by: me ///jon
> -----Original Message----- > From: Richard Alpe > Sent: Wednesday, 02 December, 2015 07:52 > To: [email protected] > Cc: Jon Maloy; Ying Xue; Richard Alpe > Subject: [PATCH 2/2] tipc: add node removal functionality > > Add a new netlink command, TIPC_NL_NODE_REMOVE. This command can > remove an offline peer node from the internal data structures. > > This will be supported by the tipc user space tool in iproute2. > > Signed-off-by: Richard Alpe <[email protected]> > --- > include/uapi/linux/tipc_netlink.h | 1 + > net/tipc/net.c | 2 +- > net/tipc/netlink.c | 5 ++++ > net/tipc/node.c | 60 +++++++++++++++++++++++++++++++++++- > --- > net/tipc/node.h | 3 +- > 5 files changed, 63 insertions(+), 8 deletions(-) > > diff --git a/include/uapi/linux/tipc_netlink.h > b/include/uapi/linux/tipc_netlink.h > index d4c8f14..3f8a2b8 100644 > --- a/include/uapi/linux/tipc_netlink.h > +++ b/include/uapi/linux/tipc_netlink.h > @@ -56,6 +56,7 @@ enum { > TIPC_NL_NET_GET, > TIPC_NL_NET_SET, > TIPC_NL_NAME_TABLE_GET, > + TIPC_NL_NODE_REMOVE, > > __TIPC_NL_CMD_MAX, > TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1 diff --git > a/net/tipc/net.c b/net/tipc/net.c index d7a5c11..bc6b4a6 100644 > --- a/net/tipc/net.c > +++ b/net/tipc/net.c > @@ -135,7 +135,7 @@ void tipc_net_stop(struct net *net) > tn->own_addr); > rtnl_lock(); > tipc_bearer_stop(net); > - tipc_node_stop(net); > + tipc_node_stop_net(net); > rtnl_unlock(); > > pr_info("Left network mode\n"); > diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c index 234cb93..3566832 > 100644 > --- a/net/tipc/netlink.c > +++ b/net/tipc/netlink.c > @@ -134,6 +134,11 @@ static const struct genl_ops tipc_genl_v2_ops[] = { > .cmd = TIPC_NL_NAME_TABLE_GET, > .dumpit = tipc_nl_name_table_dump, > .policy = tipc_nl_policy, > + }, > + { > + .cmd = TIPC_NL_NODE_REMOVE, > + .doit = tipc_nl_node_rm, > + .policy = tipc_nl_policy, > } > }; > > diff --git a/net/tipc/node.c b/net/tipc/node.c index 6182d9d..31f40cc 100644 > --- a/net/tipc/node.c > +++ b/net/tipc/node.c > @@ -378,17 +378,21 @@ static void tipc_node_delete(struct tipc_node > *node) > kfree_rcu(node, rcu); > } > > -void tipc_node_stop(struct net *net) > +static void tipc_node_stop(struct tipc_node *node) { > + if (del_timer(&node->timer)) > + tipc_node_put(node); > + tipc_node_put(node); > +} > + > +void tipc_node_stop_net(struct net *net) > { > struct tipc_net *tn = net_generic(net, tipc_net_id); > struct tipc_node *node, *t_node; > > spin_lock_bh(&tn->node_list_lock); > - list_for_each_entry_safe(node, t_node, &tn->node_list, list) { > - if (del_timer(&node->timer)) > - tipc_node_put(node); > - tipc_node_put(node); > - } > + list_for_each_entry_safe(node, t_node, &tn->node_list, list) > + tipc_node_stop(node); > spin_unlock_bh(&tn->node_list_lock); > } > > @@ -1509,6 +1513,50 @@ discard: > kfree_skb(skb); > } > > +int tipc_nl_node_rm(struct sk_buff *skb, struct genl_info *info) { > + u32 addr; > + struct net *net = sock_net(skb->sk); > + struct nlattr *attrs[TIPC_NLA_NET_MAX + 1]; > + struct tipc_net *tn = net_generic(net, tipc_net_id); > + struct tipc_node *node; > + int err; > + > + /* We identify the node by its net */ > + if (!info->attrs[TIPC_NLA_NET]) > + return -EINVAL; > + > + err = nla_parse_nested(attrs, TIPC_NLA_NET_MAX, > + info->attrs[TIPC_NLA_NET], > + tipc_nl_net_policy); > + if (err) > + return err; > + > + if (!attrs[TIPC_NLA_NET_ADDR]) > + return -EINVAL; > + > + addr = nla_get_u32(attrs[TIPC_NLA_NET_ADDR]); > + > + spin_lock_bh(&tn->node_list_lock); > + list_for_each_entry_rcu(node, &tn->node_list, list) { > + if (node->addr != addr) > + continue; > + > + if (node->state == SELF_DOWN_PEER_DOWN || > + node->state == SELF_DOWN_PEER_LEAVING) { > + tipc_node_stop(node); > + > + spin_unlock_bh(&tn->node_list_lock); > + return 0; > + } > + spin_unlock_bh(&tn->node_list_lock); > + return -EBUSY; > + } > + spin_unlock_bh(&tn->node_list_lock); > + > + return -ENXIO; > +} > + > int tipc_nl_node_dump(struct sk_buff *skb, struct netlink_callback *cb) { > int err; > diff --git a/net/tipc/node.h b/net/tipc/node.h index f39d9d0..d6250ec > 100644 > --- a/net/tipc/node.h > +++ b/net/tipc/node.h > @@ -51,7 +51,7 @@ enum { > #define TIPC_NODE_CAPABILITIES TIPC_BCAST_SYNCH #define > INVALID_BEARER_ID -1 > > -void tipc_node_stop(struct net *net); > +void tipc_node_stop_net(struct net *net); > void tipc_node_check_dest(struct net *net, u32 onode, > struct tipc_bearer *bearer, > u16 capabilities, u32 signature, > @@ -75,5 +75,6 @@ int tipc_nl_node_dump_link(struct sk_buff *skb, struct > netlink_callback *cb); int tipc_nl_node_reset_link_stats(struct sk_buff *skb, > struct genl_info *info); int tipc_nl_node_get_link(struct sk_buff *skb, > struct > genl_info *info); int tipc_nl_node_set_link(struct sk_buff *skb, struct > genl_info *info); > +int tipc_nl_node_rm(struct sk_buff *skb, struct genl_info *info); > > #endif > -- > 2.1.4 ------------------------------------------------------------------------------ Go from Idea to Many App Stores Faster with Intel(R) XDK Give your users amazing mobile app experiences with Intel(R) XDK. Use one codebase in this all-in-one HTML5 development environment. Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs. http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140 _______________________________________________ tipc-discussion mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tipc-discussion
