Networking

1) Fix TCP checksum offload handling in iwlwifi driver, from Emmanuel Grumbach.

2) In ksz DSA tagging code, free SKB if skb_put_padto() fails. From Vivien Didelot.

3) Fix two regressions with bonding on wireless, from Andreas Born.

4) Fix build when busypoll is disabled, from Daniel Borkmann.

5) Fix copy_linear_skb() wrt. SO_PEEK_OFF, from Eric Dumazet.

6) Set SKB cached route properly in inet_rtm_getroute(), from Florian Westphal.

7) Fix PCI-E relaxed ordering handling in cxgb4 driver, from Ding Tianhong.

8) Fix module refcnt leak in ULP code, from Sabrina Dubroca.

9) Fix use of GFP_KERNEL in atomic contexts in AF_KEY code, from Eric Dumazet.

10) Need to purge socket write queue in dccp_destroy_sock(), also from Eric Dumazet.

11) Make bpf_trace_printk() work properly on 32-bit architectures, from Daniel Borkmann.

Please pull, thanks a lot!

The following changes since commit 26273939ace935dd7553b31d279eab30b40f7b9a:

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2017-08-10 10:30:29 -0700)

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 88a5c690b66110ad255380d8f629c629cf6ca559:

bpf: fix bpf_trace_printk on 32 bit archs (2017-08-15 17:32:15 -0700)

----------------------------------------------------------------
Al Viro (1):
udp: fix linear skb reception with PEEK_OFF

Andreas Born (2):
bonding: require speed/duplex only for 802.3ad, alb and tlb
bonding: ratelimit failed speed/duplex update warning

Anton Vasilyev (1):
mISDN: Fix null pointer dereference at mISDN_FsmNew

Arend Van Spriel (1):
brcmfmac: feature check for multi-scheduled scan fails on bcm4343x devices

Avraham Stern (1):
iwlwifi: mvm: start mac queues when deferred tx frames are purged

Bert Kenward (1):
sfc: don't try and read ef10 data on non-ef10 NIC

Casey Leedom (2):
net/cxgb4: Use new PCI_DEV_FLAGS_NO_RELAXED_ORDERING flag net/cxgb4vf: Use new PCI_DEV_FLAGS_NO_RELAXED_ORDERING flag

Christophe Jaillet (1):
iwlwifi: mvm: Fix a memory leak in an error handling path in 'iwl_mvm_sar_get_wgds_table()'

Daniel Borkmann (3):
net: fix compilation when busy poll is not enabled
bpf: fix two missing target_size settings in bpf_convert_ctx_access
bpf: fix bpf_trace_printk on 32 bit archs

David S. Miller (3):
Merge branch 'bpf-Minor-fix-in-bpf_convert_ctx_access'
Merge branch 'Add-new-PCI_DEV_FLAGS_NO_RELAXED_ORDERING-flag'
Merge tag 'wireless-drivers-for-davem-2017-08-15' of git://git.kernel.org/.../kvalo/wireless-drivers

Emmanuel Grumbach (4):
iwlwifi: mvm: fix TCP CSUM offload with WEP and A000 series
iwlwifi: add TLV for MLME offload firmware capability
iwlwifi: split the regulatory rules when the bandwidth flags require it
iwlwifi: mvm: don't WARN when a legit race happens in A-MPDU

Eric Dumazet (6):
udp: harden copy_linear_skb()
af_key: do not use GFP_KERNEL in atomic contexts
dccp: purge write queue in dccp_destroy_sock()
tcp: fix possible deadlock in TCP stack vs BPF filter
ipv6: fix NULL dereference in ip6_route_dev_notify()
ipv4: fix NULL dereference in free_fib_info_rcu()

Florian Westphal (1):
ipv4: route: fix inet_rtm_getroute induced crash

Gregory Greenman (2):
iwlwifi: mvm: set A-MPDU bit upon empty BA notification from FW
iwlwifi: mvm: rs: fix TLC statistics collection

Haim Dreyfuss (1):
iwlwifi: fix fw_pre_next_step to apply also for C step

Jon Paul Maloy (2):
tipc: accept PACKET_MULTICAST packets
tipc: avoid inheriting msg_non_seq flag when message is returned

Kalle Valo (2):

      Merge tag 'iwlwifi-for-kalle-2017-08-02' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
      Merge tag 'iwlwifi-for-kalle-2018-08-09' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes

Konstantin Khlebnikov (4):
net/sched/hfsc: allocate tcf block for hfsc root class
net_sched: reset pointers to tcf blocks in classful qdiscs' destructors net_sched/sfq: update hierarchical backlog when drop packet
net_sched: remove warning from qdisc_hash_add

Naftali Goldstein (3):
iwlwifi: mvm: set the RTS_MIMO_PROT bit in flag mask when sending sta to fw
mac80211: add api to start ba session timer expired flow
iwlwifi: mvm: send delba upon rx ba session timeout

Romain Perier (1):
net: stmmac: Use the right logging function in stmmac_mdio_register

Sabrina Dubroca (1):
tcp: ulp: avoid module refcnt leak in tcp_set_ulp

Simon Horman (1):
nfp: do not update MTU from BH in flower app

Tonghao Zhang (1):
net: Fix a typo in comment about sock flags.

Tzipi Peres (1):
iwlwifi: add the new 9000 series PCI IDs

Vivien Didelot (1):
net: dsa: ksz: fix skb freeing

Wei Wang (1):

      ipv6: release rt6->rt6i_idev properly during ifdown

dingtianhong (4):
PCI: Disable PCIe Relaxed Ordering if unsupported
PCI: Disable Relaxed Ordering for some Intel processors
PCI: Disable Relaxed Ordering Attributes for AMD A1100
PCI: fix oops when try to find Root Port for a PCI device

 drivers/isdn/mISDN/fsm.c                                   |  5 ++++-
 drivers/isdn/mISDN/fsm.h                                   |  2 +-
 drivers/isdn/mISDN/layer1.c                                |  3 +--
 drivers/isdn/mISDN/layer2.c                                | 15 +++++++++++++--
 drivers/isdn/mISDN/tei.c                                   | 20 +++++++++++++++++---
 drivers/net/bonding/bond_main.c                            | 13 ++++++++-----
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h                 |  1 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c            | 23 ++++++++++++++++------
 drivers/net/ethernet/chelsio/cxgb4/sge.c                   |  5 +++--
 drivers/net/ethernet/chelsio/cxgb4vf/adapter.h             |  1 +
 drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c        | 18 ++++++++++++++++++
 drivers/net/ethernet/chelsio/cxgb4vf/sge.c                 |  3 +++
 drivers/net/ethernet/netronome/nfp/flower/cmsg.c           |  8 ++------
 drivers/net/ethernet/sfc/mcdi_port.c                       |  8 ++++++--
 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c          |  9 ++++-----
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c |  6 ++++--
 drivers/net/wireless/intel/iwlwifi/cfg/9000.c              | 14 +++++++-------
 drivers/net/wireless/intel/iwlwifi/fw/file.h               |  2 ++
 drivers/net/wireless/intel/iwlwifi/iwl-config.h            |  8 ++++----
 drivers/net/wireless/intel/iwlwifi/iwl-drv.c               |  5 +++--
 drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c         | 19 +++++++++++--------
 drivers/net/wireless/intel/iwlwifi/mvm/fw.c                |  6 ++++--
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c          | 12 +++++++++++-
 drivers/net/wireless/intel/iwlwifi/mvm/rs.c                |  8 ++++----
 drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c              | 10 ++++++----
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c               |  7 ++++---
 drivers/net/wireless/intel/iwlwifi/mvm/tx.c                | 12 ++++++++++--
 drivers/net/wireless/intel/iwlwifi/pcie/drv.c              | 20 ++++++++++++++++++++
 drivers/pci/pci.c                                          |  7 ++++---
 drivers/pci/probe.c                                        | 43 ++++++++++++++++++++++++++++++++++++++++++
 drivers/pci/quirks.c                                       | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/net.h                                        |  2 +-
 include/linux/pci.h                                        |  3 +++
 include/net/addrconf.h                                     | 10 ++++++++++
 include/net/bonding.h                                      |  5 +++++
 include/net/busy_poll.h                                    | 12 ++++++------
 include/net/mac80211.h                                     | 15 +++++++++++++++
 include/net/udp.h                                          |  7 ++++---
 kernel/trace/bpf_trace.c                                   | 34 +++++++++++++++++++++++++++++----
 net/core/filter.c                                          |  2 ++
 net/dccp/proto.c                                           |  5 +----
 net/dsa/tag_ksz.c                                          | 13 +++++++++----
 net/ipv4/fib_semantics.c                                   | 12 +++++++-----
 net/ipv4/route.c                                           |  3 ++-
 net/ipv4/tcp_ipv4.c                                        |  4 ++--
 net/ipv4/tcp_ulp.c                                         | 14 +++++++-------
 net/ipv6/route.c                                           | 19 ++++++++-----------
 net/ipv6/tcp_ipv6.c                                        |  4 ++--
 net/key/af_key.c                                           | 48 ++++++++++++++++++++++++----------------------
 net/mac80211/agg-rx.c                                      | 22 +++++++++++++++++++++-
 net/sched/sch_api.c                                        |  3 ---
 net/sched/sch_atm.c                                        |  4 +++-
 net/sched/sch_cbq.c                                        |  4 +++-
 net/sched/sch_hfsc.c                                       | 12 +++++++++++-
 net/sched/sch_htb.c                                        |  4 +++-
 net/sched/sch_sfq.c                                        |  5 ++++-
 net/tipc/bearer.c                                          |  2 +-
 net/tipc/msg.c                                             |  1 +
 58 files changed, 512 insertions(+), 159 deletions(-)

I would *really* have liked to see an ack on these from Bjorn Helgaas. Was he even cc'd?

And while singling those commits out, I would also really have liked to see an actual name there.

The name exists in the sign-off chain:

but for some reason not in the actual commit author data, where it's just "dingtianhong".

Pulled, but slightly unhappy.

Linus

From: Linus Torvalds <[email protected]>
Date: Tue, 15 Aug 2017 19:21:16 -0700

Bjorn did review these changes, and certainly shaped the final result, but indeed I should have gotten an explicit ACK from him.

I'll make sure I do so next time.

Hi!

Could we get this one in?

wl1251 misses a spin_lock_init().

https://www.mail-archive.com/[email protected]/msg177031.html

It seems pretty trivial, yet getting the backtraces is not nice.

Thanks,
Pavel

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

It's in wireless-drivers-next and will be in 4.14-rc1:

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=6e9aae179f290f1a44fce7ef8e9a8e2dd68ed1e4

Kalle Valo

From: Kalle Valo <[email protected]>
Date: Wed, 30 Aug 2017 17:45:31 +0300

Is the bug only present in net-next?

AFAICS the bug was introduced by 9df86e2e702c6 back in 2010. If the bug has been there for 7 years so waiting for a few more weeks should not hurt.

And Pavel can also submit it to the stable release, it should apply without problems as wl1251 doesn't have had that many patches during the last few years (if ever).

Kalle Valo

From: Kalle Valo <[email protected]>
Date: Wed, 30 Aug 2017 20:31:31 +0300

As a maintainer you have a right to handle bug fixing in that way, but certainly that is not how I would handle this.

It's easy to validate this fix, it's extremely unlikely to cause a regression, and fixes a problem someone actually was able to trigger.

Deferring to -next only has the side effect of making people wait longer for the fix.

Yeah, you are right there. I did actually ponder which I tree should commit it back in July but due to various reasons decided differently.

Kalle Valo

Can we still get the fix to v4.13-final? :-).

Thanks,
Pavel

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

(Adding linux-wireless)

I'm not planning to submit pull requests to 4.13 anymore. If you think this is so important that it needs to be applied in the last minute (I don't) you could always try to convince Dave to take it directly.

Or better yet, push it to the stable tree. If the merge window opens on Sunday I suspect that the commit will be in Linus' tree sometime next week. Then you can submit the request to the stable team to take it.

Kalle Valo

From: Cong Wang <[email protected]>

wl1251: add a missing spin_lock_init()

This fixes the following kernel warning:

 [ 5668.771453] BUG: spinlock bad magic on CPU#0, kworker/u2:3/9745
 [ 5668.771850]  lock: 0xce63ef20, .magic: 00000000, .owner: <none>/-1,
 .owner_cpu: 0
 [ 5668.772277] CPU: 0 PID: 9745 Comm: kworker/u2:3 Tainted: G        W
 4.12.0-03002-gec979a4-dirty #40
 [ 5668.772796] Hardware name: Nokia RX-51 board
 [ 5668.773071] Workqueue: phy1 wl1251_irq_work
 [ 5668.773345] [<c010c9e4>] (unwind_backtrace) from [<c010a274>]
 (show_stack+0x10/0x14)
 [ 5668.773803] [<c010a274>] (show_stack) from [<c01545a4>]
 (do_raw_spin_lock+0x6c/0xa0)
 [ 5668.774230] [<c01545a4>] (do_raw_spin_lock) from [<c06ca578>]
 (_raw_spin_lock_irqsave+0x10/0x18)
 [ 5668.774658] [<c06ca578>] (_raw_spin_lock_irqsave) from [<c048c010>]
 (wl1251_op_tx+0x38/0x5c)
 [ 5668.775115] [<c048c010>] (wl1251_op_tx) from [<c06a12e8>]
 (ieee80211_tx_frags+0x188/0x1c0)
 [ 5668.775543] [<c06a12e8>] (ieee80211_tx_frags) from [<c06a138c>]
 (__ieee80211_tx+0x6c/0x130)
 [ 5668.775970] [<c06a138c>] (__ieee80211_tx) from [<c06a3dbc>]
 (ieee80211_tx+0xdc/0x104)
 [ 5668.776367] [<c06a3dbc>] (ieee80211_tx) from [<c06a4af0>]
 (__ieee80211_subif_start_xmit+0x454/0x8c8)
 [ 5668.776824] [<c06a4af0>] (__ieee80211_subif_start_xmit) from
 [<c06a4f94>] (ieee80211_subif_start_xmit+0x30/0x2fc)
 [ 5668.777343] [<c06a4f94>] (ieee80211_subif_start_xmit) from
 [<c0578848>] (dev_hard_start_xmit+0x80/0x118)

...

by adding the missing spin_lock_init().

---

I don't think we should use stable tree as an excuse for not fixing the bugs in mainline. Original patch is from Jul 6, thats 7 weeks ago.

Dave, Linus -- can you still take the patch?

Thanks,
Pavel

index 08f0477..9915d83 100644
@@ -1571,6 +1571,7 @@ struct ieee80211_hw *wl1251_alloc_hw(void)
 
 	wl->state = WL1251_STATE_OFF;
 	mutex_init(&wl->mutex);
+	spin_lock_init(&wl->wl_lock);
 
 	wl->tx_mgmt_frm_rate = DEFAULT_HW_GEN_TX_RATE;
 	wl->tx_mgmt_frm_mod = DEFAULT_HW_GEN_MODULATION_TYPE;

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

From: Pavel Machek <[email protected]>
Date: Thu, 31 Aug 2017 16:47:43 +0200

Pavel, please do not bypass maintainers like this.

It's really rude, and if you do things like that instead of trying to work properly with us, your relationship with these maintainers will suffer in the long term.

Thank you.

Hi!

Do you mean I'm being rude to Kalle, or rude to you?

In the part you snipped, Kalle asked me to do just that:

# I'm not planning to submit pull requests to 4.13 anymore. If you think

# this is so important that it needs to be applied in the last minute (I
# don't) you could always try to convince Dave to take it directly.

..and as I still believe patch should go in, that's what I did.

Best regards,
Pavel

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

From: Pavel Machek <[email protected]>
Date: Thu, 31 Aug 2017 20:57:19 +0200

He said "to David", not "David and Linus".

Hi!

Ok. If I knew you would be replying so quickly, I'd acted differently. I did not want to be rude.

But I'd still like to get the patch in. Do you plan to send another pull request to Linus, and can you take the patch, please?

Thanks,
Pavel

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

From: Pavel Machek <[email protected]>
Date: Thu, 31 Aug 2017 21:59:33 +0200

Yes and yes.