Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e94d1ef authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

net: socket: move ktime2ts to ktime header api 



Currently, ktime2ts is a small helper function that is only used in
net/socket.c. Move this helper into the ktime API as a small inline
function, so that i) it's maintained together with ktime routines,
and ii) also other files can make use of it. The function is named
ktime_to_timespec_cond() and placed into the generic part of ktime,
since we internally make use of ktime_to_timespec(). ktime_to_timespec()
itself does not check the ktime variable for zero, hence, we name
this function ktime_to_timespec_cond() for only a conditional
conversion, and adapt its users to it.

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf270148

include/linux/ktime.h

+18 −0
Original line number Diff line number Diff line
@@ -330,6 +330,24 @@ static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec) 


extern ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs);



/**

 * ktime_to_timespec_cond - convert a ktime_t variable to timespec

 *			    format only if the variable contains data

 * @kt:		the ktime_t variable to convert

 * @ts:		the timespec variable to store the result in

 *

 * Returns true if there was a successful conversion, false if kt was 0.

 */

static inline bool ktime_to_timespec_cond(const ktime_t kt, struct timespec *ts)

{

	if (kt.tv64) {

		*ts = ktime_to_timespec(kt);

		return true;

	} else {

		return false;

	}

}



/*

 * The resolution of the clocks. The resolution value is returned in

 * the clock_getres() system call to give application programmers an

net/socket.c

+4 −16
Original line number Diff line number Diff line
@@ -681,16 +681,6 @@ int kernel_sendmsg(struct socket *sock, struct msghdr *msg, 
}

EXPORT_SYMBOL(kernel_sendmsg);



static int ktime2ts(ktime_t kt, struct timespec *ts)

{

	if (kt.tv64) {

		*ts = ktime_to_timespec(kt);

		return 1;

	} else {

		return 0;

	}

}



/*

 * called from sock_recv_timestamp() if sock_flag(sk, SOCK_RCVTSTAMP)

 */
@@ -723,17 +713,15 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk, 




	memset(ts, 0, sizeof(ts));

	if (skb->tstamp.tv64 &&

	    sock_flag(sk, SOCK_TIMESTAMPING_SOFTWARE)) {

		skb_get_timestampns(skb, ts + 0);

	if (sock_flag(sk, SOCK_TIMESTAMPING_SOFTWARE) &&

	    ktime_to_timespec_cond(skb->tstamp, ts + 0))

		empty = 0;

	}

	if (shhwtstamps) {

		if (sock_flag(sk, SOCK_TIMESTAMPING_SYS_HARDWARE) &&

		    ktime2ts(shhwtstamps->syststamp, ts + 1))

		    ktime_to_timespec_cond(shhwtstamps->syststamp, ts + 1))

			empty = 0;

		if (sock_flag(sk, SOCK_TIMESTAMPING_RAW_HARDWARE) &&

		    ktime2ts(shhwtstamps->hwtstamp, ts + 2))

		    ktime_to_timespec_cond(shhwtstamps->hwtstamp, ts + 2))

			empty = 0;

	}

	if (!empty)