5 files changed, 117 insertions, 5 deletions

diff --git a/net/phonet/datagram.c b/net/phonet/datagram.c
index e087862ed7e4..ef5c75c372e4 100644
--- a/net/phonet/datagram.c
+++ b/net/phonet/datagram.c
@@ -159,8 +159,11 @@ out_nofree:
 static int pn_backlog_rcv(struct sock *sk, struct sk_buff *skb)
 {
         int err = sock_queue_rcv_skb(sk, skb);
-        if (err < 0)
+        if (err < 0) {
                 kfree_skb(skb);
+                if (err == -ENOMEM)
+                        atomic_inc(&sk->sk_drops);
+        }
         return err ? NET_RX_DROP : NET_RX_SUCCESS;
 }
 
diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c
index 480839dfc560..4667af51ed71 100644
--- a/net/phonet/pep-gprs.c
+++ b/net/phonet/pep-gprs.c
@@ -195,7 +195,7 @@ static int gprs_xmit(struct sk_buff *skb, struct net_device *dev)
                 break;
         default:
                 dev_kfree_skb(skb);
-                return 0;
+                return NETDEV_TX_OK;
         }
 
         skb_orphan(skb);
@@ -215,7 +215,7 @@ static int gprs_xmit(struct sk_buff *skb, struct net_device *dev)
         netif_stop_queue(dev);
         if (pep_writeable(sk))
                 netif_wake_queue(dev);
-        return 0;
+        return NETDEV_TX_OK;
 }
 
 static int gprs_set_mtu(struct net_device *dev, int new_mtu)
diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index eef833ea6d7b..b8252d289cd7 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -346,8 +346,10 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
                 break;
 
         case PNS_PEP_CTRL_REQ:
-                if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX)
+                if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
+                        atomic_inc(&sk->sk_drops);
                         break;
+                }
                 __skb_pull(skb, 4);
                 queue = &pn->ctrlreq_queue;
                 goto queue;
@@ -358,10 +360,13 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
                         err = sock_queue_rcv_skb(sk, skb);
                         if (!err)
                                 return 0;
+                        if (err == -ENOMEM)
+                                atomic_inc(&sk->sk_drops);
                         break;
                 }
 
                 if (pn->rx_credits == 0) {
+                        atomic_inc(&sk->sk_drops);
                         err = -ENOBUFS;
                         break;
                 }
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index b0d6ddd82a9d..5ae4c01e8388 100644
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -27,6 +27,7 @@
 #include <linux/net.h>
 #include <linux/netdevice.h>
 #include <linux/phonet.h>
+#include <linux/proc_fs.h>
 #include <net/sock.h>
 #include <net/netns/generic.h>
 #include <net/phonet/pn_dev.h>
@@ -96,7 +97,7 @@ struct net_device *phonet_device_get(struct net *net)
 {
         struct phonet_device_list *pndevs = phonet_device_list(net);
         struct phonet_device *pnd;
-        struct net_device *dev;
+        struct net_device *dev = NULL;
 
         spin_lock_bh(&pndevs->lock);
         list_for_each_entry(pnd, &pndevs->list, list) {
@@ -218,6 +219,11 @@ static int phonet_init_net(struct net *net)
         if (!pnn)
                 return -ENOMEM;
 
+        if (!proc_net_fops_create(net, "phonet", 0, &pn_sock_seq_fops)) {
+                kfree(pnn);
+                return -ENOMEM;
+        }
+
         INIT_LIST_HEAD(&pnn->pndevs.list);
         spin_lock_init(&pnn->pndevs.lock);
         net_assign_generic(net, phonet_net_id, pnn);
@@ -233,6 +239,8 @@ static void phonet_exit_net(struct net *net)
         for_each_netdev(net, dev)
                 phonet_device_destroy(dev);
         rtnl_unlock();
+
+        proc_net_remove(net, "phonet");
         kfree(pnn);
 }
 
diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index ada2a35bf7a2..aa1617a7f265 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
@@ -412,3 +412,99 @@ found:
         return 0;
 }
 EXPORT_SYMBOL(pn_sock_get_port);
+
+static struct sock *pn_sock_get_idx(struct seq_file *seq, loff_t pos)
+{
+        struct net *net = seq_file_net(seq);
+        struct hlist_node *node;
+        struct sock *sknode;
+
+        sk_for_each(sknode, node, &pnsocks.hlist) {
+                if (!net_eq(net, sock_net(sknode)))
+                        continue;
+                if (!pos)
+                        return sknode;
+                pos--;
+        }
+        return NULL;
+}
+
+static struct sock *pn_sock_get_next(struct seq_file *seq, struct sock *sk)
+{
+        struct net *net = seq_file_net(seq);
+
+        do
+                sk = sk_next(sk);
+        while (sk && !net_eq(net, sock_net(sk)));
+
+        return sk;
+}
+
+static void *pn_sock_seq_start(struct seq_file *seq, loff_t *pos)
+        __acquires(pnsocks.lock)
+{
+        spin_lock_bh(&pnsocks.lock);
+        return *pos ? pn_sock_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
+}
+
+static void *pn_sock_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        struct sock *sk;
+
+        if (v == SEQ_START_TOKEN)
+                sk = pn_sock_get_idx(seq, 0);
+        else
+                sk = pn_sock_get_next(seq, v);
+        (*pos)++;
+        return sk;
+}
+
+static void pn_sock_seq_stop(struct seq_file *seq, void *v)
+        __releases(pnsocks.lock)
+{
+        spin_unlock_bh(&pnsocks.lock);
+}
+
+static int pn_sock_seq_show(struct seq_file *seq, void *v)
+{
+        int len;
+
+        if (v == SEQ_START_TOKEN)
+                seq_printf(seq, "%s%n", "pt  loc  rem rs st tx_queue rx_queue "
+                        "  uid inode ref pointer drops", &len);
+        else {
+                struct sock *sk = v;
+                struct pn_sock *pn = pn_sk(sk);
+
+                seq_printf(seq, "%2d %04X:%04X:%02X %02X %08X:%08X %5d %lu "
+                        "%d %p %d%n",
+                        sk->sk_protocol, pn->sobject, 0, pn->resource,
+                        sk->sk_state,
+                        sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
+                        sock_i_uid(sk), sock_i_ino(sk),
+                        atomic_read(&sk->sk_refcnt), sk,
+                        atomic_read(&sk->sk_drops), &len);
+        }
+        seq_printf(seq, "%*s\n", 127 - len, "");
+        return 0;
+}
+
+static const struct seq_operations pn_sock_seq_ops = {
+        .start = pn_sock_seq_start,
+        .next = pn_sock_seq_next,
+        .stop = pn_sock_seq_stop,
+        .show = pn_sock_seq_show,
+};
+
+static int pn_sock_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &pn_sock_seq_ops);
+}
+
+const struct file_operations pn_sock_seq_fops = {
+        .owner = THIS_MODULE,
+        .open = pn_sock_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = seq_release,
+};