Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

Two new tls tests added in parallel in both net and net-next.

Used Stephen Rothwell's linux-next resolution.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/microchip/lan743x_main.c
Simple merge

diff --cc drivers/net/veth.c
Simple merge

diff --cc include/net/tls.h
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/sched/act_sample.c
Simple merge

diff --cc net/tls/tls_sw.c
index f4aa7cd,b9c6ecf..5ff51ba
--- 1/net/tls/tls_sw.c
--- 2/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@@ -1106,9 -930,14 +1106,16 @@@ pick_next_record
                                msg->msg_flags |= MSG_EOR;
                                if (control != TLS_RECORD_TYPE_DATA)
                                        goto recv_end;
 +                      } else {
 +                              break;
                        }
+               } else {
+                       /* MSG_PEEK right now cannot look beyond current skb
+                        * from strparser, meaning we cannot advance skb here
+                        * and thus unpause strparser since we'd loose original
+                        * one.
+                        */
+                       break;
                }
  
                /* If we have a new message from strparser, continue now. */

diff --cc tools/include/uapi/linux/if_link.h
Simple merge

diff --cc tools/testing/selftests/net/Makefile
Simple merge

diff --cc tools/testing/selftests/net/tls.c
index 96fc6fe,8fdfeaf..11d54c3
--- 1/tools/testing/selftests/net/tls.c
--- 2/tools/testing/selftests/net/tls.c
+++ b/tools/testing/selftests/net/tls.c
@@@ -502,28 -502,55 +502,78 @@@ TEST_F(tls, recv_peek_multiple
        EXPECT_EQ(memcmp(test_str, buf, send_len), 0);
  }
  
+ TEST_F(tls, recv_peek_multiple_records)
+ {
+       char const *test_str = "test_read_peek_mult_recs";
+       char const *test_str_first = "test_read_peek";
+       char const *test_str_second = "_mult_recs";
+       int len;
+       char buf[64];
+ 
+       len = strlen(test_str_first);
+       EXPECT_EQ(send(self->fd, test_str_first, len, 0), len);
+ 
+       len = strlen(test_str_second) + 1;
+       EXPECT_EQ(send(self->fd, test_str_second, len, 0), len);
+ 
+       len = sizeof(buf);
+       memset(buf, 0, len);
+       EXPECT_NE(recv(self->cfd, buf, len, MSG_PEEK), -1);
+ 
+       /* MSG_PEEK can only peek into the current record. */
+       len = strlen(test_str_first) + 1;
+       EXPECT_EQ(memcmp(test_str_first, buf, len), 0);
+ 
+       len = sizeof(buf);
+       memset(buf, 0, len);
+       EXPECT_NE(recv(self->cfd, buf, len, 0), -1);
+ 
+       /* Non-MSG_PEEK will advance strparser (and therefore record)
+        * however.
+        */
+       len = strlen(test_str) + 1;
+       EXPECT_EQ(memcmp(test_str, buf, len), 0);
+ 
+       /* MSG_MORE will hold current record open, so later MSG_PEEK
+        * will see everything.
+        */
+       len = strlen(test_str_first);
+       EXPECT_EQ(send(self->fd, test_str_first, len, MSG_MORE), len);
+ 
+       len = strlen(test_str_second) + 1;
+       EXPECT_EQ(send(self->fd, test_str_second, len, 0), len);
+ 
+       len = sizeof(buf);
+       memset(buf, 0, len);
+       EXPECT_NE(recv(self->cfd, buf, len, MSG_PEEK), -1);
+ 
+       len = strlen(test_str) + 1;
+       EXPECT_EQ(memcmp(test_str, buf, len), 0);
+ }
+ 
 +TEST_F(tls, recv_peek_large_buf_mult_recs)
 +{
 +      char const *test_str = "test_read_peek_mult_recs";
 +      char const *test_str_first = "test_read_peek";
 +      char const *test_str_second = "_mult_recs";
 +      int len;
 +      char buf[64];
 +
 +      len = strlen(test_str_first);
 +      EXPECT_EQ(send(self->fd, test_str_first, len, 0), len);
 +
 +      len = strlen(test_str_second) + 1;
 +      EXPECT_EQ(send(self->fd, test_str_second, len, 0), len);
 +
 +      len = sizeof(buf);
 +      memset(buf, 0, len);
 +      EXPECT_NE(recv(self->cfd, buf, len, MSG_PEEK), -1);
 +
 +      len = strlen(test_str) + 1;
 +      EXPECT_EQ(memcmp(test_str, buf, len), 0);
 +}
 +
++
  TEST_F(tls, pollin)
  {
        char const *test_str = "test_poll";