[GIT PULL] Networking for 5.16-rc6

[GIT PULL] Networking for 5.16-rc6

[Jakub Kicinski]

Hi Linus!

Relatively large batches of fixes from BPF and the WiFi stack,
calm in general networking.

The following changes since commit c2fcbf81c332b42382a0c439bfe2414a241e4f5b:

  bpf, selftests: Fix racing issue in btf_skc_cls_ingress test (2021-12-16 21:41:18 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git tags/net-5.16-rc6

for you to fetch changes up to 0c3e2474605581375d808bb3b9ce0927ed3eef70:

  Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (2021-12-16 13:06:49 -0800)

----------------------------------------------------------------
Networking fixes for 5.16-rc6, including fixes from mac80211, wifi, bpf.

Current release - regressions:

 - dpaa2-eth: fix buffer overrun when reporting ethtool statistics

Current release - new code bugs:

 - bpf: fix incorrect state pruning for <8B spill/fill

 - iavf:
     - add missing unlocks in iavf_watchdog_task()
     - do not override the adapter state in the watchdog task (again)

 - mlxsw: spectrum_router: consolidate MAC profiles when possible

Previous releases - regressions:

 - mac80211, fix:
     - rate control, avoid driver crash for retransmitted frames
     - regression in SSN handling of addba tx
     - a memory leak where sta_info is not freed
     - marking TX-during-stop for TX in in_reconfig, prevent stall

 - cfg80211: acquire wiphy mutex on regulatory work

 - wifi drivers: fix build regressions and LED config dependency

 - virtio_net: fix rx_drops stat for small pkts

 - dsa: mv88e6xxx: unforce speed & duplex in mac_link_down()

Previous releases - always broken:

 - bpf, fix:
    - kernel address leakage in atomic fetch
    - kernel address leakage in atomic cmpxchg's r0 aux reg
    - signed bounds propagation after mov32
    - extable fixup offset
    - extable address check

 - mac80211:
     - fix the size used for building probe request
     - send ADDBA requests using the tid/queue of the aggregation
       session
     - agg-tx: don't schedule_and_wake_txq() under sta->lock,
       avoid deadlocks
     - validate extended element ID is present

 - mptcp:
     - never allow the PM to close a listener subflow (null-defer)
     - clear 'kern' flag from fallback sockets, prevent crash
     - fix deadlock in __mptcp_push_pending()

 - inet_diag: fix kernel-infoleak for UDP sockets

 - xsk: do not sleep in poll() when need_wakeup set

 - smc: avoid very long waits in smc_release()

 - sch_ets: don't remove idle classes from the round-robin list

 - netdevsim:
     - zero-initialize memory for bpf map's value, prevent info leak
     - don't let user space overwrite read only (max) ethtool parms

 - ixgbe: set X550 MDIO speed before talking to PHY

 - stmmac:
     - fix null-deref in flower deletion w/ VLAN prio Rx steering
     - dwmac-rk: fix oob read in rk_gmac_setup

 - ice: time stamping fixes

 - systemport: add global locking for descriptor life cycle

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

----------------------------------------------------------------
Ahmed Zaki (1):
      mac80211: fix a memory leak where sta_info is not freed

Andrey Eremeev (1):
      dsa: mv88e6xxx: fix debug print for SPEED_UNFORCED

Arnd Bergmann (3):
      iwlwifi: fix LED dependencies
      brcmsmac: rework LED dependencies
      mt76: mt7921: fix build regression

Baowen Zheng (1):
      flow_offload: return EOPNOTSUPP for the unsupported mpls action type

Cyril Novikov (1):
      ixgbe: set X550 MDIO speed before talking to PHY

D. Wythe (1):
      net/smc: Prevent smc_release() from long blocking

Dan Carpenter (1):
      iavf: missing unlocks in iavf_watchdog_task()

Daniele Palmas (1):
      net: usb: qmi_wwan: add Telit 0x1070 composition

Danielle Ratson (2):
      mlxsw: spectrum_router: Consolidate MAC profiles when possible
      selftests: mlxsw: Add a test case for MAC profiles consolidation

David Ahern (3):
      selftests: Add duplicate config only for MD5 VRF tests
      selftests: Fix raw socket bind tests with VRF
      selftests: Fix IPv6 address bind tests

David S. Miller (7):
      Merge branch 'hns3-fixes'
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
      Merge tag 'mac80211-for-net-2021-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
      Merge branch 'mlxsw-fixes'
      Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
      Merge tag 'wireless-drivers-2021-12-15' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
      Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue

David Wu (1):
      net: stmmac: Add GFP_DMA32 for rx buffers if no 64 capability

Davide Caratti (1):
      net/sched: sch_ets: don't remove idle classes from the round-robin list

Eric Dumazet (2):
      inet_diag: fix kernel-infoleak for UDP sockets
      sit: do not call ipip6_dev_free() from sit_init_net()

Felix Fietkau (3):
      mac80211: fix rate control for retransmitted frames
      mac80211: fix regression in SSN handling of addba tx
      mac80211: send ADDBA requests using the tid/queue of the aggregation session

Filip Pokryvka (1):
      netdevsim: don't overwrite read only ethtool parms

Finn Behrens (2):
      nl80211: reset regdom when reloading regdb
      nl80211: remove reload flag from regulatory_request

Florian Fainelli (1):
      net: systemport: Add global locking for descriptor lifecycle

Florian Westphal (2):
      mptcp: remove tcp ulp setsockopt support
      mptcp: clear 'kern' flag from fallback sockets

Gal Pressman (1):
      net: Fix double 0x prefix print in SKB dump

Greg Jesionowski (1):
      net: usb: lan78xx: add Allied Telesis AT29M2-AF

Haimin Zhang (1):
      netdevsim: Zero-initialize memory for new map's value in function nsim_bpf_map_alloc

Hangbin Liu (1):
      selftest/net/forwarding: declare NETIFS p9 p10

Hangyu Hua (2):
      phonet: refcount leak in pep_sock_accep
      rds: memory leak in __rds_conn_create()

Ilan Peer (2):
      cfg80211: Acquire wiphy mutex on regulatory work
      mac80211: Fix the size used for building probe request

Ioana Ciornei (1):
      dpaa2-eth: fix ethtool statistics

Jakub Kicinski (2):
      Merge branch 'mptcp-fixes-for-ulp-a-deadlock-and-netlink-docs'
      Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Jiasheng Jiang (1):
      sfc_ef100: potential dereference of null pointer

Jie Wang (1):
      net: hns3: fix use-after-free bug in hclgevf_send_mbx_msg

Johannes Berg (8):
      mac80211: track only QoS data frames for admission control
      mac80211: add docs for ssn in struct tid_ampdu_tx
      iwlwifi: mvm: don't crash on invalid rate w/o STA
      mac80211: agg-tx: don't schedule_and_wake_txq() under sta->lock
      mac80211: validate extended element ID is present
      mac80211: fix lookup when adding AddBA extension element
      mac80211: mark TX-during-stop for TX in in_reconfig
      mac80211: do drv_reconfig_complete() before restarting all

John Keeping (1):
      net: stmmac: dwmac-rk: fix oob read in rk_gmac_setup

Kalle Valo (1):
      MAINTAINERS: update Kalle Valo's email

Karen Sornek (1):
      igb: Fix removal of unicast MAC filters of VFs

Karol Kolacinski (2):
      ice: Use div64_u64 instead of div_u64 in adjfine
      ice: Don't put stale timestamps in the skb

Letu Ren (1):
      igbvf: fix double free in `igbvf_probe`

Marek Behún (1):
      net: dsa: mv88e6xxx: Unforce speed & duplex in mac_link_down()

Matthieu Baerts (1):
      mptcp: add missing documented NL params

Maxim Galaganov (1):
      mptcp: fix deadlock in __mptcp_push_pending()

Maxime Bizon (1):
      mac80211: fix TCP performance on mesh interface

Miaoqian Lin (1):
      net: bcmgenet: Fix NULL vs IS_ERR() checking

Mordechay Goodstein (1):
      mac80211: update channel context before station state

Ong Boon Leong (1):
      net: stmmac: fix tc flower deletion for VLAN priority Rx steering

Paolo Abeni (1):
      mptcp: never allow the PM to close a listener subflow

Po-Hsu Lin (1):
      selftests: icmp_redirect: pass xfail=0 to log_test()

Robert Schlabbach (1):
      ixgbe: Document how to enable NBASE-T support

Russell King (Oracle) (1):
      net: phy: add a note about refcounting

Sasha Neftin (1):
      igc: Fix typo in i225 LTR functions

Stefan Assmann (1):
      iavf: do not override the adapter state in the watchdog task (again)

Wang Qing (1):
      net: ethernet: ti: add missing of_node_put before return

Wenliang Wang (1):
      virtio_net: fix rx_drops stat for small pkts

Willem de Bruijn (2):
      selftests/net: toeplitz: fix udp option
      net/packet: rx_owner_map depends on pg_vec

Xing Song (1):
      mac80211: set up the fwd_skb->dev for mesh forwarding

Yufeng Mo (1):
      net: hns3: fix race condition in debugfs

 .../device_drivers/ethernet/intel/ixgbe.rst        | 16 ++++
 MAINTAINERS                                        | 12 +--
 drivers/net/dsa/mv88e6xxx/chip.c                   |  4 +
 drivers/net/dsa/mv88e6xxx/port.c                   |  4 +-
 drivers/net/ethernet/broadcom/bcmsysport.c         |  5 +-
 drivers/net/ethernet/broadcom/bcmsysport.h         |  1 +
 drivers/net/ethernet/broadcom/genet/bcmmii.c       |  4 +-
 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h   |  2 +
 .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c   |  2 +-
 drivers/net/ethernet/hisilicon/hns3/hnae3.h        |  2 +
 drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 20 +++--
 .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c   |  3 +-
 drivers/net/ethernet/intel/iavf/iavf_main.c        |  5 +-
 drivers/net/ethernet/intel/ice/ice_ptp.c           | 13 ++--
 drivers/net/ethernet/intel/ice/ice_ptp.h           |  6 ++
 drivers/net/ethernet/intel/igb/igb_main.c          | 28 +++----
 drivers/net/ethernet/intel/igbvf/netdev.c          |  1 +
 drivers/net/ethernet/intel/igc/igc_i225.c          |  2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  4 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c      |  3 +
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |  3 +-
 drivers/net/ethernet/sfc/ef100_nic.c               |  3 +
 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c     |  4 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac.h       | 17 +++++
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  | 16 +++-
 drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c    | 86 ++++++++++++++++++----
 drivers/net/ethernet/ti/am65-cpsw-nuss.c           | 29 +++++---
 drivers/net/netdevsim/bpf.c                        |  1 +
 drivers/net/netdevsim/ethtool.c                    |  5 +-
 drivers/net/phy/mdio_bus.c                         |  3 +
 drivers/net/usb/lan78xx.c                          |  6 ++
 drivers/net/usb/qmi_wwan.c                         |  1 +
 drivers/net/virtio_net.c                           |  9 +--
 drivers/net/wireless/broadcom/brcm80211/Kconfig    | 14 ++--
 .../wireless/broadcom/brcm80211/brcmsmac/Makefile  |  2 +-
 .../net/wireless/broadcom/brcm80211/brcmsmac/led.h |  2 +-
 drivers/net/wireless/intel/iwlegacy/Kconfig        |  4 +-
 drivers/net/wireless/intel/iwlwifi/Kconfig         |  2 +-
 drivers/net/wireless/intel/iwlwifi/mvm/tx.c        |  5 +-
 drivers/net/wireless/mediatek/mt76/Makefile        |  2 +-
 include/uapi/linux/mptcp.h                         | 18 +++--
 net/core/skbuff.c                                  |  2 +-
 net/ipv4/inet_diag.c                               |  4 +-
 net/ipv6/sit.c                                     |  1 -
 net/mac80211/agg-rx.c                              |  5 +-
 net/mac80211/agg-tx.c                              | 16 ++--
 net/mac80211/driver-ops.h                          |  5 +-
 net/mac80211/mlme.c                                | 13 +++-
 net/mac80211/rx.c                                  |  1 +
 net/mac80211/sta_info.c                            | 21 +++---
 net/mac80211/sta_info.h                            |  2 +
 net/mac80211/tx.c                                  | 10 +--
 net/mac80211/util.c                                | 23 +++---
 net/mptcp/pm_netlink.c                             |  3 +
 net/mptcp/protocol.c                               |  6 +-
 net/mptcp/sockopt.c                                |  1 -
 net/packet/af_packet.c                             |  5 +-
 net/phonet/pep.c                                   |  1 +
 net/rds/connection.c                               |  1 +
 net/sched/cls_api.c                                |  1 +
 net/sched/sch_ets.c                                |  4 +-
 net/smc/af_smc.c                                   |  4 +-
 net/wireless/reg.c                                 | 30 +++++++-
 .../drivers/net/mlxsw/rif_mac_profiles_occ.sh      | 30 ++++++++
 tools/testing/selftests/net/fcnal-test.sh          | 43 ++++++++---
 .../net/forwarding/forwarding.config.sample        |  2 +
 tools/testing/selftests/net/icmp_redirect.sh       |  2 +-
 tools/testing/selftests/net/toeplitz.c             |  2 +-
 68 files changed, 445 insertions(+), 162 deletions(-)

Re: [GIT PULL] Networking for 5.16-rc6

[Linus Torvalds]

On Thu, Dec 16, 2021 at 1:32 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> Relatively large batches of fixes from BPF and the WiFi stack,
> calm in general networking.

Hmm. I get a very different diffstat, and also a different shortlog
than the one you quote.

I do get the top commit you claim:

>   git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git tags/net-5.16-rc6
>
> for you to fetch changes up to 0c3e2474605581375d808bb3b9ce0927ed3eef70:
>
>   Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (2021-12-16 13:06:49 -0800)

But your shortlog doesn't contain

  Alexei Starovoitov (3):
        bpf: Fix extable fixup offset.
        bpf: Fix extable address check.
        selftest/bpf: Add a test that reads various addresses.

  Daniel Borkmann (7):
        bpf: Fix kernel address leakage in atomic fetch
        bpf, selftests: Add test case for atomic fetch on spilled pointer
        bpf: Fix kernel address leakage in atomic cmpxchg's r0 aux reg
        bpf, selftests: Update test case for atomic cmpxchg on r0 with pointer
        bpf: Fix signed bounds propagation after mov32
        bpf: Make 32->64 bounds propagation slightly more robust
        bpf, selftests: Add test case trying to taint map value pointer

  Kumar Kartikeya Dwivedi (1):
        selftests/bpf: Fix OOB write in test_verifier

  Magnus Karlsson (1):
        xsk: Do not sleep in poll() when need_wakeup set

  Paul Chaignon (2):
        bpf: Fix incorrect state pruning for <8B spill/fill
        selftests/bpf: Tests for state pruning with u32 spill/fill

and that seems to be the missing diffstat contents also.

It looks like your pull request was done without that last merge, even
though you do mention it as being the top of tree.

I've pulled this, because that last merge looks fine and intentional,
but I'd like you to double-check your workflow to see what happened to
give a stale diffstat and shortlog...

              Linus

Re: [GIT PULL] Networking for 5.16-rc6

[Jakub Kicinski]

On Thu, 16 Dec 2021 15:14:27 -0800 Linus Torvalds wrote:
> On Thu, Dec 16, 2021 at 1:32 PM Jakub Kicinski <kuba@kernel.org> wrote:
> > Relatively large batches of fixes from BPF and the WiFi stack,
> > calm in general networking.  
> 
> Hmm. I get a very different diffstat, and also a different shortlog
> than the one you quote.
> 
> I do get the top commit you claim:
> 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git tags/net-5.16-rc6
> >
> > for you to fetch changes up to 0c3e2474605581375d808bb3b9ce0927ed3eef70:
> >
> >   Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (2021-12-16 13:06:49 -0800)  
> 
> But your shortlog doesn't contain
> [...]
> and that seems to be the missing diffstat contents also.
> 
> It looks like your pull request was done without that last merge, even
> though you do mention it as being the top of tree.

But you are able to get the bpf patches, from the tag, right?

> I've pulled this, because that last merge looks fine and intentional,
> but I'd like you to double-check your workflow to see what happened to
> give a stale diffstat and shortlog...

Very strange, I didn't fix it up, redo or anything, push the tree, 
tag, push the tag, git request-pull >> email. And request-pull did 
not complain about anything.

I will double check all the outputs next time, really not sure how this
happened..

While I have you - I see that you drop my SoB at the end of the merge
message, usually. Should I not put it there?  I put it there because
of something I read in Documentation/process/...

Re: [GIT PULL] Networking for 5.16-rc6

[Linus Torvalds]

On Thu, Dec 16, 2021 at 3:43 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> Very strange, I didn't fix it up, redo or anything, push the tree,
> tag, push the tag, git request-pull >> email. And request-pull did
> not complain about anything.

You hadn't pushed the previous case by any chance? 'git request-pull'
does actually end up going off to check the remote end, and maybe it
saw a stale state (because the mirroring to the public side isn't
immediate)?

> While I have you - I see that you drop my SoB at the end of the merge
> message, usually. Should I not put it there?  I put it there because
> of something I read in Documentation/process/...

No, I actually like seeing the sign-off from remote pulls -
particularly in the signed tags where they get saved in the git tree
anyway (you won't _see_ them with a normal 'git log', but you can see
how it's saved off if you do

    git cat-file commit 180f3bcfe3622bb78307dcc4fe1f8f4a717ee0ba

to see the raw commit data).

But I edit them out from the merge message because we haven't
standardized on a format for them, and I end up trying to make my
merges look fairly consistent (I edit just about all merge messages
for whitespace and formatting, as you've probably noticed).

Maybe we should standardize on sign-off messages for merges too, but
they really don't have much practical use.

For a patch, the sign-off chain is really important for when some
patch trouble happens, so that we can cc all the people involved in
merging the patch. And there's obviously the actual copyright part of
the sign-off too.

For a merge? Neither of those are really issues. The merge itself
doesn't add any new code - the sign-offs should be on the individual
commits that do. And if there is a merge problem, the blame for the
merge is solidly with the person who merged it, not some kind of
"merge chain".

So all the real meat is in the history, and the merge commit is about
explaining the high-level "what's going on".

End result: unlike a regular commit, there's not a lot of point for
posterity to have a sign-off chain (which would always be just the two
ends of the merge anyway). End result: I don't see much real reason to
keep the sign-offs in the merge log.

But I _do_ like seeing them in the pull request, because there it's
kind of the "super-sign-off" for the commits that I pull, if you see
what I mean...

Logical? I don't know. But hopefully the above explains my thinking.

                   Linus

Re: [GIT PULL] Networking for 5.16-rc6

[pr-tracker-bot]

The pull request you sent on Thu, 16 Dec 2021 13:32:07 -0800:

> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git tags/net-5.16-rc6

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

Thank you!

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

Re: [GIT PULL] Networking for 5.16-rc6

[Jakub Kicinski]

On Thu, 16 Dec 2021 15:59:40 -0800 Linus Torvalds wrote:
> On Thu, Dec 16, 2021 at 3:43 PM Jakub Kicinski <kuba@kernel.org> wrote:
> >
> > Very strange, I didn't fix it up, redo or anything, push the tree,
> > tag, push the tag, git request-pull >> email. And request-pull did
> > not complain about anything.  
> 
> You hadn't pushed the previous case by any chance? 'git request-pull'
> does actually end up going off to check the remote end, and maybe it
> saw a stale state (because the mirroring to the public side isn't
> immediate)?

Ah! I know.. I forgot to fetch your tree and used FETCH_HEAD 
in git request-pull which was at bpf :/

Sorry about that!

> > While I have you - I see that you drop my SoB at the end of the merge
> > message, usually. Should I not put it there?  I put it there because
> > of something I read in Documentation/process/...  
> 
> No, I actually like seeing the sign-off from remote pulls -
> particularly in the signed tags where they get saved in the git tree
> anyway (you won't _see_ them with a normal 'git log', but you can see
> how it's saved off if you do
> 
>     git cat-file commit 180f3bcfe3622bb78307dcc4fe1f8f4a717ee0ba
> 
> to see the raw commit data).
> 
> But I edit them out from the merge message because we haven't
> standardized on a format for them, and I end up trying to make my
> merges look fairly consistent (I edit just about all merge messages
> for whitespace and formatting, as you've probably noticed).
> 
> Maybe we should standardize on sign-off messages for merges too, but
> they really don't have much practical use.
> 
> For a patch, the sign-off chain is really important for when some
> patch trouble happens, so that we can cc all the people involved in
> merging the patch. And there's obviously the actual copyright part of
> the sign-off too.
> 
> For a merge? Neither of those are really issues. The merge itself
> doesn't add any new code - the sign-offs should be on the individual
> commits that do. And if there is a merge problem, the blame for the
> merge is solidly with the person who merged it, not some kind of
> "merge chain".
> 
> So all the real meat is in the history, and the merge commit is about
> explaining the high-level "what's going on".
> 
> End result: unlike a regular commit, there's not a lot of point for
> posterity to have a sign-off chain (which would always be just the two
> ends of the merge anyway). End result: I don't see much real reason to
> keep the sign-offs in the merge log.
> 
> But I _do_ like seeing them in the pull request, because there it's
> kind of the "super-sign-off" for the commits that I pull, if you see
> what I mean...
> 
> Logical? I don't know. But hopefully the above explains my thinking.

Yup, makes sense, thanks for explaining!