aboutsummaryrefslogtreecommitdiffstats
path: root/net/decnet
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
commitc71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch)
treeecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /net/decnet
parentea53c912f8a86a8567697115b6a0d8152beee5c8 (diff)
parent6a00f206debf8a5c8899055726ad127dbeeed098 (diff)
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts: litmus/sched_cedf.c
Diffstat (limited to 'net/decnet')
-rw-r--r--net/decnet/af_decnet.c26
-rw-r--r--net/decnet/dn_dev.c101
-rw-r--r--net/decnet/dn_fib.c29
-rw-r--r--net/decnet/dn_neigh.c15
-rw-r--r--net/decnet/dn_nsp_out.c24
-rw-r--r--net/decnet/dn_route.c423
-rw-r--r--net/decnet/dn_rules.c17
-rw-r--r--net/decnet/dn_table.c11
-rw-r--r--net/decnet/sysctl_net_decnet.c4
9 files changed, 356 insertions, 294 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index d6b93d19790f..ea3b6ee21fc9 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -155,7 +155,7 @@ static const struct proto_ops dn_proto_ops;
155static DEFINE_RWLOCK(dn_hash_lock); 155static DEFINE_RWLOCK(dn_hash_lock);
156static struct hlist_head dn_sk_hash[DN_SK_HASH_SIZE]; 156static struct hlist_head dn_sk_hash[DN_SK_HASH_SIZE];
157static struct hlist_head dn_wild_sk; 157static struct hlist_head dn_wild_sk;
158static atomic_t decnet_memory_allocated; 158static atomic_long_t decnet_memory_allocated;
159 159
160static int __dn_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen, int flags); 160static int __dn_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen, int flags);
161static int __dn_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen, int flags); 161static int __dn_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen, int flags);
@@ -829,7 +829,7 @@ static int dn_confirm_accept(struct sock *sk, long *timeo, gfp_t allocation)
829 return -EINVAL; 829 return -EINVAL;
830 830
831 scp->state = DN_CC; 831 scp->state = DN_CC;
832 scp->segsize_loc = dst_metric(__sk_dst_get(sk), RTAX_ADVMSS); 832 scp->segsize_loc = dst_metric_advmss(__sk_dst_get(sk));
833 dn_send_conn_conf(sk, allocation); 833 dn_send_conn_conf(sk, allocation);
834 834
835 prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); 835 prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
@@ -908,7 +908,7 @@ static int __dn_connect(struct sock *sk, struct sockaddr_dn *addr, int addrlen,
908 struct socket *sock = sk->sk_socket; 908 struct socket *sock = sk->sk_socket;
909 struct dn_scp *scp = DN_SK(sk); 909 struct dn_scp *scp = DN_SK(sk);
910 int err = -EISCONN; 910 int err = -EISCONN;
911 struct flowi fl; 911 struct flowidn fld;
912 912
913 if (sock->state == SS_CONNECTED) 913 if (sock->state == SS_CONNECTED)
914 goto out; 914 goto out;
@@ -947,18 +947,18 @@ static int __dn_connect(struct sock *sk, struct sockaddr_dn *addr, int addrlen,
947 memcpy(&scp->peer, addr, sizeof(struct sockaddr_dn)); 947 memcpy(&scp->peer, addr, sizeof(struct sockaddr_dn));
948 948
949 err = -EHOSTUNREACH; 949 err = -EHOSTUNREACH;
950 memset(&fl, 0, sizeof(fl)); 950 memset(&fld, 0, sizeof(fld));
951 fl.oif = sk->sk_bound_dev_if; 951 fld.flowidn_oif = sk->sk_bound_dev_if;
952 fl.fld_dst = dn_saddr2dn(&scp->peer); 952 fld.daddr = dn_saddr2dn(&scp->peer);
953 fl.fld_src = dn_saddr2dn(&scp->addr); 953 fld.saddr = dn_saddr2dn(&scp->addr);
954 dn_sk_ports_copy(&fl, scp); 954 dn_sk_ports_copy(&fld, scp);
955 fl.proto = DNPROTO_NSP; 955 fld.flowidn_proto = DNPROTO_NSP;
956 if (dn_route_output_sock(&sk->sk_dst_cache, &fl, sk, flags) < 0) 956 if (dn_route_output_sock(&sk->sk_dst_cache, &fld, sk, flags) < 0)
957 goto out; 957 goto out;
958 sk->sk_route_caps = sk->sk_dst_cache->dev->features; 958 sk->sk_route_caps = sk->sk_dst_cache->dev->features;
959 sock->state = SS_CONNECTING; 959 sock->state = SS_CONNECTING;
960 scp->state = DN_CI; 960 scp->state = DN_CI;
961 scp->segsize_loc = dst_metric(sk->sk_dst_cache, RTAX_ADVMSS); 961 scp->segsize_loc = dst_metric_advmss(sk->sk_dst_cache);
962 962
963 dn_nsp_send_conninit(sk, NSP_CI); 963 dn_nsp_send_conninit(sk, NSP_CI);
964 err = -EINPROGRESS; 964 err = -EINPROGRESS;
@@ -1556,6 +1556,8 @@ static int __dn_getsockopt(struct socket *sock, int level,int optname, char __us
1556 if (r_len > sizeof(struct linkinfo_dn)) 1556 if (r_len > sizeof(struct linkinfo_dn))
1557 r_len = sizeof(struct linkinfo_dn); 1557 r_len = sizeof(struct linkinfo_dn);
1558 1558
1559 memset(&link, 0, sizeof(link));
1560
1559 switch(sock->state) { 1561 switch(sock->state) {
1560 case SS_CONNECTING: 1562 case SS_CONNECTING:
1561 link.idn_linkstate = LL_CONNECTING; 1563 link.idn_linkstate = LL_CONNECTING;
@@ -1848,7 +1850,7 @@ unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu)
1848{ 1850{
1849 unsigned mss = 230 - DN_MAX_NSP_DATA_HEADER; 1851 unsigned mss = 230 - DN_MAX_NSP_DATA_HEADER;
1850 if (dev) { 1852 if (dev) {
1851 struct dn_dev *dn_db = dev->dn_ptr; 1853 struct dn_dev *dn_db = rcu_dereference_raw(dev->dn_ptr);
1852 mtu -= LL_RESERVED_SPACE(dev); 1854 mtu -= LL_RESERVED_SPACE(dev);
1853 if (dn_db->use_long) 1855 if (dn_db->use_long)
1854 mtu -= 21; 1856 mtu -= 21;
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 4c409b46aa35..cf26ac74a188 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -267,7 +267,7 @@ static int dn_forwarding_proc(ctl_table *table, int write,
267 if (table->extra1 == NULL) 267 if (table->extra1 == NULL)
268 return -EINVAL; 268 return -EINVAL;
269 269
270 dn_db = dev->dn_ptr; 270 dn_db = rcu_dereference_raw(dev->dn_ptr);
271 old = dn_db->parms.forwarding; 271 old = dn_db->parms.forwarding;
272 272
273 err = proc_dointvec(table, write, buffer, lenp, ppos); 273 err = proc_dointvec(table, write, buffer, lenp, ppos);
@@ -332,14 +332,14 @@ static struct dn_ifaddr *dn_dev_alloc_ifa(void)
332 return ifa; 332 return ifa;
333} 333}
334 334
335static __inline__ void dn_dev_free_ifa(struct dn_ifaddr *ifa) 335static void dn_dev_free_ifa(struct dn_ifaddr *ifa)
336{ 336{
337 kfree(ifa); 337 kfree_rcu(ifa, rcu);
338} 338}
339 339
340static void dn_dev_del_ifa(struct dn_dev *dn_db, struct dn_ifaddr **ifap, int destroy) 340static void dn_dev_del_ifa(struct dn_dev *dn_db, struct dn_ifaddr __rcu **ifap, int destroy)
341{ 341{
342 struct dn_ifaddr *ifa1 = *ifap; 342 struct dn_ifaddr *ifa1 = rtnl_dereference(*ifap);
343 unsigned char mac_addr[6]; 343 unsigned char mac_addr[6];
344 struct net_device *dev = dn_db->dev; 344 struct net_device *dev = dn_db->dev;
345 345
@@ -373,7 +373,9 @@ static int dn_dev_insert_ifa(struct dn_dev *dn_db, struct dn_ifaddr *ifa)
373 ASSERT_RTNL(); 373 ASSERT_RTNL();
374 374
375 /* Check for duplicates */ 375 /* Check for duplicates */
376 for(ifa1 = dn_db->ifa_list; ifa1; ifa1 = ifa1->ifa_next) { 376 for (ifa1 = rtnl_dereference(dn_db->ifa_list);
377 ifa1 != NULL;
378 ifa1 = rtnl_dereference(ifa1->ifa_next)) {
377 if (ifa1->ifa_local == ifa->ifa_local) 379 if (ifa1->ifa_local == ifa->ifa_local)
378 return -EEXIST; 380 return -EEXIST;
379 } 381 }
@@ -386,7 +388,7 @@ static int dn_dev_insert_ifa(struct dn_dev *dn_db, struct dn_ifaddr *ifa)
386 } 388 }
387 389
388 ifa->ifa_next = dn_db->ifa_list; 390 ifa->ifa_next = dn_db->ifa_list;
389 dn_db->ifa_list = ifa; 391 rcu_assign_pointer(dn_db->ifa_list, ifa);
390 392
391 dn_ifaddr_notify(RTM_NEWADDR, ifa); 393 dn_ifaddr_notify(RTM_NEWADDR, ifa);
392 blocking_notifier_call_chain(&dnaddr_chain, NETDEV_UP, ifa); 394 blocking_notifier_call_chain(&dnaddr_chain, NETDEV_UP, ifa);
@@ -396,7 +398,7 @@ static int dn_dev_insert_ifa(struct dn_dev *dn_db, struct dn_ifaddr *ifa)
396 398
397static int dn_dev_set_ifa(struct net_device *dev, struct dn_ifaddr *ifa) 399static int dn_dev_set_ifa(struct net_device *dev, struct dn_ifaddr *ifa)
398{ 400{
399 struct dn_dev *dn_db = dev->dn_ptr; 401 struct dn_dev *dn_db = rtnl_dereference(dev->dn_ptr);
400 int rv; 402 int rv;
401 403
402 if (dn_db == NULL) { 404 if (dn_db == NULL) {
@@ -425,7 +427,8 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
425 struct sockaddr_dn *sdn = (struct sockaddr_dn *)&ifr->ifr_addr; 427 struct sockaddr_dn *sdn = (struct sockaddr_dn *)&ifr->ifr_addr;
426 struct dn_dev *dn_db; 428 struct dn_dev *dn_db;
427 struct net_device *dev; 429 struct net_device *dev;
428 struct dn_ifaddr *ifa = NULL, **ifap = NULL; 430 struct dn_ifaddr *ifa = NULL;
431 struct dn_ifaddr __rcu **ifap = NULL;
429 int ret = 0; 432 int ret = 0;
430 433
431 if (copy_from_user(ifr, arg, DN_IFREQ_SIZE)) 434 if (copy_from_user(ifr, arg, DN_IFREQ_SIZE))
@@ -454,8 +457,10 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
454 goto done; 457 goto done;
455 } 458 }
456 459
457 if ((dn_db = dev->dn_ptr) != NULL) { 460 if ((dn_db = rtnl_dereference(dev->dn_ptr)) != NULL) {
458 for (ifap = &dn_db->ifa_list; (ifa=*ifap) != NULL; ifap = &ifa->ifa_next) 461 for (ifap = &dn_db->ifa_list;
462 (ifa = rtnl_dereference(*ifap)) != NULL;
463 ifap = &ifa->ifa_next)
459 if (strcmp(ifr->ifr_name, ifa->ifa_label) == 0) 464 if (strcmp(ifr->ifr_name, ifa->ifa_label) == 0)
460 break; 465 break;
461 } 466 }
@@ -558,7 +563,7 @@ static struct dn_dev *dn_dev_by_index(int ifindex)
558 563
559 dev = __dev_get_by_index(&init_net, ifindex); 564 dev = __dev_get_by_index(&init_net, ifindex);
560 if (dev) 565 if (dev)
561 dn_dev = dev->dn_ptr; 566 dn_dev = rtnl_dereference(dev->dn_ptr);
562 567
563 return dn_dev; 568 return dn_dev;
564} 569}
@@ -576,7 +581,8 @@ static int dn_nl_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
576 struct nlattr *tb[IFA_MAX+1]; 581 struct nlattr *tb[IFA_MAX+1];
577 struct dn_dev *dn_db; 582 struct dn_dev *dn_db;
578 struct ifaddrmsg *ifm; 583 struct ifaddrmsg *ifm;
579 struct dn_ifaddr *ifa, **ifap; 584 struct dn_ifaddr *ifa;
585 struct dn_ifaddr __rcu **ifap;
580 int err = -EINVAL; 586 int err = -EINVAL;
581 587
582 if (!net_eq(net, &init_net)) 588 if (!net_eq(net, &init_net))
@@ -592,7 +598,9 @@ static int dn_nl_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
592 goto errout; 598 goto errout;
593 599
594 err = -EADDRNOTAVAIL; 600 err = -EADDRNOTAVAIL;
595 for (ifap = &dn_db->ifa_list; (ifa = *ifap); ifap = &ifa->ifa_next) { 601 for (ifap = &dn_db->ifa_list;
602 (ifa = rtnl_dereference(*ifap)) != NULL;
603 ifap = &ifa->ifa_next) {
596 if (tb[IFA_LOCAL] && 604 if (tb[IFA_LOCAL] &&
597 nla_memcmp(tb[IFA_LOCAL], &ifa->ifa_local, 2)) 605 nla_memcmp(tb[IFA_LOCAL], &ifa->ifa_local, 2))
598 continue; 606 continue;
@@ -632,7 +640,7 @@ static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
632 if ((dev = __dev_get_by_index(&init_net, ifm->ifa_index)) == NULL) 640 if ((dev = __dev_get_by_index(&init_net, ifm->ifa_index)) == NULL)
633 return -ENODEV; 641 return -ENODEV;
634 642
635 if ((dn_db = dev->dn_ptr) == NULL) { 643 if ((dn_db = rtnl_dereference(dev->dn_ptr)) == NULL) {
636 dn_db = dn_dev_create(dev, &err); 644 dn_db = dn_dev_create(dev, &err);
637 if (!dn_db) 645 if (!dn_db)
638 return err; 646 return err;
@@ -739,7 +747,8 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
739 skip_naddr = cb->args[1]; 747 skip_naddr = cb->args[1];
740 748
741 idx = 0; 749 idx = 0;
742 for_each_netdev(&init_net, dev) { 750 rcu_read_lock();
751 for_each_netdev_rcu(&init_net, dev) {
743 if (idx < skip_ndevs) 752 if (idx < skip_ndevs)
744 goto cont; 753 goto cont;
745 else if (idx > skip_ndevs) { 754 else if (idx > skip_ndevs) {
@@ -748,11 +757,11 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
748 skip_naddr = 0; 757 skip_naddr = 0;
749 } 758 }
750 759
751 if ((dn_db = dev->dn_ptr) == NULL) 760 if ((dn_db = rcu_dereference(dev->dn_ptr)) == NULL)
752 goto cont; 761 goto cont;
753 762
754 for (ifa = dn_db->ifa_list, dn_idx = 0; ifa; 763 for (ifa = rcu_dereference(dn_db->ifa_list), dn_idx = 0; ifa;
755 ifa = ifa->ifa_next, dn_idx++) { 764 ifa = rcu_dereference(ifa->ifa_next), dn_idx++) {
756 if (dn_idx < skip_naddr) 765 if (dn_idx < skip_naddr)
757 continue; 766 continue;
758 767
@@ -765,6 +774,7 @@ cont:
765 idx++; 774 idx++;
766 } 775 }
767done: 776done:
777 rcu_read_unlock();
768 cb->args[0] = idx; 778 cb->args[0] = idx;
769 cb->args[1] = dn_idx; 779 cb->args[1] = dn_idx;
770 780
@@ -773,21 +783,22 @@ done:
773 783
774static int dn_dev_get_first(struct net_device *dev, __le16 *addr) 784static int dn_dev_get_first(struct net_device *dev, __le16 *addr)
775{ 785{
776 struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr; 786 struct dn_dev *dn_db;
777 struct dn_ifaddr *ifa; 787 struct dn_ifaddr *ifa;
778 int rv = -ENODEV; 788 int rv = -ENODEV;
779 789
790 rcu_read_lock();
791 dn_db = rcu_dereference(dev->dn_ptr);
780 if (dn_db == NULL) 792 if (dn_db == NULL)
781 goto out; 793 goto out;
782 794
783 rtnl_lock(); 795 ifa = rcu_dereference(dn_db->ifa_list);
784 ifa = dn_db->ifa_list;
785 if (ifa != NULL) { 796 if (ifa != NULL) {
786 *addr = ifa->ifa_local; 797 *addr = ifa->ifa_local;
787 rv = 0; 798 rv = 0;
788 } 799 }
789 rtnl_unlock();
790out: 800out:
801 rcu_read_unlock();
791 return rv; 802 return rv;
792} 803}
793 804
@@ -823,7 +834,7 @@ static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa)
823 struct endnode_hello_message *msg; 834 struct endnode_hello_message *msg;
824 struct sk_buff *skb = NULL; 835 struct sk_buff *skb = NULL;
825 __le16 *pktlen; 836 __le16 *pktlen;
826 struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr; 837 struct dn_dev *dn_db = rcu_dereference_raw(dev->dn_ptr);
827 838
828 if ((skb = dn_alloc_skb(NULL, sizeof(*msg), GFP_ATOMIC)) == NULL) 839 if ((skb = dn_alloc_skb(NULL, sizeof(*msg), GFP_ATOMIC)) == NULL)
829 return; 840 return;
@@ -889,7 +900,7 @@ static int dn_am_i_a_router(struct dn_neigh *dn, struct dn_dev *dn_db, struct dn
889static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa) 900static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)
890{ 901{
891 int n; 902 int n;
892 struct dn_dev *dn_db = dev->dn_ptr; 903 struct dn_dev *dn_db = rcu_dereference_raw(dev->dn_ptr);
893 struct dn_neigh *dn = (struct dn_neigh *)dn_db->router; 904 struct dn_neigh *dn = (struct dn_neigh *)dn_db->router;
894 struct sk_buff *skb; 905 struct sk_buff *skb;
895 size_t size; 906 size_t size;
@@ -960,7 +971,7 @@ static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)
960 971
961static void dn_send_brd_hello(struct net_device *dev, struct dn_ifaddr *ifa) 972static void dn_send_brd_hello(struct net_device *dev, struct dn_ifaddr *ifa)
962{ 973{
963 struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr; 974 struct dn_dev *dn_db = rcu_dereference_raw(dev->dn_ptr);
964 975
965 if (dn_db->parms.forwarding == 0) 976 if (dn_db->parms.forwarding == 0)
966 dn_send_endnode_hello(dev, ifa); 977 dn_send_endnode_hello(dev, ifa);
@@ -998,7 +1009,7 @@ static void dn_send_ptp_hello(struct net_device *dev, struct dn_ifaddr *ifa)
998 1009
999static int dn_eth_up(struct net_device *dev) 1010static int dn_eth_up(struct net_device *dev)
1000{ 1011{
1001 struct dn_dev *dn_db = dev->dn_ptr; 1012 struct dn_dev *dn_db = rcu_dereference_raw(dev->dn_ptr);
1002 1013
1003 if (dn_db->parms.forwarding == 0) 1014 if (dn_db->parms.forwarding == 0)
1004 dev_mc_add(dev, dn_rt_all_end_mcast); 1015 dev_mc_add(dev, dn_rt_all_end_mcast);
@@ -1012,7 +1023,7 @@ static int dn_eth_up(struct net_device *dev)
1012 1023
1013static void dn_eth_down(struct net_device *dev) 1024static void dn_eth_down(struct net_device *dev)
1014{ 1025{
1015 struct dn_dev *dn_db = dev->dn_ptr; 1026 struct dn_dev *dn_db = rcu_dereference_raw(dev->dn_ptr);
1016 1027
1017 if (dn_db->parms.forwarding == 0) 1028 if (dn_db->parms.forwarding == 0)
1018 dev_mc_del(dev, dn_rt_all_end_mcast); 1029 dev_mc_del(dev, dn_rt_all_end_mcast);
@@ -1025,12 +1036,16 @@ static void dn_dev_set_timer(struct net_device *dev);
1025static void dn_dev_timer_func(unsigned long arg) 1036static void dn_dev_timer_func(unsigned long arg)
1026{ 1037{
1027 struct net_device *dev = (struct net_device *)arg; 1038 struct net_device *dev = (struct net_device *)arg;
1028 struct dn_dev *dn_db = dev->dn_ptr; 1039 struct dn_dev *dn_db;
1029 struct dn_ifaddr *ifa; 1040 struct dn_ifaddr *ifa;
1030 1041
1042 rcu_read_lock();
1043 dn_db = rcu_dereference(dev->dn_ptr);
1031 if (dn_db->t3 <= dn_db->parms.t2) { 1044 if (dn_db->t3 <= dn_db->parms.t2) {
1032 if (dn_db->parms.timer3) { 1045 if (dn_db->parms.timer3) {
1033 for(ifa = dn_db->ifa_list; ifa; ifa = ifa->ifa_next) { 1046 for (ifa = rcu_dereference(dn_db->ifa_list);
1047 ifa;
1048 ifa = rcu_dereference(ifa->ifa_next)) {
1034 if (!(ifa->ifa_flags & IFA_F_SECONDARY)) 1049 if (!(ifa->ifa_flags & IFA_F_SECONDARY))
1035 dn_db->parms.timer3(dev, ifa); 1050 dn_db->parms.timer3(dev, ifa);
1036 } 1051 }
@@ -1039,13 +1054,13 @@ static void dn_dev_timer_func(unsigned long arg)
1039 } else { 1054 } else {
1040 dn_db->t3 -= dn_db->parms.t2; 1055 dn_db->t3 -= dn_db->parms.t2;
1041 } 1056 }
1042 1057 rcu_read_unlock();
1043 dn_dev_set_timer(dev); 1058 dn_dev_set_timer(dev);
1044} 1059}
1045 1060
1046static void dn_dev_set_timer(struct net_device *dev) 1061static void dn_dev_set_timer(struct net_device *dev)
1047{ 1062{
1048 struct dn_dev *dn_db = dev->dn_ptr; 1063 struct dn_dev *dn_db = rcu_dereference_raw(dev->dn_ptr);
1049 1064
1050 if (dn_db->parms.t2 > dn_db->parms.t3) 1065 if (dn_db->parms.t2 > dn_db->parms.t3)
1051 dn_db->parms.t2 = dn_db->parms.t3; 1066 dn_db->parms.t2 = dn_db->parms.t3;
@@ -1077,8 +1092,8 @@ static struct dn_dev *dn_dev_create(struct net_device *dev, int *err)
1077 return NULL; 1092 return NULL;
1078 1093
1079 memcpy(&dn_db->parms, p, sizeof(struct dn_dev_parms)); 1094 memcpy(&dn_db->parms, p, sizeof(struct dn_dev_parms));
1080 smp_wmb(); 1095
1081 dev->dn_ptr = dn_db; 1096 rcu_assign_pointer(dev->dn_ptr, dn_db);
1082 dn_db->dev = dev; 1097 dn_db->dev = dev;
1083 init_timer(&dn_db->timer); 1098 init_timer(&dn_db->timer);
1084 1099
@@ -1086,7 +1101,7 @@ static struct dn_dev *dn_dev_create(struct net_device *dev, int *err)
1086 1101
1087 dn_db->neigh_parms = neigh_parms_alloc(dev, &dn_neigh_table); 1102 dn_db->neigh_parms = neigh_parms_alloc(dev, &dn_neigh_table);
1088 if (!dn_db->neigh_parms) { 1103 if (!dn_db->neigh_parms) {
1089 dev->dn_ptr = NULL; 1104 rcu_assign_pointer(dev->dn_ptr, NULL);
1090 kfree(dn_db); 1105 kfree(dn_db);
1091 return NULL; 1106 return NULL;
1092 } 1107 }
@@ -1112,7 +1127,7 @@ static struct dn_dev *dn_dev_create(struct net_device *dev, int *err)
1112/* 1127/*
1113 * This processes a device up event. We only start up 1128 * This processes a device up event. We only start up
1114 * the loopback device & ethernet devices with correct 1129 * the loopback device & ethernet devices with correct
1115 * MAC addreses automatically. Others must be started 1130 * MAC addresses automatically. Others must be started
1116 * specifically. 1131 * specifically.
1117 * 1132 *
1118 * FIXME: How should we configure the loopback address ? If we could dispense 1133 * FIXME: How should we configure the loopback address ? If we could dispense
@@ -1125,7 +1140,7 @@ void dn_dev_up(struct net_device *dev)
1125 struct dn_ifaddr *ifa; 1140 struct dn_ifaddr *ifa;
1126 __le16 addr = decnet_address; 1141 __le16 addr = decnet_address;
1127 int maybe_default = 0; 1142 int maybe_default = 0;
1128 struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr; 1143 struct dn_dev *dn_db = rtnl_dereference(dev->dn_ptr);
1129 1144
1130 if ((dev->type != ARPHRD_ETHER) && (dev->type != ARPHRD_LOOPBACK)) 1145 if ((dev->type != ARPHRD_ETHER) && (dev->type != ARPHRD_LOOPBACK))
1131 return; 1146 return;
@@ -1176,7 +1191,7 @@ void dn_dev_up(struct net_device *dev)
1176 1191
1177static void dn_dev_delete(struct net_device *dev) 1192static void dn_dev_delete(struct net_device *dev)
1178{ 1193{
1179 struct dn_dev *dn_db = dev->dn_ptr; 1194 struct dn_dev *dn_db = rtnl_dereference(dev->dn_ptr);
1180 1195
1181 if (dn_db == NULL) 1196 if (dn_db == NULL)
1182 return; 1197 return;
@@ -1204,13 +1219,13 @@ static void dn_dev_delete(struct net_device *dev)
1204 1219
1205void dn_dev_down(struct net_device *dev) 1220void dn_dev_down(struct net_device *dev)
1206{ 1221{
1207 struct dn_dev *dn_db = dev->dn_ptr; 1222 struct dn_dev *dn_db = rtnl_dereference(dev->dn_ptr);
1208 struct dn_ifaddr *ifa; 1223 struct dn_ifaddr *ifa;
1209 1224
1210 if (dn_db == NULL) 1225 if (dn_db == NULL)
1211 return; 1226 return;
1212 1227
1213 while((ifa = dn_db->ifa_list) != NULL) { 1228 while ((ifa = rtnl_dereference(dn_db->ifa_list)) != NULL) {
1214 dn_dev_del_ifa(dn_db, &dn_db->ifa_list, 0); 1229 dn_dev_del_ifa(dn_db, &dn_db->ifa_list, 0);
1215 dn_dev_free_ifa(ifa); 1230 dn_dev_free_ifa(ifa);
1216 } 1231 }
@@ -1270,7 +1285,7 @@ static inline int is_dn_dev(struct net_device *dev)
1270} 1285}
1271 1286
1272static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos) 1287static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos)
1273 __acquires(rcu) 1288 __acquires(RCU)
1274{ 1289{
1275 int i; 1290 int i;
1276 struct net_device *dev; 1291 struct net_device *dev;
@@ -1313,7 +1328,7 @@ static void *dn_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
1313} 1328}
1314 1329
1315static void dn_dev_seq_stop(struct seq_file *seq, void *v) 1330static void dn_dev_seq_stop(struct seq_file *seq, void *v)
1316 __releases(rcu) 1331 __releases(RCU)
1317{ 1332{
1318 rcu_read_unlock(); 1333 rcu_read_unlock();
1319} 1334}
@@ -1340,7 +1355,7 @@ static int dn_dev_seq_show(struct seq_file *seq, void *v)
1340 struct net_device *dev = v; 1355 struct net_device *dev = v;
1341 char peer_buf[DN_ASCBUF_LEN]; 1356 char peer_buf[DN_ASCBUF_LEN];
1342 char router_buf[DN_ASCBUF_LEN]; 1357 char router_buf[DN_ASCBUF_LEN];
1343 struct dn_dev *dn_db = dev->dn_ptr; 1358 struct dn_dev *dn_db = rcu_dereference(dev->dn_ptr);
1344 1359
1345 seq_printf(seq, "%-8s %1s %04u %04u %04lu %04lu" 1360 seq_printf(seq, "%-8s %1s %04u %04u %04lu %04lu"
1346 " %04hu %03d %02x %-10s %-7s %-7s\n", 1361 " %04hu %03d %02x %-10s %-7s %-7s\n",
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index 4ab96c15166d..1c74ed36ce8f 100644
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -201,7 +201,7 @@ static int dn_fib_check_nh(const struct rtmsg *r, struct dn_fib_info *fi, struct
201 int err; 201 int err;
202 202
203 if (nh->nh_gw) { 203 if (nh->nh_gw) {
204 struct flowi fl; 204 struct flowidn fld;
205 struct dn_fib_res res; 205 struct dn_fib_res res;
206 206
207 if (nh->nh_flags&RTNH_F_ONLINK) { 207 if (nh->nh_flags&RTNH_F_ONLINK) {
@@ -221,15 +221,15 @@ static int dn_fib_check_nh(const struct rtmsg *r, struct dn_fib_info *fi, struct
221 return 0; 221 return 0;
222 } 222 }
223 223
224 memset(&fl, 0, sizeof(fl)); 224 memset(&fld, 0, sizeof(fld));
225 fl.fld_dst = nh->nh_gw; 225 fld.daddr = nh->nh_gw;
226 fl.oif = nh->nh_oif; 226 fld.flowidn_oif = nh->nh_oif;
227 fl.fld_scope = r->rtm_scope + 1; 227 fld.flowidn_scope = r->rtm_scope + 1;
228 228
229 if (fl.fld_scope < RT_SCOPE_LINK) 229 if (fld.flowidn_scope < RT_SCOPE_LINK)
230 fl.fld_scope = RT_SCOPE_LINK; 230 fld.flowidn_scope = RT_SCOPE_LINK;
231 231
232 if ((err = dn_fib_lookup(&fl, &res)) != 0) 232 if ((err = dn_fib_lookup(&fld, &res)) != 0)
233 return err; 233 return err;
234 234
235 err = -EINVAL; 235 err = -EINVAL;
@@ -404,7 +404,7 @@ failure:
404 return NULL; 404 return NULL;
405} 405}
406 406
407int dn_fib_semantic_match(int type, struct dn_fib_info *fi, const struct flowi *fl, struct dn_fib_res *res) 407int dn_fib_semantic_match(int type, struct dn_fib_info *fi, const struct flowidn *fld, struct dn_fib_res *res)
408{ 408{
409 int err = dn_fib_props[type].error; 409 int err = dn_fib_props[type].error;
410 410
@@ -424,7 +424,8 @@ int dn_fib_semantic_match(int type, struct dn_fib_info *fi, const struct flowi *
424 for_nexthops(fi) { 424 for_nexthops(fi) {
425 if (nh->nh_flags & RTNH_F_DEAD) 425 if (nh->nh_flags & RTNH_F_DEAD)
426 continue; 426 continue;
427 if (!fl->oif || fl->oif == nh->nh_oif) 427 if (!fld->flowidn_oif ||
428 fld->flowidn_oif == nh->nh_oif)
428 break; 429 break;
429 } 430 }
430 if (nhsel < fi->fib_nhs) { 431 if (nhsel < fi->fib_nhs) {
@@ -445,7 +446,7 @@ int dn_fib_semantic_match(int type, struct dn_fib_info *fi, const struct flowi *
445 return err; 446 return err;
446} 447}
447 448
448void dn_fib_select_multipath(const struct flowi *fl, struct dn_fib_res *res) 449void dn_fib_select_multipath(const struct flowidn *fld, struct dn_fib_res *res)
449{ 450{
450 struct dn_fib_info *fi = res->fi; 451 struct dn_fib_info *fi = res->fi;
451 int w; 452 int w;
@@ -610,10 +611,12 @@ static void dn_fib_del_ifaddr(struct dn_ifaddr *ifa)
610 /* Scan device list */ 611 /* Scan device list */
611 rcu_read_lock(); 612 rcu_read_lock();
612 for_each_netdev_rcu(&init_net, dev) { 613 for_each_netdev_rcu(&init_net, dev) {
613 dn_db = dev->dn_ptr; 614 dn_db = rcu_dereference(dev->dn_ptr);
614 if (dn_db == NULL) 615 if (dn_db == NULL)
615 continue; 616 continue;
616 for(ifa2 = dn_db->ifa_list; ifa2; ifa2 = ifa2->ifa_next) { 617 for (ifa2 = rcu_dereference(dn_db->ifa_list);
618 ifa2 != NULL;
619 ifa2 = rcu_dereference(ifa2->ifa_next)) {
617 if (ifa2->ifa_local == ifa->ifa_local) { 620 if (ifa2->ifa_local == ifa->ifa_local) {
618 found_it = 1; 621 found_it = 1;
619 break; 622 break;
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index 0363bb95cc7d..602dade7e9a3 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -48,7 +48,6 @@
48#include <net/dn_neigh.h> 48#include <net/dn_neigh.h>
49#include <net/dn_route.h> 49#include <net/dn_route.h>
50 50
51static u32 dn_neigh_hash(const void *pkey, const struct net_device *dev);
52static int dn_neigh_construct(struct neighbour *); 51static int dn_neigh_construct(struct neighbour *);
53static void dn_long_error_report(struct neighbour *, struct sk_buff *); 52static void dn_long_error_report(struct neighbour *, struct sk_buff *);
54static void dn_short_error_report(struct neighbour *, struct sk_buff *); 53static void dn_short_error_report(struct neighbour *, struct sk_buff *);
@@ -93,6 +92,13 @@ static const struct neigh_ops dn_phase3_ops = {
93 .queue_xmit = dev_queue_xmit 92 .queue_xmit = dev_queue_xmit
94}; 93};
95 94
95static u32 dn_neigh_hash(const void *pkey,
96 const struct net_device *dev,
97 __u32 hash_rnd)
98{
99 return jhash_2words(*(__u16 *)pkey, 0, hash_rnd);
100}
101
96struct neigh_table dn_neigh_table = { 102struct neigh_table dn_neigh_table = {
97 .family = PF_DECnet, 103 .family = PF_DECnet,
98 .entry_size = sizeof(struct dn_neigh), 104 .entry_size = sizeof(struct dn_neigh),
@@ -122,11 +128,6 @@ struct neigh_table dn_neigh_table = {
122 .gc_thresh3 = 1024, 128 .gc_thresh3 = 1024,
123}; 129};
124 130
125static u32 dn_neigh_hash(const void *pkey, const struct net_device *dev)
126{
127 return jhash_2words(*(__u16 *)pkey, 0, dn_neigh_table.hash_rnd);
128}
129
130static int dn_neigh_construct(struct neighbour *neigh) 131static int dn_neigh_construct(struct neighbour *neigh)
131{ 132{
132 struct net_device *dev = neigh->dev; 133 struct net_device *dev = neigh->dev;
@@ -390,7 +391,7 @@ int dn_neigh_router_hello(struct sk_buff *skb)
390 write_lock(&neigh->lock); 391 write_lock(&neigh->lock);
391 392
392 neigh->used = jiffies; 393 neigh->used = jiffies;
393 dn_db = (struct dn_dev *)neigh->dev->dn_ptr; 394 dn_db = rcu_dereference(neigh->dev->dn_ptr);
394 395
395 if (!(neigh->nud_state & NUD_PERMANENT)) { 396 if (!(neigh->nud_state & NUD_PERMANENT)) {
396 neigh->updated = jiffies; 397 neigh->updated = jiffies;
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c
index baeb1eaf011b..bd78836a81eb 100644
--- a/net/decnet/dn_nsp_out.c
+++ b/net/decnet/dn_nsp_out.c
@@ -78,7 +78,7 @@ static void dn_nsp_send(struct sk_buff *skb)
78 struct sock *sk = skb->sk; 78 struct sock *sk = skb->sk;
79 struct dn_scp *scp = DN_SK(sk); 79 struct dn_scp *scp = DN_SK(sk);
80 struct dst_entry *dst; 80 struct dst_entry *dst;
81 struct flowi fl; 81 struct flowidn fld;
82 82
83 skb_reset_transport_header(skb); 83 skb_reset_transport_header(skb);
84 scp->stamp = jiffies; 84 scp->stamp = jiffies;
@@ -91,13 +91,13 @@ try_again:
91 return; 91 return;
92 } 92 }
93 93
94 memset(&fl, 0, sizeof(fl)); 94 memset(&fld, 0, sizeof(fld));
95 fl.oif = sk->sk_bound_dev_if; 95 fld.flowidn_oif = sk->sk_bound_dev_if;
96 fl.fld_src = dn_saddr2dn(&scp->addr); 96 fld.saddr = dn_saddr2dn(&scp->addr);
97 fl.fld_dst = dn_saddr2dn(&scp->peer); 97 fld.daddr = dn_saddr2dn(&scp->peer);
98 dn_sk_ports_copy(&fl, scp); 98 dn_sk_ports_copy(&fld, scp);
99 fl.proto = DNPROTO_NSP; 99 fld.flowidn_proto = DNPROTO_NSP;
100 if (dn_route_output_sock(&sk->sk_dst_cache, &fl, sk, 0) == 0) { 100 if (dn_route_output_sock(&sk->sk_dst_cache, &fld, sk, 0) == 0) {
101 dst = sk_dst_get(sk); 101 dst = sk_dst_get(sk);
102 sk->sk_route_caps = dst->dev->features; 102 sk->sk_route_caps = dst->dev->features;
103 goto try_again; 103 goto try_again;
@@ -693,22 +693,22 @@ void dn_nsp_send_conninit(struct sock *sk, unsigned char msgflg)
693 aux = scp->accessdata.acc_userl; 693 aux = scp->accessdata.acc_userl;
694 *skb_put(skb, 1) = aux; 694 *skb_put(skb, 1) = aux;
695 if (aux > 0) 695 if (aux > 0)
696 memcpy(skb_put(skb, aux), scp->accessdata.acc_user, aux); 696 memcpy(skb_put(skb, aux), scp->accessdata.acc_user, aux);
697 697
698 aux = scp->accessdata.acc_passl; 698 aux = scp->accessdata.acc_passl;
699 *skb_put(skb, 1) = aux; 699 *skb_put(skb, 1) = aux;
700 if (aux > 0) 700 if (aux > 0)
701 memcpy(skb_put(skb, aux), scp->accessdata.acc_pass, aux); 701 memcpy(skb_put(skb, aux), scp->accessdata.acc_pass, aux);
702 702
703 aux = scp->accessdata.acc_accl; 703 aux = scp->accessdata.acc_accl;
704 *skb_put(skb, 1) = aux; 704 *skb_put(skb, 1) = aux;
705 if (aux > 0) 705 if (aux > 0)
706 memcpy(skb_put(skb, aux), scp->accessdata.acc_acc, aux); 706 memcpy(skb_put(skb, aux), scp->accessdata.acc_acc, aux);
707 707
708 aux = (__u8)le16_to_cpu(scp->conndata_out.opt_optl); 708 aux = (__u8)le16_to_cpu(scp->conndata_out.opt_optl);
709 *skb_put(skb, 1) = aux; 709 *skb_put(skb, 1) = aux;
710 if (aux > 0) 710 if (aux > 0)
711 memcpy(skb_put(skb,aux), scp->conndata_out.opt_data, aux); 711 memcpy(skb_put(skb, aux), scp->conndata_out.opt_data, aux);
712 712
713 scp->persist = dn_nsp_persist(sk); 713 scp->persist = dn_nsp_persist(sk);
714 scp->persist_fxn = dn_nsp_retrans_conninit; 714 scp->persist_fxn = dn_nsp_retrans_conninit;
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 6585ea6d1182..74544bc6fdec 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -93,7 +93,7 @@
93 93
94struct dn_rt_hash_bucket 94struct dn_rt_hash_bucket
95{ 95{
96 struct dn_route *chain; 96 struct dn_route __rcu *chain;
97 spinlock_t lock; 97 spinlock_t lock;
98}; 98};
99 99
@@ -110,6 +110,9 @@ static unsigned long dn_rt_deadline;
110 110
111static int dn_dst_gc(struct dst_ops *ops); 111static int dn_dst_gc(struct dst_ops *ops);
112static struct dst_entry *dn_dst_check(struct dst_entry *, __u32); 112static struct dst_entry *dn_dst_check(struct dst_entry *, __u32);
113static unsigned int dn_dst_default_advmss(const struct dst_entry *dst);
114static unsigned int dn_dst_default_mtu(const struct dst_entry *dst);
115static void dn_dst_destroy(struct dst_entry *);
113static struct dst_entry *dn_dst_negative_advice(struct dst_entry *); 116static struct dst_entry *dn_dst_negative_advice(struct dst_entry *);
114static void dn_dst_link_failure(struct sk_buff *); 117static void dn_dst_link_failure(struct sk_buff *);
115static void dn_dst_update_pmtu(struct dst_entry *dst, u32 mtu); 118static void dn_dst_update_pmtu(struct dst_entry *dst, u32 mtu);
@@ -129,12 +132,20 @@ static struct dst_ops dn_dst_ops = {
129 .gc_thresh = 128, 132 .gc_thresh = 128,
130 .gc = dn_dst_gc, 133 .gc = dn_dst_gc,
131 .check = dn_dst_check, 134 .check = dn_dst_check,
135 .default_advmss = dn_dst_default_advmss,
136 .default_mtu = dn_dst_default_mtu,
137 .cow_metrics = dst_cow_metrics_generic,
138 .destroy = dn_dst_destroy,
132 .negative_advice = dn_dst_negative_advice, 139 .negative_advice = dn_dst_negative_advice,
133 .link_failure = dn_dst_link_failure, 140 .link_failure = dn_dst_link_failure,
134 .update_pmtu = dn_dst_update_pmtu, 141 .update_pmtu = dn_dst_update_pmtu,
135 .entries = ATOMIC_INIT(0),
136}; 142};
137 143
144static void dn_dst_destroy(struct dst_entry *dst)
145{
146 dst_destroy_metrics_generic(dst);
147}
148
138static __inline__ unsigned dn_hash(__le16 src, __le16 dst) 149static __inline__ unsigned dn_hash(__le16 src, __le16 dst)
139{ 150{
140 __u16 tmp = (__u16 __force)(src ^ dst); 151 __u16 tmp = (__u16 __force)(src ^ dst);
@@ -158,15 +169,17 @@ static inline void dnrt_drop(struct dn_route *rt)
158static void dn_dst_check_expire(unsigned long dummy) 169static void dn_dst_check_expire(unsigned long dummy)
159{ 170{
160 int i; 171 int i;
161 struct dn_route *rt, **rtp; 172 struct dn_route *rt;
173 struct dn_route __rcu **rtp;
162 unsigned long now = jiffies; 174 unsigned long now = jiffies;
163 unsigned long expire = 120 * HZ; 175 unsigned long expire = 120 * HZ;
164 176
165 for(i = 0; i <= dn_rt_hash_mask; i++) { 177 for (i = 0; i <= dn_rt_hash_mask; i++) {
166 rtp = &dn_rt_hash_table[i].chain; 178 rtp = &dn_rt_hash_table[i].chain;
167 179
168 spin_lock(&dn_rt_hash_table[i].lock); 180 spin_lock(&dn_rt_hash_table[i].lock);
169 while((rt=*rtp) != NULL) { 181 while ((rt = rcu_dereference_protected(*rtp,
182 lockdep_is_held(&dn_rt_hash_table[i].lock))) != NULL) {
170 if (atomic_read(&rt->dst.__refcnt) || 183 if (atomic_read(&rt->dst.__refcnt) ||
171 (now - rt->dst.lastuse) < expire) { 184 (now - rt->dst.lastuse) < expire) {
172 rtp = &rt->dst.dn_next; 185 rtp = &rt->dst.dn_next;
@@ -187,17 +200,19 @@ static void dn_dst_check_expire(unsigned long dummy)
187 200
188static int dn_dst_gc(struct dst_ops *ops) 201static int dn_dst_gc(struct dst_ops *ops)
189{ 202{
190 struct dn_route *rt, **rtp; 203 struct dn_route *rt;
204 struct dn_route __rcu **rtp;
191 int i; 205 int i;
192 unsigned long now = jiffies; 206 unsigned long now = jiffies;
193 unsigned long expire = 10 * HZ; 207 unsigned long expire = 10 * HZ;
194 208
195 for(i = 0; i <= dn_rt_hash_mask; i++) { 209 for (i = 0; i <= dn_rt_hash_mask; i++) {
196 210
197 spin_lock_bh(&dn_rt_hash_table[i].lock); 211 spin_lock_bh(&dn_rt_hash_table[i].lock);
198 rtp = &dn_rt_hash_table[i].chain; 212 rtp = &dn_rt_hash_table[i].chain;
199 213
200 while((rt=*rtp) != NULL) { 214 while ((rt = rcu_dereference_protected(*rtp,
215 lockdep_is_held(&dn_rt_hash_table[i].lock))) != NULL) {
201 if (atomic_read(&rt->dst.__refcnt) || 216 if (atomic_read(&rt->dst.__refcnt) ||
202 (now - rt->dst.lastuse) < expire) { 217 (now - rt->dst.lastuse) < expire) {
203 rtp = &rt->dst.dn_next; 218 rtp = &rt->dst.dn_next;
@@ -228,7 +243,7 @@ static void dn_dst_update_pmtu(struct dst_entry *dst, u32 mtu)
228{ 243{
229 u32 min_mtu = 230; 244 u32 min_mtu = 230;
230 struct dn_dev *dn = dst->neighbour ? 245 struct dn_dev *dn = dst->neighbour ?
231 (struct dn_dev *)dst->neighbour->dev->dn_ptr : NULL; 246 rcu_dereference_raw(dst->neighbour->dev->dn_ptr) : NULL;
232 247
233 if (dn && dn->use_long == 0) 248 if (dn && dn->use_long == 0)
234 min_mtu -= 6; 249 min_mtu -= 6;
@@ -237,13 +252,14 @@ static void dn_dst_update_pmtu(struct dst_entry *dst, u32 mtu)
237 252
238 if (dst_metric(dst, RTAX_MTU) > mtu && mtu >= min_mtu) { 253 if (dst_metric(dst, RTAX_MTU) > mtu && mtu >= min_mtu) {
239 if (!(dst_metric_locked(dst, RTAX_MTU))) { 254 if (!(dst_metric_locked(dst, RTAX_MTU))) {
240 dst->metrics[RTAX_MTU-1] = mtu; 255 dst_metric_set(dst, RTAX_MTU, mtu);
241 dst_set_expires(dst, dn_rt_mtu_expires); 256 dst_set_expires(dst, dn_rt_mtu_expires);
242 } 257 }
243 if (!(dst_metric_locked(dst, RTAX_ADVMSS))) { 258 if (!(dst_metric_locked(dst, RTAX_ADVMSS))) {
244 u32 mss = mtu - DN_MAX_NSP_DATA_HEADER; 259 u32 mss = mtu - DN_MAX_NSP_DATA_HEADER;
245 if (dst_metric(dst, RTAX_ADVMSS) > mss) 260 u32 existing_mss = dst_metric_raw(dst, RTAX_ADVMSS);
246 dst->metrics[RTAX_ADVMSS-1] = mss; 261 if (!existing_mss || existing_mss > mss)
262 dst_metric_set(dst, RTAX_ADVMSS, mss);
247 } 263 }
248 } 264 }
249} 265}
@@ -266,26 +282,28 @@ static void dn_dst_link_failure(struct sk_buff *skb)
266{ 282{
267} 283}
268 284
269static inline int compare_keys(struct flowi *fl1, struct flowi *fl2) 285static inline int compare_keys(struct flowidn *fl1, struct flowidn *fl2)
270{ 286{
271 return ((fl1->nl_u.dn_u.daddr ^ fl2->nl_u.dn_u.daddr) | 287 return ((fl1->daddr ^ fl2->daddr) |
272 (fl1->nl_u.dn_u.saddr ^ fl2->nl_u.dn_u.saddr) | 288 (fl1->saddr ^ fl2->saddr) |
273 (fl1->mark ^ fl2->mark) | 289 (fl1->flowidn_mark ^ fl2->flowidn_mark) |
274 (fl1->nl_u.dn_u.scope ^ fl2->nl_u.dn_u.scope) | 290 (fl1->flowidn_scope ^ fl2->flowidn_scope) |
275 (fl1->oif ^ fl2->oif) | 291 (fl1->flowidn_oif ^ fl2->flowidn_oif) |
276 (fl1->iif ^ fl2->iif)) == 0; 292 (fl1->flowidn_iif ^ fl2->flowidn_iif)) == 0;
277} 293}
278 294
279static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route **rp) 295static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route **rp)
280{ 296{
281 struct dn_route *rth, **rthp; 297 struct dn_route *rth;
298 struct dn_route __rcu **rthp;
282 unsigned long now = jiffies; 299 unsigned long now = jiffies;
283 300
284 rthp = &dn_rt_hash_table[hash].chain; 301 rthp = &dn_rt_hash_table[hash].chain;
285 302
286 spin_lock_bh(&dn_rt_hash_table[hash].lock); 303 spin_lock_bh(&dn_rt_hash_table[hash].lock);
287 while((rth = *rthp) != NULL) { 304 while ((rth = rcu_dereference_protected(*rthp,
288 if (compare_keys(&rth->fl, &rt->fl)) { 305 lockdep_is_held(&dn_rt_hash_table[hash].lock))) != NULL) {
306 if (compare_keys(&rth->fld, &rt->fld)) {
289 /* Put it first */ 307 /* Put it first */
290 *rthp = rth->dst.dn_next; 308 *rthp = rth->dst.dn_next;
291 rcu_assign_pointer(rth->dst.dn_next, 309 rcu_assign_pointer(rth->dst.dn_next,
@@ -316,15 +334,15 @@ static void dn_run_flush(unsigned long dummy)
316 int i; 334 int i;
317 struct dn_route *rt, *next; 335 struct dn_route *rt, *next;
318 336
319 for(i = 0; i < dn_rt_hash_mask; i++) { 337 for (i = 0; i < dn_rt_hash_mask; i++) {
320 spin_lock_bh(&dn_rt_hash_table[i].lock); 338 spin_lock_bh(&dn_rt_hash_table[i].lock);
321 339
322 if ((rt = xchg(&dn_rt_hash_table[i].chain, NULL)) == NULL) 340 if ((rt = xchg((struct dn_route **)&dn_rt_hash_table[i].chain, NULL)) == NULL)
323 goto nothing_to_declare; 341 goto nothing_to_declare;
324 342
325 for(; rt; rt=next) { 343 for(; rt; rt = next) {
326 next = rt->dst.dn_next; 344 next = rcu_dereference_raw(rt->dst.dn_next);
327 rt->dst.dn_next = NULL; 345 RCU_INIT_POINTER(rt->dst.dn_next, NULL);
328 dst_free((struct dst_entry *)rt); 346 dst_free((struct dst_entry *)rt);
329 } 347 }
330 348
@@ -459,15 +477,16 @@ static int dn_return_long(struct sk_buff *skb)
459 */ 477 */
460static int dn_route_rx_packet(struct sk_buff *skb) 478static int dn_route_rx_packet(struct sk_buff *skb)
461{ 479{
462 struct dn_skb_cb *cb = DN_SKB_CB(skb); 480 struct dn_skb_cb *cb;
463 int err; 481 int err;
464 482
465 if ((err = dn_route_input(skb)) == 0) 483 if ((err = dn_route_input(skb)) == 0)
466 return dst_input(skb); 484 return dst_input(skb);
467 485
486 cb = DN_SKB_CB(skb);
468 if (decnet_debug_level & 4) { 487 if (decnet_debug_level & 4) {
469 char *devname = skb->dev ? skb->dev->name : "???"; 488 char *devname = skb->dev ? skb->dev->name : "???";
470 struct dn_skb_cb *cb = DN_SKB_CB(skb); 489
471 printk(KERN_DEBUG 490 printk(KERN_DEBUG
472 "DECnet: dn_route_rx_packet: rt_flags=0x%02x dev=%s len=%d src=0x%04hx dst=0x%04hx err=%d type=%d\n", 491 "DECnet: dn_route_rx_packet: rt_flags=0x%02x dev=%s len=%d src=0x%04hx dst=0x%04hx err=%d type=%d\n",
473 (int)cb->rt_flags, devname, skb->len, 492 (int)cb->rt_flags, devname, skb->len,
@@ -574,7 +593,7 @@ int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type
574 struct dn_skb_cb *cb; 593 struct dn_skb_cb *cb;
575 unsigned char flags = 0; 594 unsigned char flags = 0;
576 __u16 len = le16_to_cpu(*(__le16 *)skb->data); 595 __u16 len = le16_to_cpu(*(__le16 *)skb->data);
577 struct dn_dev *dn = (struct dn_dev *)dev->dn_ptr; 596 struct dn_dev *dn = rcu_dereference(dev->dn_ptr);
578 unsigned char padlen = 0; 597 unsigned char padlen = 0;
579 598
580 if (!net_eq(dev_net(dev), &init_net)) 599 if (!net_eq(dev_net(dev), &init_net))
@@ -729,7 +748,7 @@ static int dn_forward(struct sk_buff *skb)
729{ 748{
730 struct dn_skb_cb *cb = DN_SKB_CB(skb); 749 struct dn_skb_cb *cb = DN_SKB_CB(skb);
731 struct dst_entry *dst = skb_dst(skb); 750 struct dst_entry *dst = skb_dst(skb);
732 struct dn_dev *dn_db = dst->dev->dn_ptr; 751 struct dn_dev *dn_db = rcu_dereference(dst->dev->dn_ptr);
733 struct dn_route *rt; 752 struct dn_route *rt;
734 struct neighbour *neigh = dst->neighbour; 753 struct neighbour *neigh = dst->neighbour;
735 int header_len; 754 int header_len;
@@ -789,19 +808,28 @@ static int dn_rt_bug(struct sk_buff *skb)
789 return NET_RX_DROP; 808 return NET_RX_DROP;
790} 809}
791 810
811static unsigned int dn_dst_default_advmss(const struct dst_entry *dst)
812{
813 return dn_mss_from_pmtu(dst->dev, dst_mtu(dst));
814}
815
816static unsigned int dn_dst_default_mtu(const struct dst_entry *dst)
817{
818 return dst->dev->mtu;
819}
820
792static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res) 821static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res)
793{ 822{
794 struct dn_fib_info *fi = res->fi; 823 struct dn_fib_info *fi = res->fi;
795 struct net_device *dev = rt->dst.dev; 824 struct net_device *dev = rt->dst.dev;
825 unsigned int mss_metric;
796 struct neighbour *n; 826 struct neighbour *n;
797 unsigned mss;
798 827
799 if (fi) { 828 if (fi) {
800 if (DN_FIB_RES_GW(*res) && 829 if (DN_FIB_RES_GW(*res) &&
801 DN_FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK) 830 DN_FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK)
802 rt->rt_gateway = DN_FIB_RES_GW(*res); 831 rt->rt_gateway = DN_FIB_RES_GW(*res);
803 memcpy(rt->dst.metrics, fi->fib_metrics, 832 dst_init_metrics(&rt->dst, fi->fib_metrics, true);
804 sizeof(rt->dst.metrics));
805 } 833 }
806 rt->rt_type = res->type; 834 rt->rt_type = res->type;
807 835
@@ -812,13 +840,14 @@ static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res)
812 rt->dst.neighbour = n; 840 rt->dst.neighbour = n;
813 } 841 }
814 842
815 if (dst_metric(&rt->dst, RTAX_MTU) == 0 || 843 if (dst_metric(&rt->dst, RTAX_MTU) > rt->dst.dev->mtu)
816 dst_metric(&rt->dst, RTAX_MTU) > rt->dst.dev->mtu) 844 dst_metric_set(&rt->dst, RTAX_MTU, rt->dst.dev->mtu);
817 rt->dst.metrics[RTAX_MTU-1] = rt->dst.dev->mtu; 845 mss_metric = dst_metric_raw(&rt->dst, RTAX_ADVMSS);
818 mss = dn_mss_from_pmtu(dev, dst_mtu(&rt->dst)); 846 if (mss_metric) {
819 if (dst_metric(&rt->dst, RTAX_ADVMSS) == 0 || 847 unsigned int mss = dn_mss_from_pmtu(dev, dst_mtu(&rt->dst));
820 dst_metric(&rt->dst, RTAX_ADVMSS) > mss) 848 if (mss_metric > mss)
821 rt->dst.metrics[RTAX_ADVMSS-1] = mss; 849 dst_metric_set(&rt->dst, RTAX_ADVMSS, mss);
850 }
822 return 0; 851 return 0;
823} 852}
824 853
@@ -836,13 +865,16 @@ static inline int dn_match_addr(__le16 addr1, __le16 addr2)
836static __le16 dnet_select_source(const struct net_device *dev, __le16 daddr, int scope) 865static __le16 dnet_select_source(const struct net_device *dev, __le16 daddr, int scope)
837{ 866{
838 __le16 saddr = 0; 867 __le16 saddr = 0;
839 struct dn_dev *dn_db = dev->dn_ptr; 868 struct dn_dev *dn_db;
840 struct dn_ifaddr *ifa; 869 struct dn_ifaddr *ifa;
841 int best_match = 0; 870 int best_match = 0;
842 int ret; 871 int ret;
843 872
844 read_lock(&dev_base_lock); 873 rcu_read_lock();
845 for(ifa = dn_db->ifa_list; ifa; ifa = ifa->ifa_next) { 874 dn_db = rcu_dereference(dev->dn_ptr);
875 for (ifa = rcu_dereference(dn_db->ifa_list);
876 ifa != NULL;
877 ifa = rcu_dereference(ifa->ifa_next)) {
846 if (ifa->ifa_scope > scope) 878 if (ifa->ifa_scope > scope)
847 continue; 879 continue;
848 if (!daddr) { 880 if (!daddr) {
@@ -855,7 +887,7 @@ static __le16 dnet_select_source(const struct net_device *dev, __le16 daddr, int
855 if (best_match == 0) 887 if (best_match == 0)
856 saddr = ifa->ifa_local; 888 saddr = ifa->ifa_local;
857 } 889 }
858 read_unlock(&dev_base_lock); 890 rcu_read_unlock();
859 891
860 return saddr; 892 return saddr;
861} 893}
@@ -871,16 +903,16 @@ static inline __le16 dn_fib_rules_map_destination(__le16 daddr, struct dn_fib_re
871 return (daddr&~mask)|res->fi->fib_nh->nh_gw; 903 return (daddr&~mask)|res->fi->fib_nh->nh_gw;
872} 904}
873 905
874static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *oldflp, int try_hard) 906static int dn_route_output_slow(struct dst_entry **pprt, const struct flowidn *oldflp, int try_hard)
875{ 907{
876 struct flowi fl = { .nl_u = { .dn_u = 908 struct flowidn fld = {
877 { .daddr = oldflp->fld_dst, 909 .daddr = oldflp->daddr,
878 .saddr = oldflp->fld_src, 910 .saddr = oldflp->saddr,
879 .scope = RT_SCOPE_UNIVERSE, 911 .flowidn_scope = RT_SCOPE_UNIVERSE,
880 } }, 912 .flowidn_mark = oldflp->flowidn_mark,
881 .mark = oldflp->mark, 913 .flowidn_iif = init_net.loopback_dev->ifindex,
882 .iif = init_net.loopback_dev->ifindex, 914 .flowidn_oif = oldflp->flowidn_oif,
883 .oif = oldflp->oif }; 915 };
884 struct dn_route *rt = NULL; 916 struct dn_route *rt = NULL;
885 struct net_device *dev_out = NULL, *dev; 917 struct net_device *dev_out = NULL, *dev;
886 struct neighbour *neigh = NULL; 918 struct neighbour *neigh = NULL;
@@ -894,13 +926,14 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
894 if (decnet_debug_level & 16) 926 if (decnet_debug_level & 16)
895 printk(KERN_DEBUG 927 printk(KERN_DEBUG
896 "dn_route_output_slow: dst=%04x src=%04x mark=%d" 928 "dn_route_output_slow: dst=%04x src=%04x mark=%d"
897 " iif=%d oif=%d\n", le16_to_cpu(oldflp->fld_dst), 929 " iif=%d oif=%d\n", le16_to_cpu(oldflp->daddr),
898 le16_to_cpu(oldflp->fld_src), 930 le16_to_cpu(oldflp->saddr),
899 oldflp->mark, init_net.loopback_dev->ifindex, oldflp->oif); 931 oldflp->flowidn_mark, init_net.loopback_dev->ifindex,
932 oldflp->flowidn_oif);
900 933
901 /* If we have an output interface, verify its a DECnet device */ 934 /* If we have an output interface, verify its a DECnet device */
902 if (oldflp->oif) { 935 if (oldflp->flowidn_oif) {
903 dev_out = dev_get_by_index(&init_net, oldflp->oif); 936 dev_out = dev_get_by_index(&init_net, oldflp->flowidn_oif);
904 err = -ENODEV; 937 err = -ENODEV;
905 if (dev_out && dev_out->dn_ptr == NULL) { 938 if (dev_out && dev_out->dn_ptr == NULL) {
906 dev_put(dev_out); 939 dev_put(dev_out);
@@ -911,11 +944,11 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
911 } 944 }
912 945
913 /* If we have a source address, verify that its a local address */ 946 /* If we have a source address, verify that its a local address */
914 if (oldflp->fld_src) { 947 if (oldflp->saddr) {
915 err = -EADDRNOTAVAIL; 948 err = -EADDRNOTAVAIL;
916 949
917 if (dev_out) { 950 if (dev_out) {
918 if (dn_dev_islocal(dev_out, oldflp->fld_src)) 951 if (dn_dev_islocal(dev_out, oldflp->saddr))
919 goto source_ok; 952 goto source_ok;
920 dev_put(dev_out); 953 dev_put(dev_out);
921 goto out; 954 goto out;
@@ -924,11 +957,11 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
924 for_each_netdev_rcu(&init_net, dev) { 957 for_each_netdev_rcu(&init_net, dev) {
925 if (!dev->dn_ptr) 958 if (!dev->dn_ptr)
926 continue; 959 continue;
927 if (!dn_dev_islocal(dev, oldflp->fld_src)) 960 if (!dn_dev_islocal(dev, oldflp->saddr))
928 continue; 961 continue;
929 if ((dev->flags & IFF_LOOPBACK) && 962 if ((dev->flags & IFF_LOOPBACK) &&
930 oldflp->fld_dst && 963 oldflp->daddr &&
931 !dn_dev_islocal(dev, oldflp->fld_dst)) 964 !dn_dev_islocal(dev, oldflp->daddr))
932 continue; 965 continue;
933 966
934 dev_out = dev; 967 dev_out = dev;
@@ -943,22 +976,22 @@ source_ok:
943 } 976 }
944 977
945 /* No destination? Assume its local */ 978 /* No destination? Assume its local */
946 if (!fl.fld_dst) { 979 if (!fld.daddr) {
947 fl.fld_dst = fl.fld_src; 980 fld.daddr = fld.saddr;
948 981
949 err = -EADDRNOTAVAIL; 982 err = -EADDRNOTAVAIL;
950 if (dev_out) 983 if (dev_out)
951 dev_put(dev_out); 984 dev_put(dev_out);
952 dev_out = init_net.loopback_dev; 985 dev_out = init_net.loopback_dev;
953 dev_hold(dev_out); 986 dev_hold(dev_out);
954 if (!fl.fld_dst) { 987 if (!fld.daddr) {
955 fl.fld_dst = 988 fld.daddr =
956 fl.fld_src = dnet_select_source(dev_out, 0, 989 fld.saddr = dnet_select_source(dev_out, 0,
957 RT_SCOPE_HOST); 990 RT_SCOPE_HOST);
958 if (!fl.fld_dst) 991 if (!fld.daddr)
959 goto out; 992 goto out;
960 } 993 }
961 fl.oif = init_net.loopback_dev->ifindex; 994 fld.flowidn_oif = init_net.loopback_dev->ifindex;
962 res.type = RTN_LOCAL; 995 res.type = RTN_LOCAL;
963 goto make_route; 996 goto make_route;
964 } 997 }
@@ -967,8 +1000,8 @@ source_ok:
967 printk(KERN_DEBUG 1000 printk(KERN_DEBUG
968 "dn_route_output_slow: initial checks complete." 1001 "dn_route_output_slow: initial checks complete."
969 " dst=%o4x src=%04x oif=%d try_hard=%d\n", 1002 " dst=%o4x src=%04x oif=%d try_hard=%d\n",
970 le16_to_cpu(fl.fld_dst), le16_to_cpu(fl.fld_src), 1003 le16_to_cpu(fld.daddr), le16_to_cpu(fld.saddr),
971 fl.oif, try_hard); 1004 fld.flowidn_oif, try_hard);
972 1005
973 /* 1006 /*
974 * N.B. If the kernel is compiled without router support then 1007 * N.B. If the kernel is compiled without router support then
@@ -976,7 +1009,7 @@ source_ok:
976 * will always be executed. 1009 * will always be executed.
977 */ 1010 */
978 err = -ESRCH; 1011 err = -ESRCH;
979 if (try_hard || (err = dn_fib_lookup(&fl, &res)) != 0) { 1012 if (try_hard || (err = dn_fib_lookup(&fld, &res)) != 0) {
980 struct dn_dev *dn_db; 1013 struct dn_dev *dn_db;
981 if (err != -ESRCH) 1014 if (err != -ESRCH)
982 goto out; 1015 goto out;
@@ -991,19 +1024,19 @@ source_ok:
991 * here 1024 * here
992 */ 1025 */
993 if (!try_hard) { 1026 if (!try_hard) {
994 neigh = neigh_lookup_nodev(&dn_neigh_table, &init_net, &fl.fld_dst); 1027 neigh = neigh_lookup_nodev(&dn_neigh_table, &init_net, &fld.daddr);
995 if (neigh) { 1028 if (neigh) {
996 if ((oldflp->oif && 1029 if ((oldflp->flowidn_oif &&
997 (neigh->dev->ifindex != oldflp->oif)) || 1030 (neigh->dev->ifindex != oldflp->flowidn_oif)) ||
998 (oldflp->fld_src && 1031 (oldflp->saddr &&
999 (!dn_dev_islocal(neigh->dev, 1032 (!dn_dev_islocal(neigh->dev,
1000 oldflp->fld_src)))) { 1033 oldflp->saddr)))) {
1001 neigh_release(neigh); 1034 neigh_release(neigh);
1002 neigh = NULL; 1035 neigh = NULL;
1003 } else { 1036 } else {
1004 if (dev_out) 1037 if (dev_out)
1005 dev_put(dev_out); 1038 dev_put(dev_out);
1006 if (dn_dev_islocal(neigh->dev, fl.fld_dst)) { 1039 if (dn_dev_islocal(neigh->dev, fld.daddr)) {
1007 dev_out = init_net.loopback_dev; 1040 dev_out = init_net.loopback_dev;
1008 res.type = RTN_LOCAL; 1041 res.type = RTN_LOCAL;
1009 } else { 1042 } else {
@@ -1021,9 +1054,9 @@ source_ok:
1021 err = -ENODEV; 1054 err = -ENODEV;
1022 if (dev_out == NULL) 1055 if (dev_out == NULL)
1023 goto out; 1056 goto out;
1024 dn_db = dev_out->dn_ptr; 1057 dn_db = rcu_dereference_raw(dev_out->dn_ptr);
1025 /* Possible improvement - check all devices for local addr */ 1058 /* Possible improvement - check all devices for local addr */
1026 if (dn_dev_islocal(dev_out, fl.fld_dst)) { 1059 if (dn_dev_islocal(dev_out, fld.daddr)) {
1027 dev_put(dev_out); 1060 dev_put(dev_out);
1028 dev_out = init_net.loopback_dev; 1061 dev_out = init_net.loopback_dev;
1029 dev_hold(dev_out); 1062 dev_hold(dev_out);
@@ -1039,16 +1072,16 @@ select_source:
1039 if (neigh) 1072 if (neigh)
1040 gateway = ((struct dn_neigh *)neigh)->addr; 1073 gateway = ((struct dn_neigh *)neigh)->addr;
1041 if (gateway == 0) 1074 if (gateway == 0)
1042 gateway = fl.fld_dst; 1075 gateway = fld.daddr;
1043 if (fl.fld_src == 0) { 1076 if (fld.saddr == 0) {
1044 fl.fld_src = dnet_select_source(dev_out, gateway, 1077 fld.saddr = dnet_select_source(dev_out, gateway,
1045 res.type == RTN_LOCAL ? 1078 res.type == RTN_LOCAL ?
1046 RT_SCOPE_HOST : 1079 RT_SCOPE_HOST :
1047 RT_SCOPE_LINK); 1080 RT_SCOPE_LINK);
1048 if (fl.fld_src == 0 && res.type != RTN_LOCAL) 1081 if (fld.saddr == 0 && res.type != RTN_LOCAL)
1049 goto e_addr; 1082 goto e_addr;
1050 } 1083 }
1051 fl.oif = dev_out->ifindex; 1084 fld.flowidn_oif = dev_out->ifindex;
1052 goto make_route; 1085 goto make_route;
1053 } 1086 }
1054 free_res = 1; 1087 free_res = 1;
@@ -1057,64 +1090,60 @@ select_source:
1057 goto e_inval; 1090 goto e_inval;
1058 1091
1059 if (res.type == RTN_LOCAL) { 1092 if (res.type == RTN_LOCAL) {
1060 if (!fl.fld_src) 1093 if (!fld.saddr)
1061 fl.fld_src = fl.fld_dst; 1094 fld.saddr = fld.daddr;
1062 if (dev_out) 1095 if (dev_out)
1063 dev_put(dev_out); 1096 dev_put(dev_out);
1064 dev_out = init_net.loopback_dev; 1097 dev_out = init_net.loopback_dev;
1065 dev_hold(dev_out); 1098 dev_hold(dev_out);
1066 fl.oif = dev_out->ifindex; 1099 fld.flowidn_oif = dev_out->ifindex;
1067 if (res.fi) 1100 if (res.fi)
1068 dn_fib_info_put(res.fi); 1101 dn_fib_info_put(res.fi);
1069 res.fi = NULL; 1102 res.fi = NULL;
1070 goto make_route; 1103 goto make_route;
1071 } 1104 }
1072 1105
1073 if (res.fi->fib_nhs > 1 && fl.oif == 0) 1106 if (res.fi->fib_nhs > 1 && fld.flowidn_oif == 0)
1074 dn_fib_select_multipath(&fl, &res); 1107 dn_fib_select_multipath(&fld, &res);
1075 1108
1076 /* 1109 /*
1077 * We could add some logic to deal with default routes here and 1110 * We could add some logic to deal with default routes here and
1078 * get rid of some of the special casing above. 1111 * get rid of some of the special casing above.
1079 */ 1112 */
1080 1113
1081 if (!fl.fld_src) 1114 if (!fld.saddr)
1082 fl.fld_src = DN_FIB_RES_PREFSRC(res); 1115 fld.saddr = DN_FIB_RES_PREFSRC(res);
1083 1116
1084 if (dev_out) 1117 if (dev_out)
1085 dev_put(dev_out); 1118 dev_put(dev_out);
1086 dev_out = DN_FIB_RES_DEV(res); 1119 dev_out = DN_FIB_RES_DEV(res);
1087 dev_hold(dev_out); 1120 dev_hold(dev_out);
1088 fl.oif = dev_out->ifindex; 1121 fld.flowidn_oif = dev_out->ifindex;
1089 gateway = DN_FIB_RES_GW(res); 1122 gateway = DN_FIB_RES_GW(res);
1090 1123
1091make_route: 1124make_route:
1092 if (dev_out->flags & IFF_LOOPBACK) 1125 if (dev_out->flags & IFF_LOOPBACK)
1093 flags |= RTCF_LOCAL; 1126 flags |= RTCF_LOCAL;
1094 1127
1095 rt = dst_alloc(&dn_dst_ops); 1128 rt = dst_alloc(&dn_dst_ops, dev_out, 1, 0, DST_HOST);
1096 if (rt == NULL) 1129 if (rt == NULL)
1097 goto e_nobufs; 1130 goto e_nobufs;
1098 1131
1099 atomic_set(&rt->dst.__refcnt, 1); 1132 memset(&rt->fld, 0, sizeof(rt->fld));
1100 rt->dst.flags = DST_HOST; 1133 rt->fld.saddr = oldflp->saddr;
1134 rt->fld.daddr = oldflp->daddr;
1135 rt->fld.flowidn_oif = oldflp->flowidn_oif;
1136 rt->fld.flowidn_iif = 0;
1137 rt->fld.flowidn_mark = oldflp->flowidn_mark;
1101 1138
1102 rt->fl.fld_src = oldflp->fld_src; 1139 rt->rt_saddr = fld.saddr;
1103 rt->fl.fld_dst = oldflp->fld_dst; 1140 rt->rt_daddr = fld.daddr;
1104 rt->fl.oif = oldflp->oif; 1141 rt->rt_gateway = gateway ? gateway : fld.daddr;
1105 rt->fl.iif = 0; 1142 rt->rt_local_src = fld.saddr;
1106 rt->fl.mark = oldflp->mark;
1107 1143
1108 rt->rt_saddr = fl.fld_src; 1144 rt->rt_dst_map = fld.daddr;
1109 rt->rt_daddr = fl.fld_dst; 1145 rt->rt_src_map = fld.saddr;
1110 rt->rt_gateway = gateway ? gateway : fl.fld_dst;
1111 rt->rt_local_src = fl.fld_src;
1112 1146
1113 rt->rt_dst_map = fl.fld_dst;
1114 rt->rt_src_map = fl.fld_src;
1115
1116 rt->dst.dev = dev_out;
1117 dev_hold(dev_out);
1118 rt->dst.neighbour = neigh; 1147 rt->dst.neighbour = neigh;
1119 neigh = NULL; 1148 neigh = NULL;
1120 1149
@@ -1129,7 +1158,7 @@ make_route:
1129 if (err) 1158 if (err)
1130 goto e_neighbour; 1159 goto e_neighbour;
1131 1160
1132 hash = dn_hash(rt->fl.fld_src, rt->fl.fld_dst); 1161 hash = dn_hash(rt->fld.saddr, rt->fld.daddr);
1133 dn_insert_route(rt, hash, (struct dn_route **)pprt); 1162 dn_insert_route(rt, hash, (struct dn_route **)pprt);
1134 1163
1135done: 1164done:
@@ -1160,20 +1189,20 @@ e_neighbour:
1160/* 1189/*
1161 * N.B. The flags may be moved into the flowi at some future stage. 1190 * N.B. The flags may be moved into the flowi at some future stage.
1162 */ 1191 */
1163static int __dn_route_output_key(struct dst_entry **pprt, const struct flowi *flp, int flags) 1192static int __dn_route_output_key(struct dst_entry **pprt, const struct flowidn *flp, int flags)
1164{ 1193{
1165 unsigned hash = dn_hash(flp->fld_src, flp->fld_dst); 1194 unsigned hash = dn_hash(flp->saddr, flp->daddr);
1166 struct dn_route *rt = NULL; 1195 struct dn_route *rt = NULL;
1167 1196
1168 if (!(flags & MSG_TRYHARD)) { 1197 if (!(flags & MSG_TRYHARD)) {
1169 rcu_read_lock_bh(); 1198 rcu_read_lock_bh();
1170 for (rt = rcu_dereference_bh(dn_rt_hash_table[hash].chain); rt; 1199 for (rt = rcu_dereference_bh(dn_rt_hash_table[hash].chain); rt;
1171 rt = rcu_dereference_bh(rt->dst.dn_next)) { 1200 rt = rcu_dereference_bh(rt->dst.dn_next)) {
1172 if ((flp->fld_dst == rt->fl.fld_dst) && 1201 if ((flp->daddr == rt->fld.daddr) &&
1173 (flp->fld_src == rt->fl.fld_src) && 1202 (flp->saddr == rt->fld.saddr) &&
1174 (flp->mark == rt->fl.mark) && 1203 (flp->flowidn_mark == rt->fld.flowidn_mark) &&
1175 (rt->fl.iif == 0) && 1204 dn_is_output_route(rt) &&
1176 (rt->fl.oif == flp->oif)) { 1205 (rt->fld.flowidn_oif == flp->flowidn_oif)) {
1177 dst_use(&rt->dst, jiffies); 1206 dst_use(&rt->dst, jiffies);
1178 rcu_read_unlock_bh(); 1207 rcu_read_unlock_bh();
1179 *pprt = &rt->dst; 1208 *pprt = &rt->dst;
@@ -1186,25 +1215,36 @@ static int __dn_route_output_key(struct dst_entry **pprt, const struct flowi *fl
1186 return dn_route_output_slow(pprt, flp, flags); 1215 return dn_route_output_slow(pprt, flp, flags);
1187} 1216}
1188 1217
1189static int dn_route_output_key(struct dst_entry **pprt, struct flowi *flp, int flags) 1218static int dn_route_output_key(struct dst_entry **pprt, struct flowidn *flp, int flags)
1190{ 1219{
1191 int err; 1220 int err;
1192 1221
1193 err = __dn_route_output_key(pprt, flp, flags); 1222 err = __dn_route_output_key(pprt, flp, flags);
1194 if (err == 0 && flp->proto) { 1223 if (err == 0 && flp->flowidn_proto) {
1195 err = xfrm_lookup(&init_net, pprt, flp, NULL, 0); 1224 *pprt = xfrm_lookup(&init_net, *pprt,
1225 flowidn_to_flowi(flp), NULL, 0);
1226 if (IS_ERR(*pprt)) {
1227 err = PTR_ERR(*pprt);
1228 *pprt = NULL;
1229 }
1196 } 1230 }
1197 return err; 1231 return err;
1198} 1232}
1199 1233
1200int dn_route_output_sock(struct dst_entry **pprt, struct flowi *fl, struct sock *sk, int flags) 1234int dn_route_output_sock(struct dst_entry **pprt, struct flowidn *fl, struct sock *sk, int flags)
1201{ 1235{
1202 int err; 1236 int err;
1203 1237
1204 err = __dn_route_output_key(pprt, fl, flags & MSG_TRYHARD); 1238 err = __dn_route_output_key(pprt, fl, flags & MSG_TRYHARD);
1205 if (err == 0 && fl->proto) { 1239 if (err == 0 && fl->flowidn_proto) {
1206 err = xfrm_lookup(&init_net, pprt, fl, sk, 1240 if (!(flags & MSG_DONTWAIT))
1207 (flags & MSG_DONTWAIT) ? 0 : XFRM_LOOKUP_WAIT); 1241 fl->flowidn_flags |= FLOWI_FLAG_CAN_SLEEP;
1242 *pprt = xfrm_lookup(&init_net, *pprt,
1243 flowidn_to_flowi(fl), sk, 0);
1244 if (IS_ERR(*pprt)) {
1245 err = PTR_ERR(*pprt);
1246 *pprt = NULL;
1247 }
1208 } 1248 }
1209 return err; 1249 return err;
1210} 1250}
@@ -1221,24 +1261,24 @@ static int dn_route_input_slow(struct sk_buff *skb)
1221 int flags = 0; 1261 int flags = 0;
1222 __le16 gateway = 0; 1262 __le16 gateway = 0;
1223 __le16 local_src = 0; 1263 __le16 local_src = 0;
1224 struct flowi fl = { .nl_u = { .dn_u = 1264 struct flowidn fld = {
1225 { .daddr = cb->dst, 1265 .daddr = cb->dst,
1226 .saddr = cb->src, 1266 .saddr = cb->src,
1227 .scope = RT_SCOPE_UNIVERSE, 1267 .flowidn_scope = RT_SCOPE_UNIVERSE,
1228 } }, 1268 .flowidn_mark = skb->mark,
1229 .mark = skb->mark, 1269 .flowidn_iif = skb->dev->ifindex,
1230 .iif = skb->dev->ifindex }; 1270 };
1231 struct dn_fib_res res = { .fi = NULL, .type = RTN_UNREACHABLE }; 1271 struct dn_fib_res res = { .fi = NULL, .type = RTN_UNREACHABLE };
1232 int err = -EINVAL; 1272 int err = -EINVAL;
1233 int free_res = 0; 1273 int free_res = 0;
1234 1274
1235 dev_hold(in_dev); 1275 dev_hold(in_dev);
1236 1276
1237 if ((dn_db = in_dev->dn_ptr) == NULL) 1277 if ((dn_db = rcu_dereference(in_dev->dn_ptr)) == NULL)
1238 goto out; 1278 goto out;
1239 1279
1240 /* Zero source addresses are not allowed */ 1280 /* Zero source addresses are not allowed */
1241 if (fl.fld_src == 0) 1281 if (fld.saddr == 0)
1242 goto out; 1282 goto out;
1243 1283
1244 /* 1284 /*
@@ -1252,7 +1292,7 @@ static int dn_route_input_slow(struct sk_buff *skb)
1252 if (dn_dev_islocal(in_dev, cb->src)) 1292 if (dn_dev_islocal(in_dev, cb->src))
1253 goto out; 1293 goto out;
1254 1294
1255 err = dn_fib_lookup(&fl, &res); 1295 err = dn_fib_lookup(&fld, &res);
1256 if (err) { 1296 if (err) {
1257 if (err != -ESRCH) 1297 if (err != -ESRCH)
1258 goto out; 1298 goto out;
@@ -1264,7 +1304,7 @@ static int dn_route_input_slow(struct sk_buff *skb)
1264 1304
1265 res.type = RTN_LOCAL; 1305 res.type = RTN_LOCAL;
1266 } else { 1306 } else {
1267 __le16 src_map = fl.fld_src; 1307 __le16 src_map = fld.saddr;
1268 free_res = 1; 1308 free_res = 1;
1269 1309
1270 out_dev = DN_FIB_RES_DEV(res); 1310 out_dev = DN_FIB_RES_DEV(res);
@@ -1277,22 +1317,22 @@ static int dn_route_input_slow(struct sk_buff *skb)
1277 dev_hold(out_dev); 1317 dev_hold(out_dev);
1278 1318
1279 if (res.r) 1319 if (res.r)
1280 src_map = fl.fld_src; /* no NAT support for now */ 1320 src_map = fld.saddr; /* no NAT support for now */
1281 1321
1282 gateway = DN_FIB_RES_GW(res); 1322 gateway = DN_FIB_RES_GW(res);
1283 if (res.type == RTN_NAT) { 1323 if (res.type == RTN_NAT) {
1284 fl.fld_dst = dn_fib_rules_map_destination(fl.fld_dst, &res); 1324 fld.daddr = dn_fib_rules_map_destination(fld.daddr, &res);
1285 dn_fib_res_put(&res); 1325 dn_fib_res_put(&res);
1286 free_res = 0; 1326 free_res = 0;
1287 if (dn_fib_lookup(&fl, &res)) 1327 if (dn_fib_lookup(&fld, &res))
1288 goto e_inval; 1328 goto e_inval;
1289 free_res = 1; 1329 free_res = 1;
1290 if (res.type != RTN_UNICAST) 1330 if (res.type != RTN_UNICAST)
1291 goto e_inval; 1331 goto e_inval;
1292 flags |= RTCF_DNAT; 1332 flags |= RTCF_DNAT;
1293 gateway = fl.fld_dst; 1333 gateway = fld.daddr;
1294 } 1334 }
1295 fl.fld_src = src_map; 1335 fld.saddr = src_map;
1296 } 1336 }
1297 1337
1298 switch(res.type) { 1338 switch(res.type) {
@@ -1306,8 +1346,8 @@ static int dn_route_input_slow(struct sk_buff *skb)
1306 if (dn_db->parms.forwarding == 0) 1346 if (dn_db->parms.forwarding == 0)
1307 goto e_inval; 1347 goto e_inval;
1308 1348
1309 if (res.fi->fib_nhs > 1 && fl.oif == 0) 1349 if (res.fi->fib_nhs > 1 && fld.flowidn_oif == 0)
1310 dn_fib_select_multipath(&fl, &res); 1350 dn_fib_select_multipath(&fld, &res);
1311 1351
1312 /* 1352 /*
1313 * Check for out_dev == in_dev. We use the RTCF_DOREDIRECT 1353 * Check for out_dev == in_dev. We use the RTCF_DOREDIRECT
@@ -1325,8 +1365,8 @@ static int dn_route_input_slow(struct sk_buff *skb)
1325 break; 1365 break;
1326 case RTN_LOCAL: 1366 case RTN_LOCAL:
1327 flags |= RTCF_LOCAL; 1367 flags |= RTCF_LOCAL;
1328 fl.fld_src = cb->dst; 1368 fld.saddr = cb->dst;
1329 fl.fld_dst = cb->src; 1369 fld.daddr = cb->src;
1330 1370
1331 /* Routing tables gave us a gateway */ 1371 /* Routing tables gave us a gateway */
1332 if (gateway) 1372 if (gateway)
@@ -1355,29 +1395,28 @@ static int dn_route_input_slow(struct sk_buff *skb)
1355 } 1395 }
1356 1396
1357make_route: 1397make_route:
1358 rt = dst_alloc(&dn_dst_ops); 1398 rt = dst_alloc(&dn_dst_ops, out_dev, 0, 0, DST_HOST);
1359 if (rt == NULL) 1399 if (rt == NULL)
1360 goto e_nobufs; 1400 goto e_nobufs;
1361 1401
1362 rt->rt_saddr = fl.fld_src; 1402 memset(&rt->fld, 0, sizeof(rt->fld));
1363 rt->rt_daddr = fl.fld_dst; 1403 rt->rt_saddr = fld.saddr;
1364 rt->rt_gateway = fl.fld_dst; 1404 rt->rt_daddr = fld.daddr;
1405 rt->rt_gateway = fld.daddr;
1365 if (gateway) 1406 if (gateway)
1366 rt->rt_gateway = gateway; 1407 rt->rt_gateway = gateway;
1367 rt->rt_local_src = local_src ? local_src : rt->rt_saddr; 1408 rt->rt_local_src = local_src ? local_src : rt->rt_saddr;
1368 1409
1369 rt->rt_dst_map = fl.fld_dst; 1410 rt->rt_dst_map = fld.daddr;
1370 rt->rt_src_map = fl.fld_src; 1411 rt->rt_src_map = fld.saddr;
1371 1412
1372 rt->fl.fld_src = cb->src; 1413 rt->fld.saddr = cb->src;
1373 rt->fl.fld_dst = cb->dst; 1414 rt->fld.daddr = cb->dst;
1374 rt->fl.oif = 0; 1415 rt->fld.flowidn_oif = 0;
1375 rt->fl.iif = in_dev->ifindex; 1416 rt->fld.flowidn_iif = in_dev->ifindex;
1376 rt->fl.mark = fl.mark; 1417 rt->fld.flowidn_mark = fld.flowidn_mark;
1377 1418
1378 rt->dst.flags = DST_HOST;
1379 rt->dst.neighbour = neigh; 1419 rt->dst.neighbour = neigh;
1380 rt->dst.dev = out_dev;
1381 rt->dst.lastuse = jiffies; 1420 rt->dst.lastuse = jiffies;
1382 rt->dst.output = dn_rt_bug; 1421 rt->dst.output = dn_rt_bug;
1383 switch(res.type) { 1422 switch(res.type) {
@@ -1396,14 +1435,12 @@ make_route:
1396 rt->dst.input = dst_discard; 1435 rt->dst.input = dst_discard;
1397 } 1436 }
1398 rt->rt_flags = flags; 1437 rt->rt_flags = flags;
1399 if (rt->dst.dev)
1400 dev_hold(rt->dst.dev);
1401 1438
1402 err = dn_rt_set_next_hop(rt, &res); 1439 err = dn_rt_set_next_hop(rt, &res);
1403 if (err) 1440 if (err)
1404 goto e_neighbour; 1441 goto e_neighbour;
1405 1442
1406 hash = dn_hash(rt->fl.fld_src, rt->fl.fld_dst); 1443 hash = dn_hash(rt->fld.saddr, rt->fld.daddr);
1407 dn_insert_route(rt, hash, &rt); 1444 dn_insert_route(rt, hash, &rt);
1408 skb_dst_set(skb, &rt->dst); 1445 skb_dst_set(skb, &rt->dst);
1409 1446
@@ -1443,11 +1480,11 @@ static int dn_route_input(struct sk_buff *skb)
1443 rcu_read_lock(); 1480 rcu_read_lock();
1444 for(rt = rcu_dereference(dn_rt_hash_table[hash].chain); rt != NULL; 1481 for(rt = rcu_dereference(dn_rt_hash_table[hash].chain); rt != NULL;
1445 rt = rcu_dereference(rt->dst.dn_next)) { 1482 rt = rcu_dereference(rt->dst.dn_next)) {
1446 if ((rt->fl.fld_src == cb->src) && 1483 if ((rt->fld.saddr == cb->src) &&
1447 (rt->fl.fld_dst == cb->dst) && 1484 (rt->fld.daddr == cb->dst) &&
1448 (rt->fl.oif == 0) && 1485 (rt->fld.flowidn_oif == 0) &&
1449 (rt->fl.mark == skb->mark) && 1486 (rt->fld.flowidn_mark == skb->mark) &&
1450 (rt->fl.iif == cb->iif)) { 1487 (rt->fld.flowidn_iif == cb->iif)) {
1451 dst_use(&rt->dst, jiffies); 1488 dst_use(&rt->dst, jiffies);
1452 rcu_read_unlock(); 1489 rcu_read_unlock();
1453 skb_dst_set(skb, (struct dst_entry *)rt); 1490 skb_dst_set(skb, (struct dst_entry *)rt);
@@ -1483,9 +1520,9 @@ static int dn_rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq,
1483 if (rt->rt_flags & RTCF_NOTIFY) 1520 if (rt->rt_flags & RTCF_NOTIFY)
1484 r->rtm_flags |= RTM_F_NOTIFY; 1521 r->rtm_flags |= RTM_F_NOTIFY;
1485 RTA_PUT(skb, RTA_DST, 2, &rt->rt_daddr); 1522 RTA_PUT(skb, RTA_DST, 2, &rt->rt_daddr);
1486 if (rt->fl.fld_src) { 1523 if (rt->fld.saddr) {
1487 r->rtm_src_len = 16; 1524 r->rtm_src_len = 16;
1488 RTA_PUT(skb, RTA_SRC, 2, &rt->fl.fld_src); 1525 RTA_PUT(skb, RTA_SRC, 2, &rt->fld.saddr);
1489 } 1526 }
1490 if (rt->dst.dev) 1527 if (rt->dst.dev)
1491 RTA_PUT(skb, RTA_OIF, sizeof(int), &rt->dst.dev->ifindex); 1528 RTA_PUT(skb, RTA_OIF, sizeof(int), &rt->dst.dev->ifindex);
@@ -1497,14 +1534,14 @@ static int dn_rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq,
1497 RTA_PUT(skb, RTA_PREFSRC, 2, &rt->rt_local_src); 1534 RTA_PUT(skb, RTA_PREFSRC, 2, &rt->rt_local_src);
1498 if (rt->rt_daddr != rt->rt_gateway) 1535 if (rt->rt_daddr != rt->rt_gateway)
1499 RTA_PUT(skb, RTA_GATEWAY, 2, &rt->rt_gateway); 1536 RTA_PUT(skb, RTA_GATEWAY, 2, &rt->rt_gateway);
1500 if (rtnetlink_put_metrics(skb, rt->dst.metrics) < 0) 1537 if (rtnetlink_put_metrics(skb, dst_metrics_ptr(&rt->dst)) < 0)
1501 goto rtattr_failure; 1538 goto rtattr_failure;
1502 expires = rt->dst.expires ? rt->dst.expires - jiffies : 0; 1539 expires = rt->dst.expires ? rt->dst.expires - jiffies : 0;
1503 if (rtnl_put_cacheinfo(skb, &rt->dst, 0, 0, 0, expires, 1540 if (rtnl_put_cacheinfo(skb, &rt->dst, 0, 0, 0, expires,
1504 rt->dst.error) < 0) 1541 rt->dst.error) < 0)
1505 goto rtattr_failure; 1542 goto rtattr_failure;
1506 if (rt->fl.iif) 1543 if (dn_is_input_route(rt))
1507 RTA_PUT(skb, RTA_IIF, sizeof(int), &rt->fl.iif); 1544 RTA_PUT(skb, RTA_IIF, sizeof(int), &rt->fld.flowidn_iif);
1508 1545
1509 nlh->nlmsg_len = skb_tail_pointer(skb) - b; 1546 nlh->nlmsg_len = skb_tail_pointer(skb) - b;
1510 return skb->len; 1547 return skb->len;
@@ -1527,13 +1564,13 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void
1527 struct dn_skb_cb *cb; 1564 struct dn_skb_cb *cb;
1528 int err; 1565 int err;
1529 struct sk_buff *skb; 1566 struct sk_buff *skb;
1530 struct flowi fl; 1567 struct flowidn fld;
1531 1568
1532 if (!net_eq(net, &init_net)) 1569 if (!net_eq(net, &init_net))
1533 return -EINVAL; 1570 return -EINVAL;
1534 1571
1535 memset(&fl, 0, sizeof(fl)); 1572 memset(&fld, 0, sizeof(fld));
1536 fl.proto = DNPROTO_NSP; 1573 fld.flowidn_proto = DNPROTO_NSP;
1537 1574
1538 skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL); 1575 skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
1539 if (skb == NULL) 1576 if (skb == NULL)
@@ -1542,15 +1579,15 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void
1542 cb = DN_SKB_CB(skb); 1579 cb = DN_SKB_CB(skb);
1543 1580
1544 if (rta[RTA_SRC-1]) 1581 if (rta[RTA_SRC-1])
1545 memcpy(&fl.fld_src, RTA_DATA(rta[RTA_SRC-1]), 2); 1582 memcpy(&fld.saddr, RTA_DATA(rta[RTA_SRC-1]), 2);
1546 if (rta[RTA_DST-1]) 1583 if (rta[RTA_DST-1])
1547 memcpy(&fl.fld_dst, RTA_DATA(rta[RTA_DST-1]), 2); 1584 memcpy(&fld.daddr, RTA_DATA(rta[RTA_DST-1]), 2);
1548 if (rta[RTA_IIF-1]) 1585 if (rta[RTA_IIF-1])
1549 memcpy(&fl.iif, RTA_DATA(rta[RTA_IIF-1]), sizeof(int)); 1586 memcpy(&fld.flowidn_iif, RTA_DATA(rta[RTA_IIF-1]), sizeof(int));
1550 1587
1551 if (fl.iif) { 1588 if (fld.flowidn_iif) {
1552 struct net_device *dev; 1589 struct net_device *dev;
1553 if ((dev = dev_get_by_index(&init_net, fl.iif)) == NULL) { 1590 if ((dev = dev_get_by_index(&init_net, fld.flowidn_iif)) == NULL) {
1554 kfree_skb(skb); 1591 kfree_skb(skb);
1555 return -ENODEV; 1592 return -ENODEV;
1556 } 1593 }
@@ -1561,8 +1598,8 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void
1561 } 1598 }
1562 skb->protocol = htons(ETH_P_DNA_RT); 1599 skb->protocol = htons(ETH_P_DNA_RT);
1563 skb->dev = dev; 1600 skb->dev = dev;
1564 cb->src = fl.fld_src; 1601 cb->src = fld.saddr;
1565 cb->dst = fl.fld_dst; 1602 cb->dst = fld.daddr;
1566 local_bh_disable(); 1603 local_bh_disable();
1567 err = dn_route_input(skb); 1604 err = dn_route_input(skb);
1568 local_bh_enable(); 1605 local_bh_enable();
@@ -1574,8 +1611,8 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void
1574 int oif = 0; 1611 int oif = 0;
1575 if (rta[RTA_OIF - 1]) 1612 if (rta[RTA_OIF - 1])
1576 memcpy(&oif, RTA_DATA(rta[RTA_OIF - 1]), sizeof(int)); 1613 memcpy(&oif, RTA_DATA(rta[RTA_OIF - 1]), sizeof(int));
1577 fl.oif = oif; 1614 fld.flowidn_oif = oif;
1578 err = dn_route_output_key((struct dst_entry **)&rt, &fl, 0); 1615 err = dn_route_output_key((struct dst_entry **)&rt, &fld, 0);
1579 } 1616 }
1580 1617
1581 if (skb->dev) 1618 if (skb->dev)
@@ -1678,15 +1715,15 @@ static struct dn_route *dn_rt_cache_get_next(struct seq_file *seq, struct dn_rou
1678{ 1715{
1679 struct dn_rt_cache_iter_state *s = seq->private; 1716 struct dn_rt_cache_iter_state *s = seq->private;
1680 1717
1681 rt = rt->dst.dn_next; 1718 rt = rcu_dereference_bh(rt->dst.dn_next);
1682 while(!rt) { 1719 while (!rt) {
1683 rcu_read_unlock_bh(); 1720 rcu_read_unlock_bh();
1684 if (--s->bucket < 0) 1721 if (--s->bucket < 0)
1685 break; 1722 break;
1686 rcu_read_lock_bh(); 1723 rcu_read_lock_bh();
1687 rt = dn_rt_hash_table[s->bucket].chain; 1724 rt = rcu_dereference_bh(dn_rt_hash_table[s->bucket].chain);
1688 } 1725 }
1689 return rcu_dereference_bh(rt); 1726 return rt;
1690} 1727}
1691 1728
1692static void *dn_rt_cache_seq_start(struct seq_file *seq, loff_t *pos) 1729static void *dn_rt_cache_seq_start(struct seq_file *seq, loff_t *pos)
@@ -1758,6 +1795,7 @@ void __init dn_route_init(void)
1758 dn_dst_ops.kmem_cachep = 1795 dn_dst_ops.kmem_cachep =
1759 kmem_cache_create("dn_dst_cache", sizeof(struct dn_route), 0, 1796 kmem_cache_create("dn_dst_cache", sizeof(struct dn_route), 0,
1760 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); 1797 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
1798 dst_entries_init(&dn_dst_ops);
1761 setup_timer(&dn_route_timer, dn_dst_check_expire, 0); 1799 setup_timer(&dn_route_timer, dn_dst_check_expire, 0);
1762 dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ; 1800 dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ;
1763 add_timer(&dn_route_timer); 1801 add_timer(&dn_route_timer);
@@ -1816,5 +1854,6 @@ void __exit dn_route_cleanup(void)
1816 dn_run_flush(0); 1854 dn_run_flush(0);
1817 1855
1818 proc_net_remove(&init_net, "decnet_cache"); 1856 proc_net_remove(&init_net, "decnet_cache");
1857 dst_entries_destroy(&dn_dst_ops);
1819} 1858}
1820 1859
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index 48fdf10be7a1..f0efb0ccfeca 100644
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -49,14 +49,15 @@ struct dn_fib_rule
49}; 49};
50 50
51 51
52int dn_fib_lookup(struct flowi *flp, struct dn_fib_res *res) 52int dn_fib_lookup(struct flowidn *flp, struct dn_fib_res *res)
53{ 53{
54 struct fib_lookup_arg arg = { 54 struct fib_lookup_arg arg = {
55 .result = res, 55 .result = res,
56 }; 56 };
57 int err; 57 int err;
58 58
59 err = fib_rules_lookup(dn_fib_rules_ops, flp, 0, &arg); 59 err = fib_rules_lookup(dn_fib_rules_ops,
60 flowidn_to_flowi(flp), 0, &arg);
60 res->r = arg.rule; 61 res->r = arg.rule;
61 62
62 return err; 63 return err;
@@ -65,6 +66,7 @@ int dn_fib_lookup(struct flowi *flp, struct dn_fib_res *res)
65static int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp, 66static int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp,
66 int flags, struct fib_lookup_arg *arg) 67 int flags, struct fib_lookup_arg *arg)
67{ 68{
69 struct flowidn *fld = &flp->u.dn;
68 int err = -EAGAIN; 70 int err = -EAGAIN;
69 struct dn_fib_table *tbl; 71 struct dn_fib_table *tbl;
70 72
@@ -90,7 +92,7 @@ static int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp,
90 if (tbl == NULL) 92 if (tbl == NULL)
91 goto errout; 93 goto errout;
92 94
93 err = tbl->lookup(tbl, flp, (struct dn_fib_res *)arg->result); 95 err = tbl->lookup(tbl, fld, (struct dn_fib_res *)arg->result);
94 if (err > 0) 96 if (err > 0)
95 err = -EAGAIN; 97 err = -EAGAIN;
96errout: 98errout:
@@ -104,8 +106,9 @@ static const struct nla_policy dn_fib_rule_policy[FRA_MAX+1] = {
104static int dn_fib_rule_match(struct fib_rule *rule, struct flowi *fl, int flags) 106static int dn_fib_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)
105{ 107{
106 struct dn_fib_rule *r = (struct dn_fib_rule *)rule; 108 struct dn_fib_rule *r = (struct dn_fib_rule *)rule;
107 __le16 daddr = fl->fld_dst; 109 struct flowidn *fld = &fl->u.dn;
108 __le16 saddr = fl->fld_src; 110 __le16 daddr = fld->daddr;
111 __le16 saddr = fld->saddr;
109 112
110 if (((saddr ^ r->src) & r->srcmask) || 113 if (((saddr ^ r->src) & r->srcmask) ||
111 ((daddr ^ r->dst) & r->dstmask)) 114 ((daddr ^ r->dst) & r->dstmask))
@@ -175,7 +178,7 @@ static int dn_fib_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,
175 178
176unsigned dnet_addr_type(__le16 addr) 179unsigned dnet_addr_type(__le16 addr)
177{ 180{
178 struct flowi fl = { .nl_u = { .dn_u = { .daddr = addr } } }; 181 struct flowidn fld = { .daddr = addr };
179 struct dn_fib_res res; 182 struct dn_fib_res res;
180 unsigned ret = RTN_UNICAST; 183 unsigned ret = RTN_UNICAST;
181 struct dn_fib_table *tb = dn_fib_get_table(RT_TABLE_LOCAL, 0); 184 struct dn_fib_table *tb = dn_fib_get_table(RT_TABLE_LOCAL, 0);
@@ -183,7 +186,7 @@ unsigned dnet_addr_type(__le16 addr)
183 res.r = NULL; 186 res.r = NULL;
184 187
185 if (tb) { 188 if (tb) {
186 if (!tb->lookup(tb, &fl, &res)) { 189 if (!tb->lookup(tb, &fld, &res)) {
187 ret = res.type; 190 ret = res.type;
188 dn_fib_res_put(&res); 191 dn_fib_res_put(&res);
189 } 192 }
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index f2abd3755690..bd0a52dd1d40 100644
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -59,7 +59,6 @@ struct dn_hash
59}; 59};
60 60
61#define dz_key_0(key) ((key).datum = 0) 61#define dz_key_0(key) ((key).datum = 0)
62#define dz_prefix(key,dz) ((key).datum)
63 62
64#define for_nexthops(fi) { int nhsel; const struct dn_fib_nh *nh;\ 63#define for_nexthops(fi) { int nhsel; const struct dn_fib_nh *nh;\
65 for(nhsel = 0, nh = (fi)->fib_nh; nhsel < (fi)->fib_nhs; nh++, nhsel++) 64 for(nhsel = 0, nh = (fi)->fib_nh; nhsel < (fi)->fib_nhs; nh++, nhsel++)
@@ -124,11 +123,11 @@ static inline void dn_rebuild_zone(struct dn_zone *dz,
124 struct dn_fib_node **old_ht, 123 struct dn_fib_node **old_ht,
125 int old_divisor) 124 int old_divisor)
126{ 125{
127 int i;
128 struct dn_fib_node *f, **fp, *next; 126 struct dn_fib_node *f, **fp, *next;
127 int i;
129 128
130 for(i = 0; i < old_divisor; i++) { 129 for(i = 0; i < old_divisor; i++) {
131 for(f = old_ht[i]; f; f = f->fn_next) { 130 for(f = old_ht[i]; f; f = next) {
132 next = f->fn_next; 131 next = f->fn_next;
133 for(fp = dn_chain_p(f->fn_key, dz); 132 for(fp = dn_chain_p(f->fn_key, dz);
134 *fp && dn_key_leq((*fp)->fn_key, f->fn_key); 133 *fp && dn_key_leq((*fp)->fn_key, f->fn_key);
@@ -765,7 +764,7 @@ static int dn_fib_table_flush(struct dn_fib_table *tb)
765 return found; 764 return found;
766} 765}
767 766
768static int dn_fib_table_lookup(struct dn_fib_table *tb, const struct flowi *flp, struct dn_fib_res *res) 767static int dn_fib_table_lookup(struct dn_fib_table *tb, const struct flowidn *flp, struct dn_fib_res *res)
769{ 768{
770 int err; 769 int err;
771 struct dn_zone *dz; 770 struct dn_zone *dz;
@@ -774,7 +773,7 @@ static int dn_fib_table_lookup(struct dn_fib_table *tb, const struct flowi *flp,
774 read_lock(&dn_fib_tables_lock); 773 read_lock(&dn_fib_tables_lock);
775 for(dz = t->dh_zone_list; dz; dz = dz->dz_next) { 774 for(dz = t->dh_zone_list; dz; dz = dz->dz_next) {
776 struct dn_fib_node *f; 775 struct dn_fib_node *f;
777 dn_fib_key_t k = dz_key(flp->fld_dst, dz); 776 dn_fib_key_t k = dz_key(flp->daddr, dz);
778 777
779 for(f = dz_chain(k, dz); f; f = f->fn_next) { 778 for(f = dz_chain(k, dz); f; f = f->fn_next) {
780 if (!dn_key_eq(k, f->fn_key)) { 779 if (!dn_key_eq(k, f->fn_key)) {
@@ -789,7 +788,7 @@ static int dn_fib_table_lookup(struct dn_fib_table *tb, const struct flowi *flp,
789 if (f->fn_state&DN_S_ZOMBIE) 788 if (f->fn_state&DN_S_ZOMBIE)
790 continue; 789 continue;
791 790
792 if (f->fn_scope < flp->fld_scope) 791 if (f->fn_scope < flp->flowidn_scope)
793 continue; 792 continue;
794 793
795 err = dn_fib_semantic_match(f->fn_type, DN_FIB_INFO(f), flp, res); 794 err = dn_fib_semantic_match(f->fn_type, DN_FIB_INFO(f), flp, res);
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index be3eb8e23288..28f8b5e5f73b 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -38,7 +38,7 @@ int decnet_log_martians = 1;
38int decnet_no_fc_max_cwnd = NSP_MIN_WINDOW; 38int decnet_no_fc_max_cwnd = NSP_MIN_WINDOW;
39 39
40/* Reasonable defaults, I hope, based on tcp's defaults */ 40/* Reasonable defaults, I hope, based on tcp's defaults */
41int sysctl_decnet_mem[3] = { 768 << 3, 1024 << 3, 1536 << 3 }; 41long sysctl_decnet_mem[3] = { 768 << 3, 1024 << 3, 1536 << 3 };
42int sysctl_decnet_wmem[3] = { 4 * 1024, 16 * 1024, 128 * 1024 }; 42int sysctl_decnet_wmem[3] = { 4 * 1024, 16 * 1024, 128 * 1024 };
43int sysctl_decnet_rmem[3] = { 4 * 1024, 87380, 87380 * 2 }; 43int sysctl_decnet_rmem[3] = { 4 * 1024, 87380, 87380 * 2 };
44 44
@@ -324,7 +324,7 @@ static ctl_table dn_table[] = {
324 .data = &sysctl_decnet_mem, 324 .data = &sysctl_decnet_mem,
325 .maxlen = sizeof(sysctl_decnet_mem), 325 .maxlen = sizeof(sysctl_decnet_mem),
326 .mode = 0644, 326 .mode = 0644,
327 .proc_handler = proc_dointvec, 327 .proc_handler = proc_doulongvec_minmax
328 }, 328 },
329 { 329 {
330 .procname = "decnet_rmem", 330 .procname = "decnet_rmem",
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-03 03:38:37 -0400