| Message ID | 20181020.154737.106692150032143674.davem@davemloft.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [GIT] Networking | expand |
From: David Miller <davem@davemloft.net> Date: Sat, 20 Oct 2018 15:47:37 -0700 (PDT) > > A few straggler bug fixes: > > 1) Fix indexing of multi-pass dumps of ipv6 addresses, from David > Ahern. > > 2) Revert RCU locking change for bonding netpoll, causes worse problems > than it solves. > > 3) pskb_trim_rcsum_slow() doesn't handle odd trim offsets, resulting in > erroneous bad hw checksum triggers with CHECKSUM_COMPLETE devices. > From Dimitris Michailidis. > > Please pull, thanks a lot! Great, I appended one more bug fix to this pull request, a revert to some neighbour code changes that adjust notifications in a way that confuses some apps. ==================== From d2fb4fb8ee91c1b8a1dbba6afda6f5ed2eb28bdc Mon Sep 17 00:00:00 2001 From: Roopa Prabhu <roopa@cumulusnetworks.com> Date: Sat, 20 Oct 2018 18:09:31 -0700 Subject: [PATCH] Revert "neighbour: force neigh_invalidate when NUD_FAILED update is from admin" This reverts commit 8e326289e3069dfc9fa9c209924668dd031ab8ef. This patch results in unnecessary netlink notification when one tries to delete a neigh entry already in NUD_FAILED state. Found this with a buggy app that tries to delete a NUD_FAILED entry repeatedly. While the notification issue can be fixed with more checks, adding more complexity here seems unnecessary. Also, recent tests with other changes in the neighbour code have shown that the INCOMPLETE and PROBE checks are good enough for the original issue. Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> --- net/core/neighbour.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 91592fceeaad..4e07824eec5e 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1148,8 +1148,7 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, neigh->nud_state = new; err = 0; notify = old & NUD_VALID; - if (((old & (NUD_INCOMPLETE | NUD_PROBE)) || - (flags & NEIGH_UPDATE_F_ADMIN)) && + if ((old & (NUD_INCOMPLETE | NUD_PROBE)) && (new & NUD_FAILED)) { neigh_invalidate(neigh); notify = 1;
On Sat, Oct 20, 2018 at 10:26:45PM -0700, David Miller wrote: > From: David Miller <davem@davemloft.net> > Date: Sat, 20 Oct 2018 15:47:37 -0700 (PDT) > > > > > A few straggler bug fixes: > > > > 1) Fix indexing of multi-pass dumps of ipv6 addresses, from David > > Ahern. > > > > 2) Revert RCU locking change for bonding netpoll, causes worse problems > > than it solves. > > > > 3) pskb_trim_rcsum_slow() doesn't handle odd trim offsets, resulting in > > erroneous bad hw checksum triggers with CHECKSUM_COMPLETE devices. > > From Dimitris Michailidis. > > > > Please pull, thanks a lot! > > Great, I appended one more bug fix to this pull request, a revert to > some neighbour code changes that adjust notifications in a way that > confuses some apps. Now merged, thanks. greg k-h
A few straggler bug fixes: 1) Fix indexing of multi-pass dumps of ipv6 addresses, from David Ahern. 2) Revert RCU locking change for bonding netpoll, causes worse problems than it solves. 3) pskb_trim_rcsum_slow() doesn't handle odd trim offsets, resulting in erroneous bad hw checksum triggers with CHECKSUM_COMPLETE devices. From Dimitris Michailidis. Please pull, thanks a lot! The following changes since commit 91b15613ce7fb3e724ca0d433eef8e6bf15322af: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2018-10-19 09:16:20 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net for you to fetch changes up to 4ba4c566ba8448a05e6257e0b98a21f1a0d55315: net/ipv6: Fix index counter for unicast addresses in in6_dump_addrs (2018-10-20 15:43:14 -0700) ---------------------------------------------------------------- David Ahern (1): net/ipv6: Fix index counter for unicast addresses in in6_dump_addrs David S. Miller (1): Revert "bond: take rcu lock in netpoll_send_skb_on_dev" Dimitris Michailidis (1): net: fix pskb_trim_rcsum_slow() with odd trim offset net/core/netpoll.c | 2 -- net/core/skbuff.c | 5 +++-- net/ipv6/addrconf.c | 6 ++++-- 3 files changed, 7 insertions(+), 6 deletions(-)