| Message ID | 20240613141215.2122412-1-maze@google.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] neighbour: add RTNL_FLAG_DUMP_SPLIT_NLM_DONE to RTM_GETNEIGH | expand |
On Thu, 13 Jun 2024 07:12:15 -0700 Maciej Żenczykowski wrote: > Fixes: 3e41af90767d ("rtnetlink: use xarray iterator to implement rtnl_dump_ifinfo()") > Fixes: cdb2f80f1c10 ("inet: use xa_array iterator to implement inet_dump_ifaddr()") Did you just copy / paste those from the fix I pointed at? I really think it should be: Fixes: 7e4975f7e7fb ("neighbour: fix neigh_dump_info() return value") Please double check that, correct, and resend. Same story for the other patch.
On Sat, Jun 15, 2024 at 4:03 AM Jakub Kicinski <kuba@kernel.org> wrote: > > On Thu, 13 Jun 2024 07:12:15 -0700 Maciej Żenczykowski wrote: > > Fixes: 3e41af90767d ("rtnetlink: use xarray iterator to implement rtnl_dump_ifinfo()") > > Fixes: cdb2f80f1c10 ("inet: use xa_array iterator to implement inet_dump_ifaddr()") > > Did you just copy / paste those from the fix I pointed at? I did, since this was caught in rc and never went into any 6.9 or earlier LTS, I didn't put much thought into the fixes tag, thinking it didn't matter. > I really think it should be: > > Fixes: 7e4975f7e7fb ("neighbour: fix neigh_dump_info() return value") reverting the above does indeed fix things. I'm resending. I'll figure out what fixes the other one and resend too. > > Please double check that, correct, and resend. Same story for the other > patch. -- Maciej Żenczykowski, Kernel Networking Developer @ Google
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 45fd88405b6b..e1d12c6ac5b6 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -3892,7 +3892,7 @@ static int __init neigh_init(void) rtnl_register(PF_UNSPEC, RTM_NEWNEIGH, neigh_add, NULL, 0); rtnl_register(PF_UNSPEC, RTM_DELNEIGH, neigh_delete, NULL, 0); rtnl_register(PF_UNSPEC, RTM_GETNEIGH, neigh_get, neigh_dump_info, - RTNL_FLAG_DUMP_UNLOCKED); + RTNL_FLAG_DUMP_UNLOCKED | RTNL_FLAG_DUMP_SPLIT_NLM_DONE); rtnl_register(PF_UNSPEC, RTM_GETNEIGHTBL, NULL, neightbl_dump_info, 0);
without this Android's net test, available at: https://cs.android.com/android/platform/superproject/main/+/main:kernel/tests/net/test/ run via: /...aosp-tests.../net/test/run_net_test.sh --builder neighbour_test.py fails with: TypeError: NLMsgHdr requires a bytes object of length 16, got 4 Fixes: 3e41af90767d ("rtnetlink: use xarray iterator to implement rtnl_dump_ifinfo()") Fixes: cdb2f80f1c10 ("inet: use xa_array iterator to implement inet_dump_ifaddr()") Cc: Jakub Kicinski <kuba@kernel.org> Cc: Eric Dumazet <edumazet@google.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Maciej Żenczykowski <maze@google.com> --- net/core/neighbour.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)