From patchwork Mon Jan 26 19:59:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Horman X-Patchwork-Id: 20327 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 38C78DE0D2 for ; Tue, 27 Jan 2009 06:59:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752391AbZAZT7o (ORCPT ); Mon, 26 Jan 2009 14:59:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753772AbZAZT7o (ORCPT ); Mon, 26 Jan 2009 14:59:44 -0500 Received: from charlotte.tuxdriver.com ([70.61.120.58]:35760 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752391AbZAZT7n (ORCPT ); Mon, 26 Jan 2009 14:59:43 -0500 Received: from nat-pool-rdu.redhat.com ([66.187.233.202] helo=localhost) by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1LRXcT-0005ug-00; Mon, 26 Jan 2009 14:59:41 -0500 Date: Mon, 26 Jan 2009 14:59:30 -0500 From: Neil Horman To: netdev@vger.kernel.org Cc: davem@davemloft.net, nhorman@tuxdriver.com Subject: [PATCH] net: add tracepoints to socket api Message-ID: <20090126195930.GA28208@hmsreliant.think-freely.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-Spam-Score: -1.4 (-) X-Spam-Status: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hey all- I've been working for a bit with the various tracepoints that have been developed in the lttng tree. The infrastructure is available in the main line kernel. All thats missing are the tracepoints themselves. While some seem to be contentious for various reasons, most seem benign, and can be rather usefull, so I was thinking we could start importing Some for the net stack. Heres a patch for the top level socket api tracepoints. If these are acceptable, I'll begin porting over the rest for the remainder of the network stack. This patch applies cleanly against the net-next tree. Regards Neil Signed-off-by: Neil Horman socket.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- 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 diff --git a/net/socket.c b/net/socket.c index 35dd737..6cf37f8 100644 --- a/net/socket.c +++ b/net/socket.c @@ -95,6 +95,7 @@ #include #include +#include static int sock_no_open(struct inode *irrelevant, struct file *dontcare); static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, @@ -155,6 +156,11 @@ static const struct net_proto_family *net_families[NPROTO] __read_mostly; static DEFINE_PER_CPU(int, sockets_in_use) = 0; +DEFINE_TRACE(socket_sendmsg); +DEFINE_TRACE(socket_recvmsg); +DEFINE_TRACE(socket_create); +DEFINE_TRACE(socket_call); + /* * Support routines. * Move socket addresses back and forth across the kernel/user @@ -574,6 +580,7 @@ int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) ret = __sock_sendmsg(&iocb, sock, msg, size); if (-EIOCBQUEUED == ret) ret = wait_on_sync_kiocb(&iocb); + trace_socket_sendmsg(sock, msg, size, ret); return ret; } @@ -653,10 +660,12 @@ int sock_recvmsg(struct socket *sock, struct msghdr *msg, int ret; init_sync_kiocb(&iocb, NULL); + iocb.private = &siocb; ret = __sock_recvmsg(&iocb, sock, msg, size, flags); if (-EIOCBQUEUED == ret) ret = wait_on_sync_kiocb(&iocb); + trace_socket_recvmsg(sock, msg, size, flags, ret); return ret; } @@ -1242,6 +1251,7 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol) if (retval < 0) goto out_release; + trace_socket_create(sock, retval); out: /* It may be already another descriptor 8) Not kernel problem. */ return retval; @@ -2064,6 +2074,8 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args) a0 = a[0]; a1 = a[1]; + trace_socket_call(call, a0); + switch (call) { case SYS_SOCKET: err = sys_socket(a0, a1, a[2]);