@@ -1590,6 +1590,8 @@ struct task_struct {
#ifdef CONFIG_HAVE_HW_BREAKPOINT
atomic_t ptrace_bp_refcnt;
#endif
+ u64 rx_bytes;
+ u64 tx_bytes;
};
/* Future-safe accessor for struct task_struct's cpus_allowed. */
@@ -33,7 +33,7 @@
*/
-#define TASKSTATS_VERSION 8
+#define TASKSTATS_VERSION 9
#define TS_COMM_LEN 32 /* should be >= TASK_COMM_LEN
* in linux/sched.h */
@@ -163,6 +163,11 @@ struct taskstats {
/* Delay waiting for memory reclaim */
__u64 freepages_count;
__u64 freepages_delay_total;
+ /* Version 8 ends here */
+
+ /* Net accounting */
+ __u64 rx_bytes;
+ __u64 tx_bytes;
};
@@ -1735,6 +1735,18 @@ static inline int skb_copy_to_page(struct sock
*sk, char __user *from,
return 0;
}
+static inline void task_net_accounting_rx(int len)
+{
+ if (!in_irq() && len > 0)
+ current->rx_bytes += len;
+}
+
+static inline void task_net_accounting_tx(int len)
+{
+ if (!in_irq() && len > 0)
+ current->tx_bytes += len;
+}
+
/**
* sk_wmem_alloc_get - returns write allocations
* @sk: socket
@@ -1168,6 +1168,7 @@ static struct task_struct *copy_process(unsigned
long clone_flags,
p->default_timer_slack_ns = current->timer_slack_ns;
task_io_accounting_init(&p->ioac);
+ p->rx_bytes = p->tx_bytes = 0;
acct_clear_integrals(p);
posix_cpu_timers_init(p);
@@ -194,6 +194,9 @@ static void fill_stats(struct task_struct *tsk,
struct taskstats *stats)
/* fill in extended acct fields */
xacct_add_tsk(stats, tsk);
+
+ stats->rx_bytes = tsk->rx_bytes;
+ stats->tx_bytes = tsk->tx_bytes;
}
static int fill_stats_for_pid(pid_t pid, struct taskstats *stats)
@@ -247,6 +250,9 @@ static int fill_stats_for_tgid(pid_t tgid, struct
taskstats *stats)
stats->nvcsw += tsk->nvcsw;
stats->nivcsw += tsk->nivcsw;
+
+ stats->rx_bytes += tsk->rx_bytes;
+ stats->tx_bytes += tsk->tx_bytes;
} while_each_thread(first, tsk);
unlock_task_sighand(first, &flags);
@@ -548,6 +548,7 @@ static inline int __sock_sendmsg_nosec(struct kiocb
*iocb, struct socket *sock,
struct msghdr *msg, size_t size)
{
struct sock_iocb *si = kiocb_to_siocb(iocb);
+ int ret;
sock_update_classid(sock->sk);
This patch adds L7 traffic accounting in taskstats API, so the iotop like applications can receive these statistics data. In fact, I also have an iotop patch for this change. It ignores any protocol header overhead, so results of this patch should be saw as the applications-aware data statistics instead of traffic statistics on wire. The changes of v3 are: 1. Fix unsigned type of parameter of task_net_accounting_tx/rx() That is all, hope this is ready to merge. Thanks. Signed-off-by: Li Yu <bingtian.ly@taobao.com> include/linux/sched.h | 2 ++ include/linux/taskstats.h | 7 ++++++- include/net/sock.h | 12 ++++++++++++ kernel/fork.c | 1 + kernel/taskstats.c | 6 ++++++ net/socket.c | 27 ++++++++++++++++++++++----- 6 files changed, 49 insertions(+), 6 deletions(-) @@ -558,7 +559,10 @@ static inline int __sock_sendmsg_nosec(struct kiocb *iocb, struct socket *sock, si->msg = msg; si->size = size; - return sock->ops->sendmsg(iocb, sock, msg, size); + ret = sock->ops->sendmsg(iocb, sock, msg, size); + task_net_accounting_tx(ret); + + return ret; } static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, @@ -714,6 +718,7 @@ static inline int __sock_recvmsg_nosec(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t size, int flags) { struct sock_iocb *si = kiocb_to_siocb(iocb); + int ret; sock_update_classid(sock->sk); @@ -723,7 +728,10 @@ static inline int __sock_recvmsg_nosec(struct kiocb *iocb, struct socket *sock, si->size = size; si->flags = flags; - return sock->ops->recvmsg(iocb, sock, msg, size, flags); + ret = sock->ops->recvmsg(iocb, sock, msg, size, flags); + task_net_accounting_rx(ret); + + return ret; } static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, @@ -823,13 +831,17 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos, unsigned int flags) { struct socket *sock = file->private_data; + int ret; if (unlikely(!sock->ops->splice_read)) return -EINVAL; sock_update_classid(sock->sk); - return sock->ops->splice_read(sock, ppos, pipe, len, flags); + ret = sock->ops->splice_read(sock, ppos, pipe, len, flags); + task_net_accounting_rx(ret); + + return ret; } static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb, @@ -3361,10 +3373,15 @@ EXPORT_SYMBOL(kernel_setsockopt); int kernel_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags) { + int ret; + sock_update_classid(sock->sk); - if (sock->ops->sendpage) - return sock->ops->sendpage(sock, page, offset, size, flags); + if (sock->ops->sendpage) { + ret = sock->ops->sendpage(sock, page, offset, size, flags); + task_net_accounting_tx(ret); + return ret; + } return sock_no_sendpage(sock, page, offset, size, flags); } -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html