1 files changed, 41 insertions, 7 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index 101b9623e85a..159f12270085 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -472,8 +472,14 @@ struct sock {
         u32                     sk_ack_backlog;
         u32                     sk_max_ack_backlog;
         kuid_t                  sk_uid;
+#if IS_ENABLED(CONFIG_DEBUG_SPINLOCK) || IS_ENABLED(CONFIG_DEBUG_LOCK_ALLOC)
+        spinlock_t              sk_peer_lock;
+#else
+        /* sk_peer_lock is in the ANDROID_KABI_RESERVE(1) field below */
+#endif
         struct pid              *sk_peer_pid;
         const struct cred       *sk_peer_cred;
+
         long                    sk_rcvtimeo;
         ktime_t                 sk_stamp;
 #if BITS_PER_LONG==32
@@ -511,7 +517,11 @@ struct sock {
         struct sock_reuseport __rcu     *sk_reuseport_cb;
         struct rcu_head         sk_rcu;
 
+#if IS_ENABLED(CONFIG_DEBUG_SPINLOCK) || IS_ENABLED(CONFIG_DEBUG_LOCK_ALLOC)
         ANDROID_KABI_RESERVE(1);
+#else
+        ANDROID_KABI_USE(1, spinlock_t sk_peer_lock);
+#endif
         ANDROID_KABI_RESERVE(2);
         ANDROID_KABI_RESERVE(3);
         ANDROID_KABI_RESERVE(4);
@@ -1842,7 +1852,8 @@ static inline u32 net_tx_rndhash(void)
 
 static inline void sk_set_txhash(struct sock *sk)
 {
-        sk->sk_txhash = net_tx_rndhash();
+        /* This pairs with READ_ONCE() in skb_set_hash_from_sk() */
+        WRITE_ONCE(sk->sk_txhash, net_tx_rndhash());
 }
 
 static inline void sk_rethink_txhash(struct sock *sk)
@@ -2113,9 +2124,12 @@ static inline void sock_poll_wait(struct file *filp, struct socket *sock,
 
 static inline void skb_set_hash_from_sk(struct sk_buff *skb, struct sock *sk)
 {
-        if (sk->sk_txhash) {
+        /* This pairs with WRITE_ONCE() in sk_set_txhash() */
+        u32 txhash = READ_ONCE(sk->sk_txhash);
+
+        if (txhash) {
                 skb->l4_hash = 1;
-                skb->hash = sk->sk_txhash;
+                skb->hash = txhash;
         }
 }
 
@@ -2404,22 +2418,39 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,
 void __sock_tx_timestamp(__u16 tsflags, __u8 *tx_flags);
 
 /**
- * sock_tx_timestamp - checks whether the outgoing packet is to be time stamped
+ * _sock_tx_timestamp - checks whether the outgoing packet is to be time stamped
  * @sk:         socket sending this packet
  * @tsflags:    timestamping flags to use
  * @tx_flags:   completed with instructions for time stamping
+ * @tskey:      filled in with next sk_tskey (not for TCP, which uses seqno)
  *
  * Note: callers should take care of initial ``*tx_flags`` value (usually 0)
  */
-static inline void sock_tx_timestamp(const struct sock *sk, __u16 tsflags,
-                                     __u8 *tx_flags)
+static inline void _sock_tx_timestamp(struct sock *sk, __u16 tsflags,
+                                      __u8 *tx_flags, __u32 *tskey)
 {
-        if (unlikely(tsflags))
+        if (unlikely(tsflags)) {
                 __sock_tx_timestamp(tsflags, tx_flags);
+                if (tsflags & SOF_TIMESTAMPING_OPT_ID && tskey &&
+                    tsflags & SOF_TIMESTAMPING_TX_RECORD_MASK)
+                        *tskey = sk->sk_tskey++;
+        }
         if (unlikely(sock_flag(sk, SOCK_WIFI_STATUS)))
                 *tx_flags |= SKBTX_WIFI_STATUS;
 }
 
+static inline void sock_tx_timestamp(struct sock *sk, __u16 tsflags,
+                                     __u8 *tx_flags)
+{
+        _sock_tx_timestamp(sk, tsflags, tx_flags, NULL);
+}
+
+static inline void skb_setup_tx_timestamp(struct sk_buff *skb, __u16 tsflags)
+{
+        _sock_tx_timestamp(skb->sk, tsflags, &skb_shinfo(skb)->tx_flags,
+                           &skb_shinfo(skb)->tskey);
+}
+
 /**
  * sk_eat_skb - Release a skb if it is no longer needed
  * @sk: socket to eat this skb from
@@ -2522,6 +2553,9 @@ extern int sysctl_optmem_max;
 extern __u32 sysctl_wmem_default;
 extern __u32 sysctl_rmem_default;
 
+/* On 32bit arches, an skb frag is limited to 2^15 */
+#define SKB_FRAG_PAGE_ORDER     get_order(32768)
+
 static inline int sk_get_wmem0(const struct sock *sk, const struct proto *proto)
 {
         /* Does this proto have per netns sysctl_wmem ? */