netfilter: nfnetlink: avoid deadlock due to synchronous request_module
Subsystems (14)
Sasha Levin
maintainerPATCH 1/42 netfilter: nfnetlink: avoid deadlock due to synchronous request_module
From: Florian Westphal <[email protected]>
[ Upstream commit 1b0890cd60829bd51455dc5ad689ed58c4408227 ]
Thomas and Juliana report a deadlock when running:
(rmmod nf_conntrack_netlink/xfrm_user)
conntrack -e NEW -E &
modprobe -v xfrm_user
They provided following analysis:
conntrack -e NEW -E
netlink_bind()
netlink_lock_table() -> increases "nl_table_users"
nfnetlink_bind()
# does not unlock the table as it's locked by netlink_bind()
__request_module()
call_usermodehelper_exec()This triggers "modprobe nf_conntrack_netlink" from kernel, netlink_bind() won't return until modprobe process is done.
"modprobe xfrm_user":
xfrm_user_init()
register_pernet_subsys()
-> grab pernet_ops_rwsem
..
netlink_table_grab()
calls schedule() as "nl_table_users" is non-zeroso modprobe is blocked because netlink_bind() increased nl_table_users while also holding pernet_ops_rwsem.
"modprobe nf_conntrack_netlink" runs and inits nf_conntrack_netlink:
ctnetlink_init()
register_pernet_subsys()
-> blocks on "pernet_ops_rwsem" thanks to xfrm_user moduleboth modprobe processes wait on one another -- neither can make progress.
Switch netlink_bind() to "nowait" modprobe -- this releases the netlink table lock, which then allows both modprobe instances to complete.
--- net/netfilter/nfnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nfnetlink.c +1 -1
@@ -575,7 +575,7 @@ static int nfnetlink_bind(struct net *net, int group) ss =nfnetlink_get_subsys (type <<8 );rcu_read_unlock ();if (!ss) -request_module ("nfnetlink-subsys-%d" , type); +request_module_nowait ("nfnetlink-subsys-%d" , type); return 0; }#endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/42 vfio-ccw: Set pa_nr to 0 if memory allocation fails for pa_iova_pfn
From: Farhan Ali <[email protected]>
[ Upstream commit c1ab69268d124ebdbb3864580808188ccd3ea355 ]
So we don't call try to call vfio_unpin_pages() incorrectly.
Message-Id: <33a89467ad6369196ae6edf820cbcb1e2d8d050c.1562854091.git.alifm@linux.ibm.com>
--- drivers/s390/cio/vfio_ccw_cp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/s390/cio/vfio_ccw_cp.c +3 -1
@@ -89,8 +89,10 @@ static int pfn_array_alloc_pin(struct pfn_array *pa, struct device *mdev,sizeof (*pa->pa_iova_pfn) +sizeof (*pa->pa_pfn), GFP_KERNEL); -if (unlikely (!pa->pa_iova_pfn)) +if (unlikely (!pa->pa_iova_pfn)) { + pa->pa_nr =0 ;return -ENOMEM ; + } pa->pa_pfn = pa->pa_iova_pfn + pa->pa_nr; pa->pa_iova_pfn[0 ] = pa->pa_iova >>PAGE_SHIFT ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/42 netfilter: Fix rpfilter dropping vrf packets by mistake
In reply to Sasha LevinFrom: Miaohe Lin <[email protected]>
[ Upstream commit b575b24b8eee37f10484e951b62ce2a31c579775 ]
When firewalld is enabled with ipv4/ipv6 rpfilter, vrf ipv4/ipv6 packets will be dropped. Vrf device will pass through netfilter hook twice. One with enslaved device and another one with l3 master device. So in device may dismatch witch out device because out device is always enslaved device.So failed with the check of the rpfilter and drop the packets by mistake.
--- net/ipv4/netfilter/ipt_rpfilter.c | 1 + net/ipv6/netfilter/ip6t_rpfilter.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
net/ipv4/netfilter/ipt_rpfilter.c +1 -0
@@ -96,6 +96,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par) flow.flowi4_mark = info->flags &XT_RPFILTER_VALID_MARK ? skb->mark :0 ; flow.flowi4_tos =RT_TOS (iph->tos); flow.flowi4_scope =RT_SCOPE_UNIVERSE ; + flow.flowi4_oif =l3mdev_master_ifindex_rcu (xt_in (par));return rpfilter_lookup_reverse (xt_net (par), &flow,xt_in (par), info->flags) ^ invert; }
net/ipv6/netfilter/ip6t_rpfilter.c +6 -2
@@ -58,7 +58,9 @@ static bool rpfilter_lookup_reverse6(struct net *net, const struct sk_buff *skb,if (rpfilter_addr_linklocal (&iph->saddr)) { lookup_flags |=RT6_LOOKUP_F_IFACE ; fl6.flowi6_oif = dev->ifindex; - }else if ((flags &XT_RPFILTER_LOOSE ) ==0 ) +/* Set flowi6_oif for vrf devices to lookup route in l3mdev domain. */ + }else if (netif_is_l3_master (dev) ||netif_is_l3_slave (dev) || + (flags &XT_RPFILTER_LOOSE ) ==0 ) fl6.flowi6_oif = dev->ifindex; rt = (void *)ip6_route_lookup (net, &fl6, skb, lookup_flags);
@@ -73,7 +75,9 @@ static bool rpfilter_lookup_reverse6(struct net *net, const struct sk_buff *skb, goto out; } -if (rt->rt6i_idev->dev == dev || (flags &XT_RPFILTER_LOOSE )) +if (rt->rt6i_idev->dev == dev || +l3mdev_master_ifindex_rcu (rt->rt6i_idev->dev) == dev->ifindex || + (flags &XT_RPFILTER_LOOSE )) ret = true; out:ip6_rt_put (rt);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/42 netfilter: conntrack: always store window size un-scaled
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit 959b69ef57db00cb33e9c4777400ae7183ebddd3 ]
Jakub Jankowski reported following oddity:
After 3 way handshake completes, timeout of new connection is set to max_retrans (300s) instead of established (5 days).
shortened excerpt from pcap provided:
25.070622 IP (flags [DF], proto TCP (6), length 52)
10.8.5.4.1025 > 10.8.1.2.80: Flags [S], seq 11, win 64240, [wscale 8] 26.070462 IP (flags [DF], proto TCP (6), length 48)
10.8.1.2.80 > 10.8.5.4.1025: Flags [S.], seq 82, ack 12, win 65535, [wscale 3] 27.070449 IP (flags [DF], proto TCP (6), length 40)
10.8.5.4.1025 > 10.8.1.2.80: Flags [.], ack 83, win 512, length 0
Turns out the last_win is of u16 type, but we store the scaled value:
512 << 8 (== 0x20000) becomes 0 window.
The Fixes tag is not correct, as the bug has existed forever, but without that change all that this causes might cause is to mistake a window update (to-nonzero-from-zero) for a retransmit.
--- net/netfilter/nf_conntrack_proto_tcp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/netfilter/nf_conntrack_proto_tcp.c +5 -3
@@ -480,6 +480,7 @@ static bool tcp_in_window(const struct nf_conn *ct,struct ip_ct_tcp_state *receiver = &state->seen[!dir];const struct nf_conntrack_tuple *tuple = &ct->tuplehash[dir].tuple;__u32 seq, ack, sack, end, win, swin; +u16 win_raw;s32 receiver_offset;bool res, in_recv_win;
@@ -488,7 +489,8 @@ static bool tcp_in_window(const struct nf_conn *ct,*/ seq =ntohl (tcph->seq); ack = sack =ntohl (tcph->ack_seq); - win =ntohs (tcph->window); + win_raw =ntohs (tcph->window); + win = win_raw; end =segment_seq_plus_len (seq, skb->len, dataoff, tcph);if (receiver->flags &IP_CT_TCP_FLAG_SACK_PERM )
@@ -663,14 +665,14 @@ static bool tcp_in_window(const struct nf_conn *ct, && state->last_seq == seq && state->last_ack == ack && state->last_end == end - && state->last_win == win) + && state->last_win == win_raw) state->retrans++; else { state->last_dir = dir; state->last_seq = seq; state->last_ack = ack; state->last_end = end; - state->last_win = win; + state->last_win = win_raw; state->retrans =0 ; } }
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 4.19 04/42] netfilter: conntrack: always store window size un-scaled
Hello together,
You wrote on Fri, Aug 02, 2019 at 09:22:24AM -0400:
Quoted 24 lines
From: Florian Westphal <[email protected]>
[ Upstream commit
959b69ef57db00cb33e9c4777400ae7183ebddd3]Jakub Jankowski reported following oddity:
After 3 way handshake completes, timeout of new connection is set to
max_retrans(300s) instead of established (5 days).shortened excerpt from pcap provided:
25.070622 IP (flags [DF], proto TCP (6), length 52)
10.8.5.4.1025 > 10.8.1.2.80: Flags [S], seq 11, win 64240, [wscale 8] 26.070462 IP (flags [DF], proto TCP (6), length 48)
10.8.1.2.80 > 10.8.5.4.1025: Flags [S.], seq 82, ack 12, win 65535, [wscale 3] 27.070449 IP (flags [DF], proto TCP (6), length 40)
10.8.5.4.1025 > 10.8.1.2.80: Flags [.], ack 83, win 512, length 0Turns out the
last_winis of u16 type, but we store the scaled value:
512 << 8 (==0x20000) becomes 0 window.The Fixes tag is not correct, as the bug has existed forever, but without that change all that this causes might cause is to mistake a window update (to-nonzero-from-zero) for a retransmit.
Quoted 7 lines
Fixes fbcd253d2448b8 ("netfilter: conntrack: lower timeout to RETRANS seconds if window is 0")Reported-by Jakub Jankowski <[email protected]>Tested-by Jakub Jankowski <[email protected]>Signed-off-by Florian Westphal <[email protected]>Acked-by Jozsef Kadlecsik <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Also:
;)
We've hit the issue with the wrong conntrack timeout at two different sites, long-lived connections to a SAP server over IPSec VPN were constantly dropping.
For us this was a regression after updating from kernel 3.14 to 4.19. Yesterday I've applied the patch to kernel 4.19.57 and the problem is fixed.
The issue was extra hard to debug as we could just boot the new kernel for twenty minutes in the evening on these productive systems.
The stable kernel patch from last Friday came right on time. I was just about the replay the TCP connection with tcpreplay, so this saved me from another week of debugging. Thanks everyone!
Best regards,
Thomas Jarosch
Re: [PATCH AUTOSEL 4.19 04/42] netfilter: conntrack: always store window size un-scaled
that's still not in 5.2.8
without the exception and "nf_conntrack_tcp_timeout_max_retrans = 60" a vnc-over-ssh session having the VNC view in the background freezes within 60 secods
-----------------------------------------------------------------------------------------------
IPV4 TABLE MANGLE (STATEFUL PRE-NAT/FILTER)
-----------------------------------------------------------------------------------------------
Chain PREROUTING (policy ACCEPT 100 packets, 9437 bytes)
num pkts bytes target prot opt in out source
destination
1 6526 3892K ACCEPT all -- * * 0.0.0.0/0
0.0.0.0/0 ctstate RELATED,ESTABLISHED
2 125 6264 ACCEPT all -- lo * 0.0.0.0/0
0.0.0.0/0
3 64 4952 ACCEPT all -- vmnet8 * 0.0.0.0/0
0.0.0.0/0
4 1 40 DROP all -- * * 0.0.0.0/0
0.0.0.0/0 ctstate INVALID
-------- Weitergeleitete Nachricht --------
Betreff: [PATCH AUTOSEL 5.2 07/76] netfilter: conntrack: always store window size un-scaled
Am 08.08.19 um 11:02 schrieb Thomas Jarosch:
Quoted 52 lines
Hello together,
You wrote on Fri, Aug 02, 2019 at 09:22:24AM -0400:
Quoted 24 lines
From: Florian Westphal <[email protected]>
[ Upstream commit
959b69ef57db00cb33e9c4777400ae7183ebddd3]Jakub Jankowski reported following oddity:
After 3 way handshake completes, timeout of new connection is set to
max_retrans(300s) instead of established (5 days).shortened excerpt from pcap provided:
25.070622 IP (flags [DF], proto TCP (6), length 52)
10.8.5.4.1025 > 10.8.1.2.80: Flags [S], seq 11, win 64240, [wscale 8] 26.070462 IP (flags [DF], proto TCP (6), length 48)
10.8.1.2.80 > 10.8.5.4.1025: Flags [S.], seq 82, ack 12, win 65535, [wscale 3] 27.070449 IP (flags [DF], proto TCP (6), length 40)
10.8.5.4.1025 > 10.8.1.2.80: Flags [.], ack 83, win 512, length 0Turns out the
last_winis of u16 type, but we store the scaled value:
512 << 8 (==0x20000) becomes 0 window.The Fixes tag is not correct, as the bug has existed forever, but without that change all that this causes might cause is to mistake a window update (to-nonzero-from-zero) for a retransmit.
Quoted 7 lines
Fixes fbcd253d2448b8 ("netfilter: conntrack: lower timeout to RETRANS seconds if window is 0")Reported-by Jakub Jankowski <[email protected]>Tested-by Jakub Jankowski <[email protected]>Signed-off-by Florian Westphal <[email protected]>Acked-by Jozsef Kadlecsik <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>Signed-off-by Sasha Levin <[email protected]>Also:
Tested-by Thomas Jarosch <[email protected]>;)
We've hit the issue with the wrong conntrack timeout at two different sites, long-lived connections to a SAP server over IPSec VPN were constantly dropping.
For us this was a regression after updating from kernel 3.14 to 4.19. Yesterday I've applied the patch to kernel 4.19.57 and the problem is fixed.
The issue was extra hard to debug as we could just boot the new kernel for twenty minutes in the evening on these productive systems.
The stable kernel patch from last Friday came right on time. I was just about the replay the TCP connection with tcpreplay, so this saved me from another week of debugging. Thanks everyone!
Re: [PATCH AUTOSEL 4.19 04/42] netfilter: conntrack: always store window size un-scaled
Quoted 1 line · Reindl Harald
that's still not in 5.2.8
It will make its way into next 5.2.x release, as it is now in the pending queue: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-5.2
Regards,
Jakub.
Quoted 78 lines
without the exception and "
nf_conntrack_tcp_timeout_max_retrans= 60" a vnc-over-ssh session having the VNC view in the background freezes within 60 secods-----------------------------------------------------------------------------------------------
IPV4 TABLE MANGLE (STATEFUL PRE-NAT/FILTER)
-----------------------------------------------------------------------------------------------
Chain PREROUTING (policy ACCEPT 100 packets, 9437 bytes)
num pkts bytes target prot opt in out source
destination
1 6526 3892K ACCEPT all -- * * 0.0.0.0/0
0.0.0.0/0 ctstate RELATED,ESTABLISHED
2 125 6264 ACCEPT all -- lo * 0.0.0.0/0
0.0.0.0/0
3 64 4952 ACCEPT all -- vmnet8 * 0.0.0.0/0
0.0.0.0/0
4 1 40 DROP all -- * * 0.0.0.0/0
0.0.0.0/0 ctstate INVALID-------- Weitergeleitete Nachricht --------
Betreff: [PATCH AUTOSEL 5.2 07/76] netfilter: conntrack: always store window size un-scaledAm 08.08.19 um 11:02 schrieb Thomas Jarosch:
Quoted 52 lines
Hello together,
You wrote on Fri, Aug 02, 2019 at 09:22:24AM -0400:
Quoted 24 lines
From: Florian Westphal <[email protected]>
[ Upstream commit
959b69ef57db00cb33e9c4777400ae7183ebddd3]Jakub Jankowski reported following oddity:
After 3 way handshake completes, timeout of new connection is set to
max_retrans(300s) instead of established (5 days).shortened excerpt from pcap provided:
25.070622 IP (flags [DF], proto TCP (6), length 52)
10.8.5.4.1025 > 10.8.1.2.80: Flags [S], seq 11, win 64240, [wscale 8] 26.070462 IP (flags [DF], proto TCP (6), length 48)
10.8.1.2.80 > 10.8.5.4.1025: Flags [S.], seq 82, ack 12, win 65535, [wscale 3] 27.070449 IP (flags [DF], proto TCP (6), length 40)
10.8.5.4.1025 > 10.8.1.2.80: Flags [.], ack 83, win 512, length 0Turns out the
last_winis of u16 type, but we store the scaled value:
512 << 8 (==0x20000) becomes 0 window.The Fixes tag is not correct, as the bug has existed forever, but without that change all that this causes might cause is to mistake a window update (to-nonzero-from-zero) for a retransmit.
Quoted 7 lines
Fixes fbcd253d2448b8 ("netfilter: conntrack: lower timeout to RETRANS seconds if window is 0")Reported-by Jakub Jankowski <[email protected]>Tested-by Jakub Jankowski <[email protected]>Signed-off-by Florian Westphal <[email protected]>Acked-by Jozsef Kadlecsik <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>Signed-off-by Sasha Levin <[email protected]>Also:
Tested-by Thomas Jarosch <[email protected]>;)
We've hit the issue with the wrong conntrack timeout at two different sites, long-lived connections to a SAP server over IPSec VPN were constantly dropping.
For us this was a regression after updating from kernel 3.14 to 4.19. Yesterday I've applied the patch to kernel 4.19.57 and the problem is fixed.
The issue was extra hard to debug as we could just boot the new kernel for twenty minutes in the evening on these productive systems.
The stable kernel patch from last Friday came right on time. I was just about the replay the TCP connection with tcpreplay, so this saved me from another week of debugging. Thanks everyone!
Signature · 1 line
Jakub Jankowski|[email protected]|https://toxcorp.com/
Sasha Levin
maintainerRe: [PATCH AUTOSEL 4.19 04/42] netfilter: conntrack: always store window size un-scaled
Quoted 5 lines · Jakub Jankowski
Quoted 1 line · Reindl Harald
that's still not in 5.2.8
It will make its way into next 5.2.x release, as it is now in the pending queue: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-5.2
In general, AUTOSEL stuff soak for much longer before they make it to the queue.
If there's an urgent need for a fix to go in, please make it explicit.
--
Thanks,
Sasha
Sasha Levin
maintainerPATCH 5/42 netfilter: nft_hash: fix symhash with modulus one
In reply to Sasha LevinFrom: Laura Garcia Liebana <[email protected]>
[ Upstream commit 28b1d6ef53e3303b90ca8924bb78f31fa527cafb ]
The rule below doesn't work as the kernel raises -ERANGE.
nft add rule netdev nftlb lb01 ip daddr set \
symhash mod 1 map { 0 : 192.168.0.10 } fwd to "eth0"This patch allows to use the symhash modulus with one element, in the same way that the other types of hashes and algorithms that uses the modulus parameter.
--- net/netfilter/nft_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_hash.c +1 -1
@@ -196,7 +196,7 @@ static int nft_symhash_init(const struct nft_ctx *ctx, priv->dreg =nft_parse_register (tb[NFTA_HASH_DREG ]); priv->modulus =ntohl (nla_get_be32 (tb[NFTA_HASH_MODULUS ])); -if (priv->modulus <=1 ) +if (priv->modulus <1 )return -ERANGE ;if (priv->offset + priv->modulus -1 < priv->offset)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/42 scripts/sphinx-pre-install: fix script for RHEL/CentOS
In reply to Sasha LevinFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit b308467c916aa7acc5069802ab76a9f657434701 ]
There's a missing parenthesis at the script, with causes it to fail to detect non-Fedora releases (e. g. RHEL/CentOS).
Tested with Centos 7.6.1810.
--- scripts/sphinx-pre-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/sphinx-pre-install +1 -1
@@ -301,7 +301,7 @@ sub give_redhat_hints() # # Checks valid for RHEL/CentOS version 7.x. # - if (! $system_release =~ /Fedora/) { + if (!($system_release =~ /Fedora/)) { $map{"virtualenv"} = "python-virtualenv"; }
Signature · 1 line
2.20.1
Re: [PATCH AUTOSEL 4.19 06/42] scripts/sphinx-pre-install: fix script for RHEL/CentOS
Quoted 30 lines · Sasha Levin
From: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit
b308467c916aa7acc5069802ab76a9f657434701]There's a missing parenthesis at the script, with causes it to fail to detect non-Fedora releases (e. g. RHEL/CentOS).
Tested with Centos 7.6.1810.
Signed-off-by Mauro Carvalho Chehab <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- scripts/sphinx-pre-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/sphinx-pre-install +1
-2@@ -301,7 +301,7 @@ sub give_redhat_hints() # # Checks valid for RHEL/CentOS version 7.x. # - if (! $system_release =~ /Fedora/) { + if (!($system_release =~ /Fedora/)) { $map{"virtualenv"} = "python-virtualenv"; } --
Quoted 2 lines
2.20.1
The negated binding operator '!~' could be used here as well, and it does not require the use of extra parenthesis.
Just a thought.
Re: [PATCH AUTOSEL 4.19 06/42] scripts/sphinx-pre-install: fix script for RHEL/CentOS
Em Sat, 3 Aug 2019 13:31:30 +0300
Alexander Kapshuk <[email protected]> escreveu:
Quoted 8 lines
scripts/sphinx-pre-install sub give_redhat_hints() · line 306
Quoted 4 lines
scripts/sphinx-pre-install +1
-1- if (! $system_release =~ /Fedora/) { + if (!($system_release =~ /Fedora/)) { $map{"virtualenv"} = "python-virtualenv"; }The negated binding operator '!~' could be used here as well, and it does not require the use of extra parenthesis.
Just a thought.
Thanks for the tip! Never used such operator. Will start using next time we need to handle a pattern like that.
Thanks,
Mauro
Re: [PATCH AUTOSEL 4.19 06/42] scripts/sphinx-pre-install: fix script for RHEL/CentOS
Quoted 13 lines · Mauro Carvalho Chehab
Em Sat, 3 Aug 2019 13:31:30 +0300
Alexander Kapshuk <[email protected]> escreveu:Quoted 8 lines
scripts/sphinx-pre-install sub give_redhat_hints() · line 306
Quoted 4 lines
scripts/sphinx-pre-install +1
-1- if (! $system_release =~ /Fedora/) { + if (!($system_release =~ /Fedora/)) { $map{"virtualenv"} = "python-virtualenv"; }The negated binding operator '!~' could be used here as well, and it does not require the use of extra parenthesis.
Just a thought.
Quoted 5 lines
Thanks for the tip! Never used such operator. Will start using next time we need to handle a pattern like that.
Thanks,
Mauro
No worries at all.
Sasha Levin
maintainerPATCH 7/42 drm/amd/display: Wait for backlight programming completion in set backlight level
In reply to Sasha LevinFrom: SivapiriyanKumarasamy <[email protected]>
[ Upstream commit c7990daebe71d11a9e360b5c3b0ecd1846a3a4bb ]
[WHY]
Currently we don't wait for blacklight programming completion in DMCU when setting backlight level. Some sequences such as PSR static screen event trigger reprogramming requires it to be complete.
[How]
Add generic wait for dmcu command completion in set backlight level.
--- drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/display/dc/dce/dce_abm.c +4 -0
@@ -242,6 +242,10 @@ static void dmcu_set_backlight_level( s2 |= (level <<ATOM_S2_CURRENT_BL_LEVEL_SHIFT );REG_WRITE (BIOS_SCRATCH_2 , s2); + +/* waitDMCUReadyForCmd */ +REG_WAIT (MASTER_COMM_CNTL_REG ,MASTER_COMM_INTERRUPT , +0 ,1 ,80000 ); }static void dce_abm_init (struct abm *abm)
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 8/42 drm/amd/display: use encoder's engine id to find matched free audio device
In reply to Sasha LevinFrom: Tai Man <[email protected]>
[ Upstream commit 74eda776d7a4e69ec7aa1ce30a87636f14220fbb ]
[Why]
On some platforms, the encoder id 3 is not populated. So the encoders are not stored in right order as index (id: 0, 1, 2, 4, 5) at pool. This would cause encoders id 4 & id 5 to fail when finding corresponding audio device, defaulting to the first available audio device. As result, we cannot stream audio into two DP ports with encoders id 4 & id 5.
[How]
It need to create enough audio device objects (0 - 5) to perform matching. Then use encoder engine id to find matched audio device.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +7 -1
@@ -222,7 +222,7 @@ bool resource_construct(* PORT_CONNECTIVITY == 1 (as instructed by HW team). */ update_num_audio (&straps, &num_audio, &pool->audio_support); -for (i =0 ; i < pool->pipe_count && i < num_audio; i++) { +for (i =0 ; i < caps->num_audio; i++) {struct audio *aud = create_funcs->create_audio (ctx, i);if (aud ==NULL ) {
@@ -1713,6 +1713,12 @@ static struct audio *find_first_free_audio(return pool->audios[i]; } } + +/* use engine id to find free audio */ +if ((id < pool->audio_count) && (res_ctx->is_audio_acquired[id] == false)) { +return pool->audios[id]; + } +/*not found the matching one, first come first serve*/ for (i =0 ; i < pool->audio_count; i++) {if (res_ctx->is_audio_acquired[i] == false) {
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 9/42 drm/amd/display: Fix dc_create failure handling and 666 color depths
In reply to Sasha LevinFrom: Julian Parkin <[email protected]>
[ Upstream commit 0905f32977268149f06e3ce6ea4bd6d374dd891f ]
[Why]
It is possible (but very unlikely) that constructing dc fails before current_state is created.
We support 666 color depth in some scenarios, but this isn't handled in get_norm_pix_clk. It uses exactly the same pixel clock as the 888 case.
[How]
Check for non null current_state before destructing.
Add case for 666 color depth to get_norm_pix_clk to avoid assertion.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 6 ++++-- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +4 -2
@@ -462,8 +462,10 @@ void dc_link_set_test_pattern(struct dc_link *link,static void destruct (struct dc *dc) { -dc_release_state (dc->current_state); - dc->current_state =NULL ; +if (dc->current_state) { +dc_release_state (dc->current_state); + dc->current_state =NULL ; + }destroy_links (dc);
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +1 -0
@@ -1872,6 +1872,7 @@ static int get_norm_pix_clk(const struct dc_crtc_timing *timing) pix_clk /=2 ;if (timing->pixel_encoding !=PIXEL_ENCODING_YCBCR422 ) {switch (timing->display_color_depth) { +case COLOR_DEPTH_666 :case COLOR_DEPTH_888 : normalized_pix_clk = pix_clk;break ;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 10/42 drm/amd/display: Only enable audio if speaker allocation exists
In reply to Sasha LevinFrom: Alvin Lee <[email protected]>
[ Upstream commit 6ac25e6d5b2fbf251e9fa2f4131d42c815b43867 ]
[Why]
In dm_helpers_parse_edid_caps, there is a corner case where no speakers can be allocated even though the audio mode count is greater than 0. Enabling audio when no speaker allocations exists can cause issues in the video stream.
[How]
Add a check to not enable audio unless one or more speaker allocations exist (since doing this can cause issues in the video stream).
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +1 -1
@@ -1956,7 +1956,7 @@ enum dc_status resource_map_pool_resources(/* TODO: Add check if ASIC support and EDID audio */ if (!stream->sink->converter_disable_audio &&dc_is_audio_capable_signal (pipe_ctx->stream->signal) && - stream->audio_info.mode_count) { + stream->audio_info.mode_count && stream->audio_info.flags.all) { pipe_ctx->stream_res.audio =find_first_free_audio ( &context->res_ctx, pool, pipe_ctx->stream_res.stream_enc->id);
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 11/42 drm/amd/display: Increase size of audios array
In reply to Sasha LevinFrom: Tai Man <[email protected]>
[ Upstream commit 7352193a33dfc9b69ba3bf6a8caea925b96243b1 ]
[Why]
The audios array defined in "struct resource_pool" is only 6 (MAX_PIPES) but the max number of audio devices (num_audio) is 7. In some projects, it will run out of audios array.
[How]
Incraese the audios array size to 7.
--- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/inc/core_types.h +1 -1
@@ -159,7 +159,7 @@ struct resource_pool {struct clock_source *clock_sources[MAX_CLOCK_SOURCES ];unsigned int clk_src_count; -struct audio *audios[MAX_PIPES ]; +struct audio *audios[MAX_AUDIOS ];unsigned int audio_count;struct audio_support audio_support;
drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +1 -0
@@ -34,6 +34,7 @@* Data types shared between different Virtual HW blocks ******************************************************************************/ +#define MAX_AUDIOS 7#define MAX_PIPES 6struct gamma_curve {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 12/42 iscsi_ibft: make ISCSI_IBFT dependson ACPI instead of ISCSI_IBFT_FIND
In reply to Sasha LevinFrom: Thomas Tai <[email protected]>
[ Upstream commit 94bccc34071094c165c79b515d21b63c78f7e968 ]
iscsi_ibft can use ACPI to find the iBFT entry during bootup, currently, ISCSI_IBFT depends on ISCSI_IBFT_FIND which is a X86 legacy way to find the iBFT by searching through the low memory. This patch changes the dependency so that other arch like ARM64 can use ISCSI_IBFT as long as the arch supports ACPI.
ibft_init() needs to use the global variable ibft_addr declared in iscsi_ibft_find.c. A #ifndef CONFIG_ISCSI_IBFT_FIND is needed to declare the variable if CONFIG_ISCSI_IBFT_FIND is not selected. Moving ibft_addr into the iscsi_ibft.c does not work because if ISCSI_IBFT is selected as a module, the arch/x86/kernel/setup.c won't be able to find the variable at compile time.
--- drivers/firmware/Kconfig | 5 +++-- drivers/firmware/iscsi_ibft.c | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/firmware/Kconfig +3 -2
@@ -198,7 +198,7 @@ config DMI_SCAN_MACHINE_NON_EFI_FALLBACK config ISCSI_IBFT_FIND bool "iSCSI Boot Firmware Table Attributes" - depends on X86 && ACPI + depends on X86 && ISCSI_IBFT default n help This option enables the kernel to find the region of memory
@@ -209,7 +209,8 @@ config ISCSI_IBFT_FIND config ISCSI_IBFT tristate "iSCSI Boot Firmware Table Attributes module" select ISCSI_BOOT_SYSFS - depends on ISCSI_IBFT_FIND && SCSI && SCSI_LOWLEVEL + select ISCSI_IBFT_FIND if X86 + depends on ACPI && SCSI && SCSI_LOWLEVEL default n help This option enables support for detection and exposing of iSCSI
drivers/firmware/iscsi_ibft.c +4 -0
@@ -93,6 +93,10 @@ MODULE_DESCRIPTION("sysfs interface to BIOS iBFT information");MODULE_LICENSE ("GPL" );MODULE_VERSION (IBFT_ISCSI_VERSION ); +#ifndef CONFIG_ISCSI_IBFT_FIND +struct acpi_table_ibft *ibft_addr; +#endif +struct ibft_hdr {u8 id;u8 version;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/42 nl80211: fix NL80211_HE_MAX_CAPABILITY_LEN
In reply to Sasha LevinFrom: John Crispin <[email protected]>
[ Upstream commit 5edaac063bbf1267260ad2a5b9bb803399343e58 ]
NL80211_HE_MAX_CAPABILITY_LEN has changed between D2.0 and D4.0. It is now MAC (6) + PHY (11) + MCS (12) + PPE (25) = 54.
--- include/uapi/linux/nl80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/nl80211.h +1 -1
@@ -2732,7 +2732,7 @@ enum nl80211_attrs {#define NL80211_HT_CAPABILITY_LEN 26#define NL80211_VHT_CAPABILITY_LEN 12#define NL80211_HE_MIN_CAPABILITY_LEN 16 -#define NL80211_HE_MAX_CAPABILITY_LEN 51 +#define NL80211_HE_MAX_CAPABILITY_LEN 54#define NL80211_MAX_NR_CIPHER_SUITES 5#define NL80211_MAX_NR_AKM_SUITES 2
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/42 mac80211: don't warn about CW params when not using them
In reply to Sasha LevinFrom: Brian Norris <[email protected]>
[ Upstream commit d2b3fe42bc629c2d4002f652b3abdfb2e72991c7 ]
ieee80211_set_wmm_default() normally sets up the initial CW min/max for each queue, except that it skips doing this if the driver doesn't support ->conf_tx. We still end up calling drv_conf_tx() in some cases (e.g., ieee80211_reconfig()), which also still won't do anything useful...except it complains here about the invalid CW parameters.
Let's just skip the WARN if we weren't going to do anything useful with the parameters.
--- net/mac80211/driver-ops.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
net/mac80211/driver-ops.c +9 -4
@@ -169,11 +169,16 @@ int drv_conf_tx(struct ieee80211_local *local,if (!check_sdata_in_driver (sdata))return -EIO ; -if (WARN_ONCE (params->cw_min ==0 || - params->cw_min > params->cw_max, -"%s: invalid CW_min/CW_max: %d/%d\n" , - sdata->name, params->cw_min, params->cw_max)) +if (params->cw_min ==0 || params->cw_min > params->cw_max) { +/* +* If we can't configure hardware anyway, don't warn. We may +* never have initialized the CW parameters. +*/ +WARN_ONCE (local->ops->conf_tx, +"%s: invalid CW_min/CW_max: %d/%d\n" , + sdata->name, params->cw_min, params->cw_max);return -EINVAL ; + }trace_drv_conf_tx (local, sdata, ac, params);if (local->ops->conf_tx)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/42 allocate_flower_entry: should check for null deref
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit bb1320834b8a80c6ac2697ab418d066981ea08ba ]
allocate_flower_entry does not check for allocation success, but tries to deref the result. I only moved the spin_lock under null check, because
the caller is checking allocation's status at line 652.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c +2 -1
@@ -67,7 +67,8 @@ static struct ch_tc_pedit_fields pedits[] = {static struct ch_tc_flower_entry *allocate_flower_entry (void ) {struct ch_tc_flower_entry *new =kzalloc (sizeof (*new),GFP_KERNEL ); -spin_lock_init (&new->lock); +if (new) +spin_lock_init (&new->lock);return new; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/42 hwmon: (nct6775) Fix register address and added missed tolerance for nct6106
In reply to Sasha LevinFrom: Björn Gerhart <[email protected]>
[ Upstream commit f3d43e2e45fd9d44ba52d20debd12cd4ee9c89bf ]
Fixed address of third NCT6106_REG_WEIGHT_DUTY_STEP, and added missed NCT6106_REG_TOLERANCE_H.
--- drivers/hwmon/nct6775.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hwmon/nct6775.c +2 -1
@@ -818,7 +818,7 @@ static const u16 NCT6106_REG_TARGET[] = { 0x111, 0x121, 0x131 };static const u16 NCT6106_REG_WEIGHT_TEMP_SEL [] = {0x168 ,0x178 ,0x188 };static const u16 NCT6106_REG_WEIGHT_TEMP_STEP [] = {0x169 ,0x179 ,0x189 };static const u16 NCT6106_REG_WEIGHT_TEMP_STEP_TOL [] = {0x16a ,0x17a ,0x18a }; -static const u16 NCT6106_REG_WEIGHT_DUTY_STEP [] = {0x16b ,0x17b ,0x17c }; +static const u16 NCT6106_REG_WEIGHT_DUTY_STEP [] = {0x16b ,0x17b ,0x18b };static const u16 NCT6106_REG_WEIGHT_TEMP_BASE [] = {0x16c ,0x17c ,0x18c };static const u16 NCT6106_REG_WEIGHT_DUTY_BASE [] = {0x16d ,0x17d ,0x18d };
@@ -3673,6 +3673,7 @@ static int nct6775_probe(struct platform_device *pdev) data->REG_FAN_TIME[0 ] =NCT6106_REG_FAN_STOP_TIME ; data->REG_FAN_TIME[1 ] =NCT6106_REG_FAN_STEP_UP_TIME ; data->REG_FAN_TIME[2 ] =NCT6106_REG_FAN_STEP_DOWN_TIME ; + data->REG_TOLERANCE_H =NCT6106_REG_TOLERANCE_H ; data->REG_PWM[0 ] =NCT6106_REG_PWM ; data->REG_PWM[1 ] =NCT6106_REG_FAN_START_OUTPUT ; data->REG_PWM[2 ] =NCT6106_REG_FAN_STOP_OUTPUT ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/42 x86/mm: Check for pfn instead of page in vmalloc_sync_one()
In reply to Sasha LevinFrom: Joerg Roedel <[email protected]>
[ Upstream commit 51b75b5b563a2637f9d8dc5bd02a31b2ff9e5ea0 ]
Do not require a struct page for the mapped memory location because it might not exist. This can happen when an ioremapped region is mapped with 2MB pages.
--- arch/x86/mm/fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/mm/fault.c +1 -1
@@ -267,7 +267,7 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address)if (!pmd_present (*pmd))set_pmd (pmd, *pmd_k);else -BUG_ON (pmd_page (*pmd) !=pmd_page (*pmd_k)); +BUG_ON (pmd_pfn (*pmd) !=pmd_pfn (*pmd_k));return pmd_k; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/42 x86/mm: Sync also unmappings in vmalloc_sync_all()
In reply to Sasha LevinFrom: Joerg Roedel <[email protected]>
[ Upstream commit 8e998fc24de47c55b47a887f6c95ab91acd4a720 ]
With huge-page ioremap areas the unmappings also need to be synced between all page-tables. Otherwise it can cause data corruption when a region is unmapped and later re-used.
Make the vmalloc_sync_one() function ready to sync unmappings and make sure vmalloc_sync_all() iterates over all page-tables even when an unmapped PMD is found.
--- arch/x86/mm/fault.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
arch/x86/mm/fault.c +5 -8
@@ -261,11 +261,12 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address) pmd =pmd_offset (pud, address); pmd_k =pmd_offset (pud_k, address); -if (!pmd_present (*pmd_k)) -return NULL ; -if (!pmd_present (*pmd)) +if (pmd_present (*pmd) !=pmd_present (*pmd_k))set_pmd (pmd, *pmd_k); + +if (!pmd_present (*pmd_k)) +return NULL ;else BUG_ON (pmd_pfn (*pmd) !=pmd_pfn (*pmd_k));
@@ -287,17 +288,13 @@ void vmalloc_sync_all(void)spin_lock (&pgd_lock);list_for_each_entry (page, &pgd_list, lru) {spinlock_t *pgt_lock; -pmd_t *ret;/* the pgt_lock only for Xen */ pgt_lock = &pgd_page_get_mm (page)->page_table_lock;spin_lock (pgt_lock); - ret =vmalloc_sync_one (page_address (page), address); +vmalloc_sync_one (page_address (page), address);spin_unlock (pgt_lock); - -if (!ret) -break ; }spin_unlock (&pgd_lock); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/42 drm/msm: stop abusing dma_map/unmap for cache
In reply to Sasha LevinFrom: Rob Clark <[email protected]>
[ Upstream commit 0036bc73ccbe7e600a3468bf8e8879b122252274 ]
Recently splats like this started showing up:
WARNING: CPU: 4 PID: 251 at drivers/iommu/dma-iommu.c:451 __iommu_dma_unmap+0xb8/0xc0
Modules linked in: ath10k_snoc ath10k_core fuse msm ath mac80211 uvcvideo cfg80211 videobuf2_vmalloc videobuf2_memops vide
CPU: 4 PID: 251 Comm: kworker/u16:4 Tainted: G W 5.2.0-rc5-next-20190619+ #2317
Hardware name: LENOVO 81JL/LNVNB161216, BIOS 9UCN23WW(V1.06) 10/25/2018
Workqueue: msm msm_gem_free_work [msm]
pstate: 80c00005 (Nzcv daif +PAN +UAO)
pc : __iommu_dma_unmap+0xb8/0xc0
lr : __iommu_dma_unmap+0x54/0xc0
sp : ffff0000119abce0
x29: ffff0000119abce0 x28: 0000000000000000
x27: ffff8001f9946648 x26: ffff8001ec271068
x25: 0000000000000000 x24: ffff8001ea3580a8
x23: ffff8001f95ba010 x22: ffff80018e83ba88
x21: ffff8001e548f000 x20: fffffffffffff000
x19: 0000000000001000 x18: 00000000c00001fe
x17: 0000000000000000 x16: 0000000000000000
x15: ffff000015b70068 x14: 0000000000000005
x13: 0003142cc1be1768 x12: 0000000000000001
x11: ffff8001f6de9100 x10: 0000000000000009
x9 : ffff000015b78000 x8 : 0000000000000000
x7 : 0000000000000001 x6 : fffffffffffff000
x5 : 0000000000000fff x4 : ffff00001065dbc8
x3 : 000000000000000d x2 : 0000000000001000
x1 : fffffffffffff000 x0 : 0000000000000000
Call trace:
__iommu_dma_unmap+0xb8/0xc0
iommu_dma_unmap_sg+0x98/0xb8
put_pages+0x5c/0xf0 [msm]
msm_gem_free_work+0x10c/0x150 [msm]
process_one_work+0x1e0/0x330
worker_thread+0x40/0x438
kthread+0x12c/0x130
ret_from_fork+0x10/0x18
---[ end trace afc0dc5ab81a06bf ]---Not quite sure what triggered that, but we really shouldn't be abusing dma_{map,unmap}_sg() for cache maint.
--- drivers/gpu/drm/msm/msm_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gem.c +2 -2
@@ -108,7 +108,7 @@ static struct page **get_pages(struct drm_gem_object *obj)* because display controller, GPU, etc. are not coherent: */ if (msm_obj->flags & (MSM_BO_WC |MSM_BO_UNCACHED )) -dma_map_sg (dev->dev, msm_obj->sgt->sgl, +dma_sync_sg_for_device (dev->dev, msm_obj->sgt->sgl, msm_obj->sgt->nents,DMA_BIDIRECTIONAL ); }
@@ -138,7 +138,7 @@ static void put_pages(struct drm_gem_object *obj)* GPU, etc. are not coherent: */ if (msm_obj->flags & (MSM_BO_WC |MSM_BO_UNCACHED )) -dma_unmap_sg (obj->dev->dev, msm_obj->sgt->sgl, +dma_sync_sg_for_cpu (obj->dev->dev, msm_obj->sgt->sgl, msm_obj->sgt->nents,DMA_BIDIRECTIONAL );
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 20/42 drm: silence variable 'conn' set but not used
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit bbb6fc43f131f77fcb7ae8081f6d7c51396a2120 ]
The "struct drm_connector" iteration cursor from "for_each_new_connector_in_state" is never used in atomic_remove_fb() which generates a compilation warning,
drivers/gpu/drm/drm_framebuffer.c: In function 'atomic_remove_fb':drivers/gpu/drm/drm_framebuffer.c:838:24: warning: variable 'conn' set but not used [-Wunused-but-set-variable]
Silence it by marking "conn" __maybe_unused.
--- drivers/gpu/drm/drm_framebuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_framebuffer.c +1 -1
@@ -793,7 +793,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)struct drm_device *dev = fb->dev;struct drm_atomic_state *state;struct drm_plane *plane; -struct drm_connector *conn; +struct drm_connector *conn__maybe_unused ;struct drm_connector_state *conn_state;int i, ret;unsigned plane_mask;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 21/42 cpufreq/pasemi: fix use-after-free in pas_cpufreq_cpu_init()
In reply to Sasha LevinFrom: Wen Yang <[email protected]>
[ Upstream commit e0a12445d1cb186d875410d093a00d215bec6a89 ]
The cpu variable is still being used in the of_get_property() call after the of_node_put() call, which may result in use-after-free.
--- drivers/cpufreq/pasemi-cpufreq.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
drivers/cpufreq/pasemi-cpufreq.c +9 -14
@@ -145,10 +145,18 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)int err = -ENODEV ; cpu =of_get_cpu_node (policy->cpu,NULL ); +if (!cpu) + goto out; + max_freqp =of_get_property (cpu,"clock-frequency" ,NULL );of_node_put (cpu); -if (!cpu) +if (!max_freqp) { + err = -EINVAL ; goto out; + } + +/* we need the freq in kHz */ + max_freq = *max_freqp /1000 ; dn =of_find_compatible_node (NULL ,NULL ,"1682m-sdc" );if (!dn)
@@ -185,16 +193,6 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) }pr_debug ("init cpufreq on CPU %d\n" , policy->cpu); - - max_freqp =of_get_property (cpu,"clock-frequency" ,NULL ); -if (!max_freqp) { - err = -EINVAL ; - goto out_unmap_sdcpwr; - } - -/* we need the freq in kHz */ - max_freq = *max_freqp /1000 ; -pr_debug ("max clock-frequency is at %u kHz\n" , max_freq);pr_debug ("initializing frequency table\n" );
@@ -212,9 +210,6 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)return cpufreq_generic_init (policy, pas_freqs,get_gizmo_latency ()); -out_unmap_sdcpwr: -iounmap (sdcpwr_mapbase); - out_unmap_sdcasr:iounmap (sdcasr_mapbase); out:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 22/42 s390/qdio: add sanity checks to the fast-requeue path
In reply to Sasha LevinFrom: Julian Wiedmann <[email protected]>
[ Upstream commit a6ec414a4dd529eeac5c3ea51c661daba3397108 ]
If the device driver were to send out a full queue's worth of SBALs, current code would end up discovering the last of those SBALs as PRIMED and erroneously skip the SIGA-w. This immediately stalls the queue.
Add a check to not attempt fast-requeue in this case. While at it also make sure that the state of the previous SBAL was successfully extracted before inspecting it.
--- drivers/s390/cio/qdio_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/s390/cio/qdio_main.c +6 -6
@@ -1569,13 +1569,13 @@ static int handle_outbound(struct qdio_q *q, unsigned int callflags, rc =qdio_kick_outbound_q (q, phys_aob); }else if (need_siga_sync (q)) { rc =qdio_siga_sync_q (q); + }else if (count <QDIO_MAX_BUFFERS_PER_Q && +get_buf_state (q,prev_buf (bufnr), &state,0 ) >0 && + state ==SLSB_CU_OUTPUT_PRIMED ) { +/* The previous buffer is not processed yet, tack on. */ +qperf_inc (q, fast_requeue); }else { -/* try to fast requeue buffers */ -get_buf_state (q,prev_buf (bufnr), &state,0 ); -if (state !=SLSB_CU_OUTPUT_PRIMED ) - rc =qdio_kick_outbound_q (q,0 ); -else -qperf_inc (q, fast_requeue); + rc =qdio_kick_outbound_q (q,0 ); }/* in case of SIGA errors we must process the error immediately */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 23/42 ALSA: compress: Fix regression on compressed capture streams
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit 4475f8c4ab7b248991a60d9c02808dbb813d6be8 ]
A previous fix to the stop handling on compressed capture streams causes some knock on issues. The previous fix updated snd_compr_drain_notify to set the state back to PREPARED for capture streams. This causes some issues however as the handling for snd_compr_poll differs between the two states and some user-space applications were relying on the poll failing after the stream had been stopped.
To correct this regression whilst still fixing the original problem the patch was addressing, update the capture handling to skip the PREPARED state rather than skipping the SETUP state as it has done until now.
--- include/sound/compress_driver.h | 5 +---- sound/core/compress_offload.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-)
include/sound/compress_driver.h +1 -4
@@ -171,10 +171,7 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream)if (snd_BUG_ON (!stream))return ; -if (stream->direction ==SND_COMPRESS_PLAYBACK ) - stream->runtime->state =SNDRV_PCM_STATE_SETUP ; -else - stream->runtime->state =SNDRV_PCM_STATE_PREPARED ; + stream->runtime->state =SNDRV_PCM_STATE_SETUP ;wake_up (&stream->runtime->sleep); }
sound/core/compress_offload.c +11 -5
@@ -575,10 +575,7 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg) stream->metadata_set = false; stream->next_track = false; -if (stream->direction ==SND_COMPRESS_PLAYBACK ) - stream->runtime->state =SNDRV_PCM_STATE_SETUP ; -else - stream->runtime->state =SNDRV_PCM_STATE_PREPARED ; + stream->runtime->state =SNDRV_PCM_STATE_SETUP ; }else {return -EPERM ; }
@@ -694,8 +691,17 @@ static int snd_compr_start(struct snd_compr_stream *stream) {int retval; -if (stream->runtime->state !=SNDRV_PCM_STATE_PREPARED ) +switch (stream->runtime->state) { +case SNDRV_PCM_STATE_SETUP : +if (stream->direction !=SND_COMPRESS_CAPTURE ) +return -EPERM ; +break ; +case SNDRV_PCM_STATE_PREPARED : +break ; +default :return -EPERM ; + } + retval = stream->ops->trigger (stream,SNDRV_PCM_TRIGGER_START );if (!retval) stream->runtime->state =SNDRV_PCM_STATE_RUNNING ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/42 ALSA: compress: Prevent bypasses of set_params
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit 26c3f1542f5064310ad26794c09321780d00c57d ]
Currently, whilst in SNDRV_PCM_STATE_OPEN it is possible to call snd_compr_stop, snd_compr_drain and snd_compr_partial_drain, which allow a transition to SNDRV_PCM_STATE_SETUP. The stream should only be able to move to the setup state once it has received a SNDRV_COMPRESS_SET_PARAMS ioctl. Fix this issue by not allowing those ioctls whilst in the open state.
--- sound/core/compress_offload.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)
sound/core/compress_offload.c +24 -6
@@ -712,9 +712,15 @@ static int snd_compr_stop(struct snd_compr_stream *stream) {int retval; -if (stream->runtime->state ==SNDRV_PCM_STATE_PREPARED || - stream->runtime->state ==SNDRV_PCM_STATE_SETUP ) +switch (stream->runtime->state) { +case SNDRV_PCM_STATE_OPEN : +case SNDRV_PCM_STATE_SETUP : +case SNDRV_PCM_STATE_PREPARED :return -EPERM ; +default : +break ; + } + retval = stream->ops->trigger (stream,SNDRV_PCM_TRIGGER_STOP );if (!retval) {snd_compr_drain_notify (stream);
@@ -802,9 +808,14 @@ static int snd_compr_drain(struct snd_compr_stream *stream) {int retval; -if (stream->runtime->state ==SNDRV_PCM_STATE_PREPARED || - stream->runtime->state ==SNDRV_PCM_STATE_SETUP ) +switch (stream->runtime->state) { +case SNDRV_PCM_STATE_OPEN : +case SNDRV_PCM_STATE_SETUP : +case SNDRV_PCM_STATE_PREPARED :return -EPERM ; +default : +break ; + } retval = stream->ops->trigger (stream,SND_COMPR_TRIGGER_DRAIN );if (retval) {
@@ -841,9 +852,16 @@ static int snd_compr_next_track(struct snd_compr_stream *stream)static int snd_compr_partial_drain (struct snd_compr_stream *stream) {int retval; -if (stream->runtime->state ==SNDRV_PCM_STATE_PREPARED || - stream->runtime->state ==SNDRV_PCM_STATE_SETUP ) + +switch (stream->runtime->state) { +case SNDRV_PCM_STATE_OPEN : +case SNDRV_PCM_STATE_SETUP : +case SNDRV_PCM_STATE_PREPARED :return -EPERM ; +default : +break ; + } +/* stream can be drained only when next track has been signalled */ if (stream->next_track == false)return -EPERM ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/42 ALSA: compress: Don't allow paritial drain operations on capture streams
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit a70ab8a8645083f3700814e757f2940a88b7ef88 ]
Partial drain and next track are intended for gapless playback and don't really have an obvious interpretation for a capture stream, so makes sense to not allow those operations on capture streams.
--- sound/core/compress_offload.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/core/compress_offload.c +8 -0
@@ -835,6 +835,10 @@ static int snd_compr_next_track(struct snd_compr_stream *stream)if (stream->runtime->state !=SNDRV_PCM_STATE_RUNNING )return -EPERM ; +/* next track doesn't have any meaning for capture streams */ +if (stream->direction ==SND_COMPRESS_CAPTURE ) +return -EPERM ; +/* you can signal next track if this is intended to be a gapless stream * and current track metadata is set */
@@ -862,6 +866,10 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream)break ; } +/* partial drain doesn't have any meaning for capture streams */ +if (stream->direction ==SND_COMPRESS_CAPTURE ) +return -EPERM ; +/* stream can be drained only when next track has been signalled */ if (stream->next_track == false)return -EPERM ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 26/42 ALSA: compress: Be more restrictive about when a drain is allowed
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit 3b8179944cb0dd53e5223996966746cdc8a60657 ]
Draining makes little sense in the situation of hardware overrun, as the hardware will have consumed all its available samples. Additionally, draining whilst the stream is paused would presumably get stuck as no data is being consumed on the DSP side.
--- sound/core/compress_offload.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/core/compress_offload.c +6 -0
@@ -812,7 +812,10 @@ static int snd_compr_drain(struct snd_compr_stream *stream)case SNDRV_PCM_STATE_OPEN :case SNDRV_PCM_STATE_SETUP :case SNDRV_PCM_STATE_PREPARED : +case SNDRV_PCM_STATE_PAUSED :return -EPERM ; +case SNDRV_PCM_STATE_XRUN : +return -EPIPE ;default :break ; }
@@ -861,7 +864,10 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream)case SNDRV_PCM_STATE_OPEN :case SNDRV_PCM_STATE_SETUP :case SNDRV_PCM_STATE_PREPARED : +case SNDRV_PCM_STATE_PAUSED :return -EPERM ; +case SNDRV_PCM_STATE_XRUN : +return -EPIPE ;default :break ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 27/42 perf tools: Fix proper buffer size for feature processing
In reply to Sasha LevinFrom: Jiri Olsa <[email protected]>
[ Upstream commit 79b2fe5e756163897175a8f57d66b26cd9befd59 ]
After Song Liu's segfault fix for pipe mode, Arnaldo reported following error:
# perf record -o - | perf script 0x514 [0x1ac]: failed to process type: 80
It's caused by wrong buffer size setup in feature processing, which makes cpu topology feature fail, because it's using buffer size to recognize its header version.
--- tools/perf/util/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/header.c +1 -1
@@ -3472,7 +3472,7 @@ int perf_event__process_feature(struct perf_tool *tool,return 0 ; ff.buf = (void *)fe->data; - ff.size = event->header.size -sizeof (event->header); + ff.size = event->header.size -sizeof (*fe); ff.ph = &session->header;if (feat_ops[feat].process (&ff,NULL ))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 28/42 perf probe: Avoid calling freeing routine multiple times for same pointer
In reply to Sasha LevinFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit d95daf5accf4a72005daa13fbb1d1bd8709f2861 ]
When perf_add_probe_events() we call cleanup_perf_probe_events() for the pev pointer it receives, then, as part of handling this failure the main 'perf probe' goes on and calls cleanup_params() and that will again call cleanup_perf_probe_events()for the same pointer, so just set nevents to zero when handling the failure of perf_add_probe_events() to avoid the double free.
--- tools/perf/builtin-probe.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
tools/perf/builtin-probe.c +10 -0
@@ -711,6 +711,16 @@ __cmd_probe(int argc, const char **argv) ret =perf_add_probe_events (params.events, params.nevents);if (ret <0 ) { + +/* +* When perf_add_probe_events() fails it calls +* cleanup_perf_probe_events(pevs, npevs), i.e. +* cleanup_perf_probe_events(params.events, params.nevents), which +* will call clear_perf_probe_event(), so set nevents to zero +* to avoid cleanup_params() to call clear_perf_probe_event() again +* on the same pevs. +*/ + params.nevents =0 ;pr_err_with_code (" Error: Failed to add events." , ret);return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 29/42 drbd: dynamically allocate shash descriptor
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 77ce56e2bfaa64127ae5e23ef136c0168b818777 ]
Building with clang and KASAN, we get a warning about an overly large stack frame on 32-bit architectures:
drivers/block/drbd/drbd_receiver.c:921:31: error: stack frame size of 1280 bytes in function 'conn_connect'
[-Werror,-Wframe-larger-than=]
We already allocate other data dynamically in this function, so just do the same for the shash descriptor, which makes up most of this memory.
--- drivers/block/drbd/drbd_receiver.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/block/drbd/drbd_receiver.c +12 -2
@@ -5240,7 +5240,7 @@ static int drbd_do_auth(struct drbd_connection *connection)unsigned int key_len;char secret[SHARED_SECRET_MAX ];/* 64 byte */ unsigned int resp_size; -SHASH_DESC_ON_STACK (desc, connection->cram_hmac_tfm); +struct shash_desc *desc;struct packet_info pi;struct net_conf *nc;int err, rv;
@@ -5253,6 +5253,13 @@ static int drbd_do_auth(struct drbd_connection *connection)memcpy (secret, nc->shared_secret, key_len);rcu_read_unlock (); + desc =kmalloc (sizeof (struct shash_desc ) + +crypto_shash_descsize (connection->cram_hmac_tfm), +GFP_KERNEL ); +if (!desc) { + rv =-1 ; + goto fail; + } desc->tfm = connection->cram_hmac_tfm; desc->flags =0 ;
@@ -5395,7 +5402,10 @@ static int drbd_do_auth(struct drbd_connection *connection)kfree (peers_ch);kfree (response);kfree (right_response); -shash_desc_zero (desc); +if (desc) { +shash_desc_zero (desc); +kfree (desc); + }return rv; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 30/42 ACPI/IORT: Fix off-by-one check in iort_dev_find_its_id()
In reply to Sasha LevinFrom: Lorenzo Pieralisi <[email protected]>
[ Upstream commit 5a46d3f71d5e5a9f82eabc682f996f1281705ac7 ]
Static analysis identified that index comparison against ITS entries in iort_dev_find_its_id() is off by one.
Update the comparison condition and clarify the resulting error message.
--- drivers/acpi/arm64/iort.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/arm64/iort.c +2 -2
@@ -616,8 +616,8 @@ static int iort_dev_find_its_id(struct device *dev, u32 req_id,/* Move to ITS specific data */ its = (struct acpi_iort_its_group *)node->node_data; -if (idx > its->its_count) { -dev_err (dev,"requested ITS ID index [%d] is greater than available [%d]\n" , +if (idx >= its->its_count) { +dev_err (dev,"requested ITS ID index [%d] overruns ITS entries [%d]\n" , idx, its->its_count);return -ENXIO ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 31/42 nvme: fix multipath crash when ANA is deactivated
In reply to Sasha LevinFrom: Marta Rybczynska <[email protected]>
[ Upstream commit 66b20ac0a1a10769d059d6903202f53494e3d902 ]
Fix a crash with multipath activated. It happends when ANA log page is larger than MDTS and because of that ANA is disabled. The driver then tries to access unallocated buffer when connecting to a nvme target. The signature is as follows:
[ 300.433586] nvme nvme0: ANA log page size (8208) larger than MDTS (8192). [ 300.435387] nvme nvme0: disabling ANA support. [ 300.437835] nvme nvme0: creating 4 I/O queues. [ 300.459132] nvme nvme0: new ctrl: NQN "nqn.0.0.0", addr 10.91.0.1:8009 [ 300.464609] BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 [ 300.466342] #PF error: [normal kernel read fault] [ 300.467385] PGD 0 P4D 0 [ 300.467987] Oops: 0000 [#1] SMP PTI [ 300.468787] CPU: 3 PID: 50 Comm: kworker/u8:1 Not tainted 5.0.20kalray+ #4 [ 300.470264] Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 [ 300.471532] Workqueue: nvme-wq nvme_scan_work [nvme_core] [ 300.472724] RIP: 0010:nvme_parse_ana_log+0x21/0x140 [nvme_core] [ 300.474038] Code: 45 01 d2 d8 48 98 c3 66 90 0f 1f 44 00 00 41 57 41 56 41 55 41 54 55 53 48 89 fb 48 83 ec 08 48 8b af 20 0a 00 00 48 89 34 24 <66> 83 7d 08 00 0f 84 c6 00 00 00 44 8b 7d 14 49 89 d5 8b 55 10 48 [ 300.477374] RSP: 0018:ffffa50e80fd7cb8 EFLAGS: 00010296 [ 300.478334] RAX: 0000000000000001 RBX: ffff9130f1872258 RCX: 0000000000000000 [ 300.479784] RDX: ffffffffc06c4c30 RSI: ffff9130edad4280 RDI: ffff9130f1872258 [ 300.481488] RBP: 0000000000000000 R08: 0000000000000001 R09: 0000000000000044 [ 300.483203] R10: 0000000000000220 R11: 0000000000000040 R12: ffff9130f18722c0 [ 300.484928] R13: ffff9130f18722d0 R14: ffff9130edad4280 R15: ffff9130f18722c0 [ 300.486626] FS: 0000000000000000(0000) GS:ffff9130f7b80000(0000) knlGS:0000000000000000 [ 300.488538] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 300.489907] CR2: 0000000000000008 CR3: 00000002365e6000 CR4: 00000000000006e0 [ 300.491612] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 300.493303] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 300.494991] Call Trace: [ 300.495645] nvme_mpath_add_disk+0x5c/0xb0 [nvme_core] [ 300.496880] nvme_validate_ns+0x2ef/0x550 [nvme_core] [ 300.498105] ? nvme_identify_ctrl.isra.45+0x6a/0xb0 [nvme_core] [ 300.499539] nvme_scan_work+0x2b4/0x370 [nvme_core] [ 300.500717] ? __switch_to_asm+0x35/0x70 [ 300.501663] process_one_work+0x171/0x380 [ 300.502340] worker_thread+0x49/0x3f0 [ 300.503079] kthread+0xf8/0x130 [ 300.503795] ? max_active_store+0x80/0x80 [ 300.504690] ? kthread_bind+0x10/0x10 [ 300.505502] ret_from_fork+0x35/0x40 [ 300.506280] Modules linked in: nvme_tcp nvme_rdma rdma_cm iw_cm ib_cm ib_core nvme_fabrics nvme_core xt_physdev ip6table_raw ip6table_mangle ip6table_filter ip6_tables xt_comment iptable_nat nf_nat_ipv4 nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 xt_CHECKSUM iptable_mangle iptable_filter veth ebtable_filter ebtable_nat ebtables iptable_raw vxlan ip6_udp_tunnel udp_tunnel sunrpc joydev pcspkr virtio_balloon br_netfilter bridge stp llc ip_tables xfs libcrc32c ata_generic pata_acpi virtio_net virtio_console net_failover virtio_blk failover ata_piix serio_raw libata virtio_pci virtio_ring virtio [ 300.514984] CR2: 0000000000000008 [ 300.515569] ---[ end trace faa2eefad7e7f218 ]--- [ 300.516354] RIP: 0010:nvme_parse_ana_log+0x21/0x140 [nvme_core] [ 300.517330] Code: 45 01 d2 d8 48 98 c3 66 90 0f 1f 44 00 00 41 57 41 56 41 55 41 54 55 53 48 89 fb 48 83 ec 08 48 8b af 20 0a 00 00 48 89 34 24 <66> 83 7d 08 00 0f 84 c6 00 00 00 44 8b 7d 14 49 89 d5 8b 55 10 48 [ 300.520353] RSP: 0018:ffffa50e80fd7cb8 EFLAGS: 00010296 [ 300.521229] RAX: 0000000000000001 RBX: ffff9130f1872258 RCX: 0000000000000000 [ 300.522399] RDX: ffffffffc06c4c30 RSI: ffff9130edad4280 RDI: ffff9130f1872258 [ 300.523560] RBP: 0000000000000000 R08: 0000000000000001 R09: 0000000000000044 [ 300.524734] R10: 0000000000000220 R11: 0000000000000040 R12: ffff9130f18722c0 [ 300.525915] R13: ffff9130f18722d0 R14: ffff9130edad4280 R15: ffff9130f18722c0 [ 300.527084] FS: 0000000000000000(0000) GS:ffff9130f7b80000(0000) knlGS:0000000000000000 [ 300.528396] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 300.529440] CR2: 0000000000000008 CR3: 00000002365e6000 CR4: 00000000000006e0 [ 300.530739] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 300.531989] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 300.533264] Kernel panic - not syncing: Fatal exception [ 300.534338] Kernel Offset: 0x17c00000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff) [ 300.536227] ---[ end Kernel panic - not syncing: Fatal exception ]---
Condition check refactoring from Christoph Hellwig.
--- drivers/nvme/host/multipath.c | 8 ++------ drivers/nvme/host/nvme.h | 6 +++++- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/nvme/host/multipath.c +2 -6
@@ -20,11 +20,6 @@ module_param(multipath, bool, 0444);MODULE_PARM_DESC (multipath,"turn on native support for multiple controllers per subsystem" ); -inline bool nvme_ctrl_use_ana (struct nvme_ctrl *ctrl) -{ -return multipath && ctrl->subsys && (ctrl->subsys->cmic & (1 <<3 )); -} -/* * If multipathing is enabled we need to always use the subsystem instance * number for numbering our devices to avoid conflicts between subsystems that
@@ -516,7 +511,8 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) {int error; -if (!nvme_ctrl_use_ana (ctrl)) +/* check if multipath is enabled and we have the capability */ +if (!multipath || !ctrl->subsys || !(ctrl->subsys->cmic & (1 <<3 )))return 0 ; ctrl->anacap = id->anacap;
drivers/nvme/host/nvme.h +5 -1
@@ -464,7 +464,11 @@ extern const struct attribute_group nvme_ns_id_attr_group;extern const struct block_device_operations nvme_ns_head_ops;#ifdef CONFIG_NVME_MULTIPATH -bool nvme_ctrl_use_ana (struct nvme_ctrl *ctrl); +static inline bool nvme_ctrl_use_ana (struct nvme_ctrl *ctrl) +{ +return ctrl->ana_log_buf !=NULL ; +} +void nvme_set_disk_name (char *disk_name,struct nvme_ns *ns,struct nvme_ctrl *ctrl,int *flags);void nvme_failover_req (struct request *req);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 32/42 ARM: davinci: fix sleep.S build error on ARMv4
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit d64b212ea960db4276a1d8372bd98cb861dfcbb0 ]
When building a multiplatform kernel that includes armv4 support, the default target CPU does not support the blx instruction, which leads to a build failure:
arch/arm/mach-davinci/sleep.S: Assembler messages:arch/arm/mach-davinci/sleep.S:56: Error: selected processor does not support `blx ip' in ARM mode
Add a .arch statement in the sources to make this file build.
--- arch/arm/mach-davinci/sleep.S | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-davinci/sleep.S +1 -0
@@ -37,6 +37,7 @@ #define DEEPSLEEP_SLEEPENABLE_BIT BIT(31) .text + .arch armv5te /* * Move DaVinci into deep sleep state *
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 33/42 ARM: dts: bcm: bcm47094: add missing #cells for mdio-bus-mux
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 3a9d2569e45cb02769cda26fee4a02126867c934 ]
The mdio-bus-mux has no #address-cells/#size-cells property, which causes a few dtc warnings:
arch/arm/boot/dts/bcm47094-linksys-panamera.dts:129.4-18: Warning (reg_format): /mdio-bus-mux/mdio@200:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) arch/arm/boot/dts/bcm47094-linksys-panamera.dtb: Warning (pci_device_bus_num): Failed prerequisite 'reg_format' arch/arm/boot/dts/bcm47094-linksys-panamera.dtb: Warning (i2c_bus_reg): Failed prerequisite 'reg_format'arch/arm/boot/dts/bcm47094-linksys-panamera.dtb: Warning (spi_bus_reg): Failed prerequisite 'reg_format' arch/arm/boot/dts/bcm47094-linksys-panamera.dts:128.22-132.5: Warning (avoid_default_addr_size): /mdio-bus-mux/mdio@200: Relying on default #address-cells value arch/arm/boot/dts/bcm47094-linksys-panamera.dts:128.22-132.5: Warning (avoid_default_addr_size): /mdio-bus-mux/mdio@200: Relying on default #size-cells value
Add the normal cell numbers.
--- arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/boot/dts/bcm47094-linksys-panamera.dts +3 -0
@@ -125,6 +125,9 @@ }; mdio-bus-mux { + #address-cells = <1>; + #size-cells = <0>; + /* BIT(9) = 1 => external mdio */ mdio_ext: mdio@200 { reg = <0x200>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 34/42 scsi: megaraid_sas: fix panic on loading firmware crashdump
In reply to Sasha LevinFrom: Junxiao Bi <[email protected]>
[ Upstream commit 3b5f307ef3cb5022bfe3c8ca5b8f2114d5bf6c29 ]
While loading fw crashdump in function fw_crash_buffer_show(), left bytes in one dma chunk was not checked, if copying size over it, overflow access will cause kernel panic.
--- drivers/scsi/megaraid/megaraid_sas_base.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/megaraid/megaraid_sas_base.c +3 -0
@@ -3025,6 +3025,7 @@ megasas_fw_crash_buffer_show(struct device *cdev,u32 size;unsigned long buff_addr;unsigned long dmachunk =CRASH_DMA_BUF_SIZE ; +unsigned long chunk_left_bytes;unsigned long src_addr;unsigned long flags;u32 buff_offset;
@@ -3050,6 +3051,8 @@ megasas_fw_crash_buffer_show(struct device *cdev, } size = (instance->fw_crash_buffer_size * dmachunk) - buff_offset; + chunk_left_bytes = dmachunk - (buff_offset % dmachunk); + size = (size > chunk_left_bytes) ? chunk_left_bytes : size; size = (size >=PAGE_SIZE ) ? (PAGE_SIZE -1 ) : size; src_addr = (unsigned long)instance->crash_buf[buff_offset / dmachunk] +
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 35/42 scsi: ibmvfc: fix WARN_ON during event pool release
In reply to Sasha LevinFrom: Tyrel Datwyler <[email protected]>
[ Upstream commit 5578257ca0e21056821e6481bd534ba267b84e58 ]
While removing an ibmvfc client adapter a WARN_ON like the following WARN_ON is seen in the kernel log:
WARNING: CPU: 6 PID: 5421 at ./include/linux/dma-mapping.h:541 ibmvfc_free_event_pool+0x12c/0x1f0 [ibmvfc] CPU: 6 PID: 5421 Comm: rmmod Tainted: G E 4.17.0-rc1-next-20180419-autotest #1 NIP: d00000000290328c LR: d00000000290325c CTR: c00000000036ee20 REGS: c000000288d1b7e0 TRAP: 0700 Tainted: G E (4.17.0-rc1-next-20180419-autotest) MSR: 800000010282b033 <SF,VEC,VSX,EE,FP,ME,IR,DR,RI,LE,TM[E]> CR: 44008828 XER: 20000000
CFAR: c00000000036e408 SOFTE: 1
GPR00: d00000000290325c c000000288d1ba60 d000000002917900 c000000289d75448
GPR04: 0000000000000071 c0000000ff870000 0000000018040000 0000000000000001
GPR08: 0000000000000000 c00000000156e838 0000000000000001 d00000000290c640
GPR12: c00000000036ee20 c00000001ec4dc00 0000000000000000 0000000000000000
GPR16: 0000000000000000 0000000000000000 00000100276901e0 0000000010020598
GPR20: 0000000010020550 0000000010020538 0000000010020578 00000000100205b0
GPR24: 0000000000000000 0000000000000000 0000000010020590 5deadbeef0000100
GPR28: 5deadbeef0000200 d000000002910b00 0000000000000071 c0000002822f87d8 NIP [d00000000290328c] ibmvfc_free_event_pool+0x12c/0x1f0 [ibmvfc] LR [d00000000290325c] ibmvfc_free_event_pool+0xfc/0x1f0 [ibmvfc]
Call Trace: [c000000288d1ba60] [d00000000290325c] ibmvfc_free_event_pool+0xfc/0x1f0 [ibmvfc] (unreliable) [c000000288d1baf0] [d000000002909390] ibmvfc_abort_task_set+0x7b0/0x8b0 [ibmvfc] [c000000288d1bb70] [c0000000000d8c68] vio_bus_remove+0x68/0x100 [c000000288d1bbb0] [c0000000007da7c4] device_release_driver_internal+0x1f4/0x2d0 [c000000288d1bc00] [c0000000007da95c] driver_detach+0x7c/0x100 [c000000288d1bc40] [c0000000007d8af4] bus_remove_driver+0x84/0x140 [c000000288d1bcb0] [c0000000007db6ac] driver_unregister+0x4c/0xa0 [c000000288d1bd20] [c0000000000d6e7c] vio_unregister_driver+0x2c/0x50 [c000000288d1bd50] [d00000000290ba0c] cleanup_module+0x24/0x15e0 [ibmvfc] [c000000288d1bd70] [c0000000001dadb0] sys_delete_module+0x220/0x2d0 [c000000288d1be30] [c00000000000b284] system_call+0x58/0x6c
Instruction dump:e8410018 e87f0068 809f0078 e8bf0080 e8df0088 2fa30000 419e008c e9230200 2fa90000 419e0080 894d098a 794a07e0 <0b0a0000> e9290008 2fa90000 419e0028
This is tripped as a result of irqs being disabled during the call to dma_free_coherent() by ibmvfc_free_event_pool(). At this point in the code path we have quiesced the adapter and its overly paranoid anyways to be holding the host lock.
--- drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/ibmvscsi/ibmvfc.c +1 -1
@@ -4874,8 +4874,8 @@ static int ibmvfc_remove(struct vio_dev *vdev)spin_lock_irqsave (vhost->host->host_lock, flags);ibmvfc_purge_requests (vhost,DID_ERROR ); -ibmvfc_free_event_pool (vhost);spin_unlock_irqrestore (vhost->host->host_lock, flags); +ibmvfc_free_event_pool (vhost);ibmvfc_free_mem (vhost);spin_lock (&ibmvfc_driver_lock);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 36/42 scsi: scsi_dh_alua: always use a 2 second delay before retrying RTPG
In reply to Sasha LevinFrom: Hannes Reinecke <[email protected]>
[ Upstream commit 20122994e38aef0ae50555884d287adde6641c94 ]
Retrying immediately after we've received a 'transitioning' sense code is pretty much pointless, we should always use a delay before retrying. So ensure the default delay is applied before retrying.
--- drivers/scsi/device_handler/scsi_dh_alua.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/scsi/device_handler/scsi_dh_alua.c +6 -1
@@ -54,6 +54,7 @@#define ALUA_FAILOVER_TIMEOUT 60#define ALUA_FAILOVER_RETRIES 5#define ALUA_RTPG_DELAY_MSECS 5 +#define ALUA_RTPG_RETRY_DELAY 2/* device handler flags */ #define ALUA_OPTIMIZE_STPG 0x01
@@ -696,7 +697,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)case SCSI_ACCESS_STATE_TRANSITIONING :if (time_before (jiffies, pg->expiry)) {/* State transition, retry */ - pg->interval =2 ; + pg->interval =ALUA_RTPG_RETRY_DELAY ; err =SCSI_DH_RETRY ; }else {struct alua_dh_data *h;
@@ -821,6 +822,8 @@ static void alua_rtpg_work(struct work_struct *work)spin_lock_irqsave (&pg->lock, flags); pg->flags &= ~ALUA_PG_RUNNING ; pg->flags |=ALUA_PG_RUN_RTPG ; +if (!pg->interval) + pg->interval =ALUA_RTPG_RETRY_DELAY ;spin_unlock_irqrestore (&pg->lock, flags);queue_delayed_work (kaluad_wq, &pg->rtpg_work, pg->interval *HZ );
@@ -832,6 +835,8 @@ static void alua_rtpg_work(struct work_struct *work)spin_lock_irqsave (&pg->lock, flags);if (err ==SCSI_DH_RETRY || pg->flags &ALUA_PG_RUN_RTPG ) { pg->flags &= ~ALUA_PG_RUNNING ; +if (!pg->interval && !(pg->flags &ALUA_PG_RUN_RTPG )) + pg->interval =ALUA_RTPG_RETRY_DELAY ; pg->flags |=ALUA_PG_RUN_RTPG ;spin_unlock_irqrestore (&pg->lock, flags); queue_delayed_work(kaluad_wq, &pg->rtpg_work,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 37/42 test_firmware: fix a memory leak bug
In reply to Sasha LevinFrom: Wenwen Wang <[email protected]>
[ Upstream commit d4fddac5a51c378c5d3e68658816c37132611e1f ]
In test_firmware_init(), the buffer pointed to by the global pointer 'test_fw_config' is allocated through kzalloc(). Then, the buffer is initialized in __test_firmware_config_init(). In the case that the initialization fails, the following execution in test_firmware_init() needs to be terminated with an error code returned to indicate this failure. However, the allocated buffer is not freed on this execution path, leading to a memory leak bug.
To fix the above issue, free the allocated buffer before returning from test_firmware_init().
--- lib/test_firmware.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
lib/test_firmware.c +4 -1
@@ -894,8 +894,11 @@ static int __init test_firmware_init(void)return -ENOMEM ; rc =__test_firmware_config_init (); -if (rc) +if (rc) { +kfree (test_fw_config); +pr_err ("could not init firmware test config: %d\n" , rc);return rc; + } rc =misc_register (&test_fw_misc_device);if (rc) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 38/42 sched/fair: Don't free p->numa_faults with concurrent readers
In reply to Sasha LevinFrom: Jann Horn <[email protected]>
[ Upstream commit 16d51a590a8ce3befb1308e0e7ab77f3b661af33 ]
When going through execve(), zero out the NUMA fault statistics instead of freeing them.
During execve, the task is reachable through procfs and the scheduler. A concurrent /proc/*/sched reader can read data from a freed ->numa_faults allocation (confirmed by KASAN) and write it back to userspace. I believe that it would also be possible for a use-after-free read to occur through a race between a NUMA fault and execve(): task_numa_fault() can lead to task_numa_compare(), which invokes task_weight() on the currently running task of a different CPU.
Another way to fix this would be to make ->numa_faults RCU-managed or add extra locking, but it seems easier to wipe the NUMA fault statistics on execve.
--- fs/exec.c | 2 +- include/linux/sched/numa_balancing.h | 4 ++-- kernel/fork.c | 2 +- kernel/sched/fair.c | 24 ++++++++++++++++++++---- 4 files changed, 24 insertions(+), 8 deletions(-)
fs/exec.c +1 -1
@@ -1826,7 +1826,7 @@ static int __do_execve_file(int fd, struct filename *filename,membarrier_execve (current);rseq_execve (current);acct_update_integrals (current); -task_numa_free (current); +task_numa_free (current, false);free_bprm (bprm);kfree (pathbuf);if (filename)
include/linux/sched/numa_balancing.h +2 -2
@@ -19,7 +19,7 @@extern void task_numa_fault (int last_node,int node,int pages,int flags);extern pid_t task_numa_group_id (struct task_struct *p);extern void set_numabalancing_state (bool enabled); -extern void task_numa_free (struct task_struct *p); +extern void task_numa_free (struct task_struct *p,bool final);extern bool should_numa_migrate_memory (struct task_struct *p,struct page *page,int src_nid,int dst_cpu);#else
@@ -34,7 +34,7 @@ static inline pid_t task_numa_group_id(struct task_struct *p)static inline void set_numabalancing_state (bool enabled) { } -static inline void task_numa_free (struct task_struct *p) +static inline void task_numa_free (struct task_struct *p,bool final) { } static inline bool should_numa_migrate_memory(struct task_struct *p,
kernel/fork.c +1 -1
@@ -679,7 +679,7 @@ void __put_task_struct(struct task_struct *tsk)WARN_ON (tsk == current);cgroup_free (tsk); -task_numa_free (tsk); +task_numa_free (tsk, true);security_task_free (tsk);exit_creds (tsk);delayacct_tsk_free (tsk);
kernel/sched/fair.c +20 -4
@@ -2345,13 +2345,23 @@ static void task_numa_group(struct task_struct *p, int cpupid, int flags,return ; } -void task_numa_free (struct task_struct *p) +/* +* Get rid of NUMA staticstics associated with a task (either current or dead). +* If @final is set, the task is dead and has reached refcount zero, so we can +* safely free all relevant data structures. Otherwise, there might be +* concurrent reads from places like load balancing and procfs, and we should +* reset the data back to default state without freeing ->numa_faults. +*/ +void task_numa_free (struct task_struct *p,bool final) {struct numa_group *grp = p->numa_group; -void *numa_faults = p->numa_faults; +unsigned long *numa_faults = p->numa_faults;unsigned long flags;int i; +if (!numa_faults) +return ; +if (grp) {spin_lock_irqsave (&grp->lock, flags);for (i =0 ; i <NR_NUMA_HINT_FAULT_STATS * nr_node_ids; i++)
@@ -2364,8 +2374,14 @@ void task_numa_free(struct task_struct *p)put_numa_group (grp); } - p->numa_faults =NULL ; -kfree (numa_faults); +if (final) { + p->numa_faults =NULL ; +kfree (numa_faults); + }else { + p->total_numa_faults =0 ; +for (i =0 ; i <NR_NUMA_HINT_FAULT_STATS * nr_node_ids; i++) + numa_faults[i] =0 ; + } }/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 39/42 sched/fair: Use RCU accessors consistently for ->numa_group
In reply to Sasha LevinFrom: Jann Horn <[email protected]>
[ Upstream commit cb361d8cdef69990f6b4504dc1fd9a594d983c97 ]
The old code used RCU annotations and accessors inconsistently for ->numa_group, which can lead to use-after-frees and NULL dereferences.
Let all accesses to ->numa_group use proper RCU helpers to prevent such issues.
--- include/linux/sched.h | 10 +++- kernel/sched/fair.c | 120 ++++++++++++++++++++++++++++-------------- 2 files changed, 90 insertions(+), 40 deletions(-)
include/linux/sched.h +9 -1
@@ -1023,7 +1023,15 @@ struct task_struct {u64 last_sum_exec_runtime;struct callback_head numa_work; -struct numa_group *numa_group; +/* +* This pointer is only modified for current in syscall and +* pagefault context (and for tasks being destroyed), so it can be read +* from any of the following contexts: +* - RCU read-side critical section +* - current->numa_group from everywhere +* - task's runqueue locked, task not running +*/ +struct numa_group __rcu *numa_group;/* * numa_faults is an array split into four regions:
kernel/sched/fair.c +81 -39
308 lines not on this page · raw message
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 40/42 tty/ldsem, locking/rwsem: Add missing ACQUIRE to read_failed sleep loop
In reply to Sasha LevinFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 952041a8639a7a3a73a2b6573cb8aa8518bc39f8 ]
While reviewing rwsem down_slowpath, Will noticed ldsem had a copy of a bug we just found for rwsem.
X = 0;
CPU0 CPU1
rwsem_down_read()
for (;;) {
set_current_state(TASK_UNINTERRUPTIBLE); X = 1;
rwsem_up_write();
rwsem_mark_wake()
atomic_long_add(adjustment, &sem->count);
smp_store_release(&waiter->task, NULL);
if (!waiter.task)
break;
...
}r = X;
Allows 'r == 0'.
--- drivers/tty/tty_ldsem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/tty/tty_ldsem.c +2 -3
@@ -116,8 +116,7 @@ static void __ldsem_wake_readers(struct ld_semaphore *sem)list_for_each_entry_safe (waiter, next, &sem->read_wait, list) { tsk = waiter->task; -smp_mb (); - waiter->task =NULL ; +smp_store_release (&waiter->task,NULL );wake_up_process (tsk);put_task_struct (tsk); }
@@ -217,7 +216,7 @@ down_read_failed(struct ld_semaphore *sem, long count, long timeout)for (;;) {set_current_state (TASK_UNINTERRUPTIBLE ); -if (!waiter.task) +if (!smp_load_acquire (&waiter.task))break ;if (!timeout)break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 41/42 perf/core: Fix creating kernel counters for PMUs that override event->cpu
In reply to Sasha LevinFrom: Leonard Crestez <[email protected]>
[ Upstream commit 4ce54af8b33d3e21ca935fc1b89b58cbba956051 ]
Some hardware PMU drivers will override perf_event.cpu inside their event_init callback. This causes a lockdep splat when initialized through the kernel API:
WARNING: CPU: 0 PID: 250 at kernel/events/core.c:2917 ctx_sched_out+0x78/0x208 pc : ctx_sched_out+0x78/0x208 Call trace: ctx_sched_out+0x78/0x208 __perf_install_in_context+0x160/0x248 remote_function+0x58/0x68 generic_exec_single+0x100/0x180 smp_call_function_single+0x174/0x1b8 perf_install_in_context+0x178/0x188 perf_event_create_kernel_counter+0x118/0x160
Fix this by calling perf_install_in_context with event->cpu, just like perf_event_open
--- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/core.c +1 -1
@@ -10957,7 +10957,7 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu, goto err_unlock; } -perf_install_in_context (ctx, event, cpu); +perf_install_in_context (ctx, event, event->cpu);perf_unpin_context (ctx);mutex_unlock (&ctx->mutex);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 42/42 s390/dma: provide proper ARCH_ZONE_DMA_BITS value
In reply to Sasha LevinFrom: Halil Pasic <[email protected]>
[ Upstream commit 1a2dcff881059dedc14fafc8a442664c8dbd60f1 ]
On s390 ZONE_DMA is up to 2G, i.e. ARCH_ZONE_DMA_BITS should be 31 bits. The current value is 24 and makes __dma_direct_alloc_pages() take a wrong turn first (but __dma_direct_alloc_pages() recovers then).
Let's correct ARCH_ZONE_DMA_BITS value and avoid wrong turns.
--- arch/s390/include/asm/page.h | 2 ++ 1 file changed, 2 insertions(+)
arch/s390/include/asm/page.h +2 -0
@@ -176,6 +176,8 @@ static inline int devmem_is_allowed(unsigned long pfn)#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define ARCH_ZONE_DMA_BITS 31 +#include <asm-generic/memory_model.h> #include <asm-generic/getorder.h>
Signature · 1 line
2.20.1