ath10k: Check tx_stats before use it
Subsystems (41)
Sasha Levin
maintainerPATCH 173/219 net: hns3: fix a -Wformat-nonliteral compile warning
In reply to Sasha LevinFrom: Yonglong Liu <[email protected]>
[ Upstream commit 18d219b783da61a6cc77581f55fc4af2fa16bc36 ]
When setting -Wformat=2, there is a compiler warning like this:
hclge_main.c:xxx:x: warning: format not a string literal and no format arguments [-Wformat-nonliteral]
strs[i].desc);
^~~~
This patch adds missing format parameter "%s" to snprintf() to fix it.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -2
@@ -550,8 +550,7 @@ static u8 *hclge_comm_get_strings(u32 stringset,return buff;for (i =0 ; i < size; i++) { -snprintf (buff,ETH_GSTRING_LEN , - strs[i].desc); +snprintf (buff,ETH_GSTRING_LEN ,"%s" , strs[i].desc); buff = buff +ETH_GSTRING_LEN ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 174/219 net: hns3: add some error checking in hclge_tm module
In reply to Sasha LevinFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 04f25edb48c441fc278ecc154c270f16966cbb90 ]
When hdev->tx_sch_mode is HCLGE_FLAG_VNET_BASE_SCH_MODE, the hclge_tm_schd_mode_vnet_base_cfg calls hclge_tm_pri_schd_mode_cfg with vport->vport_id as pri_id, which is used as index for hdev->tm_info.tc_info, it will cause out of bound access issue if vport_id is equal to or larger than HNAE3_MAX_TC.
Also hardware only support maximum speed of HCLGE_ETHER_MAX_RATE.
So this patch adds two checks for above cases.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +5 -1
@@ -54,7 +54,8 @@ static int hclge_shaper_para_calc(u32 ir, u8 shaper_level,u32 tick;/* Calc tick */ -if (shaper_level >=HCLGE_SHAPER_LVL_CNT ) +if (shaper_level >=HCLGE_SHAPER_LVL_CNT || + ir >HCLGE_ETHER_MAX_RATE )return -EINVAL ; tick = tick_array[shaper_level];
@@ -1124,6 +1125,9 @@ static int hclge_tm_schd_mode_vnet_base_cfg(struct hclge_vport *vport)int ret;u8 i; +if (vport->vport_id >=HNAE3_MAX_TC ) +return -EINVAL ; + ret =hclge_tm_pri_schd_mode_cfg (hdev, vport->vport_id);if (ret)return ret;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 175/219 ath10k: Fix memory leak in qmi
In reply to Sasha LevinFrom: Dundi Raviteja <[email protected]>
[ Upstream commit c709df58832c5f575f0255bea4b09ad477fc62ea ]
Currently the memory allocated for qmi handle is not being freed during de-init which leads to memory leak.
Free the allocated qmi memory in qmi deinit
to avoid memory leak.
Tested HW: WCN3990
Tested FW: WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1
--- drivers/net/wireless/ath/ath10k/qmi.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath10k/qmi.c +1 -0
@@ -1002,6 +1002,7 @@ int ath10k_qmi_deinit(struct ath10k *ar)qmi_handle_release (&qmi->qmi_hdl);cancel_work_sync (&qmi->event_work);destroy_workqueue (qmi->event_wq); +kfree (qmi); ar_snoc->qmi =NULL ;return 0 ;
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 176/219 ath10k: destroy sdio workqueue while remove sdio module
In reply to Sasha LevinFrom: Wen Gong <[email protected]>
[ Upstream commit 3ed39f8e747a7aafeec07bb244f2c3a1bdca5730 ]
The workqueue need to flush and destory while remove sdio module, otherwise it will have thread which is not destory after remove sdio modules.
Tested with QCA6174 SDIO with firmware
WLAN.RMH.4.4.1-00007-QCARMSWP-1.
--- drivers/net/wireless/ath/ath10k/sdio.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath10k/sdio.c +3 -0
@@ -2081,6 +2081,9 @@ static void ath10k_sdio_remove(struct sdio_func *func)cancel_work_sync (&ar_sdio->wr_async_work);ath10k_core_unregister (ar);ath10k_core_destroy (ar); + +flush_workqueue (ar_sdio->workqueue); +destroy_workqueue (ar_sdio->workqueue); }static const struct sdio_device_id ath10k_sdio_devices[] = {
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 177/219 net: mvpp2: prs: Don't override the sign bit in SRAM parser shift
In reply to Sasha LevinFrom: Maxime Chevallier <[email protected]>
[ Upstream commit 8ec3ede559956f8ad58db7b57d25ac724bab69e9 ]
The Header Parser allows identifying various fields in the packet headers, used for various kind of filtering and classification steps.
This is a re-entrant process, where the offset in the packet header depends on the previous lookup results. This offset is represented in the SRAM results of the TCAM, as a shift to be operated.
This shift can be negative in some cases, such as in IPv6 parsing.
This commit prevents overriding the sign bit when setting the shift value, which could cause instabilities when parsing IPv6 flows.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c +2 -1
@@ -312,7 +312,8 @@ static void mvpp2_prs_sram_shift_set(struct mvpp2_prs_entry *pe, int shift, }/* Set value */ - pe->sram[MVPP2_BIT_TO_WORD (MVPP2_PRS_SRAM_SHIFT_OFFS )] = shift &MVPP2_PRS_SRAM_SHIFT_MASK ; + pe->sram[MVPP2_BIT_TO_WORD (MVPP2_PRS_SRAM_SHIFT_OFFS )] |= + shift &MVPP2_PRS_SRAM_SHIFT_MASK ;/* Reset and set operation */ mvpp2_prs_sram_bits_clear(pe, MVPP2_PRS_SRAM_OP_SEL_SHIFT_OFFS,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 178/219 igb: clear out skb->tstamp after reading the txtime
In reply to Sasha LevinFrom: Vedang Patel <[email protected]>
[ Upstream commit 1e08511d5d01884a3c9070afd52a47799312074a ]
If a packet which is utilizing the launchtime feature (via SO_TXTIME socket option) also requests the hardware transmit timestamp, the hardware timestamp is not delivered to the userspace. This is because the value in skb->tstamp is mistaken as the software timestamp.
Applications, like ptp4l, request a hardware timestamp by setting the SOF_TIMESTAMPING_TX_HARDWARE socket option. Whenever a new timestamp is detected by the driver (this work is done in igb_ptp_tx_work() which calls igb_ptp_tx_hwtstamps() in igb_ptp.c[1]), it will queue the timestamp in the ERR_QUEUE for the userspace to read. When the userspace is ready, it will issue a recvmsg() call to collect this timestamp. The problem is in this recvmsg() call. If the skb->tstamp is not cleared out, it will be interpreted as a software timestamp and the hardware tx timestamp will not be successfully sent to the userspace. Look at skb_is_swtx_tstamp() and the callee function __sock_recv_timestamp() in net/socket.c for more details.
--- drivers/net/ethernet/intel/igb/igb_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/igb/igb_main.c +1 -0
@@ -5687,6 +5687,7 @@ static void igb_tx_ctxtdesc(struct igb_ring *tx_ring,*/ if (tx_ring->launchtime_enable) { ts =ns_to_timespec64 (first->skb->tstamp); + first->skb->tstamp =0 ; context_desc->seqnum_seed =cpu_to_le32 (ts.tv_nsec /32 ); }else { context_desc->seqnum_seed =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 179/219 net: hns3: add Asym Pause support to fix autoneg problem
In reply to Sasha LevinFrom: Yonglong Liu <[email protected]>
[ Upstream commit bc3781edcea017aa1a29abd953b776cdba298ce2 ]
Local device and link partner config auto-negotiation on both, local device config pause frame use as: rx on/tx off, link partner config pause frame use as: rx off/tx on.
We except the result is:
Local device:
Autonegotiate: on RX: on TX: off RX negotiated: on TX negotiated: off
Link partner:
Autonegotiate: on RX: off TX: on RX negotiated: off TX negotiated: on
But actually, the result of Local device and link partner is both:
Autonegotiate: on RX: off TX: off RX negotiated: off TX negotiated: off
The root cause is that the supported flag is has only Pause, reference to the function genphy_config_advert():
static int genphy_config_advert(struct phy_device *phydev)
{
...
linkmode_and(phydev->advertising, phydev->advertising,
phydev->supported);
...
}The pause frame use of link partner is rx off/tx on, so its advertising only set the bit Asym_Pause, and the supported is only set the bit Pause, so the result of linkmode_and(), is rx off/tx off.
This patch adds Asym_Pause to the supported flag to fix it.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1 + drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 7 +++++++ 2 files changed, 8 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -0
@@ -889,6 +889,7 @@ static void hclge_parse_copper_link_mode(struct hclge_dev *hdev,linkmode_set_bit (ETHTOOL_LINK_MODE_Autoneg_BIT, supported);linkmode_set_bit (ETHTOOL_LINK_MODE_TP_BIT , supported);linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, supported); +linkmode_set_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, supported); }static void hclge_parse_link_mode (struct hclge_dev *hdev,u8 speed_ability)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c +7 -0
@@ -215,6 +215,13 @@ int hclge_mac_connect_phy(struct hnae3_handle *handle)linkmode_and (phydev->supported, phydev->supported, mask);linkmode_copy (phydev->advertising, phydev->supported); +/* supported flag is Pause and Asym Pause, but default advertising +* should be rx on, tx on, so need clear Asym Pause in advertising +* flag +*/ +linkmode_clear_bit (ETHTOOL_LINK_MODE_Asym_Pause_BIT, + phydev->advertising); +return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 180/219 ixgbe: Avoid NULL pointer dereference with VF on non-IPsec hw
In reply to Sasha LevinFrom: Dann Frazier <[email protected]>
[ Upstream commit 92924064106e410cdc015f1dbfc0499309f9f5b1 ]
An ipsec structure will not be allocated if the hardware does not support offload. Fixes the following Oops:
[ 191.045452] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 [ 191.054232] Mem abort info: [ 191.057014] ESR = 0x96000004 [ 191.060057] Exception class = DABT (current EL), IL = 32 bits [ 191.065963] SET = 0, FnV = 0 [ 191.069004] EA = 0, S1PTW = 0 [ 191.072132] Data abort info: [ 191.074999] ISV = 0, ISS = 0x00000004 [ 191.078822] CM = 0, WnR = 0 [ 191.081780] user pgtable: 4k pages, 48-bit VAs, pgdp = 0000000043d9e467 [ 191.088382] [0000000000000000] pgd=0000000000000000 [ 191.093252] Internal error: Oops: 96000004 [#1] SMP [ 191.098119] Modules linked in: vhost_net vhost tap vfio_pci vfio_virqfd vfio_iommu_type1 vfio xt_CHECKSUM iptable_mangle ipt_MASQUERADE iptable_nat nf_nat_ipv4 nf_nat xt_conntrack nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 ipt_REJECT nf_reject_ipv4 xt_tcpudp bridge stp llc ebtable_filter devlink ebtables ip6table_filter ip6_tables iptable_filter bpfilter ipmi_ssif nls_iso8859_1 input_leds joydev ipmi_si hns_roce_hw_v2 ipmi_devintf hns_roce ipmi_msghandler cppc_cpufreq sch_fq_codel ib_iser rdma_cm iw_cm ib_cm ib_core iscsi_tcp libiscsi_tcp libiscsi scsi_transport_iscsi ip_tables x_tables autofs4 ses enclosure btrfs zstd_compress raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor hid_generic usbhid hid raid6_pq libcrc32c raid1 raid0 multipath linear ixgbevf hibmc_drm ttm [ 191.168607] drm_kms_helper aes_ce_blk aes_ce_cipher syscopyarea crct10dif_ce sysfillrect ghash_ce qla2xxx sysimgblt sha2_ce sha256_arm64 hisi_sas_v3_hw fb_sys_fops sha1_ce uas nvme_fc mpt3sas ixgbe drm hisi_sas_main nvme_fabrics usb_storage hclge scsi_transport_fc ahci libsas hnae3 raid_class libahci xfrm_algo scsi_transport_sas mdio aes_neon_bs aes_neon_blk crypto_simd cryptd aes_arm64 [ 191.202952] CPU: 94 PID: 0 Comm: swapper/94 Not tainted 4.19.0-rc1+ #11 [ 191.209553] Hardware name: Huawei D06 /D06, BIOS Hisilicon D06 UEFI RC0 - V1.20.01 04/26/2019 [ 191.218064] pstate: 20400089 (nzCv daIf +PAN -UAO) [ 191.222873] pc : ixgbe_ipsec_vf_clear+0x60/0xd0 [ixgbe] [ 191.228093] lr : ixgbe_msg_task+0x2d0/0x1088 [ixgbe] [ 191.233044] sp : ffff000009b3bcd0 [ 191.236346] x29: ffff000009b3bcd0 x28: 0000000000000000 [ 191.241647] x27: ffff000009628000 x26: 0000000000000000 [ 191.246946] x25: ffff803f652d7600 x24: 0000000000000004 [ 191.252246] x23: ffff803f6a718900 x22: 0000000000000000 [ 191.257546] x21: 0000000000000000 x20: 0000000000000000 [ 191.262845] x19: 0000000000000000 x18: 0000000000000000 [ 191.268144] x17: 0000000000000000 x16: 0000000000000000 [ 191.273443] x15: 0000000000000000 x14: 0000000100000026 [ 191.278742] x13: 0000000100000025 x12: ffff8a5f7fbe0df0 [ 191.284042] x11: 000000010000000b x10: 0000000000000040 [ 191.289341] x9 : 0000000000001100 x8 : ffff803f6a824fd8 [ 191.294640] x7 : ffff803f6a825098 x6 : 0000000000000001 [ 191.299939] x5 : ffff000000f0ffc0 x4 : 0000000000000000 [ 191.305238] x3 : ffff000028c00000 x2 : ffff803f652d7600 [ 191.310538] x1 : 0000000000000000 x0 : ffff000000f205f0 [ 191.315838] Process swapper/94 (pid: 0, stack limit = 0x00000000addfed5a) [ 191.322613] Call trace: [ 191.325055] ixgbe_ipsec_vf_clear+0x60/0xd0 [ixgbe] [ 191.329927] ixgbe_msg_task+0x2d0/0x1088 [ixgbe] [ 191.334536] ixgbe_msix_other+0x274/0x330 [ixgbe] [ 191.339233] __handle_irq_event_percpu+0x78/0x270 [ 191.343924] handle_irq_event_percpu+0x40/0x98 [ 191.348355] handle_irq_event+0x50/0xa8 [ 191.352180] handle_fasteoi_irq+0xbc/0x148 [ 191.356263] generic_handle_irq+0x34/0x50 [ 191.360259] __handle_domain_irq+0x68/0xc0 [ 191.364343] gic_handle_irq+0x84/0x180 [ 191.368079] el1_irq+0xe8/0x180 [ 191.371208] arch_cpu_idle+0x30/0x1a8 [ 191.374860] do_idle+0x1dc/0x2a0 [ 191.378077] cpu_startup_entry+0x2c/0x30 [ 191.381988] secondary_start_kernel+0x150/0x1e0 [ 191.386506] Code: 6b15003f 54000320 f1404a9f 54000060 (79400260)
--- drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c +3 -0
@@ -842,6 +842,9 @@ void ixgbe_ipsec_vf_clear(struct ixgbe_adapter *adapter, u32 vf)struct ixgbe_ipsec *ipsec = adapter->ipsec;int i; +if (!ipsec) +return ; +/* search rx sa table */ for (i =0 ; i <IXGBE_IPSEC_MAX_SA_COUNT && ipsec->num_rx_sa; i++) {if (!ipsec->rx_tbl[i].used)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 181/219 iwlwifi: mvm: Drop large non sta frames
In reply to Sasha LevinFrom: Andrei Otcheretianski <[email protected]>
[ Upstream commit ac70499ee97231a418dc1a4d6c9dc102e8f64631 ]
In some buggy scenarios we could possible attempt to transmit frames larger than maximum MSDU size. Since our devices don't know how to handle this, it may result in asserts, hangs etc.
This can happen, for example, when we receive a large multicast frame and try to transmit it back to the air in AP mode.
Since in a legal scenario this should never happen, drop such frames and warn about it.
--- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +3 -0
@@ -726,6 +726,9 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)memcpy (&info, skb->cb,sizeof (info)); +if (WARN_ON_ONCE (skb->len >IEEE80211_MAX_DATA_LEN + hdrlen)) +return -1 ; +if (WARN_ON_ONCE (info.flags &IEEE80211_TX_CTL_AMPDU ))return -1 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 182/219 bpf: fix uapi bpf_prog_info fields alignment
In reply to Sasha LevinFrom: Baruch Siach <[email protected]>
[ Upstream commit 0472301a28f6cf53a6bc5783e48a2d0bbff4682f ]
Merge commit 1c8c5a9d38f60 ("Mergegit://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next") undid the fix from commit 36f9814a494 ("bpf: fix uapi hole for 32 bit compat applications") by taking the gpl_compatible 1-bit field definition from commit b85fab0e67b162 ("bpf: Add gpl_compatible flag to struct bpf_prog_info") as is. That breaks architectures with 16-bit alignment like m68k. Add 31-bit pad after gpl_compatible to restore alignment of following fields.
Thanks to Dmitry V. Levin his analysis of this bug history.
--- include/uapi/linux/bpf.h | 1 + tools/include/uapi/linux/bpf.h | 1 + 2 files changed, 2 insertions(+)
include/uapi/linux/bpf.h +1 -0
@@ -2871,6 +2871,7 @@ struct bpf_prog_info {char name[BPF_OBJ_NAME_LEN ];__u32 ifindex; __u32 gpl_compatible:1; + __u32 :31 ;/* alignment pad */ __u64 netns_dev;__u64 netns_ino;__u32 nr_jited_ksyms;
tools/include/uapi/linux/bpf.h +1 -0
@@ -2869,6 +2869,7 @@ struct bpf_prog_info {char name[BPF_OBJ_NAME_LEN ];__u32 ifindex; __u32 gpl_compatible:1; + __u32 :31 ;/* alignment pad */ __u64 netns_dev;__u64 netns_ino;__u32 nr_jited_ksyms;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 183/219 netfilter: Fix remainder of pseudo-header protocol 0
In reply to Sasha LevinFrom: He Zhe <[email protected]>
[ Upstream commit 5d1549847c76b1ffcf8e388ef4d0f229bdd1d7e8 ]
Since v5.1-rc1, some types of packets do not get unreachable reply with the following iptables setting. Fox example,
$ iptables -A INPUT -p icmp --icmp-type 8 -j REJECT $ ping 127.0.0.1 -c 1 PING 127.0.0.1 (127.0.0.1) 56(84) bytes of data. — 127.0.0.1 ping statistics — 1 packets transmitted, 0 received, 100% packet loss, time 0ms
We should have got the following reply from command line, but we did not. From 127.0.0.1 icmp_seq=1 Destination Port Unreachable
Yi Zhao reported it and narrowed it down to:7fc38225363d ("netfilter: reject: skip csum verification for protocols that don't support it"),
This is because nf_ip_checksum still expects pseudo-header protocol type 0 for packets that are of neither TCP or UDP, and thus ICMP packets are mistakenly treated as TCP/UDP.
This patch corrects the conditions in nf_ip_checksum and all other places that still call it with protocol 0.
--- net/netfilter/nf_conntrack_proto_icmp.c | 2 +- net/netfilter/nf_nat_proto.c | 2 +- net/netfilter/utils.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-)
net/netfilter/nf_conntrack_proto_icmp.c +1 -1
@@ -221,7 +221,7 @@ int nf_conntrack_icmpv4_error(struct nf_conn *tmpl,/* See ip_conntrack_proto_tcp.c */ if (state->net->ct.sysctl_checksum && state->hook ==NF_INET_PRE_ROUTING && -nf_ip_checksum (skb, state->hook, dataoff,0 )) { +nf_ip_checksum (skb, state->hook, dataoff,IPPROTO_ICMP )) {icmp_error_log (skb, state,"bad hw icmp checksum" );return -NF_ACCEPT ; }
net/netfilter/nf_nat_proto.c +1 -1
@@ -567,7 +567,7 @@ int nf_nat_icmp_reply_translation(struct sk_buff *skb,if (!skb_make_writable (skb, hdrlen +sizeof (*inside)))return 0 ; -if (nf_ip_checksum (skb, hooknum, hdrlen,0 )) +if (nf_ip_checksum (skb, hooknum, hdrlen,IPPROTO_ICMP ))return 0 ; inside = (void *)skb->data + hdrlen;
net/netfilter/utils.c +3 -2
@@ -17,7 +17,8 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,case CHECKSUM_COMPLETE :if (hook !=NF_INET_PRE_ROUTING && hook !=NF_INET_LOCAL_IN )break ; -if ((protocol ==0 && !csum_fold (skb->csum)) || +if ((protocol !=IPPROTO_TCP && protocol !=IPPROTO_UDP && + !csum_fold (skb->csum)) || !csum_tcpudp_magic (iph->saddr, iph->daddr, skb->len - dataoff, protocol, skb->csum)) {
@@ -26,7 +27,7 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook, }/* fall through */ case CHECKSUM_NONE : -if (protocol ==0 ) +if (protocol !=IPPROTO_TCP && protocol !=IPPROTO_UDP ) skb->csum =0 ;else skb->csum = csum_tcpudp_nofold(iph->saddr, iph->daddr,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 184/219 iwlwifi: dbg: fix debug monitor stop and restart delays
In reply to Sasha LevinFrom: Shahar S Matityahu <[email protected]>
[ Upstream commit fc838c775f35e272e5cc7ef43853f0b55babbe37 ]
The driver should delay only in recording stop flow between writing to DBGC_IN_SAMPLE register and DBGC_OUT_CTRL register. Any other delay is not needed.
Change the following:
1. Remove any unnecessary delays in the flow
2. Increase the delay in the stop recording flow since 100 micro is not enough
3. Use usleep_range instead of delay since the driver is allowed to sleep in this flow.
--- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 2 -- drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +0 -2
@@ -2146,8 +2146,6 @@ void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt)/* start recording again if the firmware is not crashed */ if (!test_bit (STATUS_FW_ERROR , &fwrt->trans->status) && fwrt->fw->dbg.dest_tlv) { -/* wait before we collect the data till the DBGC stop */ -udelay (500 );iwl_fw_dbg_restart_recording (fwrt, ¶ms); } }
drivers/net/wireless/intel/iwlwifi/fw/dbg.h +4 -2
@@ -297,7 +297,10 @@ _iwl_fw_dbg_stop_recording(struct iwl_trans *trans, }iwl_write_umac_prph (trans,DBGC_IN_SAMPLE ,0 ); -udelay (100 ); +/* wait for the DBGC to finish writing the internal buffer to DRAM to +* avoid halting the HW while writing +*/ +usleep_range (700 ,1000 );iwl_write_umac_prph (trans,DBGC_OUT_CTRL ,0 );#ifdef CONFIG_IWLWIFI_DEBUGFS trans->dbg_rec_on = false;
@@ -327,7 +330,6 @@ _iwl_fw_dbg_restart_recording(struct iwl_trans *trans,iwl_set_bits_prph (trans,MON_BUFF_SAMPLE_CTL ,0x1 ); }else {iwl_write_umac_prph (trans,DBGC_IN_SAMPLE , params->in_sample); -udelay (100 );iwl_write_umac_prph (trans,DBGC_OUT_CTRL , params->out_ctrl); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 185/219 bnxt_en: Disable bus master during PCI shutdown and driver unload.
In reply to Sasha LevinFrom: Michael Chan <[email protected]>
[ Upstream commit c20dc142dd7b2884b8570eeab323bcd4a84294fa ]
Some chips with older firmware can continue to perform DMA read from context memory even after the memory has been freed. In the PCI shutdown method, we need to call pci_disable_device() to shutdown DMA to prevent this DMA before we put the device into D3hot. DMA memory request in D3hot state will generate PCI fatal error. Similarly, in the driver remove method, the context memory should only be freed after DMA has been shutdown for correctness.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -1
@@ -10165,10 +10165,10 @@ static void bnxt_remove_one(struct pci_dev *pdev)bnxt_dcb_free (bp);kfree (bp->edev); bp->edev =NULL ; +bnxt_cleanup_pci (bp);bnxt_free_ctx_mem (bp);kfree (bp->ctx); bp->ctx =NULL ; -bnxt_cleanup_pci (bp);bnxt_free_port_stats (bp);free_netdev (dev); }
@@ -10730,6 +10730,7 @@ static void bnxt_shutdown(struct pci_dev *pdev)if (system_state ==SYSTEM_POWER_OFF ) {bnxt_clear_int_mode (bp); +pci_disable_device (pdev);pci_wake_from_d3 (pdev, bp->wol);pci_set_power_state (pdev, PCI_D3hot); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 186/219 bnxt_en: Fix statistics context reservation logic for RDMA driver.
In reply to Sasha LevinFrom: Michael Chan <[email protected]>
[ Upstream commit d77b1ad8e87dc5a6cd0d9158b097a4817946ca3b ]
The current logic assumes that the RDMA driver uses one statistics context adjacent to the ones used by the network driver. This assumption is not true and the statistics context used by the RDMA driver is tied to its MSIX base vector. This wrong assumption can cause RDMA driver failure after changing ethtool rings on the network side. Fix the statistics reservation logic accordingly.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +11 -6
@@ -5481,7 +5481,16 @@ static int bnxt_cp_rings_in_use(struct bnxt *bp)static int bnxt_get_func_stat_ctxs (struct bnxt *bp) { -return bp->cp_nr_rings +bnxt_get_ulp_stat_ctxs (bp); +int ulp_stat =bnxt_get_ulp_stat_ctxs (bp); +int cp = bp->cp_nr_rings; + +if (!ulp_stat) +return cp; + +if (bnxt_nq_rings_in_use (bp) > cp +bnxt_get_ulp_msix_num (bp)) +return bnxt_get_ulp_msix_base (bp) + ulp_stat; + +return cp + ulp_stat; }static bool bnxt_need_reserve_rings (struct bnxt *bp)
@@ -7373,11 +7382,7 @@ unsigned int bnxt_get_avail_cp_rings_for_en(struct bnxt *bp)unsigned int bnxt_get_avail_stat_ctxs_for_en (struct bnxt *bp) { -unsigned int stat; - - stat =bnxt_get_max_func_stat_ctxs (bp) -bnxt_get_ulp_stat_ctxs (bp); - stat -= bp->cp_nr_rings; -return stat; +return bnxt_get_max_func_stat_ctxs (bp) -bnxt_get_func_stat_ctxs (bp); }int bnxt_get_avail_msix (struct bnxt *bp,int num)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 187/219 ALSA: hda: Fix a headphone detection issue when using SOF
In reply to Sasha LevinFrom: Rander Wang <[email protected]>
[ Upstream commit 7c2b3629d09ddec810dc4c1d3a6657c32def8f71 ]
To save power, the hda hdmi driver in ASoC invokes snd_hdac_ext_bus_link_put to disable CORB/RIRB buffers DMA if there is no user of bus and invokes snd_hdac_ext_bus_link_get to set up CORB/RIRB buffers when it is used. Unsolicited responses is disabled in snd_hdac_bus_stop_cmd_io called by snd_hdac_ext_bus_link_put , but it is not enabled in snd_hdac_bus_init_cmd_io called by snd_hdac_ext_bus_link_get. So for put-get sequence, Unsolicited responses is disabled and headphone can't be detected by hda codecs.
Now unsolicited responses is only enabled in snd_hdac_bus_reset_link which resets controller. The function is only called for setup of controller. This patch enables Unsolicited responses after RIRB is initialized in snd_hdac_bus_init_cmd_io which works together with snd_hdac_bus_reset_link to set up controller.
Tested legacy hda driver and SOF driver on intel whiskeylake.
--- sound/hda/hdac_controller.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
sound/hda/hdac_controller.c +2 -3
@@ -78,6 +78,8 @@ void snd_hdac_bus_init_cmd_io(struct hdac_bus *bus)snd_hdac_chip_writew (bus,RINTCNT ,1 );/* enable rirb dma and response irq */ snd_hdac_chip_writeb (bus,RIRBCTL ,AZX_RBCTL_DMA_EN |AZX_RBCTL_IRQ_EN ); +/* Accept unsolicited responses */ +snd_hdac_chip_updatel (bus,GCTL ,AZX_GCTL_UNSOL ,AZX_GCTL_UNSOL );spin_unlock_irq (&bus->reg_lock); }EXPORT_SYMBOL_GPL (snd_hdac_bus_init_cmd_io);
@@ -414,9 +416,6 @@ int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset)return -EBUSY ; } -/* Accept unsolicited responses */ -snd_hdac_chip_updatel (bus,GCTL ,AZX_GCTL_UNSOL ,AZX_GCTL_UNSOL ); -/* detect codecs */ if (!bus->codec_mask) { bus->codec_mask =snd_hdac_chip_readw (bus,STATESTS );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 188/219 perf stat: Make metric event lookup more robust
In reply to Sasha LevinFrom: Andi Kleen <[email protected]>
[ Upstream commit 145c407c808352acd625be793396fd4f33c794f8 ]
After setting up metric groups through the event parser, the metricgroup code looks them up again in the event list.
Make sure we only look up events that haven't been used by some other metric. The data structures currently cannot handle more than one metric per event. This avoids problems with multiple events partially overlapping.
--- tools/perf/util/stat-shadow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/util/stat-shadow.c +3 -2
@@ -303,7 +303,7 @@ static struct perf_evsel *perf_stat__find_event(struct perf_evlist *evsel_list,struct perf_evsel *c2; evlist__for_each_entry (evsel_list, c2) { -if (!strcasecmp (c2->name, name)) +if (!strcasecmp (c2->name, name) && !c2->collect_stat)return c2; }return NULL ;
@@ -342,7 +342,8 @@ void perf_stat__collect_metric_expr(struct perf_evlist *evsel_list)if (leader) {/* Search in group */ for_each_group_member (oc, leader) { -if (!strcasecmp (oc->name, metric_names[i])) { +if (!strcasecmp (oc->name, metric_names[i]) && + !oc->collect_stat) { found = true;break ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 189/219 perf stat: Fix metrics with --no-merge
In reply to Sasha LevinFrom: Andi Kleen <[email protected]>
[ Upstream commit e3a9427323a53ceee540276a74af7706f350d052 ]
Since Fixes: 8c5421c016a4 ("perf pmu: Display pmu name when printing unmerged events in stat") using --no-merge adds the PMU name to the evsel name.
This breaks the metric value lookup because the parser doesn't know about this.
Remove the extra postfixes for the metric evaluation.
--- tools/perf/util/stat-shadow.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
tools/perf/util/stat-shadow.c +17 -1
@@ -723,6 +723,7 @@ static void generic_metric(struct perf_stat_config *config,double ratio;int i;void *ctxp = out->ctx; +char *n, *pn;expr__ctx_init (&pctx);expr__add_id (&pctx, name, avg);
@@ -742,7 +743,19 @@ static void generic_metric(struct perf_stat_config *config, stats = &v->stats; scale =1.0 ; } -expr__add_id (&pctx, metric_events[i]->name,avg_stats (stats)*scale); + + n =strdup (metric_events[i]->name); +if (!n) +return ; +/* +* This display code with --no-merge adds [cpu] postfixes. +* These are not supported by the parser. Remove everything +* after the space. +*/ + pn =strchr (n,' ' ); +if (pn) + *pn =0 ; +expr__add_id (&pctx, n,avg_stats (stats)*scale); }if (!metric_events[i]) {const char *p = metric_expr;
@@ -759,6 +772,9 @@ static void generic_metric(struct perf_stat_config *config, (metric_name ? metric_name : name) : "", 0); }else print_metric (config, ctxp,NULL ,NULL ,"" ,0 ); + +for (i =1 ; i < pctx.num_ids; i++) +free ((void *)pctx.ids[i].name); } void perf_stat__print_shadow_stats(struct perf_stat_config *config,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 190/219 perf stat: Don't merge events in the same PMU
In reply to Sasha LevinFrom: Andi Kleen <[email protected]>
[ Upstream commit 6c5f4e5cb35b4694dc035d91092d23f596ecd06a ]
Event merging is mainly to collapse similar events in lots of different duplicated PMUs.
It can break metric displaying. It's possible for two metrics to have the same event, and when the two events happen in a row the second wouldn't be displayed. This would also not show the second metric.
To avoid this don't merge events in the same PMU. This makes sense, if we have multiple events in the same PMU there is likely some reason for it (e.g. using multiple groups) and we better not merge them.
While in theory it would be possible to construct metrics that have events with the same name in different PMU no current metrics have this problem.
This is the fix for perf stat -M UPI,IPC (needs also another bug fix to completely work)
--- tools/perf/util/stat-display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/util/stat-display.c +2 -1
@@ -539,7 +539,8 @@ static void collect_all_aliases(struct perf_stat_config *config, struct perf_evs alias->scale != counter->scale || alias->cgrp != counter->cgrp ||strcmp (alias->unit, counter->unit) || - perf_evsel__is_clock(alias) != perf_evsel__is_clock(counter)) +perf_evsel__is_clock (alias) !=perf_evsel__is_clock (counter) || + !strcmp(alias->pmu_name, counter->pmu_name)) break; alias->merged_stat = true;cb (config, alias, data, false);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 191/219 perf stat: Fix group lookup for metric group
In reply to Sasha LevinFrom: Andi Kleen <[email protected]>
[ Upstream commit 2f87f33f4226523df9c9cc28f9874ea02fcc3d3f ]
The metric group code tries to find a group it added earlier in the evlist. Fix the lookup to handle groups with partially overlaps correctly. When a sub string match fails and we reset the match, we have to compare the first element again.
I also renamed the find_evsel function to find_evsel_group to make its purpose clearer.
With the earlier changes this fixes:
Before:
% perf stat -M UPI,IPC sleep 1
...
1,032,922 uops_retired.retire_slots # 1.1 UPI
1,896,096 inst_retired.any
1,896,096 inst_retired.any
1,177,254 cpu_clk_unhalted.threadAfter:
% perf stat -M UPI,IPC sleep 1
...
1,013,193 uops_retired.retire_slots # 1.1 UPI
932,033 inst_retired.any
932,033 inst_retired.any # 0.9 IPC
1,091,245 cpu_clk_unhalted.thread--- tools/perf/util/metricgroup.c | 47 ++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 12 deletions(-)
tools/perf/util/metricgroup.c +35 -12
@@ -94,26 +94,49 @@ struct egroup {const char *metric_expr; }; -static struct perf_evsel *find_evsel (struct perf_evlist *perf_evlist, -const char **ids, -int idnum, -struct perf_evsel **metric_events) +static bool record_evsel (int *ind,struct perf_evsel **start, +int idnum, +struct perf_evsel **metric_events, +struct perf_evsel *ev) +{ + metric_events[*ind] = ev; +if (*ind ==0 ) + *start = ev; +if (++*ind == idnum) { + metric_events[*ind] =NULL ; +return true; + } +return false; +} + +static struct perf_evsel *find_evsel_group (struct perf_evlist *perf_evlist, +const char **ids, +int idnum, +struct perf_evsel **metric_events) {struct perf_evsel *ev, *start =NULL ;int ind =0 ; evlist__for_each_entry (perf_evlist, ev) { +if (ev->collect_stat) +continue ;if (!strcmp (ev->name, ids[ind])) { - metric_events[ind] = ev; -if (ind ==0 ) - start = ev; -if (++ind == idnum) { - metric_events[ind] =NULL ; +if (record_evsel (&ind, &start, idnum, + metric_events, ev))return start; - } }else { +/* +* We saw some other event that is not +* in our list of events. Discard +* the whole match and start again. +*/ ind =0 ; start =NULL ; +if (!strcmp (ev->name, ids[ind])) { +if (record_evsel (&ind, &start, idnum, + metric_events, ev)) +return start; + } } }/*
@@ -143,8 +166,8 @@ static int metricgroup__setup_events(struct list_head *groups, ret = -ENOMEM ;break ; } - evsel =find_evsel (perf_evlist, eg->ids, eg->idnum, - metric_events); + evsel =find_evsel_group (perf_evlist, eg->ids, eg->idnum, + metric_events);if (!evsel) {pr_debug ("Cannot resolve %s: %s\n" , eg->metric_name, eg->metric_expr);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 192/219 vxlan: do not destroy fdb if register_netdevice() is failed
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit 7c31e54aeee517d1318dfc0bde9fa7de75893dc6 ]
__vxlan_dev_create() destroys FDB using specific pointer which indicates a fdb when error occurs.
But that pointer should not be used when register_netdevice() fails because register_netdevice() internally destroys fdb when error occurs.
This patch makes vxlan_fdb_create() to do not link fdb entry to vxlan dev internally.
Instead, a new function vxlan_fdb_insert() is added to link fdb to vxlan dev.
vxlan_fdb_insert() is called after calling register_netdevice(). This routine can avoid situation that ->ndo_uninit() destroys fdb entry in error path of register_netdevice().
Hence, error path of __vxlan_dev_create() routine can have an opportunity to destroy default fdb entry by hand.
Test command
ip link add bonding_masters type vxlan id 0 group 239.1.1.1 \ dev enp0s9 dstport 4789
Splat looks like:
[ 213.392816] kasan: GPF could be caused by NULL-ptr deref or user memory access [ 213.401257] general protection fault: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI [ 213.402178] CPU: 0 PID: 1414 Comm: ip Not tainted 5.2.0-rc5+ #256 [ 213.402178] RIP: 0010:vxlan_fdb_destroy+0x120/0x220 [vxlan] [ 213.402178] Code: df 48 8b 2b 48 89 fa 48 c1 ea 03 80 3c 02 00 0f 85 06 01 00 00 4c 8b 63 08 48 b8 00 00 00 00 00 fc d [ 213.402178] RSP: 0018:ffff88810cb9f0a0 EFLAGS: 00010202 [ 213.402178] RAX: dffffc0000000000 RBX: ffff888101d4a8c8 RCX: 0000000000000000 [ 213.402178] RDX: 1bd5a00000000040 RSI: ffff888101d4a8c8 RDI: ffff888101d4a8d0 [ 213.402178] RBP: 0000000000000000 R08: fffffbfff22b72d9 R09: 0000000000000000 [ 213.402178] R10: 00000000ffffffef R11: 0000000000000000 R12: dead000000000200 [ 213.402178] R13: ffff88810cb9f1f8 R14: ffff88810efccda0 R15: ffff88810efccda0 [ 213.402178] FS: 00007f7f6621a0c0(0000) GS:ffff88811b000000(0000) knlGS:0000000000000000 [ 213.402178] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 213.402178] CR2: 000055746f0807d0 CR3: 00000001123e0000 CR4: 00000000001006f0 [ 213.402178] Call Trace: [ 213.402178] __vxlan_dev_create+0x3a9/0x7d0 [vxlan] [ 213.402178] ? vxlan_changelink+0x740/0x740 [vxlan] [ 213.402178] ? rcu_read_unlock+0x60/0x60 [vxlan] [ 213.402178] ? __kasan_kmalloc.constprop.3+0xa0/0xd0 [ 213.402178] vxlan_newlink+0x8d/0xc0 [vxlan] [ 213.402178] ? __vxlan_dev_create+0x7d0/0x7d0 [vxlan] [ 213.554119] ? __netlink_ns_capable+0xc3/0xf0 [ 213.554119] __rtnl_newlink+0xb75/0x1180 [ 213.554119] ? rtnl_link_unregister+0x230/0x230
[ ... ]
--- drivers/net/vxlan.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-)
drivers/net/vxlan.c +27 -10
@@ -806,6 +806,14 @@ static struct vxlan_fdb *vxlan_fdb_alloc(struct vxlan_dev *vxlan,return f; } +static void vxlan_fdb_insert (struct vxlan_dev *vxlan,const u8 *mac, +__be32 src_vni,struct vxlan_fdb *f) +{ + ++vxlan->addrcnt; +hlist_add_head_rcu (&f->hlist, +vxlan_fdb_head (vxlan, mac, src_vni)); +} + static int vxlan_fdb_create(struct vxlan_dev *vxlan, const u8 *mac, union vxlan_addr *ip, __u16 state, __be16 port, __be32 src_vni,
@@ -831,18 +839,13 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan,return rc; } - ++vxlan->addrcnt; -hlist_add_head_rcu (&f->hlist, -vxlan_fdb_head (vxlan, mac, src_vni)); - *fdb = f;return 0 ; } -static void vxlan_fdb_free (struct rcu_head *head) +static void __vxlan_fdb_free (struct vxlan_fdb *f) { - struct vxlan_fdb *f = container_of(head, struct vxlan_fdb, rcu);struct vxlan_rdst *rd, *nd;list_for_each_entry_safe (rd, nd, &f->remotes, list) {
@@ -852,6 +855,13 @@ static void vxlan_fdb_free(struct rcu_head *head)kfree (f); } +static void vxlan_fdb_free (struct rcu_head *head) +{ + struct vxlan_fdb *f = container_of(head, struct vxlan_fdb, rcu); + +__vxlan_fdb_free (f); +} +static void vxlan_fdb_destroy (struct vxlan_dev *vxlan,struct vxlan_fdb *f,bool do_notify,bool swdev_notify) {
@@ -979,6 +989,7 @@ static int vxlan_fdb_update_create(struct vxlan_dev *vxlan,if (rc <0 )return rc; +vxlan_fdb_insert (vxlan, mac, src_vni, f); rc =vxlan_fdb_notify (vxlan, f,first_remote_rtnl (f),RTM_NEWNEIGH , swdev_notify, extack);if (rc)
@@ -3573,12 +3584,17 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev,if (err) goto errout; -/* notify default fdb entry */ if (f) { +vxlan_fdb_insert (vxlan, all_zeros_mac, + vxlan->default_dst.remote_vni, f); + +/* notify default fdb entry */ err =vxlan_fdb_notify (vxlan, f,first_remote_rtnl (f),RTM_NEWNEIGH , true, extack); -if (err) - goto errout; +if (err) { +vxlan_fdb_destroy (vxlan, f, false, false); + goto unregister; + } }list_add (&vxlan->next, &vn->vxlan_list);
@@ -3590,7 +3606,8 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev,* destroy the entry by hand here. */ if (f) -vxlan_fdb_destroy (vxlan, f, false, false); +__vxlan_fdb_free (f); +unregister:if (unregister)unregister_netdevice (dev);return err;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 193/219 bnx2x: Prevent ptp_task to be rescheduled indefinitely
In reply to Sasha LevinFrom: "Guilherme G. Piccoli" <[email protected]>
[ Upstream commit 3c91f25c2f72ba6001775a5932857c1d2131c531 ]
Currently bnx2x ptp worker tries to read a register with timestamp information in case of TX packet timestamping and in case it fails, the routine reschedules itself indefinitely. This was reported as a kworker always at 100% of CPU usage, which was narrowed down to be bnx2x ptp_task.
By following the ioctl handler, we could narrow down the problem to an NTP tool (chrony) requesting HW timestamping from bnx2x NIC with RX filter zeroed; this isn't reproducible for example with ptp4l (from linuxptp) since this tool requests a supported RX filter. It seems NIC FW timestamp mechanism cannot work well with RX_FILTER_NONE - driver's PTP filter init routine skips a register write to the adapter if there's not a supported filter request.
This patch addresses the problem of bnx2x ptp thread's everlasting reschedule by retrying the register read 10 times; between the read attempts the thread sleeps for an increasing amount of time starting in 1ms to give FW some time to perform the timestamping. If it still fails after all retries, we bail out in order to prevent an unbound resource consumption from bnx2x.
The patch also adds an ethtool statistic for accounting the skipped TX timestamp packets and it reduces the priority of timestamping error messages to prevent log flooding. The code was tested using both linuxptp and chrony.
--- .../net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 5 ++- .../ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 4 ++- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 33 ++++++++++++++----- .../net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 3 ++ 4 files changed, 34 insertions(+), 11 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +4 -1
@@ -3858,9 +3858,12 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)if (unlikely (skb_shinfo (skb)->tx_flags &SKBTX_HW_TSTAMP )) {if (!(bp->flags &TX_TIMESTAMPING_EN )) { + bp->eth_stats.ptp_skip_tx_ts++;BNX2X_ERR ("Tx timestamping was not enabled, this packet will not be timestamped\n" ); }else if (bp->ptp_tx_skb) { -BNX2X_ERR ("The device supports only a single outstanding packet to timestamp, this packet will not be timestamped\n" ); + bp->eth_stats.ptp_skip_tx_ts++; +netdev_err_once (bp->dev, +"Device supports only a single outstanding packet to timestamp, this packet won't be timestamped\n" ); }else {skb_shinfo (skb)->tx_flags |=SKBTX_IN_PROGRESS ;/* schedule check for Tx timestamp */
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +3 -1
@@ -182,7 +182,9 @@ static const struct { {STATS_OFFSET32 (driver_filtered_tx_pkt), 4, false, "driver_filtered_tx_pkt" }, { STATS_OFFSET32(eee_tx_lpi), - 4, true, "Tx LPI entry count"} + 4, true, "Tx LPI entry count"}, + { STATS_OFFSET32(ptp_skip_tx_ts), + 4, false, "ptp_skipped_tx_tstamp" }, };#define BNX2X_NUM_STATS ARRAY_SIZE(bnx2x_stats_arr)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +24 -9
@@ -15243,11 +15243,24 @@ static void bnx2x_ptp_task(struct work_struct *work)u32 val_seq;u64 timestamp, ns;struct skb_shared_hwtstamps shhwtstamps; +bool bail = true; +int i; + +/* FW may take a while to complete timestamping; try a bit and if it's +* still not complete, may indicate an error state - bail out then. +*/ +for (i =0 ; i <10 ; i++) { +/* Read Tx timestamp registers */ + val_seq =REG_RD (bp, port ?NIG_REG_P1_TLLH_PTP_BUF_SEQID : +NIG_REG_P0_TLLH_PTP_BUF_SEQID ); +if (val_seq &0x10000 ) { + bail = false; +break ; + } +msleep (1 << i); + } -/* Read Tx timestamp registers */ - val_seq =REG_RD (bp, port ?NIG_REG_P1_TLLH_PTP_BUF_SEQID : -NIG_REG_P0_TLLH_PTP_BUF_SEQID ); -if (val_seq &0x10000 ) { +if (!bail) {/* There is a valid timestamp value */ timestamp =REG_RD (bp, port ?NIG_REG_P1_TLLH_PTP_BUF_TS_MSB :NIG_REG_P0_TLLH_PTP_BUF_TS_MSB );
@@ -15262,16 +15275,18 @@ static void bnx2x_ptp_task(struct work_struct *work)memset (&shhwtstamps,0 ,sizeof (shhwtstamps)); shhwtstamps.hwtstamp =ns_to_ktime (ns);skb_tstamp_tx (bp->ptp_tx_skb, &shhwtstamps); -dev_kfree_skb_any (bp->ptp_tx_skb); - bp->ptp_tx_skb =NULL ;DP (BNX2X_MSG_PTP ,"Tx timestamp, timestamp cycles = %llu, ns = %llu\n" , timestamp, ns); }else { -DP (BNX2X_MSG_PTP ,"There is no valid Tx timestamp yet\n" ); -/* Reschedule to keep checking for a valid timestamp value */ -schedule_work (&bp->ptp_task); +DP (BNX2X_MSG_PTP , +"Tx timestamp is not recorded (register read=%u)\n" , + val_seq); + bp->eth_stats.ptp_skip_tx_ts++; } + +dev_kfree_skb_any (bp->ptp_tx_skb); + bp->ptp_tx_skb =NULL ; }void bnx2x_set_rx_ts (struct bnx2x *bp,struct sk_buff *skb)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h +3 -0
@@ -207,6 +207,9 @@ struct bnx2x_eth_stats {u32 driver_filtered_tx_pkt;/* src: Clear-on-Read register; Will not survive PMF Migration */ u32 eee_tx_lpi; + +/* PTP */ +u32 ptp_skip_tx_ts; };struct bnx2x_eth_q_stats {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 194/219 net: usb: asix: init MAC address buffers
In reply to Sasha LevinFrom: Phong Tran <[email protected]>
[ Upstream commit 78226f6eaac80bf30256a33a4926c194ceefdf36 ]
This is for fixing bug KMSAN: uninit-value in ax88772_bind
Tested by
https://groups.google.com/d/msg/syzkaller-bugs/aFQurGotng4/eB_HlNhhCwAJ
syzbot found the following crash on:
HEAD commit: f75e4cfe kmsan: use kmsan_handle_urb() in urb.c git tree: kmsan console output: https://syzkaller.appspot.com/x/log.txt?x=136d720ea00000
kernel config:
https://syzkaller.appspot.com/x/.config?x=602468164ccdc30a
dashboard link:
https://syzkaller.appspot.com/bug?extid=8a3fc6674bbc3978ed4e
compiler: clang version 9.0.0 (/home/glider/llvm/clang06d00afa61eef8f7f501ebdb4e8612ea43ec2d78)
syz repro:
https://syzkaller.appspot.com/x/repro.syz?x=12788316a00000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=120359aaa00000
==================================================================
BUG: KMSAN: uninit-value in is_valid_ether_addr include/linux/etherdevice.h:200 [inline] BUG: KMSAN: uninit-value in asix_set_netdev_dev_addr drivers/net/usb/asix_devices.c:73 [inline] BUG: KMSAN: uninit-value in ax88772_bind+0x93d/0x11e0 drivers/net/usb/asix_devices.c:724 CPU: 0 PID: 3348 Comm: kworker/0:2 Not tainted 5.1.0+ #1 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: usb_hub_wq hub_event Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x191/0x1f0 lib/dump_stack.c:113 kmsan_report+0x130/0x2a0 mm/kmsan/kmsan.c:622 __msan_warning+0x75/0xe0 mm/kmsan/kmsan_instr.c:310 is_valid_ether_addr include/linux/etherdevice.h:200 [inline] asix_set_netdev_dev_addr drivers/net/usb/asix_devices.c:73 [inline] ax88772_bind+0x93d/0x11e0 drivers/net/usb/asix_devices.c:724 usbnet_probe+0x10f5/0x3940 drivers/net/usb/usbnet.c:1728 usb_probe_interface+0xd66/0x1320 drivers/usb/core/driver.c:361 really_probe+0xdae/0x1d80 drivers/base/dd.c:513 driver_probe_device+0x1b3/0x4f0 drivers/base/dd.c:671 __device_attach_driver+0x5b8/0x790 drivers/base/dd.c:778 bus_for_each_drv+0x28e/0x3b0 drivers/base/bus.c:454 __device_attach+0x454/0x730 drivers/base/dd.c:844 device_initial_probe+0x4a/0x60 drivers/base/dd.c:891 bus_probe_device+0x137/0x390 drivers/base/bus.c:514 device_add+0x288d/0x30e0 drivers/base/core.c:2106 usb_set_configuration+0x30dc/0x3750 drivers/usb/core/message.c:2027 generic_probe+0xe7/0x280 drivers/usb/core/generic.c:210 usb_probe_device+0x14c/0x200 drivers/usb/core/driver.c:266 really_probe+0xdae/0x1d80 drivers/base/dd.c:513 driver_probe_device+0x1b3/0x4f0 drivers/base/dd.c:671 __device_attach_driver+0x5b8/0x790 drivers/base/dd.c:778 bus_for_each_drv+0x28e/0x3b0 drivers/base/bus.c:454 __device_attach+0x454/0x730 drivers/base/dd.c:844 device_initial_probe+0x4a/0x60 drivers/base/dd.c:891 bus_probe_device+0x137/0x390 drivers/base/bus.c:514 device_add+0x288d/0x30e0 drivers/base/core.c:2106 usb_new_device+0x23e5/0x2ff0 drivers/usb/core/hub.c:2534 hub_port_connect drivers/usb/core/hub.c:5089 [inline] hub_port_connect_change drivers/usb/core/hub.c:5204 [inline] port_event drivers/usb/core/hub.c:5350 [inline] hub_event+0x48d1/0x7290 drivers/usb/core/hub.c:5432 process_one_work+0x1572/0x1f00 kernel/workqueue.c:2269 process_scheduled_works kernel/workqueue.c:2331 [inline] worker_thread+0x189c/0x2460 kernel/workqueue.c:2417 kthread+0x4b5/0x4f0 kernel/kthread.c:254 ret_from_fork+0x35/0x40 arch/x86/entry/entry_64.S:355
--- drivers/net/usb/asix_devices.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/usb/asix_devices.c +3 -3
@@ -238,7 +238,7 @@ static void asix_phy_reset(struct usbnet *dev, unsigned int reset_bits)static int ax88172_bind (struct usbnet *dev,struct usb_interface *intf) {int ret =0 ; -u8 buf[ETH_ALEN ]; +u8 buf[ETH_ALEN ] = {0 };int i;unsigned long gpio_bits = dev->driver_info->data;
@@ -689,7 +689,7 @@ static int asix_resume(struct usb_interface *intf)static int ax88772_bind (struct usbnet *dev,struct usb_interface *intf) {int ret, i; -u8 buf[ETH_ALEN ], chipcode =0 ; +u8 buf[ETH_ALEN ] = {0 }, chipcode =0 ;u32 phyid;struct asix_common_private *priv;
@@ -1073,7 +1073,7 @@ static const struct net_device_ops ax88178_netdev_ops = {static int ax88178_bind (struct usbnet *dev,struct usb_interface *intf) {int ret; -u8 buf[ETH_ALEN ]; +u8 buf[ETH_ALEN ] = {0 };usbnet_get_endpoints (dev,intf);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 195/219 rxrpc: Fix oops in tracepoint
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit 99f0eae653b2db64917d0b58099eb51e300b311d ]
If the rxrpc_eproto tracepoint is enabled, an oops will be cause by the trace line that rxrpc_extract_header() tries to emit when a protocol error occurs (typically because the packet is short) because the call argument is NULL.
Fix this by using ?: to assume 0 as the debug_id if call is NULL.
This can then be induced by:
echo -e '\0\0\0\0\0\0\0\0' | ncat -4u --send-only <addr> 20001
where addr has the following program running on it:
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <linux/rxrpc.h>
int main(void)
{
struct sockaddr_rxrpc srx;
int fd;
memset(&srx, 0, sizeof(srx));
srx.srx_family = AF_RXRPC;
srx.srx_service = 0;
srx.transport_type = AF_INET;
srx.transport_len = sizeof(srx.transport.sin);
srx.transport.sin.sin_family = AF_INET;
srx.transport.sin.sin_port = htons(0x4e21);
fd = socket(AF_RXRPC, SOCK_DGRAM, AF_INET6);
bind(fd, (struct sockaddr *)&srx, sizeof(srx));
sleep(20);
return 0;
}It results in the following oops.
BUG: kernel NULL pointer dereference, address: 0000000000000340 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page ... RIP: 0010:trace_event_raw_event_rxrpc_rx_eproto+0x47/0xac ... Call Trace: <IRQ> rxrpc_extract_header+0x86/0x171 ? rcu_read_lock_sched_held+0x5d/0x63 ? rxrpc_new_skb+0xd4/0x109 rxrpc_input_packet+0xef/0x14fc ? rxrpc_input_data+0x986/0x986 udp_queue_rcv_one_skb+0xbf/0x3d0 udp_unicast_rcv_skb.isra.8+0x64/0x71 ip_protocol_deliver_rcu+0xe4/0x1b4 ip_local_deliver+0xf0/0x154 __netif_receive_skb_one_core+0x50/0x6c netif_receive_skb_internal+0x26b/0x2e9 napi_gro_receive+0xf8/0x1da rtl8169_poll+0x303/0x4c4 net_rx_action+0x10e/0x333 __do_softirq+0x1a5/0x38f irq_exit+0x54/0xc4 do_IRQ+0xda/0xf8 common_interrupt+0xf/0xf </IRQ> ... ? cpuidle_enter_state+0x23c/0x34d cpuidle_enter+0x2a/0x36 do_idle+0x163/0x1ea cpu_startup_entry+0x1d/0x1f start_secondary+0x157/0x172 secondary_startup_64+0xa4/0xb0
--- include/trace/events/rxrpc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/trace/events/rxrpc.h +1 -1
@@ -1383,7 +1383,7 @@ TRACE_EVENT(rxrpc_rx_eproto, ), TP_fast_assign( - __entry->call = call->debug_id; + __entry->call = call ? call->debug_id : 0; __entry->serial = serial; __entry->why = why; ),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 196/219 libbpf: fix GCC8 warning for strncpy
In reply to Sasha LevinFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit cdfc7f888c2a355b01308e97c6df108f1c2b64e8 ]
GCC8 started emitting warning about using strncpy with number of bytes exactly equal destination size, which is generally unsafe, as can lead to non-zero terminated string being copied. Use IFNAMSIZ - 1 as number of bytes to ensure name is always zero-terminated.
--- tools/lib/bpf/xsk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/lib/bpf/xsk.c +2 -1
@@ -336,7 +336,8 @@ static int xsk_get_max_queues(struct xsk_socket *xsk) channels.cmd =ETHTOOL_GCHANNELS ; ifr.ifr_data = (void *)&channels; -strncpy (ifr.ifr_name, xsk->ifname,IFNAMSIZ ); +strncpy (ifr.ifr_name, xsk->ifname,IFNAMSIZ -1 ); + ifr.ifr_name[IFNAMSIZ -1 ] ='\0' ; err =ioctl (fd,SIOCETHTOOL , &ifr);if (err && errno !=EOPNOTSUPP ) { ret = -errno;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 197/219 bpf, libbpf, smatch: Fix potential NULL pointer dereference
In reply to Sasha LevinFrom: Leo Yan <[email protected]>
[ Upstream commit 33bae185f74d49a0d7b1bfaafb8e959efce0f243 ]
Based on the following report from Smatch, fix the potential NULL pointer dereference check:
tools/lib/bpf/libbpf.c:3493
bpf_prog_load_xattr() warn: variable dereferenced before check 'attr' (see line 3483)
3479 int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr,
3480 struct bpf_object **pobj, int *prog_fd)
3481 {
3482 struct bpf_object_open_attr open_attr = {
3483 .file = attr->file,
3484 .prog_type = attr->prog_type,
^^^^^^3485 };
At the head of function, it directly access 'attr' without checking if it's NULL pointer. This patch moves the values assignment after validating 'attr' and 'attr->file'.
--- tools/lib/bpf/libbpf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/lib/bpf/libbpf.c +4 -4
@@ -2897,10 +2897,7 @@ int bpf_prog_load(const char *file, enum bpf_prog_type type,int bpf_prog_load_xattr (const struct bpf_prog_load_attr *attr,struct bpf_object **pobj,int *prog_fd) { -struct bpf_object_open_attr open_attr = { - .file = attr->file, - .prog_type = attr->prog_type, - }; +struct bpf_object_open_attr open_attr = {};struct bpf_program *prog, *first_prog =NULL ;enum bpf_attach_type expected_attach_type;enum bpf_prog_type prog_type;
@@ -2913,6 +2910,9 @@ int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr,if (!attr->file)return -EINVAL ; + open_attr.file = attr->file; + open_attr.prog_type = attr->prog_type; + obj =bpf_object__open_xattr (&open_attr);if (IS_ERR_OR_NULL (obj))return -ENOENT ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 198/219 selftests: bpf: fix inlines in test_lwt_seg6local
In reply to Sasha LevinFrom: Jiri Benc <[email protected]>
[ Upstream commit 11aca65ec4db09527d3e9b6b41a0615b7da4386b ]
Selftests are reporting this failure in test_lwt_seg6local.sh:
+ ip netns exec ns2 ip -6 route add fb00::6 encap bpf in obj test_lwt_seg6local.o sec encap_srh dev veth2 Error fetching program/map!
Failed to parse eBPF program: Operation not permitted
The problem is __attribute__((always_inline)) alone is not enough to prevent clang from inserting those functions in .text. In that case, .text is not marked as relocateable.
See the output of objdump -h test_lwt_seg6local.o:
Idx Name Size VMA LMA File off Algn 0 .text 00003530 0000000000000000 0000000000000000 00000040 2**3
CONTENTS, ALLOC, LOAD, READONLY, CODE
This causes the iproute bpf loader to fail in bpf_fetch_prog_sec:bpf_has_call_data returns true but bpf_fetch_prog_relo fails as there's no relocateable .text section in the file.
To fix this, convert to 'static __always_inline'.
v2: Use 'static __always_inline' instead of 'static inline
__attribute__((always_inline))'
--- .../testing/selftests/bpf/progs/test_lwt_seg6local.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/testing/selftests/bpf/progs/test_lwt_seg6local.c +6 -6
@@ -61,7 +61,7 @@ struct sr6_tlv_t {unsigned char value[0 ]; }BPF_PACKET_HEADER ; -__attribute__((always_inline))struct ip6_srh_t *get_srh (struct __sk_buff *skb) +static __always_inline struct ip6_srh_t *get_srh(struct __sk_buff *skb) {void *cursor, *data_end;struct ip6_srh_t *srh;
@@ -95,7 +95,7 @@ __attribute__((always_inline)) struct ip6_srh_t *get_srh(struct __sk_buff *skb)return srh; } -__attribute__((always_inline)) +static __always_inline int update_tlv_pad(struct __sk_buff *skb, uint32_t new_pad,uint32_t old_pad,uint32_t pad_off) {
@@ -125,7 +125,7 @@ int update_tlv_pad(struct __sk_buff *skb, uint32_t new_pad,return 0 ; } -__attribute__((always_inline)) +static __always_inline int is_valid_tlv_boundary(struct __sk_buff *skb, struct ip6_srh_t *srh,uint32_t *tlv_off,uint32_t *pad_size,uint32_t *pad_off)
@@ -184,7 +184,7 @@ int is_valid_tlv_boundary(struct __sk_buff *skb, struct ip6_srh_t *srh,return 0 ; } -__attribute__((always_inline)) +static __always_inline int add_tlv(struct __sk_buff *skb, struct ip6_srh_t *srh, uint32_t tlv_off,struct sr6_tlv_t *itlv,uint8_t tlv_size) {
@@ -228,7 +228,7 @@ int add_tlv(struct __sk_buff *skb, struct ip6_srh_t *srh, uint32_t tlv_off,return update_tlv_pad (skb, new_pad, pad_size, pad_off); } -__attribute__((always_inline)) +static __always_inline int delete_tlv(struct __sk_buff *skb, struct ip6_srh_t *srh,uint32_t tlv_off) {
@@ -266,7 +266,7 @@ int delete_tlv(struct __sk_buff *skb, struct ip6_srh_t *srh,return update_tlv_pad (skb, new_pad, pad_size, pad_off); } -__attribute__((always_inline)) +static __always_inline int has_egr_tlv(struct __sk_buff *skb, struct ip6_srh_t *srh) { int tlv_offset = sizeof(struct ip6_t) + sizeof(struct ip6_srh_t) +
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 199/219 bonding: validate ip header before check IPPROTO_IGMP
In reply to Sasha LevinFrom: Cong Wang <[email protected]>
[ Upstream commit 9d1bc24b52fb8c5d859f9a47084bf1179470e04c ]
bond_xmit_roundrobin() checks for IGMP packets but it parses the IP header even before checking skb->protocol.
We should validate the IP header with pskb_may_pull() before using iph->protocol.
--- drivers/net/bonding/bond_main.c | 37 ++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 14 deletions(-)
drivers/net/bonding/bond_main.c +23 -14
@@ -3866,8 +3866,8 @@ static netdev_tx_t bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev) {struct bonding *bond =netdev_priv (bond_dev); -struct iphdr *iph =ip_hdr (skb);struct slave *slave; +int slave_cnt;u32 slave_id;/* Start with the curr_active_slave that joined the bond as the
@@ -3876,23 +3876,32 @@ static netdev_tx_t bond_xmit_roundrobin(struct sk_buff *skb,* send the join/membership reports. The curr_active_slave found * will send all of this type of traffic. */ -if (iph->protocol ==IPPROTO_IGMP && skb->protocol ==htons (ETH_P_IP )) { - slave =rcu_dereference (bond->curr_active_slave); -if (slave) -bond_dev_queue_xmit (bond, skb, slave->dev); -else -bond_xmit_slave_id (bond, skb,0 ); - }else { -int slave_cnt =READ_ONCE (bond->slave_cnt); +if (skb->protocol ==htons (ETH_P_IP )) { +int noff =skb_network_offset (skb); +struct iphdr *iph; -if (likely (slave_cnt)) { - slave_id =bond_rr_gen_slave_id (bond); -bond_xmit_slave_id (bond, skb, slave_id % slave_cnt); - }else { -bond_tx_drop (bond_dev, skb); +if (unlikely (!pskb_may_pull (skb, noff +sizeof (*iph)))) + goto non_igmp; + + iph =ip_hdr (skb); +if (iph->protocol ==IPPROTO_IGMP ) { + slave =rcu_dereference (bond->curr_active_slave); +if (slave) +bond_dev_queue_xmit (bond, skb, slave->dev); +else +bond_xmit_slave_id (bond, skb,0 ); +return NETDEV_TX_OK ; } } +non_igmp: + slave_cnt =READ_ONCE (bond->slave_cnt); +if (likely (slave_cnt)) { + slave_id =bond_rr_gen_slave_id (bond); +bond_xmit_slave_id (bond, skb, slave_id % slave_cnt); + }else { +bond_tx_drop (bond_dev, skb); + }return NETDEV_TX_OK ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 200/219 gpiolib: Fix references to gpiod_[gs]et_*value_cansleep() variants
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 3285170f28a850638794cdfe712eb6d93e51e706 ]
Commit 372e722ea4dd4ca1 ("gpiolib: use descriptors internally") renamed the functions to use a "gpiod" prefix, and commit 79a9becda8940deb ("gpiolib: export descriptor-based GPIO interface") introduced the "raw" variants, but both changes forgot to update the comments.
Readd a similar reference to gpiod_set_value(), which was accidentally removed by commit 1e77fc82110ac36f ("gpio: Add missing open drain/source handling to gpiod_set_value_cansleep()").
--- drivers/gpio/gpiolib.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpio/gpiolib.c +4 -3
@@ -3012,7 +3012,7 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep,int gpiod_get_raw_value (const struct gpio_desc *desc) {VALIDATE_DESC (desc); -/* Should be using gpio_get_value_cansleep() */ +/* Should be using gpiod_get_raw_value_cansleep() */ WARN_ON (desc->gdev->chip->can_sleep);return gpiod_get_raw_value_commit (desc); }
@@ -3033,7 +3033,7 @@ int gpiod_get_value(const struct gpio_desc *desc)int value;VALIDATE_DESC (desc); -/* Should be using gpio_get_value_cansleep() */ +/* Should be using gpiod_get_value_cansleep() */ WARN_ON (desc->gdev->chip->can_sleep); value =gpiod_get_raw_value_commit (desc);
@@ -3304,7 +3304,7 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep,void gpiod_set_raw_value (struct gpio_desc *desc,int value) {VALIDATE_DESC_VOID (desc); -/* Should be using gpiod_set_value_cansleep() */ +/* Should be using gpiod_set_raw_value_cansleep() */ WARN_ON (desc->gdev->chip->can_sleep);gpiod_set_raw_value_commit (desc, value); }
@@ -3345,6 +3345,7 @@ static void gpiod_set_value_nocheck(struct gpio_desc *desc, int value)void gpiod_set_value (struct gpio_desc *desc,int value) {VALIDATE_DESC_VOID (desc); +/* Should be using gpiod_set_value_cansleep() */ WARN_ON (desc->gdev->chip->can_sleep);gpiod_set_value_nocheck (desc, value); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 201/219 ASoC: audio-graph-card: fix use-after-free in graph_for_each_link
In reply to Sasha LevinFrom: Wen Yang <[email protected]>
[ Upstream commit 1bcc1fd64e4dd903f4d868a9e053986e3b102713 ]
After calling of_node_put() on the codec_ep and codec_port variables, they are still being used, which may result in use-after-free. We fix this issue by calling of_node_put() after the last usage.
--- sound/soc/generic/audio-graph-card.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/generic/audio-graph-card.c +3 -3
@@ -460,9 +460,6 @@ static int graph_for_each_link(struct graph_priv *priv, codec_ep =of_graph_get_remote_endpoint (cpu_ep); codec_port =of_get_parent (codec_ep); -of_node_put (codec_ep); -of_node_put (codec_port); -/* get convert-xxx property */ memset (&adata,0 ,sizeof (adata));graph_get_conversion (dev, codec_ep, &adata);
@@ -482,6 +479,9 @@ static int graph_for_each_link(struct graph_priv *priv,else ret =func_noml (priv, cpu_ep, codec_ep, li); +of_node_put (codec_ep); +of_node_put (codec_port); +if (ret <0 )return ret;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 202/219 tools: bpftool: Fix json dump crash on powerpc
In reply to Sasha LevinFrom: Jiri Olsa <[email protected]>
[ Upstream commit aa52bcbe0e72fac36b1862db08b9c09c4caefae3 ]
Michael reported crash with by bpf program in json mode on powerpc:
# bpftool prog -p dump jited id 14
[{
"name": "0xd00000000a9aa760",
"insns": [{
"pc": "0x0",
"operation": "nop",
"operands": [null
]
},{
"pc": "0x4",
"operation": "nop",
"operands": [null
]
},{
"pc": "0x8",
"operation": "mflr",
Segmentation fault (core dumped)The code is assuming char pointers in format, which is not always true at least for powerpc. Fixing this by dumping the whole string into buffer based on its format.
Please note that libopcodes code does not check return values from fprintf callback, but as per Jakub suggestion returning -1 on allocation failure so we do the best effort to propagate the error.
--- tools/bpf/bpftool/jit_disasm.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
tools/bpf/bpftool/jit_disasm.c +7 -4
@@ -11,6 +11,8 @@* Licensed under the GNU General Public License, version 2.0 (GPLv2) */ +#define _GNU_SOURCE +#include <stdio.h> #include <stdarg.h> #include <stdint.h> #include <stdio.h>
@@ -44,11 +46,13 @@ static int fprintf_json(void *out, const char *fmt, ...)char *s;va_start (ap, fmt); +if (vasprintf (&s, fmt, ap) <0 ) +return -1 ; +va_end (ap); +if (!oper_count) {int i; - s = va_arg(ap, char *); -/* Strip trailing spaces */ i =strlen (s) -1 ;while (s[i] ==' ' )
@@ -61,11 +65,10 @@ static int fprintf_json(void *out, const char *fmt, ...) }else if (!strcmp (fmt,"," )) {/* Skip */ }else { - s = va_arg(ap, char *);jsonw_string (json_wtr, s); oper_count++; } -va_end (ap); +free (s);return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 203/219 net: hns3: enable broadcast promisc mode when initializing VF
In reply to Sasha LevinFrom: Jian Shen <[email protected]>
[ Upstream commit 2d5066fc175ea77a733d84df9ef414b34f311641 ]
For revision 0x20, the broadcast promisc is enabled by firmware, it's unnecessary to enable it when initializing VF.
For revision 0x21, it's necessary to enable broadcast promisc mode when initializing or re-initializing VF, otherwise, it will be unable to send and receive promisc packets.
--- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +11 -3
@@ -2425,6 +2425,12 @@ static int hclgevf_reset_hdev(struct hclgevf_dev *hdev)return ret; } +if (pdev->revision >=0x21 ) { + ret =hclgevf_set_promisc_mode (hdev, true); +if (ret) +return ret; + } +dev_info (&hdev->pdev->dev,"Reset done\n" );return 0 ;
@@ -2504,9 +2510,11 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev)* firmware makes sure broadcast packets can be accepted. * For revision 0x21, default to enable broadcast promisc mode. */ - ret =hclgevf_set_promisc_mode (hdev, true); -if (ret) - goto err_config; +if (pdev->revision >=0x21 ) { + ret =hclgevf_set_promisc_mode (hdev, true); +if (ret) + goto err_config; + }/* Initialize RSS for this VF */ ret =hclgevf_rss_init_hw (hdev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 204/219 Bluetooth: hci_bcsp: Fix memory leak in rx_skb
In reply to Sasha LevinFrom: Tomas Bortoli <[email protected]>
[ Upstream commit 4ce9146e0370fcd573f0372d9b4e5a211112567c ]
Syzkaller found that it is possible to provoke a memory leak by never freeing rx_skb in struct bcsp_struct.
Fix by freeing in bcsp_close()
--- drivers/bluetooth/hci_bcsp.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/bluetooth/hci_bcsp.c +5 -0
@@ -759,6 +759,11 @@ static int bcsp_close(struct hci_uart *hu)skb_queue_purge (&bcsp->rel);skb_queue_purge (&bcsp->unrel); +if (bcsp->rx_skb) { +kfree_skb (bcsp->rx_skb); + bcsp->rx_skb =NULL ; + } +kfree (bcsp);return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 205/219 Bluetooth: Add new 13d3:3491 QCA_ROME device
In reply to Sasha LevinFrom: João Paulo Rechi Vita <[email protected]>
[ Upstream commit 44d34af2e4cfd0c5357182f8b43f3e0a1fe30a2e ]
Without the QCA ROME setup routine this adapter fails to establish a SCO connection.
T: Bus=01 Lev=01 Prnt=01 Port=08 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3491 Rev=00.01 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#=0x0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#=0x1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -279,6 +279,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x04ca, 0x3015), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x04ca, 0x3016), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x04ca, 0x301a), .driver_info = BTUSB_QCA_ROME }, + { USB_DEVICE(0x13d3, 0x3491), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x13d3, 0x3496), .driver_info = BTUSB_QCA_ROME },/* Broadcom BCM2035 */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 206/219 Bluetooth: Add new 13d3:3501 QCA_ROME device
In reply to Sasha LevinFrom: João Paulo Rechi Vita <[email protected]>
[ Upstream commit 881cec4f6b4da78e54b73c046a60f39315964c7d ]
Without the QCA ROME setup routine this adapter fails to establish a SCO connection.
T: Bus=01 Lev=01 Prnt=01 Port=04 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3501 Rev=00.01 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#=0x0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#=0x1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -281,6 +281,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x04ca, 0x301a), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x13d3, 0x3491), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x13d3, 0x3496), .driver_info = BTUSB_QCA_ROME }, + { USB_DEVICE(0x13d3, 0x3501), .driver_info = BTUSB_QCA_ROME }, /* Broadcom BCM2035 */ { USB_DEVICE(0x0a5c, 0x2009), .driver_info = BTUSB_BCM92035 },
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 207/219 Bluetooth: 6lowpan: search for destination address in all peers
In reply to Sasha LevinFrom: Josua Mayer <[email protected]>
[ Upstream commit b188b03270b7f8568fc714101ce82fbf5e811c5a ]
Handle overlooked case where the target address is assigned to a peer and neither route nor gateway exist.
For one peer, no checks are performed to see if it is meant to receive packets for a given address.
As soon as there is a second peer however, checks are performed to deal with routes and gateways for handling complex setups with multiple hops to a target address.
This logic assumed that no route and no gateway imply that the destination address can not be reached, which is false in case of a direct peer.
--- net/bluetooth/6lowpan.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/bluetooth/6lowpan.c +10 -4
@@ -187,10 +187,16 @@ static inline struct lowpan_peer *peer_lookup_dst(struct lowpan_btle_dev *dev, }if (!rt) { - nexthop = &lowpan_cb (skb)->gw; - -if (ipv6_addr_any (nexthop)) -return NULL ; +if (ipv6_addr_any (&lowpan_cb (skb)->gw)) { +/* There is neither route nor gateway, +* probably the destination is a direct peer. +*/ + nexthop = daddr; + }else { +/* There is a known gateway +*/ + nexthop = &lowpan_cb (skb)->gw; + } }else { nexthop =rt6_nexthop (rt, daddr);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 208/219 genirq: Update irq stats from NMI handlers
In reply to Sasha LevinFrom: Shijith Thotton <[email protected]>
[ Upstream commit c09cb1293523dd786ae54a12fd88001542cba2f6 ]
The NMI handlers handle_percpu_devid_fasteoi_nmi() and handle_fasteoi_nmi() do not update the interrupt counts. Due to that the NMI interrupt count does not show up correctly in /proc/interrupts.
Add the statistics and treat the NMI handlers in the same way as per cpu interrupts and prevent them from updating irq_desc::tot_count as this might be corrupted due to concurrency.
[ tglx: Massaged changelog ]
--- kernel/irq/chip.c | 4 ++++ kernel/irq/irqdesc.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
kernel/irq/chip.c +4 -0
@@ -748,6 +748,8 @@ void handle_fasteoi_nmi(struct irq_desc *desc)unsigned int irq =irq_desc_get_irq (desc);irqreturn_t res; +__kstat_incr_irqs_this_cpu (desc); +trace_irq_handler_entry (irq, action);/* * NMIs cannot be shared, there is only one action.
@@ -962,6 +964,8 @@ void handle_percpu_devid_fasteoi_nmi(struct irq_desc *desc)unsigned int irq =irq_desc_get_irq (desc);irqreturn_t res; +__kstat_incr_irqs_this_cpu (desc); +trace_irq_handler_entry (irq, action); res = action->handler (irq,raw_cpu_ptr (action->percpu_dev_id));trace_irq_handler_exit (irq, action, res);
kernel/irq/irqdesc.c +7 -1
@@ -945,6 +945,11 @@ unsigned int kstat_irqs_cpu(unsigned int irq, int cpu) *per_cpu_ptr(desc->kstat_irqs, cpu) : 0; } +static bool irq_is_nmi (struct irq_desc *desc) +{ +return desc->istate &IRQS_NMI ; +} +/** * kstat_irqs - Get the statistics for an interrupt * @irq: The interrupt number
@@ -962,7 +967,8 @@ unsigned int kstat_irqs(unsigned int irq)if (!desc || !desc->kstat_irqs)return 0 ;if (!irq_settings_is_per_cpu_devid (desc) && - !irq_settings_is_per_cpu (desc)) + !irq_settings_is_per_cpu (desc) && + !irq_is_nmi (desc))return desc->tot_count;for_each_possible_cpu (cpu)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 209/219 perf tests: Fix record+probe_libc_inet_pton.sh for powerpc64
In reply to Sasha LevinFrom: Seeteena Thoufeek <[email protected]>
[ Upstream commit bff5a556c149804de29347a88a884d25e4e4e3a2 ]
'probe libc's inet_pton & backtrace it with ping' testcase sometimes fails on powerpc because distro ping binary does not have symbol information and thus it prints "[unknown]" function name in the backtrace.
Accept "[unknown]" as valid function name for powerpc as well.
# perf test -v "probe libc's inet_pton & backtrace it with ping"
Before:
59: probe libc's inet_pton & backtrace it with ping :
--- start ---
test child forked, pid 79695
ping 79718 [077] 96483.787025: probe_libc:inet_pton: (7fff83a754c8) 7fff83a754c8 __GI___inet_pton+0x8 (/usr/lib64/power9/libc-2.28.so) 7fff83a2b7a0 gaih_inet.constprop.7+0x1020 (/usr/lib64/power9/libc-2.28.so)
7fff83a2c170 getaddrinfo+0x160 (/usr/lib64/power9/libc-2.28.so) 1171830f4 [unknown] (/usr/bin/ping)
FAIL: expected backtrace entry ".*\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$"
got "1171830f4 [unknown] (/usr/bin/ping)"
test child finished with -1
---- end ----
probe libc's inet_pton & backtrace it with ping: FAILED!
After:
59: probe libc's inet_pton & backtrace it with ping :
--- start ---
test child forked, pid 79085
ping 79108 [045] 96400.214177: probe_libc:inet_pton: (7fffbb9654c8) 7fffbb9654c8 __GI___inet_pton+0x8 (/usr/lib64/power9/libc-2.28.so) 7fffbb91b7a0 gaih_inet.constprop.7+0x1020 (/usr/lib64/power9/libc-2.28.so)
7fffbb91c170 getaddrinfo+0x160 (/usr/lib64/power9/libc-2.28.so) 132e830f4 [unknown] (/usr/bin/ping)
test child finished with 0
---- end ----
probe libc's inet_pton & backtrace it with ping: Ok
--- tools/perf/tests/shell/record+probe_libc_inet_pton.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/shell/record+probe_libc_inet_pton.sh +1 -1
@@ -44,7 +44,7 @@ trace_libc_inet_pton_backtrace() { eventattr='max-stack=4' echo "gaih_inet.*\+0x[[:xdigit:]]+[[:space:]]\($libc\)$" >> $expected echo "getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc\)$" >> $expected - echo ".*\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$" >> $expected + echo ".*(\+0x[[:xdigit:]]+|\[unknown\])[[:space:]]\(.*/bin/ping.*\)$" >> $expected ;; *) eventattr='max-stack=3'
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 210/219 Bluetooth: Check state in l2cap_disconnect_rsp
In reply to Sasha LevinFrom: Matias Karhumaa <[email protected]>
[ Upstream commit 28261da8a26f4915aa257d12d506c6ba179d961f ]
Because of both sides doing L2CAP disconnection at the same time, it was possible to receive L2CAP Disconnection Response with CID that was already freed. That caused problems if CID was already reused and L2CAP Connection Request with same CID was sent out. Before this patch kernel deleted channel context regardless of the state of the channel.
Example where leftover Disconnection Response (frame #402) causes local device to delete L2CAP channel which was not yet connected. This in turn confuses remote device's stack because same CID is re-used without properly disconnecting.
Btmon capture before patch:
** snip **
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 8 #394 [hci1] 10.748949
Channel: 65 len 4 [PSM 3 mode 0] {chan 2}
RFCOMM: Disconnect (DISC) (0x43)
Address: 0x03 cr 1 dlci 0x00
Control: 0x53 poll/final 1
Length: 0
FCS: 0xfd
< ACL Data TX: Handle 43 flags 0x00 dlen 8 #395 [hci1] 10.749062
Channel: 65 len 4 [PSM 3 mode 0] {chan 2}
RFCOMM: Unnumbered Ack (UA) (0x63)
Address: 0x03 cr 1 dlci 0x00
Control: 0x73 poll/final 1
Length: 0
FCS: 0xd7< ACL Data TX: Handle 43 flags 0x00 dlen 12 #396 [hci1] 10.749073
L2CAP: Disconnection Request (0x06) ident 17 len 4
Destination CID: 65
Source CID: 65
Quoted 1 line
HCI Event: Number of Completed Packets (
0x13) plen 5 #397 [hci1] 10.752391
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
HCI Event: Number of Completed Packets (
0x13) plen 5 #398 [hci1] 10.753394
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #399 [hci1] 10.756499
L2CAP: Disconnection Request (0x06) ident 26 len 4
Destination CID: 65
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 12 #400 [hci1] 10.756548
L2CAP: Disconnection Response (0x07) ident 26 len 4
Destination CID: 65
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 12 #401 [hci1] 10.757459
L2CAP: Connection Request (0x02) ident 18 len 4
PSM: 1 (0x0001)
Source CID: 65Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #402 [hci1] 10.759148
L2CAP: Disconnection Response (0x07) ident 17 len 4
Destination CID: 65
Source CID: 65
= bluetoothd: 00:1E:AB:4C:56:54: error updating services: Input/o.. 10.759447
Quoted 1 line
HCI Event: Number of Completed Packets (
0x13) plen 5 #403 [hci1] 10.759386
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #404 [hci1] 10.760397
L2CAP: Connection Request (0x02) ident 27 len 4
PSM: 3 (0x0003)
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 16 #405 [hci1] 10.760441
L2CAP: Connection Response (0x03) ident 27 len 8
Destination CID: 65
Source CID: 65
Result: Connection successful (0x0000)
Status: No further information available (0x0000)< ACL Data TX: Handle 43 flags 0x00 dlen 27 #406 [hci1] 10.760449
L2CAP: Configure Request (0x04) ident 19 len 19
Destination CID: 65
Flags: 0x0000
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 1013
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Basic (0x00)
TX window size: 0
Max transmit: 0
Retransmission timeout: 0
Monitor timeout: 0
Maximum PDU size: 0
Quoted 1 line
HCI Event: Number of Completed Packets (
0x13) plen 5 #407 [hci1] 10.761399
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 16 #408 [hci1] 10.762942
L2CAP: Connection Response (0x03) ident 18 len 8
Destination CID: 66
Source CID: 65
Result: Connection successful (0x0000)
Status: No further information available (0x0000)*snip*
Similar case after the patch:
*snip*
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 8 #22702 [hci0] 1664.411056
Channel: 65 len 4 [PSM 3 mode 0] {chan 3}
RFCOMM: Disconnect (DISC) (0x43)
Address: 0x03 cr 1 dlci 0x00
Control: 0x53 poll/final 1
Length: 0
FCS: 0xfd
< ACL Data TX: Handle 43 flags 0x00 dlen 8 #22703 [hci0] 1664.411136
Channel: 65 len 4 [PSM 3 mode 0] {chan 3}
RFCOMM: Unnumbered Ack (UA) (0x63)
Address: 0x03 cr 1 dlci 0x00
Control: 0x73 poll/final 1
Length: 0
FCS: 0xd7< ACL Data TX: Handle 43 flags 0x00 dlen 12 #22704 [hci0] 1664.411143
L2CAP: Disconnection Request (0x06) ident 11 len 4
Destination CID: 65
Source CID: 65
Quoted 1 line
HCI Event: Number of Completed Pac.. (
0x13) plen 5 #22705 [hci0] 1664.414009
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
HCI Event: Number of Completed Pac.. (
0x13) plen 5 #22706 [hci0] 1664.415007
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #22707 [hci0] 1664.418674
L2CAP: Disconnection Request (0x06) ident 17 len 4
Destination CID: 65
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 12 #22708 [hci0] 1664.418762
L2CAP: Disconnection Response (0x07) ident 17 len 4
Destination CID: 65
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 12 #22709 [hci0] 1664.421073
L2CAP: Connection Request (0x02) ident 12 len 4
PSM: 1 (0x0001)
Source CID: 65Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #22710 [hci0] 1664.421371
L2CAP: Disconnection Response (0x07) ident 11 len 4
Destination CID: 65
Source CID: 65
Quoted 1 line
HCI Event: Number of Completed Pac.. (
0x13) plen 5 #22711 [hci0] 1664.424082
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
HCI Event: Number of Completed Pac.. (
0x13) plen 5 #22712 [hci0] 1664.425040
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #22713 [hci0] 1664.426103
L2CAP: Connection Request (0x02) ident 18 len 4
PSM: 3 (0x0003)
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 16 #22714 [hci0] 1664.426186
L2CAP: Connection Response (0x03) ident 18 len 8
Destination CID: 66
Source CID: 65
Result: Connection successful (0x0000)
Status: No further information available (0x0000)< ACL Data TX: Handle 43 flags 0x00 dlen 27 #22715 [hci0] 1664.426196
L2CAP: Configure Request (0x04) ident 13 len 19
Destination CID: 65
Flags: 0x0000
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 1013
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Basic (0x00)
TX window size: 0
Max transmit: 0
Retransmission timeout: 0
Monitor timeout: 0
Maximum PDU size: 0
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 16 #22716 [hci0] 1664.428804
L2CAP: Connection Response (0x03) ident 12 len 8
Destination CID: 66
Source CID: 65
Result: Connection successful (0x0000)
Status: No further information available (0x0000)*snip*
Fix is to check that channel is in state BT_DISCONN before deleting the channel.
This bug was found while fuzzing Bluez's OBEX implementation using Synopsys Defensics.
--- net/bluetooth/l2cap_core.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/bluetooth/l2cap_core.c +6 -0
@@ -4394,6 +4394,12 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn,l2cap_chan_lock (chan); +if (chan->state !=BT_DISCONN ) { +l2cap_chan_unlock (chan); +mutex_unlock (&conn->chan_lock); +return 0 ; + } +l2cap_chan_hold (chan);l2cap_chan_del (chan,0 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 211/219 Bluetooth: hidp: NUL terminate a string in the compat ioctl
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit dcae9052ebb0c5b2614de620323d615fcbfda7f8 ]
This change is similar to commit a1616a5ac99e ("Bluetooth: hidp: fix buffer overflow") but for the compat ioctl. We take a string from the user and forgot to ensure that it's NUL terminated.
I have also changed the strncpy() in to strscpy() in hidp_setup_hid(). The difference is the strncpy() doesn't necessarily NUL terminate the destination string. Either change would fix the problem but it's nice to take a belt and suspenders approach and do both.
--- net/bluetooth/hidp/core.c | 2 +- net/bluetooth/hidp/sock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
net/bluetooth/hidp/core.c +1 -1
@@ -775,7 +775,7 @@ static int hidp_setup_hid(struct hidp_session *session, hid->version = req->version; hid->country = req->country; -strncpy (hid->name, req->name,sizeof (hid->name)); +strscpy (hid->name, req->name,sizeof (hid->name));snprintf (hid->phys,sizeof (hid->phys),"%pMR" , &l2cap_pi (session->ctrl_sock->sk)->chan->src);
net/bluetooth/hidp/sock.c +1 -0
@@ -192,6 +192,7 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne ca.version = ca32.version; ca.flags = ca32.flags; ca.idle_to = ca32.idle_to; + ca32.name[sizeof (ca32.name) -1 ] ='\0' ;memcpy (ca.name, ca32.name,128 ); csock =sockfd_lookup (ca.ctrl_sock, &err);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 212/219 gtp: add missing gtp_encap_disable_sock() in gtp_encap_enable()
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit e30155fd23c9c141cbe7d99b786e10a83a328837 ]
If an invalid role is sent from user space, gtp_encap_enable() will fail. Then, it should call gtp_encap_disable_sock() but current code doesn't. It makes memory leak.
--- drivers/net/gtp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/gtp.c +6 -1
@@ -847,8 +847,13 @@ static int gtp_encap_enable(struct gtp_dev *gtp, struct nlattr *data[])if (data[IFLA_GTP_ROLE ]) { role =nla_get_u32 (data[IFLA_GTP_ROLE ]); -if (role >GTP_ROLE_SGSN ) +if (role >GTP_ROLE_SGSN ) { +if (sk0) +gtp_encap_disable_sock (sk0); +if (sk1u) +gtp_encap_disable_sock (sk1u);return -EINVAL ; + } } gtp->sk0 = sk0;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 213/219 Bluetooth: validate BLE connection interval updates
In reply to Sasha LevinFrom: csonsino <[email protected]>
[ Upstream commit c49a8682fc5d298d44e8d911f4fa14690ea9485e ]
Problem: The Linux Bluetooth stack yields complete control over the BLE connection interval to the remote device.
The Linux Bluetooth stack provides access to the BLE connection interval min and max values through /sys/kernel/debug/bluetooth/hci0/ conn_min_interval and /sys/kernel/debug/bluetooth/hci0/conn_max_interval. These values are used for initial BLE connections, but the remote device has the ability to request a connection parameter update. In the event that the remote side requests to change the connection interval, the Linux kernel currently only validates that the desired value is within the acceptable range in the Bluetooth specification (6 - 3200, corresponding to 7.5ms - 4000ms). There is currently no validation that the desired value requested by the remote device is within the min/max limits specified in the conn_min_interval/conn_max_interval configurations. This essentially leads to Linux yielding complete control over the connection interval to the remote device.
The proposed patch adds a verification step to the connection parameter update mechanism, ensuring that the desired value is within the min/max bounds of the current connection. If the desired value is outside of the current connection min/max values, then the connection parameter update request is rejected and the negative response is returned to the remote device. Recall that the initial connection is established using the local conn_min_interval/conn_max_interval values, so this allows the Linux administrator to retain control over the BLE connection interval.
The one downside that I see is that the current default Linux values for conn_min_interval and conn_max_interval typically correspond to 30ms and 50ms respectively. If this change were accepted, then it is feasible that some devices would no longer be able to negotiate to their desired connection interval values. This might be remedied by setting the default Linux conn_min_interval and conn_max_interval values to the widest supported range (6 - 3200 / 7.5ms - 4000ms). This could lead to the same behavior as the current implementation, where the remote device could request to change the connection interval value to any value that is permitted by the Bluetooth specification, and Linux would accept the desired value.
--- net/bluetooth/hci_event.c | 5 +++++ net/bluetooth/l2cap_core.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)
net/bluetooth/hci_event.c +5 -0
@@ -5588,6 +5588,11 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev,return send_conn_param_neg_reply (hdev, handle,HCI_ERROR_UNKNOWN_CONN_ID ); +if (min < hcon->le_conn_min_interval || + max > hcon->le_conn_max_interval) +return send_conn_param_neg_reply (hdev, handle, +HCI_ERROR_INVALID_LL_PARAMS ); +if (hci_check_conn_params (min, max, latency, timeout))return send_conn_param_neg_reply (hdev, handle,HCI_ERROR_INVALID_LL_PARAMS );
net/bluetooth/l2cap_core.c +8 -1
@@ -5297,7 +5297,14 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn,memset (&rsp,0 ,sizeof (rsp)); - err =hci_check_conn_params (min, max, latency, to_multiplier); +if (min < hcon->le_conn_min_interval || + max > hcon->le_conn_max_interval) { +BT_DBG ("requested connection interval exceeds current bounds." ); + err = -EINVAL ; + }else { + err =hci_check_conn_params (min, max, latency, to_multiplier); + } +if (err) rsp.result =cpu_to_le16 (L2CAP_CONN_PARAM_REJECTED );else
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 214/219 gtp: fix suspicious RCU usage
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit e198987e7dd7d3645a53875151cd6f8fc425b706 ]
gtp_encap_enable_socket() and gtp_encap_destroy() are not protected by rcu_read_lock(). and it's not safe to write sk->sk_user_data. This patch make these functions to use lock_sock() instead of rcu_dereference_sk_user_data().
Test commands:
gtp-link add gtp1
Splat looks like:
[ 83.238315] =============================
[ 83.239127] WARNING: suspicious RCU usage
[ 83.239702] 5.2.0-rc6+ #49 Not tainted
[ 83.240268] -----------------------------
[ 83.241205] drivers/net/gtp.c:799 suspicious rcu_dereference_check() usage!
[ 83.243828]
[ 83.243828] other info that might help us debug this:
[ 83.243828]
[ 83.246325]
[ 83.246325] rcu_scheduler_active = 2, debug_locks = 1
[ 83.247314] 1 lock held by gtp-link/1008:
[ 83.248523] #0: 0000000017772c7f (rtnl_mutex){+.+.}, at: __rtnl_newlink+0x5f5/0x11b0
[ 83.251503]
[ 83.251503] stack backtrace:
[ 83.252173] CPU: 0 PID: 1008 Comm: gtp-link Not tainted 5.2.0-rc6+ #49
[ 83.253271] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006
[ 83.254562] Call Trace:
[ 83.254995] dump_stack+0x7c/0xbb
[ 83.255567] gtp_encap_enable_socket+0x2df/0x360 [gtp]
[ 83.256415] ? gtp_find_dev+0x1a0/0x1a0 [gtp]
[ 83.257161] ? memset+0x1f/0x40
[ 83.257843] gtp_newlink+0x90/0xa21 [gtp]
[ 83.258497] ? __netlink_ns_capable+0xc3/0xf0
[ 83.259260] __rtnl_newlink+0xb9f/0x11b0
[ 83.260022] ? rtnl_link_unregister+0x230/0x230[ ... ]
--- drivers/net/gtp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/gtp.c +6 -2
@@ -293,12 +293,14 @@ static void gtp_encap_destroy(struct sock *sk) {struct gtp_dev *gtp; - gtp =rcu_dereference_sk_user_data (sk); +lock_sock (sk); + gtp = sk->sk_user_data;if (gtp) {udp_sk (sk)->encap_type =0 ;rcu_assign_sk_user_data (sk,NULL );sock_put (sk); } +release_sock (sk); }static void gtp_encap_disable_sock (struct sock *sk)
@@ -800,7 +802,8 @@ static struct sock *gtp_encap_enable_socket(int fd, int type, goto out_sock; } -if (rcu_dereference_sk_user_data (sock->sk)) { +lock_sock (sock->sk); +if (sock->sk->sk_user_data) { sk =ERR_PTR (-EBUSY ); goto out_sock; }
@@ -816,6 +819,7 @@ static struct sock *gtp_encap_enable_socket(int fd, int type,setup_udp_tunnel_sock (sock_net (sock->sk), sock, &tuncfg); out_sock: +release_sock (sock->sk);sockfd_put (sock);return sk; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 215/219 gtp: fix Illegal context switch in RCU read-side critical section.
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit 3f167e1921865b379a9becf03828e7202c7b4917 ]
ipv4_pdp_add() is called in RCU read-side critical section. So GFP_KERNEL should not be used in the function.
This patch make ipv4_pdp_add() to use GFP_ATOMIC instead of GFP_KERNEL.
Test commands:
gtp-link add gtp1 &
gtp-tunnel add gtp1 v1 100 200 1.1.1.1 2.2.2.2
Splat looks like:
[ 130.618881] =============================
[ 130.626382] WARNING: suspicious RCU usage
[ 130.626994] 5.2.0-rc6+ #50 Not tainted
[ 130.627622] -----------------------------
[ 130.628223] ./include/linux/rcupdate.h:266 Illegal context switch in RCU read-side critical section!
[ 130.629684]
[ 130.629684] other info that might help us debug this:
[ 130.629684]
[ 130.631022]
[ 130.631022] rcu_scheduler_active = 2, debug_locks = 1
[ 130.632136] 4 locks held by gtp-tunnel/1025:
[ 130.632925] #0: 000000002b93c8b7 (cb_lock){++++}, at: genl_rcv+0x15/0x40
[ 130.634159] #1: 00000000f17bc999 (genl_mutex){+.+.}, at: genl_rcv_msg+0xfb/0x130
[ 130.635487] #2: 00000000c644ed8e (rtnl_mutex){+.+.}, at: gtp_genl_new_pdp+0x18c/0x1150 [gtp]
[ 130.636936] #3: 0000000007a1cde7 (rcu_read_lock){....}, at: gtp_genl_new_pdp+0x187/0x1150 [gtp]
[ 130.638348]
[ 130.638348] stack backtrace:
[ 130.639062] CPU: 1 PID: 1025 Comm: gtp-tunnel Not tainted 5.2.0-rc6+ #50
[ 130.641318] Call Trace:
[ 130.641707] dump_stack+0x7c/0xbb
[ 130.642252] ___might_sleep+0x2c0/0x3b0
[ 130.642862] kmem_cache_alloc_trace+0x1cd/0x2b0
[ 130.643591] gtp_genl_new_pdp+0x6c5/0x1150 [gtp]
[ 130.644371] genl_family_rcv_msg+0x63a/0x1030
[ 130.645074] ? mutex_lock_io_nested+0x1090/0x1090
[ 130.645845] ? genl_unregister_family+0x630/0x630
[ 130.646592] ? debug_show_all_locks+0x2d0/0x2d0
[ 130.647293] ? check_flags.part.40+0x440/0x440
[ 130.648099] genl_rcv_msg+0xa3/0x130[ ... ]
--- drivers/net/gtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/gtp.c +1 -1
@@ -958,7 +958,7 @@ static int ipv4_pdp_add(struct gtp_dev *gtp, struct sock *sk, } - pctx =kmalloc (sizeof (struct pdp_ctx ),GFP_KERNEL ); + pctx =kmalloc (sizeof (*pctx),GFP_ATOMIC );if (pctx ==NULL )return -ENOMEM ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 216/219 gtp: fix use-after-free in gtp_encap_destroy()
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit 1788b8569f5de27da09087fa3f6580d2aa04cc75 ]
gtp_encap_destroy() is called twice.
1. When interface is deleted.
2. When udp socket is destroyed.
either gtp->sk0 or gtp->sk1u could be freed by sock_put() in gtp_encap_destroy(). so, when gtp_encap_destroy() is called again, it would uses freed sk pointer.
patch makes gtp_encap_destroy() to set either gtp->sk0 or gtp->sk1u to null. in addition, both gtp->sk0 and gtp->sk1u pointer are protected by rtnl_lock. so, rtnl_lock() is added.
Test command:
gtp-link add gtp1 &
killall gtp-link
ip link del gtp1
Splat looks like:
[ 83.182767] BUG: KASAN: use-after-free in __lock_acquire+0x3a20/0x46a0 [ 83.184128] Read of size 8 at addr ffff8880cc7d5360 by task ip/1008 [ 83.185567] CPU: 1 PID: 1008 Comm: ip Not tainted 5.2.0-rc6+ #50 [ 83.188469] Call Trace: [ ... ] [ 83.200126] lock_acquire+0x141/0x380 [ 83.200575] ? lock_sock_nested+0x3a/0xf0 [ 83.201069] _raw_spin_lock_bh+0x38/0x70 [ 83.201551] ? lock_sock_nested+0x3a/0xf0 [ 83.202044] lock_sock_nested+0x3a/0xf0 [ 83.202520] gtp_encap_destroy+0x18/0xe0 [gtp] [ 83.203065] gtp_encap_disable.isra.14+0x13/0x50 [gtp] [ 83.203687] gtp_dellink+0x56/0x170 [gtp] [ 83.204190] rtnl_delete_link+0xb4/0x100 [ ... ] [ 83.236513] Allocated by task 976: [ 83.236925] save_stack+0x19/0x80 [ 83.237332] __kasan_kmalloc.constprop.3+0xa0/0xd0 [ 83.237894] kmem_cache_alloc+0xd8/0x280 [ 83.238360] sk_prot_alloc.isra.42+0x50/0x200 [ 83.238874] sk_alloc+0x32/0x940 [ 83.239264] inet_create+0x283/0xc20 [ 83.239684] __sock_create+0x2dd/0x540 [ 83.240136] __sys_socket+0xca/0x1a0 [ 83.240550] __x64_sys_socket+0x6f/0xb0 [ 83.240998] do_syscall_64+0x9c/0x450 [ 83.241466] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 83.242061] [ 83.242249] Freed by task 0: [ 83.242616] save_stack+0x19/0x80 [ 83.243013] __kasan_slab_free+0x111/0x150 [ 83.243498] kmem_cache_free+0x89/0x250 [ 83.244444] __sk_destruct+0x38f/0x5a0 [ 83.245366] rcu_core+0x7e9/0x1c20 [ 83.245766] __do_softirq+0x213/0x8fa
--- drivers/net/gtp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/net/gtp.c +15 -2
@@ -289,13 +289,17 @@ static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb)return gtp_rx (pctx, skb, hdrlen, gtp->role); } -static void gtp_encap_destroy (struct sock *sk) +static void __gtp_encap_destroy (struct sock *sk) {struct gtp_dev *gtp;lock_sock (sk); gtp = sk->sk_user_data;if (gtp) { +if (gtp->sk0 == sk) + gtp->sk0 =NULL ; +else + gtp->sk1u =NULL ;udp_sk (sk)->encap_type =0 ;rcu_assign_sk_user_data (sk,NULL );sock_put (sk);
@@ -303,12 +307,19 @@ static void gtp_encap_destroy(struct sock *sk)release_sock (sk); } +static void gtp_encap_destroy (struct sock *sk) +{ +rtnl_lock (); +__gtp_encap_destroy (sk); +rtnl_unlock (); +} +static void gtp_encap_disable_sock (struct sock *sk) {if (!sk)return ; -gtp_encap_destroy (sk); +__gtp_encap_destroy (sk); }static void gtp_encap_disable (struct gtp_dev *gtp)
@@ -1047,6 +1058,7 @@ static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info)return -EINVAL ; } +rtnl_lock ();rcu_read_lock (); gtp =gtp_find_dev (sock_net (skb->sk), info->attrs);
@@ -1071,6 +1083,7 @@ static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info) out_unlock:rcu_read_unlock (); +rtnl_unlock ();return err; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 217/219 gtp: fix use-after-free in gtp_newlink()
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit a2bed90704c68d3763bf24decb1b781a45395de8 ]
Current gtp_newlink() could be called after unregister_pernet_subsys(). gtp_newlink() uses gtp_net but it can be destroyed by unregister_pernet_subsys().
So unregister_pernet_subsys() should be called after rtnl_link_unregister().
Test commands:
#SHELL 1
while :
do
for i in {1..5}
do
./gtp-link add gtp$i &
done
killall gtp-linkdone
#SHELL 2
while :
do
modprobe -rv gtp
done
Splat looks like:
[ 753.176631] BUG: KASAN: use-after-free in gtp_newlink+0x9b4/0xa5c [gtp] [ 753.177722] Read of size 8 at addr ffff8880d48f2458 by task gtp-link/7126 [ 753.179082] CPU: 0 PID: 7126 Comm: gtp-link Tainted: G W 5.2.0-rc6+ #50 [ 753.185801] Call Trace: [ 753.186264] dump_stack+0x7c/0xbb [ 753.186863] ? gtp_newlink+0x9b4/0xa5c [gtp] [ 753.187583] print_address_description+0xc7/0x240 [ 753.188382] ? gtp_newlink+0x9b4/0xa5c [gtp] [ 753.189097] ? gtp_newlink+0x9b4/0xa5c [gtp] [ 753.189846] __kasan_report+0x12a/0x16f [ 753.190542] ? gtp_newlink+0x9b4/0xa5c [gtp] [ 753.191298] kasan_report+0xe/0x20 [ 753.191893] gtp_newlink+0x9b4/0xa5c [gtp] [ 753.192580] ? __netlink_ns_capable+0xc3/0xf0 [ 753.193370] __rtnl_newlink+0xb9f/0x11b0 [ ... ] [ 753.241201] Allocated by task 7186: [ 753.241844] save_stack+0x19/0x80 [ 753.242399] __kasan_kmalloc.constprop.3+0xa0/0xd0 [ 753.243192] __kmalloc+0x13e/0x300 [ 753.243764] ops_init+0xd6/0x350 [ 753.244314] register_pernet_operations+0x249/0x6f0 [ ... ] [ 753.251770] Freed by task 7178: [ 753.252288] save_stack+0x19/0x80 [ 753.252833] __kasan_slab_free+0x111/0x150 [ 753.253962] kfree+0xc7/0x280 [ 753.254509] ops_free_list.part.11+0x1c4/0x2d0 [ 753.255241] unregister_pernet_operations+0x262/0x390 [ ... ] [ 753.285883] list_add corruption. next->prev should be prev (ffff8880d48f2458), but was ffff8880d497d878. (next. [ 753.287241] ------------[ cut here ]------------ [ 753.287794] kernel BUG at lib/list_debug.c:25! [ 753.288364] invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI [ 753.289099] CPU: 0 PID: 7126 Comm: gtp-link Tainted: G B W 5.2.0-rc6+ #50 [ 753.291036] RIP: 0010:__list_add_valid+0x74/0xd0 [ 753.291589] Code: 48 39 da 75 27 48 39 f5 74 36 48 39 dd 74 31 48 83 c4 08 b8 01 00 00 00 5b 5d c3 48 89 d9 48b [ 753.293779] RSP: 0018:ffff8880cae8f398 EFLAGS: 00010286 [ 753.294401] RAX: 0000000000000075 RBX: ffff8880d497d878 RCX: 0000000000000000 [ 753.296260] RDX: 0000000000000075 RSI: 0000000000000008 RDI: ffffed10195d1e69 [ 753.297070] RBP: ffff8880cd250ae0 R08: ffffed101b4bff21 R09: ffffed101b4bff21 [ 753.297899] R10: 0000000000000001 R11: ffffed101b4bff20 R12: ffff8880d497d878 [ 753.298703] R13: 0000000000000000 R14: ffff8880cd250ae0 R15: ffff8880d48f2458 [ 753.299564] FS: 00007f5f79805740(0000) GS:ffff8880da400000(0000) knlGS:0000000000000000 [ 753.300533] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 753.301231] CR2: 00007fe8c7ef4f10 CR3: 00000000b71a6006 CR4: 00000000000606f0 [ 753.302183] Call Trace: [ 753.302530] gtp_newlink+0x5f6/0xa5c [gtp] [ 753.303037] ? __netlink_ns_capable+0xc3/0xf0 [ 753.303576] __rtnl_newlink+0xb9f/0x11b0 [ 753.304092] ? rtnl_link_unregister+0x230/0x230
--- drivers/net/gtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/gtp.c +1 -1
@@ -1385,9 +1385,9 @@ late_initcall(gtp_init); static void __exit gtp_fini(void) { -unregister_pernet_subsys (>p_net_ops);genl_unregister_family (>p_genl_family);rtnl_link_unregister (>p_link_ops); +unregister_pernet_subsys (>p_net_ops);pr_info ("GTP module unloaded\n" ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 218/219 xdp: fix race on generic receive path
In reply to Sasha LevinFrom: Ilya Maximets <[email protected]>
[ Upstream commit bf0bdd1343efbbf65b4d53aef1fce14acbd79d50 ]
Unlike driver mode, generic xdp receive could be triggered by different threads on different CPU cores at the same time leading to the fill and rx queue breakage. For example, this could happen while sending packets from two processes to the first interface of veth pair while the second part of it is open with AF_XDP socket.
Need to take a lock for each generic receive to avoid race.
--- include/net/xdp_sock.h | 2 ++ net/xdp/xsk.c | 31 ++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-)
include/net/xdp_sock.h +2 -0
@@ -67,6 +67,8 @@ struct xdp_sock {* in the SKB destructor callback. */ spinlock_t tx_completion_lock; +/* Protects generic receive. */ +spinlock_t rx_lock;u64 rx_dropped; };
net/xdp/xsk.c +22 -9
@@ -123,13 +123,17 @@ int xsk_generic_rcv(struct xdp_sock *xs, struct xdp_buff *xdp)u64 addr;int err; -if (xs->dev != xdp->rxq->dev || xs->queue_id != xdp->rxq->queue_index) -return -EINVAL ; +spin_lock_bh (&xs->rx_lock); + +if (xs->dev != xdp->rxq->dev || xs->queue_id != xdp->rxq->queue_index) { + err = -EINVAL ; + goto out_unlock; + }if (!xskq_peek_addr (xs->umem->fq, &addr) || len > xs->umem->chunk_size_nohr -XDP_PACKET_HEADROOM ) { - xs->rx_dropped++; -return -ENOSPC ; + err = -ENOSPC ; + goto out_drop; } addr += xs->umem->headroom;
@@ -138,13 +142,21 @@ int xsk_generic_rcv(struct xdp_sock *xs, struct xdp_buff *xdp)memcpy (buffer, xdp->data_meta, len + metalen); addr += metalen; err =xskq_produce_batch_desc (xs->rx, addr, len); -if (!err) { -xskq_discard_addr (xs->umem->fq); -xsk_flush (xs); -return 0 ; - } +if (err) + goto out_drop; + +xskq_discard_addr (xs->umem->fq); +xskq_produce_flush_desc (xs->rx); +spin_unlock_bh (&xs->rx_lock); + + xs->sk.sk_data_ready (&xs->sk); +return 0 ; + +out_drop: xs->rx_dropped++; +out_unlock: +spin_unlock_bh (&xs->rx_lock);return err; }
@@ -765,6 +777,7 @@ static int xsk_create(struct net *net, struct socket *sock, int protocol, xs =xdp_sk (sk);mutex_init (&xs->mutex); +spin_lock_init (&xs->rx_lock);spin_lock_init (&xs->tx_completion_lock);mutex_lock (&net->xdp.lock);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 219/219 net: mvmdio: defer probe of orion-mdio if a clock is not ready
In reply to Sasha LevinFrom: Josua Mayer <[email protected]>
[ Upstream commit 433a06d7d74e677c40b1148c70c48677ff62fb6b ]
Defer probing of the orion-mdio interface when getting a clock returns EPROBE_DEFER. This avoids locking up the Armada 8k SoC when mdio is used before all clocks have been enabled.
--- drivers/net/ethernet/marvell/mvmdio.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/marvell/mvmdio.c +5 -0
@@ -321,6 +321,10 @@ static int orion_mdio_probe(struct platform_device *pdev)for (i =0 ; i <ARRAY_SIZE (dev->clk); i++) { dev->clk[i] =of_clk_get (pdev->dev.of_node, i); +if (PTR_ERR (dev->clk[i]) == -EPROBE_DEFER ) { + ret = -EPROBE_DEFER ; + goto out_clk; + }if (IS_ERR (dev->clk[i]))break ;clk_prepare_enable (dev->clk[i]);
@@ -362,6 +366,7 @@ static int orion_mdio_probe(struct platform_device *pdev)if (dev->err_interrupt >0 )writel (0 , dev->regs +MVMDIO_ERR_INT_MASK ); +out_clk:for (i =0 ; i <ARRAY_SIZE (dev->clk); i++) {if (IS_ERR (dev->clk[i]))break ;
Signature · 1 line
2.20.1