RDS: Add support for per socket SO_TIMESTAMP for incoming messages

The SO_TIMESTAMP generates time stamp for each incoming RDS message
using the wall time. Result is returned via recv_msg() in a control
message as timeval (usec resolution).

User app can enable it by using SO_TIMESTAMP setsocketopt() at
SOL_SOCKET level. CMSG data of cmsg type SO_TIMESTAMP contains the
time stamp in struct timeval format.

Orabug: 22190837

Acked-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Acked-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Reviewed-by: Shamir Rabinovitch <shamir.rabinovitch@oracle.com>
Tested-by: Namrata Jampani <namrata.jampani@oracle.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>

diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index f90e097ee1f2a7f27467e9165c87b44820161237..8d131d33436097ac84c2bb976a16cb7f2ae21c7c 100644 (file)
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -362,6 +362,27 @@ static int rds_set_transport(struct rds_sock *rs, char __user *optval,
        return rs->rs_transport ? 0 : -ENOPROTOOPT;
 }
 
+static int rds_enable_recvtstamp(struct sock *sk, char __user *optval,
+                                int optlen)
+{
+       int val, valbool;
+
+       if (optlen != sizeof(int))
+               return -EFAULT;
+
+       if (get_user(val, (int __user *)optval))
+               return -EFAULT;
+
+       valbool = val ? 1 : 0;
+
+       if (valbool)
+               sock_set_flag(sk, SOCK_RCVTSTAMP);
+       else
+               sock_reset_flag(sk, SOCK_RCVTSTAMP);
+
+       return 0;
+}
+
 static int rds_setsockopt(struct socket *sock, int level, int optname,
                          char __user *optval, unsigned int optlen)
 {
@@ -400,6 +421,11 @@ static int rds_setsockopt(struct socket *sock, int level, int optname,
                ret = rds_set_transport(rs, optval, optlen);
                release_sock(sock->sk);
                break;
+       case SO_TIMESTAMP:
+               lock_sock(sock->sk);
+               ret = rds_enable_recvtstamp(sock->sk, optval, optlen);
+               release_sock(sock->sk);
+               break;
        default:
                ret = -ENOPROTOOPT;
        }

diff --git a/net/rds/rds.h b/net/rds/rds.h
index a634a2bb927173727c9586e1becf757c45fd4096..e4a9266892c12c0cc792631a00d8934b7f32342b 100644 (file)
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -284,6 +284,7 @@ struct rds_incoming {
        struct sk_buff          *i_skb;
 
        rds_rdma_cookie_t       i_rdma_cookie;
+       struct timeval          i_rx_tstamp;
 };
 
 struct rds_mr {

diff --git a/net/rds/recv.c b/net/rds/recv.c
index 23ce423ca7ce8449b00caf613a92fd6e95cc5740..ae827970e36a1ff05bfb166966c9504a243e232c 100644 (file)
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -35,6 +35,8 @@
 #include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/netfilter.h>
+#include <linux/time.h>
+#include <linux/rds.h>
 
 #include "rds.h"
 #include "tcp.h"
@@ -73,6 +75,8 @@ void rds_inc_init(struct rds_incoming *inc, struct rds_connection *conn,
        inc->i_rdma_cookie = 0;
        inc->i_oconn = NULL;
        inc->i_skb   = NULL;
+       inc->i_rx_tstamp.tv_sec = 0;
+       inc->i_rx_tstamp.tv_usec = 0;
 }
 EXPORT_SYMBOL_GPL(rds_inc_init);
 
@@ -546,6 +550,8 @@ rds_recv_local(struct rds_connection *conn, __be32 saddr, __be32 daddr,
                        rds_recv_rcvbuf_delta(rs, sk, inc->i_conn->c_lcong,
                                      be32_to_cpu(inc->i_hdr.h_len),
                                      inc->i_hdr.h_dport);
+                       if (sock_flag(sk, SOCK_RCVTSTAMP))
+                               do_gettimeofday(&inc->i_rx_tstamp);
                        rds_inc_addref(inc);
                        list_add_tail(&inc->i_item, &rs->rs_recv_queue);
                        __rds_wake_sk_sleep(sk);
@@ -711,7 +717,8 @@ static int rds_notify_cong(struct rds_sock *rs, struct msghdr *msghdr)
 /*
  * Receive any control messages.
  */
-static int rds_cmsg_recv(struct rds_incoming *inc, struct msghdr *msg)
+static int rds_cmsg_recv(struct rds_incoming *inc, struct msghdr *msg,
+                        struct rds_sock *rs)
 {
        int ret = 0;
 
@@ -722,6 +729,15 @@ static int rds_cmsg_recv(struct rds_incoming *inc, struct msghdr *msg)
                        return ret;
        }
 
+       if ((inc->i_rx_tstamp.tv_sec != 0) &&
+           sock_flag(rds_rs_to_sk(rs), SOCK_RCVTSTAMP)) {
+               ret = put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMP,
+                              sizeof(struct timeval),
+                              &inc->i_rx_tstamp);
+               if (ret)
+                       return ret;
+       }
+
        return 0;
 }
 
@@ -807,7 +823,7 @@ int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
                        msg->msg_flags |= MSG_TRUNC;
                }
 
-               if (rds_cmsg_recv(inc, msg)) {
+               if (rds_cmsg_recv(inc, msg, rs)) {
                        ret = -EFAULT;
                        goto out;
                }