4.9.229-rc1 review
Subsystems (6)
Sasha Levin
maintainerPATCH 141/191 tcp: grow window for OOO packets only for SACK flows
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 662051215c758ae8545451628816204ed6cd372d ]
Back in 2013, we made a change that broke fast retransmit for non SACK flows.
Indeed, for these flows, a sender needs to receive three duplicate ACK before starting fast retransmit. Sending ACK with different receive window do not count.
Even if enabling SACK is strongly recommended these days, there still are some cases where it has to be disabled.
Not increasing the window seems better than having to rely on RTO.
After the fix, following packetdrill test gives :
// Initialize connection
0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3
+0 setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0 +0 bind(3, ..., ...) = 0
+0 listen(3, 1) = 0
+0 < S 0:0(0) win 32792 <mss 1000,nop,wscale 7> +0 > S. 0:0(0) ack 1 <mss 1460,nop,wscale 8> +0 < . 1:1(0) ack 1 win 514
+0 accept(3, ..., ...) = 4
+0 < . 1:1001(1000) ack 1 win 514
// Quick ack
+0 > . 1:1(0) ack 1001 win 264
+0 < . 2001:3001(1000) ack 1 win 514
// DUPACK : Normally we should not change the window
+0 > . 1:1(0) ack 1001 win 264
+0 < . 3001:4001(1000) ack 1 win 514
// DUPACK : Normally we should not change the window
+0 > . 1:1(0) ack 1001 win 264
+0 < . 4001:5001(1000) ack 1 win 514
// DUPACK : Normally we should not change the window
+0 > . 1:1(0) ack 1001 win 264
+0 < . 1001:2001(1000) ack 1 win 514
// Hole is repaired.
+0 > . 1:1(0) ack 5001 win 272
--- net/ipv4/tcp_input.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/ipv4/tcp_input.c +10 -2
@@ -4537,7 +4537,11 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)if (tcp_ooo_try_coalesce (sk, tp->ooo_last_skb, skb, &fragstolen)) { coalesce_done: -tcp_grow_window (sk, skb); +/* For non sack flows, do not grow window to force DUPACK +* and trigger fast retransmit. +*/ +if (tcp_is_sack (tp)) +tcp_grow_window (sk, skb);kfree_skb_partial (skb, fragstolen); skb =NULL ; goto add_sack;
@@ -4621,7 +4625,11 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)tcp_sack_new_ofo_skb (sk, seq, end_seq); end:if (skb) { -tcp_grow_window (sk, skb); +/* For non sack flows, do not grow window to force DUPACK +* and trigger fast retransmit. +*/ +if (tcp_is_sack (tp)) +tcp_grow_window (sk, skb);skb_set_owner_r (skb, sk); } }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 142/191 sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket
In reply to Sasha LevinFrom: Marcelo Ricardo Leitner <[email protected]>
[ Upstream commit 471e39df96b9a4c4ba88a2da9e25a126624d7a9c ]
If a socket is set ipv6only, it will still send IPv4 addresses in the INIT and INIT_ACK packets. This potentially misleads the peer into using them, which then would cause association termination.
The fix is to not add IPv4 addresses to ipv6only sockets.
--- include/net/sctp/constants.h | 8 +++++--- net/sctp/associola.c | 5 ++++- net/sctp/bind_addr.c | 1 + net/sctp/protocol.c | 1 + 4 files changed, 11 insertions(+), 4 deletions(-)
include/net/sctp/constants.h +5 -3
@@ -357,11 +357,13 @@ typedef enum { ipv4_is_anycast_6to4(a))/* Flags used for the bind address copy functions. */ -#define SCTP_ADDR6_ALLOWED 0x00000001/* IPv6 address is allowed by +#define SCTP_ADDR4_ALLOWED 0x00000001/* IPv4 address is allowed by local sock family */ -#define SCTP_ADDR4_PEERSUPP 0x00000002/* IPv4 address is supported by +#define SCTP_ADDR6_ALLOWED 0x00000002/* IPv6 address is allowed by +local sock family */ +#define SCTP_ADDR4_PEERSUPP 0x00000004/* IPv4 address is supported by peer */ -#define SCTP_ADDR6_PEERSUPP 0x00000004/* IPv6 address is supported by +#define SCTP_ADDR6_PEERSUPP 0x00000008/* IPv6 address is supported by peer */ /* Reasons to retransmit. */
net/sctp/associola.c +4 -1
@@ -1583,12 +1583,15 @@ void sctp_assoc_rwnd_decrease(struct sctp_association *asoc, unsigned int len)int sctp_assoc_set_bind_addr_from_ep (struct sctp_association *asoc,sctp_scope_t scope,gfp_t gfp) { +struct sock *sk = asoc->base.sk;int flags;/* Use scoping rules to determine the subset of addresses from * the endpoint. */ - flags = (PF_INET6 == asoc->base.sk->sk_family) ?SCTP_ADDR6_ALLOWED :0 ; + flags = (PF_INET6 == sk->sk_family) ?SCTP_ADDR6_ALLOWED :0 ; +if (!inet_v6_ipv6only (sk)) + flags |=SCTP_ADDR4_ALLOWED ;if (asoc->peer.ipv4_address) flags |=SCTP_ADDR4_PEERSUPP ;if (asoc->peer.ipv6_address)
net/sctp/bind_addr.c +1 -0
@@ -451,6 +451,7 @@ static int sctp_copy_one_addr(struct net *net, struct sctp_bind_addr *dest,* well as the remote peer. */ if ((((AF_INET == addr->sa.sa_family) && + (flags & SCTP_ADDR4_ALLOWED) && (flags & SCTP_ADDR4_PEERSUPP))) || (((AF_INET6 == addr->sa.sa_family) && (flags & SCTP_ADDR6_ALLOWED) &&
net/sctp/protocol.c +1 -0
@@ -210,6 +210,7 @@ int sctp_copy_local_addr_list(struct net *net, struct sctp_bind_addr *bp,* sock as well as the remote peer. */ if ((((AF_INET == addr->a.sa.sa_family) && + (copy_flags & SCTP_ADDR4_ALLOWED) && (copy_flags & SCTP_ADDR4_PEERSUPP))) || (((AF_INET6 == addr->a.sa.sa_family) && (copy_flags & SCTP_ADDR6_ALLOWED) &&
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 143/191 net: Fix the arp error in some cases
In reply to Sasha LevinFrom: guodeqing <[email protected]>
[ Upstream commit 5eea3a63ff4aba6a26002e657a6d21934b7e2b96 ]
ie.,
$ ifconfig eth0 6.6.6.6 netmask 255.255.255.0
$ ip rule add from 6.6.6.6 table 6666
$ ip route add 9.9.9.9 via 6.6.6.6
$ ping -I 6.6.6.6 9.9.9.9 PING 9.9.9.9 (9.9.9.9) from 6.6.6.6 : 56(84) bytes of data.
3 packets transmitted, 0 received, 100% packet loss, time 2079ms
$ arp Address HWtype HWaddress Flags Mask Iface 6.6.6.6 (incomplete) eth0
The arp request address is error, this is because fib_table_lookup in fib_check_nh lookup the destnation 9.9.9.9 nexthop, the scope of the fib result is RT_SCOPE_LINK,the correct scope is RT_SCOPE_HOST. Here I add a check of whether this is RT_TABLE_MAIN to solve this problem.
--- net/ipv4/fib_semantics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/fib_semantics.c +1 -1
@@ -776,7 +776,7 @@ static int fib_check_nh(struct fib_config *cfg, struct fib_info *fi,if (fl4.flowi4_scope <RT_SCOPE_LINK ) fl4.flowi4_scope =RT_SCOPE_LINK ; -if (cfg->fc_table) +if (cfg->fc_table && cfg->fc_table !=RT_TABLE_MAIN ) tbl =fib_get_table (net, cfg->fc_table);if (tbl)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 144/191 net: Do not clear the sock TX queue in sk_set_socket()
In reply to Sasha LevinFrom: Tariq Toukan <[email protected]>
[ Upstream commit 41b14fb8724d5a4b382a63cb4a1a61880347ccb8 ]
Clearing the sock TX queue in sk_set_socket() might cause unexpected out-of-order transmit when called from sock_orphan(), as outstanding packets can pick a different TX queue and bypass the ones already queued.
This is undesired in general. More specifically, it breaks the in-order scheduling property guarantee for device-offloaded TLS sockets.
Remove the call to sk_tx_queue_clear() in sk_set_socket(), and add it explicitly only where needed.
--- include/net/sock.h | 1 - net/core/sock.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)
include/net/sock.h +0 -1
@@ -1631,7 +1631,6 @@ static inline int sk_tx_queue_get(const struct sock *sk)static inline void sk_set_socket (struct sock *sk,struct socket *sock) { -sk_tx_queue_clear (sk); sk->sk_socket = sock; }
net/core/sock.c +2 -0
@@ -1403,6 +1403,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,cgroup_sk_alloc (&sk->sk_cgrp_data);sock_update_classid (&sk->sk_cgrp_data);sock_update_netprioidx (&sk->sk_cgrp_data); +sk_tx_queue_clear (sk); }return sk;
@@ -1587,6 +1588,7 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)*/ sk_refcnt_debug_inc (newsk);sk_set_socket (newsk,NULL ); +sk_tx_queue_clear (newsk); newsk->sk_wq =NULL ;if (newsk->sk_prot->sockets_allocated)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 145/191 net: core: reduce recursion limit value
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit fb7861d14c8d7edac65b2fcb6e8031cb138457b2 ]
In the current code, ->ndo_start_xmit() can be executed recursively only 10 times because of stack memory.
But, in the case of the vxlan, 10 recursion limit value results in a stack overflow.
In the current code, the nested interface is limited by 8 depth. There is no critical reason that the recursion limitation value should be 10.
So, it would be good to be the same value with the limitation value of nesting interface depth.
Test commands:
ip link add vxlan10 type vxlan vni 10 dstport 4789 srcport 4789 4789
ip link set vxlan10 up
ip a a 192.168.10.1/24 dev vxlan10
ip n a 192.168.10.2 dev vxlan10 lladdr fc:22:33:44:55:66 nud permanent
for i in {9..0}
do
let A=$i+1
ip link add vxlan$i type vxlan vni $i dstport 4789 srcport 4789 4789
ip link set vxlan$i up
ip a a 192.168.$i.1/24 dev vxlan$i
ip n a 192.168.$i.2 dev vxlan$i lladdr fc:22:33:44:55:66 nud permanent
bridge fdb add fc:22:33:44:55:66 dev vxlan$A dst 192.168.$i.2 self
done
hping3 192.168.10.2 -2 -d 60000Splat looks like:
[ 103.814237][ T1127] ============================================================================= [ 103.871955][ T1127] BUG kmalloc-2k (Tainted: G B ): Padding overwritten. 0x00000000897a2e4f-0x000 [ 103.873187][ T1127] ----------------------------------------------------------------------------- [ 103.873187][ T1127] [ 103.874252][ T1127] INFO: Slab 0x000000005cccc724 objects=5 used=5 fp=0x0000000000000000 flags=0x10000000001020 [ 103.881323][ T1127] CPU: 3 PID: 1127 Comm: hping3 Tainted: G B 5.7.0+ #575 [ 103.882131][ T1127] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 [ 103.883006][ T1127] Call Trace: [ 103.883324][ T1127] dump_stack+0x96/0xdb [ 103.883716][ T1127] slab_err+0xad/0xd0 [ 103.884106][ T1127] ? _raw_spin_unlock+0x1f/0x30 [ 103.884620][ T1127] ? get_partial_node.isra.78+0x140/0x360 [ 103.885214][ T1127] slab_pad_check.part.53+0xf7/0x160 [ 103.885769][ T1127] ? pskb_expand_head+0x110/0xe10 [ 103.886316][ T1127] check_slab+0x97/0xb0 [ 103.886763][ T1127] alloc_debug_processing+0x84/0x1a0 [ 103.887308][ T1127] ___slab_alloc+0x5a5/0x630 [ 103.887765][ T1127] ? pskb_expand_head+0x110/0xe10 [ 103.888265][ T1127] ? lock_downgrade+0x730/0x730 [ 103.888762][ T1127] ? pskb_expand_head+0x110/0xe10 [ 103.889244][ T1127] ? __slab_alloc+0x3e/0x80 [ 103.889675][ T1127] __slab_alloc+0x3e/0x80 [ 103.890108][ T1127] __kmalloc_node_track_caller+0xc7/0x420
[ ... ]
--- include/linux/netdevice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/netdevice.h +1 -1
@@ -2480,7 +2480,7 @@ void synchronize_net(void);int init_dummy_netdev (struct net_device *dev);DECLARE_PER_CPU (int, xmit_recursion); -#define XMIT_RECURSION_LIMIT 10 +#define XMIT_RECURSION_LIMIT 8static inline int dev_recursion_level (void ) {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 146/191 USB: ohci-sm501: Add missed iounmap() in remove
In reply to Sasha LevinFrom: Chuhong Yuan <[email protected]>
commit 07c112fb09c86c0231f6ff0061a000ffe91c8eb9 upstream.
This driver misses calling iounmap() in remove to undo the ioremap() called in probe.
Add the missed call to fix it.
--- drivers/usb/host/ohci-sm501.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/ohci-sm501.c +1 -0
@@ -196,6 +196,7 @@ static int ohci_hcd_sm501_drv_remove(struct platform_device *pdev)struct resource *mem;usb_remove_hcd (hcd); +iounmap (hcd->regs);release_mem_region (hcd->rsrc_start, hcd->rsrc_len);usb_put_hcd (hcd);dma_release_declared_memory (&pdev->dev);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 147/191 usb: dwc2: Postponed gadget registration to the udc class driver
In reply to Sasha LevinFrom: Minas Harutyunyan <[email protected]>
commit 207324a321a866401b098cadf19e4a2dd6584622 upstream.
During dwc2 driver probe, after gadget registration to the udc class driver, if exist any builtin function driver it immediately bound to dwc2 and after init host side (dwc2_hcd_init()) stucked in host mode. Patch postpone gadget registration after host side initialization done.
--- drivers/usb/dwc2/gadget.c | 6 ------ drivers/usb/dwc2/platform.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-)
drivers/usb/dwc2/gadget.c +0 -6
@@ -3947,12 +3947,6 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int irq) epnum, 0); } - ret =usb_add_gadget_udc (dev, &hsotg->gadget); -if (ret) { -dwc2_hsotg_ep_free_request (&hsotg->eps_out[0 ]->ep, - hsotg->ctrl_req); -return ret; - }dwc2_hsotg_dump (hsotg);return 0 ;
drivers/usb/dwc2/platform.c +11 -0
@@ -661,6 +661,17 @@ static int dwc2_driver_probe(struct platform_device *dev)if (hsotg->dr_mode ==USB_DR_MODE_PERIPHERAL )dwc2_lowlevel_hw_disable (hsotg); +#if IS_ENABLED (CONFIG_USB_DWC2_PERIPHERAL ) || \ +IS_ENABLED (CONFIG_USB_DWC2_DUAL_ROLE ) +/* Postponed adding a new gadget to the udc class driver list */ +if (hsotg->gadget_enabled) { + retval =usb_add_gadget_udc (hsotg->dev, &hsotg->gadget); +if (retval) { +dwc2_hsotg_remove (hsotg); + goto error; + } + } +#endif /* CONFIG_USB_DWC2_PERIPHERAL || CONFIG_USB_DWC2_DUAL_ROLE */ return 0 ; error:
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 148/191 usb: add USB_QUIRK_DELAY_INIT for Logitech C922
In reply to Sasha LevinFrom: Tomasz Meresiński <[email protected]>
commit 5d8021923e8a8cc37a421a64e27c7221f0fee33c upstream.
The Logitech C922, just like other Logitech webcams, needs the USB_QUIRK_DELAY_INIT or it will randomly not respond after device connection
--- drivers/usb/core/quirks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/core/quirks.c +2 -1
@@ -73,11 +73,12 @@ static const struct usb_device_id usb_quirk_list[] = {/* Logitech HD Webcam C270 */ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, - /* Logitech HD Pro Webcams C920, C920-C, C925e and C930e */ + /* Logitech HD Pro Webcams C920, C920-C, C922, C925e and C930e */ { USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT }, { USB_DEVICE(0x046d, 0x0841), .driver_info = USB_QUIRK_DELAY_INIT }, { USB_DEVICE(0x046d, 0x0843), .driver_info = USB_QUIRK_DELAY_INIT }, { USB_DEVICE(0x046d, 0x085b), .driver_info = USB_QUIRK_DELAY_INIT }, + { USB_DEVICE(0x046d, 0x085c), .driver_info = USB_QUIRK_DELAY_INIT }, /* Logitech ConferenceCam CC3000e */ { USB_DEVICE(0x046d, 0x0847), .driver_info = USB_QUIRK_DELAY_INIT },
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 149/191 USB: ehci: reopen solution for Synopsys HC bug
In reply to Sasha LevinFrom: Longfang Liu <[email protected]>
commit 1ddcb71a3edf0e1682b6e056158e4c4b00325f66 upstream.
A Synopsys USB2.0 core used in Huawei Kunpeng920 SoC has a bug which might cause the host controller not issuing ping.
Bug description:
After indicating an Interrupt on Async Advance, the software uses the doorbell mechanism to delete the Next Link queue head of the last executed queue head. At this time, the host controller still references the removed queue head(the queue head is NULL). NULL reference causes the host controller to lose the USB device.
Solution:
After deleting the Next Link queue head, when has_synopsys_hc_bug set to 1,the software can write one of the valid queue head addresses to the ASYNCLISTADDR register to allow the host controller to get the valid queue head. in order to solve that problem, this patch set the flag for Huawei Kunpeng920
There are detailed instructions and solutions in this patch:
commit 2f7ac6c19997 ("USB: ehci: add workaround for Synopsys HC bug")
--- drivers/usb/host/ehci-pci.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/host/ehci-pci.c +7 -0
@@ -229,6 +229,13 @@ static int ehci_pci_setup(struct usb_hcd *hcd)ehci_info (ehci,"applying MosChip frame-index workaround\n" ); ehci->frame_index_bug =1 ;break ; +case PCI_VENDOR_ID_HUAWEI : +/* Synopsys HC bug */ +if (pdev->device ==0xa239 ) { +ehci_info (ehci,"applying Synopsys HC workaround\n" ); + ehci->has_synopsys_hc_bug =1 ; + } +break ; }/* optional debug port, normally in the first BAR */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 150/191 usb: host: ehci-exynos: Fix error check in exynos_ehci_probe()
In reply to Sasha LevinFrom: Tang Bin <[email protected]>
commit 44ed240d62736ad29943ec01e41e194b96f7c5e9 upstream.
If the function platform_get_irq() failed, the negative value returned will not be detected here. So fix error handling in exynos_ehci_probe(). And when get irq failed, the function platform_get_irq() logs an error message, so remove redundant message here.
--- drivers/usb/host/ehci-exynos.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/usb/host/ehci-exynos.c +2 -3
@@ -199,9 +199,8 @@ static int exynos_ehci_probe(struct platform_device *pdev) hcd->rsrc_len =resource_size (res); irq =platform_get_irq (pdev,0 ); -if (!irq) { -dev_err (&pdev->dev,"Failed to get IRQ\n" ); - err = -ENODEV ; +if (irq <0 ) { + err = irq; goto fail_io; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 151/191 ALSA: usb-audio: add quirk for Denon DCD-1500RE
In reply to Sasha LevinFrom: "Yick W. Tse" <[email protected]>
commit c9808bbfed3cfc911ecb60fe8e80c0c27876c657 upstream.
fix error "clock source 41 is not valid, cannot use"
[] New USB device found, idVendor=154e, idProduct=1002, bcdDevice= 1.00 [] New USB device strings: Mfr=1, Product=2, SerialNumber=0 [] Product: DCD-1500RE
[] Manufacturer: D & M Holdings Inc.
[]
[] clock source 41 is not valid, cannot use
[] usbcore: registered new interface driver snd-usb-audio
--- sound/usb/quirks.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/quirks.c +1 -0
@@ -1162,6 +1162,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)static bool is_itf_usb_dsd_2alts_dac (unsigned int id) {switch (id) { +case USB_ID (0x154e ,0x1002 ):/* Denon DCD-1500RE */ case USB_ID (0x154e ,0x1003 ):/* Denon DA-300USB */ case USB_ID (0x154e ,0x3005 ):/* Marantz HD-DAC1 */ case USB_ID (0x154e ,0x3006 ):/* Marantz SA-14S1 */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 152/191 xhci: Fix incorrect EP_STATE_MASK
In reply to Sasha LevinFrom: Mathias Nyman <[email protected]>
commit dceea67058fe22075db3aed62d5cb62092be5053 upstream.
EP_STATE_MASK should be 0x7 instead of 0xf
xhci spec 6.2.3 shows that the EP state field in the endpoint context data structure consist of bits [2:0].
The old value included a bit from the next field which fortunately is a
RsvdZ region. So hopefully this hasn't caused too much harm
--- drivers/usb/host/xhci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci.h +1 -1
@@ -709,7 +709,7 @@ struct xhci_ep_ctx {* 4 - TRB error * 5-7 - reserved */ -#define EP_STATE_MASK (0xf) +#define EP_STATE_MASK (0x7)#define EP_STATE_DISABLED 0#define EP_STATE_RUNNING 1#define EP_STATE_HALTED 2
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 153/191 xhci: Fix enumeration issue when setting max packet size for FS devices.
In reply to Sasha LevinFrom: Al Cooper <[email protected]>
commit a73d9d9cfc3cfceabd91fb0b0c13e4062b6dbcd7 upstream.
Unable to complete the enumeration of a USB TV Tuner device.
Per XHCI spec (4.6.5), the EP state field of the input context shall be cleared for a set address command. In the special case of an FS device that has "MaxPacketSize0 = 8", the Linux XHCI driver does not do this before evaluating the context. With an XHCI controller that checks the EP state field for parameter context error this causes a problem in cases such as the device getting reset again after enumeration.
When that field is cleared, the problem does not occur.
This was found and fixed by Sasi Kumar.
--- drivers/usb/host/xhci.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/xhci.c +1 -0
@@ -1347,6 +1347,7 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id, xhci->devs[slot_id]->out_ctx, ep_index); ep_ctx =xhci_get_ep_ctx (xhci, command->in_ctx, ep_index); + ep_ctx->ep_info &=cpu_to_le32 (~EP_STATE_MASK );/* must clear */ ep_ctx->ep_info2 &=cpu_to_le32 (~MAX_PACKET_MASK ); ep_ctx->ep_info2 |=cpu_to_le32 (MAX_PACKET (max_packet_size));
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 154/191 cdc-acm: Add DISABLE_ECHO quirk for Microchip/SMSC chip
In reply to Sasha LevinFrom: Joakim Tjernlund <[email protected]>
commit 03894573f2913181ee5aae0089f333b2131f2d4b upstream.
USB_DEVICE(0x0424, 0x274e) can send data before cdc_acm is ready, causing garbage chars on the TTY causing stray input to the shell and/or login prompt.
--- drivers/usb/class/cdc-acm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/class/cdc-acm.c +2 -0
@@ -1627,6 +1627,8 @@ static int acm_reset_resume(struct usb_interface *intf)static const struct usb_device_id acm_ids[] = {/* quirky and broken devices */ + {USB_DEVICE (0x0424 ,0x274e ),/* Microchip Technology, Inc. (formerly SMSC) */ + .driver_info =DISABLE_ECHO , },/* DISABLE ECHO in termios flag */ {USB_DEVICE (0x076d ,0x0006 ),/* Denso Cradle CU-321 */ .driver_info =NO_UNION_NORMAL , },/* has no union descriptor */ {USB_DEVICE (0x17ef ,0x7000 ),/* Lenovo USB modem */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 155/191 ALSA: usb-audio: uac1: Invalidate ctl on interrupt
In reply to Sasha LevinFrom: Julian Scheel <[email protected]>
[ Upstream commit b2500b584cfd228d67e1e43daf27c8af865b499e ]
When an interrupt occurs, the value of at least one of the belonging controls should have changed. To make sure they get re-read from device on the next read, invalidate the cache. This was correctly implemented for uac2 already, but missing for uac1.
--- sound/usb/mixer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
sound/usb/mixer.c +6 -1
@@ -2397,9 +2397,14 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid) {struct usb_mixer_elem_list *list; -for (list = mixer->id_elems[unitid]; list; list = list->next_id_elem) +for (list = mixer->id_elems[unitid]; list; list = list->next_id_elem) { +struct usb_mixer_elem_info *info = + (struct usb_mixer_elem_info *)list; +/* invalidate cache, so the value is read from the device */ + info->cached =0 ;snd_ctl_notify (mixer->chip->card,SNDRV_CTL_EVENT_MASK_VALUE , &list->kctl->id); + } } static void snd_usb_mixer_dump_cval(struct snd_info_buffer *buffer,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 156/191 ALSA: usb-audio: Clean up mixer element list traverse
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 8c558076c740e8009a96c6fdc3d4245dde62be77 ]
Introduce a new macro for iterating over mixer element list for avoiding the open codes in many places. Also the open-coded container_of() and the forced cast to struct usb_mixer_elem_info are replaced with another simple macro, too.
No functional changes but just readability improvement.
--- sound/usb/mixer.c | 20 +++++++++----------- sound/usb/mixer.h | 6 ++++++ sound/usb/mixer_quirks.c | 2 +- sound/usb/mixer_scarlett.c | 6 ++---- 4 files changed, 18 insertions(+), 16 deletions(-)
sound/usb/mixer.c +9 -11
@@ -2397,9 +2397,9 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid) {struct usb_mixer_elem_list *list; -for (list = mixer->id_elems[unitid]; list; list = list->next_id_elem) { +for_each_mixer_elem (list, mixer, unitid) {struct usb_mixer_elem_info *info = - (struct usb_mixer_elem_info *)list; +mixer_elem_list_to_info (list);/* invalidate cache, so the value is read from the device */ info->cached =0 ; snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
@@ -2410,7 +2410,7 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid)static void snd_usb_mixer_dump_cval (struct snd_info_buffer *buffer,struct usb_mixer_elem_list *list) { -struct usb_mixer_elem_info *cval = (struct usb_mixer_elem_info *)list; +struct usb_mixer_elem_info *cval =mixer_elem_list_to_info (list);static char *val_types[] = {"BOOLEAN" ,"INV_BOOLEAN" ,"S8" ,"U8" ,"S16" ,"U16" }; snd_iprintf(buffer, " Info: id=%i, control=%i, cmask=0x%x, "
@@ -2436,8 +2436,7 @@ static void snd_usb_mixer_proc_read(struct snd_info_entry *entry, mixer->ignore_ctl_error);snd_iprintf (buffer,"Card: %s\n" , chip->card->longname);for (unitid =0 ; unitid <MAX_ID_ELEMS ; unitid++) { -for (list = mixer->id_elems[unitid]; list; - list = list->next_id_elem) { +for_each_mixer_elem (list, mixer, unitid) {snd_iprintf (buffer," Unit: %i\n" , list->id);if (list->kctl) snd_iprintf(buffer,
@@ -2467,19 +2466,19 @@ static void snd_usb_mixer_interrupt_v2(struct usb_mixer_interface *mixer,return ; } -for (list = mixer->id_elems[unitid]; list; list = list->next_id_elem) +for_each_mixer_elem (list, mixer, unitid) count++;if (count ==0 )return ; -for (list = mixer->id_elems[unitid]; list; list = list->next_id_elem) { +for_each_mixer_elem (list, mixer, unitid) {struct usb_mixer_elem_info *info;if (!list->kctl)continue ; - info = (struct usb_mixer_elem_info *)list; + info =mixer_elem_list_to_info (list);if (count >1 && info->control != control)continue ;
@@ -2699,7 +2698,7 @@ int snd_usb_mixer_suspend(struct usb_mixer_interface *mixer)static int restore_mixer_value (struct usb_mixer_elem_list *list) { -struct usb_mixer_elem_info *cval = (struct usb_mixer_elem_info *)list; +struct usb_mixer_elem_info *cval =mixer_elem_list_to_info (list);int c, err, idx;if (cval->cmask) {
@@ -2735,8 +2734,7 @@ int snd_usb_mixer_resume(struct usb_mixer_interface *mixer, bool reset_resume)if (reset_resume) {/* restore cached mixer values */ for (id =0 ; id <MAX_ID_ELEMS ; id++) { -for (list = mixer->id_elems[id]; list; - list = list->next_id_elem) { +for_each_mixer_elem (list, mixer, id) {if (list->resume) { err = list->resume (list);if (err <0 )
sound/usb/mixer.h +6 -0
@@ -52,6 +52,12 @@ struct usb_mixer_elem_list {usb_mixer_elem_resume_func_t resume; }; +/* iterate over mixer element list of the given unit id */ +#define for_each_mixer_elem (list, mixer, id) \ + for ((list) = (mixer)->id_elems[id]; (list); (list) = (list)->next_id_elem) +#define mixer_elem_list_to_info (list) \ + container_of(list, struct usb_mixer_elem_info, head) +struct usb_mixer_elem_info {struct usb_mixer_elem_list head;unsigned int control;/* CS or ICN (high byte) */
sound/usb/mixer_quirks.c +1 -1
@@ -1170,7 +1170,7 @@ void snd_emuusb_set_samplerate(struct snd_usb_audio *chip,int unitid =12 ;/* SamleRate ExtensionUnit ID */ list_for_each_entry (mixer, &chip->mixer_list, list) { - cval = (struct usb_mixer_elem_info *)mixer->id_elems[unitid]; + cval =mixer_elem_list_to_info (mixer->id_elems[unitid]);if (cval) { snd_usb_mixer_set_ctl_value(cval, UAC_SET_CUR, cval->control << 8,
sound/usb/mixer_scarlett.c +2 -4
@@ -287,8 +287,7 @@ static int scarlett_ctl_switch_put(struct snd_kcontrol *kctl,static int scarlett_ctl_resume (struct usb_mixer_elem_list *list) { -struct usb_mixer_elem_info *elem = - container_of(list, struct usb_mixer_elem_info, head); +struct usb_mixer_elem_info *elem =mixer_elem_list_to_info (list);int i;for (i =0 ; i < elem->channels; i++)
@@ -447,8 +446,7 @@ static int scarlett_ctl_enum_put(struct snd_kcontrol *kctl,static int scarlett_ctl_enum_resume (struct usb_mixer_elem_list *list) { -struct usb_mixer_elem_info *elem = - container_of(list, struct usb_mixer_elem_info, head); +struct usb_mixer_elem_info *elem =mixer_elem_list_to_info (list);if (elem->cached)snd_usb_set_cur_mix_value (elem,0 ,0 , *elem->cache_val);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 157/191 ALSA: usb-audio: Fix OOB access of mixer element list
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 220345e98f1cdc768eeb6e3364a0fa7ab9647fe7 ]
The USB-audio mixer code holds a linked list of usb_mixer_elem_list, and several operations are performed for each mixer element. A few of them (snd_usb_mixer_notify_id() and snd_usb_mixer_interrupt_v2()) assume each mixer element being a usb_mixer_elem_info object that is a subclass of usb_mixer_elem_list, cast via container_of() and access it members. This may result in an out-of-bound access when a non-standard list element has been added, as spotted by syzkaller recently.
This patch adds a new field, is_std_info, in usb_mixer_elem_list to indicate that the element is the usb_mixer_elem_info type or not, and skip the access to such an element if needed.
--- sound/usb/mixer.c | 15 +++++++++++---- sound/usb/mixer.h | 9 +++++++-- sound/usb/mixer_quirks.c | 3 ++- 3 files changed, 20 insertions(+), 7 deletions(-)
sound/usb/mixer.c +11 -4
@@ -585,8 +585,9 @@ static int check_matrix_bitmap(unsigned char *bmap,* if failed, give up and free the control instance. */ -int snd_usb_mixer_add_control (struct usb_mixer_elem_list *list, -struct snd_kcontrol *kctl) +int snd_usb_mixer_add_list (struct usb_mixer_elem_list *list, +struct snd_kcontrol *kctl, +bool is_std_info) {struct usb_mixer_interface *mixer = list->mixer;int err;
@@ -599,6 +600,7 @@ int snd_usb_mixer_add_control(struct usb_mixer_elem_list *list,return err; } list->kctl = kctl; + list->is_std_info = is_std_info; list->next_id_elem = mixer->id_elems[list->id]; mixer->id_elems[list->id] = list;return 0 ;
@@ -2398,8 +2400,11 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid)struct usb_mixer_elem_list *list;for_each_mixer_elem (list, mixer, unitid) { -struct usb_mixer_elem_info *info = -mixer_elem_list_to_info (list); +struct usb_mixer_elem_info *info; + +if (!list->is_std_info) +continue ; + info =mixer_elem_list_to_info (list);/* invalidate cache, so the value is read from the device */ info->cached =0 ; snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
@@ -2477,6 +2482,8 @@ static void snd_usb_mixer_interrupt_v2(struct usb_mixer_interface *mixer,if (!list->kctl)continue ; +if (!list->is_std_info) +continue ; info =mixer_elem_list_to_info (list);if (count >1 && info->control != control)
sound/usb/mixer.h +7 -2
@@ -48,6 +48,7 @@ struct usb_mixer_elem_list {struct usb_mixer_elem_list *next_id_elem;/* list of controls with same id */ struct snd_kcontrol *kctl;unsigned int id; +bool is_std_info;usb_mixer_elem_dump_func_t dump;usb_mixer_elem_resume_func_t resume; };
@@ -85,8 +86,12 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid);int snd_usb_mixer_set_ctl_value (struct usb_mixer_elem_info *cval,int request,int validx,int value_set); -int snd_usb_mixer_add_control (struct usb_mixer_elem_list *list, -struct snd_kcontrol *kctl); +int snd_usb_mixer_add_list (struct usb_mixer_elem_list *list, +struct snd_kcontrol *kctl, +bool is_std_info); + +#define snd_usb_mixer_add_control (list, kctl) \ + snd_usb_mixer_add_list(list, kctl, true) void snd_usb_mixer_elem_init_std(struct usb_mixer_elem_list *list, struct usb_mixer_interface *mixer,
sound/usb/mixer_quirks.c +2 -1
@@ -168,7 +168,8 @@ static int add_single_ctl_with_resume(struct usb_mixer_interface *mixer,return -ENOMEM ; } kctl->private_free = snd_usb_mixer_elem_free; -return snd_usb_mixer_add_control (list, kctl); +/* don't use snd_usb_mixer_add_control() here, this is a special list element */ +return snd_usb_mixer_add_list (list, kctl, false); }/*
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 158/191 xhci: Poll for U0 after disabling USB2 LPM
In reply to Sasha LevinFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit b3d71abd135e6919ca0b6cab463738472653ddfb ]
USB2 devices with LPM enabled may interrupt the system suspend:
[ 932.510475] usb 1-7: usb suspend, wakeup 0 [ 932.510549] hub 1-0:1.0: hub_suspend [ 932.510581] usb usb1: bus suspend, wakeup 0 [ 932.510590] xhci_hcd 0000:00:14.0: port 9 not suspended [ 932.510593] xhci_hcd 0000:00:14.0: port 8 not suspended .. [ 932.520323] xhci_hcd 0000:00:14.0: Port change event, 1-7, id 7, portsc: 0x400e03 .. [ 932.591405] PM: pci_pm_suspend(): hcd_pci_suspend+0x0/0x30 returns -16 [ 932.591414] PM: dpm_run_callback(): pci_pm_suspend+0x0/0x160 returns -16 [ 932.591418] PM: Device 0000:00:14.0 failed to suspend async: error -16
During system suspend, USB core will let HC suspends the device if it doesn't have remote wakeup enabled and doesn't have any children. However, from the log above we can see that the usb 1-7 doesn't get bus suspended due to not in U0. After a while the port finished U2 -> U0 transition, interrupts the suspend process.
The observation is that after disabling LPM, port doesn't transit to U0 immediately and can linger in U2. xHCI spec 4.23.5.2 states that the maximum exit latency for USB2 LPM should be BESL + 10us. The BESL for the affected device is advertised as 400us, which is still not enough based on my testing result.
So let's use the maximum permitted latency, 10000, to poll for U0 status to solve the issue.
--- drivers/usb/host/xhci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/xhci.c +3 -0
@@ -4245,6 +4245,9 @@ int xhci_set_usb2_hardware_lpm(struct usb_hcd *hcd,mutex_lock (hcd->bandwidth_mutex);xhci_change_max_exit_latency (xhci, udev,0 );mutex_unlock (hcd->bandwidth_mutex); +readl_poll_timeout (port_array[port_num], pm_val, + (pm_val &PORT_PLS_MASK ) ==XDEV_U0 , +100 ,10000 );return 0 ; } }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 159/191 cifs/smb3: Fix data inconsistent when punch hole
In reply to Sasha LevinFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit acc91c2d8de4ef46ed751c5f9df99ed9a109b100 ]
When punch hole success, we also can read old data from file:
# strace -e trace=pread64,fallocate xfs_io -f -c "pread 20 40" \
-c "fpunch 20 40" -c"pread 20 40" file
pread64(3, " version 5.8.0-rc1+"..., 40, 20) = 40
fallocate(3, FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE, 20, 40) = 0
pread64(3, " version 5.8.0-rc1+"..., 40, 20) = 40CIFS implements the fallocate(FALLOCATE_FL_PUNCH_HOLE) with send SMB ioctl(FSCTL_SET_ZERO_DATA) to server. It just set the range of the remote file to zero, but local page caches not updated, then the local page caches inconsistent with server.
Also can be found by xfstests generic/316.
So, we need to remove the page caches before send the SMB ioctl(FSCTL_SET_ZERO_DATA) to server.
--- fs/cifs/smb2ops.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/cifs/smb2ops.c +6 -0
@@ -1276,6 +1276,12 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,if (!smb2_set_sparse (xid, tcon, cfile, inode, set_sparse))return -EOPNOTSUPP ; +/* +* We implement the punch hole through ioctl, so we need remove the page +* caches first, otherwise the data may be inconsistent with the server. +*/ +truncate_pagecache_range (inode, offset, offset + len -1 ); +cifs_dbg (FYI ,"offset %lld len %lld" , offset, len); fsctl_buf.FileOffset =cpu_to_le64 (offset);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 160/191 cifs/smb3: Fix data inconsistent when zero file range
In reply to Sasha LevinFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit 6b69040247e14b43419a520f841f2b3052833df9 ]
CIFS implements the fallocate(FALLOC_FL_ZERO_RANGE) with send SMB ioctl(FSCTL_SET_ZERO_DATA) to server. It just set the range of the remote file to zero, but local page cache not update, then the data inconsistent with server, which leads the xfstest generic/008 failed.
So we need to remove the local page caches before send SMB ioctl(FSCTL_SET_ZERO_DATA) to server. After next read, it will re-cache it.
--- fs/cifs/smb2ops.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/cifs/smb2ops.c +6 -0
@@ -1220,6 +1220,12 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon, inode =d_inode (cfile->dentry); cifsi =CIFS_I (inode); +/* +* We zero the range through ioctl, so we need remove the page caches +* first, otherwise the data may be inconsistent with the server. +*/ +truncate_pagecache_range (inode, offset, offset + len -1 ); +/* if file not oplocked can't be sure whether asking to extend size */ if (!CIFS_CACHE_READ (cifsi))if (keep_size == false)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 161/191 efi/esrt: Fix reference count leak in esre_create_sysfs_entry.
In reply to Sasha LevinFrom: Qiushi Wu <[email protected]>
[ Upstream commit 4ddf4739be6e375116c375f0a68bf3893ffcee21 ]
kobject_init_and_add() takes reference even when it fails. If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object. Previous commit "b8eb718348b8" fixed a similar problem.
--- drivers/firmware/efi/esrt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/efi/esrt.c +1 -1
@@ -180,7 +180,7 @@ static int esre_create_sysfs_entry(void *esre, int entry_num) rc =kobject_init_and_add (&entry->kobj, &esre1_ktype,NULL ,"entry%d" , entry_num);if (rc) { -kfree (entry); +kobject_put (&entry->kobj);return rc; } }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 162/191 RDMA/mad: Fix possible memory leak in ib_mad_post_receive_mads()
In reply to Sasha LevinFrom: Fan Guo <[email protected]>
[ Upstream commit a17f4bed811c60712d8131883cdba11a105d0161 ]
If ib_dma_mapping_error() returns non-zero value, ib_mad_post_receive_mads() will jump out of loops and return -ENOMEM without freeing mad_priv. Fix this memory-leak problem by freeing mad_priv in this case.
--- drivers/infiniband/core/mad.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/core/mad.c +1 -0
@@ -2885,6 +2885,7 @@ static int ib_mad_post_receive_mads(struct ib_mad_qp_info *qp_info, DMA_FROM_DEVICE);if (unlikely (ib_dma_mapping_error (qp_info->port_priv->device, sg_list.addr))) { +kfree (mad_priv); ret = -ENOMEM ;break ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 163/191 net: qed: fix left elements count calculation
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 97dd1abd026ae4e6a82fa68645928404ad483409 ]
qed_chain_get_element_left{,_u32} returned 0 when the difference between producer and consumer page count was equal to the total page count.
Fix this by conditional expanding of producer value (vs unconditional). This allowed to eliminate normalizaton against total page count, which was the cause of this bug.
Misc: replace open-coded constants with common defines.
--- include/linux/qed/qed_chain.h | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
include/linux/qed/qed_chain.h +16 -10
@@ -155,28 +155,34 @@ static inline u32 qed_chain_get_cons_idx_u32(struct qed_chain *p_chain)static inline u16 qed_chain_get_elem_left (struct qed_chain *p_chain) { +u16 elem_per_page = p_chain->elem_per_page; +u32 prod = p_chain->u.chain16.prod_idx; +u32 cons = p_chain->u.chain16.cons_idx;u16 used; - used = (u16) (((u32 )0x10000 + - (u32 )p_chain->u.chain16.prod_idx) - - (u32 )p_chain->u.chain16.cons_idx); +if (prod < cons) + prod += (u32 )U16_MAX +1 ; + + used = (u16)(prod - cons);if (p_chain->mode ==QED_CHAIN_MODE_NEXT_PTR ) - used -= p_chain->u.chain16.prod_idx / p_chain->elem_per_page - - p_chain->u.chain16.cons_idx / p_chain->elem_per_page; + used -= prod / elem_per_page - cons / elem_per_page;return (u16)(p_chain->capacity - used); }static inline u32 qed_chain_get_elem_left_u32 (struct qed_chain *p_chain) { +u16 elem_per_page = p_chain->elem_per_page; +u64 prod = p_chain->u.chain32.prod_idx; +u64 cons = p_chain->u.chain32.cons_idx;u32 used; - used = (u32) (((u64 )0x100000000ULL + - (u64 )p_chain->u.chain32.prod_idx) - - (u64 )p_chain->u.chain32.cons_idx); +if (prod < cons) + prod += (u64 )U32_MAX +1 ; + + used = (u32)(prod - cons);if (p_chain->mode ==QED_CHAIN_MODE_NEXT_PTR ) - used -= p_chain->u.chain32.prod_idx / p_chain->elem_per_page - - p_chain->u.chain32.cons_idx / p_chain->elem_per_page; + used -= (u32)(prod / elem_per_page - cons / elem_per_page);return p_chain->capacity - used; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 164/191 net: qed: fix NVMe login fails over VFs
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit ccd7c7ce167a21dbf2b698ffcf00f11d96d44f9b ]
25ms sleep cycles in waiting for PF response are excessive and may lead to different timeout failures.
Start to wait with short udelays, and in most cases polling will end here. If the time was not sufficient, switch to msleeps. usleep_range() may go far beyond 100us depending on platform and tick configuration, hence atomic udelays for consistency.
Also add explicit DMA barriers since 'done' always comes from a shared request-response DMA pool, and note that in the comment nearby.
--- drivers/net/ethernet/qlogic/qed/qed_vf.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_vf.c +18 -5
@@ -57,12 +57,17 @@ static void qed_vf_pf_req_end(struct qed_hwfn *p_hwfn, int req_status)mutex_unlock (&(p_hwfn->vf_iov_info->mutex)); } +#define QED_VF_CHANNEL_USLEEP_ITERATIONS 90 +#define QED_VF_CHANNEL_USLEEP_DELAY 100 +#define QED_VF_CHANNEL_MSLEEP_ITERATIONS 10 +#define QED_VF_CHANNEL_MSLEEP_DELAY 25 +static int qed_send_msg2pf (struct qed_hwfn *p_hwfn,u8 *done,u32 resp_size) {union vfpf_tlvs *p_req = p_hwfn->vf_iov_info->vf2pf_request;struct ustorm_trigger_vf_zone trigger;struct ustorm_vf_zone *zone_data; -int rc =0 , time =100 ; +int iter, rc =0 ; zone_data = (struct ustorm_vf_zone *)PXP_VF_BAR0_START_USDM_ZONE_B ;
@@ -102,11 +107,19 @@ static int qed_send_msg2pf(struct qed_hwfn *p_hwfn, u8 *done, u32 resp_size)REG_WR (p_hwfn, (uintptr_t )&zone_data->trigger, *((u32 *)&trigger));/* When PF would be done with the response, it would write back to the -* `done' address. Poll until then. +* `done' address from a coherent DMA zone. Poll until then. */ -while ((!*done) && time) { -msleep (25 ); - time--; + + iter =QED_VF_CHANNEL_USLEEP_ITERATIONS ; +while (!*done && iter--) { +udelay (QED_VF_CHANNEL_USLEEP_DELAY ); +dma_rmb (); + } + + iter =QED_VF_CHANNEL_MSLEEP_ITERATIONS ; +while (!*done && iter--) { +msleep (QED_VF_CHANNEL_MSLEEP_DELAY ); +dma_rmb (); }if (!*done) {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 165/191 net: qed: fix excessive QM ILT lines consumption
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit d434d02f7e7c24c721365fd594ed781acb18e0da ]
This is likely a copy'n'paste mistake. The amount of ILT lines to reserve for a single VF was being multiplied by the total VFs count. This led to a huge redundancy in reservation and potential lines drainouts.
--- drivers/net/ethernet/qlogic/qed/qed_cxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qed/qed_cxt.c +1 -1
@@ -339,7 +339,7 @@ static void qed_cxt_qm_iids(struct qed_hwfn *p_hwfn, vf_tids += segs[NUM_TASK_PF_SEGMENTS ].count; } - iids->vf_cids += vf_cids * p_mngr->vf_count; + iids->vf_cids = vf_cids; iids->tids += vf_tids * p_mngr->vf_count; DP_VERBOSE(p_hwfn, QED_MSG_ILT,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 166/191 ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram()
In reply to Sasha LevinFrom: yu kuai <[email protected]>
[ Upstream commit 586745f1598ccf71b0a5a6df2222dee0a865954e ]
if of_find_device_by_node() succeed, imx_suspend_alloc_ocram() doesn't have a corresponding put_device(). Thus add a jump target to fix the exception handling for this function implementation.
--- arch/arm/mach-imx/pm-imx5.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-imx/pm-imx5.c +4 -2
@@ -301,14 +301,14 @@ static int __init imx_suspend_alloc_ocram(if (!ocram_pool) {pr_warn ("%s: ocram pool unavailable!\n" , __func__); ret = -ENODEV ; - goto put_node; + goto put_device; } ocram_base =gen_pool_alloc (ocram_pool, size);if (!ocram_base) {pr_warn ("%s: unable to alloc ocram!\n" , __func__); ret = -ENOMEM ; - goto put_node; + goto put_device; } phys =gen_pool_virt_to_phys (ocram_pool, ocram_base);
@@ -318,6 +318,8 @@ static int __init imx_suspend_alloc_ocram(if (virt_out) *virt_out = virt; +put_device: +put_device (&pdev->dev); put_node:of_node_put (node);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 167/191 usb: gadget: udc: Potential Oops in error handling code
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit e55f3c37cb8d31c7e301f46396b2ac6a19eb3a7c ]
If this is in "transceiver" mode the the ->qwork isn't required and is a NULL pointer. This can lead to a NULL dereference when we call destroy_workqueue(udc->qwork).
--- drivers/usb/gadget/udc/mv_udc_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/gadget/udc/mv_udc_core.c +2 -1
@@ -2317,7 +2317,8 @@ static int mv_udc_probe(struct platform_device *pdev)return 0 ; err_create_workqueue: -destroy_workqueue (udc->qwork); +if (udc->qwork) +destroy_workqueue (udc->qwork); err_destroy_dma:dma_pool_destroy (udc->dtd_pool); err_free_dma:
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 168/191 netfilter: ipset: fix unaligned atomic access
In reply to Sasha LevinFrom: Russell King <[email protected]>
[ Upstream commit 715028460082d07a7ec6fcd87b14b46784346a72 ]
When using ip_set with counters and comment, traffic causes the kernel to panic on 32-bit ARM:
Alignment trap: not handling instruction e1b82f9f at [<bf01b0dc>] Unhandled fault: alignment exception (0x221) at 0xea08133c PC is at ip_set_match_extensions+0xe0/0x224 [ip_set]
The problem occurs when we try to update the 64-bit counters - the faulting address above is not 64-bit aligned. The problem occurs due to the way elements are allocated, for example:
set->dsize = ip_set_elem_len(set, tb, 0, 0); map = ip_set_alloc(sizeof(*map) + elements * set->dsize);
If the element has a requirement for a member to be 64-bit aligned, and set->dsize is not a multiple of 8, but is a multiple of four, then every odd numbered elements will be misaligned - and hitting an atomic64_add() on that element will cause the kernel to panic.
ip_set_elem_len() must return a size that is rounded to the maximum alignment of any extension field stored in the element. This change ensures that is the case.
--- net/netfilter/ipset/ip_set_core.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/ipset/ip_set_core.c +2 -0
@@ -379,6 +379,8 @@ ip_set_elem_len(struct ip_set *set, struct nlattr *tb[], size_t len,for (id =0 ; id <IPSET_EXT_ID_MAX ; id++) {if (!add_extension (id, cadt_flags, tb))continue ; +if (align < ip_set_extensions[id].align) + align = ip_set_extensions[id].align; len =ALIGN (len, ip_set_extensions[id].align); set->offset[id] = len; set->extensions |= ip_set_extensions[id].type;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 169/191 sched/core: Fix PI boosting between RT and DEADLINE tasks
In reply to Sasha LevinFrom: Juri Lelli <[email protected]>
[ Upstream commit 740797ce3a124b7dd22b7fb832d87bc8fba1cf6f ]
syzbot reported the following warning:
WARNING: CPU: 1 PID: 6351 at kernel/sched/deadline.c:628 enqueue_task_dl+0x22da/0x38a0 kernel/sched/deadline.c:1504
At deadline.c:628 we have:
623 static inline void setup_new_dl_entity(struct sched_dl_entity *dl_se) 624 {
625 struct dl_rq *dl_rq = dl_rq_of_se(dl_se);
626 struct rq *rq = rq_of_dl_rq(dl_rq);
627
628 WARN_ON(dl_se->dl_boosted);
629 WARN_ON(dl_time_before(rq_clock(rq), dl_se->deadline));
[...]
}Which means that setup_new_dl_entity() has been called on a task currently boosted. This shouldn't happen though, as setup_new_dl_entity() is only called when the 'dynamic' deadline of the new entity is in the past w.r.t. rq_clock and boosted tasks shouldn't verify this condition.
Digging through the PI code I noticed that what above might in fact happen if an RT tasks blocks on an rt_mutex hold by a DEADLINE task. In the first branch of boosting conditions we check only if a pi_task 'dynamic' deadline is earlier than mutex holder's and in this case we set mutex holder to be dl_boosted. However, since RT 'dynamic' deadlines are only initialized if such tasks get boosted at some point (or if they become DEADLINE of course), in general RT 'dynamic' deadlines are usually equal to 0 and this verifies the aforementioned condition.
Fix it by checking that the potential donor task is actually (even if temporary because in turn boosted) running at DEADLINE priority before using its 'dynamic' deadline value.
--- kernel/sched/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/sched/core.c +2 -1
@@ -3697,7 +3697,8 @@ void rt_mutex_setprio(struct task_struct *p, int prio)if (dl_prio (prio)) {struct task_struct *pi_task =rt_mutex_get_top_task (p);if (!dl_prio (p->normal_prio) || - (pi_task &&dl_entity_preempt (&pi_task->dl, &p->dl))) { + (pi_task &&dl_prio (pi_task->prio) && +dl_entity_preempt (&pi_task->dl, &p->dl))) { p->dl.dl_boosted =1 ; queue_flag |=ENQUEUE_REPLENISH ; }else
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 170/191 ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function
In reply to Sasha LevinFrom: Ye Bin <[email protected]>
[ Upstream commit f650ef61e040bcb175dd8762164b00a5d627f20e ]
BUG: KASAN: use-after-free in ata_scsi_mode_select_xlat+0x10bd/0x10f0 drivers/ata/libata-scsi.c:4045 Read of size 1 at addr ffff88803b8cd003 by task syz-executor.6/12621 CPU: 1 PID: 12621 Comm: syz-executor.6 Not tainted 4.19.95 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xac/0xee lib/dump_stack.c:118 print_address_description+0x60/0x223 mm/kasan/report.c:253 kasan_report_error mm/kasan/report.c:351 [inline] kasan_report mm/kasan/report.c:409 [inline] kasan_report.cold+0xae/0x2d8 mm/kasan/report.c:393 ata_scsi_mode_select_xlat+0x10bd/0x10f0 drivers/ata/libata-scsi.c:4045 ata_scsi_translate+0x2da/0x680 drivers/ata/libata-scsi.c:2035 __ata_scsi_queuecmd drivers/ata/libata-scsi.c:4360 [inline] ata_scsi_queuecmd+0x2e4/0x790 drivers/ata/libata-scsi.c:4409 scsi_dispatch_cmd+0x2ee/0x6c0 drivers/scsi/scsi_lib.c:1867 scsi_queue_rq+0xfd7/0x1990 drivers/scsi/scsi_lib.c:2170 blk_mq_dispatch_rq_list+0x1e1/0x19a0 block/blk-mq.c:1186 blk_mq_do_dispatch_sched+0x147/0x3d0 block/blk-mq-sched.c:108 blk_mq_sched_dispatch_requests+0x427/0x680 block/blk-mq-sched.c:204 __blk_mq_run_hw_queue+0xbc/0x200 block/blk-mq.c:1308 __blk_mq_delay_run_hw_queue+0x3c0/0x460 block/blk-mq.c:1376 blk_mq_run_hw_queue+0x152/0x310 block/blk-mq.c:1413 blk_mq_sched_insert_request+0x337/0x6c0 block/blk-mq-sched.c:397 blk_execute_rq_nowait+0x124/0x320 block/blk-exec.c:64 blk_execute_rq+0xc5/0x112 block/blk-exec.c:101 sg_scsi_ioctl+0x3b0/0x6a0 block/scsi_ioctl.c:507 sg_ioctl+0xd37/0x23f0 drivers/scsi/sg.c:1106 vfs_ioctl fs/ioctl.c:46 [inline] file_ioctl fs/ioctl.c:501 [inline] do_vfs_ioctl+0xae6/0x1030 fs/ioctl.c:688 ksys_ioctl+0x76/0xa0 fs/ioctl.c:705 __do_sys_ioctl fs/ioctl.c:712 [inline] __se_sys_ioctl fs/ioctl.c:710 [inline] __x64_sys_ioctl+0x6f/0xb0 fs/ioctl.c:710 do_syscall_64+0xa0/0x2e0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x45c479 Code: ad b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89
f7 48
89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f
83 7b b6 fb ff c3 66 2e 0f 1f 84 00 00 00 00
RSP: 002b:00007fb0e9602c78 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 00007fb0e96036d4 RCX: 000000000045c479
RDX: 0000000020000040 RSI: 0000000000000001 RDI: 0000000000000003
RBP: 000000000076bfc0 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00000000ffffffff
R13: 000000000000046d R14: 00000000004c6e1a R15: 000000000076bfcc
Allocated by task 12577: set_track mm/kasan/kasan.c:460 [inline] kasan_kmalloc mm/kasan/kasan.c:553 [inline] kasan_kmalloc+0xbf/0xe0 mm/kasan/kasan.c:531 __kmalloc+0xf3/0x1e0 mm/slub.c:3749 kmalloc include/linux/slab.h:520 [inline] load_elf_phdrs+0x118/0x1b0 fs/binfmt_elf.c:441 load_elf_binary+0x2de/0x4610 fs/binfmt_elf.c:737 search_binary_handler fs/exec.c:1654 [inline] search_binary_handler+0x15c/0x4e0 fs/exec.c:1632 exec_binprm fs/exec.c:1696 [inline] __do_execve_file.isra.0+0xf52/0x1a90 fs/exec.c:1820 do_execveat_common fs/exec.c:1866 [inline] do_execve fs/exec.c:1883 [inline] __do_sys_execve fs/exec.c:1964 [inline] __se_sys_execve fs/exec.c:1959 [inline] __x64_sys_execve+0x8a/0xb0 fs/exec.c:1959 do_syscall_64+0xa0/0x2e0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Freed by task 12577: set_track mm/kasan/kasan.c:460 [inline] __kasan_slab_free+0x129/0x170 mm/kasan/kasan.c:521 slab_free_hook mm/slub.c:1370 [inline] slab_free_freelist_hook mm/slub.c:1397 [inline] slab_free mm/slub.c:2952 [inline] kfree+0x8b/0x1a0 mm/slub.c:3904 load_elf_binary+0x1be7/0x4610 fs/binfmt_elf.c:1118 search_binary_handler fs/exec.c:1654 [inline] search_binary_handler+0x15c/0x4e0 fs/exec.c:1632 exec_binprm fs/exec.c:1696 [inline] __do_execve_file.isra.0+0xf52/0x1a90 fs/exec.c:1820 do_execveat_common fs/exec.c:1866 [inline] do_execve fs/exec.c:1883 [inline] __do_sys_execve fs/exec.c:1964 [inline] __se_sys_execve fs/exec.c:1959 [inline] __x64_sys_execve+0x8a/0xb0 fs/exec.c:1959 do_syscall_64+0xa0/0x2e0 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x44/0xa9 The buggy address belongs to the object at ffff88803b8ccf00 which belongs to the cache kmalloc-512 of size 512 The buggy address is located 259 bytes inside of 512-byte region [ffff88803b8ccf00, ffff88803b8cd100) The buggy address belongs to the page: page:ffffea0000ee3300 count:1 mapcount:0 mapping:ffff88806cc03080 index:0xffff88803b8cc780 compound_mapcount: 0 flags: 0x100000000008100(slab|head) raw: 0100000000008100 ffffea0001104080 0000000200000002 ffff88806cc03080 raw: ffff88803b8cc780 00000000800c000b 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff88803b8ccf00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff88803b8ccf80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb >ffff88803b8cd000: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^ffff88803b8cd080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fbffff88803b8cd100: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
You can refer to "https://www.lkml.org/lkml/2019/1/17/474" reproduce this error.
The exception code is "bd_len = p[3];", "p" value is ffff88803b8cd000
which belongs to the cache kmalloc-512 of size 512. The "page_address(sg_page(scsi_sglist(scmd)))" maybe from sg_scsi_ioctl function "buffer" which allocated by kzalloc, so "buffer" may not page aligned.
This also looks completely buggy on highmem systems and really needs to use akmap_atomic. --Christoph Hellwig
To address above bugs, Paolo Bonzini advise to simpler to just make a char array of size CACHE_MPAGE_LEN+8+8+4-2(or just 64 to make it easy), use sg_copy_to_buffer to copy from the sglist into the buffer, and workthere.
--- drivers/ata/libata-scsi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/ata/libata-scsi.c +6 -3
@@ -3967,12 +3967,13 @@ static unsigned int ata_scsi_mode_select_xlat(struct ata_queued_cmd *qc) {struct scsi_cmnd *scmd = qc->scsicmd;const u8 *cdb = scmd->cmnd; -const u8 *p;u8 pg, spg;unsigned six_byte, pg_len, hdr_len, bd_len;int len;u16 fp = (u16)-1 ;u8 bp =0xff ; +u8 buffer[64 ]; +const u8 *p = buffer;VPRINTK ("ENTER\n" );
@@ -4006,12 +4007,14 @@ static unsigned int ata_scsi_mode_select_xlat(struct ata_queued_cmd *qc)if (!scsi_sg_count (scmd) ||scsi_sglist (scmd)->length < len) goto invalid_param_len; - p =page_address (sg_page (scsi_sglist (scmd))); -/* Move past header and block descriptors. */ if (len < hdr_len) goto invalid_param_len; +if (!sg_copy_to_buffer (scsi_sglist (scmd),scsi_sg_count (scmd), + buffer,sizeof (buffer))) + goto invalid_param_len; +if (six_byte) bd_len = p[3 ];else
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 171/191 net: alx: fix race condition in alx_remove
In reply to Sasha LevinFrom: Zekun Shen <[email protected]>
[ Upstream commit e89df5c4322c1bf495f62d74745895b5fd2a4393 ]
There is a race condition exist during termination. The path is alx_stop and then alx_remove. An alx_schedule_link_check could be called before alx_stop by interrupt handler and invoke alx_link_check later. Alx_stop frees the napis, and alx_remove cancels any pending works. If any of the work is scheduled before termination and invoked before alx_remove, a null-ptr-deref occurs because both expect alx->napis[i].
This patch fix the race condition by moving cancel_work_sync functions before alx_free_napis inside alx_stop. Because interrupt handler can call alx_schedule_link_check again, alx_free_irq is moved before cancel_work_sync calls too.
--- drivers/net/ethernet/atheros/alx/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/atheros/alx/main.c +5 -4
@@ -1056,8 +1056,12 @@ static int __alx_open(struct alx_priv *alx, bool resume)static void __alx_stop (struct alx_priv *alx) { -alx_halt (alx);alx_free_irq (alx); + +cancel_work_sync (&alx->link_check_wk); +cancel_work_sync (&alx->reset_wk); + +alx_halt (alx);alx_free_rings (alx); }
@@ -1659,9 +1663,6 @@ static void alx_remove(struct pci_dev *pdev)struct alx_priv *alx =pci_get_drvdata (pdev);struct alx_hw *hw = &alx->hw; -cancel_work_sync (&alx->link_check_wk); -cancel_work_sync (&alx->reset_wk); -/* restore permanent mac address */ alx_set_macaddr (hw, hw->perm_addr);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 172/191 s390/ptrace: fix setting syscall number
In reply to Sasha LevinFrom: Sven Schnelle <[email protected]>
[ Upstream commit 873e5a763d604c32988c4a78913a8dab3862d2f9 ]
When strace wants to update the syscall number, it sets GPR2 to the desired number and updates the GPR via PTRACE_SETREGSET. It doesn't update regs->int_code which would cause the old syscall executed on syscall restart. As we cannot change the ptrace ABI and don't have a field for the interruption code, check whether the tracee is in a syscall and the last instruction was svc. In that case assume that the tracer wants to update the syscall number and copy the GPR2 value to regs->int_code.
--- arch/s390/kernel/ptrace.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)
arch/s390/kernel/ptrace.c +30 -1
@@ -308,6 +308,25 @@ static inline void __poke_user_per(struct task_struct *child, child->thread.per_user.end = data; } +static void fixup_int_code (struct task_struct *child,addr_t data) +{ +struct pt_regs *regs =task_pt_regs (child); +int ilc = regs->int_code >>16 ; +u16 insn; + +if (ilc >6 ) +return ; + +if (ptrace_access_vm (child, regs->psw.addr - (regs->int_code >>16 ), + &insn,sizeof (insn),FOLL_FORCE ) !=sizeof (insn)) +return ; + +/* double check that tracee stopped on svc instruction */ +if ((insn >>8 ) !=0xa ) +return ; + + regs->int_code =0x20000 | (data &0xffff ); +}/* * Write a word to the user area of a process at location addr. This * operation does have an additional problem compared to peek_user.
@@ -319,7 +338,9 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data)struct user *dummy =NULL ;addr_t offset; +if (addr < (addr_t) &dummy->regs.acrs) { +struct pt_regs *regs =task_pt_regs (child);/* * psw and gprs are stored on the stack */
@@ -337,7 +358,11 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data)/* Invalid addressing mode bits */ return -EINVAL ; } - *(addr_t *)((addr_t ) &task_pt_regs (child)->psw + addr) = data; + +if (test_pt_regs_flag (regs,PIF_SYSCALL ) && + addr == offsetof(struct user, regs.gprs[2])) +fixup_int_code (child, data); + *(addr_t *)((addr_t ) ®s->psw + addr) = data; }else if (addr < (addr_t) (&dummy->regs.orig_gpr2)) {/*
@@ -703,6 +728,10 @@ static int __poke_user_compat(struct task_struct *child, regs->psw.mask = (regs->psw.mask & ~PSW_MASK_BA ) | (__u64)(tmp &PSW32_ADDR_AMODE ); }else { + +if (test_pt_regs_flag (regs,PIF_SYSCALL ) && + addr == offsetof(struct compat_user, regs.gprs[2])) +fixup_int_code (child, data);/* gpr 0-15 */ *(__u32 *)((addr_t ) ®s->psw + addr*2 +4 ) = tmp; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 173/191 kbuild: improve cc-option to clean up all temporary files
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit f2f02ebd8f3833626642688b2d2c6a7b3c141fa9 ]
When cc-option and friends evaluate compiler flags, the temporary file $$TMP is created as an output object, and automatically cleaned up. The actual file path of $$TMP is .<pid>.tmp, here <pid> is the process ID of $(shell ...) invoked from cc-option. (Please note $$$$ is the escape sequence of $$).
Such garbage files are cleaned up in most cases, but some compiler flags create additional output files.
For example, -gsplit-dwarf creates a .dwo file.
When CONFIG_DEBUG_INFO_SPLIT=y, you will see a bunch of .<pid>.dwo files left in the top of build directories. You may not notice them unless you do 'ls -a', but the garbage files will increase every time you run 'make'.
This commit changes the temporary object path to .tmp_<pid>/tmp, and removes .tmp_<pid> directory when exiting. Separate build artifacts such as *.dwo will be cleaned up all together because their file paths are usually determined based on the base name of the object.
Another example is -ftest-coverage, which outputs the coverage data into <base-name-of-object>.gcno
--- scripts/Kbuild.include | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
scripts/Kbuild.include +6 -5
@@ -82,20 +82,21 @@ cc-cross-prefix = \ fi))) # output directory for tests below -TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/) +TMPOUT = $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_$$$$ # try-run # Usage: option = $(call try-run, $(CC)...-o "$$TMP",option-ok,otherwise) # Exit code chooses option. "$$TMP" is can be used as temporary file and # is automatically cleaned up. try-run = $(shell set -e; \ - TMP="$(TMPOUT).$$$$.tmp"; \ - TMPO="$(TMPOUT).$$$$.o"; \ + TMP=$(TMPOUT)/tmp; \ + TMPO=$(TMPOUT)/tmp.o; \ + mkdir -p $(TMPOUT); \ + trap "rm -rf $(TMPOUT)" EXIT; \ if ($(1)) >/dev/null 2>&1; \ then echo "$(2)"; \ else echo "$(3)"; \ - fi; \ - rm -f "$$TMP" "$$TMPO") + fi) # as-option # Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 174/191 blktrace: break out of blktrace setup on concurrent calls
In reply to Sasha LevinFrom: Luis Chamberlain <[email protected]>
[ Upstream commit 1b0b283648163dae2a214ca28ed5a99f62a77319 ]
We use one blktrace per request_queue, that means one per the entire disk. So we cannot run one blktrace on say /dev/vda and then /dev/vda1, or just two calls on /dev/vda.
We check for concurrent setup only at the very end of the blktrace setup though.
If we try to run two concurrent blktraces on the same block device the second one will fail, and the first one seems to go on. However when one tries to kill the first one one will see things like this:
The kernel will show these:
``` debugfs: File 'dropped' in directory 'nvme1n1' already present! debugfs: File 'msg' in directory 'nvme1n1' already present! debugfs: File 'trace0' in directory 'nvme1n1' already present! `` And userspace just sees this error message for the second call: ```
blktrace /dev/nvme1n1
BLKTRACESETUP(2) /dev/nvme1n1 failed: 5/Input/output error ```
The first userspace process #1 will also claim that the files were taken underneath their nose as well. The files are taken away form the first process given that when the second blktrace fails, it will follow up with a BLKTRACESTOP and BLKTRACETEARDOWN. This means that even if go-happy process #1 is waiting for blktrace data, we *have* been asked to take teardown the blktrace.
This can easily be reproduced with break-blktrace [0] run_0005.sh test.
Just break out early if we know we're already going to fail, this will prevent trying to create the files all over again, which we know still exist.
[0] https://github.com/mcgrof/break-blktrace
--- kernel/trace/blktrace.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
kernel/trace/blktrace.c +13 -0
@@ -15,6 +15,9 @@* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/kernel.h> #include <linux/blkdev.h> #include <linux/blktrace_api.h>
@@ -481,6 +484,16 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,*/ strreplace (buts->name,'/' ,'_' ); +/* +* bdev can be NULL, as with scsi-generic, this is a helpful as +* we can be. +*/ +if (q->blk_trace) { +pr_warn ("Concurrent blktraces are not allowed on %s\n" , + buts->name); +return -EBUSY ; + } + bt =kzalloc (sizeof (*bt),GFP_KERNEL );if (!bt)return -ENOMEM ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 175/191 ALSA: hda: Add NVIDIA codec IDs 9a & 9d through a0 to patch table
In reply to Sasha LevinFrom: Aaron Plattner <[email protected]>
commit adb36a8203831e40494a92095dacd566b2ad4a69 upstream.
These IDs are for upcoming NVIDIA chips with audio functions that are largely similar to the existing ones.
--- sound/pci/hda/patch_hdmi.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/pci/hda/patch_hdmi.c +5 -0
@@ -3687,6 +3687,11 @@ HDA_CODEC_ENTRY(0x10de0095, "GPU 95 HDMI/DP", patch_nvhdmi),HDA_CODEC_ENTRY (0x10de0097 ,"GPU 97 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de0098 ,"GPU 98 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de0099 ,"GPU 99 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de009a ,"GPU 9a HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de009d ,"GPU 9d HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de009e ,"GPU 9e HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de009f ,"GPU 9f HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00a0 ,"GPU a0 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de8001 ,"MCP73 HDMI" , patch_nvhdmi_2ch),HDA_CODEC_ENTRY (0x10de8067 ,"MCP67/68 HDMI" , patch_nvhdmi_2ch), HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP", patch_via_hdmi),
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 176/191 ACPI: sysfs: Fix pm_profile_attr type
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
commit e6d701dca9893990d999fd145e3e07223c002b06 upstream.
When running a kernel with Clang's Control Flow Integrity implemented, there is a violation that happens when accessing /sys/firmware/acpi/pm_profile:
$ cat /sys/firmware/acpi/pm_profile 0
$ dmesg ... [ 17.352564] ------------[ cut here ]------------ [ 17.352568] CFI failure (target: acpi_show_profile+0x0/0x8): [ 17.352572] WARNING: CPU: 3 PID: 497 at kernel/cfi.c:29 __cfi_check_fail+0x33/0x40 [ 17.352573] Modules linked in: [ 17.352575] CPU: 3 PID: 497 Comm: cat Tainted: G W 5.7.0-microsoft-standard+ #1 [ 17.352576] RIP: 0010:__cfi_check_fail+0x33/0x40 [ 17.352577] Code: 48 c7 c7 50 b3 85 84 48 c7 c6 50 0a 4e 84 e8 a4 d8 60 00 85 c0 75 02 5b c3 48 c7 c7 dc 5e 49 84 48 89 de 31 c0 e8 7d 06 eb ff <0f> 0b 5b c3 00 00 cc cc 00 00 cc cc 00 85 f6 74 25 41 b9 ea ff ff [ 17.352577] RSP: 0018:ffffaa6dc3c53d30 EFLAGS: 00010246 [ 17.352578] RAX: 331267e0c06cee00 RBX: ffffffff83d85890 RCX: ffffffff8483a6f8 [ 17.352579] RDX: ffff9cceabbb37c0 RSI: 0000000000000082 RDI: ffffffff84bb9e1c [ 17.352579] RBP: ffffffff845b2bc8 R08: 0000000000000001 R09: ffff9cceabbba200 [ 17.352579] R10: 000000000000019d R11: 0000000000000000 R12: ffff9cc947766f00 [ 17.352580] R13: ffffffff83d6bd50 R14: ffff9ccc6fa80000 R15: ffffffff845bd328 [ 17.352582] FS: 00007fdbc8d13580(0000) GS:ffff9cce91ac0000(0000) knlGS:0000000000000000 [ 17.352582] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 17.352583] CR2: 00007fdbc858e000 CR3: 00000005174d0000 CR4: 0000000000340ea0 [ 17.352584] Call Trace: [ 17.352586] ? rev_id_show+0x8/0x8 [ 17.352587] ? __cfi_check+0x45bac/0x4b640 [ 17.352589] ? kobj_attr_show+0x73/0x80 [ 17.352590] ? sysfs_kf_seq_show+0xc1/0x140 [ 17.352592] ? ext4_seq_options_show.cfi_jt+0x8/0x8 [ 17.352593] ? seq_read+0x180/0x600 [ 17.352595] ? sysfs_create_file_ns.cfi_jt+0x10/0x10 [ 17.352596] ? tlbflush_read_file+0x8/0x8 [ 17.352597] ? __vfs_read+0x6b/0x220 [ 17.352598] ? handle_mm_fault+0xa23/0x11b0 [ 17.352599] ? vfs_read+0xa2/0x130 [ 17.352599] ? ksys_read+0x6a/0xd0 [ 17.352601] ? __do_sys_getpgrp+0x8/0x8 [ 17.352602] ? do_syscall_64+0x72/0x120 [ 17.352603] ? entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 17.352604] ---[ end trace 7b1fa81dc897e419 ]---
When /sys/firmware/acpi/pm_profile is read, sysfs_kf_seq_show is called, which in turn calls kobj_attr_show, which gets the ->show callback member by calling container_of on attr (casting it to struct kobj_attribute) then calls it.
There is a CFI violation because pm_profile_attr is of type struct device_attribute but kobj_attr_show calls ->show expecting it to be from struct kobj_attribute. CFI checking ensures that function pointer types match when doing indirect calls. Fix pm_profile_attr to be defined in terms of kobj_attribute so there is no violation or mismatch.
--- drivers/acpi/sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/sysfs.c +2 -2
@@ -843,13 +843,13 @@ static void __exit interrupt_stats_exit(void) }static ssize_t -acpi_show_profile (struct device *dev,struct device_attribute *attr, +acpi_show_profile (struct kobject *kobj,struct kobj_attribute *attr,char *buf) {return sprintf (buf,"%d\n" , acpi_gbl_FADT.preferred_profile); } -static const struct device_attribute pm_profile_attr = +static const struct kobj_attribute pm_profile_attr =__ATTR (pm_profile,S_IRUGO , acpi_show_profile,NULL ); static ssize_t hotplug_enabled_show(struct kobject *kobj,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 177/191 KVM: X86: Fix MSR range of APIC registers in X2APIC mode
In reply to Sasha LevinFrom: Xiaoyao Li <[email protected]>
commit bf10bd0be53282183f374af23577b18b5fbf7801 upstream.
Only MSR address range 0x800 through 0x8ff is architecturally reserved and dedicated for accessing APIC registers in x2APIC mode.
Message-Id: <[email protected]>
--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
@@ -2304,7 +2304,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)return kvm_mtrr_set_msr (vcpu, msr, data);case MSR_IA32_APICBASE :return kvm_set_apic_base (vcpu, msr_info); - case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: + case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff:return kvm_x2apic_msr_write (vcpu, msr, data);case MSR_IA32_TSCDEADLINE :kvm_set_lapic_tscdeadline_msr (vcpu, data);
@@ -2576,7 +2576,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)case MSR_IA32_APICBASE : msr_info->data =kvm_get_apic_base (vcpu);break ; - case APIC_BASE_MSR ... APIC_BASE_MSR + 0x3ff: + case APIC_BASE_MSR ... APIC_BASE_MSR + 0xff:return kvm_x2apic_msr_read (vcpu, msr_info->index, &msr_info->data);break ;case MSR_IA32_TSCDEADLINE :
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 178/191 mm/slab: use memzero_explicit() in kzfree()
In reply to Sasha LevinFrom: Waiman Long <[email protected]>
commit 8982ae527fbef170ef298650c15d55a9ccd33973 upstream.
The kzfree() function is normally used to clear some sensitive information, like encryption keys, in the buffer before freeing it back to the pool. Memset() is currently used for buffer clearing. However unlikely, there is still a non-zero probability that the compiler may choose to optimize away the memory clearing especially if LTO is being used in the future.
To make sure that this optimization will never happen, memzero_explicit(), which is introduced in v3.18, is now used in kzfree() to future-proof it.
--- mm/slab_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/slab_common.c +1 -1
@@ -1345,7 +1345,7 @@ void kzfree(const void *p)if (unlikely (ZERO_OR_NULL_PTR (mem)))return ; ks =ksize (mem); -memset (mem,0 , ks); +memzero_explicit (mem, ks);kfree (mem); }EXPORT_SYMBOL (kzfree);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 179/191 ocfs2: load global_inode_alloc
In reply to Sasha LevinFrom: Junxiao Bi <[email protected]>
commit 7569d3c754e452769a5747eeeba488179e38a5da upstream.
Set global_inode_alloc as OCFS2_FIRST_ONLINE_SYSTEM_INODE, that will make it load during mount. It can be used to test whether some global/system inodes are valid. One use case is that nfsd will test whether root inode is valid.
--- fs/ocfs2/ocfs2_fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/ocfs2_fs.h +1 -1
@@ -340,8 +340,8 @@ struct ocfs2_system_inode_info {enum {BAD_BLOCK_SYSTEM_INODE =0 ,GLOBAL_INODE_ALLOC_SYSTEM_INODE , +#define OCFS2_FIRST_ONLINE_SYSTEM_INODE GLOBAL_INODE_ALLOC_SYSTEM_INODE SLOT_MAP_SYSTEM_INODE, -#define OCFS2_FIRST_ONLINE_SYSTEM_INODE SLOT_MAP_SYSTEM_INODEHEARTBEAT_SYSTEM_INODE ,GLOBAL_BITMAP_SYSTEM_INODE ,USER_QUOTA_SYSTEM_INODE ,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 180/191 ocfs2: fix value of OCFS2_INVALID_SLOT
In reply to Sasha LevinFrom: Junxiao Bi <[email protected]>
commit 9277f8334ffc719fe922d776444d6e4e884dbf30 upstream.
In the ocfs2 disk layout, slot number is 16 bits, but in ocfs2 implementation, slot number is 32 bits. Usually this will not cause any issue, because slot number is converted from u16 to u32, but OCFS2_INVALID_SLOT was defined as -1, when an invalid slot number from disk was obtained, its value was (u16)-1, and it was converted to u32. Then the following checking in get_local_system_inode will be always skipped:
static struct inode **get_local_system_inode(struct ocfs2_super *osb,
int type,
u32 slot)
{
BUG_ON(slot == OCFS2_INVALID_SLOT);
...}
--- fs/ocfs2/ocfs2_fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/ocfs2_fs.h +1 -1
@@ -304,7 +304,7 @@#define OCFS2_MAX_SLOTS 255/* Slot map indicator for an empty slot */ -#define OCFS2_INVALID_SLOT -1 +#define OCFS2_INVALID_SLOT ((u16)-1)#define OCFS2_VOL_UUID_LEN 16#define OCFS2_MAX_VOL_LABEL_LEN 64
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 181/191 ocfs2: fix panic on nfs server over ocfs2
In reply to Sasha LevinFrom: Junxiao Bi <[email protected]>
commit e5a15e17a78d58f933d17cafedfcf7486a29f5b4 upstream.
The following kernel panic was captured when running nfs server over ocfs2, at that time ocfs2_test_inode_bit() was checking whether one inode locating at "blkno" 5 was valid, that is ocfs2 root inode, its "suballoc_slot" was OCFS2_INVALID_SLOT(65535) and it was allocted from //global_inode_alloc, but here it wrongly assumed that it was got from per slot inode alloctor which would cause array overflow and trigger kernel panic.
BUG: unable to handle kernel paging request at 0000000000001088
IP: [<ffffffff816f6898>] _raw_spin_lock+0x18/0xf0
PGD 1e06ba067 PUD 1e9e7d067 PMD 0
Oops: 0002 [#1] SMP
CPU: 6 PID: 24873 Comm: nfsd Not tainted 4.1.12-124.36.1.el6uek.x86_64 #2
Hardware name: Huawei CH121 V3/IT11SGCA1, BIOS 3.87 02/02/2018
RIP: _raw_spin_lock+0x18/0xf0
RSP: e02b:ffff88005ae97908 EFLAGS: 00010206
RAX: ffff88005ae98000 RBX: 0000000000001088 RCX: 0000000000000000
RDX: 0000000000020000 RSI: 0000000000000009 RDI: 0000000000001088
RBP: ffff88005ae97928 R08: 0000000000000000 R09: ffff880212878e00
R10: 0000000000007ff0 R11: 0000000000000000 R12: 0000000000001088
R13: ffff8800063c0aa8 R14: ffff8800650c27d0 R15: 000000000000ffff
FS: 0000000000000000(0000) GS:ffff880218180000(0000) knlGS:ffff880218180000
CS: e033 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000001088 CR3: 00000002033d0000 CR4: 0000000000042660
Call Trace:
igrab+0x1e/0x60
ocfs2_get_system_file_inode+0x63/0x3a0 [ocfs2]
ocfs2_test_inode_bit+0x328/0xa00 [ocfs2]
ocfs2_get_parent+0xba/0x3e0 [ocfs2]
reconnect_path+0xb5/0x300
exportfs_decode_fh+0xf6/0x2b0
fh_verify+0x350/0x660 [nfsd]
nfsd4_putfh+0x4d/0x60 [nfsd]
nfsd4_proc_compound+0x3d3/0x6f0 [nfsd]
nfsd_dispatch+0xe0/0x290 [nfsd]
svc_process_common+0x412/0x6a0 [sunrpc]
svc_process+0x123/0x210 [sunrpc]
nfsd+0xff/0x170 [nfsd]
kthread+0xcb/0xf0
ret_from_fork+0x61/0x90
Code: 83 c2 02 0f b7 f2 e8 18 dc 91 ff 66 90 eb bf 0f 1f 40 00 55 48 89 e5 41 56 41 55 41 54 53 0f 1f 44 00 00 48 89 fb ba 00 00 02 00 <f0> 0f c1 17 89 d0 45 31 e4 45 31 ed c1 e8 10 66 39 d0 41 89 c6
RIP _raw_spin_lock+0x18/0xf0
CR2: 0000000000001088
---[ end trace 7264463cd1aac8f9 ]---
Kernel panic - not syncing: Fatal exception--- fs/ocfs2/suballoc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
fs/ocfs2/suballoc.c +6 -3
@@ -2891,9 +2891,12 @@ int ocfs2_test_inode_bit(struct ocfs2_super *osb, u64 blkno, int *res) goto bail; } - inode_alloc_inode = -ocfs2_get_system_file_inode (osb,INODE_ALLOC_SYSTEM_INODE , - suballoc_slot); +if (suballoc_slot == (u16 )OCFS2_INVALID_SLOT ) + inode_alloc_inode =ocfs2_get_system_file_inode (osb, +GLOBAL_INODE_ALLOC_SYSTEM_INODE , suballoc_slot); +else + inode_alloc_inode =ocfs2_get_system_file_inode (osb, +INODE_ALLOC_SYSTEM_INODE , suballoc_slot);if (!inode_alloc_inode) {/* the error code could be inaccurate, but we are not able to * get the correct one. */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 182/191 arm64: perf: Report the PC value in REGS_ABI_32 mode
In reply to Sasha LevinFrom: Jiping Ma <[email protected]>
commit 8dfe804a4031ca6ba3a3efb2048534249b64f3a5 upstream.
A 32-bit perf querying the registers of a compat task using REGS_ABI_32 will receive zeroes from w15, when it expects to find the PC.
Return the PC value for register dwarf register 15 when returning register values for a compat task to perf.
--- arch/arm64/kernel/perf_regs.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
arch/arm64/kernel/perf_regs.c +22 -3
@@ -13,15 +13,34 @@ u64 perf_reg_value(struct pt_regs *regs, int idx)return 0 ;/* -* Compat (i.e. 32 bit) mode: -* - PC has been set in the pt_regs struct in kernel_entry, -* - Handle SP and LR here. +* Our handling of compat tasks (PERF_SAMPLE_REGS_ABI_32) is weird, but +* we're stuck with it for ABI compatability reasons. +* +* For a 32-bit consumer inspecting a 32-bit task, then it will look at +* the first 16 registers (see arch/arm/include/uapi/asm/perf_regs.h). +* These correspond directly to a prefix of the registers saved in our +* 'struct pt_regs', with the exception of the PC, so we copy that down +* (x15 corresponds to SP_hyp in the architecture). +* +* So far, so good. +* +* The oddity arises when a 64-bit consumer looks at a 32-bit task and +* asks for registers beyond PERF_REG_ARM_MAX. In this case, we return +* SP_usr, LR_usr and PC in the positions where the AArch64 SP, LR and +* PC registers would normally live. The initial idea was to allow a +* 64-bit unwinder to unwind a 32-bit task and, although it's not clear +* how well that works in practice, somebody might be relying on it. +* +* At the time we make a sample, we don't know whether the consumer is +* 32-bit or 64-bit, so we have to cater for both possibilities. */ if (compat_user_mode (regs)) {if ((u32 )idx ==PERF_REG_ARM64_SP )return regs->compat_sp;if ((u32 )idx ==PERF_REG_ARM64_LR )return regs->compat_lr; +if (idx ==15 ) +return regs->pc; }if ((u32 )idx ==PERF_REG_ARM64_SP )
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 183/191 tracing: Fix event trigger to accept redundant spaces
In reply to Sasha LevinFrom: Masami Hiramatsu <[email protected]>
commit 6784beada631800f2c5afd567e5628c843362cee upstream.
Fix the event trigger to accept redundant spaces in the trigger input.
For example, these return -EINVAL
echo " traceon" > events/ftrace/print/trigger
echo "traceon if common_pid == 0" > events/ftrace/print/trigger echo "disable_event:kmem:kmalloc " > events/ftrace/print/trigger
But these are hard to find what is wrong.
To fix this issue, use skip_spaces() to remove spaces in front of actual tokens, and set NULL if there is no token.
--- kernel/trace/trace_events_trigger.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
kernel/trace/trace_events_trigger.c +19 -2
@@ -222,11 +222,17 @@ static int event_trigger_regex_open(struct inode *inode, struct file *file)static int trigger_process_regex (struct trace_event_file *file,char *buff) { -char *command, *next = buff; +char *command, *next;struct event_command *p;int ret = -EINVAL ; + next = buff =skip_spaces (buff); command =strsep (&next,": \t" ); +if (next) { + next =skip_spaces (next); +if (!*next) + next =NULL ; + } command = (command[0 ] !='!' ) ? command : command +1 ;mutex_lock (&trigger_cmd_mutex);
@@ -629,8 +635,14 @@ event_trigger_callback(struct event_command *cmd_ops,int ret;/* separate the trigger from the filter (t:n [if filter]) */ -if (param &&isdigit (param[0 ])) +if (param &&isdigit (param[0 ])) { trigger =strsep (¶m," \t" ); +if (param) { + param =skip_spaces (param); +if (!*param) + param =NULL ; + } + } trigger_ops = cmd_ops->get_trigger_ops (cmd, trigger);
@@ -1335,6 +1347,11 @@ int event_enable_trigger_func(struct event_command *cmd_ops, trigger =strsep (¶m," \t" );if (!trigger)return -EINVAL ; +if (param) { + param =skip_spaces (param); +if (!*param) + param =NULL ; + } system =strsep (&trigger,":" );if (!trigger)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 184/191 drm/radeon: fix fb_div check in ni_init_smc_spll_table()
In reply to Sasha LevinFrom: Denis Efremov <[email protected]>
commit 35f760b44b1b9cb16a306bdcc7220fbbf78c4789 upstream.
clk_s is checked twice in a row in ni_init_smc_spll_table(). fb_div should be checked instead.
--- drivers/gpu/drm/radeon/ni_dpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/ni_dpm.c +1 -1
@@ -2126,7 +2126,7 @@ static int ni_init_smc_spll_table(struct radeon_device *rdev)if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT )) ret = -EINVAL ; -if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT )) +if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT )) ret = -EINVAL ;if (clk_v & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKV_MASK >>SMC_NISLANDS_SPLL_DIV_TABLE_CLKV_SHIFT ))
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 185/191 sunrpc: fixed rollback in rpc_gssd_dummy_populate()
In reply to Sasha LevinFrom: Vasily Averin <[email protected]>
commit b7ade38165ca0001c5a3bd5314a314abbbfbb1b7 upstream.
__rpc_depopulate(gssd_dentry) was lost on error path
--- net/sunrpc/rpc_pipe.c | 1 + 1 file changed, 1 insertion(+)
net/sunrpc/rpc_pipe.c +1 -0
@@ -1347,6 +1347,7 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data) q.len =strlen (gssd_dummy_clnt_dir[0 ].name); clnt_dentry =d_hash_and_lookup (gssd_dentry, &q);if (!clnt_dentry) { +__rpc_depopulate (gssd_dentry, gssd_dummy_clnt_dir,0 ,1 ); pipe_dentry =ERR_PTR (-ENOENT ); goto out; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 186/191 SUNRPC: Properly set the @subbuf parameter of xdr_buf_subsegment()
In reply to Sasha LevinFrom: Chuck Lever <[email protected]>
commit 89a3c9f5b9f0bcaa9aea3e8b2a616fcaea9aad78 upstream.
@subbuf is an output parameter of xdr_buf_subsegment(). A survey of call sites shows that @subbuf is always uninitialized before xdr_buf_segment() is invoked by callers.
There are some execution paths through xdr_buf_subsegment() that do not set all of the fields in @subbuf, leaving some pointer fields containing garbage addresses. Subsequent processing of that buffer then results in a page fault.
--- net/sunrpc/xdr.c | 4 ++++ 1 file changed, 4 insertions(+)
net/sunrpc/xdr.c +4 -0
@@ -1036,6 +1036,7 @@ xdr_buf_subsegment(struct xdr_buf *buf, struct xdr_buf *subbuf, base =0 ; }else { base -= buf->head[0 ].iov_len; + subbuf->head[0 ].iov_base = buf->head[0 ].iov_base; subbuf->head[0 ].iov_len =0 ; }
@@ -1048,6 +1049,8 @@ xdr_buf_subsegment(struct xdr_buf *buf, struct xdr_buf *subbuf, base =0 ; }else { base -= buf->page_len; + subbuf->pages = buf->pages; + subbuf->page_base =0 ; subbuf->page_len =0 ; }
@@ -1059,6 +1062,7 @@ xdr_buf_subsegment(struct xdr_buf *buf, struct xdr_buf *subbuf, base =0 ; }else { base -= buf->tail[0 ].iov_len; + subbuf->tail[0 ].iov_base = buf->tail[0 ].iov_base; subbuf->tail[0 ].iov_len =0 ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 187/191 pNFS/flexfiles: Fix list corruption if the mirror count changes
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
commit 8b04013737341442ed914b336cde866b902664ae upstream.
If the mirror count changes in the new layout we pick up inside ff_layout_pg_init_write(), then we can end up adding the request to the wrong mirror and corrupting the mirror->pg_list.
--- fs/nfs/flexfilelayout/flexfilelayout.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +7 -4
@@ -939,9 +939,8 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio, goto out_mds;/* Use a direct mapping of ds_idx to pgio mirror_idx */ -if (WARN_ON_ONCE (pgio->pg_mirror_count != -FF_LAYOUT_MIRROR_COUNT (pgio->pg_lseg))) - goto out_mds; +if (pgio->pg_mirror_count !=FF_LAYOUT_MIRROR_COUNT (pgio->pg_lseg)) + goto out_eagain;for (i =0 ; i < pgio->pg_mirror_count; i++) { ds =nfs4_ff_layout_prepare_ds (pgio->pg_lseg, i, true);
@@ -960,11 +959,15 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio, }return ; - +out_eagain: +pnfs_generic_pg_cleanup (pgio); + pgio->pg_error = -EAGAIN ; +return ; out_mds:pnfs_put_lseg (pgio->pg_lseg); pgio->pg_lseg =NULL ;nfs_pageio_reset_write_mds (pgio); + pgio->pg_error = -EAGAIN ; } static unsigned int
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 188/191 NFSv4 fix CLOSE not waiting for direct IO compeletion
In reply to Sasha LevinFrom: Olga Kornievskaia <[email protected]>
commit d03727b248d0dae6199569a8d7b629a681154633 upstream.
Figuring out the root case for the REMOVE/CLOSE race and suggesting the solution was done by Neil Brown.
Currently what happens is that direct IO calls hold a reference on the open context which is decremented as an asynchronous task in the nfs_direct_complete(). Before reference is decremented, control is returned to the application which is free to close the file. When close is being processed, it decrements its reference on the open_context but since directIO still holds one, it doesn't sent a close on the wire. It returns control to the application which is free to do other operations. For instance, it can delete a file. Direct IO is finally releasing its reference and triggering an asynchronous close. Which races with the REMOVE. On the server, REMOVE can be processed before the CLOSE, failing the REMOVE with EACCES as the file is still opened.
--- fs/nfs/direct.c | 13 +++++++++---- fs/nfs/file.c | 1 + 2 files changed, 10 insertions(+), 4 deletions(-)
fs/nfs/direct.c +9 -4
@@ -379,8 +379,6 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq) {struct inode *inode = dreq->inode; -inode_dio_end (inode); -if (dreq->iocb) {long res = (long ) dreq->error;if (dreq->count !=0 ) {
@@ -392,7 +390,10 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq)complete (&dreq->completion); +igrab (inode);nfs_direct_req_release (dreq); +inode_dio_end (inode); +iput (inode); }static void nfs_direct_readpage_release (struct nfs_page *req)
@@ -534,8 +535,10 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq,* generic layer handle the completion. */ if (requested_bytes ==0 ) { -inode_dio_end (inode); +igrab (inode);nfs_direct_req_release (dreq); +inode_dio_end (inode); +iput (inode);return result <0 ? result : -EIO ; }
@@ -953,8 +956,10 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,* generic layer handle the completion. */ if (requested_bytes ==0 ) { -inode_dio_end (inode); +igrab (inode);nfs_direct_req_release (dreq); +inode_dio_end (inode); +iput (inode);return result <0 ? result : -EIO ; }
fs/nfs/file.c +1 -0
@@ -82,6 +82,7 @@ nfs_file_release(struct inode *inode, struct file *filp)dprintk ("NFS: release(%pD2)\n" , filp);nfs_inc_stats (inode,NFSIOS_VFSRELEASE ); +inode_dio_wait (inode);nfs_file_clear_open_context (filp);return 0 ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 189/191 ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate()
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
commit 6de3c9e3f6b3eaf66859e1379b3f35dda781416b upstream.
The quirk function snd_emuusb_set_samplerate() has a NULL check for the mixer element, but this is useless in the current code. It used to be a check against mixer->id_elems[unitid] but it was changed later to the value after mixer_eleme_list_to_info() which is always non-NULL due to the container_of() usage.
This patch fixes the check before the conversion.
While we're at it, correct a typo in the comment in the function, too.
--- sound/usb/mixer_quirks.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/usb/mixer_quirks.c +4 -4
@@ -1168,17 +1168,17 @@ void snd_emuusb_set_samplerate(struct snd_usb_audio *chip, {struct usb_mixer_interface *mixer;struct usb_mixer_elem_info *cval; -int unitid =12 ;/* SamleRate ExtensionUnit ID */ +int unitid =12 ;/* SampleRate ExtensionUnit ID */ list_for_each_entry (mixer, &chip->mixer_list, list) { - cval =mixer_elem_list_to_info (mixer->id_elems[unitid]); -if (cval) { +if (mixer->id_elems[unitid]) { + cval =mixer_elem_list_to_info (mixer->id_elems[unitid]);snd_usb_mixer_set_ctl_value (cval,UAC_SET_CUR , cval->control <<8 , samplerate_id);snd_usb_mixer_notify_id (mixer, unitid); +break ; } -break ; } }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 190/191 xfs: add agf freeblocks verify in xfs_agf_verify
In reply to Sasha LevinFrom: Zheng Bin <[email protected]>
[ Upstream commit d0c7feaf87678371c2c09b3709400be416b2dc62 ]
We recently used fuzz(hydra) to test XFS and automatically generate tmp.img(XFS v5 format, but some metadata is wrong)
xfs_repair information(just one AG):agf_freeblks 0, counted 3224 in ag 0agf_longest 536874136, counted 3224 in ag 0sb_fdblocks 613, counted 3228
Test as follows:
mount tmp.img tmpdir
cp file1M tmpdir
sync
In 4.19-stable, sync will stuck, the reason is:xfs_mountfs
xfs_check_summary_counts
if ((!xfs_sb_version_haslazysbcount(&mp->m_sb) ||
XFS_LAST_UNMOUNT_WAS_CLEAN(mp)) &&
!xfs_fs_has_sickness(mp, XFS_SICK_FS_COUNTERS))
return 0; -->just return, incore sb_fdblocks still be 613
xfs_initialize_perag_datacp file1M tmpdir -->ok(write file to pagecache)
sync -->stuck(write pagecache to disk)xfs_map_blocks
xfs_iomap_write_allocate
while (count_fsb != 0) {
nimaps = 0;
while (nimaps == 0) { --> endless loop
nimaps = 1;
xfs_bmapi_write(..., &nimaps) --> nimaps becomes 0 again
xfs_bmapi_write
xfs_bmap_alloc
xfs_bmap_btalloc
xfs_alloc_vextent
xfs_alloc_fix_freelist
xfs_alloc_space_available -->fail(agf_freeblks is 0)In linux-next, sync not stuck, cause commit c2b3164320b5 ("xfs:
use the latest extent at writeback delalloc conversion time") remove the above while, dmesg is as follows:
[ 55.250114] XFS (loop0): page discard on page ffffea0008bc7380, inode 0x1b0c, offset 0.
Users do not know why this page is discard, the better soultion is:
1. Like xfs_repair, make sure sb_fdblocks is equal to counted (xfs_initialize_perag_data did this, who is not called at this mount)
2. Add agf verify, if fail, will tell users to repair
This patch use the second soultion.
--- fs/xfs/libxfs/xfs_alloc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
fs/xfs/libxfs/xfs_alloc.c +16 -0
@@ -2507,6 +2507,13 @@ xfs_agf_verify( be32_to_cpu(agf->agf_flcount) <= XFS_AGFL_SIZE(mp)))return false; +if (be32_to_cpu (agf->agf_length) > mp->m_sb.sb_dblocks) +return false; + +if (be32_to_cpu (agf->agf_freeblks) <be32_to_cpu (agf->agf_longest) || +be32_to_cpu (agf->agf_freeblks) >be32_to_cpu (agf->agf_length)) +return false; + if (be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) < 1 || be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) < 1 || be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) > XFS_BTREE_MAXLEVELS ||
@@ -2518,6 +2525,10 @@ xfs_agf_verify( be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) > XFS_BTREE_MAXLEVELS))return false; +if (xfs_sb_version_hasrmapbt (&mp->m_sb) && +be32_to_cpu (agf->agf_rmap_blocks) >be32_to_cpu (agf->agf_length)) +return false; +/* * during growfs operations, the perag is not fully initialised, * so we can't use it for any useful checking. growfs ensures we can't
@@ -2531,6 +2542,11 @@ xfs_agf_verify( be32_to_cpu(agf->agf_btreeblks) > be32_to_cpu(agf->agf_length))return false; +if (xfs_sb_version_hasreflink (&mp->m_sb) && +be32_to_cpu (agf->agf_refcount_blocks) > +be32_to_cpu (agf->agf_length)) +return false; +if (xfs_sb_version_hasreflink (&mp->m_sb) && (be32_to_cpu (agf->agf_refcount_level) <1 ||be32_to_cpu (agf->agf_refcount_level) >XFS_BTREE_MAXLEVELS ))
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 191/191 Linux 4.9.229-rc1
In reply to Sasha Levin--- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
@@ -1,7 +1,7 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 228 -EXTRAVERSION = +SUBLEVEL = 229 +EXTRAVERSION = -rc1 NAME = Roaring Lionus # *DOCUMENTATION*
Signature · 1 line
2.25.1
Quoted 13 lines · Sasha Levin
This is the start of the stable review cycle for the 4.9.229 release. There are 191 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 01 Jul 2020 03:40:00 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/patch/?id=linux-4.9.y&id2=v4.9.228
Quoted 7 lines
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.--
Thanks,
Sasha
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.9.229-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.9.y
git commit: 082e807235d793b91b22c2e836fbea167c5cd6a0
git describe: v4.9.228-191-g082e807235d7
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.9-oe/build/v4.9.228-191-g082e807235d7
No regressions (compared to build v4.9.228)
No fixes (compared to build v4.9.228)
Ran 33260 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- juno-r2-compat
- juno-r2-kasan
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
- x86-kasan
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* install-android-platform-tools-r2800
* kselftest
* kselftest/drivers
* kselftest/filesystems
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* perf
* v4l2-compliance
* kvm-unit-tests
* network-basic-tests
* ltp-open-posix-tests
* kselftest/net
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Jon Hunter
maintainerQuoted 12 lines · Sasha Levin
This is the start of the stable review cycle for the 4.9.229 release. There are 191 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 01 Jul 2020 03:40:00 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/patch/?id=linux-4.9.y&id2=v4.9.228
Quoted 7 lines
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.--
Thanks,
Sasha
All tests are passing for Tegra ...
Test results for stable-v4.9:
8 builds: 8 pass, 0 fail
16 boots: 16 pass, 0 fail
30 tests: 30 pass, 0 failLinux version: 4.9.229-rc1-g082e807235d7
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 9 lines · Sasha Levin
This is the start of the stable review cycle for the 4.9.229 release. There are 191 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed 01 Jul 2020 03:40:00 PM UTC. Anything received after that time might be too late.
Build results:
total: 171 pass: 171 fail: 0 Qemu test results: total: 386 pass: 386 fail: 0
Guenter