5.2.20-stable review
Subsystems (8)
Greg Kroah-Hartman
maintainerPATCH 27/137 drm/bridge: tc358767: Increase AUX transfer length limit
In reply to Greg Kroah-HartmanFrom: Andrey Smirnov <[email protected]>
[ Upstream commit e0655feaec62d5139b6b13a7b1bbb1ab8f1c2d83 ]
According to the datasheet tc358767 can transfer up to 16 bytes via its AUX channel, so the artificial limit of 8 appears to be too low. However only up to 15-bytes seem to be actually supported and trying to use 16-byte transfers results in transfers failing sporadically (with bogus status in case of I2C transfers), so limit it to 15.
--- drivers/gpu/drm/bridge/tc358767.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358767.c +1 -1
@@ -293,7 +293,7 @@ static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) {struct tc_data *tc =aux_to_tc (aux); -size_t size =min_t (size_t,8 , msg->size); +size_t size =min_t (size_t,DP_AUX_MAX_PAYLOAD_BYTES -1 , msg->size);u8 request = msg->request & ~DP_AUX_I2C_MOT ;u8 *buf = msg->buffer;u32 tmp =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 110/137 PCI: rockchip: Propagate errors for optional regulators
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
[ Upstream commit 0e3ff0ac5f71bdb6be2a698de0ed0c7e6e738269 ]
regulator_get_optional() can fail for a number of reasons besides probe deferral. It can for example return -ENOMEM if it runs out of memory as it tries to allocate data structures. Propagating only -EPROBE_DEFER is problematic because it results in these legitimately fatal errors being treated as "regulator not specified in DT".
What we really want is to ignore the optional regulators only if they have not been specified in DT. regulator_get_optional() returns -ENODEV in this case, so that's the special case that we need to handle. So we propagate all errors, except -ENODEV, so that real failures will still cause the driver to fail probe.
--- drivers/pci/controller/pcie-rockchip-host.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pci/controller/pcie-rockchip-host.c +8 -8
@@ -608,29 +608,29 @@ static int rockchip_pcie_parse_host_dt(struct rockchip_pcie *rockchip) rockchip->vpcie12v =devm_regulator_get_optional (dev,"vpcie12v" );if (IS_ERR (rockchip->vpcie12v)) { -if (PTR_ERR (rockchip->vpcie12v) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; +if (PTR_ERR (rockchip->vpcie12v) != -ENODEV ) +return PTR_ERR (rockchip->vpcie12v);dev_info (dev,"no vpcie12v regulator found\n" ); } rockchip->vpcie3v3 =devm_regulator_get_optional (dev,"vpcie3v3" );if (IS_ERR (rockchip->vpcie3v3)) { -if (PTR_ERR (rockchip->vpcie3v3) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; +if (PTR_ERR (rockchip->vpcie3v3) != -ENODEV ) +return PTR_ERR (rockchip->vpcie3v3);dev_info (dev,"no vpcie3v3 regulator found\n" ); } rockchip->vpcie1v8 =devm_regulator_get_optional (dev,"vpcie1v8" );if (IS_ERR (rockchip->vpcie1v8)) { -if (PTR_ERR (rockchip->vpcie1v8) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; +if (PTR_ERR (rockchip->vpcie1v8) != -ENODEV ) +return PTR_ERR (rockchip->vpcie1v8);dev_info (dev,"no vpcie1v8 regulator found\n" ); } rockchip->vpcie0v9 =devm_regulator_get_optional (dev,"vpcie0v9" );if (IS_ERR (rockchip->vpcie0v9)) { -if (PTR_ERR (rockchip->vpcie0v9) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; +if (PTR_ERR (rockchip->vpcie0v9) != -ENODEV ) +return PTR_ERR (rockchip->vpcie0v9);dev_info (dev,"no vpcie0v9 regulator found\n" ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/137 nfc: fix memory leak in llcp_sock_bind()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit a0c2dc1fe63e2869b74c1c7f6a81d1745c8a695d ]
sysbot reported a memory leak after a bind() has failed.
While we are at it, abort the operation if kmemdup() has failed.
BUG: memory leak
unreferenced object 0xffff888105d83ec0 (size 32):
comm "syz-executor067", pid 7207, jiffies 4294956228 (age 19.430s)
hex dump (first 32 bytes):
00 69 6c 65 20 72 65 61 64 00 6e 65 74 3a 5b 34 .ile read.net:[4
30 32 36 35 33 33 30 39 37 5d 00 00 00 00 00 00 026533097]......
backtrace:
[<0000000036bac473>] kmemleak_alloc_recursive /./include/linux/kmemleak.h:43 [inline]
[<0000000036bac473>] slab_post_alloc_hook /mm/slab.h:522 [inline]
[<0000000036bac473>] slab_alloc /mm/slab.c:3319 [inline]
[<0000000036bac473>] __do_kmalloc /mm/slab.c:3653 [inline]
[<0000000036bac473>] __kmalloc_track_caller+0x169/0x2d0 /mm/slab.c:3670
[<000000000cd39d07>] kmemdup+0x27/0x60 /mm/util.c:120
[<000000008e57e5fc>] kmemdup /./include/linux/string.h:432 [inline]
[<000000008e57e5fc>] llcp_sock_bind+0x1b3/0x230 /net/nfc/llcp_sock.c:107
[<000000009cb0b5d3>] __sys_bind+0x11c/0x140 /net/socket.c:1647
[<00000000492c3bbc>] __do_sys_bind /net/socket.c:1658 [inline]
[<00000000492c3bbc>] __se_sys_bind /net/socket.c:1656 [inline]
[<00000000492c3bbc>] __x64_sys_bind+0x1e/0x30 /net/socket.c:1656
[<0000000008704b2a>] do_syscall_64+0x76/0x1a0 /arch/x86/entry/common.c:296
[<000000009f4c57a4>] entry_SYSCALL_64_after_hwframe+0x44/0xa9--- net/nfc/llcp_sock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/nfc/llcp_sock.c +6 -1
@@ -107,9 +107,14 @@ static int llcp_sock_bind(struct socket llcp_sock->service_name =kmemdup (llcp_addr.service_name, llcp_sock->service_name_len,GFP_KERNEL ); - +if (!llcp_sock->service_name) { + ret = -ENOMEM ; + goto put_dev; + } llcp_sock->ssap =nfc_llcp_get_sdp_ssap (local, llcp_sock);if (llcp_sock->ssap ==LLCP_SAP_MAX ) { +kfree (llcp_sock->service_name); + llcp_sock->service_name =NULL ; ret = -EADDRINUSE ; goto put_dev; }
Greg Kroah-Hartman
maintainerPATCH 11/137 qmi_wwan: add support for Cinterion CLS8 devices
In reply to Greg Kroah-HartmanFrom: Reinhard Speyerer <[email protected]>
[ Upstream commit cf74ac6db25d4002089e85cc623ad149ecc25614 ]
Add support for Cinterion CLS8 devices.
Use QMI_QUIRK_SET_DTR as required for Qualcomm MDM9x07 chipsets.
T: Bus=01 Lev=03 Prnt=05 Port=01 Cnt=02 Dev#= 25 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1e2d ProdID=00b0 Rev= 3.18 S: Manufacturer=GEMALTO S: Product=USB Modem C:* #Ifs= 5 Cfg#= 1 Atr=80 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan E: Ad=89(I) Atr=03(Int.) MxPS= 8 Ivl=32ms E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/net/usb/qmi_wwan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1349,6 +1349,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x1e2d, 0x0082, 4)}, /* Cinterion PHxx,PXxx (2 RmNet) */ {QMI_FIXED_INTF(0x1e2d, 0x0082, 5)}, /* Cinterion PHxx,PXxx (2 RmNet) */ {QMI_FIXED_INTF(0x1e2d, 0x0083, 4)}, /* Cinterion PHxx,PXxx (1 RmNet + USB Audio)*/ + {QMI_QUIRK_SET_DTR(0x1e2d, 0x00b0, 4)}, /* Cinterion CLS8 */ {QMI_FIXED_INTF(0x413c, 0x81a2, 8)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */ {QMI_FIXED_INTF(0x413c, 0x81a3, 8)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */ {QMI_FIXED_INTF(0x413c, 0x81a4, 8)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */
Greg Kroah-Hartman
maintainerPATCH 12/137 rxrpc: Fix rxrpc_recvmsg tracepoint
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit db9b2e0af605e7c994784527abfd9276cabd718a ]
Fix the rxrpc_recvmsg tracepoint to handle being called with a NULL call parameter.
--- include/trace/events/rxrpc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/trace/events/rxrpc.h +1 -1
@@ -1071,7 +1071,7 @@ TRACE_EVENT(rxrpc_recvmsg, ), TP_fast_assign( - __entry->call = call->debug_id; + __entry->call = call ? call->debug_id : 0; __entry->why = why; __entry->seq = seq; __entry->offset = offset;
Greg Kroah-Hartman
maintainerPATCH 14/137 sch_dsmark: fix potential NULL deref in dsmark_init()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 474f0813a3002cb299bb73a5a93aa1f537a80ca8 ]
Make sure TCA_DSMARK_INDICES was provided by the user.
syzbot reported :
kasan: CONFIG_KASAN_INLINE enabled
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] PREEMPT SMP KASAN CPU: 1 PID: 8799 Comm: syz-executor235 Not tainted 5.3.0+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:nla_get_u16 include/net/netlink.h:1501 [inline] RIP: 0010:dsmark_init net/sched/sch_dsmark.c:364 [inline] RIP: 0010:dsmark_init+0x193/0x640 net/sched/sch_dsmark.c:339 Code: 85 db 58 0f 88 7d 03 00 00 e8 e9 1a ac fb 48 8b 9d 70 ff ff ff 48 b8 00 00 00 00 00 fc ff df 48 8d 7b 04 48 89 fa 48 c1 ea 03 <0f> b6 14 02 48 89 f8 83 e0 07 83 c0 01 38 d0 7c 08 84 d2 0f 85 ca RSP: 0018:ffff88809426f3b8 EFLAGS: 00010247 RAX: dffffc0000000000 RBX: 0000000000000000 RCX: ffffffff85c6eb09 RDX: 0000000000000000 RSI: ffffffff85c6eb17 RDI: 0000000000000004 RBP: ffff88809426f4b0 R08: ffff88808c4085c0 R09: ffffed1015d26159 R10: ffffed1015d26158 R11: ffff8880ae930ac7 R12: ffff8880a7e96940 R13: dffffc0000000000 R14: ffff88809426f8c0 R15: 0000000000000000 FS: 0000000001292880(0000) GS:ffff8880ae900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000080 CR3: 000000008ca1b000 CR4: 00000000001406e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: qdisc_create+0x4ee/0x1210 net/sched/sch_api.c:1237 tc_modify_qdisc+0x524/0x1c50 net/sched/sch_api.c:1653 rtnetlink_rcv_msg+0x463/0xb00 net/core/rtnetlink.c:5223 netlink_rcv_skb+0x177/0x450 net/netlink/af_netlink.c:2477 rtnetlink_rcv+0x1d/0x30 net/core/rtnetlink.c:5241 netlink_unicast_kernel net/netlink/af_netlink.c:1302 [inline] netlink_unicast+0x531/0x710 net/netlink/af_netlink.c:1328 netlink_sendmsg+0x8a5/0xd60 net/netlink/af_netlink.c:1917 sock_sendmsg_nosec net/socket.c:637 [inline] sock_sendmsg+0xd7/0x130 net/socket.c:657 ___sys_sendmsg+0x803/0x920 net/socket.c:2311 __sys_sendmsg+0x105/0x1d0 net/socket.c:2356 __do_sys_sendmsg net/socket.c:2365 [inline] __se_sys_sendmsg net/socket.c:2363 [inline] __x64_sys_sendmsg+0x78/0xb0 net/socket.c:2363 do_syscall_64+0xfa/0x760 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x440369
--- net/sched/sch_dsmark.c | 2 ++ 1 file changed, 2 insertions(+)
net/sched/sch_dsmark.c +2 -0
@@ -361,6 +361,8 @@ static int dsmark_init(struct Qdisc *sch goto errout; err = -EINVAL ; +if (!tb[TCA_DSMARK_INDICES ]) + goto errout; indices =nla_get_u16 (tb[TCA_DSMARK_INDICES ]);if (hweight32 (indices) !=1 )
Greg Kroah-Hartman
maintainerPATCH 15/137 tipc: fix unlimited bundling of small messages
In reply to Greg Kroah-HartmanFrom: Tuong Lien <[email protected]>
[ Upstream commit e95584a889e1902fdf1ded9712e2c3c3083baf96 ]
We have identified a problem with the "oversubscription" policy in the link transmission code.
When small messages are transmitted, and the sending link has reached the transmit window limit, those messages will be bundled and put into the link backlog queue. However, bundles of data messages are counted at the 'CRITICAL' level, so that the counter for that level, instead of the counter for the real, bundled message's level is the one being increased.
Subsequent, to-be-bundled data messages at non-CRITICAL levels continue to be tested against the unchanged counter for their own level, while contributing to an unrestrained increase at the CRITICAL backlog level.
This leaves a gap in congestion control algorithm for small messages that can result in starvation for other users or a "real" CRITICAL user. Even that eventually can lead to buffer exhaustion & link reset.
We fix this by keeping a 'target_bskb' buffer pointer at each levels, then when bundling, we only bundle messages at the same importance level only. This way, we know exactly how many slots a certain level have occupied in the queue, so can manage level congestion accurately.
By bundling messages at the same level, we even have more benefits. Let consider this:
- One socket sends 64-byte messages at the 'CRITICAL' level;
- Another sends 4096-byte messages at the 'LOW' level;
When a 64-byte message comes and is bundled the first time, we put the overhead of message bundle to it (+ 40-byte header, data copy, etc.) for later use, but the next message can be a 4096-byte one that cannot be bundled to the previous one. This means the last bundle carries only one payload message which is totally inefficient, as for the receiver also! Later on, another 64-byte message comes, now we make a new bundle and the same story repeats...
With the new bundling algorithm, this will not happen, the 64-byte messages will be bundled together even when the 4096-byte message(s) comes in between. However, if the 4096-byte messages are sent at the same level i.e. 'CRITICAL', the bundling algorithm will again cause the same overhead.
Also, the same will happen even with only one socket sending small messages at a rate close to the link transmit's one, so that, when one message is bundled, it's transmitted shortly. Then, another message comes, a new bundle is created and so on...
We will solve this issue radically by another patch.
--- net/tipc/link.c | 29 ++++++++++++++++++----------- net/tipc/msg.c | 5 +---- 2 files changed, 19 insertions(+), 15 deletions(-)
net/tipc/link.c +18 -11
@@ -163,6 +163,7 @@ struct tipc_link {struct {u16 len;u16 limit; +struct sk_buff *target_bskb; } backlog[5 ];u16 snd_nxt;u16 prev_from;
@@ -872,6 +873,7 @@ static void link_prepare_wakeup(struct tvoid tipc_link_reset (struct tipc_link *l) {struct sk_buff_head list; +u32 imp;__skb_queue_head_init (&list);
@@ -893,11 +895,10 @@ void tipc_link_reset(struct tipc_link *l__skb_queue_purge (&l->deferdq);__skb_queue_purge (&l->backlogq);__skb_queue_purge (&l->failover_deferdq); - l->backlog[TIPC_LOW_IMPORTANCE ].len =0 ; - l->backlog[TIPC_MEDIUM_IMPORTANCE ].len =0 ; - l->backlog[TIPC_HIGH_IMPORTANCE ].len =0 ; - l->backlog[TIPC_CRITICAL_IMPORTANCE ].len =0 ; - l->backlog[TIPC_SYSTEM_IMPORTANCE ].len =0 ; +for (imp =0 ; imp <=TIPC_SYSTEM_IMPORTANCE ; imp++) { + l->backlog[imp].len =0 ; + l->backlog[imp].target_bskb =NULL ; + }kfree_skb (l->reasm_buf);kfree_skb (l->failover_reasm_skb); l->reasm_buf =NULL ;
@@ -938,7 +939,7 @@ int tipc_link_xmit(struct tipc_link *l,u16 bc_ack = l->bc_rcvlink->rcv_nxt -1 ;struct sk_buff_head *transmq = &l->transmq;struct sk_buff_head *backlogq = &l->backlogq; -struct sk_buff *skb, *_skb, *bskb; +struct sk_buff *skb, *_skb, **tskb;int pkt_cnt =skb_queue_len (list);int rc =0 ;
@@ -988,19 +989,21 @@ int tipc_link_xmit(struct tipc_link *l, seqno++;continue ; } -if (tipc_msg_bundle (skb_peek_tail (backlogq), hdr, mtu)) { + tskb = &l->backlog[imp].target_bskb; +if (tipc_msg_bundle (*tskb, hdr, mtu)) {kfree_skb (__skb_dequeue (list)); l->stats.sent_bundled++;continue ; } -if (tipc_msg_make_bundle (&bskb, hdr, mtu, l->addr)) { +if (tipc_msg_make_bundle (tskb, hdr, mtu, l->addr)) {kfree_skb (__skb_dequeue (list)); -__skb_queue_tail (backlogq, bskb); - l->backlog[msg_importance (buf_msg (bskb))].len++; +__skb_queue_tail (backlogq, *tskb); + l->backlog[imp].len++; l->stats.sent_bundled++; l->stats.sent_bundles++;continue ; } + l->backlog[imp].target_bskb =NULL ; l->backlog[imp].len +=skb_queue_len (list);skb_queue_splice_tail_init (list, backlogq); }
@@ -1016,6 +1019,7 @@ static void tipc_link_advance_backlog(stu16 seqno = l->snd_nxt;u16 ack = l->rcv_nxt -1 ;u16 bc_ack = l->bc_rcvlink->rcv_nxt -1 ; +u32 imp;while (skb_queue_len (&l->transmq) < l->window) { skb =skb_peek (&l->backlogq);
@@ -1026,7 +1030,10 @@ static void tipc_link_advance_backlog(stbreak ;__skb_dequeue (&l->backlogq); hdr =buf_msg (skb); - l->backlog[msg_importance (hdr)].len--; + imp =msg_importance (hdr); + l->backlog[imp].len--; +if (unlikely (skb == l->backlog[imp].target_bskb)) + l->backlog[imp].target_bskb =NULL ;__skb_queue_tail (&l->transmq, skb);/* next retransmit attempt */ if (link_is_bc_sndlink (l))
net/tipc/msg.c +1 -4
@@ -484,10 +484,7 @@ bool tipc_msg_make_bundle(struct sk_buff bmsg =buf_msg (_skb);tipc_msg_init (msg_prevnode (msg), bmsg,MSG_BUNDLER ,0 ,INT_H_SIZE , dnode); -if (msg_isdata (msg)) -msg_set_importance (bmsg,TIPC_CRITICAL_IMPORTANCE ); -else -msg_set_importance (bmsg,TIPC_SYSTEM_IMPORTANCE ); +msg_set_importance (bmsg,msg_importance (msg));msg_set_seqno (bmsg,msg_seqno (msg));msg_set_ack (bmsg,msg_ack (msg));msg_set_bcast_ack (bmsg,msg_bcast_ack (msg));
Greg Kroah-Hartman
maintainerPATCH 16/137 udp: fix gso_segs calculations
In reply to Greg Kroah-HartmanFrom: Josh Hunt <[email protected]>
[ Upstream commit 44b321e5020d782ad6e8ae8183f09b163be6e6e2 ]
Commit dfec0ee22c0a ("udp: Record gso_segs when supporting UDP segmentation offload") added gso_segs calculation, but incorrectly got sizeof() the pointer and not the underlying data type. In addition let's fix the v6 case.
--- net/ipv4/udp.c | 2 +- net/ipv6/udp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
net/ipv4/udp.c +1 -1
@@ -868,7 +868,7 @@ static int udp_send_skb(struct sk_buff *skb_shinfo (skb)->gso_size = cork->gso_size;skb_shinfo (skb)->gso_type =SKB_GSO_UDP_L4 ; -skb_shinfo (skb)->gso_segs =DIV_ROUND_UP (len -sizeof (uh), +skb_shinfo (skb)->gso_segs =DIV_ROUND_UP (len -sizeof (*uh), cork->gso_size); goto csum_partial; }
net/ipv6/udp.c +2 -0
@@ -1156,6 +1156,8 @@ static int udp_v6_send_skb(struct sk_bufskb_shinfo (skb)->gso_size = cork->gso_size;skb_shinfo (skb)->gso_type =SKB_GSO_UDP_L4 ; +skb_shinfo (skb)->gso_segs =DIV_ROUND_UP (len -sizeof (*uh), + cork->gso_size); goto csum_partial; }
Greg Kroah-Hartman
maintainerPATCH 19/137 tcp: adjust rto_base in retransmits_timed_out()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 3256a2d6ab1f71f9a1bd2d7f6f18eb8108c48d17 ]
The cited commit exposed an old retransmits_timed_out() bug which assumed it could call tcp_model_timeout() with TCP_RTO_MIN as rto_base for all states.
But flows in SYN_SENT or SYN_RECV state uses a different RTO base (1 sec instead of 200 ms, unless BPF choses another value)
This caused a reduction of SYN retransmits from 6 to 4 with the default /proc/sys/net/ipv4/tcp_syn_retries value.
--- net/ipv4/tcp_timer.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/ipv4/tcp_timer.c +7 -2
@@ -198,8 +198,13 @@ static bool retransmits_timed_out(structreturn false; start_ts =tcp_sk (sk)->retrans_stamp; -if (likely (timeout ==0 )) - timeout =tcp_model_timeout (sk, boundary,TCP_RTO_MIN ); +if (likely (timeout ==0 )) { +unsigned int rto_base =TCP_RTO_MIN ; + +if ((1 << sk->sk_state) & (TCPF_SYN_SENT |TCPF_SYN_RECV )) + rto_base =tcp_timeout_init (sk); + timeout =tcp_model_timeout (sk, boundary, rto_base); + }return (s32)(tcp_time_stamp (tcp_sk (sk)) - start_ts - timeout) >=0 ; }
Greg Kroah-Hartman
maintainerPATCH 18/137 net: dsa: rtl8366: Check VLAN ID and not ports
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit e8521e53cca584ddf8ec4584d3c550a6c65f88c4 ]
There has been some confusion between the port number and the VLAN ID in this driver. What we need to check for validity is the VLAN ID, nothing else.
The current confusion came from assigning a few default VLANs for default routing and we need to rewrite that properly.
Instead of checking if the port number is a valid VLAN ID, check the actual VLAN IDs passed in to the callback one by one as expected.
--- drivers/net/dsa/rtl8366.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/dsa/rtl8366.c +7 -4
@@ -339,10 +339,12 @@ int rtl8366_vlan_prepare(struct dsa_swit const struct switchdev_obj_port_vlan *vlan) {struct realtek_smi *smi = ds->priv; +u16 vid;int ret; -if (!smi->ops->is_vlan_valid (smi, port)) -return -EINVAL ; +for (vid = vlan->vid_begin; vid < vlan->vid_end; vid++) +if (!smi->ops->is_vlan_valid (smi, vid)) +return -EINVAL ;dev_info (smi->dev,"prepare VLANs %04x..%04x\n" , vlan->vid_begin, vlan->vid_end);
@@ -370,8 +372,9 @@ void rtl8366_vlan_add(struct dsa_switchu16 vid;int ret; -if (!smi->ops->is_vlan_valid (smi, port)) -return ; +for (vid = vlan->vid_begin; vid < vlan->vid_end; vid++) +if (!smi->ops->is_vlan_valid (smi, vid)) +return ; dev_info(smi->dev, "add VLAN on port %d, %s, %s\n", port,
Greg Kroah-Hartman
maintainerPATCH 2/137 erspan: remove the incorrect mtu limit for erspan
In reply to Greg Kroah-HartmanFrom: Haishuang Yan <[email protected]>
[ Upstream commit 0e141f757b2c78c983df893e9993313e2dc21e38 ]
erspan driver calls ether_setup(), after commit 61e84623ace3 ("net: centralize net_device min/max MTU checking"), the range of mtu is [min_mtu, max_mtu], which is [68, 1500] by default.
It causes the dev mtu of the erspan device to not be greater than 1500, this limit value is not correct for ipgre tap device.
Tested:
Before patch:
# ip link set erspan0 mtu 1600
Error: mtu greater than device maximum.
After patch:
# ip link set erspan0 mtu 1600
# ip -d link show erspan0
21: erspan0@NONE: <BROADCAST,MULTICAST> mtu 1600 qdisc noop state DOWN
mode DEFAULT group default qlen 1000
link/ether 00:00:00:00:00:00 brd ff:ff:ff:ff:ff:ff promiscuity 0 minmtu 68 maxmtu 0--- net/ipv4/ip_gre.c | 1 + 1 file changed, 1 insertion(+)
net/ipv4/ip_gre.c +1 -0
@@ -1446,6 +1446,7 @@ static void erspan_setup(struct net_devistruct ip_tunnel *t =netdev_priv (dev);ether_setup (dev); + dev->max_mtu =0 ; dev->netdev_ops = &erspan_netdev_ops; dev->priv_flags &= ~IFF_TX_SKB_SHARING ; dev->priv_flags |=IFF_LIVE_ADDR_CHANGE ;
Greg Kroah-Hartman
maintainerPATCH 20/137 udp: only do GSO if # of segs > 1
In reply to Greg Kroah-HartmanFrom: Josh Hunt <[email protected]>
[ Upstream commit 4094871db1d65810acab3d57f6089aa39ef7f648 ]
Prior to this change an application sending <= 1MSS worth of data and enabling UDP GSO would fail if the system had SW GSO enabled, but the same send would succeed if HW GSO offload is enabled. In addition to this inconsistency the error in the SW GSO case does not get back to the application if sending out of a real device so the user is unaware of this failure.
With this change we only perform GSO if the # of segments is > 1 even if the application has enabled segmentation. I've also updated the relevant udpgso selftests.
--- net/ipv4/udp.c | 11 +++++++---- net/ipv6/udp.c | 11 +++++++---- tools/testing/selftests/net/udpgso.c | 16 ++++------------ 3 files changed, 18 insertions(+), 20 deletions(-)
net/ipv4/udp.c +7 -4
@@ -833,6 +833,7 @@ static int udp_send_skb(struct sk_buff *int is_udplite =IS_UDPLITE (sk);int offset =skb_transport_offset (skb);int len = skb->len - offset; +int datalen = len -sizeof (*uh);__wsum csum =0 ;/*
@@ -866,10 +867,12 @@ static int udp_send_skb(struct sk_buff *return -EIO ; } -skb_shinfo (skb)->gso_size = cork->gso_size; -skb_shinfo (skb)->gso_type =SKB_GSO_UDP_L4 ; -skb_shinfo (skb)->gso_segs =DIV_ROUND_UP (len -sizeof (*uh), - cork->gso_size); +if (datalen > cork->gso_size) { +skb_shinfo (skb)->gso_size = cork->gso_size; +skb_shinfo (skb)->gso_type =SKB_GSO_UDP_L4 ; +skb_shinfo (skb)->gso_segs =DIV_ROUND_UP (datalen, + cork->gso_size); + } goto csum_partial; }
net/ipv6/udp.c +7 -4
@@ -1122,6 +1122,7 @@ static int udp_v6_send_skb(struct sk_buf__wsum csum =0 ;int offset =skb_transport_offset (skb);int len = skb->len - offset; +int datalen = len -sizeof (*uh);/* * Create a UDP header
@@ -1154,10 +1155,12 @@ static int udp_v6_send_skb(struct sk_bufreturn -EIO ; } -skb_shinfo (skb)->gso_size = cork->gso_size; -skb_shinfo (skb)->gso_type =SKB_GSO_UDP_L4 ; -skb_shinfo (skb)->gso_segs =DIV_ROUND_UP (len -sizeof (*uh), - cork->gso_size); +if (datalen > cork->gso_size) { +skb_shinfo (skb)->gso_size = cork->gso_size; +skb_shinfo (skb)->gso_type =SKB_GSO_UDP_L4 ; +skb_shinfo (skb)->gso_segs =DIV_ROUND_UP (datalen, + cork->gso_size); + } goto csum_partial; }
tools/testing/selftests/net/udpgso.c +4 -12
@@ -89,12 +89,9 @@ struct testcase testcases_v4[] = { .tfail = true, }, { -/* send a single MSS: will fail with GSO, because the segment -* logic in udp4_ufo_fragment demands a gso skb to be > MTU -*/ +/* send a single MSS: will fall back to no GSO */ .tlen = CONST_MSS_V4, .gso_len = CONST_MSS_V4, - .tfail = true, .r_num_mss = 1, }, {
@@ -139,10 +136,9 @@ struct testcase testcases_v4[] = { .tfail = true, }, { -/* send a single 1B MSS: will fail, see single MSS above */ +/* send a single 1B MSS: will fall back to no GSO */ .tlen = 1, .gso_len = 1, - .tfail = true, .r_num_mss = 1, }, {
@@ -196,12 +192,9 @@ struct testcase testcases_v6[] = { .tfail = true, }, { -/* send a single MSS: will fail with GSO, because the segment -* logic in udp4_ufo_fragment demands a gso skb to be > MTU -*/ +/* send a single MSS: will fall back to no GSO */ .tlen = CONST_MSS_V6, .gso_len = CONST_MSS_V6, - .tfail = true, .r_num_mss = 1, }, {
@@ -246,10 +239,9 @@ struct testcase testcases_v6[] = { .tfail = true, }, { -/* send a single 1B MSS: will fail, see single MSS above */ +/* send a single 1B MSS: will fall back to no GSO */ .tlen = 1, .gso_len = 1, - .tfail = true, .r_num_mss = 1, }, {
Greg Kroah-Hartman
maintainerPATCH 21/137 net/rds: Fix error handling in rds_ib_add_one()
In reply to Greg Kroah-HartmanFrom: Dotan Barak <[email protected]>
[ Upstream commit d64bf89a75b65f83f06be9fb8f978e60d53752db ]
rds_ibdev:ipaddr_list and rds_ibdev:conn_list are initialized after allocation some resources such as protection domain. If allocation of such resources fail, then these uninitialized variables are accessed in rds_ib_dev_free() in failure path. This can potentially crash the system. The code has been updated to initialize these variables very early in the function.
--- net/rds/ib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/rds/ib.c +3 -3
@@ -143,6 +143,9 @@ static void rds_ib_add_one(struct ib_devrefcount_set (&rds_ibdev->refcount,1 );INIT_WORK (&rds_ibdev->free_work, rds_ib_dev_free); +INIT_LIST_HEAD (&rds_ibdev->ipaddr_list); +INIT_LIST_HEAD (&rds_ibdev->conn_list); + rds_ibdev->max_wrs = device->attrs.max_qp_wr; rds_ibdev->max_sge =min (device->attrs.max_send_sge,RDS_IB_MAX_SGE );
@@ -203,9 +206,6 @@ static void rds_ib_add_one(struct ib_dev device->name, rds_ibdev->use_fastreg ? "FRMR" : "FMR"); -INIT_LIST_HEAD (&rds_ibdev->ipaddr_list); -INIT_LIST_HEAD (&rds_ibdev->conn_list); -down_write (&rds_ib_devices_lock);list_add_tail_rcu (&rds_ibdev->list, &rds_ib_devices);up_write (&rds_ib_devices_lock);
Greg Kroah-Hartman
maintainerPATCH 22/137 xen-netfront: do not use ~0U as error return value for xennet_fill_frags()
In reply to Greg Kroah-HartmanFrom: Dongli Zhang <[email protected]>
[ Upstream commit a761129e3625688310aecf26e1be9e98e85f8eb5 ]
xennet_fill_frags() uses ~0U as return value when the sk_buff is not able to cache extra fragments. This is incorrect because the return type of xennet_fill_frags() is RING_IDX and 0xffffffff is an expected value for ring buffer index.
In the situation when the rsp_cons is approaching 0xffffffff, the return value of xennet_fill_frags() may become 0xffffffff which xennet_poll() (the caller) would regard as error. As a result, queue->rx.rsp_cons is set incorrectly because it is updated only when there is error. If there is no error, xennet_poll() would be responsible to update queue->rx.rsp_cons. Finally, queue->rx.rsp_cons would point to the rx ring buffer entries whose queue->rx_skbs[i] and queue->grant_rx_ref[i] are already cleared to NULL. This leads to NULL pointer access in the next iteration to process rx ring buffer entries.
The symptom is similar to the one fixed in
commit 00b368502d18 ("xen-netfront: do not assume sk_buff_head list is empty in error handling").
This patch changes the return type of xennet_fill_frags() to indicate whether it is successful or failed. The queue->rx.rsp_cons will be always updated inside this function.
--- drivers/net/xen-netfront.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/net/xen-netfront.c +9 -8
@@ -887,9 +887,9 @@ static int xennet_set_skb_gso(struct sk_return 0 ; } -static RING_IDX xennet_fill_frags (struct netfront_queue *queue, -struct sk_buff *skb, -struct sk_buff_head *list) +static int xennet_fill_frags (struct netfront_queue *queue, +struct sk_buff *skb, +struct sk_buff_head *list) {RING_IDX cons = queue->rx.rsp_cons;struct sk_buff *nskb;
@@ -908,7 +908,7 @@ static RING_IDX xennet_fill_frags(structif (unlikely (skb_shinfo (skb)->nr_frags >=MAX_SKB_FRAGS )) { queue->rx.rsp_cons = ++cons +skb_queue_len (list);kfree_skb (nskb); -return ~0U ; +return -ENOENT ; } skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
@@ -919,7 +919,9 @@ static RING_IDX xennet_fill_frags(structkfree_skb (nskb); } -return cons; + queue->rx.rsp_cons = cons; + +return 0 ; }static int checksum_setup (struct net_device *dev,struct sk_buff *skb)
@@ -1045,8 +1047,7 @@ err: skb->data_len = rx->status; skb->len += rx->status; - i =xennet_fill_frags (queue, skb, &tmpq); -if (unlikely (i == ~0U )) +if (unlikely (xennet_fill_frags (queue, skb, &tmpq))) goto err;if (rx->flags & XEN_NETRXF_csum_blank)
@@ -1056,7 +1057,7 @@ err:__skb_queue_tail (&rxq, skb); - queue->rx.rsp_cons = ++i; + i = ++queue->rx.rsp_cons; work_done++; }
Greg Kroah-Hartman
maintainerPATCH 23/137 ptp_qoriq: Initialize the registers spinlock before calling ptp_qoriq_settime
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit db34a4714c013b644eec2de0ec81b1f0373b8b93 ]
Because ptp_qoriq_settime is being called prior to spin_lock_init, the following stack trace can be seen at driver probe time:
[ 2.269117] the code is fine but needs lockdep annotation. [ 2.274569] turning off the locking correctness validator. [ 2.280027] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.3.0-rc7-01478-g01eaa67a4797 #263 [ 2.288073] Hardware name: Freescale LS1021A [ 2.292337] [<c0313cb4>] (unwind_backtrace) from [<c030e11c>] (show_stack+0x10/0x14) [ 2.300045] [<c030e11c>] (show_stack) from [<c1219440>] (dump_stack+0xcc/0xf8) [ 2.307235] [<c1219440>] (dump_stack) from [<c03b9b44>] (register_lock_class+0x730/0x73c) [ 2.315372] [<c03b9b44>] (register_lock_class) from [<c03b6190>] (__lock_acquire+0x78/0x270c) [ 2.323856] [<c03b6190>] (__lock_acquire) from [<c03b90cc>] (lock_acquire+0xe0/0x22c) [ 2.331649] [<c03b90cc>] (lock_acquire) from [<c123c310>] (_raw_spin_lock_irqsave+0x54/0x68) [ 2.340048] [<c123c310>] (_raw_spin_lock_irqsave) from [<c0e73fe4>] (ptp_qoriq_settime+0x38/0x80) [ 2.348878] [<c0e73fe4>] (ptp_qoriq_settime) from [<c0e746d4>] (ptp_qoriq_init+0x1f8/0x484) [ 2.357189] [<c0e746d4>] (ptp_qoriq_init) from [<c0e74aac>] (ptp_qoriq_probe+0xd0/0x184) [ 2.365243] [<c0e74aac>] (ptp_qoriq_probe) from [<c0b0a07c>] (platform_drv_probe+0x48/0x9c) [ 2.373555] [<c0b0a07c>] (platform_drv_probe) from [<c0b07a14>] (really_probe+0x1c4/0x400) [ 2.381779] [<c0b07a14>] (really_probe) from [<c0b07e28>] (driver_probe_device+0x78/0x1b8) [ 2.390003] [<c0b07e28>] (driver_probe_device) from [<c0b081d0>] (device_driver_attach+0x58/0x60) [ 2.398832] [<c0b081d0>] (device_driver_attach) from [<c0b082d4>] (__driver_attach+0xfc/0x160) [ 2.407402] [<c0b082d4>] (__driver_attach) from [<c0b05a84>] (bus_for_each_dev+0x68/0xb4) [ 2.415539] [<c0b05a84>] (bus_for_each_dev) from [<c0b06b68>] (bus_add_driver+0x104/0x20c) [ 2.423763] [<c0b06b68>] (bus_add_driver) from [<c0b0909c>] (driver_register+0x78/0x10c) [ 2.431815] [<c0b0909c>] (driver_register) from [<c030313c>] (do_one_initcall+0x8c/0x3ac) [ 2.439954] [<c030313c>] (do_one_initcall) from [<c1f013f4>] (kernel_init_freeable+0x468/0x548) [ 2.448610] [<c1f013f4>] (kernel_init_freeable) from [<c12344d8>] (kernel_init+0x8/0x10c) [ 2.456745] [<c12344d8>] (kernel_init) from [<c03010b4>] (ret_from_fork+0x14/0x20) [ 2.464273] Exception stack(0xea89ffb0 to 0xea89fff8) [ 2.469297] ffa0: 00000000 00000000 00000000 00000000 [ 2.477432] ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 2.485566] ffe0: 00000000 00000000 00000000 00000000 00000013 00000000
--- drivers/ptp/ptp_qoriq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ptp/ptp_qoriq.c +2 -1
@@ -507,6 +507,8 @@ int ptp_qoriq_init(struct ptp_qoriq *ptp ptp_qoriq->regs.etts_regs = base +ETTS_REGS_OFFSET ; } +spin_lock_init (&ptp_qoriq->lock); +ktime_get_real_ts64 (&now);ptp_qoriq_settime (&ptp_qoriq->caps, &now);
@@ -514,7 +516,6 @@ int ptp_qoriq_init(struct ptp_qoriq *ptp (ptp_qoriq->tclk_period &TCLK_PERIOD_MASK ) <<TCLK_PERIOD_SHIFT | (ptp_qoriq->cksel &CKSEL_MASK ) <<CKSEL_SHIFT ; -spin_lock_init (&ptp_qoriq->lock);spin_lock_irqsave (&ptp_qoriq->lock, flags); regs = &ptp_qoriq->regs;
Greg Kroah-Hartman
maintainerPATCH 24/137 net: sched: cbs: Avoid division by zero when calculating the port rate
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 83c8c3cf45163f0c823db37be6ab04dfcf8ac751 ]
As explained in the "net: sched: taprio: Avoid division by zero on invalid link speed" commit, it is legal for the ethtool API to return zero as a link speed. So guard against it to ensure we don't perform a division by zero in kernel.
--- net/sched/sch_cbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_cbs.c +1 -1
@@ -306,7 +306,7 @@ static void cbs_set_port_rate(struct netif (err <0 ) goto skip; -if (ecmd.base.speed !=SPEED_UNKNOWN ) +if (ecmd.base.speed && ecmd.base.speed !=SPEED_UNKNOWN ) speed = ecmd.base.speed; skip:
Greg Kroah-Hartman
maintainerPATCH 25/137 net: sched: taprio: Avoid division by zero on invalid link speed
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 9a9251a3534745d08a92abfeca0ca467b912b5f6 ]
The check in taprio_set_picos_per_byte is currently not robust enough and will trigger this division by zero, due to e.g. PHYLINK not setting kset->base.speed when there is no PHY connected:
[ 27.109992] Division by zero in kernel. [ 27.113842] CPU: 1 PID: 198 Comm: tc Not tainted 5.3.0-rc5-01246-gc4006b8c2637-dirty #212 [ 27.121974] Hardware name: Freescale LS1021A [ 27.126234] [<c03132e0>] (unwind_backtrace) from [<c030d8b8>] (show_stack+0x10/0x14) [ 27.133938] [<c030d8b8>] (show_stack) from [<c10b21b0>] (dump_stack+0xb0/0xc4) [ 27.141124] [<c10b21b0>] (dump_stack) from [<c10af97c>] (Ldiv0_64+0x8/0x18) [ 27.148052] [<c10af97c>] (Ldiv0_64) from [<c0700260>] (div64_u64+0xcc/0xf0) [ 27.154978] [<c0700260>] (div64_u64) from [<c07002d0>] (div64_s64+0x4c/0x68) [ 27.161993] [<c07002d0>] (div64_s64) from [<c0f3d890>] (taprio_set_picos_per_byte+0xe8/0xf4) [ 27.170388] [<c0f3d890>] (taprio_set_picos_per_byte) from [<c0f3f614>] (taprio_change+0x668/0xcec) [ 27.179302] [<c0f3f614>] (taprio_change) from [<c0f2bc24>] (qdisc_create+0x1fc/0x4f4) [ 27.187091] [<c0f2bc24>] (qdisc_create) from [<c0f2c0c8>] (tc_modify_qdisc+0x1ac/0x6f8) [ 27.195055] [<c0f2c0c8>] (tc_modify_qdisc) from [<c0ee9604>] (rtnetlink_rcv_msg+0x268/0x2dc) [ 27.203449] [<c0ee9604>] (rtnetlink_rcv_msg) from [<c0f4fef0>] (netlink_rcv_skb+0xe0/0x114) [ 27.211756] [<c0f4fef0>] (netlink_rcv_skb) from [<c0f4f6cc>] (netlink_unicast+0x1b4/0x22c) [ 27.219977] [<c0f4f6cc>] (netlink_unicast) from [<c0f4fa84>] (netlink_sendmsg+0x284/0x340) [ 27.228198] [<c0f4fa84>] (netlink_sendmsg) from [<c0eae5fc>] (sock_sendmsg+0x14/0x24) [ 27.235988] [<c0eae5fc>] (sock_sendmsg) from [<c0eaedf8>] (___sys_sendmsg+0x214/0x228) [ 27.243863] [<c0eaedf8>] (___sys_sendmsg) from [<c0eb015c>] (__sys_sendmsg+0x50/0x8c) [ 27.251652] [<c0eb015c>] (__sys_sendmsg) from [<c0301000>] (ret_fast_syscall+0x0/0x54) [ 27.259524] Exception stack(0xe8045fa8 to 0xe8045ff0) [ 27.264546] 5fa0: b6f608c8 000000f8 00000003 bed7e2f0 00000000 00000000 [ 27.272681] 5fc0: b6f608c8 000000f8 004ce54c 00000128 5d3ce8c7 00000000 00000026 00505c9c [ 27.280812] 5fe0: 00000070 bed7e298 004ddd64 b6dd1e64
Russell King points out that the ethtool API says zero is a valid return value of __ethtool_get_link_ksettings:
* If it is enabled then they are read-only; if the link
* is up they represent the negotiated link mode; if the link is down,
* the speed is 0, %SPEED_UNKNOWN or the highest enabled speed and
* @duplex is %DUPLEX_UNKNOWN or the best enabled duplex mode.
So, it seems that taprio is not following the API... I'd suggest either fixing taprio, or getting agreement to change the ethtool API.
The chosen path was to fix taprio.
--- net/sched/sch_taprio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_taprio.c +1 -1
@@ -668,7 +668,7 @@ static void taprio_set_picos_per_byte(stif (err <0 ) goto skip; -if (ecmd.base.speed !=SPEED_UNKNOWN ) +if (ecmd.base.speed && ecmd.base.speed !=SPEED_UNKNOWN ) speed = ecmd.base.speed; skip:
Greg Kroah-Hartman
maintainerPATCH 26/137 drm/vkms: Fix crc worker races
In reply to Greg Kroah-HartmanFrom: Daniel Vetter <[email protected]>
[ Upstream commit 18d0952a838ba559655b0cd9cf85097ad63d9bca ]
The issue we have is that the crc worker might fall behind. We've tried to handle this by tracking both the earliest frame for which it still needs to compute a crc, and the last one. Plus when the crtc_state changes, we have a new work item, which are all run in order due to the ordered workqueue we allocate for each vkms crtc.
Trouble is there's been a few small issues in the current code:
- we need to capture frame_end in the vblank hrtimer, not in the worker. The worker might run much later, and then we generate a lot of crc for which there's already a different worker queued up.
- frame number might be 0, so create a new crc_pending boolean to track this without confusion.
- we need to atomically grab frame_start/end and clear it, so do that all in one go. This is not going to create a new race, because if we race with the hrtimer then our work will be re-run.
- only race that can happen is the following:
1. worker starts
2. hrtimer runs and updates frame_end
3. worker grabs frame_start/end, already reading the new frame_end, and clears crc_pending
4. hrtimer calls queue_work()
5. worker completes
6. worker gets re-run, crc_pending is false
Explain this case a bit better by rewording the comment.
v2: Demote warning level output to debug when we fail to requeue, this is expected under high load when the crc worker can't quite keep up.
--- drivers/gpu/drm/vkms/vkms_crc.c | 27 +++++++++++++-------------- drivers/gpu/drm/vkms/vkms_crtc.c | 9 +++++++-- drivers/gpu/drm/vkms/vkms_drv.h | 2 ++ 3 files changed, 22 insertions(+), 16 deletions(-)
drivers/gpu/drm/vkms/vkms_crc.c +13 -14
@@ -166,16 +166,24 @@ void vkms_crc_work_handle(struct work_struct *work)struct drm_plane *plane;u32 crc32 =0 ;u64 frame_start, frame_end; +bool crc_pending;unsigned long flags;spin_lock_irqsave (&out->state_lock, flags); frame_start = crtc_state->frame_start; frame_end = crtc_state->frame_end; + crc_pending = crtc_state->crc_pending; + crtc_state->frame_start =0 ; + crtc_state->frame_end =0 ; + crtc_state->crc_pending = false;spin_unlock_irqrestore (&out->state_lock, flags); -/* _vblank_handle() hasn't updated frame_start yet */ -if (!frame_start || frame_start == frame_end) - goto out; +/* +* We raced with the vblank hrtimer and previous work already computed +* the crc, nothing to do. +*/ +if (!crc_pending) +return ;drm_for_each_plane (plane, &vdev->drm) {struct vkms_plane_state *vplane_state;
@@ -196,20 +204,11 @@ void vkms_crc_work_handle(struct work_struct *work)if (primary_crc) crc32 =_vkms_get_crc (primary_crc, cursor_crc); - frame_end =drm_crtc_accurate_vblank_count (crtc); - -/* queue_work can fail to schedule crc_work; add crc for -* missing frames +/* +* The worker can fall behind the vblank hrtimer, make sure we catch up. */ while (frame_start <= frame_end)drm_crtc_add_crc_entry (crtc, true, frame_start++, &crc32); - -out: -/* to avoid using the same value for frame number again */ -spin_lock_irqsave (&out->state_lock, flags); - crtc_state->frame_end = frame_end; - crtc_state->frame_start =0 ; -spin_unlock_irqrestore (&out->state_lock, flags); }static int vkms_crc_parse_source (const char *src_name,bool *enabled)
drivers/gpu/drm/vkms/vkms_crtc.c +7 -2
@@ -30,13 +30,18 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)* has read the data */ spin_lock (&output->state_lock); -if (!state->frame_start) +if (!state->crc_pending) state->frame_start = frame; +else +DRM_DEBUG_DRIVER ("crc worker falling behind, frame_start: %llu, frame_end: %llu\n" , + state->frame_start, frame); + state->frame_end = frame; + state->crc_pending = true;spin_unlock (&output->state_lock); ret =queue_work (output->crc_workq, &state->crc_work);if (!ret) -DRM_WARN ("failed to queue vkms_crc_work_handle" ); +DRM_DEBUG_DRIVER ("vkms_crc_work_handle already queued\n" ); }spin_unlock (&output->lock);
drivers/gpu/drm/vkms/vkms_drv.h +2 -0
@@ -56,6 +56,8 @@ struct vkms_plane_state {struct vkms_crtc_state {struct drm_crtc_state base;struct work_struct crc_work; + +bool crc_pending;u64 frame_start;u64 frame_end; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/137 drm/vkms: Avoid assigning 0 for possible_crtc
In reply to Greg Kroah-HartmanFrom: Rodrigo Siqueira <[email protected]>
[ Upstream commit e9d85f731de06a35d2ae6cdcf7d0e037c98ef41a ]
When vkms invoke drm_universal_plane_init(), it sets 0 for possible_crtcs parameter which means that planes can't be attached to any CRTC. It currently works due to some safeguard in the drm_crtc file; however, it is possible to identify the problem by trying to append a second connector. This patch fixes this issue by modifying vkms_plane_init() to accept an index parameter which makes the code a little bit more flexible and avoid set zero to possible_crtcs.
--- drivers/gpu/drm/vkms/vkms_drv.c | 2 +- drivers/gpu/drm/vkms/vkms_drv.h | 4 ++-- drivers/gpu/drm/vkms/vkms_output.c | 6 +++--- drivers/gpu/drm/vkms/vkms_plane.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/vkms/vkms_drv.c +1 -1
@@ -92,7 +92,7 @@ static int vkms_modeset_init(struct vkms_device *vkmsdev) dev->mode_config.max_height =YRES_MAX ; dev->mode_config.preferred_depth =24 ; -return vkms_output_init (vkmsdev); +return vkms_output_init (vkmsdev,0 ); }static int __init vkms_init (void )
drivers/gpu/drm/vkms/vkms_drv.h +2 -2
@@ -115,10 +115,10 @@ bool vkms_get_vblank_timestamp(struct drm_device *dev, unsigned int pipe, int *max_error, ktime_t *vblank_time, bool in_vblank_irq); -int vkms_output_init (struct vkms_device *vkmsdev); +int vkms_output_init (struct vkms_device *vkmsdev,int index);struct drm_plane *vkms_plane_init (struct vkms_device *vkmsdev, -enum drm_plane_type type); +enum drm_plane_type type,int index);/* Gem stuff */ struct drm_gem_object *vkms_gem_create(struct drm_device *dev,
drivers/gpu/drm/vkms/vkms_output.c +3 -3
@@ -36,7 +36,7 @@ static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = { .get_modes = vkms_conn_get_modes, }; -int vkms_output_init (struct vkms_device *vkmsdev) +int vkms_output_init (struct vkms_device *vkmsdev,int index) {struct vkms_output *output = &vkmsdev->output;struct drm_device *dev = &vkmsdev->drm;
@@ -46,12 +46,12 @@ int vkms_output_init(struct vkms_device *vkmsdev)struct drm_plane *primary, *cursor =NULL ;int ret; - primary =vkms_plane_init (vkmsdev,DRM_PLANE_TYPE_PRIMARY ); + primary =vkms_plane_init (vkmsdev,DRM_PLANE_TYPE_PRIMARY , index);if (IS_ERR (primary))return PTR_ERR (primary);if (enable_cursor) { - cursor =vkms_plane_init (vkmsdev,DRM_PLANE_TYPE_CURSOR ); + cursor =vkms_plane_init (vkmsdev,DRM_PLANE_TYPE_CURSOR , index);if (IS_ERR (cursor)) { ret =PTR_ERR (cursor); goto err_cursor;
drivers/gpu/drm/vkms/vkms_plane.c +2 -2
@@ -168,7 +168,7 @@ static const struct drm_plane_helper_funcs vkms_primary_helper_funcs = { };struct drm_plane *vkms_plane_init (struct vkms_device *vkmsdev, -enum drm_plane_type type) +enum drm_plane_type type,int index) {struct drm_device *dev = &vkmsdev->drm;const struct drm_plane_helper_funcs *funcs;
@@ -190,7 +190,7 @@ struct drm_plane *vkms_plane_init(struct vkms_device *vkmsdev, funcs = &vkms_primary_helper_funcs; } - ret =drm_universal_plane_init (dev, plane,0 , + ret =drm_universal_plane_init (dev, plane,1 << index, &vkms_plane_funcs, formats, nformats,NULL , type,NULL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/137 drm/panel: simple: fix AUO g185han01 horizontal blanking
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
[ Upstream commit f8c6bfc612b56f02e1b8fae699dff12738aaf889 ]
The horizontal blanking periods are too short, as the values are specified for a single LVDS channel. Since this panel is dual LVDS they need to be doubled. With this change the panel reaches its nominal vrefresh rate of 60Fps, instead of the 64Fps with the current wrong blanking.
Philipp Zabel added:
The datasheet specifies 960 active clocks + 40/128/160 clocks blanking on each of the two LVDS channels (min/typical/max), so doubled this is now correct.
--- drivers/gpu/drm/panel/panel-simple.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/panel/panel-simple.c +3 -3
@@ -723,9 +723,9 @@ static const struct panel_desc auo_g133han01 = {static const struct display_timing auo_g185han01_timings = { .pixelclock = {120000000 ,144000000 ,175000000 }, .hactive = {1920 ,1920 ,1920 }, - .hfront_porch = {18 ,60 ,74 }, - .hback_porch = {12 ,44 ,54 }, - .hsync_len = {10 ,24 ,32 }, + .hfront_porch = {36 ,120 ,148 }, + .hback_porch = {24 ,88 ,108 }, + .hsync_len = {20 ,48 ,64 }, .vactive = {1080 ,1080 ,1080 }, .vfront_porch = {6 ,10 ,40 }, .vback_porch = {2 ,5 ,20 },
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/137 video: ssd1307fb: Start page range at page_offset
In reply to Greg Kroah-HartmanFrom: Marko Kohtala <[email protected]>
[ Upstream commit dd9782834dd9dde3624ff1acea8859f3d3e792d4 ]
The page_offset was only applied to the end of the page range. This caused the display updates to cause a scrolling effect on the display because the amount of data written to the display did not match the range display expected.
--- drivers/video/fbdev/ssd1307fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/ssd1307fb.c +1 -1
@@ -432,7 +432,7 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)if (ret <0 )return ret; - ret =ssd1307fb_write_cmd (par->client,0x0 ); + ret =ssd1307fb_write_cmd (par->client, par->page_offset);if (ret <0 )return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/137 drm/tinydrm/Kconfig: drivers: Select BACKLIGHT_CLASS_DEVICE
In reply to Greg Kroah-HartmanFrom: Noralf Trønnes <[email protected]>
[ Upstream commit 3389669ac5ea598562673c04971d7bb0fab0e9f1 ]
The mipi_dbi helper is missing a dependency on DRM_KMS_HELPER and putting that in revealed this problem:
drivers/video/fbdev/Kconfig:12:error: recursive dependency detected! drivers/video/fbdev/Kconfig:12: symbol FB is selected by DRM_KMS_FB_HELPERdrivers/gpu/drm/Kconfig:75: symbol DRM_KMS_FB_HELPER depends on DRM_KMS_HELPERdrivers/gpu/drm/Kconfig:69: symbol DRM_KMS_HELPER is selected by TINYDRM_MIPI_DBI
drivers/gpu/drm/tinydrm/Kconfig:11: symbol TINYDRM_MIPI_DBI is selected by TINYDRM_HX8357D drivers/gpu/drm/tinydrm/Kconfig:15: symbol TINYDRM_HX8357D depends on BACKLIGHT_CLASS_DEVICE drivers/video/backlight/Kconfig:144: symbol BACKLIGHT_CLASS_DEVICE is selected by FB_BACKLIGHT drivers/video/fbdev/Kconfig:187: symbol FB_BACKLIGHT depends on FB
A symbol that selects DRM_KMS_HELPER can not depend on BACKLIGHT_CLASS_DEVICE. The reason for this is that DRM_KMS_FB_HELPER selects FB instead of depending on it.
The tinydrm drivers have somehow gotten away with depending on BACKLIGHT_CLASS_DEVICE because DRM_TINYDRM selects DRM_KMS_HELPER and the drivers depend on that symbol.
An audit shows that all DRM drivers that select DRM_KMS_HELPER and use BACKLIGHT_CLASS_DEVICE, selects it:
DRM_TILCDC, DRM_GMA500, DRM_SHMOBILE, DRM_NOUVEAU, DRM_FSL_DCU, DRM_I915, DRM_RADEON, DRM_AMDGPU, DRM_PARADE_PS8622
Documentation/kbuild/kconfig-language.txt has a note regarding select:
1. 'select should be used with care since it doesn't visit dependencies.' This is not a problem since BACKLIGHT_CLASS_DEVICE doesn't have any dependencies.
2. 'In general use select only for non-visible symbols' BACKLIGHT_CLASS_DEVICE is user visible.
The real solution to this would be to have DRM_KMS_FB_HELPER depend on the user visible symbol FB. That is a can of worms I'm not willing to tackle. I fear that such a change will result in me handling difficult fallouts for the next weeks. So I'm following DRM suite here.
--- drivers/gpu/drm/tinydrm/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/tinydrm/Kconfig +4 -4
@@ -14,8 +14,8 @@ config TINYDRM_MIPI_DBI config TINYDRM_HX8357D tristate "DRM support for HX8357D display panels" depends on DRM_TINYDRM && SPI - depends on BACKLIGHT_CLASS_DEVICE select TINYDRM_MIPI_DBI + select BACKLIGHT_CLASS_DEVICE help DRM driver for the following HX8357D panels: * YX350HV15-T 3.5" 340x350 TFT (Adafruit 3.5")
@@ -35,8 +35,8 @@ config TINYDRM_ILI9225 config TINYDRM_ILI9341 tristate "DRM support for ILI9341 display panels" depends on DRM_TINYDRM && SPI - depends on BACKLIGHT_CLASS_DEVICE select TINYDRM_MIPI_DBI + select BACKLIGHT_CLASS_DEVICE help DRM driver for the following Ilitek ILI9341 panels: * YX240QV29-T 2.4" 240x320 TFT (Adafruit 2.4")
@@ -46,8 +46,8 @@ config TINYDRM_ILI9341 config TINYDRM_MI0283QT tristate "DRM support for MI0283QT" depends on DRM_TINYDRM && SPI - depends on BACKLIGHT_CLASS_DEVICE select TINYDRM_MIPI_DBI + select BACKLIGHT_CLASS_DEVICE help DRM driver for the Multi-Inno MI0283QT display panel If M is selected the module will be called mi0283qt.
@@ -78,8 +78,8 @@ config TINYDRM_ST7586 config TINYDRM_ST7735R tristate "DRM support for Sitronix ST7735R display panels" depends on DRM_TINYDRM && SPI - depends on BACKLIGHT_CLASS_DEVICE select TINYDRM_MIPI_DBI + select BACKLIGHT_CLASS_DEVICE help DRM driver Sitronix ST7735R with one of the following LCDs: * JD-T18003-T01 1.8" 128x160 TFT
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/137 drm/stm: attach gem fence to atomic state
In reply to Greg Kroah-HartmanFrom: Ahmad Fatoum <[email protected]>
[ Upstream commit 8fabc9c3109a71b3577959a05408153ae69ccd8d ]
To properly synchronize with other devices the fence from the GEM object backing the framebuffer needs to be attached to the atomic state, so the commit work can wait on fence signaling.
--- drivers/gpu/drm/stm/ltdc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/stm/ltdc.c +2 -0
@@ -25,6 +25,7 @@#include <drm/drm_fb_cma_helper.h> #include <drm/drm_fourcc.h> #include <drm/drm_gem_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_of.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h>
@@ -875,6 +876,7 @@ static const struct drm_plane_funcs ltdc_plane_funcs = { };static const struct drm_plane_helper_funcs ltdc_plane_helper_funcs = { + .prepare_fb = drm_gem_fb_prepare_fb, .atomic_check = ltdc_plane_atomic_check, .atomic_update = ltdc_plane_atomic_update, .atomic_disable = ltdc_plane_atomic_disable,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/137 drm/rockchip: Check for fast link training before enabling psr
In reply to Greg Kroah-HartmanFrom: Sean Paul <[email protected]>
[ Upstream commit ad309284a52be47c8b3126c9376358bf381861bc ]
Once we start shutting off the link during PSR, we're going to want fast training to work. If the display doesn't support fast training, don't enable psr.
Changes in v2:
- None
Changes in v3:
- None
Changes in v4:
- None
Changes in v5:
- None
Link to v1: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Link to v2: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Link to v3: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Link to v4: https://patchwork.freedesktop.org/patch/msgid/[email protected]
--- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +5 -4
@@ -1036,16 +1036,17 @@ static int analogix_dp_commit(struct analogix_dp_device *dp)if (ret)return ret; +/* Check whether panel supports fast training */ + ret =analogix_dp_fast_link_train_detection (dp); +if (ret) + dp->psr_enable = false; +if (dp->psr_enable) { ret =analogix_dp_enable_sink_psr (dp);if (ret)return ret; } -/* Check whether panel supports fast training */ - ret =analogix_dp_fast_link_train_detection (dp); -if (ret) - dp->psr_enable = false;return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/137 ipv6: drop incoming packets having a v4mapped source address
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 6af1799aaf3f1bc8defedddfa00df3192445bbf3 ]
This began with a syzbot report. syzkaller was injecting IPv6 TCP SYN packets having a v4mapped source address.
After an unsuccessful 4-tuple lookup, TCP creates a request socket (SYN_RECV) and calls reqsk_queue_hash_req()
reqsk_queue_hash_req() calls sk_ehashfn(sk)
At this point we have AF_INET6 sockets, and the heuristic used by sk_ehashfn() to either hash the IPv4 or IPv6 addresses is to use ipv6_addr_v4mapped(&sk->sk_v6_daddr)
For the particular spoofed packet, we end up hashing V4 addresses which were not initialized by the TCP IPv6 stack, so KMSAN fired a warning.
I first fixed sk_ehashfn() to test both source and destination addresses, but then faced various problems, including user-space programs like packetdrill that had similar assumptions.
Instead of trying to fix the whole ecosystem, it is better to admit that we have a dual stack behavior, and that we can not build linux kernels without V4 stack anyway.
The dual stack API automatically forces the traffic to be IPv4 if v4mapped addresses are used at bind() or connect(), so it makes no sense to allow IPv6 traffic to use the same v4mapped class.
--- net/ipv6/ip6_input.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
net/ipv6/ip6_input.c +10 -0
@@ -221,6 +221,16 @@ static struct sk_buff *ip6_rcv_core(struif (ipv6_addr_is_multicast (&hdr->saddr)) goto err; +/* While RFC4291 is not explicit about v4mapped addresses +* in IPv6 headers, it seems clear linux dual-stack +* model can not deal properly with these. +* Security models could be fooled by ::ffff:127.0.0.1 for example. +* +* https://tools.ietf.org/html/draft-itojun-v6ops-v4mapped-harmful-02 +*/ +if (ipv6_addr_v4mapped (&hdr->saddr)) + goto err; + skb->transport_header = skb->network_header +sizeof (*hdr);IP6CB (skb)->nhoff = offsetof(struct ipv6hdr , nexthdr);
Greg Kroah-Hartman
maintainerPATCH 5/137 ipv6: Handle missing host route in __ipv6_ifa_notify
In reply to Greg Kroah-HartmanFrom: David Ahern <[email protected]>
[ Upstream commit 2d819d250a1393a3e725715425ab70a0e0772a71 ]
Rajendra reported a kernel panic when a link was taken down:
[ 6870.263084] BUG: unable to handle kernel NULL pointer dereference at 00000000000000a8
[ 6870.271856] IP: [<ffffffff8efc5764>] __ipv6_ifa_notify+0x154/0x290 <snip>
[ 6870.570501] Call Trace:
[ 6870.573238] [<ffffffff8efc58c6>] ? ipv6_ifa_notify+0x26/0x40
[ 6870.579665] [<ffffffff8efc98ec>] ? addrconf_dad_completed+0x4c/0x2c0
[ 6870.586869] [<ffffffff8efe70c6>] ? ipv6_dev_mc_inc+0x196/0x260
[ 6870.593491] [<ffffffff8efc9c6a>] ? addrconf_dad_work+0x10a/0x430
[ 6870.600305] [<ffffffff8f01ade4>] ? __switch_to_asm+0x34/0x70
[ 6870.606732] [<ffffffff8ea93a7a>] ? process_one_work+0x18a/0x430
[ 6870.613449] [<ffffffff8ea93d6d>] ? worker_thread+0x4d/0x490
[ 6870.619778] [<ffffffff8ea93d20>] ? process_one_work+0x430/0x430
[ 6870.626495] [<ffffffff8ea99dd9>] ? kthread+0xd9/0xf0
[ 6870.632145] [<ffffffff8f01ade4>] ? __switch_to_asm+0x34/0x70
[ 6870.638573] [<ffffffff8ea99d00>] ? kthread_park+0x60/0x60
[ 6870.644707] [<ffffffff8f01ae77>] ? ret_from_fork+0x57/0x70
[ 6870.650936] Code: 31 c0 31 d2 41 b9 20 00 08 02 b9 09 00 00 0addrconf_dad_work is kicked to be scheduled when a device is brought up. There is a race between addrcond_dad_work getting scheduled and taking the rtnl lock and a process taking the link down (under rtnl). The latter removes the host route from the inet6_addr as part of addrconf_ifdown which is run for NETDEV_DOWN. The former attempts to use the host route in __ipv6_ifa_notify. If the down event removes the host route due to the race to the rtnl, then the BUG listed above occurs.
Since the DAD sequence can not be aborted, add a check for the missing host route in __ipv6_ifa_notify. The only way this should happen is due to the previously mentioned race. The host route is created when the address is added to an interface; it is only removed on a down event where the address is kept. Add a warning if the host route is missing AND the device is up; this is a situation that should never happen.
--- net/ipv6/addrconf.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
net/ipv6/addrconf.c +12 -5
@@ -5962,13 +5962,20 @@ static void __ipv6_ifa_notify(int event,switch (event) {case RTM_NEWADDR :/* -* If the address was optimistic -* we inserted the route at the start of -* our DAD process, so we don't need -* to do it again +* If the address was optimistic we inserted the route at the +* start of our DAD process, so we don't need to do it again. +* If the device was taken down in the middle of the DAD +* cycle there is a race where we could get here without a +* host route, so nothing to insert. That will be fixed when +* the device is brought up. */ -if (!rcu_access_pointer (ifp->rt->fib6_node)) +if (ifp->rt && !rcu_access_pointer (ifp->rt->fib6_node)) {ip6_ins_rt (net, ifp->rt); + }else if (!ifp->rt && (ifp->idev->dev->flags &IFF_UP )) { +pr_warn ("BUG: Address %pI6c on device %s is missing its host route.\n" , + &ifp->addr, ifp->idev->dev->name); + } +if (ifp->idev->cnf.forwarding)addrconf_join_anycast (ifp);if (!ipv6_addr_any (&ifp->peer_addr))
Greg Kroah-Hartman
maintainerPATCH 6/137 net: ipv4: avoid mixed n_redirects and rate_tokens usage
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit b406472b5ad79ede8d10077f0c8f05505ace8b6d ]
Since commit c09551c6ff7f ("net: ipv4: use a dedicated counter for icmp_v4 redirect packets") we use 'n_redirects' to account for redirect packets, but we still use 'rate_tokens' to compute the redirect packets exponential backoff.
If the device sent to the relevant peer any ICMP error packet after sending a redirect, it will also update 'rate_token' according to the leaking bucket schema; typically 'rate_token' will raise above BITS_PER_LONG and the redirect packets backoff algorithm will produce undefined behavior.
Fix the issue using 'n_redirects' to compute the exponential backoff in ip_rt_send_redirect().
Note that we still clear rate_tokens after a redirect silence period, to avoid changing an established behaviour.
The root cause predates git history; before the mentioned commit in the critical scenario, the kernel stopped sending redirects, after the mentioned commit the behavior more randomic.
--- net/ipv4/route.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/ipv4/route.c +2 -3
@@ -915,16 +915,15 @@ void ip_rt_send_redirect(struct sk_buffif (peer->rate_tokens ==0 ||time_after (jiffies, (peer->rate_last + - (ip_rt_redirect_load << peer->rate_tokens)))) { + (ip_rt_redirect_load << peer->n_redirects)))) {__be32 gw =rt_nexthop (rt,ip_hdr (skb)->daddr);icmp_send (skb,ICMP_REDIRECT ,ICMP_REDIR_HOST , gw); peer->rate_last = jiffies; - ++peer->rate_tokens; ++peer->n_redirects;#ifdef CONFIG_IP_ROUTE_VERBOSE if (log_martians && - peer->rate_tokens == ip_rt_redirect_number) + peer->n_redirects == ip_rt_redirect_number)net_warn_ratelimited ("host %pI4/if%d ignores redirects for %pI4 to %pI4\n" , &ip_hdr (skb)->saddr,inet_iif (skb), &ip_hdr (skb)->daddr, &gw);
Greg Kroah-Hartman
maintainerPATCH 7/137 net: qlogic: Fix memory leak in ql_alloc_large_buffers
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 1acb8f2a7a9f10543868ddd737e37424d5c36cf4 ]
In ql_alloc_large_buffers, a new skb is allocated via netdev_alloc_skb. This skb should be released if pci_dma_mapping_error fails.
--- drivers/net/ethernet/qlogic/qla3xxx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/qlogic/qla3xxx.c +1 -0
@@ -2787,6 +2787,7 @@ static int ql_alloc_large_buffers(structnetdev_err (qdev->ndev,"PCI mapping failed with error: %d\n" , err); +dev_kfree_skb_irq (skb);ql_free_large_buffers (qdev);return -ENOMEM ; }
Greg Kroah-Hartman
maintainerPATCH 9/137 net: Unpublish sk from sk_reuseport_cb before call_rcu
In reply to Greg Kroah-HartmanFrom: Martin KaFai Lau <[email protected]>
[ Upstream commit 8c7138b33e5c690c308b2a7085f6313fdcb3f616 ]
The "reuse->sock[]" array is shared by multiple sockets. The going away sk must unpublish itself from "reuse->sock[]" before making call_rcu() call. However, this unpublish-action is currently done after a grace period and it may cause use-after-free.
The fix is to move reuseport_detach_sock() to sk_destruct(). Due to the above reason, any socket with sk_reuseport_cb has to go through the rcu grace period before freeing it.
It is a rather old bug (~3 yrs). The Fixes tag is not necessary the right commit but it is the one that introduced the SOCK_RCU_FREE logic and this fix is depending on it.
--- net/core/sock.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
net/core/sock.c +8 -3
@@ -1696,8 +1696,6 @@ static void __sk_destruct(struct rcu_heask_filter_uncharge (sk, filter);RCU_INIT_POINTER (sk->sk_filter,NULL ); } -if (rcu_access_pointer (sk->sk_reuseport_cb)) -reuseport_detach_sock (sk);sock_disable_timestamp (sk,SK_FLAGS_TIMESTAMP );
@@ -1724,7 +1722,14 @@ static void __sk_destruct(struct rcu_heavoid sk_destruct (struct sock *sk) { -if (sock_flag (sk,SOCK_RCU_FREE )) +bool use_call_rcu =sock_flag (sk,SOCK_RCU_FREE ); + +if (rcu_access_pointer (sk->sk_reuseport_cb)) { +reuseport_detach_sock (sk); + use_call_rcu = true; + } + +if (use_call_rcu)call_rcu (&sk->sk_rcu, __sk_destruct);else __sk_destruct (&sk->sk_rcu);
Greg Kroah-Hartman
maintainerPATCH 8/137 net: sched: taprio: Fix potential integer overflow in taprio_set_picos_per_byte
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 68ce6688a5baefde30914fc07fc27292dbbe8320 ]
The speed divisor is used in a context expecting an s64, but it is evaluated using 32-bit arithmetic.
To avoid that happening, instead of multiplying by 1,000,000 in the first place, simplify the fraction and do a standard 32 bit division instead.
--- net/sched/sch_taprio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/sched/sch_taprio.c +1 -2
@@ -672,8 +672,7 @@ static void taprio_set_picos_per_byte(st speed = ecmd.base.speed; skip: - picos_per_byte =div64_s64 (NSEC_PER_SEC *1000LL *8 , - speed *1000 *1000 ); + picos_per_byte = (USEC_PER_SEC *8 ) / speed;atomic64_set (&q->picos_per_byte, picos_per_byte); netdev_dbg(dev, "taprio: set %s's picos_per_byte to: %lld, linkspeed: %d\n",
Greg Kroah-Hartman
maintainerPATCH 37/137 drm/radeon: Fix EEH during kexec
In reply to Greg Kroah-HartmanFrom: KyleMahlkuch <[email protected]>
[ Upstream commit 6f7fe9a93e6c09bf988c5059403f5f88e17e21e6 ]
During kexec some adapters hit an EEH since they are not properly shut down in the radeon_pci_shutdown() function. Adding radeon_suspend_kms() fixes this issue.
--- drivers/gpu/drm/radeon/radeon_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/radeon/radeon_drv.c +8 -0
@@ -344,11 +344,19 @@ radeon_pci_remove(struct pci_dev *pdev)static void radeon_pci_shutdown (struct pci_dev *pdev) { +struct drm_device *ddev =pci_get_drvdata (pdev); +/* if we are running in a VM, make sure the device * torn down properly on reboot/shutdown */ if (radeon_device_is_virtual ())radeon_pci_remove (pdev); + +/* Some adapters need to be suspended before a +* shutdown occurs in order to prevent an error +* during kexec. +*/ +radeon_suspend_kms (ddev, true, true, false); }static int radeon_pmops_suspend (struct device *dev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/137 drm/amd/display: Fix frames_to_insert math
In reply to Greg Kroah-HartmanFrom: Bayan Zabihiyan <[email protected]>
[ Upstream commit a463b263032f7c98c5912207db43be1aa34a6438 ]
[Why]
The math on deciding on how many
"frames to insert" sometimes sent us over the max refresh rate. Also integer overflow can occur if we have high refresh rates.
[How]
Instead of clipping the frame duration such that it doesn’t go below the min, just remove a frame from the number of frames to insert. +
Use unsigned long long for intermediate calculations to prevent integer overflow.
--- .../amd/display/modules/freesync/freesync.c | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +17 -10
@@ -433,6 +433,12 @@ static void apply_below_the_range(struct core_freesync *core_freesync,/* Either we've calculated the number of frames to insert, * or we need to insert min duration frames */ +if (last_render_time_in_us / frames_to_insert < + in_out_vrr->min_duration_in_us){ + frames_to_insert -= (frames_to_insert >1 ) ? +1 :0 ; + } +if (frames_to_insert >0 ) inserted_frame_duration_in_us = last_render_time_in_us / frames_to_insert;
@@ -885,8 +891,8 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync,struct core_freesync *core_freesync =NULL ;unsigned long long nominal_field_rate_in_uhz =0 ;unsigned int refresh_range =0 ; -unsigned int min_refresh_in_uhz =0 ; -unsigned int max_refresh_in_uhz =0 ; +unsigned long long min_refresh_in_uhz =0 ; +unsigned long long max_refresh_in_uhz =0 ;if (mod_freesync ==NULL )return ;
@@ -913,7 +919,7 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, min_refresh_in_uhz = nominal_field_rate_in_uhz;if (!vrr_settings_require_update (core_freesync, - in_config, min_refresh_in_uhz, max_refresh_in_uhz, + in_config, (unsigned int )min_refresh_in_uhz, (unsigned int )max_refresh_in_uhz, in_out_vrr))return ;
@@ -929,15 +935,15 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync,return ; }else { - in_out_vrr->min_refresh_in_uhz = min_refresh_in_uhz; + in_out_vrr->min_refresh_in_uhz = (unsigned int )min_refresh_in_uhz; in_out_vrr->max_duration_in_us =calc_duration_in_us_from_refresh_in_uhz ( - min_refresh_in_uhz); + (unsigned int )min_refresh_in_uhz); - in_out_vrr->max_refresh_in_uhz = max_refresh_in_uhz; + in_out_vrr->max_refresh_in_uhz = (unsigned int )max_refresh_in_uhz; in_out_vrr->min_duration_in_us =calc_duration_in_us_from_refresh_in_uhz ( - max_refresh_in_uhz); + (unsigned int )max_refresh_in_uhz); refresh_range = in_out_vrr->max_refresh_in_uhz - in_out_vrr->min_refresh_in_uhz;
@@ -948,17 +954,18 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, in_out_vrr->fixed.ramping_active = in_config->ramping; in_out_vrr->btr.btr_enabled = in_config->btr; +if (in_out_vrr->max_refresh_in_uhz <2 * in_out_vrr->min_refresh_in_uhz) in_out_vrr->btr.btr_enabled = false; + in_out_vrr->btr.btr_active = false; in_out_vrr->btr.inserted_duration_in_us =0 ; in_out_vrr->btr.frames_to_insert =0 ; in_out_vrr->btr.frame_counter =0 ; in_out_vrr->btr.mid_point_in_us = - in_out_vrr->min_duration_in_us + - (in_out_vrr->max_duration_in_us - - in_out_vrr->min_duration_in_us) /2 ; + (in_out_vrr->min_duration_in_us + + in_out_vrr->max_duration_in_us) /2 ;if (in_out_vrr->state ==VRR_STATE_UNSUPPORTED ) { in_out_vrr->adjust.v_total_min = stream->timing.v_total;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/137 drm/amd/display: reprogram VM config when system resume
In reply to Greg Kroah-HartmanFrom: Lewis Huang <[email protected]>
[ Upstream commit e5382701c3520b3ed66169a6e4aa6ce5df8c56e0 ]
[Why]
The vm config will be clear to 0 when system enter S4. It will cause hubbub didn't know how to fetch data when system resume. The flip always pending because earliest_inuse_address and request_address are different.
[How]
Reprogram VM config when system resume
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +8 -0
@@ -2016,6 +2016,14 @@ void dc_set_power_state(dc_resource_state_construct (dc, dc->current_state); dc->hwss.init_hw (dc); + +#ifdef CONFIG_DRM_AMD_DC_DCN2_0 +if (dc->hwss.init_sys_ctx !=NULL && + dc->vm_pa_config.valid) { + dc->hwss.init_sys_ctx (dc->hwseq, dc, &dc->vm_pa_config); + } +#endif +break ;default :ASSERT (dc->current_state->stream_count ==0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/137 clk: sirf: Dont reference clk_init_data after registration
In reply to Greg Kroah-HartmanFrom: Stephen Boyd <[email protected]>
[ Upstream commit af55dadfbce35b4f4c6247244ce3e44b2e242b84 ]
A future patch is going to change semantics of clk_register() so that clk_hw::init is guaranteed to be NULL after a clk is registered. Avoid referencing this member here so that we don't run into NULL pointer exceptions.
--- drivers/clk/sirf/clk-common.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/clk/sirf/clk-common.c +8 -4
@@ -297,9 +297,10 @@ static u8 dmn_clk_get_parent(struct clk_hw *hw) {struct clk_dmn *clk =to_dmnclk (hw);u32 cfg =clkc_readl (clk->regofs); +const char *name =clk_hw_get_name (hw);/* parent of io domain can only be pll3 */ -if (strcmp (hw->init->name,"io" ) ==0 ) +if (strcmp (name,"io" ) ==0 )return 4 ;WARN_ON ((cfg & (BIT (3 ) -1 )) >4 );
@@ -311,9 +312,10 @@ static int dmn_clk_set_parent(struct clk_hw *hw, u8 parent) {struct clk_dmn *clk =to_dmnclk (hw);u32 cfg =clkc_readl (clk->regofs); +const char *name =clk_hw_get_name (hw);/* parent of io domain can only be pll3 */ -if (strcmp (hw->init->name,"io" ) ==0 ) +if (strcmp (name,"io" ) ==0 )return -EINVAL ; cfg &= ~(BIT (3 ) -1 );
@@ -353,7 +355,8 @@ static long dmn_clk_round_rate(struct clk_hw *hw, unsigned long rate, {unsigned long fin;unsigned ratio, wait, hold; -unsigned bits = (strcmp (hw->init->name,"mem" ) ==0 ) ?3 :4 ; +const char *name =clk_hw_get_name (hw); +unsigned bits = (strcmp (name,"mem" ) ==0 ) ?3 :4 ; fin = *parent_rate; ratio = fin / rate;
@@ -375,7 +378,8 @@ static int dmn_clk_set_rate(struct clk_hw *hw, unsigned long rate,struct clk_dmn *clk =to_dmnclk (hw);unsigned long fin;unsigned ratio, wait, hold, reg; -unsigned bits = (strcmp (hw->init->name,"mem" ) ==0 ) ?3 :4 ; +const char *name =clk_hw_get_name (hw); +unsigned bits = (strcmp (name,"mem" ) ==0 ) ?3 :4 ; fin = parent_rate; ratio = fin / rate;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/137 clk: sprd: Dont reference clk_init_data after registration
In reply to Greg Kroah-HartmanFrom: Stephen Boyd <[email protected]>
[ Upstream commit f6c90df8e7e33c3dc33d4d7471bc42c232b0510e ]
A future patch is going to change semantics of clk_register() so that clk_hw::init is guaranteed to be NULL after a clk is registered. Avoid referencing this member here so that we don't run into NULL pointer exceptions.
--- drivers/clk/sprd/common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/sprd/common.c +3 -2
@@ -71,16 +71,17 @@ int sprd_clk_probe(struct device *dev, struct clk_hw_onecell_data *clkhw)struct clk_hw *hw;for (i =0 ; i < clkhw->num; i++) { +const char *name; hw = clkhw->hws[i]; -if (!hw)continue ; + name = hw->init->name; ret =devm_clk_hw_register (dev, hw);if (ret) {dev_err (dev,"Couldn't register clock %d - %s\n" , - i, hw->init->name); + i, name);return ret; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/137 powerpc/xmon: Check for HV mode when dumping XIVE info from OPAL
In reply to Greg Kroah-HartmanFrom: Cédric Le Goater <[email protected]>
[ Upstream commit c3e0dbd7f780a58c4695f1cd8fc8afde80376737 ]
Currently, the xmon 'dx' command calls OPAL to dump the XIVE state in the OPAL logs and also outputs some of the fields of the internal XIVE structures in Linux. The OPAL calls can only be done on baremetal (PowerNV) and they crash a pseries machine. Fix by checking the hypervisor feature of the CPU.
--- arch/powerpc/xmon/xmon.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
arch/powerpc/xmon/xmon.c +10 -7
@@ -2532,13 +2532,16 @@ static void dump_pacas(void)static void dump_one_xive (int cpu) {unsigned int hwid =get_hard_smp_processor_id (cpu); - -opal_xive_dump (XIVE_DUMP_TM_HYP , hwid); -opal_xive_dump (XIVE_DUMP_TM_POOL , hwid); -opal_xive_dump (XIVE_DUMP_TM_OS , hwid); -opal_xive_dump (XIVE_DUMP_TM_USER , hwid); -opal_xive_dump (XIVE_DUMP_VP , hwid); -opal_xive_dump (XIVE_DUMP_EMU_STATE , hwid); +bool hv =cpu_has_feature (CPU_FTR_HVMODE ); + +if (hv) { +opal_xive_dump (XIVE_DUMP_TM_HYP , hwid); +opal_xive_dump (XIVE_DUMP_TM_POOL , hwid); +opal_xive_dump (XIVE_DUMP_TM_OS , hwid); +opal_xive_dump (XIVE_DUMP_TM_USER , hwid); +opal_xive_dump (XIVE_DUMP_VP , hwid); +opal_xive_dump (XIVE_DUMP_EMU_STATE , hwid); + }if (setjmp (bus_error_jmp) !=0 ) { catch_memory_errors =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/137 powerpc/rtas: use device model APIs and serialization during LPM
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit a6717c01ddc259f6f73364779df058e2c67309f8 ]
The LPAR migration implementation and userspace-initiated cpu hotplug can interleave their executions like so:
1. Set cpu 7 offline via sysfs.
2. Begin a partition migration, whose implementation requires the OS to ensure all present cpus are online; cpu 7 is onlined:
rtas_ibm_suspend_me -> rtas_online_cpus_mask -> cpu_up
This sets cpu 7 online in all respects except for the cpu's corresponding struct device; dev->offline remains true.
3. Set cpu 7 online via sysfs. _cpu_up() determines that cpu 7 is already online and returns success. The driver core (device_online) sets dev->offline = false.
4. The migration completes and restores cpu 7 to offline state:
rtas_ibm_suspend_me -> rtas_offline_cpus_mask -> cpu_down
This leaves cpu7 in a state where the driver core considers the cpu device online, but in all other respects it is offline and unused. Attempts to online the cpu via sysfs appear to succeed but the driver core actually does not pass the request to the lower-level cpuhp support code. This makes the cpu unusable until the cpu device is manually set offline and then online again via sysfs.
Instead of directly calling cpu_up/cpu_down, the migration code should use the higher-level device core APIs to maintain consistent state and serialize operations.
--- arch/powerpc/kernel/rtas.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
arch/powerpc/kernel/rtas.c +8 -3
@@ -871,15 +871,17 @@ static int rtas_cpu_state_change_mask(enum rtas_cpu_state state,return 0 ;for_each_cpu (cpu, cpus) { +struct device *dev =get_cpu_device (cpu); +switch (state) {case DOWN : - cpuret =cpu_down (cpu); + cpuret =device_offline (dev);break ;case UP : - cpuret =cpu_up (cpu); + cpuret =device_online (dev);break ; } -if (cpuret) { +if (cpuret <0 ) { pr_debug("%s: cpu_%s for cpu#%d returned %d.\n", __func__, ((state == UP) ? "up" : "down"),
@@ -968,6 +970,8 @@ int rtas_ibm_suspend_me(u64 handle) data.token =rtas_token ("ibm,suspend-me" ); data.complete = &done; +lock_device_hotplug (); +/* All present CPUs must be online */ cpumask_andnot (offline_mask, cpu_present_mask, cpu_online_mask); cpuret =rtas_online_cpus_mask (offline_mask);
@@ -1007,6 +1011,7 @@ out_hotplug_enable: __func__); out: +unlock_device_hotplug ();free_cpumask_var (offline_mask);return atomic_read (&data.error); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/137 powerpc/64s/radix: Fix memory hotplug section page table creation
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 8f51e3929470942e6a8744061254fdeef646cd36 ]
create_physical_mapping expects physical addresses, but creating and splitting these mappings after boot is supplying virtual (effective) addresses. This can be irritated by booting with mem= to limit memory then probing an unused physical memory range:
echo <addr> > /sys/devices/system/memory/probe
This mostly works by accident, firstly because __va(__va(x)) == __va(x) so the virtual address does not get corrupted. Secondly because pfn_pte masks out the upper bits of the pfn beyond the physical address limit, so a pfn constructed with a 0xc000000000000000 virtual linear address will be masked back to the correct physical address in the pte.
--- arch/powerpc/mm/book3s64/radix_pgtable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/book3s64/radix_pgtable.c +1 -1
@@ -901,7 +901,7 @@ int __meminit radix__create_section_mapping(unsigned long start, unsigned long ereturn -1 ; } -return create_physical_mapping (start, end, nid); +return create_physical_mapping (__pa (start),__pa (end), nid); }int __meminit radix__remove_section_mapping (unsigned long start,unsigned long end)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/137 powerpc/perf: fix imc allocation failure handling
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 10c4bd7cd28e77aeb8cfa65b23cb3c632ede2a49 ]
The alloc_pages_node return value should be tested for failure before being passed to page_address.
--- arch/powerpc/perf/imc-pmu.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
arch/powerpc/perf/imc-pmu.c +18 -11
@@ -570,6 +570,7 @@ static int core_imc_mem_init(int cpu, int size) {int nid, rc =0 , core_id = (cpu / threads_per_core);struct imc_mem_info *mem_info; +struct page *page;/* * alloc_pages_node() will allocate memory for core in the
@@ -580,11 +581,12 @@ static int core_imc_mem_init(int cpu, int size) mem_info->id = core_id;/* We need only vbase for core counters */ - mem_info->vbase =page_address (alloc_pages_node (nid, -GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE | - __GFP_NOWARN,get_order (size))); -if (!mem_info->vbase) + page =alloc_pages_node (nid, +GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE | + __GFP_NOWARN,get_order (size)); +if (!page)return -ENOMEM ; + mem_info->vbase =page_address (page);/* Init the mutex */ core_imc_refc[core_id].id = core_id;
@@ -839,15 +841,17 @@ static int thread_imc_mem_alloc(int cpu_id, int size)int nid =cpu_to_node (cpu_id);if (!local_mem) { +struct page *page;/* * This case could happen only once at start, since we dont * free the memory in cpu offline path. */ - local_mem =page_address (alloc_pages_node (nid, + page =alloc_pages_node (nid,GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE | - __GFP_NOWARN,get_order (size))); -if (!local_mem) + __GFP_NOWARN,get_order (size)); +if (!page)return -ENOMEM ; + local_mem =page_address (page);per_cpu (thread_imc_mem, cpu_id) = local_mem; }
@@ -1085,11 +1089,14 @@ static int trace_imc_mem_alloc(int cpu_id, int size)int core_id = (cpu_id / threads_per_core);if (!local_mem) { - local_mem =page_address (alloc_pages_node (phys_id, -GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE | - __GFP_NOWARN,get_order (size))); -if (!local_mem) +struct page *page; + + page =alloc_pages_node (phys_id, +GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE | + __GFP_NOWARN,get_order (size)); +if (!page)return -ENOMEM ; + local_mem =page_address (page);per_cpu (trace_imc_mem, cpu_id) = local_mem;/* Initialise the counters for trace mode */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/137 pinctrl: tegra: Fix write barrier placement in pmx_writel
In reply to Greg Kroah-HartmanFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit c2cf351eba2ff6002ce8eb178452219d2521e38e ]
pmx_writel uses writel which inserts write barrier before the register write.
This patch has fix to replace writel with writel_relaxed followed by a readback and memory barrier to ensure write operation is completed for successful pinctrl change.
--- drivers/pinctrl/tegra/pinctrl-tegra.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pinctrl/tegra/pinctrl-tegra.c +3 -1
@@ -32,7 +32,9 @@ static inline u32 pmx_readl(struct tegra_pmx *pmx, u32 bank, u32 reg)static inline void pmx_writel (struct tegra_pmx *pmx,u32 val,u32 bank,u32 reg) { -writel (val, pmx->regs[bank] + reg); +writel_relaxed (val, pmx->regs[bank] + reg); +/* make sure pinmux register write completed */ +pmx_readl (pmx, bank, reg); }static int tegra_pinctrl_get_groups_count (struct pinctrl_dev *pctldev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/137 powerpc/eeh: Clear stale EEH_DEV_NO_HANDLER flag
In reply to Greg Kroah-HartmanFrom: Sam Bobroff <[email protected]>
[ Upstream commit aa06e3d60e245284d1e55497eb3108828092818d ]
The EEH_DEV_NO_HANDLER flag is used by the EEH system to prevent the use of driver callbacks in drivers that have been bound part way through the recovery process. This is necessary to prevent later stage handlers from being called when the earlier stage handlers haven't, which can be confusing for drivers.
However, the flag is set for all devices that are added after boot time and only cleared at the end of the EEH recovery process. This results in hot plugged devices erroneously having the flag set during the first recovery after they are added (causing their driver's handlers to be incorrectly ignored).
To remedy this, clear the flag at the beginning of recovery processing. The flag is still cleared at the end of recovery processing, although it is no longer really necessary.
Also clear the flag during eeh_handle_special_event(), for the same reasons.
--- arch/powerpc/kernel/eeh_driver.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
arch/powerpc/kernel/eeh_driver.c +10 -1
@@ -793,6 +793,10 @@ void eeh_handle_normal_event(struct eeh_pe *pe) result =PCI_ERS_RESULT_DISCONNECT ; } +eeh_for_each_pe (pe, tmp_pe) +eeh_pe_for_each_dev (tmp_pe, edev, tmp) + edev->mode &= ~EEH_DEV_NO_HANDLER ; +/* Walk the various device drivers attached to this slot through * a reset sequence, giving each an opportunity to do what it needs * to accomplish the reset. Each child gets a report of the
@@ -981,7 +985,8 @@ void eeh_handle_normal_event(struct eeh_pe *pe)*/ void eeh_handle_special_event (void ) { -struct eeh_pe *pe, *phb_pe; +struct eeh_pe *pe, *phb_pe, *tmp_pe; +struct eeh_dev *edev, *tmp_edev;struct pci_bus *bus;struct pci_controller *hose;unsigned long flags;
@@ -1050,6 +1055,10 @@ void eeh_handle_special_event(void) (phb_pe->state & EEH_PE_RECOVERING))continue ; +eeh_for_each_pe (pe, tmp_pe) +eeh_pe_for_each_dev (tmp_pe, edev, tmp_edev) + edev->mode &= ~EEH_DEV_NO_HANDLER ; +/* Notify all devices to be down */ eeh_pe_state_clear (pe,EEH_PE_PRI_BUS , true);eeh_set_channel_state (pe, pci_channel_io_perm_failure);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/137 vfio_pci: Restore original state on release
In reply to Greg Kroah-HartmanFrom: hexin <[email protected]>
[ Upstream commit 92c8026854c25093946e0d7fe536fd9eac440f06 ]
vfio_pci_enable() saves the device's initial configuration information with the intent that it is restored in vfio_pci_disable(). However, the commit referenced in Fixes: below replaced the call to __pci_reset_function_locked(), which is not wrapped in a state save and restore, with pci_try_reset_function(), which overwrites the restored device state with the current state before applying it to the device. Reinstate use of __pci_reset_function_locked() to return to the desired behavior.
--- drivers/vfio/pci/vfio_pci.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/vfio/pci/vfio_pci.c +13 -4
@@ -438,11 +438,20 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev)pci_write_config_word (pdev,PCI_COMMAND ,PCI_COMMAND_INTX_DISABLE );/* -* Try to reset the device. The success of this is dependent on -* being able to lock the device, which is not always possible. +* Try to get the locks ourselves to prevent a deadlock. The +* success of this is dependent on being able to lock the device, +* which is not always possible. +* We can not use the "try" reset interface here, which will +* overwrite the previously restored configuration information. */ -if (vdev->reset_works && !pci_try_reset_function (pdev)) - vdev->needs_reset = false; +if (vdev->reset_works &&pci_cfg_access_trylock (pdev)) { +if (device_trylock (&pdev->dev)) { +if (!__pci_reset_function_locked (pdev)) + vdev->needs_reset = false; +device_unlock (&pdev->dev); + } +pci_cfg_access_unlock (pdev); + }pci_restore_state (pdev); out:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/137 drm/nouveau/kms/tu102-: disable input lut when input is already FP16
In reply to Greg Kroah-HartmanFrom: Ben Skeggs <[email protected]>
[ Upstream commit 1e339ab2ac3c769c1b06b9fb7d532f8495ebc56d ]
On Turing, an input LUT is required to transform inputs in fixed-point formats to FP16 for the internal display pipe. We provide an identity mapping whenever a window is enabled for this reason.
HW has error checks to ensure when the input is already FP16, that the input LUT is also disabled.
--- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/dispnv50/wndw.c +3 -1
@@ -320,7 +320,9 @@ nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw, asyh->wndw.olut &= ~BIT (wndw->id); } -if (!ilut && wndw->func->ilut_identity) { +if (!ilut && wndw->func->ilut_identity && + asyw->state.fb->format->format !=DRM_FORMAT_XBGR16161616F && + asyw->state.fb->format->format !=DRM_FORMAT_ABGR16161616F ) {static struct drm_property_blob dummy = {}; ilut = &dummy; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/137 drm/nouveau/volt: Fix for some cards having 0 maximum voltage
In reply to Greg Kroah-HartmanFrom: Mark Menzynski <[email protected]>
[ Upstream commit a1af2afbd244089560794c260b2d4326a86e39b6 ]
Some, mostly Fermi, vbioses appear to have zero max voltage. That causes Nouveau to not parse voltage entries, thus users not being able to set higher clocks.
When changing this value Nvidia driver still appeared to ignore it, and I wasn't able to find out why, thus the code is ignoring the value if it is zero.
--- drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c +2 -0
@@ -96,6 +96,8 @@ nvbios_volt_parse(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len, info->min =min (info->base, info->base + info->step * info->vidmask); info->max =nvbios_rd32 (bios, volt +0x0e ); +if (!info->max) + info->max =max (info->base, info->base + info->step * info->vidmask);break ;case 0x50 : info->min =nvbios_rd32 (bios, volt +0x0a );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/137 clk: renesas: mstp: Set GENPD_FLAG_ALWAYS_ON for clock domain
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit a459a184c978ca9ad538aab93aafdde873953f30 ]
The CPG/MSTP Clock Domain driver does not implement the generic_pm_domain.power_{on,off}() callbacks, as the domain itself cannot be powered down. Hence the domain should be marked as always-on by setting the GENPD_FLAG_ALWAYS_ON flag, to prevent the core PM Domain code from considering it for power-off, and doing unnessary processing.
This also gets rid of a boot warning when the Clock Domain contains an IRQ-safe device, e.g. on RZ/A1:
sh_mtu2 fcff0000.timer: PM domain cpg_clocks will not be powered off
--- drivers/clk/renesas/clk-mstp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/renesas/clk-mstp.c +2 -1
@@ -338,7 +338,8 @@ void __init cpg_mstp_add_clk_domain(struct device_node *np)return ; pd->name = np->name; - pd->flags =GENPD_FLAG_PM_CLK |GENPD_FLAG_ACTIVE_WAKEUP ; + pd->flags =GENPD_FLAG_PM_CLK |GENPD_FLAG_ALWAYS_ON | +GENPD_FLAG_ACTIVE_WAKEUP ; pd->attach_dev = cpg_mstp_attach_dev; pd->detach_dev = cpg_mstp_detach_dev;pm_genpd_init (pd, &pm_domain_always_on_gov, false);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/137 clk: imx8mq: Mark AHB clock as critical
In reply to Greg Kroah-HartmanFrom: Abel Vesa <[email protected]>
[ Upstream commit 9b9c60bed562c3718ae324a86f3f30a4ff983cf8 ]
Initially, the TMU_ROOT clock was marked as critical, which automatically made the AHB clock to stay always on. Since the TMU_ROOT clock is not marked as critical anymore, following commit:
"clk: imx8mq: Remove CLK_IS_CRITICAL flag for IMX8MQ_CLK_TMU_ROOT"
all the clocks that derive from ipg_root clock (and implicitly ahb clock) would also have to enable, along with their own gate, the AHB clock.
But considering that AHB is actually a bus that has to be always on, we mark it as critical in the clock provider driver and then all the clocks that derive from it can be controlled through the dedicated per IP gate which follows after the ipg_root clock.
--- drivers/clk/imx/clk-imx8mq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/imx/clk-imx8mq.c +2 -1
@@ -396,7 +396,8 @@ static int imx8mq_clocks_probe(struct platform_device *pdev) clks[IMX8MQ_CLK_NOC_APB ] =imx8m_clk_composite_critical ("noc_apb" , imx8mq_noc_apb_sels, base +0x8d80 );/* AHB */ - clks[IMX8MQ_CLK_AHB ] =imx8m_clk_composite ("ahb" , imx8mq_ahb_sels, base +0x9000 ); +/* AHB clock is used by the AHB bus therefore marked as critical */ + clks[IMX8MQ_CLK_AHB ] =imx8m_clk_composite_critical ("ahb" , imx8mq_ahb_sels, base +0x9000 ); clks[IMX8MQ_CLK_AUDIO_AHB ] =imx8m_clk_composite ("audio_ahb" , imx8mq_audio_ahb_sels, base +0x9100 );/* IPG */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/137 clk: renesas: cpg-mssr: Set GENPD_FLAG_ALWAYS_ON for clock domain
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit f787216f33ce5b5a2567766398f44ab62157114c ]
The CPG/MSSR Clock Domain driver does not implement the generic_pm_domain.power_{on,off}() callbacks, as the domain itself cannot be powered down. Hence the domain should be marked as always-on by setting the GENPD_FLAG_ALWAYS_ON flag, to prevent the core PM Domain code from considering it for power-off, and doing unnessary processing.
Note that this only affects RZ/A2 SoCs. On R-Car Gen2 and Gen3 SoCs, the R-Car SYSC driver handles Clock Domain creation, and offloads only device attachment/detachment to the CPG/MSSR driver.
--- drivers/clk/renesas/renesas-cpg-mssr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/renesas/renesas-cpg-mssr.c +2 -1
@@ -555,7 +555,8 @@ static int __init cpg_mssr_add_clk_domain(struct device *dev, genpd = &pd->genpd; genpd->name = np->name; - genpd->flags =GENPD_FLAG_PM_CLK |GENPD_FLAG_ACTIVE_WAKEUP ; + genpd->flags =GENPD_FLAG_PM_CLK |GENPD_FLAG_ALWAYS_ON | +GENPD_FLAG_ACTIVE_WAKEUP ; genpd->attach_dev = cpg_mssr_attach_dev; genpd->detach_dev = cpg_mssr_detach_dev;pm_genpd_init (genpd, &pm_domain_always_on_gov, false);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/137 drm/amd/display: support spdif
In reply to Greg Kroah-HartmanFrom: Charlene Liu <[email protected]>
[ Upstream commit b5a41620bb88efb9fb31a4fa5e652e3d5bead7d4 ]
[Description]
port spdif fix to staging:
spdif hardwired to afmt inst 1.
spdif func pointer
spdif resource allocation (reserve last audio endpoint for spdif only)
--- .../gpu/drm/amd/display/dc/core/dc_resource.c | 17 ++++++++--------- drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +8 -9
@@ -261,12 +261,10 @@ bool resource_construct(DC_ERR ("DC: failed to create audio!\n" );return false; } -if (!aud->funcs->endpoint_valid (aud)) { aud->funcs->destroy (&aud);break ; } - pool->audios[i] = aud; pool->audio_count++; }
@@ -1692,24 +1690,25 @@ static struct audio *find_first_free_audio(const struct resource_pool *pool, enum engine_id id) { - int i; -for (i =0 ; i < pool->audio_count; i++) { + int i, available_audio_count; + + available_audio_count = pool->audio_count; + +for (i =0 ; i < available_audio_count; i++) {if ((res_ctx->is_audio_acquired[i] == false) && (res_ctx->is_stream_enc_acquired[i] == true)) {/*we have enough audio endpoint, find the matching inst*/ if (id != i)continue ; -return pool->audios[i]; } } -/* use engine id to find free audio */ -if ((id < pool->audio_count) && (res_ctx->is_audio_acquired[id] == false)) { +/* use engine id to find free audio */ +if ((id < available_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++) { +for (i =0 ; i < available_audio_count; i++) {if (res_ctx->is_audio_acquired[i] == false) {return pool->audios[i]; }
drivers/gpu/drm/amd/display/dc/dce/dce_audio.c +2 -2
@@ -611,6 +611,8 @@ void dce_aud_az_configure(AZ_REG_WRITE (AZALIA_F0_CODEC_PIN_CONTROL_SINK_INFO1 , value); +DC_LOG_HW_AUDIO ("\n\tAUDIO:az_configure: index: %u data, 0x%x, displayName %s: \n" , + audio->inst, value, audio_info->display_name);/* *write the port ID:
@@ -922,7 +924,6 @@ static const struct audio_funcs funcs = { .az_configure = dce_aud_az_configure, .destroy = dce_aud_destroy, }; -void dce_aud_destroy (struct audio **audio) {struct dce_audio *aud =DCE_AUD (*audio);
@@ -953,7 +954,6 @@ struct audio *dce_audio_create( audio->regs = reg; audio->shifts = shifts; audio->masks = masks; -return &audio->base; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainercover 5.2.20-stable review
This is the start of the stable review cycle for the 5.2.20 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue 08 Oct 2019 05:07:10 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.20-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.2.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.2.20-rc1
Eric Biggers <[email protected]>
vfs: set fs_context::user_ns for reconfigure
Bharath Vedartham <[email protected]>
9p/cache.c: Fix memory leak in v9fs_cache_session_get_cookie
Wanpeng Li <[email protected]>
KVM: hyperv: Fix Direct Synthetic timers assert an interrupt w/o lapic_in_kernel
Tetsuo Handa <[email protected]>
kexec: bail out upon SIGKILL when allocating memory.
Andrey Konovalov <[email protected]>
NFC: fix attrs checks in netlink interface
Ming Lei <[email protected]>
dm raid: fix updating of max_discard_sectors limit
Eric Biggers <[email protected]>
smack: use GFP_NOFS while holding inode_smack::smk_lock
Jann Horn <[email protected]>
Smack: Don't ignore other bprm->unsafe flags if LSM_UNSAFE_PTRACE is set
Pierre-Louis Bossart <[email protected]>
soundwire: fix regmap dependencies and align with other serial links
Alexandre Ghiti <[email protected]>
arm: use STACK_TOP when computing mmap base address
Alexandre Ghiti <[email protected]>
arm: properly account for stack randomization and stack guard gap
Alexandre Ghiti <[email protected]>
mips: properly account for stack randomization and stack guard gap
Alexandre Ghiti <[email protected]>
arm64: consider stack randomization for mmap base only when necessary
Nicolas Boichat <[email protected]>
kmemleak: increase DEBUG_KMEMLEAK_EARLY_LOG_SIZE default to 16K
Changwei Ge <[email protected]>
ocfs2: wait for recovering done after direct unlock request
Greg Thelen <[email protected]>
kbuild: clean compressed initramfs image
Yunfeng Ye <[email protected]>
crypto: hisilicon - Fix double free in sec_free_hw_sgl()
David Howells <[email protected]>
hypfs: Fix error number left in struct pointer member
Jens Axboe <[email protected]>
pktcdvd: remove warning on attempting to register non-passthrough dev
OGAWA Hirofumi <[email protected]>
fat: work around race with userspace's read via blockdev while mounting
Mike Rapoport <[email protected]>
ARM: 8903/1: ensure that usable memory in bank 0 starts from a PMD-aligned address
Nathan Chancellor <[email protected]>
ARM: 8905/1: Emit __gnu_mcount_nc when using Clang 10.0.0 or newer
Krzysztof Wilczynski <[email protected]>
PCI: Use static const struct, not const static struct
Jia-Ju Bai <[email protected]>
security: smack: Fix possible null-pointer dereferences in smack_socket_sock_rcv_skb()
Thierry Reding <[email protected]>
PCI: exynos: Propagate errors for optional PHYs
Thierry Reding <[email protected]>
PCI: imx6: Propagate errors for optional regulators
Thierry Reding <[email protected]>
PCI: histb: Propagate errors for optional regulators
Thierry Reding <[email protected]>
PCI: rockchip: Propagate errors for optional regulators
Joao Moreno <[email protected]>
HID: apple: Fix stuck function keys when using FN
Krzysztof Wilczynski <[email protected]>
PCI: Add pci_info_ratelimited() to ratelimit PCI separately
Stephen Smalley <[email protected]>
selinux: fix residual uses of current_security() for the SELinux blob
Biwen Li <[email protected]>
rtc: pcf85363/pcf85263: fix regmap error in set_time
Anson Huang <[email protected]>
rtc: snvs: fix possible race condition
Nick Desaulniers <[email protected]>
ARM: 8875/1: Kconfig: default to AEABI w/ Clang
Pierre-Louis Bossart <[email protected]>
soundwire: intel: fix channel number reported by hardware
Will Deacon <[email protected]>
ARM: 8898/1: mm: Don't treat faults reported from cache maintenance as writes
Peter Zijlstra <[email protected]>
mips/atomic: Fix smp_mb__{before,after}_atomic()
Miroslav Benes <[email protected]>
livepatch: Nullify obj->mod in klp_module_coming()'s error path
Xiaowei Bao <[email protected]>
PCI: layerscape: Add the bar_fixed_64bit property to the endpoint driver
Randy Dunlap <[email protected]>
PCI: pci-hyperv: Fix build errors on non-SYSFS config
Peter Zijlstra <[email protected]>
mips/atomic: Fix loongson_llsc_mb() wreckage
Jason Gerecke <[email protected]>
HID: wacom: Fix several minor compiler warnings
Nishka Dasgupta <[email protected]>
PCI: tegra: Fix OF node reference leak
Kai-Heng Feng <[email protected]>
mfd: intel-lpss: Remove D3cold delay
Hans de Goede <[email protected]>
i2c-cht-wc: Fix lockdep warning
Nathan Chancellor <[email protected]>
MIPS: tlbex: Explicitly cast _PAGE_NO_EXEC to a boolean
Nathan Chancellor <[email protected]>
MIPS: Don't use bc_false uninitialized in __mm_isBranchInstr
Zhou Yanjie <[email protected]>
MIPS: Ingenic: Disable broken BTB lookup optimization.
zhangyi (F) <[email protected]>
ext4: fix potential use after free after remounting with noblock_validity
Chao Yu <[email protected]>
f2fs: fix to drop meta/node pages during umount
Chris Wilson <[email protected]>
dma-buf/sw_sync: Synchronize signal vs syncpt free
Bart Van Assche <[email protected]>
scsi: core: Reduce memory required for SCSI logging
Chunyan Zhang <[email protected]>
clk: sprd: add missing kfree
Jorge Ramirez-Ortiz <[email protected]>
mbox: qcom: add APCS child device for QCS404
Ganesh Goudar <[email protected]>
powerpc: dump kernel log before carrying out fadump or kdump
Bjorn Andersson <[email protected]>
clk: Make clk_bulk_get_all() return a valid "id"
Peng Fan <[email protected]>
clk: imx: clk-pll14xx: unbypass PLL by default
Peng Fan <[email protected]>
clk: imx: pll14xx: avoid glitch when set rate
Eugen Hristev <[email protected]>
clk: at91: select parent if main oscillator or bypass is enabled
Arnd Bergmann <[email protected]>
arm64: fix unreachable code issue with cmpxchg
Bibby Hsieh <[email protected]>
mailbox: mediatek: cmdq: clear the event in cmdq initial flow
Otto Meier <[email protected]>
pinctrl: meson-gxbb: Fix wrong pinning definition for uart_c
Nathan Lynch <[email protected]>
powerpc/pseries: correctly track irq state in default idle
Stephen Boyd <[email protected]>
clk: qcom: gcc-sdm845: Use floor ops for sdcc clks
Oliver O'Halloran <[email protected]>
powerpc/eeh: Clean up EEH PEs after recovery finishes
Deepa Dinamani <[email protected]>
pstore: fs superblock limits
Nicholas Piggin <[email protected]>
powerpc/64s/exception: machine check use correct cfar for late handler
Jean Delvare <[email protected]>
drm/amdgpu/si: fix ASIC tests
Gustavo Romero <[email protected]>
selftests/powerpc: Retry on host facility unavailable
Charlene Liu <[email protected]>
drm/amd/display: support spdif
Geert Uytterhoeven <[email protected]>
clk: renesas: cpg-mssr: Set GENPD_FLAG_ALWAYS_ON for clock domain
Geert Uytterhoeven <[email protected]>
clk: renesas: mstp: Set GENPD_FLAG_ALWAYS_ON for clock domain
Daniel Drake <[email protected]>
pinctrl: amd: disable spurious-firing GPIO IRQs
Mark Menzynski <[email protected]>
drm/nouveau/volt: Fix for some cards having 0 maximum voltage
Ben Skeggs <[email protected]>
drm/nouveau/kms/tu102-: disable input lut when input is already FP16
hexin <[email protected]>
vfio_pci: Restore original state on release
Sam Bobroff <[email protected]>
powerpc/eeh: Clear stale EEH_DEV_NO_HANDLER flag
Sowjanya Komatineni <[email protected]>
pinctrl: tegra: Fix write barrier placement in pmx_writel
Nicholas Piggin <[email protected]>
powerpc/perf: fix imc allocation failure handling
Nathan Lynch <[email protected]>
powerpc/pseries/mobility: use cond_resched when updating device tree
Nicholas Piggin <[email protected]>
powerpc/64s/radix: Fix memory hotplug section page table creation
Christophe Leroy <[email protected]>
powerpc/futex: Fix warning: 'oldval' may be used uninitialized in this function
Nathan Lynch <[email protected]>
powerpc/rtas: use device model APIs and serialization during LPM
Cédric Le Goater <[email protected]>
powerpc/xmon: Check for HV mode when dumping XIVE info from OPAL
Stephen Boyd <[email protected]>
clk: zx296718: Don't reference clk_init_data after registration
Stephen Boyd <[email protected]>
clk: sprd: Don't reference clk_init_data after registration
Stephen Boyd <[email protected]>
clk: meson: axg-audio: Don't reference clk_init_data after registration
Stephen Boyd <[email protected]>
clk: sirf: Don't reference clk_init_data after registration
Stephen Boyd <[email protected]>
clk: actions: Don't reference clk_init_data after registration
Alexey Kardashevskiy <[email protected]>
powerpc/powernv/ioda2: Allocate TCE table levels on demand for default DMA window
Lewis Huang <[email protected]>
drm/amd/display: reprogram VM config when system resume
Bayan Zabihiyan <[email protected]>
drm/amd/display: Fix frames_to_insert math
Anthony Koo <[email protected]>
drm/amd/display: fix issue where 252-255 values are clipped
Icenowy Zheng <[email protected]>
clk: sunxi-ng: v3s: add missing clock slices for MMC2 module clocks
Nathan Huckleberry <[email protected]>
clk: qoriq: Fix -Wunused-const-variable
Corey Minyard <[email protected]>
ipmi_si: Only schedule continuously in the thread in maintenance mode
Alexandre Torgue <[email protected]>
pinctrl: stmfx: update pinconf settings
Nathan Chancellor <[email protected]>
PCI: rpaphp: Avoid a sometimes-uninitialized warning
Abel Vesa <[email protected]>
clk: imx8mq: Mark AHB clock as critical
Jia-Ju Bai <[email protected]>
gpu: drm: radeon: Fix a possible null-pointer dereference in radeon_connector_set_property()
KyleMahlkuch <[email protected]>
drm/radeon: Fix EEH during kexec
Andrey Grodzovsky <[email protected]>
drm/amdgpu: Fix hard hang for S/G display BOs.
Sean Paul <[email protected]>
drm/rockchip: Check for fast link training before enabling psr
Navid Emamdoost <[email protected]>
drm/panel: check failure cases in the probe func
Ahmad Fatoum <[email protected]>
drm/stm: attach gem fence to atomic state
Noralf Trønnes <[email protected]>
drm/tinydrm/Kconfig: drivers: Select BACKLIGHT_CLASS_DEVICE
Marko Kohtala <[email protected]>
video: ssd1307fb: Start page range at page_offset
Anthony Koo <[email protected]>
drm/amd/display: add monitor patch to add T7 delay
Lucas Stach <[email protected]>
drm/panel: simple: fix AUO g185han01 horizontal blanking
Rodrigo Siqueira <[email protected]>
drm/vkms: Avoid assigning 0 for possible_crtc
Andrey Smirnov <[email protected]>
drm/bridge: tc358767: Increase AUX transfer length limit
Daniel Vetter <[email protected]>
drm/vkms: Fix crc worker races
Vladimir Oltean <[email protected]>
net: sched: taprio: Avoid division by zero on invalid link speed
Vladimir Oltean <[email protected]>
net: sched: cbs: Avoid division by zero when calculating the port rate
Vladimir Oltean <[email protected]>
ptp_qoriq: Initialize the registers' spinlock before calling ptp_qoriq_settime
Dongli Zhang <[email protected]>
xen-netfront: do not use ~0U as error return value for xennet_fill_frags()
Dotan Barak <[email protected]>
net/rds: Fix error handling in rds_ib_add_one()
Josh Hunt <[email protected]>
udp: only do GSO if # of segs > 1
Eric Dumazet <[email protected]>
tcp: adjust rto_base in retransmits_timed_out()
Linus Walleij <[email protected]>
net: dsa: rtl8366: Check VLAN ID and not ports
Dexuan Cui <[email protected]>
vsock: Fix a lockdep warning in __vsock_release()
Josh Hunt <[email protected]>
udp: fix gso_segs calculations
Tuong Lien <[email protected]>
tipc: fix unlimited bundling of small messages
Eric Dumazet <[email protected]>
sch_dsmark: fix potential NULL deref in dsmark_init()
Eric Dumazet <[email protected]>
sch_cbq: validate TCA_CBQ_WRROPT to avoid crash
David Howells <[email protected]>
rxrpc: Fix rxrpc_recvmsg tracepoint
Reinhard Speyerer <[email protected]>
qmi_wwan: add support for Cinterion CLS8 devices
Eric Dumazet <[email protected]>
nfc: fix memory leak in llcp_sock_bind()
Martin KaFai Lau <[email protected]>
net: Unpublish sk from sk_reuseport_cb before call_rcu
Vladimir Oltean <[email protected]>
net: sched: taprio: Fix potential integer overflow in taprio_set_picos_per_byte
Navid Emamdoost <[email protected]>
net: qlogic: Fix memory leak in ql_alloc_large_buffers
Paolo Abeni <[email protected]>
net: ipv4: avoid mixed n_redirects and rate_tokens usage
David Ahern <[email protected]>
ipv6: Handle missing host route in __ipv6_ifa_notify
Eric Dumazet <[email protected]>
ipv6: drop incoming packets having a v4mapped source address
Johan Hovold <[email protected]>
hso: fix NULL-deref on tty open
Haishuang Yan <[email protected]>
erspan: remove the incorrect mtu limit for erspan
Vishal Kulkarni <[email protected]>
cxgb4:Fix out-of-bounds MSI-X info array access
-------------
Diffstat:
Makefile | 4 +- arch/arm/Kconfig | 7 +- arch/arm/Makefile | 4 + arch/arm/mm/fault.c | 4 +- arch/arm/mm/fault.h | 1 + arch/arm/mm/mmap.c | 16 +- arch/arm/mm/mmu.c | 16 ++ arch/arm64/include/asm/cmpxchg.h | 6 +- arch/arm64/mm/mmap.c | 6 +- arch/mips/include/asm/atomic.h | 19 ++- arch/mips/include/asm/barrier.h | 44 +++-- arch/mips/include/asm/bitops.h | 47 +++-- arch/mips/include/asm/cmpxchg.h | 11 +- arch/mips/include/asm/mipsregs.h | 4 + arch/mips/kernel/branch.c | 2 +- arch/mips/kernel/cpu-probe.c | 7 + arch/mips/kernel/syscall.c | 1 + arch/mips/mm/mmap.c | 14 +- arch/mips/mm/tlbex.c | 2 +- arch/powerpc/include/asm/futex.h | 3 +- arch/powerpc/kernel/eeh_driver.c | 47 ++++- arch/powerpc/kernel/eeh_event.c | 8 + arch/powerpc/kernel/eeh_pe.c | 23 ++- arch/powerpc/kernel/exceptions-64s.S | 4 + arch/powerpc/kernel/rtas.c | 11 +- arch/powerpc/kernel/traps.c | 1 + arch/powerpc/mm/book3s64/radix_pgtable.c | 2 +- arch/powerpc/perf/imc-pmu.c | 29 ++-- arch/powerpc/platforms/powernv/pci-ioda-tce.c | 20 +-- arch/powerpc/platforms/powernv/pci.h | 2 +- arch/powerpc/platforms/pseries/mobility.c | 9 + arch/powerpc/platforms/pseries/setup.c | 3 + arch/powerpc/xmon/xmon.c | 17 +- arch/s390/hypfs/inode.c | 9 +- arch/x86/kvm/hyperv.c | 12 +- drivers/base/regmap/Kconfig | 2 +- drivers/block/pktcdvd.c | 1 - drivers/char/ipmi/ipmi_si_intf.c | 24 ++- drivers/clk/actions/owl-common.c | 5 +- drivers/clk/at91/clk-main.c | 10 +- drivers/clk/clk-bulk.c | 5 +- drivers/clk/clk-qoriq.c | 2 +- drivers/clk/imx/clk-imx8mq.c | 3 +- drivers/clk/imx/clk-pll14xx.c | 27 ++- drivers/clk/meson/axg-audio.c | 7 +- drivers/clk/qcom/gcc-sdm845.c | 4 +- drivers/clk/renesas/clk-mstp.c | 3 +- drivers/clk/renesas/renesas-cpg-mssr.c | 3 +- drivers/clk/sirf/clk-common.c | 12 +- drivers/clk/sprd/common.c | 5 +- drivers/clk/sprd/pll.c | 2 + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 3 + drivers/clk/zte/clk-zx296718.c | 109 ++++++------ drivers/crypto/hisilicon/sec/sec_algs.c | 13 +- drivers/dma-buf/sw_sync.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 +- drivers/gpu/drm/amd/amdgpu/si.c | 6 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 8 + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 4 + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 17 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 4 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 3 +- .../drm/amd/display/modules/freesync/freesync.c | 27 +-- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 +- drivers/gpu/drm/bridge/tc358767.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 4 +- drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c | 2 + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 13 ++ drivers/gpu/drm/panel/panel-simple.c | 6 +- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 8 + drivers/gpu/drm/stm/ltdc.c | 2 + drivers/gpu/drm/tinydrm/Kconfig | 8 +- drivers/gpu/drm/vkms/vkms_crc.c | 27 ++- drivers/gpu/drm/vkms/vkms_crtc.c | 9 +- drivers/gpu/drm/vkms/vkms_drv.c | 2 +- drivers/gpu/drm/vkms/vkms_drv.h | 6 +- drivers/gpu/drm/vkms/vkms_output.c | 6 +- drivers/gpu/drm/vkms/vkms_plane.c | 4 +- drivers/hid/hid-apple.c | 49 +++--- drivers/hid/wacom_sys.c | 7 +- drivers/hid/wacom_wac.c | 4 +- drivers/i2c/busses/i2c-cht-wc.c | 46 +++++ drivers/mailbox/mtk-cmdq-mailbox.c | 5 + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 8 +- drivers/md/dm-raid.c | 10 +- drivers/mfd/intel-lpss-pci.c | 2 + drivers/net/dsa/rtl8366.c | 11 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 9 +- drivers/net/ethernet/qlogic/qla3xxx.c | 1 + drivers/net/usb/hso.c | 12 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/xen-netfront.c | 17 +- drivers/pci/Kconfig | 2 +- drivers/pci/controller/dwc/pci-exynos.c | 2 +- drivers/pci/controller/dwc/pci-imx6.c | 4 +- drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 + drivers/pci/controller/dwc/pcie-histb.c | 4 +- drivers/pci/controller/pci-tegra.c | 22 ++- drivers/pci/controller/pcie-rockchip-host.c | 16 +- drivers/pci/hotplug/rpaphp_core.c | 18 +- drivers/pci/pci-bridge-emul.c | 4 +- drivers/pci/pci.c | 4 +- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 12 +- drivers/pinctrl/pinctrl-amd.c | 12 +- drivers/pinctrl/pinctrl-stmfx.c | 24 +-- drivers/pinctrl/tegra/pinctrl-tegra.c | 4 +- drivers/ptp/ptp_qoriq.c | 3 +- drivers/rtc/rtc-pcf85363.c | 7 +- drivers/rtc/rtc-snvs.c | 11 +- drivers/scsi/scsi_logging.c | 48 +----- drivers/soundwire/Kconfig | 7 +- drivers/soundwire/Makefile | 2 +- drivers/soundwire/intel.c | 10 ++ drivers/vfio/pci/vfio_pci.c | 17 +- drivers/video/fbdev/ssd1307fb.c | 2 +- fs/9p/cache.c | 2 + fs/ext4/block_validity.c | 189 +++++++++++++++------ fs/ext4/ext4.h | 10 +- fs/f2fs/super.c | 14 ++ fs/fat/dir.c | 13 +- fs/fat/fatent.c | 3 + fs/fs_context.c | 4 +- fs/ocfs2/dlm/dlmunlock.c | 23 ++- fs/pstore/ram.c | 2 + include/linux/mailbox/mtk-cmdq-mailbox.h | 3 + include/linux/pci.h | 3 + include/linux/soc/mediatek/mtk-cmdq.h | 3 - include/scsi/scsi_dbg.h | 2 - include/trace/events/rxrpc.h | 2 +- kernel/kexec_core.c | 2 + kernel/livepatch/core.c | 1 + lib/Kconfig.debug | 2 +- net/core/sock.c | 11 +- net/ipv4/ip_gre.c | 1 + net/ipv4/route.c | 5 +- net/ipv4/tcp_timer.c | 9 +- net/ipv4/udp.c | 11 +- net/ipv6/addrconf.c | 17 +- net/ipv6/ip6_input.c | 10 ++ net/ipv6/udp.c | 9 +- net/nfc/llcp_sock.c | 7 +- net/nfc/netlink.c | 6 +- net/rds/ib.c | 6 +- net/sched/sch_cbq.c | 43 +++-- net/sched/sch_cbs.c | 2 +- net/sched/sch_dsmark.c | 2 + net/sched/sch_taprio.c | 5 +- net/tipc/link.c | 29 ++-- net/tipc/msg.c | 5 +- net/vmw_vsock/af_vsock.c | 16 +- net/vmw_vsock/hyperv_transport.c | 2 +- net/vmw_vsock/virtio_transport_common.c | 2 +- security/selinux/hooks.c | 2 +- security/selinux/include/objsec.h | 20 +-- security/smack/smack_access.c | 6 +- security/smack/smack_lsm.c | 7 +- tools/testing/selftests/net/udpgso.c | 16 +- tools/testing/selftests/powerpc/tm/tm.h | 3 +- usr/Makefile | 3 + 162 files changed, 1201 insertions(+), 611 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 49/137 clk: actions: Dont reference clk_init_data after registration
From: Stephen Boyd <[email protected]>
[ Upstream commit cf9ec1fc6d7cceb73e7f1efd079d2eae173fdf57 ]
A future patch is going to change semantics of clk_register() so that clk_hw::init is guaranteed to be NULL after a clk is registered. Avoid referencing this member here so that we don't run into NULL pointer exceptions.
--- drivers/clk/actions/owl-common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/actions/owl-common.c +3 -2
@@ -68,16 +68,17 @@ int owl_clk_probe(struct device *dev, struct clk_hw_onecell_data *hw_clks)struct clk_hw *hw;for (i =0 ; i < hw_clks->num; i++) { +const char *name; hw = hw_clks->hws[i]; -if (IS_ERR_OR_NULL (hw))continue ; + name = hw->init->name; ret =devm_clk_hw_register (dev, hw);if (ret) {dev_err (dev,"Couldn't register clock %d - %s\n" , - i, hw->init->name); + i, name);return ret; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/137 clk: meson: axg-audio: Dont reference clk_init_data after registration
In reply to Greg Kroah-HartmanFrom: Stephen Boyd <[email protected]>
[ Upstream commit 1610dd79d0f6202c5c1a91122255fa598679c13a ]
A future patch is going to change semantics of clk_register() so that clk_hw::init is guaranteed to be NULL after a clk is registered. Avoid referencing this member here so that we don't run into NULL pointer exceptions.
--- drivers/clk/meson/axg-audio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/clk/meson/axg-audio.c +5 -2
@@ -992,15 +992,18 @@ static int axg_audio_clkc_probe(struct platform_device *pdev)/* Take care to skip the registered input clocks */ for (i =AUD_CLKID_DDR_ARB ; i < data->hw_onecell_data->num; i++) { +const char *name; + hw = data->hw_onecell_data->hws[i];/* array might be sparse */ if (!hw)continue ; + name = hw->init->name; + ret =devm_clk_hw_register (dev, hw);if (ret) { -dev_err (dev,"failed to register clock %s\n" , - hw->init->name); +dev_err (dev,"failed to register clock %s\n" , name);return ret; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/137 selftests/powerpc: Retry on host facility unavailable
In reply to Greg Kroah-HartmanFrom: Gustavo Romero <[email protected]>
[ Upstream commit 6652bf6408895b09d31fd4128a1589a1a0672823 ]
TM test tm-unavailable must take into account aborts due to host aborting a transactin because of a facility unavailable exception, just like it already does for aborts on reschedules (TM_CAUSE_KVM_RESCHED).
--- tools/testing/selftests/powerpc/tm/tm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/powerpc/tm/tm.h +2 -1
@@ -55,7 +55,8 @@ static inline bool failure_is_unavailable(void)static inline bool failure_is_reschedule (void ) {if ((failure_code () &TM_CAUSE_RESCHED ) ==TM_CAUSE_RESCHED || - (failure_code () &TM_CAUSE_KVM_RESCHED ) ==TM_CAUSE_KVM_RESCHED ) + (failure_code () &TM_CAUSE_KVM_RESCHED ) ==TM_CAUSE_KVM_RESCHED || + (failure_code () &TM_CAUSE_KVM_FAC_UNAV ) ==TM_CAUSE_KVM_FAC_UNAV )return true;return false;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/137 clk: qcom: gcc-sdm845: Use floor ops for sdcc clks
In reply to Greg Kroah-HartmanFrom: Stephen Boyd <[email protected]>
[ Upstream commit 5e4b7e82d497580bc430576c4c9bce157dd72512 ]
Some MMC cards fail to enumerate properly when inserted into an MMC slot on sdm845 devices. This is because the clk ops for qcom clks round the frequency up to the nearest rate instead of down to the nearest rate. For example, the MMC driver requests a frequency of 52MHz from clk_set_rate() but the qcom implementation for these clks rounds 52MHz up to the next supported frequency of 100MHz. The MMC driver could be modified to request clk rate ranges but for now we can fix this in the clk driver by changing the rounding policy for this clk to be round down instead of round up.
--- drivers/clk/qcom/gcc-sdm845.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/qcom/gcc-sdm845.c +2 -2
@@ -685,7 +685,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { .name = "gcc_sdcc2_apps_clk_src", .parent_names = gcc_parent_names_10, .num_parents = 5, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_floor_ops, }, };
@@ -709,7 +709,7 @@ static struct clk_rcg2 gcc_sdcc4_apps_clk_src = { .name = "gcc_sdcc4_apps_clk_src", .parent_names = gcc_parent_names_0, .num_parents = 4, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/137 pinctrl: meson-gxbb: Fix wrong pinning definition for uart_c
In reply to Greg Kroah-HartmanFrom: Otto Meier <[email protected]>
[ Upstream commit cb0438e4436085d89706b5ccfce4d5da531253de ]
Hi i tried to use the uart_C of the the odroid-c2.
I enabled it in the dts file. During boot it crashed when the the sdcard slot is addressed.
After long search in the net i found this:
https://forum.odroid.com/viewtopic.php?f=139&t=25371&p=194370&hilit=uart_C#p177856
After changing the pin definitions accordingly erverything works. Uart_c is functioning and sdcard ist working.
--- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/pinctrl/meson/pinctrl-meson-gxbb.c +6 -6
@@ -192,8 +192,8 @@ static const unsigned int uart_rts_b_pins[] = { GPIODV_27 };static const unsigned int uart_tx_c_pins[] = {GPIOY_13 };static const unsigned int uart_rx_c_pins[] = {GPIOY_14 }; -static const unsigned int uart_cts_c_pins[] = {GPIOX_11 }; -static const unsigned int uart_rts_c_pins[] = {GPIOX_12 }; +static const unsigned int uart_cts_c_pins[] = {GPIOY_11 }; +static const unsigned int uart_rts_c_pins[] = {GPIOY_12 };static const unsigned int i2c_sck_a_pins[] = {GPIODV_25 };static const unsigned int i2c_sda_a_pins[] = {GPIODV_24 };
@@ -439,10 +439,10 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = {GROUP (pwm_f_x,3 ,18 ),/* Bank Y */ -GROUP (uart_cts_c,1 ,19 ), -GROUP (uart_rts_c,1 ,18 ), -GROUP (uart_tx_c,1 ,17 ), -GROUP (uart_rx_c,1 ,16 ), +GROUP (uart_cts_c,1 ,17 ), +GROUP (uart_rts_c,1 ,16 ), +GROUP (uart_tx_c,1 ,19 ), +GROUP (uart_rx_c,1 ,18 ),GROUP (pwm_a_y,1 ,21 ),GROUP (pwm_f_y,1 ,20 ), GROUP(i2s_out_ch23_y, 1, 5),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/137 mailbox: mediatek: cmdq: clear the event in cmdq initial flow
In reply to Greg Kroah-HartmanFrom: Bibby Hsieh <[email protected]>
[ Upstream commit 6058f11870b8e6d4f5cc7b591097c00bf69a000d ]
GCE hardware stored event information in own internal sysram, if the initial value in those sysram is not zero value it will cause a situation that gce can wait the event immediately after client ask gce to wait event but not really trigger the corresponding hardware.
In order to make sure that the wait event function is exactly correct, we need to clear the sysram value in cmdq initial flow.
--- drivers/mailbox/mtk-cmdq-mailbox.c | 5 +++++ include/linux/mailbox/mtk-cmdq-mailbox.h | 3 +++ include/linux/soc/mediatek/mtk-cmdq.h | 3 --- 3 files changed, 8 insertions(+), 3 deletions(-)
drivers/mailbox/mtk-cmdq-mailbox.c +5 -0
@@ -22,6 +22,7 @@#define CMDQ_NUM_CMD (t) (t->cmd_buf_size / CMDQ_INST_SIZE)#define CMDQ_CURR_IRQ_STATUS 0x10 +#define CMDQ_SYNC_TOKEN_UPDATE 0x68#define CMDQ_THR_SLOT_CYCLES 0x30#define CMDQ_THR_BASE 0x100#define CMDQ_THR_SIZE 0x80
@@ -104,8 +105,12 @@ static void cmdq_thread_resume(struct cmdq_thread *thread)static void cmdq_init (struct cmdq *cmdq) { +int i; +WARN_ON (clk_enable (cmdq->clock) <0 );writel (CMDQ_THR_ACTIVE_SLOT_CYCLES , cmdq->base +CMDQ_THR_SLOT_CYCLES ); +for (i =0 ; i <=CMDQ_MAX_EVENT ; i++) +writel (i, cmdq->base +CMDQ_SYNC_TOKEN_UPDATE );clk_disable (cmdq->clock); }
include/linux/mailbox/mtk-cmdq-mailbox.h +3 -0
@@ -20,6 +20,9 @@#define CMDQ_WFE_WAIT BIT(15)#define CMDQ_WFE_WAIT_VALUE 0x1 +/** cmdq event maximum */ +#define CMDQ_MAX_EVENT 0x3ff +/* * CMDQ_CODE_MASK: * set write mask
include/linux/soc/mediatek/mtk-cmdq.h +0 -3
@@ -13,9 +13,6 @@#define CMDQ_NO_TIMEOUT 0xffffffffu -/** cmdq event maximum */ -#define CMDQ_MAX_EVENT 0x3ff -struct cmdq_pkt ;struct cmdq_client {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/137 arm64: fix unreachable code issue with cmpxchg
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 920fdab7b3ce98c14c840261e364f490f3679a62 ]
On arm64 build with clang, sometimes the __cmpxchg_mb is not inlined when CONFIG_OPTIMIZE_INLINING is set.
Clang then fails a compile-time assertion, because it cannot tell at compile time what the size of the argument is:
mm/memcontrol.o: In function `__cmpxchg_mb':
memcontrol.c:(.text+0x1a4c): undefined reference to __compiletime_assert_175' memcontrol.c:(.text+0x1a4c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol __compiletime_assert_175'
Mark all of the cmpxchg() style functions as __always_inline to ensure that the compiler can see the result.
--- arch/arm64/include/asm/cmpxchg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/include/asm/cmpxchg.h +3 -3
@@ -63,7 +63,7 @@ __XCHG_CASE( , , mb_, 64, dmb ish, nop, , a, l, "memory")#undef __XCHG_CASE#define __XCHG_GEN (sfx) \ -static inline unsigned long __xchg##sfx(unsigned long x, \ +static __always_inline unsigned long __xchg##sfx(unsigned long x, \ volatile void *ptr, \ int size) \ { \
@@ -105,7 +105,7 @@ __XCHG_GEN(_mb)#define arch_xchg (...) __xchg_wrapper( _mb, __VA_ARGS__)#define __CMPXCHG_GEN (sfx) \ -static inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ +static __always_inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ unsigned long old, \ unsigned long new, \ int size) \
@@ -212,7 +212,7 @@ __CMPWAIT_CASE( , , 64);#undef __CMPWAIT_CASE#define __CMPWAIT_GEN (sfx) \ -static inline void __cmpwait##sfx(volatile void *ptr, \ +static __always_inline void __cmpwait##sfx(volatile void *ptr, \ unsigned long val, \ int size) \ { \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/137 clk: at91: select parent if main oscillator or bypass is enabled
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
[ Upstream commit 69a6bcde7fd3fe6f3268ce26f31d9d9378384c98 ]
Selecting the right parent for the main clock is done using only main oscillator enabled bit.
In case we have this oscillator bypassed by an external signal (no driving on the XOUT line), we still use external clock, but with BYPASS bit set. So, in this case we must select the same parent as before. Create a macro that will select the right parent considering both bits from the MOR register.
Use this macro when looking for the right parent.
--- drivers/clk/at91/clk-main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/clk/at91/clk-main.c +7 -3
@@ -21,6 +21,10 @@#define MOR_KEY_MASK (0xff << 16) +#define clk_main_parent_select (s) (((s) & \ + (AT91_PMC_MOSCEN | \ + AT91_PMC_OSCBYPASS)) ? 1 : 0) +struct clk_main_osc {struct clk_hw hw;struct regmap *regmap;
@@ -113,7 +117,7 @@ static int clk_main_osc_is_prepared(struct clk_hw *hw)regmap_read (regmap,AT91_PMC_SR , &status); -return (status &AT91_PMC_MOSCS ) && (tmp &AT91_PMC_MOSCEN ); +return (status &AT91_PMC_MOSCS ) &&clk_main_parent_select (tmp); }static const struct clk_ops main_osc_ops = {
@@ -450,7 +454,7 @@ static u8 clk_sam9x5_main_get_parent(struct clk_hw *hw)regmap_read (clkmain->regmap,AT91_CKGR_MOR , &status); -return status &AT91_PMC_MOSCEN ?1 :0 ; +return clk_main_parent_select (status); }static const struct clk_ops sam9x5_main_ops = {
@@ -492,7 +496,7 @@ at91_clk_register_sam9x5_main(struct regmap *regmap, clkmain->hw.init = &init; clkmain->regmap = regmap;regmap_read (clkmain->regmap,AT91_CKGR_MOR , &status); - clkmain->parent = status &AT91_PMC_MOSCEN ?1 :0 ; + clkmain->parent =clk_main_parent_select (status); hw = &clkmain->hw; ret =clk_hw_register (NULL , &clkmain->hw);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/137 clk: imx: pll14xx: avoid glitch when set rate
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit dee1bc9c23cd41fe32549c0adbe6cb57cab02282 ]
According to PLL1443XA and PLL1416X spec,
"When BYPASS is 0 and RESETB is changed from 0 to 1, FOUT starts to output unstable clock until lock time passes. PLL1416X/PLL1443XA may generate a glitch at FOUT."
So set BYPASS when RESETB is changed from 0 to 1 to avoid glitch. In the end of set rate, BYPASS will be cleared.
When prepare clock, also need to take care to avoid glitch. So we also follow Spec to set BYPASS before RESETB changed from 0 to 1. And add a check if the RESETB is already 0, directly return 0;
--- drivers/clk/imx/clk-pll14xx.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/clk/imx/clk-pll14xx.c +21 -1
@@ -191,6 +191,10 @@ static int clk_pll1416x_set_rate(struct clk_hw *hw, unsigned long drate, tmp &= ~RST_MASK ;writel_relaxed (tmp, pll->base); +/* Enable BYPASS */ + tmp |=BYPASS_MASK ; +writel (tmp, pll->base); + div_val = (rate->mdiv <<MDIV_SHIFT ) | (rate->pdiv <<PDIV_SHIFT ) | (rate->sdiv <<SDIV_SHIFT );writel_relaxed (div_val, pll->base +0x4 );
@@ -250,6 +254,10 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate, tmp &= ~RST_MASK ;writel_relaxed (tmp, pll->base); +/* Enable BYPASS */ + tmp |=BYPASS_MASK ; +writel_relaxed (tmp, pll->base); + div_val = (rate->mdiv <<MDIV_SHIFT ) | (rate->pdiv <<PDIV_SHIFT ) | (rate->sdiv <<SDIV_SHIFT );writel_relaxed (div_val, pll->base +0x4 );
@@ -283,16 +291,28 @@ static int clk_pll14xx_prepare(struct clk_hw *hw) {struct clk_pll14xx *pll =to_clk_pll14xx (hw);u32 val; +int ret;/* * RESETB = 1 from 0, PLL starts its normal * operation after lock time */ val =readl_relaxed (pll->base +GNRL_CTL ); +if (val &RST_MASK ) +return 0 ; + val |=BYPASS_MASK ; +writel_relaxed (val, pll->base +GNRL_CTL ); val |=RST_MASK ;writel_relaxed (val, pll->base +GNRL_CTL ); -return clk_pll14xx_wait_lock (pll); + ret =clk_pll14xx_wait_lock (pll); +if (ret) +return ret; + + val &= ~BYPASS_MASK ; +writel_relaxed (val, pll->base +GNRL_CTL ); + +return 0 ; }static int clk_pll14xx_is_prepared (struct clk_hw *hw)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/137 clk: imx: clk-pll14xx: unbypass PLL by default
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit a9aa8306074d9519dd6e5fdf07240b01bac72e04 ]
When registering the PLL, unbypass the PLL.
The PLL has two bypass control bit, BYPASS and EXT_BYPASS. we will expose EXT_BYPASS to clk driver for mux usage, and keep BYPASS inside pll14xx usage. The PLL has a restriction that when M/P change, need to RESET/BYPASS pll to avoid glitch, so we could not expose BYPASS.
To make it easy for clk driver usage, unbypass PLL which does not hurt current function.
--- drivers/clk/imx/clk-pll14xx.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/clk/imx/clk-pll14xx.c +5 -0
@@ -368,6 +368,7 @@ struct clk *imx_clk_pll14xx(const char *name, const char *parent_name,struct clk_pll14xx *pll;struct clk *clk;struct clk_init_data init; +u32 val; pll =kzalloc (sizeof (*pll),GFP_KERNEL );if (!pll)
@@ -399,6 +400,10 @@ struct clk *imx_clk_pll14xx(const char *name, const char *parent_name, pll->rate_table = pll_clk->rate_table; pll->rate_count = pll_clk->rate_count; + val =readl_relaxed (pll->base +GNRL_CTL ); + val &= ~BYPASS_MASK ; +writel_relaxed (val, pll->base +GNRL_CTL ); + clk =clk_register (NULL , &pll->hw);if (IS_ERR (clk)) { pr_err("%s: failed to register pll %s %lu\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/137 clk: Make clk_bulk_get_all() return a valid "id"
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit 7f81c2426587b34bf73e643c1a6d080dfa14cf8a ]
The adreno driver expects the "id" field of the returned clk_bulk_data to be filled in with strings from the clock-names property.
But due to the use of kmalloc_array() in of_clk_bulk_get_all() it receives a list of bogus pointers instead.
Zero-initialize the "id" field and attempt to populate with strings from the clock-names property to resolve both these issues.
--- drivers/clk/clk-bulk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/clk-bulk.c +4 -1
@@ -18,10 +18,13 @@ static int __must_check of_clk_bulk_get(struct device_node *np, int num_clks,int ret;int i; -for (i =0 ; i < num_clks; i++) +for (i =0 ; i < num_clks; i++) { + clks[i].id =NULL ; clks[i].clk =NULL ; + }for (i =0 ; i < num_clks; i++) { +of_property_read_string_index (np,"clock-names" , i, &clks[i].id); clks[i].clk =of_clk_get (np, i);if (IS_ERR (clks[i].clk)) { ret =PTR_ERR (clks[i].clk);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/137 pinctrl: stmfx: update pinconf settings
In reply to Greg Kroah-HartmanFrom: Alexandre Torgue <[email protected]>
[ Upstream commit a502b343ebd0eab38f3cb33fbb84011847cf5aac ]
According to the following tab (coming from STMFX datasheet), updates have to done in stmfx_pinconf_set function:
-"type" has to be set when "bias" is configured as "pull-up or pull-down" -PIN_CONFIG_DRIVE_PUSH_PULL should only be used when gpio is configured as
output. There is so no need to check direction.
DIR | TYPE | PUPD | MFX GPIO configuration ----|------|------|--------------------------------------------------- 1 | 1 | 1 | OUTPUT open drain with internal pull-up resistor ----|------|------|--------------------------------------------------- 1 | 1 | 0 | OUTPUT open drain with internal pull-down resistor ----|------|------|--------------------------------------------------- 1 | 0 | 0/1 | OUTPUT push pull no pull ----|------|------|--------------------------------------------------- 0 | 1 | 1 | INPUT with internal pull-up resistor ----|------|------|--------------------------------------------------- 0 | 1 | 0 | INPUT with internal pull-down resistor ----|------|------|--------------------------------------------------- 0 | 0 | 1 | INPUT floating ----|------|------|--------------------------------------------------- 0 | 0 | 0 | analog (GPIO not used, default setting)
--- drivers/pinctrl/pinctrl-stmfx.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/pinctrl/pinctrl-stmfx.c +12 -12
@@ -296,29 +296,29 @@ static int stmfx_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,switch (param) {case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT :case PIN_CONFIG_BIAS_DISABLE : +case PIN_CONFIG_DRIVE_PUSH_PULL : + ret =stmfx_pinconf_set_type (pctl, pin,0 ); +if (ret) +return ret; +break ;case PIN_CONFIG_BIAS_PULL_DOWN : + ret =stmfx_pinconf_set_type (pctl, pin,1 ); +if (ret) +return ret; ret =stmfx_pinconf_set_pupd (pctl, pin,0 );if (ret)return ret;break ;case PIN_CONFIG_BIAS_PULL_UP : - ret =stmfx_pinconf_set_pupd (pctl, pin,1 ); + ret =stmfx_pinconf_set_type (pctl, pin,1 );if (ret)return ret; -break ; -case PIN_CONFIG_DRIVE_OPEN_DRAIN : -if (!dir) - ret =stmfx_pinconf_set_type (pctl, pin,1 ); -else - ret =stmfx_pinconf_set_type (pctl, pin,0 ); + ret =stmfx_pinconf_set_pupd (pctl, pin,1 );if (ret)return ret;break ; -case PIN_CONFIG_DRIVE_PUSH_PULL : -if (!dir) - ret =stmfx_pinconf_set_type (pctl, pin,0 ); -else - ret =stmfx_pinconf_set_type (pctl, pin,1 ); +case PIN_CONFIG_DRIVE_OPEN_DRAIN : + ret =stmfx_pinconf_set_type (pctl, pin,1 );if (ret)return ret;break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/137 ipmi_si: Only schedule continuously in the thread in maintenance mode
In reply to Greg Kroah-HartmanFrom: Corey Minyard <[email protected]>
[ Upstream commit 340ff31ab00bca5c15915e70ad9ada3030c98cf8 ]
ipmi_thread() uses back-to-back schedule() to poll for command completion which, on some machines, can push up CPU consumption and heavily tax the scheduler locks leading to noticeable overall performance degradation.
This was originally added so firmware updates through IPMI would complete in a timely manner. But we can't kill the scheduler locks for that one use case.
Instead, only run schedule() continuously in maintenance mode, where firmware updates should run.
--- drivers/char/ipmi/ipmi_si_intf.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +19 -5
@@ -221,6 +221,9 @@ struct smi_info {*/ bool irq_enable_broken; +/* Is the driver in maintenance mode? */ +bool in_maintenance_mode; +/* * Did we get an attention that we did not handle? */
@@ -1007,11 +1010,20 @@ static int ipmi_thread(void *data)spin_unlock_irqrestore (&(smi_info->si_lock), flags); busy_wait =ipmi_thread_busy_wait (smi_result, smi_info, &busy_until); -if (smi_result ==SI_SM_CALL_WITHOUT_DELAY ) +if (smi_result ==SI_SM_CALL_WITHOUT_DELAY ) { ;/* do nothing */ -else if (smi_result ==SI_SM_CALL_WITH_DELAY && busy_wait) -schedule (); -else if (smi_result ==SI_SM_IDLE ) { + }else if (smi_result ==SI_SM_CALL_WITH_DELAY && busy_wait) { +/* +* In maintenance mode we run as fast as +* possible to allow firmware updates to +* complete as fast as possible, but normally +* don't bang on the scheduler. +*/ +if (smi_info->in_maintenance_mode) +schedule (); +else +usleep_range (100 ,200 ); + }else if (smi_result ==SI_SM_IDLE ) {if (atomic_read (&smi_info->need_watch)) {schedule_timeout_interruptible (100 ); }else {
@@ -1019,8 +1031,9 @@ static int ipmi_thread(void *data)__set_current_state (TASK_INTERRUPTIBLE );schedule (); } - }else + }else {schedule_timeout_interruptible (1 ); + } }return 0 ; }
@@ -1198,6 +1211,7 @@ static void set_maintenance_mode(void *send_info, bool enable)if (!enable)atomic_set (&smi_info->req_events,0 ); + smi_info->in_maintenance_mode = enable; }static void shutdown_smi (void *send_info);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/137 clk: sunxi-ng: v3s: add missing clock slices for MMC2 module clocks
In reply to Greg Kroah-HartmanFrom: Icenowy Zheng <[email protected]>
[ Upstream commit 720099603d1f62e37b789366d7e89824b009ca28 ]
The MMC2 clock slices are currently not defined in V3s CCU driver, which makes MMC2 not working.
Fix this issue.
--- drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clk/sunxi-ng/ccu-sun8i-v3s.c +3 -0
@@ -493,6 +493,9 @@ static struct clk_hw_onecell_data sun8i_v3s_hw_clks = { [CLK_MMC1] = &mmc1_clk.common.hw, [CLK_MMC1_SAMPLE] = &mmc1_sample_clk.common.hw, [CLK_MMC1_OUTPUT] = &mmc1_output_clk.common.hw, + [CLK_MMC2] = &mmc2_clk.common.hw, + [CLK_MMC2_SAMPLE] = &mmc2_sample_clk.common.hw, + [CLK_MMC2_OUTPUT] = &mmc2_output_clk.common.hw, [CLK_CE] = &ce_clk.common.hw, [CLK_SPI0] = &spi0_clk.common.hw, [CLK_USB_PHY0] = &usb_phy0_clk.common.hw,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/137 drm/amd/display: fix issue where 252-255 values are clipped
In reply to Greg Kroah-HartmanFrom: Anthony Koo <[email protected]>
[ Upstream commit 1cbcfc975164f397b449efb17f59d81a703090db ]
[Why]
When endpoint is at the boundary of a region, such as at 2^0=1 we find that the last segment has a sharp slope and some points are clipped at the top.
[How]
If end point is 1, which is exactly at the 2^0 region boundary, we need to program an additional region beyond this point.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c +2 -1
@@ -357,9 +357,10 @@ bool cm_helper_translate_curve_to_hw_format( seg_distr[7 ] =4 ; seg_distr[8 ] =4 ; seg_distr[9 ] =4 ; + seg_distr[10 ] =1 ; region_start =-10 ; - region_end =0 ; + region_end =1 ; }for (i = region_end - region_start; i <MAX_REGIONS_NUMBER ; i++)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/137 drm/amdgpu: Fix hard hang for S/G display BOs.
In reply to Greg Kroah-HartmanFrom: Andrey Grodzovsky <[email protected]>
[ Upstream commit e4c4073b0139d055d43a9568690fc560aab4fa5c ]
HW requires for caching to be unset for scanout BO mappings when the BO placement is in GTT memory. Usually the flag to unset is passed from user mode but for FB mode this was missing.
v2:
Keep all BO placement logic in amdgpu_display_supported_domains
--- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 7 +++---- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +3 -4
@@ -137,14 +137,14 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, mode_cmd->pitches[0 ] =amdgpu_align_pitch (adev, mode_cmd->width, cpp, fb_tiled); domain =amdgpu_display_supported_domains (adev); - height =ALIGN (mode_cmd->height,8 ); size = mode_cmd->pitches[0 ] * height; aligned_size =ALIGN (size,PAGE_SIZE ); ret =amdgpu_gem_object_create (adev, aligned_size,0 , domain,AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | -AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS | -AMDGPU_GEM_CREATE_VRAM_CLEARED , +AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS | +AMDGPU_GEM_CREATE_VRAM_CLEARED | +AMDGPU_GEM_CREATE_CPU_GTT_USWC , ttm_bo_type_kernel,NULL , &gobj);if (ret) {pr_err ("failed to allocate framebuffer (%d)\n" , aligned_size);
@@ -166,7 +166,6 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,dev_err (adev->dev,"FB failed to set tiling flags\n" ); } - ret =amdgpu_bo_pin (abo, domain);if (ret) {amdgpu_bo_unreserve (abo);
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +2 -1
@@ -746,7 +746,8 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,struct amdgpu_device *adev = dev->dev_private;struct drm_gem_object *gobj;uint32_t handle; -u64 flags =AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; +u64 flags =AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | +AMDGPU_GEM_CREATE_CPU_GTT_USWC ;u32 domain;int r;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/137 mfd: intel-lpss: Remove D3cold delay
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit 76380a607ba0b28627c9b4b55cd47a079a59624b ]
Goodix touchpad may drop its first couple input events when i2c-designware-platdrv and intel-lpss it connects to took too long to runtime resume from runtime suspended state.
This issue happens becuase the touchpad has a rather small buffer to store up to 13 input events, so if the host doesn't read those events in time (i.e. runtime resume takes too long), events are dropped from the touchpad's buffer.
The bottleneck is D3cold delay it waits when transitioning from D3cold to D0, hence remove the delay to make the resume faster. I've tested some systems with intel-lpss and haven't seen any regression.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202683
--- drivers/mfd/intel-lpss-pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mfd/intel-lpss-pci.c +2 -0
@@ -35,6 +35,8 @@ static int intel_lpss_pci_probe(struct pci_dev *pdev, info->mem = &pdev->resource[0 ]; info->irq = pdev->irq; + pdev->d3cold_delay =0 ; +/* Probably it is enough to set this for iDMA capable devices only */ pci_set_master (pdev);pci_try_set_mwi (pdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/137 PCI: tegra: Fix OF node reference leak
In reply to Greg Kroah-HartmanFrom: Nishka Dasgupta <[email protected]>
[ Upstream commit 9e38e690ace3e7a22a81fc02652fc101efb340cf ]
Each iteration of for_each_child_of_node() executes of_node_put() on the previous node, but in some return paths in the middle of the loop of_node_put() is missing thus causing a reference leak.
Hence stash these mid-loop return values in a variable 'err' and add a new label err_node_put which executes of_node_put() on the previous node and returns 'err' on failure.
Change mid-loop return statements to point to jump to this label to fix the reference leak.
Issue found with Coccinelle.
--- drivers/pci/controller/pci-tegra.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/pci/controller/pci-tegra.c +15 -7
@@ -1994,14 +1994,15 @@ static int tegra_pcie_parse_dt(struct tegra_pcie *pcie) err =of_pci_get_devfn (port);if (err <0 ) {dev_err (dev,"failed to parse address: %d\n" , err); -return err; + goto err_node_put; } index =PCI_SLOT (err);if (index <1 || index > soc->num_ports) {dev_err (dev,"invalid port number: %d\n" , index); -return -EINVAL ; + err = -EINVAL ; + goto err_node_put; } index--;
@@ -2010,12 +2011,13 @@ static int tegra_pcie_parse_dt(struct tegra_pcie *pcie)if (err <0 ) {dev_err (dev,"failed to parse # of lanes: %d\n" , err); -return err; + goto err_node_put; }if (value >16 ) {dev_err (dev,"invalid # of lanes: %u\n" , value); -return -EINVAL ; + err = -EINVAL ; + goto err_node_put; } lanes |= value << (index <<3 );
@@ -2029,13 +2031,15 @@ static int tegra_pcie_parse_dt(struct tegra_pcie *pcie) lane += value; rp =devm_kzalloc (dev,sizeof (*rp),GFP_KERNEL ); -if (!rp) -return -ENOMEM ; +if (!rp) { + err = -ENOMEM ; + goto err_node_put; + } err =of_address_to_resource (port,0 , &rp->regs);if (err <0 ) {dev_err (dev,"failed to parse address: %d\n" , err); -return err; + goto err_node_put; }INIT_LIST_HEAD (&rp->list);
@@ -2062,6 +2066,10 @@ static int tegra_pcie_parse_dt(struct tegra_pcie *pcie)return err;return 0 ; + +err_node_put: +of_node_put (port); +return err; }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 96/137 HID: wacom: Fix several minor compiler warnings
In reply to Greg Kroah-HartmanFrom: Jason Gerecke <[email protected]>
[ Upstream commit 073b50bccbbf99a3b79a1913604c656d0e1a56c9 ]
Addresses a few issues that were noticed when compiling with non-default warnings enabled. The trimmed-down warnings in the order they are fixed below are:
* declaration of 'size' shadows a parameter
* '%s' directive output may be truncated writing up to 5 bytes into a region of size between 1 and 64
* pointer targets in initialization of 'char *' from 'unsigned char *' differ in signedness
* left shift of negative value
--- drivers/hid/wacom_sys.c | 7 ++++--- drivers/hid/wacom_wac.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/hid/wacom_sys.c +4 -3
@@ -88,7 +88,7 @@ static void wacom_wac_queue_flush(struct hid_device *hdev, }static int wacom_wac_pen_serial_enforce (struct hid_device *hdev, -struct hid_report *report,u8 *raw_data,int size) +struct hid_report *report,u8 *raw_data,int report_size) {struct wacom *wacom =hid_get_drvdata (hdev);struct wacom_wac *wacom_wac = &wacom->wacom_wac;
@@ -149,7 +149,8 @@ static int wacom_wac_pen_serial_enforce(struct hid_device *hdev,if (flush)wacom_wac_queue_flush (hdev, &wacom_wac->pen_fifo);else if (insert) -wacom_wac_queue_insert (hdev, &wacom_wac->pen_fifo, raw_data, size); +wacom_wac_queue_insert (hdev, &wacom_wac->pen_fifo, + raw_data, report_size);return insert && !flush; }
@@ -2176,7 +2177,7 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix) {struct wacom_wac *wacom_wac = &wacom->wacom_wac;struct wacom_features *features = &wacom_wac->features; -char name[WACOM_NAME_MAX ]; +char name[WACOM_NAME_MAX -20 ];/* Leave some room for suffixes */ /* Generic devices name unspecified */ if ((features->type ==HID_GENERIC ) && !strcmp ("Wacom HID" , features->name)) {
drivers/hid/wacom_wac.c +2 -2
@@ -251,7 +251,7 @@ static int wacom_dtu_irq(struct wacom_wac *wacom)static int wacom_dtus_irq (struct wacom_wac *wacom) { -char *data = wacom->data; +unsigned char *data = wacom->data;struct input_dev *input = wacom->pen_input;unsigned short prox, pressure =0 ;
@@ -572,7 +572,7 @@ static int wacom_intuos_pad(struct wacom_wac *wacom) strip2 = ((data[3 ] &0x1f ) <<8 ) | data[4 ]; } - prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) | + prox = (buttons & ~(~0U << nbuttons)) | (keys & ~(~0U << nkeys)) | (ring1 &0x80 ) | (ring2 &0x80 ) | strip1 | strip2;wacom_report_numbered_buttons (input, nbuttons, buttons);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/137 mips/atomic: Fix loongson_llsc_mb() wreckage
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 1c6c1ca318585f1096d4d04bc722297c85e9fb8a ]
The comment describing the loongson_llsc_mb() reorder case doesn't make any sense what so ever. Instruction re-ordering is not an SMP artifact, but rather a CPU local phenomenon. Clarify the comment by explaining that these issue cause a coherence fail.
For the branch speculation case; if futex_atomic_cmpxchg_inatomic() needs one at the bne branch target, then surely the normal __cmpxch_asm() implementation does too. We cannot rely on the barriers from cmpxchg() because cmpxchg_local() is implemented with the same macro, and branch prediction and speculation are, too, CPU local.
--- arch/mips/include/asm/atomic.h | 5 +++-- arch/mips/include/asm/barrier.h | 32 ++++++++++++++++++-------------- arch/mips/include/asm/bitops.h | 5 +++++ arch/mips/include/asm/cmpxchg.h | 5 +++++ arch/mips/kernel/syscall.c | 1 + 5 files changed, 32 insertions(+), 16 deletions(-)
arch/mips/include/asm/atomic.h +3 -2
@@ -193,6 +193,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)if (kernel_uses_llsc) {int temp; +loongson_llsc_mb (); __asm__ __volatile__(" .set push \n" " .set "MIPS_ISA_LEVEL" \n"
@@ -200,12 +201,12 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)" .set pop \n" " subu %0, %1, %3 \n" " move %1, %0 \n" -" bltz %0, 1f \n" +" bltz %0, 2f \n" " .set push \n" " .set " MIPS_ISA_LEVEL " \n" " sc %1, %2 \n" "\t" __scbeqz" %1, 1b \n" -"1: \n" +"2: \n" " .set pop \n" : "=&r" (result), "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter)
arch/mips/include/asm/barrier.h +18 -14
@@ -238,36 +238,40 @@/* * Some Loongson 3 CPUs have a bug wherein execution of a memory access (load, -* store or pref) in between an ll & sc can cause the sc instruction to +* store or prefetch) in between an LL & SC can cause the SC instruction to * erroneously succeed, breaking atomicity. Whilst it's unusual to write code * containing such sequences, this bug bites harder than we might otherwise * expect due to reordering & speculation: * -* 1) A memory access appearing prior to the ll in program order may actually -* be executed after the ll - this is the reordering case. +* 1) A memory access appearing prior to the LL in program order may actually +* be executed after the LL - this is the reordering case. * -* In order to avoid this we need to place a memory barrier (ie. a sync -* instruction) prior to every ll instruction, in between it & any earlier -* memory access instructions. Many of these cases are already covered by -* smp_mb__before_llsc() but for the remaining cases, typically ones in -* which multiple CPUs may operate on a memory location but ordering is not -* usually guaranteed, we use loongson_llsc_mb() below. +* In order to avoid this we need to place a memory barrier (ie. a SYNC +* instruction) prior to every LL instruction, in between it and any earlier +* memory access instructions. * * This reordering case is fixed by 3A R2 CPUs, ie. 3A2000 models and later. * -* 2) If a conditional branch exists between an ll & sc with a target outside -* of the ll-sc loop, for example an exit upon value mismatch in cmpxchg() +* 2) If a conditional branch exists between an LL & SC with a target outside +* of the LL-SC loop, for example an exit upon value mismatch in cmpxchg() * or similar, then misprediction of the branch may allow speculative -* execution of memory accesses from outside of the ll-sc loop. +* execution of memory accesses from outside of the LL-SC loop. * -* In order to avoid this we need a memory barrier (ie. a sync instruction) +* In order to avoid this we need a memory barrier (ie. a SYNC instruction) * at each affected branch target, for which we also use loongson_llsc_mb() * defined below. * * This case affects all current Loongson 3 CPUs. +* +* The above described cases cause an error in the cache coherence protocol; +* such that the Invalidate of a competing LL-SC goes 'missing' and SC +* erroneously observes its core still has Exclusive state and lets the SC +* proceed. +* +* Therefore the error only occurs on SMP systems. */ #ifdef CONFIG_CPU_LOONGSON3_WORKAROUNDS /* Loongson-3's LLSC workaround */ -#define loongson_llsc_mb () __asm__ __volatile__(__WEAK_LLSC_MB : : :"memory") +#define loongson_llsc_mb () __asm__ __volatile__("sync" : : :"memory")#else #define loongson_llsc_mb () do { } while (0)#endif
arch/mips/include/asm/bitops.h +5 -0
@@ -249,6 +249,7 @@ static inline int test_and_set_bit(unsigned long nr,unsigned long *m = ((unsigned long *) addr) + (nr >>SZLONG_LOG );unsigned long temp; +loongson_llsc_mb (); do { __asm__ __volatile__( " .set push \n"
@@ -305,6 +306,7 @@ static inline int test_and_set_bit_lock(unsigned long nr,unsigned long *m = ((unsigned long *) addr) + (nr >>SZLONG_LOG );unsigned long temp; +loongson_llsc_mb (); do { __asm__ __volatile__( " .set push \n"
@@ -364,6 +366,7 @@ static inline int test_and_clear_bit(unsigned long nr,unsigned long *m = ((unsigned long *) addr) + (nr >>SZLONG_LOG );unsigned long temp; +loongson_llsc_mb (); do { __asm__ __volatile__( " " __LL "%0, %1 # test_and_clear_bit \n"
@@ -379,6 +382,7 @@ static inline int test_and_clear_bit(unsigned long nr,unsigned long *m = ((unsigned long *) addr) + (nr >>SZLONG_LOG );unsigned long temp; +loongson_llsc_mb (); do { __asm__ __volatile__( " .set push \n"
@@ -438,6 +442,7 @@ static inline int test_and_change_bit(unsigned long nr,unsigned long *m = ((unsigned long *) addr) + (nr >>SZLONG_LOG );unsigned long temp; +loongson_llsc_mb (); do { __asm__ __volatile__( " .set push \n"
arch/mips/include/asm/cmpxchg.h +5 -0
@@ -46,6 +46,7 @@ extern unsigned long __xchg_called_with_bad_pointer(void) __typeof(*(m)) __ret; \ \if (kernel_uses_llsc) { \ +loongson_llsc_mb (); \ __asm__ __volatile__( \" .set push \n" \ " .set noat \n" \
@@ -117,6 +118,7 @@ static inline unsigned long __xchg(volatile void *ptr, unsigned long x, __typeof(*(m)) __ret; \ \if (kernel_uses_llsc) { \ +loongson_llsc_mb (); \ __asm__ __volatile__( \" .set push \n" \ " .set noat \n" \
@@ -134,6 +136,7 @@ static inline unsigned long __xchg(volatile void *ptr, unsigned long x, : "=&r" (__ret), "=" GCC_OFF_SMALL_ASM() (*m) \ : GCC_OFF_SMALL_ASM() (*m), "Jr" (old), "Jr" (new) \ : "memory"); \ +loongson_llsc_mb (); \ }else { \unsigned long __flags; \ \
@@ -229,6 +232,7 @@ static inline unsigned long __cmpxchg64(volatile void *ptr,*/ local_irq_save (flags); +loongson_llsc_mb (); asmvolatile (" .set push \n" " .set " MIPS_ISA_ARCH_LEVEL " \n"
@@ -274,6 +278,7 @@ static inline unsigned long __cmpxchg64(volatile void *ptr, "r" (old), "r" (new) : "memory"); + loongson_llsc_mb();local_irq_restore (flags);return ret;
arch/mips/kernel/syscall.c +1 -0
@@ -132,6 +132,7 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) [efault] "i" (-EFAULT) : "memory"); }else if (cpu_has_llsc) { +loongson_llsc_mb (); __asm__ __volatile__ (" .set push \n" " .set "MIPS_ISA_ARCH_LEVEL" \n"
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/137 PCI: layerscape: Add the bar_fixed_64bit property to the endpoint driver
In reply to Greg Kroah-HartmanFrom: Xiaowei Bao <[email protected]>
[ Upstream commit fd5d16531a39322c3d7433d9f8a36203c9aaeddc ]
The layerscape PCIe controller have 4 BARs.
BAR0 and BAR1 are 32bit, BAR2 and BAR4 are 64bit and that's a
fixed hardware configuration.
Set the bar_fixed_64bit variable accordingly.
--- drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/controller/dwc/pci-layerscape-ep.c +1 -0
@@ -44,6 +44,7 @@ static const struct pci_epc_features ls_pcie_epc_features = { .linkup_notifier = false, .msi_capable = true, .msix_capable = false, + .bar_fixed_64bit = (1 << BAR_2) | (1 << BAR_4), }; static const struct pci_epc_features*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 100/137 livepatch: Nullify obj->mod in klp_module_coming()s error path
In reply to Greg Kroah-HartmanFrom: Miroslav Benes <[email protected]>
[ Upstream commit 4ff96fb52c6964ad42e0a878be8f86a2e8052ddd ]
klp_module_coming() is called for every module appearing in the system. It sets obj->mod to a patched module for klp_object obj. Unfortunately it leaves it set even if an error happens later in the function and the patched module is not allowed to be loaded.
klp_is_object_loaded() uses obj->mod variable and could currently give a wrong return value. The bug is probably harmless as of now.
--- kernel/livepatch/core.c | 1 + 1 file changed, 1 insertion(+)
kernel/livepatch/core.c +1 -0
@@ -1175,6 +1175,7 @@ err:pr_warn ("patch '%s' failed for module '%s', refusing to load module '%s'\n" , patch->mod->name, obj->mod->name, obj->mod->name); mod->klp_alive = false; + obj->mod =NULL ;klp_cleanup_module_patches_limited (mod, patch);mutex_unlock (&klp_mutex);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/137 mips/atomic: Fix smp_mb__{before,after}_atomic()
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 42344113ba7a1ed7b5654cd5270af0d5698d8521 ]
Recent probing at the Linux Kernel Memory Model uncovered a 'surprise'. Strongly ordered architectures where the atomic RmW primitive implies full memory ordering and smp_mb__{before,after}_atomic() are a simple barrier() (such as MIPS without WEAK_REORDERING_BEYOND_LLSC) fail for:
*x = 1; atomic_inc(u); smp_mb__after_atomic(); r0 = *y;
Because, while the atomic_inc() implies memory order, it (surprisingly) does not provide a compiler barrier. This then allows the compiler to re-order like so:
atomic_inc(u); *x = 1; smp_mb__after_atomic(); r0 = *y;
Which the CPU is then allowed to re-order (under TSO rules) like:
atomic_inc(u); r0 = *y; *x = 1;
And this very much was not intended. Therefore strengthen the atomic RmW ops to include a compiler barrier.
--- arch/mips/include/asm/atomic.h | 14 +++++------ arch/mips/include/asm/barrier.h | 12 ++++++++-- arch/mips/include/asm/bitops.h | 42 ++++++++++++++++++++------------- arch/mips/include/asm/cmpxchg.h | 6 ++--- 4 files changed, 45 insertions(+), 29 deletions(-)
arch/mips/include/asm/atomic.h +7 -7
@@ -68,7 +68,7 @@ static __inline__ void atomic_##op(int i, atomic_t * v) \"\t" __scbeqz" %0, 1b \n" \" .set pop \n" \ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \ -: " Ir" (i)); \ +: " Ir" (i) : __LLSC_CLOBBER); \ } else { \ unsigned long flags; \ \
@@ -98,7 +98,7 @@ static __inline__ int atomic_##op##_return_relaxed(int i, atomic_t * v) \ " .set pop \n" \ : "=&r" (result), "=&r" (temp), \ "+" GCC_OFF_SMALL_ASM() (v->counter) \ - : "Ir" (i)); \ + : "Ir" (i) : __LLSC_CLOBBER); \ }else { \unsigned long flags; \ \
@@ -132,7 +132,7 @@ static __inline__ int atomic_fetch_##op##_relaxed(int i, atomic_t * v) \ " move %0, %1 \n" \ : "=&r" (result), "=&r" (temp), \ "+" GCC_OFF_SMALL_ASM() (v->counter) \ - : "Ir" (i)); \ + : "Ir" (i) : __LLSC_CLOBBER); \ }else { \unsigned long flags; \ \
@@ -210,7 +210,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) " .set pop \n" : "=&r" (result), "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) - : "Ir" (i)); + : "Ir" (i) : __LLSC_CLOBBER); }else {unsigned long flags;
@@ -270,7 +270,7 @@ static __inline__ void atomic64_##op(long i, atomic64_t * v) \"\t" __scbeqz" %0, 1b \n" \" .set pop \n" \ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \ -: " Ir" (i)); \ +: " Ir" (i) : __LLSC_CLOBBER); \ } else { \ unsigned long flags; \ \
@@ -300,7 +300,7 @@ static __inline__ long atomic64_##op##_return_relaxed(long i, atomic64_t * v) \ " .set pop \n" \ : "=&r" (result), "=&r" (temp), \ "+" GCC_OFF_SMALL_ASM() (v->counter) \ - : "Ir" (i)); \ + : "Ir" (i) : __LLSC_CLOBBER); \ }else { \unsigned long flags; \ \
@@ -334,7 +334,7 @@ static __inline__ long atomic64_fetch_##op##_relaxed(long i, atomic64_t * v) \ " .set pop \n" \ : "=&r" (result), "=&r" (temp), \ "+" GCC_OFF_SMALL_ASM() (v->counter) \ - : "Ir" (i)); \ + : "Ir" (i) : __LLSC_CLOBBER); \ }else { \unsigned long flags; \ \
arch/mips/include/asm/barrier.h +10 -2
@@ -211,14 +211,22 @@#define __smp_wmb () barrier()#endif +/* +* When LL/SC does imply order, it must also be a compiler barrier to avoid the +* compiler from reordering where the CPU will not. When it does not imply +* order, the compiler is also free to reorder across the LL/SC loop and +* ordering will be done by smp_llsc_mb() and friends. +*/ #if defined(CONFIG_WEAK_REORDERING_BEYOND_LLSC ) && defined(CONFIG_SMP )#define __WEAK_LLSC_MB " sync \n" +#define smp_llsc_mb () __asm__ __volatile__(__WEAK_LLSC_MB : : :"memory") +#define __LLSC_CLOBBER#else #define __WEAK_LLSC_MB " \n" +#define smp_llsc_mb () do { } while (0) +#define __LLSC_CLOBBER "memory"#endif -#define smp_llsc_mb () __asm__ __volatile__(__WEAK_LLSC_MB : : :"memory") -#ifdef CONFIG_CPU_CAVIUM_OCTEON #define smp_mb__before_llsc () smp_wmb()#define __smp_mb__before_llsc () __smp_wmb()
arch/mips/include/asm/bitops.h +25 -17
144 lines not on this page · raw message
arch/mips/include/asm/cmpxchg.h +3 -3
@@ -61,7 +61,7 @@ extern unsigned long __xchg_called_with_bad_pointer(void) " .set pop \n" \ : "=&r" (__ret), "=" GCC_OFF_SMALL_ASM() (*m) \ : GCC_OFF_SMALL_ASM() (*m), "Jr" (val) \ - : "memory"); \ + : __LLSC_CLOBBER); \ }else { \unsigned long __flags; \ \
@@ -134,8 +134,8 @@ static inline unsigned long __xchg(volatile void *ptr, unsigned long x, " .set pop \n" \ "2: \n" \ : "=&r" (__ret), "=" GCC_OFF_SMALL_ASM() (*m) \ - : GCC_OFF_SMALL_ASM() (*m), "Jr" (old), "Jr" (new) \ - : "memory"); \ + : GCC_OFF_SMALL_ASM() (*m), "Jr" (old), "Jr" (new) \ + : __LLSC_CLOBBER); \loongson_llsc_mb (); \ }else { \unsigned long __flags; \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/137 ARM: 8898/1: mm: Dont treat faults reported from cache maintenance as writes
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
[ Upstream commit 834020366da9ab3fb87d1eb9a3160eb22dbed63a ]
Translation faults arising from cache maintenance instructions are rather unhelpfully reported with an FSR value where the WnR field is set to 1, indicating that the faulting access was a write. Since cache maintenance instructions on 32-bit ARM do not require any particular permissions, this can cause our private 'cacheflush' system call to fail spuriously if a translation fault is generated due to page aging when targetting a read-only VMA.
In this situation, we will return -EFAULT to userspace, although this is unfortunately suppressed by the popular '__builtin___clear_cache()' intrinsic provided by GCC, which returns void.
Although it's tempting to write this off as a userspace issue, we can actually do a little bit better on CPUs that support LPAE, even if the short-descriptor format is in use. On these CPUs, cache maintenance faults additionally set the CM field in the FSR, which we can use to suppress the write permission checks in the page fault handler and succeed in performing cache maintenance to read-only areas even in the presence of a translation fault.
--- arch/arm/mm/fault.c | 4 ++-- arch/arm/mm/fault.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/mm/fault.c +2 -2
@@ -211,7 +211,7 @@ static inline bool access_error(unsigned int fsr, struct vm_area_struct *vma) {unsigned int mask =VM_READ |VM_WRITE |VM_EXEC ; -if (fsr &FSR_WRITE ) +if ((fsr &FSR_WRITE ) && !(fsr &FSR_CM )) mask =VM_WRITE ;if (fsr &FSR_LNX_PF ) mask =VM_EXEC ;
@@ -282,7 +282,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)if (user_mode (regs)) flags |=FAULT_FLAG_USER ; -if (fsr &FSR_WRITE ) +if ((fsr &FSR_WRITE ) && !(fsr &FSR_CM )) flags |=FAULT_FLAG_WRITE ;/*
arch/arm/mm/fault.h +1 -0
@@ -6,6 +6,7 @@* Fault status register encodings. We steal bit 31 for our own purposes. */ #define FSR_LNX_PF (1 << 31) +#define FSR_CM (1 << 13)#define FSR_WRITE (1 << 11)#define FSR_FS4 (1 << 10)#define FSR_FS3_0 (15)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/137 clk: sprd: add missing kfree
In reply to Greg Kroah-HartmanFrom: Chunyan Zhang <[email protected]>
[ Upstream commit 5e75ea9c67433a065b0e8595ad3c91c7c0ca0d2d ]
The number of config registers for different pll clocks probably are not same, so we have to use malloc, and should free the memory before return.
--- drivers/clk/sprd/pll.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/sprd/pll.c +2 -0
@@ -136,6 +136,7 @@ static unsigned long _sprd_pll_recalc_rate(const struct sprd_pll *pll, k2 + refin * nint *CLK_PLL_1M ; } +kfree (cfg);return rate; }
@@ -222,6 +223,7 @@ static int _sprd_pll_set_rate(const struct sprd_pll *pll,if (!ret)udelay (pll->udelay); +kfree (cfg);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 103/137 soundwire: intel: fix channel number reported by hardware
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 18046335643de6d21327f5ae034c8fb8463f6715 ]
On all released Intel controllers (CNL/CML/ICL), PDI2 reports an invalid count, force the correct hardware-supported value
This may have to be revisited with platform-specific values if the hardware changes, but for now this is good enough.
--- drivers/soundwire/intel.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/soundwire/intel.c +10 -0
@@ -283,6 +283,16 @@ intel_pdi_get_ch_cap(struct sdw_intel *sdw, unsigned int pdi_num, bool pcm)if (pcm) { count =intel_readw (shim,SDW_SHIM_PCMSYCHC (link_id, pdi_num)); + +/* +* WORKAROUND: on all existing Intel controllers, pdi +* number 2 reports channel count as 1 even though it +* supports 8 channels. Performing hardcoding for pdi +* number 2. +*/ +if (pdi_num ==2 ) + count =7 ; + }else { count =intel_readw (shim,SDW_SHIM_PDMSCAP (link_id)); count = ((count & SDW_SHIM_PDMSCAP_CPSS) >>
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/137 ARM: 8875/1: Kconfig: default to AEABI w/ Clang
In reply to Greg Kroah-HartmanFrom: Nick Desaulniers <[email protected]>
[ Upstream commit a05b9608456e0d4464c6f7ca8572324ace57a3f4 ]
Clang produces references to __aeabi_uidivmod and __aeabi_idivmod for arm-linux-gnueabi and arm-linux-gnueabihf targets incorrectly when AEABI is not selected (such as when OABI_COMPAT is selected).
While this means that OABI userspaces wont be able to upgraded to kernels built with Clang, it means that boards that don't enable AEABI like s3c2410_defconfig will stop failing to link in KernelCI when built with Clang.
--- arch/arm/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/Kconfig +3 -2
@@ -1545,8 +1545,9 @@ config ARM_PATCH_IDIV code to do integer division. config AEABI - bool "Use the ARM EABI to compile the kernel" if !CPU_V7 && !CPU_V7M && !CPU_V6 && !CPU_V6K - default CPU_V7 || CPU_V7M || CPU_V6 || CPU_V6K + bool "Use the ARM EABI to compile the kernel" if !CPU_V7 && \ + !CPU_V7M && !CPU_V6 && !CPU_V6K && !CC_IS_CLANG + default CPU_V7 || CPU_V7M || CPU_V6 || CPU_V6K || CC_IS_CLANG help This option allows for the kernel to be compiled using the latest ARM ABI (aka EABI). This is only useful if you are using a user
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/137 rtc: snvs: fix possible race condition
In reply to Greg Kroah-HartmanFrom: Anson Huang <[email protected]>
[ Upstream commit 6fd4fe9b496d9ba3382992ff4fde3871d1b6f63d ]
The RTC IRQ is requested before the struct rtc_device is allocated, this may lead to a NULL pointer dereference in IRQ handler.
To fix this issue, allocating the rtc_device struct before requesting the RTC IRQ using devm_rtc_allocate_device, and use rtc_register_device to register the RTC device.
--- drivers/rtc/rtc-snvs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/rtc/rtc-snvs.c +7 -4
@@ -279,6 +279,10 @@ static int snvs_rtc_probe(struct platform_device *pdev)if (!data)return -ENOMEM ; + data->rtc =devm_rtc_allocate_device (&pdev->dev); +if (IS_ERR (data->rtc)) +return PTR_ERR (data->rtc); + data->regmap =syscon_regmap_lookup_by_phandle (pdev->dev.of_node,"regmap" );if (IS_ERR (data->regmap)) {
@@ -343,10 +347,9 @@ static int snvs_rtc_probe(struct platform_device *pdev) goto error_rtc_device_register; } - data->rtc =devm_rtc_device_register (&pdev->dev, pdev->name, - &snvs_rtc_ops,THIS_MODULE ); -if (IS_ERR (data->rtc)) { - ret =PTR_ERR (data->rtc); + data->rtc->ops = &snvs_rtc_ops; + ret =rtc_register_device (data->rtc); +if (ret) {dev_err (&pdev->dev,"failed to register rtc: %d\n" , ret); goto error_rtc_device_register; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 106/137 rtc: pcf85363/pcf85263: fix regmap error in set_time
In reply to Greg Kroah-HartmanFrom: Biwen Li <[email protected]>
[ Upstream commit 7ef66122bdb3b839e9f51b76d7e600b6e21ef648 ]
Issue:
- # hwclock -w
hwclock: RTC_SET_TIME: Invalid argument
Why:
- Relative commit: 8b9f9d4dc511 ("regmap: verify if register is writeable before writing operations"), this patch will always check for unwritable registers, it will compare reg with max_register in regmap_writeable.
- The pcf85363/pcf85263 has the capability of address wrapping which means if you access an address outside the allowed range (0x00-0x2f) hardware actually wraps the access to a lower address. The rtc-pcf85363 driver will use this feature to configure the time and execute 2 actions in the same i2c write operation (stopping the clock and configure the time). However the driver has also configured the regmap maxregister protection mechanism that will block accessing addresses outside valid range (0x00-0x2f).
How:
- Split of writing regs to two parts, first part writes control registers about stop_enable and resets, second part writes RTC time and date registers.
--- drivers/rtc/rtc-pcf85363.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/rtc/rtc-pcf85363.c +6 -1
@@ -166,7 +166,12 @@ static int pcf85363_rtc_set_time(struct device *dev, struct rtc_time *tm) buf[DT_YEARS ] =bin2bcd (tm->tm_year %100 ); ret =regmap_bulk_write (pcf85363->regmap,CTRL_STOP_EN , - tmp,sizeof (tmp)); + tmp,2 ); +if (ret) +return ret; + + ret =regmap_bulk_write (pcf85363->regmap,DT_100THS , + buf,sizeof (tmp) -2 );if (ret)return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 107/137 selinux: fix residual uses of current_security() for the SELinux blob
In reply to Greg Kroah-HartmanFrom: Stephen Smalley <[email protected]>
[ Upstream commit 169ce0c081cd85f78388bb6c1638c1ad7b81bde7 ]
We need to use selinux_cred() to fetch the SELinux cred blob instead of directly using current->security or current_security(). There were a couple of lingering uses of current_security() in the SELinux code that were apparently missed during the earlier conversions. IIUC, this would only manifest as a bug if multiple security modules including SELinux are enabled and SELinux is not first in the lsm order. After this change, there appear to be no other users of current_security() in-tree; perhaps we should remove it altogether.
--- security/selinux/hooks.c | 2 +- security/selinux/include/objsec.h | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-)
security/selinux/hooks.c +1 -1
@@ -3403,7 +3403,7 @@ static int selinux_inode_copy_up_xattr(const char *name)static int selinux_kernfs_init_security (struct kernfs_node *kn_dir,struct kernfs_node *kn) { -const struct task_security_struct *tsec =current_security (); +const struct task_security_struct *tsec =selinux_cred (current_cred ());u32 parent_sid, newsid, clen;int rc;char *context;
security/selinux/include/objsec.h +10 -10
@@ -37,16 +37,6 @@ struct task_security_struct {u32 sockcreate_sid;/* fscreate SID */ }; -/* -* get the subjective security ID of the current task -*/ -static inline u32 current_sid (void ) -{ -const struct task_security_struct *tsec =current_security (); - -return tsec->sid; -} -enum label_initialized {LABEL_INVALID ,/* invalid or not initialized */ LABEL_INITIALIZED ,/* initialized */
@@ -185,4 +175,14 @@ static inline struct ipc_security_struct *selinux_ipc( return ipc->security + selinux_blob_sizes.lbs_ipc; } +/* +* get the subjective security ID of the current task +*/ +static inline u32 current_sid (void ) +{ +const struct task_security_struct *tsec =selinux_cred (current_cred ()); + +return tsec->sid; +} +#endif /* _SELINUX_OBJSEC_H_ */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 108/137 PCI: Add pci_info_ratelimited() to ratelimit PCI separately
In reply to Greg Kroah-HartmanFrom: Krzysztof Wilczynski <[email protected]>
[ Upstream commit 7f1c62c443a453deb6eb3515e3c05650ffe0dcf0 ]
Do not use printk_ratelimit() in drivers/pci/pci.c as it shares the rate limiting state with all other callers to the printk_ratelimit().
Add pci_info_ratelimited() (similar to pci_notice_ratelimited() added in the commit a88a7b3eb076 ("vfio: Use dev_printk() when possible")) and use it instead of printk_ratelimit() + pci_info().
--- drivers/pci/pci.c | 4 ++-- include/linux/pci.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/pci/pci.c +2 -2
@@ -884,8 +884,8 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state)pci_read_config_word (dev, dev->pm_cap +PCI_PM_CTRL , &pmcsr); dev->current_state = (pmcsr &PCI_PM_CTRL_STATE_MASK ); -if (dev->current_state != state &&printk_ratelimit ()) -pci_info (dev,"Refused to change power state, currently in D%d\n" , +if (dev->current_state != state) +pci_info_ratelimited (dev,"Refused to change power state, currently in D%d\n" , dev->current_state);/*
include/linux/pci.h +3 -0
@@ -2375,4 +2375,7 @@ void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type); #define pci_notice_ratelimited(pdev, fmt, arg...) \ dev_notice_ratelimited(&(pdev)->dev, fmt, ##arg) +#define pci_info_ratelimited(pdev, fmt, arg...) \ + dev_info_ratelimited(&(pdev)->dev, fmt, ##arg) +#endif /* LINUX_PCI_H */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/137 PCI: histb: Propagate errors for optional regulators
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
[ Upstream commit 8f9e1641ba445437095411d9fda2324121110d5d ]
regulator_get_optional() can fail for a number of reasons besides probe deferral. It can for example return -ENOMEM if it runs out of memory as it tries to allocate data structures. Propagating only -EPROBE_DEFER is problematic because it results in these legitimately fatal errors being treated as "regulator not specified in DT".
What we really want is to ignore the optional regulators only if they have not been specified in DT. regulator_get_optional() returns -ENODEV in this case, so that's the special case that we need to handle. So we propagate all errors, except -ENODEV, so that real failures will still cause the driver to fail probe.
--- drivers/pci/controller/dwc/pcie-histb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/dwc/pcie-histb.c +2 -2
@@ -340,8 +340,8 @@ static int histb_pcie_probe(struct platform_device *pdev) hipcie->vpcie =devm_regulator_get_optional (dev,"vpcie" );if (IS_ERR (hipcie->vpcie)) { -if (PTR_ERR (hipcie->vpcie) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; +if (PTR_ERR (hipcie->vpcie) != -ENODEV ) +return PTR_ERR (hipcie->vpcie); hipcie->vpcie =NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 112/137 PCI: imx6: Propagate errors for optional regulators
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
[ Upstream commit 2170a09fb4b0f66e06e5bcdcbc98c9ccbf353650 ]
regulator_get_optional() can fail for a number of reasons besides probe deferral. It can for example return -ENOMEM if it runs out of memory as it tries to allocate data structures. Propagating only -EPROBE_DEFER is problematic because it results in these legitimately fatal errors being treated as "regulator not specified in DT".
What we really want is to ignore the optional regulators only if they have not been specified in DT. regulator_get_optional() returns -ENODEV in this case, so that's the special case that we need to handle. So we propagate all errors, except -ENODEV, so that real failures will still cause the driver to fail probe.
--- drivers/pci/controller/dwc/pci-imx6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/dwc/pci-imx6.c +2 -2
@@ -1173,8 +1173,8 @@ static int imx6_pcie_probe(struct platform_device *pdev) imx6_pcie->vpcie =devm_regulator_get_optional (&pdev->dev,"vpcie" );if (IS_ERR (imx6_pcie->vpcie)) { -if (PTR_ERR (imx6_pcie->vpcie) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; +if (PTR_ERR (imx6_pcie->vpcie) != -ENODEV ) +return PTR_ERR (imx6_pcie->vpcie); imx6_pcie->vpcie =NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/137 scsi: core: Reduce memory required for SCSI logging
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit dccc96abfb21dc19d69e707c38c8ba439bba7160 ]
The data structure used for log messages is so large that it can cause a boot failure. Since allocations from that data structure can fail anyway, use kmalloc() / kfree() instead of that data structure.
See also https://bugzilla.kernel.org/show_bug.cgi?id=204119.
See also commit ded85c193a39 ("scsi: Implement per-cpu logging buffer") # v4.0.
--- drivers/scsi/scsi_logging.c | 48 +++---------------------------------- include/scsi/scsi_dbg.h | 2 -- 2 files changed, 3 insertions(+), 47 deletions(-)
drivers/scsi/scsi_logging.c +3 -45
@@ -15,57 +15,15 @@#include <scsi/scsi_eh.h> #include <scsi/scsi_dbg.h> -#define SCSI_LOG_SPOOLSIZE 4096 - -#if (SCSI_LOG_SPOOLSIZE /SCSI_LOG_BUFSIZE ) >BITS_PER_LONG -#warning SCSI logging bitmask too large -#endif - -struct scsi_log_buf { -char buffer[SCSI_LOG_SPOOLSIZE ]; -unsigned long map; -}; - -static DEFINE_PER_CPU(struct scsi_log_buf, scsi_format_log); -static char *scsi_log_reserve_buffer (size_t *len) { -struct scsi_log_buf *buf; -unsigned long map_bits =sizeof (buf->buffer) /SCSI_LOG_BUFSIZE ; -unsigned long idx =0 ; - -preempt_disable (); - buf =this_cpu_ptr (&scsi_format_log); - idx =find_first_zero_bit (&buf->map, map_bits); -if (likely (idx < map_bits)) { -while (test_and_set_bit (idx, &buf->map)) { - idx =find_next_zero_bit (&buf->map, map_bits, idx); -if (idx >= map_bits) -break ; - } - } -if (WARN_ON (idx >= map_bits)) { -preempt_enable (); -return NULL ; - } - *len =SCSI_LOG_BUFSIZE ; -return buf->buffer + idx *SCSI_LOG_BUFSIZE ; + *len =128 ; +return kmalloc (*len,GFP_ATOMIC ); }static void scsi_log_release_buffer (char *bufptr) { -struct scsi_log_buf *buf; -unsigned long idx; -int ret; - - buf =this_cpu_ptr (&scsi_format_log); -if (bufptr >= buf->buffer && - bufptr < buf->buffer +SCSI_LOG_SPOOLSIZE ) { - idx = (bufptr - buf->buffer) /SCSI_LOG_BUFSIZE ; - ret =test_and_clear_bit (idx, &buf->map); -WARN_ON (!ret); - } -preempt_enable (); +kfree (bufptr); }static inline const char *scmd_name (const struct scsi_cmnd *scmd)
include/scsi/scsi_dbg.h +0 -2
@@ -6,8 +6,6 @@ struct scsi_cmnd;struct scsi_device ;struct scsi_sense_hdr ; -#define SCSI_LOG_BUFSIZE 128 -extern void scsi_print_command (struct scsi_cmnd *);extern size_t __scsi_format_command (char *,size_t ,const unsigned char *,size_t );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 113/137 PCI: exynos: Propagate errors for optional PHYs
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
[ Upstream commit ddd6960087d4b45759434146d681a94bbb1c54ad ]
devm_of_phy_get() can fail for a number of reasons besides probe deferral. It can for example return -ENOMEM if it runs out of memory as it tries to allocate devres structures. Propagating only -EPROBE_DEFER is problematic because it results in these legitimately fatal errors being treated as "PHY not specified in DT".
What we really want is to ignore the optional PHYs only if they have not been specified in DT. devm_of_phy_get() returns -ENODEV in this case, so that's the special case that we need to handle. So we propagate all errors, except -ENODEV, so that real failures will still cause the driver to fail probe.
--- drivers/pci/controller/dwc/pci-exynos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/dwc/pci-exynos.c +1 -1
@@ -465,7 +465,7 @@ static int __init exynos_pcie_probe(struct platform_device *pdev) ep->phy =devm_of_phy_get (dev, np,NULL );if (IS_ERR (ep->phy)) { -if (PTR_ERR (ep->phy) == -EPROBE_DEFER ) +if (PTR_ERR (ep->phy) != -ENODEV )return PTR_ERR (ep->phy); ep->phy =NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 114/137 security: smack: Fix possible null-pointer dereferences in smack_socket_sock_rcv_skb()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 3f4287e7d98a2954f20bf96c567fdffcd2b63eb9 ]
In smack_socket_sock_rcv_skb(), there is an if statement on line 3920 to check whether skb is NULL:
if (skb && skb->secmark != 0)
This check indicates skb can be NULL in some cases.
But on lines 3931 and 3932, skb is used:
ad.a.u.net->netif = skb->skb_iif;
ipv6_skb_to_auditdata(skb, &ad.a, NULL);Thus, possible null-pointer dereferences may occur when skb is NULL.
To fix these possible bugs, an if statement is added to check skb.
These bugs are found by a static analysis tool STCheck written by us.
--- security/smack/smack_lsm.c | 2 ++ 1 file changed, 2 insertions(+)
security/smack/smack_lsm.c +2 -0
@@ -3925,6 +3925,8 @@ access_check: skp =smack_ipv6host_label (&sadd);if (skp ==NULL ) skp = smack_net_ambient; +if (skb ==NULL ) +break ;#ifdef CONFIG_AUDIT smk_ad_init_net (&ad, __func__,LSM_AUDIT_DATA_NET , &net); ad.a.u.net->family = family;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 115/137 PCI: Use static const struct, not const static struct
In reply to Greg Kroah-HartmanFrom: Krzysztof Wilczynski <[email protected]>
[ Upstream commit 8050f3f6645ae0f7e4c1304593f6f7eb2ee7d85c ]
Move the static keyword to the front of declarations of pci_regs_behavior[] and pcie_cap_regs_behavior[], which resolves compiler warnings when building with "W=1":
drivers/pci/pci-bridge-emul.c:41:1: warning: ‘static’ is not at beginning of declaration [-Wold-style-declaration]
const static struct pci_bridge_reg_behavior pci_regs_behavior[] = { ^
drivers/pci/pci-bridge-emul.c:176:1: warning: ‘static’ is not at beginning of declaration [-Wold-style-declaration]
const static struct pci_bridge_reg_behavior pcie_cap_regs_behavior[] = { ^
--- drivers/pci/pci-bridge-emul.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pci-bridge-emul.c +2 -2
@@ -38,7 +38,7 @@ struct pci_bridge_reg_behavior {u32 rsvd; }; -const static struct pci_bridge_reg_behavior pci_regs_behavior[] = { +static const struct pci_bridge_reg_behavior pci_regs_behavior[] = { [PCI_VENDOR_ID /4 ] = { .ro = ~0 }, [PCI_COMMAND /4 ] = { .rw = (PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
@@ -173,7 +173,7 @@ const static struct pci_bridge_reg_behavior pci_regs_behavior[] = { }, }; -const static struct pci_bridge_reg_behavior pcie_cap_regs_behavior[] = { +static const struct pci_bridge_reg_behavior pcie_cap_regs_behavior[] = { [PCI_CAP_LIST_ID /4 ] = {/* * Capability ID, Next Capability Pointer and
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 116/137 ARM: 8905/1: Emit __gnu_mcount_nc when using Clang 10.0.0 or newer
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit b0fe66cf095016e0b238374c10ae366e1f087d11 ]
Currently, multi_v7_defconfig + CONFIG_FUNCTION_TRACER fails to build with clang:
arm-linux-gnueabi-ld: kernel/softirq.o: in function `_local_bh_enable':
softirq.c:(.text+0x504): undefined reference to `mcount'
arm-linux-gnueabi-ld: kernel/softirq.o: in function `__local_bh_enable_ip':
softirq.c:(.text+0x58c): undefined reference to `mcount'
arm-linux-gnueabi-ld: kernel/softirq.o: in function `do_softirq':
softirq.c:(.text+0x6c8): undefined reference to `mcount'
arm-linux-gnueabi-ld: kernel/softirq.o: in function `irq_enter':
softirq.c:(.text+0x75c): undefined reference to `mcount'
arm-linux-gnueabi-ld: kernel/softirq.o: in function `irq_exit':
softirq.c:(.text+0x840): undefined reference to `mcount'
arm-linux-gnueabi-ld: kernel/softirq.o:softirq.c:(.text+0xa50): more undefined references to `mcount' follow
clang can emit a working mcount symbol, __gnu_mcount_nc, when '-meabi gnu' is passed to it. Until r369147 in LLVM, this was broken and caused the kernel not to boot with '-pg' because the calling convention was not correct. Always build with '-meabi gnu' when using clang but ensure that '-pg' (which is added with CONFIG_FUNCTION_TRACER and its prereq CONFIG_HAVE_FUNCTION_TRACER) cannot be added with it unless this is fixed (which means using clang 10.0.0 and newer).
--- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)
arch/arm/Kconfig +1 -1
@@ -75,7 +75,7 @@ config ARM select HAVE_EXIT_THREAD select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG - select HAVE_FUNCTION_TRACER if !XIP_KERNEL + select HAVE_FUNCTION_TRACER if !XIP_KERNEL && (CC_IS_GCC || CLANG_VERSION >= 100000) select HAVE_GCC_PLUGINS select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7) select HAVE_IDE if PCI || ISA || PCMCIA
arch/arm/Makefile +4 -0
@@ -112,6 +112,10 @@ ifeq ($(CONFIG_ARM_UNWIND),y) CFLAGS_ABI +=-funwind-tables endif +ifeq ($(CONFIG_CC_IS_CLANG),y) +CFLAGS_ABI += -meabi gnu +endif + # Accept old syntax despite ".syntax unified" AFLAGS_NOWARN :=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/137 ARM: 8903/1: ensure that usable memory in bank 0 starts from a PMD-aligned address
In reply to Greg Kroah-HartmanFrom: Mike Rapoport <[email protected]>
[ Upstream commit 00d2ec1e6bd82c0538e6dd3e4a4040de93ba4fef ]
The calculation of memblock_limit in adjust_lowmem_bounds() assumes that bank 0 starts from a PMD-aligned address. However, the beginning of the first bank may be NOMAP memory and the start of usable memory will be not aligned to PMD boundary. In such case the memblock_limit will be set to the end of the NOMAP region, which will prevent any memblock allocations.
Mark the region between the end of the NOMAP area and the next PMD-aligned address as NOMAP as well, so that the usable memory will start at PMD-aligned address.
--- arch/arm/mm/mmu.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/arm/mm/mmu.c +16 -0
@@ -1177,6 +1177,22 @@ void __init adjust_lowmem_bounds(void)*/ vmalloc_limit = (u64 )(uintptr_t )vmalloc_min -PAGE_OFFSET +PHYS_OFFSET ; +/* +* The first usable region must be PMD aligned. Mark its start +* as MEMBLOCK_NOMAP if it isn't +*/ +for_each_memblock (memory, reg) { +if (!memblock_is_nomap (reg)) { +if (!IS_ALIGNED (reg->base,PMD_SIZE )) { +phys_addr_t len; + + len =round_up (reg->base,PMD_SIZE ) - reg->base; +memblock_mark_nomap (reg->base, len); + } +break ; + } + } +for_each_memblock (memory, reg) {phys_addr_t block_start = reg->base;phys_addr_t block_end = reg->base + reg->size;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 118/137 fat: work around race with userspaces read via blockdev while mounting
In reply to Greg Kroah-HartmanFrom: OGAWA Hirofumi <[email protected]>
[ Upstream commit 07bfa4415ab607e459b69bd86aa7e7602ce10b4f ]
If userspace reads the buffer via blockdev while mounting, sb_getblk()+modify can race with buffer read via blockdev.
For example,
FS userspace
bh = sb_getblk()
modify bh->b_data
read
ll_rw_block(bh)
fill bh->b_data by on-disk data
/* lost modified data by FS */
set_buffer_uptodate(bh)
set_buffer_uptodate(bh)Userspace should not use the blockdev while mounting though, the udev seems to be already doing this. Although I think the udev should try to avoid this, workaround the race by small overhead.
--- fs/fat/dir.c | 13 +++++++++++-- fs/fat/fatent.c | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-)
fs/fat/dir.c +11 -2
@@ -1100,8 +1100,11 @@ static int fat_zeroed_cluster(struct inode *dir, sector_t blknr, int nr_used, err = -ENOMEM ; goto error; } +/* Avoid race with userspace read via bdev */ +lock_buffer (bhs[n]);memset (bhs[n]->b_data,0 , sb->s_blocksize);set_buffer_uptodate (bhs[n]); +unlock_buffer (bhs[n]);mark_buffer_dirty_inode (bhs[n], dir); n++;
@@ -1158,6 +1161,8 @@ int fat_alloc_new_dir(struct inode *dir, struct timespec64 *ts)fat_time_unix2fat (sbi, ts, &time, &date, &time_cs); de = (struct msdos_dir_entry *)bhs[0 ]->b_data; +/* Avoid race with userspace read via bdev */ +lock_buffer (bhs[0 ]);/* filling the new directory slots ("." and ".." entries) */ memcpy (de[0 ].name,MSDOS_DOT ,MSDOS_NAME );memcpy (de[1 ].name,MSDOS_DOTDOT ,MSDOS_NAME );
@@ -1180,6 +1185,7 @@ int fat_alloc_new_dir(struct inode *dir, struct timespec64 *ts) de[0 ].size = de[1 ].size =0 ;memset (de +2 ,0 , sb->s_blocksize -2 *sizeof (*de));set_buffer_uptodate (bhs[0 ]); +unlock_buffer (bhs[0 ]);mark_buffer_dirty_inode (bhs[0 ], dir); err =fat_zeroed_cluster (dir, blknr,1 , bhs,MAX_BUF_PER_PAGE );
@@ -1237,11 +1243,14 @@ static int fat_add_new_entries(struct inode *dir, void *slots, int nr_slots,/* fill the directory entry */ copy =min (size, sb->s_blocksize); +/* Avoid race with userspace read via bdev */ +lock_buffer (bhs[n]);memcpy (bhs[n]->b_data, slots, copy); - slots += copy; - size -= copy;set_buffer_uptodate (bhs[n]); +unlock_buffer (bhs[n]);mark_buffer_dirty_inode (bhs[n], dir); + slots += copy; + size -= copy;if (!size)break ; n++;
fs/fat/fatent.c +3 -0
@@ -388,8 +388,11 @@ static int fat_mirror_bhs(struct super_block *sb, struct buffer_head **bhs, err = -ENOMEM ; goto error; } +/* Avoid race with userspace read via bdev */ +lock_buffer (c_bh);memcpy (c_bh->b_data, bhs[n]->b_data, sb->s_blocksize);set_buffer_uptodate (c_bh); +unlock_buffer (c_bh);mark_buffer_dirty_inode (c_bh, sbi->fat_inode);if (sb->s_flags &SB_SYNCHRONOUS ) err =sync_dirty_buffer (c_bh);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 119/137 pktcdvd: remove warning on attempting to register non-passthrough dev
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
[ Upstream commit eb09b3cc464d2c3bbde9a6648603c8d599ea8582 ]
Anatoly reports that he gets the below warning when booting -git on a sparc64 box on debian unstable:
...
[ 13.352975] aes_sparc64: Using sparc64 aes opcodes optimized AES implementation [ 13.428002] ------------[ cut here ]------------ [ 13.428081] WARNING: CPU: 21 PID: 586 at drivers/block/pktcdvd.c:2597 pkt_setup_dev+0x2e4/0x5a0 [pktcdvd] [ 13.428147] Attempt to register a non-SCSI queue [ 13.428184] Modules linked in: pktcdvd libdes cdrom aes_sparc64
n2_rng md5_sparc64 sha512_sparc64 rng_core sha256_sparc64 flash sha1_sparc64 ip_tables x_tables ipv6 crc_ccitt nf_defrag_ipv6 autofs4 ext4 crc16 mbcache jbd2 raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor xor async_tx raid6_pq raid1 raid0 multipath linear md_mod crc32c_sparc64
[ 13.428452] CPU: 21 PID: 586 Comm: pktsetup Not tainted 5.3.0-10169-g574cc4539762 #1234 [ 13.428507] Call Trace: [ 13.428542] [00000000004635c0] __warn+0xc0/0x100 [ 13.428582] [0000000000463634] warn_slowpath_fmt+0x34/0x60 [ 13.428626] [000000001045b244] pkt_setup_dev+0x2e4/0x5a0 [pktcdvd] [ 13.428674] [000000001045ccf4] pkt_ctl_ioctl+0x94/0x220 [pktcdvd] [ 13.428724] [00000000006b95c8] do_vfs_ioctl+0x628/0x6e0 [ 13.428764] [00000000006b96c8] ksys_ioctl+0x48/0x80 [ 13.428803] [00000000006b9714] sys_ioctl+0x14/0x40 [ 13.428847] [0000000000406294] linux_sparc_syscall+0x34/0x44 [ 13.428890] irq event stamp: 4181 [ 13.428924] hardirqs last enabled at (4189): [<00000000004e0a74>] console_unlock+0x634/0x6c0 [ 13.428984] hardirqs last disabled at (4196): [<00000000004e0540>] console_unlock+0x100/0x6c0 [ 13.429048] softirqs last enabled at (3978): [<0000000000b2e2d8>] __do_softirq+0x498/0x520 [ 13.429110] softirqs last disabled at (3967): [<000000000042cfb4>] do_softirq_own_stack+0x34/0x60 [ 13.429172] ---[ end trace 2220ca468f32967d ]--- [ 13.430018] pktcdvd: setup of pktcdvd device failed [ 13.455589] des_sparc64: Using sparc64 des opcodes optimized DES implementation [ 13.515334] camellia_sparc64: Using sparc64 camellia opcodes optimized CAMELLIA implementation [ 13.522856] pktcdvd: setup of pktcdvd device failed [ 13.529327] pktcdvd: setup of pktcdvd device failed [ 13.532932] pktcdvd: setup of pktcdvd device failed [ 13.536165] pktcdvd: setup of pktcdvd device failed [ 13.539372] pktcdvd: setup of pktcdvd device failed [ 13.542834] pktcdvd: setup of pktcdvd device failed [ 13.546536] pktcdvd: setup of pktcdvd device failed [ 15.431071] XFS (dm-0): Mounting V5 Filesystem
...
Apparently debian auto-attaches any cdrom like device to pktcdvd, which can lead to the above warning. There's really no reason to warn for this situation, kill it.
--- drivers/block/pktcdvd.c | 1 - 1 file changed, 1 deletion(-)
drivers/block/pktcdvd.c +0 -1
@@ -2594,7 +2594,6 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)if (ret)return ret;if (!blk_queue_scsi_passthrough (bdev_get_queue (bdev))) { -WARN_ONCE (true,"Attempt to register a non-SCSI queue\n" );blkdev_put (bdev,FMODE_READ |FMODE_NDELAY );return -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 120/137 hypfs: Fix error number left in struct pointer member
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit b54c64f7adeb241423cd46598f458b5486b0375e ]
In hypfs_fill_super(), if hypfs_create_update_file() fails, sbi->update_file is left holding an error number. This is passed to hypfs_kill_super() which doesn't check for this.
Fix this by not setting sbi->update_value until after we've checked for error.
--- arch/s390/hypfs/inode.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/s390/hypfs/inode.c +5 -4
@@ -269,7 +269,7 @@ static int hypfs_show_options(struct seq_file *s, struct dentry *root)static int hypfs_fill_super (struct super_block *sb,void *data,int silent) {struct inode *root_inode; -struct dentry *root_dentry; +struct dentry *root_dentry, *update_file;int rc =0 ;struct hypfs_sb_info *sbi;
@@ -300,9 +300,10 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) rc =hypfs_diag_create_files (root_dentry);if (rc)return rc; - sbi->update_file =hypfs_create_update_file (root_dentry); -if (IS_ERR (sbi->update_file)) -return PTR_ERR (sbi->update_file); + update_file =hypfs_create_update_file (root_dentry); +if (IS_ERR (update_file)) +return PTR_ERR (update_file); + sbi->update_file = update_file;hypfs_update_update (sb);pr_info ("Hypervisor filesystem mounted\n" );return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 122/137 kbuild: clean compressed initramfs image
In reply to Greg Kroah-HartmanFrom: Greg Thelen <[email protected]>
[ Upstream commit 6279eb3dd7946c69346a3b98473ed13d3a44adb5 ]
Since 9e3596b0c653 ("kbuild: initramfs cleanup, set target from Kconfig") "make clean" leaves behind compressed initramfs images. Example:
$ make defconfig $ sed -i 's|CONFIG_INITRAMFS_SOURCE=""|CONFIG_INITRAMFS_SOURCE="/tmp/ir.cpio"|' .config $ make olddefconfig $ make -s $ make -s clean $ git clean -ndxf | grep initramfs Would remove usr/initramfs_data.cpio.gz
clean rules do not have CONFIG_* context so they do not know which compression format was used. Thus they don't know which files to delete.
Tell clean to delete all possible compression formats.
Once patched usr/initramfs_data.cpio.gz and friends are deleted by "make clean".
--- usr/Makefile | 3 +++ 1 file changed, 3 insertions(+)
usr/Makefile +3 -0
@@ -11,6 +11,9 @@ datafile_y = initramfs_data.cpio$(suffix_y) datafile_d_y = .$(datafile_y).d AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/$(datafile_y)" +# clean rules do not have CONFIG_INITRAMFS_COMPRESSION. So clean up after all +# possible compression formats. +clean-files += initramfs_data.cpio* # Generate builtin.o based on initramfs_data.o obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 123/137 ocfs2: wait for recovering done after direct unlock request
In reply to Greg Kroah-HartmanFrom: Changwei Ge <[email protected]>
[ Upstream commit 0a3775e4f883912944481cf2ef36eb6383a9cc74 ]
There is a scenario causing ocfs2 umount hang when multiple hosts are rebooting at the same time.
NODE1 NODE2 NODE3
send unlock requset to NODE2
dies
become recovery master recover NODE2
find NODE2 dead
mark resource RECOVERING
directly remove lock from grant list
calculate usage but RECOVERING marked
**miss the window of purging
clear RECOVERING
To reproduce this issue, crash a host and then umount ocfs2 from another node.
To solve this, just let unlock progress wait for recovery done.
--- fs/ocfs2/dlm/dlmunlock.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
fs/ocfs2/dlm/dlmunlock.c +19 -4
@@ -90,7 +90,8 @@ static enum dlm_status dlmunlock_common(struct dlm_ctxt *dlm,enum dlm_status status;int actions =0 ;int in_use; -u8 owner; +u8 owner; +int recovery_wait =0 ;mlog (0 ,"master_node = %d, valblk = %d\n" , master_node, flags &LKM_VALBLK );
@@ -193,9 +194,12 @@ static enum dlm_status dlmunlock_common(struct dlm_ctxt *dlm, }if (flags &LKM_CANCEL ) lock->cancel_pending =0 ; -else - lock->unlock_pending =0 ; - +else { +if (!lock->unlock_pending) + recovery_wait =1 ; +else + lock->unlock_pending =0 ; + } }/* get an extra ref on lock. if we are just switching
@@ -229,6 +233,17 @@ leave:spin_unlock (&res->spinlock);wake_up (&res->wq); +if (recovery_wait) { +spin_lock (&res->spinlock); +/* Unlock request will directly succeed after owner dies, +* and the lock is already removed from grant list. We have to +* wait for RECOVERING done or we miss the chance to purge it +* since the removement is much faster than RECOVERING proc. +*/ +__dlm_wait_on_lockres_flags (res,DLM_LOCK_RES_RECOVERING ); +spin_unlock (&res->spinlock); + } +/* let the caller's final dlm_lock_put handle the actual kfree */ if (actions &DLM_UNLOCK_FREE_LOCK ) {/* this should always be coupled with list removal */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 124/137 kmemleak: increase DEBUG_KMEMLEAK_EARLY_LOG_SIZE default to 16K
In reply to Greg Kroah-HartmanFrom: Nicolas Boichat <[email protected]>
[ Upstream commit b751c52bb587ae66f773b15204ef7a147467f4c7 ]
The current default value (400) is too low on many systems (e.g. some ARM64 platform takes up 1000+ entries).
syzbot uses 16000 as default value, and has proved to be enough on beefy configurations, so let's pick that value.
This consumes more RAM on boot (each entry is 160 bytes, so in total ~2.5MB of RAM), but the memory would later be freed (early_log is __initdata).
--- lib/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/Kconfig.debug +1 -1
@@ -599,7 +599,7 @@ config DEBUG_KMEMLEAK_EARLY_LOG_SIZE int "Maximum kmemleak early log entries" depends on DEBUG_KMEMLEAK range 200 40000 - default 400 + default 16000 help Kmemleak must track all the memory allocations to avoid reporting false positives. Since memory may be allocated or
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 126/137 mips: properly account for stack randomization and stack guard gap
In reply to Greg Kroah-HartmanFrom: Alexandre Ghiti <[email protected]>
[ Upstream commit b1f61b5bde3a1f50392c97b4c8513d1b8efb1cf2 ]
This commit takes care of stack randomization and stack guard gap when computing mmap base address and checks if the task asked for randomization. This fixes the problem uncovered and not fixed for arm
here: https://lkml.kernel.org/r/[email protected]
--- arch/mips/mm/mmap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
arch/mips/mm/mmap.c +12 -2
@@ -21,8 +21,9 @@ unsigned long shm_align_mask = PAGE_SIZE - 1; /* Sane caches */EXPORT_SYMBOL (shm_align_mask);/* gap between mmap and stack */ -#define MIN_GAP (128*1024*1024UL) -#define MAX_GAP ((TASK_SIZE)/6*5) +#define MIN_GAP (128*1024*1024UL) +#define MAX_GAP ((TASK_SIZE)/6*5) +#define STACK_RND_MASK (0x7ff >> (PAGE_SHIFT - 12))static int mmap_is_legacy (struct rlimit *rlim_stack) {
@@ -38,6 +39,15 @@ static int mmap_is_legacy(struct rlimit *rlim_stack)static unsigned long mmap_base (unsigned long rnd,struct rlimit *rlim_stack) {unsigned long gap = rlim_stack->rlim_cur; +unsigned long pad = stack_guard_gap; + +/* Account for stack randomization if necessary */ +if (current->flags &PF_RANDOMIZE ) + pad += (STACK_RND_MASK <<PAGE_SHIFT ); + +/* Values close to RLIM_INFINITY can overflow. */ +if (gap + pad > gap) + gap += pad;if (gap <MIN_GAP ) gap =MIN_GAP ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 127/137 arm: properly account for stack randomization and stack guard gap
In reply to Greg Kroah-HartmanFrom: Alexandre Ghiti <[email protected]>
[ Upstream commit af0f4297286f13a75edf93677b1fb2fc16c412a7 ]
This commit takes care of stack randomization and stack guard gap when computing mmap base address and checks if the task asked for randomization. This fixes the problem uncovered and not fixed for arm
here: https://lkml.kernel.org/r/[email protected]
--- arch/arm/mm/mmap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
arch/arm/mm/mmap.c +12 -2
@@ -18,8 +18,9 @@ (((pgoff)<<PAGE_SHIFT) & (SHMLBA-1)))/* gap between mmap and stack */ -#define MIN_GAP (128*1024*1024UL) -#define MAX_GAP ((TASK_SIZE)/6*5) +#define MIN_GAP (128*1024*1024UL) +#define MAX_GAP ((TASK_SIZE)/6*5) +#define STACK_RND_MASK (0x7ff >> (PAGE_SHIFT - 12))static int mmap_is_legacy (struct rlimit *rlim_stack) {
@@ -35,6 +36,15 @@ static int mmap_is_legacy(struct rlimit *rlim_stack)static unsigned long mmap_base (unsigned long rnd,struct rlimit *rlim_stack) {unsigned long gap = rlim_stack->rlim_cur; +unsigned long pad = stack_guard_gap; + +/* Account for stack randomization if necessary */ +if (current->flags &PF_RANDOMIZE ) + pad += (STACK_RND_MASK <<PAGE_SHIFT ); + +/* Values close to RLIM_INFINITY can overflow. */ +if (gap + pad > gap) + gap += pad;if (gap <MIN_GAP ) gap =MIN_GAP ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 128/137 arm: use STACK_TOP when computing mmap base address
In reply to Greg Kroah-HartmanFrom: Alexandre Ghiti <[email protected]>
[ Upstream commit 86e568e9c0525fc40e76d827212d5e9721cf7504 ]
mmap base address must be computed wrt stack top address, using TASK_SIZE is wrong since STACK_TOP and TASK_SIZE are not equivalent.
--- arch/arm/mm/mmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mm/mmap.c +2 -2
@@ -19,7 +19,7 @@/* gap between mmap and stack */ #define MIN_GAP (128*1024*1024UL) -#define MAX_GAP ((TASK_SIZE)/6*5) +#define MAX_GAP ((STACK_TOP)/6*5)#define STACK_RND_MASK (0x7ff >> (PAGE_SHIFT - 12))static int mmap_is_legacy (struct rlimit *rlim_stack)
@@ -51,7 +51,7 @@ static unsigned long mmap_base(unsigned long rnd, struct rlimit *rlim_stack)else if (gap >MAX_GAP ) gap =MAX_GAP ; -return PAGE_ALIGN (TASK_SIZE - gap - rnd); +return PAGE_ALIGN (STACK_TOP - gap - rnd); }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/137 MIPS: Ingenic: Disable broken BTB lookup optimization.
In reply to Greg Kroah-HartmanFrom: Zhou Yanjie <[email protected]>
[ Upstream commit 053951dda71ecb4b554a2cdbe26f5f6f9bee9dd2 ]
In order to further reduce power consumption, the XBurst core by default attempts to avoid branch target buffer lookups by detecting & special casing loops. This feature will cause BogoMIPS and lpj calculate in error. Set cp0 config7 bit 4 to disable this feature.
--- arch/mips/include/asm/mipsregs.h | 4 ++++ arch/mips/kernel/cpu-probe.c | 7 +++++++ 2 files changed, 11 insertions(+)
arch/mips/include/asm/mipsregs.h +4 -0
@@ -689,6 +689,9 @@#define MIPS_CONF7_IAR (_ULCAST_(1) << 10)#define MIPS_CONF7_AR (_ULCAST_(1) << 16) +/* Ingenic Config7 bits */ +#define MIPS_CONF7_BTB_LOOP_EN (_ULCAST_(1) << 4) +/* Config7 Bits specific to MIPS Technologies. */ /* Performance counters implemented Per TC */
@@ -2813,6 +2816,7 @@ __BUILD_SET_C0(status) __BUILD_SET_C0(cause) __BUILD_SET_C0(config) __BUILD_SET_C0(config5) +__BUILD_SET_C0(config7) __BUILD_SET_C0(intcontrol) __BUILD_SET_C0(intctl) __BUILD_SET_C0(srsmap)
arch/mips/kernel/cpu-probe.c +7 -0
@@ -1964,6 +1964,13 @@ static inline void cpu_probe_ingenic(struct cpuinfo_mips *c, unsigned int cpu) c->cputype =CPU_JZRISC ; c->writecombine = _CACHE_UNCACHED_ACCELERATED; __cpu_name[cpu] ="Ingenic JZRISC" ; +/* +* The XBurst core by default attempts to avoid branch target +* buffer lookups by detecting & special casing loops. This +* feature will cause BogoMIPS and lpj calculate in error. +* Set cp0 config7 bit 4 to disable this feature. +*/ +set_c0_config7 (MIPS_CONF7_BTB_LOOP_EN );break ;default :panic ("Unknown Ingenic Processor ID!" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/137 ext4: fix potential use after free after remounting with noblock_validity
In reply to Greg Kroah-HartmanFrom: zhangyi (F) <[email protected]>
[ Upstream commit 7727ae52975d4f4ef7ff69ed8e6e25f6a4168158 ]
Remount process will release system zone which was allocated before if "noblock_validity" is specified. If we mount an ext4 file system to two mountpoints with default mount options, and then remount one of them with "noblock_validity", it may trigger a use after free problem when someone accessing the other one.
# mount /dev/sda foo # mount /dev/sda bar
User access mountpoint "foo" | Remount mountpoint "bar"
|
ext4_map_blocks() | ext4_remount()
check_block_validity() | ext4_setup_system_zone()
ext4_data_block_valid() | ext4_release_system_zone()
| free system_blks rb nodes
access system_blks rb nodes |
trigger use after free |This problem can also be reproduced by one mountpint, At the same time, add_system_zone() can get called during remount as well so there can be racing ext4_data_block_valid() reading the rbtree at the same time.
This patch add RCU to protect system zone from releasing or building when doing a remount which inverse current "noblock_validity" mount option. It assign the rbtree after the whole tree was complete and do actual freeing after rcu grace period, avoid any intermediate state.
--- fs/ext4/block_validity.c | 189 ++++++++++++++++++++++++++++----------- fs/ext4/ext4.h | 10 ++- 2 files changed, 147 insertions(+), 52 deletions(-)
fs/ext4/block_validity.c +138 -51
@@ -38,6 +38,7 @@ int __init ext4_init_system_zone(void)void ext4_exit_system_zone (void ) { +rcu_barrier ();kmem_cache_destroy (ext4_system_zone_cachep); }
@@ -49,17 +50,26 @@ static inline int can_merge(struct ext4_system_zone *entry1,return 0 ; } +static void release_system_zone (struct ext4_system_blocks *system_blks) +{ +struct ext4_system_zone *entry, *n; + +rbtree_postorder_for_each_entry_safe (entry, n, + &system_blks->root, node) +kmem_cache_free (ext4_system_zone_cachep, entry); +} +/* * Mark a range of blocks as belonging to the "system zone" --- that * is, filesystem metadata blocks which should never be used by * inodes. */ -static int add_system_zone (struct ext4_sb_info *sbi, +static int add_system_zone (struct ext4_system_blocks *system_blks,ext4_fsblk_t start_blk,unsigned int count) {struct ext4_system_zone *new_entry =NULL , *entry; -struct rb_node **n = &sbi->system_blks.rb_node, *node; +struct rb_node **n = &system_blks->root.rb_node, *node;struct rb_node *parent =NULL , *new_node =NULL ;while (*n) {
@@ -91,7 +101,7 @@ static int add_system_zone(struct ext4_sb_info *sbi, new_node = &new_entry->node;rb_link_node (new_node, parent, n); -rb_insert_color (new_node, &sbi->system_blks); +rb_insert_color (new_node, &system_blks->root); }/* Can we merge to the left? */
@@ -101,7 +111,7 @@ static int add_system_zone(struct ext4_sb_info *sbi,if (can_merge (entry, new_entry)) { new_entry->start_blk = entry->start_blk; new_entry->count += entry->count; -rb_erase (node, &sbi->system_blks); +rb_erase (node, &system_blks->root);kmem_cache_free (ext4_system_zone_cachep, entry); } }
@@ -112,7 +122,7 @@ static int add_system_zone(struct ext4_sb_info *sbi, entry = rb_entry(node, struct ext4_system_zone, node);if (can_merge (new_entry, entry)) { new_entry->count += entry->count; -rb_erase (node, &sbi->system_blks); +rb_erase (node, &system_blks->root);kmem_cache_free (ext4_system_zone_cachep, entry); } }
@@ -126,7 +136,7 @@ static void debug_print_tree(struct ext4_sb_info *sbi)int first =1 ;printk (KERN_INFO "System zones: " ); - node =rb_first (&sbi->system_blks); + node =rb_first (&sbi->system_blks->root);while (node) { entry = rb_entry(node, struct ext4_system_zone, node); printk(KERN_CONT "%s%llu-%llu", first ? "" : ", ",
@@ -137,7 +147,47 @@ static void debug_print_tree(struct ext4_sb_info *sbi)printk (KERN_CONT "\n" ); } -static int ext4_protect_reserved_inode (struct super_block *sb,u32 ino) +/* +* Returns 1 if the passed-in block region (start_blk, +* start_blk+count) is valid; 0 if some part of the block region +* overlaps with filesystem metadata blocks. +*/ +static int ext4_data_block_valid_rcu (struct ext4_sb_info *sbi, +struct ext4_system_blocks *system_blks, +ext4_fsblk_t start_blk, +unsigned int count) +{ +struct ext4_system_zone *entry; +struct rb_node *n; + +if ((start_blk <=le32_to_cpu (sbi->s_es->s_first_data_block)) || + (start_blk + count < start_blk) || + (start_blk + count >ext4_blocks_count (sbi->s_es))) { + sbi->s_es->s_last_error_block =cpu_to_le64 (start_blk); +return 0 ; + } + +if (system_blks ==NULL ) +return 1 ; + + n = system_blks->root.rb_node; +while (n) { + entry = rb_entry(n, struct ext4_system_zone, node); +if (start_blk + count -1 < entry->start_blk) + n = n->rb_left; +else if (start_blk >= (entry->start_blk + entry->count)) + n = n->rb_right; +else { + sbi->s_es->s_last_error_block =cpu_to_le64 (start_blk); +return 0 ; + } + } +return 1 ; +} + +static int ext4_protect_reserved_inode (struct super_block *sb, +struct ext4_system_blocks *system_blks, +u32 ino) {struct inode *inode;struct ext4_sb_info *sbi =EXT4_SB (sb);
@@ -163,14 +213,15 @@ static int ext4_protect_reserved_inode(struct super_block *sb, u32 ino)if (n ==0 ) { i++; }else { -if (!ext4_data_block_valid (sbi, map.m_pblk, n)) { +if (!ext4_data_block_valid_rcu (sbi, system_blks, + map.m_pblk, n)) {ext4_error (sb,"blocks %llu-%llu from inode %u " "overlap system zone" , map.m_pblk, map.m_pblk + map.m_len -1 , ino); err = -EFSCORRUPTED ;break ; } - err =add_system_zone (sbi, map.m_pblk, n); + err =add_system_zone (system_blks, map.m_pblk, n);if (err <0 )break ; i += n;
@@ -180,94 +231,130 @@ static int ext4_protect_reserved_inode(struct super_block *sb, u32 ino)return err; } +static void ext4_destroy_system_zone (struct rcu_head *rcu) +{ +struct ext4_system_blocks *system_blks; + + system_blks = container_of(rcu, struct ext4_system_blocks, rcu); +release_system_zone (system_blks); +kfree (system_blks); +} + +/* +* Build system zone rbtree which is used for block validity checking. +* +* The update of system_blks pointer in this function is protected by +* sb->s_umount semaphore. However we have to be careful as we can be +* racing with ext4_data_block_valid() calls reading system_blks rbtree +* protected only by RCU. That's why we first build the rbtree and then +* swap it in place. +*/ int ext4_setup_system_zone (struct super_block *sb) {ext4_group_t ngroups =ext4_get_groups_count (sb);struct ext4_sb_info *sbi =EXT4_SB (sb); +struct ext4_system_blocks *system_blks;struct ext4_group_desc *gdp;ext4_group_t i;int flex_size =ext4_flex_bg_size (sbi);int ret;if (!test_opt (sb,BLOCK_VALIDITY )) { -if (sbi->system_blks.rb_node) +if (sbi->system_blks)ext4_release_system_zone (sb);return 0 ; } -if (sbi->system_blks.rb_node) +if (sbi->system_blks)return 0 ; + system_blks =kzalloc (sizeof (*system_blks),GFP_KERNEL ); +if (!system_blks) +return -ENOMEM ; +for (i=0 ; i < ngroups; i++) {cond_resched ();if (ext4_bg_has_super (sb, i) && ((i <5 ) || ((i % flex_size) ==0 ))) -add_system_zone (sbi,ext4_group_first_block_no (sb, i), +add_system_zone (system_blks, +ext4_group_first_block_no (sb, i),ext4_bg_num_gdb (sb, i) +1 ); gdp =ext4_get_group_desc (sb, i,NULL ); - ret =add_system_zone (sbi,ext4_block_bitmap (sb, gdp),1 ); + ret =add_system_zone (system_blks, +ext4_block_bitmap (sb, gdp),1 );if (ret) -return ret; - ret =add_system_zone (sbi,ext4_inode_bitmap (sb, gdp),1 ); + goto err; + ret =add_system_zone (system_blks, +ext4_inode_bitmap (sb, gdp),1 );if (ret) -return ret; - ret =add_system_zone (sbi,ext4_inode_table (sb, gdp), + goto err; + ret =add_system_zone (system_blks, +ext4_inode_table (sb, gdp), sbi->s_itb_per_group);if (ret) -return ret; + goto err; }if (ext4_has_feature_journal (sb) && sbi->s_es->s_journal_inum) { - ret =ext4_protect_reserved_inode (sb, + ret =ext4_protect_reserved_inode (sb, system_blks,le32_to_cpu (sbi->s_es->s_journal_inum));if (ret) -return ret; + goto err; } +/* +* System blks rbtree complete, announce it once to prevent racing +* with ext4_data_block_valid() accessing the rbtree at the same +* time. +*/ +rcu_assign_pointer (sbi->system_blks, system_blks); +if (test_opt (sb,DEBUG ))debug_print_tree (sbi);return 0 ; +err: +release_system_zone (system_blks); +kfree (system_blks); +return ret; } -/* Called when the filesystem is unmounted */ +/* +* Called when the filesystem is unmounted or when remounting it with +* noblock_validity specified. +* +* The update of system_blks pointer in this function is protected by +* sb->s_umount semaphore. However we have to be careful as we can be +* racing with ext4_data_block_valid() calls reading system_blks rbtree +* protected only by RCU. So we first clear the system_blks pointer and +* then free the rbtree only after RCU grace period expires. +*/ void ext4_release_system_zone (struct super_block *sb) { -struct ext4_system_zone *entry, *n; +struct ext4_system_blocks *system_blks; -rbtree_postorder_for_each_entry_safe (entry, n, - &EXT4_SB (sb)->system_blks, node) -kmem_cache_free (ext4_system_zone_cachep, entry); + system_blks =rcu_dereference_protected (EXT4_SB (sb)->system_blks, +lockdep_is_held (&sb->s_umount)); +rcu_assign_pointer (EXT4_SB (sb)->system_blks,NULL ); -EXT4_SB (sb)->system_blks =RB_ROOT ; +if (system_blks) +call_rcu (&system_blks->rcu, ext4_destroy_system_zone); } -/* -* Returns 1 if the passed-in block region (start_blk, -* start_blk+count) is valid; 0 if some part of the block region -* overlaps with filesystem metadata blocks. -*/ int ext4_data_block_valid (struct ext4_sb_info *sbi,ext4_fsblk_t start_blk,unsigned int count) { -struct ext4_system_zone *entry; -struct rb_node *n = sbi->system_blks.rb_node; +struct ext4_system_blocks *system_blks; +int ret; -if ((start_blk <=le32_to_cpu (sbi->s_es->s_first_data_block)) || - (start_blk + count < start_blk) || - (start_blk + count >ext4_blocks_count (sbi->s_es))) { - sbi->s_es->s_last_error_block =cpu_to_le64 (start_blk); -return 0 ; - } -while (n) { - entry = rb_entry(n, struct ext4_system_zone, node); -if (start_blk + count -1 < entry->start_blk) - n = n->rb_left; -else if (start_blk >= (entry->start_blk + entry->count)) - n = n->rb_right; -else { - sbi->s_es->s_last_error_block =cpu_to_le64 (start_blk); -return 0 ; - } - } -return 1 ; +/* +* Lock the system zone to prevent it being released concurrently +* when doing a remount which inverse current "[no]block_validity" +* mount option. +*/ +rcu_read_lock (); + system_blks =rcu_dereference (sbi->system_blks); + ret =ext4_data_block_valid_rcu (sbi, system_blks, start_blk, + count); +rcu_read_unlock (); +return ret; } int ext4_check_blockref(const char *function, unsigned int line,
fs/ext4/ext4.h +9 -1
@@ -184,6 +184,14 @@ struct ext4_map_blocks {unsigned int m_flags; }; +/* +* Block validity checking, system zone rbtree. +*/ +struct ext4_system_blocks { +struct rb_root root; +struct rcu_head rcu; +}; +/* * Flags for ext4_io_end->flags */
@@ -1420,7 +1428,7 @@ struct ext4_sb_info {int s_jquota_fmt;/* Format of quota to use */ #endif unsigned int s_want_extra_isize;/* New inodes should reserve # bytes */ -struct rb_root system_blks; +struct ext4_system_blocks __rcu *system_blks;#ifdef EXTENTS_STATS /* ext4 extents stats */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/137 MIPS: tlbex: Explicitly cast _PAGE_NO_EXEC to a boolean
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit c59ae0a1055127dd3828a88e111a0db59b254104 ]
clang warns:
arch/mips/mm/tlbex.c:634:19: error: use of logical '&&' with constant operand [-Werror,-Wconstant-logical-operand]
if (cpu_has_rixi && _PAGE_NO_EXEC) {
^ ~~~~~~~~~~~~~
arch/mips/mm/tlbex.c:634:19: note: use '&' for a bitwise operation
if (cpu_has_rixi && _PAGE_NO_EXEC) {
^~
&
arch/mips/mm/tlbex.c:634:19: note: remove constant to silence this
warning
if (cpu_has_rixi && _PAGE_NO_EXEC) {
~^~~~~~~~~~~~~~~~1 error generated.
Explicitly cast this value to a boolean so that clang understands we intend for this to be a non-zero value.
--- arch/mips/mm/tlbex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/mm/tlbex.c +1 -1
@@ -631,7 +631,7 @@ static __maybe_unused void build_convert_pte_to_entrylo(u32 **p,return ; } -if (cpu_has_rixi && _PAGE_NO_EXEC) { +if (cpu_has_rixi && !!_PAGE_NO_EXEC) {if (fill_includes_sw_bits) {UASM_i_ROTR (p, reg, reg,ilog2 (_PAGE_GLOBAL)); }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/137 Smack: Dont ignore other bprm->unsafe flags if LSM_UNSAFE_PTRACE is set
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit 3675f052b43ba51b99b85b073c7070e083f3e6fb upstream.
There is a logic bug in the current smack_bprm_set_creds():
If LSM_UNSAFE_PTRACE is set, but the ptrace state is deemed to be acceptable (e.g. because the ptracer detached in the meantime), the other ->unsafe flags aren't checked. As far as I can tell, this means that something like the following could work (but I haven't tested it):
- task A: create task B with fork()
- task B: set NO_NEW_PRIVS
- task B: install a seccomp filter that makes open() return 0 under some conditions
- task B: replace fd 0 with a malicious library
- task A: attach to task B with PTRACE_ATTACH
- task B: execve() a file with an SMACK64EXEC extended attribute
- task A: while task B is still in the middle of execve(), exit (which destroys the ptrace relationship)
Make sure that if any flags other than LSM_UNSAFE_PTRACE are set in bprm->unsafe, we reject the execve().
--- security/smack/smack_lsm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
security/smack/smack_lsm.c +2 -1
@@ -937,7 +937,8 @@ static int smack_bprm_set_creds(struct lif (rc !=0 )return rc; - }else if (bprm->unsafe) + } +if (bprm->unsafe & ~LSM_UNSAFE_PTRACE )return -EPERM ; bsp->smk_task = isp->smk_task;
Greg Kroah-Hartman
maintainerPATCH 83/137 powerpc: dump kernel log before carrying out fadump or kdump
In reply to Greg Kroah-HartmanFrom: Ganesh Goudar <[email protected]>
[ Upstream commit e7ca44ed3ba77fc26cf32650bb71584896662474 ]
Since commit 4388c9b3a6ee ("powerpc: Do not send system reset request through the oops path"), pstore dmesg file is not updated when dump is triggered from HMC. This commit modified system reset (sreset) handler to invoke fadump or kdump (if configured), without pushing dmesg to pstore. This leaves pstore to have old dmesg data which won't be much of a help if kdump fails to capture the dump. This patch fixes that by calling kmsg_dump() before heading to fadump ot kdump.
--- arch/powerpc/kernel/traps.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kernel/traps.c +1 -0
@@ -472,6 +472,7 @@ void system_reset_exception(struct pt_regs *regs)if (debugger (regs)) goto out; +kmsg_dump (KMSG_DUMP_OOPS );/* * A system reset is a request to dump, so we always send * it through the crashdump code (if fadump or kdump are
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/137 smack: use GFP_NOFS while holding inode_smack::smk_lock
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit e5bfad3d7acc5702f32aafeb388362994f4d7bd0 upstream.
inode_smack::smk_lock is taken during smack_d_instantiate(), which is called during a filesystem transaction when creating a file on ext4. Therefore to avoid a deadlock, all code that takes this lock must use GFP_NOFS, to prevent memory reclaim from waiting for the filesystem transaction to complete.
--- security/smack/smack_access.c | 6 +++--- security/smack/smack_lsm.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
security/smack/smack_access.c +3 -3
@@ -465,7 +465,7 @@ char *smk_parse_smack(const char *stringif (i ==0 || i >=SMK_LONGLABEL )return ERR_PTR (-EINVAL ); - smack =kzalloc (i +1 ,GFP_KERNEL ); + smack =kzalloc (i +1 ,GFP_NOFS );if (smack ==NULL )return ERR_PTR (-ENOMEM );
@@ -500,7 +500,7 @@ int smk_netlbl_mls(int level, char *catsif ((m & *cp) ==0 )continue ; rc =netlbl_catmap_setbit (&sap->attr.mls.cat, - cat,GFP_KERNEL ); + cat,GFP_NOFS );if (rc <0 ) {netlbl_catmap_free (sap->attr.mls.cat);return rc;
@@ -536,7 +536,7 @@ struct smack_known *smk_import_entry(conif (skp !=NULL ) goto freeout; - skp =kzalloc (sizeof (*skp),GFP_KERNEL ); + skp =kzalloc (sizeof (*skp),GFP_NOFS );if (skp ==NULL ) { skp =ERR_PTR (-ENOMEM ); goto freeout;
security/smack/smack_lsm.c +1 -1
@@ -288,7 +288,7 @@ static struct smack_known *smk_fetch(conif (!(ip->i_opflags &IOP_XATTR ))return ERR_PTR (-EOPNOTSUPP ); - buffer =kzalloc (SMK_LONGLABEL ,GFP_KERNEL ); + buffer =kzalloc (SMK_LONGLABEL ,GFP_NOFS );if (buffer ==NULL )return ERR_PTR (-ENOMEM );
Greg Kroah-Hartman
maintainerPATCH 134/137 kexec: bail out upon SIGKILL when allocating memory.
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit 7c3a6aedcd6aae0a32a527e68669f7dd667492d1 upstream.
syzbot found that a thread can stall for minutes inside kexec_load() after that thread was killed by SIGKILL [1]. It turned out that the reproducer was trying to allocate 2408MB of memory using kimage_alloc_page() from kimage_load_normal_segment(). Let's check for SIGKILL before doing memory allocation.
[1] https://syzkaller.appspot.com/bug?id=a0e3436829698d5824231251fad9d8e998f94f5e
--- kernel/kexec_core.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/kexec_core.c +2 -0
@@ -300,6 +300,8 @@ static struct page *kimage_alloc_pages(g {struct page *pages; +if (fatal_signal_pending (current)) +return NULL ; pages =alloc_pages (gfp_mask & ~__GFP_ZERO, order);if (pages) {unsigned int count, i;
Greg Kroah-Hartman
maintainerPATCH 135/137 KVM: hyperv: Fix Direct Synthetic timers assert an interrupt w/o lapic_in_kernel
In reply to Greg Kroah-HartmanFrom: Wanpeng Li <[email protected]>
commit a073d7e3ad687a7ef32b65affe80faa7ce89bf92 upstream.
Reported by syzkaller:
kasan: GPF could be caused by NULL-ptr deref or user memory access general protection fault: 0000 [#1] PREEMPT SMP KASAN RIP: 0010:__apic_accept_irq+0x46/0x740 arch/x86/kvm/lapic.c:1029 Call Trace: kvm_apic_set_irq+0xb4/0x140 arch/x86/kvm/lapic.c:558 stimer_notify_direct arch/x86/kvm/hyperv.c:648 [inline] stimer_expiration arch/x86/kvm/hyperv.c:659 [inline] kvm_hv_process_stimers+0x594/0x1650 arch/x86/kvm/hyperv.c:686 vcpu_enter_guest+0x2b2a/0x54b0 arch/x86/kvm/x86.c:7896 vcpu_run+0x393/0xd40 arch/x86/kvm/x86.c:8152 kvm_arch_vcpu_ioctl_run+0x636/0x900 arch/x86/kvm/x86.c:8360 kvm_vcpu_ioctl+0x6cf/0xaf0 arch/x86/kvm/../../../virt/kvm/kvm_main.c:2765
The testcase programs HV_X64_MSR_STIMERn_CONFIG/HV_X64_MSR_STIMERn_COUNT, in addition, there is no lapic in the kernel, the counters value are small enough in order that kvm_hv_process_stimers() inject this already-expired timer interrupt into the guest through lapic in the kernel which triggers the NULL deferencing. This patch fixes it by don't advertise direct mode synthetic timers and discarding the inject when lapic is not in kernel.
syzkaller source: https://syzkaller.appspot.com/x/repro.c?x=1752fe0a600000
--- arch/x86/kvm/hyperv.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
arch/x86/kvm/hyperv.c +10 -2
@@ -645,7 +645,9 @@ static int stimer_notify_direct(struct k .vector = stimer->config.apic_vector }; -return !kvm_apic_set_irq (vcpu, &irq,NULL ); +if (lapic_in_kernel (vcpu)) +return !kvm_apic_set_irq (vcpu, &irq,NULL ); +return 0 ; }static void stimer_expiration (struct kvm_vcpu_hv_stimer *stimer)
@@ -1854,7 +1856,13 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct k ent->edx |=HV_FEATURE_FREQUENCY_MSRS_AVAILABLE ; ent->edx |=HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE ; - ent->edx |=HV_STIMER_DIRECT_MODE_AVAILABLE ; + +/* +* Direct Synthetic timers only make sense with in-kernel +* LAPIC +*/ +if (lapic_in_kernel (vcpu)) + ent->edx |=HV_STIMER_DIRECT_MODE_AVAILABLE ;break ;
Greg Kroah-Hartman
maintainerPATCH 136/137 9p/cache.c: Fix memory leak in v9fs_cache_session_get_cookie
In reply to Greg Kroah-HartmanFrom: Bharath Vedartham <[email protected]>
commit 962a991c5de18452d6c429d99f3039387cf5cbb0 upstream.
v9fs_cache_session_get_cookie assigns a random cachetag to v9ses->cachetag, if the cachetag is not assigned previously.
v9fs_random_cachetag allocates memory to v9ses->cachetag with kmalloc and uses scnprintf to fill it up with a cachetag.
But if scnprintf fails, v9ses->cachetag is not freed in the current code causing a memory leak.
Fix this by freeing v9ses->cachetag it v9fs_random_cachetag fails.
This was reported by syzbot, the link to the report is below:
https://syzkaller.appspot.com/bug?id=f012bdf297a7a4c860c38a88b44fbee43fd9bbf3
--- fs/9p/cache.c | 2 ++ 1 file changed, 2 insertions(+)
fs/9p/cache.c +2 -0
@@ -51,6 +51,8 @@ void v9fs_cache_session_get_cookie(strucif (!v9ses->cachetag) {if (v9fs_random_cachetag (v9ses) <0 ) { v9ses->fscache =NULL ; +kfree (v9ses->cachetag); + v9ses->cachetag =NULL ;return ; } }
Greg Kroah-Hartman
maintainerPATCH 137/137 vfs: set fs_context::user_ns for reconfigure
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit 1dd9bc08cf1420d466dd8dcfcc233777e61ca5d2 upstream.
fs_context::user_ns is used by fuse_parse_param(), even during remount, so it needs to be set to the existing value for reconfigure.
Reproducer:
#include <fcntl.h>
#include <sys/mount.h>
int main()
{
char opts[128];
int fd = open("/dev/fuse", O_RDWR);
sprintf(opts, "fd=%d,rootmode=040000,user_id=0,group_id=0", fd);
mkdir("mnt", 0777);
mount("foo", "mnt", "fuse.foo", 0, opts);
mount("foo", "mnt", "fuse.foo", MS_REMOUNT, opts);
}Crash:
BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] SMP CPU: 0 PID: 129 Comm: syz_make_kuid Not tainted 5.3.0-rc5-next-20190821 #3 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-20181126_142135-anatol 04/01/2014 RIP: 0010:map_id_range_down+0xb/0xc0 kernel/user_namespace.c:291 [...] Call Trace: map_id_down kernel/user_namespace.c:312 [inline] make_kuid+0xe/0x10 kernel/user_namespace.c:389 fuse_parse_param+0x116/0x210 fs/fuse/inode.c:523 vfs_parse_fs_param+0xdb/0x1b0 fs/fs_context.c:145 vfs_parse_fs_string+0x6a/0xa0 fs/fs_context.c:188 generic_parse_monolithic+0x85/0xc0 fs/fs_context.c:228 parse_monolithic_mount_data+0x1b/0x20 fs/fs_context.c:708 do_remount fs/namespace.c:2525 [inline] do_mount+0x39a/0xa60 fs/namespace.c:3107 ksys_mount+0x7d/0xd0 fs/namespace.c:3325 __do_sys_mount fs/namespace.c:3339 [inline] __se_sys_mount fs/namespace.c:3336 [inline] __x64_sys_mount+0x20/0x30 fs/namespace.c:3336 do_syscall_64+0x4a/0x1a0 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- fs/fs_context.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/fs_context.c +1 -3
@@ -279,10 +279,8 @@ static struct fs_context *alloc_fs_conte fc->user_ns =get_user_ns (reference->d_sb->s_user_ns);break ;case FS_CONTEXT_FOR_RECONFIGURE : -/* We don't pin any namespaces as the superblock's -* subscriptions cannot be changed at this point. -*/ atomic_inc (&reference->d_sb->s_active); + fc->user_ns =get_user_ns (reference->d_sb->s_user_ns); fc->root =dget (reference);break ; }
Greg Kroah-Hartman
maintainerPATCH 129/137 soundwire: fix regmap dependencies and align with other serial links
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 8676b3ca4673517650fd509d7fa586aff87b3c28 ]
The existing code has a mixed select/depend usage which makes no sense.
config SOUNDWIRE_BUS
tristate
select REGMAP_SOUNDWIRE
config REGMAP_SOUNDWIRE
tristate
depends on SOUNDWIRE_BUS
Let's remove one layer of Kconfig definitions and align with the solutions used by all other serial links.
--- drivers/base/regmap/Kconfig | 2 +- drivers/soundwire/Kconfig | 7 +------ drivers/soundwire/Makefile | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-)
drivers/base/regmap/Kconfig +1 -1
@@ -44,7 +44,7 @@ config REGMAP_IRQ config REGMAP_SOUNDWIRE tristate - depends on SOUNDWIRE_BUS + depends on SOUNDWIRE config REGMAP_SCCB tristate
drivers/soundwire/Kconfig +1 -6
@@ -4,7 +4,7 @@ # menuconfig SOUNDWIRE - bool "SoundWire support" + tristate "SoundWire support" help SoundWire is a 2-Pin interface with data and clock line ratified by the MIPI Alliance. SoundWire is used for transporting data
@@ -17,17 +17,12 @@ if SOUNDWIRE comment "SoundWire Devices" -config SOUNDWIRE_BUS - tristate - select REGMAP_SOUNDWIRE - config SOUNDWIRE_CADENCE tristate config SOUNDWIRE_INTEL tristate "Intel SoundWire Master driver" select SOUNDWIRE_CADENCE - select SOUNDWIRE_BUS depends on X86 && ACPI && SND_SOC help SoundWire Intel Master driver.
drivers/soundwire/Makefile +1 -1
@@ -5,7 +5,7 @@ #Bus Objs soundwire-bus-objs := bus_type.o bus.o slave.o mipi_disco.o stream.o -obj-$(CONFIG_SOUNDWIRE_BUS) += soundwire-bus.o +obj-$(CONFIG_SOUNDWIRE) += soundwire-bus.o #Cadence Objs soundwire-cadence-objs := cadence_master.o
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/137 NFC: fix attrs checks in netlink interface
In reply to Greg Kroah-HartmanFrom: Andrey Konovalov <[email protected]>
commit 18917d51472fe3b126a3a8f756c6b18085eb8130 upstream.
nfc_genl_deactivate_target() relies on the NFC_ATTR_TARGET_INDEX attribute being present, but doesn't check whether it is actually provided by the user. Same goes for nfc_genl_fw_download() and NFC_ATTR_FIRMWARE_NAME.
This patch adds appropriate checks.
Found with syzkaller.
--- net/nfc/netlink.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/nfc/netlink.c +4 -2
@@ -970,7 +970,8 @@ static int nfc_genl_dep_link_down(structint rc;u32 idx; -if (!info->attrs[NFC_ATTR_DEVICE_INDEX ]) +if (!info->attrs[NFC_ATTR_DEVICE_INDEX ] || + !info->attrs[NFC_ATTR_TARGET_INDEX ])return -EINVAL ; idx =nla_get_u32 (info->attrs[NFC_ATTR_DEVICE_INDEX ]);
@@ -1018,7 +1019,8 @@ static int nfc_genl_llc_get_params(strucstruct sk_buff *msg =NULL ;u32 idx; -if (!info->attrs[NFC_ATTR_DEVICE_INDEX ]) +if (!info->attrs[NFC_ATTR_DEVICE_INDEX ] || + !info->attrs[NFC_ATTR_FIRMWARE_NAME ])return -EINVAL ; idx =nla_get_u32 (info->attrs[NFC_ATTR_DEVICE_INDEX ]);
Greg Kroah-Hartman
maintainerPATCH 132/137 dm raid: fix updating of max_discard_sectors limit
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
commit c8156fc77d0796ba2618936dbb3084e769e916c1 upstream.
Unit of 'chunk_size' is byte, instead of sector, so fix it by setting the queue_limits' max_discard_sectors to rs->md.chunk_sectors. Also, rename chunk_size to chunk_size_bytes.
Without this fix, too big max_discard_sectors is applied on the request queue of dm-raid, finally raid code has to split the bio again.
This re-split done by raid causes the following nested clone_endio:
1) one big bio 'A' is submitted to dm queue, and served as the original bio
2) one new bio 'B' is cloned from the original bio 'A', and .map() is run on this bio of 'B', and B's original bio points to 'A'
3) raid code sees that 'B' is too big, and split 'B' and re-submit the remainded part of 'B' to dm-raid queue via generic_make_request().
4) now dm will handle 'B' as new original bio, then allocate a new clone bio of 'C' and run .map() on 'C'. Meantime C's original bio points to 'B'.
5) suppose now 'C' is completed by raid directly, then the following clone_endio() is called recursively:
clone_endio(C) ->clone_endio(B) #B is original bio of 'C' ->bio_endio(A)
'A' can be big enough to make hundreds of nested clone_endio(), then stack can be corrupted easily.
--- drivers/md/dm-raid.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/md/dm-raid.c +5 -5
@@ -3738,18 +3738,18 @@ static int raid_iterate_devices(struct dstatic void raid_io_hints (struct dm_target *ti,struct queue_limits *limits) {struct raid_set *rs = ti->private; -unsigned int chunk_size =to_bytes (rs->md.chunk_sectors); +unsigned int chunk_size_bytes =to_bytes (rs->md.chunk_sectors); -blk_limits_io_min (limits, chunk_size); -blk_limits_io_opt (limits, chunk_size *mddev_data_stripes (rs)); +blk_limits_io_min (limits, chunk_size_bytes); +blk_limits_io_opt (limits, chunk_size_bytes *mddev_data_stripes (rs));/* * RAID1 and RAID10 personalities require bio splitting, * RAID0/4/5/6 don't and process large discard bios properly. */ if (rs_is_raid1 (rs) ||rs_is_raid10 (rs)) { - limits->discard_granularity = chunk_size; - limits->max_discard_sectors = chunk_size; + limits->discard_granularity = chunk_size_bytes; + limits->max_discard_sectors = rs->md.chunk_sectors; } }
Greg Kroah-Hartman
maintainerPATCH 91/137 MIPS: Dont use bc_false uninitialized in __mm_isBranchInstr
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit c2869aafe7191d366d74c55cb8a93c6d0baba317 ]
clang warns:
arch/mips/kernel/branch.c:148:8: error: variable 'bc_false' is used uninitialized whenever switch case is taken [-Werror,-Wsometimes-uninitialized]
case mm_bc2t_op:
^~~~~~~~~~
arch/mips/kernel/branch.c:157:8: note: uninitialized use occurs here
if (bc_false)
^~~~~~~~
arch/mips/kernel/branch.c:149:8: error: variable 'bc_false' is used
uninitialized whenever switch case is taken
[-Werror,-Wsometimes-uninitialized]
case mm_bc1t_op:
^~~~~~~~~~
arch/mips/kernel/branch.c:157:8: note: uninitialized use occurs here
if (bc_false)
^~~~~~~~
arch/mips/kernel/branch.c:142:4: note: variable 'bc_false' is declared
here
int bc_false = 0;
^2 errors generated.
When mm_bc1t_op and mm_bc2t_op are taken, the bc_false initialization does not happen, which leads to a garbage value upon use, as illustrated below with a small sample program.
$ mipsel-linux-gnu-gcc --version | head -n1 mipsel-linux-gnu-gcc (Debian 8.3.0-2) 8.3.0
$ clang --version | head -n1 ClangBuiltLinux clang version 9.0.0 (git://github.com/llvm/llvm-project 544315b4197034a3be8acd12cba56a75fb1f08dc) (based on LLVM 9.0.0svn)
$ cat test.c #include <stdio.h>
static void switch_scoped(int opcode)
{
switch (opcode) {
case 1:
case 2: {
int bc_false = 0;
bc_false = 4;
case 3:
case 4:
printf("\t* switch scoped bc_false = %d\n", bc_false);
}
}}
static void function_scoped(int opcode)
{
int bc_false = 0;
switch (opcode) {
case 1:
case 2: {
bc_false = 4;
case 3:
case 4:
printf("\t* function scoped bc_false = %d\n", bc_false);
}
}}
int main(void)
{
int opcode;
for (opcode = 1; opcode < 5; opcode++) {
printf("opcode = %d:\n", opcode);
switch_scoped(opcode);
function_scoped(opcode);
printf("\n");
}
return 0;}
$ mipsel-linux-gnu-gcc -std=gnu89 -static test.c && \
qemu-mipsel a.out
opcode = 1:
* switch scoped bc_false = 4
* function scoped bc_false = 4opcode = 2:
* switch scoped bc_false = 4
* function scoped bc_false = 4
opcode = 3:
* switch scoped bc_false = 2147483004
* function scoped bc_false = 0
opcode = 4:
* switch scoped bc_false = 2147483004
* function scoped bc_false = 0
$ clang -std=gnu89 --target=mipsel-linux-gnu -m32 -static test.c && \
qemu-mipsel a.out
opcode = 1:
* switch scoped bc_false = 4
* function scoped bc_false = 4opcode = 2:
* switch scoped bc_false = 4
* function scoped bc_false = 4
opcode = 3:
* switch scoped bc_false = 2147483004
* function scoped bc_false = 0
opcode = 4:
* switch scoped bc_false = 2147483004
* function scoped bc_false = 0
Move the definition up so that we get the right behavior and mark it __maybe_unused as it will not be used when CONFIG_MIPS_FP_SUPPORT isn't enabled.
--- arch/mips/kernel/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/branch.c +1 -1
@@ -58,6 +58,7 @@ int __mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn, unsigned long *contpc) {union mips_instruction insn = (union mips_instruction )dec_insn.insn; +int __maybe_unused bc_false =0 ;if (!cpu_has_mmips)return 0 ;
@@ -139,7 +140,6 @@ int __mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,#ifdef CONFIG_MIPS_FP_SUPPORT case mm_bc2f_op:case mm_bc1f_op: { -int bc_false =0 ;unsigned int fcr31;unsigned int bit;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/137 f2fs: fix to drop meta/node pages during umount
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit a8933b6b68f775b5774e7b075447fae13f4d01fe ]
As reported in bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=204193
A null pointer dereference bug is triggered in f2fs under kernel-5.1.3.
kasan_report.cold+0x5/0x32 f2fs_write_end_io+0x215/0x650 bio_endio+0x26e/0x320 blk_update_request+0x209/0x5d0 blk_mq_end_request+0x2e/0x230 lo_complete_rq+0x12c/0x190 blk_done_softirq+0x14a/0x1a0 __do_softirq+0x119/0x3e5 irq_exit+0x94/0xe0 call_function_single_interrupt+0xf/0x20
During umount, we will access NULL sbi->node_inode pointer in f2fs_write_end_io():
f2fs_bug_on(sbi, page->mapping == NODE_MAPPING(sbi) && page->index != nid_of_node(page));
The reason is if disable_checkpoint mount option is on, meta dirty pages can remain during umount, and then be flushed by iput() of meta_inode, however node_inode has been iput()ed before meta_inode's iput().
Since checkpoint is disabled, all meta/node datas are useless and should be dropped in next mount, so in umount, let's adjust drop_inode() to give a hint to iput_final() to drop all those dirty datas correctly.
--- fs/f2fs/super.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
fs/f2fs/super.c +14 -0
@@ -894,7 +894,21 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb)static int f2fs_drop_inode (struct inode *inode) { +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);int ret; + +/* +* during filesystem shutdown, if checkpoint is disabled, +* drop useless meta/node dirty pages. +*/ +if (unlikely (is_sbi_flag_set (sbi,SBI_CP_DISABLED ))) { +if (inode->i_ino ==F2FS_NODE_INO (sbi) || + inode->i_ino ==F2FS_META_INO (sbi)) { +trace_f2fs_drop_inode (inode,1 ); +return 1 ; + } + } +/* * This is to avoid a deadlock condition like below. * writeback_single_inode(inode)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/137 arm64: consider stack randomization for mmap base only when necessary
In reply to Greg Kroah-HartmanFrom: Alexandre Ghiti <[email protected]>
[ Upstream commit e8d54b62c55ab6201de6d195fc2c276294c1f6ae ]
Do not offset mmap base address because of stack randomization if current task does not want randomization. Note that x86 already implements this behaviour.
--- arch/arm64/mm/mmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/mm/mmap.c +5 -1
@@ -54,7 +54,11 @@ unsigned long arch_mmap_rnd(void)static unsigned long mmap_base (unsigned long rnd,struct rlimit *rlim_stack) {unsigned long gap = rlim_stack->rlim_cur; -unsigned long pad = (STACK_RND_MASK <<PAGE_SHIFT ) + stack_guard_gap; +unsigned long pad = stack_guard_gap; + +/* Account for stack randomization if necessary */ +if (current->flags &PF_RANDOMIZE ) + pad += (STACK_RND_MASK <<PAGE_SHIFT );/* Values close to RLIM_INFINITY can overflow. */ if (gap + pad > gap)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/137 dma-buf/sw_sync: Synchronize signal vs syncpt free
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
[ Upstream commit d3c6dd1fb30d3853c2012549affe75c930f4a2f9 ]
During release of the syncpt, we remove it from the list of syncpt and the tree, but only if it is not already been removed. However, during signaling, we first remove the syncpt from the list. So, if we concurrently free and signal the syncpt, the free may decide that it is not part of the tree and immediately free itself -- meanwhile the signaler goes on to use the now freed datastructure.
In particular, we get struck by commit 0e2f733addbf ("dma-buf: make dma_fence structure a bit smaller v2") as the cb_list is immediately clobbered by the kfree_rcu.
v2: Avoid calling into timeline_fence_release() from under the spinlock
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111381
--- drivers/dma-buf/sw_sync.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/dma-buf/sw_sync.c +7 -9
@@ -132,17 +132,14 @@ static void timeline_fence_release(struct dma_fence *fence) {struct sync_pt *pt =dma_fence_to_sync_pt (fence);struct sync_timeline *parent =dma_fence_parent (fence); +unsigned long flags; +spin_lock_irqsave (fence->lock, flags);if (!list_empty (&pt->link)) { -unsigned long flags; - -spin_lock_irqsave (fence->lock, flags); -if (!list_empty (&pt->link)) { -list_del (&pt->link); -rb_erase (&pt->node, &parent->pt_tree); - } -spin_unlock_irqrestore (fence->lock, flags); +list_del (&pt->link); +rb_erase (&pt->node, &parent->pt_tree); } +spin_unlock_irqrestore (fence->lock, flags);sync_timeline_put (parent);dma_fence_free (fence);
@@ -265,7 +262,8 @@ static struct sync_pt *sync_pt_create(struct sync_timeline *obj, p = &parent->rb_left; }else {if (dma_fence_get_rcu (&other->base)) { -dma_fence_put (&pt->base); +sync_timeline_put (obj); +kfree (pt); pt = other; goto unlock; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 121/137 crypto: hisilicon - Fix double free in sec_free_hw_sgl()
In reply to Greg Kroah-HartmanFrom: Yunfeng Ye <[email protected]>
[ Upstream commit 24fbf7bad888767bed952f540ac963bc57e47e15 ]
There are two problems in sec_free_hw_sgl():
First, when sgl_current->next is valid, @hw_sgl will be freed in the first loop, but it free again after the loop.
Second, sgl_current and sgl_current->next_sgl is not match when dma_pool_free() is invoked, the third parameter should be the dma address of sgl_current, but sgl_current->next_sgl is the dma address of next chain, so use sgl_current->next_sgl is wrong.
Fix this by deleting the last dma_pool_free() in sec_free_hw_sgl(), modifying the condition for while loop, and matching the address for dma_pool_free().
--- drivers/crypto/hisilicon/sec/sec_algs.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/crypto/hisilicon/sec/sec_algs.c +7 -6
@@ -215,17 +215,18 @@ static void sec_free_hw_sgl(struct sec_hw_sgl *hw_sgl, dma_addr_t psec_sgl, struct sec_dev_info *info) { struct sec_hw_sgl *sgl_current, *sgl_next; +dma_addr_t sgl_next_dma; -if (!hw_sgl) -return ; sgl_current = hw_sgl; -while (sgl_current->next) { +while (sgl_current) { sgl_next = sgl_current->next; -dma_pool_free (info->hw_sgl_pool, sgl_current, - sgl_current->next_sgl); + sgl_next_dma = sgl_current->next_sgl; + +dma_pool_free (info->hw_sgl_pool, sgl_current, psec_sgl); + sgl_current = sgl_next; + psec_sgl = sgl_next_dma; } -dma_pool_free (info->hw_sgl_pool, hw_sgl, psec_sgl); } static int sec_alg_skcipher_setkey(struct crypto_skcipher *tfm,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/137 HID: apple: Fix stuck function keys when using FN
In reply to Greg Kroah-HartmanFrom: Joao Moreno <[email protected]>
[ Upstream commit aec256d0ecd561036f188dbc8fa7924c47a9edfd ]
This fixes an issue in which key down events for function keys would be repeatedly emitted even after the user has raised the physical key. For example, the driver fails to emit the F5 key up event when going through the following steps:
- fnmode=1: hold FN, hold F5, release FN, release F5
- fnmode=2: hold F5, hold FN, release F5, release FN
The repeated F5 key down events can be easily verified using xev.
--- drivers/hid/hid-apple.c | 49 +++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 21 deletions(-)
drivers/hid/hid-apple.c +28 -21
@@ -54,7 +54,6 @@ MODULE_PARM_DESC(swap_opt_cmd, "Swap the Option (\"Alt\") and Command (\"Flag\")struct apple_sc {unsigned long quirks;unsigned int fn_on; - DECLARE_BITMAP(pressed_fn, KEY_CNT); DECLARE_BITMAP(pressed_numlock, KEY_CNT); };
@@ -181,6 +180,8 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, {struct apple_sc *asc =hid_get_drvdata (hid);const struct apple_key_translation *trans, *table; +bool do_translate; +u16 code =0 ;if (usage->code ==KEY_FN ) { asc->fn_on = !!value;
@@ -189,8 +190,6 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, }if (fnmode) { -int do_translate; -if (hid->product >=USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI && hid->product <=USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS ) table = macbookair_fn_keys;
@@ -202,25 +201,33 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, trans =apple_find_translation (table, usage->code);if (trans) { -if (test_bit (usage->code, asc->pressed_fn)) - do_translate =1 ; -else if (trans->flags &APPLE_FLAG_FKEY ) - do_translate = (fnmode ==2 && asc->fn_on) || - (fnmode ==1 && !asc->fn_on); -else - do_translate = asc->fn_on; - -if (do_translate) { -if (value) -set_bit (usage->code, asc->pressed_fn); -else -clear_bit (usage->code, asc->pressed_fn); - -input_event (input, usage->type, trans->to, - value); - -return 1 ; +if (test_bit (trans->from, input->key)) + code = trans->from; +else if (test_bit (trans->to, input->key)) + code = trans->to; + +if (!code) { +if (trans->flags &APPLE_FLAG_FKEY ) { +switch (fnmode) { +case 1 : + do_translate = !asc->fn_on; +break ; +case 2 : + do_translate = asc->fn_on; +break ; +default : +/* should never happen */ + do_translate = false; + } + }else { + do_translate = asc->fn_on; + } + + code = do_translate ? trans->to : trans->from; } + +input_event (input, usage->type, code, value); +return 1 ; } if (asc->quirks & APPLE_NUMLOCK_EMULATION &&
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/137 PCI: pci-hyperv: Fix build errors on non-SYSFS config
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit f58ba5e3f6863ea4486952698898848a6db726c2 ]
Fix build errors when building almost-allmodconfig but with SYSFS not set (not enabled). Fixes these build errors:
ERROR: "pci_destroy_slot" [drivers/pci/controller/pci-hyperv.ko] undefined!
ERROR: "pci_create_slot" [drivers/pci/controller/pci-hyperv.ko] undefined!
drivers/pci/slot.o is only built when SYSFS is enabled, so pci-hyperv.o has an implicit dependency on SYSFS. Make that explicit.
Also, depending on X86 && X86_64 is not needed, so just change that to depend on X86_64.
--- drivers/pci/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/Kconfig +1 -1
@@ -181,7 +181,7 @@ config PCI_LABEL config PCI_HYPERV tristate "Hyper-V PCI Frontend" - depends on X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64 + depends on X86_64 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && SYSFS help The PCI device frontend driver allows the kernel to import arbitrary PCI devices from a PCI backend to support PCI driver domains.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/137 i2c-cht-wc: Fix lockdep warning
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 232219b9a464c2479c98aa589acb1bd3383ae9d6 ]
When the kernel is build with lockdep support and the i2c-cht-wc driver is used, the following warning is shown:
[ 66.674334] ======================================================
[ 66.674337] WARNING: possible circular locking dependency detected
[ 66.674340] 5.3.0-rc4+ #83 Not tainted
[ 66.674342] ------------------------------------------------------
[ 66.674345] systemd-udevd/1232 is trying to acquire lock:
[ 66.674349] 00000000a74dab07 (intel_soc_pmic_chtwc:167:(&cht_wc_regmap_cfg)->lock){+.+.}, at: regmap_write+0x31/0x70
[ 66.674360]
but task is already holding lock:
[ 66.674362] 00000000d44a85b7 (i2c_register_adapter){+.+.}, at: i2c_smbus_xfer+0x49/0xf0
[ 66.674370]
which lock already depends on the new lock.[ 66.674371]
the existing dependency chain (in reverse order) is:
[ 66.674374]
-> #1 (i2c_register_adapter){+.+.}:
[ 66.674381] rt_mutex_lock_nested+0x46/0x60
[ 66.674384] i2c_smbus_xfer+0x49/0xf0
[ 66.674387] i2c_smbus_read_byte_data+0x45/0x70
[ 66.674391] cht_wc_byte_reg_read+0x35/0x50
[ 66.674394] _regmap_read+0x63/0x1a0
[ 66.674396] _regmap_update_bits+0xa8/0xe0
[ 66.674399] regmap_update_bits_base+0x63/0xa0
[ 66.674403] regmap_irq_update_bits.isra.0+0x3b/0x50
[ 66.674406] regmap_add_irq_chip+0x592/0x7a0
[ 66.674409] devm_regmap_add_irq_chip+0x89/0xed
[ 66.674412] cht_wc_probe+0x102/0x158
[ 66.674415] i2c_device_probe+0x95/0x250
[ 66.674419] really_probe+0xf3/0x380
[ 66.674422] driver_probe_device+0x59/0xd0
[ 66.674425] device_driver_attach+0x53/0x60
[ 66.674428] __driver_attach+0x92/0x150
[ 66.674431] bus_for_each_dev+0x7d/0xc0
[ 66.674434] bus_add_driver+0x14d/0x1f0
[ 66.674437] driver_register+0x6d/0xb0
[ 66.674440] i2c_register_driver+0x45/0x80
[ 66.674445] do_one_initcall+0x60/0x2f4
[ 66.674450] kernel_init_freeable+0x20d/0x2b4
[ 66.674453] kernel_init+0xa/0x10c
[ 66.674457] ret_from_fork+0x3a/0x50
[ 66.674459]
-> #0 (intel_soc_pmic_chtwc:167:(&cht_wc_regmap_cfg)->lock){+.+.}:
[ 66.674465] __lock_acquire+0xe07/0x1930
[ 66.674468] lock_acquire+0x9d/0x1a0
[ 66.674472] __mutex_lock+0xa8/0x9a0
[ 66.674474] regmap_write+0x31/0x70
[ 66.674480] cht_wc_i2c_adap_smbus_xfer+0x72/0x240 [i2c_cht_wc]
[ 66.674483] __i2c_smbus_xfer+0x1a3/0x640
[ 66.674486] i2c_smbus_xfer+0x67/0xf0
[ 66.674489] i2c_smbus_read_byte_data+0x45/0x70
[ 66.674494] bq24190_probe+0x26b/0x410 [bq24190_charger]
[ 66.674497] i2c_device_probe+0x189/0x250
[ 66.674500] really_probe+0xf3/0x380
[ 66.674503] driver_probe_device+0x59/0xd0
[ 66.674506] device_driver_attach+0x53/0x60
[ 66.674509] __driver_attach+0x92/0x150
[ 66.674512] bus_for_each_dev+0x7d/0xc0
[ 66.674515] bus_add_driver+0x14d/0x1f0
[ 66.674518] driver_register+0x6d/0xb0
[ 66.674521] i2c_register_driver+0x45/0x80
[ 66.674524] do_one_initcall+0x60/0x2f4
[ 66.674528] do_init_module+0x5c/0x230
[ 66.674531] load_module+0x2707/0x2a20
[ 66.674534] __do_sys_init_module+0x188/0x1b0
[ 66.674537] do_syscall_64+0x5c/0xb0
[ 66.674541] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 66.674543]
other info that might help us debug this:[ 66.674545] Possible unsafe locking scenario:
[ 66.674547] CPU0 CPU1
[ 66.674548] ---- ----
[ 66.674550] lock(i2c_register_adapter);
[ 66.674553] lock(intel_soc_pmic_chtwc:167:(&cht_wc_regmap_cfg)->lock);
[ 66.674556] lock(i2c_register_adapter);
[ 66.674559] lock(intel_soc_pmic_chtwc:167:(&cht_wc_regmap_cfg)->lock);
[ 66.674561]
*** DEADLOCK ***The problem is that the CHT Whiskey Cove PMIC's builtin i2c-adapter is itself a part of an i2c-client (the PMIC). This means that transfers done through it take adapter->bus_lock twice, once for the parent i2c-adapter and once for its own bus_lock. Lockdep does not like this nested locking.
To make lockdep happy in the case of busses with muxes, the i2c-core's i2c_adapter_lock_bus function calls:
rt_mutex_lock_nested(&adapter->bus_lock, i2c_adapter_depth(adapter));
But i2c_adapter_depth only works when the direct parent of the adapter is another adapter, as it is only meant for muxes. In this case there is an i2c-client and MFD instantiated platform_device in the parent->child chain between the 2 devices.
This commit overrides the default i2c_lock_operations, passing a hardcoded depth of 1 to rt_mutex_lock_nested, making lockdep happy.
Note that if there were to be a mux attached to the i2c-wc-cht adapter, this would break things again since the i2c-mux code expects the root-adapter to have a locking depth of 0. But the i2c-wc-cht adapter always has only 1 client directly attached in the form of the charger IC paired with the CHT Whiskey Cove PMIC.
--- drivers/i2c/busses/i2c-cht-wc.c | 46 +++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
drivers/i2c/busses/i2c-cht-wc.c +46 -0
@@ -178,6 +178,51 @@ static const struct i2c_algorithm cht_wc_i2c_adap_algo = { .smbus_xfer = cht_wc_i2c_adap_smbus_xfer, }; +/* +* We are an i2c-adapter which itself is part of an i2c-client. This means that +* transfers done through us take adapter->bus_lock twice, once for our parent +* i2c-adapter and once to take our own bus_lock. Lockdep does not like this +* nested locking, to make lockdep happy in the case of busses with muxes, the +* i2c-core's i2c_adapter_lock_bus function calls: +* rt_mutex_lock_nested(&adapter->bus_lock, i2c_adapter_depth(adapter)); +* +* But i2c_adapter_depth only works when the direct parent of the adapter is +* another adapter, as it is only meant for muxes. In our case there is an +* i2c-client and MFD instantiated platform_device in the parent->child chain +* between the 2 devices. +* +* So we override the default i2c_lock_operations and pass a hardcoded +* depth of 1 to rt_mutex_lock_nested, to make lockdep happy. +* +* Note that if there were to be a mux attached to our adapter, this would +* break things again since the i2c-mux code expects the root-adapter to have +* a locking depth of 0. But we always have only 1 client directly attached +* in the form of the Charger IC paired with the CHT Whiskey Cove PMIC. +*/ +static void cht_wc_i2c_adap_lock_bus (struct i2c_adapter *adapter, +unsigned int flags) +{ +rt_mutex_lock_nested (&adapter->bus_lock,1 ); +} + +static int cht_wc_i2c_adap_trylock_bus (struct i2c_adapter *adapter, +unsigned int flags) +{ +return rt_mutex_trylock (&adapter->bus_lock); +} + +static void cht_wc_i2c_adap_unlock_bus (struct i2c_adapter *adapter, +unsigned int flags) +{ +rt_mutex_unlock (&adapter->bus_lock); +} + +static const struct i2c_lock_operations cht_wc_i2c_adap_lock_ops = { + .lock_bus = cht_wc_i2c_adap_lock_bus, + .trylock_bus = cht_wc_i2c_adap_trylock_bus, + .unlock_bus = cht_wc_i2c_adap_unlock_bus, +}; +/**** irqchip for the client connected to the extchgr i2c adapter ****/ static void cht_wc_i2c_irq_lock (struct irq_data *data) {
@@ -286,6 +331,7 @@ static int cht_wc_i2c_adap_i2c_probe(struct platform_device *pdev) adap->adapter.owner =THIS_MODULE ; adap->adapter.class =I2C_CLASS_HWMON ; adap->adapter.algo = &cht_wc_i2c_adap_algo; + adap->adapter.lock_ops = &cht_wc_i2c_adap_lock_ops;strlcpy (adap->adapter.name,"PMIC I2C Adapter" ,sizeof (adap->adapter.name)); adap->adapter.dev.parent = &pdev->dev;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/137 mbox: qcom: add APCS child device for QCS404
In reply to Greg Kroah-HartmanFrom: Jorge Ramirez-Ortiz <[email protected]>
[ Upstream commit 78c86458a440ff356073c21b568cb58ddb67b82b ]
There is clock controller functionality in the APCS hardware block of qcs404 devices similar to msm8916.
--- drivers/mailbox/qcom-apcs-ipc-mailbox.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/mailbox/qcom-apcs-ipc-mailbox.c +6 -2
@@ -47,7 +47,6 @@ static const struct mbox_chan_ops qcom_apcs_ipc_ops = {static int qcom_apcs_ipc_probe (struct platform_device *pdev) { -struct device_node *np = pdev->dev.of_node;struct qcom_apcs_ipc *apcs;struct regmap *regmap;struct resource *res;
@@ -55,6 +54,11 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev)void __iomem *base;unsigned long i;int ret; +const struct of_device_id apcs_clk_match_table[] = { + { .compatible ="qcom,msm8916-apcs-kpss-global" , }, + { .compatible ="qcom,qcs404-apcs-apps-global" , }, + {} + }; apcs =devm_kzalloc (&pdev->dev,sizeof (*apcs),GFP_KERNEL );if (!apcs)
@@ -89,7 +93,7 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev)return ret; } -if (of_device_is_compatible (np,"qcom,msm8916-apcs-kpss-global" )) { +if (of_match_device (apcs_clk_match_table, &pdev->dev)) { apcs->clk =platform_device_register_data (&pdev->dev,"qcom-apcs-msm8916-clk" ,-1 ,NULL ,0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/137 clk: qoriq: Fix -Wunused-const-variable
In reply to Greg Kroah-HartmanFrom: Nathan Huckleberry <[email protected]>
[ Upstream commit a95fb581b144b5e73da382eaedb2e32027610597 ]
drivers/clk/clk-qoriq.c:138:38: warning: unused variable 'p5020_cmux_grp1' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp1
drivers/clk/clk-qoriq.c:146:38: warning: unused variable 'p5020_cmux_grp2' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp2
In the definition of the p5020 chip, the p2041 chip's info was used instead. The p5020 and p2041 chips have different info. This is most likely a typo.
--- drivers/clk/clk-qoriq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-qoriq.c +1 -1
@@ -675,7 +675,7 @@ static const struct clockgen_chipinfo chipinfo[] = { .guts_compat = "fsl,qoriq-device-config-1.0", .init_periph = p5020_init_periph, .cmux_groups = { - &p2041_cmux_grp1, &p2041_cmux_grp2 + &p5020_cmux_grp1, &p5020_cmux_grp2 }, .cmux_to_group = {0 ,1 ,-1
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/137 PCI: rpaphp: Avoid a sometimes-uninitialized warning
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 0df3e42167caaf9f8c7b64de3da40a459979afe8 ]
When building with -Wsometimes-uninitialized, clang warns:
drivers/pci/hotplug/rpaphp_core.c:243:14: warning: variable 'fndit' is used uninitialized whenever 'for' loop exits because its condition is false [-Wsometimes-uninitialized]
for (j = 0; j < entries; j++) {
^~~~~~~~~~~
drivers/pci/hotplug/rpaphp_core.c:256:6: note: uninitialized use occurs
here
if (fndit)
^~~~~
drivers/pci/hotplug/rpaphp_core.c:243:14: note: remove the condition if
it is always true
for (j = 0; j < entries; j++) {
^~~~~~~~~~~
drivers/pci/hotplug/rpaphp_core.c:233:14: note: initialize the variable
'fndit' to silence this warning
int j, fndit;
^
= 0fndit is only used to gate a sprintf call, which can be moved into the loop to simplify the code and eliminate the local variable, which will fix this warning.
--- drivers/pci/hotplug/rpaphp_core.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/pci/hotplug/rpaphp_core.c +7 -11
@@ -230,7 +230,7 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name,struct of_drc_info drc;const __be32 *value;char cell_drc_name[MAX_DRC_NAME_LEN ]; -int j, fndit; +int j; info =of_find_property (dn->parent,"ibm,drc-info" ,NULL );if (info ==NULL )
@@ -245,17 +245,13 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name,/* Should now know end of current entry */ -if (my_index > drc.last_drc_index) -continue ; - - fndit =1 ; -break ; +/* Found it */ +if (my_index <= drc.last_drc_index) { +sprintf (cell_drc_name,"%s%d" , drc.drc_name_prefix, + my_index); +break ; + } } -/* Found it */ - -if (fndit) -sprintf (cell_drc_name,"%s%d" , drc.drc_name_prefix, - my_index); if (((drc_name == NULL) || (drc_name && !strcmp(drc_name, cell_drc_name))) &&
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/137 powerpc/eeh: Clean up EEH PEs after recovery finishes
In reply to Greg Kroah-HartmanFrom: Oliver O'Halloran <[email protected]>
[ Upstream commit 799abe283e5103d48e079149579b4f167c95ea0e ]
When the last device in an eeh_pe is removed the eeh_pe structure itself (and any empty parents) are freed since they are no longer needed. This results in a crash when a hotplug driver is involved since the following may occur:
1. Device is suprise removed.
2. Driver performs an MMIO, which fails and queues and eeh_event.
3. Hotplug driver receives a hotplug interrupt and removes any pci_devs that were under the slot.
4. pci_dev is torn down and the eeh_pe is freed.
5. The EEH event handler thread processes the eeh_event and crashes since the eeh_pe pointer in the eeh_event structure is no longer valid.
Crashing is generally considered poor form. Instead of doing that use the fact PEs are marked as EEH_PE_INVALID to keep them around until the end of the recovery cycle, at which point we can safely prune any empty PEs.
--- arch/powerpc/kernel/eeh_driver.c | 36 ++++++++++++++++++++++++++++++-- arch/powerpc/kernel/eeh_event.c | 8 +++++++ arch/powerpc/kernel/eeh_pe.c | 23 +++++++++++++++++++- 3 files changed, 64 insertions(+), 3 deletions(-)
arch/powerpc/kernel/eeh_driver.c +34 -2
@@ -744,6 +744,33 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,*/ #define MAX_WAIT_FOR_RECOVERY 300 + +/* Walks the PE tree after processing an event to remove any stale PEs. +* +* NB: This needs to be recursive to ensure the leaf PEs get removed +* before their parents do. Although this is possible to do recursively +* we don't since this is easier to read and we need to garantee +* the leaf nodes will be handled first. +*/ +static void eeh_pe_cleanup (struct eeh_pe *pe) +{ +struct eeh_pe *child_pe, *tmp; + +list_for_each_entry_safe (child_pe, tmp, &pe->child_list, child) +eeh_pe_cleanup (child_pe); + +if (pe->state &EEH_PE_KEEP ) +return ; + +if (!(pe->state &EEH_PE_INVALID )) +return ; + +if (list_empty (&pe->edevs) &&list_empty (&pe->child_list)) { +list_del (&pe->child); +kfree (pe); + } +} +/** * eeh_handle_normal_event - Handle EEH events on a specific PE * @pe: EEH PE - which should not be used after we return, as it may
@@ -782,8 +809,6 @@ void eeh_handle_normal_event(struct eeh_pe *pe)return ; } -eeh_pe_state_mark (pe,EEH_PE_RECOVERING ); -eeh_pe_update_time_stamp (pe); pe->freeze_count++;if (pe->freeze_count > eeh_max_freezes) {
@@ -973,6 +998,12 @@ void eeh_handle_normal_event(struct eeh_pe *pe)return ; } } + +/* +* Clean up any PEs without devices. While marked as EEH_PE_RECOVERYING +* we don't want to modify the PE tree structure so we do it here. +*/ +eeh_pe_cleanup (pe);eeh_pe_state_clear (pe,EEH_PE_RECOVERING , true); }
@@ -1045,6 +1076,7 @@ void eeh_handle_special_event(void)*/ if (rc ==EEH_NEXT_ERR_FROZEN_PE || rc ==EEH_NEXT_ERR_FENCED_PHB ) { +eeh_pe_state_mark (pe,EEH_PE_RECOVERING );eeh_handle_normal_event (pe); }else {pci_lock_rescan_remove ();
arch/powerpc/kernel/eeh_event.c +8 -0
@@ -121,6 +121,14 @@ int __eeh_send_failure_event(struct eeh_pe *pe) } event->pe = pe; +/* +* Mark the PE as recovering before inserting it in the queue. +* This prevents the PE from being free()ed by a hotplug driver +* while the PE is sitting in the event queue. +*/ +if (pe) +eeh_pe_state_mark (pe,EEH_PE_RECOVERING ); +/* We may or may not be called in an interrupt context */ spin_lock_irqsave (&eeh_eventlist_lock, flags);list_add (&event->list, &eeh_eventlist);
arch/powerpc/kernel/eeh_pe.c +22 -1
@@ -491,6 +491,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev)int eeh_rmv_from_parent_pe (struct eeh_dev *edev) {struct eeh_pe *pe, *parent, *child; +bool keep, recover;int cnt;struct pci_dn *pdn =eeh_dev_to_pdn (edev);
@@ -516,10 +517,21 @@ int eeh_rmv_from_parent_pe(struct eeh_dev *edev)*/ while (1 ) { parent = pe->parent; + +/* PHB PEs should never be removed */ if (pe->type &EEH_PE_PHB )break ; -if (!(pe->state &EEH_PE_KEEP )) { +/* +* XXX: KEEP is set while resetting a PE. I don't think it's +* ever set without RECOVERING also being set. I could +* be wrong though so catch that with a WARN. +*/ + keep = !!(pe->state &EEH_PE_KEEP ); + recover = !!(pe->state &EEH_PE_RECOVERING ); +WARN_ON (keep && !recover); + +if (!keep && !recover) {if (list_empty (&pe->edevs) &&list_empty (&pe->child_list)) {list_del (&pe->child);
@@ -528,6 +540,15 @@ int eeh_rmv_from_parent_pe(struct eeh_dev *edev)break ; } }else { +/* +* Mark the PE as invalid. At the end of the recovery +* process any invalid PEs will be garbage collected. +* +* We need to delay the free()ing of them since we can +* remove edev's while traversing the PE tree which +* might trigger the removal of a PE and we can't +* deal with that (yet). +*/ if (list_empty (&pe->edevs)) { cnt =0 ;list_for_each_entry (child, &pe->child_list, child) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/137 powerpc/pseries: correctly track irq state in default idle
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit 92c94dfb69e350471473fd3075c74bc68150879e ]
prep_irq_for_idle() is intended to be called before entering H_CEDE (and it is used by the pseries cpuidle driver). However the default pseries idle routine does not call it, leading to mismanaged lazy irq state when the cpuidle driver isn't in use. Manifestations of this include:
* Dropped IPIs in the time immediately after a cpu comes online (before it has installed the cpuidle handler), making the online operation block indefinitely waiting for the new cpu to respond.
* Hitting this WARN_ON in arch_local_irq_restore():
/* * We should already be hard disabled here. We had bugs * where that wasn't the case so let's dbl check it and * warn if we are wrong. Only do that when IRQ tracing * is enabled as mfmsr() can be costly. */ if (WARN_ON_ONCE(mfmsr() & MSR_EE)) __hard_irq_disable();
Call prep_irq_for_idle() from pseries_lpar_idle() and honor its result.
--- arch/powerpc/platforms/pseries/setup.c | 3 +++ 1 file changed, 3 insertions(+)
arch/powerpc/platforms/pseries/setup.c +3 -0
@@ -344,6 +344,9 @@ static void pseries_lpar_idle(void)* low power mode by ceding processor to hypervisor */ +if (!prep_irq_for_idle ()) +return ; +/* Indicate to hypervisor that we are idle. */ get_lppaca ()->idle =1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/137 pstore: fs superblock limits
In reply to Greg Kroah-HartmanFrom: Deepa Dinamani <[email protected]>
[ Upstream commit 83b8a3fbe3aa82ac3c253b698ae6a9be2dbdd5e0 ]
Leaving granularity at 1ns because it is dependent on the specific attached backing pstore module. ramoops has microsecond resolution.
Fix the readback of ramoops fractional timestamp microseconds, which has incorrectly been reporting the value as nanoseconds.
--- fs/pstore/ram.c | 2 ++ 1 file changed, 2 insertions(+)
fs/pstore/ram.c +2 -0
@@ -144,6 +144,7 @@ static int ramoops_read_kmsg_hdr(char *buffer, struct timespec64 *time,if (sscanf (buffer,RAMOOPS_KERNMSG_HDR "%lld.%lu-%c\n%n" , (time64_t *)&time->tv_sec, &time->tv_nsec, &data_type, &header_length) ==3 ) { + time->tv_nsec *=1000 ;if (data_type =='C' ) *compressed = true;else
@@ -151,6 +152,7 @@ static int ramoops_read_kmsg_hdr(char *buffer, struct timespec64 *time, }else if (sscanf (buffer,RAMOOPS_KERNMSG_HDR "%lld.%lu\n%n" , (time64_t *)&time->tv_sec, &time->tv_nsec, &header_length) ==2 ) { + time->tv_nsec *=1000 ; *compressed = false; }else { time->tv_sec =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/137 powerpc/64s/exception: machine check use correct cfar for late handler
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 0b66370c61fcf5fcc1d6901013e110284da6e2bb ]
Bare metal machine checks run an "early" handler in real mode before running the main handler which reports the event.
The main handler runs exactly as a normal interrupt handler, after the "windup" which sets registers back as they were at interrupt entry. CFAR does not get restored by the windup code, so that will be wrong when the handler is run.
Restore the CFAR to the saved value before running the late handler.
--- arch/powerpc/kernel/exceptions-64s.S | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/kernel/exceptions-64s.S +4 -0
@@ -556,6 +556,10 @@ FTR_SECTION_ELSE ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE) 9: /* Deliver the machine check to host kernel in V mode. */ +BEGIN_FTR_SECTION + ld r10,ORIG_GPR3(r1) + mtspr SPRN_CFAR,r10 +END_FTR_SECTION_IFSET(CPU_FTR_CFAR) MACHINE_CHECK_HANDLER_WINDUP SET_SCRATCH0(r13) /* save r13 */ EXCEPTION_PROLOG_0(PACA_EXMC)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/137 drm/amdgpu/si: fix ASIC tests
In reply to Greg Kroah-HartmanFrom: Jean Delvare <[email protected]>
[ Upstream commit 77efe48a729588527afb4d5811b9e0acb29f5e51 ]
Comparing adev->family with CHIP constants is not correct. adev->family can only be compared with AMDGPU_FAMILY constants and adev->asic_type is the struct member to compare with CHIP constants. They are separate identification spaces.
--- drivers/gpu/drm/amd/amdgpu/si.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/si.c +3 -3
@@ -1867,7 +1867,7 @@ static void si_program_aspm(struct amdgpu_device *adev)if (orig != data)si_pif_phy1_wreg (adev,PB1_PIF_PWRDOWN_1 , data); -if ((adev->family !=CHIP_OLAND ) && (adev->family !=CHIP_HAINAN )) { +if ((adev->asic_type !=CHIP_OLAND ) && (adev->asic_type !=CHIP_HAINAN )) { orig = data =si_pif_phy0_rreg (adev,PB0_PIF_PWRDOWN_0 ); data &= ~PLL_RAMP_UP_TIME_0_MASK ;if (orig != data)
@@ -1916,14 +1916,14 @@ static void si_program_aspm(struct amdgpu_device *adev) orig = data =si_pif_phy0_rreg (adev,PB0_PIF_CNTL ); data &= ~LS2_EXIT_TIME_MASK ; -if ((adev->family ==CHIP_OLAND ) || (adev->family ==CHIP_HAINAN )) +if ((adev->asic_type ==CHIP_OLAND ) || (adev->asic_type ==CHIP_HAINAN )) data |=LS2_EXIT_TIME (5 );if (orig != data)si_pif_phy0_wreg (adev,PB0_PIF_CNTL , data); orig = data =si_pif_phy1_rreg (adev,PB1_PIF_CNTL ); data &= ~LS2_EXIT_TIME_MASK ; -if ((adev->family ==CHIP_OLAND ) || (adev->family ==CHIP_HAINAN )) +if ((adev->asic_type ==CHIP_OLAND ) || (adev->asic_type ==CHIP_HAINAN )) data |=LS2_EXIT_TIME (5 );if (orig != data)si_pif_phy1_wreg (adev,PB1_PIF_CNTL , data);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/137 pinctrl: amd: disable spurious-firing GPIO IRQs
In reply to Greg Kroah-HartmanFrom: Daniel Drake <[email protected]>
[ Upstream commit d21b8adbd475dba19ac2086d3306327b4a297418 ]
When cold-booting Asus X434DA, GPIO 7 is found to be already configured as an interrupt, and the GPIO level is found to be in a state that causes the interrupt to fire.
As soon as pinctrl-amd probes, this interrupt fires and invokes amd_gpio_irq_handler(). The IRQ is acked, but no GPIO-IRQ handler was invoked, so the GPIO level being unchanged just causes another interrupt to fire again immediately after.
This results in an interrupt storm causing this platform to hang during boot, right after pinctrl-amd is probed.
Detect this situation and disable the GPIO interrupt when this happens. This enables the affected platform to boot as normal. GPIO 7 actually is the I2C touchpad interrupt line, and later on, i2c-multitouch loads and re-enables this interrupt when it is ready to handle it.
Instead of this approach, I considered disabling all GPIO interrupts at probe time, however that seems a little risky, and I also confirmed that Windows does not seem to have this behaviour: the same 41 GPIO IRQs are enabled under both Linux and Windows, which is a far larger collection than the GPIOs referenced by the DSDT on this platform.
--- drivers/pinctrl/pinctrl-amd.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/pinctrl/pinctrl-amd.c +11 -1
@@ -565,15 +565,25 @@ static irqreturn_t amd_gpio_irq_handler(int irq, void *dev_id) !(regval & BIT(INTERRUPT_MASK_OFF)))continue ; irq =irq_find_mapping (gc->irq.domain, irqnr + i); -generic_handle_irq (irq); +if (irq !=0 ) +generic_handle_irq (irq);/* Clear interrupt. * We must read the pin register again, in case the * value was changed while executing * generic_handle_irq() above. +* If we didn't find a mapping for the interrupt, +* disable it in order to avoid a system hang caused +* by an interrupt storm. */ raw_spin_lock_irqsave (&gpio_dev->lock, flags); regval =readl (regs + i); +if (irq ==0 ) { + regval &= ~BIT (INTERRUPT_ENABLE_OFF ); +dev_dbg (&gpio_dev->pdev->dev, +"Disabling spurious GPIO IRQ %d\n" , + irqnr + i); + }writel (regval, regs + i);raw_spin_unlock_irqrestore (&gpio_dev->lock, flags); ret =IRQ_HANDLED ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/137 powerpc/futex: Fix warning: oldval may be used uninitialized in this function
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 38a0d0cdb46d3f91534e5b9839ec2d67be14c59d ]
We see warnings such as:
kernel/futex.c: In function 'do_futex':
kernel/futex.c:1676:17: warning: 'oldval' may be used uninitialized in this function [-Wmaybe-uninitialized]
return oldval == cmparg;
^
kernel/futex.c:1651:6: note: 'oldval' was declared here
int oldval, ret;
^This is because arch_futex_atomic_op_inuser() only sets *oval if ret is 0 and GCC doesn't see that it will only use it when ret is 0.
Anyway, the non-zero ret path is an error path that won't suffer from setting *oval, and as *oval is a local var in futex_atomic_op_inuser() it will have no impact.
--- arch/powerpc/include/asm/futex.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/powerpc/include/asm/futex.h +1 -2
@@ -60,8 +60,7 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,pagefault_enable (); -if (!ret) - *oval = oldval; + *oval = oldval;prevent_write_to_user (uaddr,sizeof (*uaddr));return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/137 powerpc/pseries/mobility: use cond_resched when updating device tree
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit ccfb5bd71d3d1228090a8633800ae7cdf42a94ac ]
After a partition migration, pseries_devicetree_update() processes changes to the device tree communicated from the platform to Linux. This is a relatively heavyweight operation, with multiple device tree searches, memory allocations, and conversations with partition firmware.
There's a few levels of nested loops which are bounded only by decisions made by the platform, outside of Linux's control, and indeed we have seen RCU stalls on large systems while executing this call graph. Use cond_resched() in these loops so that the cpu is yielded when needed.
--- arch/powerpc/platforms/pseries/mobility.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/powerpc/platforms/pseries/mobility.c +9 -0
@@ -9,6 +9,7 @@#include <linux/cpu.h> #include <linux/kernel.h> #include <linux/kobject.h> +#include <linux/sched.h> #include <linux/smp.h> #include <linux/stat.h> #include <linux/completion.h>
@@ -206,7 +207,11 @@ static int update_dt_node(__be32 phandle, s32 scope) prop_data += vd; } + +cond_resched (); } + +cond_resched (); }while (rtas_rc ==1 );of_node_put (dn);
@@ -309,8 +314,12 @@ int pseries_devicetree_update(s32 scope)add_dt_node (phandle, drc_index);break ; } + +cond_resched (); } } + +cond_resched (); }while (rc ==1 );kfree (rtas_buf);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/137 gpu: drm: radeon: Fix a possible null-pointer dereference in radeon_connector_set_property()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit f3eb9b8f67bc28783eddc142ad805ebdc53d6339 ]
In radeon_connector_set_property(), there is an if statement on line 743 to check whether connector->encoder is NULL:
if (connector->encoder)
When connector->encoder is NULL, it is used on line 755:
if (connector->encoder->crtc)
Thus, a possible null-pointer dereference may occur.
To fix this bug, connector->encoder is checked before being used.
This bug is found by a static analysis tool STCheck written by us.
--- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_connectors.c +1 -1
@@ -752,7 +752,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct radeon_encoder->output_csc = val; -if (connector->encoder->crtc) { +if (connector->encoder && connector->encoder->crtc) {struct drm_crtc *crtc = connector->encoder->crtc;struct radeon_crtc *radeon_crtc =to_radeon_crtc (crtc);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/137 powerpc/powernv/ioda2: Allocate TCE table levels on demand for default DMA window
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit c37c792dec0929dbb6360a609fb00fa20bb16fc2 ]
We allocate only the first level of multilevel TCE tables for KVM already (alloc_userspace_copy==true), and the rest is allocated on demand. This is not enabled though for bare metal.
This removes the KVM limitation (implicit, via the alloc_userspace_copy parameter) and always allocates just the first level. The on-demand allocation of missing levels is already implemented.
As from now on DMA map might happen with disabled interrupts, this allocates TCEs with GFP_ATOMIC; otherwise lockdep reports errors 1]. In practice just a single page is allocated there so chances for failure are quite low.
To save time when creating a new clean table, this skips non-allocated indirect TCE entries in pnv_tce_free just like we already do in the VFIO IOMMU TCE driver.
This changes the default level number from 1 to 2 to reduce the amount of memory required for the default 32bit DMA window at the boot time. The default window size is up to 2GB which requires 4MB of TCEs which is unlikely to be used entirely or at all as most devices these days are 64bit capable so by switching to 2 levels by default we save 4032KB of RAM per a device.
While at this, add __GFP_NOWARN to alloc_pages_node() as the userspace can trigger this path via VFIO, see the failure and try creating a table again with different parameters which might succeed.
[1]:
===
BUG: sleeping function called from invalid context at mm/page_alloc.c:4596
in_atomic(): 1, irqs_disabled(): 1, pid: 1038, name: scsi_eh_1
2 locks held by scsi_eh_1/1038:
#0: 000000005efd659a (&host->eh_mutex){+.+.}, at: ata_eh_acquire+0x34/0x80 #1: 0000000006cf56a6 (&(&host->lock)->rlock){....}, at: ata_exec_internal_sg+0xb0/0x5c0
irq event stamp: 500 hardirqs last enabled at (499): [<c000000000cb8a74>] _raw_spin_unlock_irqrestore+0x94/0xd0 hardirqs last disabled at (500): [<c000000000cb85c4>] _raw_spin_lock_irqsave+0x44/0x120 softirqs last enabled at (0): [<c000000000101120>] copy_process.isra.4.part.5+0x640/0x1a80 softirqs last disabled at (0): [<0000000000000000>] 0x0 CPU: 73 PID: 1038 Comm: scsi_eh_1 Not tainted 5.2.0-rc6-le_nv2_aikATfstn1-p1 #634 Call Trace: [c000003d064cef50] [c000000000c8e6c4] dump_stack+0xe8/0x164 (unreliable) [c000003d064cefa0] [c00000000014ed78] ___might_sleep+0x2f8/0x310 [c000003d064cf020] [c0000000003ca084] __alloc_pages_nodemask+0x2a4/0x1560 [c000003d064cf220] [c0000000000c2530] pnv_alloc_tce_level.isra.0+0x90/0x130 [c000003d064cf290] [c0000000000c2888] pnv_tce+0x128/0x3b0 [c000003d064cf360] [c0000000000c2c00] pnv_tce_build+0xb0/0xf0 [c000003d064cf3c0] [c0000000000bbd9c] pnv_ioda2_tce_build+0x3c/0xb0 [c000003d064cf400] [c00000000004cfe0] ppc_iommu_map_sg+0x210/0x550 [c000003d064cf510] [c00000000004b7a4] dma_iommu_map_sg+0x74/0xb0 [c000003d064cf530] [c000000000863944] ata_qc_issue+0x134/0x470 [c000003d064cf5b0] [c000000000863ec4] ata_exec_internal_sg+0x244/0x5c0 [c000003d064cf700] [c0000000008642d0] ata_exec_internal+0x90/0xe0 [c000003d064cf780] [c0000000008650ac] ata_dev_read_id+0x2ec/0x640 [c000003d064cf8d0] [c000000000878e28] ata_eh_recover+0x948/0x16d0 [c000003d064cfa10] [c00000000087d760] sata_pmp_error_handler+0x480/0xbf0 [c000003d064cfbc0] [c000000000884624] ahci_error_handler+0x74/0xe0 [c000003d064cfbf0] [c000000000879fa8] ata_scsi_port_error_handler+0x2d8/0x7c0 [c000003d064cfca0] [c00000000087a544] ata_scsi_error+0xb4/0x100 [c000003d064cfd00] [c000000000802450] scsi_error_handler+0x120/0x510 [c000003d064cfdb0] [c000000000140c48] kthread+0x1b8/0x1c0 [c000003d064cfe20] [c00000000000bd8c] ret_from_kernel_thread+0x5c/0x70 ata1: SATA link up 6.0 Gbps (SStatus 133 SControl 300) irq event stamp: 2305
========================================================
hardirqs last enabled at (2305): [<c00000000000e4c8>] fast_exc_return_irq+0x28/0x34 hardirqs last disabled at (2303): [<c000000000cb9fd0>] __do_softirq+0x4a0/0x654 WARNING: possible irq lock inversion dependency detected 5.2.0-rc6-le_nv2_aikATfstn1-p1 #634 Tainted: G W softirqs last enabled at (2304): [<c000000000cba054>] __do_softirq+0x524/0x654 softirqs last disabled at (2297): [<c00000000010f278>] irq_exit+0x128/0x180 --------------------------------------------------------
swapper/0/0 just changed the state of lock:0000000006cf56a6 (&(&host->lock)->rlock){-...}, at: ahci_single_level_irq_intr+0xac/0x120 but this lock took another, HARDIRQ-unsafe lock in the past:
(fs_reclaim){+.+.}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(fs_reclaim);
local_irq_disable();
lock(&(&host->lock)->rlock);
lock(fs_reclaim);
<Interrupt>
lock(&(&host->lock)->rlock);*** DEADLOCK ***
no locks held by swapper/0/0.
the shortest dependencies between 2nd lock and 1st lock:
-> (fs_reclaim){+.+.} ops: 167579 {
HARDIRQ-ON-W at:
lock_acquire+0xf8/0x2a0
fs_reclaim_acquire.part.23+0x44/0x60
kmem_cache_alloc_node_trace+0x80/0x590
alloc_desc+0x64/0x270
__irq_alloc_descs+0x2e4/0x3a0
irq_domain_alloc_descs+0xb0/0x150
irq_create_mapping+0x168/0x2c0
xics_smp_probe+0x2c/0x98
pnv_smp_probe+0x40/0x9c
smp_prepare_cpus+0x524/0x6c4
kernel_init_freeable+0x1b4/0x650
kernel_init+0x2c/0x148
ret_from_kernel_thread+0x5c/0x70
SOFTIRQ-ON-W at:
lock_acquire+0xf8/0x2a0
fs_reclaim_acquire.part.23+0x44/0x60
kmem_cache_alloc_node_trace+0x80/0x590
alloc_desc+0x64/0x270
__irq_alloc_descs+0x2e4/0x3a0
irq_domain_alloc_descs+0xb0/0x150
irq_create_mapping+0x168/0x2c0
xics_smp_probe+0x2c/0x98
pnv_smp_probe+0x40/0x9c
smp_prepare_cpus+0x524/0x6c4
kernel_init_freeable+0x1b4/0x650
kernel_init+0x2c/0x148
ret_from_kernel_thread+0x5c/0x70
INITIAL USE at:
lock_acquire+0xf8/0x2a0
fs_reclaim_acquire.part.23+0x44/0x60
kmem_cache_alloc_node_trace+0x80/0x590
alloc_desc+0x64/0x270
__irq_alloc_descs+0x2e4/0x3a0
irq_domain_alloc_descs+0xb0/0x150
irq_create_mapping+0x168/0x2c0
xics_smp_probe+0x2c/0x98
pnv_smp_probe+0x40/0x9c
smp_prepare_cpus+0x524/0x6c4
kernel_init_freeable+0x1b4/0x650
kernel_init+0x2c/0x148
ret_from_kernel_thread+0x5c/0x70 }
===
--- arch/powerpc/platforms/powernv/pci-ioda-tce.c | 20 +++++++++---------- arch/powerpc/platforms/powernv/pci.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda-tce.c +10 -10
@@ -36,7 +36,8 @@ static __be64 *pnv_alloc_tce_level(int nid, unsigned int shift)struct page *tce_mem =NULL ;__be64 *addr; - tce_mem =alloc_pages_node (nid,GFP_KERNEL , shift -PAGE_SHIFT ); + tce_mem =alloc_pages_node (nid,GFP_ATOMIC | __GFP_NOWARN, + shift -PAGE_SHIFT );if (!tce_mem) {pr_err ("Failed to allocate a TCE memory, level shift=%d\n" , shift);
@@ -161,6 +162,9 @@ void pnv_tce_free(struct iommu_table *tbl, long index, long npages)if (ptce) *ptce =cpu_to_be64 (0 ); +else +/* Skip the rest of the level */ + i |= tbl->it_level_size -1 ; } }
@@ -260,7 +264,6 @@ long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset, unsigned int table_shift = max_t(unsigned int, entries_shift + 3,PAGE_SHIFT );const unsigned long tce_table_size =1UL << table_shift; -unsigned int tmplevels = levels;if (!levels || (levels >POWERNV_IOMMU_MAX_LEVELS ))return -EINVAL ;
@@ -268,9 +271,6 @@ long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset,if (!is_power_of_2 (window_size))return -EINVAL ; -if (alloc_userspace_copy && (window_size > (1ULL <<32 ))) - tmplevels =1 ; -/* Adjust direct table size from window_size and levels */ entries_shift = (entries_shift + levels -1 ) / levels; level_shift = entries_shift +3 ;
@@ -281,7 +281,7 @@ long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset,/* Allocate TCE table */ addr =pnv_pci_ioda2_table_do_alloc_pages (nid, level_shift, - tmplevels, tce_table_size, &offset, &total_allocated); +1 , tce_table_size, &offset, &total_allocated);/* addr==NULL means that the first level allocation failed */ if (!addr)
@@ -292,18 +292,18 @@ long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset,* we did not allocate as much as we wanted, * release partially allocated table. */ -if (tmplevels == levels && offset < tce_table_size) +if (levels ==1 && offset < tce_table_size) goto free_tces_exit;/* Allocate userspace view of the TCE table */ if (alloc_userspace_copy) { offset =0 ; uas =pnv_pci_ioda2_table_do_alloc_pages (nid, level_shift, - tmplevels, tce_table_size, &offset, +1 , tce_table_size, &offset, &total_allocated_uas);if (!uas) goto free_tces_exit; -if (tmplevels == levels && (offset < tce_table_size || +if (levels ==1 && (offset < tce_table_size || total_allocated_uas != total_allocated)) goto free_uas_exit; }
@@ -318,7 +318,7 @@ long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset,pr_debug ("Created TCE table: ws=%08llx ts=%lx @%08llx base=%lx uas=%p levels=%d/%d\n" , window_size, tce_table_size, bus_offset, tbl->it_base, - tbl->it_userspace, tmplevels, levels); + tbl->it_userspace,1 , levels);return 0 ;
arch/powerpc/platforms/powernv/pci.h +1 -1
@@ -225,7 +225,7 @@ extern struct iommu_table_group *pnv_npu_compound_attach( struct pnv_ioda_pe *pe);/* pci-ioda-tce.c */ -#define POWERNV_IOMMU_DEFAULT_LEVELS 1 +#define POWERNV_IOMMU_DEFAULT_LEVELS 2#define POWERNV_IOMMU_MAX_LEVELS 5 extern int pnv_tce_build(struct iommu_table *tbl, long index, long npages,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/137 clk: zx296718: Dont reference clk_init_data after registration
In reply to Greg Kroah-HartmanFrom: Stephen Boyd <[email protected]>
[ Upstream commit 1a4549c150e27dbc3aea762e879a88209df6d1a5 ]
A future patch is going to change semantics of clk_register() so that clk_hw::init is guaranteed to be NULL after a clk is registered. Avoid referencing this member here so that we don't run into NULL pointer exceptions.
--- drivers/clk/zte/clk-zx296718.c | 109 +++++++++++++++------------------ 1 file changed, 49 insertions(+), 60 deletions(-)
drivers/clk/zte/clk-zx296718.c +49 -60
@@ -564,6 +564,7 @@ static int __init top_clocks_init(struct device_node *np) {void __iomem *reg_base;int i, ret; +const char *name; reg_base =of_iomap (np,0 );if (!reg_base) {
@@ -573,11 +574,10 @@ static int __init top_clocks_init(struct device_node *np)for (i =0 ; i <ARRAY_SIZE (zx296718_pll_clk); i++) { zx296718_pll_clk[i].reg_base += (uintptr_t )reg_base; + name = zx296718_pll_clk[i].hw.init->name; ret =clk_hw_register (NULL , &zx296718_pll_clk[i].hw); -if (ret) { -pr_warn ("top clk %s init error!\n" , - zx296718_pll_clk[i].hw.init->name); - } +if (ret) +pr_warn ("top clk %s init error!\n" , name); }for (i =0 ; i <ARRAY_SIZE (top_ffactor_clk); i++) {
@@ -585,11 +585,10 @@ static int __init top_clocks_init(struct device_node *np) top_hw_onecell_data.hws[top_ffactor_clk[i].id] = &top_ffactor_clk[i].factor.hw; + name = top_ffactor_clk[i].factor.hw.init->name; ret =clk_hw_register (NULL , &top_ffactor_clk[i].factor.hw); -if (ret) { -pr_warn ("top clk %s init error!\n" , - top_ffactor_clk[i].factor.hw.init->name); - } +if (ret) +pr_warn ("top clk %s init error!\n" , name); }for (i =0 ; i <ARRAY_SIZE (top_mux_clk); i++) {
@@ -598,11 +597,10 @@ static int __init top_clocks_init(struct device_node *np) &top_mux_clk[i].mux.hw; top_mux_clk[i].mux.reg += (uintptr_t )reg_base; + name = top_mux_clk[i].mux.hw.init->name; ret =clk_hw_register (NULL , &top_mux_clk[i].mux.hw); -if (ret) { -pr_warn ("top clk %s init error!\n" , - top_mux_clk[i].mux.hw.init->name); - } +if (ret) +pr_warn ("top clk %s init error!\n" , name); }for (i =0 ; i <ARRAY_SIZE (top_gate_clk); i++) {
@@ -611,11 +609,10 @@ static int __init top_clocks_init(struct device_node *np) &top_gate_clk[i].gate.hw; top_gate_clk[i].gate.reg += (uintptr_t )reg_base; + name = top_gate_clk[i].gate.hw.init->name; ret =clk_hw_register (NULL , &top_gate_clk[i].gate.hw); -if (ret) { -pr_warn ("top clk %s init error!\n" , - top_gate_clk[i].gate.hw.init->name); - } +if (ret) +pr_warn ("top clk %s init error!\n" , name); }for (i =0 ; i <ARRAY_SIZE (top_div_clk); i++) {
@@ -624,11 +621,10 @@ static int __init top_clocks_init(struct device_node *np) &top_div_clk[i].div.hw; top_div_clk[i].div.reg += (uintptr_t )reg_base; + name = top_div_clk[i].div.hw.init->name; ret =clk_hw_register (NULL , &top_div_clk[i].div.hw); -if (ret) { -pr_warn ("top clk %s init error!\n" , - top_div_clk[i].div.hw.init->name); - } +if (ret) +pr_warn ("top clk %s init error!\n" , name); } ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
@@ -754,6 +750,7 @@ static int __init lsp0_clocks_init(struct device_node *np) {void __iomem *reg_base;int i, ret; +const char *name; reg_base =of_iomap (np,0 );if (!reg_base) {
@@ -767,11 +764,10 @@ static int __init lsp0_clocks_init(struct device_node *np) &lsp0_mux_clk[i].mux.hw; lsp0_mux_clk[i].mux.reg += (uintptr_t )reg_base; + name = lsp0_mux_clk[i].mux.hw.init->name; ret =clk_hw_register (NULL , &lsp0_mux_clk[i].mux.hw); -if (ret) { -pr_warn ("lsp0 clk %s init error!\n" , - lsp0_mux_clk[i].mux.hw.init->name); - } +if (ret) +pr_warn ("lsp0 clk %s init error!\n" , name); }for (i =0 ; i <ARRAY_SIZE (lsp0_gate_clk); i++) {
@@ -780,11 +776,10 @@ static int __init lsp0_clocks_init(struct device_node *np) &lsp0_gate_clk[i].gate.hw; lsp0_gate_clk[i].gate.reg += (uintptr_t )reg_base; + name = lsp0_gate_clk[i].gate.hw.init->name; ret =clk_hw_register (NULL , &lsp0_gate_clk[i].gate.hw); -if (ret) { -pr_warn ("lsp0 clk %s init error!\n" , - lsp0_gate_clk[i].gate.hw.init->name); - } +if (ret) +pr_warn ("lsp0 clk %s init error!\n" , name); }for (i =0 ; i <ARRAY_SIZE (lsp0_div_clk); i++) {
@@ -793,11 +788,10 @@ static int __init lsp0_clocks_init(struct device_node *np) &lsp0_div_clk[i].div.hw; lsp0_div_clk[i].div.reg += (uintptr_t )reg_base; + name = lsp0_div_clk[i].div.hw.init->name; ret =clk_hw_register (NULL , &lsp0_div_clk[i].div.hw); -if (ret) { -pr_warn ("lsp0 clk %s init error!\n" , - lsp0_div_clk[i].div.hw.init->name); - } +if (ret) +pr_warn ("lsp0 clk %s init error!\n" , name); } ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
@@ -862,6 +856,7 @@ static int __init lsp1_clocks_init(struct device_node *np) {void __iomem *reg_base;int i, ret; +const char *name; reg_base =of_iomap (np,0 );if (!reg_base) {
@@ -875,11 +870,10 @@ static int __init lsp1_clocks_init(struct device_node *np) &lsp0_mux_clk[i].mux.hw; lsp1_mux_clk[i].mux.reg += (uintptr_t )reg_base; + name = lsp1_mux_clk[i].mux.hw.init->name; ret =clk_hw_register (NULL , &lsp1_mux_clk[i].mux.hw); -if (ret) { -pr_warn ("lsp1 clk %s init error!\n" , - lsp1_mux_clk[i].mux.hw.init->name); - } +if (ret) +pr_warn ("lsp1 clk %s init error!\n" , name); }for (i =0 ; i <ARRAY_SIZE (lsp1_gate_clk); i++) {
@@ -888,11 +882,10 @@ static int __init lsp1_clocks_init(struct device_node *np) &lsp1_gate_clk[i].gate.hw; lsp1_gate_clk[i].gate.reg += (uintptr_t )reg_base; + name = lsp1_gate_clk[i].gate.hw.init->name; ret =clk_hw_register (NULL , &lsp1_gate_clk[i].gate.hw); -if (ret) { -pr_warn ("lsp1 clk %s init error!\n" , - lsp1_gate_clk[i].gate.hw.init->name); - } +if (ret) +pr_warn ("lsp1 clk %s init error!\n" , name); }for (i =0 ; i <ARRAY_SIZE (lsp1_div_clk); i++) {
@@ -901,11 +894,10 @@ static int __init lsp1_clocks_init(struct device_node *np) &lsp1_div_clk[i].div.hw; lsp1_div_clk[i].div.reg += (uintptr_t )reg_base; + name = lsp1_div_clk[i].div.hw.init->name; ret =clk_hw_register (NULL , &lsp1_div_clk[i].div.hw); -if (ret) { -pr_warn ("lsp1 clk %s init error!\n" , - lsp1_div_clk[i].div.hw.init->name); - } +if (ret) +pr_warn ("lsp1 clk %s init error!\n" , name); } ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
@@ -979,6 +971,7 @@ static int __init audio_clocks_init(struct device_node *np) {void __iomem *reg_base;int i, ret; +const char *name; reg_base =of_iomap (np,0 );if (!reg_base) {
@@ -992,11 +985,10 @@ static int __init audio_clocks_init(struct device_node *np) &audio_mux_clk[i].mux.hw; audio_mux_clk[i].mux.reg += (uintptr_t )reg_base; + name = audio_mux_clk[i].mux.hw.init->name; ret =clk_hw_register (NULL , &audio_mux_clk[i].mux.hw); -if (ret) { -pr_warn ("audio clk %s init error!\n" , - audio_mux_clk[i].mux.hw.init->name); - } +if (ret) +pr_warn ("audio clk %s init error!\n" , name); }for (i =0 ; i <ARRAY_SIZE (audio_adiv_clk); i++) {
@@ -1005,11 +997,10 @@ static int __init audio_clocks_init(struct device_node *np) &audio_adiv_clk[i].hw; audio_adiv_clk[i].reg_base += (uintptr_t )reg_base; + name = audio_adiv_clk[i].hw.init->name; ret =clk_hw_register (NULL , &audio_adiv_clk[i].hw); -if (ret) { -pr_warn ("audio clk %s init error!\n" , - audio_adiv_clk[i].hw.init->name); - } +if (ret) +pr_warn ("audio clk %s init error!\n" , name); }for (i =0 ; i <ARRAY_SIZE (audio_div_clk); i++) {
@@ -1018,11 +1009,10 @@ static int __init audio_clocks_init(struct device_node *np) &audio_div_clk[i].div.hw; audio_div_clk[i].div.reg += (uintptr_t )reg_base; + name = audio_div_clk[i].div.hw.init->name; ret =clk_hw_register (NULL , &audio_div_clk[i].div.hw); -if (ret) { -pr_warn ("audio clk %s init error!\n" , - audio_div_clk[i].div.hw.init->name); - } +if (ret) +pr_warn ("audio clk %s init error!\n" , name); }for (i =0 ; i <ARRAY_SIZE (audio_gate_clk); i++) {
@@ -1031,11 +1021,10 @@ static int __init audio_clocks_init(struct device_node *np) &audio_gate_clk[i].gate.hw; audio_gate_clk[i].gate.reg += (uintptr_t )reg_base; + name = audio_gate_clk[i].gate.hw.init->name; ret =clk_hw_register (NULL , &audio_gate_clk[i].gate.hw); -if (ret) { -pr_warn ("audio clk %s init error!\n" , - audio_gate_clk[i].gate.hw.init->name); - } +if (ret) +pr_warn ("audio clk %s init error!\n" , name); } ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/137 drm/panel: check failure cases in the probe func
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit afd6d4f5a52c16e1483328ac074abb1cde92c29f ]
The following function calls may fail and return NULL, so the null check is added.of_graph_get_next_endpointof_graph_get_remote_port_parentof_graph_get_remote_port
Update: Thanks to Sam Ravnborg, for suggession on the use of goto to avoid leaking endpoint.
--- .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +13 -0
@@ -400,7 +400,13 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c,/* Look up the DSI host. It needs to probe before we do. */ endpoint =of_graph_get_next_endpoint (dev->of_node,NULL ); +if (!endpoint) +return -ENODEV ; + dsi_host_node =of_graph_get_remote_port_parent (endpoint); +if (!dsi_host_node) + goto error; + host =of_find_mipi_dsi_host_by_node (dsi_host_node);of_node_put (dsi_host_node);if (!host) {
@@ -409,6 +415,9 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c, } info.node =of_graph_get_remote_port (endpoint); +if (!info.node) + goto error; +of_node_put (endpoint); ts->dsi =mipi_dsi_device_register_full (host, &info);
@@ -429,6 +438,10 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c,return ret;return 0 ; + +error: +of_node_put (endpoint); +return -ENODEV ; }static int rpi_touchscreen_remove (struct i2c_client *i2c)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/137 hso: fix NULL-deref on tty open
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit 8353da9fa69722b54cba82b2ec740afd3d438748 ]
Fix NULL-pointer dereference on tty open due to a failure to handle a missing interrupt-in endpoint when probing modem ports:
BUG: kernel NULL pointer dereference, address: 0000000000000006 ... RIP: 0010:tiocmget_submit_urb+0x1c/0xe0 [hso] ... Call Trace: hso_start_serial_device+0xdc/0x140 [hso] hso_serial_open+0x118/0x1b0 [hso] tty_open+0xf1/0x490
--- drivers/net/usb/hso.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/usb/hso.c +8 -4
@@ -2620,14 +2620,18 @@ static struct hso_device *hso_create_bul*/ if (serial->tiocmget) { tiocmget = serial->tiocmget; + tiocmget->endp =hso_get_ep (interface, +USB_ENDPOINT_XFER_INT , +USB_DIR_IN ); +if (!tiocmget->endp) { +dev_err (&interface->dev,"Failed to find INT IN ep\n" ); + goto exit; + } + tiocmget->urb =usb_alloc_urb (0 ,GFP_KERNEL );if (tiocmget->urb) {mutex_init (&tiocmget->mutex);init_waitqueue_head (&tiocmget->waitq); - tiocmget->endp =hso_get_ep ( - interface, -USB_ENDPOINT_XFER_INT , -USB_DIR_IN ); }else hso_free_tiomget (serial); }
Greg Kroah-Hartman
maintainerPATCH 30/137 drm/amd/display: add monitor patch to add T7 delay
In reply to Greg Kroah-HartmanFrom: Anthony Koo <[email protected]>
[ Upstream commit 88eac241a1fc500ce5274a09ddc4bd5fc2b5adb6 ]
[Why]
Specifically to one panel,
TCON is able to accept active video signal quickly, but the Source Driver requires 2-3 frames of extra time.
It is a Panel issue since TCON needs to take care of all Sink requirements including Source Driver. But in this case it does not.
Customer is asking to add fixed T7 delay as panel workaround.
[How]
Add monitor specific patch to add T7 delay
--- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 4 ++++ drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + 2 files changed, 5 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +4 -0
@@ -154,6 +154,10 @@ bool edp_receiver_ready_T7(struct dc_link *link)break ;udelay (25 );//MAx T7 is 50ms }while (++tries <300 ); + +if (link->local_sink->edid_caps.panel_patch.extra_t7_ms >0 ) +udelay (link->local_sink->edid_caps.panel_patch.extra_t7_ms *1000 ); +return result; }
drivers/gpu/drm/amd/display/dc/dc_types.h +1 -0
@@ -202,6 +202,7 @@ struct dc_panel_patch {unsigned int dppowerup_delay;unsigned int extra_t12_ms;unsigned int extra_delay_backlight_off; +unsigned int extra_t7_ms; };struct dc_edid_caps {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/137 vsock: Fix a lockdep warning in __vsock_release()
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
[ Upstream commit 0d9138ffac24cf8b75366ede3a68c951e6dcc575 ]
Lockdep is unhappy if two locks from the same class are held.
Fix the below warning for hyperv and virtio sockets (vmci socket code doesn't have the issue) by using lock_sock_nested() when __vsock_release() is called recursively:
============================================
WARNING: possible recursive locking detected
5.3.0+ #1 Not tainted
--------------------------------------------
server/1795 is trying to acquire lock:ffff8880c5158990 (sk_lock-AF_VSOCK){+.+.}, at: hvs_release+0x10/0x120 [hv_sock]
but task is already holding lock:ffff8880c5158150 (sk_lock-AF_VSOCK){+.+.}, at: __vsock_release+0x2e/0xf0 [vsock]
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
---- lock(sk_lock-AF_VSOCK);
lock(sk_lock-AF_VSOCK);
*** DEADLOCK ***
May be due to missing lock nesting notation
2 locks held by server/1795:
#0: ffff8880c5d05ff8 (&sb->s_type->i_mutex_key#10){+.+.}, at: __sock_release+0x2d/0xa0 #1: ffff8880c5158150 (sk_lock-AF_VSOCK){+.+.}, at: __vsock_release+0x2e/0xf0 [vsock]
stack backtrace: CPU: 5 PID: 1795 Comm: server Not tainted 5.3.0+ #1 Call Trace: dump_stack+0x67/0x90 __lock_acquire.cold.67+0xd2/0x20b lock_acquire+0xb5/0x1c0 lock_sock_nested+0x6d/0x90 hvs_release+0x10/0x120 [hv_sock] __vsock_release+0x24/0xf0 [vsock] __vsock_release+0xa0/0xf0 [vsock] vsock_release+0x12/0x30 [vsock] __sock_release+0x37/0xa0 sock_close+0x14/0x20 __fput+0xc1/0x250 task_work_run+0x98/0xc0 do_exit+0x344/0xc60 do_group_exit+0x47/0xb0 get_signal+0x15c/0xc50 do_signal+0x30/0x720 exit_to_usermode_loop+0x50/0xa0 do_syscall_64+0x24e/0x270 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x7f4184e85f31
--- net/vmw_vsock/af_vsock.c | 16 ++++++++++++---- net/vmw_vsock/hyperv_transport.c | 2 +- net/vmw_vsock/virtio_transport_common.c | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-)
net/vmw_vsock/af_vsock.c +12 -4
@@ -638,7 +638,7 @@ struct sock *__vsock_create(struct net * }EXPORT_SYMBOL_GPL (__vsock_create); -static void __vsock_release (struct sock *sk) +static void __vsock_release (struct sock *sk,int level) {if (sk) {struct sk_buff *skb;
@@ -648,9 +648,17 @@ static void __vsock_release(struct sock vsk =vsock_sk (sk); pending =NULL ;/* Compiler warning. */ +/* The release call is supposed to use lock_sock_nested() +* rather than lock_sock(), if a sock lock should be acquired. +*/ transport->release (vsk); -lock_sock (sk); +/* When "level" is SINGLE_DEPTH_NESTING, use the nested +* version to avoid the warning "possible recursive locking +* detected". When "level" is 0, lock_sock_nested(sk, level) +* is the same as lock_sock(sk). +*/ +lock_sock_nested (sk, level);sock_orphan (sk); sk->sk_shutdown =SHUTDOWN_MASK ;
@@ -659,7 +667,7 @@ static void __vsock_release(struct sock/* Clean up any sockets that never were accepted. */ while ((pending =vsock_dequeue_accept (sk)) !=NULL ) { -__vsock_release (pending); +__vsock_release (pending,SINGLE_DEPTH_NESTING );sock_put (pending); }
@@ -708,7 +716,7 @@ EXPORT_SYMBOL_GPL(vsock_stream_has_spacestatic int vsock_release (struct socket *sock) { -__vsock_release (sock->sk); +__vsock_release (sock->sk,0 ); sock->sk =NULL ; sock->state =SS_FREE ;
net/vmw_vsock/hyperv_transport.c +1 -1
@@ -528,7 +528,7 @@ static void hvs_release(struct vsock_socstruct sock *sk =sk_vsock (vsk);bool remove_sock; -lock_sock (sk); +lock_sock_nested (sk,SINGLE_DEPTH_NESTING ); remove_sock =hvs_close_lock_held (vsk);release_sock (sk);if (remove_sock)
net/vmw_vsock/virtio_transport_common.c +1 -1
@@ -790,7 +790,7 @@ void virtio_transport_release(struct vsostruct sock *sk = &vsk->sk;bool remove_sock = true; -lock_sock (sk); +lock_sock_nested (sk,SINGLE_DEPTH_NESTING );if (sk->sk_type ==SOCK_STREAM ) remove_sock =virtio_transport_close (vsk);
Greg Kroah-Hartman
maintainerPATCH 13/137 sch_cbq: validate TCA_CBQ_WRROPT to avoid crash
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit e9789c7cc182484fc031fd88097eb14cb26c4596 ]
syzbot reported a crash in cbq_normalize_quanta() caused by an out of range cl->priority.
iproute2 enforces this check, but malicious users do not.
kasan: CONFIG_KASAN_INLINE enabled
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] SMP KASAN PTI Modules linked in: CPU: 1 PID: 26447 Comm: syz-executor.1 Not tainted 5.3+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:cbq_normalize_quanta.part.0+0x1fd/0x430 net/sched/sch_cbq.c:902 RSP: 0018:ffff8801a5c333b0 EFLAGS: 00010206 RAX: 0000000020000003 RBX: 00000000fffffff8 RCX: ffffc9000712f000 RDX: 00000000000043bf RSI: ffffffff83be8962 RDI: 0000000100000018 RBP: ffff8801a5c33420 R08: 000000000000003a R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 00000000000002ef R13: ffff88018da95188 R14: dffffc0000000000 R15: 0000000000000015 FS: 00007f37d26b1700(0000) GS:ffff8801dad00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000004c7cec CR3: 00000001bcd0a006 CR4: 00000000001626f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: [<ffffffff83be9d57>] cbq_normalize_quanta include/net/pkt_sched.h:27 [inline] [<ffffffff83be9d57>] cbq_addprio net/sched/sch_cbq.c:1097 [inline] [<ffffffff83be9d57>] cbq_set_wrr+0x2d7/0x450 net/sched/sch_cbq.c:1115 [<ffffffff83bee8a7>] cbq_change_class+0x987/0x225b net/sched/sch_cbq.c:1537 [<ffffffff83b96985>] tc_ctl_tclass+0x555/0xcd0 net/sched/sch_api.c:2329 [<ffffffff83a84655>] rtnetlink_rcv_msg+0x485/0xc10 net/core/rtnetlink.c:5248 [<ffffffff83cadf0a>] netlink_rcv_skb+0x17a/0x460 net/netlink/af_netlink.c:2510 [<ffffffff83a7db6d>] rtnetlink_rcv+0x1d/0x30 net/core/rtnetlink.c:5266 [<ffffffff83cac2c6>] netlink_unicast_kernel net/netlink/af_netlink.c:1324 [inline] [<ffffffff83cac2c6>] netlink_unicast+0x536/0x720 net/netlink/af_netlink.c:1350 [<ffffffff83cacd4a>] netlink_sendmsg+0x89a/0xd50 net/netlink/af_netlink.c:1939 [<ffffffff8399d46e>] sock_sendmsg_nosec net/socket.c:673 [inline] [<ffffffff8399d46e>] sock_sendmsg+0x12e/0x170 net/socket.c:684 [<ffffffff8399f1fd>] ___sys_sendmsg+0x81d/0x960 net/socket.c:2359 [<ffffffff839a2d05>] __sys_sendmsg+0x105/0x1d0 net/socket.c:2397 [<ffffffff839a2df9>] SYSC_sendmsg net/socket.c:2406 [inline] [<ffffffff839a2df9>] SyS_sendmsg+0x29/0x30 net/socket.c:2404 [<ffffffff8101ccc8>] do_syscall_64+0x528/0x770 arch/x86/entry/common.c:305 [<ffffffff84400091>] entry_SYSCALL_64_after_hwframe+0x42/0xb7
--- net/sched/sch_cbq.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-)
net/sched/sch_cbq.c +29 -14
@@ -1127,6 +1127,33 @@ static const struct nla_policy cbq_polic [TCA_CBQ_POLICE] = { .len = sizeof(struct tc_cbq_police) }, }; +static int cbq_opt_parse (struct nlattr *tb[TCA_CBQ_MAX +1 ], +struct nlattr *opt, +struct netlink_ext_ack *extack) +{ +int err; + +if (!opt) { +NL_SET_ERR_MSG (extack,"CBQ options are required for this operation" ); +return -EINVAL ; + } + + err =nla_parse_nested_deprecated (tb,TCA_CBQ_MAX , opt, + cbq_policy, extack); +if (err <0 ) +return err; + +if (tb[TCA_CBQ_WRROPT ]) { +const struct tc_cbq_wrropt *wrr =nla_data (tb[TCA_CBQ_WRROPT ]); + +if (wrr->priority >TC_CBQ_MAXPRIO ) { +NL_SET_ERR_MSG (extack,"priority is bigger than TC_CBQ_MAXPRIO" ); + err = -EINVAL ; + } + } +return err; +} +static int cbq_init (struct Qdisc *sch,struct nlattr *opt,struct netlink_ext_ack *extack) {
@@ -1139,13 +1166,7 @@ static int cbq_init(struct Qdisc *sch, shrtimer_init (&q->delay_timer,CLOCK_MONOTONIC ,HRTIMER_MODE_ABS_PINNED ); q->delay_timer.function = cbq_undelay; -if (!opt) { -NL_SET_ERR_MSG (extack,"CBQ options are required for this operation" ); -return -EINVAL ; - } - - err =nla_parse_nested_deprecated (tb,TCA_CBQ_MAX , opt, cbq_policy, - extack); + err =cbq_opt_parse (tb, opt, extack);if (err <0 )return err;
@@ -1464,13 +1485,7 @@ cbq_change_class(struct Qdisc *sch, u32struct cbq_class *parent;struct qdisc_rate_table *rtab =NULL ; -if (!opt) { -NL_SET_ERR_MSG (extack,"Mandatory qdisc options missing" ); -return -EINVAL ; - } - - err =nla_parse_nested_deprecated (tb,TCA_CBQ_MAX , opt, cbq_policy, - extack); + err =cbq_opt_parse (tb, opt, extack);if (err <0 )return err;
Greg Kroah-Hartman
maintainerPATCH 1/137 cxgb4:Fix out-of-bounds MSI-X info array access
In reply to Greg Kroah-HartmanFrom: Vishal Kulkarni <[email protected]>
[ Upstream commit 6b517374f4ea5a3c6e307e1219ec5f35d42e6d00 ]
When fetching free MSI-X vectors for ULDs, check for the error code before accessing MSI-X info array. Otherwise, an out-of-bounds access is attempted, which results in kernel panic.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c +6 -3
@@ -137,13 +137,12 @@ static int uldrx_handler(struct sge_rspqstatic int alloc_uld_rxqs (struct adapter *adap,struct sge_uld_rxq_info *rxq_info,bool lro) { -struct sge *s = &adap->sge;unsigned int nq = rxq_info->nrxq + rxq_info->nciq; +int i, err, msi_idx, que_idx =0 , bmap_idx =0 ;struct sge_ofld_rxq *q = rxq_info->uldrxq;unsigned short *ids = rxq_info->rspq_id; -unsigned int bmap_idx =0 ; +struct sge *s = &adap->sge;unsigned int per_chan; -int i, err, msi_idx, que_idx =0 ; per_chan = rxq_info->nrxq / adap->params.nports;
@@ -161,6 +160,10 @@ static int alloc_uld_rxqs(struct adapterif (msi_idx >=0 ) { bmap_idx =get_msix_idx_from_bmap (adap); +if (bmap_idx <0 ) { + err = -ENOSPC ; + goto freeout; + } msi_idx = adap->msix_info_ulds[bmap_idx].idx; } err = t4_sge_alloc_rxq(adap, &q->rspq, false,
stable-rc/linux-5.2.y boot: 62 boots: 0 failed, 61 passed with 1 untried/unknown (v5.2.19-138-gc7a8121be8ef)
stable-rc/linux-5.2.y boot: 62 boots: 0 failed, 61 passed with 1 untried/unknown (v5.2.19-138-gc7a8121be8ef)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-5.2.y/kernel/v5.2.19-138-gc7a8121be8ef/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-5.2.y/kernel/v5.2.19-138-gc7a8121be8ef/
Tree: stable-rc
Branch: linux-5.2.y
Git Describe: v5.2.19-138-gc7a8121be8ef
Git Commit: c7a8121be8ef67066e07c79b2204dea12511b17b
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 43 unique boards, 16 SoC families, 12 builds out of 209
Boot Regressions Detected:
arm64:
defconfig:
gcc-8:
meson-gxl-s805x-p241:
lab-baylibre: new failure (last pass: v5.2.19-133-ga4c5f9f59786)---
For more info write to <[email protected]>
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.20 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue 08 Oct 2019 05:07:10 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.20-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.2.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v5.2:
12 builds: 12 pass, 0 fail
22 boots: 22 pass, 0 fail
38 tests: 38 pass, 0 failLinux version: 5.2.20-rc1-gc7a8121be8ef
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04Cheers
Jon
Signature · 1 line
nvpublic
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.20 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue 08 Oct 2019 05:07:10 PM UTC. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 390 pass: 390 fail: 0
Guenter
Hello!
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.20 release. There are 137 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue 08 Oct 2019 05:07:10 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.20-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.2.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
As mentioned, we found a problem with the mismatch of kselftests 5.3.1 and net/udpgso.sh, but everything is fine.
Summary
------------------------------------------------------------------------
kernel: 5.2.20-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.2.y
git commit: c7a8121be8ef67066e07c79b2204dea12511b17b
git describe: v5.2.19-138-gc7a8121be8ef
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-5.2-oe/build/v5.2.19-138-gc7a8121be8ef
No regressions (compared to build v5.2.19)
No fixes (compared to build v5.2.19)
Ran 25451 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15
- x86
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libgpiod
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* ltp-fs-tests
* ltp-open-posix-tests
* network-basic-tests
* kvm-unit-tests
* ssuite
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Greetings!
Daniel Díaz
[email protected]
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org