5.4.68-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 2/43 ibmvnic fix NULL tx_pools and rx_tools issue at do_reset
In reply to Greg Kroah-HartmanFrom: Mingming Cao <[email protected]>
[ Upstream commit 9f13457377907fa253aef560e1a37e1ca4197f9b ]
At the time of do_rest, ibmvnic tries to re-initalize the tx_pools and rx_pools to avoid re-allocating the long term buffer. However there is a window inside do_reset that the tx_pools and rx_pools were freed before re-initialized making it possible to deference null pointers.
This patch fix this issue by always check the tx_pool
and rx_pool are not NULL after ibmvnic_login. If so, re-allocating the pools. This will avoid getting into calling reset_tx/rx_pools with NULL adapter tx_pools/rx_pools pointer. Also add null pointer check in reset_tx_pools and reset_rx_pools to safe handle NULL pointer case.
--- drivers/net/ethernet/ibm/ibmvnic.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/net/ethernet/ibm/ibmvnic.c +14 -1
@@ -416,6 +416,9 @@ static int reset_rx_pools(struct ibmvnic_adapter *adapter)int i, j, rc;u64 *size_array; +if (!adapter->rx_pool) +return -1 ; + size_array = (u64 *)((u8 *)(adapter->login_rsp_buf) +be32_to_cpu (adapter->login_rsp_buf->off_rxadd_buff_size));
@@ -586,6 +589,9 @@ static int reset_tx_pools(struct ibmvnic_adapter *adapter)int tx_scrqs;int i, rc; +if (!adapter->tx_pool) +return -1 ; + tx_scrqs =be32_to_cpu (adapter->login_rsp_buf->num_txsubm_subcrqs);for (i =0 ; i < tx_scrqs; i++) { rc =reset_one_tx_pool (adapter, &adapter->tso_pool[i]);
@@ -1918,7 +1924,10 @@ static int do_reset(struct ibmvnic_adapter *adapter, adapter->req_rx_add_entries_per_subcrq != old_num_rx_slots || adapter->req_tx_entries_per_subcrq != - old_num_tx_slots) { + old_num_tx_slots || + !adapter->rx_pool || + !adapter->tso_pool || + !adapter->tx_pool) {release_rx_pools (adapter);release_tx_pools (adapter);release_napi (adapter);
@@ -1931,10 +1940,14 @@ static int do_reset(struct ibmvnic_adapter *adapter, }else { rc =reset_tx_pools (adapter);if (rc) +netdev_dbg (adapter->netdev,"reset tx pools failed (%d)\n" , + rc); goto out; rc =reset_rx_pools (adapter);if (rc) +netdev_dbg (adapter->netdev,"reset rx pools failed (%d)\n" , + rc); goto out; }ibmvnic_disable_irqs (adapter);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 3/43 ibmvnic: add missing parenthesis in do_reset()
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 8ae4dff882eb879c17bf46574201bd37fc6bc8b5 ]
Indentation and logic clearly show that this code is missing parenthesis.
--- drivers/net/ethernet/ibm/ibmvnic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +4 -2
@@ -1939,16 +1939,18 @@ static int do_reset(struct ibmvnic_adapter *adapter, }else { rc =reset_tx_pools (adapter); -if (rc) +if (rc) {netdev_dbg (adapter->netdev,"reset tx pools failed (%d)\n" , rc); goto out; + } rc =reset_rx_pools (adapter); -if (rc) +if (rc) {netdev_dbg (adapter->netdev,"reset rx pools failed (%d)\n" , rc); goto out; + } }ibmvnic_disable_irqs (adapter); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 4/43 kprobes: fix kill kprobe which has been marked as gone
In reply to Greg Kroah-HartmanFrom: Muchun Song <[email protected]>
[ Upstream commit b0399092ccebd9feef68d4ceb8d6219a8c0caa05 ]
If a kprobe is marked as gone, we should not kill it again. Otherwise, we can disarm the kprobe more than once. In that case, the statistics of kprobe_ftrace_enabled can unbalance which can lead to that kprobe do not work.
--- kernel/kprobes.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel/kprobes.c +8 -1
@@ -2088,6 +2088,9 @@ static void kill_kprobe(struct kprobe *p) {struct kprobe *kp; +if (WARN_ON_ONCE (kprobe_gone (p))) +return ; + p->flags |=KPROBE_FLAG_GONE ;if (kprobe_aggrprobe (p)) {/*
@@ -2270,7 +2273,10 @@ static int kprobes_module_callback(struct notifier_block *nb,mutex_lock (&kprobe_mutex);for (i =0 ; i <KPROBE_TABLE_SIZE ; i++) { head = &kprobe_table[i]; -hlist_for_each_entry_rcu (p, head, hlist) +hlist_for_each_entry_rcu (p, head, hlist) { +if (kprobe_gone (p)) +continue ; +if (within_module_init ((unsigned long )p->addr, mod) || (checkcore &&within_module_core ((unsigned long )p->addr, mod))) {
@@ -2287,6 +2293,7 @@ static int kprobes_module_callback(struct notifier_block *nb,*/ kill_kprobe (p); } + } }mutex_unlock (&kprobe_mutex);return NOTIFY_DONE ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 6/43 act_ife: load meta modules before tcf_idr_check_alloc()
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit cc8e58f8325cdf14b9516b61c384cdfd02a4f408 ]
The following deadlock scenario is triggered by syzbot:
Thread A: Thread B:tcf_idr_check_alloc()
...populate_metalist()
rtnl_unlock()
rtnl_lock() ...
request_module() tcf_idr_check_alloc()
rtnl_lock()
At this point, thread A is waiting for thread B to release RTNL lock, while thread B is waiting for thread A to commit the IDR change with tcf_idr_insert() later.
Break this deadlock situation by preloading ife modules earlier, before tcf_idr_check_alloc(), this is fine because we only need to load modules we need potentially.
--- net/sched/act_ife.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-)
net/sched/act_ife.c +34 -10
@@ -436,6 +436,25 @@ static void tcf_ife_cleanup(struct tc_ackfree_rcu (p, rcu); } +static int load_metalist (struct nlattr **tb,bool rtnl_held) +{ +int i; + +for (i =1 ; i < max_metacnt; i++) { +if (tb[i]) { +void *val =nla_data (tb[i]); +int len =nla_len (tb[i]); +int rc; + + rc =load_metaops_and_vet (i, val, len, rtnl_held); +if (rc !=0 ) +return rc; + } + } + +return 0 ; +} +static int populate_metalist (struct tcf_ife_info *ife,struct nlattr **tb,bool exists,bool rtnl_held) {
@@ -449,10 +468,6 @@ static int populate_metalist(struct tcf_ val =nla_data (tb[i]); len =nla_len (tb[i]); - rc =load_metaops_and_vet (i, val, len, rtnl_held); -if (rc !=0 ) -return rc; - rc =add_metainfo (ife, i, val, len, exists);if (rc)return rc;
@@ -508,6 +523,21 @@ static int tcf_ife_init(struct net *net,if (!p)return -ENOMEM ; +if (tb[TCA_IFE_METALST ]) { + err =nla_parse_nested_deprecated (tb2,IFE_META_MAX , + tb[TCA_IFE_METALST ],NULL , +NULL ); +if (err) { +kfree (p); +return err; + } + err =load_metalist (tb2, rtnl_held); +if (err) { +kfree (p); +return err; + } + } + index = parm->index; err =tcf_idr_check_alloc (tn, &index, a, bind);if (err <0 ) {
@@ -569,15 +599,9 @@ static int tcf_ife_init(struct net *net, }if (tb[TCA_IFE_METALST ]) { - err =nla_parse_nested_deprecated (tb2,IFE_META_MAX , - tb[TCA_IFE_METALST ],NULL , -NULL ); -if (err) - goto metadata_parse_err; err =populate_metalist (ife, tb2, exists, rtnl_held);if (err) goto metadata_parse_err; - }else {/* if no passed metadata allow list or passed allow-all * then here we process by adding as many supported metadatum
Greg Kroah-Hartman
maintainercover 5.4.68-rc1 review
This is the start of the stable review cycle for the 5.4.68 release. There are 43 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 27 Sep 2020 12:47:02 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.68-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.68-rc1
Suravee Suthikulpanit <[email protected]>
iommu/amd: Use cmpxchg_double() when updating 128-bit IRTE
Xunlei Pang <[email protected]>
mm: memcg: fix memcg reclaim soft lockup
Eric Dumazet <[email protected]>
net: add __must_check to skb_put_padto()
Eric Dumazet <[email protected]>
net: qrtr: check skb_put_padto() return value
Florian Fainelli <[email protected]>
net: phy: Do not warn in phy_stop() on PHY_DOWN
Florian Fainelli <[email protected]>
net: phy: Avoid NPD upon phy_detach() when driver is unbound
Hauke Mehrtens <[email protected]>
net: lantiq: Disable IRQs only if NAPI gets scheduled
Hauke Mehrtens <[email protected]>
net: lantiq: Use napi_complete_done()
Hauke Mehrtens <[email protected]>
net: lantiq: use netif_tx_napi_add() for TX NAPI
Hauke Mehrtens <[email protected]>
net: lantiq: Wake TX queue again
Michael Chan <[email protected]>
bnxt_en: Protect bnxt_set_eee() and bnxt_set_pauseparam() with mutex.
Edwin Peer <[email protected]>
bnxt_en: return proper error codes in bnxt_show_temp
Tariq Toukan <[email protected]>
net/mlx5e: TLS, Do not expose FPGA TLS counter if not supported
Maor Dickman <[email protected]>
net/mlx5e: Enable adding peer miss rules only if merged eswitch is supported
Xin Long <[email protected]>
tipc: use skb_unshare() instead in tipc_buf_append()
Tetsuo Handa <[email protected]>
tipc: fix shutdown() of connection oriented socket
Peilin Ye <[email protected]>
tipc: Fix memory leak in tipc_group_create_member()
Vinicius Costa Gomes <[email protected]>
taprio: Fix allowing too small intervals
Jakub Kicinski <[email protected]>
nfp: use correct define to return NONE fec
Henry Ptasinski <[email protected]>
net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant
Yunsheng Lin <[email protected]>
net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc
Maor Gottlieb <[email protected]>
net/mlx5: Fix FTE cleanup
Necip Fazil Yildiran <[email protected]>
net: ipv6: fix kconfig dependency warning for IPV6_SEG6_HMAC
Ido Schimmel <[email protected]>
net: Fix bridge enslavement failure
Linus Walleij <[email protected]>
net: dsa: rtl8366: Properly clear member config
Petr Machata <[email protected]>
net: DCB: Validate DCB_ATTR_DCB_BUFFER argument
Vladimir Oltean <[email protected]>
net: bridge: br_vlan_get_pvid_rcu() should dereference the VLAN group under RCU
Eric Dumazet <[email protected]>
ipv6: avoid lockdep issue in fib6_del()
David Ahern <[email protected]>
ipv4: Update exception handling for multipath routes via same device
David Ahern <[email protected]>
ipv4: Initialize flowi4_multipath_hash in data path
Wei Wang <[email protected]>
ip: fix tos reflection in ack and reset packets
Dan Carpenter <[email protected]>
hdlc_ppp: add range checks in ppp_cp_parse_cr()
Mark Gray <[email protected]>
geneve: add transport ports in route lookup for geneve
Ganji Aravind <[email protected]>
cxgb4: Fix offset when clearing filter byte counters
Raju Rangoju <[email protected]>
cxgb4: fix memory leak during module unload
Vasundhara Volam <[email protected]>
bnxt_en: Fix NULL ptr dereference crash in bnxt_fw_reset_task()
Vasundhara Volam <[email protected]>
bnxt_en: Avoid sending firmware messages when AER error is detected.
Cong Wang <[email protected]>
act_ife: load meta modules before tcf_idr_check_alloc()
Ralph Campbell <[email protected]>
mm/thp: fix __split_huge_pmd_locked() for migration PMD
Muchun Song <[email protected]>
kprobes: fix kill kprobe which has been marked as gone
Jakub Kicinski <[email protected]>
ibmvnic: add missing parenthesis in do_reset()
Mingming Cao <[email protected]>
ibmvnic fix NULL tx_pools and rx_tools issue at do_reset
Mark Salyzyn <[email protected]>
af_key: pfkey_dump needs parameter validation
-------------
Diffstat:
Makefile | 4 +- drivers/iommu/Kconfig | 2 +- drivers/iommu/amd_iommu.c | 17 +++++-- drivers/iommu/amd_iommu_init.c | 21 ++++++++- drivers/net/dsa/rtl8366.c | 20 ++++++--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 32 ++++++++----- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 ++ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 31 ++++++++----- drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 9 ++-- drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c | 2 +- drivers/net/ethernet/ibm/ibmvnic.c | 21 +++++++-- drivers/net/ethernet/lantiq_xrx200.c | 21 +++++---- .../mellanox/mlx5/core/en_accel/tls_stats.c | 12 +++-- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 52 ++++++++++++---------- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 8 ++-- .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 4 +- drivers/net/geneve.c | 37 ++++++++++----- drivers/net/phy/phy.c | 2 +- drivers/net/phy/phy_device.c | 3 +- drivers/net/wan/hdlc_ppp.c | 16 ++++--- include/linux/skbuff.h | 7 +-- include/net/flow.h | 1 + include/net/sctp/structs.h | 8 ++-- kernel/kprobes.c | 9 +++- mm/huge_memory.c | 40 ++++++++++------- mm/vmscan.c | 8 ++++ net/bridge/br_vlan.c | 27 ++++++----- net/core/dev.c | 2 +- net/core/filter.c | 1 + net/dcb/dcbnl.c | 8 ++++ net/ipv4/fib_frontend.c | 1 + net/ipv4/ip_output.c | 3 +- net/ipv4/route.c | 14 +++--- net/ipv6/Kconfig | 1 + net/ipv6/ip6_fib.c | 13 ++++-- net/key/af_key.c | 7 +++ net/qrtr/qrtr.c | 20 +++++---- net/sched/act_ife.c | 44 +++++++++++++----- net/sched/sch_generic.c | 49 +++++++++++++------- net/sched/sch_taprio.c | 28 +++++++----- net/sctp/socket.c | 9 ++-- net/tipc/group.c | 14 ++++-- net/tipc/msg.c | 3 +- net/tipc/socket.c | 5 +-- 44 files changed, 429 insertions(+), 211 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 16/43 ipv6: avoid lockdep issue in fib6_del()
From: Eric Dumazet <[email protected]>
[ Upstream commit 843d926b003ea692468c8cc5bea1f9f58dfa8c75 ]
syzbot reported twice a lockdep issue in fib6_del() [1] which I think is caused by net->ipv6.fib6_null_entry having a NULL fib6_table pointer.
fib6_del() already checks for fib6_null_entry special case, we only need to return earlier.
Bug seems to occur very rarely, I have thus chosen a 'bug origin' that makes backports not too complex.
[1]
WARNING: suspicious RCU usage
5.9.0-rc4-syzkaller #0 Not tainted
-----------------------------net/ipv6/ip6_fib.c:1996 suspicious rcu_dereference_protected() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
4 locks held by syz-executor.5/8095:
#0: ffffffff8a7ea708 (rtnl_mutex){+.+.}-{3:3}, at: ppp_release+0x178/0x240 drivers/net/ppp/ppp_generic.c:401 #1: ffff88804c422dd8 (&net->ipv6.fib6_gc_lock){+.-.}-{2:2}, at: spin_trylock_bh include/linux/spinlock.h:414 [inline] #1: ffff88804c422dd8 (&net->ipv6.fib6_gc_lock){+.-.}-{2:2}, at: fib6_run_gc+0x21b/0x2d0 net/ipv6/ip6_fib.c:2312 #2: ffffffff89bd6a40 (rcu_read_lock){....}-{1:2}, at: __fib6_clean_all+0x0/0x290 net/ipv6/ip6_fib.c:2613 #3: ffff8880a82e6430 (&tb->tb6_lock){+.-.}-{2:2}, at: spin_lock_bh include/linux/spinlock.h:359 [inline] #3: ffff8880a82e6430 (&tb->tb6_lock){+.-.}-{2:2}, at: __fib6_clean_all+0x107/0x290 net/ipv6/ip6_fib.c:2245
stack backtrace: CPU: 1 PID: 8095 Comm: syz-executor.5 Not tainted 5.9.0-rc4-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x198/0x1fd lib/dump_stack.c:118 fib6_del+0x12b4/0x1630 net/ipv6/ip6_fib.c:1996 fib6_clean_node+0x39b/0x570 net/ipv6/ip6_fib.c:2180 fib6_walk_continue+0x4aa/0x8e0 net/ipv6/ip6_fib.c:2102 fib6_walk+0x182/0x370 net/ipv6/ip6_fib.c:2150 fib6_clean_tree+0xdb/0x120 net/ipv6/ip6_fib.c:2230 __fib6_clean_all+0x120/0x290 net/ipv6/ip6_fib.c:2246 fib6_clean_all net/ipv6/ip6_fib.c:2257 [inline] fib6_run_gc+0x113/0x2d0 net/ipv6/ip6_fib.c:2320 ndisc_netdev_event+0x217/0x350 net/ipv6/ndisc.c:1805 notifier_call_chain+0xb5/0x200 kernel/notifier.c:83 call_netdevice_notifiers_info+0xb5/0x130 net/core/dev.c:2033 call_netdevice_notifiers_extack net/core/dev.c:2045 [inline] call_netdevice_notifiers net/core/dev.c:2059 [inline] dev_close_many+0x30b/0x650 net/core/dev.c:1634 rollback_registered_many+0x3a8/0x1210 net/core/dev.c:9261 rollback_registered net/core/dev.c:9329 [inline] unregister_netdevice_queue+0x2dd/0x570 net/core/dev.c:10410 unregister_netdevice include/linux/netdevice.h:2774 [inline] ppp_release+0x216/0x240 drivers/net/ppp/ppp_generic.c:403 __fput+0x285/0x920 fs/file_table.c:281 task_work_run+0xdd/0x190 kernel/task_work.c:141 tracehook_notify_resume include/linux/tracehook.h:188 [inline] exit_to_user_mode_loop kernel/entry/common.c:163 [inline] exit_to_user_mode_prepare+0x1e1/0x200 kernel/entry/common.c:190 syscall_exit_to_user_mode+0x7e/0x2e0 kernel/entry/common.c:265 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- net/ipv6/ip6_fib.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
net/ipv6/ip6_fib.c +9 -4
@@ -1896,14 +1896,19 @@ static void fib6_del_route(struct fib6_t/* Need to own table->tb6_lock */ int fib6_del (struct fib6_info *rt,struct nl_info *info) { -struct fib6_node *fn =rcu_dereference_protected (rt->fib6_node, -lockdep_is_held (&rt->fib6_table->tb6_lock)); -struct fib6_table *table = rt->fib6_table;struct net *net = info->nl_net;struct fib6_info __rcu **rtp;struct fib6_info __rcu **rtp_next; +struct fib6_table *table; +struct fib6_node *fn; -if (!fn || rt == net->ipv6.fib6_null_entry) +if (rt == net->ipv6.fib6_null_entry) +return -ENOENT ; + + table = rt->fib6_table; + fn =rcu_dereference_protected (rt->fib6_node, +lockdep_is_held (&table->tb6_lock)); +if (!fn)return -ENOENT ;WARN_ON (!(fn->fn_flags &RTN_RTINFO ));
Greg Kroah-Hartman
maintainerPATCH 15/43 ipv4: Update exception handling for multipath routes via same device
In reply to Greg Kroah-HartmanFrom: David Ahern <[email protected]>
[ Upstream commit 2fbc6e89b2f1403189e624cabaf73e189c5e50c6 ]
Kfir reported that pmtu exceptions are not created properly for deployments where multipath routes use the same device.
After some digging I see 2 compounding problems:
1. ip_route_output_key_hash_rcu is updating the flowi4_oif *after* the route lookup. This is the second use case where this has been a problem (the first is related to use of vti devices with VRF). I can not find any reason for the oif to be changed after the lookup; the code goes back to the start of git. It does not seem logical so remove it.
2. fib_lookups for exceptions do not call fib_select_path to handle multipath route selection based on the hash.
The end result is that the fib_lookup used to add the exception always creates it based using the first leg of the route.
An example topology showing the problem:
| host1
+------+
| eth0 | .209
+------+
|
+------+
switch | br0 |
+------+
|
+---------+---------+
| host2 | host3
+------+ +------+
| eth0 | .250 | eth0 | 192.168.252.252
+------+ +------+ +-----+ +-----+
| vti | .2 | vti | 192.168.247.3
+-----+ +-----+
\ /
=================================
tunnels
192.168.247.1/24for h in host1 host2 host3; do
ip netns add ${h}
ip -netns ${h} link set lo up
ip netns exec ${h} sysctl -wq net.ipv4.ip_forward=1done
ip netns add switch
ip -netns switch li set lo up
ip -netns switch link add br0 type bridge stp 0
ip -netns switch link set br0 up
for n in 1 2 3; do
ip -netns switch link add eth-sw type veth peer name eth-h${n}
ip -netns switch li set eth-h${n} master br0 up
ip -netns switch li set eth-sw netns host${n} name eth0done
ip -netns host1 addr add 192.168.252.209/24 dev eth0 ip -netns host1 link set dev eth0 up
ip -netns host1 route add 192.168.247.0/24 \
nexthop via 192.168.252.250 dev eth0 nexthop via 192.168.252.252 dev eth0ip -netns host2 addr add 192.168.252.250/24 dev eth0 ip -netns host2 link set dev eth0 up
ip -netns host2 addr add 192.168.252.252/24 dev eth0 ip -netns host3 link set dev eth0 up
ip netns add tunnel
ip -netns tunnel li set lo up
ip -netns tunnel li add br0 type bridge
ip -netns tunnel li set br0 up
for n in $(seq 11 20); do
ip -netns tunnel addr add dev br0 192.168.247.${n}/24done
for n in 2 3
do
ip -netns tunnel link add vti${n} type veth peer name eth${n}
ip -netns tunnel link set eth${n} mtu 1360 master br0 up
ip -netns tunnel link set vti${n} netns host${n} mtu 1360 up
ip -netns host${n} addr add dev vti${n} 192.168.247.${n}/24done
ip -netns tunnel ro add default nexthop via 192.168.247.2 nexthop via 192.168.247.3
ip netns exec host1 ping -M do -s 1400 -c3 -I 192.168.252.209 192.168.247.11 ip netns exec host1 ping -M do -s 1400 -c3 -I 192.168.252.209 192.168.247.15 ip -netns host1 ro ls cache
Before this patch the cache always shows exceptions against the first leg in the multipath route; 192.168.252.250 per this example. Since the hash has an initial random seed, you may need to vary the final octet more than what is listed. In my tests, using addresses between 11 and 19 usually found 1 that used both legs.
With this patch, the cache will have exceptions for both legs.
--- net/ipv4/route.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
net/ipv4/route.c +8 -5
@@ -785,8 +785,10 @@ static void __ip_do_redirect(struct rtabneigh_event_send (n,NULL ); }else {if (fib_lookup (net, fl4, &res,0 ) ==0 ) { -struct fib_nh_common *nhc =FIB_RES_NHC (res); +struct fib_nh_common *nhc; +fib_select_path (net, &res, fl4, skb); + nhc =FIB_RES_NHC (res);update_or_create_fnhe (nhc, fl4->daddr, new_gw,0 , false, jiffies + ip_rt_gc_timeout);
@@ -1012,6 +1014,7 @@ out: kfree_skb(skb);static void __ip_rt_update_pmtu (struct rtable *rt,struct flowi4 *fl4,u32 mtu) {struct dst_entry *dst = &rt->dst; +struct net *net =dev_net (dst->dev);u32 old_mtu =ipv4_mtu (dst);struct fib_result res;bool lock = false;
@@ -1032,9 +1035,11 @@ static void __ip_rt_update_pmtu(struct rreturn ;rcu_read_lock (); -if (fib_lookup (dev_net (dst->dev), fl4, &res,0 ) ==0 ) { -struct fib_nh_common *nhc =FIB_RES_NHC (res); +if (fib_lookup (net, fl4, &res,0 ) ==0 ) { +struct fib_nh_common *nhc; +fib_select_path (net, &res, fl4,NULL ); + nhc =FIB_RES_NHC (res);update_or_create_fnhe (nhc, fl4->daddr,0 , mtu, lock, jiffies + ip_rt_mtu_expires); }
@@ -2626,8 +2631,6 @@ struct rtable *ip_route_output_key_hash_fib_select_path (net, res, fl4, skb); dev_out =FIB_RES_DEV (*res); - fl4->flowi4_oif = dev_out->ifindex; - make_route: rth =__mkroute_output (res, fl4, orig_oif, dev_out, flags);
Greg Kroah-Hartman
maintainerPATCH 18/43 net: DCB: Validate DCB_ATTR_DCB_BUFFER argument
In reply to Greg Kroah-HartmanFrom: Petr Machata <[email protected]>
[ Upstream commit 297e77e53eadb332d5062913447b104a772dc33b ]
The parameter passed via DCB_ATTR_DCB_BUFFER is a struct dcbnl_buffer. The field prio2buffer is an array of IEEE_8021Q_MAX_PRIORITIES bytes, where each value is a number of a buffer to direct that priority's traffic to. That value is however never validated to lie within the bounds set by DCBX_MAX_BUFFERS. The only driver that currently implements the callback is mlx5 (maintainers CCd), and that does not do any validation either, in particual allowing incorrect configuration if the prio2buffer value does not fit into 4 bits.
Instead of offloading the need to validate the buffer index to drivers, do it right there in core, and bounce the request if the value is too large.
--- net/dcb/dcbnl.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/dcb/dcbnl.c +8 -0
@@ -1426,6 +1426,7 @@ static int dcbnl_ieee_set(struct net_dev {const struct dcbnl_rtnl_ops *ops = netdev->dcbnl_ops;struct nlattr *ieee[DCB_ATTR_IEEE_MAX +1 ]; +int prio;int err;if (!ops)
@@ -1475,6 +1476,13 @@ static int dcbnl_ieee_set(struct net_devstruct dcbnl_buffer *buffer =nla_data (ieee[DCB_ATTR_DCB_BUFFER ]); +for (prio =0 ; prio <ARRAY_SIZE (buffer->prio2buffer); prio++) { +if (buffer->prio2buffer[prio] >=DCBX_MAX_BUFFERS ) { + err = -EINVAL ; + goto err; + } + } + err = ops->dcbnl_setbuffer (netdev, buffer);if (err) goto err;
Greg Kroah-Hartman
maintainerPATCH 19/43 net: dsa: rtl8366: Properly clear member config
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 4ddcaf1ebb5e4e99240f29d531ee69d4244fe416 ]
When removing a port from a VLAN we are just erasing the member config for the VLAN, which is wrong: other ports can be using it.
Just mask off the port and only zero out the rest of the member config once ports using of the VLAN are removed from it.
--- drivers/net/dsa/rtl8366.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/net/dsa/rtl8366.c +13 -7
@@ -452,13 +452,19 @@ int rtl8366_vlan_del(struct dsa_switch *return ret;if (vid == vlanmc.vid) { -/* clear VLAN member configurations */ - vlanmc.vid =0 ; - vlanmc.priority =0 ; - vlanmc.member =0 ; - vlanmc.untag =0 ; - vlanmc.fid =0 ; - +/* Remove this port from the VLAN */ + vlanmc.member &= ~BIT (port); + vlanmc.untag &= ~BIT (port); +/* +* If no ports are members of this VLAN +* anymore then clear the whole member +* config so it can be reused. +*/ +if (!vlanmc.member && vlanmc.untag) { + vlanmc.vid =0 ; + vlanmc.priority =0 ; + vlanmc.fid =0 ; + } ret = smi->ops->set_vlan_mc (smi, i, &vlanmc);if (ret) { dev_err(smi->dev,
Greg Kroah-Hartman
maintainerPATCH 21/43 net: ipv6: fix kconfig dependency warning for IPV6_SEG6_HMAC
In reply to Greg Kroah-HartmanFrom: Necip Fazil Yildiran <[email protected]>
[ Upstream commit db7cd91a4be15e1485d6b58c6afc8761c59c4efb ]
When IPV6_SEG6_HMAC is enabled and CRYPTO is disabled, it results in the following Kbuild warning:
WARNING: unmet direct dependencies detected for CRYPTO_HMAC
Depends on [n]: CRYPTO [=n]
Selected by [y]:
- IPV6_SEG6_HMAC [=y] && NET [=y] && INET [=y] && IPV6 [=y]
WARNING: unmet direct dependencies detected for CRYPTO_SHA1
Depends on [n]: CRYPTO [=n]
Selected by [y]:
- IPV6_SEG6_HMAC [=y] && NET [=y] && INET [=y] && IPV6 [=y]
WARNING: unmet direct dependencies detected for CRYPTO_SHA256
Depends on [n]: CRYPTO [=n]
Selected by [y]:
- IPV6_SEG6_HMAC [=y] && NET [=y] && INET [=y] && IPV6 [=y]
The reason is that IPV6_SEG6_HMAC selects CRYPTO_HMAC, CRYPTO_SHA1, and CRYPTO_SHA256 without depending on or selecting CRYPTO while those configs are subordinate to CRYPTO.
Honor the kconfig menu hierarchy to remove kconfig dependency warnings.
--- net/ipv6/Kconfig | 1 + 1 file changed, 1 insertion(+)
net/ipv6/Kconfig +1 -0
@@ -289,6 +289,7 @@ config IPV6_SEG6_LWTUNNEL config IPV6_SEG6_HMAC bool "IPv6: Segment Routing HMAC support" depends on IPV6 + select CRYPTO select CRYPTO_HMAC select CRYPTO_SHA1 select CRYPTO_SHA256
Greg Kroah-Hartman
maintainerPATCH 22/43 net/mlx5: Fix FTE cleanup
In reply to Greg Kroah-HartmanFrom: Maor Gottlieb <[email protected]>
[ Upstream commit cefc23554fc259114e78a7b0908aac4610ee18eb ]
Currently, when an FTE is allocated, its refcount is decreased to 0 with the purpose it will not be a stand alone steering object and every rule (destination) of the FTE would increase the refcount. When mlx5_cleanup_fs is called while not all rules were deleted by the steering users, it hit refcount underflow on the FTE once clean_tree calls to tree_remove_node after the deleted rules already decreased the refcount to 0.
FTE is no longer destroyed implicitly when the last rule (destination) is deleted. mlx5_del_flow_rules avoids it by increasing the refcount on the FTE and destroy it explicitly after all rules were deleted. So we can avoid the refcount underflow by making FTE as stand alone object. In addition need to set del_hw_func to FTE so the HW object will be destroyed when the FTE is deleted from the cleanup_tree flow.
refcount_t: underflow; use-after-free.
WARNING: CPU: 2 PID: 15715 at lib/refcount.c:28 refcount_warn_saturate+0xd9/0xe0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 Call Trace: tree_put_node+0xf2/0x140 [mlx5_core] clean_tree+0x4e/0xf0 [mlx5_core] clean_tree+0x4e/0xf0 [mlx5_core] clean_tree+0x4e/0xf0 [mlx5_core] clean_tree+0x5f/0xf0 [mlx5_core] clean_tree+0x4e/0xf0 [mlx5_core] clean_tree+0x5f/0xf0 [mlx5_core] mlx5_cleanup_fs+0x26/0x270 [mlx5_core] mlx5_unload+0x2e/0xa0 [mlx5_core] mlx5_unload_one+0x51/0x120 [mlx5_core] mlx5_devlink_reload_down+0x51/0x90 [mlx5_core] devlink_reload+0x39/0x120 ? devlink_nl_cmd_reload+0x43/0x220 genl_rcv_msg+0x1e4/0x420 ? genl_family_rcv_msg_attrs_parse+0x100/0x100 netlink_rcv_skb+0x47/0x110 genl_rcv+0x24/0x40 netlink_unicast+0x217/0x2f0 netlink_sendmsg+0x30f/0x430 sock_sendmsg+0x30/0x40 __sys_sendto+0x10e/0x140 ? handle_mm_fault+0xc4/0x1f0 ? do_page_fault+0x33f/0x630 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x48/0x130 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +4 -4
@@ -629,7 +629,7 @@ static struct fs_fte *alloc_fte(struct m fte->action = *flow_act; fte->flow_context = spec->flow_context; -tree_init_node (&fte->node,NULL , del_sw_fte); +tree_init_node (&fte->node, del_hw_fte, del_sw_fte);return fte; }
@@ -1737,7 +1737,6 @@ skip_search:up_write_ref_node (&g->node, false); rule =add_rule_fg (g, spec, flow_act, dest, dest_num, fte);up_write_ref_node (&fte->node, false); -tree_put_node (&fte->node, false);return rule; } rule =ERR_PTR (-ENOENT );
@@ -1837,7 +1836,6 @@ search_again_locked:up_write_ref_node (&g->node, false); rule =add_rule_fg (g, spec, flow_act, dest, dest_num, fte);up_write_ref_node (&fte->node, false); -tree_put_node (&fte->node, false);tree_put_node (&g->node, false);return rule;
@@ -1930,7 +1928,9 @@ void mlx5_del_flow_rules(struct mlx5_floup_write_ref_node (&fte->node, false); }else {del_hw_fte (&fte->node); -up_write (&fte->node.lock); +/* Avoid double call to del_hw_fte */ + fte->node.del_hw_func =NULL ; +up_write_ref_node (&fte->node, false);tree_put_node (&fte->node, false); }kfree (handle);
Greg Kroah-Hartman
maintainerPATCH 24/43 net: sctp: Fix IPv6 ancestor_size calc in sctp_copy_descendant
In reply to Greg Kroah-HartmanFrom: Henry Ptasinski <[email protected]>
[ Upstream commit fe81d9f6182d1160e625894eecb3d7ff0222cac5 ]
When calculating ancestor_size with IPv6 enabled, simply using sizeof(struct ipv6_pinfo) doesn't account for extra bytes needed for alignment in the struct sctp6_sock. On x86, there aren't any extra bytes, but on ARM the ipv6_pinfo structure is aligned on an 8-byte boundary so there were 4 pad bytes that were omitted from the ancestor_size calculation. This would lead to corruption of the pd_lobby pointers, causing an oops when trying to free the sctp structure on socket close.
--- include/net/sctp/structs.h | 8 +++++--- net/sctp/socket.c | 9 +++------ 2 files changed, 8 insertions(+), 9 deletions(-)
include/net/sctp/structs.h +5 -3
@@ -224,12 +224,14 @@ struct sctp_sock { data_ready_signalled:1 ;atomic_t pd_mode; + +/* Fields after this point will be skipped on copies, like on accept +* and peeloff operations +*/ +/* Receive to here while partial delivery is in effect. */ struct sk_buff_head pd_lobby; -/* These must be the last fields, as they will skipped on copies, -* like on accept and peeloff operations -*/ struct list_head auto_asconf_list;int do_auto_asconf; };
net/sctp/socket.c +3 -6
@@ -9337,13 +9337,10 @@ void sctp_copy_sock(struct sock *newsk,static inline void sctp_copy_descendant (struct sock *sk_to,const struct sock *sk_from) { -int ancestor_size =sizeof (struct inet_sock ) + -sizeof (struct sctp_sock ) - - offsetof(struct sctp_sock , pd_lobby); - -if (sk_from->sk_family ==PF_INET6 ) - ancestor_size +=sizeof (struct ipv6_pinfo ); +size_t ancestor_size =sizeof (struct inet_sock ); + ancestor_size += sk_from->sk_prot->obj_size; + ancestor_size -= offsetof(struct sctp_sock , pd_lobby);__inet_sk_copy_descendant (sk_to, sk_from, ancestor_size); }
Greg Kroah-Hartman
maintainerPATCH 23/43 net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 2fb541c862c987d02dfdf28f1545016deecfa0d5 ]
Currently there is concurrent reset and enqueue operation for the same lockless qdisc when there is no lock to synchronize the q->enqueue() in __dev_xmit_skb() with the qdisc reset operation in qdisc_deactivate() called by dev_deactivate_queue(), which may cause out-of-bounds access for priv->ring[] in hns3 driver if user has requested a smaller queue num when __dev_xmit_skb() still enqueue a skb with a larger queue_mapping after the corresponding qdisc is reset, and call hns3_nic_net_xmit() with that skb later.
Reused the existing synchronize_net() in dev_deactivate_many() to make sure skb with larger queue_mapping enqueued to old qdisc(which is saved in dev_queue->qdisc_sleeping) will always be reset when dev_reset_queue() is called.
--- net/sched/sch_generic.c | 49 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-)
net/sched/sch_generic.c +33 -16
@@ -1126,27 +1126,36 @@ static void dev_deactivate_queue(structstruct netdev_queue *dev_queue, void *_qdisc_default) { - struct Qdisc *qdisc_default = _qdisc_default; -struct Qdisc *qdisc; + struct Qdisc *qdisc = rtnl_dereference(dev_queue->qdisc); - qdisc =rtnl_dereference (dev_queue->qdisc);if (qdisc) { -bool nolock = qdisc->flags &TCQ_F_NOLOCK ; - -if (nolock) -spin_lock_bh (&qdisc->seqlock); -spin_lock_bh (qdisc_lock (qdisc)); -if (!(qdisc->flags &TCQ_F_BUILTIN ))set_bit (__QDISC_STATE_DEACTIVATED, &qdisc->state); + } +} -rcu_assign_pointer (dev_queue->qdisc, qdisc_default); -qdisc_reset (qdisc); +static void dev_reset_queue (struct net_device *dev, +struct netdev_queue *dev_queue, +void *_unused) +{ +struct Qdisc *qdisc; +bool nolock; -spin_unlock_bh (qdisc_lock (qdisc)); -if (nolock) -spin_unlock_bh (&qdisc->seqlock); - } + qdisc = dev_queue->qdisc_sleeping; +if (!qdisc) +return ; + + nolock = qdisc->flags &TCQ_F_NOLOCK ; + +if (nolock) +spin_lock_bh (&qdisc->seqlock); +spin_lock_bh (qdisc_lock (qdisc)); + +qdisc_reset (qdisc); + +spin_unlock_bh (qdisc_lock (qdisc)); +if (nolock) +spin_unlock_bh (&qdisc->seqlock); }static bool some_qdisc_is_busy (struct net_device *dev)
@@ -1207,12 +1216,20 @@ void dev_deactivate_many(struct list_headev_watchdog_down (dev); } -/* Wait for outstanding qdisc-less dev_queue_xmit calls. +/* Wait for outstanding qdisc-less dev_queue_xmit calls or +* outstanding qdisc enqueuing calls. * This is avoided if all devices are in dismantle phase : * Caller will call synchronize_net() for us */ synchronize_net (); +list_for_each_entry (dev, head, close_list) { +netdev_for_each_tx_queue (dev, dev_reset_queue,NULL ); + +if (dev_ingress_queue (dev)) +dev_reset_queue (dev,dev_ingress_queue (dev),NULL ); + } +/* Wait for outstanding qdisc_run calls. */ list_for_each_entry (dev, head, close_list) {while (some_qdisc_is_busy (dev))
Greg Kroah-Hartman
maintainerPATCH 25/43 nfp: use correct define to return NONE fec
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 5f6857e808a8bd078296575b417c4b9d160b9779 ]
struct ethtool_fecparam carries bitmasks not bit numbers. We want to return 1 (NONE), not 0.
--- drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +2 -2
@@ -731,8 +731,8 @@ nfp_port_get_fecparam(struct net_devicestruct nfp_eth_table_port *eth_port;struct nfp_port *port; - param->active_fec =ETHTOOL_FEC_NONE_BIT ; - param->fec =ETHTOOL_FEC_NONE_BIT ; + param->active_fec =ETHTOOL_FEC_NONE ; + param->fec =ETHTOOL_FEC_NONE ; port =nfp_port_from_netdev (netdev); eth_port =nfp_port_get_eth_port (port);
Greg Kroah-Hartman
maintainerPATCH 26/43 taprio: Fix allowing too small intervals
In reply to Greg Kroah-HartmanFrom: Vinicius Costa Gomes <[email protected]>
[ Upstream commit b5b73b26b3ca34574124ed7ae9c5ba8391a7f176 ]
It's possible that the user specifies an interval that couldn't allow any packet to be transmitted. This also avoids the issue of the hrtimer handler starving the other threads because it's running too often.
The solution is to reject interval sizes that according to the current link speed wouldn't allow any packet to be transmitted.
--- net/sched/sch_taprio.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
net/sched/sch_taprio.c +17 -11
@@ -777,9 +777,11 @@ static const struct nla_policy taprio_po [TCA_TAPRIO_ATTR_TXTIME_DELAY] = { .type = NLA_U32 }, }; -static int fill_sched_entry (struct nlattr **tb,struct sched_entry *entry, +static int fill_sched_entry (struct taprio_sched *q,struct nlattr **tb, +struct sched_entry *entry,struct netlink_ext_ack *extack) { +int min_duration =length_to_duration (q,ETH_ZLEN );u32 interval =0 ;if (tb[TCA_TAPRIO_SCHED_ENTRY_CMD ])
@@ -794,7 +796,10 @@ static int fill_sched_entry(struct nlatt interval =nla_get_u32 ( tb[TCA_TAPRIO_SCHED_ENTRY_INTERVAL ]); -if (interval ==0 ) { +/* The interval should allow at least the minimum ethernet +* frame to go out. +*/ +if (interval < min_duration) {NL_SET_ERR_MSG (extack,"Invalid interval for schedule entry" );return -EINVAL ; }
@@ -804,8 +809,9 @@ static int fill_sched_entry(struct nlattreturn 0 ; } -static int parse_sched_entry (struct nlattr *n,struct sched_entry *entry, -int index,struct netlink_ext_ack *extack) +static int parse_sched_entry (struct taprio_sched *q,struct nlattr *n, +struct sched_entry *entry,int index, +struct netlink_ext_ack *extack) {struct nlattr *tb[TCA_TAPRIO_SCHED_ENTRY_MAX +1 ] = { };int err;
@@ -819,10 +825,10 @@ static int parse_sched_entry(struct nlat entry->index = index; -return fill_sched_entry (tb, entry, extack); +return fill_sched_entry (q, tb, entry, extack); } -static int parse_sched_list (struct nlattr *list, +static int parse_sched_list (struct taprio_sched *q,struct nlattr *list,struct sched_gate_list *sched,struct netlink_ext_ack *extack) {
@@ -847,7 +853,7 @@ static int parse_sched_list(struct nlattreturn -ENOMEM ; } - err =parse_sched_entry (n, entry, i, extack); + err =parse_sched_entry (q, n, entry, i, extack);if (err <0 ) {kfree (entry);return err;
@@ -862,7 +868,7 @@ static int parse_sched_list(struct nlattreturn i; } -static int parse_taprio_schedule (struct nlattr **tb, +static int parse_taprio_schedule (struct taprio_sched *q,struct nlattr **tb,struct sched_gate_list *new,struct netlink_ext_ack *extack) {
@@ -883,8 +889,8 @@ static int parse_taprio_schedule(struct new->cycle_time =nla_get_s64 (tb[TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME ]);if (tb[TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST ]) - err =parse_sched_list ( - tb[TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST ], new, extack); + err =parse_sched_list (q, tb[TCA_TAPRIO_ATTR_SCHED_ENTRY_LIST ], + new, extack);if (err <0 )return err;
@@ -1474,7 +1480,7 @@ static int taprio_change(struct Qdisc *s goto free_sched; } - err =parse_taprio_schedule (tb, new_admin, extack); + err =parse_taprio_schedule (q, tb, new_admin, extack);if (err <0 ) goto free_sched;
Greg Kroah-Hartman
maintainerPATCH 27/43 tipc: Fix memory leak in tipc_group_create_member()
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
[ Upstream commit bb3a420d47ab00d7e1e5083286cab15235a96680 ]
tipc_group_add_to_tree() returns silently if key matches nkey of an existing node, causing tipc_group_create_member() to leak memory. Let tipc_group_add_to_tree() return an error in such a case, so that tipc_group_create_member() can handle it properly.
--- net/tipc/group.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/tipc/group.c +10 -4
@@ -273,8 +273,8 @@ static struct tipc_member *tipc_group_fireturn NULL ; } -static void tipc_group_add_to_tree (struct tipc_group *grp, -struct tipc_member *m) +static int tipc_group_add_to_tree (struct tipc_group *grp, +struct tipc_member *m) {u64 nkey, key = (u64 )m->node <<32 | m->port;struct rb_node **n, *parent =NULL ;
@@ -291,10 +291,11 @@ static void tipc_group_add_to_tree(strucelse if (key > nkey) n = &(*n)->rb_right;else -return ; +return -EEXIST ; }rb_link_node (&m->tree_node, parent, n);rb_insert_color (&m->tree_node, &grp->members); +return 0 ; } static struct tipc_member *tipc_group_create_member(struct tipc_group *grp,
@@ -302,6 +303,7 @@ static struct tipc_member *tipc_group_cr u32 instance, int state) {struct tipc_member *m; +int ret; m =kzalloc (sizeof (*m),GFP_ATOMIC );if (!m)
@@ -314,8 +316,12 @@ static struct tipc_member *tipc_group_cr m->port = port; m->instance = instance; m->bc_acked = grp->bc_snd_nxt -1 ; + ret =tipc_group_add_to_tree (grp, m); +if (ret <0 ) { +kfree (m); +return NULL ; + } grp->member_cnt++; -tipc_group_add_to_tree (grp, m);tipc_nlist_add (&grp->dests, m->node); m->state = state;return m;
Greg Kroah-Hartman
maintainerPATCH 28/43 tipc: fix shutdown() of connection oriented socket
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
[ Upstream commit a4b5cc9e10803ecba64a7d54c0f47e4564b4a980 ]
I confirmed that the problem fixed by commit 2a63866c8b51a3f7 ("tipc: fix shutdown() of connectionless socket") also applies to stream socket.
----------
#include <sys/socket.h>
#include <unistd.h>
#include <sys/wait.h>
int main(int argc, char *argv[])
{
int fds[2] = { -1, -1 };
socketpair(PF_TIPC, SOCK_STREAM /* or SOCK_DGRAM */, 0, fds);
if (fork() == 0)
_exit(read(fds[0], NULL, 1));
shutdown(fds[0], SHUT_RDWR); /* This must make read() return. */
wait(NULL); /* To be woken up by _exit(). */
return 0;
}----------
Since shutdown(SHUT_RDWR) should affect all processes sharing that socket, unconditionally setting sk->sk_shutdown to SHUTDOWN_MASK will be the right behavior.
--- net/tipc/socket.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
net/tipc/socket.c +1 -4
@@ -2616,10 +2616,7 @@ static int tipc_shutdown(struct socket *trace_tipc_sk_shutdown (sk,NULL ,TIPC_DUMP_ALL ," " );__tipc_shutdown (sock,TIPC_CONN_SHUTDOWN ); -if (tipc_sk_type_connectionless (sk)) - sk->sk_shutdown =SHUTDOWN_MASK ; -else - sk->sk_shutdown =SEND_SHUTDOWN ; + sk->sk_shutdown =SHUTDOWN_MASK ;if (sk->sk_state ==TIPC_DISCONNECTING ) {/* Discard any unreceived messages */
Greg Kroah-Hartman
maintainerPATCH 30/43 net/mlx5e: Enable adding peer miss rules only if merged eswitch is supported
In reply to Greg Kroah-HartmanFrom: Maor Dickman <[email protected]>
[ Upstream commit 6cec0229ab1959259e71e9a5bbe47c04577950b1 ]
The cited commit creates peer miss group during switchdev mode initialization in order to handle miss packets correctly while in VF LAG mode. This is done regardless of FW support of such groups which could cause rules setups failure later on.
Fix by adding FW capability check before creating peer groups/rule.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 64 ++++++------- 1 file changed, 34 insertions(+), 30 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +34 -30
@@ -1143,35 +1143,37 @@ static int esw_create_offloads_fdb_table } esw->fdb_table.offloads.send_to_vport_grp = g; -/* create peer esw miss group */ -memset (flow_group_in,0 , inlen); - -esw_set_flow_group_source_port (esw, flow_group_in); - -if (!mlx5_eswitch_vport_match_metadata_enabled (esw)) { - match_criteria =MLX5_ADDR_OF (create_flow_group_in, - flow_group_in, - match_criteria); - -MLX5_SET_TO_ONES (fte_match_param, match_criteria, - misc_parameters.source_eswitch_owner_vhca_id); - -MLX5_SET (create_flow_group_in, flow_group_in, - source_eswitch_owner_vhca_id_valid,1 ); - } - -MLX5_SET (create_flow_group_in, flow_group_in, start_flow_index, ix); -MLX5_SET (create_flow_group_in, flow_group_in, end_flow_index, - ix + esw->total_vports -1 ); - ix += esw->total_vports; - - g =mlx5_create_flow_group (fdb, flow_group_in); -if (IS_ERR (g)) { - err =PTR_ERR (g); -esw_warn (dev,"Failed to create peer miss flow group err(%d)\n" , err); - goto peer_miss_err; +if (MLX5_CAP_ESW (esw->dev, merged_eswitch)) { +/* create peer esw miss group */ +memset (flow_group_in,0 , inlen); + +esw_set_flow_group_source_port (esw, flow_group_in); + +if (!mlx5_eswitch_vport_match_metadata_enabled (esw)) { + match_criteria =MLX5_ADDR_OF (create_flow_group_in, + flow_group_in, + match_criteria); + +MLX5_SET_TO_ONES (fte_match_param, match_criteria, + misc_parameters.source_eswitch_owner_vhca_id); + +MLX5_SET (create_flow_group_in, flow_group_in, + source_eswitch_owner_vhca_id_valid,1 ); + } + +MLX5_SET (create_flow_group_in, flow_group_in, start_flow_index, ix); +MLX5_SET (create_flow_group_in, flow_group_in, end_flow_index, + ix + esw->total_vports -1 ); + ix += esw->total_vports; + + g =mlx5_create_flow_group (fdb, flow_group_in); +if (IS_ERR (g)) { + err =PTR_ERR (g); +esw_warn (dev,"Failed to create peer miss flow group err(%d)\n" , err); + goto peer_miss_err; + } + esw->fdb_table.offloads.peer_miss_grp = g; } - esw->fdb_table.offloads.peer_miss_grp = g;/* create miss group */ memset (flow_group_in,0 , inlen);
@@ -1206,7 +1208,8 @@ static int esw_create_offloads_fdb_table miss_rule_err:mlx5_destroy_flow_group (esw->fdb_table.offloads.miss_grp); miss_err: -mlx5_destroy_flow_group (esw->fdb_table.offloads.peer_miss_grp); +if (MLX5_CAP_ESW (esw->dev, merged_eswitch)) +mlx5_destroy_flow_group (esw->fdb_table.offloads.peer_miss_grp); peer_miss_err:mlx5_destroy_flow_group (esw->fdb_table.offloads.send_to_vport_grp); send_vport_err:
@@ -1229,7 +1232,8 @@ static void esw_destroy_offloads_fdb_tabmlx5_del_flow_rules (esw->fdb_table.offloads.miss_rule_multi);mlx5_del_flow_rules (esw->fdb_table.offloads.miss_rule_uni);mlx5_destroy_flow_group (esw->fdb_table.offloads.send_to_vport_grp); -mlx5_destroy_flow_group (esw->fdb_table.offloads.peer_miss_grp); +if (MLX5_CAP_ESW (esw->dev, merged_eswitch)) +mlx5_destroy_flow_group (esw->fdb_table.offloads.peer_miss_grp);mlx5_destroy_flow_group (esw->fdb_table.offloads.miss_grp);mlx5_destroy_flow_table (esw->fdb_table.offloads.slow_fdb);
Greg Kroah-Hartman
maintainerPATCH 32/43 bnxt_en: return proper error codes in bnxt_show_temp
In reply to Greg Kroah-HartmanFrom: Edwin Peer <[email protected]>
[ Upstream commit d69753fa1ecb3218b56b022722f7a5822735b876 ]
Returning "unknown" as a temperature value violates the hwmon interface rules. Appropriate error codes should be returned via device_attribute show instead. These will ultimately be propagated to the user via the file system interface.
In addition to the corrected error handling, it is an even better idea to not present the sensor in sysfs at all if it is known that the read will definitely fail. Given that temp1_input is currently the only sensor reported, ensure no hwmon registration if TEMP_MONITOR_QUERY is not supported or if it will fail due to access permissions. Something smarter may be needed if and when other sensors are added.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +13 -6
@@ -8939,18 +8939,16 @@ static ssize_t bnxt_show_temp(struct devstruct hwrm_temp_monitor_query_output *resp;struct bnxt *bp =dev_get_drvdata (dev);u32 len =0 ; +int rc; resp = bp->hwrm_cmd_resp_addr;bnxt_hwrm_cmd_hdr_init (bp, &req,HWRM_TEMP_MONITOR_QUERY ,-1 ,-1 );mutex_lock (&bp->hwrm_cmd_lock); -if (!_hwrm_send_message_silent (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT )) + rc =_hwrm_send_message (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT ); +if (!rc) len =sprintf (buf,"%u\n" , resp->temp *1000 );/* display millidegree */ mutex_unlock (&bp->hwrm_cmd_lock); - -if (len) -return len; - -return sprintf (buf,"unknown\n" ); +return rc ?: len; } static SENSOR_DEVICE_ATTR(temp1_input, 0444, bnxt_show_temp, NULL, 0);
@@ -8970,7 +8968,16 @@ static void bnxt_hwmon_close(struct bnxtstatic void bnxt_hwmon_open (struct bnxt *bp) { +struct hwrm_temp_monitor_query_input req = {0 };struct pci_dev *pdev = bp->pdev; +int rc; + +bnxt_hwrm_cmd_hdr_init (bp, &req,HWRM_TEMP_MONITOR_QUERY ,-1 ,-1 ); + rc =hwrm_send_message_silent (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT ); +if (rc == -EACCES || rc == -EOPNOTSUPP ) { +bnxt_hwmon_close (bp); +return ; + }if (bp->hwmon_dev)return ;
Greg Kroah-Hartman
maintainerPATCH 33/43 bnxt_en: Protect bnxt_set_eee() and bnxt_set_pauseparam() with mutex.
In reply to Greg Kroah-HartmanFrom: Michael Chan <[email protected]>
[ Upstream commit a53906908148d64423398a62c4435efb0d09652c ]
All changes related to bp->link_info require the protection of the link_lock mutex. It's not sufficient to rely just on RTNL.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 31 ++++++++++++++-------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +20 -11
@@ -1665,9 +1665,12 @@ static int bnxt_set_pauseparam(struct neif (!BNXT_SINGLE_PF (bp))return -EOPNOTSUPP ; +mutex_lock (&bp->link_lock);if (epause->autoneg) { -if (!(link_info->autoneg &BNXT_AUTONEG_SPEED )) -return -EINVAL ; +if (!(link_info->autoneg &BNXT_AUTONEG_SPEED )) { + rc = -EINVAL ; + goto pause_exit; + } link_info->autoneg |=BNXT_AUTONEG_FLOW_CTRL ;if (bp->hwrm_spec_code >=0x10201 )
@@ -1688,11 +1691,11 @@ static int bnxt_set_pauseparam(struct neif (epause->tx_pause) link_info->req_flow_ctrl |=BNXT_LINK_PAUSE_TX ; -if (netif_running (dev)) { -mutex_lock (&bp->link_lock); +if (netif_running (dev)) rc =bnxt_hwrm_set_pause (bp); -mutex_unlock (&bp->link_lock); - } + +pause_exit: +mutex_unlock (&bp->link_lock);return rc; }
@@ -2397,8 +2400,7 @@ static int bnxt_set_eee(struct net_devicstruct bnxt *bp =netdev_priv (dev);struct ethtool_eee *eee = &bp->eee;struct bnxt_link_info *link_info = &bp->link_info; -u32 advertising = -_bnxt_fw_to_ethtool_adv_spds (link_info->advertising,0 ); +u32 advertising;int rc =0 ;if (!BNXT_SINGLE_PF (bp))
@@ -2407,19 +2409,23 @@ static int bnxt_set_eee(struct net_devicif (!(bp->flags &BNXT_FLAG_EEE_CAP ))return -EOPNOTSUPP ; +mutex_lock (&bp->link_lock); + advertising =_bnxt_fw_to_ethtool_adv_spds (link_info->advertising,0 );if (!edata->eee_enabled) goto eee_ok;if (!(link_info->autoneg &BNXT_AUTONEG_SPEED )) {netdev_warn (dev,"EEE requires autoneg\n" ); -return -EINVAL ; + rc = -EINVAL ; + goto eee_exit; }if (edata->tx_lpi_enabled) {if (bp->lpi_tmr_hi && (edata->tx_lpi_timer > bp->lpi_tmr_hi || edata->tx_lpi_timer < bp->lpi_tmr_lo)) {netdev_warn (dev,"Valid LPI timer range is %d and %d microsecs\n" , bp->lpi_tmr_lo, bp->lpi_tmr_hi); -return -EINVAL ; + rc = -EINVAL ; + goto eee_exit; }else if (!bp->lpi_tmr_hi) { edata->tx_lpi_timer = eee->tx_lpi_timer; }
@@ -2429,7 +2435,8 @@ static int bnxt_set_eee(struct net_devic }else if (edata->advertised & ~advertising) {netdev_warn (dev,"EEE advertised %x must be a subset of autoneg advertised speeds %x\n" , edata->advertised, advertising); -return -EINVAL ; + rc = -EINVAL ; + goto eee_exit; } eee->advertised = edata->advertised;
@@ -2441,6 +2448,8 @@ eee_ok:if (netif_running (dev)) rc =bnxt_hwrm_set_link_setting (bp, false, true); +eee_exit: +mutex_unlock (&bp->link_lock);return rc; }
Greg Kroah-Hartman
maintainerPATCH 34/43 net: lantiq: Wake TX queue again
In reply to Greg Kroah-HartmanFrom: Hauke Mehrtens <[email protected]>
[ Upstream commit dea36631e6f186d4b853af67a4aef2e35cfa8bb7 ]
The call to netif_wake_queue() when the TX descriptors were freed was missing. When there are no TX buffers available the TX queue will be stopped, but it was not started again when they are available again, this is fixed in this patch.
--- drivers/net/ethernet/lantiq_xrx200.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/lantiq_xrx200.c +3 -0
@@ -268,6 +268,9 @@ static int xrx200_tx_housekeeping(struct net_dev->stats.tx_bytes += bytes;netdev_completed_queue (ch->priv->net_dev, pkts, bytes); +if (netif_queue_stopped (net_dev)) +netif_wake_queue (net_dev); +if (pkts < budget) {napi_complete (&ch->napi);ltq_dma_enable_irq (&ch->dma);
Greg Kroah-Hartman
maintainerPATCH 31/43 net/mlx5e: TLS, Do not expose FPGA TLS counter if not supported
In reply to Greg Kroah-HartmanFrom: Tariq Toukan <[email protected]>
[ Upstream commit 8f0bcd19b1da3f264223abea985b9462e85a3718 ]
The set of TLS TX global SW counters in mlx5e_tls_sw_stats_desc is updated from all rings by using atomic ops.
This set of stats is used only in the FPGA TLS use case, not in the Connect-X TLS one, where regular per-ring counters are used.
Do not expose them in the Connect-X use case, as this would cause counter duplication. For example, tx_tls_drop_no_sync_data would appear twice in the ethtool stats.
--- drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_stats.c | 12 +++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_stats.c +8 -4
@@ -35,7 +35,6 @@#include <net/sock.h> #include "en.h" -#include "accel/tls.h" #include "fpga/sdk.h" #include "en_accel/tls.h"
@@ -51,9 +50,14 @@ static const struct counter_desc mlx5e_t#define NUM_TLS_SW_COUNTERS ARRAY_SIZE(mlx5e_tls_sw_stats_desc) +static bool is_tls_atomic_stats (struct mlx5e_priv *priv) +{ +return priv->tls && !mlx5_accel_is_ktls_device (priv->mdev); +} +int mlx5e_tls_get_count (struct mlx5e_priv *priv) { -if (!priv->tls) +if (!is_tls_atomic_stats (priv))return 0 ;return NUM_TLS_SW_COUNTERS ;
@@ -63,7 +67,7 @@ int mlx5e_tls_get_strings(struct mlx5e_p {unsigned int i, idx =0 ; -if (!priv->tls) +if (!is_tls_atomic_stats (priv))return 0 ;for (i =0 ; i <NUM_TLS_SW_COUNTERS ; i++)
@@ -77,7 +81,7 @@ int mlx5e_tls_get_stats(struct mlx5e_pri {int i, idx =0 ; -if (!priv->tls) +if (!is_tls_atomic_stats (priv))return 0 ;for (i =0 ; i <NUM_TLS_SW_COUNTERS ; i++)
Greg Kroah-Hartman
maintainerPATCH 29/43 tipc: use skb_unshare() instead in tipc_buf_append()
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit ff48b6222e65ebdba5a403ef1deba6214e749193 ]
In tipc_buf_append() it may change skb's frag_list, and it causes problems when this skb is cloned. skb_unclone() doesn't really make this skb's flag_list available to change.
Shuang Li has reported an use-after-free issue because of this when creating quite a few macvlan dev over the same dev, where the broadcast packets will be cloned and go up to the stack:
[ ] BUG: KASAN: use-after-free in pskb_expand_head+0x86d/0xea0 [ ] Call Trace:
[ ] dump_stack+0x7c/0xb0 [ ] print_address_description.constprop.7+0x1a/0x220 [ ] kasan_report.cold.10+0x37/0x7c [ ] check_memory_region+0x183/0x1e0 [ ] pskb_expand_head+0x86d/0xea0 [ ] process_backlog+0x1df/0x660 [ ] net_rx_action+0x3b4/0xc90 [ ] [ ] Allocated by task 1786: [ ] kmem_cache_alloc+0xbf/0x220 [ ] skb_clone+0x10a/0x300 [ ] macvlan_broadcast+0x2f6/0x590 [macvlan] [ ] macvlan_process_broadcast+0x37c/0x516 [macvlan] [ ] process_one_work+0x66a/0x1060 [ ] worker_thread+0x87/0xb10 [ ] [ ] Freed by task 3253: [ ] kmem_cache_free+0x82/0x2a0 [ ] skb_release_data+0x2c3/0x6e0 [ ] kfree_skb+0x78/0x1d0 [ ] tipc_recvmsg+0x3be/0xa40 [tipc]
So fix it by using skb_unshare() instead, which would create a new skb for the cloned frag and it'll be safe to change its frag_list. The similar things were also done in sctp_make_reassembled_event(), which is using skb_copy().
--- net/tipc/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/tipc/msg.c +2 -1
@@ -140,7 +140,8 @@ int tipc_buf_append(struct sk_buff **heaif (fragid ==FIRST_FRAGMENT ) {if (unlikely (head)) goto err; -if (unlikely (skb_unclone (frag,GFP_ATOMIC ))) + frag =skb_unshare (frag,GFP_ATOMIC ); +if (unlikely (!frag)) goto err; head = *headbuf = frag; *buf =NULL ;
Greg Kroah-Hartman
maintainerPATCH 7/43 bnxt_en: Avoid sending firmware messages when AER error is detected.
In reply to Greg Kroah-HartmanFrom: Vasundhara Volam <[email protected]>
[ Upstream commit b340dc680ed48dcc05b56e1ebe1b9535813c3ee0 ]
When the driver goes through PCIe AER reset in error state, all firmware messages will timeout because the PCIe bus is no longer accessible. This can lead to AER reset taking many minutes to complete as each firmware command takes time to timeout.
Define a new macro BNXT_NO_FW_ACCESS() to skip these firmware messages when either firmware is in fatal error state or when pci_channel_offline() is true. It now takes a more reasonable 20 to 30 seconds to complete AER recovery.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 +++--- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +3 -3
@@ -4204,7 +4204,7 @@ static int bnxt_hwrm_do_send_msg(structu32 bar_offset =BNXT_GRCPF_REG_CHIMP_COMM ;u16 dst =BNXT_HWRM_CHNL_CHIMP ; -if (test_bit (BNXT_STATE_FW_FATAL_COND , &bp->state)) +if (BNXT_NO_FW_ACCESS (bp))return -EBUSY ;if (msg_len >BNXT_HWRM_MAX_REQ_LEN ) {
@@ -5539,7 +5539,7 @@ static int hwrm_ring_free_send_msg(strucstruct hwrm_ring_free_output *resp = bp->hwrm_cmd_resp_addr;u16 error_code; -if (test_bit (BNXT_STATE_FW_FATAL_COND , &bp->state)) +if (BNXT_NO_FW_ACCESS (bp))return 0 ;bnxt_hwrm_cmd_hdr_init (bp, &req,HWRM_RING_FREE , cmpl_ring_id,-1 );
@@ -7454,7 +7454,7 @@ static int bnxt_set_tpa(struct bnxt *bp,if (set_tpa) tpa_flags = bp->flags &BNXT_FLAG_TPA ; -else if (test_bit (BNXT_STATE_FW_FATAL_COND , &bp->state)) +else if (BNXT_NO_FW_ACCESS (bp))return 0 ;for (i =0 ; i < bp->nr_vnics; i++) { rc =bnxt_hwrm_vnic_set_tpa (bp, i, tpa_flags);
drivers/net/ethernet/broadcom/bnxt/bnxt.h +4 -0
@@ -1628,6 +1628,10 @@ struct bnxt {#define BNXT_STATE_ABORT_ERR 5#define BNXT_STATE_FW_FATAL_COND 6 +#define BNXT_NO_FW_ACCESS (bp) \ + (test_bit(BNXT_STATE_FW_FATAL_COND, &(bp)->state) || \ + pci_channel_offline((bp)->pdev)) +struct bnxt_irq *irq_tbl;int total_irqs;u8 mac_addr[ETH_ALEN ];
Greg Kroah-Hartman
maintainerPATCH 8/43 bnxt_en: Fix NULL ptr dereference crash in bnxt_fw_reset_task()
In reply to Greg Kroah-HartmanFrom: Vasundhara Volam <[email protected]>
[ Upstream commit b16939b59cc00231a75d224fd058d22c9d064976 ]
bnxt_fw_reset_task() which runs from a workqueue can race with bnxt_remove_one(). For example, if firmware reset and VF FLR are happening at about the same time.
bnxt_remove_one() already cancels the workqueue and waits for it to finish, but we need to do this earlier before the devlink reporters are destroyed. This will guarantee that
the devlink reporters will always be valid when bnxt_fw_reset_task() is still running.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +4 -3
@@ -11385,14 +11385,15 @@ static void bnxt_remove_one(struct pci_dif (BNXT_PF (bp))bnxt_sriov_disable (bp); +clear_bit (BNXT_STATE_IN_FW_RESET , &bp->state); +bnxt_cancel_sp_work (bp); + bp->sp_event =0 ; +bnxt_dl_fw_reporters_destroy (bp, true);pci_disable_pcie_error_reporting (pdev);unregister_netdev (dev);bnxt_dl_unregister (bp);bnxt_shutdown_tc (bp); -clear_bit (BNXT_STATE_IN_FW_RESET , &bp->state); -bnxt_cancel_sp_work (bp); - bp->sp_event =0 ;bnxt_clear_int_mode (bp);bnxt_hwrm_func_drv_unrgtr (bp);
Greg Kroah-Hartman
maintainerPATCH 9/43 cxgb4: fix memory leak during module unload
In reply to Greg Kroah-HartmanFrom: Raju Rangoju <[email protected]>
[ Upstream commit f4a26a9b311d7ff9db461278faf2869d06496ef8 ]
Fix the memory leak in mps during module unload
path by freeing mps reference entries if the listadpter->mps_ref is not already empty
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c +1 -1
@@ -229,7 +229,7 @@ void cxgb4_free_mps_ref_entries(struct a {struct mps_entries_ref *mps_entry, *tmp; -if (!list_empty (&adap->mps_ref)) +if (list_empty (&adap->mps_ref))return ;spin_lock (&adap->mps_ref_lock);
Greg Kroah-Hartman
maintainerPATCH 10/43 cxgb4: Fix offset when clearing filter byte counters
In reply to Greg Kroah-HartmanFrom: Ganji Aravind <[email protected]>
[ Upstream commit 94cc242a067a869c29800aa789d38b7676136e50 ]
Pass the correct offset to clear the stale filter hit bytes counter. Otherwise, the counter starts incrementing from the stale information, instead of 0.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c +6 -3
@@ -1617,13 +1617,16 @@ out:static int configure_filter_tcb (struct adapter *adap,unsigned int tid,struct filter_entry *f) { -if (f->fs.hitcnts) +if (f->fs.hitcnts) {set_tcb_field (adap, f, tid,TCB_TIMESTAMP_W , -TCB_TIMESTAMP_V (TCB_TIMESTAMP_M ) | +TCB_TIMESTAMP_V (TCB_TIMESTAMP_M ), +TCB_TIMESTAMP_V (0ULL ), +1 ); +set_tcb_field (adap, f, tid,TCB_RTT_TS_RECENT_AGE_W ,TCB_RTT_TS_RECENT_AGE_V (TCB_RTT_TS_RECENT_AGE_M ), -TCB_TIMESTAMP_V (0ULL ) |TCB_RTT_TS_RECENT_AGE_V (0ULL ),1 ); + }if (f->fs.newdmac) set_tcb_tflag(adap, f, tid, TF_CCTRL_ECE_S, 1,
Greg Kroah-Hartman
maintainerPATCH 11/43 geneve: add transport ports in route lookup for geneve
In reply to Greg Kroah-HartmanFrom: Mark Gray <[email protected]>
[ Upstream commit 34beb21594519ce64a55a498c2fe7d567bc1ca20 ]
This patch adds transport ports information for route lookup so that IPsec can select Geneve tunnel traffic to do encryption. This is needed for OVS/OVN IPsec with encrypted Geneve tunnels.
This can be tested by configuring a host-host VPN using an IKE daemon and specifying port numbers. For example, for an Openswan-type configuration, the following parameters should be configured on both hosts and IPsec set up as-per normal:
$ cat /etc/ipsec.conf
conn in
...
left=$IP1
right=$IP2
...
leftprotoport=udp/6081
rightprotoport=udp
...
conn out
...
left=$IP1
right=$IP2
...
leftprotoport=udp
rightprotoport=udp/6081
...
The tunnel can then be setup using "ip" on both hosts (but changing the relevant IP addresses):
$ ip link add tun type geneve id 1000 remote $IP2 $ ip addr add 192.168.0.1/24 dev tun $ ip link set tun up
This can then be tested by pinging from $IP1:
$ ping 192.168.0.2
Without this patch the traffic is unencrypted on the wire.
--- drivers/net/geneve.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-)
drivers/net/geneve.c +27 -10
@@ -773,7 +773,8 @@ static struct rtable *geneve_get_v4_rt(sstruct net_device *dev, struct geneve_sock *gs4, struct flowi4 *fl4, - const struct ip_tunnel_info *info) + const struct ip_tunnel_info *info, + __be16 dport, __be16 sport) { bool use_cache = ip_tunnel_dst_cache_usable(skb, info);struct geneve_dev *geneve =netdev_priv (dev);
@@ -789,6 +790,8 @@ static struct rtable *geneve_get_v4_rt(s fl4->flowi4_proto =IPPROTO_UDP ; fl4->daddr = info->key.u.ipv4.dst; fl4->saddr = info->key.u.ipv4.src; + fl4->fl4_dport = dport; + fl4->fl4_sport = sport; tos = info->key.tos;if ((tos ==1 ) && !geneve->collect_md) {
@@ -823,7 +826,8 @@ static struct dst_entry *geneve_get_v6_dstruct net_device *dev, struct geneve_sock *gs6, struct flowi6 *fl6, - const struct ip_tunnel_info *info) + const struct ip_tunnel_info *info, + __be16 dport, __be16 sport) { bool use_cache = ip_tunnel_dst_cache_usable(skb, info);struct geneve_dev *geneve =netdev_priv (dev);
@@ -839,6 +843,9 @@ static struct dst_entry *geneve_get_v6_d fl6->flowi6_proto =IPPROTO_UDP ; fl6->daddr = info->key.u.ipv6.dst; fl6->saddr = info->key.u.ipv6.src; + fl6->fl6_dport = dport; + fl6->fl6_sport = sport; + prio = info->key.tos;if ((prio ==1 ) && !geneve->collect_md) { prio =ip_tunnel_get_dsfield (ip_hdr (skb), skb);
@@ -885,14 +892,15 @@ static int geneve_xmit_skb(struct sk_buf__be16 sport;int err; - rt =geneve_get_v4_rt (skb, dev, gs4, &fl4, info); + sport =udp_flow_src_port (geneve->net, skb,1 ,USHRT_MAX , true); + rt =geneve_get_v4_rt (skb, dev, gs4, &fl4, info, + geneve->info.key.tp_dst, sport);if (IS_ERR (rt))return PTR_ERR (rt);skb_tunnel_check_pmtu (skb, &rt->dst,GENEVE_IPV4_HLEN + info->options_len); - sport =udp_flow_src_port (geneve->net, skb,1 ,USHRT_MAX , true);if (geneve->collect_md) { tos =ip_tunnel_ecn_encap (key->tos,ip_hdr (skb), skb); ttl = key->ttl;
@@ -947,13 +955,14 @@ static int geneve6_xmit_skb(struct sk_bu__be16 sport;int err; - dst =geneve_get_v6_dst (skb, dev, gs6, &fl6, info); + sport =udp_flow_src_port (geneve->net, skb,1 ,USHRT_MAX , true); + dst =geneve_get_v6_dst (skb, dev, gs6, &fl6, info, + geneve->info.key.tp_dst, sport);if (IS_ERR (dst))return PTR_ERR (dst);skb_tunnel_check_pmtu (skb, dst,GENEVE_IPV6_HLEN + info->options_len); - sport =udp_flow_src_port (geneve->net, skb,1 ,USHRT_MAX , true);if (geneve->collect_md) { prio =ip_tunnel_ecn_encap (key->tos,ip_hdr (skb), skb); ttl = key->ttl;
@@ -1034,13 +1043,18 @@ static int geneve_fill_metadata_dst(stru {struct ip_tunnel_info *info =skb_tunnel_info (skb);struct geneve_dev *geneve =netdev_priv (dev); +__be16 sport;if (ip_tunnel_info_af (info) ==AF_INET ) {struct rtable *rt;struct flowi4 fl4; +struct geneve_sock *gs4 =rcu_dereference (geneve->sock4); + sport =udp_flow_src_port (geneve->net, skb, +1 ,USHRT_MAX , true); - rt =geneve_get_v4_rt (skb, dev, gs4, &fl4, info); + rt =geneve_get_v4_rt (skb, dev, gs4, &fl4, info, + geneve->info.key.tp_dst, sport);if (IS_ERR (rt))return PTR_ERR (rt);
@@ -1050,9 +1064,13 @@ static int geneve_fill_metadata_dst(stru }else if (ip_tunnel_info_af (info) ==AF_INET6 ) {struct dst_entry *dst;struct flowi6 fl6; +struct geneve_sock *gs6 =rcu_dereference (geneve->sock6); + sport =udp_flow_src_port (geneve->net, skb, +1 ,USHRT_MAX , true); - dst =geneve_get_v6_dst (skb, dev, gs6, &fl6, info); + dst =geneve_get_v6_dst (skb, dev, gs6, &fl6, info, + geneve->info.key.tp_dst, sport);if (IS_ERR (dst))return PTR_ERR (dst);
@@ -1063,8 +1081,7 @@ static int geneve_fill_metadata_dst(strureturn -EINVAL ; } - info->key.tp_src =udp_flow_src_port (geneve->net, skb, -1 ,USHRT_MAX , true); + info->key.tp_src = sport; info->key.tp_dst = geneve->info.key.tp_dst;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 13/43 ip: fix tos reflection in ack and reset packets
In reply to Greg Kroah-HartmanFrom: Wei Wang <[email protected]>
[ Upstream commit ba9e04a7ddf4f22a10e05bf9403db6b97743c7bf ]
Currently, in tcp_v4_reqsk_send_ack() and tcp_v4_send_reset(), we echo the TOS value of the received packets in the response. However, we do not want to echo the lower 2 ECN bits in accordance with RFC 3168 6.1.5 robustness principles.
--- net/ipv4/ip_output.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/ip_output.c +2 -1
@@ -74,6 +74,7 @@#include <net/icmp.h> #include <net/checksum.h> #include <net/inetpeer.h> +#include <net/inet_ecn.h> #include <net/lwtunnel.h> #include <linux/bpf-cgroup.h> #include <linux/igmp.h>
@@ -1699,7 +1700,7 @@ void ip_send_unicast_reply(struct sock *if (IS_ERR (rt))return ; -inet_sk (sk)->tos = arg->tos; +inet_sk (sk)->tos = arg->tos & ~INET_ECN_MASK ; sk->sk_protocol =ip_hdr (skb)->protocol; sk->sk_bound_dev_if = arg->bound_dev_if;
Greg Kroah-Hartman
maintainerPATCH 12/43 hdlc_ppp: add range checks in ppp_cp_parse_cr()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 66d42ed8b25b64eb63111a2b8582c5afc8bf1105 ]
There are a couple bugs here:
1) If opt[1] is zero then this results in a forever loop. If the value is less than 2 then it is invalid.
2) It assumes that "len" is more than sizeof(valid_accm) or 6 which can result in memory corruption.
In the case of LCP_OPTION_ACCM, then we should check "opt[1]" instead of "len" because, if "opt[1]" is less than sizeof(valid_accm) then "nak_len" gets out of sync and it can lead to memory corruption in the next iterations through the loop. In case of LCP_OPTION_MAGIC, the only valid value for opt[1] is 6, but the code is trying to log invalid data so we should only discard the data when "len" is less than 6 because that leads to a read overflow.
--- drivers/net/wan/hdlc_ppp.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/wan/hdlc_ppp.c +11 -5
@@ -383,11 +383,8 @@ static void ppp_cp_parse_cr(struct net_d }for (opt = data; len; len -= opt[1 ], opt += opt[1 ]) { -if (len <2 || len < opt[1 ]) { - dev->stats.rx_errors++; -kfree (out); -return ;/* bad packet, drop silently */ - } +if (len <2 || opt[1 ] <2 || len < opt[1 ]) + goto err_out;if (pid ==PID_LCP )switch (opt[0 ]) {
@@ -395,6 +392,8 @@ static void ppp_cp_parse_cr(struct net_dcontinue ;/* MRU always OK and > 1500 bytes? */ case LCP_OPTION_ACCM :/* async control character map */ +if (opt[1 ] <sizeof (valid_accm)) + goto err_out;if (!memcmp (opt, valid_accm,sizeof (valid_accm)))continue ;
@@ -406,6 +405,8 @@ static void ppp_cp_parse_cr(struct net_d }break ;case LCP_OPTION_MAGIC : +if (len <6 ) + goto err_out;if (opt[1 ] !=6 || (!opt[2 ] && !opt[3 ] && !opt[4 ] && !opt[5 ]))break ;/* reject invalid magic number */
@@ -424,6 +425,11 @@ static void ppp_cp_parse_cr(struct net_dppp_cp_event (dev, pid,RCR_GOOD ,CP_CONF_ACK , id, req_len, data);kfree (out); +return ; + +err_out: + dev->stats.rx_errors++; +kfree (out); }static int ppp_rx (struct sk_buff *skb)
Greg Kroah-Hartman
maintainerPATCH 5/43 mm/thp: fix __split_huge_pmd_locked() for migration PMD
In reply to Greg Kroah-HartmanFrom: Ralph Campbell <[email protected]>
[ Upstream commit ec0abae6dcdf7ef88607c869bf35a4b63ce1b370 ]
A migrating transparent huge page has to already be unmapped. Otherwise, the page could be modified while it is being copied to a new page and data could be lost. The function __split_huge_pmd() checks for a PMD migration entry before calling __split_huge_pmd_locked() leading one to think that __split_huge_pmd_locked() can handle splitting a migrating PMD.
However, the code always increments the page->_mapcount and adjusts the memory control group accounting assuming the page is mapped.
Also, if the PMD entry is a migration PMD entry, the call to is_huge_zero_pmd(*pmd) is incorrect because it calls pmd_pfn(pmd) instead of migration_entry_to_pfn(pmd_to_swp_entry(pmd)). Fix these problems by checking for a PMD migration entry.
--- mm/huge_memory.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-)
mm/huge_memory.c +23 -17
@@ -2174,7 +2174,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,put_page (page);add_mm_counter (mm,mm_counter_file (page), -HPAGE_PMD_NR );return ; - }else if (is_huge_zero_pmd (*pmd)) { + }else if (pmd_trans_huge (*pmd) &&is_huge_zero_pmd (*pmd)) {/* * FIXME: Do we want to invalidate secondary mmu by calling * mmu_notifier_invalidate_range() see comments below inside
@@ -2262,27 +2262,33 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, pte =pte_offset_map (&_pmd, addr);BUG_ON (!pte_none (*pte));set_pte_at (mm, addr, pte, entry); -atomic_inc (&page[i]._mapcount); -pte_unmap (pte); - } - -/* -* Set PG_double_map before dropping compound_mapcount to avoid -* false-negative page_mapped(). -*/ -if (compound_mapcount (page) >1 && !TestSetPageDoubleMap (page)) { -for (i =0 ; i <HPAGE_PMD_NR ; i++) +if (!pmd_migration)atomic_inc (&page[i]._mapcount); +pte_unmap (pte); } -if (atomic_add_negative (-1 ,compound_mapcount_ptr (page))) { -/* Last compound_mapcount is gone. */ -__dec_node_page_state (page,NR_ANON_THPS ); -if (TestClearPageDoubleMap (page)) { -/* No need in mapcount reference anymore */ +if (!pmd_migration) { +/* +* Set PG_double_map before dropping compound_mapcount to avoid +* false-negative page_mapped(). +*/ +if (compound_mapcount (page) >1 && + !TestSetPageDoubleMap (page)) {for (i =0 ; i <HPAGE_PMD_NR ; i++) -atomic_dec (&page[i]._mapcount); +atomic_inc (&page[i]._mapcount); + } + +lock_page_memcg (page); +if (atomic_add_negative (-1 ,compound_mapcount_ptr (page))) { +/* Last compound_mapcount is gone. */ +__dec_lruvec_page_state (page,NR_ANON_THPS ); +if (TestClearPageDoubleMap (page)) { +/* No need in mapcount reference anymore */ +for (i =0 ; i <HPAGE_PMD_NR ; i++) +atomic_dec (&page[i]._mapcount); + } } +unlock_page_memcg (page); }smp_wmb ();/* make pte visible before pmd */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 37/43 net: lantiq: Disable IRQs only if NAPI gets scheduled
In reply to Greg Kroah-HartmanFrom: Hauke Mehrtens <[email protected]>
[ Upstream commit 9423361da52356cb68642db5b2729b6b85aad330 ]
The napi_schedule() call will only schedule the NAPI if it is not already running. To make sure that we do not deactivate interrupts without scheduling NAPI only deactivate the interrupts in case NAPI also gets scheduled.
--- drivers/net/ethernet/lantiq_xrx200.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/lantiq_xrx200.c +5 -3
@@ -344,10 +344,12 @@ static irqreturn_t xrx200_dma_irq(int ir {struct xrx200_chan *ch = ptr; -ltq_dma_disable_irq (&ch->dma); -ltq_dma_ack_irq (&ch->dma); +if (napi_schedule_prep (&ch->napi)) { +__napi_schedule (&ch->napi); +ltq_dma_disable_irq (&ch->dma); + } -napi_schedule (&ch->napi); +ltq_dma_ack_irq (&ch->dma);return IRQ_HANDLED ; }
Greg Kroah-Hartman
maintainerPATCH 38/43 net: phy: Avoid NPD upon phy_detach() when driver is unbound
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit c2b727df7caa33876e7066bde090f40001b6d643 ]
If we have unbound the PHY driver prior to calling phy_detach() (often via phy_disconnect()) then we can cause a NULL pointer de-reference accessing the driver owner member. The steps to reproduce are:
echo unimac-mdio-0:01 > /sys/class/net/eth0/phydev/driver/unbind ip link set eth0 down
--- drivers/net/phy/phy_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/phy/phy_device.c +2 -1
@@ -1421,7 +1421,8 @@ void phy_detach(struct phy_device *phydephy_led_triggers_unregister (phydev); -module_put (phydev->mdio.dev.driver->owner); +if (phydev->mdio.dev.driver) +module_put (phydev->mdio.dev.driver->owner);/* If the device had no specific driver before (i.e. - it * was using the generic driver), we unbind the device
Greg Kroah-Hartman
maintainerPATCH 39/43 net: phy: Do not warn in phy_stop() on PHY_DOWN
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 5116a8ade333b6c2e180782139c9c516a437b21c ]
When phy_is_started() was added to catch incorrect PHY states, phy_stop() would not be qualified against PHY_DOWN. It is possible to reach that state when the PHY driver has been unbound and the network device is then brought down.
--- drivers/net/phy/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/phy.c +1 -1
@@ -834,7 +834,7 @@ EXPORT_SYMBOL(phy_free_interrupt);*/ void phy_stop (struct phy_device *phydev) { -if (!phy_is_started (phydev)) { +if (!phy_is_started (phydev) && phydev->state !=PHY_DOWN ) {WARN (1 ,"called from state %s\n" ,phy_state_to_str (phydev->state));return ;
Greg Kroah-Hartman
maintainerPATCH 40/43 net: qrtr: check skb_put_padto() return value
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 3ca1a42a52ca4b4f02061683851692ad65fefac8 ]
If skb_put_padto() returns an error, skb has been freed. Better not touch it anymore, as reported by syzbot [1]
Note to qrtr maintainers : this suggests qrtr_sendmsg() should adjust sock_alloc_send_skb() second parameter to account for the potential added alignment to avoid reallocation.
[1]
BUG: KASAN: use-after-free in __skb_insert include/linux/skbuff.h:1907 [inline] BUG: KASAN: use-after-free in __skb_queue_before include/linux/skbuff.h:2016 [inline] BUG: KASAN: use-after-free in __skb_queue_tail include/linux/skbuff.h:2049 [inline] BUG: KASAN: use-after-free in skb_queue_tail+0x6b/0x120 net/core/skbuff.c:3146 Write of size 8 at addr ffff88804d8ab3c0 by task syz-executor.4/4316 CPU: 1 PID: 4316 Comm: syz-executor.4 Not tainted 5.9.0-rc4-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1d6/0x29e lib/dump_stack.c:118 print_address_description+0x66/0x620 mm/kasan/report.c:383 __kasan_report mm/kasan/report.c:513 [inline] kasan_report+0x132/0x1d0 mm/kasan/report.c:530 __skb_insert include/linux/skbuff.h:1907 [inline] __skb_queue_before include/linux/skbuff.h:2016 [inline] __skb_queue_tail include/linux/skbuff.h:2049 [inline] skb_queue_tail+0x6b/0x120 net/core/skbuff.c:3146 qrtr_tun_send+0x1a/0x40 net/qrtr/tun.c:23 qrtr_node_enqueue+0x44f/0xc00 net/qrtr/qrtr.c:364 qrtr_bcast_enqueue+0xbe/0x140 net/qrtr/qrtr.c:861 qrtr_sendmsg+0x680/0x9c0 net/qrtr/qrtr.c:960 sock_sendmsg_nosec net/socket.c:651 [inline] sock_sendmsg net/socket.c:671 [inline] sock_write_iter+0x317/0x470 net/socket.c:998 call_write_iter include/linux/fs.h:1882 [inline] new_sync_write fs/read_write.c:503 [inline] vfs_write+0xa96/0xd10 fs/read_write.c:578 ksys_write+0x11b/0x220 fs/read_write.c:631 do_syscall_64+0x31/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x45d5b9 Code: 5d b4 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 2b b4 fb ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007f84b5b81c78 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 0000000000038b40 RCX: 000000000045d5b9 RDX: 0000000000000055 RSI: 0000000020001240 RDI: 0000000000000003 RBP: 00007f84b5b81ca0 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000000f R13: 00007ffcbbf86daf R14: 00007f84b5b829c0 R15: 000000000118cf4c Allocated by task 4316: kasan_save_stack mm/kasan/common.c:48 [inline] kasan_set_track mm/kasan/common.c:56 [inline] __kasan_kmalloc+0x100/0x130 mm/kasan/common.c:461 slab_post_alloc_hook+0x3e/0x290 mm/slab.h:518 slab_alloc mm/slab.c:3312 [inline] kmem_cache_alloc+0x1c1/0x2d0 mm/slab.c:3482 skb_clone+0x1b2/0x370 net/core/skbuff.c:1449 qrtr_bcast_enqueue+0x6d/0x140 net/qrtr/qrtr.c:857 qrtr_sendmsg+0x680/0x9c0 net/qrtr/qrtr.c:960 sock_sendmsg_nosec net/socket.c:651 [inline] sock_sendmsg net/socket.c:671 [inline] sock_write_iter+0x317/0x470 net/socket.c:998 call_write_iter include/linux/fs.h:1882 [inline] new_sync_write fs/read_write.c:503 [inline] vfs_write+0xa96/0xd10 fs/read_write.c:578 ksys_write+0x11b/0x220 fs/read_write.c:631 do_syscall_64+0x31/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Freed by task 4316: kasan_save_stack mm/kasan/common.c:48 [inline] kasan_set_track+0x3d/0x70 mm/kasan/common.c:56 kasan_set_free_info+0x17/0x30 mm/kasan/generic.c:355 __kasan_slab_free+0xdd/0x110 mm/kasan/common.c:422 __cache_free mm/slab.c:3418 [inline] kmem_cache_free+0x82/0xf0 mm/slab.c:3693 __skb_pad+0x3f5/0x5a0 net/core/skbuff.c:1823 __skb_put_padto include/linux/skbuff.h:3233 [inline] skb_put_padto include/linux/skbuff.h:3252 [inline] qrtr_node_enqueue+0x62f/0xc00 net/qrtr/qrtr.c:360 qrtr_bcast_enqueue+0xbe/0x140 net/qrtr/qrtr.c:861 qrtr_sendmsg+0x680/0x9c0 net/qrtr/qrtr.c:960 sock_sendmsg_nosec net/socket.c:651 [inline] sock_sendmsg net/socket.c:671 [inline] sock_write_iter+0x317/0x470 net/socket.c:998 call_write_iter include/linux/fs.h:1882 [inline] new_sync_write fs/read_write.c:503 [inline] vfs_write+0xa96/0xd10 fs/read_write.c:578 ksys_write+0x11b/0x220 fs/read_write.c:631 do_syscall_64+0x31/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 The buggy address belongs to the object at ffff88804d8ab3c0 which belongs to the cache skbuff_head_cache of size 224 The buggy address is located 0 bytes inside of 224-byte region [ffff88804d8ab3c0, ffff88804d8ab4a0) The buggy address belongs to the page: page:00000000ea8cccfb refcount:1 mapcount:0 mapping:0000000000000000 index:0xffff88804d8abb40 pfn:0x4d8ab flags: 0xfffe0000000200(slab) raw: 00fffe0000000200 ffffea0002237ec8 ffffea00029b3388 ffff88821bb66800 raw: ffff88804d8abb40 ffff88804d8ab000 000000010000000b 0000000000000000 page dumped because: kasan: bad access detected
--- net/qrtr/qrtr.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
net/qrtr/qrtr.c +11 -9
@@ -178,7 +178,7 @@ static int qrtr_node_enqueue(struct qrtr {struct qrtr_hdr_v1 *hdr;size_t len = skb->len; -int rc = -ENODEV ; +int rc; hdr =skb_push (skb,sizeof (*hdr)); hdr->version =cpu_to_le32 (QRTR_PROTO_VER_1 );
@@ -196,15 +196,17 @@ static int qrtr_node_enqueue(struct qrtr hdr->size =cpu_to_le32 (len); hdr->confirm_rx =0 ; -skb_put_padto (skb,ALIGN (len,4 ) +sizeof (*hdr)); - -mutex_lock (&node->ep_lock); -if (node->ep) - rc = node->ep->xmit (node->ep, skb); -else -kfree_skb (skb); -mutex_unlock (&node->ep_lock); + rc =skb_put_padto (skb,ALIGN (len,4 ) +sizeof (*hdr)); +if (!rc) { +mutex_lock (&node->ep_lock); + rc = -ENODEV ; +if (node->ep) + rc = node->ep->xmit (node->ep, skb); +else +kfree_skb (skb); +mutex_unlock (&node->ep_lock); + }return rc; }
Greg Kroah-Hartman
maintainerPATCH 42/43 mm: memcg: fix memcg reclaim soft lockup
In reply to Greg Kroah-HartmanFrom: Xunlei Pang <[email protected]>
commit e3336cab2579012b1e72b5265adf98e2d6e244ad upstream.
We've met softlockup with "CONFIG_PREEMPT_NONE=y", when the target memcg doesn't have any reclaimable memory.
It can be easily reproduced as below:
watchdog: BUG: soft lockup - CPU#0 stuck for 111s![memcg_test:2204]
CPU: 0 PID: 2204 Comm: memcg_test Not tainted 5.9.0-rc2+ #12
Call Trace:
shrink_lruvec+0x49f/0x640
shrink_node+0x2a6/0x6f0
do_try_to_free_pages+0xe9/0x3e0
try_to_free_mem_cgroup_pages+0xef/0x1f0
try_charge+0x2c1/0x750
mem_cgroup_charge+0xd7/0x240
__add_to_page_cache_locked+0x2fd/0x370
add_to_page_cache_lru+0x4a/0xc0
pagecache_get_page+0x10b/0x2f0
filemap_fault+0x661/0xad0
ext4_filemap_fault+0x2c/0x40
__do_fault+0x4d/0xf9
handle_mm_fault+0x1080/0x1790It only happens on our 1-vcpu instances, because there's no chance for oom reaper to run to reclaim the to-be-killed process.
Add a cond_resched() at the upper shrink_node_memcgs() to solve this issue, this will mean that we will get a scheduling point for each memcg in the reclaimed hierarchy without any dependency on the reclaimable memory in that memcg thus making it more predictable.
--- mm/vmscan.c | 8 ++++++++ 1 file changed, 8 insertions(+)
mm/vmscan.c +8 -0
@@ -2775,6 +2775,14 @@ static bool shrink_node(pg_data_t *pgdatunsigned long reclaimed;unsigned long scanned; +/* +* This loop can become CPU-bound when target memcgs +* aren't eligible for reclaim - either because they +* don't have any reclaimable pages, or because their +* memory is explicitly protected. Avoid soft lockups. +*/ +cond_resched (); +switch (mem_cgroup_protected (root, memcg)) {case MEMCG_PROT_MIN :/*
Greg Kroah-Hartman
maintainerPATCH 43/43 iommu/amd: Use cmpxchg_double() when updating 128-bit IRTE
In reply to Greg Kroah-HartmanFrom: Suravee Suthikulpanit <[email protected]>
commit e52d58d54a321d4fe9d0ecdabe4f8774449f0d6e upstream.
When using 128-bit interrupt-remapping table entry (IRTE) (a.k.a GA mode), current driver disables interrupt remapping when it updates the IRTE so that the upper and lower 64-bit values can be updated safely.
However, this creates a small window, where the interrupt could arrive and result in IO_PAGE_FAULT (for interrupt) as shown below.
IOMMU Driver Device IRQ
============ ===========
irte.RemapEn=0
...
change IRTE IRQ from device ==> IO_PAGE_FAULT !!
...irte.RemapEn=1
This scenario has been observed when changing irq affinity on a system running I/O-intensive workload, in which the destination APIC ID in the IRTE is updated.
Instead, use cmpxchg_double() to update the 128-bit IRTE at once without disabling the interrupt remapping. However, this means several features, which require GA (128-bit IRTE) support will also be affected if cmpxchg16b is not supported (which is unprecedented for AMD processors w/ IOMMU).
--- drivers/iommu/Kconfig | 2 +- drivers/iommu/amd_iommu.c | 17 +++++++++++++---- drivers/iommu/amd_iommu_init.c | 21 +++++++++++++++++++-- 3 files changed, 33 insertions(+), 7 deletions(-)
drivers/iommu/Kconfig +1 -1
@@ -138,7 +138,7 @@ config AMD_IOMMU select PCI_PASID select IOMMU_API select IOMMU_IOVA - depends on X86_64 && PCI && ACPI + depends on X86_64 && PCI && ACPI && HAVE_CMPXCHG_DOUBLE ---help--- With this option you can enable support for AMD IOMMU hardware in your system. An IOMMU is a hardware component which provides
drivers/iommu/amd_iommu.c +13 -4
@@ -3873,6 +3873,7 @@ out:static int modify_irte_ga (u16 devid,int index,struct irte_ga *irte,struct amd_ir_data *data) { +bool ret;struct irq_remap_table *table;struct amd_iommu *iommu;unsigned long flags;
@@ -3890,10 +3891,18 @@ static int modify_irte_ga(u16 devid, int entry = (struct irte_ga *)table->table; entry = &entry[index]; - entry->lo.fields_remap.valid =0 ; - entry->hi.val = irte->hi.val; - entry->lo.val = irte->lo.val; - entry->lo.fields_remap.valid =1 ; + + ret =cmpxchg_double (&entry->lo.val, &entry->hi.val, + entry->lo.val, entry->hi.val, + irte->lo.val, irte->hi.val); +/* +* We use cmpxchg16 to atomically update the 128-bit IRTE, +* and it cannot be updated by the hardware or other processors +* behind us, so the return value of cmpxchg16 should be the +* same as the old value. +*/ +WARN_ON (!ret); +if (data) data->ref = entry;
drivers/iommu/amd_iommu_init.c +19 -2
@@ -1522,7 +1522,14 @@ static int __init init_iommu_one(struct iommu->mmio_phys_end =MMIO_REG_END_OFFSET ; else iommu->mmio_phys_end = MMIO_CNTR_CONF_OFFSET; -if (((h->efr_attr & (0x1 <<IOMMU_FEAT_GASUP_SHIFT )) ==0 )) + +/* +* Note: GA (128-bit IRTE) mode requires cmpxchg16b supports. +* GAM also requires GA mode. Therefore, we need to +* check cmpxchg16b support before enabling it. +*/ +if (!boot_cpu_has (X86_FEATURE_CX16 ) || + ((h->efr_attr & (0x1 <<IOMMU_FEAT_GASUP_SHIFT )) ==0 )) amd_iommu_guest_ir =AMD_IOMMU_GUEST_IR_LEGACY ;break ;case 0x11 :
@@ -1531,8 +1538,18 @@ static int __init init_iommu_one(struct iommu->mmio_phys_end =MMIO_REG_END_OFFSET ; else iommu->mmio_phys_end = MMIO_CNTR_CONF_OFFSET; -if (((h->efr_reg & (0x1 <<IOMMU_EFR_GASUP_SHIFT )) ==0 )) + +/* +* Note: GA (128-bit IRTE) mode requires cmpxchg16b supports. +* XT, GAM also requires GA mode. Therefore, we need to +* check cmpxchg16b support before enabling them. +*/ +if (!boot_cpu_has (X86_FEATURE_CX16 ) || + ((h->efr_reg & (0x1 <<IOMMU_EFR_GASUP_SHIFT )) ==0 )) { amd_iommu_guest_ir =AMD_IOMMU_GUEST_IR_LEGACY ; +break ; + } +/* * Note: Since iommu_update_intcapxt() leverages * the IOMMU MMIO access to MSI capability block registers
Greg Kroah-Hartman
maintainerPATCH 36/43 net: lantiq: Use napi_complete_done()
In reply to Greg Kroah-HartmanFrom: Hauke Mehrtens <[email protected]>
[ Upstream commit c582a7fea9dad4d309437d1a7e22e6d2cb380e2e ]
Use napi_complete_done() and activate the interrupts when this function returns true. This way the generic NAPI code can take care of activating the interrupts.
--- drivers/net/ethernet/lantiq_xrx200.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/lantiq_xrx200.c +4 -4
@@ -230,8 +230,8 @@ static int xrx200_poll_rx(struct napi_st }if (rx < budget) { -napi_complete (&ch->napi); -ltq_dma_enable_irq (&ch->dma); +if (napi_complete_done (&ch->napi, rx)) +ltq_dma_enable_irq (&ch->dma); }return rx;
@@ -272,8 +272,8 @@ static int xrx200_tx_housekeeping(structnetif_wake_queue (net_dev);if (pkts < budget) { -napi_complete (&ch->napi); -ltq_dma_enable_irq (&ch->dma); +if (napi_complete_done (&ch->napi, pkts)) +ltq_dma_enable_irq (&ch->dma); }return pkts;
Greg Kroah-Hartman
maintainerPATCH 41/43 net: add __must_check to skb_put_padto()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 4a009cb04aeca0de60b73f37b102573354214b52 ]
skb_put_padto() and __skb_put_padto() callers must check return values or risk use-after-free.
--- include/linux/skbuff.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
include/linux/skbuff.h +4 -3
@@ -3185,8 +3185,9 @@ static inline int skb_padto(struct sk_bu* is untouched. Otherwise it is extended. Returns zero on * success. The skb is freed on error if @free_on_error is true. */ -static inline int __skb_put_padto (struct sk_buff *skb,unsigned int len, -bool free_on_error) +static inline int __must_check __skb_put_padto (struct sk_buff *skb, +unsigned int len, +bool free_on_error) {unsigned int size = skb->len;
@@ -3209,7 +3210,7 @@ static inline int __skb_put_padto(struct* is untouched. Otherwise it is extended. Returns zero on * success. The skb is freed on error. */ -static inline int skb_put_padto (struct sk_buff *skb,unsigned int len) +static inline int __must_check skb_put_padto (struct sk_buff *skb,unsigned int len) {return __skb_put_padto (skb, len, true); }
Greg Kroah-Hartman
maintainerPATCH 14/43 ipv4: Initialize flowi4_multipath_hash in data path
In reply to Greg Kroah-HartmanFrom: David Ahern <[email protected]>
[ Upstream commit 1869e226a7b3ef75b4f70ede2f1b7229f7157fa4 ]
flowi4_multipath_hash was added by the commit referenced below for tunnels. Unfortunately, the patch did not initialize the new field for several fast path lookups that do not initialize the entire flow struct to 0. Fix those locations. Currently, flowi4_multipath_hash is random garbage and affects the hash value computed by fib_multipath_hash for multipath selection.
--- include/net/flow.h | 1 + net/core/filter.c | 1 + net/ipv4/fib_frontend.c | 1 + net/ipv4/route.c | 1 + 4 files changed, 4 insertions(+)
include/net/flow.h +1 -0
@@ -116,6 +116,7 @@ static inline void flowi4_init_output(st fl4->saddr = saddr; fl4->fl4_dport = dport; fl4->fl4_sport = sport; + fl4->flowi4_multipath_hash =0 ; }/* Reset some input parameters after previous lookup */
net/core/filter.c +1 -0
@@ -4650,6 +4650,7 @@ static int bpf_ipv4_fib_lookup(struct ne fl4.saddr = params->ipv4_src; fl4.fl4_sport = params->sport; fl4.fl4_dport = params->dport; + fl4.flowi4_multipath_hash =0 ;if (flags &BPF_FIB_LOOKUP_DIRECT ) {u32 tbid =l3mdev_fib_table_rcu (dev) ? :RT_TABLE_MAIN ;
net/ipv4/fib_frontend.c +1 -0
@@ -372,6 +372,7 @@ static int __fib_validate_source(struct fl4.flowi4_tun_key.tun_id =0 ; fl4.flowi4_flags =0 ; fl4.flowi4_uid =sock_net_uid (net,NULL ); + fl4.flowi4_multipath_hash =0 ; no_addr = idev->ifa_list ==NULL ;
net/ipv4/route.c +1 -0
@@ -2104,6 +2104,7 @@ static int ip_route_input_slow(struct sk fl4.daddr = daddr; fl4.saddr = saddr; fl4.flowi4_uid =sock_net_uid (net,NULL ); + fl4.flowi4_multipath_hash =0 ;if (fib4_rules_early_flow_dissect (net, skb, &fl4, &_flkeys)) { flkeys = &_flkeys;
Greg Kroah-Hartman
maintainerPATCH 35/43 net: lantiq: use netif_tx_napi_add() for TX NAPI
In reply to Greg Kroah-HartmanFrom: Hauke Mehrtens <[email protected]>
[ Upstream commit 74c7b80e222b58d3cea731d31e2a31a77fea8345 ]
netif_tx_napi_add() should be used for NAPI in the TX direction instead of the netif_napi_add() function.
--- drivers/net/ethernet/lantiq_xrx200.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/lantiq_xrx200.c +1 -1
@@ -501,7 +501,7 @@ static int xrx200_probe(struct platform_/* setup NAPI */ netif_napi_add (net_dev, &priv->chan_rx.napi, xrx200_poll_rx,32 ); -netif_napi_add (net_dev, &priv->chan_tx.napi, xrx200_tx_housekeeping,32 ); +netif_tx_napi_add (net_dev, &priv->chan_tx.napi, xrx200_tx_housekeeping,32 );platform_set_drvdata (pdev, priv);
Greg Kroah-Hartman
maintainerPATCH 20/43 net: Fix bridge enslavement failure
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit e1b9efe6baebe79019a2183176686a0e709388ae ]
When a netdev is enslaved to a bridge, its parent identifier is queried. This is done so that packets that were already forwarded in hardware will not be forwarded again by the bridge device between netdevs belonging to the same hardware instance.
The operation fails when the netdev is an upper of netdevs with different parent identifiers.
Instead of failing the enslavement, have dev_get_port_parent_id() return '-EOPNOTSUPP' which will signal the bridge to skip the query operation. Other callers of the function are not affected by this change.
--- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/dev.c +1 -1
@@ -8241,7 +8241,7 @@ int dev_get_port_parent_id(struct net_deif (!first.id_len) first = *ppid;else if (memcmp (&first, ppid,sizeof (*ppid))) -return -ENODATA ; +return -EOPNOTSUPP ; }return err;
Greg Kroah-Hartman
maintainerPATCH 17/43 net: bridge: br_vlan_get_pvid_rcu() should dereference the VLAN group under RCU
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 99f62a746066fa436aa15d4606a538569540db08 ]
When calling the RCU brother of br_vlan_get_pvid(), lockdep warns:
=============================
WARNING: suspicious RCU usage 5.9.0-rc3-01631-g13c17acb8e38-dirty #814 Not tainted
-----------------------------net/bridge/br_private.h:1054 suspicious rcu_dereference_protected() usage!
Call trace: lockdep_rcu_suspicious+0xd4/0xf8 __br_vlan_get_pvid+0xc0/0x100 br_vlan_get_pvid_rcu+0x78/0x108
The warning is because br_vlan_get_pvid_rcu() calls nbp_vlan_group() which calls rtnl_dereference() instead of rcu_dereference(). In turn, rtnl_dereference() calls rcu_dereference_protected() which assumes operation under an RCU write-side critical section, which obviously is not the case here. So, when the incorrect primitive is used to access the RCU-protected VLAN group pointer, READ_ONCE() is not used, which may cause various unexpected problems.
I'm sad to say that br_vlan_get_pvid() and br_vlan_get_pvid_rcu() cannot share the same implementation. So fix the bug by splitting the 2 functions, and making br_vlan_get_pvid_rcu() retrieve the VLAN groups under proper locking annotations.
--- net/bridge/br_vlan.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
net/bridge/br_vlan.c +17 -10
@@ -1229,11 +1229,13 @@ void br_vlan_get_stats(const struct net_ } } -static int __br_vlan_get_pvid (const struct net_device *dev, -struct net_bridge_port *p,u16 *p_pvid) +int br_vlan_get_pvid (const struct net_device *dev,u16 *p_pvid) {struct net_bridge_vlan_group *vg; +struct net_bridge_port *p; +ASSERT_RTNL (); + p =br_port_get_check_rtnl (dev);if (p) vg =nbp_vlan_group (p);else if (netif_is_bridge_master (dev))
@@ -1244,18 +1246,23 @@ static int __br_vlan_get_pvid(const stru *p_pvid =br_get_pvid (vg);return 0 ; } - -int br_vlan_get_pvid (const struct net_device *dev,u16 *p_pvid) -{ -ASSERT_RTNL (); - -return __br_vlan_get_pvid (dev,br_port_get_check_rtnl (dev), p_pvid); -}EXPORT_SYMBOL_GPL (br_vlan_get_pvid);int br_vlan_get_pvid_rcu (const struct net_device *dev,u16 *p_pvid) { -return __br_vlan_get_pvid (dev,br_port_get_check_rcu (dev), p_pvid); +struct net_bridge_vlan_group *vg; +struct net_bridge_port *p; + + p =br_port_get_check_rcu (dev); +if (p) + vg =nbp_vlan_group_rcu (p); +else if (netif_is_bridge_master (dev)) + vg =br_vlan_group_rcu (netdev_priv (dev)); +else +return -EINVAL ; + + *p_pvid =br_get_pvid (vg); +return 0 ; }EXPORT_SYMBOL_GPL (br_vlan_get_pvid_rcu);
Greg Kroah-Hartman
maintainerPATCH 1/43 af_key: pfkey_dump needs parameter validation
In reply to Greg Kroah-HartmanFrom: Mark Salyzyn <[email protected]>
commit 37bd22420f856fcd976989f1d4f1f7ad28e1fcac upstream.
In pfkey_dump() dplen and splen can both be specified to access the xfrm_address_t structure out of bounds in__xfrm_state_filter_match() when it calls addr_match() with the indexes. Return EINVAL if either are out of range.
--- net/key/af_key.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/key/af_key.c +7 -0
@@ -1849,6 +1849,13 @@ static int pfkey_dump(struct sock *sk, sif (ext_hdrs[SADB_X_EXT_FILTER -1 ]) {struct sadb_x_filter *xfilter = ext_hdrs[SADB_X_EXT_FILTER -1 ]; +if ((xfilter->sadb_x_filter_splen >= + (sizeof (xfrm_address_t) <<3 )) || + (xfilter->sadb_x_filter_dplen >= + (sizeof (xfrm_address_t) <<3 ))) { +mutex_unlock (&pfk->dump_lock); +return -EINVAL ; + } filter =kmalloc (sizeof (*filter),GFP_KERNEL );if (filter ==NULL ) {mutex_unlock (&pfk->dump_lock);
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.68 release. There are 43 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 27 Sep 2020 12:47:02 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.68-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.4:
14 builds: 14 pass, 0 fail
26 boots: 26 pass, 0 fail
56 tests: 56 pass, 0 failLinux version: 5.4.68-rc1-ga6d2801f4120
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.68 release. There are 43 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 27 Sep 2020 12:47:02 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.68-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.68 release. There are 43 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 27 Sep 2020 12:47:02 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.68-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 5.4.68-rc1
git repo: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
git branch: linux-5.4.y
git commit: a6d2801f4120fe0719556290e85ca7402b7c1fe2
git describe: v5.4.67-44-ga6d2801f4120
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.4.y-sanity/build/v5.4.67-44-ga6d2801f4120
No regressions (compared to build v5.4.67)
No fixes (compared to build v5.4.67)
Ran 33349 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- juno-r2-compat
- juno-r2-kasan
- nxp-ls2088
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15
- x86
- x86-kasan
Test Suites
-----------
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-syscalls-tests
* libhugetlbfs
* ltp-fs-tests
* ltp-hugetlb-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-securebits-tests
* ltp-tracing-tests
* v4l2-compliance
* ltp-controllers-tests
* ltp-cve-tests
* ltp-open-posix-tests
* ltp-sched-tests
* network-basic-tests
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.68 release. There are 43 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 27 Sep 2020 12:47:02 +0000. Anything received after that time might be too late.
Build results:
total: 157 pass: 157 fail: 0 Qemu test results: total: 430 pass: 430 fail: 0
Guenter