ARM: dts: dra76x: Disable rtc target module
Subsystems (22)
Sasha Levin
maintainerPATCH 1/95 ARM: dts: dra76x: Disable rtc target module
From: Keerthy <[email protected]>
[ Upstream commit f7b9cb944a5d41fdede4e928a47e9d5fce5169d7 ]
rtc is fused out on dra76 and accessing target module register is causing a boot crash hence disable it.
--- arch/arm/boot/dts/dra7-l4.dtsi | 2 +- arch/arm/boot/dts/dra76x.dtsi | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)
arch/arm/boot/dts/dra7-l4.dtsi +1 -1
@@ -3543,7 +3543,7 @@ }; }; - target-module@38000 { /* 0x48838000, ap 29 12.0 */ + rtctarget: target-module@38000 { /* 0x48838000, ap 29 12.0 */ compatible = "ti,sysc-omap4-simple", "ti,sysc"; ti,hwmods = "rtcss"; reg = <0x38074 0x4>,
arch/arm/boot/dts/dra76x.dtsi +4 -0
@@ -81,3 +81,7 @@ reg = <0x3fc>; }; }; + +&rtctarget { + status = "disabled"; +};
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/95 ARM: dts: dra76x: Disable usb4_tm target module
From: Keerthy <[email protected]>
[ Upstream commit b07bd27e02b9108ce8412cc2dc6faf621f57d224 ]
usb4_tm is unsed on dra76 and accessing the module with ti,sysc is causing a boot crash hence disable its target module.
--- arch/arm/boot/dts/dra76x.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/dra76x.dtsi +4 -0
@@ -85,3 +85,7 @@ &rtctarget { status = "disabled"; }; + +&usb4_tm { + status = "disabled"; +};
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/95 ARM: dts: dra71x: Disable rtc target module
In reply to Sasha LevinFrom: Keerthy <[email protected]>
[ Upstream commit fe9edfe648ac444150ec95da1fb10e2728cc9789 ]
Introduce dra71x.dtsi to include dra71x specific changes. rtc is fused out on dra71 and accessing target module register is causing a boot crash hence disable it.
--- arch/arm/boot/dts/dra71-evm.dts | 2 +- arch/arm/boot/dts/dra71x.dtsi | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/dra71x.dtsi
arch/arm/boot/dts/dra71-evm.dts +1 -1
@@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "dra72-evm-common.dtsi" +#include "dra71x.dtsi" #include "dra7-mmc-iodelay.dtsi" #include "dra72x-mmc-iodelay.dtsi" #include <dt-bindings/net/ti-dp83867.h>
arch/arm/boot/dts/dra71x.dtsi new file +13 -0
@@ -0,0 +1,13 @@ +/* + * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "dra72-evm-common.dtsi" + +&rtctarget { + status = "disabled"; +};
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/95 ARM: dts: dra71x: Disable usb4_tm target module
In reply to Sasha LevinFrom: Keerthy <[email protected]>
[ Upstream commit 34b1b8061de3215208db9accfe60cc3f5b40178f ]
usb4_tm is unsed on dra71 and accessing the module with ti,sysc is causing a boot crash hence disable its target module.
--- arch/arm/boot/dts/dra71x.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/dra71x.dtsi +4 -0
@@ -11,3 +11,7 @@ &rtctarget { status = "disabled"; }; + +&usb4_tm { + status = "disabled"; +};
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/95 soc: brcmstb: Fix error path for unsupported CPUs
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit 490cad5a3ad6ef0bfd3168a5063140b982f3b22a ]
In case setup_hifcpubiuctrl_regs() returns an error, because of e.g:
an unsupported CPU type, just catch that error and return instead of blindly continuing with the initialization. This fixes a NULL pointer de-reference with the code continuing without having a proper array of registers to use.
--- drivers/soc/bcm/brcmstb/biuctrl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/soc/bcm/brcmstb/biuctrl.c +3 -1
@@ -246,7 +246,9 @@ static int __init brcmstb_biuctrl_init(void)if (!np)return 0 ; -setup_hifcpubiuctrl_regs (np); + ret =setup_hifcpubiuctrl_regs (np); +if (ret) +return ret; ret =mcp_write_pairing_set ();if (ret) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/95 soc: bcm: brcmstb: biuctrl: Register writes require a barrier
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit 6b23af0783a54efb348f0bd781b7850636023dbb ]
The BIUCTRL register writes require that a data barrier be inserted after comitting the write to the register for the block to latch in the recently written values. Reads have no such requirement and are not changed.
--- drivers/soc/bcm/brcmstb/biuctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/bcm/brcmstb/biuctrl.c +1 -1
@@ -56,7 +56,7 @@ static inline void cbc_writel(u32 val, int reg)if (offset ==-1 )return ; -writel_relaxed (val, cpubiuctrl_base + offset); +writel (val, cpubiuctrl_base + offset); }enum cpubiuctrl_regs {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/95 Input: elantech - enable middle button support on 2 ThinkPads
In reply to Sasha LevinFrom: Aaron Ma <[email protected]>
[ Upstream commit aa440de3058a3ef530851f9ef373fbb5f694dbc3 ]
Adding 2 new touchpad PNPIDs to enable middle button support.
--- drivers/input/mouse/elantech.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/mouse/elantech.c +2 -0
@@ -1189,6 +1189,8 @@ static const char * const middle_button_pnp_ids[] = {"LEN2132" ,/* ThinkPad P52 */ "LEN2133" ,/* ThinkPad P72 w/ NFC */ "LEN2134" ,/* ThinkPad P72 */ +"LEN0407" , +"LEN0408" , NULL };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/95 bpf: fix out-of-bounds read in __bpf_skc_lookup
In reply to Sasha LevinFrom: Lorenz Bauer <[email protected]>
[ Upstream commit 9b28ae243ef3b13d8a88b5451d025475c75ebdef ]
__bpf_skc_lookup takes a socket tuple and the length of the tuple as an argument. Based on the length, it decides which address family to pass to the helper function sk_lookup.
In case of AF_INET6, it fails to verify that the length of the tuple is long enough. sk_lookup may therefore access data past the end of the tuple.
--- net/core/filter.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/core/filter.c +7 -1
@@ -5173,7 +5173,13 @@ __bpf_sk_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,struct net *net;int sdif; - family = len ==sizeof (tuple->ipv4) ?AF_INET :AF_INET6 ; +if (len ==sizeof (tuple->ipv4)) + family =AF_INET ; +else if (len ==sizeof (tuple->ipv6)) + family =AF_INET6 ; +else +return NULL ; +if (unlikely (family ==AF_UNSPEC || flags || !((s32 )netns_id <0 || netns_id <=S32_MAX ))) goto out;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/95 samples, bpf: fix to change the buffer size for read()
In reply to Sasha LevinFrom: Chang-Hsien Tsai <[email protected]>
[ Upstream commit f7c2d64bac1be2ff32f8e4f500c6e5429c1003e0 ]
If the trace for read is larger than 4096, the return value sz will be 4096. This results in off-by-one error on buf:
static char buf[4096];
ssize_t sz;
sz = read(trace_fd, buf, sizeof(buf));
if (sz > 0) {
buf[sz] = 0;
puts(buf);
}--- samples/bpf/bpf_load.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/bpf/bpf_load.c +1 -1
@@ -678,7 +678,7 @@ void read_trace_pipe(void)static char buf[4096 ];ssize_t sz; - sz =read (trace_fd, buf,sizeof (buf)); + sz =read (trace_fd, buf,sizeof (buf) -1 );if (sz >0 ) { buf[sz] =0 ;puts (buf);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/95 samples, bpf: suppress compiler warning
In reply to Sasha LevinFrom: Matteo Croce <[email protected]>
[ Upstream commit a195cefff49f60054998333e81ee95170ce8bf92 ]
GCC 9 fails to calculate the size of local constant strings and produces a false positive:
samples/bpf/task_fd_query_user.c: In function ‘test_debug_fs_uprobe’:samples/bpf/task_fd_query_user.c:242:67: warning: ‘%s’ directive output may be truncated writing up to 255 bytes into a region of size 215 [-Wformat-truncation=]
242 | snprintf(buf, sizeof(buf), "/sys/kernel/debug/tracing/events/%ss/%s/id",
| ^~
243 | event_type, event_alias);
| ~~~~~~~~~~~
samples/bpf/task_fd_query_user.c:242:2: note: ‘snprintf’ output between 45 and 300 bytes into a destination of size 256
242 | snprintf(buf, sizeof(buf), "/sys/kernel/debug/tracing/events/%ss/%s/id",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
243 | event_type, event_alias);
| ~~~~~~~~~~~~~~~~~~~~~~~~Workaround this by lowering the buffer size to a reasonable value. Related GCC Bugzilla: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83431
--- samples/bpf/task_fd_query_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/bpf/task_fd_query_user.c +1 -1
@@ -216,7 +216,7 @@ static int test_debug_fs_uprobe(char *binary_path, long offset, bool is_return) {const char *event_type ="uprobe" ;struct perf_event_attr attr = {}; -char buf[256 ], event_alias[256 ]; +char buf[256 ], event_alias[sizeof ("test_1234567890" )];__u64 probe_offset, probe_addr;__u32 len, prog_id, fd_type;int err, res, kfd, efd;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/95 bpf, riscv: clear target register high 32-bits for and/or/xor on ALU32
In reply to Sasha LevinFrom: Björn Töpel <[email protected]>
[ Upstream commit fe121ee531d1362810bfd30f38a1b88b1d3d376c ]
When using 32-bit subregisters (ALU32), the RISC-V JIT would not clear the high 32-bits of the target register and therefore generate incorrect code.
E.g., in the following code:
$ cat test.c
unsigned int f(unsigned long long a,
unsigned int b)
{
return (unsigned int)a & b;
}$ clang-9 -target bpf -O2 -emit-llvm -S test.c -o - | \ llc-9 -mattr=+alu32 -mcpu=v3 .text .file "test.c" .globl f .p2align 3 .type f,@function f: r0 = r1 w0 &= w2 exit .Lfunc_end0: .size f, .Lfunc_end0-f
The JIT would not clear the high 32-bits of r0 after the and-operation, which in this case might give an incorrect return value.
After this patch, that is not the case, and the upper 32-bits are cleared.
--- arch/riscv/net/bpf_jit_comp.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/riscv/net/bpf_jit_comp.c +6 -0
@@ -759,14 +759,20 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,case BPF_ALU |BPF_AND |BPF_X :case BPF_ALU64 |BPF_AND |BPF_X :emit (rv_and (rd, rd, rs), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;case BPF_ALU |BPF_OR |BPF_X :case BPF_ALU64 |BPF_OR |BPF_X :emit (rv_or (rd, rd, rs), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;case BPF_ALU |BPF_XOR |BPF_X :case BPF_ALU64 |BPF_XOR |BPF_X :emit (rv_xor (rd, rd, rs), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;case BPF_ALU |BPF_MUL |BPF_X :case BPF_ALU64 |BPF_MUL |BPF_X :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/95 bpf: sockmap, restore sk_write_space when psock gets dropped
In reply to Sasha LevinFrom: Jakub Sitnicki <[email protected]>
[ Upstream commit 186bcc3dcd106dc52d706117f912054b616666e1 ]
Once psock gets unlinked from its sock (sk_psock_drop), user-space can still trigger a call to sk->sk_write_space by setting TCP_NOTSENT_LOWAT socket option. This causes a null-ptr-deref because we try to read psock->saved_write_space from sk_psock_write_space:
==================================================================
BUG: KASAN: null-ptr-deref in sk_psock_write_space+0x69/0x80 Read of size 8 at addr 00000000000001a0 by task sockmap-echo/131 CPU: 0 PID: 131 Comm: sockmap-echo Not tainted 5.2.0-rc1-00094-gf49aa1de9836 #81 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20180724_192412-buildhw-07.phx2.fedoraproject.org-1.fc29 04/01/2014 Call Trace: ? sk_psock_write_space+0x69/0x80 __kasan_report.cold.2+0x5/0x3f ? sk_psock_write_space+0x69/0x80 kasan_report+0xe/0x20 sk_psock_write_space+0x69/0x80 tcp_setsockopt+0x69a/0xfc0 ? tcp_shutdown+0x70/0x70 ? fsnotify+0x5b0/0x5f0 ? remove_wait_queue+0x90/0x90 ? __fget_light+0xa5/0xf0 __sys_setsockopt+0xe6/0x180 ? sockfd_lookup_light+0xb0/0xb0 ? vfs_write+0x195/0x210 ? ksys_write+0xc9/0x150 ? __x64_sys_read+0x50/0x50 ? __bpf_trace_x86_fpu+0x10/0x10 __x64_sys_setsockopt+0x61/0x70 do_syscall_64+0xc5/0x520 ? vmacache_find+0xc0/0x110 ? syscall_return_slowpath+0x110/0x110 ? handle_mm_fault+0xb4/0x110 ? entry_SYSCALL_64_after_hwframe+0x3e/0xbe ? trace_hardirqs_off_caller+0x4b/0x120 ? trace_hardirqs_off_thunk+0x1a/0x3a entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x7f2e5e7cdcce Code: d8 64 89 02 48 c7 c0 ff ff ff ff eb b1 66 2e 0f 1f 84 00 00 00 00 00
0f 1f 44 00 00 f3 0f 1e fa 49 89 ca b8 36 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 8a 11 0c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffed011b778 EFLAGS: 00000206 ORIG_RAX: 0000000000000036
RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00007f2e5e7cdcce
RDX: 0000000000000019 RSI: 0000000000000006 RDI: 0000000000000007
RBP: 00007ffed011b790 R08: 0000000000000004 R09: 00007f2e5e84ee80
R10: 00007ffed011b788 R11: 0000000000000206 R12: 00007ffed011b78c
R13: 00007ffed011b788 R14: 0000000000000007 R15: 0000000000000068
==================================================================
Restore the saved sk_write_space callback when psock is being dropped to fix the crash.
--- include/linux/skmsg.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/skmsg.h +2 -0
@@ -351,6 +351,8 @@ static inline void sk_psock_update_proto(struct sock *sk,static inline void sk_psock_restore_proto (struct sock *sk,struct sk_psock *psock) { + sk->sk_write_space = psock->saved_write_space; +if (psock->sk_proto) { sk->sk_prot = psock->sk_proto; psock->sk_proto =NULL ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/95 mac80211: fix rate reporting inside cfg80211_calculate_bitrate_he()
In reply to Sasha LevinFrom: John Crispin <[email protected]>
[ Upstream commit 25d16d124a5e249e947c0487678b61dcff25cf8b ]
The reported rate is not scaled down correctly. After applying this patch, the function will behave just like the v/ht equivalents.
--- net/wireless/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/wireless/util.c +1 -1
@@ -1237,7 +1237,7 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate)if (rate->he_dcm) result /=2 ; -return result; +return result /10000 ; }u32 cfg80211_calculate_bitrate (struct rate_info *rate)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/95 bpf: sockmap, fix use after free from sleep in psock backlog workqueue
In reply to Sasha LevinFrom: John Fastabend <[email protected]>
[ Upstream commit bd95e678e0f6e18351ecdc147ca819145db9ed7b ]
Backlog work for psock (sk_psock_backlog) might sleep while waiting for memory to free up when sending packets. However, while sleeping the socket may be closed and removed from the map by the user space side.
This breaks an assumption in sk_stream_wait_memory, which expects the wait queue to be still there when it wakes up resulting in a use-after-free shown below. To fix his mark sendmsg as MSG_DONTWAIT to avoid the sleep altogether. We already set the flag for the sendpage case but we missed the case were sendmsg is used. Sockmap is currently the only user of skb_send_sock_locked() so only the sockmap paths should be impacted.
==================================================================
BUG: KASAN: use-after-free in remove_wait_queue+0x31/0x70 Write of size 8 at addr ffff888069a0c4e8 by task kworker/0:2/110 CPU: 0 PID: 110 Comm: kworker/0:2 Not tainted 5.0.0-rc2-00335-g28f9d1a3d4fe-dirty #14 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-2.fc27 04/01/2014 Workqueue: events sk_psock_backlog Call Trace: print_address_description+0x6e/0x2b0 ? remove_wait_queue+0x31/0x70 kasan_report+0xfd/0x177 ? remove_wait_queue+0x31/0x70 ? remove_wait_queue+0x31/0x70 remove_wait_queue+0x31/0x70 sk_stream_wait_memory+0x4dd/0x5f0 ? sk_stream_wait_close+0x1b0/0x1b0 ? wait_woken+0xc0/0xc0 ? tcp_current_mss+0xc5/0x110 tcp_sendmsg_locked+0x634/0x15d0 ? tcp_set_state+0x2e0/0x2e0 ? __kasan_slab_free+0x1d1/0x230 ? kmem_cache_free+0x70/0x140 ? sk_psock_backlog+0x40c/0x4b0 ? process_one_work+0x40b/0x660 ? worker_thread+0x82/0x680 ? kthread+0x1b9/0x1e0 ? ret_from_fork+0x1f/0x30 ? check_preempt_curr+0xaf/0x130 ? iov_iter_kvec+0x5f/0x70 ? kernel_sendmsg_locked+0xa0/0xe0 skb_send_sock_locked+0x273/0x3c0 ? skb_splice_bits+0x180/0x180 ? start_thread+0xe0/0xe0 ? update_min_vruntime.constprop.27+0x88/0xc0 sk_psock_backlog+0xb3/0x4b0 ? strscpy+0xbf/0x1e0 process_one_work+0x40b/0x660 worker_thread+0x82/0x680 ? process_one_work+0x660/0x660 kthread+0x1b9/0x1e0 ? __kthread_create_on_node+0x250/0x250 ret_from_fork+0x1f/0x30
--- net/core/skbuff.c | 1 + 1 file changed, 1 insertion(+)
net/core/skbuff.c +1 -0
@@ -2309,6 +2309,7 @@ int skb_send_sock_locked(struct sock *sk, struct sk_buff *skb, int offset, kv.iov_base = skb->data + offset; kv.iov_len = slen;memset (&msg,0 ,sizeof (msg)); + msg.msg_flags =MSG_DONTWAIT ; ret =kernel_sendmsg_locked (sk, &msg, &kv,1 , slen);if (ret <=0 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/95 soundwire: stream: fix out of boundary access on port properties
In reply to Sasha LevinFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 03ecad90d3798be11b033248bbd4bbff4425a1c7 ]
Assigning local iterator to array element and using it again for indexing would cross the array boundary.
Fix this by directly referring array element without using the local variable.
--- drivers/soundwire/stream.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/soundwire/stream.c +1 -3
@@ -1401,9 +1401,7 @@ struct sdw_dpn_prop *sdw_get_slave_dpn_prop(struct sdw_slave *slave, }for (i =0 ; i < num_ports; i++) { - dpn_prop = &dpn_prop[i]; - -if (dpn_prop->num == port_num) +if (dpn_prop[i].num == port_num)return &dpn_prop[i]; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/95 staging:iio:ad7150: fix threshold mode config bit
In reply to Sasha LevinFrom: Melissa Wen <[email protected]>
[ Upstream commit df4d737ee4d7205aaa6275158aeebff87fd14488 ]
According to the AD7150 configuration register description, bit 7 assumes value 1 when the threshold mode is fixed and 0 when it is adaptive, however, the operation that identifies this mode was considering the opposite values.
This patch renames the boolean variable to describe it correctly and properly replaces it in the places where it is used.
--- drivers/staging/iio/cdc/ad7150.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/staging/iio/cdc/ad7150.c +11 -8
@@ -6,6 +6,7 @@* Licensed under the GPL-2 or later. */ +#include <linux/bitfield.h> #include <linux/interrupt.h> #include <linux/device.h> #include <linux/kernel.h>
@@ -131,7 +132,7 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev, {int ret;u8 threshtype; -bool adaptive; +bool thrfixed;struct ad7150_chip_info *chip =iio_priv (indio_dev); ret =i2c_smbus_read_byte_data (chip->client,AD7150_CFG );
@@ -139,21 +140,23 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev,return ret; threshtype = (ret >>5 ) &0x03 ; - adaptive = !!(ret &0x80 ); + +/*check if threshold mode is fixed or adaptive*/ + thrfixed =FIELD_GET (AD7150_CFG_FIX , ret);switch (type) {case IIO_EV_TYPE_MAG_ADAPTIVE :if (dir ==IIO_EV_DIR_RISING ) -return adaptive && (threshtype ==0x1 ); -return adaptive && (threshtype ==0x0 ); +return !thrfixed && (threshtype ==0x1 ); +return !thrfixed && (threshtype ==0x0 );case IIO_EV_TYPE_THRESH_ADAPTIVE :if (dir ==IIO_EV_DIR_RISING ) -return adaptive && (threshtype ==0x3 ); -return adaptive && (threshtype ==0x2 ); +return !thrfixed && (threshtype ==0x3 ); +return !thrfixed && (threshtype ==0x2 );case IIO_EV_TYPE_THRESH :if (dir ==IIO_EV_DIR_RISING ) -return !adaptive && (threshtype ==0x1 ); -return !adaptive && (threshtype ==0x0 ); +return thrfixed && (threshtype ==0x1 ); +return thrfixed && (threshtype ==0x0 );default :break ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/95 iio: imu: st_lsm6dsx: fix PM support for st_lsm6dsx i2c controller
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit bce0d57db388cdb1c1931d0aa7d31c77b590e0f0 ]
Properly suspend/resume i2c slaves connected to st_lsm6dsx master controller if the CPU goes in suspended state
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 ++ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 25 +++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +2 -0
@@ -265,6 +265,7 @@ struct st_lsm6dsx_sensor {* @conf_lock: Mutex to prevent concurrent FIFO configuration update. * @page_lock: Mutex to prevent concurrent memory page configuration. * @fifo_mode: FIFO operating mode supported by the device. +* @suspend_mask: Suspended sensor bitmask. * @enable_mask: Enabled sensor bitmask. * @ts_sip: Total number of timestamp samples in a given pattern. * @sip: Total number of samples (acc/gyro/ts) in a given pattern.
@@ -282,6 +283,7 @@ struct st_lsm6dsx_hw {struct mutex page_lock;enum st_lsm6dsx_fifo_mode fifo_mode; +u8 suspend_mask;u8 enable_mask;u8 ts_sip;u8 sip;
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +17 -8
@@ -1023,8 +1023,6 @@ static int __maybe_unused st_lsm6dsx_suspend(struct device *dev) {struct st_lsm6dsx_hw *hw =dev_get_drvdata (dev);struct st_lsm6dsx_sensor *sensor; -const struct st_lsm6dsx_reg *reg; -unsigned int data;int i, err =0 ;for (i =0 ; i <ST_LSM6DSX_ID_MAX ; i++) {
@@ -1035,12 +1033,16 @@ static int __maybe_unused st_lsm6dsx_suspend(struct device *dev)if (!(hw->enable_mask &BIT (sensor->id)))continue ; - reg = &st_lsm6dsx_odr_table[sensor->id].reg; - data =ST_LSM6DSX_SHIFT_VAL (0 , reg->mask); - err =st_lsm6dsx_update_bits_locked (hw, reg->addr, reg->mask, - data); +if (sensor->id ==ST_LSM6DSX_ID_EXT0 || + sensor->id ==ST_LSM6DSX_ID_EXT1 || + sensor->id ==ST_LSM6DSX_ID_EXT2 ) + err =st_lsm6dsx_shub_set_enable (sensor, false); +else + err =st_lsm6dsx_sensor_set_enable (sensor, false);if (err <0 )return err; + + hw->suspend_mask |=BIT (sensor->id); }if (hw->fifo_mode !=ST_LSM6DSX_FIFO_BYPASS )
@@ -1060,12 +1062,19 @@ static int __maybe_unused st_lsm6dsx_resume(struct device *dev)continue ; sensor =iio_priv (hw->iio_devs[i]); -if (!(hw->enable_mask &BIT (sensor->id))) +if (!(hw->suspend_mask &BIT (sensor->id)))continue ; - err =st_lsm6dsx_set_odr (sensor, sensor->odr); +if (sensor->id ==ST_LSM6DSX_ID_EXT0 || + sensor->id ==ST_LSM6DSX_ID_EXT1 || + sensor->id ==ST_LSM6DSX_ID_EXT2 ) + err =st_lsm6dsx_shub_set_enable (sensor, true); +else + err =st_lsm6dsx_sensor_set_enable (sensor, true);if (err <0 )return err; + + hw->suspend_mask &= ~BIT (sensor->id); }if (hw->enable_mask)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/95 iio: temperature: mlx90632 Relax the compatibility check
In reply to Sasha LevinFrom: Crt Mori <[email protected]>
[ Upstream commit 389fc70b60f534d679aea9a3f05146040ce20d77 ]
Register EE_VERSION contains mixture of calibration information and DSP version. So far, because calibrations were definite, the driver compatibility depended on whole contents, but in the newer production process the calibration part changes. Because of that, value in EE_VERSION will be changed and to avoid that calibration value is same as DSP version the MSB in calibration part was fixed to 1.
That means existing calibrations (medical and consumer) will now have hex values (bits 8 to 15) of 83 and 84 respectively. Driver compatibility should be based only on DSP version part of the EE_VERSION (bits 0 to 7) register.
--- drivers/iio/temperature/mlx90632.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/iio/temperature/mlx90632.c +7 -2
@@ -81,6 +81,8 @@/* Magic constants */ #define MLX90632_ID_MEDICAL 0x0105/* EEPROM DSPv5 Medical device id */ #define MLX90632_ID_CONSUMER 0x0205/* EEPROM DSPv5 Consumer device id */ +#define MLX90632_DSP_VERSION 5/* DSP version */ +#define MLX90632_DSP_MASK GENMASK(7, 0)/* DSP version in EE_VERSION */ #define MLX90632_RESET_CMD 0x0006/* Reset sensor (address or global) */ #define MLX90632_REF_12 12LL/**< ResCtrlRef value of Ch 1 or Ch 2 */ #define MLX90632_REF_3 12LL/**< ResCtrlRef value of Channel 3 */
@@ -667,10 +669,13 @@ static int mlx90632_probe(struct i2c_client *client, }else if (read ==MLX90632_ID_CONSUMER ) {dev_dbg (&client->dev,"Detected Consumer EEPROM calibration %x\n" , read); + }else if ((read &MLX90632_DSP_MASK ) ==MLX90632_DSP_VERSION ) { +dev_dbg (&client->dev, +"Detected Unknown EEPROM calibration %x\n" , read); }else {dev_err (&client->dev, -"EEPROM version mismatch %x (expected %x or %x)\n" , - read,MLX90632_ID_CONSUMER ,MLX90632_ID_MEDICAL ); +"Wrong DSP version %x (expected %x)\n" , + read,MLX90632_DSP_VERSION );return -EPROTONOSUPPORT ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/95 mac80211: mesh: fix RCU warning
In reply to Sasha LevinFrom: Thomas Pedersen <[email protected]>
[ Upstream commit 551842446ed695641a00782cd118cbb064a416a1 ]
ifmsh->csa is an RCU-protected pointer. The writer context in ieee80211_mesh_finish_csa() is already mutually exclusive with wdev->sdata.mtx, but the RCU checker did not know this. Use rcu_dereference_protected() to avoid a warning.
fixes the following warning:
[ 12.519089] =============================
[ 12.520042] WARNING: suspicious RCU usage
[ 12.520652] 5.1.0-rc7-wt+ #16 Tainted: G W
[ 12.521409] -----------------------------
[ 12.521972] net/mac80211/mesh.c:1223 suspicious rcu_dereference_check() usage!
[ 12.522928] other info that might help us debug this:
[ 12.523984] rcu_scheduler_active = 2, debug_locks = 1
[ 12.524855] 5 locks held by kworker/u8:2/152:
[ 12.525438] #0: 00000000057be08c ((wq_completion)phy0){+.+.}, at: process_one_work+0x1a2/0x620
[ 12.526607] #1: 0000000059c6b07a ((work_completion)(&sdata->csa_finalize_work)){+.+.}, at: process_one_work+0x1a2/0x620
[ 12.528001] #2: 00000000f184ba7d (&wdev->mtx){+.+.}, at: ieee80211_csa_finalize_work+0x2f/0x90
[ 12.529116] #3: 00000000831a1f54 (&local->mtx){+.+.}, at: ieee80211_csa_finalize_work+0x47/0x90
[ 12.530233] #4: 00000000fd06f988 (&local->chanctx_mtx){+.+.}, at: ieee80211_csa_finalize_work+0x51/0x90--- net/mac80211/mesh.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/mac80211/mesh.c +4 -1
@@ -1220,7 +1220,8 @@ int ieee80211_mesh_finish_csa(struct ieee80211_sub_if_data *sdata) ifmsh->chsw_ttl =0 ;/* Remove the CSA and MCSP elements from the beacon */ - tmp_csa_settings =rcu_dereference (ifmsh->csa); + tmp_csa_settings =rcu_dereference_protected (ifmsh->csa, +lockdep_is_held (&sdata->wdev.mtx));RCU_INIT_POINTER (ifmsh->csa,NULL );if (tmp_csa_settings)kfree_rcu (tmp_csa_settings, rcu_head);
@@ -1242,6 +1243,8 @@ int ieee80211_mesh_csa_beacon(struct ieee80211_sub_if_data *sdata,struct mesh_csa_settings *tmp_csa_settings;int ret =0 ; +lockdep_assert_held (&sdata->wdev.mtx); + tmp_csa_settings =kmalloc (sizeof (*tmp_csa_settings),GFP_ATOMIC );if (!tmp_csa_settings)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 20/95 mac80211: free peer keys before vif down in mesh
In reply to Sasha LevinFrom: Pradeep Kumar Chitrapu <[email protected]>
[ Upstream commit 0112fa557c3bb3a002bc85760dc3761d737264d3 ]
freeing peer keys after vif down is resulting in peer key uninstall to fail due to interface lookup failure. so fix that.
--- net/mac80211/mesh.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/mesh.c +1 -0
@@ -929,6 +929,7 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)/* flush STAs and mpaths on this iface */ sta_info_flush (sdata); +ieee80211_free_keys (sdata, true);mesh_path_flush_by_iface (sdata);/* stop the beacon */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 21/95 ARM: dts: Drop bogus CLKSEL for timer12 on dra7
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 34f61de87017aff3c8306280d196dddb1e168a88 ]
There is no CLKSEL for timer12 on dra7 unlike for timer1. This causes issues on booting the device that Tomi noticed if DEBUG_SLAB is enabled and the clkctrl clock does not properly handle non-existing clock. Let's drop the bogus CLKSEL clock, the clkctrl clock handling gets fixed separately.
--- arch/arm/boot/dts/dra7-l4.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm/boot/dts/dra7-l4.dtsi +0 -2
@@ -4450,8 +4450,6 @@ timer12: timer@0 { compatible = "ti,omap5430-timer"; reg = <0x0 0x80>; - clocks = <&wkupaon_clkctrl DRA7_WKUPAON_TIMER12_CLKCTRL 24>; - clock-names = "fck"; interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; ti,timer-alwon; ti,timer-secure;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 22/95 mwifiex: Fix possible buffer overflows at parsing bss descriptor
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 13ec7f10b87f5fc04c4ccbd491c94c7980236a74 ]
mwifiex_update_bss_desc_with_ie() calls memcpy() unconditionally in a couple places without checking the destination size. Since the source is given from user-space, this may trigger a heap buffer overflow.
Fix it by putting the length check before performing memcpy().
This fix addresses CVE-2019-3846.
--- drivers/net/wireless/marvell/mwifiex/scan.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/marvell/mwifiex/scan.c +4 -0
@@ -1247,6 +1247,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, }switch (element_id) {case WLAN_EID_SSID : +if (element_len >IEEE80211_MAX_SSID_LEN ) +return -EINVAL ; bss_entry->ssid.ssid_len = element_len;memcpy (bss_entry->ssid.ssid, (current_ptr +2 ), element_len);
@@ -1256,6 +1258,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_SUPP_RATES : +if (element_len >MWIFIEX_SUPPORTED_RATES ) +return -EINVAL ;memcpy (bss_entry->data_rates, current_ptr +2 , element_len); memcpy(bss_entry->supported_rates, current_ptr + 2,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 23/95 mwifiex: Abort at too short BSS descriptor element
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 685c9b7750bfacd6fc1db50d86579980593b7869 ]
Currently mwifiex_update_bss_desc_with_ie() implicitly assumes that the source descriptor entries contain the enough size for each type and performs copying without checking the source size. This may lead to read over boundary.
Fix this by putting the source size check in appropriate places.
--- drivers/net/wireless/marvell/mwifiex/scan.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/wireless/marvell/mwifiex/scan.c +15 -0
@@ -1269,6 +1269,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_FH_PARAMS : +if (element_len +2 <sizeof (*fh_param_set)) +return -EINVAL ; fh_param_set = (struct ieee_types_fh_param_set *) current_ptr; memcpy(&bss_entry->phy_param_set.fh_param_set,
@@ -1277,6 +1279,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_DS_PARAMS : +if (element_len +2 <sizeof (*ds_param_set)) +return -EINVAL ; ds_param_set = (struct ieee_types_ds_param_set *) current_ptr;
@@ -1288,6 +1292,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_CF_PARAMS : +if (element_len +2 <sizeof (*cf_param_set)) +return -EINVAL ; cf_param_set = (struct ieee_types_cf_param_set *) current_ptr; memcpy(&bss_entry->ss_param_set.cf_param_set,
@@ -1296,6 +1302,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_IBSS_PARAMS : +if (element_len +2 <sizeof (*ibss_param_set)) +return -EINVAL ; ibss_param_set = (struct ieee_types_ibss_param_set *) current_ptr;
@@ -1305,10 +1313,14 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_ERP_INFO : +if (!element_len) +return -EINVAL ; bss_entry->erp_flags = *(current_ptr +2 );break ;case WLAN_EID_PWR_CONSTRAINT : +if (!element_len) +return -EINVAL ; bss_entry->local_constraint = *(current_ptr +2 ); bss_entry->sensed_11h = true;break ;
@@ -1349,6 +1361,9 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_VENDOR_SPECIFIC : +if (element_len +2 <sizeof (vendor_ie->vend_hdr)) +return -EINVAL ; + vendor_ie = (struct ieee_types_vendor_specific *) current_ptr;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/95 bpf, riscv: clear high 32 bits for ALU32 add/sub/neg/lsh/rsh/arsh
In reply to Sasha LevinFrom: Luke Nelson <[email protected]>
[ Upstream commit 1e692f09e091bf5c8b38384f297d6dae5dbf0f12 ]
In BPF, 32-bit ALU operations should zero-extend their results into the 64-bit registers.
The current BPF JIT on RISC-V emits incorrect instructions that perform sign extension only (e.g., addw, subw) on 32-bit add, sub, lsh, rsh, arsh, and neg. This behavior diverges from the interpreter and JITs for other architectures.
This patch fixes the bugs by performing zero extension on the destination register of 32-bit ALU operations.
--- arch/riscv/net/bpf_jit_comp.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/riscv/net/bpf_jit_comp.c +18 -0
@@ -751,10 +751,14 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,case BPF_ALU |BPF_ADD |BPF_X :case BPF_ALU64 |BPF_ADD |BPF_X :emit (is64 ?rv_add (rd, rd, rs) :rv_addw (rd, rd, rs), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;case BPF_ALU |BPF_SUB |BPF_X :case BPF_ALU64 |BPF_SUB |BPF_X :emit (is64 ?rv_sub (rd, rd, rs) :rv_subw (rd, rd, rs), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;case BPF_ALU |BPF_AND |BPF_X :case BPF_ALU64 |BPF_AND |BPF_X :
@@ -795,14 +799,20 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,case BPF_ALU |BPF_LSH |BPF_X :case BPF_ALU64 |BPF_LSH |BPF_X :emit (is64 ?rv_sll (rd, rd, rs) :rv_sllw (rd, rd, rs), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;case BPF_ALU |BPF_RSH |BPF_X :case BPF_ALU64 |BPF_RSH |BPF_X :emit (is64 ?rv_srl (rd, rd, rs) :rv_srlw (rd, rd, rs), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;case BPF_ALU |BPF_ARSH |BPF_X :case BPF_ALU64 |BPF_ARSH |BPF_X :emit (is64 ?rv_sra (rd, rd, rs) :rv_sraw (rd, rd, rs), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;/* dst = -dst */
@@ -810,6 +820,8 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,case BPF_ALU64 |BPF_NEG :emit (is64 ?rv_sub (rd,RV_REG_ZERO , rd) :rv_subw (rd,RV_REG_ZERO , rd), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;/* dst = BSWAP##imm(dst) */
@@ -964,14 +976,20 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,case BPF_ALU |BPF_LSH |BPF_K :case BPF_ALU64 |BPF_LSH |BPF_K :emit (is64 ?rv_slli (rd, rd, imm) :rv_slliw (rd, rd, imm), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;case BPF_ALU |BPF_RSH |BPF_K :case BPF_ALU64 |BPF_RSH |BPF_K :emit (is64 ?rv_srli (rd, rd, imm) :rv_srliw (rd, rd, imm), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;case BPF_ALU |BPF_ARSH |BPF_K :case BPF_ALU64 |BPF_ARSH |BPF_K :emit (is64 ?rv_srai (rd, rd, imm) :rv_sraiw (rd, rd, imm), ctx); +if (!is64) +emit_zext_32 (rd, ctx);break ;/* JUMP off */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/95 iwlwifi: fix load in rfkill flow for unified firmware
In reply to Sasha LevinFrom: Emmanuel Grumbach <[email protected]>
[ Upstream commit b3500b472c880b5abe90ffd5c4a25aa736f906ad ]
When we have a single image (same firmware image for INIT and OPERATIONAL), we couldn't load the driver and register to the stack if we had hardware RF-Kill asserted.
Fix this. This required a few changes:
1) Run the firmware as part of the INIT phase even if its ucode_type is not IWL_UCODE_INIT.
2) Send the commands that are sent to the unified image in INIT flow even in RF-Kill.
3) Don't ask the transport to stop the hardware upon RF-Kill interrupt if the RF-Kill is asserted.
4) Allow the RF-Kill interrupt to take us out of L1A so that the RF-Kill interrupt will be received by the host (to enable the radio).
--- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 23 ++++++++++++++----- .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 17 ++++++++++---- .../wireless/intel/iwlwifi/pcie/internal.h | 2 +- 5 files changed, 33 insertions(+), 13 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +17 -6
@@ -311,6 +311,8 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,int ret;enum iwl_ucode_type old_type = mvm->fwrt.cur_fw_img;static const u16 alive_cmd[] = {MVM_ALIVE }; +bool run_in_rfkill = + ucode_type ==IWL_UCODE_INIT ||iwl_mvm_has_unified_ucode (mvm); if (ucode_type == IWL_UCODE_REGULAR && iwl_fw_dbg_conf_usniffer(mvm->fw, FW_DBG_START_FROM_ALIVE) &&
@@ -328,7 +330,12 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm, alive_cmd,ARRAY_SIZE (alive_cmd), iwl_alive_fn, &alive_data); - ret =iwl_trans_start_fw (mvm->trans, fw, ucode_type ==IWL_UCODE_INIT ); +/* +* We want to load the INIT firmware even in RFKILL +* For the unified firmware case, the ucode_type is not +* INIT, but we still need to run it. +*/ + ret =iwl_trans_start_fw (mvm->trans, fw, run_in_rfkill);if (ret) {iwl_fw_set_current_image (&mvm->fwrt, old_type);iwl_remove_notification (&mvm->notif_wait, &alive_wait);
@@ -433,7 +440,8 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)* commands */ ret =iwl_mvm_send_cmd_pdu (mvm,WIDE_ID (SYSTEM_GROUP , -INIT_EXTENDED_CFG_CMD ),0 , +INIT_EXTENDED_CFG_CMD ), +CMD_SEND_IN_RFKILL ,sizeof (init_cfg), &init_cfg);if (ret) { IWL_ERR(mvm, "Failed to run init config command: %d\n",
@@ -457,7 +465,8 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) } ret =iwl_mvm_send_cmd_pdu (mvm,WIDE_ID (REGULATORY_AND_NVM_GROUP , -NVM_ACCESS_COMPLETE ),0 , +NVM_ACCESS_COMPLETE ), +CMD_SEND_IN_RFKILL ,sizeof (nvm_complete), &nvm_complete);if (ret) { IWL_ERR(mvm, "Failed to run complete NVM access: %d\n",
@@ -482,6 +491,8 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) } } + mvm->rfkill_safe_init_done = true; +return 0 ; error:
@@ -526,7 +537,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)lockdep_assert_held (&mvm->mutex); -if (WARN_ON_ONCE (mvm->calibrating)) +if (WARN_ON_ONCE (mvm->rfkill_safe_init_done))return 0 ; iwl_init_notification_wait(&mvm->notif_wait,
@@ -576,7 +587,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) goto remove_notif; } - mvm->calibrating = true; + mvm->rfkill_safe_init_done = true;/* Send TX valid antennas before triggering calibrations */ ret =iwl_send_tx_ant_cfg (mvm,iwl_mvm_get_valid_tx_ant (mvm));
@@ -612,7 +623,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) remove_notif:iwl_remove_notification (&mvm->notif_wait, &calib_wait); out: - mvm->calibrating = false; + mvm->rfkill_safe_init_done = false;if (iwlmvm_mod_params.init_dbg && !mvm->nvm_data) {/* we want to debug INIT and we have no NVM - fake */ mvm->nvm_data = kzalloc(sizeof(struct iwl_nvm_data) +
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +1 -1
@@ -1211,7 +1211,7 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm) mvm->scan_status =0 ; mvm->ps_disabled = false; - mvm->calibrating = false; + mvm->rfkill_safe_init_done = false;/* just in case one was running */ iwl_mvm_cleanup_roc_te (mvm);
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +1 -1
@@ -877,7 +877,7 @@ struct iwl_mvm {struct iwl_mvm_vif *bf_allowed_vif;bool hw_registered; -bool calibrating; +bool rfkill_safe_init_done;bool support_umac_log;u32 ampdu_ref;
drivers/net/wireless/intel/iwlwifi/mvm/ops.c +13 -4
@@ -1222,7 +1222,8 @@ void iwl_mvm_set_hw_ctkill_state(struct iwl_mvm *mvm, bool state)static bool iwl_mvm_set_hw_rfkill_state (struct iwl_op_mode *op_mode,bool state) {struct iwl_mvm *mvm =IWL_OP_MODE_GET_MVM (op_mode); -bool calibrating =READ_ONCE (mvm->calibrating); +bool rfkill_safe_init_done =READ_ONCE (mvm->rfkill_safe_init_done); +bool unified =iwl_mvm_has_unified_ucode (mvm);if (state)set_bit (IWL_MVM_STATUS_HW_RFKILL , &mvm->status);
@@ -1231,15 +1232,23 @@ static bool iwl_mvm_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)iwl_mvm_set_rfkill_state (mvm); -/* iwl_run_init_mvm_ucode is waiting for results, abort it */ -if (calibrating) +/* iwl_run_init_mvm_ucode is waiting for results, abort it. */ +if (rfkill_safe_init_done)iwl_abort_notification_waits (&mvm->notif_wait); +/* +* Don't ask the transport to stop the firmware. We'll do it +* after cfg80211 takes us down. +*/ +if (unified) +return false; +/* * Stop the device if we run OPERATIONAL firmware or if we are in the * middle of the calibrations. */ -return state && (mvm->fwrt.cur_fw_img !=IWL_UCODE_INIT || calibrating); +return state && (mvm->fwrt.cur_fw_img !=IWL_UCODE_INIT || + rfkill_safe_init_done); }static void iwl_mvm_free_skb (struct iwl_op_mode *op_mode,struct sk_buff *skb)
drivers/net/wireless/intel/iwlwifi/pcie/internal.h +1 -1
@@ -948,7 +948,7 @@ static inline void iwl_enable_rfkill_int(struct iwl_trans *trans) MSIX_HW_INT_CAUSES_REG_RF_KILL); } -if (trans->cfg->device_family ==IWL_DEVICE_FAMILY_9000 ) { +if (trans->cfg->device_family >=IWL_DEVICE_FAMILY_9000 ) {/* * On 9000-series devices this bit isn't enabled by default, so * when we power down the device we need set the bit to allow it
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 26/95 iwlwifi: clear persistence bit according to device family
In reply to Sasha LevinFrom: Shahar S Matityahu <[email protected]>
[ Upstream commit 44f61b5c832c4085fcf476484efeaeef96dcfb8b ]
The driver attempts to clear persistence bit on any device familiy even though only 9000 and 22000 families require it. Clear the bit only on the relevant device families.
Each HW has different address to the write protection register. Use the right register for each HW
--- drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 7 ++- .../net/wireless/intel/iwlwifi/pcie/trans.c | 46 +++++++++++++------ 2 files changed, 39 insertions(+), 14 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-prph.h +6 -1
@@ -402,7 +402,12 @@ enum aux_misc_master1_en {#define AUX_MISC_MASTER1_SMPHR_STATUS 0xA20800#define RSA_ENABLE 0xA24B08#define PREG_AUX_BUS_WPROT_0 0xA04CC0 -#define PREG_PRPH_WPROT_0 0xA04CE0 + +/* device family 9000 WPROT register */ +#define PREG_PRPH_WPROT_9000 0xA04CE0 +/* device family 22000 WPROT register */ +#define PREG_PRPH_WPROT_22000 0xA04D00 +#define SB_CPU_1_STATUS 0xA01E30#define SB_CPU_2_STATUS 0xA01E34#define UMAG_SB_CPU_1_STATUS 0xA038C0
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +33 -13
65 lines not on this page · raw message
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 27/95 iwlwifi: fix AX201 killer sku loading firmware issue
In reply to Sasha LevinFrom: Matt Chen <[email protected]>
[ Upstream commit b17dc0632a17fbfe66b34ee7c24e1cc10cfc503e ]
When try to bring up the AX201 2 killer sku, we
run into:
[81261.392463] iwlwifi 0000:01:00.0: loaded firmware version 46.8c20f243.0 op_mode iwlmvm [81261.407407] iwlwifi 0000:01:00.0: Detected Intel(R) Dual Band Wireless AX 22000, REV=0x340 [81262.424778] iwlwifi 0000:01:00.0: Collecting data: trigger 16 fired. [81262.673359] iwlwifi 0000:01:00.0: Start IWL Error Log Dump: [81262.673365] iwlwifi 0000:01:00.0: Status: 0x00000000, count: -906373681 [81262.673368] iwlwifi 0000:01:00.0: Loaded firmware version: 46.8c20f243.0 [81262.673371] iwlwifi 0000:01:00.0: 0x507C015D | ADVANCED_SYSASSERT
Fix this issue by adding 2 more cfg to avoid modifying the original cfg configuration.
--- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +3 -1
@@ -3585,7 +3585,9 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, } }else if (CSR_HW_RF_ID_TYPE_CHIP_ID (trans->hw_rf_id) ==CSR_HW_RF_ID_TYPE_CHIP_ID (CSR_HW_RF_ID_TYPE_HR ) && - (trans->cfg != &iwl_ax200_cfg_cc || + ((trans->cfg != &iwl_ax200_cfg_cc && + trans->cfg != &killer1650x_2ax_cfg && + trans->cfg != &killer1650w_2ax_cfg) || trans->hw_rev ==CSR_HW_REV_TYPE_QNJ_B0 )) {u32 hw_status;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 28/95 iwlwifi: Fix double-free problems in iwl_req_fw_callback()
In reply to Sasha LevinFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit a8627176b0de7ba3f4524f641ddff4abf23ae4e4 ]
In the error handling code of iwl_req_fw_callback(), iwl_dealloc_ucode() is called to free data. In iwl_drv_stop(), iwl_dealloc_ucode() is called again, which can cause double-free problems.
To fix this bug, the call to iwl_dealloc_ucode() in iwl_req_fw_callback() is deleted.
This bug is found by a runtime fuzzing tool named FIZZER written by us.
--- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/iwl-drv.c +0 -1
@@ -1579,7 +1579,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) goto free; out_free_fw: -iwl_dealloc_ucode (drv);release_firmware (ucode_raw); out_unbind:complete (&drv->request_firmware_complete);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 29/95 mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 69ae4f6aac1578575126319d3f55550e7e440449 ]
A few places in mwifiex_uap_parse_tail_ies() perform memcpy() unconditionally, which may lead to either buffer overflow or read over boundary.
This patch addresses the issues by checking the read size and the destination size at each place more properly. Along with the fixes, the patch cleans up the code slightly by introducing a temporary variable for the token size, and unifies the error path with the standard goto statement.
--- drivers/net/wireless/marvell/mwifiex/ie.c | 47 +++++++++++++++-------- 1 file changed, 31 insertions(+), 16 deletions(-)
drivers/net/wireless/marvell/mwifiex/ie.c +31 -16
@@ -329,6 +329,8 @@ static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,struct ieee80211_vendor_ie *vendorhdr;u16 gen_idx =MWIFIEX_AUTO_IDX_MASK , ie_len =0 ;int left_len, parsed_len =0 ; +unsigned int token_len; +int err =0 ;if (!info->tail || !info->tail_len)return 0 ;
@@ -344,6 +346,12 @@ static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,*/ while (left_len >sizeof (struct ieee_types_header )) { hdr = (void *)(info->tail + parsed_len); + token_len = hdr->len +sizeof (struct ieee_types_header ); +if (token_len > left_len) { + err = -EINVAL ; + goto out; + } +switch (hdr->element_id) {case WLAN_EID_SSID :case WLAN_EID_SUPP_RATES :
@@ -361,17 +369,20 @@ static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,if (cfg80211_find_vendor_ie (WLAN_OUI_MICROSOFT ,WLAN_OUI_TYPE_MICROSOFT_WMM , (const u8 *)hdr, - hdr->len +sizeof (struct ieee_types_header ))) + token_len))break ;/* fall through */ default : -memcpy (gen_ie->ie_buffer + ie_len, hdr, - hdr->len +sizeof (struct ieee_types_header )); - ie_len += hdr->len +sizeof (struct ieee_types_header ); +if (ie_len + token_len >IEEE_MAX_IE_SIZE ) { + err = -EINVAL ; + goto out; + } +memcpy (gen_ie->ie_buffer + ie_len, hdr, token_len); + ie_len += token_len;break ; } - left_len -= hdr->len +sizeof (struct ieee_types_header ); - parsed_len += hdr->len +sizeof (struct ieee_types_header ); + left_len -= token_len; + parsed_len += token_len; }/* parse only WPA vendor IE from tail, WMM IE is configured by
@@ -381,15 +392,17 @@ static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,WLAN_OUI_TYPE_MICROSOFT_WPA , info->tail, info->tail_len);if (vendorhdr) { -memcpy (gen_ie->ie_buffer + ie_len, vendorhdr, - vendorhdr->len +sizeof (struct ieee_types_header )); - ie_len += vendorhdr->len +sizeof (struct ieee_types_header ); + token_len = vendorhdr->len +sizeof (struct ieee_types_header ); +if (ie_len + token_len >IEEE_MAX_IE_SIZE ) { + err = -EINVAL ; + goto out; + } +memcpy (gen_ie->ie_buffer + ie_len, vendorhdr, token_len); + ie_len += token_len; } -if (!ie_len) { -kfree (gen_ie); -return 0 ; - } +if (!ie_len) + goto out; gen_ie->ie_index =cpu_to_le16 (gen_idx); gen_ie->mgmt_subtype_mask = cpu_to_le16(MGMT_MASK_BEACON |
@@ -399,13 +412,15 @@ static int mwifiex_uap_parse_tail_ies(struct mwifiex_private *priv,if (mwifiex_update_uap_custom_ie (priv, gen_ie, &gen_idx,NULL ,NULL ,NULL ,NULL )) { -kfree (gen_ie); -return -1 ; + err = -EINVAL ; + goto out; } priv->gen_idx = gen_idx; + + out:kfree (gen_ie); -return 0 ; +return err; }/* This function parses different IEs-head & tail IEs, beacon IEs,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 30/95 bpf: udp: ipv6: Avoid running reuseport's bpf_prog from __udp6_lib_err
In reply to Sasha LevinFrom: Martin KaFai Lau <[email protected]>
[ Upstream commit 4ac30c4b3659efac031818c418beb51e630d512d ]
__udp6_lib_err() may be called when handling icmpv6 message. For example, the icmpv6 toobig(type=2). __udp6_lib_lookup() is then called which may call reuseport_select_sock(). reuseport_select_sock() will call into a bpf_prog (if there is one).
reuseport_select_sock() is expecting the skb->data pointing to the transport header (udphdr in this case). For example, run_bpf_filter() is pulling the transport header.
However, in the __udp6_lib_err() path, the skb->data is pointing to the ipv6hdr instead of the udphdr.
One option is to pull and push the ipv6hdr in __udp6_lib_err(). Instead of doing this, this patch follows how the original commit 538950a1b752 ("soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPF") was done in IPv4, which has passed a NULL skb pointer to reuseport_select_sock().
--- net/ipv6/udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/udp.c +1 -1
@@ -516,7 +516,7 @@ int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,struct net *net =dev_net (skb->dev); sk =__udp6_lib_lookup (net, daddr, uh->dest, saddr, uh->source, -inet6_iif (skb),inet6_sdif (skb), udptable, skb); +inet6_iif (skb),inet6_sdif (skb), udptable,NULL );if (!sk) {/* No socket for error: try tunnels before discarding */ sk =ERR_PTR (-ENOENT );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 31/95 bpf: udp: Avoid calling reuseport's bpf_prog from udp_gro
In reply to Sasha LevinFrom: Martin KaFai Lau <[email protected]>
[ Upstream commit 257a525fe2e49584842c504a92c27097407f778f ]
When the commit a6024562ffd7 ("udp: Add GRO functions to UDP socket") added udp[46]_lib_lookup_skb to the udp_gro code path, it broke the reuseport_select_sock() assumption that skb->data is pointing to the transport header.
This patch follows an earlier __udp6_lib_err() fix by passing a NULL skb to avoid calling the reuseport's bpf_prog.
--- net/ipv4/udp.c | 6 +++++- net/ipv6/udp.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-)
net/ipv4/udp.c +5 -1
@@ -503,7 +503,11 @@ static inline struct sock *__udp4_lib_lookup_skb(struct sk_buff *skb,struct sock *udp4_lib_lookup_skb (struct sk_buff *skb,__be16 sport,__be16 dport) { -return __udp4_lib_lookup_skb (skb, sport, dport, &udp_table); +const struct iphdr *iph =ip_hdr (skb); + +return __udp4_lib_lookup (dev_net (skb->dev), iph->saddr, sport, + iph->daddr, dport,inet_iif (skb), +inet_sdif (skb), &udp_table,NULL ); }EXPORT_SYMBOL_GPL (udp4_lib_lookup_skb);
net/ipv6/udp.c +1 -1
@@ -242,7 +242,7 @@ struct sock *udp6_lib_lookup_skb(struct sk_buff *skb,return __udp6_lib_lookup (dev_net (skb->dev), &iph->saddr, sport, &iph->daddr, dport,inet6_iif (skb), -inet6_sdif (skb), &udp_table, skb); +inet6_sdif (skb), &udp_table,NULL ); }EXPORT_SYMBOL_GPL (udp6_lib_lookup_skb);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 32/95 netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments
In reply to Sasha LevinFrom: Guillaume Nault <[email protected]>
[ Upstream commit a0d56cb911ca301de81735f1d73c2aab424654ba ]
With commit 997dd9647164 ("net: IP6 defrag: use rbtrees in nf_conntrack_reasm.c"), nf_ct_frag6_reasm() is now called from nf_ct_frag6_queue(). With this change, nf_ct_frag6_queue() can fail after the skb has been added to the fragment queue and nf_ct_frag6_gather() was adapted to handle this case.
But nf_ct_frag6_queue() can still fail before the fragment has been queued. nf_ct_frag6_gather() can't handle this case anymore, because it has no way to know if nf_ct_frag6_queue() queued the fragment before failing. If it didn't, the skb is lost as the error code is overwritten with -EINPROGRESS.
Fix this by setting -EINPROGRESS directly in nf_ct_frag6_queue(), so that nf_ct_frag6_gather() can propagate the error as is.
--- net/ipv6/netfilter/nf_conntrack_reasm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
net/ipv6/netfilter/nf_conntrack_reasm.c +5 -7
@@ -293,7 +293,11 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb, skb->_skb_refdst =0UL ; err =nf_ct_frag6_reasm (fq, skb, prev, dev); skb->_skb_refdst = orefdst; -return err; + +/* After queue has assumed skb ownership, only 0 or +* -EINPROGRESS must be returned. +*/ +return err ? -EINPROGRESS :0 ; }skb_dst_drop (skb);
@@ -480,12 +484,6 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user) ret =0 ; } -/* after queue has assumed skb ownership, only 0 or -EINPROGRESS -* must be returned. -*/ -if (ret) - ret = -EINPROGRESS ; -spin_unlock_bh (&fq->q.lock);inet_frag_put (&fq->q);return ret;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 33/95 tools: bpftool: Fix JSON output when lookup fails
In reply to Sasha LevinFrom: Krzesimir Nowak <[email protected]>
[ Upstream commit 1884c066579a7a274dd981a4d9639ca63db66a23 ]
In commit 9a5ab8bf1d6d ("tools: bpftool: turn err() and info() macros into functions") one case of error reporting was special cased, so it could report a lookup error for a specific key when dumping the map element. What the code forgot to do is to wrap the key and value keys into a JSON object, so an example output of pretty JSON dump of a sockhash map (which does not support looking up its values) is:
[
"key": ["0x0a","0x41","0x00","0x02","0x1f","0x78","0x00","0x00"
],
"value": {
"error": "Operation not supported"
},
"key": ["0x0a","0x41","0x00","0x02","0x1f","0x78","0x00","0x01"
],
"value": {
"error": "Operation not supported"
}]
Note the key-value pairs inside the toplevel array. They should be wrapped inside a JSON object, otherwise it is an invalid JSON. This commit fixes this, so the output now is:
[{
"key": ["0x0a","0x41","0x00","0x02","0x1f","0x78","0x00","0x00"
],
"value": {
"error": "Operation not supported"
}
},{
"key": ["0x0a","0x41","0x00","0x02","0x1f","0x78","0x00","0x01"
],
"value": {
"error": "Operation not supported"
}
}]
--- tools/bpf/bpftool/map.c | 2 ++ 1 file changed, 2 insertions(+)
tools/bpf/bpftool/map.c +2 -0
@@ -713,12 +713,14 @@ static int dump_map_elem(int fd, void *key, void *value,return 0 ;if (json_output) { +jsonw_start_object (json_wtr);jsonw_name (json_wtr,"key" );print_hex_data_json (key, map_info->key_size);jsonw_name (json_wtr,"value" );jsonw_start_object (json_wtr);jsonw_string_field (json_wtr,"error" ,strerror (lookup_errno));jsonw_end_object (json_wtr); +jsonw_end_object (json_wtr); }else {if (errno ==ENOENT )print_entry_plain (map_info, key,NULL );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 34/95 soundwire: stream: fix bad unlock balance
In reply to Sasha LevinFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 9315d904c7e8f38886e2820fa6cb8d0fa723ea21 ]
the msg lock is taken for multi-link cases only but released unconditionally, leading to an unlock balance warning for single-link usages This patch fixes this.
=====================================
WARNING: bad unlock balance detected!
5.1.0-16506-gc1c383a6f0a2-dirty #1523 Tainted: G W
-------------------------------------
aplay/2954 is trying to release lock (&bus->msg_lock) at:
do_bank_switch+0x21c/0x480 but there are no more locks to release!
--- drivers/soundwire/stream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/soundwire/stream.c +2 -1
@@ -805,7 +805,8 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) goto error; } -mutex_unlock (&bus->msg_lock); +if (bus->multi_link) +mutex_unlock (&bus->msg_lock); }return ret;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 35/95 soundwire: intel: set dai min and max channels correctly
In reply to Sasha LevinFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 39194128701bf2af9bbc420ffe6e3cb5d2c16061 ]
Looks like there is a copy paste error.
This patch fixes it!
--- drivers/soundwire/intel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soundwire/intel.c +2 -2
@@ -714,8 +714,8 @@ static int intel_create_dai(struct sdw_cdns *cdns,return -ENOMEM ; } - dais[i].playback.channels_min =1 ; - dais[i].playback.channels_max = max_ch; + dais[i].capture.channels_min =1 ; + dais[i].capture.channels_max = max_ch; dais[i].capture.rates =SNDRV_PCM_RATE_48000 ; dais[i].capture.formats =SNDRV_PCM_FMTBIT_S16_LE ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 36/95 netfilter: ipv6: nf_defrag: accept duplicate fragments again
In reply to Sasha LevinFrom: Guillaume Nault <[email protected]>
[ Upstream commit 8a3dca632538c550930ce8bafa8c906b130d35cf ]
When fixing the skb leak introduced by the conversion to rbtree, I forgot about the special case of duplicate fragments. The condition under the 'insert_error' label isn't effective anymore as nf_ct_frg6_gather() doesn't override the returned value anymore. So duplicate fragments now get NF_DROP verdict.
To accept duplicate fragments again, handle them specially as soon as inet_frag_queue_insert() reports them. Return -EINPROGRESS which will translate to NF_STOLEN verdict, like any accepted fragment. However, such packets don't carry any new information and aren't queued, so we just drop them immediately.
--- net/ipv6/netfilter/nf_conntrack_reasm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
net/ipv6/netfilter/nf_conntrack_reasm.c +7 -3
@@ -265,8 +265,14 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb, prev = fq->q.fragments_tail; err =inet_frag_queue_insert (&fq->q, skb, offset, end); -if (err) +if (err) { +if (err ==IPFRAG_DUP ) { +/* No error for duplicates, pretend they got queued. */ +kfree_skb (skb); +return -EINPROGRESS ; + } goto insert_error; + }if (dev) fq->iif = dev->ifindex;
@@ -304,8 +310,6 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb,return -EINPROGRESS ; insert_error: -if (err ==IPFRAG_DUP ) - goto err;inet_frag_kill (&fq->q); err:skb_dst_drop (skb);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 37/95 dt-bindings: can: mcp251x: add mcp25625 support
In reply to Sasha LevinFrom: Sean Nyekjaer <[email protected]>
[ Upstream commit 0df82dcd55832a99363ab7f9fab954fcacdac3ae ]
Fully compatible with mcp2515, the mcp25625 have integrated transceiver.
This patch add the mcp25625 to the device tree bindings documentation.
--- Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt +1 -0
@@ -4,6 +4,7 @@ Required properties: - compatible: Should be one of the following: - "microchip,mcp2510" for MCP2510. - "microchip,mcp2515" for MCP2515. + - "microchip,mcp25625" for MCP25625. - reg: SPI chip select. - clocks: The clock feeding the CAN controller. - interrupts: Should contain IRQ line for the CAN controller.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 38/95 can: mcp251x: add support for mcp25625
In reply to Sasha LevinFrom: Sean Nyekjaer <[email protected]>
[ Upstream commit 35b7fa4d07c43ad79b88e6462119e7140eae955c ]
Fully compatible with mcp2515, the mcp25625 have integrated transceiver.
This patch adds support for the mcp25625 to the existing mcp251x driver.
--- drivers/net/can/spi/Kconfig | 5 +++-- drivers/net/can/spi/mcp251x.c | 25 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-)
drivers/net/can/spi/Kconfig +3 -2
@@ -8,9 +8,10 @@ config CAN_HI311X Driver for the Holt HI311x SPI CAN controllers. config CAN_MCP251X - tristate "Microchip MCP251x SPI CAN controllers" + tristate "Microchip MCP251x and MCP25625 SPI CAN controllers" depends on HAS_DMA ---help--- - Driver for the Microchip MCP251x SPI CAN controllers. + Driver for the Microchip MCP251x and MCP25625 SPI CAN + controllers. endmenu
drivers/net/can/spi/mcp251x.c +16 -9
@@ -1,5 +1,5 @@/* -* CAN bus driver for Microchip 251x CAN Controller with SPI Interface +* CAN bus driver for Microchip 251x/25625 CAN Controller with SPI Interface * * MCP2510 support and bug fixes by Christian Pellegrin * <[email protected]>
@@ -41,7 +41,7 @@* static struct spi_board_info spi_board_info[] = { * { * .modalias = "mcp2510", -* // or "mcp2515" depending on your controller +* // "mcp2515" or "mcp25625" depending on your controller * .platform_data = &mcp251x_info, * .irq = IRQ_EINT13, * .max_speed_hz = 2*1000*1000,
@@ -238,6 +238,7 @@ static const struct can_bittiming_const mcp251x_bittiming_const = {enum mcp251x_model {CAN_MCP251X_MCP2510 =0x2510 ,CAN_MCP251X_MCP2515 =0x2515 , +CAN_MCP251X_MCP25625 =0x25625 , };struct mcp251x_priv {
@@ -280,7 +281,6 @@ static inline int mcp251x_is_##_model(struct spi_device *spi) \ }MCP251X_IS (2510 ); -MCP251X_IS (2515 );static void mcp251x_clean (struct net_device *net) {
@@ -639,7 +639,7 @@ static int mcp251x_hw_reset(struct spi_device *spi)/* Wait for oscillator startup timer after reset */ mdelay (MCP251X_OST_DELAY_MS ); - + reg =mcp251x_read_reg (spi,CANSTAT );if ((reg &CANCTRL_REQOP_MASK ) !=CANCTRL_REQOP_CONF )return -ENODEV ;
@@ -820,9 +820,8 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)/* receive buffer 0 */ if (intf &CANINTF_RX0IF ) {mcp251x_hw_rx (spi,0 ); -/* -* Free one buffer ASAP -* (The MCP2515 does this automatically.) +/* Free one buffer ASAP +* (The MCP2515/25625 does this automatically.) */ if (mcp251x_is_2510 (spi))mcp251x_write_bits (spi,CANINTF ,CANINTF_RX0IF ,0x00 );
@@ -831,7 +830,7 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)/* receive buffer 1 */ if (intf &CANINTF_RX1IF ) {mcp251x_hw_rx (spi,1 ); -/* the MCP2515 does this automatically */ +/* The MCP2515/25625 does this automatically. */ if (mcp251x_is_2510 (spi)) clear_intf |=CANINTF_RX1IF ; }
@@ -1006,6 +1005,10 @@ static const struct of_device_id mcp251x_of_match[] = { .compatible = "microchip,mcp2515", .data = (void *)CAN_MCP251X_MCP2515, }, + { + .compatible = "microchip,mcp25625", + .data = (void *)CAN_MCP251X_MCP25625, + }, { } };MODULE_DEVICE_TABLE (of, mcp251x_of_match);
@@ -1019,6 +1022,10 @@ static const struct spi_device_id mcp251x_id_table[] = { .name = "mcp2515", .driver_data = (kernel_ulong_t)CAN_MCP251X_MCP2515, }, + { + .name = "mcp25625", + .driver_data = (kernel_ulong_t)CAN_MCP251X_MCP25625, + }, { } };MODULE_DEVICE_TABLE (spi, mcp251x_id_table);
@@ -1259,5 +1266,5 @@ module_spi_driver(mcp251x_can_driver);MODULE_AUTHOR ("Chris Elston <[email protected]>, " "Christian Pellegrin <[email protected]>" ); -MODULE_DESCRIPTION ("Microchip 251x CAN driver" ); +MODULE_DESCRIPTION ("Microchip 251x/25625 CAN driver" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 39/95 can: m_can: implement errata "Needless activation of MRAF irq"
In reply to Sasha LevinFrom: Eugen Hristev <[email protected]>
[ Upstream commit 3e82f2f34c930a2a0a9e69fdc2de2f2f1388b442 ]
During frame reception while the MCAN is in Error Passive state and the Receive Error Counter has thevalue MCAN_ECR.REC = 127, it may happen that MCAN_IR.MRAF is set although there was no Message RAM access failure. If MCAN_IR.MRAF is enabled, an interrupt to the Host CPU is generated.
Work around:
The Message RAM Access Failure interrupt routine needs to check whether
MCAN_ECR.RP = '1' and MCAN_ECR.REC = '127'.
In this case, reset MCAN_IR.MRAF. No further action is required. This affects versions older than 3.2.0
Errata explained on Sama5d2 SoC which includes this hardware block:
http://ww1.microchip.com/downloads/en/DeviceDoc/SAMA5D2-Family-Silicon-Errata-and-Data-Sheet-Clarification-DS80000803B.pdf
chapter 6.2
Reproducibility: If 2 devices with m_can are connected back to back, configuring different bitrate on them will lead to interrupt storm on the receiving side, with error "Message RAM access failure occurred". Another way is to have a bad hardware connection. Bad wire connection can lead to this issue as well.
This patch fixes the issue according to provided workaround.
--- drivers/net/can/m_can/m_can.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/net/can/m_can/m_can.c +21 -0
@@ -822,6 +822,27 @@ static int m_can_poll(struct napi_struct *napi, int quota)if (!irqstatus) goto end; +/* Errata workaround for issue "Needless activation of MRAF irq" +* During frame reception while the MCAN is in Error Passive state +* and the Receive Error Counter has the value MCAN_ECR.REC = 127, +* it may happen that MCAN_IR.MRAF is set although there was no +* Message RAM access failure. +* If MCAN_IR.MRAF is enabled, an interrupt to the Host CPU is generated +* The Message RAM Access Failure interrupt routine needs to check +* whether MCAN_ECR.RP = ’1’ and MCAN_ECR.REC = 127. +* In this case, reset MCAN_IR.MRAF. No further action is required. +*/ +if ((priv->version <=31 ) && (irqstatus &IR_MRAF ) && + (m_can_read (priv,M_CAN_ECR ) &ECR_RP )) { +struct can_berr_counter bec; + +__m_can_get_berr_counter (dev, &bec); +if (bec.rxerr ==127 ) { +m_can_write (priv,M_CAN_IR ,IR_MRAF ); + irqstatus &= ~IR_MRAF ; + } + } + psr =m_can_read (priv,M_CAN_PSR );if (irqstatus &IR_ERR_STATE ) work_done +=m_can_handle_state_errors (dev, psr);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 40/95 can: af_can: Fix error path of can_init()
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit c5a3aed1cd3152429348ee1fe5cdcca65fe901ce ]
This patch add error path for can_init() to avoid possible crash if some error occurs.
--- net/can/af_can.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
net/can/af_can.c +21 -3
@@ -958,6 +958,8 @@ static struct pernet_operations can_pernet_ops __read_mostly = {static __init int can_init (void ) { +int err; +/* check for correct padding to be able to use the structs similarly */ BUILD_BUG_ON(offsetof(struct can_frame, can_dlc) != offsetof(struct canfd_frame, len) ||
@@ -971,15 +973,31 @@ static __init int can_init(void)if (!rcv_cache)return -ENOMEM ; -register_pernet_subsys (&can_pernet_ops); + err =register_pernet_subsys (&can_pernet_ops); +if (err) + goto out_pernet;/* protocol register */ -sock_register (&can_family_ops); -register_netdevice_notifier (&can_netdev_notifier); + err =sock_register (&can_family_ops); +if (err) + goto out_sock; + err =register_netdevice_notifier (&can_netdev_notifier); +if (err) + goto out_notifier; +dev_add_pack (&can_packet);dev_add_pack (&canfd_packet);return 0 ; + +out_notifier: +sock_unregister (PF_CAN ); +out_sock: +unregister_pernet_subsys (&can_pernet_ops); +out_pernet: +kmem_cache_destroy (rcv_cache); + +return err; } static __exit void can_exit(void)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 41/95 can: flexcan: Remove unneeded registration message
In reply to Sasha LevinFrom: Fabio Estevam <[email protected]>
[ Upstream commit eb503004a7e563d543c9cb869907156de7efe720 ]
Currently the following message is observed when the flexcan driver is probed:
flexcan 2090000.flexcan: device registered (reg_base=(ptrval), irq=23)
The reason for printing 'ptrval' is explained atDocumentation/core-api/printk-formats.rst:
"Pointers printed without a specifier extension (i.e unadorned %p) are hashed to prevent leaking information about the kernel memory layout. This has the added benefit of providing a unique identifier. On 64-bit machines the first 32 bits are zeroed. The kernel will print ``(ptrval)`` until it gathers enough entropy."
Instead of passing %pK, which can print the correct address, simply remove the entire message as it is not really that useful.
--- drivers/net/can/flexcan.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/can/flexcan.c +0 -3
@@ -1583,9 +1583,6 @@ static int flexcan_probe(struct platform_device *pdev)dev_dbg (&pdev->dev,"failed to setup stop-mode\n" ); } -dev_info (&pdev->dev,"device registered (reg_base=%p, irq=%d)\n" , - priv->regs, dev->irq); -return 0 ; failed_register:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 42/95 net: phy: rename Asix Electronics PHY driver
In reply to Sasha LevinFrom: Michael Schmitz <[email protected]>
[ Upstream commit a9520543b123bbd7275a0ab8d0375a5412683b41 ]
[Resent to net instead of net-next - may clash with Anders Roxell's patch series addressing duplicate module names]
Commit 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver") introduced a new PHY driver drivers/net/phy/asix.c that causes a module name conflict with a pre-existiting driver (drivers/net/usb/asix.c).
The PHY driver is used by the X-Surf 100 ethernet card driver, and loaded by that driver via its PHY ID. A rename of the driver looks unproblematic.
Rename PHY driver to ax88796b.c in order to resolve name conflict.
---
drivers/net/ethernet/8390/Kconfig | 2 +-
drivers/net/phy/Kconfig | 2 +-
drivers/net/phy/Makefile | 2 +-
drivers/net/phy/{asix.c => ax88796b.c} | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/net/phy/{asix.c => ax88796b.c} (100%)drivers/net/ethernet/8390/Kconfig +1 -1
@@ -49,7 +49,7 @@ config XSURF100 tristate "Amiga XSurf 100 AX88796/NE2000 clone support" depends on ZORRO select AX88796 - select ASIX_PHY + select AX88796B_PHY help This driver is for the Individual Computers X-Surf 100 Ethernet card (based on the Asix AX88796 chip). If you have such a card,
drivers/net/phy/Kconfig +1 -1
@@ -242,7 +242,7 @@ config AQUANTIA_PHY ---help--- Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405 -config ASIX_PHY +config AX88796B_PHY tristate "Asix PHYs" help Currently supports the Asix Electronics PHY found in the X-Surf 100
drivers/net/phy/Makefile +1 -1
@@ -51,7 +51,7 @@ ifdef CONFIG_HWMON aquantia-objs += aquantia_hwmon.o endif obj-$(CONFIG_AQUANTIA_PHY) += aquantia.o -obj-$(CONFIG_ASIX_PHY) += asix.o +obj-$(CONFIG_AX88796B_PHY) += ax88796b.o obj-$(CONFIG_AT803X_PHY) += at803x.o obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o obj-$(CONFIG_BCM7XXX_PHY) += bcm7xxx.o
drivers/net/phy/ax88796b.c renamed from drivers/net/phy/asix.c +0 -0
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 43/95 ibmvnic: Do not close unopened driver during reset
In reply to Sasha LevinFrom: Thomas Falcon <[email protected]>
[ Upstream commit 1f94608b0ce141be5286dde31270590bdf35b86a ]
Check driver state before halting it during a reset. If the driver is not running, do nothing. Otherwise, a request to deactivate a down link can cause an error and the reset will fail.
--- drivers/net/ethernet/ibm/ibmvnic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/ibm/ibmvnic.c +2 -1
@@ -1751,7 +1751,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,ibmvnic_cleanup (netdev); -if (adapter->reset_reason !=VNIC_RESET_MOBILITY && +if (reset_state ==VNIC_OPEN && + adapter->reset_reason !=VNIC_RESET_MOBILITY && adapter->reset_reason !=VNIC_RESET_FAILOVER ) { rc =__ibmvnic_close (netdev);if (rc)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 44/95 ibmvnic: Refresh device multicast list after reset
In reply to Sasha LevinFrom: Thomas Falcon <[email protected]>
[ Upstream commit be32a24372cf162e825332da1a7ccef058d4f20b ]
It was observed that multicast packets were no longer received after a device reset. The fix is to resend the current multicast list to the backing device after recovery.
--- drivers/net/ethernet/ibm/ibmvnic.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/ibm/ibmvnic.c +3 -0
@@ -1851,6 +1851,9 @@ static int do_reset(struct ibmvnic_adapter *adapter,return 0 ; } +/* refresh device's multicast list */ +ibmvnic_set_multi (netdev); +/* kick napi */ for (i =0 ; i < adapter->req_rx_queues; i++)napi_schedule (&adapter->napi[i]);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 45/95 ibmvnic: Fix unchecked return codes of memory allocations
In reply to Sasha LevinFrom: Thomas Falcon <[email protected]>
[ Upstream commit 7c940b1a5291e5069d561f5b8f0e51db6b7a259a ]
The return values for these memory allocations are unchecked, which may cause an oops if the driver does not handle them after a failure. Fix by checking the function's return code.
--- drivers/net/ethernet/ibm/ibmvnic.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +7 -6
@@ -438,9 +438,10 @@ static int reset_rx_pools(struct ibmvnic_adapter *adapter)if (rx_pool->buff_size !=be64_to_cpu (size_array[i])) {free_long_term_buff (adapter, &rx_pool->long_term_buff); rx_pool->buff_size =be64_to_cpu (size_array[i]); -alloc_long_term_buff (adapter, &rx_pool->long_term_buff, - rx_pool->size * - rx_pool->buff_size); + rc =alloc_long_term_buff (adapter, + &rx_pool->long_term_buff, + rx_pool->size * + rx_pool->buff_size); }else { rc =reset_long_term_buff (adapter, &rx_pool->long_term_buff);
@@ -706,9 +707,9 @@ static int init_tx_pools(struct net_device *netdev)return rc; } -init_one_tx_pool (netdev, &adapter->tso_pool[i], -IBMVNIC_TSO_BUFS , -IBMVNIC_TSO_BUF_SZ ); + rc =init_one_tx_pool (netdev, &adapter->tso_pool[i], +IBMVNIC_TSO_BUFS , +IBMVNIC_TSO_BUF_SZ );if (rc) {release_tx_pools (adapter);return rc;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 46/95 ARM: dts: am335x phytec boards: Fix cd-gpios active level
In reply to Sasha LevinFrom: Teresa Remmet <[email protected]>
[ Upstream commit 8a0098c05a272c9a68f6885e09755755b612459c ]
Active level of the mmc1 cd gpio needs to be low instead of high. Fix PCM-953 and phyBOARD-WEGA.
--- arch/arm/boot/dts/am335x-pcm-953.dtsi | 2 +- arch/arm/boot/dts/am335x-wega.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/am335x-pcm-953.dtsi +1 -1
@@ -197,7 +197,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/am335x-wega.dtsi +1 -1
@@ -157,7 +157,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; status = "okay"; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 47/95 s390/boot: disable address-of-packed-member warning
In reply to Sasha LevinFrom: Heiko Carstens <[email protected]>
[ Upstream commit f9364df30420987e77599c4789ec0065c609a507 ]
Get rid of gcc9 warnings like this:
arch/s390/boot/ipl_report.c: In function 'find_bootdata_space':arch/s390/boot/ipl_report.c:42:26: warning: taking address of packed member of 'struct ipl_rb_components' may result in an unaligned pointer value [-Waddress-of-packed-member]
42 | for_each_rb_entry(comp, comps)
| ^~~~~
This is effectively the s390 variant of commit 20c6c1890455 ("x86/boot: Disable the address-of-packed-member compiler warning").
--- arch/s390/Makefile | 1 + 1 file changed, 1 insertion(+)
arch/s390/Makefile +1 -0
@@ -24,6 +24,7 @@ KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-option,-ffreestanding) +KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member) KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g) KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,)) UTS_MACHINE := s390x
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 48/95 bpf: lpm_trie: check left child of last leftmost node for NULL
In reply to Sasha LevinFrom: Jonathan Lemon <[email protected]>
[ Upstream commit da2577fdd0932ea4eefe73903f1130ee366767d2 ]
If the leftmost parent node of the tree has does not have a child on the left side, then trie_get_next_key (and bpftool map dump) will not look at the child on the right. This leads to the traversal missing elements.
Lookup is not affected.
Update selftest to handle this case.
Reproducer:
bpftool map create /sys/fs/bpf/lpm type lpm_trie key 6 \
value 1 entries 256 name test_lpm flags 1
bpftool map update pinned /sys/fs/bpf/lpm key 8 0 0 0 0 0 value 1
bpftool map update pinned /sys/fs/bpf/lpm key 16 0 0 0 0 128 value 2
bpftool map dump pinned /sys/fs/bpf/lpm
Returns only 1 element. (2 expected)
--- kernel/bpf/lpm_trie.c | 9 +++-- tools/testing/selftests/bpf/test_lpm_map.c | 41 ++++++++++++++++++++-- 2 files changed, 45 insertions(+), 5 deletions(-)
kernel/bpf/lpm_trie.c +7 -2
@@ -715,9 +715,14 @@ static int trie_get_next_key(struct bpf_map *map, void *_key, void *_next_key)* have exact two children, so this function will never return NULL. */ for (node = search_root; node;) { -if (!(node->flags &LPM_TREE_NODE_FLAG_IM )) +if (node->flags &LPM_TREE_NODE_FLAG_IM ) { + node =rcu_dereference (node->child[0 ]); + }else { next_node = node; - node =rcu_dereference (node->child[0 ]); + node =rcu_dereference (node->child[0 ]); +if (!node) + node =rcu_dereference (next_node->child[1 ]); + } } do_copy: next_key->prefixlen = next_node->prefixlen;
tools/testing/selftests/bpf/test_lpm_map.c +38 -3
64 lines not on this page · raw message
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 49/95 RISC-V: defconfig: enable clocks, serial console
In reply to Sasha LevinFrom: Kevin Hilman <[email protected]>
[ Upstream commit 3b025f2bc98973f181d926192b0ceb6ced0f86d2 ]
Enable PRCI clock driver and serial console by default, so the default upstream defconfig is bootable to a serial console.
--- arch/riscv/configs/defconfig | 4 ++++ 1 file changed, 4 insertions(+)
arch/riscv/configs/defconfig +4 -0
@@ -49,6 +49,8 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_EARLYCON_RISCV_SBI=y +CONFIG_SERIAL_SIFIVE=y +CONFIG_SERIAL_SIFIVE_CONSOLE=y CONFIG_HVC_RISCV_SBI=y # CONFIG_PTP_1588_CLOCK is not set CONFIG_DRM=y
@@ -64,6 +66,8 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_STORAGE=y CONFIG_USB_UAS=y CONFIG_VIRTIO_MMIO=y +CONFIG_CLK_SIFIVE=y +CONFIG_CLK_SIFIVE_FU540_PRCI=y CONFIG_SIFIVE_PLIC=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 50/95 drm/vmwgfx: Honor the sg list segment size limitation
In reply to Sasha LevinFrom: Thomas Hellstrom <[email protected]>
[ Upstream commit bde15555ba61c7f664f40fd3c6fdbdb63f784c9b ]
When building sg tables, honor the device sg list segment size limitation.
--- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +5 -5
@@ -454,11 +454,11 @@ static int vmw_ttm_map_dma(struct vmw_ttm_tt *vmw_tt)if (unlikely (ret !=0 ))return ret; - ret =sg_alloc_table_from_pages (&vmw_tt->sgt, vsgt->pages, - vsgt->num_pages,0 , - (unsigned long ) - vsgt->num_pages <<PAGE_SHIFT , -GFP_KERNEL ); + ret =__sg_alloc_table_from_pages + (&vmw_tt->sgt, vsgt->pages, vsgt->num_pages,0 , + (unsigned long ) vsgt->num_pages <<PAGE_SHIFT , +dma_get_max_seg_size (dev_priv->dev->dev), +GFP_KERNEL );if (unlikely (ret !=0 )) goto out_sg_alloc_fail;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 51/95 drm/vmwgfx: fix a warning due to missing dma_parms
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit 39916897cd815a0ee07ba1f6820cf88a63e459fc ]
Booting up with DMA_API_DEBUG_SG=y generates a warning due to the driver forgot to set dma_parms appropriately. Set it just after vmw_dma_masks() in vmw_driver_load().
DMA-API: vmwgfx 0000:00:0f.0: mapping sg segment longer than device claims to support [len=2097152] [max=65536]
WARNING: CPU: 2 PID: 261 at kernel/dma/debug.c:1232 debug_dma_map_sg+0x360/0x480 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/13/2018 RIP: 0010:debug_dma_map_sg+0x360/0x480 Call Trace: vmw_ttm_map_dma+0x3b1/0x5b0 [vmwgfx] vmw_bo_map_dma+0x25/0x30 [vmwgfx] vmw_otables_setup+0x2a8/0x750 [vmwgfx] vmw_request_device_late+0x78/0xc0 [vmwgfx] vmw_request_device+0xee/0x4e0 [vmwgfx] vmw_driver_load.cold+0x757/0xd84 [vmwgfx] drm_dev_register+0x1ff/0x340 [drm] drm_get_pci_dev+0x110/0x290 [drm] vmw_probe+0x15/0x20 [vmwgfx] local_pci_probe+0x7a/0xc0 pci_device_probe+0x1b9/0x290 really_probe+0x1b5/0x630 driver_probe_device+0xa3/0x1a0 device_driver_attach+0x94/0xa0 __driver_attach+0xdd/0x1c0 bus_for_each_dev+0xfe/0x150 driver_attach+0x2d/0x40 bus_add_driver+0x290/0x350 driver_register+0xdc/0x1d0 __pci_register_driver+0xda/0xf0 vmwgfx_init+0x34/0x1000 [vmwgfx] do_one_initcall+0xe5/0x40a do_init_module+0x10f/0x3a0 load_module+0x16a5/0x1a40 __se_sys_finit_module+0x183/0x1c0 __x64_sys_finit_module+0x43/0x50 do_syscall_64+0xc8/0x606 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +3 -0
@@ -747,6 +747,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)if (unlikely (ret !=0 )) goto out_err0; + dma_set_max_seg_size(dev->dev, min_t(unsigned int, U32_MAX & PAGE_MASK, +SCATTERLIST_MAX_SEGMENT )); +if (dev_priv->capabilities &SVGA_CAP_GMR2 ) {DRM_INFO ("Max GMR ids is %u\n" , (unsigned )dev_priv->max_gmr_ids);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 52/95 riscv: Fix udelay in RV32.
In reply to Sasha LevinFrom: Nick Hu <[email protected]>
[ Upstream commit d0e1f2110a5eeb6e410b2dd37d98bc5b30da7bc7 ]
In RV32, udelay would delay the wrong cycle. When it shifts right "UDELAY_SHIFT" bits, it either delays 0 cycle or 1 cycle. It only works correctly in RV64. Because the 'ucycles' always needs to be 64 bits variable.
--- arch/riscv/lib/delay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/lib/delay.c +1 -1
@@ -88,7 +88,7 @@ EXPORT_SYMBOL(__delay);void udelay (unsigned long usecs) { -unsigned long ucycles = usecs * lpj_fine *UDELAY_MULT ; +u64 ucycles = (u64 )usecs * lpj_fine *UDELAY_MULT ;if (unlikely (usecs >MAX_UDELAY_US )) {__delay ((u64 )usecs * riscv_timebase /1000000ULL );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 53/95 Input: imx_keypad - make sure keyboard can always wake up system
In reply to Sasha LevinFrom: Anson Huang <[email protected]>
[ Upstream commit ce9a53eb3dbca89e7ad86673d94ab886e9bea704 ]
There are several scenarios that keyboard can NOT wake up system from suspend, e.g., if a keyboard is depressed between system device suspend phase and device noirq suspend phase, the keyboard ISR will be called and both keyboard depress and release interrupts will be disabled, then keyboard will no longer be able to wake up system. Another scenario would be, if a keyboard is kept depressed, and then system goes into suspend, the expected behavior would be when keyboard is released, system will be waked up, but current implementation can NOT achieve that, because both depress and release interrupts are disabled in ISR, and the event check is still in progress.
To fix these issues, need to make sure keyboard's depress or release interrupt is enabled after noirq device suspend phase, this patch moves the suspend/resume callback to noirq suspend/resume phase, and enable the corresponding interrupt according to current keyboard status.
--- drivers/input/keyboard/imx_keypad.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/input/keyboard/imx_keypad.c +14 -4
@@ -526,11 +526,12 @@ static int imx_keypad_probe(struct platform_device *pdev)return 0 ; } -static int __maybe_unused imx_kbd_suspend (struct device *dev) +static int __maybe_unused imx_kbd_noirq_suspend (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);struct imx_keypad *kbd =platform_get_drvdata (pdev);struct input_dev *input_dev = kbd->input_dev; +unsigned short reg_val =readw (kbd->mmio_base +KPSR );/* imx kbd can wake up system even clock is disabled */ mutex_lock (&input_dev->mutex);
@@ -540,13 +541,20 @@ static int __maybe_unused imx_kbd_suspend(struct device *dev)mutex_unlock (&input_dev->mutex); -if (device_may_wakeup (&pdev->dev)) +if (device_may_wakeup (&pdev->dev)) { +if (reg_val &KBD_STAT_KPKD ) + reg_val |=KBD_STAT_KRIE ; +if (reg_val &KBD_STAT_KPKR ) + reg_val |=KBD_STAT_KDIE ; +writew (reg_val, kbd->mmio_base +KPSR ); +enable_irq_wake (kbd->irq); + }return 0 ; } -static int __maybe_unused imx_kbd_resume (struct device *dev) +static int __maybe_unused imx_kbd_noirq_resume (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);struct imx_keypad *kbd =platform_get_drvdata (pdev);
@@ -570,7 +578,9 @@ static int __maybe_unused imx_kbd_resume(struct device *dev)return ret; } -static SIMPLE_DEV_PM_OPS(imx_kbd_pm_ops, imx_kbd_suspend, imx_kbd_resume); +static const struct dev_pm_ops imx_kbd_pm_ops = { +SET_NOIRQ_SYSTEM_SLEEP_PM_OPS (imx_kbd_noirq_suspend, imx_kbd_noirq_resume) +};static struct platform_driver imx_keypad_driver = { .driver = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 54/95 xdp: check device pointer before clearing
In reply to Sasha LevinFrom: Ilya Maximets <[email protected]>
[ Upstream commit 01d76b5317003e019ace561a9b775f51aafdfdc4 ]
We should not call 'ndo_bpf()' or 'dev_put()' with NULL argument.
--- net/xdp/xdp_umem.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/xdp/xdp_umem.c +6 -5
@@ -143,6 +143,9 @@ static void xdp_umem_clear_dev(struct xdp_umem *umem)struct netdev_bpf bpf;int err; +if (!umem->dev) +return ; +if (umem->zc) { bpf.command =XDP_SETUP_XSK_UMEM ; bpf.xsk.umem =NULL ;
@@ -156,11 +159,9 @@ static void xdp_umem_clear_dev(struct xdp_umem *umem)WARN (1 ,"failed to disable umem!\n" ); } -if (umem->dev) { -rtnl_lock (); -xdp_clear_umem_at_qid (umem->dev, umem->queue_id); -rtnl_unlock (); - } +rtnl_lock (); +xdp_clear_umem_at_qid (umem->dev, umem->queue_id); +rtnl_unlock ();if (umem->zc) {dev_put (umem->dev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 55/95 KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy
In reply to Sasha LevinFrom: Dave Martin <[email protected]>
[ Upstream commit 4729ec8c1e1145234aeeebad5d96d77f4ccbb00a ]
kvm_device->destroy() seems to be supposed to free its kvm_device struct, but vgic_its_destroy() is not currently doing this, resulting in a memory leak, resulting in kmemleak reports such as the following:
unreferenced object 0xffff800aeddfe280 (size 128):
comm "qemu-system-aar", pid 13799, jiffies 4299827317 (age 1569.844s) [...]
backtrace:
[<00000000a08b80e2>] kmem_cache_alloc+0x178/0x208
[<00000000dcad2bd3>] kvm_vm_ioctl+0x350/0xbc0Fix it.
--- virt/kvm/arm/vgic/vgic-its.c | 1 + 1 file changed, 1 insertion(+)
virt/kvm/arm/vgic/vgic-its.c +1 -0
@@ -1734,6 +1734,7 @@ static void vgic_its_destroy(struct kvm_device *kvm_dev)mutex_unlock (&its->its_lock);kfree (its); +kfree (kvm_dev);/* alloc by kvm_ioctl_create_device, free by .destroy */ } static int vgic_its_has_attr_regs(struct kvm_device *dev,
Signature · 6 lines
2.20.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Sasha Levin
maintainerPATCH 56/95 mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed
In reply to Sasha LevinFrom: Ido Schimmel <[email protected]>
[ Upstream commit 4b14cc313f076c37b646cee06a85f0db59cf216c ]
When PVID is removed from a bridge port, the Linux bridge drops both untagged and prio-tagged packets. Align mlxsw with this behavior.
--- drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/reg.h +1 -1
@@ -997,7 +997,7 @@ static inline void mlxsw_reg_spaft_pack(char *payload, u8 local_port,MLXSW_REG_ZERO (spaft, payload);mlxsw_reg_spaft_local_port_set (payload, local_port);mlxsw_reg_spaft_allow_untagged_set (payload, allow_untagged); -mlxsw_reg_spaft_allow_prio_tagged_set (payload, true); +mlxsw_reg_spaft_allow_prio_tagged_set (payload, allow_untagged);mlxsw_reg_spaft_allow_tagged_set (payload, true); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 57/95 KVM: nVMX: use correct clean fields when copying from eVMCS
In reply to Sasha LevinFrom: Vitaly Kuznetsov <[email protected]>
[ Upstream commit f9bc5227652df4900eff12a9b8b38e9a8c7c78ea ]
Unfortunately, a couple of mistakes were made while implementing Enlightened VMCS support, in particular, wrong clean fields were used in copy_enlightened_to_vmcs12():
- exception_bitmap is covered by CONTROL_EXCPN;
- vm_exit_controls/pin_based_vm_exec_control/secondary_vm_exec_control are covered by CONTROL_GRP1.
--- arch/x86/kvm/vmx/nested.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx/nested.c +2 -2
@@ -1404,7 +1404,7 @@ static int copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx) }if (unlikely (!(evmcs->hv_clean_fields & -HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_PROC ))) { +HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_EXCPN ))) { vmcs12->exception_bitmap = evmcs->exception_bitmap; }
@@ -1444,7 +1444,7 @@ static int copy_enlightened_to_vmcs12(struct vcpu_vmx *vmx) }if (unlikely (!(evmcs->hv_clean_fields & -HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1 ))) { +HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP1 ))) { vmcs12->pin_based_vm_exec_control = evmcs->pin_based_vm_exec_control; vmcs12->vm_exit_controls = evmcs->vm_exit_controls;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 58/95 bpf: fix div64 overflow tests to properly detect errors
In reply to Sasha LevinFrom: "Naveen N. Rao" <[email protected]>
[ Upstream commit 3e0682695199bad51dd898fe064d1564637ff77a ]
If the result of the division is LLONG_MIN, current tests do not detect the error since the return value is truncated to a 32-bit value and ends up being 0.
--- .../testing/selftests/bpf/verifier/div_overflow.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/verifier/div_overflow.c +10 -4
@@ -29,8 +29,11 @@ "DIV64 overflow, check 1", .insns = {BPF_MOV64_IMM (BPF_REG_1 ,-1 ), -BPF_LD_IMM64 (BPF_REG_0 ,LLONG_MIN ), -BPF_ALU64_REG (BPF_DIV ,BPF_REG_0 ,BPF_REG_1 ), +BPF_LD_IMM64 (BPF_REG_2 ,LLONG_MIN ), +BPF_ALU64_REG (BPF_DIV ,BPF_REG_2 ,BPF_REG_1 ), +BPF_MOV32_IMM (BPF_REG_0 ,0 ), +BPF_JMP_REG (BPF_JEQ ,BPF_REG_0 ,BPF_REG_2 ,1 ), +BPF_MOV32_IMM (BPF_REG_0 ,1 ), BPF_EXIT_INSN(), }, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
@@ -40,8 +43,11 @@ { "DIV64 overflow, check 2", .insns = { -BPF_LD_IMM64 (BPF_REG_0 ,LLONG_MIN ), -BPF_ALU64_IMM (BPF_DIV ,BPF_REG_0 ,-1 ), +BPF_LD_IMM64 (BPF_REG_1 ,LLONG_MIN ), +BPF_ALU64_IMM (BPF_DIV ,BPF_REG_1 ,-1 ), +BPF_MOV32_IMM (BPF_REG_0 ,0 ), +BPF_JMP_REG (BPF_JEQ ,BPF_REG_0 ,BPF_REG_1 ,1 ), +BPF_MOV32_IMM (BPF_REG_0 ,1 ), BPF_EXIT_INSN(), }, .prog_type = BPF_PROG_TYPE_SCHED_CLS,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 59/95 ARM: davinci: da850-evm: call regulator_has_full_constraints()
In reply to Sasha LevinFrom: Bartosz Golaszewski <[email protected]>
[ Upstream commit 0c0c9b5753cd04601b17de09da1ed2885a3b42fe ]
The BB expander at 0x21 i2c bus 1 fails to probe on da850-evm because the board doesn't set has_full_constraints to true in the regulator API.
Call regulator_has_full_constraints() at the end of board registration just like we do in da850-lcdk and da830-evm.
--- arch/arm/mach-davinci/board-da850-evm.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-davinci/board-da850-evm.c +2 -0
@@ -1479,6 +1479,8 @@ static __init void da850_evm_init(void)if (ret)pr_warn ("%s: dsp/rproc registration failed: %d\n" , __func__, ret); + +regulator_has_full_constraints (); }#ifdef CONFIG_SERIAL_8250_CONSOLE
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 60/95 ARM: davinci: da8xx: specify dma_coherent_mask for lcdc
In reply to Sasha LevinFrom: Bartosz Golaszewski <[email protected]>
[ Upstream commit 68f2515bb31a664ba3e2bc1eb78dd9f529b10067 ]
The lcdc device is missing the dma_coherent_mask definition causing the following warning on da850-evm:
da8xx_lcdc da8xx_lcdc.0: found Sharp_LK043T1DG01 panel
------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at kernel/dma/mapping.c:247 dma_alloc_attrs+0xc8/0x110 Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 5.2.0-rc3-00077-g16d72dd4891f #18 Hardware name: DaVinci DA850/OMAP-L138/AM18x EVM [<c000fce8>] (unwind_backtrace) from [<c000d900>] (show_stack+0x10/0x14) [<c000d900>] (show_stack) from [<c001a4f8>] (__warn+0xec/0x114) [<c001a4f8>] (__warn) from [<c001a634>] (warn_slowpath_null+0x3c/0x48) [<c001a634>] (warn_slowpath_null) from [<c0065860>] (dma_alloc_attrs+0xc8/0x110) [<c0065860>] (dma_alloc_attrs) from [<c02820f8>] (fb_probe+0x228/0x5a8) [<c02820f8>] (fb_probe) from [<c02d3e9c>] (platform_drv_probe+0x48/0x9c) [<c02d3e9c>] (platform_drv_probe) from [<c02d221c>] (really_probe+0x1d8/0x2d4) [<c02d221c>] (really_probe) from [<c02d2474>] (driver_probe_device+0x5c/0x168) [<c02d2474>] (driver_probe_device) from [<c02d2728>] (device_driver_attach+0x58/0x60) [<c02d2728>] (device_driver_attach) from [<c02d27b0>] (__driver_attach+0x80/0xbc) [<c02d27b0>] (__driver_attach) from [<c02d047c>] (bus_for_each_dev+0x64/0xb4) [<c02d047c>] (bus_for_each_dev) from [<c02d1590>] (bus_add_driver+0xe4/0x1d8) [<c02d1590>] (bus_add_driver) from [<c02d301c>] (driver_register+0x78/0x10c) [<c02d301c>] (driver_register) from [<c000a5c0>] (do_one_initcall+0x48/0x1bc) [<c000a5c0>] (do_one_initcall) from [<c05cae6c>] (kernel_init_freeable+0x10c/0x1d8) [<c05cae6c>] (kernel_init_freeable) from [<c048a000>] (kernel_init+0x8/0xf4) [<c048a000>] (kernel_init) from [<c00090e0>] (ret_from_fork+0x14/0x34) Exception stack(0xc6837fb0 to 0xc6837ff8) 7fa0: 00000000 00000000 00000000 00000000 7fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 7fe0: 00000000 00000000 00000000 00000000 00000013 00000000 ---[ end trace 8a8073511be81dd2 ]---
Add a 32-bit mask to the platform device's definition.
--- arch/arm/mach-davinci/devices-da8xx.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/mach-davinci/devices-da8xx.c +3 -0
@@ -686,6 +686,9 @@ static struct platform_device da8xx_lcdc_device = { .id = 0, .num_resources = ARRAY_SIZE(da8xx_lcdc_resources), .resource = da8xx_lcdc_resources, + .dev = { + .coherent_dma_mask = DMA_BIT_MASK(32), + } };int __init da8xx_register_lcdc (struct da8xx_lcdc_platform_data *pdata)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 61/95 gpu: ipu-v3: image-convert: Fix input bytesperline width/height align
In reply to Sasha LevinFrom: Steve Longerbeam <[email protected]>
[ Upstream commit ff391ecd65a1b8324c49046c3db98d9c8ab29af9 ]
The output width and height alignment values were being used in the input bytesperline calculation. Fix by separating local vars w_align and h_align into w_align_in, h_align_in, w_align_out, and h_align_out.
adjustment")
--- drivers/gpu/ipu-v3/ipu-image-convert.c | 32 +++++++++++++++++--------- 1 file changed, 21 insertions(+), 11 deletions(-)
drivers/gpu/ipu-v3/ipu-image-convert.c +21 -11
@@ -1885,7 +1885,8 @@ void ipu_image_convert_adjust(struct ipu_image *in, struct ipu_image *out, enum ipu_rotate_mode rot_mode) {const struct ipu_image_pixfmt *infmt, *outfmt; -u32 w_align, h_align; +u32 w_align_out, h_align_out; +u32 w_align_in, h_align_in; infmt =get_format (in->pix.pixelformat); outfmt =get_format (out->pix.pixelformat);
@@ -1917,22 +1918,31 @@ void ipu_image_convert_adjust(struct ipu_image *in, struct ipu_image *out, }/* align input width/height */ - w_align =ilog2 (tile_width_align (IMAGE_CONVERT_IN , infmt, rot_mode)); - h_align =ilog2 (tile_height_align (IMAGE_CONVERT_IN , infmt, rot_mode)); - in->pix.width =clamp_align (in->pix.width,MIN_W ,MAX_W , w_align); - in->pix.height =clamp_align (in->pix.height,MIN_H ,MAX_H , h_align); + w_align_in =ilog2 (tile_width_align (IMAGE_CONVERT_IN , infmt, + rot_mode)); + h_align_in =ilog2 (tile_height_align (IMAGE_CONVERT_IN , infmt, + rot_mode)); + in->pix.width =clamp_align (in->pix.width,MIN_W ,MAX_W , + w_align_in); + in->pix.height =clamp_align (in->pix.height,MIN_H ,MAX_H , + h_align_in);/* align output width/height */ - w_align =ilog2 (tile_width_align (IMAGE_CONVERT_OUT , outfmt, rot_mode)); - h_align =ilog2 (tile_height_align (IMAGE_CONVERT_OUT , outfmt, rot_mode)); - out->pix.width =clamp_align (out->pix.width,MIN_W ,MAX_W , w_align); - out->pix.height =clamp_align (out->pix.height,MIN_H ,MAX_H , h_align); + w_align_out =ilog2 (tile_width_align (IMAGE_CONVERT_OUT , outfmt, + rot_mode)); + h_align_out =ilog2 (tile_height_align (IMAGE_CONVERT_OUT , outfmt, + rot_mode)); + out->pix.width =clamp_align (out->pix.width,MIN_W ,MAX_W , + w_align_out); + out->pix.height =clamp_align (out->pix.height,MIN_H ,MAX_H , + h_align_out);/* set input/output strides and image sizes */ in->pix.bytesperline = infmt->planar ? -clamp_align (in->pix.width,2 << w_align,MAX_W , w_align) : +clamp_align (in->pix.width,2 << w_align_in,MAX_W , + w_align_in) :clamp_align ((in->pix.width * infmt->bpp) >>3 , -2 << w_align,MAX_W , w_align); +2 << w_align_in,MAX_W , w_align_in); in->pix.sizeimage = infmt->planar ? (in->pix.height * in->pix.bytesperline * infmt->bpp) >>3 : in->pix.height * in->pix.bytesperline;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 62/95 gpu: ipu-v3: image-convert: Fix input bytesperline for packed formats
In reply to Sasha LevinFrom: Steve Longerbeam <[email protected]>
[ Upstream commit bca4d70cf1b8f6478a711c448a3a1e47b794b162 ]
The input bytesperline calculation for packed pixel formats was incorrect. The min/max clamping values must be multiplied by the packed bits-per-pixel. This was causing corrupted converted images when the input format was RGB4 (probably also other input packed formats).
adjustment")
--- drivers/gpu/ipu-v3/ipu-image-convert.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/ipu-v3/ipu-image-convert.c +3 -1
@@ -1942,7 +1942,9 @@ void ipu_image_convert_adjust(struct ipu_image *in, struct ipu_image *out, clamp_align(in->pix.width, 2 << w_align_in, MAX_W, w_align_in) :clamp_align ((in->pix.width * infmt->bpp) >>3 , -2 << w_align_in,MAX_W , w_align_in); + ((2 << w_align_in) * infmt->bpp) >>3 , + (MAX_W * infmt->bpp) >>3 , + w_align_in); in->pix.sizeimage = infmt->planar ? (in->pix.height * in->pix.bytesperline * infmt->bpp) >>3 : in->pix.height * in->pix.bytesperline;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 63/95 gpu: ipu-v3: image-convert: Fix image downsize coefficients
In reply to Sasha LevinFrom: Steve Longerbeam <[email protected]>
[ Upstream commit 912bbf7e9ca422099935dd69d3ff0fd62db24882 ]
The output of the IC downsizer unit in both dimensions must be <= 1024 before being passed to the IC resizer unit. This was causing corrupted images when:
input_dim > 1024, andinput_dim / 2 < output_dim < input_dim
Some broken examples were 1920x1080 -> 1024x768 and 1920x1080 -> 1280x1080.
resize coefficients")
--- drivers/gpu/ipu-v3/ipu-image-convert.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/ipu-v3/ipu-image-convert.c +4 -2
@@ -409,12 +409,14 @@ static int calc_image_resize_coefficients(struct ipu_image_convert_ctx *ctx,if (WARN_ON (resized_width ==0 || resized_height ==0 ))return -EINVAL ; -while (downsized_width >= resized_width *2 ) { +while (downsized_width >1024 || + downsized_width >= resized_width *2 ) { downsized_width >>=1 ; downsize_coeff_h++; } -while (downsized_height >= resized_height *2 ) { +while (downsized_height >1024 || + downsized_height >= resized_height *2 ) { downsized_height >>=1 ; downsize_coeff_v++; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 64/95 mac80211: only warn once on chanctx_conf being NULL
In reply to Sasha LevinFrom: Yibo Zhao <[email protected]>
[ Upstream commit 563572340173865a9a356e6bb02579e6998a876d ]
In multiple SSID cases, it takes time to prepare every AP interface to be ready in initializing phase. If a sta already knows everything it needs to join one of the APs and sends authentication to the AP which is not fully prepared at this point of time, AP's channel context could be NULL. As a result, warning message occurs.
Even worse, if the AP is under attack via tools such as MDK3 and massive authentication requests are received in a very short time, console will be hung due to kernel warning messages.
WARN_ON_ONCE() could be a better way for indicating warning messages without duplicate messages to flood the console.
Johannes: We still need to address the underlying problem, but we
don't really have a good handle on it yet. Suppress the worst side-effects for now.
--- net/mac80211/ieee80211_i.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/ieee80211_i.h +1 -1
@@ -1434,7 +1434,7 @@ ieee80211_get_sband(struct ieee80211_sub_if_data *sdata)rcu_read_lock (); chanctx_conf =rcu_dereference (sdata->vif.chanctx_conf); -if (WARN_ON (!chanctx_conf)) { +if (WARN_ON_ONCE (!chanctx_conf)) {rcu_read_unlock ();return NULL ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 65/95 mac80211: do not start any work during reconfigure flow
In reply to Sasha LevinFrom: Naftali Goldstein <[email protected]>
[ Upstream commit f8891461a277ec0afc493fd30cd975a38048a038 ]
It is not a good idea to try to perform any work (e.g. send an auth frame) during reconfigure flow.
Prevent this from happening, and at the end of the reconfigure flow requeue all the works.
--- net/mac80211/ieee80211_i.h | 7 +++++++ net/mac80211/util.c | 4 ++++ 2 files changed, 11 insertions(+)
net/mac80211/ieee80211_i.h +7 -0
@@ -2034,6 +2034,13 @@ void __ieee80211_flush_queues(struct ieee80211_local *local,static inline bool ieee80211_can_run_worker (struct ieee80211_local *local) { +/* +* It's unsafe to try to do any work during reconfigure flow. +* When the flow ends the work will be requeued. +*/ +if (local->in_reconfig) +return false; +/* * If quiescing is set, we are racing with __ieee80211_suspend. * __ieee80211_suspend flushes the workers after setting quiescing,
net/mac80211/util.c +4 -0
@@ -2442,6 +2442,10 @@ int ieee80211_reconfig(struct ieee80211_local *local)mutex_lock (&local->mtx);ieee80211_start_next_roc (local);mutex_unlock (&local->mtx); + +/* Requeue all works */ +list_for_each_entry (sdata, &local->interfaces, list) +ieee80211_queue_work (&local->hw, &sdata->work); } ieee80211_wake_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 66/95 cfg80211: util: fix bit count off by one
In reply to Sasha LevinFrom: Mordechay Goodstein <[email protected]>
[ Upstream commit 1a473d6092d5d182914bea854ce0b21e6d12519d ]
The bits of Rx MCS Map in VHT capability were enumerated with index transform - index i -> (i + 1) bit => nss i. BUG!
while it should be - index i -> (i + 1) bit => (i + 1) nss.
The bug was exposed in commit a53b2a0b1245 ("iwlwifi: mvm: implement VHT extended NSS support in rs.c"), where iwlwifi started using the function.
--- net/wireless/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/wireless/util.c +1 -1
@@ -1989,7 +1989,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,continue ;if (supp >= mcs_encoding) { - max_vht_nss = i; + max_vht_nss = i +1 ;break ; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 67/95 cfg80211: report measurement start TSF correctly
In reply to Sasha LevinFrom: Avraham Stern <[email protected]>
[ Upstream commit b65842025335711e2a0259feb4dbadb0c9ffb6d9 ]
Instead of reporting the AP's TSF, host time was reported. Fix it.
--- net/wireless/pmsr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/wireless/pmsr.c +2 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* Copyright (C) 2018 Intel Corporation +* Copyright (C) 2018 - 2019 Intel Corporation */ #ifndef __PMSR_H#define __PMSR_H
@@ -446,7 +446,7 @@ static int nl80211_pmsr_send_result(struct sk_buff *msg,if (res->ap_tsf_valid &&nla_put_u64_64bit (msg,NL80211_PMSR_RESP_ATTR_AP_TSF , - res->host_time,NL80211_PMSR_RESP_ATTR_PAD )) + res->ap_tsf,NL80211_PMSR_RESP_ATTR_PAD )) goto error;if (res->final &&nla_put_flag (msg,NL80211_PMSR_RESP_ATTR_FINAL ))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 68/95 bpf, devmap: Fix premature entry free on destroying map
In reply to Sasha LevinFrom: Toshiaki Makita <[email protected]>
[ Upstream commit d4dd153d551634683fccf8881f606fa9f3dfa1ef ]
dev_map_free() waits for flush_needed bitmap to be empty in order to ensure all flush operations have completed before freeing its entries. However the corresponding clear_bit() was called before using the entries, so the entries could be used after free.
All access to the entries needs to be done before clearing the bit. It seems commit a5e2da6e9787 ("bpf: netdev is never null in __dev_map_flush") accidentally changed the clear_bit() and memory access order.
Note that the problem happens only in __dev_map_flush(), not in dev_map_flush_old(). dev_map_flush_old() is called only after nulling out the corresponding netdev_map entry, so dev_map_free() never frees the entry thus no such race happens there.
--- kernel/bpf/devmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/bpf/devmap.c +2 -2
@@ -291,10 +291,10 @@ void __dev_map_flush(struct bpf_map *map)if (unlikely (!dev))continue ; -__clear_bit (bit, bitmap); - bq =this_cpu_ptr (dev->bulkq);bq_xmit_all (dev, bq,XDP_XMIT_FLUSH , true); + +__clear_bit (bit, bitmap); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 69/95 bpf, devmap: Add missing bulk queue free
In reply to Sasha LevinFrom: Toshiaki Makita <[email protected]>
[ Upstream commit edabf4d9dd905acd60048ea1579943801e3a4876 ]
dev_map_free() forgot to free bulk queue when freeing its entries.
--- kernel/bpf/devmap.c | 1 + 1 file changed, 1 insertion(+)
kernel/bpf/devmap.c +1 -0
@@ -186,6 +186,7 @@ static void dev_map_free(struct bpf_map *map)if (!dev)continue ; +free_percpu (dev->bulkq);dev_put (dev->dev);kfree (dev); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 70/95 bpf, devmap: Add missing RCU read lock on flush
In reply to Sasha LevinFrom: Toshiaki Makita <[email protected]>
[ Upstream commit 86723c8640633bee4b4588d3c7784ee7a0032f65 ]
.ndo_xdp_xmit() assumes it is called under RCU. For example virtio_net uses RCU to detect it has setup the resources for tx. The assumption accidentally broke when introducing bulk queue in devmap.
--- kernel/bpf/devmap.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/bpf/devmap.c +4 -0
@@ -282,6 +282,7 @@ void __dev_map_flush(struct bpf_map *map)unsigned long *bitmap =this_cpu_ptr (dtab->flush_needed);u32 bit; +rcu_read_lock ();for_each_set_bit (bit, bitmap, map->max_entries) {struct bpf_dtab_netdev *dev =READ_ONCE (dtab->netdev_map[bit]);struct xdp_bulk_queue *bq;
@@ -297,6 +298,7 @@ void __dev_map_flush(struct bpf_map *map)__clear_bit (bit, bitmap); } +rcu_read_unlock (); }/* rcu_read_lock (from syscall and BPF contexts) ensures that if a delete and/or
@@ -389,6 +391,7 @@ static void dev_map_flush_old(struct bpf_dtab_netdev *dev)int cpu; +rcu_read_lock ();for_each_online_cpu (cpu) { bitmap =per_cpu_ptr (dev->dtab->flush_needed, cpu);__clear_bit (dev->bit, bitmap);
@@ -396,6 +399,7 @@ static void dev_map_flush_old(struct bpf_dtab_netdev *dev) bq =per_cpu_ptr (dev->bulkq, cpu);bq_xmit_all (dev, bq,XDP_XMIT_FLUSH , false); } +rcu_read_unlock (); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 71/95 bpf, x64: fix stack layout of JITed bpf code
In reply to Sasha LevinFrom: Alexei Starovoitov <[email protected]>
[ Upstream commit fe8d9571dc50232b569242fac7ea6332a654f186 ]
Since commit 177366bf7ceb the %rbp stopped pointing to %rbp of the previous stack frame. That broke frame pointer based stack unwinding. This commit is a partial revert of it.
Note that the location of tail_call_cnt is fixed, since the verifier enforces MAX_BPF_STACK stack size for programs with tail calls.
--- arch/x86/net/bpf_jit_comp.c | 74 +++++++++++-------------------------- 1 file changed, 21 insertions(+), 53 deletions(-)
arch/x86/net/bpf_jit_comp.c +21 -53
@@ -190,9 +190,7 @@ struct jit_context {#define BPF_MAX_INSN_SIZE 128#define BPF_INSN_SAFETY 64 -#define AUX_STACK_SPACE 40/* Space for RBX, R13, R14, R15, tailcnt */ - -#define PROLOGUE_SIZE 37 +#define PROLOGUE_SIZE 20/* * Emit x86-64 prologue code for BPF program and check its size.
@@ -203,44 +201,19 @@ static void emit_prologue(u8 **pprog, u32 stack_depth, bool ebpf_from_cbpf)u8 *prog = *pprog;int cnt =0 ; -/* push rbp */ -EMIT1 (0x55 ); - -/* mov rbp,rsp */ -EMIT3 (0x48 ,0x89 ,0xE5 ); - -/* sub rsp, rounded_stack_depth + AUX_STACK_SPACE */ -EMIT3_off32 (0x48 ,0x81 ,0xEC , -round_up (stack_depth,8 ) +AUX_STACK_SPACE ); - -/* sub rbp, AUX_STACK_SPACE */ -EMIT4 (0x48 ,0x83 ,0xED ,AUX_STACK_SPACE ); - -/* mov qword ptr [rbp+0],rbx */ -EMIT4 (0x48 ,0x89 ,0x5D ,0 ); -/* mov qword ptr [rbp+8],r13 */ -EMIT4 (0x4C ,0x89 ,0x6D ,8 ); -/* mov qword ptr [rbp+16],r14 */ -EMIT4 (0x4C ,0x89 ,0x75 ,16 ); -/* mov qword ptr [rbp+24],r15 */ -EMIT4 (0x4C ,0x89 ,0x7D ,24 ); - +EMIT1 (0x55 );/* push rbp */ +EMIT3 (0x48 ,0x89 ,0xE5 );/* mov rbp, rsp */ +/* sub rsp, rounded_stack_depth */ +EMIT3_off32 (0x48 ,0x81 ,0xEC ,round_up (stack_depth,8 )); +EMIT1 (0x53 );/* push rbx */ +EMIT2 (0x41 ,0x55 );/* push r13 */ +EMIT2 (0x41 ,0x56 );/* push r14 */ +EMIT2 (0x41 ,0x57 );/* push r15 */ if (!ebpf_from_cbpf) { -/* -* Clear the tail call counter (tail_call_cnt): for eBPF tail -* calls we need to reset the counter to 0. It's done in two -* instructions, resetting RAX register to 0, and moving it -* to the counter location. -*/ - -/* xor eax, eax */ -EMIT2 (0x31 ,0xc0 ); -/* mov qword ptr [rbp+32], rax */ -EMIT4 (0x48 ,0x89 ,0x45 ,32 ); - +/* zero init tail_call_cnt */ +EMIT2 (0x6a ,0x00 );BUILD_BUG_ON (cnt !=PROLOGUE_SIZE ); } - *pprog = prog; }
@@ -285,13 +258,13 @@ static void emit_bpf_tail_call(u8 **pprog)* if (tail_call_cnt > MAX_TAIL_CALL_CNT) * goto out; */ -EMIT2_off32 (0x8B ,0x85 ,36 );/* mov eax, dword ptr [rbp + 36] */ +EMIT2_off32 (0x8B ,0x85 ,-36 -MAX_BPF_STACK );/* mov eax, dword ptr [rbp - 548] */ EMIT3 (0x83 ,0xF8 ,MAX_TAIL_CALL_CNT );/* cmp eax, MAX_TAIL_CALL_CNT */ #define OFFSET2 (30 + RETPOLINE_RAX_BPF_JIT_SIZE)EMIT2 (X86_JA ,OFFSET2 );/* ja out */ label2 = cnt;EMIT3 (0x83 ,0xC0 ,0x01 );/* add eax, 1 */ -EMIT2_off32 (0x89 ,0x85 ,36 );/* mov dword ptr [rbp + 36], eax */ +EMIT2_off32 (0x89 ,0x85 ,-36 -MAX_BPF_STACK );/* mov dword ptr [rbp -548], eax */ /* prog = array->ptrs[index]; */ EMIT4_off32(0x48, 0x8B, 0x84, 0xD6, /* mov rax, [rsi + rdx * 8 + offsetof(...)] */
@@ -1040,19 +1013,14 @@ xadd: if (is_imm8(insn->off)) seen_exit = true;/* Update cleanup_addr */ ctx->cleanup_addr = proglen; -/* mov rbx, qword ptr [rbp+0] */ -EMIT4 (0x48 ,0x8B ,0x5D ,0 ); -/* mov r13, qword ptr [rbp+8] */ -EMIT4 (0x4C ,0x8B ,0x6D ,8 ); -/* mov r14, qword ptr [rbp+16] */ -EMIT4 (0x4C ,0x8B ,0x75 ,16 ); -/* mov r15, qword ptr [rbp+24] */ -EMIT4 (0x4C ,0x8B ,0x7D ,24 ); - -/* add rbp, AUX_STACK_SPACE */ -EMIT4 (0x48 ,0x83 ,0xC5 ,AUX_STACK_SPACE ); -EMIT1 (0xC9 );/* leave */ -EMIT1 (0xC3 );/* ret */ +if (!bpf_prog_was_classic (bpf_prog)) +EMIT1 (0x5B );/* get rid of tail_call_cnt */ +EMIT2 (0x41 ,0x5F );/* pop r15 */ +EMIT2 (0x41 ,0x5E );/* pop r14 */ +EMIT2 (0x41 ,0x5D );/* pop r13 */ +EMIT1 (0x5B );/* pop rbx */ +EMIT1 (0xC9 );/* leave */ +EMIT1 (0xC3 );/* ret */ break ;default :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 72/95 qmi_wwan: add support for QMAP padding in the RX path
In reply to Sasha LevinFrom: Reinhard Speyerer <[email protected]>
[ Upstream commit 61356088ace1866a847a727d4d40da7bf00b67fc ]
The QMAP code in the qmi_wwan driver is based on the CodeAurora GobiNet driver which does not process QMAP padding in the RX path correctly. Add support for QMAP padding to qmimux_rx_fixup() according to the description of the rmnet driver.
--- drivers/net/usb/qmi_wwan.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/net/usb/qmi_wwan.c +9 -3
@@ -153,7 +153,7 @@ static bool qmimux_has_slaves(struct usbnet *dev)static int qmimux_rx_fixup (struct usbnet *dev,struct sk_buff *skb) { -unsigned int len, offset =0 ; +unsigned int len, offset =0 , pad_len, pkt_len;struct qmimux_hdr *hdr;struct net_device *net;struct sk_buff *skbn;
@@ -171,10 +171,16 @@ static int qmimux_rx_fixup(struct usbnet *dev, struct sk_buff *skb)if (hdr->pad &0x80 ) goto skip; +/* extract padding length and check for valid length info */ + pad_len = hdr->pad &0x3f ; +if (len ==0 || pad_len >= len) + goto skip; + pkt_len = len - pad_len; + net =qmimux_find_dev (dev, hdr->mux_id);if (!net) goto skip; - skbn =netdev_alloc_skb (net, len); + skbn =netdev_alloc_skb (net, pkt_len);if (!skbn)return 0 ; skbn->dev = net;
@@ -191,7 +197,7 @@ static int qmimux_rx_fixup(struct usbnet *dev, struct sk_buff *skb) goto skip; } -skb_put_data (skbn, skb->data + offset + qmimux_hdr_sz, len); +skb_put_data (skbn, skb->data + offset + qmimux_hdr_sz, pkt_len);if (netif_rx (skbn) !=NET_RX_SUCCESS )return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 73/95 qmi_wwan: avoid RCU stalls on device disconnect when in QMAP mode
In reply to Sasha LevinFrom: Reinhard Speyerer <[email protected]>
[ Upstream commit a8fdde1cb830e560208af42b6c10750137f53eb3 ]
Switch qmimux_unregister_device() and qmi_wwan_disconnect() to use unregister_netdevice_queue() and unregister_netdevice_many() instead of unregister_netdevice(). This avoids RCU stalls which have been observed on device disconnect in certain setups otherwise.
--- drivers/net/usb/qmi_wwan.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/usb/qmi_wwan.c +7 -4
@@ -247,13 +247,14 @@ static int qmimux_register_device(struct net_device *real_dev, u8 mux_id)return err; } -static void qmimux_unregister_device (struct net_device *dev) +static void qmimux_unregister_device (struct net_device *dev, +struct list_head *head) {struct qmimux_priv *priv =netdev_priv (dev);struct net_device *real_dev = priv->real_dev;netdev_upper_dev_unlink (real_dev, dev); -unregister_netdevice (dev); +unregister_netdevice_queue (dev, head);/* Get rid of the reference to real_dev */ dev_put (real_dev);
@@ -424,7 +425,7 @@ static ssize_t del_mux_store(struct device *d, struct device_attribute *attr, c ret = -EINVAL ; goto err; } -qmimux_unregister_device (del_dev); +qmimux_unregister_device (del_dev,NULL );if (!qmimux_has_slaves (dev)) info->flags &= ~QMI_WWAN_FLAG_MUX ;
@@ -1434,6 +1435,7 @@ static void qmi_wwan_disconnect(struct usb_interface *intf)struct qmi_wwan_state *info;struct list_head *iter;struct net_device *ldev; +LIST_HEAD (list);/* called twice if separate control and data intf */ if (!dev)
@@ -1446,8 +1448,9 @@ static void qmi_wwan_disconnect(struct usb_interface *intf) }rcu_read_lock ();netdev_for_each_upper_dev_rcu (dev->net, ldev, iter) -qmimux_unregister_device (ldev); +qmimux_unregister_device (ldev, &list);rcu_read_unlock (); +unregister_netdevice_many (&list);rtnl_unlock (); info->flags &= ~QMI_WWAN_FLAG_MUX ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 74/95 qmi_wwan: extend permitted QMAP mux_id value range
In reply to Sasha LevinFrom: Reinhard Speyerer <[email protected]>
[ Upstream commit 36815b416fa48766ac5a98e4b2dc3ebc5887222e ]
Permit mux_id values up to 254 to be used in qmimux_register_device() for compatibility with ip(8) and the rmnet driver.
--- Documentation/ABI/testing/sysfs-class-net-qmi | 4 ++-- drivers/net/usb/qmi_wwan.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Documentation/ABI/testing/sysfs-class-net-qmi +2 -2
@@ -29,7 +29,7 @@ Contact: Bjørn Mork <[email protected]> Description: Unsigned integer. - Write a number ranging from 1 to 127 to add a qmap mux + Write a number ranging from 1 to 254 to add a qmap mux based network device, supported by recent Qualcomm based modems.
@@ -46,5 +46,5 @@ Contact: Bjørn Mork <[email protected]> Description: Unsigned integer. - Write a number ranging from 1 to 127 to delete a previously + Write a number ranging from 1 to 254 to delete a previously created qmap mux based network device.
drivers/net/usb/qmi_wwan.c +2 -2
@@ -363,8 +363,8 @@ static ssize_t add_mux_store(struct device *d, struct device_attribute *attr, cif (kstrtou8 (buf,0 , &mux_id))return -EINVAL ; -/* mux_id [1 - 0x7f] range empirically found */ -if (mux_id <1 || mux_id >0x7f ) +/* mux_id [1 - 254] for compatibility with ip(8) and the rmnet driver */ +if (mux_id <1 || mux_id >254 )return -EINVAL ;if (!rtnl_trylock ())
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 75/95 bpf: fix nested bpf tracepoints with per-cpu data
In reply to Sasha LevinFrom: Matt Mullins <[email protected]>
[ Upstream commit 9594dc3c7e71b9f52bee1d7852eb3d4e3aea9e99 ]
BPF_PROG_TYPE_RAW_TRACEPOINTs can be executed nested on the same CPU, as they do not increment bpf_prog_active while executing.
This enables three levels of nesting, to support
- a kprobe or raw tp or perf event,
- another one of the above that irq context happens to call, and
- another one in nmi context
(at most one of which may be a kprobe or perf event).
--- kernel/trace/bpf_trace.c | 100 ++++++++++++++++++++++++++++++++------- 1 file changed, 84 insertions(+), 16 deletions(-)
kernel/trace/bpf_trace.c +84 -16
@@ -402,8 +402,6 @@ static const struct bpf_func_proto bpf_perf_event_read_value_proto = { .arg4_type = ARG_CONST_SIZE, }; -static DEFINE_PER_CPU(struct perf_sample_data, bpf_trace_sd); - static __always_inline u64__bpf_perf_event_output (struct pt_regs *regs,struct bpf_map *map,u64 flags,struct perf_sample_data *sd)
@@ -434,24 +432,50 @@ __bpf_perf_event_output(struct pt_regs *regs, struct bpf_map *map,return perf_event_output (event, sd, regs); } +/* +* Support executing tracepoints in normal, irq, and nmi context that each call +* bpf_perf_event_output +*/ +struct bpf_trace_sample_data { +struct perf_sample_data sds[3 ]; +}; + +static DEFINE_PER_CPU(struct bpf_trace_sample_data, bpf_trace_sds); +static DEFINE_PER_CPU(int, bpf_trace_nest_level);BPF_CALL_5 (bpf_perf_event_output ,struct pt_regs *,regs ,struct bpf_map *,map ,u64 ,flags ,void *,data ,u64 ,size ) { -struct perf_sample_data *sd =this_cpu_ptr (&bpf_trace_sd); +struct bpf_trace_sample_data *sds =this_cpu_ptr (&bpf_trace_sds); +int nest_level =this_cpu_inc_return (bpf_trace_nest_level);struct perf_raw_record raw = { .frag = { .size = size, .data = data, }, }; +struct perf_sample_data *sd; +int err; -if (unlikely (flags & ~(BPF_F_INDEX_MASK ))) -return -EINVAL ; +if (WARN_ON_ONCE (nest_level >ARRAY_SIZE (sds->sds))) { + err = -EBUSY ; + goto out; + } + + sd = &sds->sds[nest_level -1 ]; + +if (unlikely (flags & ~(BPF_F_INDEX_MASK ))) { + err = -EINVAL ; + goto out; + }perf_sample_data_init (sd,0 ,0 ); sd->raw = &raw; -return __bpf_perf_event_output (regs, map, flags, sd); + err =__bpf_perf_event_output (regs, map, flags, sd); + +out: +this_cpu_dec (bpf_trace_nest_level); +return err; }static const struct bpf_func_proto bpf_perf_event_output_proto = {
@@ -808,16 +832,48 @@ pe_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)/* * bpf_raw_tp_regs are separate from bpf_pt_regs used from skb/xdp * to avoid potential recursive reuse issue when/if tracepoints are added -* inside bpf_*_event_output, bpf_get_stackid and/or bpf_get_stack +* inside bpf_*_event_output, bpf_get_stackid and/or bpf_get_stack. +* +* Since raw tracepoints run despite bpf_prog_active, support concurrent usage +* in normal, irq, and nmi context. */ -static DEFINE_PER_CPU(struct pt_regs, bpf_raw_tp_regs); +struct bpf_raw_tp_regs { +struct pt_regs regs[3 ]; +}; +static DEFINE_PER_CPU(struct bpf_raw_tp_regs, bpf_raw_tp_regs); +static DEFINE_PER_CPU(int, bpf_raw_tp_nest_level); +static struct pt_regs *get_bpf_raw_tp_regs (void ) +{ +struct bpf_raw_tp_regs *tp_regs =this_cpu_ptr (&bpf_raw_tp_regs); +int nest_level =this_cpu_inc_return (bpf_raw_tp_nest_level); + +if (WARN_ON_ONCE (nest_level >ARRAY_SIZE (tp_regs->regs))) { +this_cpu_dec (bpf_raw_tp_nest_level); +return ERR_PTR (-EBUSY ); + } + +return &tp_regs->regs[nest_level -1 ]; +} + +static void put_bpf_raw_tp_regs (void ) +{ +this_cpu_dec (bpf_raw_tp_nest_level); +} + BPF_CALL_5(bpf_perf_event_output_raw_tp, struct bpf_raw_tracepoint_args *, args, struct bpf_map *, map, u64, flags, void *, data, u64, size) { -struct pt_regs *regs =this_cpu_ptr (&bpf_raw_tp_regs); +struct pt_regs *regs =get_bpf_raw_tp_regs (); +int ret; + +if (IS_ERR (regs)) +return PTR_ERR (regs);perf_fetch_caller_regs (regs); -return ____bpf_perf_event_output (regs, map, flags, data, size); + ret =____bpf_perf_event_output (regs, map, flags, data, size); + +put_bpf_raw_tp_regs (); +return ret; }static const struct bpf_func_proto bpf_perf_event_output_proto_raw_tp = {
@@ -834,12 +890,18 @@ static const struct bpf_func_proto bpf_perf_event_output_proto_raw_tp = { BPF_CALL_3(bpf_get_stackid_raw_tp, struct bpf_raw_tracepoint_args *, args, struct bpf_map *, map, u64, flags) { -struct pt_regs *regs =this_cpu_ptr (&bpf_raw_tp_regs); +struct pt_regs *regs =get_bpf_raw_tp_regs (); +int ret; + +if (IS_ERR (regs)) +return PTR_ERR (regs);perf_fetch_caller_regs (regs);/* similar to bpf_perf_event_output_tp, but pt_regs fetched differently */ -return bpf_get_stackid ((unsigned long ) regs, (unsigned long ) map, - flags,0 ,0 ); + ret =bpf_get_stackid ((unsigned long ) regs, (unsigned long ) map, + flags,0 ,0 ); +put_bpf_raw_tp_regs (); +return ret; }static const struct bpf_func_proto bpf_get_stackid_proto_raw_tp = {
@@ -854,11 +916,17 @@ static const struct bpf_func_proto bpf_get_stackid_proto_raw_tp = { BPF_CALL_4(bpf_get_stack_raw_tp, struct bpf_raw_tracepoint_args *, args, void *, buf, u32, size, u64, flags) { -struct pt_regs *regs =this_cpu_ptr (&bpf_raw_tp_regs); +struct pt_regs *regs =get_bpf_raw_tp_regs (); +int ret; + +if (IS_ERR (regs)) +return PTR_ERR (regs);perf_fetch_caller_regs (regs); -return bpf_get_stack ((unsigned long ) regs, (unsigned long ) buf, - (unsigned long ) size, flags,0 ); + ret =bpf_get_stack ((unsigned long ) regs, (unsigned long ) buf, + (unsigned long ) size, flags,0 ); +put_bpf_raw_tp_regs (); +return ret; }static const struct bpf_func_proto bpf_get_stack_proto_raw_tp = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 76/95 mmc: core: complete HS400 before checking status
In reply to Sasha LevinFrom: Wolfram Sang <[email protected]>
[ Upstream commit b0e370b95a3b231d0fb5d1958cce85ef57196fe6 ]
We don't have a reproducible error case, yet our BSP team suggested that the mmc_switch_status() command in mmc_select_hs400() should come after the callback into the driver completing HS400 setup. It makes sense to me because we want the status of a fully setup HS400, so it will increase the reliability of the mmc_switch_status() command.
--- drivers/mmc/core/mmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mmc/core/mmc.c +3 -3
@@ -1212,13 +1212,13 @@ static int mmc_select_hs400(struct mmc_card *card)mmc_set_timing (host,MMC_TIMING_MMC_HS400 );mmc_set_bus_speed (card); +if (host->ops->hs400_complete) + host->ops->hs400_complete (host); + err =mmc_switch_status (card);if (err) goto out_err; -if (host->ops->hs400_complete) - host->ops->hs400_complete (host); -return 0 ; out_err:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 77/95 block: fix page leak when merging to same page
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 4569180495600ac59f5cd27f67242a6cb51254f3 ]
When multiple iovecs reference the same page, each get_user_page call will add a reference to the page. But once we've created the bio that information gets lost and only a single reference will be dropped after I/O completion. Use the same_page information returned from __bio_try_merge_page to drop additional references to pages that were already present in the bio.
Based on a patch from Ming Lei.
--- block/bio.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
block/bio.c +10 -2
@@ -884,6 +884,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt;struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;struct page **pages = (struct page **)bv; +bool same_page = false;ssize_t size, left;unsigned len, i;size_t offset;
@@ -904,8 +905,15 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)struct page *page = pages[i]; len =min_t (size_t,PAGE_SIZE - offset, left); -if (WARN_ON_ONCE (bio_add_page (bio, page, len, offset) != len)) -return -EINVAL ; + +if (__bio_try_merge_page (bio, page, len, offset, &same_page)) { +if (same_page) +put_page (page); + }else { +if (WARN_ON_ONCE (bio_full (bio))) +return -EINVAL ; +__bio_add_page (bio, page, len, offset); + } offset =0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 78/95 IB/hfi1: Create inline to get extended headers
In reply to Sasha LevinFrom: Mike Marciniszyn <[email protected]>
[ Upstream commit 9755f72496664eec70bc804104118b5797b6bf63 ]
This paves the way for another patch that reacts to a flush sdma completion for RC.
--- drivers/infiniband/hw/hfi1/hfi.h | 31 +++++++++++++++++++++++++++++++ drivers/infiniband/hw/hfi1/rc.c | 21 +-------------------- 2 files changed, 32 insertions(+), 20 deletions(-)
drivers/infiniband/hw/hfi1/hfi.h +31 -0
@@ -539,6 +539,37 @@ static inline void hfi1_16B_set_qpn(struct opa_16b_mgmt *mgmt, mgmt->src_qpn =cpu_to_be32 (src_qp &OPA_16B_MGMT_QPN_MASK ); } +/** +* hfi1_get_rc_ohdr - get extended header +* @opah - the opaheader +*/ +static inline struct ib_other_headers * +hfi1_get_rc_ohdr (struct hfi1_opa_header *opah) +{ +struct ib_other_headers *ohdr; +struct ib_header *hdr =NULL ; +struct hfi1_16b_header *hdr_16b =NULL ; + +/* Find out where the BTH is */ +if (opah->hdr_type ==HFI1_PKT_TYPE_9B ) { + hdr = &opah->ibh; +if (ib_get_lnh (hdr) ==HFI1_LRH_BTH ) + ohdr = &hdr->u.oth; +else + ohdr = &hdr->u.l.oth; + }else { +u8 l4; + + hdr_16b = &opah->opah; + l4 =hfi1_16B_get_l4 (hdr_16b); +if (l4 ==OPA_16B_L4_IB_LOCAL ) + ohdr = &hdr_16b->u.oth; +else + ohdr = &hdr_16b->u.l.oth; + } +return ohdr; +} +struct rvt_sge_state ;/*
drivers/infiniband/hw/hfi1/rc.c +1 -20
@@ -1711,8 +1711,6 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah)struct ib_other_headers *ohdr;struct hfi1_qp_priv *priv = qp->priv;struct rvt_swqe *wqe; -struct ib_header *hdr =NULL ; -struct hfi1_16b_header *hdr_16b =NULL ;u32 opcode, head, tail;u32 psn;struct tid_rdma_request *req;
@@ -1721,24 +1719,7 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah)if (!(ib_rvt_state_ops[qp->state] &RVT_SEND_OR_FLUSH_OR_RECV_OK ))return ; -/* Find out where the BTH is */ -if (priv->hdr_type ==HFI1_PKT_TYPE_9B ) { - hdr = &opah->ibh; -if (ib_get_lnh (hdr) ==HFI1_LRH_BTH ) - ohdr = &hdr->u.oth; -else - ohdr = &hdr->u.l.oth; - }else { -u8 l4; - - hdr_16b = &opah->opah; - l4 =hfi1_16B_get_l4 (hdr_16b); -if (l4 ==OPA_16B_L4_IB_LOCAL ) - ohdr = &hdr_16b->u.oth; -else - ohdr = &hdr_16b->u.l.oth; - } - + ohdr =hfi1_get_rc_ohdr (opah); opcode =ib_bth_get_opcode (ohdr); if ((opcode >= OP(RDMA_READ_RESPONSE_FIRST) && opcode <= OP(ATOMIC_ACKNOWLEDGE)) ||
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 79/95 IB/hfi1: Use aborts to trigger RC throttling
In reply to Sasha LevinFrom: Mike Marciniszyn <[email protected]>
[ Upstream commit 4bb02e9572af1383038d83ad196d7166c515f2ee ]
SDMA and pio flushes will cause a lot of packets to be transmitted after a link has gone down, using a lot of CPU to retransmit packets.
Fix for RC QPs by recognizing the flush status and:
- Forcing a timer start
- Putting the QP into a "send one" mode
--- drivers/infiniband/hw/hfi1/rc.c | 30 ++++++++++++++++++++++++++++++ drivers/infiniband/hw/hfi1/verbs.c | 10 ++++++---- drivers/infiniband/hw/hfi1/verbs.h | 1 + 3 files changed, 37 insertions(+), 4 deletions(-)
drivers/infiniband/hw/hfi1/rc.c +30 -0
@@ -1703,6 +1703,36 @@ static void reset_sending_psn(struct rvt_qp *qp, u32 psn) } } +/** +* hfi1_rc_verbs_aborted - handle abort status +* @qp: the QP +* @opah: the opa header +* +* This code modifies both ACK bit in BTH[2] +* and the s_flags to go into send one mode. +* +* This serves to throttle the send engine to only +* send a single packet in the likely case the +* a link has gone down. +*/ +void hfi1_rc_verbs_aborted (struct rvt_qp *qp,struct hfi1_opa_header *opah) +{ +struct ib_other_headers *ohdr =hfi1_get_rc_ohdr (opah); +u8 opcode =ib_bth_get_opcode (ohdr); +u32 psn; + +/* ignore responses */ +if ((opcode >=OP (RDMA_READ_RESPONSE_FIRST ) && + opcode <=OP (ATOMIC_ACKNOWLEDGE )) || + opcode ==TID_OP (READ_RESP ) || + opcode ==TID_OP (WRITE_RESP )) +return ; + + psn =ib_bth_get_psn (ohdr) |IB_BTH_REQ_ACK ; + ohdr->bth[2 ] =cpu_to_be32 (psn); + qp->s_flags |=RVT_S_SEND_ONE ; +} +/* * This should be called with the QP s_lock held and interrupts disabled. */
drivers/infiniband/hw/hfi1/verbs.c +6 -4
@@ -638,6 +638,8 @@ static void verbs_sdma_complete(struct hfi1_opa_header *hdr; hdr = &tx->phdr.hdr; +if (unlikely (status ==SDMA_TXREQ_S_ABORTED )) +hfi1_rc_verbs_aborted (qp, hdr);hfi1_rc_send_complete (qp, hdr); }spin_unlock (&qp->s_lock);
@@ -1095,15 +1097,15 @@ int hfi1_verbs_send_pio(struct rvt_qp *qp, struct hfi1_pkt_state *ps, &ps->s_txreq->phdr.hdr, ib_is_sc5(sc5)); pio_bail: +spin_lock_irqsave (&qp->s_lock, flags);if (qp->s_wqe) { -spin_lock_irqsave (&qp->s_lock, flags);rvt_send_complete (qp, qp->s_wqe, wc_status); -spin_unlock_irqrestore (&qp->s_lock, flags); }else if (qp->ibqp.qp_type ==IB_QPT_RC ) { -spin_lock_irqsave (&qp->s_lock, flags); +if (unlikely (wc_status ==IB_WC_GENERAL_ERR )) +hfi1_rc_verbs_aborted (qp, &ps->s_txreq->phdr.hdr);hfi1_rc_send_complete (qp, &ps->s_txreq->phdr.hdr); -spin_unlock_irqrestore (&qp->s_lock, flags); } +spin_unlock_irqrestore (&qp->s_lock, flags); ret =0 ;
drivers/infiniband/hw/hfi1/verbs.h +1 -0
@@ -415,6 +415,7 @@ void hfi1_rc_hdrerr(u8 ah_to_sc (struct ib_device *ibdev,struct rdma_ah_attr *ah_attr); +void hfi1_rc_verbs_aborted (struct rvt_qp *qp,struct hfi1_opa_header *opah);void hfi1_rc_send_complete (struct rvt_qp *qp,struct hfi1_opa_header *opah);void hfi1_ud_rcv (struct hfi1_packet *packet);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 80/95 IB/hfi1: Wakeup QPs orphaned on wait list after flush
In reply to Sasha LevinFrom: Mike Marciniszyn <[email protected]>
[ Upstream commit f972775b1cc0441ae22c9f8d06dd16b118463632 ]
Once an SDMA engine is taken down due to a link failure, any waiting QPs that do not have outstanding descriptors in the ring will stay on the dmawait list as long as the port is down.
Since there is no timer running, they will stay there for a long time.
The fix is to wake up all iowaits linked to dmawait. The send engine will build and post packets that get flushed back.
--- drivers/infiniband/hw/hfi1/sdma.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/infiniband/hw/hfi1/sdma.c +17 -0
@@ -405,6 +405,7 @@ static void sdma_flush(struct sdma_engine *sde)struct sdma_txreq *txp, *txp_next;LIST_HEAD (flushlist);unsigned long flags; +uint seq;/* flush from head to tail */ sdma_flush_descq (sde);
@@ -418,6 +419,22 @@ static void sdma_flush(struct sdma_engine *sde)/* flush from flush list */ list_for_each_entry_safe (txp, txp_next, &flushlist, list)complete_tx (sde, txp,SDMA_TXREQ_S_ABORTED ); +/* wakeup QPs orphaned on the dmawait list */ +do { +struct iowait *w, *nw; + + seq =read_seqbegin (&sde->waitlock); +if (!list_empty (&sde->dmawait)) { +write_seqlock (&sde->waitlock); +list_for_each_entry_safe (w, nw, &sde->dmawait, list) { +if (w->wakeup) { + w->wakeup (w,SDMA_AVAIL_REASON ); +list_del_init (&w->list); + } + } +write_sequnlock (&sde->waitlock); + } + }while (read_seqretry (&sde->waitlock, seq)); }/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 81/95 IB/hfi1: Handle wakeup of orphaned QPs for pio
In reply to Sasha LevinFrom: Mike Marciniszyn <[email protected]>
[ Upstream commit 099a884ba4c00145cef283d36e050726311c2e95 ]
Once a send context is taken down due to a link failure, any QPs waiting for pio credits will stay on the waitlist indefinitely.
Fix by wakeing up all QPs linked to piowait list.
--- drivers/infiniband/hw/hfi1/pio.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/infiniband/hw/hfi1/pio.c +16 -0
@@ -952,6 +952,22 @@ void sc_disable(struct send_context *sc) } }spin_unlock (&sc->release_lock); + +write_seqlock (&sc->waitlock); +while (!list_empty (&sc->piowait)) { +struct iowait *wait; +struct rvt_qp *qp; +struct hfi1_qp_priv *priv; + + wait = list_first_entry(&sc->piowait, struct iowait, list); + qp =iowait_to_qp (wait); + priv = qp->priv; +list_del_init (&priv->s_iowait.list); + priv->s_iowait.lock =NULL ; +hfi1_qp_wakeup (qp,RVT_S_WAIT_PIO |HFI1_S_WAIT_PIO_DRAIN ); + } +write_sequnlock (&sc->waitlock); +spin_unlock_irq (&sc->alloc_lock); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 82/95 IB/hfi1: Handle port down properly in pio
In reply to Sasha LevinFrom: Mike Marciniszyn <[email protected]>
[ Upstream commit 942a899335707fc9cfc97cb382a60734b2ff4e03 ]
The call to sc_buffer_alloc currently returns NULL (no buffer) or a buffer descriptor.
There is a third case when the port is down. Currently that returns NULL and this prevents the caller from properly handling the sc_buffer_alloc() failure. A verbs code link test after the call is racy so the indication needs to come from the state check inside the allocation routine to be valid.
Fix by encoding the ECOMM failure like SDMA. IS_ERR_OR_NULL() tests
are added at all call sites. For verbs send, this needs to treat any error by returning a completion without any MMIO copy.
--- drivers/infiniband/hw/hfi1/pio.c | 5 +++-- drivers/infiniband/hw/hfi1/rc.c | 2 +- drivers/infiniband/hw/hfi1/ud.c | 4 ++-- drivers/infiniband/hw/hfi1/verbs.c | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-)
drivers/infiniband/hw/hfi1/pio.c +3 -2
@@ -1443,7 +1443,8 @@ void sc_stop(struct send_context *sc, int flag)* @cb: optional callback to call when the buffer is finished sending * @arg: argument for cb * -* Return a pointer to a PIO buffer if successful, NULL if not enough room. +* Return a pointer to a PIO buffer, NULL if not enough room, -ECOMM +* when link is down. */ struct pio_buf *sc_buffer_alloc (struct send_context *sc,u32 dw_len,pio_release_cb cb,void *arg)
@@ -1459,7 +1460,7 @@ struct pio_buf *sc_buffer_alloc(struct send_context *sc, u32 dw_len,spin_lock_irqsave (&sc->alloc_lock, flags);if (!(sc->flags &SCF_ENABLED )) {spin_unlock_irqrestore (&sc->alloc_lock, flags); - goto done; +return ERR_PTR (-ECOMM ); } retry:
drivers/infiniband/hw/hfi1/rc.c +1 -1
@@ -1434,7 +1434,7 @@ void hfi1_send_rc_ack(struct hfi1_packet *packet, bool is_fecn) pbc =create_pbc (ppd, pbc_flags, qp->srate_mbps,sc_to_vlt (ppd->dd, sc5), plen); pbuf =sc_buffer_alloc (rcd->sc, plen,NULL ,NULL ); -if (!pbuf) { +if (IS_ERR_OR_NULL (pbuf)) {/* * We have no room to send at the moment. Pass * responsibility for sending the ACK to the send engine
drivers/infiniband/hw/hfi1/ud.c +2 -2
@@ -683,7 +683,7 @@ void return_cnp_16B(struct hfi1_ibport *ibp, struct rvt_qp *qp, pbc =create_pbc (ppd, pbc_flags, qp->srate_mbps, vl, plen);if (ctxt) { pbuf =sc_buffer_alloc (ctxt, plen,NULL ,NULL ); -if (pbuf) { +if (!IS_ERR_OR_NULL (pbuf)) {trace_pio_output_ibhdr (ppd->dd, &hdr, sc5); ppd->dd->pio_inline_send (ppd->dd, pbuf, pbc, &hdr, hwords);
@@ -738,7 +738,7 @@ void return_cnp(struct hfi1_ibport *ibp, struct rvt_qp *qp, u32 remote_qpn, pbc =create_pbc (ppd, pbc_flags, qp->srate_mbps, vl, plen);if (ctxt) { pbuf =sc_buffer_alloc (ctxt, plen,NULL ,NULL ); -if (pbuf) { +if (!IS_ERR_OR_NULL (pbuf)) {trace_pio_output_ibhdr (ppd->dd, &hdr, sc5); ppd->dd->pio_inline_send (ppd->dd, pbuf, pbc, &hdr, hwords);
drivers/infiniband/hw/hfi1/verbs.c +2 -2
@@ -1039,10 +1039,10 @@ int hfi1_verbs_send_pio(struct rvt_qp *qp, struct hfi1_pkt_state *ps,if (cb)iowait_pio_inc (&priv->s_iowait); pbuf =sc_buffer_alloc (sc, plen, cb, qp); -if (unlikely (!pbuf)) { +if (unlikely (IS_ERR_OR_NULL (pbuf))) {if (cb)verbs_pio_complete (qp,0 ); -if (ppd->host_link_state !=HLS_UP_ACTIVE ) { +if (IS_ERR (pbuf)) {/* * If we have filled the PIO buffers to capacity and are * not in an active state this request is not going to
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 83/95 md: fix for divide error in status_resync
In reply to Sasha LevinFrom: Mariusz Tkaczyk <[email protected]>
[ Upstream commit 9642fa73d073527b0cbc337cc17a47d545d82cd2 ]
Stopping external metadata arrays during resync/recovery causes retries, loop of interrupting and starting reconstruction, until it hit at good moment to stop completely. While these retries curr_mark_cnt can be small- especially on HDD drives, so subtraction result can be smaller than 0. However it is casted to uint without checking. As a result of it the status bar in /proc/mdstat while stopping is strange (it jumps between 0% and 99%).
The real problem occurs here after commit 72deb455b5ec ("block: remove CONFIG_LBDAF"). Sector_div() macro has been changed, now the divisor is casted to uint32. For db = -8 the divisior(db/32-1) becomes 0.
Check if db value can be really counted and replace these macro by div64_u64() inline.
--- drivers/md/md.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)
drivers/md/md.c +22 -14
@@ -7617,9 +7617,9 @@ static void status_unused(struct seq_file *seq)static int status_resync (struct seq_file *seq,struct mddev *mddev) {sector_t max_sectors, resync, res; -unsigned long dt, db; -sector_t rt; -int scale; +unsigned long dt, db =0 ; +sector_t rt, curr_mark_cnt, resync_mark_cnt; +int scale, recovery_active;unsigned int per_milli; if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ||
@@ -7708,22 +7708,30 @@ static int status_resync(struct seq_file *seq, struct mddev *mddev)* db: blocks written from mark until now * rt: remaining time * -* rt is a sector_t, so could be 32bit or 64bit. -* So we divide before multiply in case it is 32bit and close -* to the limit. -* We scale the divisor (db) by 32 to avoid losing precision -* near the end of resync when the number of remaining sectors -* is close to 'db'. -* We then divide rt by 32 after multiplying by db to compensate. -* The '+1' avoids division by zero if db is very small. +* rt is a sector_t, which is always 64bit now. We are keeping +* the original algorithm, but it is not really necessary. +* +* Original algorithm: +* So we divide before multiply in case it is 32bit and close +* to the limit. +* We scale the divisor (db) by 32 to avoid losing precision +* near the end of resync when the number of remaining sectors +* is close to 'db'. +* We then divide rt by 32 after multiplying by db to compensate. +* The '+1' avoids division by zero if db is very small. */ dt = ((jiffies - mddev->resync_mark) /HZ );if (!dt) dt++; - db = (mddev->curr_mark_cnt -atomic_read (&mddev->recovery_active)) - - mddev->resync_mark_cnt; + + curr_mark_cnt = mddev->curr_mark_cnt; + recovery_active =atomic_read (&mddev->recovery_active); + resync_mark_cnt = mddev->resync_mark_cnt; + +if (curr_mark_cnt >= (recovery_active + resync_mark_cnt)) + db = curr_mark_cnt - (recovery_active + resync_mark_cnt); rt = max_sectors - resync;/* number of remaining sectors */ -sector_div (rt, db/32 +1 ); + rt =div64_u64 (rt, db/32 +1 ); rt *= dt; rt >>=5 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 84/95 bnx2x: Check if transceiver implements DDM before access
In reply to Sasha LevinFrom: "Mauro S. M. Rodrigues" <[email protected]>
[ Upstream commit cf18cecca911c0db96b868072665347efe6df46f ]
Some transceivers may comply with SFF-8472 even though they do not implement the Digital Diagnostic Monitoring (DDM) interface described in the spec. The existence of such area is specified by the 6th bit of byte 92, set to 1 if implemented.
Currently, without checking this bit, bnx2x fails trying to read sfp module's EEPROM with the follow message:
ethtool -m enP5p1s0f1
Cannot get Module EEPROM data: Input/output error
Because it fails to read the additional 256 bytes in which it is assumed to exist the DDM data.
This issue was noticed using a Mellanox Passive DAC PN 01FT738. The EEPROM data was confirmed by Mellanox as correct and similar to other Passive DACs from other manufacturers.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 3 ++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +2 -1
@@ -1609,7 +1609,8 @@ static int bnx2x_get_module_info(struct net_device *dev, }if (!sff8472_comp || - (diag_type &SFP_EEPROM_DIAG_ADDR_CHANGE_REQ )) { + (diag_type &SFP_EEPROM_DIAG_ADDR_CHANGE_REQ ) || + !(diag_type &SFP_EEPROM_DDM_IMPLEMENTED )) { modinfo->type =ETH_MODULE_SFF_8079 ; modinfo->eeprom_len =ETH_MODULE_SFF_8079_LEN ; }else {
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h +1 -0
@@ -62,6 +62,7 @@#define SFP_EEPROM_DIAG_TYPE_ADDR 0x5c#define SFP_EEPROM_DIAG_TYPE_SIZE 1#define SFP_EEPROM_DIAG_ADDR_CHANGE_REQ (1<<2) +#define SFP_EEPROM_DDM_IMPLEMENTED (1<<6)#define SFP_EEPROM_SFF_8472_COMP_ADDR 0x5e#define SFP_EEPROM_SFF_8472_COMP_SIZE 1
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 85/95 drm: return -EFAULT if copy_to_user() fails
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 74b67efa8d7b4f90137f0ab9a80dd319da050350 ]
The copy_from_user() function returns the number of bytes remaining to be copied but we want to return a negative error code. Otherwise the callers treat it as a successful copy.
--- drivers/gpu/drm/drm_bufs.c | 5 ++++- drivers/gpu/drm/drm_ioc32.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_bufs.c +4 -1
@@ -1332,7 +1332,10 @@ static int copy_one_buf(void *data, int count, struct drm_buf_entry *from) .size = from->buf_size, .low_mark = from->low_mark, .high_mark = from->high_mark}; -return copy_to_user (to, &v, offsetof(struct drm_buf_desc , flags)); + +if (copy_to_user (to, &v, offsetof(struct drm_buf_desc , flags))) +return -EFAULT ; +return 0 ; } int drm_legacy_infobufs(struct drm_device *dev, void *data,
drivers/gpu/drm/drm_ioc32.c +4 -1
@@ -372,7 +372,10 @@ static int copy_one_buf32(void *data, int count, struct drm_buf_entry *from) .size = from->buf_size, .low_mark = from->low_mark, .high_mark = from->high_mark}; -return copy_to_user (to + count, &v, offsetof(drm_buf_desc32_t , flags)); + +if (copy_to_user (to + count, &v, offsetof(drm_buf_desc32_t , flags))) +return -EFAULT ; +return 0 ; } static int drm_legacy_infobufs32(struct drm_device *dev, void *data,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 86/95 ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL
In reply to Sasha LevinFrom: Xin Long <[email protected]>
[ Upstream commit 6f6a8622057c92408930c31698394fae1557b188 ]
A similar fix to Patch "ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL" is also needed by ip6_tunnel.
--- include/net/ip6_tunnel.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
include/net/ip6_tunnel.h +6 -3
@@ -158,9 +158,12 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb,memset (skb->cb,0 ,sizeof (struct inet6_skb_parm )); pkt_len = skb->len -skb_inner_network_offset (skb); err =ip6_local_out (dev_net (skb_dst (skb)->dev), sk, skb); -if (unlikely (net_xmit_eval (err))) - pkt_len =-1 ; -iptunnel_xmit_stats (dev, pkt_len); + +if (dev) { +if (unlikely (net_xmit_eval (err))) + pkt_len =-1 ; +iptunnel_xmit_stats (dev, pkt_len); + } }#endif #endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 87/95 net: lio_core: fix potential sign-extension overflow on large shift
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 9476274093a0e79b905f4cd6cf6d149f65e02c17 ]
Left shifting the signed int value 1 by 31 bits has undefined behaviour and the shift amount oq_no can be as much as 63. Fix this by using BIT_ULL(oq_no) instead.
Addresses-Coverity: ("Bad shift operation")
--- drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/cavium/liquidio/lio_core.c +1 -1
@@ -964,7 +964,7 @@ static void liquidio_schedule_droq_pkt_handlers(struct octeon_device *oct)if (droq->ops.poll_mode) { droq->ops.napi_fn (droq); - oct_priv->napi_mask |= (1 << oq_no); + oct_priv->napi_mask |=BIT_ULL (oq_no); }else {tasklet_schedule (&oct_priv->droq_tasklet); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 88/95 scsi: qedi: Check targetname while finding boot target information
In reply to Sasha LevinFrom: Nilesh Javali <[email protected]>
[ Upstream commit 1ac3549ed58cdfdaf43bbf31ac260e2381cc0dae ]
The kernel panic was observed during iSCSI discovery via offload with below call trace,
[ 2115.646901] BUG: unable to handle kernel NULL pointer dereference at (null)
[ 2115.646909] IP: [<ffffffffacf7f0cc>] strncmp+0xc/0x60
[ 2115.646927] PGD 0
[ 2115.646932] Oops: 0000 [#1] SMP
[ 2115.647107] CPU: 24 PID: 264 Comm: kworker/24:1 Kdump: loaded Tainted: G
OE ------------ 3.10.0-957.el7.x86_64 #1
[ 2115.647133] Workqueue: slowpath-13:00. qed_slowpath_task [qed]
[ 2115.647135] task: ffff8d66af80b0c0 ti: ffff8d66afb80000 task.ti: ffff8d66afb80000
[ 2115.647136] RIP: 0010:[<ffffffffacf7f0cc>] [<ffffffffacf7f0cc>] strncmp+0xc/0x60
[ 2115.647141] RSP: 0018:ffff8d66afb83c68 EFLAGS: 00010206
[ 2115.647143] RAX: 0000000000000001 RBX: 0000000000000007 RCX: 000000000000000a
[ 2115.647144] RDX: 0000000000000100 RSI: 0000000000000000 RDI: ffff8d632b3ba040
[ 2115.647145] RBP: ffff8d66afb83c68 R08: 0000000000000000 R09: 000000000000ffff
[ 2115.647147] R10: 0000000000000007 R11: 0000000000000800 R12: ffff8d66a30007a0
[ 2115.647148] R13: ffff8d66747a3c10 R14: ffff8d632b3ba000 R15: ffff8d66747a32f8
[ 2115.647149] FS: 0000000000000000(0000) GS:ffff8d66aff00000(0000) knlGS:0000000000000000
[ 2115.647151] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 2115.647152] CR2: 0000000000000000 CR3: 0000000509610000 CR4: 00000000007607e0
[ 2115.647153] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 2115.647154] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[ 2115.647155] PKRU: 00000000
[ 2115.647157] Call Trace:
[ 2115.647165] [<ffffffffc0634cc5>] qedi_get_protocol_tlv_data+0x2c5/0x510 [qedi]
[ 2115.647184] [<ffffffffc05968f5>] ? qed_mfw_process_tlv_req+0x245/0xbe0 [qed]
[ 2115.647195] [<ffffffffc05496cb>] qed_mfw_fill_tlv_data+0x4b/0xb0 [qed]
[ 2115.647206] [<ffffffffc0596911>] qed_mfw_process_tlv_req+0x261/0xbe0 [qed]
[ 2115.647215] [<ffffffffacce0e8e>] ? dequeue_task_fair+0x41e/0x660
[ 2115.647221] [<ffffffffacc2a59e>] ? __switch_to+0xce/0x580
[ 2115.647230] [<ffffffffc0546013>] qed_slowpath_task+0xa3/0x160 [qed]
[ 2115.647278] RIP [<ffffffffacf7f0cc>] strncmp+0xc/0x60Fix kernel panic by validating the session targetname before providing TLV data and confirming the presence of boot targets.
--- drivers/scsi/qedi/qedi_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/qedi/qedi_main.c +3 -0
@@ -990,6 +990,9 @@ static int qedi_find_boot_info(struct qedi_ctx *qedi,if (!iscsi_is_session_online (cls_sess))continue ; +if (!sess->targetname) +continue ; +if (pri_ctrl_flags) {if (!strcmp (pri_tgt->iscsi_name, sess->targetname) && !strcmp (pri_tgt->ip_addr, ep_ip_addr)) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 89/95 powerpc: enable a 30-bit ZONE_DMA for 32-bit pmac
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 9739ab7eda459f0669ec9807e0d9be5020bab88c ]
With the strict dma mask checking introduced with the switch to the generic DMA direct code common wifi chips on 32-bit powerbooks stopped working. Add a 30-bit ZONE_DMA to the 32-bit pmac builds to allow them to reliably allocate dma coherent memory.
--- arch/powerpc/include/asm/page.h | 7 +++++++ arch/powerpc/mm/mem.c | 3 ++- arch/powerpc/platforms/powermac/Kconfig | 1 + 3 files changed, 10 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/page.h +7 -0
@@ -330,6 +330,13 @@ struct vm_area_struct;#endif /* __ASSEMBLY__ */ #include <asm/slice.h> +/* +* Allow 30-bit DMA for very limited Broadcom wifi chips on many powerbooks. +*/ +#ifdef CONFIG_PPC32 +#define ARCH_ZONE_DMA_BITS 30 +#else #define ARCH_ZONE_DMA_BITS 31 +#endif #endif /* _ASM_POWERPC_PAGE_H */
arch/powerpc/mm/mem.c +2 -1
@@ -255,7 +255,8 @@ void __init paging_init(void) (long int)((top_of_ram - total_ram) >> 20));#ifdef CONFIG_ZONE_DMA - max_zone_pfns[ZONE_DMA ] =min (max_low_pfn,0x7fffffffUL >>PAGE_SHIFT ); + max_zone_pfns[ZONE_DMA ] =min (max_low_pfn, + ((1UL <<ARCH_ZONE_DMA_BITS ) -1 ) >>PAGE_SHIFT );#endif max_zone_pfns[ZONE_NORMAL ] = max_low_pfn;#ifdef CONFIG_HIGHMEM
arch/powerpc/platforms/powermac/Kconfig +1 -0
@@ -7,6 +7,7 @@ config PPC_PMAC select PPC_INDIRECT_PCI if PPC32 select PPC_MPC106 if PPC32 select PPC_NATIVE + select ZONE_DMA if PPC32 default y config PPC_PMAC64
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 90/95 quota: fix a problem about transfer quota
In reply to Sasha LevinFrom: yangerkun <[email protected]>
[ Upstream commit c6d9c35d16f1bafd3fec64b865e569e48cbcb514 ]
Run below script as root, dquot_add_space will return -EDQUOT since __dquot_transfer call dquot_add_space with flags=0, and dquot_add_space think it's a preallocation. Fix it by set flags as DQUOT_SPACE_WARN.
mkfs.ext4 -O quota,project /dev/vdb mount -o prjquota /dev/vdb /mnt
setquota -P 23 1 1 0 0 /dev/vdb
dd if=/dev/zero of=/mnt/test-file bs=4K count=1 chattr -p 23 test-file
--- fs/quota/dquot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/quota/dquot.c +2 -2
@@ -1993,8 +1993,8 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to) &warn_to[cnt]);if (ret) goto over_quota; - ret =dquot_add_space (transfer_to[cnt], cur_space, rsv_space,0 , - &warn_to[cnt]); + ret =dquot_add_space (transfer_to[cnt], cur_space, rsv_space, +DQUOT_SPACE_WARN , &warn_to[cnt]);if (ret) {spin_lock (&transfer_to[cnt]->dq_dqb_lock);dquot_decr_inodes (transfer_to[cnt], inode_usage);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 91/95 fanotify: update connector fsid cache on add mark
In reply to Sasha LevinFrom: Amir Goldstein <[email protected]>
[ Upstream commit c285a2f01d692ef48d7243cf1072897bbd237407 ]
When implementing connector fsid cache, we only initialized the cache when the first mark added to object was added by FAN_REPORT_FID group. We forgot to update conn->fsid when the second mark is added by FAN_REPORT_FID group to an already attached connector without fsid cache.
--- fs/notify/fanotify/fanotify.c | 4 ++++ fs/notify/mark.c | 14 +++++++++++--- include/linux/fsnotify_backend.h | 4 +++- 3 files changed, 18 insertions(+), 4 deletions(-)
fs/notify/fanotify/fanotify.c +4 -0
@@ -355,6 +355,10 @@ static __kernel_fsid_t fanotify_get_fsid(struct fsnotify_iter_info *iter_info)/* Mark is just getting destroyed or created? */ if (!conn)continue ; +if (!(conn->flags &FSNOTIFY_CONN_FLAG_HAS_FSID )) +continue ; +/* Pairs with smp_wmb() in fsnotify_add_mark_list() */ +smp_rmb (); fsid = conn->fsid;if (WARN_ON_ONCE (!fsid.val[0 ] && !fsid.val[1 ]))continue ;
fs/notify/mark.c +11 -3
@@ -495,10 +495,13 @@ static int fsnotify_attach_connector_to_object(fsnotify_connp_t *connp, conn->type = type; conn->obj = connp;/* Cache fsid of filesystem containing the object */ -if (fsid) +if (fsid) { conn->fsid = *fsid; -else + conn->flags =FSNOTIFY_CONN_FLAG_HAS_FSID ; + }else { conn->fsid.val[0 ] = conn->fsid.val[1 ] =0 ; + conn->flags =0 ; + }if (conn->type ==FSNOTIFY_OBJ_TYPE_INODE ) inode =igrab (fsnotify_conn_inode (conn));/*
@@ -573,7 +576,12 @@ static int fsnotify_add_mark_list(struct fsnotify_mark *mark,if (err)return err; goto restart; - }else if (fsid && (conn->fsid.val[0 ] || conn->fsid.val[1 ]) && + }else if (fsid && !(conn->flags &FSNOTIFY_CONN_FLAG_HAS_FSID )) { + conn->fsid = *fsid; +/* Pairs with smp_rmb() in fanotify_get_fsid() */ +smp_wmb (); + conn->flags |=FSNOTIFY_CONN_FLAG_HAS_FSID ; + }else if (fsid && (conn->flags &FSNOTIFY_CONN_FLAG_HAS_FSID ) && (fsid->val[0 ] != conn->fsid.val[0 ] || fsid->val[1 ] != conn->fsid.val[1 ])) {/*
include/linux/fsnotify_backend.h +3 -1
@@ -292,7 +292,9 @@ typedef struct fsnotify_mark_connector __rcu *fsnotify_connp_t;*/ struct fsnotify_mark_connector {spinlock_t lock; -unsigned int type;/* Type of object [lock] */ +unsigned short type;/* Type of object [lock] */ +#define FSNOTIFY_CONN_FLAG_HAS_FSID 0x01 +unsigned short flags;/* flags [lock] */ __kernel_fsid_t fsid;/* fsid of filesystem containing object */ union {/* Object pointer [lock] */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 92/95 net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge()
In reply to Sasha LevinFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit 48620e341659f6e4b978ec229f6944dabe6df709 ]
The comment is correct, but the code ends up moving the bits four places too far, into the VTUOp field.
--- drivers/net/dsa/mv88e6xxx/global1_vtu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/mv88e6xxx/global1_vtu.c +1 -1
@@ -419,7 +419,7 @@ int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,* VTU DBNum[7:4] are located in VTU Operation 11:8 */ op |= entry->fid &0x000f ; - op |= (entry->fid &0x00f0 ) <<8 ; + op |= (entry->fid &0x00f0 ) <<4 ; }return mv88e6xxx_g1_vtu_op (chip, op);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 93/95 KVM: arm/arm64: Fix emulated ptimer irq injection
In reply to Sasha LevinFrom: Andrew Jones <[email protected]>
[ Upstream commit e4e5a865e9a9e8e47ac1959b629e9f3ae3b062f2 ]
The emulated ptimer needs to track the level changes, otherwise the the interrupt will never get deasserted, resulting in the guest getting stuck in an interrupt storm if it enables ptimer interrupts. This was found with kvm-unit-tests; the ptimer tests hung as soon as interrupts were enabled. Typical Linux guests don't have a problem as they prefer using the virtual timer.
--- virt/kvm/arm/arch_timer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
virt/kvm/arm/arch_timer.c +3 -2
@@ -321,14 +321,15 @@ static void kvm_timer_update_irq(struct kvm_vcpu *vcpu, bool new_level, } } +/* Only called for a fully emulated timer */ static void timer_emulate (struct arch_timer_context *ctx) {bool should_fire =kvm_timer_should_fire (ctx);trace_kvm_timer_emulate (ctx, should_fire); -if (should_fire) { -kvm_timer_update_irq (ctx->vcpu, true, ctx); +if (should_fire != ctx->irq.level) { +kvm_timer_update_irq (ctx->vcpu, should_fire, ctx);return ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 94/95 NFS4: Only set creation opendata if O_CREAT
In reply to Sasha LevinFrom: Benjamin Coddington <[email protected]>
[ Upstream commit 909105199a682cb09c500acd443d34b182846c9c ]
We can end up in nfs4_opendata_alloc during task exit, in which case current->fs has already been cleaned up. This leads to a crash in current_umask().
Fix this by only setting creation opendata if we are actually doing an open with O_CREAT. We can drop the check for NULL nfs4_open_createattrs, since O_CREAT will never be set for the recovery path.
--- fs/nfs/nfs4proc.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
fs/nfs/nfs4proc.c +11 -9
@@ -1234,10 +1234,20 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,atomic_inc (&sp->so_count); p->o_arg.open_flags = flags; p->o_arg.fmode = fmode & (FMODE_READ |FMODE_WRITE ); - p->o_arg.umask =current_umask (); p->o_arg.claim =nfs4_map_atomic_open_claim (server, claim); p->o_arg.share_access =nfs4_map_atomic_open_share (server, fmode, flags); +if (flags &O_CREAT ) { + p->o_arg.umask =current_umask (); + p->o_arg.label =nfs4_label_copy (p->a_label, label); +if (c->sattr !=NULL && c->sattr->ia_valid !=0 ) { + p->o_arg.u.attrs = &p->attrs; +memcpy (&p->attrs, c->sattr,sizeof (p->attrs)); + +memcpy (p->o_arg.u.verifier.data, c->verf, +sizeof (p->o_arg.u.verifier.data)); + } + }/* don't put an ACCESS op in OPEN compound if O_EXCL, because ACCESS * will return permission denied for all bits until close */ if (!(flags &O_EXCL )) {
@@ -1261,7 +1271,6 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry, p->o_arg.server = server; p->o_arg.bitmask =nfs4_bitmask (server, label); p->o_arg.open_bitmap = &nfs4_fattr_bitmap[0 ]; - p->o_arg.label =nfs4_label_copy (p->a_label, label);switch (p->o_arg.claim) {case NFS4_OPEN_CLAIM_NULL :case NFS4_OPEN_CLAIM_DELEGATE_CUR :
@@ -1274,13 +1283,6 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,case NFS4_OPEN_CLAIM_DELEG_PREV_FH : p->o_arg.fh =NFS_FH (d_inode (dentry)); } -if (c !=NULL && c->sattr !=NULL && c->sattr->ia_valid !=0 ) { - p->o_arg.u.attrs = &p->attrs; -memcpy (&p->attrs, c->sattr,sizeof (p->attrs)); - -memcpy (p->o_arg.u.verifier.data, c->verf, -sizeof (p->o_arg.u.verifier.data)); - } p->c_arg.fh = &p->o_res.fh; p->c_arg.stateid = &p->o_res.stateid; p->c_arg.seqid = p->o_arg.seqid;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 95/95 net :sunrpc :clnt :Fix xps refcount imbalance on the error path
In reply to Sasha LevinFrom: Lin Yi <[email protected]>
[ Upstream commit b96226148491505318228ac52624956bd98f9e0c ]
rpc_clnt_add_xprt take a reference to struct rpc_xprt_switch, but forget to release it before return, may lead to a memory leak.
--- net/sunrpc/clnt.c | 1 + 1 file changed, 1 insertion(+)
net/sunrpc/clnt.c +1 -0
@@ -2766,6 +2766,7 @@ int rpc_clnt_add_xprt(struct rpc_clnt *clnt, xprt =xprt_iter_xprt (&clnt->cl_xpi);if (xps ==NULL || xprt ==NULL ) {rcu_read_unlock (); +xprt_switch_put (xps);return -EAGAIN ; } resvport = xprt->resvport;
Signature · 1 line
2.20.1