powerpc: fix off by one in max_zone_pfn initialization for ZONE_DMA
Subsystems (14)
Sasha Levin
maintainerPATCH 1/76 powerpc: fix off by one in max_zone_pfn initialization for ZONE_DMA
From: Andrea Arcangeli <[email protected]>
[ Upstream commit 03800e0526ee25ed7c843ca1e57b69ac2a5af642 ]
25078dc1f74be16b858e914f52cc8f4d03c2271a first introduced an off by one error in the ZONE_DMA initialization of PPC_BOOK3E_64=y and since 9739ab7eda459f0669ec9807e0d9be5020bab88c the off by one applies to PPC32=y too. This simply corrects the off by one and should resolve crashes like below:
[ 65.179101] page 0x7fff outside node 0 zone DMA [ 0x0 - 0x7fff ]
Unfortunately in various MM places "max" means a non inclusive end of range. free_area_init_nodes max_zone_pfn parameter is one case and MAX_ORDER is another one (unrelated) that comes by memory.
--- arch/powerpc/mm/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/mem.c +1 -1
@@ -249,7 +249,7 @@ void __init paging_init(void)#ifdef CONFIG_ZONE_DMA max_zone_pfns[ZONE_DMA ] =min (max_low_pfn, - ((1UL <<ARCH_ZONE_DMA_BITS ) -1 ) >>PAGE_SHIFT ); +1UL << (ARCH_ZONE_DMA_BITS -PAGE_SHIFT ));#endif max_zone_pfns[ZONE_NORMAL ] = max_low_pfn;#ifdef CONFIG_HIGHMEM
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/76 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
@@ -578,7 +578,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 3/76 vfio-ccw: Set pa_nr to 0 if memory allocation fails for pa_iova_pfn
In reply to Sasha LevinFrom: 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 4/76 vfio-ccw: Don't call cp_free if we are processing a channel program
In reply to Sasha LevinFrom: Farhan Ali <[email protected]>
[ Upstream commit f4c9939433bd396d0b08e803b2b880a9d02682b9 ]
There is a small window where it's possible that we could be working on an interrupt (queued in the workqueue) and setting up a channel program (i.e allocating memory, pinning pages, translating address). This can lead to allocating and freeing the channel program at the same time and can cause memory corruption.
Let's not call cp_free if we are currently processing a channel program. The only way we know for sure that we don't have a thread setting up a channel program is when the state is set to VFIO_CCW_STATE_CP_PENDING.
Message-Id: <62e87bf67b38dc8d5760586e7c96d400db854ebe.1562854091.git.alifm@linux.ibm.com>
--- drivers/s390/cio/vfio_ccw_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/cio/vfio_ccw_drv.c +1 -1
@@ -88,7 +88,7 @@ static void vfio_ccw_sch_io_todo(struct work_struct *work) (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT));if (scsw_is_solicited (&irb->scsw)) {cp_update_scsw (&private->cp, &irb->scsw); -if (is_final) +if (is_final && private->state ==VFIO_CCW_STATE_CP_PENDING )cp_free (&private->cp); }mutex_lock (&private->io_mutex);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/76 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
@@ -78,6 +78,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
@@ -55,7 +55,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);
@@ -70,7 +72,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 6/76 netfilter: nf_tables: fix module autoload for redir
In reply to Sasha LevinFrom: Christian Hesse <[email protected]>
[ Upstream commit f41828ee10b36644bb2b2bfa9dd1d02f55aa0516 ]
Fix expression for autoloading.
--- net/netfilter/nft_redir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_redir.c +1 -1
@@ -291,4 +291,4 @@ module_exit(nft_redir_module_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Arturo Borrero Gonzalez <[email protected]>" ); -MODULE_ALIAS_NFT_EXPR ("nat" ); +MODULE_ALIAS_NFT_EXPR ("redir" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/76 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
@@ -472,6 +472,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;
@@ -480,7 +481,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 )
@@ -655,14 +657,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
Sasha Levin
maintainerPATCH 8/76 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
@@ -129,7 +129,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 9/76 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
@@ -364,7 +364,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
Sasha Levin
maintainerPATCH 10/76 scripts/sphinx-pre-install: don't use LaTeX with CentOS 7
In reply to Sasha LevinFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 56e5a633923793b31515795ad30156a307572c1e ]
There aren't enough texlive packages for LaTeX-based builds to work on CentOS/RHEL <= 7.
--- scripts/sphinx-pre-install | 68 ++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 18 deletions(-)
scripts/sphinx-pre-install +50 -18
@@ -77,6 +77,17 @@ sub check_missing(%) foreach my $prog (sort keys %missing) { my $is_optional = $missing{$prog}; + # At least on some LTS distros like CentOS 7, texlive doesn't + # provide all packages we need. When such distros are + # detected, we have to disable PDF output. + # + # So, we need to ignore the packages that distros would + # need for LaTeX to work + if ($is_optional == 2 && !$pdf) { + $optional--; + next; + } + if ($is_optional) { print "Warning: better to also install \"$prog\".\n"; } else {
@@ -326,10 +337,10 @@ sub give_debian_hints() if ($pdf) { check_missing_file("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", - "fonts-dejavu", 1); + "fonts-dejavu", 2); } - check_program("dvipng", 1) if ($pdf); + check_program("dvipng", 2) if ($pdf); check_missing(\%map); return if (!$need && !$optional);
@@ -364,22 +375,40 @@ sub give_redhat_hints() # # Checks valid for RHEL/CentOS version 7.x. # + my $old = 0; + my $rel; + $rel = $1 if ($system_release =~ /release\s+(\d+)/); + if (!($system_release =~ /Fedora/)) { $map{"virtualenv"} = "python-virtualenv"; - } - my $release; + if ($rel && $rel < 8) { + $old = 1; + $pdf = 0; - $release = $1 if ($system_release =~ /Fedora\s+release\s+(\d+)/); + printf("Note: texlive packages on RHEL/CENTOS <= 7 are incomplete. Can't support PDF output\n"); + printf("If you want to build PDF, please read:\n"); + printf("\thttps://www.systutorials.com/241660/how-to-install-tex-live-on-centos-7-linux/\n"); + } + } else { + if ($rel && $rel < 26) { + $old = 1; + } + } + if (!$rel) { + printf("Couldn't identify release number\n"); + $old = 1; + $pdf = 0; + } - check_rpm_missing(\@fedora26_opt_pkgs, 1) if ($pdf && $release >= 26); - check_rpm_missing(\@fedora_tex_pkgs, 1) if ($pdf); - check_missing_tex(1) if ($pdf); + check_rpm_missing(\@fedora26_opt_pkgs, 2) if ($pdf && !$old); + check_rpm_missing(\@fedora_tex_pkgs, 2) if ($pdf); + check_missing_tex(2) if ($pdf); check_missing(\%map); return if (!$need && !$optional); - if ($release >= 18) { + if (!$old) { # dnf, for Fedora 18+ printf("You should run:\n\n\tsudo dnf install -y $install\n"); } else {
@@ -418,8 +447,8 @@ sub give_opensuse_hints() "texlive-zapfding", ); - check_rpm_missing(\@suse_tex_pkgs, 1) if ($pdf); - check_missing_tex(1) if ($pdf); + check_rpm_missing(\@suse_tex_pkgs, 2) if ($pdf); + check_missing_tex(2) if ($pdf); check_missing(\%map); return if (!$need && !$optional);
@@ -443,7 +472,7 @@ sub give_mageia_hints() "texlive-fontsextra", ); - check_rpm_missing(\@tex_pkgs, 1) if ($pdf); + check_rpm_missing(\@tex_pkgs, 2) if ($pdf); check_missing(\%map); return if (!$need && !$optional);
@@ -466,7 +495,8 @@ sub give_arch_linux_hints() "texlive-latexextra", "ttf-dejavu", ); - check_pacman_missing(\@archlinux_tex_pkgs, 1) if ($pdf); + check_pacman_missing(\@archlinux_tex_pkgs, 2) if ($pdf); + check_missing(\%map); return if (!$need && !$optional);
@@ -485,7 +515,7 @@ sub give_gentoo_hints() ); check_missing_file("/usr/share/fonts/dejavu/DejaVuSans.ttf", - "media-fonts/dejavu", 1) if ($pdf); + "media-fonts/dejavu", 2) if ($pdf); check_missing(\%map);
@@ -553,7 +583,7 @@ sub check_distros() my %map = ( "sphinx-build" => "sphinx" ); - check_missing_tex(1) if ($pdf); + check_missing_tex(2) if ($pdf); check_missing(\%map); print "I don't know distro $system_release.\n"; print "So, I can't provide you a hint with the install procedure.\n";
@@ -591,11 +621,13 @@ sub check_needs() check_program("make", 0); check_program("gcc", 0); check_python_module("sphinx_rtd_theme", 1) if (!$virtualenv); - check_program("xelatex", 1) if ($pdf); check_program("dot", 1); check_program("convert", 1); - check_program("rsvg-convert", 1) if ($pdf); - check_program("latexmk", 1) if ($pdf); + + # Extra PDF files - should use 2 for is_optional + check_program("xelatex", 2) if ($pdf); + check_program("rsvg-convert", 2) if ($pdf); + check_program("latexmk", 2) if ($pdf); check_distros();
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/76 scripts/sphinx-pre-install: fix latexmk dependencies
In reply to Sasha LevinFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 353290a9eb5362a80bc8e52fcd7eb77a30f48afc ]
The name of the package with carries latexmk is different on two distros:
- On OpenSUSE, latexmk is packaged as "texlive-latexmk-bin"
- On Mageia, latexmk is packaged at "texlive-collection-basic"
--- scripts/sphinx-pre-install | 4 ++++ 1 file changed, 4 insertions(+)
scripts/sphinx-pre-install +4 -0
@@ -447,6 +447,8 @@ sub give_opensuse_hints() "texlive-zapfding", ); + $map{"latexmk"} = "texlive-latexmk-bin"; + check_rpm_missing(\@suse_tex_pkgs, 2) if ($pdf); check_missing_tex(2) if ($pdf); check_missing(\%map);
@@ -472,6 +474,8 @@ sub give_mageia_hints() "texlive-fontsextra", ); + $map{"latexmk"} = "texlive-collection-basic"; + check_rpm_missing(\@tex_pkgs, 2) if ($pdf); check_missing(\%map);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/76 rq-qos: don't reset has_sleepers on spurious wakeups
In reply to Sasha LevinFrom: Josef Bacik <[email protected]>
[ Upstream commit 64e7ea875ef63b2801be7954cf7257d1bfccc266 ]
If we raced with somebody else getting an inflight counter we could fail to get an inflight counter with no sleepers on the list, and thus need to go to sleep. In this case has_sleepers should be true because we are now relying on the waker to get our inflight counter for us. And in the case of spurious wakeups we'd still want this to be the case. So set has_sleepers to true if we went to sleep to make sure we're woken up the proper way.
--- block/blk-rq-qos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/blk-rq-qos.c +1 -1
@@ -260,7 +260,7 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,break ; }io_schedule (); - has_sleeper = false; + has_sleeper = true; }while (1 );finish_wait (&rqw->wait, &data.wq); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/76 rq-qos: set ourself TASK_UNINTERRUPTIBLE after we schedule
In reply to Sasha LevinFrom: Josef Bacik <[email protected]>
[ Upstream commit d14a9b389a86a5154b704bc88ce8dd37c701456a ]
In case we get a spurious wakeup we need to make sure to re-set ourselves to TASK_UNINTERRUPTIBLE so we don't busy wait.
--- block/blk-rq-qos.c | 1 + 1 file changed, 1 insertion(+)
block/blk-rq-qos.c +1 -0
@@ -261,6 +261,7 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data, }io_schedule (); has_sleeper = true; +set_current_state (TASK_UNINTERRUPTIBLE ); }while (1 );finish_wait (&rqw->wait, &data.wq); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/76 rq-qos: use a mb for got_token
In reply to Sasha LevinFrom: Josef Bacik <[email protected]>
[ Upstream commit ac38297f7038cd5b80d66f8809c7bbf5b70031f3 ]
Oleg noticed that our checking of data.got_token is unsafe in the cleanup case, and should really use a memory barrier. Use a wmb on the write side, and a rmb() on the read side. We don't need one in the main loop since we're saved by set_current_state().
--- block/blk-rq-qos.c | 3 +++ 1 file changed, 3 insertions(+)
block/blk-rq-qos.c +3 -0
@@ -202,6 +202,7 @@ static int rq_qos_wake_function(struct wait_queue_entry *curr,return -1 ; data->got_token = true; +smp_wmb ();list_del_init (&curr->entry);wake_up_process (data->task);return 1 ;
@@ -245,6 +246,7 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,prepare_to_wait_exclusive (&rqw->wait, &data.wq,TASK_UNINTERRUPTIBLE ); do { + /* The memory barrier in set_task_state saves us here. */ if (data.got_token) break; if (!has_sleeper && acquire_inflight_cb(rqw, private_data)) {
@@ -255,6 +257,7 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,* which means we now have two. Put our local token * and wake anyone else potentially waiting for one. */ +smp_rmb ();if (data.got_token)cleanup_cb (rqw, private_data);break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/76 netfilter: nf_tables: Support auto-loading for inet nat
In reply to Sasha LevinFrom: Phil Sutter <[email protected]>
[ Upstream commit b4f1483cbfa5fafca4874e90063f75603edbc210 ]
Trying to create an inet family nat chain would not cause nft_chain_nat.ko module to auto-load due to missing module alias. Add a proper one with hard-coded family value 1 for the pseudo-family NFPROTO_INET.
--- net/netfilter/nft_chain_nat.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nft_chain_nat.c +3 -0
@@ -142,3 +142,6 @@ MODULE_ALIAS_NFT_CHAIN(AF_INET, "nat");#ifdef CONFIG_NF_TABLES_IPV6 MODULE_ALIAS_NFT_CHAIN (AF_INET6 ,"nat" );#endif +#ifdef CONFIG_NF_TABLES_INET +MODULE_ALIAS_NFT_CHAIN (1 ,"nat" );/* NFPROTO_INET */ +#endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/76 drm/amd/display: No audio endpoint for Dell MST display
In reply to Sasha LevinFrom: Harmanprit Tatla <[email protected]>
[ Upstream commit 5b25e5f1a97284020abee7348427f89abdb674e8 ]
[Why]
There are certain MST displays (i.e. Dell P2715Q) that although have the MST feature set to off may still report it is a branch device and a non-zero value for downstream port present.
This can lead to us incorrectly classifying a dp dongle connection as being active and disabling the audio endpoint for the display.
[How]
Modified the placement and
condition used to assign
the is_branch_dev bit.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +8 -1
@@ -2218,11 +2218,18 @@ static void get_active_converter_info( link->dpcd_caps.dongle_type =DISPLAY_DONGLE_NONE ;ddc_service_set_dongle_type (link->ddc, link->dpcd_caps.dongle_type); + link->dpcd_caps.is_branch_dev = false;return ; }/* DPCD 0x5 bit 0 = 1, it indicate it's branch device */ - link->dpcd_caps.is_branch_dev = ds_port.fields.PORT_PRESENT; +if (ds_port.fields.PORT_TYPE ==DOWNSTREAM_DP ) { + link->dpcd_caps.is_branch_dev = false; + } + +else { + link->dpcd_caps.is_branch_dev = ds_port.fields.PORT_PRESENT; + }switch (ds_port.fields.PORT_TYPE) {case DOWNSTREAM_VGA :
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 17/76 drm/amd/display: Clock does not lower in Updateplanes
In reply to Sasha LevinFrom: Murton Liu <[email protected]>
[ Upstream commit 492d9ec244923420af96db6b69ad7d575859aa92 ]
[why]
We reset the optimized_required in atomic_plane_disable
flag immediately after it is set in atomic_plane_disconnect, causing us to never have flag set during next flip in UpdatePlanes.
[how]
Optimize directly after each time plane is removed.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +6 -0
@@ -2416,6 +2416,12 @@ static void dcn10_apply_ctx_for_surface(if (removed_pipe[i])dcn10_disable_plane (dc, &dc->current_state->res_ctx.pipe_ctx[i]); +for (i =0 ; i < dc->res_pool->pipe_count; i++) +if (removed_pipe[i]) { + dc->hwss.optimize_bandwidth (dc, context); +break ; + } +if (dc->hwseq->wa.DEGVIDCN10_254)hubbub1_wm_change_req_wa (dc->res_pool->hubbub); }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 18/76 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
@@ -234,6 +234,10 @@ static void dmcu_set_backlight_level( s2 |= (backlight_8_bit <<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 19/76 drm/amd/display: fix DMCU hang when going into Modern Standby
In reply to Sasha LevinFrom: Zi Yu Liao <[email protected]>
[ Upstream commit 1ca068ed34d6b39d336c1b0d618ed73ba8f04548 ]
[why]
When the system is going into suspend, set_backlight gets called after the eDP got blanked. Since smooth brightness is enabled, the driver will make a call into the DMCU to ramp the brightness. The DMCU would try to enable ABM to do so. But since the display is blanked, this ends up causing ABM1_ACE_DBUF_REG_UPDATE_PENDING to get stuck at 1, which results in a dead lock in the DMCU firmware.
[how]
Disable brightness ramping when the eDP display is blanked.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +8 -1
@@ -2284,7 +2284,7 @@ bool dc_link_set_backlight_level(const struct dc_link *link,if (core_dc->current_state->res_ctx.pipe_ctx[i].stream) {if (core_dc->current_state->res_ctx. pipe_ctx[i].stream->link - == link) + == link) {/* DMCU -1 for all controller id values, * therefore +1 here */
@@ -2292,6 +2292,13 @@ bool dc_link_set_backlight_level(const struct dc_link *link, core_dc->current_state-> res_ctx.pipe_ctx[i].stream_res.tg->inst +1 ; + +/* Disable brightness ramping when the display is blanked +* as it can hang the DMCU +*/ +if (core_dc->current_state->res_ctx.pipe_ctx[i].plane_state ==NULL ) + frame_ramp =0 ; + } } } abm->funcs->set_backlight_level_pwm(
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 20/76 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
@@ -254,7 +254,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 ) {
@@ -1702,6 +1702,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 21/76 drm/amd/display: put back front end initialization sequence
In reply to Sasha LevinFrom: Eric Yang <[email protected]>
[ Upstream commit feb7eb522e0a7a22c1e60d386bd3c3bfa1d5e4f7 ]
[Why]
Seamless boot optimization removed proper front end power off sequence. In driver disable enable case, this causes driver to power gate hubp and dpp while there is still memory fetching going on, this can cause invalid memory requests to be generated which will hang data fabric.
[How]
Put back proper front end power off sequence
--- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +1 -14
@@ -1120,16 +1120,7 @@ static void dcn10_init_hw(struct dc *dc)* everything down. */ if (dcb->funcs->is_accelerated_mode (dcb) || dc->config.power_down_display_on_boot) { -for (i =0 ; i < dc->res_pool->pipe_count; i++) { -struct hubp *hubp = dc->res_pool->hubps[i]; -struct dpp *dpp = dc->res_pool->dpps[i]; - - hubp->funcs->hubp_init (hubp); - dc->res_pool->opps[i]->mpc_tree_params.opp_id = dc->res_pool->opps[i]->inst; -plane_atomic_power_down (dc, dpp, hubp); - } - -apply_DEGVIDCN10_253_wa (dc); + dc->hwss.init_pipes (dc, dc->current_state); }for (i =0 ; i < dc->res_pool->audio_count; i++) {
@@ -1298,10 +1289,6 @@ static bool dcn10_set_input_transfer_func(struct pipe_ctx *pipe_ctx,return result; } - - - -static bool dcn10_set_output_transfer_func (struct pipe_ctx *pipe_ctx,const struct dc_stream_state *stream)
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 22/76 drm/amd/display: allocate 4 ddc engines for RV2
In reply to Sasha LevinFrom: Derek Lai <[email protected]>
[ Upstream commit 67fd6c0d2de8e51e84ff3fa6e68bbd524f823e49 ]
[Why]
Driver will create 0, 1, and 2 ddc engines for RV2, but some platforms used 0, 1, and 3.
[How]
Still allocate 4 ddc engines for RV2.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +1 -1
@@ -512,7 +512,7 @@ static const struct resource_caps rv2_res_cap = { .num_audio = 3, .num_stream_encoder = 3, .num_pll = 3, - .num_ddc = 3, + .num_ddc = 4, };#endif
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 23/76 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
@@ -608,8 +608,10 @@ const struct dc_link_settings *dc_link_get_link_cap(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 · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/76 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
@@ -2019,7 +2019,7 @@ enum dc_status resource_map_pool_resources(/* TODO: Add check if ASIC support and EDID audio */ if (!stream->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 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 25/76 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
@@ -169,7 +169,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 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 26/76 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
@@ -157,7 +157,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
@@ -168,7 +168,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
@@ -84,6 +84,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 27/76 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
@@ -2844,7 +2844,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 28/76 mac80211: fix possible memory leak in ieee80211_assign_beacon
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit bcc27fab8cc673ddc95452674373cce618ccb3a3 ]
Free new beacon_data in ieee80211_assign_beacon whenever ieee80211_assign_beacon fails
--- net/mac80211/cfg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/mac80211/cfg.c +6 -2
@@ -935,8 +935,10 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, err =ieee80211_set_probe_resp (sdata, params->probe_resp, params->probe_resp_len, csa); -if (err <0 ) +if (err <0 ) { +kfree (new);return err; + }if (err ==0 ) changed |=BSS_CHANGED_AP_PROBE_RESP ;
@@ -948,8 +950,10 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, params->civicloc, params->civicloc_len); -if (err <0 ) +if (err <0 ) { +kfree (new);return err; + } changed |=BSS_CHANGED_FTM_RESPONDER ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 29/76 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
@@ -187,11 +187,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 30/76 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 31/76 hwmon: (occ) Fix division by zero issue
In reply to Sasha LevinFrom: Lei YU <[email protected]>
[ Upstream commit 211186cae14de09573b062e478eb9fe215aed8d9 ]
The code in occ_get_powr_avg() invokes div64_u64() without checking the divisor. In case the divisor is zero, kernel gets an "Division by zero in kernel" error.
Check the divisor and make it return 0 if the divisor is 0.
--- drivers/hwmon/occ/common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hwmon/occ/common.c +4 -2
@@ -402,8 +402,10 @@ static ssize_t occ_show_power_1(struct device *dev,static u64 occ_get_powr_avg (u64 *accum,u32 *samples) { -return div64_u64 (get_unaligned_be64 (accum) *1000000ULL , -get_unaligned_be32 (samples)); +u64 divisor =get_unaligned_be32 (samples); + +return (divisor ==0 ) ?0 : +div64_u64 (get_unaligned_be64 (accum) *1000000ULL , divisor); } static ssize_t occ_show_power_2(struct device *dev,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 32/76 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
@@ -852,7 +852,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 };
@@ -3764,6 +3764,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 33/76 ARM: dts: imx6ul: fix clock frequency property name of I2C buses
In reply to Sasha LevinFrom: Sébastien Szymanski <[email protected]>
[ Upstream commit 2ca99396333999b9b5c5b91b36cbccacfe571aaf ]
A few boards set clock frequency of their I2C buses with "clock_frequency" property. The right property is "clock-frequency".
--- arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 +- arch/arm/boot/dts/imx6ul-geam.dts | 2 +- arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 +- arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 2 +- arch/arm/boot/dts/imx6ul-pico-pi.dts | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +1 -1
@@ -112,7 +112,7 @@ }; &i2c2 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; status = "okay";
arch/arm/boot/dts/imx6ul-geam.dts +1 -1
@@ -156,7 +156,7 @@ }; &i2c2 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; status = "okay";
arch/arm/boot/dts/imx6ul-isiot.dtsi +1 -1
@@ -148,7 +148,7 @@ }; &i2c2 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; status = "okay";
arch/arm/boot/dts/imx6ul-pico-hobbit.dts +1 -1
@@ -43,7 +43,7 @@ }; &i2c2 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; status = "okay";
arch/arm/boot/dts/imx6ul-pico-pi.dts +2 -2
@@ -43,7 +43,7 @@ }; &i2c2 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; status = "okay";
@@ -58,7 +58,7 @@ }; &i2c3 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c3>; status = "okay";
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 34/76 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
@@ -200,7 +200,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 35/76 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
@@ -194,11 +194,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));
@@ -220,17 +221,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 36/76 mm/vmalloc: Sync unmappings in __purge_vmap_area_lazy()
In reply to Sasha LevinFrom: Joerg Roedel <[email protected]>
[ Upstream commit 3f8fd02b1bf1d7ba964485a56f2f4b53ae88c167 ]
On x86-32 with PTI enabled, parts of the kernel page-tables are not shared between processes. This can cause mappings in the vmalloc/ioremap area to persist in some page-tables after the region is unmapped and released.
When the region is re-used the processes with the old mappings do not fault in the new mappings but still access the old ones.
This causes undefined behavior, in reality often data corruption, kernel oopses and panics and even spontaneous reboots.
Fix this problem by activly syncing unmaps in the vmalloc/ioremap area to all page-tables in the system before the regions can be re-used.
References: https://bugzilla.suse.com/show_bug.cgi?id=1118689
--- mm/vmalloc.c | 9 +++++++++ 1 file changed, 9 insertions(+)
mm/vmalloc.c +9 -0
@@ -1213,6 +1213,12 @@ static bool __purge_vmap_area_lazy(unsigned long start, unsigned long end)if (unlikely (valist ==NULL ))return false; +/* +* First make sure the mappings are removed from all page-tables +* before they are freed. +*/ +vmalloc_sync_all (); +/* * TODO: to calculate a flush range without looping. * The list can be up to lazy_max_pages() elements.
@@ -3001,6 +3007,9 @@ EXPORT_SYMBOL(remap_vmalloc_range);/* * Implement a stub for vmalloc_sync_all() if the architecture chose not to * have one. +* +* The purpose of this function is to make sure the vmalloc area +* mappings are identical in all page-tables in the system. */ void __weak vmalloc_sync_all (void ) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 37/76 powerpc/papr_scm: Force a scm-unbind if initial scm-bind fails
In reply to Sasha LevinFrom: Vaibhav Jain <[email protected]>
[ Upstream commit 3a855b7ac7d5021674aa3e1cc9d3bfd6b604e9c0 ]
In some cases initial bind of scm memory for an lpar can fail if previously it wasn't released using a scm-unbind hcall. This situation can arise due to panic of the previous kernel or forced lpar fadump. In such cases the H_SCM_BIND_MEM return a H_OVERLAP error.
To mitigate such cases the patch updates papr_scm_probe() to force a call to drc_pmem_unbind() in case the initial bind of scm memory fails with EBUSY error. In case scm-bind operation again fails after the forced scm-unbind then we follow the existing error path. We also update drc_pmem_bind() to handle the H_OVERLAP error returned by phyp and indicate it as a EBUSY error back to the caller.
--- arch/powerpc/platforms/pseries/papr_scm.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
arch/powerpc/platforms/pseries/papr_scm.c +14 -1
@@ -42,8 +42,9 @@ struct papr_scm_priv {static int drc_pmem_bind (struct papr_scm_priv *p) {unsigned long ret[PLPAR_HCALL_BUFSIZE ]; -uint64_t rc, token;uint64_t saved =0 ; +uint64_t token; +int64_t rc;/* * When the hypervisor cannot map all the requested memory in a single
@@ -63,6 +64,10 @@ static int drc_pmem_bind(struct papr_scm_priv *p) }while (rc ==H_BUSY );if (rc) { +/* H_OVERLAP needs a separate error path */ +if (rc ==H_OVERLAP ) +return -EBUSY ; +dev_err (&p->pdev->dev,"bind err: %lld\n" , rc);return -ENXIO ; }
@@ -316,6 +321,14 @@ static int papr_scm_probe(struct platform_device *pdev)/* request the hypervisor to bind this region to somewhere in memory */ rc =drc_pmem_bind (p); + +/* If phyp says drc memory still bound then force unbound and retry */ +if (rc == -EBUSY ) { +dev_warn (&pdev->dev,"Retrying bind after unbinding\n" ); +drc_pmem_unbind (p); + rc =drc_pmem_bind (p); + } +if (rc) goto err;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 38/76 arm64: Force SSBS on context switch
In reply to Sasha LevinFrom: Marc Zyngier <[email protected]>
[ Upstream commit cbdf8a189a66001c36007bf0f5c975d0376c5c3a ]
On a CPU that doesn't support SSBS, PSTATE[12] is RES0. In a system where only some of the CPUs implement SSBS, we end-up losing track of the SSBS bit across task migration.
To address this issue, let's force the SSBS bit on context switch.
--- arch/arm64/include/asm/processor.h | 14 ++++++++++++-- arch/arm64/kernel/process.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-)
arch/arm64/include/asm/processor.h +12 -2
@@ -193,6 +193,16 @@ static inline void start_thread_common(struct pt_regs *regs, unsigned long pc) regs->pmr_save =GIC_PRIO_IRQON ; } +static inline void set_ssbs_bit (struct pt_regs *regs) +{ + regs->pstate |=PSR_SSBS_BIT ; +} + +static inline void set_compat_ssbs_bit (struct pt_regs *regs) +{ + regs->pstate |=PSR_AA32_SSBS_BIT ; +} +static inline void start_thread (struct pt_regs *regs,unsigned long pc,unsigned long sp) {
@@ -200,7 +210,7 @@ static inline void start_thread(struct pt_regs *regs, unsigned long pc, regs->pstate = PSR_MODE_EL0t;if (arm64_get_ssbd_state () !=ARM64_SSBD_FORCE_ENABLE ) - regs->pstate |=PSR_SSBS_BIT ; +set_ssbs_bit (regs); regs->sp = sp; }
@@ -219,7 +229,7 @@ static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc,#endif if (arm64_get_ssbd_state () !=ARM64_SSBD_FORCE_ENABLE ) - regs->pstate |=PSR_AA32_SSBS_BIT ; +set_compat_ssbs_bit (regs); regs->compat_sp = sp; }
arch/arm64/kernel/process.c +28 -1
@@ -398,7 +398,7 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start, childregs->pstate |=PSR_UAO_BIT ;if (arm64_get_ssbd_state () ==ARM64_SSBD_FORCE_DISABLE ) - childregs->pstate |=PSR_SSBS_BIT ; +set_ssbs_bit (childregs);if (system_uses_irq_prio_masking ()) childregs->pmr_save =GIC_PRIO_IRQON ;
@@ -442,6 +442,32 @@ void uao_thread_switch(struct task_struct *next) } } +/* +* Force SSBS state on context-switch, since it may be lost after migrating +* from a CPU which treats the bit as RES0 in a heterogeneous system. +*/ +static void ssbs_thread_switch (struct task_struct *next) +{ +struct pt_regs *regs =task_pt_regs (next); + +/* +* Nothing to do for kernel threads, but 'regs' may be junk +* (e.g. idle task) so check the flags and bail early. +*/ +if (unlikely (next->flags &PF_KTHREAD )) +return ; + +/* If the mitigation is enabled, then we leave SSBS clear. */ +if ((arm64_get_ssbd_state () ==ARM64_SSBD_FORCE_ENABLE ) || +test_tsk_thread_flag (next,TIF_SSBD )) +return ; + +if (compat_user_mode (regs)) +set_compat_ssbs_bit (regs); +else if (user_mode (regs)) +set_ssbs_bit (regs); +} +/* * We store our current task in sp_el0, which is clobbered by userspace. Keep a * shadow copy so that we can restore this upon entry from userspace.
@@ -471,6 +497,7 @@ __notrace_funcgraph struct task_struct *__switch_to(struct task_struct *prev,entry_task_switch (next);uao_thread_switch (next);ptrauth_thread_switch (next); +ssbs_thread_switch (next);/* * Complete any pending TLB or cache maintenance on this CPU in case
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 39/76 arm64: entry: SP Alignment Fault doesn't write to FAR_EL1
In reply to Sasha LevinFrom: James Morse <[email protected]>
[ Upstream commit 40ca0ce56d4bb889dc43b455c55398468115569a ]
Comparing the arm-arm's pseudocode for AArch64.PCAlignmentFault() with AArch64.SPAlignmentFault() shows that SP faults don't copy the faulty-SP to FAR_EL1, but this is where we read from, and the address we provide to user-space with the BUS_ADRALN signal.
For user-space this value will be UNKNOWN due to the previous ERET to user-space. If the last value is preserved, on systems with KASLR or KPTI this will be the user-space link-register left in FAR_EL1 by tramp_exit(). Fix this to retrieve the original sp_el0 value, and pass this to do_sp_pc_fault().
SP alignment faults from EL1 will cause us to take the fault again when trying to store the pt_regs. This eventually takes us to the overflow stack. Remove the ESR_ELx_EC_SP_ALIGN check as we will never make it this far.
--- arch/arm64/kernel/entry.S | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
arch/arm64/kernel/entry.S +13 -9
@@ -586,10 +586,8 @@ el1_sync: b.eq el1_ia cmp x24, #ESR_ELx_EC_SYS64 // configurable trap b.eq el1_undef - cmp x24, #ESR_ELx_EC_SP_ALIGN // stack alignment exception - b.eq el1_sp_pc cmp x24, #ESR_ELx_EC_PC_ALIGN // pc alignment exception - b.eq el1_sp_pc + b.eq el1_pc cmp x24, #ESR_ELx_EC_UNKNOWN // unknown exception in EL1 b.eq el1_undef cmp x24, #ESR_ELx_EC_BREAKPT_CUR // debug exception in EL1
@@ -611,9 +609,11 @@ el1_da: bl do_mem_abort kernel_exit 1 -el1_sp_pc: +el1_pc: /* - * Stack or PC alignment exception handling + * PC alignment exception handling. We don't handle SP alignment faults, + * since we will have hit a recursive exception when trying to push the + * initial pt_regs. */ mrs x0, far_el1 inherit_daif pstate=x23, tmp=x2
@@ -732,9 +732,9 @@ el0_sync: ccmp x24, #ESR_ELx_EC_WFx, #4, ne b.eq el0_sys cmp x24, #ESR_ELx_EC_SP_ALIGN // stack alignment exception - b.eq el0_sp_pc + b.eq el0_sp cmp x24, #ESR_ELx_EC_PC_ALIGN // pc alignment exception - b.eq el0_sp_pc + b.eq el0_pc cmp x24, #ESR_ELx_EC_UNKNOWN // unknown exception in EL0 b.eq el0_undef cmp x24, #ESR_ELx_EC_BREAKPT_LOW // debug exception in EL0
@@ -758,7 +758,7 @@ el0_sync_compat: cmp x24, #ESR_ELx_EC_FP_EXC32 // FP/ASIMD exception b.eq el0_fpsimd_exc cmp x24, #ESR_ELx_EC_PC_ALIGN // pc alignment exception - b.eq el0_sp_pc + b.eq el0_pc cmp x24, #ESR_ELx_EC_UNKNOWN // unknown exception in EL0 b.eq el0_undef cmp x24, #ESR_ELx_EC_CP15_32 // CP15 MRC/MCR trap
@@ -858,11 +858,15 @@ el0_fpsimd_exc: mov x1, sp bl do_fpsimd_exc b ret_to_user +el0_sp: + ldr x26, [sp, #S_SP] + b el0_sp_pc +el0_pc: + mrs x26, far_el1 el0_sp_pc: /* * Stack or PC alignment exception handling */ - mrs x26, far_el1 gic_prio_kentry_setup tmp=x0 enable_da_f #ifdef CONFIG_TRACE_IRQFLAGS
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 40/76 iommu/vt-d: Check if domain->pgd was allocated
In reply to Sasha LevinFrom: Dmitry Safonov <[email protected]>
[ Upstream commit 3ee9eca760e7d0b68c55813243de66bbb499dc3b ]
There is a couple of places where on domain_init() failure domain_exit() is called. While currently domain_init() can fail only if alloc_pgtable_page() has failed.
Make domain_exit() check if domain->pgd present, before calling domain_unmap(), as it theoretically should crash on clearing pte entries in dma_pte_clear_level().
--- drivers/iommu/intel-iommu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/iommu/intel-iommu.c +5 -3
@@ -1900,7 +1900,6 @@ static int domain_init(struct dmar_domain *domain, struct intel_iommu *iommu,static void domain_exit (struct dmar_domain *domain) { -struct page *freelist;/* Remove associated devices and clear attached or cached domains */ rcu_read_lock ();
@@ -1910,9 +1909,12 @@ static void domain_exit(struct dmar_domain *domain)/* destroy iovas */ put_iova_domain (&domain->iovad); - freelist =domain_unmap (domain,0 ,DOMAIN_MAX_PFN (domain->gaw)); +if (domain->pgd) { +struct page *freelist; -dma_free_pagelist (freelist); + freelist =domain_unmap (domain,0 ,DOMAIN_MAX_PFN (domain->gaw)); +dma_free_pagelist (freelist); + }free_domain_mem (domain); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 41/76 drm/msm/dpu: Correct dpu encoder spinlock initialization
In reply to Sasha LevinFrom: Shubhashree Dhar <[email protected]>
[ Upstream commit 2e7b801eadbf327bf61041c943e5c44a5de4b0e5 ]
dpu encoder spinlock should be initialized during dpu encoder init instead of dpu encoder setup which is part of modeset init.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1 -2
@@ -2226,8 +2226,6 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,if (ret) goto fail; -spin_lock_init (&dpu_enc->enc_spinlock); -atomic_set (&dpu_enc->frame_done_timeout_ms,0 );timer_setup (&dpu_enc->frame_done_timer, dpu_encoder_frame_done_timeout,0 );
@@ -2281,6 +2279,7 @@ struct drm_encoder *dpu_encoder_init(struct drm_device *dev,drm_encoder_helper_add (&dpu_enc->base, &dpu_encoder_helper_funcs); +spin_lock_init (&dpu_enc->enc_spinlock); dpu_enc->enabled = false;return &dpu_enc->base;
Signature · 6 lines
2.20.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Sasha Levin
maintainerPATCH 42/76 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
@@ -97,7 +97,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 ); }
@@ -127,7 +127,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
Re: [PATCH AUTOSEL 5.2 42/76] drm/msm: stop abusing dma_map/unmap for cache
Hi Sasha,
It's probably best *not* to backport this patch.. drm/msm abuses the DMA API in a way that it is not intended be used, to work around the lack of cache sync API exported to kernel modules on arm/arm64. I couldn't really guarantee that this patch does the right thing on older versions of DMA API, so best to leave things as they were.
BR,
-R
Quoted 81 lines · Sasha Levin
From: 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.
Cc Stephen Boyd <[email protected]>Tested-by Stephen Boyd <[email protected]>Reviewed-by Jordan Crouse <[email protected]>Signed-off-by Rob Clark <[email protected]>Signed-off-by Sean Paul <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/gpu/drm/msm/msm_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/msm_gem.c +2
-3@@ -97,7 +97,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 ); }@@ -127,7 +127,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 ); --2.20.1
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.2 42/76] drm/msm: stop abusing dma_map/unmap for cache
Quoted 7 lines · Rob Clark
Hi Sasha,
It's probably best *not* to backport this patch.. drm/msm abuses the DMA API in a way that it is not intended be used, to work around the lack of cache sync API exported to kernel modules on arm/arm64. I couldn't really guarantee that this patch does the right thing on older versions of DMA API, so best to leave things as they were.
Now dropped, thank you.
Sasha Levin
maintainerPATCH 43/76 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
@@ -830,7 +830,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 · 1 line
2.20.1
Sasha Levin
maintainerPATCH 44/76 arm64: dts: imx8mm: Correct SAI3 RXC/TXFS pin's mux option #1
In reply to Sasha LevinFrom: Anson Huang <[email protected]>
[ Upstream commit 52d09014bb104a9157c0f5530700291052d2955c ]
According to i.MX8MM reference manual Rev.1, 03/2019:
SAI3_RXC pin's mux option #1 should be GPT1_CLK, NOT GPT1_CAPTURE2; SAI3_TXFS pin's mux option #1 should be GPT1_CAPTURE2, NOT GPT1_CLK.
--- arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h +2 -2
@@ -462,7 +462,7 @@#define MX8MM_IOMUXC_SAI3_RXFS_GPIO4_IO28 0x1CC 0x434 0x000 0x5 0x0#define MX8MM_IOMUXC_SAI3_RXFS_TPSMP_HTRANS0 0x1CC 0x434 0x000 0x7 0x0#define MX8MM_IOMUXC_SAI3_RXC_SAI3_RX_BCLK 0x1D0 0x438 0x000 0x0 0x0 -#define MX8MM_IOMUXC_SAI3_RXC_GPT1_CAPTURE2 0x1D0 0x438 0x000 0x1 0x0 +#define MX8MM_IOMUXC_SAI3_RXC_GPT1_CLK 0x1D0 0x438 0x000 0x1 0x0#define MX8MM_IOMUXC_SAI3_RXC_SAI5_RX_BCLK 0x1D0 0x438 0x4D0 0x2 0x2#define MX8MM_IOMUXC_SAI3_RXC_GPIO4_IO29 0x1D0 0x438 0x000 0x5 0x0#define MX8MM_IOMUXC_SAI3_RXC_TPSMP_HTRANS1 0x1D0 0x438 0x000 0x7 0x0
@@ -472,7 +472,7 @@#define MX8MM_IOMUXC_SAI3_RXD_GPIO4_IO30 0x1D4 0x43C 0x000 0x5 0x0#define MX8MM_IOMUXC_SAI3_RXD_TPSMP_HDATA0 0x1D4 0x43C 0x000 0x7 0x0#define MX8MM_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC 0x1D8 0x440 0x000 0x0 0x0 -#define MX8MM_IOMUXC_SAI3_TXFS_GPT1_CLK 0x1D8 0x440 0x000 0x1 0x0 +#define MX8MM_IOMUXC_SAI3_TXFS_GPT1_CAPTURE2 0x1D8 0x440 0x000 0x1 0x0#define MX8MM_IOMUXC_SAI3_TXFS_SAI5_RX_DATA1 0x1D8 0x440 0x4D8 0x2 0x2#define MX8MM_IOMUXC_SAI3_TXFS_GPIO4_IO31 0x1D8 0x440 0x000 0x5 0x0#define MX8MM_IOMUXC_SAI3_TXFS_TPSMP_HDATA1 0x1D8 0x440 0x000 0x7 0x0
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 45/76 arm64: dts: imx8mq: fix SAI compatible
In reply to Sasha LevinFrom: Lucas Stach <[email protected]>
[ Upstream commit 8d0148473dece51675d11dd59b8db5fe4b5d2e7e ]
The i.MX8M SAI block is not compatible with the i.MX6SX one, as the register layout has changed due to two version registers being added at the beginning of the address map. Remove the bogus compatible.
--- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mq.dtsi +1 -2
@@ -675,8 +675,7 @@ sai2: sai@308b0000 { #sound-dai-cells = <0>; - compatible = "fsl,imx8mq-sai", - "fsl,imx6sx-sai"; + compatible = "fsl,imx8mq-sai"; reg = <0x308b0000 0x10000>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk IMX8MQ_CLK_SAI2_IPG>,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 46/76 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
@@ -131,10 +131,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)
@@ -171,16 +179,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" );
@@ -198,9 +196,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 47/76 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
@@ -1558,13 +1558,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 48/76 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
@@ -173,10 +173,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
@@ -574,10 +574,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 ; }
@@ -693,8 +690,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 49/76 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
@@ -711,9 +711,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);
@@ -801,9 +807,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) {
@@ -840,9 +851,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 50/76 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
@@ -834,6 +834,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 */
@@ -861,6 +865,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 51/76 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
@@ -811,7 +811,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 ; }
@@ -860,7 +863,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 52/76 perf script: Fix off by one in brstackinsn IPC computation
In reply to Sasha LevinFrom: Andi Kleen <[email protected]>
[ Upstream commit dde4e732a5b02fa5599c2c0e6c48a0c11789afc4 ]
When we hit the end of a program block, need to count the last instruction too for the IPC computation. This caused large errors for small blocks.
% perf script -b ls / > /dev/null
Before:
% perf script -F +brstackinsn --xed
...
00007f94c9ac70d8 jz 0x7f94c9ac70e3 # PRED 3 cycles [36] 4.33 IPC
00007f94c9ac70e3 testb $0x20, 0x31d(%rbx)
00007f94c9ac70ea jnz 0x7f94c9ac70b0
00007f94c9ac70ec testb $0x8, 0x205ad(%rip)
00007f94c9ac70f3 jz 0x7f94c9ac6ff0 # PRED 1 cycles [37] 3.00 IPCAfter:
% perf script -F +brstackinsn --xed
...
00007f94c9ac70d8 jz 0x7f94c9ac70e3 # PRED 3 cycles [15] 4.67 IPC
00007f94c9ac70e3 testb $0x20, 0x31d(%rbx)
00007f94c9ac70ea jnz 0x7f94c9ac70b0
00007f94c9ac70ec testb $0x8, 0x205ad(%rip)
00007f94c9ac70f3 jz 0x7f94c9ac6ff0 # PRED 1 cycles [16] 4.00 IPC--- tools/perf/builtin-script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-script.c +1 -1
@@ -1057,7 +1057,7 @@ static int perf_sample__fprintf_brstackinsn(struct perf_sample *sample, printed +=ip__fprintf_sym (ip, thread, x.cpumode, x.cpu, &lastsym, attr, fp);if (ip == end) { - printed +=ip__fprintf_jump (ip, &br->entries[i], &x, buffer + off, len - off, insn, fp, + printed +=ip__fprintf_jump (ip, &br->entries[i], &x, buffer + off, len - off, ++insn, fp, &total_cycles);if (PRINT_FIELD (SRCCODE )) printed +=print_srccode (thread, x.cpumode, ip);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 53/76 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
@@ -3666,7 +3666,7 @@ int perf_event__process_feature(struct perf_session *session,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 54/76 perf stat: Fix segfault for event group in repeat mode
In reply to Sasha LevinFrom: Jiri Olsa <[email protected]>
[ Upstream commit 08ef3af1579d0446db1c1bd08e2c42565addf10f ]
Numfor Mbiziwo-Tiapo reported segfault on stat of event group in repeat mode:
# perf stat -e '{cycles,instructions}' -r 10 lsIt's caused by memory corruption due to not cleaned evsel's id array and index, which needs to be rebuilt in every stat iteration. Currently the ids index grows, while the array (which is also not freed) has the same size.
Fixing this by releasing id array and zeroing ids index in perf_evsel__close function.
We also need to keep the evsel_list alive for stat record (which is disabled in repeat mode).
--- tools/perf/builtin-stat.c | 9 ++++++++- tools/perf/util/evsel.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-)
tools/perf/builtin-stat.c +8 -1
@@ -607,7 +607,13 @@ try_again:* group leaders. */ read_counters (&(struct timespec ) { .tv_nsec = t1-t0 }); -perf_evlist__close (evsel_list); + +/* +* We need to keep evsel_list alive, because it's processed +* later the evsel_list will be closed after. +*/ +if (!STAT_RECORD ) +perf_evlist__close (evsel_list);return WEXITSTATUS (status); }
@@ -1922,6 +1928,7 @@ int cmd_stat(int argc, const char **argv)perf_session__write_header (perf_stat.session, evsel_list, fd, true); } +perf_evlist__close (evsel_list);perf_session__delete (perf_stat.session); }
tools/perf/util/evsel.c +2 -0
@@ -1282,6 +1282,7 @@ static void perf_evsel__free_id(struct perf_evsel *evsel)xyarray__delete (evsel->sample_id); evsel->sample_id =NULL ;zfree (&evsel->id); + evsel->ids =0 ; }static void perf_evsel__free_config_terms (struct perf_evsel *evsel)
@@ -2074,6 +2075,7 @@ void perf_evsel__close(struct perf_evsel *evsel)perf_evsel__close_fd (evsel);perf_evsel__free_fd (evsel); +perf_evsel__free_id (evsel); } int perf_evsel__open_per_cpu(struct perf_evsel *evsel,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 55/76 perf session: Fix loading of compressed data split across adjacent records
In reply to Sasha LevinFrom: Alexey Budankov <[email protected]>
[ Upstream commit 872c8ee8f0f47222f7b10da96eea84d0486540a3 ]
Fix decompression failure found during the loading of compressed trace collected on larger scale systems (>48 cores).
The error happened due to lack of decompression space for a mmaped buffer data chunk split across adjacent PERF_RECORD_COMPRESSED records.
$ perf report -i bt.16384.data --stats failed to decompress (B): 63869 -> 0 : Destination buffer is too small user stack dump failure Can't parse sample, err = -14 0x2637e436 [0x4080]: failed to process type: 9 Error: failed to process sample
$ perf test 71 71: Zstd perf.data compression/decompression : Ok
--- tools/perf/util/session.c | 22 ++++++++++++++-------- tools/perf/util/session.h | 1 + tools/perf/util/zstd.c | 4 ++-- 3 files changed, 17 insertions(+), 10 deletions(-)
tools/perf/util/session.c +14 -8
@@ -36,10 +36,16 @@ static int perf_session__process_compressed_event(struct perf_session *session,void *src;size_t decomp_size, src_size;u64 decomp_last_rem =0 ; -size_t decomp_len = session->header.env.comp_mmap_len; +size_t mmap_len, decomp_len = session->header.env.comp_mmap_len;struct decomp *decomp, *decomp_last = session->decomp_last; - decomp =mmap (NULL ,sizeof (struct decomp ) + decomp_len,PROT_READ |PROT_WRITE , +if (decomp_last) { + decomp_last_rem = decomp_last->size - decomp_last->head; + decomp_len += decomp_last_rem; + } + + mmap_len =sizeof (struct decomp ) + decomp_len; + decomp =mmap (NULL , mmap_len,PROT_READ |PROT_WRITE ,MAP_ANONYMOUS |MAP_PRIVATE ,-1 ,0 );if (decomp ==MAP_FAILED ) {pr_err ("Couldn't allocate memory for decompression\n" );
@@ -47,10 +53,10 @@ static int perf_session__process_compressed_event(struct perf_session *session, } decomp->file_pos = file_offset; + decomp->mmap_len = mmap_len; decomp->head =0 ; -if (decomp_last) { - decomp_last_rem = decomp_last->size - decomp_last->head; +if (decomp_last_rem) {memcpy (decomp->data, &(decomp_last->data[decomp_last->head]), decomp_last_rem); decomp->size = decomp_last_rem; }
@@ -61,7 +67,7 @@ static int perf_session__process_compressed_event(struct perf_session *session, decomp_size =zstd_decompress_stream (&(session->zstd_data), src, src_size, &(decomp->data[decomp_last_rem]), decomp_len - decomp_last_rem);if (!decomp_size) { -munmap (decomp,sizeof (struct decomp ) + decomp_len); +munmap (decomp, mmap_len);pr_err ("Couldn't decompress data\n" );return -1 ; }
@@ -255,15 +261,15 @@ static void perf_session__delete_threads(struct perf_session *session)static void perf_session__release_decomp_events (struct perf_session *session) {struct decomp *next, *decomp; -size_t decomp_len; +size_t mmap_len; next = session->decomp; - decomp_len = session->header.env.comp_mmap_len;do { decomp = next;if (decomp ==NULL )break ; next = decomp->next; -munmap (decomp, decomp_len +sizeof (struct decomp )); + mmap_len = decomp->mmap_len; +munmap (decomp, mmap_len); }while (1 ); }
tools/perf/util/session.h +1 -0
@@ -46,6 +46,7 @@ struct perf_session {struct decomp {struct decomp *next;u64 file_pos; +size_t mmap_len;u64 head;size_t size;char data[];
tools/perf/util/zstd.c +2 -2
@@ -99,8 +99,8 @@ size_t zstd_decompress_stream(struct zstd_data *data, void *src, size_t src_sizewhile (input.pos < input.size) { ret =ZSTD_decompressStream (data->dstream, &output, &input);if (ZSTD_isError (ret)) { -pr_err ("failed to decompress (B): %ld -> %ld : %s\n" , - src_size, output.size,ZSTD_getErrorName (ret)); +pr_err ("failed to decompress (B): %ld -> %ld, dst_size %ld : %s\n" , + src_size, output.size, dst_size,ZSTD_getErrorName (ret));break ; } output.dst = dst + output.pos;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 56/76 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
@@ -698,6 +698,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 57/76 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
@@ -5417,7 +5417,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;
@@ -5430,6 +5430,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; rv =crypto_shash_setkey (connection->cram_hmac_tfm, (u8 *)secret, key_len);
@@ -5571,7 +5578,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 58/76 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
@@ -611,8 +611,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 59/76 nvme: ignore subnqn for ADATA SX6000LNP
In reply to Sasha LevinFrom: Misha Nasledov <[email protected]>
[ Upstream commit 08b903b5fd0c49e5f224a9bf085b6329ec3c55c0 ]
The ADATA SX6000LNP NVMe SSDs have the same subnqn and, due to this, a system with more than one of these SSDs will only have one usable.
[ 0.942706] nvme nvme1: ignoring ctrl due to duplicate subnqn (nqn.2018-05.com.example:nvme:nvm-subsystem-OUI00E04C). [ 0.943017] nvme nvme1: Removing after probe failure status: -22
02:00.0 Non-Volatile memory controller [0108]: Realtek Semiconductor Co., Ltd. Device [10ec:5762] (rev 01) 71:00.0 Non-Volatile memory controller [0108]: Realtek Semiconductor Co., Ltd. Device [10ec:5762] (rev 01)
There are no firmware updates available from the vendor, unfortunately. Applying the NVME_QUIRK_IGNORE_DEV_SUBNQN quirk for these SSDs resolves the issue, and they all work after this patch:
/dev/nvme0n1 2J1120050420 ADATA SX6000LNP [...] /dev/nvme1n1 2J1120050540 ADATA SX6000LNP [...]
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -2959,6 +2959,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_LIGHTNVM, }, { PCI_DEVICE(0x1d1d, 0x2601), /* CNEX Granby */ .driver_data = NVME_QUIRK_LIGHTNVM, }, + { PCI_DEVICE(0x10ec, 0x5762), /* ADATA SX6000LNP */ + .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) }, { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 60/76 nvme: fix memory leak caused by incorrect subsystem free
In reply to Sasha LevinFrom: Logan Gunthorpe <[email protected]>
[ Upstream commit e654dfd38c1ecf58d8d019f3c053189413484a5b ]
When freeing the subsystem after finding another match with __nvme_find_get_subsystem(), use put_device() instead of __nvme_release_subsystem() which calls kfree() directly.
Per the documentation, put_device() should always be used after device_initialization() is called. Otherwise, leaks like the one below which was detected by kmemleak may occur.
Once the call of __nvme_release_subsystem() is removed it no longer makes sense to keep the helper, so fold it back into nvme_release_subsystem().
unreferenced object 0xffff8883d12bfbc0 (size 16):
comm "nvme", pid 2635, jiffies 4294933602 (age 739.952s) hex dump (first 16 bytes):
6e 76 6d 65 2d 73 75 62 73 79 73 32 00 88 ff ff nvme-subsys2....
backtrace:
[<000000007d8fc208>] __kmalloc_track_caller+0x16d/0x2a0
[<0000000081169e5f>] kvasprintf+0xad/0x130
[<0000000025626f25>] kvasprintf_const+0x47/0x120
[<00000000fa66ad36>] kobject_set_name_vargs+0x44/0x120
[<000000004881f8b3>] dev_set_name+0x98/0xc0
[<000000007124dae3>] nvme_init_identify+0x1995/0x38e0
[<000000009315020a>] nvme_loop_configure_admin_queue+0x4fa/0x5e0
[<000000001a63e766>] nvme_loop_create_ctrl+0x489/0xf80
[<00000000a46ecc23>] nvmf_dev_write+0x1a12/0x2220
[<000000002259b3d5>] __vfs_write+0x66/0x120
[<000000002f6df81e>] vfs_write+0x154/0x490
[<000000007e8cfc19>] ksys_write+0x10a/0x240
[<00000000ff5c7b85>] __x64_sys_write+0x73/0xb0
[<00000000fee6d692>] do_syscall_64+0xaa/0x470
[<00000000997e1ede>] entry_SYSCALL_64_after_hwframe+0x49/0xbe--- drivers/nvme/host/core.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/nvme/host/core.c +5 -7
@@ -2264,17 +2264,15 @@ static void nvme_init_subnqn(struct nvme_subsystem *subsys, struct nvme_ctrl *ctmemset (subsys->subnqn + off,0 ,sizeof (subsys->subnqn) - off); } -static void __nvme_release_subsystem (struct nvme_subsystem *subsys) +static void nvme_release_subsystem (struct device *dev) { +struct nvme_subsystem *subsys = + container_of(dev, struct nvme_subsystem, dev); +ida_simple_remove (&nvme_subsystems_ida, subsys->instance);kfree (subsys); } -static void nvme_release_subsystem (struct device *dev) -{ -__nvme_release_subsystem (container_of(dev ,struct nvme_subsystem ,dev )); -} -static void nvme_destroy_subsystem (struct kref *ref) { struct nvme_subsystem *subsys =
@@ -2429,7 +2427,7 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)mutex_lock (&nvme_subsystems_lock); found =__nvme_find_get_subsystem (subsys->subnqn);if (found) { -__nvme_release_subsystem (subsys); +put_device (&subsys->dev); subsys = found;if (!nvme_validate_cntlid (subsys, ctrl, id)) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 61/76 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
@@ -12,11 +12,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
@@ -614,7 +609,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
@@ -472,7 +472,11 @@ extern const struct attribute_group *nvme_ns_id_attr_groups[];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 62/76 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
@@ -24,6 +24,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 63/76 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
@@ -126,6 +126,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 64/76 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
@@ -3045,6 +3045,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;
@@ -3070,6 +3071,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 65/76 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
@@ -4864,8 +4864,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 66/76 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
@@ -40,6 +40,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
@@ -682,7 +683,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;
@@ -807,6 +808,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 );
@@ -818,6 +821,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 67/76 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
@@ -886,8 +886,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 68/76 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
@@ -1828,7 +1828,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
@@ -727,7 +727,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
@@ -2336,13 +2336,23 @@ no_join: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++)
@@ -2355,8 +2365,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 69/76 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
@@ -1026,7 +1026,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 70/76 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
@@ -93,8 +93,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); }
@@ -194,7 +193,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 71/76 perf/x86/intel: Fix SLOTS PEBS event constraint
In reply to Sasha LevinFrom: Kan Liang <[email protected]>
[ Upstream commit 3d0c3953601d250175c7684ec0d9df612061dae5 ]
Sampling SLOTS event and ref-cycles event in a group on Icelake gives EINVAL.
SLOTS event is the event stands for the fixed counter 3, not fixed counter 2. Wrong mask was set to SLOTS event in intel_icl_pebs_event_constraints[].
--- arch/x86/events/intel/ds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/ds.c +1 -1
@@ -851,7 +851,7 @@ struct event_constraint intel_skl_pebs_event_constraints[] = {struct event_constraint intel_icl_pebs_event_constraints[] = {INTEL_FLAGS_UEVENT_CONSTRAINT (0x1c0 ,0x100000000ULL ),/* INST_RETIRED.PREC_DIST */ -INTEL_FLAGS_UEVENT_CONSTRAINT (0x0400 ,0x400000000ULL ),/* SLOTS */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x0400 ,0x800000000ULL ),/* SLOTS */ INTEL_PLD_CONSTRAINT (0x1cd ,0xff ),/* MEM_TRANS_RETIRED.LOAD_LATENCY */ INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD (0x1d0 ,0xf ),/* MEM_INST_RETIRED.LOAD */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 72/76 perf/x86/intel: Fix invalid Bit 13 for Icelake MSR_OFFCORE_RSP_x register
In reply to Sasha LevinFrom: Yunying Sun <[email protected]>
[ Upstream commit 3b238a64c3009fed36eaea1af629d9377759d87d ]
The Intel SDM states that bit 13 of Icelake's MSR_OFFCORE_RSP_x register is valid, and used for counting hardware generated prefetches of L3 cache. Update the bitmask to allow bit 13.
Before:
$ perf stat -e cpu/event=0xb7,umask=0x1,config1=0x1bfff/u sleep 3 Performance counter stats for 'sleep 3': <not supported> cpu/event=0xb7,umask=0x1,config1=0x1bfff/u
After:
$ perf stat -e cpu/event=0xb7,umask=0x1,config1=0x1bfff/u sleep 3
Performance counter stats for 'sleep 3':
9,293 cpu/event=0xb7,umask=0x1,config1=0x1bfff/u--- arch/x86/events/intel/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/events/intel/core.c +2 -2
@@ -263,8 +263,8 @@ static struct event_constraint intel_icl_event_constraints[] = { };static struct extra_reg intel_icl_extra_regs[]__read_mostly = { -INTEL_UEVENT_EXTRA_REG (0x01b7 ,MSR_OFFCORE_RSP_0 ,0x3fffff9fffull ,RSP_0 ), -INTEL_UEVENT_EXTRA_REG (0x01bb ,MSR_OFFCORE_RSP_1 ,0x3fffff9fffull ,RSP_1 ), +INTEL_UEVENT_EXTRA_REG (0x01b7 ,MSR_OFFCORE_RSP_0 ,0x3fffffbfffull ,RSP_0 ), +INTEL_UEVENT_EXTRA_REG (0x01bb ,MSR_OFFCORE_RSP_1 ,0x3fffffbfffull ,RSP_1 ),INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG (0x01cd ),INTEL_UEVENT_EXTRA_REG (0x01c6 ,MSR_PEBS_FRONTEND ,0x7fff17 ,FE ),EVENT_EXTRA_END
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 73/76 perf/x86: Apply more accurate check on hypervisor platform
In reply to Sasha LevinFrom: Zhenzhong Duan <[email protected]>
[ Upstream commit 5ea3f6fb37b79da33ac9211df336fd2b9f47c39f ]
check_msr is used to fix a bug report in guest where KVM doesn't support LBR MSR and cause #GP.
The msr check is bypassed on real HW to workaround a false failure, see commit d0e1a507bdc7 ("perf/x86/intel: Disable check_msr for real HW")
When running a guest with CONFIG_HYPERVISOR_GUEST not set or "nopv" enabled, current check isn't enough and #GP could trigger.
--- arch/x86/events/intel/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/events/intel/core.c +1 -2
@@ -20,7 +20,6 @@#include <asm/intel-family.h> #include <asm/apic.h> #include <asm/cpu_device_id.h> -#include <asm/hypervisor.h> #include "../perf_event.h"
@@ -4057,7 +4056,7 @@ static bool check_msr(unsigned long msr, u64 mask)* Disable the check for real HW, so we don't * mess with potentionaly enabled registers: */ -if (hypervisor_is_type (X86_HYPER_NATIVE )) +if (!boot_cpu_has (X86_FEATURE_HYPERVISOR ))return true;/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 74/76 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
@@ -11266,7 +11266,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 75/76 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
@@ -177,6 +177,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
Sasha Levin
maintainerPATCH 76/76 gen_compile_commands: lower the entry count threshold
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit cb36955a5569f1ff17a42ae93264ef391c013a97 ]
Running gen_compile_commands.py after building the kernel with allnoconfig gave this:
$ ./scripts/gen_compile_commands.py WARNING: Found 449 entries. Have you compiled the kernel?
--- scripts/gen_compile_commands.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/gen_compile_commands.py +2 -2
@@ -21,9 +21,9 @@ _LINE_PATTERN = r'^cmd_[^ ]*\.o := (.* )([^ ]*\.c)$' _VALID_LOG_LEVELS = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] # A kernel build generally has over 2000 entries in its compile_commands.json -# database. If this code finds 500 or fewer, then warn the user that they might +# database. If this code finds 300 or fewer, then warn the user that they might # not have all the .cmd files, and they might need to compile the kernel. -_LOW_COUNT_THRESHOLD = 500 +_LOW_COUNT_THRESHOLD = 300 def parse_arguments():
Signature · 1 line
2.20.1