Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Wed, 24 Mar 2021 17:47:44 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e138138003eb3b3d06cc91cf2e8c5dec77e2a31e

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Wed, 17 Feb 2021 18:52:00 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git 
> refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/51e6d17809c85e1934600ec4cdb85552e9bda254

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Tue, 09 Feb 2021 19:36:11 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/6016bf19b3854b6e70ba9278a7ca0fce75278d3a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sun, 04 Oct 2020 22:07:55 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/165563c05088467e7e0ba382c5bdb04b6cbf0013

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT] Networking

[Jakub Kicinski]

On Tue, 22 Sep 2020 15:02:24 -0700 Linus Torvalds wrote:
> Pulled.

Thanks!

>  (a) please put "git pull" somewhere in the email (lots of people just
> put it in the subject by prepending it with "[GIT PULL]" but all I
> really look for is "git" and "pull" anywhere in the email. You had the
> "git" but there was no "pull" anywhere).
 
>  (b) please use an imperative sentence structure for the description
> instead of present tense.

> Also, I'd love to see signed tags. I don't _require_ them for
> git.kernel.org pulls, but I do prefer them.

Thanks a lot for the guidance. Will do better next time!

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Mon, 21 Sep 2020 18:44:43 -0700:

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d3017135c43373b06eef1eb70dfeb948b8ae159f

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT] Networking

[Linus Torvalds]

On Mon, Sep 21, 2020 at 6:44 PM Jakub Kicinski  wrote:
>
> Here are the latest updates from the networking tree:

Pulled.

But I'd ask for a couple of things for future pull requests:

 (a) please put "git pull" somewhere in the email (lots of people just
put it in the subject by prepending it with "[GIT PULL]" but all I
really look for is "git" and "pull" anywhere in the email. You had the
"git" but there was no "pull" anywhere).

This can be as simple as just adding a "Please pull" or something.
Anything to trigger my search terms. Otherwise the pull request
doesn't show up when I start doing pulls - I'll see it eventually, but
it might end up delayed.

 (b) please use an imperative sentence structure for the description
instead of present tense.

The end result reads _much_ better when you look at the end result
after the fact. Just as an example:

> Ido fixes failure to add bond interfaces to a bridge, the offload-handling
> code was too defensive there and recent refactoring unearthed that.
> Users complained.

Instead of "Ido fixes failure", please just say "Fix failure".

We actually have this in our "Submitting Patches" documentation, for
the patch descriptions, but it holds for pull request descriptions
too, for all the same reasons. There the example is

  Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
  instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
  to do frotz", as if you are giving orders to the codebase to change
  its behaviour.

but the issue is kind of the same. Using present tense in particular
is very odd when somebody fixed something a year ago and you go back
to the description that says "Ido fixes". No, he fixed things long
ago.

I basically try to make the commit logs be _roughly_ similar (well,
there's basically two kinds of logs: the freeform descriptive ones,
and the ones that are a list of changes and use bullet points - and
then you have the ones that do both). That also involves primarily
just describing the _fixes_ (and possibly the problems). Giving credit
to the developers is obviously fine, but if you want to call out the
developer, please do it _after_ describing the actual fix. Because the
commit log (whether for an individual patch or for a merge message) is
primarily about what the change is about. Authorship is separate (and
generally shows up as such).

End result: I rewrote the above wording into

 - fix failure to add bond interfaces to a bridge, the offload-handling
   code was too defensive there and recent refactoring unearthed that.
   Users complained (Ido)

and that's basically would be the form I'd prefer things to be in.

Also, I'd love to see signed tags. I don't _require_ them for
git.kernel.org pulls, but I do prefer them.

Thanks,

   Linus

Re: [GIT] Networking

[Alejandro Colomar]

On Thu, Sep 3, 2015 at 11:31 AM, Linus Torvalds
 wrote:

 >> [-Wsizeof-array-argument]

 > Ahh. Google shows that it's an old clang warning that gcc has recently
 > picked up.

 > But even clang doesn't seem to have any way for a project to say
 > "please warn about arrays in function argument declaration". It *is*
 > very traditional idiomatic C, it's just that I personally think it's
 > one of those bad traditional C things exactly because it's so
 > misleading about what actually goes on. But I guess that in practice,
 > the only thing that it actually *affects* is "sizeof" (and assignment
 > to the variable name - something that would be invalid for a real
 > array, but works on argument arrays because they are really just
 > pointers).

 > The "array as function argument" syntax is occasionally useful
 > (particularly for the multi-dimensional array case), so I very much
 > understand why it exists, I just think that in the kernel we'd be
 > better off with the rule that it's against our coding practices.

 >   Linus


Hi Linus,

First of all, this is my first message to this mailing list, and I'm
trying to reply to a very old thread, so sorry if I don't know how/if I
should do it.

I have a different approach in my code to avoid that whole class of bugs
relating sizeof and false arrays in function argument declarations.
I do like the sintactic sugar that they provide, so I decided to ban
"sizeof(array)" completely off my code.

I have developed the following macro:

#define ARRAY_BYTES(arr)(sizeof((arr)[0]) * ARRAY_SIZE(arr))

which compiles to a simple "sizeof(arr)" by undoing the division in
"ARRAY_SIZE()", but with the added benefit that it checks that the
argument is an array (due to "ARRAY_SIZE()"), and if not, compilation
breaks which means that the array is not an array but a pointer.

My rules are:

  - Size of an array (number of elements):
ARRAY_SIZE(arr)
  - Signed size of an array (normally for loops where I compare against a
  signed variable):
ARRAY_SSIZE(arr)defined as: ((ptrdiff_t)ARRAY_SIZE(arr))
  - Size of an array in bytes (normally for buffers):
ARRAY_BYTES(arr)

No use of "sizeof" is allowed for arrays, which completely rules
out bugs of that class, because I never pass an array to "sizeof", which
is the core of the problem.  I've been using those macros in my code for
more than a year, and they work really nice.

I propose to include the macro "ARRAY_BYTES()" in  just
after "ARRAY_SIZE()" and replace every appearance of "sizeof(array)" in
Linux by "ARRAY_BYTES(array)", and modify the coding style guide to ban
"sizeof(array)" completely off the kernel.

Below are two patches:  one that adds the macro to
, and another one that serves as an example of usage
for the macro (that one is just as an example).

I don't intend those patches to be applied directly, but instead to
be an example of what I mean.  If you think the change is good, then
I'll prepare a big patch set for all of the appearances of sizeof()
that are unsafe :)


Cheers,

Alex.


Please CC me  in any response to this thread.

 From b5b674d39b28e703300698fa63e4ab4be646df8f Mon Sep 17 00:00:00 2001
From: Alejandro Colomar 
Date: Sun, 5 Apr 2020 01:45:35 +0200
Subject: [PATCH 1/2] linux/kernel.h: add ARRAY_BYTES() macro

Signed-off-by: Alejandro Colomar 
---
  include/linux/kernel.h | 6 ++
  1 file changed, 6 insertions(+)

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 9b7a8d74a9d6..dc806e2a7799 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -46,6 +46,12 @@
   */
  #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
__must_be_array(arr))

+/**
+ * ARRAY_BYTES - get the number of bytes in array @arr
+ * @arr: array to be sized
+ */
+#define ARRAY_BYTES(arr)   (sizeof(arr) + __must_be_array(arr))
+
  #define u64_to_user_ptr(x) (  \
  { \
typecheck(u64, (x));\
-- 
2.25.1


 From 3e7bcf70b708b51a7807c336c5d1b01403989d3b Mon Sep 17 00:00:00 2001
From: Alejandro Colomar 
Date: Sun, 5 Apr 2020 01:48:17 +0200
Subject: [PATCH 2/2] block, bfq: Use ARRAY_BYTES() for arrays instead of
  sizeof()

Signed-off-by: Alejandro Colomar 
---
  block/bfq-cgroup.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 68882b9b8f11..51ba9b9a8855 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -7,6 +7,7 @@
  #include 
  #include 
  #include 
+#include 
  #include 
  #include 
  #include 
@@ -794,7 +795,8 @@ void bfq_bic_update_cgroup(struct bfq_io_cq *bic,
struct bio *bio)
 * refcounter for bfqg, to let it disappear only after no
 * bfq_queue refers to it any longer.
 */
-   blkg_path(bfqg_to_blkg(bfqg), 

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Thu, 03 Sep 2020 17:03:19 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3e8d3bdc2a757cc6be5470297947799a7df445cc

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sat, 22 Aug 2020 19:19:48 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9d045ed1ebe1a6115d3fa9930c5371defb31d95a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Mon, 17 Aug 2020 15:15:16 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4cf7562190c795f1f95be6ee0d161107d0dc5d49

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Thu, 13 Aug 2020 16:10:57 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a1d21081a60dfb7fddf4a38b66d9cef603b317a9

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT] Networking

[John Stultz]

On Fri, Aug 7, 2020 at 12:19 AM Christoph Hellwig  wrote:
>
> On Thu, Aug 06, 2020 at 11:23:34PM -0700, John Stultz wrote:
> > So I've finally rebase-bisected it down to:
> >   a31edb2059ed ("net: improve the user pointer check in init_user_sockptr")
> > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a31edb2059ed4e498f9aa8230c734b59d0ad797a
> >
> > And reverting that from linus/HEAD (at least from this morning) seems
> > to avoid it.
> >
> > Seems like it is just adding extra checks on the data passed, so maybe
> > existing trouble from a different driver is the issue here, but it's
> > not really clear from the crash what might be wrong.
> >
> > Suggestions would be greatly appreciated!
>
> I think the sockpt optimization is just a little to clever for its
> own sake, as also chown by the other issue pointed out by Eric.
>
> Can you try this revert that just goes back to the "boring" normal
> version for everyone?

Yes! This seems to avoid the crash and networking looks ok.

Tested-by: John Stultz 

thanks
-john

Re: [GIT] Networking

[Christoph Hellwig]

On Thu, Aug 06, 2020 at 11:23:34PM -0700, John Stultz wrote:
> So I've finally rebase-bisected it down to:
>   a31edb2059ed ("net: improve the user pointer check in init_user_sockptr")
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a31edb2059ed4e498f9aa8230c734b59d0ad797a
> 
> And reverting that from linus/HEAD (at least from this morning) seems
> to avoid it.
> 
> Seems like it is just adding extra checks on the data passed, so maybe
> existing trouble from a different driver is the issue here, but it's
> not really clear from the crash what might be wrong.
> 
> Suggestions would be greatly appreciated!

I think the sockpt optimization is just a little to clever for its
own sake, as also chown by the other issue pointed out by Eric.

Can you try this revert that just goes back to the "boring" normal
version for everyone?

diff --git a/include/linux/sockptr.h b/include/linux/sockptr.h
index 96840def9d69cc..ea193414298b7f 100644
--- a/include/linux/sockptr.h
+++ b/include/linux/sockptr.h
@@ -8,26 +8,9 @@
 #ifndef _LINUX_SOCKPTR_H
 #define _LINUX_SOCKPTR_H
 
-#include 
 #include 
 #include 
 
-#ifdef CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
-typedef union {
-   void*kernel;
-   void __user *user;
-} sockptr_t;
-
-static inline bool sockptr_is_kernel(sockptr_t sockptr)
-{
-   return (unsigned long)sockptr.kernel >= TASK_SIZE;
-}
-
-static inline sockptr_t KERNEL_SOCKPTR(void *p)
-{
-   return (sockptr_t) { .kernel = p };
-}
-#else /* CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE */
 typedef struct {
union {
void*kernel;
@@ -45,15 +28,10 @@ static inline sockptr_t KERNEL_SOCKPTR(void *p)
 {
return (sockptr_t) { .kernel = p, .is_kernel = true };
 }
-#endif /* CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE */
 
-static inline int __must_check init_user_sockptr(sockptr_t *sp, void __user *p,
-   size_t size)
+static inline sockptr_t USER_SOCKPTR(void __user *p)
 {
-   if (!access_ok(p, size))
-   return -EFAULT;
-   *sp = (sockptr_t) { .user = p };
-   return 0;
+   return (sockptr_t) { .user = p };
 }
 
 static inline bool sockptr_is_null(sockptr_t sockptr)
diff --git a/net/ipv4/bpfilter/sockopt.c b/net/ipv4/bpfilter/sockopt.c
index 545b2640f0194d..1b34cb9a7708ec 100644
--- a/net/ipv4/bpfilter/sockopt.c
+++ b/net/ipv4/bpfilter/sockopt.c
@@ -57,18 +57,16 @@ int bpfilter_ip_set_sockopt(struct sock *sk, int optname, 
sockptr_t optval,
return bpfilter_mbox_request(sk, optname, optval, optlen, true);
 }
 
-int bpfilter_ip_get_sockopt(struct sock *sk, int optname,
-   char __user *user_optval, int __user *optlen)
+int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval,
+   int __user *optlen)
 {
-   sockptr_t optval;
-   int err, len;
+   int len;
 
if (get_user(len, optlen))
return -EFAULT;
-   err = init_user_sockptr(, user_optval, len);
-   if (err)
-   return err;
-   return bpfilter_mbox_request(sk, optname, optval, len, false);
+
+   return bpfilter_mbox_request(sk, optname, USER_SOCKPTR(optval), len,
+false);
 }
 
 static int __init bpfilter_sockopt_init(void)
diff --git a/net/socket.c b/net/socket.c
index aff52e81653ce3..e44b8ac47f6f46 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2097,7 +2097,7 @@ static bool sock_use_custom_sol_socket(const struct 
socket *sock)
 int __sys_setsockopt(int fd, int level, int optname, char __user *user_optval,
int optlen)
 {
-   sockptr_t optval;
+   sockptr_t optval = USER_SOCKPTR(user_optval);
char *kernel_optval = NULL;
int err, fput_needed;
struct socket *sock;
@@ -2105,10 +2105,6 @@ int __sys_setsockopt(int fd, int level, int optname, 
char __user *user_optval,
if (optlen < 0)
return -EINVAL;
 
-   err = init_user_sockptr(, user_optval, optlen);
-   if (err)
-   return err;
-
sock = sockfd_lookup_light(fd, , _needed);
if (!sock)
return err;

Re: [GIT] Networking

[John Stultz]

On Thu, Aug 6, 2020 at 11:23 PM John Stultz  wrote:
>
> On Thu, Aug 6, 2020 at 5:32 PM John Stultz  wrote:
> >
> > On Thu, Aug 6, 2020 at 4:17 PM Eric Dumazet  wrote:
> > > On 8/6/20 2:39 PM, John Stultz wrote:
> > > > [   19.709492] Unable to handle kernel access to user memory outside
> > > > uaccess routines at virtual address 006f53337070
> > > > [   19.726539] Mem abort info:
> > > > [   19.726544]   ESR = 0x960f
> > > > [   19.741323]   EC = 0x25: DABT (current EL), IL = 32 bits
> > > > [   19.741326]   SET = 0, FnV = 0
> > > > [   19.761185]   EA = 0, S1PTW = 0
> > > > [   19.761188] Data abort info:
> > > > [   19.761190]   ISV = 0, ISS = 0x000f
> > > > [   19.761192]   CM = 0, WnR = 0
> > > > [   19.761199] user pgtable: 4k pages, 39-bit VAs, pgdp=00016e9e9000
> > > > [   19.777584] [006f53337070] pgd=00016e99e003,
> > > > p4d=00016e99e003, pud=00016e99e003, pmd=00016e99a003,
> > > > pte=00e800016d3c7f53
> > > > [   19.789205] Internal error: Oops: 960f [#1] PREEMPT SMP
> > > > [   19.789211] Modules linked in:
> > > > [   19.797153] CPU: 7 PID: 364 Comm: iptables-restor Tainted: G
> > > > W 5.8.0-mainline-08255-gf9e74a8eb6f3 #3350
> > > > [   19.797156] Hardware name: Thundercomm Dragonboard 845c (DT)
> > > > [   19.797161] pstate: a045 (NzCv daif +PAN -UAO BTYPE=--)
> > > > [   19.797177] pc : do_ipt_set_ctl+0x304/0x610
> > > > [   19.807891] lr : do_ipt_set_ctl+0x50/0x610
> > > > [   19.807894] sp : ffc0139bbba0
> > > > [   19.807898] x29: ffc0139bbba0 x28: ff80f07a3800
> > > > [   19.846468] x27:  x26: 
> > > > [   19.846472] x25:  x24: 0698
> > > > [   19.846476] x23: ffec8eb0cc80 x22: 0040
> > > > [   19.846480] x21: b46f53337070 x20: ffec8eb0c000
> > > > [   19.846484] x19: ffec8e9e9000 x18: 
> > > > [   19.846487] x17:  x16: 
> > > > [   19.846491] x15:  x14: 
> > > > [   19.846495] x13:  x12: 
> > > > [   19.846501] x11:  x10: 
> > > > [   19.856005] x9 :  x8 : 
> > > > [   19.856008] x7 : ffec8e9e9d08 x6 : 
> > > > [   19.856012] x5 :  x4 : 0213
> > > > [   19.856015] x3 : 0001ffdeffef x2 : 11ded3fb0bb85e00
> > > > [   19.856019] x1 : 0027 x0 : 0080
> > > > [   19.856024] Call trace:
> > > > [   19.866319]  do_ipt_set_ctl+0x304/0x610
> > > > [   19.866327]  nf_setsockopt+0x64/0xa8
> > > > [   19.866332]  ip_setsockopt+0x21c/0x1710
> > > > [   19.866338]  raw_setsockopt+0x50/0x1b8
> > > > [   19.866347]  sock_common_setsockopt+0x50/0x68
> > > > [   19.882672]  __sys_setsockopt+0x120/0x1c8
> > > > [   19.882677]  __arm64_sys_setsockopt+0x30/0x40
> > > > [   19.882686]  el0_svc_common.constprop.3+0x78/0x188
> > > > [   19.882691]  do_el0_svc+0x80/0xa0
> > > > [   19.882699]  el0_sync_handler+0x134/0x1a0
> > > > [   19.901555]  el0_sync+0x140/0x180
> > > > [   19.901564] Code: aa1503e0 97fffd3e 2a0003f5 1780 (a9401ea6)
> > > > [   19.901569] ---[ end trace 22010e9688ae248f ]---
> > > > [   19.913033] Kernel panic - not syncing: Fatal exception
> > > > [   19.913042] SMP: stopping secondary CPUs
> > > > [   20.138885] Kernel Offset: 0x2c7d08 from 0xffc01000
> > > > [   20.138887] PHYS_OFFSET: 0xfffa8000
> > > > [   20.138894] CPU features: 0x0040002,2a80a218
> > > > [   20.138898] Memory Limit: none
> > > >
> > > > I'll continue to work on bisecting this down further, but figured I'd
> > > > share now as you or someone else might be able to tell whats wrong
> > > > from the trace.
> > > >
> > >
> > > Can you try at commit c2f12630c60ff33a9cafd221646053fc10ec59b6 
> > > ("netfilter: switch nf_setsockopt to sockptr_t")
> > > (and right before it)
> >
> >
> > So I rebased my patches ontop of that commit, but I'm not seeing the
> > crash there.  I also hand applied your suggested patch when I did see
> > the issue, but that didn't seem to fix it either.
> >
> > So far I've only narrowed it down to between
> > 65ccbbda52288527b7c48087eb33bb0757975875..530fe9d433b9e60251bb8fdc5dddecbc486a50ef.
> > But I'll keep rebase-bisecting it down.
>
> So I've finally rebase-bisected it down to:
>   a31edb2059ed ("net: improve the user pointer check in init_user_sockptr")
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a31edb2059ed4e498f9aa8230c734b59d0ad797a
>
> And reverting that from linus/HEAD (at least from this morning) seems
> to avoid it.
>
> Seems like it is just adding extra checks on the data passed, so maybe
> existing trouble from a different driver is the issue here, but it's
> not really clear from the crash what might be wrong.
>
> Suggestions would be greatly appreciated!

And while I'm back to being able to boot with the above reverted, 

Re: [GIT] Networking

[John Stultz]

On Thu, Aug 6, 2020 at 5:32 PM John Stultz  wrote:
>
> On Thu, Aug 6, 2020 at 4:17 PM Eric Dumazet  wrote:
> > On 8/6/20 2:39 PM, John Stultz wrote:
> > > [   19.709492] Unable to handle kernel access to user memory outside
> > > uaccess routines at virtual address 006f53337070
> > > [   19.726539] Mem abort info:
> > > [   19.726544]   ESR = 0x960f
> > > [   19.741323]   EC = 0x25: DABT (current EL), IL = 32 bits
> > > [   19.741326]   SET = 0, FnV = 0
> > > [   19.761185]   EA = 0, S1PTW = 0
> > > [   19.761188] Data abort info:
> > > [   19.761190]   ISV = 0, ISS = 0x000f
> > > [   19.761192]   CM = 0, WnR = 0
> > > [   19.761199] user pgtable: 4k pages, 39-bit VAs, pgdp=00016e9e9000
> > > [   19.777584] [006f53337070] pgd=00016e99e003,
> > > p4d=00016e99e003, pud=00016e99e003, pmd=00016e99a003,
> > > pte=00e800016d3c7f53
> > > [   19.789205] Internal error: Oops: 960f [#1] PREEMPT SMP
> > > [   19.789211] Modules linked in:
> > > [   19.797153] CPU: 7 PID: 364 Comm: iptables-restor Tainted: G
> > > W 5.8.0-mainline-08255-gf9e74a8eb6f3 #3350
> > > [   19.797156] Hardware name: Thundercomm Dragonboard 845c (DT)
> > > [   19.797161] pstate: a045 (NzCv daif +PAN -UAO BTYPE=--)
> > > [   19.797177] pc : do_ipt_set_ctl+0x304/0x610
> > > [   19.807891] lr : do_ipt_set_ctl+0x50/0x610
> > > [   19.807894] sp : ffc0139bbba0
> > > [   19.807898] x29: ffc0139bbba0 x28: ff80f07a3800
> > > [   19.846468] x27:  x26: 
> > > [   19.846472] x25:  x24: 0698
> > > [   19.846476] x23: ffec8eb0cc80 x22: 0040
> > > [   19.846480] x21: b46f53337070 x20: ffec8eb0c000
> > > [   19.846484] x19: ffec8e9e9000 x18: 
> > > [   19.846487] x17:  x16: 
> > > [   19.846491] x15:  x14: 
> > > [   19.846495] x13:  x12: 
> > > [   19.846501] x11:  x10: 
> > > [   19.856005] x9 :  x8 : 
> > > [   19.856008] x7 : ffec8e9e9d08 x6 : 
> > > [   19.856012] x5 :  x4 : 0213
> > > [   19.856015] x3 : 0001ffdeffef x2 : 11ded3fb0bb85e00
> > > [   19.856019] x1 : 0027 x0 : 0080
> > > [   19.856024] Call trace:
> > > [   19.866319]  do_ipt_set_ctl+0x304/0x610
> > > [   19.866327]  nf_setsockopt+0x64/0xa8
> > > [   19.866332]  ip_setsockopt+0x21c/0x1710
> > > [   19.866338]  raw_setsockopt+0x50/0x1b8
> > > [   19.866347]  sock_common_setsockopt+0x50/0x68
> > > [   19.882672]  __sys_setsockopt+0x120/0x1c8
> > > [   19.882677]  __arm64_sys_setsockopt+0x30/0x40
> > > [   19.882686]  el0_svc_common.constprop.3+0x78/0x188
> > > [   19.882691]  do_el0_svc+0x80/0xa0
> > > [   19.882699]  el0_sync_handler+0x134/0x1a0
> > > [   19.901555]  el0_sync+0x140/0x180
> > > [   19.901564] Code: aa1503e0 97fffd3e 2a0003f5 1780 (a9401ea6)
> > > [   19.901569] ---[ end trace 22010e9688ae248f ]---
> > > [   19.913033] Kernel panic - not syncing: Fatal exception
> > > [   19.913042] SMP: stopping secondary CPUs
> > > [   20.138885] Kernel Offset: 0x2c7d08 from 0xffc01000
> > > [   20.138887] PHYS_OFFSET: 0xfffa8000
> > > [   20.138894] CPU features: 0x0040002,2a80a218
> > > [   20.138898] Memory Limit: none
> > >
> > > I'll continue to work on bisecting this down further, but figured I'd
> > > share now as you or someone else might be able to tell whats wrong
> > > from the trace.
> > >
> >
> > Can you try at commit c2f12630c60ff33a9cafd221646053fc10ec59b6 ("netfilter: 
> > switch nf_setsockopt to sockptr_t")
> > (and right before it)
>
>
> So I rebased my patches ontop of that commit, but I'm not seeing the
> crash there.  I also hand applied your suggested patch when I did see
> the issue, but that didn't seem to fix it either.
>
> So far I've only narrowed it down to between
> 65ccbbda52288527b7c48087eb33bb0757975875..530fe9d433b9e60251bb8fdc5dddecbc486a50ef.
> But I'll keep rebase-bisecting it down.

So I've finally rebase-bisected it down to:
  a31edb2059ed ("net: improve the user pointer check in init_user_sockptr")
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a31edb2059ed4e498f9aa8230c734b59d0ad797a

And reverting that from linus/HEAD (at least from this morning) seems
to avoid it.

Seems like it is just adding extra checks on the data passed, so maybe
existing trouble from a different driver is the issue here, but it's
not really clear from the crash what might be wrong.

Suggestions would be greatly appreciated!

thanks
-john

Re: [GIT] Networking

[John Stultz]

On Thu, Aug 6, 2020 at 4:17 PM Eric Dumazet  wrote:
> On 8/6/20 2:39 PM, John Stultz wrote:
> > [   19.709492] Unable to handle kernel access to user memory outside
> > uaccess routines at virtual address 006f53337070
> > [   19.726539] Mem abort info:
> > [   19.726544]   ESR = 0x960f
> > [   19.741323]   EC = 0x25: DABT (current EL), IL = 32 bits
> > [   19.741326]   SET = 0, FnV = 0
> > [   19.761185]   EA = 0, S1PTW = 0
> > [   19.761188] Data abort info:
> > [   19.761190]   ISV = 0, ISS = 0x000f
> > [   19.761192]   CM = 0, WnR = 0
> > [   19.761199] user pgtable: 4k pages, 39-bit VAs, pgdp=00016e9e9000
> > [   19.777584] [006f53337070] pgd=00016e99e003,
> > p4d=00016e99e003, pud=00016e99e003, pmd=00016e99a003,
> > pte=00e800016d3c7f53
> > [   19.789205] Internal error: Oops: 960f [#1] PREEMPT SMP
> > [   19.789211] Modules linked in:
> > [   19.797153] CPU: 7 PID: 364 Comm: iptables-restor Tainted: G
> > W 5.8.0-mainline-08255-gf9e74a8eb6f3 #3350
> > [   19.797156] Hardware name: Thundercomm Dragonboard 845c (DT)
> > [   19.797161] pstate: a045 (NzCv daif +PAN -UAO BTYPE=--)
> > [   19.797177] pc : do_ipt_set_ctl+0x304/0x610
> > [   19.807891] lr : do_ipt_set_ctl+0x50/0x610
> > [   19.807894] sp : ffc0139bbba0
> > [   19.807898] x29: ffc0139bbba0 x28: ff80f07a3800
> > [   19.846468] x27:  x26: 
> > [   19.846472] x25:  x24: 0698
> > [   19.846476] x23: ffec8eb0cc80 x22: 0040
> > [   19.846480] x21: b46f53337070 x20: ffec8eb0c000
> > [   19.846484] x19: ffec8e9e9000 x18: 
> > [   19.846487] x17:  x16: 
> > [   19.846491] x15:  x14: 
> > [   19.846495] x13:  x12: 
> > [   19.846501] x11:  x10: 
> > [   19.856005] x9 :  x8 : 
> > [   19.856008] x7 : ffec8e9e9d08 x6 : 
> > [   19.856012] x5 :  x4 : 0213
> > [   19.856015] x3 : 0001ffdeffef x2 : 11ded3fb0bb85e00
> > [   19.856019] x1 : 0027 x0 : 0080
> > [   19.856024] Call trace:
> > [   19.866319]  do_ipt_set_ctl+0x304/0x610
> > [   19.866327]  nf_setsockopt+0x64/0xa8
> > [   19.866332]  ip_setsockopt+0x21c/0x1710
> > [   19.866338]  raw_setsockopt+0x50/0x1b8
> > [   19.866347]  sock_common_setsockopt+0x50/0x68
> > [   19.882672]  __sys_setsockopt+0x120/0x1c8
> > [   19.882677]  __arm64_sys_setsockopt+0x30/0x40
> > [   19.882686]  el0_svc_common.constprop.3+0x78/0x188
> > [   19.882691]  do_el0_svc+0x80/0xa0
> > [   19.882699]  el0_sync_handler+0x134/0x1a0
> > [   19.901555]  el0_sync+0x140/0x180
> > [   19.901564] Code: aa1503e0 97fffd3e 2a0003f5 1780 (a9401ea6)
> > [   19.901569] ---[ end trace 22010e9688ae248f ]---
> > [   19.913033] Kernel panic - not syncing: Fatal exception
> > [   19.913042] SMP: stopping secondary CPUs
> > [   20.138885] Kernel Offset: 0x2c7d08 from 0xffc01000
> > [   20.138887] PHYS_OFFSET: 0xfffa8000
> > [   20.138894] CPU features: 0x0040002,2a80a218
> > [   20.138898] Memory Limit: none
> >
> > I'll continue to work on bisecting this down further, but figured I'd
> > share now as you or someone else might be able to tell whats wrong
> > from the trace.
> >
>
> Can you try at commit c2f12630c60ff33a9cafd221646053fc10ec59b6 ("netfilter: 
> switch nf_setsockopt to sockptr_t")
> (and right before it)


So I rebased my patches ontop of that commit, but I'm not seeing the
crash there.  I also hand applied your suggested patch when I did see
the issue, but that didn't seem to fix it either.

So far I've only narrowed it down to between
65ccbbda52288527b7c48087eb33bb0757975875..530fe9d433b9e60251bb8fdc5dddecbc486a50ef.
But I'll keep rebase-bisecting it down.

thanks
-john

Re: [GIT] Networking

[Eric Dumazet]

On 8/6/20 4:17 PM, Eric Dumazet wrote:
> 
> 
> On 8/6/20 2:39 PM, John Stultz wrote:
>> On Wed, Aug 5, 2020 at 6:57 PM David Miller  wrote:
>>> There is a minor conflict in net/ipv6/ip6_flowlabel.c, it's because of
>>> the commit that did the tree-wide removal of uninitialized_var().  The
>>> resolution is simple, kill all of the conflict markers and content
>>> within, and remove the uninitialized_var() marker that got moved
>>> elsewhere in the file in the net-next tree.
>>>
>>> Otherwise, we have:
>>>
>>> 1) Support 6Ghz band in ath11k driver, from Rajkumar Manoharan.
>>>
>>> 2) Support UDP segmentation in code TSO code, from Eric Dumazet.
>>>
>>> 3) Allow flashing different flash images in cxgb4 driver, from Vishal
>>>Kulkarni.
>>>
>>> 4) Add drop frames counter and flow status to tc flower offloading,
>>>from Po Liu.
>>>
>>> 5) Support n-tuple filters in cxgb4, from Vishal Kulkarni.
>>>
>>> 6) Various new indirect call avoidance, from Eric Dumazet and Brian
>>>Vazquez.
>>>
>>> 7) Fix BPF verifier failures on 32-bit pointer arithmetic, from
>>>Yonghong Song.
>>>
>>> 8) Support querying and setting hardware address of a port function
>>>via devlink, use this in mlx5, from Parav Pandit.
>>>
>>> 9) Support hw ipsec offload on bonding slaves, from Jarod Wilson.
>>>
>>> 10) Switch qca8k driver over to phylink, from Jonathan McDowell.
>>>
>>> 11) In bpftool, show list of processes holding BPF FD references to
>>> maps, programs, links, and btf objects.  From Andrii Nakryiko.
>>>
>>> 12) Several conversions over to generic power management, from Vaibhav
>>> Gupta.
>>>
>>> 13) Add support for SO_KEEPALIVE et al. to bpf_setsockopt(), from
>>> Dmitry Yakunin.
>>>
>>> 14) Various https url conversions, from Alexander A. Klimov.
>>>
>>> 15) Timestamping and PHC support for mscc PHY driver, from Antoine
>>> Tenart.
>>>
>>> 16) Support bpf iterating over tcp and udp sockets, from Yonghong
>>> Song.
>>>
>>> 17) Support 5GBASE-T i40e NICs, from Aleksandr Loktionov.
>>>
>>> 18) Add kTLS RX HW offload support to mlx5e, from Tariq Toukan.
>>>
>>> 19) Fix the ->ndo_start_xmit() return type to be netdev_tx_t in several
>>> drivers.  From Luc Van Oostenryck.
>>>
>>> 20) XDP support for xen-netfront, from Denis Kirjanov.
>>>
>>> 21) Support receive buffer autotuning in MPTCP, from Florian Westphal.
>>>
>>> 22) Support EF100 chip in sfc driver, from Edward Cree.
>>>
>>> 23) Add XDP support to mvpp2 driver, from Matteo Croce.
>>>
>>> 24) Support MPTCP in sock_diag, from Paolo Abeni.
>>>
>>> 25) Commonize UDP tunnel offloading code by creating udp_tunnel_nic
>>> infrastructure, from Jakub Kicinski.
>>>
>>> 26) Several pci_ --> dma_ API conversions, from Christophe JAILLET.
>>>
>>> 27) Add FLOW_ACTION_POLICE support to mlxsw, from Ido Schimmel.
>>>
>>> 28) Add SK_LOOKUP bpf program type, from Jakub Sitnicki.
>>>
>>> 29) Refactor a lot of networking socket option handling code in
>>> order to avoid set_fs() calls, from Christoph Hellwig.
>>>
>>> 30) Add rfc4884 support to icmp code, from Willem de Bruijn.
>>>
>>> 31) Support TBF offload in dpaa2-eth driver, from Ioana Ciornei.
>>>
>>> 32) Support XDP_REDIRECT in qede driver, from Alexander Lobakin.
>>>
>>> 33) Support PCI relaxed ordering in mlx5 driver, from Aya Levin.
>>>
>>> 34) Support TCP syncookies in MPTCP, from Flowian Westphal.
>>>
>>> 35) Fix several tricky cases of PMTU handling wrt. briding, from
>>> Stefano Brivio.
>>>
>>> Please pull, thanks a lot!
>>>
>>> The following changes since commit ac3a0c8472969a03c0496ae774b3a29eb26c8d5a:
>>>
>>>   Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
>>> (2020-08-01 16:47:24 -0700)
>>>
>>> are available in the Git repository at:
>>>
>>>   git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
>>
>> Hey David, All,
>>   Just as a heads up, after net-next was merged into Linus' tree, I
>> started hitting the following crash on boot on the Dragonboard 845c
>> booting AOSP.
>>
>> I've bisected it down to the net-next merge, but haven't bisected it
>> further yet, as I still have a handful of (unrelated to networking)
>> out of tree patches needed to boot the board.
>>
>> [   19.709492] Unable to handle kernel access to user memory outside
>> uaccess routines at virtual address 006f53337070
>> [   19.726539] Mem abort info:
>> [   19.726544]   ESR = 0x960f
>> [   19.741323]   EC = 0x25: DABT (current EL), IL = 32 bits
>> [   19.741326]   SET = 0, FnV = 0
>> [   19.761185]   EA = 0, S1PTW = 0
>> [   19.761188] Data abort info:
>> [   19.761190]   ISV = 0, ISS = 0x000f
>> [   19.761192]   CM = 0, WnR = 0
>> [   19.761199] user pgtable: 4k pages, 39-bit VAs, pgdp=00016e9e9000
>> [   19.777584] [006f53337070] pgd=00016e99e003,
>> p4d=00016e99e003, pud=00016e99e003, pmd=00016e99a003,
>> pte=00e800016d3c7f53
>> [   19.789205] Internal error: Oops: 960f [#1] PREEMPT SMP
>> [   19.789211] Modules linked in:
>> [   

Re: [GIT] Networking

[Eric Dumazet]

On 8/6/20 2:39 PM, John Stultz wrote:
> On Wed, Aug 5, 2020 at 6:57 PM David Miller  wrote:
>> There is a minor conflict in net/ipv6/ip6_flowlabel.c, it's because of
>> the commit that did the tree-wide removal of uninitialized_var().  The
>> resolution is simple, kill all of the conflict markers and content
>> within, and remove the uninitialized_var() marker that got moved
>> elsewhere in the file in the net-next tree.
>>
>> Otherwise, we have:
>>
>> 1) Support 6Ghz band in ath11k driver, from Rajkumar Manoharan.
>>
>> 2) Support UDP segmentation in code TSO code, from Eric Dumazet.
>>
>> 3) Allow flashing different flash images in cxgb4 driver, from Vishal
>>Kulkarni.
>>
>> 4) Add drop frames counter and flow status to tc flower offloading,
>>from Po Liu.
>>
>> 5) Support n-tuple filters in cxgb4, from Vishal Kulkarni.
>>
>> 6) Various new indirect call avoidance, from Eric Dumazet and Brian
>>Vazquez.
>>
>> 7) Fix BPF verifier failures on 32-bit pointer arithmetic, from
>>Yonghong Song.
>>
>> 8) Support querying and setting hardware address of a port function
>>via devlink, use this in mlx5, from Parav Pandit.
>>
>> 9) Support hw ipsec offload on bonding slaves, from Jarod Wilson.
>>
>> 10) Switch qca8k driver over to phylink, from Jonathan McDowell.
>>
>> 11) In bpftool, show list of processes holding BPF FD references to
>> maps, programs, links, and btf objects.  From Andrii Nakryiko.
>>
>> 12) Several conversions over to generic power management, from Vaibhav
>> Gupta.
>>
>> 13) Add support for SO_KEEPALIVE et al. to bpf_setsockopt(), from
>> Dmitry Yakunin.
>>
>> 14) Various https url conversions, from Alexander A. Klimov.
>>
>> 15) Timestamping and PHC support for mscc PHY driver, from Antoine
>> Tenart.
>>
>> 16) Support bpf iterating over tcp and udp sockets, from Yonghong
>> Song.
>>
>> 17) Support 5GBASE-T i40e NICs, from Aleksandr Loktionov.
>>
>> 18) Add kTLS RX HW offload support to mlx5e, from Tariq Toukan.
>>
>> 19) Fix the ->ndo_start_xmit() return type to be netdev_tx_t in several
>> drivers.  From Luc Van Oostenryck.
>>
>> 20) XDP support for xen-netfront, from Denis Kirjanov.
>>
>> 21) Support receive buffer autotuning in MPTCP, from Florian Westphal.
>>
>> 22) Support EF100 chip in sfc driver, from Edward Cree.
>>
>> 23) Add XDP support to mvpp2 driver, from Matteo Croce.
>>
>> 24) Support MPTCP in sock_diag, from Paolo Abeni.
>>
>> 25) Commonize UDP tunnel offloading code by creating udp_tunnel_nic
>> infrastructure, from Jakub Kicinski.
>>
>> 26) Several pci_ --> dma_ API conversions, from Christophe JAILLET.
>>
>> 27) Add FLOW_ACTION_POLICE support to mlxsw, from Ido Schimmel.
>>
>> 28) Add SK_LOOKUP bpf program type, from Jakub Sitnicki.
>>
>> 29) Refactor a lot of networking socket option handling code in
>> order to avoid set_fs() calls, from Christoph Hellwig.
>>
>> 30) Add rfc4884 support to icmp code, from Willem de Bruijn.
>>
>> 31) Support TBF offload in dpaa2-eth driver, from Ioana Ciornei.
>>
>> 32) Support XDP_REDIRECT in qede driver, from Alexander Lobakin.
>>
>> 33) Support PCI relaxed ordering in mlx5 driver, from Aya Levin.
>>
>> 34) Support TCP syncookies in MPTCP, from Flowian Westphal.
>>
>> 35) Fix several tricky cases of PMTU handling wrt. briding, from
>> Stefano Brivio.
>>
>> Please pull, thanks a lot!
>>
>> The following changes since commit ac3a0c8472969a03c0496ae774b3a29eb26c8d5a:
>>
>>   Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2020-08-01 
>> 16:47:24 -0700)
>>
>> are available in the Git repository at:
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
> 
> Hey David, All,
>   Just as a heads up, after net-next was merged into Linus' tree, I
> started hitting the following crash on boot on the Dragonboard 845c
> booting AOSP.
> 
> I've bisected it down to the net-next merge, but haven't bisected it
> further yet, as I still have a handful of (unrelated to networking)
> out of tree patches needed to boot the board.
> 
> [   19.709492] Unable to handle kernel access to user memory outside
> uaccess routines at virtual address 006f53337070
> [   19.726539] Mem abort info:
> [   19.726544]   ESR = 0x960f
> [   19.741323]   EC = 0x25: DABT (current EL), IL = 32 bits
> [   19.741326]   SET = 0, FnV = 0
> [   19.761185]   EA = 0, S1PTW = 0
> [   19.761188] Data abort info:
> [   19.761190]   ISV = 0, ISS = 0x000f
> [   19.761192]   CM = 0, WnR = 0
> [   19.761199] user pgtable: 4k pages, 39-bit VAs, pgdp=00016e9e9000
> [   19.777584] [006f53337070] pgd=00016e99e003,
> p4d=00016e99e003, pud=00016e99e003, pmd=00016e99a003,
> pte=00e800016d3c7f53
> [   19.789205] Internal error: Oops: 960f [#1] PREEMPT SMP
> [   19.789211] Modules linked in:
> [   19.797153] CPU: 7 PID: 364 Comm: iptables-restor Tainted: G
> W 5.8.0-mainline-08255-gf9e74a8eb6f3 #3350
> [   19.797156] Hardware name: Thundercomm Dragonboard 845c 

Re: [GIT] Networking

[John Stultz]

On Wed, Aug 5, 2020 at 6:57 PM David Miller  wrote:
> There is a minor conflict in net/ipv6/ip6_flowlabel.c, it's because of
> the commit that did the tree-wide removal of uninitialized_var().  The
> resolution is simple, kill all of the conflict markers and content
> within, and remove the uninitialized_var() marker that got moved
> elsewhere in the file in the net-next tree.
>
> Otherwise, we have:
>
> 1) Support 6Ghz band in ath11k driver, from Rajkumar Manoharan.
>
> 2) Support UDP segmentation in code TSO code, from Eric Dumazet.
>
> 3) Allow flashing different flash images in cxgb4 driver, from Vishal
>Kulkarni.
>
> 4) Add drop frames counter and flow status to tc flower offloading,
>from Po Liu.
>
> 5) Support n-tuple filters in cxgb4, from Vishal Kulkarni.
>
> 6) Various new indirect call avoidance, from Eric Dumazet and Brian
>Vazquez.
>
> 7) Fix BPF verifier failures on 32-bit pointer arithmetic, from
>Yonghong Song.
>
> 8) Support querying and setting hardware address of a port function
>via devlink, use this in mlx5, from Parav Pandit.
>
> 9) Support hw ipsec offload on bonding slaves, from Jarod Wilson.
>
> 10) Switch qca8k driver over to phylink, from Jonathan McDowell.
>
> 11) In bpftool, show list of processes holding BPF FD references to
> maps, programs, links, and btf objects.  From Andrii Nakryiko.
>
> 12) Several conversions over to generic power management, from Vaibhav
> Gupta.
>
> 13) Add support for SO_KEEPALIVE et al. to bpf_setsockopt(), from
> Dmitry Yakunin.
>
> 14) Various https url conversions, from Alexander A. Klimov.
>
> 15) Timestamping and PHC support for mscc PHY driver, from Antoine
> Tenart.
>
> 16) Support bpf iterating over tcp and udp sockets, from Yonghong
> Song.
>
> 17) Support 5GBASE-T i40e NICs, from Aleksandr Loktionov.
>
> 18) Add kTLS RX HW offload support to mlx5e, from Tariq Toukan.
>
> 19) Fix the ->ndo_start_xmit() return type to be netdev_tx_t in several
> drivers.  From Luc Van Oostenryck.
>
> 20) XDP support for xen-netfront, from Denis Kirjanov.
>
> 21) Support receive buffer autotuning in MPTCP, from Florian Westphal.
>
> 22) Support EF100 chip in sfc driver, from Edward Cree.
>
> 23) Add XDP support to mvpp2 driver, from Matteo Croce.
>
> 24) Support MPTCP in sock_diag, from Paolo Abeni.
>
> 25) Commonize UDP tunnel offloading code by creating udp_tunnel_nic
> infrastructure, from Jakub Kicinski.
>
> 26) Several pci_ --> dma_ API conversions, from Christophe JAILLET.
>
> 27) Add FLOW_ACTION_POLICE support to mlxsw, from Ido Schimmel.
>
> 28) Add SK_LOOKUP bpf program type, from Jakub Sitnicki.
>
> 29) Refactor a lot of networking socket option handling code in
> order to avoid set_fs() calls, from Christoph Hellwig.
>
> 30) Add rfc4884 support to icmp code, from Willem de Bruijn.
>
> 31) Support TBF offload in dpaa2-eth driver, from Ioana Ciornei.
>
> 32) Support XDP_REDIRECT in qede driver, from Alexander Lobakin.
>
> 33) Support PCI relaxed ordering in mlx5 driver, from Aya Levin.
>
> 34) Support TCP syncookies in MPTCP, from Flowian Westphal.
>
> 35) Fix several tricky cases of PMTU handling wrt. briding, from
> Stefano Brivio.
>
> Please pull, thanks a lot!
>
> The following changes since commit ac3a0c8472969a03c0496ae774b3a29eb26c8d5a:
>
>   Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2020-08-01 
> 16:47:24 -0700)
>
> are available in the Git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git

Hey David, All,
  Just as a heads up, after net-next was merged into Linus' tree, I
started hitting the following crash on boot on the Dragonboard 845c
booting AOSP.

I've bisected it down to the net-next merge, but haven't bisected it
further yet, as I still have a handful of (unrelated to networking)
out of tree patches needed to boot the board.

[   19.709492] Unable to handle kernel access to user memory outside
uaccess routines at virtual address 006f53337070
[   19.726539] Mem abort info:
[   19.726544]   ESR = 0x960f
[   19.741323]   EC = 0x25: DABT (current EL), IL = 32 bits
[   19.741326]   SET = 0, FnV = 0
[   19.761185]   EA = 0, S1PTW = 0
[   19.761188] Data abort info:
[   19.761190]   ISV = 0, ISS = 0x000f
[   19.761192]   CM = 0, WnR = 0
[   19.761199] user pgtable: 4k pages, 39-bit VAs, pgdp=00016e9e9000
[   19.777584] [006f53337070] pgd=00016e99e003,
p4d=00016e99e003, pud=00016e99e003, pmd=00016e99a003,
pte=00e800016d3c7f53
[   19.789205] Internal error: Oops: 960f [#1] PREEMPT SMP
[   19.789211] Modules linked in:
[   19.797153] CPU: 7 PID: 364 Comm: iptables-restor Tainted: G
W 5.8.0-mainline-08255-gf9e74a8eb6f3 #3350
[   19.797156] Hardware name: Thundercomm Dragonboard 845c (DT)
[   19.797161] pstate: a045 (NzCv daif +PAN -UAO BTYPE=--)
[   19.797177] pc : do_ipt_set_ctl+0x304/0x610
[   19.807891] lr : do_ipt_set_ctl+0x50/0x610
[   19.807894] sp : ffc0139bbba0
[   

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Wed, 05 Aug 2020 18:55:59 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git 
> refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/47ec5303d73ea344e84f46660fff693c57641386

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT] Networking

[David Miller]

From: Linus Torvalds 
Date: Sat, 1 Aug 2020 16:45:49 -0700

> On Sat, Aug 1, 2020 at 2:36 PM David Miller  wrote:
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
> 
> How is this wrt an rc8 or a final?

Nothing scary in there, I think you can safely do a -final with those
networking changes.

> On a very much related note, I really wish you didn't send the
> networking fixes the day before a release is scheduled.
> 
> If it's really quiet., send them on (say) Wed/Thu. And then on
> Saturday, send a note saying "no, important stuff", hold on. Or say
> "nothing new".
> 
> Because right now the "last-minute network pull request" has become a
> pattern, and I have a very hard time judging whether I should delay a
> release for it.

Sorry about that, just the way things work during the week I can't
catch my breath until late Friday night or Saturday usually to review
what I have and send a pull request to you.

I'll shoot for more mid-week pulls in the future.

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sat, 01 Aug 2020 14:36:31 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/ac3a0c8472969a03c0496ae774b3a29eb26c8d5a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[Linus Torvalds]

On Sat, Aug 1, 2020 at 2:36 PM David Miller  wrote:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git

How is this wrt an rc8 or a final?

I have another possible small reason to do an rc8 right now. And this
roughly doubles my current diff.

On a very much related note, I really wish you didn't send the
networking fixes the day before a release is scheduled.

If it's really quiet., send them on (say) Wed/Thu. And then on
Saturday, send a note saying "no, important stuff", hold on. Or say
"nothing new".

Because right now the "last-minute network pull request" has become a
pattern, and I have a very hard time judging whether I should delay a
release for it.

 Linus

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 24 Jul 2020 22:12:04 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1b64b2e2444c11b8dd2b657f8538c05cb699ed25

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 10 Jul 2020 16:58:15 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5a764898afec0bc097003e8c3e727792289f76d6

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Thu, 25 Jun 2020 16:43:48 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4a21185cda0fbb860580eeeb4f1a70a9cda332a4

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Tue, 16 Jun 2020 16:25:51 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/69119673bd50b176ded34032fadd41530fb5af21

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sat, 13 Jun 2020 15:54:03 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/96144c58abe7ff767e754b5b80995f7b8846d49b

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Tue, 02 Jun 2020 17:11:11 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git 
> refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sun, 07 Jun 2020 17:21:43 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/af7b4801030c07637840191c69eb666917e4135d

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sat, 30 May 2020 22:13:09 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/19835b1ba6b1f2d3fb5aefffa01ebd626513ff4a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sat, 23 May 2020 17:06:54 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/caffb99b6929f41a69edbb5aef3a359bf45f3315

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 15 May 2020 12:39:00 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f85c1598ddfe83f61d0656bd1d2025fa3b148b99

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Wed, 06 May 2020 20:40:39 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a811c1fa0a02c062555b54651065899437bacdbe

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sat, 19 Oct 2019 12:39:27 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/531e93d11470aa2e14e6a3febef50d9bc7bab7a1

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 04 Oct 2019 18:47:16 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9819a30c11ea439e5e3c81f5539c4d42d6c76314

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sat, 28 Sep 2019 15:49:21 +0200 (CEST):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/02dc96ef6c25f990452c114c59d75c368a1f4c8f

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[David Miller]

From: Linus Torvalds 
Date: Wed, 18 Sep 2019 13:37:57 -0700

> Hmm. This adds that NET_TC_SKB_EXT config thing, and makes it "default y".
> 
> Why?
> 
> It's also done in a crazy way:
> 
> +   depends on NET_CLS_ACT
> +   default y if NET_CLS_ACT

I agree.

I've asked Paul Blakey, who added this, to make it depend upon OpenVSWwtch
or whatever else uses it.

Re: [GIT] Networking

[David Miller]

From: Linus Torvalds 
Date: Wed, 18 Sep 2019 13:37:57 -0700

> I've obviously already pulled this (and only noticed when I was
> testing further on my laptop), but please explain or fix.

I'll take a look, thanks.

Re: [GIT] Networking

[Linus Torvalds]

Hmm. This adds that NET_TC_SKB_EXT config thing, and makes it "default y".

Why?

It's also done in a crazy way:

+   depends on NET_CLS_ACT
+   default y if NET_CLS_ACT

yeah, that's some screwed-up thinking right there. First it depends on
another config variable, and then it defaults to "y" if that variable
is set.

That's all kinds of messed up:

 - we shouldn't "default y" for new features unless those features are
somehow critical (ie typically maybe it was a feature we already had,
but that now grew a config option to configure it _away_)

 - that's a very confused way of saying "default y" (which you
shouldn't say in the first place)

 - there's no explanation for why it should be enabled by default anyway.

I've obviously already pulled this (and only noticed when I was
testing further on my laptop), but please explain or fix.

  Linus

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Wed, 18 Sep 2019 00:39:03 +0200 (CEST):

> (unable to parse the git remote)

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/81160dda9a7aad13c04e78bb2cfd3c4630e3afab

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 13 Sep 2019 21:55:40 +0100 (WEST):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/36024fcf8d28999f270908e75675d43b099ff7b3

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sun, 01 Sep 2019 13:45:25 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/345464fb760d1b772e891538b498e111c588b692

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sun, 25 Aug 2019 23:29:02 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/452a04441b4d0d2d567e4128af58867739002640

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sun, 18 Aug 2019 19:46:15 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/06821504fd47a5e5b641aeeb638a0ae10a216ef8

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Tue, 06 Aug 2019 16:35:57 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/33920f1ec5bf47c5c0a1d2113989bdd9dfb3fae9

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sun, 21 Jul 2019 21:13:21 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/83768245a3b158b96d33012b22ab01d193afb2da

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Thu, 18 Jul 2019 20:44:20 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5f4fc6d440d77a2cf74fe4ea56955674ac7e35e7

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 12 Jul 2019 23:17:04 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d12109291ccbef7e879cc0d0733f31685cd80854

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Tue, 09 Jul 2019 22:38:34 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 
> refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/237f83dfbe668443b5e31c3c7576125871cca674

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Wed, 26 Jun 2019 19:50:06 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/c84afab02c311b08b5cb8ea758cc177f81c95d11

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[Bhaskar Chowdhury]

ROFL bots gets confused ...we are blurring the boundaries Linus...:)

On 22:36 Fri 21 Jun , Linus Torvalds wrote:

On Fri, Jun 21, 2019 at 10:30 PM  wrote:


The pull request you sent on Fri, 21 Jun 2019 21:21:37 -0400 (EDT):

> (unable to parse the git remote)


This "unable to parse the git remote" is apparently because the pull
request had an extraneous ':' in the remote description

 git://git.kernel.org:/pub/scm/linux/kernel/git/davem/net.git
^^^

which seems to have confused the pr-tracker-bot.

  Linus


signature.asc
Description: PGP signature

Re: [GIT] Networking

[Linus Torvalds]

On Fri, Jun 21, 2019 at 10:30 PM  wrote:
>
> The pull request you sent on Fri, 21 Jun 2019 21:21:37 -0400 (EDT):
>
> > (unable to parse the git remote)

This "unable to parse the git remote" is apparently because the pull
request had an extraneous ':' in the remote description

  git://git.kernel.org:/pub/scm/linux/kernel/git/davem/net.git
 ^^^

which seems to have confused the pr-tracker-bot.

   Linus

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 21 Jun 2019 21:21:37 -0400 (EDT):

> (unable to parse the git remote)

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/c356dc4b540edd6c02b409dd8cf3208ba2804c38

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Mon, 17 Jun 2019 11:17:38 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/da0f382029868806e88c046eb2560fdee7a9457c

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Thu, 06 Jun 2019 15:00:10 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1e1d926369545ea09c98c6c7f5d109aa4ee0cd0b

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Thu, 30 May 2019 16:05:06 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/036e34310931e64ce4f1edead435708cd517db10

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Tue, 21 May 2019 22:43:13 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f75b6f303bd80249a56cce9028954b4f731270e3

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sun, 19 May 2019 23:28:05 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/78e03651849fd3e8aa9ab3288bc1d3726c4c6129

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Mon, 13 May 2019 10:08:08 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a3958f5e13e23f6e68c3cc1210639f63728a950f

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Mon, 08 Apr 2019 19:21:27 -0700 (PDT):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/869e3305f23dfeacdaa234717c92ccb237815d90

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Mon, 04 Mar 2019 15:26:27 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/6456300356433873309a1cae6aa05e77d6b59153

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sat, 02 Mar 2019 01:08:23 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/c93d9218ea561d6a91b23449cfd637ddec91dc23

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sat, 23 Feb 2019 18:57:10 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/c4eb1e1852df60d61e04a6b580a0490460c9e31b

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Tue, 19 Feb 2019 14:33:26 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/40e196a906d969fd10d885c692d2674b3d657006

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Thu, 14 Feb 2019 18:00:59 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net refs/heads/master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/6e7bd3b5494620265d39463b9289b7ba872f6df1

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 08 Feb 2019 02:42:09 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/27b4ad621e887ce8e5eb508a0103f13d30f6b38a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Tue, 29 Jan 2019 12:55:00 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/62967898789dc1f09a06e59fa85ae2c5ca4dc2da

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[David Miller]

From: Linus Torvalds 
Date: Sun, 27 Jan 2019 09:02:17 -0800

> I'm trying to be a bit stricter about the rc pulls, even if I normally
> don't even look at yours much.
> 
> So let's try to keep it to fixes only, or at least when you sneak in
> new stuff, make them small enough that I don't go "Hmm.. That looks
> odd.." ;)

Completely understood.

This one was actually my bad in the most heinous way, because the
submitter did say that the changes should go to net-next.

I have to tone down the meds or something.

Sorry!

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 25 Jan 2019 16:21:51 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/037222ad3f43a45c3a601dabf893efc9264ff5a0

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 25 Jan 2019 11:58:27 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/abfd04f738c2625f63e04c8fc7cadb3b7a70d580

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[Linus Torvalds]

On Fri, Jan 25, 2019 at 4:21 PM David Miller  wrote:
>
> This is a resend of the previous pull request with the qed changes
> reverted.

Thanks.

I'm trying to be a bit stricter about the rc pulls, even if I normally
don't even look at yours much.

So let's try to keep it to fixes only, or at least when you sneak in
new stuff, make them small enough that I don't go "Hmm.. That looks
odd.." ;)

   Linus

Re: [GIT] Networking

[David Miller]

From: Linus Torvalds 
Date: Fri, 25 Jan 2019 13:25:22 -1000

> No way is this appropriate. Get rid of it.

Ok, consider it done.

Re: [GIT] Networking

[David Miller]

From: Linus Torvalds 
Date: Fri, 25 Jan 2019 13:15:37 -1000

> You don't even *mention*  the changes to the qlogic driver that are
> completely new and over a thousand lines.

It's error recovery code and I trust the judgment of the qlogic folks
that this was appropriate to add.

I am more than happy to revert if you disagree.

Thanks.

Re: [GIT] Networking

[Linus Torvalds]

On Fri, Jan 25, 2019 at 1:15 PM Linus Torvalds
 wrote:
>
> You don't even *mention*  the changes to the qlogic driver that are
> completely new and over a thousand lines.

They look like completely new error handling and recovery code. Very
much new development, not fixes.

And this is not some new driver that is getting some fixups from being
merged, the code has been without any of this fundamentally new error
recovery for at least three years.

In other words: no. This is not a "fix". This is fundamental new
development that is larger than all the changes that came in this
merge window.

No way is this appropriate. Get rid of it.

Linus

Re: [GIT] Networking

[Linus Torvalds]

On Fri, Jan 25, 2019 at 9:58 AM David Miller  wrote:
>
> Please pull, thanks a lot!

Why?

You don't even *mention*  the changes to the qlogic driver that are
completely new and over a thousand lines.

What is  going on here? There's no explanation for these huge  "fixes"
that aren't even mentioned.

 Linus

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sun, 20 Jan 2019 14:09:04 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7d0ae236ed13d7645fb73b85e7c95deee46c4656

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sun, 13 Jan 2019 13:33:46 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e8746440bf68212f19688f1454dad593c74abee1

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Wed, 02 Jan 2019 22:12:13 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/43d86ee8c639df750529b4d8f062b328b61c423e

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 21 Dec 2018 16:20:28 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8762cdcd1d5055017770a54e2755bed30dd4f8b6

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 21 Dec 2018 12:42:25 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/87935eee57705e9b6df506c5df8b92d6a0b77a51

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Wed, 19 Dec 2018 21:03:40 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/519be6995c31005ae3bad5421e09ef99d4eb0b82

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Sun, 09 Dec 2018 12:51:54 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d48f782e4fb20dc7ec935ca0ca41ae31e4a69362

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 23 Nov 2018 22:58:55 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/857fa628bbe93017c72ddd0d5304962a2608db07

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[pr-tracker-bot]

The pull request you sent on Fri, 23 Nov 2018 22:58:55 -0800 (PST):

> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git master

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/857fa628bbe93017c72ddd0d5304962a2608db07

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

Re: [GIT] Networking

[Linus Torvalds]

On Sun, Oct 28, 2018 at 7:46 PM David Miller  wrote:
>
> Please pull, thanks a lot!

Pulled,

  Linus

Re: [GIT] Networking

[Linus Torvalds]

On Sun, Oct 28, 2018 at 7:46 PM David Miller  wrote:
>
> Please pull, thanks a lot!

Pulled,

  Linus

Re: [GIT] Networking

[Linus Torvalds]

On Fri, May 11, 2018 at 5:10 PM David Miller  wrote:

> I guess this is my reward for trying to break the monotony of
> pull requests :-)

I actually went back and checked a few older pull requests to see if this
had been going on for a while and I just hadn't noticed.

It just took me by surprise :^p

   Linus

Re: [GIT] Networking

[Linus Torvalds]

On Fri, May 11, 2018 at 5:10 PM David Miller  wrote:

> I guess this is my reward for trying to break the monotony of
> pull requests :-)

I actually went back and checked a few older pull requests to see if this
had been going on for a while and I just hadn't noticed.

It just took me by surprise :^p

   Linus

Re: [GIT] Networking

[David Miller]

From: Linus Torvalds 
Date: Fri, 11 May 2018 14:25:59 -0700

> David, is there something you want to tell us?
> 
> Drugs are bad, m'kay..

I guess this is my reward for trying to break the monotony of
pull requests :-)

Re: [GIT] Networking

[David Miller]

From: Linus Torvalds 
Date: Fri, 11 May 2018 14:25:59 -0700

> David, is there something you want to tell us?
> 
> Drugs are bad, m'kay..

I guess this is my reward for trying to break the monotony of
pull requests :-)

Re: [GIT] Networking

[Linus Torvalds]

David, is there something you want to tell us?

Drugs are bad, m'kay..

   Linus

On Fri, May 11, 2018 at 2:00 PM David Miller  wrote:

> "from Kevin Easton", "Thanks to Bhadram Varka", "courtesy of Gustavo A.
> R.  Silva", "To Eric Dumazet we are most grateful for this fix", "This
> fix from YU Bo, we do appreciate", "Once again we are blessed by the
> honorable Eric Dumazet with this fix", "This fix is bestowed upon us by
> Andrew Tomt", "another great gift from Eric Dumazet", "to Hangbin Liu we
> give thanks for this", "Paolo Abeni, he gave us this", "thank you Moshe
> Shemesh", "from our good brother David Howells", "Daniel Juergens,
> you're the best!", "Debabrata Benerjee saved us!", "The ship is now
> water tight, thanks to Andrey Ignatov", "from Colin Ian King, man we've
> got holes everywhere!", "Jiri Pirko what would we do without you!

Re: [GIT] Networking

[Linus Torvalds]

David, is there something you want to tell us?

Drugs are bad, m'kay..

   Linus

On Fri, May 11, 2018 at 2:00 PM David Miller  wrote:

> "from Kevin Easton", "Thanks to Bhadram Varka", "courtesy of Gustavo A.
> R.  Silva", "To Eric Dumazet we are most grateful for this fix", "This
> fix from YU Bo, we do appreciate", "Once again we are blessed by the
> honorable Eric Dumazet with this fix", "This fix is bestowed upon us by
> Andrew Tomt", "another great gift from Eric Dumazet", "to Hangbin Liu we
> give thanks for this", "Paolo Abeni, he gave us this", "thank you Moshe
> Shemesh", "from our good brother David Howells", "Daniel Juergens,
> you're the best!", "Debabrata Benerjee saved us!", "The ship is now
> water tight, thanks to Andrey Ignatov", "from Colin Ian King, man we've
> got holes everywhere!", "Jiri Pirko what would we do without you!

Re: [GIT] Networking

[David Miller]

Sorry, this is a dup of the bug fix pull request from last week.

I'll send you the right one.

Re: [GIT] Networking

[David Miller]

Sorry, this is a dup of the bug fix pull request from last week.

I'll send you the right one.

Re: [GIT] Networking

[David Miller]

From: Daniel Borkmann 
Date: Wed, 15 Nov 2017 23:15:20 +0100

> On 11/15/2017 09:19 PM, Linus Torvalds wrote:
>> On Wed, Nov 15, 2017 at 3:33 AM, David Miller  wrote:
>>>
>>> Highlights:
>> 
>> Lowlights:
>> 
>>  1) it duplicated a commit from the hrtimer tree, which had been
>> cleaned up and rewritten, but then merging the second copy of the
>> commit re-introduced the bad code that had been cleaned up.
>> 
>> I'm talking about commits
>> 
>>  - 7d9285e82db5:
>>   perf/bpf: Extend the perf_event_read_local() interface, a.k.a.
>> "bpf: perf event change needed for subsequent bpf helpers"
>>  - 97562633bcba
>>   bpf: perf event change needed for subsequent bpf helpers
>> 
>> where apparently there was no discussion between the groups about the
>> subsequent changes.
>> 
>> And this must have shown up in linux-next as a conflict, but no
>> mention of it from either the perf event tree or the networking tree
>> merge.
>> 
>> Although it is of course possible that depending on merge order, the
>> problem never showed up in next.
> 
> Sorry about that, it was discussed that the patch in [1] would get
> routed through net-next and again cherry-picked from tracing folks
> due to conflicting changes in perf event tree that were being worked
> on to avoid later merge conflicts - clearly that didn't give the
> desired result.
> 
> There was a subsequent discussion in [2] but not sure if cherry-picking
> 0d3d73aac2ff ("perf/core: Rewrite event timekeeping") into net-next
> would have made it better or worse. We'll have a bpf sub-tree up and
> running soon for the next development cycle that can be pulled from
> by different parties when needed; potentially this could reduce such
> conflicts between trees in future. Sorry for the trouble.

Yeah, sorry about all of this.

I had hoped that since the patch was being appied to both trees in
order to avoid merge problems, no modifications would have been made
to the change at either end.  This obviously didn't happen.

I also didn't communicate the issue to you clearly in the pull
request, and for this I apologize.

As Daniel says, we realize that bpf is breaching multiple subsystems
more and more so over time, and we hope a bpf GIT tree will help
alleviate this moving forward.

Thanks!

Re: [GIT] Networking

[David Miller]

From: Daniel Borkmann 
Date: Wed, 15 Nov 2017 23:15:20 +0100

> On 11/15/2017 09:19 PM, Linus Torvalds wrote:
>> On Wed, Nov 15, 2017 at 3:33 AM, David Miller  wrote:
>>>
>>> Highlights:
>> 
>> Lowlights:
>> 
>>  1) it duplicated a commit from the hrtimer tree, which had been
>> cleaned up and rewritten, but then merging the second copy of the
>> commit re-introduced the bad code that had been cleaned up.
>> 
>> I'm talking about commits
>> 
>>  - 7d9285e82db5:
>>   perf/bpf: Extend the perf_event_read_local() interface, a.k.a.
>> "bpf: perf event change needed for subsequent bpf helpers"
>>  - 97562633bcba
>>   bpf: perf event change needed for subsequent bpf helpers
>> 
>> where apparently there was no discussion between the groups about the
>> subsequent changes.
>> 
>> And this must have shown up in linux-next as a conflict, but no
>> mention of it from either the perf event tree or the networking tree
>> merge.
>> 
>> Although it is of course possible that depending on merge order, the
>> problem never showed up in next.
> 
> Sorry about that, it was discussed that the patch in [1] would get
> routed through net-next and again cherry-picked from tracing folks
> due to conflicting changes in perf event tree that were being worked
> on to avoid later merge conflicts - clearly that didn't give the
> desired result.
> 
> There was a subsequent discussion in [2] but not sure if cherry-picking
> 0d3d73aac2ff ("perf/core: Rewrite event timekeeping") into net-next
> would have made it better or worse. We'll have a bpf sub-tree up and
> running soon for the next development cycle that can be pulled from
> by different parties when needed; potentially this could reduce such
> conflicts between trees in future. Sorry for the trouble.

Yeah, sorry about all of this.

I had hoped that since the patch was being appied to both trees in
order to avoid merge problems, no modifications would have been made
to the change at either end.  This obviously didn't happen.

I also didn't communicate the issue to you clearly in the pull
request, and for this I apologize.

As Daniel says, we realize that bpf is breaching multiple subsystems
more and more so over time, and we hope a bpf GIT tree will help
alleviate this moving forward.

Thanks!

Re: [GIT] Networking

[Daniel Borkmann]

On 11/15/2017 09:19 PM, Linus Torvalds wrote:
> On Wed, Nov 15, 2017 at 3:33 AM, David Miller  wrote:
>>
>> Highlights:
> 
> Lowlights:
> 
>  1) it duplicated a commit from the hrtimer tree, which had been
> cleaned up and rewritten, but then merging the second copy of the
> commit re-introduced the bad code that had been cleaned up.
> 
> I'm talking about commits
> 
>  - 7d9285e82db5:
>   perf/bpf: Extend the perf_event_read_local() interface, a.k.a.
> "bpf: perf event change needed for subsequent bpf helpers"
>  - 97562633bcba
>   bpf: perf event change needed for subsequent bpf helpers
> 
> where apparently there was no discussion between the groups about the
> subsequent changes.
> 
> And this must have shown up in linux-next as a conflict, but no
> mention of it from either the perf event tree or the networking tree
> merge.
> 
> Although it is of course possible that depending on merge order, the
> problem never showed up in next.

Sorry about that, it was discussed that the patch in [1] would get
routed through net-next and again cherry-picked from tracing folks
due to conflicting changes in perf event tree that were being worked
on to avoid later merge conflicts - clearly that didn't give the
desired result.

There was a subsequent discussion in [2] but not sure if cherry-picking
0d3d73aac2ff ("perf/core: Rewrite event timekeeping") into net-next
would have made it better or worse. We'll have a bpf sub-tree up and
running soon for the next development cycle that can be pulled from
by different parties when needed; potentially this could reduce such
conflicts between trees in future. Sorry for the trouble.

Thanks,
Daniel

  [1] https://patchwork.ozlabs.org/patch/821919/
  [2] https://lkml.org/lkml/2017/11/1/53

Re: [GIT] Networking

[Daniel Borkmann]

On 11/15/2017 09:19 PM, Linus Torvalds wrote:
> On Wed, Nov 15, 2017 at 3:33 AM, David Miller  wrote:
>>
>> Highlights:
> 
> Lowlights:
> 
>  1) it duplicated a commit from the hrtimer tree, which had been
> cleaned up and rewritten, but then merging the second copy of the
> commit re-introduced the bad code that had been cleaned up.
> 
> I'm talking about commits
> 
>  - 7d9285e82db5:
>   perf/bpf: Extend the perf_event_read_local() interface, a.k.a.
> "bpf: perf event change needed for subsequent bpf helpers"
>  - 97562633bcba
>   bpf: perf event change needed for subsequent bpf helpers
> 
> where apparently there was no discussion between the groups about the
> subsequent changes.
> 
> And this must have shown up in linux-next as a conflict, but no
> mention of it from either the perf event tree or the networking tree
> merge.
> 
> Although it is of course possible that depending on merge order, the
> problem never showed up in next.

Sorry about that, it was discussed that the patch in [1] would get
routed through net-next and again cherry-picked from tracing folks
due to conflicting changes in perf event tree that were being worked
on to avoid later merge conflicts - clearly that didn't give the
desired result.

There was a subsequent discussion in [2] but not sure if cherry-picking
0d3d73aac2ff ("perf/core: Rewrite event timekeeping") into net-next
would have made it better or worse. We'll have a bpf sub-tree up and
running soon for the next development cycle that can be pulled from
by different parties when needed; potentially this could reduce such
conflicts between trees in future. Sorry for the trouble.

Thanks,
Daniel

  [1] https://patchwork.ozlabs.org/patch/821919/
  [2] https://lkml.org/lkml/2017/11/1/53