From patchwork Fri Jul 19 17:40:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Cochran X-Patchwork-Id: 260315 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 3E5C52C008E for ; Sat, 20 Jul 2013 03:40:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760844Ab3GSRka (ORCPT ); Fri, 19 Jul 2013 13:40:30 -0400 Received: from mail-ee0-f54.google.com ([74.125.83.54]:48508 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760631Ab3GSRk2 (ORCPT ); Fri, 19 Jul 2013 13:40:28 -0400 Received: by mail-ee0-f54.google.com with SMTP id t10so2539702eei.13 for ; Fri, 19 Jul 2013 10:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=RSTo0Lzgq9WRVcX99SsHe4LfH0zCrJDNFCPZTAKpPEw=; b=tjQhsA+3dCT2qxJqMQiYuoi5Pd/H529cGPYfmhi6A/TZ+SZ5zaGlsHq2Npd0KO8G/Q p1C28UbQGiTD6zJNLT8J6jhRJJcirOH3akeU6DovK8iLjAf1vaBntaoOHo2l2GI0Z8QF 0mRGbMbjus+IXxHBv5ggcSVELqlJNue7KcI0xLNsGxCdt4moDWYmXQXQ7Sa5myFiCcQ3 H3ax1PeXwkb7OptT2+b4YngNKPnK9StIS/71WyLfkuAvVz7LWn7Ig6pPzzjLhBHWT6Kt fsn7k0sJjujegIGl4vn8FlhtjtVkg3l+MyXF8JerALx2iRo9cdSiiU7STs2H0n4nOIYK cefQ== X-Received: by 10.15.94.11 with SMTP id ba11mr17113168eeb.101.1374255627508; Fri, 19 Jul 2013 10:40:27 -0700 (PDT) Received: from localhost.localdomain (089144206156.atnat0015.highway.bob.at. [89.144.206.156]) by mx.google.com with ESMTPSA id cg12sm29085860eeb.7.2013.07.19.10.40.24 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Jul 2013 10:40:26 -0700 (PDT) From: Richard Cochran To: Cc: David Miller , "Michael S. Tsirkin" Subject: [PATCH net-next 2/2] tun: Support software transmit time stamping. Date: Fri, 19 Jul 2013 19:40:10 +0200 Message-Id: <6f731f729eaa7f49e4c05f68e07f583b9ee1959f.1374254759.git.richardcochran@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds transmit time stamping to the tun/tap driver. Similar support already exists for UDP, can, and raw packets. Signed-off-by: Richard Cochran --- drivers/net/tun.c | 14 ++++++++++++-- include/uapi/linux/if_tun.h | 3 +++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index db690a3..a72d141 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -739,6 +739,11 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) >= dev->tx_queue_len / tun->numqueues) goto drop; + if (skb->sk) { + sock_tx_timestamp(skb->sk, &skb_shinfo(skb)->tx_flags); + sw_tx_timestamp(skb); + } + /* Orphan the skb - required as we might hang on to it * for indefinite time. */ if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC))) @@ -1476,7 +1481,6 @@ static int tun_sendmsg(struct kiocb *iocb, struct socket *sock, return ret; } - static int tun_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m, size_t total_len, int flags) @@ -1488,10 +1492,15 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock, if (!tun) return -EBADFD; - if (flags & ~(MSG_DONTWAIT|MSG_TRUNC)) { + if (flags & ~(MSG_DONTWAIT|MSG_TRUNC|MSG_ERRQUEUE)) { ret = -EINVAL; goto out; } + if (flags & MSG_ERRQUEUE) { + ret = sock_recv_errqueue(sock->sk, m, total_len, + SOL_PACKET, TUN_TX_TIMESTAMP); + goto out; + } ret = tun_do_read(tun, tfile, iocb, m->msg_iov, total_len, flags & MSG_DONTWAIT); if (ret > total_len) { @@ -2274,6 +2283,7 @@ static const struct ethtool_ops tun_ethtool_ops = { .get_msglevel = tun_get_msglevel, .set_msglevel = tun_set_msglevel, .get_link = ethtool_op_get_link, + .get_ts_info = ethtool_op_get_ts_info, }; diff --git a/include/uapi/linux/if_tun.h b/include/uapi/linux/if_tun.h index 82334f8..1870ee2 100644 --- a/include/uapi/linux/if_tun.h +++ b/include/uapi/linux/if_tun.h @@ -71,6 +71,9 @@ /* read-only flag */ #define IFF_PERSIST 0x0800 +/* Socket options */ +#define TUN_TX_TIMESTAMP 1 + /* Features for GSO (TUNSETOFFLOAD). */ #define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */ #define TUN_F_TSO4 0x02 /* I can handle TSO for IPv4 packets */