X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fdecnet%2Fdn_rules.c;fp=net%2Fdecnet%2Fdn_rules.c;h=1060de70bc0cdea5fec0eb7a6afe317138aa57d7;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=6986be754ef284cb0f023e3d08c3c4321ad31af9;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c index 6986be754..1060de70b 100644 --- a/net/decnet/dn_rules.c +++ b/net/decnet/dn_rules.c @@ -13,6 +13,7 @@ * Changes: * */ +#include #include #include #include @@ -26,8 +27,6 @@ #include #include #include -#include -#include #include #include #include @@ -40,18 +39,18 @@ struct dn_fib_rule { - struct hlist_node r_hlist; + struct dn_fib_rule *r_next; atomic_t r_clntref; u32 r_preference; unsigned char r_table; unsigned char r_action; unsigned char r_dst_len; unsigned char r_src_len; - __le16 r_src; - __le16 r_srcmask; - __le16 r_dst; - __le16 r_dstmask; - __le16 r_srcmap; + dn_address r_src; + dn_address r_srcmask; + dn_address r_dst; + dn_address r_dstmask; + dn_address r_srcmap; u8 r_flags; #ifdef CONFIG_DECNET_ROUTE_FWMARK u32 r_fwmark; @@ -59,7 +58,6 @@ struct dn_fib_rule int r_ifindex; char r_ifname[IFNAMSIZ]; int r_dead; - struct rcu_head rcu; }; static struct dn_fib_rule default_rule = { @@ -69,17 +67,18 @@ static struct dn_fib_rule default_rule = { .r_action = RTN_UNICAST }; -static struct hlist_head dn_fib_rules; +static struct dn_fib_rule *dn_fib_rules = &default_rule; +static DEFINE_RWLOCK(dn_fib_rules_lock); + int dn_fib_rtm_delrule(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) { struct rtattr **rta = arg; struct rtmsg *rtm = NLMSG_DATA(nlh); - struct dn_fib_rule *r; - struct hlist_node *node; + struct dn_fib_rule *r, **rp; int err = -ESRCH; - hlist_for_each_entry(r, node, &dn_fib_rules, r_hlist) { + for(rp=&dn_fib_rules; (r=*rp) != NULL; rp = &r->r_next) { if ((!rta[RTA_SRC-1] || memcmp(RTA_DATA(rta[RTA_SRC-1]), &r->r_src, 2) == 0) && rtm->rtm_src_len == r->r_src_len && rtm->rtm_dst_len == r->r_dst_len && @@ -96,8 +95,10 @@ int dn_fib_rtm_delrule(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) if (r == &default_rule) break; - hlist_del_rcu(&r->r_hlist); + write_lock_bh(&dn_fib_rules_lock); + *rp = r->r_next; r->r_dead = 1; + write_unlock_bh(&dn_fib_rules_lock); dn_fib_rule_put(r); err = 0; break; @@ -107,17 +108,11 @@ int dn_fib_rtm_delrule(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) return err; } -static inline void dn_fib_rule_put_rcu(struct rcu_head *head) -{ - struct dn_fib_rule *r = container_of(head, struct dn_fib_rule, rcu); - kfree(r); -} - void dn_fib_rule_put(struct dn_fib_rule *r) { if (atomic_dec_and_test(&r->r_clntref)) { if (r->r_dead) - call_rcu(&r->rcu, dn_fib_rule_put_rcu); + kfree(r); else printk(KERN_DEBUG "Attempt to free alive dn_fib_rule\n"); } @@ -128,8 +123,7 @@ int dn_fib_rtm_newrule(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) { struct rtattr **rta = arg; struct rtmsg *rtm = NLMSG_DATA(nlh); - struct dn_fib_rule *r, *new_r, *last = NULL; - struct hlist_node *node = NULL; + struct dn_fib_rule *r, *new_r, **rp; unsigned char table_id; if (rtm->rtm_src_len > 16 || rtm->rtm_dst_len > 16) @@ -151,10 +145,10 @@ int dn_fib_rtm_newrule(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) } } - new_r = kzalloc(sizeof(*new_r), GFP_KERNEL); + new_r = kmalloc(sizeof(*new_r), GFP_KERNEL); if (!new_r) return -ENOMEM; - + memset(new_r, 0, sizeof(*new_r)); if (rta[RTA_SRC-1]) memcpy(&new_r->r_src, RTA_DATA(rta[RTA_SRC-1]), 2); if (rta[RTA_DST-1]) @@ -185,26 +179,27 @@ int dn_fib_rtm_newrule(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) } } - r = container_of(dn_fib_rules.first, struct dn_fib_rule, r_hlist); + rp = &dn_fib_rules; if (!new_r->r_preference) { - if (r && r->r_hlist.next != NULL) { - r = container_of(r->r_hlist.next, struct dn_fib_rule, r_hlist); + r = dn_fib_rules; + if (r && (r = r->r_next) != NULL) { + rp = &dn_fib_rules->r_next; if (r->r_preference) new_r->r_preference = r->r_preference - 1; } } - hlist_for_each_entry(r, node, &dn_fib_rules, r_hlist) { + while((r=*rp) != NULL) { if (r->r_preference > new_r->r_preference) break; - last = r; + rp = &r->r_next; } - atomic_inc(&new_r->r_clntref); - if (last) - hlist_add_after_rcu(&last->r_hlist, &new_r->r_hlist); - else - hlist_add_before_rcu(&new_r->r_hlist, &r->r_hlist); + new_r->r_next = r; + atomic_inc(&new_r->r_clntref); + write_lock_bh(&dn_fib_rules_lock); + *rp = new_r; + write_unlock_bh(&dn_fib_rules_lock); return 0; } @@ -213,14 +208,12 @@ int dn_fib_lookup(const struct flowi *flp, struct dn_fib_res *res) { struct dn_fib_rule *r, *policy; struct dn_fib_table *tb; - __le16 saddr = flp->fld_src; - __le16 daddr = flp->fld_dst; - struct hlist_node *node; + dn_address saddr = flp->fld_src; + dn_address daddr = flp->fld_dst; int err; - rcu_read_lock(); - - hlist_for_each_entry_rcu(r, node, &dn_fib_rules, r_hlist) { + read_lock(&dn_fib_rules_lock); + for(r = dn_fib_rules; r; r = r->r_next) { if (((saddr^r->r_src) & r->r_srcmask) || ((daddr^r->r_dst) & r->r_dstmask) || #ifdef CONFIG_DECNET_ROUTE_FWMARK @@ -235,14 +228,14 @@ int dn_fib_lookup(const struct flowi *flp, struct dn_fib_res *res) policy = r; break; case RTN_UNREACHABLE: - rcu_read_unlock(); + read_unlock(&dn_fib_rules_lock); return -ENETUNREACH; default: case RTN_BLACKHOLE: - rcu_read_unlock(); + read_unlock(&dn_fib_rules_lock); return -EINVAL; case RTN_PROHIBIT: - rcu_read_unlock(); + read_unlock(&dn_fib_rules_lock); return -EACCES; } @@ -253,20 +246,20 @@ int dn_fib_lookup(const struct flowi *flp, struct dn_fib_res *res) res->r = policy; if (policy) atomic_inc(&policy->r_clntref); - rcu_read_unlock(); + read_unlock(&dn_fib_rules_lock); return 0; } if (err < 0 && err != -EAGAIN) { - rcu_read_unlock(); + read_unlock(&dn_fib_rules_lock); return err; } } - rcu_read_unlock(); + read_unlock(&dn_fib_rules_lock); return -ESRCH; } -unsigned dnet_addr_type(__le16 addr) +unsigned dnet_addr_type(__u16 addr) { struct flowi fl = { .nl_u = { .dn_u = { .daddr = addr } } }; struct dn_fib_res res; @@ -284,7 +277,7 @@ unsigned dnet_addr_type(__le16 addr) return ret; } -__le16 dn_fib_rules_policy(__le16 saddr, struct dn_fib_res *res, unsigned *flags) +__u16 dn_fib_rules_policy(__u16 saddr, struct dn_fib_res *res, unsigned *flags) { struct dn_fib_rule *r = res->r; @@ -304,23 +297,27 @@ __le16 dn_fib_rules_policy(__le16 saddr, struct dn_fib_res *res, unsigned *flags static void dn_fib_rules_detach(struct net_device *dev) { - struct hlist_node *node; struct dn_fib_rule *r; - hlist_for_each_entry(r, node, &dn_fib_rules, r_hlist) { - if (r->r_ifindex == dev->ifindex) + for(r = dn_fib_rules; r; r = r->r_next) { + if (r->r_ifindex == dev->ifindex) { + write_lock_bh(&dn_fib_rules_lock); r->r_ifindex = -1; + write_unlock_bh(&dn_fib_rules_lock); + } } } static void dn_fib_rules_attach(struct net_device *dev) { - struct hlist_node *node; struct dn_fib_rule *r; - hlist_for_each_entry(r, node, &dn_fib_rules, r_hlist) { - if (r->r_ifindex == -1 && strcmp(dev->name, r->r_ifname) == 0) + for(r = dn_fib_rules; r; r = r->r_next) { + if (r->r_ifindex == -1 && strcmp(dev->name, r->r_ifname) == 0) { + write_lock_bh(&dn_fib_rules_lock); r->r_ifindex = dev->ifindex; + write_unlock_bh(&dn_fib_rules_lock); + } } } @@ -390,21 +387,18 @@ rtattr_failure: int dn_fib_dump_rules(struct sk_buff *skb, struct netlink_callback *cb) { - int idx = 0; + int idx; int s_idx = cb->args[0]; struct dn_fib_rule *r; - struct hlist_node *node; - rcu_read_lock(); - hlist_for_each_entry(r, node, &dn_fib_rules, r_hlist) { + read_lock(&dn_fib_rules_lock); + for(r = dn_fib_rules, idx = 0; r; r = r->r_next, idx++) { if (idx < s_idx) - goto next; + continue; if (dn_fib_fill_rule(skb, r, cb, NLM_F_MULTI) < 0) break; -next: - idx++; } - rcu_read_unlock(); + read_unlock(&dn_fib_rules_lock); cb->args[0] = idx; return skb->len; @@ -412,8 +406,6 @@ next: void __init dn_fib_rules_init(void) { - INIT_HLIST_HEAD(&dn_fib_rules); - hlist_add_head(&default_rule.r_hlist, &dn_fib_rules); register_netdevice_notifier(&dn_fib_rules_notifier); }