[TCP]: Fix NewReno's fast rexmit/recovery problems with GSOed skb

[safe/jmp/linux-2.6] / net / ipv4 / raw.c

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index a490a9d..a3002fe 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -352,6 +352,7 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length,
        skb_reserve(skb, hh_len);
 
        skb->priority = sk->sk_priority;
+       skb->mark = sk->sk_mark;
        skb->dst = dst_clone(&rt->u.dst);
 
        skb_reset_network_header(skb);
@@ -544,6 +545,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 
        {
                struct flowi fl = { .oif = ipc.oif,
+                                   .mark = sk->sk_mark,
                                    .nl_u = { .ip4_u =
                                              { .daddr = daddr,
                                                .saddr = saddr,
@@ -558,7 +560,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                }
 
                security_sk_classify_flow(sk, &fl);
-               err = ip_route_output_flow(&rt, &fl, sk, 1);
+               err = ip_route_output_flow(&init_net, &rt, &fl, sk, 1);
        }
        if (err)
                goto done;
@@ -625,7 +627,7 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 
        if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in))
                goto out;
-       chk_addr_ret = inet_addr_type(&init_net, addr->sin_addr.s_addr);
+       chk_addr_ret = inet_addr_type(sk->sk_net, addr->sin_addr.s_addr);
        ret = -EADDRNOTAVAIL;
        if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL &&
            chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
@@ -860,7 +862,7 @@ static struct sock *raw_get_first(struct seq_file *seq)
                struct hlist_node *node;
 
                sk_for_each(sk, node, &state->h->ht[state->bucket])
-                       if (sk->sk_family == state->family)
+                       if (sk->sk_net == state->p.net)
                                goto found;
        }
        sk = NULL;
@@ -876,7 +878,7 @@ static struct sock *raw_get_next(struct seq_file *seq, struct sock *sk)
                sk = sk_next(sk);
 try_again:
                ;
-       } while (sk && sk->sk_family != state->family);
+       } while (sk && sk->sk_net != state->p.net);
 
        if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
                sk = sk_head(&state->h->ht[state->bucket]);
@@ -925,7 +927,7 @@ void raw_seq_stop(struct seq_file *seq, void *v)
 }
 EXPORT_SYMBOL_GPL(raw_seq_stop);
 
-static __inline__ char *get_raw_sock(struct sock *sp, char *tmpbuf, int i)
+static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
 {
        struct inet_sock *inet = inet_sk(sp);
        __be32 dest = inet->daddr,
@@ -933,33 +935,23 @@ static __inline__ char *get_raw_sock(struct sock *sp, char *tmpbuf, int i)
        __u16 destp = 0,
              srcp  = inet->num;
 
-       sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X"
+       seq_printf(seq, "%4d: %08X:%04X %08X:%04X"
                " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d",
                i, src, srcp, dest, destp, sp->sk_state,
                atomic_read(&sp->sk_wmem_alloc),
                atomic_read(&sp->sk_rmem_alloc),
                0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
                atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
-       return tmpbuf;
 }
 
-#define TMPSZ 128
-
 static int raw_seq_show(struct seq_file *seq, void *v)
 {
-       char tmpbuf[TMPSZ+1];
-
        if (v == SEQ_START_TOKEN)
-               seq_printf(seq, "%-*s\n", TMPSZ-1,
-                              "  sl  local_address rem_address   st tx_queue "
-                              "rx_queue tr tm->when retrnsmt   uid  timeout "
-                              "inode  drops");
-       else {
-               struct raw_iter_state *state = raw_seq_private(seq);
-
-               seq_printf(seq, "%-*s\n", TMPSZ-1,
-                          get_raw_sock(v, tmpbuf, state->bucket));
-       }
+               seq_printf(seq, "  sl  local_address rem_address   st tx_queue "
+                               "rx_queue tr tm->when retrnsmt   uid  timeout "
+                               "inode  drops\n");
+       else
+               raw_sock_seq_show(seq, v, raw_seq_private(seq)->bucket);
        return 0;
 }
 
@@ -970,25 +962,25 @@ static const struct seq_operations raw_seq_ops = {
        .show  = raw_seq_show,
 };
 
-int raw_seq_open(struct file *file, struct raw_hashinfo *h,
-               unsigned short family)
+int raw_seq_open(struct inode *ino, struct file *file,
+                struct raw_hashinfo *h, const struct seq_operations *ops)
 {
+       int err;
        struct raw_iter_state *i;
 
-       i = __seq_open_private(file, &raw_seq_ops,
-                       sizeof(struct raw_iter_state));
-       if (i == NULL)
-               return -ENOMEM;
+       err = seq_open_net(ino, file, ops, sizeof(struct raw_iter_state));
+       if (err < 0)
+               return err;
 
+       i = raw_seq_private((struct seq_file *)file->private_data);
        i->h = h;
-       i->family = family;
        return 0;
 }
 EXPORT_SYMBOL_GPL(raw_seq_open);
 
 static int raw_v4_seq_open(struct inode *inode, struct file *file)
 {
-       return raw_seq_open(file, &raw_v4_hashinfo, PF_INET);
+       return raw_seq_open(inode, file, &raw_v4_hashinfo, &raw_seq_ops);
 }
 
 static const struct file_operations raw_seq_fops = {
@@ -996,18 +988,34 @@ static const struct file_operations raw_seq_fops = {
        .open    = raw_v4_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = seq_release_private,
+       .release = seq_release_net,
 };
 
-int __init raw_proc_init(void)
+static __net_init int raw_init_net(struct net *net)
 {
-       if (!proc_net_fops_create(&init_net, "raw", S_IRUGO, &raw_seq_fops))
+       if (!proc_net_fops_create(net, "raw", S_IRUGO, &raw_seq_fops))
                return -ENOMEM;
+
        return 0;
 }
 
+static __net_exit void raw_exit_net(struct net *net)
+{
+       proc_net_remove(net, "raw");
+}
+
+static __net_initdata struct pernet_operations raw_net_ops = {
+       .init = raw_init_net,
+       .exit = raw_exit_net,
+};
+
+int __init raw_proc_init(void)
+{
+       return register_pernet_subsys(&raw_net_ops);
+}
+
 void __init raw_proc_exit(void)
 {
-       proc_net_remove(&init_net, "raw");
+       unregister_pernet_subsys(&raw_net_ops);
 }
 #endif /* CONFIG_PROC_FS */