5 files changed, 35 insertions, 17 deletions

diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c
index 04b8eda94e7d..03cc59ee9c95 100644
--- a/kernel/bpf/hashtab.c
+++ b/kernel/bpf/hashtab.c
@@ -15,6 +15,7 @@
 #include <linux/jhash.h>
 #include <linux/filter.h>
 #include <linux/rculist_nulls.h>
+#include <linux/random.h>
 #include <uapi/linux/btf.h>
 #include "percpu_freelist.h"
 #include "bpf_lru_list.h"
@@ -41,6 +42,7 @@ struct bpf_htab {
         atomic_t count; /* number of elements in this hashtable */
         u32 n_buckets;  /* number of hash buckets */
         u32 elem_size;  /* size of each element in bytes */
+        u32 hashrnd;
 };
 
 /* each htab element is struct htab_elem + key + value */
@@ -371,6 +373,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr)
         if (!htab->buckets)
                 goto free_htab;
 
+        htab->hashrnd = get_random_int();
         for (i = 0; i < htab->n_buckets; i++) {
                 INIT_HLIST_NULLS_HEAD(&htab->buckets[i].head, i);
                 raw_spin_lock_init(&htab->buckets[i].lock);
@@ -402,9 +405,9 @@ free_htab:
         return ERR_PTR(err);
 }
 
-static inline u32 htab_map_hash(const void *key, u32 key_len)
+static inline u32 htab_map_hash(const void *key, u32 key_len, u32 hashrnd)
 {
-        return jhash(key, key_len, 0);
+        return jhash(key, key_len, hashrnd);
 }
 
 static inline struct bucket *__select_bucket(struct bpf_htab *htab, u32 hash)
@@ -470,7 +473,7 @@ static void *__htab_map_lookup_elem(struct bpf_map *map, void *key)
 
         key_size = map->key_size;
 
-        hash = htab_map_hash(key, key_size);
+        hash = htab_map_hash(key, key_size, htab->hashrnd);
 
         head = select_bucket(htab, hash);
 
@@ -597,7 +600,7 @@ static int htab_map_get_next_key(struct bpf_map *map, void *key, void *next_key)
         if (!key)
                 goto find_first_elem;
 
-        hash = htab_map_hash(key, key_size);
+        hash = htab_map_hash(key, key_size, htab->hashrnd);
 
         head = select_bucket(htab, hash);
 
@@ -824,7 +827,7 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value,
 
         key_size = map->key_size;
 
-        hash = htab_map_hash(key, key_size);
+        hash = htab_map_hash(key, key_size, htab->hashrnd);
 
         b = __select_bucket(htab, hash);
         head = &b->head;
@@ -880,7 +883,7 @@ static int htab_lru_map_update_elem(struct bpf_map *map, void *key, void *value,
 
         key_size = map->key_size;
 
-        hash = htab_map_hash(key, key_size);
+        hash = htab_map_hash(key, key_size, htab->hashrnd);
 
         b = __select_bucket(htab, hash);
         head = &b->head;
@@ -945,7 +948,7 @@ static int __htab_percpu_map_update_elem(struct bpf_map *map, void *key,
 
         key_size = map->key_size;
 
-        hash = htab_map_hash(key, key_size);
+        hash = htab_map_hash(key, key_size, htab->hashrnd);
 
         b = __select_bucket(htab, hash);
         head = &b->head;
@@ -998,7 +1001,7 @@ static int __htab_lru_percpu_map_update_elem(struct bpf_map *map, void *key,
 
         key_size = map->key_size;
 
-        hash = htab_map_hash(key, key_size);
+        hash = htab_map_hash(key, key_size, htab->hashrnd);
 
         b = __select_bucket(htab, hash);
         head = &b->head;
@@ -1071,7 +1074,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key)
 
         key_size = map->key_size;
 
-        hash = htab_map_hash(key, key_size);
+        hash = htab_map_hash(key, key_size, htab->hashrnd);
         b = __select_bucket(htab, hash);
         head = &b->head;
 
@@ -1103,7 +1106,7 @@ static int htab_lru_map_delete_elem(struct bpf_map *map, void *key)
 
         key_size = map->key_size;
 
-        hash = htab_map_hash(key, key_size);
+        hash = htab_map_hash(key, key_size, htab->hashrnd);
         b = __select_bucket(htab, hash);
         head = &b->head;
 
diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c
index 98e621a29e8e..cf5195c7c331 100644
--- a/kernel/bpf/sockmap.c
+++ b/kernel/bpf/sockmap.c
@@ -1427,12 +1427,15 @@ out:
 static void smap_write_space(struct sock *sk)
 {
         struct smap_psock *psock;
+        void (*write_space)(struct sock *sk);
 
         rcu_read_lock();
         psock = smap_psock_sk(sk);
         if (likely(psock && test_bit(SMAP_TX_RUNNING, &psock->state)))
                 schedule_work(&psock->tx_work);
+        write_space = psock->save_write_space;
         rcu_read_unlock();
+        write_space(sk);
 }
 
 static void smap_stop_sock(struct smap_psock *psock, struct sock *sk)
@@ -2140,7 +2143,9 @@ static struct bpf_map *sock_hash_alloc(union bpf_attr *attr)
                 return ERR_PTR(-EPERM);
 
         /* check sanity of attributes */
-        if (attr->max_entries == 0 || attr->value_size != 4 ||
+        if (attr->max_entries == 0 ||
+            attr->key_size == 0 ||
+            attr->value_size != 4 ||
             attr->map_flags & ~SOCK_CREATE_FLAG_MASK)
                 return ERR_PTR(-EINVAL);
 
@@ -2267,8 +2272,10 @@ static struct htab_elem *alloc_sock_hash_elem(struct bpf_htab *htab,
         }
         l_new = kmalloc_node(htab->elem_size, GFP_ATOMIC | __GFP_NOWARN,
                              htab->map.numa_node);
-        if (!l_new)
+        if (!l_new) {
+                atomic_dec(&htab->count);
                 return ERR_PTR(-ENOMEM);
+        }
 
         memcpy(l_new->key, key, key_size);
         l_new->sk = sk;
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 93c0c225ab34..180b6640e531 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -213,9 +213,14 @@ static void tls_write_space(struct sock *sk)
 {
         struct tls_context *ctx = tls_get_ctx(sk);
 
-        /* We are already sending pages, ignore notification */
-        if (ctx->in_tcp_sendpages)
+        /* If in_tcp_sendpages call lower protocol write space handler
+         * to ensure we wake up any waiting operations there. For example
+         * if do_tcp_sendpages where to call sk_wait_event.
+         */
+        if (ctx->in_tcp_sendpages) {
+                ctx->sk_write_space(sk);
                 return;
+        }
 
         if (!sk->sk_write_pending && tls_is_pending_closed_record(ctx)) {
                 gfp_t sk_allocation = sk->sk_allocation;
diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c
index 911ca6d3cb5a..bfe2dbea480b 100644
--- a/net/xdp/xdp_umem.c
+++ b/net/xdp/xdp_umem.c
@@ -74,14 +74,14 @@ int xdp_umem_assign_dev(struct xdp_umem *umem, struct net_device *dev,