6.14.5-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 108/311 net: stmmac: block PHY RXC clock-stop
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King (Oracle) <[email protected]>
commit dd557266cf5fb01a8cd85482dd258c1e172301d1 upstream.
The DesignWare core requires the receive clock to be running during certain operations. Ensure that we block PHY RXC clock-stop during these operations.
This is a best-efforts change - not everywhere can be covered by this because of net's core locking, which means we can't access the MDIO bus to configure the PHY to disable RXC clock-stop in certain areas. These are marked with FIXME comments.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +27 -0
@@ -3448,9 +3448,18 @@ static int stmmac_hw_setup(struct net_deif (priv->hw->phylink_pcs)phylink_pcs_pre_init (priv->phylink, priv->hw->phylink_pcs); +/* Note that clk_rx_i must be running for reset to complete. This +* clock may also be required when setting the MAC address. +* +* Block the receive clock stop for LPI mode at the PHY in case +* the link is established with EEE mode active. +*/ +phylink_rx_clk_stop_block (priv->phylink); +/* DMA initialization and SW reset */ ret =stmmac_init_dma_engine (priv);if (ret <0 ) { +phylink_rx_clk_stop_unblock (priv->phylink);netdev_err (priv->dev,"%s: DMA engine initialization failed\n" , __func__);return ret;
@@ -3458,6 +3467,7 @@ static int stmmac_hw_setup(struct net_de/* Copy the MAC addr into the HW */ stmmac_set_umac_addr (priv, priv->hw, dev->dev_addr,0 ); +phylink_rx_clk_stop_unblock (priv->phylink);/* PS and related bits will be programmed according to the speed */ if (priv->hw->pcs) {
@@ -3568,7 +3578,9 @@ static int stmmac_hw_setup(struct net_de/* Start the ball rolling... */ stmmac_start_all_dma (priv); +phylink_rx_clk_stop_block (priv->phylink);stmmac_set_hw_vlan_mode (priv, priv->hw); +phylink_rx_clk_stop_unblock (priv->phylink);return 0 ; }
@@ -5853,6 +5865,9 @@ static void stmmac_tx_timeout(struct net* whenever multicast addresses must be enabled/disabled. * Return value: * void. +* +* FIXME: This may need RXC to be running, but it may be called with BH +* disabled, which means we can't call phylink_rx_clk_stop*(). */ static void stmmac_set_rx_mode (struct net_device *dev) {
@@ -5985,7 +6000,9 @@ static int stmmac_set_features(struct neelse priv->hw->hw_vlan_en = false; +phylink_rx_clk_stop_block (priv->phylink);stmmac_set_hw_vlan_mode (priv, priv->hw); +phylink_rx_clk_stop_unblock (priv->phylink);return 0 ; }
@@ -6269,7 +6286,9 @@ static int stmmac_set_mac_address(structif (ret) goto set_mac_error; +phylink_rx_clk_stop_block (priv->phylink);stmmac_set_umac_addr (priv, priv->hw, ndev->dev_addr,0 ); +phylink_rx_clk_stop_unblock (priv->phylink); set_mac_error:pm_runtime_put (priv->device);
@@ -6625,6 +6644,9 @@ static int stmmac_vlan_update(struct stmreturn stmmac_update_vlan_hash (priv, priv->hw, hash, pmatch, is_double); } +/* FIXME: This may need RXC to be running, but it may be called with BH +* disabled, which means we can't call phylink_rx_clk_stop*(). +*/ static int stmmac_vlan_rx_add_vid (struct net_device *ndev,__be16 proto,u16 vid) {struct stmmac_priv *priv =netdev_priv (ndev);
@@ -6656,6 +6678,9 @@ err_pm_put:return ret; } +/* FIXME: This may need RXC to be running, but it may be called with BH +* disabled, which means we can't call phylink_rx_clk_stop*(). +*/ static int stmmac_vlan_rx_kill_vid (struct net_device *ndev,__be16 proto,u16 vid) {struct stmmac_priv *priv =netdev_priv (ndev);
@@ -7922,9 +7947,11 @@ int stmmac_resume(struct device *dev)stmmac_hw_setup (ndev, false);stmmac_init_coalesce (priv); +phylink_rx_clk_stop_block (priv->phylink);stmmac_set_rx_mode (ndev);stmmac_restore_hw_vlan_rx_fltr (priv, ndev, priv->hw); +phylink_rx_clk_stop_unblock (priv->phylink);stmmac_enable_all_queues (priv);stmmac_enable_all_dma_irq (priv);
Greg Kroah-Hartman
maintainerPATCH 109/311 netfilter: fib: avoid lookup if socket is available
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
commit eaaff9b6702e99be5d79135f2afa9fc48a0d59e0 upstream.
In case the fib match is used from the input hook we can avoid the fib lookup if early demux assigned a socket for us: check that the input interface matches sk-cached one.
Rework the existing 'lo bypass' logic to first check sk, then for loopback interface type to elide the fib lookup.
This speeds up fib matching a little, before:
93.08 GBit/s (no rules at all)
75.1 GBit/s ("fib saddr . iif oif missing drop" in prerouting) 75.62 GBit/s ("fib saddr . iif oif missing drop" in input)
After:
92.48 GBit/s (no rules at all)
75.62 GBit/s (fib rule in prerouting)
90.37 GBit/s (fib rule in input).
Numbers for the 'no rules' and 'prerouting' are expected to closely match in-between runs, the 3rd/input test case exercises the the 'avoid lookup if cached ifindex in sk matches' case.
Test used iperf3 via veth interface, lo can't be used due to existing loopback test.
--- include/net/netfilter/nft_fib.h | 21 +++++++++++++++++++++ net/ipv4/netfilter/nft_fib_ipv4.c | 11 +++++------ net/ipv6/netfilter/nft_fib_ipv6.c | 19 ++++++++++--------- 3 files changed, 36 insertions(+), 15 deletions(-)
include/net/netfilter/nft_fib.h +21 -0
@@ -18,6 +18,27 @@ nft_fib_is_loopback(const struct sk_buffreturn skb->pkt_type ==PACKET_LOOPBACK || in->flags &IFF_LOOPBACK ; } +static inline bool nft_fib_can_skip (const struct nft_pktinfo *pkt) +{ +const struct net_device *indev =nft_in (pkt); +const struct sock *sk; + +switch (nft_hook (pkt)) { +case NF_INET_PRE_ROUTING : +case NF_INET_INGRESS : +case NF_INET_LOCAL_IN : +break ; +default : +return false; + } + + sk = pkt->skb->sk; +if (sk &&sk_fullsock (sk)) +return sk->sk_rx_dst_ifindex == indev->ifindex; + +return nft_fib_is_loopback (pkt->skb, indev); +} +int nft_fib_dump (struct sk_buff *skb,const struct nft_expr *expr,bool reset);int nft_fib_init (const struct nft_ctx *ctx,const struct nft_expr *expr,const struct nlattr *const tb[]);
net/ipv4/netfilter/nft_fib_ipv4.c +5 -6
@@ -71,6 +71,11 @@ void nft_fib4_eval(const struct nft_exprconst struct net_device *oif;const struct net_device *found; +if (nft_fib_can_skip (pkt)) { +nft_fib_store_result (dest, priv,nft_in (pkt)); +return ; + } +/* * Do not set flowi4_oif, it restricts results (for example, asking * for oif 3 will get RTN_UNICAST result even if the daddr exits
@@ -85,12 +90,6 @@ void nft_fib4_eval(const struct nft_exprelse oif =NULL ; -if (nft_hook (pkt) ==NF_INET_PRE_ROUTING && -nft_fib_is_loopback (pkt->skb,nft_in (pkt))) { -nft_fib_store_result (dest, priv,nft_in (pkt)); -return ; - } - iph =skb_header_pointer (pkt->skb, noff,sizeof (_iph), &_iph);if (!iph) { regs->verdict.code =NFT_BREAK ;
net/ipv6/netfilter/nft_fib_ipv6.c +10 -9
@@ -170,6 +170,11 @@ void nft_fib6_eval(const struct nft_exprstruct rt6_info *rt;int lookup_flags; +if (nft_fib_can_skip (pkt)) { +nft_fib_store_result (dest, priv,nft_in (pkt)); +return ; + } +if (priv->flags &NFTA_FIB_F_IIF ) oif =nft_in (pkt);else if (priv->flags &NFTA_FIB_F_OIF )
@@ -181,17 +186,13 @@ void nft_fib6_eval(const struct nft_exprreturn ; } - lookup_flags =nft_fib6_flowi_init (&fl6, priv, pkt, oif, iph); - -if (nft_hook (pkt) ==NF_INET_PRE_ROUTING || -nft_hook (pkt) ==NF_INET_INGRESS ) { -if (nft_fib_is_loopback (pkt->skb,nft_in (pkt)) || -nft_fib_v6_skip_icmpv6 (pkt->skb, pkt->tprot, iph)) { -nft_fib_store_result (dest, priv,nft_in (pkt)); -return ; - } +if (nft_fib_v6_skip_icmpv6 (pkt->skb, pkt->tprot, iph)) { +nft_fib_store_result (dest, priv,nft_in (pkt)); +return ; } + lookup_flags =nft_fib6_flowi_init (&fl6, priv, pkt, oif, iph); + *dest =0 ; rt = (void *)ip6_route_lookup (nft_net (pkt), &fl6, pkt->skb, lookup_flags);
Greg Kroah-Hartman
maintainerPATCH 110/311 virtio_console: fix missing byte order handling for cols and rows
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Halil Pasic <[email protected]>
commit fbd3039a64b01b769040677c4fc68badeca8e3b2 upstream.
As per virtio spec the fields cols and rows are specified as little endian. Although there is no legacy interface requirement that would state that cols and rows need to be handled as native endian when legacy interface is used, unlike for the fields of the adjacent struct virtio_console_control, I decided to err on the side of caution based on some non-conclusive virtio spec repo archaeology and opt for using virtio16_to_cpu() much like for virtio_console_control.event. Strictly by the letter of the spec virtio_le_to_cpu() would have been sufficient. But when the legacy interface is not used, it boils down to the same.
And when using the legacy interface, the device formatting these as little endian when the guest is big endian would surprise me more than it using guest native byte order (which would make it compatible with the current implementation). Nevertheless somebody trying to implement the spec following it to the letter could end up forcing little endian byte order when the legacy interface is in use. So IMHO this ultimately needs a judgement call by the maintainers.
Message-Id: <[email protected]>
--- drivers/char/virtio_console.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/char/virtio_console.c +4 -3
@@ -1579,8 +1579,8 @@ static void handle_control_message(strucbreak ;case VIRTIO_CONSOLE_RESIZE : {struct { -__u16 rows; -__u16 cols; +__virtio16 rows; +__virtio16 cols; } size;if (!is_console_port (port))
@@ -1588,7 +1588,8 @@ static void handle_control_message(strucmemcpy (&size, buf->buf + buf->offset +sizeof (*cpkt),sizeof (size)); -set_console_size (port, size.rows, size.cols); +set_console_size (port,virtio16_to_cpu (vdev, size.rows), +virtio16_to_cpu (vdev, size.cols)); port->cons.hvc->irq_requested =1 ;resize_console (port);
Greg Kroah-Hartman
maintainerPATCH 111/311 sched_ext: Use kvzalloc for large exit_dump allocation
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
commit 47068309b5777313b6ac84a77d8d10dc7312260a upstream.
Replace kzalloc with kvzalloc for the exit_dump buffer allocation, which can require large contiguous memory depending on the implementation. This change prevents allocation failures by allowing the system to fall back to vmalloc when contiguous memory allocation fails.
Since this buffer is only used for debugging purposes, physical memory contiguity is not required, making vmalloc a suitable alternative.
--- kernel/sched/ext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/ext.c +2 -2
@@ -4944,7 +4944,7 @@ unlock:static void free_exit_info (struct scx_exit_info *ei) { -kfree (ei->dump); +kvfree (ei->dump);kfree (ei->msg);kfree (ei->bt);kfree (ei);
@@ -4960,7 +4960,7 @@ static struct scx_exit_info *alloc_exit_ ei->bt =kcalloc (SCX_EXIT_BT_LEN ,sizeof (ei->bt[0 ]),GFP_KERNEL ); ei->msg =kzalloc (SCX_EXIT_MSG_LEN ,GFP_KERNEL ); - ei->dump =kzalloc (exit_dump_len,GFP_KERNEL ); + ei->dump =kvzalloc (exit_dump_len,GFP_KERNEL );if (!ei->bt || !ei->msg || !ei->dump) {free_exit_info (ei);
Greg Kroah-Hartman
maintainerPATCH 112/311 crypto: atmel-sha204a - Set hwrng quality to lowest possible
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
commit 8006aff15516a170640239c5a8e6696c0ba18d8e upstream.
According to the review by Bill Cox [1], the Atmel SHA204A random number generator produces random numbers with very low entropy.
Set the lowest possible entropy for this chip just to be safe.
[1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html
--- drivers/crypto/atmel-sha204a.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/crypto/atmel-sha204a.c +6 -0
@@ -163,6 +163,12 @@ static int atmel_sha204a_probe(struct i2 i2c_priv->hwrng.name =dev_name (&client->dev); i2c_priv->hwrng.read = atmel_sha204a_rng_read; +/* +* According to review by Bill Cox [1], this HWRNG has very low entropy. +* [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html +*/ + i2c_priv->hwrng.quality =1 ; + ret =devm_hwrng_register (&client->dev, &i2c_priv->hwrng);if (ret)dev_warn (&client->dev,"failed to register RNG (%d)\n" , ret);
Greg Kroah-Hartman
maintainerPATCH 113/311 xen-netfront: handle NULL returned by xdp_convert_buff_to_frame()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Nepomnyashih <[email protected]>
commit cc3628dcd851ddd8d418bf0c897024b4621ddc92 upstream.
The function xdp_convert_buff_to_frame() may return NULL if it fails to correctly convert the XDP buffer into an XDP frame due to memory constraints, internal errors, or invalid data. Failing to check for NULL may lead to a NULL pointer dereference if the result is used later in processing, potentially causing crashes, data corruption, or undefined behavior.
On XDP redirect failure, the associated page must be released explicitly if it was previously retained via get_page(). Failing to do so may result in a memory leak, as the pages reference count is not decremented.
--- drivers/net/xen-netfront.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/xen-netfront.c +12 -5
@@ -985,20 +985,27 @@ static u32 xennet_run_xdp(struct netfron act =bpf_prog_run_xdp (prog, xdp);switch (act) {case XDP_TX : -get_page (pdata); xdpf =xdp_convert_buff_to_frame (xdp); +if (unlikely (!xdpf)) { +trace_xdp_exception (queue->info->netdev, prog, act); +break ; + } +get_page (pdata); err =xennet_xdp_xmit (queue->info->netdev,1 , &xdpf,0 ); -if (unlikely (!err)) +if (unlikely (err <=0 )) { +if (err <0 ) +trace_xdp_exception (queue->info->netdev, prog, act);xdp_return_frame_rx_napi (xdpf); -else if (unlikely (err <0 )) -trace_xdp_exception (queue->info->netdev, prog, act); + }break ;case XDP_REDIRECT :get_page (pdata); err =xdp_do_redirect (queue->info->netdev, xdp, prog); *need_xdp_flush = true; -if (unlikely (err)) +if (unlikely (err)) {trace_xdp_exception (queue->info->netdev, prog, act); +xdp_return_buff (xdp); + }break ;case XDP_PASS :case XDP_DROP :
Greg Kroah-Hartman
maintainerPATCH 114/311 net: selftests: initialize TCP header and skb payload with zero
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
commit 9e8d1013b0c38910cbc9e60de74dbe883878469d upstream.
Zero-initialize TCP header via memset() to avoid garbage values that may affect checksum or behavior during test transmission.
Also zero-fill allocated payload and padding regions using memset() after skb_put(), ensuring deterministic content for all outgoing test packets.
--- net/core/selftests.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
net/core/selftests.c +13 -5
@@ -100,10 +100,10 @@ static struct sk_buff *net_test_get_skb( ehdr->h_proto =htons (ETH_P_IP );if (attr->tcp) { +memset (thdr,0 ,sizeof (*thdr)); thdr->source =htons (attr->sport); thdr->dest =htons (attr->dport); thdr->doff =sizeof (struct tcphdr ) /4 ; - thdr->check =0 ; }else { uhdr->source =htons (attr->sport); uhdr->dest =htons (attr->dport);
@@ -144,10 +144,18 @@ static struct sk_buff *net_test_get_skb( attr->id = net_test_next_id; shdr->id = net_test_next_id++; -if (attr->size) -skb_put (skb, attr->size); -if (attr->max_size && attr->max_size > skb->len) -skb_put (skb, attr->max_size - skb->len); +if (attr->size) { +void *payload =skb_put (skb, attr->size); + +memset (payload,0 , attr->size); + } + +if (attr->max_size && attr->max_size > skb->len) { +size_t pad_len = attr->max_size - skb->len; +void *pad =skb_put (skb, pad_len); + +memset (pad,0 , pad_len); + } skb->csum =0 ; skb->ip_summed =CHECKSUM_PARTIAL ;
Greg Kroah-Hartman
maintainerPATCH 115/311 net: phy: microchip: force IRQ polling mode for lan88xx
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fiona Klute <[email protected]>
commit 30a41ed32d3088cd0d682a13d7f30b23baed7e93 upstream.
With lan88xx based devices the lan78xx driver can get stuck in an interrupt loop while bringing the device up, flooding the kernel log with messages like the following:
lan78xx 2-3:1.0 enp1s0u3: kevent 4 may have been dropped
Removing interrupt support from the lan88xx PHY driver forces the driver to use polling instead, which avoids the problem.
The issue has been observed with Raspberry Pi devices at least since 4.14 (see [1], bug report for their downstream kernel), as well as with Nvidia devices [2] in 2020, where disabling interrupts was the vendor-suggested workaround (together with the claim that phylib changes in 4.9 made the interrupt handling in lan78xx incompatible).
Iperf reports well over 900Mbits/sec per direction with client in --dualtest mode, so there does not seem to be a significant impact on throughput (lan88xx device connected via switch to the peer).
[1] https://github.com/raspberrypi/linux/issues/2447
[2] https://forums.developer.nvidia.com/t/jetson-xavier-and-lan7800-problem/142134/11
--- drivers/net/phy/microchip.c | 46 ++------------------------------------------ 1 file changed, 3 insertions(+), 43 deletions(-)
drivers/net/phy/microchip.c +3 -43
@@ -37,47 +37,6 @@ static int lan88xx_write_page(struct phyreturn __phy_write (phydev,LAN88XX_EXT_PAGE_ACCESS , page); } -static int lan88xx_phy_config_intr (struct phy_device *phydev) -{ -int rc; - -if (phydev->interrupts ==PHY_INTERRUPT_ENABLED ) { -/* unmask all source and clear them before enable */ - rc =phy_write (phydev,LAN88XX_INT_MASK ,0x7FFF ); - rc =phy_read (phydev,LAN88XX_INT_STS ); - rc =phy_write (phydev,LAN88XX_INT_MASK , -LAN88XX_INT_MASK_MDINTPIN_EN_ | -LAN88XX_INT_MASK_LINK_CHANGE_ ); - }else { - rc =phy_write (phydev,LAN88XX_INT_MASK ,0 ); -if (rc) -return rc; - -/* Ack interrupts after they have been disabled */ - rc =phy_read (phydev,LAN88XX_INT_STS ); - } - -return rc <0 ? rc :0 ; -} - -static irqreturn_t lan88xx_handle_interrupt (struct phy_device *phydev) -{ -int irq_status; - - irq_status =phy_read (phydev,LAN88XX_INT_STS ); -if (irq_status <0 ) { -phy_error (phydev); -return IRQ_NONE ; - } - -if (!(irq_status &LAN88XX_INT_STS_LINK_CHANGE_ )) -return IRQ_NONE ; - -phy_trigger_machine (phydev); - -return IRQ_HANDLED ; -} -static int lan88xx_suspend (struct phy_device *phydev) {struct lan88xx_priv *priv = phydev->priv;
@@ -528,8 +487,9 @@ static struct phy_driver microchip_phy_d .config_aneg = lan88xx_config_aneg, .link_change_notify = lan88xx_link_change_notify, - .config_intr = lan88xx_phy_config_intr, - .handle_interrupt = lan88xx_handle_interrupt, +/* Interrupt handling is broken, do not define related +* functions to force polling. +*/ .suspend = lan88xx_suspend, .resume = genphy_resume,
Greg Kroah-Hartman
maintainerPATCH 116/311 mptcp: pm: Defer freeing of MPTCP userspace path manager entries
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mat Martineau <[email protected]>
commit 13b4ece33cf9def67966bb8716783c42cec20617 upstream.
When path manager entries are deleted from the local address list, they are first unlinked from the address list using list_del_rcu(). The entries must not be freed until after the RCU grace period, but the existing code immediately frees the entry.
Use kfree_rcu_mightsleep() and adjust sk_omem_alloc in open code instead of using the sock_kfree_s() helper. This code path is only called in a netlink handler, so the "might sleep" function is preferable to adding a rarely-used rcu_head member to struct mptcp_pm_addr_entry.
--- net/mptcp/pm_userspace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/mptcp/pm_userspace.c +5 -1
@@ -352,7 +352,11 @@ int mptcp_pm_nl_remove_doit(struct sk_burelease_sock (sk); -sock_kfree_s (sk, match,sizeof (*match)); +kfree_rcu_mightsleep (match); +/* Adjust sk_omem_alloc like sock_kfree_s() does, to match +* with allocation of this memory by sock_kmemdup() +*/ +atomic_sub (sizeof (*match), &sk->sk_omem_alloc); err =0 ; out:
Greg Kroah-Hartman
maintainerPATCH 117/311 scsi: mpi3mr: Fix pending I/O counter
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ranjan Kumar <[email protected]>
commit cdd445258db9919e9dde497a6d5c3477ea7faf4d upstream.
Commit 199510e33dea ("scsi: mpi3mr: Update consumer index of reply queues after every 100 replies") introduced a regression with the per-reply queue pending I/O counter which was erroneously decremented, leading to the counter going negative.
Drop the incorrect atomic decrement for the pending I/O counter.
--- drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpi3mr/mpi3mr_fw.c +1 -1
@@ -563,7 +563,7 @@ int mpi3mr_process_op_reply_q(struct mpiWRITE_ONCE (op_req_q->ci,le16_to_cpu (reply_desc->request_queue_ci));mpi3mr_process_op_reply_desc (mrioc, reply_desc, &reply_dma, reply_qidx); -atomic_dec (&op_reply_q->pend_ios); +if (reply_dma)mpi3mr_repost_reply_buf (mrioc, reply_dma); num_op_reply++;
Greg Kroah-Hartman
maintainerPATCH 118/311 rust: firmware: Use `ffi::c_char` type in `FwFunc`
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Schrefl <[email protected]>
commit 53bd97801632c940767f4c8407c2cbdeb56b40e7 upstream.
The FwFunc struct contains an function with a char pointer argument, for which a *const u8 pointer was used. This is not really the "proper" type for this, so use a *const kernel::ffi::c_char pointer instead.
This has no real functionality changes, since now kernel::ffi::c_char (which bindgen uses for char) is now a type alias to u8 anyways, but before commit 1bae8729e50a ("rust: map long to isize and char to u8") the concrete type of kernel::ffi::c_char depended on the architecture (However all supported architectures at the time mapped to i8).
This caused problems on the v6.13 tag when building for 32 bit arm (with my patches), since back then *const i8 was used in the function argument and the function that bindgen generated used *const core::ffi::c_char which Rust mapped to *const u8 on 32 bit arm. The stable v6.13.y branch does not have this issue since commit 1bae8729e50a ("rust: map long to isize and char to u8") was backported.
This caused the following build error:
```
error[E0308]: mismatched types
--> rust/kernel/firmware.rs:20:4
|
20 | Self(bindings::request_firmware)
| ---- ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected fn pointer, found fn item
| |
| arguments to this function are incorrect
|
= note: expected fn pointer `unsafe extern "C" fn(_, *const i8, _) -> _`
found fn item `unsafe extern "C" fn(_, *const u8, _) -> _ {request_firmware}`
note: tuple struct defined here
--> rust/kernel/firmware.rs:14:8
|
14 | struct FwFunc(
| ^^^^^^
error[E0308]: mismatched types
--> rust/kernel/firmware.rs:24:14
|
24 | Self(bindings::firmware_request_nowarn)
| ---- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected fn pointer, found fn item
| |
| arguments to this function are incorrect
|
= note: expected fn pointer `unsafe extern "C" fn(_, *const i8, _) -> _`
found fn item `unsafe extern "C" fn(_, *const u8, _) -> _ {firmware_request_nowarn}`
note: tuple struct defined here
--> rust/kernel/firmware.rs:14:8
|
14 | struct FwFunc(
| ^^^^^^
error[E0308]: mismatched types
--> rust/kernel/firmware.rs:64:45
|
64 | let ret = unsafe { func.0(pfw as _, name.as_char_ptr(), dev.as_raw()) };
| ------ ^^^^^^^^^^^^^^^^^^ expected `*const i8`, found `*const u8`
| |
| arguments to this function are incorrect
|
= note: expected raw pointer `*const i8`
found raw pointer `*const u8`
error: aborting due to 3 previous errors
```--- rust/kernel/firmware.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
rust/kernel/firmware.rs +6 -2
@@ -4,7 +4,7 @@//! //! C header: [`include/linux/firmware.h`](srctree/include/linux/firmware.h) -use crate ::{bindings, device::Device , error::Error , error::Result , str::CStr }; +use crate ::{bindings, device::Device , error::Error , error::Result , ffi, str::CStr };use core::ptr::NonNull ;/// # Invariants
@@ -12,7 +12,11 @@ use core::ptr::NonNull;/// One of the following: `bindings::request_firmware`, `bindings::firmware_request_nowarn`, /// `bindings::firmware_request_platform`, `bindings::request_firmware_direct`. struct FwFunc ( -unsafe extern "C" fn (*mut *const bindings::firmware , *const u8 , *mut bindings::device ) ->i32 , +unsafe extern "C" fn ( + *mut *const bindings::firmware , + *const ffi::c_char , + *mut bindings::device , + ) ->i32 , );impl FwFunc {
Greg Kroah-Hartman
maintainerPATCH 119/311 drm: panel: jd9365da: fix reset signal polarity in unprepare
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hugo Villeneuve <[email protected]>
commit 095c8e61f4c71cd4630ee11a82e82cc341b38464 upstream.
commit a8972d5a49b4 ("drm: panel: jd9365da-h3: fix reset signal polarity") fixed reset signal polarity in jadard_dsi_probe() and jadard_prepare().
It was not done in jadard_unprepare() because of an incorrect assumption about reset line handling in power off mode. After looking into the datasheet, it now appears that before disabling regulators, the reset line is deasserted first, and if reset_before_power_off_vcioo is true, then the reset line is asserted.
Fix reset polarity by inverting gpiod_set_value() second argument in in jadard_unprepare().
--- drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c +2 -2
@@ -129,11 +129,11 @@ static int jadard_unprepare(struct drm_p {struct jadard *jadard =panel_to_jadard (panel); -gpiod_set_value (jadard->reset,1 ); +gpiod_set_value (jadard->reset,0 );msleep (120 );if (jadard->desc->reset_before_power_off_vcioo) { -gpiod_set_value (jadard->reset,0 ); +gpiod_set_value (jadard->reset,1 );usleep_range (1000 ,2000 ); }
Greg Kroah-Hartman
maintainerPATCH 120/311 drm/amd/display: Fix gpu reset in multidisplay config
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Li <[email protected]>
commit 7eb287beeb60be1e4437be2b4e4e9f0da89aab97 upstream.
[Why]
The indexing of stream_status in dm_gpureset_commit_state() is incorrect. That leads to asserts in multi-display configuration after gpu reset.
[How]
Adjust the indexing logic to align stream_status with surface_updates.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -3
@@ -3293,16 +3293,16 @@ static void dm_gpureset_commit_state(strfor (k =0 ; k < dc_state->stream_count; k++) { bundle->stream_update.stream = dc_state->streams[k]; -for (m =0 ; m < dc_state->stream_status->plane_count; m++) { +for (m =0 ; m < dc_state->stream_status[k].plane_count; m++) { bundle->surface_updates[m].surface = - dc_state->stream_status->plane_states[m]; + dc_state->stream_status[k].plane_states[m]; bundle->surface_updates[m].surface->force_full_update = true; }update_planes_and_stream_adapter (dm->dc,UPDATE_TYPE_FULL , - dc_state->stream_status->plane_count, + dc_state->stream_status[k].plane_count, dc_state->streams[k], &bundle->stream_update, bundle->surface_updates);
Greg Kroah-Hartman
maintainerPATCH 121/311 drm/amd/display: Force full update in gpu reset
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Li <[email protected]>
commit 67fe574651c73fe5cc176e35f28f2ec1ba498d14 upstream.
[Why]
While system undergoing gpu reset always do full update to sync the dc state before and after reset.
[How]
Return true in should_reset_plane() if gpu reset detected
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -10901,6 +10901,9 @@ static bool should_reset_plane(struct dr state->allow_modeset)return true; +if (amdgpu_in_reset (adev) && state->allow_modeset) +return true; +/* Exit early if we know that we're adding or removing the plane. */ if (old_plane_state->crtc != new_plane_state->crtc)return true;
Greg Kroah-Hartman
maintainerPATCH 122/311 drm/amd/display: Fix ACPI edid parsing on some Lenovo systems
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
commit 870bea21fdf88f45c94c0a3dbb0e3cc1b219680f upstream.
[Why]
The ACPI EDID in the BIOS of a Lenovo laptop includes 3 blocks, but dm_helpers_probe_acpi_edid() has a start that is 'char'. The 3rd block index starts after 255, so it can't be indexed properly. This leads to problems with the display when the EDID is parsed.
[How]
Change the variable type to 'short' so that larger values can be indexed.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
@@ -912,7 +912,7 @@ dm_helpers_probe_acpi_edid(void *data, u {struct drm_connector *connector = data;struct acpi_device *acpidev =ACPI_COMPANION (connector->dev->dev); -unsigned char start = block *EDID_LENGTH ; +unsigned short start = block *EDID_LENGTH ;struct edid *edid;int r;
Greg Kroah-Hartman
maintainerPATCH 123/311 x86/insn: Fix CTEST instruction decoding
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kirill A. Shutemov <[email protected]>
commit 85fd85bc025a525354acb2241beb3c5387c551ec upstream.
insn_decoder_test found a problem with decoding APX CTEST instructions:
Found an x86 instruction decoder bug, please report this.
ffffffff810021df 62 54 94 05 85 ff ctestneq
objdump says 6 bytes, but insn_get_length() says 5
It happens because x86-opcode-map.txt doesn't specify arguments for the instruction and the decoder doesn't expect to see ModRM byte.
--- arch/x86/lib/x86-opcode-map.txt | 4 ++-- tools/arch/x86/lib/x86-opcode-map.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/lib/x86-opcode-map.txt +2 -2
@@ -996,8 +996,8 @@ AVXcode: 4 83: Grp1 Ev,Ib (1A),(es) # CTESTSCC instructions are: CTESTB, CTESTBE, CTESTF, CTESTL, CTESTLE, CTESTNB, CTESTNBE, CTESTNL, # CTESTNLE, CTESTNO, CTESTNS, CTESTNZ, CTESTO, CTESTS, CTESTT, CTESTZ -84: CTESTSCC (ev) -85: CTESTSCC (es) | CTESTSCC (66),(es) +84: CTESTSCC Eb,Gb (ev) +85: CTESTSCC Ev,Gv (es) | CTESTSCC Ev,Gv (66),(es) 88: POPCNT Gv,Ev (es) | POPCNT Gv,Ev (66),(es) 8f: POP2 Bq,Rq (000),(11B),(ev) a5: SHLD Ev,Gv,CL (es) | SHLD Ev,Gv,CL (66),(es)
tools/arch/x86/lib/x86-opcode-map.txt +2 -2
@@ -996,8 +996,8 @@ AVXcode: 4 83: Grp1 Ev,Ib (1A),(es) # CTESTSCC instructions are: CTESTB, CTESTBE, CTESTF, CTESTL, CTESTLE, CTESTNB, CTESTNBE, CTESTNL, # CTESTNLE, CTESTNO, CTESTNS, CTESTNZ, CTESTO, CTESTS, CTESTT, CTESTZ -84: CTESTSCC (ev) -85: CTESTSCC (es) | CTESTSCC (66),(es) +84: CTESTSCC Eb,Gb (ev) +85: CTESTSCC Ev,Gv (es) | CTESTSCC Ev,Gv (66),(es) 88: POPCNT Gv,Ev (es) | POPCNT Gv,Ev (66),(es) 8f: POP2 Bq,Rq (000),(11B),(ev) a5: SHLD Ev,Gv,CL (es) | SHLD Ev,Gv,CL (66),(es)
Greg Kroah-Hartman
maintainerPATCH 124/311 x86/mm: Fix _pgd_alloc() for Xen PV mode
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juergen Gross <[email protected]>
commit 4ce385f56434f3810ef103e1baea357ddcc6667e upstream.
Recently _pgd_alloc() was switched from using __get_free_pages() to pagetable_alloc_noprof(), which might return a compound page in case the allocation order is larger than 0.
On x86 this will be the case if CONFIG_MITIGATION_PAGE_TABLE_ISOLATION is set, even if PTI has been disabled at runtime.
When running as a Xen PV guest (this will always disable PTI), using a compound page for a PGD will result in VM_BUG_ON_PGFLAGS being triggered when the Xen code tries to pin the PGD.
Fix the Xen issue together with the not needed 8k allocation for a PGD with PTI disabled by replacing PGD_ALLOCATION_ORDER with an inline helper returning the needed order for PGD allocations.
--- arch/x86/include/asm/pgalloc.h | 19 +++++++++++-------- arch/x86/kernel/machine_kexec_32.c | 4 ++-- arch/x86/mm/pgtable.c | 4 ++-- arch/x86/platform/efi/efi_64.c | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-)
arch/x86/include/asm/pgalloc.h +11 -8
@@ -6,6 +6,8 @@#include <linux/mm.h> /* for struct page */ #include <linux/pagemap.h> +#include <asm/cpufeature.h> +#define __HAVE_ARCH_PTE_ALLOC_ONE#define __HAVE_ARCH_PGD_FREE#include <asm-generic/pgalloc.h>
@@ -34,16 +36,17 @@ static inline void paravirt_release_p4d(*/ extern gfp_t __userpte_alloc_gfp; -#ifdef CONFIG_MITIGATION_PAGE_TABLE_ISOLATION /* -* Instead of one PGD, we acquire two PGDs. Being order-1, it is -* both 8k in size and 8k-aligned. That lets us just flip bit 12 -* in a pointer to swap between the two 4k halves. +* In case of Page Table Isolation active, we acquire two PGDs instead of one. +* Being order-1, it is both 8k in size and 8k-aligned. That lets us just +* flip bit 12 in a pointer to swap between the two 4k halves. */ -#define PGD_ALLOCATION_ORDER 1 -#else -#define PGD_ALLOCATION_ORDER 0 -#endif +static inline unsigned int pgd_allocation_order (void ) +{ +if (cpu_feature_enabled (X86_FEATURE_PTI )) +return 1 ; +return 0 ; +}/* * Allocate and free page tables.
arch/x86/kernel/machine_kexec_32.c +2 -2
@@ -42,7 +42,7 @@ static void load_segments(void)static void machine_kexec_free_page_tables (struct kimage *image) { -free_pages ((unsigned long )image->arch.pgd,PGD_ALLOCATION_ORDER ); +free_pages ((unsigned long )image->arch.pgd,pgd_allocation_order ()); image->arch.pgd =NULL ;#ifdef CONFIG_X86_PAE free_page ((unsigned long )image->arch.pmd0);
@@ -59,7 +59,7 @@ static void machine_kexec_free_page_tablstatic int machine_kexec_alloc_page_tables (struct kimage *image) { image->arch.pgd = (pgd_t *)__get_free_pages (GFP_KERNEL | __GFP_ZERO, -PGD_ALLOCATION_ORDER ); +pgd_allocation_order ());#ifdef CONFIG_X86_PAE image->arch.pmd0 = (pmd_t *)get_zeroed_page (GFP_KERNEL ); image->arch.pmd1 = (pmd_t *)get_zeroed_page (GFP_KERNEL );
arch/x86/mm/pgtable.c +2 -2
@@ -404,7 +404,7 @@ static inline pgd_t *_pgd_alloc(struct m* We allocate one page for pgd. */ if (!SHARED_KERNEL_PMD ) -return __pgd_alloc (mm,PGD_ALLOCATION_ORDER ); +return __pgd_alloc (mm,pgd_allocation_order ());/* * Now PAE kernel is not running as a Xen domain. We can allocate
@@ -424,7 +424,7 @@ static inline void _pgd_free(struct mm_sstatic inline pgd_t *_pgd_alloc (struct mm_struct *mm) { -return __pgd_alloc (mm,PGD_ALLOCATION_ORDER ); +return __pgd_alloc (mm,pgd_allocation_order ()); }static inline void _pgd_free (struct mm_struct *mm,pgd_t *pgd)
arch/x86/platform/efi/efi_64.c +2 -2
@@ -73,7 +73,7 @@ int __init efi_alloc_page_tables(void)gfp_t gfp_mask; gfp_mask =GFP_KERNEL | __GFP_ZERO; - efi_pgd = (pgd_t *)__get_free_pages (gfp_mask,PGD_ALLOCATION_ORDER ); + efi_pgd = (pgd_t *)__get_free_pages (gfp_mask,pgd_allocation_order ());if (!efi_pgd) goto fail;
@@ -96,7 +96,7 @@ free_p4d:if (pgtable_l5_enabled ())free_page ((unsigned long )pgd_page_vaddr (*pgd)); free_pgd: -free_pages ((unsigned long )efi_pgd,PGD_ALLOCATION_ORDER ); +free_pages ((unsigned long )efi_pgd,pgd_allocation_order ()); fail:return -ENOMEM ; }
Greg Kroah-Hartman
maintainerPATCH 125/311 selftests/pcie_bwctrl: Fix test progs list
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
commit 39e703ed3b48c4262be141072d4f42a8b89a10cc upstream.
Commit df6f8c4d72ae ("selftests/pcie_bwctrl: Add 'set_pcie_speed.sh' to TEST_PROGS") added set_pcie_speed.sh into TEST_PROGS but that script is a helper that is only being called by set_pcie_cooling_state.sh, not a test case itself. When set_pcie_speed.sh is in TEST_PROGS, selftest harness will execute also it leading to bwctrl selftest errors:
# selftests: pcie_bwctrl: set_pcie_speed.sh
# cat: /cur_state: No such file or directory
not ok 2 selftests: pcie_bwctrl: set_pcie_speed.sh # exit=1
Place set_pcie_speed.sh into TEST_FILES instead to have it included into installed test files but not execute it from the test harness.
--- tools/testing/selftests/pcie_bwctrl/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/pcie_bwctrl/Makefile +2 -1
@@ -1,2 +1,3 @@ -TEST_PROGS = set_pcie_cooling_state.sh set_pcie_speed.sh +TEST_PROGS = set_pcie_cooling_state.sh +TEST_FILES = set_pcie_speed.sh include ../lib.mk
Greg Kroah-Hartman
maintainerPATCH 126/311 irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suzuki K Poulose <[email protected]>
commit 3318dc299b072a0511d6dfd8367f3304fb6d9827 upstream.
With ACPI in place, gicv2m_get_fwnode() is registered with the pci subsystem as pci_msi_get_fwnode_cb(), which may get invoked at runtime during a PCI host bridge probe. But, the call back is wrongly marked as __init, causing it to be freed, while being registered with the PCI subsystem and could trigger:
Unable to handle kernel paging request at virtual address ffff8000816c0400 gicv2m_get_fwnode+0x0/0x58 (P) pci_set_bus_msi_domain+0x74/0x88 pci_register_host_bridge+0x194/0x548
This is easily reproducible on a Juno board with ACPI boot.
Retain the function for later use.
--- drivers/irqchip/irq-gic-v2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic-v2m.c +1 -1
@@ -423,7 +423,7 @@ static int __init gicv2m_of_init(struct#ifdef CONFIG_ACPI static int acpi_num_msi; -static __init struct fwnode_handle *gicv2m_get_fwnode (struct device *dev) +static struct fwnode_handle *gicv2m_get_fwnode (struct device *dev) {struct v2m_data *data;
Greg Kroah-Hartman
maintainerPATCH 127/311 binder: fix offset calculation in debug log
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
commit 170d1a3738908eef6a0dbf378ea77fb4ae8e294d upstream.
The vma start address should be substracted from the buffer's user data address and not the other way around.
--- drivers/android/binder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/android/binder.c +1 -1
@@ -6373,7 +6373,7 @@ static void print_binder_transaction_iloseq_printf (m," node %d" , buffer->target_node->debug_id);seq_printf (m," size %zd:%zd offset %lx\n" , buffer->data_size, buffer->offsets_size, - proc->alloc.vm_start - buffer->user_data); + buffer->user_data - proc->alloc.vm_start); } static void print_binder_work_ilocked(struct seq_file *m,
Greg Kroah-Hartman
maintainerPATCH 128/311 LoongArch: Handle fp, lsx, lasx and lbt assembly symbols
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiezhu Yang <[email protected]>
commit 2ef174b13344b3b4554d3d28e6f9e2a2c1d3138f upstream.
Like the other relevant symbols, export some fp, lsx, lasx and lbt assembly symbols and put the function declarations in header files rather than source files.
While at it, use "asmlinkage" for the other existing C prototypes of assembly functions and also do not use the "extern" keyword with function declarations according to the document coding-style.rst.
--- arch/loongarch/include/asm/fpu.h | 37 ++++++++++++++++++++++--------------- arch/loongarch/include/asm/lbt.h | 10 +++++++--- arch/loongarch/kernel/fpu.S | 6 ++++++ arch/loongarch/kernel/lbt.S | 4 ++++ arch/loongarch/kernel/signal.c | 21 --------------------- 5 files changed, 39 insertions(+), 39 deletions(-)
arch/loongarch/include/asm/fpu.h +22 -15
@@ -22,22 +22,29 @@struct sigcontext ;#define kernel_fpu_available () cpu_has_fpu -extern void kernel_fpu_begin (void ); -extern void kernel_fpu_end (void ); -extern void _init_fpu (unsigned int ); -extern void _save_fp (struct loongarch_fpu *); -extern void _restore_fp (struct loongarch_fpu *); - -extern void _save_lsx (struct loongarch_fpu *fpu); -extern void _restore_lsx (struct loongarch_fpu *fpu); -extern void _init_lsx_upper (void ); -extern void _restore_lsx_upper (struct loongarch_fpu *fpu); - -extern void _save_lasx (struct loongarch_fpu *fpu); -extern void _restore_lasx (struct loongarch_fpu *fpu); -extern void _init_lasx_upper (void ); -extern void _restore_lasx_upper (struct loongarch_fpu *fpu); +void kernel_fpu_begin (void ); +void kernel_fpu_end (void ); + +asmlinkage void _init_fpu(unsigned int); +asmlinkage void _save_fp(struct loongarch_fpu *); +asmlinkage void _restore_fp(struct loongarch_fpu *); +asmlinkage int _save_fp_context(void __user *fpregs, void __user *fcc, void __user *csr); +asmlinkage int _restore_fp_context(void __user *fpregs, void __user *fcc, void __user *csr); + +asmlinkage void _save_lsx(struct loongarch_fpu *fpu); +asmlinkage void _restore_lsx(struct loongarch_fpu *fpu); +asmlinkage void _init_lsx_upper(void); +asmlinkage void _restore_lsx_upper(struct loongarch_fpu *fpu); +asmlinkage int _save_lsx_context(void __user *fpregs, void __user *fcc, void __user *fcsr); +asmlinkage int _restore_lsx_context(void __user *fpregs, void __user *fcc, void __user *fcsr); + +asmlinkage void _save_lasx(struct loongarch_fpu *fpu); +asmlinkage void _restore_lasx(struct loongarch_fpu *fpu); +asmlinkage void _init_lasx_upper(void); +asmlinkage void _restore_lasx_upper(struct loongarch_fpu *fpu); +asmlinkage int _save_lasx_context(void __user *fpregs, void __user *fcc, void __user *fcsr); +asmlinkage int _restore_lasx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);static inline void enable_lsx (void );static inline void disable_lsx (void );
arch/loongarch/include/asm/lbt.h +7 -3
@@ -12,9 +12,13 @@#include <asm/loongarch.h> #include <asm/processor.h> -extern void _init_lbt (void ); -extern void _save_lbt (struct loongarch_lbt *); -extern void _restore_lbt (struct loongarch_lbt *); +asmlinkage void _init_lbt(void); +asmlinkage void _save_lbt(struct loongarch_lbt *); +asmlinkage void _restore_lbt(struct loongarch_lbt *); +asmlinkage int _save_lbt_context(void __user *regs, void __user *eflags); +asmlinkage int _restore_lbt_context(void __user *regs, void __user *eflags); +asmlinkage int _save_ftop_context(void __user *ftop); +asmlinkage int _restore_ftop_context(void __user *ftop);static inline int is_lbt_enabled (void ) {
arch/loongarch/kernel/fpu.S +6 -0
@@ -458,6 +458,7 @@ SYM_FUNC_START(_save_fp_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_save_fp_context) +EXPORT_SYMBOL_GPL(_save_fp_context) /* * a0: fpregs
@@ -471,6 +472,7 @@ SYM_FUNC_START(_restore_fp_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_restore_fp_context) +EXPORT_SYMBOL_GPL(_restore_fp_context) /* * a0: fpregs
@@ -484,6 +486,7 @@ SYM_FUNC_START(_save_lsx_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_save_lsx_context) +EXPORT_SYMBOL_GPL(_save_lsx_context) /* * a0: fpregs
@@ -497,6 +500,7 @@ SYM_FUNC_START(_restore_lsx_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_restore_lsx_context) +EXPORT_SYMBOL_GPL(_restore_lsx_context) /* * a0: fpregs
@@ -510,6 +514,7 @@ SYM_FUNC_START(_save_lasx_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_save_lasx_context) +EXPORT_SYMBOL_GPL(_save_lasx_context) /* * a0: fpregs
@@ -523,6 +528,7 @@ SYM_FUNC_START(_restore_lasx_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_restore_lasx_context) +EXPORT_SYMBOL_GPL(_restore_lasx_context) .L_fpu_fault: li.w a0, -EFAULT # failure
arch/loongarch/kernel/lbt.S +4 -0
@@ -90,6 +90,7 @@ SYM_FUNC_START(_save_lbt_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_save_lbt_context) +EXPORT_SYMBOL_GPL(_save_lbt_context) /* * a0: scr
@@ -110,6 +111,7 @@ SYM_FUNC_START(_restore_lbt_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_restore_lbt_context) +EXPORT_SYMBOL_GPL(_restore_lbt_context) /* * a0: ftop
@@ -120,6 +122,7 @@ SYM_FUNC_START(_save_ftop_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_save_ftop_context) +EXPORT_SYMBOL_GPL(_save_ftop_context) /* * a0: ftop
@@ -150,6 +153,7 @@ SYM_FUNC_START(_restore_ftop_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_restore_ftop_context) +EXPORT_SYMBOL_GPL(_restore_ftop_context) .L_lbt_fault: li.w a0, -EFAULT # failure
arch/loongarch/kernel/signal.c +0 -21
@@ -51,27 +51,6 @@#define lock_lbt_owner () ({ preempt_disable(); pagefault_disable(); })#define unlock_lbt_owner () ({ pagefault_enable(); preempt_enable(); }) -/* Assembly functions to move context to/from the FPU */ -extern asmlinkage int -_save_fp_context (void __user *fpregs,void __user *fcc,void __user *csr); -extern asmlinkage int -_restore_fp_context (void __user *fpregs,void __user *fcc,void __user *csr); -extern asmlinkage int -_save_lsx_context (void __user *fpregs,void __user *fcc,void __user *fcsr); -extern asmlinkage int -_restore_lsx_context (void __user *fpregs,void __user *fcc,void __user *fcsr); -extern asmlinkage int -_save_lasx_context (void __user *fpregs,void __user *fcc,void __user *fcsr); -extern asmlinkage int -_restore_lasx_context (void __user *fpregs,void __user *fcc,void __user *fcsr); - -#ifdef CONFIG_CPU_HAS_LBT -extern asmlinkage int _save_lbt_context(void __user *regs, void __user *eflags); -extern asmlinkage int _restore_lbt_context(void __user *regs, void __user *eflags); -extern asmlinkage int _save_ftop_context(void __user *ftop); -extern asmlinkage int _restore_ftop_context(void __user *ftop); -#endif -struct rt_sigframe {struct siginfo rs_info;struct ucontext rs_uctx;
Greg Kroah-Hartman
maintainerPATCH 129/311 LoongArch: Return NULL from huge_pte_offset() for invalid PMD
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Wang <[email protected]>
commit bd51834d1cf65a2c801295d230c220aeebf87a73 upstream.
LoongArch's huge_pte_offset() currently returns a pointer to a PMD slot even if the underlying entry points to invalid_pte_table (indicating no mapping). Callers like smaps_hugetlb_range() fetch this invalid entry value (the address of invalid_pte_table) via this pointer.
The generic is_swap_pte() check then incorrectly identifies this address as a swap entry on LoongArch, because it satisfies the "!pte_present() && !pte_none()" conditions. This misinterpretation, combined with a coincidental match by is_migration_entry() on the address bits, leads to kernel crashes in pfn_swap_entry_to_page().
Fix this at the architecture level by modifying huge_pte_offset() to check the PMD entry's content using pmd_none() before returning. If the entry is invalid (i.e., it points to invalid_pte_table), return NULL instead of the pointer to the slot.
--- arch/loongarch/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/loongarch/mm/hugetlbpage.c +1 -1
@@ -47,7 +47,7 @@ pte_t *huge_pte_offset(struct mm_struct pmd =pmd_offset (pud, addr); } } -return (pte_t *) pmd; +return pmd_none (pmdp_get (pmd)) ?NULL : (pte_t *) pmd; }uint64_t pmd_to_entrylo (unsigned long pmd_val)
Greg Kroah-Hartman
maintainerPATCH 130/311 LoongArch: Remove a bogus reference to ZONE_DMA
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Tesarik <[email protected]>
commit c37325cbd91abe3bfab280b3b09947155abe8e07 upstream.
Remove dead code. LoongArch does not have a DMA memory zone (24bit DMA). The architecture does not even define MAX_DMA_PFN.
--- arch/loongarch/mm/init.c | 3 --- 1 file changed, 3 deletions(-)
arch/loongarch/mm/init.c +0 -3
@@ -65,9 +65,6 @@ void __init paging_init(void) {unsigned long max_zone_pfns[MAX_NR_ZONES ]; -#ifdef CONFIG_ZONE_DMA - max_zone_pfns[ZONE_DMA ] =MAX_DMA_PFN ; -#endif #ifdef CONFIG_ZONE_DMA32 max_zone_pfns[ZONE_DMA32 ] =MAX_DMA32_PFN ;#endif
Greg Kroah-Hartman
maintainerPATCH 131/311 LoongArch: KVM: Fix multiple typos of KVM code
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yulong Han <[email protected]>
commit 8b2d01fec800081dd68271c01e4d239ef4d7115e upstream.
Fix multiple typos inside arch/loongarch/kvm.
--- arch/loongarch/kvm/intc/ipi.c | 4 ++-- arch/loongarch/kvm/main.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/loongarch/kvm/intc/ipi.c +2 -2
@@ -111,7 +111,7 @@ static int send_ipi_data(struct kvm_vcpu ret =kvm_io_bus_read (vcpu,KVM_IOCSR_BUS , addr,sizeof (val), &val);srcu_read_unlock (&vcpu->kvm->srcu, idx);if (unlikely (ret)) { -kvm_err ("%s: : read date from addr %llx failed\n" , __func__, addr); +kvm_err ("%s: : read data from addr %llx failed\n" , __func__, addr);return ret; }/* Construct the mask by scanning the bit 27-30 */
@@ -127,7 +127,7 @@ static int send_ipi_data(struct kvm_vcpu ret =kvm_io_bus_write (vcpu,KVM_IOCSR_BUS , addr,sizeof (val), &val);srcu_read_unlock (&vcpu->kvm->srcu, idx);if (unlikely (ret)) -kvm_err ("%s: : write date to addr %llx failed\n" , __func__, addr); +kvm_err ("%s: : write data to addr %llx failed\n" , __func__, addr);return ret; }
arch/loongarch/kvm/main.c +2 -2
@@ -296,10 +296,10 @@ int kvm_arch_enable_virtualization_cpu(v/* * Enable virtualization features granting guest direct control of * certain features: -* GCI=2: Trap on init or unimplement cache instruction. +* GCI=2: Trap on init or unimplemented cache instruction. * TORU=0: Trap on Root Unimplement. * CACTRL=1: Root control cache. -* TOP=0: Trap on Previlege. +* TOP=0: Trap on Privilege. * TOE=0: Trap on Exception. * TIT=0: Trap on Timer. */
Greg Kroah-Hartman
maintainerPATCH 132/311 LoongArch: KVM: Fully clear some CSRs when VM reboot
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bibo Mao <[email protected]>
commit 9ea86232a5520d9d21832d06031ea80f055a6ff8 upstream.
Some registers such as LOONGARCH_CSR_ESTAT and LOONGARCH_CSR_GINTC are partly cleared with function _kvm_setcsr(). This comes from the hardware specification, some bits are read only in VM mode, and however they can be written in host mode. So they are partly cleared in VM mode, and can be fully cleared in host mode.
These read only bits show pending interrupt or exception status. When VM reset, the read-only bits should be cleared, otherwise vCPU will receive unknown interrupts in boot stage.
Here registers LOONGARCH_CSR_ESTAT/LOONGARCH_CSR_GINTC are fully cleared in ioctl KVM_REG_LOONGARCH_VCPU_RESET vCPU reset path.
--- arch/loongarch/kvm/vcpu.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/loongarch/kvm/vcpu.c +7 -0
@@ -874,6 +874,13 @@ static int kvm_set_one_reg(struct kvm_vc vcpu->arch.st.guest_addr =0 ;memset (&vcpu->arch.irq_pending,0 ,sizeof (vcpu->arch.irq_pending));memset (&vcpu->arch.irq_clear,0 ,sizeof (vcpu->arch.irq_clear)); + +/* +* When vCPU reset, clear the ESTAT and GINTC registers +* Other CSR registers are cleared with function _kvm_setcsr(). +*/ +kvm_write_sw_gcsr (vcpu->arch.csr,LOONGARCH_CSR_GINTC ,0 ); +kvm_write_sw_gcsr (vcpu->arch.csr,LOONGARCH_CSR_ESTAT ,0 );break ;default : ret = -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 133/311 LoongArch: KVM: Fix PMU pass-through issue if VM exits to host finally
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bibo Mao <[email protected]>
commit 5add0dbbebd60628b55e5eb8426612dedab7311a upstream.
In function kvm_pre_enter_guest(), it prepares to enter guest and check whether there are pending signals or events. And it will not enter guest if there are, PMU pass-through preparation for guest should be cancelled and host should own PMU hardware.
--- arch/loongarch/kvm/vcpu.c | 1 + 1 file changed, 1 insertion(+)
arch/loongarch/kvm/vcpu.c +1 -0
@@ -294,6 +294,7 @@ static int kvm_pre_enter_guest(struct kv vcpu->arch.aux_inuse &= ~KVM_LARCH_SWCSR_LATEST ;if (kvm_request_pending (vcpu) ||xfer_to_guest_mode_work_pending ()) { +kvm_lose_pmu (vcpu);/* make sure the vcpu mode has been written */ smp_store_mb (vcpu->mode,OUTSIDE_GUEST_MODE );local_irq_enable ();
Greg Kroah-Hartman
maintainerPATCH 134/311 io_uring: fix sync handling of io_fallback_tw()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit edd43f4d6f50ec3de55a0c9e9df6348d1da51965 upstream.
A previous commit added a 'sync' parameter to io_fallback_tw(), which if true, means the caller wants to wait on the fallback thread handling it. But the logic is somewhat messed up, ensure that ctxs are swapped and flushed appropriately.
--- io_uring/io_uring.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
io_uring/io_uring.c +7 -6
@@ -1080,21 +1080,22 @@ static __cold void __io_fallback_tw(struwhile (node) { req = container_of(node, struct io_kiocb, io_task_work.node); node = node->next; -if (sync && last_ctx != req->ctx) { +if (last_ctx != req->ctx) {if (last_ctx) { -flush_delayed_work (&last_ctx->fallback_work); +if (sync) +flush_delayed_work (&last_ctx->fallback_work);percpu_ref_put (&last_ctx->refs); } last_ctx = req->ctx;percpu_ref_get (&last_ctx->refs); } -if (llist_add (&req->io_task_work.node, - &req->ctx->fallback_llist)) -schedule_delayed_work (&req->ctx->fallback_work,1 ); +if (llist_add (&req->io_task_work.node, &last_ctx->fallback_llist)) +schedule_delayed_work (&last_ctx->fallback_work,1 ); }if (last_ctx) { -flush_delayed_work (&last_ctx->fallback_work); +if (sync) +flush_delayed_work (&last_ctx->fallback_work);percpu_ref_put (&last_ctx->refs); } }
Greg Kroah-Hartman
maintainerPATCH 135/311 KVM: SVM: Allocate IR data using atomic allocation
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
commit 7537deda36521fa8fff9133b39c46e31893606f2 upstream.
Allocate SVM's interrupt remapping metadata using GFP_ATOMIC as svm_ir_list_add() is called with IRQs are disabled and irqfs.lock held when kvm_irq_routing_update() reacts to GSI routing changes.
Message-ID: <[email protected]>
--- arch/x86/kvm/svm/avic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/avic.c +1 -1
@@ -820,7 +820,7 @@ static int svm_ir_list_add(struct vcpu_s* Allocating new amd_iommu_pi_data, which will get * add to the per-vcpu ir_list. */ - ir =kzalloc (sizeof (struct amd_svm_iommu_ir ),GFP_KERNEL_ACCOUNT ); + ir =kzalloc (sizeof (struct amd_svm_iommu_ir ),GFP_ATOMIC | __GFP_ACCOUNT);if (!ir) { ret = -ENOMEM ; goto out;
Greg Kroah-Hartman
maintainerPATCH 136/311 cxl/core/regs.c: Skip Memory Space Enable check for RCD and RCH Ports
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Smita Koralahalli <[email protected]>
commit 078d3ee7c162cd66d76171579c02d7890bd77daf upstream.
According to CXL r3.2 section 8.2.1.2, the PCI_COMMAND register fields, including Memory Space Enable bit, have no effect on the behavior of an RCD Upstream Port. Retaining this check may incorrectly cause cxl_pci_probe() to fail on a valid RCD upstream Port.
While the specification is explicit only for RCD Upstream Ports, this check is solely for accessing the RCRB, which is always mapped through memory space. Therefore, its safe to remove the check entirely. In practice, firmware reliably enables the Memory Space Enable bit for RCH Downstream Ports and no failures have been observed.
Removing the check simplifies the code and avoids unnecessary special-casing, while relying on BIOS/firmware to configure devices correctly. Moreover, any failures due to inaccessible RCRB regions will still be caught either in __rcrb_to_component() or while parsing the component register block.
The following failure was observed in dmesg when the check was present:
cxl_pci 0000:7f:00.0: No component registers (-6)
--- drivers/cxl/core/regs.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/cxl/core/regs.c +0 -4
@@ -581,7 +581,6 @@ resource_size_t __rcrb_to_component(struresource_size_t rcrb = ri->base;void __iomem *addr;u32 bar0, bar1; -u16 cmd;u32 id;if (which ==CXL_RCRB_UPSTREAM )
@@ -603,7 +602,6 @@ resource_size_t __rcrb_to_component(stru } id =readl (addr +PCI_VENDOR_ID ); - cmd =readw (addr +PCI_COMMAND ); bar0 =readl (addr +PCI_BASE_ADDRESS_0 ); bar1 =readl (addr +PCI_BASE_ADDRESS_1 );iounmap (addr);
@@ -618,8 +616,6 @@ resource_size_t __rcrb_to_component(strudev_err (dev,"Failed to access Downstream Port RCRB\n" );return CXL_RESOURCE_NONE ; } -if (!(cmd &PCI_COMMAND_MEMORY )) -return CXL_RESOURCE_NONE ;/* The RCRB is a Memory Window, and the MEM_TYPE_1M bit is obsolete */ if (bar0 & (PCI_BASE_ADDRESS_MEM_TYPE_1M |PCI_BASE_ADDRESS_SPACE_IO ))return CXL_RESOURCE_NONE ;
Greg Kroah-Hartman
maintainerPATCH 137/311 mcb: fix a double free bug in chameleon_parse_gdd()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
commit 7c7f1bfdb2249f854a736d9b79778c7e5a29a150 upstream.
In chameleon_parse_gdd(), if mcb_device_register() fails, 'mdev' would be released in mcb_device_register() via put_device(). Thus, goto 'err' label and free 'mdev' again causes a double free. Just return if mcb_device_register() fails.
--- drivers/mcb/mcb-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mcb/mcb-parse.c +1 -1
@@ -96,7 +96,7 @@ static int chameleon_parse_gdd(struct mc ret =mcb_device_register (bus, mdev);if (ret <0 ) - goto err; +return ret;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 138/311 ata: libata-scsi: Improve CDL control
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 17e897a456752ec9c2d7afb3d9baf268b442451b upstream.
With ATA devices supporting the CDL feature, using CDL requires that the feature be enabled with a SET FEATURES command. This command is issued as the translated command for the MODE SELECT command issued by scsi_cdl_enable() when the user enables CDL through the device cdl_enable sysfs attribute.
Currently, ata_mselect_control_ata_feature() always translates a MODE SELECT command for the ATA features subpage of the control mode page to a SET FEATURES command to enable or disable CDL based on the cdl_ctrl field. However, there is no need to issue the SET FEATURES command if:
1) The MODE SELECT command requests disabling CDL and CDL is already disabled.
2) The MODE SELECT command requests enabling CDL and CDL is already enabled.
Fix ata_mselect_control_ata_feature() to issue the SET FEATURES command only when necessary. Since enabling CDL also implies a reset of the CDL statistics log page, avoiding useless CDL enable operations also avoids clearing the CDL statistics log.
Also add debug messages to clearly signal when CDL is being enabled or disabled using a SET FEATURES command.
--- drivers/ata/libata-scsi.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/ata/libata-scsi.c +12 -2
@@ -3909,17 +3909,27 @@ static unsigned int ata_mselect_control_/* Check cdl_ctrl */ switch (buf[0 ] &0x03 ) {case 0 : -/* Disable CDL */ +/* Disable CDL if it is enabled */ +if (!(dev->flags &ATA_DFLAG_CDL_ENABLED )) +return 0 ; +ata_dev_dbg (dev,"Disabling CDL\n" ); cdl_action =0 ; dev->flags &= ~ATA_DFLAG_CDL_ENABLED ;break ;case 0x02 : -/* Enable CDL T2A/T2B: NCQ priority must be disabled */ +/* +* Enable CDL if not already enabled. Since this is mutually +* exclusive with NCQ priority, allow this only if NCQ priority +* is disabled. +*/ +if (dev->flags &ATA_DFLAG_CDL_ENABLED ) +return 0 ;if (dev->flags &ATA_DFLAG_NCQ_PRIO_ENABLED ) {ata_dev_err (dev,"NCQ priority must be disabled to enable CDL\n" );return -EINVAL ; } +ata_dev_dbg (dev,"Enabling CDL\n" ); cdl_action =1 ; dev->flags |=ATA_DFLAG_CDL_ENABLED ;break ;
Greg Kroah-Hartman
maintainerPATCH 139/311 ata: libata-scsi: Fix ata_mselect_control_ata_feature() return type
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit db91586b1e8f36122a9e5b8fbced11741488dd22 upstream.
The function ata_mselect_control_ata_feature() has a return type defined as unsigned int but this function may return negative error codes, which are correctly propagated up the call chain as integers.
Fix ata_mselect_control_ata_feature() to have the correct int return type.
While at it, also fix a typo in this function description comment.
--- drivers/ata/libata-scsi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/ata/libata-scsi.c +3 -4
@@ -3886,12 +3886,11 @@ static int ata_mselect_control_spg0(stru }/* -* Translate MODE SELECT control mode page, sub-pages f2h (ATA feature mode +* Translate MODE SELECT control mode page, sub-page f2h (ATA feature mode * page) into a SET FEATURES command. */ -static unsigned int ata_mselect_control_ata_feature (struct ata_queued_cmd *qc, -const u8 *buf,int len, -u16 *fp) +static int ata_mselect_control_ata_feature (struct ata_queued_cmd *qc, +const u8 *buf,int len,u16 *fp) {struct ata_device *dev = qc->dev;struct ata_taskfile *tf = &qc->tf;
Greg Kroah-Hartman
maintainerPATCH 140/311 ata: libata-scsi: Fix ata_msense_control_ata_feature()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 88474ad734fb2000805c63e01cc53ea930adf2c7 upstream.
For the ATA features subpage of the control mode page, the T10 SAT-6 specifications state that:
For a MODE SENSE command, the SATL shall return the CDL_CTRL field value that was last set by an application client.
However, the function ata_msense_control_ata_feature() always sets the CDL_CTRL field to the 0x02 value to indicate support for the CDL T2A and T2B pages. This is thus incorrect and the value 0x02 must be reported only after the user enables the CDL feature, which is indicated with the ATA_DFLAG_CDL_ENABLED device flag. When this flag is not set, the CDL_CTRL field of the ATA feature subpage of the control mode page must report a value of 0x00.
Fix ata_msense_control_ata_feature() to report the correct values for the CDL_CTRL field, according to the enable/disable state of the device CDL feature.
--- drivers/ata/libata-scsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ata/libata-scsi.c +2 -2
@@ -2453,8 +2453,8 @@ static unsigned int ata_msense_control_a*/ put_unaligned_be16 (ATA_FEATURE_SUB_MPAGE_LEN -4 , &buf[2 ]); -if (dev->flags &ATA_DFLAG_CDL ) - buf[4 ] =0x02 ;/* Support T2A and T2B pages */ +if (dev->flags &ATA_DFLAG_CDL_ENABLED ) + buf[4 ] =0x02 ;/* T2A and T2B pages enabled */ else buf[4 ] =0 ;
Greg Kroah-Hartman
maintainerPATCH 141/311 USB: storage: quirk for ADATA Portable HDD CH94
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 9ab75eee1a056f896b87d139044dd103adc532b9 upstream.
Version 1.60 specifically needs this quirk.
Version 2.00 is known good.
--- drivers/usb/storage/unusual_uas.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_uas.h +7 -0
@@ -83,6 +83,13 @@ UNUSUAL_DEV(0x0bc2, 0x331a, 0x0000, 0x99 USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_REPORT_LUNS), +/* Reported-by: Oliver Neukum <[email protected]> */ +UNUSUAL_DEV (0x125f ,0xa94a ,0x0160 ,0x0160 , +"ADATA" , +"Portable HDD CH94" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_NO_ATA_1X ), +/* Reported-by: Benjamin Tissoires <[email protected]> */ UNUSUAL_DEV(0x13fd, 0x3940, 0x0000, 0x9999, "Initio Corporation",
Greg Kroah-Hartman
maintainerPATCH 142/311 scsi: Improve CDL control
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 14a3cc755825ef7b34c986aa2786ea815023e9c5 upstream.
With ATA devices supporting the CDL feature, using CDL requires that the feature be enabled with a SET FEATURES command. This command is issued as the translated command for the MODE SELECT command issued by scsi_cdl_enable() when the user enables CDL through the device cdl_enable sysfs attribute.
However, the implementation of scsi_cdl_enable() always issues a MODE SELECT command for ATA devices when the enable argument is true, even if CDL is already enabled on the device. While this does not cause any issue with using CDL descriptors with read/write commands (the CDL feature will be enabled on the drive), issuing the MODE SELECT command even when the device CDL feature is already enabled will cause a reset of the ATA device CDL statistics log page (as defined in ACS, any CDL enable action must reset the device statistics).
Avoid this needless actions (and the implied statistics log page reset) by modifying scsi_cdl_enable() to issue the MODE SELECT command to enable CDL if and only if CDL is not reported as already enabled on the device.
And while at it, simplify the initialization of the is_ata boolean variable and move the declaration of the scsi mode data and sense header variables to within the scope of ATA device handling.
--- drivers/scsi/scsi.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
drivers/scsi/scsi.c +24 -12
@@ -695,26 +695,23 @@ void scsi_cdl_check(struct scsi_device **/ int scsi_cdl_enable (struct scsi_device *sdev,bool enable) { -struct scsi_mode_data data; -struct scsi_sense_hdr sshdr; -struct scsi_vpd *vpd; -bool is_ata = false;char buf[64 ]; +bool is_ata;int ret;if (!sdev->cdl_supported)return -EOPNOTSUPP ;rcu_read_lock (); - vpd =rcu_dereference (sdev->vpd_pg89); -if (vpd) - is_ata = true; + is_ata =rcu_dereference (sdev->vpd_pg89);rcu_read_unlock ();/* * For ATA devices, CDL needs to be enabled with a SET FEATURES command. */ if (is_ata) { +struct scsi_mode_data data; +struct scsi_sense_hdr sshdr;char *buf_data;int len;
@@ -723,16 +720,30 @@ int scsi_cdl_enable(struct scsi_device *if (ret)return -EINVAL ; -/* Enable CDL using the ATA feature page */ +/* Enable or disable CDL using the ATA feature page */ len =min_t (size_t,sizeof (buf), data.length - data.header_length - data.block_descriptor_length); buf_data = buf + data.header_length + data.block_descriptor_length; -if (enable) - buf_data[4 ] =0x02 ; -else - buf_data[4 ] =0 ; + +/* +* If we want to enable CDL and CDL is already enabled on the +* device, do nothing. This avoids needlessly resetting the CDL +* statistics on the device as that is implied by the CDL enable +* action. Similar to this, there is no need to do anything if +* we want to disable CDL and CDL is already disabled. +*/ +if (enable) { +if ((buf_data[4 ] &0x03 ) ==0x02 ) + goto out; + buf_data[4 ] &= ~0x03 ; + buf_data[4 ] |=0x02 ; + }else { +if ((buf_data[4 ] &0x03 ) ==0x00 ) + goto out; + buf_data[4 ] &= ~0x03 ; + } ret =scsi_mode_select (sdev,1 ,0 , buf_data, len,5 *HZ ,3 , &data, &sshdr);
@@ -744,6 +755,7 @@ int scsi_cdl_enable(struct scsi_device * } } +out: sdev->cdl_enable = enable;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 143/311 mei: me: add panther lake H DID
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Usyskin <[email protected]>
commit 86ce5c0a1dec02e21b4c864b2bc0cc5880a2c13c upstream.
Add Panther Lake H device id.
--- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/pci-me.c | 1 + 2 files changed, 2 insertions(+)
drivers/misc/mei/hw-me-regs.h +1 -0
@@ -117,6 +117,7 @@#define MEI_DEV_ID_LNL_M 0xA870/* Lunar Lake Point M */ +#define MEI_DEV_ID_PTL_H 0xE370/* Panther Lake H */ #define MEI_DEV_ID_PTL_P 0xE470/* Panther Lake P */ /*
drivers/misc/mei/pci-me.c +1 -0
@@ -124,6 +124,7 @@ static const struct pci_device_id mei_me {MEI_PCI_DEVICE(MEI_DEV_ID_LNL_M, MEI_ME_PCH15_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_PTL_H, MEI_ME_PCH15_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_PTL_P, MEI_ME_PCH15_CFG)},/* required last entry */
Greg Kroah-Hartman
maintainerPATCH 144/311 mei: vsc: Fix fortify-panic caused by invalid counted_by() use
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit 00f1cc14da0f06d2897b8c528df7c7dcf1b8da50 upstream.
gcc 15 honors the __counted_by(len) attribute on vsc_tp_packet.buf[] and the vsc-tp.c code is using this in a wrong way. len does not contain the available size in the buffer, it contains the actual packet length *without* the crc. So as soon as vsc_tp_xfer() tries to add the crc to buf[] the fortify-panic handler gets triggered:
[ 80.842193] memcpy: detected buffer overflow: 4 byte write of buffer size 0 [ 80.842243] WARNING: CPU: 4 PID: 272 at lib/string_helpers.c:1032 __fortify_report+0x45/0x50 ... [ 80.843175] __fortify_panic+0x9/0xb [ 80.843186] vsc_tp_xfer.cold+0x67/0x67 [mei_vsc_hw] [ 80.843210] ? seqcount_lockdep_reader_access.constprop.0+0x82/0x90 [ 80.843229] ? lockdep_hardirqs_on+0x7c/0x110 [ 80.843250] mei_vsc_hw_start+0x98/0x120 [mei_vsc] [ 80.843270] mei_reset+0x11d/0x420 [mei]
The easiest fix would be to just drop the counted-by but with the exception of the ack buffer in vsc_tp_xfer_helper() which only contains enough room for the packet-header, all other uses of vsc_tp_packet always use a buffer of VSC_TP_MAX_XFER_SIZE bytes for the packet.
Instead of just dropping the counted-by, split the vsc_tp_packet struct definition into a header and a full-packet definition and use a fixed size buf[] in the packet definition, this way fortify-source buffer overrun checking still works when enabled.
--- drivers/misc/mei/vsc-tp.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
drivers/misc/mei/vsc-tp.c +15 -11
@@ -36,20 +36,24 @@#define VSC_TP_XFER_TIMEOUT_BYTES 700#define VSC_TP_PACKET_PADDING_SIZE 1#define VSC_TP_PACKET_SIZE (pkt) \ - (sizeof(struct vsc_tp_packet) + le16_to_cpu((pkt)->len) + VSC_TP_CRC_SIZE) + (sizeof(struct vsc_tp_packet_hdr) + le16_to_cpu((pkt)->hdr.len) + VSC_TP_CRC_SIZE)#define VSC_TP_MAX_PACKET_SIZE \ - (sizeof(struct vsc_tp_packet) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE) + (sizeof(struct vsc_tp_packet_hdr) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE)#define VSC_TP_MAX_XFER_SIZE \ (VSC_TP_MAX_PACKET_SIZE + VSC_TP_XFER_TIMEOUT_BYTES)#define VSC_TP_NEXT_XFER_LEN (len, offset) \ - (len + sizeof(struct vsc_tp_packet) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE) + (len + sizeof(struct vsc_tp_packet_hdr) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE) -struct vsc_tp_packet { +struct vsc_tp_packet_hdr {__u8 sync;__u8 cmd;__le16 len;__le32 seq; - __u8 buf[] __counted_by(len); +}; + +struct vsc_tp_packet { +struct vsc_tp_packet_hdr hdr; +__u8 buf[VSC_TP_MAX_XFER_SIZE -sizeof (struct vsc_tp_packet_hdr )]; };struct vsc_tp {
@@ -158,12 +162,12 @@ static int vsc_tp_dev_xfer(struct vsc_tpstatic int vsc_tp_xfer_helper (struct vsc_tp *tp,struct vsc_tp_packet *pkt,void *ibuf,u16 ilen) { -int ret, offset =0 , cpy_len, src_len, dst_len =sizeof (struct vsc_tp_packet ); +int ret, offset =0 , cpy_len, src_len, dst_len =sizeof (struct vsc_tp_packet_hdr );int next_xfer_len =VSC_TP_PACKET_SIZE (pkt) +VSC_TP_XFER_TIMEOUT_BYTES ;u8 *src, *crc_src, *rx_buf = tp->rx_buf;int count_down =VSC_TP_MAX_XFER_COUNT ;u32 recv_crc =0 , crc = ~0 ; -struct vsc_tp_packet ack; +struct vsc_tp_packet_hdr ack;u8 *dst = (u8 *)&ack;bool synced = false;
@@ -280,10 +284,10 @@ int vsc_tp_xfer(struct vsc_tp *tp, u8 cmguard (mutex)(&tp->mutex); - pkt->sync =VSC_TP_PACKET_SYNC ; - pkt->cmd = cmd; - pkt->len =cpu_to_le16 (olen); - pkt->seq =cpu_to_le32 (++tp->seq); + pkt->hdr.sync =VSC_TP_PACKET_SYNC ; + pkt->hdr.cmd = cmd; + pkt->hdr.len =cpu_to_le16 (olen); + pkt->hdr.seq =cpu_to_le32 (++tp->seq);memcpy (pkt->buf, obuf, olen); crc = ~crc32 (~0 , (u8 *)pkt,sizeof (pkt) + olen);
Greg Kroah-Hartman
maintainerPATCH 145/311 KVM: x86: Explicitly treat routing entry type changes as changes
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
commit bcda70c56f3e718465cab2aad260cf34183ce1ce upstream.
Explicitly treat type differences as GSI routing changes, as comparing MSI data between two entries could get a false negative, e.g. if userspace changed the type but left the type-specific data as-is.
Message-ID: <[email protected]>
--- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +2 -1
@@ -13611,7 +13611,8 @@ int kvm_arch_update_irqfd_routing(structbool kvm_arch_irqfd_route_changed (struct kvm_kernel_irq_routing_entry *old,struct kvm_kernel_irq_routing_entry *new) { -if (new->type !=KVM_IRQ_ROUTING_MSI ) +if (old->type !=KVM_IRQ_ROUTING_MSI || + new->type !=KVM_IRQ_ROUTING_MSI )return true;return !!memcmp (&old->msi, &new->msi,sizeof (new->msi));
Greg Kroah-Hartman
maintainerPATCH 146/311 KVM: x86: Reset IRTE to host control if *new* route isnt postable
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
commit 9bcac97dc42d2f4da8229d18feb0fe2b1ce523a2 upstream.
Restore an IRTE back to host control (remapped or posted MSI mode) if the *new* GSI route prevents posting the IRQ directly to a vCPU, regardless of the GSI routing type. Updating the IRTE if and only if the new GSI is an MSI results in KVM leaving an IRTE posting to a vCPU.
The dangling IRTE can result in interrupts being incorrectly delivered to the guest, and in the worst case scenario can result in use-after-free, e.g. if the VM is torn down, but the underlying host IRQ isn't freed.
Message-ID: <[email protected]>
--- arch/x86/kvm/svm/avic.c | 58 +++++++++++++++++++++-------------------- arch/x86/kvm/vmx/posted_intr.c | 28 +++++++------------ 2 files changed, 41 insertions(+), 45 deletions(-)
arch/x86/kvm/svm/avic.c +31 -27
@@ -896,6 +896,7 @@ int avic_pi_update_irte(struct kvm *kvm, {struct kvm_kernel_irq_routing_entry *e;struct kvm_irq_routing_table *irq_rt; +bool enable_remapped_mode = true;int idx, ret =0 ; if (!kvm_arch_has_assigned_device(kvm) ||
@@ -933,6 +934,8 @@ int avic_pi_update_irte(struct kvm *kvm, kvm_vcpu_apicv_active(&svm->vcpu)) {struct amd_iommu_pi_data pi; + enable_remapped_mode = false; +/* Try to enable guest_mode in IRTE */ pi.base =__sme_set (page_to_phys (svm->avic_backing_page) &AVIC_HPA_MASK );
@@ -951,33 +954,6 @@ int avic_pi_update_irte(struct kvm *kvm,*/ if (!ret && pi.is_guest_mode)svm_ir_list_add (svm, &pi); - }else { -/* Use legacy mode in IRTE */ -struct amd_iommu_pi_data pi; - -/** -* Here, pi is used to: -* - Tell IOMMU to use legacy mode for this interrupt. -* - Retrieve ga_tag of prior interrupt remapping data. -*/ - pi.prev_ga_tag =0 ; - pi.is_guest_mode = false; - ret =irq_set_vcpu_affinity (host_irq, &pi); - -/** -* Check if the posted interrupt was previously -* setup with the guest_mode by checking if the ga_tag -* was cached. If so, we need to clean up the per-vcpu -* ir_list. -*/ -if (!ret && pi.prev_ga_tag) { -int id =AVIC_GATAG_TO_VCPUID (pi.prev_ga_tag); -struct kvm_vcpu *vcpu; - - vcpu =kvm_get_vcpu_by_id (kvm, id); -if (vcpu) -svm_ir_list_del (to_svm (vcpu), &pi); - } }if (!ret && svm) {
@@ -993,6 +969,34 @@ int avic_pi_update_irte(struct kvm *kvm, } ret =0 ; +if (enable_remapped_mode) { +/* Use legacy mode in IRTE */ +struct amd_iommu_pi_data pi; + +/** +* Here, pi is used to: +* - Tell IOMMU to use legacy mode for this interrupt. +* - Retrieve ga_tag of prior interrupt remapping data. +*/ + pi.prev_ga_tag =0 ; + pi.is_guest_mode = false; + ret =irq_set_vcpu_affinity (host_irq, &pi); + +/** +* Check if the posted interrupt was previously +* setup with the guest_mode by checking if the ga_tag +* was cached. If so, we need to clean up the per-vcpu +* ir_list. +*/ +if (!ret && pi.prev_ga_tag) { +int id =AVIC_GATAG_TO_VCPUID (pi.prev_ga_tag); +struct kvm_vcpu *vcpu; + + vcpu =kvm_get_vcpu_by_id (kvm, id); +if (vcpu) +svm_ir_list_del (to_svm (vcpu), &pi); + } + } out:srcu_read_unlock (&kvm->irq_srcu, idx);return ret;
arch/x86/kvm/vmx/posted_intr.c +10 -18
@@ -274,6 +274,7 @@ int vmx_pi_update_irte(struct kvm *kvm, {struct kvm_kernel_irq_routing_entry *e;struct kvm_irq_routing_table *irq_rt; +bool enable_remapped_mode = true;struct kvm_lapic_irq irq;struct kvm_vcpu *vcpu;struct vcpu_data vcpu_info;
@@ -312,21 +313,8 @@ int vmx_pi_update_irte(struct kvm *kvm,kvm_set_msi_irq (kvm, e, &irq);if (!kvm_intr_is_single_vcpu (kvm, &irq, &vcpu) || - !kvm_irq_is_postable (&irq)) { -/* -* Make sure the IRTE is in remapped mode if -* we don't handle it in posted mode. -*/ - ret =irq_set_vcpu_affinity (host_irq,NULL ); -if (ret <0 ) { -printk (KERN_INFO -"failed to back to remapped mode, irq: %u\n" , - host_irq); - goto out; - } - + !kvm_irq_is_postable (&irq))continue ; - } vcpu_info.pi_desc_addr =__pa (vcpu_to_pi_desc (vcpu)); vcpu_info.vector = irq.vector;
@@ -334,11 +322,12 @@ int vmx_pi_update_irte(struct kvm *kvm,trace_kvm_pi_irte_update (host_irq, vcpu->vcpu_id, e->gsi, vcpu_info.vector, vcpu_info.pi_desc_addr, set); -if (set) - ret =irq_set_vcpu_affinity (host_irq, &vcpu_info); -else - ret =irq_set_vcpu_affinity (host_irq,NULL ); +if (!set) +continue ; + enable_remapped_mode = false; + + ret =irq_set_vcpu_affinity (host_irq, &vcpu_info);if (ret <0 ) {printk (KERN_INFO "%s: failed to update PI IRTE\n" , __func__);
@@ -346,6 +335,9 @@ int vmx_pi_update_irte(struct kvm *kvm, } } +if (enable_remapped_mode) + ret =irq_set_vcpu_affinity (host_irq,NULL ); + ret =0 ; out:srcu_read_unlock (&kvm->irq_srcu, idx);
Greg Kroah-Hartman
maintainerPATCH 147/311 KVM: x86: Take irqfds.lock when adding/deleting IRQ bypass producer
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
commit f1fb088d9cecde5c3066d8ff8846789667519b7d upstream.
Take irqfds.lock when adding/deleting an IRQ bypass producer to ensure irqfd->producer isn't modified while kvm_irq_routing_update() is running. The only lock held when a producer is added/removed is irqbypass's mutex.
Message-ID: <[email protected]>
--- arch/x86/kvm/x86.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +15 -2
@@ -13565,15 +13565,22 @@ int kvm_arch_irq_bypass_add_producer(str {struct kvm_kernel_irqfd *irqfd = container_of(cons, struct kvm_kernel_irqfd, consumer); +struct kvm *kvm = irqfd->kvm;int ret; - irqfd->producer = prod;kvm_arch_start_assignment (irqfd->kvm); + +spin_lock_irq (&kvm->irqfds.lock); + irqfd->producer = prod; + ret =kvm_x86_call (pi_update_irte)(irqfd->kvm, prod->irq, irqfd->gsi,1 );if (ret)kvm_arch_end_assignment (irqfd->kvm); +spin_unlock_irq (&kvm->irqfds.lock); + +return ret; }
@@ -13583,9 +13590,9 @@ void kvm_arch_irq_bypass_del_producer(stint ret;struct kvm_kernel_irqfd *irqfd = container_of(cons, struct kvm_kernel_irqfd, consumer); +struct kvm *kvm = irqfd->kvm;WARN_ON (irqfd->producer != prod); - irqfd->producer =NULL ;/* * When producer of consumer is unregistered, we change back to
@@ -13593,12 +13600,18 @@ void kvm_arch_irq_bypass_del_producer(st* when the irq is masked/disabled or the consumer side (KVM * int this case doesn't want to receive the interrupts. */ +spin_lock_irq (&kvm->irqfds.lock); + irqfd->producer =NULL ; + ret =kvm_x86_call (pi_update_irte)(irqfd->kvm, prod->irq, irqfd->gsi,0 );if (ret)printk (KERN_INFO "irq bypass consumer (token %p) unregistration" " fails: %d\n" , irqfd->consumer.token, ret); +spin_unlock_irq (&kvm->irqfds.lock); + +kvm_arch_end_assignment (irqfd->kvm); }
Greg Kroah-Hartman
maintainerPATCH 148/311 char: misc: register chrdev region with all possible minors
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thadeu Lima de Souza Cascardo <[email protected]>
commit c876be906ce7e518d9ef9926478669c151999e69 upstream.
register_chrdev will only register the first 256 minors of a major chrdev. That means that dynamically allocated misc devices with minor above 255 will fail to open with -ENXIO.
This was found by kernel test robot when testing a different change that makes all dynamically allocated minors be above 255. This has, however, been separately tested by creating 256 serio_raw devices with the help of userio driver.
Ever since allowing misc devices with minors above 128, this has been possible.
Fix it by registering all minor numbers from 0 to MINORMASK + 1 for MISC_MAJOR.
--- drivers/char/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/misc.c +1 -1
@@ -315,7 +315,7 @@ static int __init misc_init(void) goto fail_remove; err = -EIO ; -if (register_chrdev (MISC_MAJOR ,"misc" , &misc_fops)) +if (__register_chrdev (MISC_MAJOR ,0 ,MINORMASK +1 ,"misc" , &misc_fops)) goto fail_printk;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 149/311 misc: microchip: pci1xxxx: Fix Kernel panic during IRQ handler registration
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rengarajan S <[email protected]>
commit 18eb77c75ed01439f96ae5c0f33461eb5134b907 upstream.
Resolve kernel panic while accessing IRQ handler associated with the generated IRQ. This is done by acquiring the spinlock and storing the current interrupt state before handling the interrupt request using generic_handle_irq.
A previous fix patch was submitted where 'generic_handle_irq' was replaced with 'handle_nested_irq'. However, this change also causes the kernel panic where after determining which GPIO triggered the interrupt and attempting to call handle_nested_irq with the mapped IRQ number, leads to a failure in locating the registered handler.
--- drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c +5 -1
@@ -37,6 +37,7 @@struct pci1xxxx_gpio {struct auxiliary_device *aux_dev;void __iomem *reg_base; +raw_spinlock_t wa_lock;struct gpio_chip gpio;spinlock_t lock;int irq_base;
@@ -257,6 +258,7 @@ static irqreturn_t pci1xxxx_gpio_irq_hanstruct pci1xxxx_gpio *priv = dev_id;struct gpio_chip *gc = &priv->gpio;unsigned long int_status =0 ; +unsigned long wa_flags;unsigned long flags;u8 pincount;int bit;
@@ -280,7 +282,9 @@ static irqreturn_t pci1xxxx_gpio_irq_hanwritel (BIT (bit), priv->reg_base +INTR_STATUS_OFFSET (gpiobank));spin_unlock_irqrestore (&priv->lock, flags); irq =irq_find_mapping (gc->irq.domain, (bit + (gpiobank *32 ))); -handle_nested_irq (irq); +raw_spin_lock_irqsave (&priv->wa_lock, wa_flags); +generic_handle_irq (irq); +raw_spin_unlock_irqrestore (&priv->wa_lock, wa_flags); } }spin_lock_irqsave (&priv->lock, flags);
Greg Kroah-Hartman
maintainerPATCH 150/311 misc: microchip: pci1xxxx: Fix incorrect IRQ status handling during ack
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rengarajan S <[email protected]>
commit e9d7748a7468581859d2b85b378135f9688a0aff upstream.
Under irq_ack, pci1xxxx_assign_bit reads the current interrupt status, modifies and writes the entire value back. Since, the IRQ status bit gets cleared on writing back, the better approach is to directly write the bitmask to the register in order to preserve the value.
--- drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c +1 -1
@@ -168,7 +168,7 @@ static void pci1xxxx_gpio_irq_ack(structunsigned long flags;spin_lock_irqsave (&priv->lock, flags); -pci1xxx_assign_bit (priv->reg_base,INTR_STAT_OFFSET (gpio), (gpio %32 ), true); +writel (BIT (gpio %32 ), priv->reg_base +INTR_STAT_OFFSET (gpio));spin_unlock_irqrestore (&priv->lock, flags); }
Greg Kroah-Hartman
maintainerPATCH 151/311 firmware: stratix10-svc: Add of_platform_default_populate()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mahesh Rao <[email protected]>
commit 4d239f447f96bd2cb646f89431e9db186c1ccfd4 upstream.
Add of_platform_default_populate() to stratix10-svc driver as the firmware/svc node was moved out of soc. This fixes the failed probing of child drivers of svc node.
--- drivers/firmware/stratix10-svc.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/firmware/stratix10-svc.c +11 -3
@@ -1224,22 +1224,28 @@ static int stratix10_svc_drv_probe(strucif (!svc->intel_svc_fcs) {dev_err (dev,"failed to allocate %s device\n" ,INTEL_FCS ); ret = -ENOMEM ; - goto err_unregister_dev; + goto err_unregister_rsu_dev; } ret =platform_device_add (svc->intel_svc_fcs);if (ret) {platform_device_put (svc->intel_svc_fcs); - goto err_unregister_dev; + goto err_unregister_rsu_dev; } + ret =of_platform_default_populate (dev_of_node (dev),NULL , dev); +if (ret) + goto err_unregister_fcs_dev; +dev_set_drvdata (dev, svc);pr_info ("Intel Service Layer Driver Initialized\n" );return 0 ; -err_unregister_dev: +err_unregister_fcs_dev: +platform_device_unregister (svc->intel_svc_fcs); +err_unregister_rsu_dev:platform_device_unregister (svc->stratix10_svc_rsu); err_free_kfifo:kfifo_free (&controller->svc_fifo);
@@ -1253,6 +1259,8 @@ static void stratix10_svc_drv_remove(strstruct stratix10_svc *svc =dev_get_drvdata (&pdev->dev);struct stratix10_svc_controller *ctrl =platform_get_drvdata (pdev); +of_platform_depopulate (ctrl->dev); +platform_device_unregister (svc->intel_svc_fcs);platform_device_unregister (svc->stratix10_svc_rsu);
Greg Kroah-Hartman
maintainerPATCH 152/311 tty: Require CAP_SYS_ADMIN for all usages of TIOCL_SELMOUSEREPORT
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Günther Noack <[email protected]>
commit ee6a44da3c87cf64d67dd02be8c0127a5bf56175 upstream.
This requirement was overeagerly loosened in commit 2f83e38a095f ("tty: Permit some TIOCL_SETSEL modes without CAP_SYS_ADMIN"), but as it turns out,
(1) the logic I implemented there was inconsistent (apologies!),
(2) TIOCL_SELMOUSEREPORT might actually be a small security risk after all, and
(3) TIOCL_SELMOUSEREPORT is only meant to be used by the mouse daemon (GPM or Consolation), which runs as CAP_SYS_ADMIN already.
In more detail:
1. The previous patch has inconsistent logic:
In commit 2f83e38a095f ("tty: Permit some TIOCL_SETSEL modes without CAP_SYS_ADMIN"), we checked for sel_mode == TIOCL_SELMOUSEREPORT, but overlooked that the lower four bits of this "mode" parameter were actually used as an additional way to pass an argument. So the patch did actually still require CAP_SYS_ADMIN, if any of the mouse button bits are set, but did not require it if none of the mouse buttons bits are set.
This logic is inconsistent and was not intentional. We should have the same policies for using TIOCL_SELMOUSEREPORT independent of the value of the "hidden" mouse button argument.
I sent a separate documentation patch to the man page list with more details on TIOCL_SELMOUSEREPORT:
https://lore.kernel.org/all/[email protected]/
2. TIOCL_SELMOUSEREPORT is indeed a potential security risk which can let an attacker simulate "keyboard" input to command line applications on the same terminal, like TIOCSTI and some other TIOCLINUX "selection mode" IOCTLs.
By enabling mouse reporting on a terminal and then injecting mouse reports through TIOCL_SELMOUSEREPORT, an attacker can simulate mouse movements on the same terminal, similar to the TIOCSTI keystroke injection attacks that were previously possible with TIOCSTI and other TIOCL_SETSEL selection modes.
Many programs (including libreadline/bash) are then prone to misinterpret these mouse reports as normal keyboard input because they do not expect input in the X11 mouse protocol form. The attacker does not have complete control over the escape sequence, but they can at least control the values of two consecutive bytes in the binary mouse reporting escape sequence.
I went into more detail on that in the discussion at
https://lore.kernel.org/all/[email protected]/
It is not equally trivial to simulate arbitrary keystrokes as it was with TIOCSTI (commit 83efeeeb3d04 ("tty: Allow TIOCSTI to be disabled")), but the general mechanism is there, and together with the small number of existing legit use cases (see below), it would be better to revert back to requiring CAP_SYS_ADMIN for TIOCL_SELMOUSEREPORT, as it was already the case before commit 2f83e38a095f ("tty: Permit some TIOCL_SETSEL modes without CAP_SYS_ADMIN").
3. TIOCL_SELMOUSEREPORT is only used by the mouse daemons (GPM or Consolation), and they are the only legit use case:
To quote console_codes(4):
The mouse tracking facility is intended to return xterm(1)-compatible mouse status reports. Because the console driver has no way to know the device or type of the mouse, these reports are returned in the console input stream only when the virtual terminal driver receives a mouse update ioctl. These ioctls must be generated by a mouse-aware user-mode application such as the gpm(8) daemon.
Jared Finder has also confirmed in
https://lore.kernel.org/all/[email protected]/
that Emacs does not call TIOCL_SELMOUSEREPORT directly, and it would be difficult to find good reasons for doing that, given that it would interfere with the reports that GPM is sending.
More information on the interaction between GPM, terminals and the kernel with additional pointers is also available in this patch:
https://lore.kernel.org/all/a773e48920aa104a65073671effbdee665c105fc.1603963593.git.tammo.block@gmail.com/
For background on who else uses TIOCL_SELMOUSEREPORT: Debian Code search finds one page of results, the only two known callers are the two mouse daemons GPM and Consolation. (GPM does not show up in the search results because it uses literal numbers to refer to TIOCLINUX-related enums. I looked through GPM by hand instead. TIOCL_SELMOUSEREPORT is also not used from libgpm.)
https://codesearch.debian.net/search?q=TIOCL_SELMOUSEREPORT
--- drivers/tty/vt/selection.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/tty/vt/selection.c +2 -3
@@ -193,13 +193,12 @@ int set_selection_user(const struct tiocreturn -EFAULT ;/* -* TIOCL_SELCLEAR, TIOCL_SELPOINTER and TIOCL_SELMOUSEREPORT are OK to -* use without CAP_SYS_ADMIN as they do not modify the selection. +* TIOCL_SELCLEAR and TIOCL_SELPOINTER are OK to use without +* CAP_SYS_ADMIN as they do not modify the selection. */ switch (v.sel_mode) {case TIOCL_SELCLEAR :case TIOCL_SELPOINTER : -case TIOCL_SELMOUSEREPORT :break ;default :if (!capable (CAP_SYS_ADMIN ))
Greg Kroah-Hartman
maintainerPATCH 153/311 serial: msm: Configure correct working mode before starting earlycon
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephan Gerhold <[email protected]>
commit 7094832b5ac861b0bd7ed8866c93cb15ef619996 upstream.
The MSM UART DM controller supports different working modes, e.g. DMA or the "single-character mode", where all reads/writes operate on a single character rather than 4 chars (32-bit) at once. When using earlycon, __msm_console_write() always writes 4 characters at a time, but we don't know which mode the bootloader was using and we don't set the mode either.
This causes garbled output if the bootloader was using the single-character mode, because only every 4th character appears in the serial console, e.g.
"[ 00oni pi 000xf0[ 00i s 5rm9(l)l s 1 1 SPMTA 7:C 5[ 00A ade k d[
00ano:ameoi .Q1B[ 00ac _idaM00080oo'"
If the bootloader was using the DMA ("DM") mode, output would likely fail entirely. Later, when the full serial driver probes, the port is re-initialized and output works as expected.
Fix this also for earlycon by clearing the DMEN register and reset+re-enable the transmitter to apply the change. This ensures the transmitter is in the expected state before writing any output.
--- drivers/tty/serial/msm_serial.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/tty/serial/msm_serial.c +6 -0
@@ -1746,6 +1746,12 @@ msm_serial_early_console_setup_dm(structif (!device->port.membase)return -ENODEV ; +/* Disable DM / single-character modes */ +msm_write (&device->port,0 ,UARTDM_DMEN ); +msm_write (&device->port,MSM_UART_CR_CMD_RESET_RX ,MSM_UART_CR ); +msm_write (&device->port,MSM_UART_CR_CMD_RESET_TX ,MSM_UART_CR ); +msm_write (&device->port,MSM_UART_CR_TX_ENABLE ,MSM_UART_CR ); + device->con->write = msm_serial_early_write_dm;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 154/311 serial: sifive: lock port in startup()/shutdown() callbacks
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryo Takakura <[email protected]>
commit e1ca3ff28ab1e2c1e70713ef3fa7943c725742c3 upstream.
startup()/shutdown() callbacks access SIFIVE_SERIAL_IE_OFFS. The register is also accessed from write() callback.
If console were printing and startup()/shutdown() callback gets called, its access to the register could be overwritten.
Add port->lock to startup()/shutdown() callbacks to make sure their access to SIFIVE_SERIAL_IE_OFFS is synchronized against write() callback.
Rule: add
--- drivers/tty/serial/sifive.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/tty/serial/sifive.c +6 -0
@@ -563,8 +563,11 @@ static void sifive_serial_break_ctl(strustatic int sifive_serial_startup (struct uart_port *port) {struct sifive_serial_port *ssp =port_to_sifive_serial_port (port); +unsigned long flags; +uart_port_lock_irqsave (&ssp->port, &flags);__ssp_enable_rxwm (ssp); +uart_port_unlock_irqrestore (&ssp->port, flags);return 0 ; }
@@ -572,9 +575,12 @@ static int sifive_serial_startup(structstatic void sifive_serial_shutdown (struct uart_port *port) {struct sifive_serial_port *ssp =port_to_sifive_serial_port (port); +unsigned long flags; +uart_port_lock_irqsave (&ssp->port, &flags);__ssp_disable_rxwm (ssp);__ssp_disable_txwm (ssp); +uart_port_unlock_irqrestore (&ssp->port, flags); }/**
Greg Kroah-Hartman
maintainerPATCH 155/311 USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ehrenreich <[email protected]>
commit b399078f882b6e5d32da18b6c696cc84b12f90d5 upstream.
Abacus Electrics makes optical probes for interacting with smart meters over an optical interface.
At least one version uses an FT232B chip (as detected by ftdi_sio) with a custom USB PID, which needs to be added to the list to make the device work in a plug-and-play fashion.
--- drivers/usb/serial/ftdi_sio.c | 2 ++ drivers/usb/serial/ftdi_sio_ids.h | 5 +++++ 2 files changed, 7 insertions(+)
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -1093,6 +1093,8 @@ static const struct usb_device_id id_tab { USB_DEVICE_INTERFACE_NUMBER(ALTERA_VID, ALTERA_UB3_602E_PID, 1) }, { USB_DEVICE_INTERFACE_NUMBER(ALTERA_VID, ALTERA_UB3_602E_PID, 2) }, { USB_DEVICE_INTERFACE_NUMBER(ALTERA_VID, ALTERA_UB3_602E_PID, 3) }, +/* Abacus Electrics */ + { USB_DEVICE(FTDI_VID, ABACUS_OPTICAL_PROBE_PID) }, { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +5 -0
@@ -443,6 +443,11 @@#define LINX_FUTURE_2_PID 0xF44C/* Linx future device */ /* +* Abacus Electrics +*/ +#define ABACUS_OPTICAL_PROBE_PID 0xf458/* ABACUS ELECTRICS Optical Probe */ + +/* * Oceanic product ids */ #define FTDI_OCEANIC_PID 0xF460/* Oceanic dive instrument */
Greg Kroah-Hartman
maintainerPATCH 156/311 USB: serial: option: add Sierra Wireless EM9291
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Xue <[email protected]>
commit 968e1cbb1f6293c3add9607f80b5ce3d29f57583 upstream.
Add Sierra Wireless EM9291.
Interface 0: MBIM control
1: MBIM data
3: AT port
4: Diagnostic port
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1199 ProdID=90e3 Rev=00.06 S: Manufacturer=Sierra Wireless, Incorporated S: Product=Sierra Wireless EM9291 S: SerialNumber=xxxxxxxxxxxxxxxx C: #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I: If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim E: Ad=0f(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=8e(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=(none) E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=(none) E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/serial/option.c +3 -0
@@ -611,6 +611,7 @@ static void option_instat_callback(struc/* Sierra Wireless products */ #define SIERRA_VENDOR_ID 0x1199#define SIERRA_PRODUCT_EM9191 0x90d3 +#define SIERRA_PRODUCT_EM9291 0x90e3/* UNISOC (Spreadtrum) products */ #define UNISOC_VENDOR_ID 0x1782
@@ -2432,6 +2433,8 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x30) }, { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9291, 0xff, 0xff, 0x30) }, + { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9291, 0xff, 0xff, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, TOZED_PRODUCT_LT70C, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, LUAT_PRODUCT_AIR720U, 0xff, 0, 0) }, { USB_DEVICE_INTERFACE_CLASS(0x1bbb, 0x0530, 0xff), /* TCL IK512 MBIM */
Greg Kroah-Hartman
maintainerPATCH 157/311 USB: serial: simple: add OWON HDS200 series oscilloscope support
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Craig Hesling <[email protected]>
commit 4cc01410e1c1dd075df10f750775c81d1cb6672b upstream.
Add serial support for OWON HDS200 series oscilloscopes and likely many other pieces of OWON test equipment.
OWON HDS200 series devices host two USB endpoints, designed to facilitate bidirectional SCPI. SCPI is a predominately ASCII text protocol for test/measurement equipment. Having a serial/tty interface for these devices lowers the barrier to entry for anyone trying to write programs to communicate with them.
The following shows the USB descriptor for the OWON HDS272S running firmware V5.7.1:
Bus 001 Device 068: ID 5345:1234 Owon PDS6062T Oscilloscope Negotiated speed: Full Speed (12Mbps)
Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 0 [unknown] bDeviceSubClass 0 [unknown] bDeviceProtocol 0 bMaxPacketSize0 64 idVendor 0x5345 Owon idProduct 0x1234 PDS6062T Oscilloscope bcdDevice 1.00 iManufacturer 1 oscilloscope iProduct 2 oscilloscope iSerial 3 oscilloscope bNumConfigurations 1
Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 0x0029
bNumInterfaces 1
bConfigurationValue 1
iConfiguration 0
bmAttributes 0x80
(Bus Powered)
MaxPower 100mA
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 5 Physical Interface Device
bInterfaceSubClass 0 [unknown]
bInterfaceProtocol 0
iInterface 0
** UNRECOGNIZED: 09 21 11 01 00 01 22 5f 00 Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 32
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x01 EP 1 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 32
Device Status: 0x0000
(Bus Powered)
OWON appears to be using the same USB Vendor and Product ID for many of their oscilloscopes. Looking at the discussion about the USB vendor/product ID, in the link bellow, suggests that this VID/PID is shared with VDS, SDS, PDS, and now the HDS series oscilloscopes. Available documentation for these devices seems to indicate that all use a similar SCPI protocol, some with RS232 options. It is likely that this same simple serial setup would work correctly for them all.
--- drivers/usb/serial/usb-serial-simple.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/serial/usb-serial-simple.c +7 -0
@@ -100,6 +100,11 @@ DEVICE(nokia, NOKIA_IDS); { USB_DEVICE(0x09d7, 0x0100) } /* NovAtel FlexPack GPS */DEVICE_N (novatel_gps,NOVATEL_IDS ,3 ); +/* OWON electronic test and measurement equipment driver */ +#define OWON_IDS () \ + { USB_DEVICE(0x5345, 0x1234) }/* HDS200 oscilloscopes and others */ +DEVICE (owon,OWON_IDS ); +/* Siemens USB/MPI adapter */ #define SIEMENS_IDS () \ { USB_DEVICE(0x908, 0x0004) }
@@ -134,6 +139,7 @@ static struct usb_serial_driver * const &motorola_tetra_device, &nokia_device, &novatel_gps_device, + &owon_device, &siemens_mpi_device, &suunto_device, &vivopay_device,
@@ -153,6 +159,7 @@ static const struct usb_device_id id_tabMOTOROLA_TETRA_IDS (),NOKIA_IDS (),NOVATEL_IDS (), +OWON_IDS (),SIEMENS_IDS (),SUUNTO_IDS (), VIVOPAY_IDS(),
Greg Kroah-Hartman
maintainerPATCH 158/311 xhci: Limit time spent with xHC interrupts disabled during bus resume
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
commit bea5892d0ed274e03655223d1977cf59f9aff2f2 upstream.
Current xhci bus resume implementation prevents xHC host from generating interrupts during high-speed USB 2 and super-speed USB 3 bus resume.
Only reason to disable interrupts during bus resume would be to prevent the interrupt handler from interfering with the resume process of USB 2 ports.
Host initiated resume of USB 2 ports is done in two stages.
The xhci driver first transitions the port from 'U3' to 'Resume' state, then wait in Resume for 20ms, and finally moves port to U0 state. xhci driver can't prevent interrupts by keeping the xhci spinlock due to this 20ms sleep.
Limit interrupt disabling to the USB 2 port resume case only. resuming USB 2 ports in bus resume is only done in special cases where USB 2 ports had to be forced to suspend during bus suspend.
The current way of preventing interrupts by clearing the 'Interrupt Enable' (INTE) bit in USBCMD register won't prevent the Interrupter registers 'Interrupt Pending' (IP), 'Event Handler Busy' (EHB) and USBSTS register Event Interrupt (EINT) bits from being set.
New interrupts can't be issued before those bits are properly clered.
Disable interrupts by clearing the interrupter register 'Interrupt Enable' (IE) bit instead. This way IP, EHB and INTE won't be set before IE is enabled again and a new interrupt is triggered.
--- drivers/usb/host/xhci-hub.c | 30 ++++++++++++++++-------------- drivers/usb/host/xhci.c | 4 ++-- drivers/usb/host/xhci.h | 2 ++ 3 files changed, 20 insertions(+), 16 deletions(-)
drivers/usb/host/xhci-hub.c +16 -14
@@ -1878,9 +1878,10 @@ int xhci_bus_resume(struct usb_hcd *hcd)int max_ports, port_index;int sret;u32 next_state; -u32 temp, portsc; +u32 portsc;struct xhci_hub *rhub;struct xhci_port **ports; +bool disabled_irq = false; rhub =xhci_get_rhub (hcd); ports = rhub->ports;
@@ -1896,17 +1897,20 @@ int xhci_bus_resume(struct usb_hcd *hcd)return -ESHUTDOWN ; } -/* delay the irqs */ - temp =readl (&xhci->op_regs->command); - temp &= ~CMD_EIE ; -writel (temp, &xhci->op_regs->command); -/* bus specific resume for ports we suspended at bus_suspend */ -if (hcd->speed >=HCD_USB3 ) +if (hcd->speed >=HCD_USB3 ) { next_state =XDEV_U0 ; -else + }else { next_state =XDEV_RESUME ; - +if (bus_state->bus_suspended) { +/* +* prevent port event interrupts from interfering +* with usb2 port resume process +*/ +xhci_disable_interrupter (xhci->interrupters[0 ]); + disabled_irq = true; + } + } port_index = max_ports;while (port_index--) { portsc =readl (ports[port_index]->addr);
@@ -1974,11 +1978,9 @@ int xhci_bus_resume(struct usb_hcd *hcd) (void )readl (&xhci->op_regs->command); bus_state->next_statechange = jiffies +msecs_to_jiffies (5 ); -/* re-enable irqs */ - temp =readl (&xhci->op_regs->command); - temp |=CMD_EIE ; -writel (temp, &xhci->op_regs->command); - temp =readl (&xhci->op_regs->command); +/* re-enable interrupter */ +if (disabled_irq) +xhci_enable_interrupter (xhci->interrupters[0 ]);spin_unlock_irqrestore (&xhci->lock, flags);return 0 ;
drivers/usb/host/xhci.c +2 -2
@@ -322,7 +322,7 @@ static void xhci_zero_64b_regs(struct xhxhci_info (xhci,"Fault detected\n" ); } -static int xhci_enable_interrupter (struct xhci_interrupter *ir) +int xhci_enable_interrupter (struct xhci_interrupter *ir) {u32 iman;
@@ -335,7 +335,7 @@ static int xhci_enable_interrupter(strucreturn 0 ; } -static int xhci_disable_interrupter (struct xhci_interrupter *ir) +int xhci_disable_interrupter (struct xhci_interrupter *ir) {u32 iman;
drivers/usb/host/xhci.h +2 -0
@@ -1890,6 +1890,8 @@ int xhci_alloc_tt_info(struct xhci_hcd * struct usb_tt *tt, gfp_t mem_flags);int xhci_set_interrupter_moderation (struct xhci_interrupter *ir,u32 imod_interval); +int xhci_enable_interrupter (struct xhci_interrupter *ir); +int xhci_disable_interrupter (struct xhci_interrupter *ir);/* xHCI ring, segment, TRB, and TD functions */ dma_addr_t xhci_trb_virt_to_dma (struct xhci_segment *seg,union xhci_trb *trb);
Greg Kroah-Hartman
maintainerPATCH 159/311 usb: xhci: Fix invalid pointer dereference in Etron workaround
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Pecio <[email protected]>
commit 1ea050da5562af9b930d17cbbe9632d30f5df43a upstream.
This check is performed before prepare_transfer() and prepare_ring(), so enqueue can already point at the final link TRB of a segment. And indeed it will, some 0.4% of times this code is called.
Then enqueue + 1 is an invalid pointer. It will crash the kernel right away or load some junk which may look like a link TRB and cause the real link TRB to be replaced with a NOOP. This wouldn't end well.
Use a functionally equivalent test which doesn't dereference the pointer and always gives correct result.
Something has crashed my machine twice in recent days while playing with an Etron HC, and a control transfer stress test ran for confirmation has just crashed it again. The same test passes with this patch applied.
--- drivers/usb/host/xhci-ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-ring.c +1 -1
@@ -3780,7 +3780,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd ** enqueue a No Op TRB, this can prevent the Setup and Data Stage * TRB to be breaked by the Link TRB. */ -if (trb_is_link (ep_ring->enqueue +1 )) { +if (last_trb_on_seg (ep_ring->enq_seg, ep_ring->enqueue +1 )) { field =TRB_TYPE (TRB_TR_NOOP ) | ep_ring->cycle_state;queue_trb (xhci, ep_ring, false,0 ,0 ,TRB_INTR_TARGET (0 ), field);
Greg Kroah-Hartman
maintainerPATCH 160/311 usb: cdns3: Fix deadlock when using NCM gadget
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ralph Siemsen <[email protected]>
commit a1059896f2bfdcebcdc7153c3be2307ea319501f upstream.
The cdns3 driver has the same NCM deadlock as fixed in cdnsp by commit 58f2fcb3a845 ("usb: cdnsp: Fix deadlock issue during using NCM gadget").
Under PREEMPT_RT the deadlock can be readily triggered by heavy network traffic, for example using "iperf --bidir" over NCM ethernet link.
The deadlock occurs because the threaded interrupt handler gets preempted by a softirq, but both are protected by the same spinlock. Prevent deadlock by disabling softirq during threaded irq handler.
--- drivers/usb/cdns3/cdns3-gadget.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/cdns3/cdns3-gadget.c +2 -0
@@ -1963,6 +1963,7 @@ static irqreturn_t cdns3_device_thread_iunsigned int bit;unsigned long reg; +local_bh_disable ();spin_lock_irqsave (&priv_dev->lock, flags); reg =readl (&priv_dev->regs->usb_ists);
@@ -2004,6 +2005,7 @@ static irqreturn_t cdns3_device_thread_i irqend:writel (~0 , &priv_dev->regs->ep_ien);spin_unlock_irqrestore (&priv_dev->lock, flags); +local_bh_enable ();return ret; }
Greg Kroah-Hartman
maintainerPATCH 161/311 usb: chipidea: ci_hdrc_imx: fix usbmisc handling
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 4e28f79e3dffa52d327b46d1a78dac16efb5810b upstream.
usbmisc is an optional device property so it is totally valid for the corresponding data->usbmisc_data to have a NULL value.
Check that before dereferencing the pointer.
Found by Linux Verification Center (linuxtesting.org) with Svace static analysis tool.
--- drivers/usb/chipidea/ci_hdrc_imx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +4 -2
@@ -534,7 +534,8 @@ disable_hsic_regulator:cpu_latency_qos_remove_request (&data->pm_qos_req); data->ci_pdev =NULL ; err_put: -put_device (data->usbmisc_data->dev); +if (data->usbmisc_data) +put_device (data->usbmisc_data->dev);return ret; }
@@ -559,7 +560,8 @@ static void ci_hdrc_imx_remove(struct plif (data->hsic_pad_regulator)regulator_disable (data->hsic_pad_regulator); } -put_device (data->usbmisc_data->dev); +if (data->usbmisc_data) +put_device (data->usbmisc_data->dev); }static void ci_hdrc_imx_shutdown (struct platform_device *pdev)
Greg Kroah-Hartman
maintainerPATCH 162/311 usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 8cab0e9a3f3e8d700179e0d6141643d54a267fd5 upstream.
Upon encountering errors during the HSIC pinctrl handling section the regulator should be disabled.
Use devm_add_action_or_reset() to let the regulator-disabling routine be handled by device resource management stack.
Found by Linux Verification Center (linuxtesting.org).
--- drivers/usb/chipidea/ci_hdrc_imx.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +17 -8
@@ -336,6 +336,13 @@ static int ci_hdrc_imx_notify_event(strureturn ret; } +static void ci_hdrc_imx_disable_regulator (void *arg) +{ +struct ci_hdrc_imx_data *data = arg; + +regulator_disable (data->hsic_pad_regulator); +} +static int ci_hdrc_imx_probe (struct platform_device *pdev) {struct ci_hdrc_imx_data *data;
@@ -394,6 +401,13 @@ static int ci_hdrc_imx_probe(struct plat "Failed to enable HSIC pad regulator\n"); goto err_put; } + ret =devm_add_action_or_reset (dev, + ci_hdrc_imx_disable_regulator, data); +if (ret) { +dev_err (dev, +"Failed to add regulator devm action\n" ); + goto err_put; + } } }
@@ -432,11 +446,11 @@ static int ci_hdrc_imx_probe(struct plat ret =imx_get_clks (dev);if (ret) - goto disable_hsic_regulator; + goto qos_remove_request; ret =imx_prepare_enable_clks (dev);if (ret) - goto disable_hsic_regulator; + goto qos_remove_request; ret =clk_prepare_enable (data->clk_wakeup);if (ret)
@@ -526,10 +540,7 @@ err_clk:clk_disable_unprepare (data->clk_wakeup); err_wakeup_clk:imx_disable_unprepare_clks (dev); -disable_hsic_regulator: -if (data->hsic_pad_regulator) -/* don't overwrite original ret (cf. EPROBE_DEFER) */ -regulator_disable (data->hsic_pad_regulator); +qos_remove_request:if (pdata.flags &CI_HDRC_PMQOS )cpu_latency_qos_remove_request (&data->pm_qos_req); data->ci_pdev =NULL ;
@@ -557,8 +568,6 @@ static void ci_hdrc_imx_remove(struct plclk_disable_unprepare (data->clk_wakeup);if (data->plat_data->flags &CI_HDRC_PMQOS )cpu_latency_qos_remove_request (&data->pm_qos_req); -if (data->hsic_pad_regulator) -regulator_disable (data->hsic_pad_regulator); }if (data->usbmisc_data)put_device (data->usbmisc_data->dev);
Greg Kroah-Hartman
maintainerPATCH 163/311 usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 8c531e0a8c2d82509ad97c6d3a1e6217c7ed136d upstream.
usb_phy_init() may return an error code if e.g. its implementation fails to prepare/enable some clocks. And properly rollback on probe error path by calling the counterpart usb_phy_shutdown().
Found by Linux Verification Center (linuxtesting.org).
--- drivers/usb/chipidea/ci_hdrc_imx.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +10 -3
@@ -484,7 +484,11 @@ static int ci_hdrc_imx_probe(struct plat of_usb_get_phy_mode(np) == USBPHY_INTERFACE_MODE_ULPI) { pdata.flags |=CI_HDRC_OVERRIDE_PHY_CONTROL ; data->override_phy_control = true; -usb_phy_init (pdata.usb_phy); + ret =usb_phy_init (pdata.usb_phy); +if (ret) { +dev_err (dev,"Failed to init phy\n" ); + goto err_clk; + } }if (pdata.flags &CI_HDRC_SUPPORTS_RUNTIME_PM )
@@ -493,7 +497,7 @@ static int ci_hdrc_imx_probe(struct plat ret =imx_usbmisc_init (data->usbmisc_data);if (ret) {dev_err (dev,"usbmisc init failed, ret=%d\n" , ret); - goto err_clk; + goto phy_shutdown; } data->ci_pdev = ci_hdrc_add_device(dev,
@@ -502,7 +506,7 @@ static int ci_hdrc_imx_probe(struct platif (IS_ERR (data->ci_pdev)) { ret =PTR_ERR (data->ci_pdev);dev_err_probe (dev, ret,"ci_hdrc_add_device failed\n" ); - goto err_clk; + goto phy_shutdown; }if (data->usbmisc_data) {
@@ -536,6 +540,9 @@ static int ci_hdrc_imx_probe(struct plat disable_device:ci_hdrc_remove_device (data->ci_pdev); +phy_shutdown: +if (data->override_phy_control) +usb_phy_shutdown (data->phy); err_clk:clk_disable_unprepare (data->clk_wakeup); err_wakeup_clk:
Greg Kroah-Hartman
maintainerPATCH 164/311 USB: OHCI: Add quirk for LS7A OHCI controller (rev 0x02)
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
commit bcb60d438547355b8f9ad48645909139b64d3482 upstream.
The OHCI controller (rev 0x02) under LS7A PCI host has a hardware flaw. MMIO register with offset 0x60/0x64 is treated as legacy PS2-compatible keyboard/mouse interface, which confuse the OHCI controller. Since OHCI only use a 4KB BAR resource indeed, the LS7A OHCI controller's 32KB BAR is wrapped around (the second 4KB BAR space is the same as the first 4KB internally). So we can add an 4KB offset (0x1000) to the OHCI registers (from the PCI BAR resource) as a quirk.
--- drivers/usb/host/ohci-pci.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/usb/host/ohci-pci.c +23 -0
@@ -165,6 +165,25 @@ static int ohci_quirk_amd700(struct usb_return 0 ; } +static int ohci_quirk_loongson (struct usb_hcd *hcd) +{ +struct pci_dev *pdev =to_pci_dev (hcd->self.controller); + +/* +* Loongson's LS7A OHCI controller (rev 0x02) has a +* flaw. MMIO register with offset 0x60/64 is treated +* as legacy PS2-compatible keyboard/mouse interface. +* Since OHCI only use 4KB BAR resource, LS7A OHCI's +* 32KB BAR is wrapped around (the 2nd 4KB BAR space +* is the same as the 1st 4KB internally). So add 4KB +* offset (0x1000) to the OHCI registers as a quirk. +*/ +if (pdev->revision ==0x2 ) + hcd->regs +=SZ_4K ;/* SZ_4K = 0x1000 */ + +return 0 ; +} +static int ohci_quirk_qemu (struct usb_hcd *hcd) {struct ohci_hcd *ohci =hcd_to_ohci (hcd);
@@ -225,6 +244,10 @@ static const struct pci_device_id ohci_p .driver_data = (unsigned long)ohci_quirk_amd700, }, { + PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, 0x7a24), + .driver_data = (unsigned long)ohci_quirk_loongson, + }, + { .vendor = PCI_VENDOR_ID_APPLE, .device = 0x003f, .subvendor = PCI_SUBVENDOR_ID_REDHAT_QUMRANET,
Greg Kroah-Hartman
maintainerPATCH 165/311 usb: dwc3: gadget: check that event count does not exceed event buffer length
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frode Isaksen <[email protected]>
commit 63ccd26cd1f6600421795f6ca3e625076be06c9f upstream.
The event count is read from register DWC3_GEVNTCOUNT. There is a check for the count being zero, but not for exceeding the event buffer length.
Check that event count does not exceed event buffer length, avoiding an out-of-bounds access when memcpy'ing the event. Crash log:
Unable to handle kernel paging request at virtual address ffffffc0129be000 pc : __memcpy+0x114/0x180 lr : dwc3_check_event_buf+0xec/0x348 x3 : 0000000000000030 x2 : 000000000000dfc4 x1 : ffffffc0129be000 x0 : ffffff87aad60080 Call trace: __memcpy+0x114/0x180 dwc3_interrupt+0x24/0x34
--- drivers/usb/dwc3/gadget.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/dwc3/gadget.c +6 -0
@@ -4564,6 +4564,12 @@ static irqreturn_t dwc3_check_event_buf(if (!count)return IRQ_NONE ; +if (count > evt->length) { +dev_err_ratelimited (dwc->dev,"invalid count(%u) > evt->length(%u)\n" , + count, evt->length); +return IRQ_NONE ; + } + evt->count = count; evt->flags |=DWC3_EVENT_PENDING ;
Greg Kroah-Hartman
maintainerPATCH 166/311 usb: dwc3: xilinx: Prevent spike in reset signal
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Looijmans <[email protected]>
commit 38d6e60b6f3a99f8f13bee22eab616136c2c0675 upstream.
The "reset" GPIO controls the RESET signal to an external, usually ULPI PHY, chip. The original code path acquires the signal in LOW state, and then immediately asserts it HIGH again, if the reset signal defaulted to asserted, there'd be a short "spike" before the reset.
Here is what happens depending on the pre-existing state of the reset signal:
Reset (previously asserted): ~~~|_|~~~~|_______ Reset (previously deasserted): _____|~~~~|_______
^ ^ ^
A B C
At point A, the low going transition is because the reset line is requested using GPIOD_OUT_LOW. If the line is successfully requested, the first thing we do is set it high _without_ any delay. This is point B. So, a glitch occurs between A and B.
Requesting the line using GPIOD_OUT_HIGH eliminates the A and B transitions. Instead we get:
Reset (previously asserted) : ~~~~~~~~~~|______
Reset (previously deasserted): ____|~~~~~|______
^ ^
A CWhere A and C are the points described above in the code. Point B has been eliminated.
The issue was found during code inspection.
Also remove the cryptic "toggle ulpi .." comment.
--- drivers/usb/dwc3/dwc3-xilinx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/usb/dwc3/dwc3-xilinx.c +1 -3
@@ -207,15 +207,13 @@ static int dwc3_xlnx_init_zynqmp(struct skip_usb3_phy:/* ulpi reset via gpio-modepin or gpio-framework driver */ - reset_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_LOW ); + reset_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_HIGH );if (IS_ERR (reset_gpio)) {return dev_err_probe (dev,PTR_ERR (reset_gpio),"Failed to request reset GPIO\n" ); }if (reset_gpio) { -/* Toggle ulpi to reset the phy. */ -gpiod_set_value_cansleep (reset_gpio,1 );usleep_range (5000 ,10000 );gpiod_set_value_cansleep (reset_gpio,0 );usleep_range (5000 ,10000 );
Greg Kroah-Hartman
maintainerPATCH 167/311 usb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miao Li <[email protected]>
commit 2932b6b547ec36ad2ed60fbf2117c0e46bb7d40a upstream.
Silicon Motion Flash Drive connects to Huawei hisi platforms and performs a system reboot test for two thousand circles, it will randomly work incorrectly on boot, set DELAY_INIT quirk can workaround this issue.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -383,6 +383,9 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x0904, 0x6103), .driver_info = USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL }, + /* Silicon Motion Flash Drive */ + { USB_DEVICE(0x090c, 0x1000), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Sound Devices USBPre2 */ { USB_DEVICE(0x0926, 0x0202), .driver_info = USB_QUIRK_ENDPOINT_IGNORE },
Greg Kroah-Hartman
maintainerPATCH 168/311 usb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miao Li <[email protected]>
commit 37ffdbd695c02189dbf23d6e7d2385e0299587ca upstream.
The SanDisk 3.2Gen1 Flash Drive, which VID:PID is in 0781:55a3, just like Silicon Motion Flash Drive:
https://lore.kernel.org/r/[email protected]
also needs the DELAY_INIT quirk, or it will randomly work incorrectly (e.g.: lsusb and can't list this device info) when connecting Huawei hisi platforms and doing thousand of reboot test circles.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -369,6 +369,9 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x0781, 0x5583), .driver_info = USB_QUIRK_NO_LPM }, { USB_DEVICE(0x0781, 0x5591), .driver_info = USB_QUIRK_NO_LPM }, + /* SanDisk Corp. SanDisk 3.2Gen1 */ + { USB_DEVICE(0x0781, 0x55a3), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Realforce 87U Keyboard */ { USB_DEVICE(0x0853, 0x011b), .driver_info = USB_QUIRK_NO_LPM },
Greg Kroah-Hartman
maintainerPATCH 169/311 USB: VLI disk crashes if LPM is used
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit e00b39a4f3552c730f1e24c8d62c4a8c6aad4e5d upstream.
This device needs the NO_LPM quirk.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -545,6 +545,9 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x2040, 0x7200), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, + /* VLI disk */ + { USB_DEVICE(0x2109, 0x0711), .driver_info = USB_QUIRK_NO_LPM }, + /* Raydium Touchscreen */ { USB_DEVICE(0x2386, 0x3114), .driver_info = USB_QUIRK_NO_LPM },
Greg Kroah-Hartman
maintainerPATCH 170/311 usb: typec: class: Fix NULL pointer access
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrei Kuchynski <[email protected]>
commit ec27386de23a511008c53aa2f3434ad180a3ca9a upstream.
Concurrent calls to typec_partner_unlink_device can lead to a NULL pointer dereference. This patch adds a mutex to protect USB device pointers and prevent this issue. The same mutex protects both the device pointers and the partner device registration.
--- drivers/usb/typec/class.c | 15 +++++++++++++-- drivers/usb/typec/class.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-)
drivers/usb/typec/class.c +13 -2
@@ -1052,6 +1052,7 @@ struct typec_partner *typec_register_par partner->usb_mode =USB_MODE_USB3 ; } +mutex_lock (&port->partner_link_lock); ret =device_register (&partner->dev);if (ret) {dev_err (&port->dev,"failed to register partner (%d)\n" , ret);
@@ -1063,6 +1064,7 @@ struct typec_partner *typec_register_partypec_partner_link_device (partner, port->usb2_dev);if (port->usb3_dev)typec_partner_link_device (partner, port->usb3_dev); +mutex_unlock (&port->partner_link_lock);return partner; }
@@ -1083,12 +1085,14 @@ void typec_unregister_partner(struct typ port =to_typec_port (partner->dev.parent); +mutex_lock (&port->partner_link_lock);if (port->usb2_dev)typec_partner_unlink_device (partner, port->usb2_dev);if (port->usb3_dev)typec_partner_unlink_device (partner, port->usb3_dev);device_unregister (&partner->dev); +mutex_unlock (&port->partner_link_lock); }EXPORT_SYMBOL_GPL (typec_unregister_partner);
@@ -2041,10 +2045,11 @@ static struct typec_partner *typec_get_pstatic void typec_partner_attach (struct typec_connector *con,struct device *dev) { struct typec_port *port = container_of(con, struct typec_port, con); -struct typec_partner *partner =typec_get_partner (port); +struct typec_partner *partner;struct usb_device *udev =to_usb_device (dev);enum usb_mode usb_mode; +mutex_lock (&port->partner_link_lock);if (udev->speed <USB_SPEED_SUPER ) { usb_mode =USB_MODE_USB2 ; port->usb2_dev = dev;
@@ -2053,18 +2058,22 @@ static void typec_partner_attach(struct port->usb3_dev = dev; } + partner =typec_get_partner (port);if (partner) {typec_partner_set_usb_mode (partner, usb_mode);typec_partner_link_device (partner, dev);put_device (&partner->dev); } +mutex_unlock (&port->partner_link_lock); }static void typec_partner_deattach (struct typec_connector *con,struct device *dev) { struct typec_port *port = container_of(con, struct typec_port, con); -struct typec_partner *partner =typec_get_partner (port); +struct typec_partner *partner; +mutex_lock (&port->partner_link_lock); + partner =typec_get_partner (port);if (partner) {typec_partner_unlink_device (partner, dev);put_device (&partner->dev);
@@ -2074,6 +2083,7 @@ static void typec_partner_deattach(struc port->usb2_dev =NULL ; else if (port->usb3_dev == dev) port->usb3_dev = NULL; +mutex_unlock (&port->partner_link_lock); }/**
@@ -2614,6 +2624,7 @@ struct typec_port *typec_register_port(sida_init (&port->mode_ids);mutex_init (&port->port_type_lock); +mutex_init (&port->partner_link_lock); port->id = id; port->ops = cap->ops;
drivers/usb/typec/class.h +1 -0
@@ -59,6 +59,7 @@ struct typec_port {enum typec_port_type port_type;enum usb_mode usb_mode;struct mutex port_type_lock; +struct mutex partner_link_lock;enum typec_orientation orientation;struct typec_switch *sw;
Greg Kroah-Hartman
maintainerPATCH 171/311 usb: typec: class: Invalidate USB device pointers on partner unregistration
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrei Kuchynski <[email protected]>
commit 66e1a887273c6b89f09bc11a40d0a71d5a081a8e upstream.
To avoid using invalid USB device pointers after a Type-C partner disconnects, this patch clears the pointers upon partner unregistration. This ensures a clean state for future connections.
--- drivers/usb/typec/class.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/typec/class.c +6 -2
@@ -1086,10 +1086,14 @@ void typec_unregister_partner(struct typ port =to_typec_port (partner->dev.parent);mutex_lock (&port->partner_link_lock); -if (port->usb2_dev) +if (port->usb2_dev) {typec_partner_unlink_device (partner, port->usb2_dev); -if (port->usb3_dev) + port->usb2_dev =NULL ; + } +if (port->usb3_dev) {typec_partner_unlink_device (partner, port->usb3_dev); + port->usb3_dev =NULL ; + }device_unregister (&partner->dev);mutex_unlock (&port->partner_link_lock);
Greg Kroah-Hartman
maintainerPATCH 172/311 usb: typec: class: Unlocked on error in typec_register_partner()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 429a98abfc01d3d4378b7a00969437dc3e8f647c upstream.
We recently added some locking to this function but this error path was accidentally missed. Unlock before returning.
--- drivers/usb/typec/class.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/typec/class.c +1 -0
@@ -1056,6 +1056,7 @@ struct typec_partner *typec_register_par ret =device_register (&partner->dev);if (ret) {dev_err (&port->dev,"failed to register partner (%d)\n" , ret); +mutex_unlock (&port->partner_link_lock);put_device (&partner->dev);return ERR_PTR (ret); }
Greg Kroah-Hartman
maintainerPATCH 173/311 USB: wdm: handle IO errors in wdm_wwan_port_start
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 9697f5efcf5fdea65b8390b5eb81bebe746ceedc upstream.
In case submitting the URB fails we must undo
what we've done so far.
--- drivers/usb/class/cdc-wdm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/usb/class/cdc-wdm.c +10 -1
@@ -829,6 +829,7 @@ static struct usb_class_driver wdm_classstatic int wdm_wwan_port_start (struct wwan_port *port) {struct wdm_device *desc =wwan_port_get_drvdata (port); +int rv;/* The interface is both exposed via the WWAN framework and as a * legacy usbmisc chardev. If chardev is already open, just fail
@@ -848,7 +849,15 @@ static int wdm_wwan_port_start(struct wwwwan_port_txon (port);/* Start getting events */ -return usb_submit_urb (desc->validity,GFP_KERNEL ); + rv =usb_submit_urb (desc->validity,GFP_KERNEL ); +if (rv <0 ) { +wwan_port_txoff (port); + desc->manage_power (desc->intf,0 ); +/* this must be last lest we race with chardev open */ +clear_bit (WDM_WWAN_IN_USE , &desc->flags); + } + +return rv; }static void wdm_wwan_port_stop (struct wwan_port *port)
Greg Kroah-Hartman
maintainerPATCH 174/311 USB: wdm: close race between wdm_open and wdm_wwan_port_stop
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit c1846ed4eb527bdfe6b3b7dd2c78e2af4bf98f4f upstream.
Clearing WDM_WWAN_IN_USE must be the last action or we can open a chardev whose URBs are still poisoned
--- drivers/usb/class/cdc-wdm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/class/cdc-wdm.c +4 -2
@@ -726,7 +726,7 @@ static int wdm_open(struct inode *inode, rv = -EBUSY ; goto out; } - +smp_rmb ();/* ordered against wdm_wwan_port_stop() */ rv =usb_autopm_get_interface (desc->intf);if (rv <0 ) {dev_err (&desc->intf->dev,"Error autopm - %d\n" , rv);
@@ -868,8 +868,10 @@ static void wdm_wwan_port_stop(struct wwpoison_urbs (desc); desc->manage_power (desc->intf,0 );clear_bit (WDM_READ , &desc->flags); -clear_bit (WDM_WWAN_IN_USE , &desc->flags);unpoison_urbs (desc); +smp_wmb ();/* ordered against wdm_open() */ +/* this must be last lest we open a poisoned device */ +clear_bit (WDM_WWAN_IN_USE , &desc->flags); }static void wdm_wwan_port_tx_complete (struct urb *urb)
Greg Kroah-Hartman
maintainerPATCH 175/311 USB: wdm: wdm_wwan_port_tx_complete mutex in atomic context
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 1fdc4dca350c0b8ada0b8ebf212504e1ad55e511 upstream.
wdm_wwan_port_tx_complete is called from a completion handler with irqs disabled and possible in IRQ context usb_autopm_put_interface can take a mutex. Hence usb_autopm_put_interface_async must be used.
--- drivers/usb/class/cdc-wdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/class/cdc-wdm.c +1 -1
@@ -879,7 +879,7 @@ static void wdm_wwan_port_tx_complete(ststruct sk_buff *skb = urb->context;struct wdm_device *desc =skb_shinfo (skb)->destructor_arg; -usb_autopm_put_interface (desc->intf); +usb_autopm_put_interface_async (desc->intf);wwan_port_txon (desc->wwanp);kfree_skb (skb); }
Greg Kroah-Hartman
maintainerPATCH 176/311 USB: wdm: add annotation
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 73e9cc1ffd3650b12c4eb059dfdafd56e725ceda upstream.
This is not understandable without a comment on endianness
--- drivers/usb/class/cdc-wdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/class/cdc-wdm.c +1 -1
@@ -909,7 +909,7 @@ static int wdm_wwan_port_tx(struct wwan_ req->bRequestType = (USB_DIR_OUT |USB_TYPE_CLASS |USB_RECIP_INTERFACE ); req->bRequest =USB_CDC_SEND_ENCAPSULATED_COMMAND ; req->wValue =0 ; - req->wIndex = desc->inum; + req->wIndex = desc->inum;/* already converted */ req->wLength =cpu_to_le16 (skb->len);skb_shinfo (skb)->destructor_arg = desc;
Greg Kroah-Hartman
maintainerPATCH 177/311 crypto: ecdsa - Harden against integer overflows in DIV_ROUND_UP()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Wunner <[email protected]>
[ Upstream commit b16510a530d1e6ab9683f04f8fb34f2e0f538275 ]
Herbert notes that DIV_ROUND_UP() may overflow unnecessarily if an ecdsa implementation's ->key_size() callback returns an unusually large value. Herbert instead suggests (for a division by 8):
X / 8 + !!(X & 7)
Based on this formula, introduce a generic DIV_ROUND_UP_POW2() macro and use it in lieu of DIV_ROUND_UP() for ->key_size() return values.
Additionally, use the macro in ecc_digits_from_bytes(), whose "nbytes" parameter is a ->key_size() return value in some instances, or a user-specified ASN.1 length in the case of ecdsa_get_signature_rs().
--- crypto/ecc.c | 2 +- crypto/ecdsa-p1363.c | 2 +- crypto/ecdsa-x962.c | 4 ++-- include/linux/math.h | 12 ++++++++++++ 4 files changed, 16 insertions(+), 4 deletions(-)
crypto/ecc.c +1 -1
@@ -71,7 +71,7 @@ EXPORT_SYMBOL(ecc_get_curve);void ecc_digits_from_bytes (const u8 *in,unsigned int nbytes,u64 *out,unsigned int ndigits) { -int diff = ndigits -DIV_ROUND_UP (nbytes,sizeof (u64)); +int diff = ndigits -DIV_ROUND_UP_POW2 (nbytes,sizeof (u64));unsigned int o = nbytes &7 ;__be64 msd =0 ;
crypto/ecdsa-p1363.c +1 -1
@@ -22,7 +22,7 @@ static int ecdsa_p1363_verify(struct crypto_sig *tfm, {struct ecdsa_p1363_ctx *ctx =crypto_sig_ctx (tfm);unsigned int keylen =crypto_sig_keysize (ctx->child); -unsigned int ndigits =DIV_ROUND_UP (keylen,sizeof (u64)); +unsigned int ndigits =DIV_ROUND_UP_POW2 (keylen,sizeof (u64));struct ecdsa_raw_sig sig;if (slen !=2 * keylen)
crypto/ecdsa-x962.c +2 -2
@@ -81,8 +81,8 @@ static int ecdsa_x962_verify(struct crypto_sig *tfm,struct ecdsa_x962_signature_ctx sig_ctx;int err; - sig_ctx.ndigits =DIV_ROUND_UP (crypto_sig_keysize (ctx->child), -sizeof (u64)); + sig_ctx.ndigits =DIV_ROUND_UP_POW2 (crypto_sig_keysize (ctx->child), +sizeof (u64)); err =asn1_ber_decoder (&ecdsasignature_decoder, &sig_ctx, src, slen);if (err <0 )
include/linux/math.h +12 -0
@@ -34,6 +34,18 @@*/ #define round_down (x, y) ((x) & ~__round_mask(x, y)) +/** +* DIV_ROUND_UP_POW2 - divide and round up +* @n: numerator +* @d: denominator (must be a power of 2) +* +* Divides @n by @d and rounds up to next multiple of @d (which must be a power +* of 2). Avoids integer overflows that may occur with __KERNEL_DIV_ROUND_UP(). +* Performance is roughly equivalent to __KERNEL_DIV_ROUND_UP(). +*/ +#define DIV_ROUND_UP_POW2 (n, d) \ + ((n) / (d) + !!((n) & ((d) - 1))) +#define DIV_ROUND_UP __KERNEL_DIV_ROUND_UP#define DIV_ROUND_DOWN_ULL (ll, d) \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 178/311 selftests/bpf: Fix stdout race condition in traffic monitor
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amery Hung <[email protected]>
[ Upstream commit b99f27e90268b1a814c13f8bd72ea1db448ea257 ]
Fix a race condition between the main test_progs thread and the traffic monitoring thread. The traffic monitor thread tries to print a line using multiple printf and use flockfile() to prevent the line from being torn apart. Meanwhile, the main thread doing io redirection can reassign or close stdout when going through tests. A deadlock as shown below can happen.
main traffic_monitor_thread
==== ======================
show_transport()
-> flockfile(stdout)stdio_hijack_init()
-> stdout = open_memstream(log_buf, log_cnt);
...
env.subtest_state->stdout_saved = stdout;
...
funlockfile(stdout)stdio_restore_cleanup()
-> fclose(env.subtest_state->stdout_saved);
After the traffic monitor thread lock stdout, A new memstream can be assigned to stdout by the main thread. Therefore, the traffic monitor thread later will not be able to unlock the original stdout. As the main thread tries to access the old stdout, it will hang indefinitely as it is still locked by the traffic monitor thread.
The deadlock can be reproduced by running test_progs repeatedly with traffic monitor enabled:
for ((i=1;i<=100;i++)); do
./test_progs -a flow_dissector_skb* -m '*'
done
Fix this by only calling printf once and remove flockfile()/funlockfile().
--- tools/testing/selftests/bpf/network_helpers.c | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +13 -20
@@ -771,12 +771,13 @@ static const char *pkt_type_str(u16 pkt_type)return "Unknown" ; } +#define MAX_FLAGS_STRLEN 21/* Show the information of the transport layer in the packet */ static void show_transport (const u_char *packet,u16 len,u32 ifindex,const char *src_addr,const char *dst_addr,u16 proto,bool ipv6,u8 pkt_type) { -char *ifname, _ifname[IF_NAMESIZE ]; +char *ifname, _ifname[IF_NAMESIZE ], flags[MAX_FLAGS_STRLEN ] ="" ;const char *transport_str;u16 src_port, dst_port;struct udphdr *udp;
@@ -817,29 +818,21 @@ static void show_transport(const u_char *packet, u16 len, u32 ifindex,/* TCP or UDP*/ -flockfile (stdout); +if (proto ==IPPROTO_TCP ) +snprintf (flags,MAX_FLAGS_STRLEN ,"%s%s%s%s" , + tcp->fin ?", FIN" :"" , + tcp->syn ?", SYN" :"" , + tcp->rst ?", RST" :"" , + tcp->ack ?", ACK" :"" ); +if (ipv6) -printf ("%-7s %-3s IPv6 %s.%d > %s.%d: %s, length %d" , +printf ("%-7s %-3s IPv6 %s.%d > %s.%d: %s, length %d%s\n" , ifname,pkt_type_str (pkt_type), src_addr, src_port, - dst_addr, dst_port, transport_str, len); + dst_addr, dst_port, transport_str, len, flags);else -printf ("%-7s %-3s IPv4 %s:%d > %s:%d: %s, length %d" , +printf ("%-7s %-3s IPv4 %s:%d > %s:%d: %s, length %d%s\n" , ifname,pkt_type_str (pkt_type), src_addr, src_port, - dst_addr, dst_port, transport_str, len); - -if (proto ==IPPROTO_TCP ) { -if (tcp->fin) -printf (", FIN" ); -if (tcp->syn) -printf (", SYN" ); -if (tcp->rst) -printf (", RST" ); -if (tcp->ack) -printf (", ACK" ); - } - -printf ("\n" ); -funlockfile (stdout); + dst_addr, dst_port, transport_str, len, flags); }static void show_ipv6_packet (const u_char *packet,u32 ifindex,u8 pkt_type)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 179/311 pinctrl: renesas: rza2: Fix potential NULL pointer dereference
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit f752ee5b5b86b5f88a5687c9eb0ef9b39859b908 ]
chip.label in rza2_gpio_register() could be NULL. Add the missing check.
--- drivers/pinctrl/renesas/pinctrl-rza2.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pinctrl/renesas/pinctrl-rza2.c +3 -0
@@ -246,6 +246,9 @@ static int rza2_gpio_register(struct rza2_pinctrl_priv *priv)int ret; chip.label =devm_kasprintf (priv->dev,GFP_KERNEL ,"%pOFn" , np); +if (!chip.label) +return -ENOMEM ; + chip.parent = priv->dev; chip.ngpio = priv->npins;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 180/311 pinctrl: mcp23s08: Get rid of spurious level interrupts
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Mastykin <[email protected]>
[ Upstream commit 7b0671b97f0872d6950ccc925e210cb3f67721bf ]
irq_mask()/irq_unmask() are not called for nested interrupts. So level interrupts are never masked, chip's interrupt output is not cleared on INTCAP or GPIO read, the irq handler is uselessly called again. Nested irq handler is not called again, because interrupt reason is cleared by its first call./proc/interrupts shows that number of chip's irqs is greater than number of nested irqs.
This patch adds masking and unmasking level interrupts inside irq handler.
--- drivers/pinctrl/pinctrl-mcp23s08.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-mcp23s08.c +20 -3
@@ -382,6 +382,7 @@ static irqreturn_t mcp23s08_irq(int irq, void *data) {struct mcp23s08 *mcp = data;int intcap, intcon, intf, i, gpio, gpio_orig, intcap_mask, defval, gpinten; +bool need_unmask = false;unsigned long int enabled_interrupts;unsigned int child_irq; bool intf_set, intcap_changed, gpio_bit_changed,
@@ -396,9 +397,6 @@ static irqreturn_t mcp23s08_irq(int irq, void *data) goto unlock; } -if (mcp_read (mcp,MCP_INTCAP , &intcap)) - goto unlock; -if (mcp_read (mcp,MCP_INTCON , &intcon)) goto unlock;
@@ -408,6 +406,16 @@ static irqreturn_t mcp23s08_irq(int irq, void *data)if (mcp_read (mcp,MCP_DEFVAL , &defval)) goto unlock; +/* Mask level interrupts to avoid their immediate reactivation after clearing */ +if (intcon) { + need_unmask = true; +if (mcp_write (mcp,MCP_GPINTEN , gpinten & ~intcon)) + goto unlock; + } + +if (mcp_read (mcp,MCP_INTCAP , &intcap)) + goto unlock; +/* This clears the interrupt(configurable on S18) */ if (mcp_read (mcp,MCP_GPIO , &gpio)) goto unlock;
@@ -470,9 +478,18 @@ static irqreturn_t mcp23s08_irq(int irq, void *data) } } +if (need_unmask) { +mutex_lock (&mcp->lock); + goto unlock; + } +return IRQ_HANDLED ; unlock: +if (need_unmask) +if (mcp_write (mcp,MCP_GPINTEN , gpinten)) +dev_err (mcp->chip.parent,"can't unmask GPINTEN\n" ); +mutex_unlock (&mcp->lock);return IRQ_HANDLED ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 181/311 MIPS: cm: Detect CM quirks from device tree
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gregory CLEMENT <[email protected]>
[ Upstream commit e27fbe16af5cfc40639de4ced67d1a866a1953e9 ]
Some information that should be retrieved at runtime for the Coherence Manager can be either absent or wrong. This patch allows checking if some of this information is available from the device tree and updates the internal variable accordingly.
For now, only the compatible string associated with the broken HCI is being retrieved.
--- arch/mips/include/asm/mips-cm.h | 22 ++++++++++++++++++++++ arch/mips/kernel/mips-cm.c | 14 ++++++++++++++ 2 files changed, 36 insertions(+)
arch/mips/include/asm/mips-cm.h +22 -0
@@ -59,6 +59,16 @@ extern phys_addr_t mips_cm_l2sync_phys_base(void);*/ extern int mips_cm_is64; +/* +* mips_cm_is_l2_hci_broken - determine if HCI is broken +* +* Some CM reports show that Hardware Cache Initialization is +* complete, but in reality it's not the case. They also incorrectly +* indicate that Hardware Cache Initialization is supported. This +* flags allows warning about this broken feature. +*/ +extern bool mips_cm_is_l2_hci_broken; +/** * mips_cm_error_report - Report CM cache errors */
@@ -97,6 +107,18 @@ static inline bool mips_cm_present(void)#endif } +/** +* mips_cm_update_property - update property from the device tree +* +* Retrieve the properties from the device tree if a CM node exist and +* update the internal variable based on this. +*/ +#ifdef CONFIG_MIPS_CM +extern void mips_cm_update_property (void ); +#else +static void mips_cm_update_property (void ) {} +#endif +/** * mips_cm_has_l2sync - determine whether an L2-only sync region is present *
arch/mips/kernel/mips-cm.c +14 -0
@@ -5,6 +5,7 @@*/ #include <linux/errno.h> +#include <linux/of.h> #include <linux/percpu.h> #include <linux/spinlock.h>
@@ -14,6 +15,7 @@void __iomem *mips_gcr_base;void __iomem *mips_cm_l2sync_base;int mips_cm_is64; +bool mips_cm_is_l2_hci_broken;static char *cm2_tr[8 ] = {"mem" ,"gcr" ,"gic" ,"mmio" ,
@@ -237,6 +239,18 @@ static void mips_cm_probe_l2sync(void) mips_cm_l2sync_base =ioremap (addr,MIPS_CM_L2SYNC_SIZE ); } +void mips_cm_update_property (void ) +{ +struct device_node *cm_node; + + cm_node =of_find_compatible_node (of_root,NULL ,"mobileye,eyeq6-cm" ); +if (!cm_node) +return ; +pr_info ("HCI (Hardware Cache Init for the L2 cache) in GCR_L2_RAM_CONFIG from the CM3 is broken" ); + mips_cm_is_l2_hci_broken = true; +of_node_put (cm_node); +} +int mips_cm_probe (void ) {phys_addr_t addr;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 182/311 crypto: ccp - Add support for PCI device 0x1134
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Devaraj Rangasamy <[email protected]>
[ Upstream commit 6cb345939b8cc4be79909875276aa9dc87d16757 ]
PCI device 0x1134 shares same register features as PCI device 0x17E0. Hence reuse same data for the new PCI device ID 0x1134.
--- drivers/crypto/ccp/sp-pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/ccp/sp-pci.c +1 -0
@@ -532,6 +532,7 @@ static const struct pci_device_id sp_pci_table[] = { { PCI_VDEVICE(AMD, 0x14CA), (kernel_ulong_t)&dev_vdata[5] }, { PCI_VDEVICE(AMD, 0x15C7), (kernel_ulong_t)&dev_vdata[6] }, { PCI_VDEVICE(AMD, 0x1649), (kernel_ulong_t)&dev_vdata[6] }, + { PCI_VDEVICE(AMD, 0x1134), (kernel_ulong_t)&dev_vdata[7] }, { PCI_VDEVICE(AMD, 0x17E0), (kernel_ulong_t)&dev_vdata[7] }, { PCI_VDEVICE(AMD, 0x156E), (kernel_ulong_t)&dev_vdata[8] }, /* Last entry must be zero */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 183/311 crypto: lib/Kconfig - Fix lib built-in failure when arch is modular
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
[ Upstream commit 1047e21aecdf17c8a9ab9fd4bd24c6647453f93d ]
The HAVE_ARCH Kconfig options in lib/crypto try to solve the modular versus built-in problem, but it still fails when the the LIB option (e.g., CRYPTO_LIB_CURVE25519) is selected externally.
Fix this by introducing a level of indirection with ARCH_MAY_HAVE Kconfig options, these then go on to select the ARCH_HAVE options if the ARCH Kconfig options matches that of the LIB option.
--- arch/arm/crypto/Kconfig | 6 +++--- arch/powerpc/crypto/Kconfig | 4 ++-- arch/x86/crypto/Kconfig | 6 +++--- lib/crypto/Kconfig | 26 ++++++++++++++++++-------- 4 files changed, 26 insertions(+), 16 deletions(-)
arch/arm/crypto/Kconfig +3 -3
@@ -6,7 +6,7 @@ config CRYPTO_CURVE25519_NEON tristate "Public key crypto: Curve25519 (NEON)" depends on KERNEL_MODE_NEON select CRYPTO_LIB_CURVE25519_GENERIC - select CRYPTO_ARCH_HAVE_LIB_CURVE25519 + select CRYPTO_ARCH_MAY_HAVE_LIB_CURVE25519 help Curve25519 algorithm
@@ -47,7 +47,7 @@ config CRYPTO_NHPOLY1305_NEON config CRYPTO_POLY1305_ARM tristate "Hash functions: Poly1305 (NEON)" select CRYPTO_HASH - select CRYPTO_ARCH_HAVE_LIB_POLY1305 + select CRYPTO_ARCH_MAY_HAVE_LIB_POLY1305 help Poly1305 authenticator algorithm (RFC7539)
@@ -214,7 +214,7 @@ config CRYPTO_AES_ARM_CE config CRYPTO_CHACHA20_NEON tristate "Ciphers: ChaCha20, XChaCha20, XChaCha12 (NEON)" select CRYPTO_SKCIPHER - select CRYPTO_ARCH_HAVE_LIB_CHACHA + select CRYPTO_ARCH_MAY_HAVE_LIB_CHACHA help Length-preserving ciphers: ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms
arch/powerpc/crypto/Kconfig +2 -2
@@ -6,7 +6,7 @@ config CRYPTO_CURVE25519_PPC64 tristate "Public key crypto: Curve25519 (PowerPC64)" depends on PPC64 && CPU_LITTLE_ENDIAN select CRYPTO_LIB_CURVE25519_GENERIC - select CRYPTO_ARCH_HAVE_LIB_CURVE25519 + select CRYPTO_ARCH_MAY_HAVE_LIB_CURVE25519 help Curve25519 algorithm
@@ -95,7 +95,7 @@ config CRYPTO_CHACHA20_P10 depends on PPC64 && CPU_LITTLE_ENDIAN && VSX select CRYPTO_SKCIPHER select CRYPTO_LIB_CHACHA_GENERIC - select CRYPTO_ARCH_HAVE_LIB_CHACHA + select CRYPTO_ARCH_MAY_HAVE_LIB_CHACHA help Length-preserving ciphers: ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms
arch/x86/crypto/Kconfig +3 -3
@@ -6,7 +6,7 @@ config CRYPTO_CURVE25519_X86 tristate "Public key crypto: Curve25519 (ADX)" depends on X86 && 64BIT select CRYPTO_LIB_CURVE25519_GENERIC - select CRYPTO_ARCH_HAVE_LIB_CURVE25519 + select CRYPTO_ARCH_MAY_HAVE_LIB_CURVE25519 help Curve25519 algorithm
@@ -352,7 +352,7 @@ config CRYPTO_CHACHA20_X86_64 depends on X86 && 64BIT select CRYPTO_SKCIPHER select CRYPTO_LIB_CHACHA_GENERIC - select CRYPTO_ARCH_HAVE_LIB_CHACHA + select CRYPTO_ARCH_MAY_HAVE_LIB_CHACHA help Length-preserving ciphers: ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms
@@ -420,7 +420,7 @@ config CRYPTO_POLY1305_X86_64 tristate "Hash functions: Poly1305 (SSE2/AVX2)" depends on X86 && 64BIT select CRYPTO_LIB_POLY1305_GENERIC - select CRYPTO_ARCH_HAVE_LIB_POLY1305 + select CRYPTO_ARCH_MAY_HAVE_LIB_POLY1305 help Poly1305 authenticator algorithm (RFC7539)
lib/crypto/Kconfig +18 -8
@@ -42,12 +42,17 @@ config CRYPTO_LIB_BLAKE2S_GENERIC of CRYPTO_LIB_BLAKE2S. config CRYPTO_ARCH_HAVE_LIB_CHACHA - tristate + bool help Declares whether the architecture provides an arch-specific accelerated implementation of the ChaCha library interface, either builtin or as a module. +config CRYPTO_ARCH_MAY_HAVE_LIB_CHACHA + tristate + select CRYPTO_ARCH_HAVE_LIB_CHACHA if CRYPTO_LIB_CHACHA=m + select CRYPTO_ARCH_HAVE_LIB_CHACHA if CRYPTO_ARCH_MAY_HAVE_LIB_CHACHA=y + config CRYPTO_LIB_CHACHA_GENERIC tristate select CRYPTO_LIB_UTILS
@@ -60,7 +65,6 @@ config CRYPTO_LIB_CHACHA_GENERIC config CRYPTO_LIB_CHACHA tristate "ChaCha library interface" - depends on CRYPTO_ARCH_HAVE_LIB_CHACHA || !CRYPTO_ARCH_HAVE_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC if CRYPTO_ARCH_HAVE_LIB_CHACHA=n help Enable the ChaCha library interface. This interface may be fulfilled
@@ -68,12 +72,17 @@ config CRYPTO_LIB_CHACHA is available and enabled. config CRYPTO_ARCH_HAVE_LIB_CURVE25519 - tristate + bool help Declares whether the architecture provides an arch-specific accelerated implementation of the Curve25519 library interface, either builtin or as a module. +config CRYPTO_ARCH_MAY_HAVE_LIB_CURVE25519 + tristate + select CRYPTO_ARCH_HAVE_LIB_CURVE25519 if CRYPTO_LIB_CURVE25519=m + select CRYPTO_ARCH_HAVE_LIB_CURVE25519 if CRYPTO_ARCH_MAY_HAVE_LIB_CURVE25519=y + config CRYPTO_LIB_CURVE25519_GENERIC tristate help
@@ -85,7 +94,6 @@ config CRYPTO_LIB_CURVE25519_GENERIC config CRYPTO_LIB_CURVE25519 tristate "Curve25519 scalar multiplication library" - depends on CRYPTO_ARCH_HAVE_LIB_CURVE25519 || !CRYPTO_ARCH_HAVE_LIB_CURVE25519 select CRYPTO_LIB_CURVE25519_GENERIC if CRYPTO_ARCH_HAVE_LIB_CURVE25519=n select CRYPTO_LIB_UTILS help
@@ -104,12 +112,17 @@ config CRYPTO_LIB_POLY1305_RSIZE default 1 config CRYPTO_ARCH_HAVE_LIB_POLY1305 - tristate + bool help Declares whether the architecture provides an arch-specific accelerated implementation of the Poly1305 library interface, either builtin or as a module. +config CRYPTO_ARCH_MAY_HAVE_LIB_POLY1305 + tristate + select CRYPTO_ARCH_HAVE_LIB_POLY1305 if CRYPTO_LIB_POLY1305=m + select CRYPTO_ARCH_HAVE_LIB_POLY1305 if CRYPTO_ARCH_MAY_HAVE_LIB_POLY1305=y + config CRYPTO_LIB_POLY1305_GENERIC tristate help
@@ -121,7 +134,6 @@ config CRYPTO_LIB_POLY1305_GENERIC config CRYPTO_LIB_POLY1305 tristate "Poly1305 library interface" - depends on CRYPTO_ARCH_HAVE_LIB_POLY1305 || !CRYPTO_ARCH_HAVE_LIB_POLY1305 select CRYPTO_LIB_POLY1305_GENERIC if CRYPTO_ARCH_HAVE_LIB_POLY1305=n help Enable the Poly1305 library interface. This interface may be fulfilled
@@ -130,8 +142,6 @@ config CRYPTO_LIB_POLY1305 config CRYPTO_LIB_CHACHA20POLY1305 tristate "ChaCha20-Poly1305 AEAD support (8-byte nonce library version)" - depends on CRYPTO_ARCH_HAVE_LIB_CHACHA || !CRYPTO_ARCH_HAVE_LIB_CHACHA - depends on CRYPTO_ARCH_HAVE_LIB_POLY1305 || !CRYPTO_ARCH_HAVE_LIB_POLY1305 depends on CRYPTO select CRYPTO_LIB_CHACHA select CRYPTO_LIB_POLY1305
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 184/311 crypto: null - Use spin lock instead of mutex
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
[ Upstream commit dcc47a028c24e793ce6d6efebfef1a1e92f80297 ]
As the null algorithm may be freed in softirq context through af_alg, use spin locks instead of mutexes to protect the default null algorithm.
--- crypto/crypto_null.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-)
crypto/crypto_null.c +26 -13
@@ -17,10 +17,10 @@#include <crypto/internal/skcipher.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/mm.h> +#include <linux/spinlock.h> #include <linux/string.h> -static DEFINE_MUTEX (crypto_default_null_skcipher_lock); +static DEFINE_SPINLOCK (crypto_default_null_skcipher_lock);static struct crypto_sync_skcipher *crypto_default_null_skcipher;static int crypto_default_null_skcipher_refcnt;
@@ -152,23 +152,32 @@ MODULE_ALIAS_CRYPTO("cipher_null");struct crypto_sync_skcipher *crypto_get_default_null_skcipher (void ) { +struct crypto_sync_skcipher *ntfm =NULL ;struct crypto_sync_skcipher *tfm; -mutex_lock (&crypto_default_null_skcipher_lock); +spin_lock_bh (&crypto_default_null_skcipher_lock); tfm = crypto_default_null_skcipher;if (!tfm) { - tfm =crypto_alloc_sync_skcipher ("ecb(cipher_null)" ,0 ,0 ); -if (IS_ERR (tfm)) - goto unlock; - - crypto_default_null_skcipher = tfm; +spin_unlock_bh (&crypto_default_null_skcipher_lock); + + ntfm =crypto_alloc_sync_skcipher ("ecb(cipher_null)" ,0 ,0 ); +if (IS_ERR (ntfm)) +return ntfm; + +spin_lock_bh (&crypto_default_null_skcipher_lock); + tfm = crypto_default_null_skcipher; +if (!tfm) { + tfm = ntfm; + ntfm =NULL ; + crypto_default_null_skcipher = tfm; + } } crypto_default_null_skcipher_refcnt++; +spin_unlock_bh (&crypto_default_null_skcipher_lock); -unlock: -mutex_unlock (&crypto_default_null_skcipher_lock); +crypto_free_sync_skcipher (ntfm);return tfm; }
@@ -176,12 +185,16 @@ EXPORT_SYMBOL_GPL(crypto_get_default_null_skcipher);void crypto_put_default_null_skcipher (void ) { -mutex_lock (&crypto_default_null_skcipher_lock); +struct crypto_sync_skcipher *tfm =NULL ; + +spin_lock_bh (&crypto_default_null_skcipher_lock);if (!--crypto_default_null_skcipher_refcnt) { -crypto_free_sync_skcipher (crypto_default_null_skcipher); + tfm = crypto_default_null_skcipher; crypto_default_null_skcipher =NULL ; } -mutex_unlock (&crypto_default_null_skcipher_lock); +spin_unlock_bh (&crypto_default_null_skcipher_lock); + +crypto_free_sync_skcipher (tfm); }EXPORT_SYMBOL_GPL (crypto_put_default_null_skcipher);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 185/311 bpf: Fix kmemleak warning for percpu hashmap
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yonghong Song <[email protected]>
[ Upstream commit 11ba7ce076e5903e7bdc1fd1498979c331b3c286 ]
Vlad Poenaru reported the following kmemleak issue:
unreferenced object 0x606fd7c44ac8 (size 32):
backtrace (crc 0):
pcpu_alloc_noprof+0x730/0xeb0
bpf_map_alloc_percpu+0x69/0xc0
prealloc_init+0x9d/0x1b0
htab_map_alloc+0x363/0x510
map_create+0x215/0x3a0
__sys_bpf+0x16b/0x3e0
__x64_sys_bpf+0x18/0x20
do_syscall_64+0x7b/0x150
entry_SYSCALL_64_after_hwframe+0x4b/0x53Further investigation shows the reason is due to not 8-byte aligned store of percpu pointer in htab_elem_set_ptr():
*(void __percpu **)(l->key + key_size) = pptr;
Note that the whole htab_elem alignment is 8 (for x86_64). If the key_size is 4, that means pptr is stored in a location which is 4 byte aligned but not 8 byte aligned. In mm/kmemleak.c, scan_block() scans the memory based on 8 byte stride, so it won't detect above pptr, hence reporting the memory leak.
In htab_map_alloc(), we already have
htab->elem_size = sizeof(struct htab_elem) +
round_up(htab->map.key_size, 8);
if (percpu)
htab->elem_size += sizeof(void *);
else
htab->elem_size += round_up(htab->map.value_size, 8);So storing pptr with 8-byte alignment won't cause any problem and can fix kmemleak too.
The issue can be reproduced with bpf selftest as well:
1. Enable CONFIG_DEBUG_KMEMLEAK config
2. Add a getchar() before skel destroy in test_hash_map() in prog_tests/for_each.c. The purpose is to keep map available so kmemleak can be detected.
3. run './test_progs -t for_each/hash_map &' and a kmemleak should be reported.
--- kernel/bpf/hashtab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/hashtab.c +3 -3
@@ -198,12 +198,12 @@ static bool htab_is_percpu(const struct bpf_htab *htab)static inline void htab_elem_set_ptr (struct htab_elem *l,u32 key_size,void __percpu *pptr) { - *(void __percpu **)(l->key + key_size) = pptr; + *(void __percpu **)(l->key +roundup (key_size,8 )) = pptr; }static inline void __percpu *htab_elem_get_ptr (struct htab_elem *l,u32 key_size) { -return *(void __percpu **)(l->key + key_size); +return *(void __percpu **)(l->key +roundup (key_size,8 )); }static void *fd_htab_map_get_ptr (const struct bpf_map *map,struct htab_elem *l)
@@ -2354,7 +2354,7 @@ static int htab_percpu_map_gen_lookup(struct bpf_map *map, struct bpf_insn *insn *insn++ =BPF_EMIT_CALL (__htab_map_lookup_elem); *insn++ =BPF_JMP_IMM (BPF_JEQ ,BPF_REG_0 ,0 ,3 ); *insn++ =BPF_ALU64_IMM (BPF_ADD ,BPF_REG_0 , - offsetof(struct htab_elem , key) + map->key_size); + offsetof(struct htab_elem , key) +roundup (map->key_size,8 )); *insn++ =BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_0 ,0 ); *insn++ =BPF_MOV64_PERCPU_REG (BPF_REG_0 ,BPF_REG_0 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 186/311 bpf: Fix deadlock between rcu_tasks_trace and event_mutex.
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Starovoitov <[email protected]>
[ Upstream commit 4580f4e0ebdf8dc8d506ae926b88510395a0c1d1 ]
Fix the following deadlock:
CPU A_free_event()
perf_kprobe_destroy()
mutex_lock(&event_mutex)
perf_trace_event_unreg()
synchronize_rcu_tasks_trace()
There are several paths where _free_event() grabs event_mutex and calls sync_rcu_tasks_trace. Above is one such case.
CPU Bbpf_prog_test_run_syscall()
rcu_read_lock_trace()
bpf_prog_run_pin_on_cpu()
bpf_prog_load()
bpf_tracing_func_proto()
trace_set_clr_event()
mutex_lock(&event_mutex)Delegate trace_set_clr_event() to workqueue to avoid such lock dependency.
--- kernel/trace/bpf_trace.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/trace/bpf_trace.c +4 -3
@@ -392,7 +392,7 @@ static const struct bpf_func_proto bpf_trace_printk_proto = { .arg2_type = ARG_CONST_SIZE, }; -static void __set_printk_clr_event (void ) +static void __set_printk_clr_event (struct work_struct *work) {/* * This program might be calling bpf_trace_printk,
@@ -405,10 +405,11 @@ static void __set_printk_clr_event(void)if (trace_set_clr_event ("bpf_trace" ,"bpf_trace_printk" ,1 ))pr_warn_ratelimited ("could not enable bpf_trace_printk events" ); } +static DECLARE_WORK(set_printk_work, __set_printk_clr_event);const struct bpf_func_proto *bpf_get_trace_printk_proto (void ) { -__set_printk_clr_event (); +schedule_work (&set_printk_work);return &bpf_trace_printk_proto; }
@@ -451,7 +452,7 @@ static const struct bpf_func_proto bpf_trace_vprintk_proto = {const struct bpf_func_proto *bpf_get_trace_vprintk_proto (void ) { -__set_printk_clr_event (); +schedule_work (&set_printk_work);return &bpf_trace_vprintk_proto; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 187/311 clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Stuebner <[email protected]>
[ Upstream commit b20150d499b3ee5c2d632fbc5ac94f98dd33accf ]
of_clk_get_hw_from_clkspec() checks all available clock-providers by comparing their of nodes to the one from the clkspec. If no matching clock provider is found, the function returns -EPROBE_DEFER to cause a re-check at a later date. If a matching clock provider is found, an authoritative answer can be retrieved from it whether the clock exists or not.
This does not take into account that the clock-provider may never appear, because it's node is disabled. This can happen when a clock is optional, provided by a separate block which never gets enabled.
One example of this happening is the rk3588's VOP, which has optional additional display clocks coming from PLLs inside the hdmiphy blocks. These can be used for better rates, but the system will also work without them.
The problem around that is described in the followups to[1]. As we already know the of node of the presumed clock provider, add a check via of_device_is_available() whether this is a "valid" device node. This prevents eternal defer loops.
--- drivers/clk/clk.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/clk/clk.c +4 -0
@@ -5258,6 +5258,10 @@ of_clk_get_hw_from_clkspec(struct of_phandle_args *clkspec)if (!clkspec)return ERR_PTR (-EINVAL ); +/* Check if node in clkspec is in disabled/fail state */ +if (!of_device_is_available (clkspec->np)) +return ERR_PTR (-ENOENT ); +mutex_lock (&of_clk_mutex);list_for_each_entry (provider, &of_clk_providers, link) {if (provider->node == clkspec->np) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 188/311 parisc: PDT: Fix missing prototype warning
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu-Chun Lin <[email protected]>
[ Upstream commit b899981750dcb958ceffa4462d903963ee494aa2 ]
As reported by the kernel test robot, the following error occurs:
arch/parisc/kernel/pdt.c:65:6: warning: no previous prototype for 'arch_report_meminfo' [-Wmissing-prototypes]
65 | void arch_report_meminfo(struct seq_file *m)
| ^~~~~~~~~~~~~~~~~~~
arch_report_meminfo() is declared in include/linux/proc_fs.h and only defined when CONFIG_PROC_FS is enabled. Wrap its definition in #ifdef CONFIG_PROC_FS to fix the -Wmissing-prototypes warning.
--- arch/parisc/kernel/pdt.c | 2 ++ 1 file changed, 2 insertions(+)
arch/parisc/kernel/pdt.c +2 -0
@@ -63,6 +63,7 @@ static unsigned long pdt_entry[MAX_PDT_ENTRIES] __page_aligned_bss;#define PDT_ADDR_PERM_ERR (pdt_type != PDT_PDC ? 2UL : 0UL)#define PDT_ADDR_SINGLE_ERR 1UL +#ifdef CONFIG_PROC_FS /* report PDT entries via /proc/meminfo */ void arch_report_meminfo (struct seq_file *m) {
@@ -74,6 +75,7 @@ void arch_report_meminfo(struct seq_file *m)seq_printf (m,"PDT_cur_entries: %7lu\n" , pdt_status.pdt_entries); } +#endif static int get_info_pat_new (void ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 189/311 s390/sclp: Add check for get_zeroed_page()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
[ Upstream commit 3db42c75a921854a99db0a2775814fef97415bac ]
Add check for the return value of get_zeroed_page() in sclp_console_init() to prevent null pointer dereference. Furthermore, to solve the memory leak caused by the loop allocation, add a free helper to do the free job.
--- drivers/s390/char/sclp_con.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/s390/char/sclp_con.c +17 -0
@@ -263,6 +263,19 @@ static struct console sclp_console = .index = 0 /* ttyS0 */ }; +/* +* Release allocated pages. +*/ +static void __init __sclp_console_free_pages (void ) +{ +struct list_head *page, *p; + +list_for_each_safe (page, p, &sclp_con_pages) { +list_del (page); +free_page ((unsigned long )page); + } +} +/* * called by console_init() in drivers/char/tty_io.c at boot-time. */
@@ -282,6 +295,10 @@ sclp_console_init(void)/* Allocate pages for output buffering */ for (i =0 ; i < sclp_console_pages; i++) { page = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA ); +if (!page) { +__sclp_console_free_pages (); +return -ENOMEM ; + }list_add_tail (page, &sclp_con_pages); } sclp_conbuf =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 190/311 s390/tty: Fix a potential memory leak bug
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
[ Upstream commit ad9bb8f049717d64c5e62b2a44954be9f681c65b ]
The check for get_zeroed_page() leads to a direct return and overlooked the memory leak caused by loop allocation. Add a free helper to free spaces allocated by get_zeroed_page().
--- drivers/s390/char/sclp_tty.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/s390/char/sclp_tty.c +12 -0
@@ -490,6 +490,17 @@ static const struct tty_operations sclp_ops = { .flush_buffer = sclp_tty_flush_buffer, }; +/* Release allocated pages. */ +static void __init __sclp_tty_free_pages (void ) +{ +struct list_head *page, *p; + +list_for_each_safe (page, p, &sclp_tty_pages) { +list_del (page); +free_page ((unsigned long )page); + } +} +static int __init sclp_tty_init (void ) {
@@ -516,6 +527,7 @@ sclp_tty_init(void)for (i =0 ; i <MAX_KMEM_PAGES ; i++) { page = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (page ==NULL ) { +__sclp_tty_free_pages ();tty_driver_kref_put (driver);return -ENOMEM ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 191/311 clk: renesas: rzv2h: Adjust for CPG_BUS_m_MSTOP starting from m = 1
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biju Das <[email protected]>
[ Upstream commit 69ac2acd209a15bd7a61a15c9532a5b505252e1c ]
Avoid using the "- 1" for finding mstop_index in all functions accessing priv->mstop_count, by adjusting its pointer in rzv2h_cpg_probe().
While at it, drop the intermediate local variable index.
--- drivers/clk/renesas/rzv2h-cpg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/clk/renesas/rzv2h-cpg.c +6 -6
@@ -447,8 +447,7 @@ static void rzv2h_mod_clock_mstop_enable(struct rzv2h_cpg_priv *priv, {unsigned long mstop_mask =FIELD_GET (BUS_MSTOP_BITS_MASK , mstop_data);u16 mstop_index =FIELD_GET (BUS_MSTOP_IDX_MASK , mstop_data); -unsigned int index = (mstop_index -1 ) *16 ; -atomic_t *mstop = &priv->mstop_count[index]; +atomic_t *mstop = &priv->mstop_count[mstop_index *16 ];unsigned long flags;unsigned int i;u32 val =0 ;
@@ -469,8 +468,7 @@ static void rzv2h_mod_clock_mstop_disable(struct rzv2h_cpg_priv *priv, {unsigned long mstop_mask =FIELD_GET (BUS_MSTOP_BITS_MASK , mstop_data);u16 mstop_index =FIELD_GET (BUS_MSTOP_IDX_MASK , mstop_data); -unsigned int index = (mstop_index -1 ) *16 ; -atomic_t *mstop = &priv->mstop_count[index]; +atomic_t *mstop = &priv->mstop_count[mstop_index *16 ];unsigned long flags;unsigned int i;u32 val =0 ;
@@ -630,8 +628,7 @@ rzv2h_cpg_register_mod_clk(const struct rzv2h_mod_clk *mod, }else if (clock->mstop_data !=BUS_MSTOP_NONE && mod->critical) {unsigned long mstop_mask =FIELD_GET (BUS_MSTOP_BITS_MASK , clock->mstop_data);u16 mstop_index =FIELD_GET (BUS_MSTOP_IDX_MASK , clock->mstop_data); -unsigned int index = (mstop_index -1 ) *16 ; -atomic_t *mstop = &priv->mstop_count[index]; +atomic_t *mstop = &priv->mstop_count[mstop_index *16 ];unsigned long flags;unsigned int i;u32 val =0 ;
@@ -926,6 +923,9 @@ static int __init rzv2h_cpg_probe(struct platform_device *pdev)if (!priv->mstop_count)return -ENOMEM ; +/* Adjust for CPG_BUS_m_MSTOP starting from m = 1 */ + priv->mstop_count -=16 ; + priv->resets =devm_kmemdup (dev, info->resets,sizeof (*info->resets) * info->num_resets,GFP_KERNEL );if (!priv->resets)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 192/311 selftests/bpf: Fix cap_enable_effective() return code
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Feng Yang <[email protected]>
[ Upstream commit 339c1f8ea11cc042c30c315c1a8f61e4b8a90117 ]
The caller of cap_enable_effective() expects negative error code. Fix it.
Before:
failed to restore CAP_SYS_ADMIN: -1, Unknown error -1
After:
failed to restore CAP_SYS_ADMIN: -3, No such process failed to restore CAP_SYS_ADMIN: -22, Invalid argument
--- tools/testing/selftests/bpf/cap_helpers.c | 8 ++++---- tools/testing/selftests/bpf/cap_helpers.h | 1 + tools/testing/selftests/bpf/prog_tests/verifier.c | 4 ++-- tools/testing/selftests/bpf/test_loader.c | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-)
tools/testing/selftests/bpf/cap_helpers.c +4 -4
@@ -19,7 +19,7 @@ int cap_enable_effective(__u64 caps, __u64 *old_caps) err =capget (&hdr, data);if (err) -return err; +return -errno;if (old_caps) *old_caps = (__u64)(data[1 ].effective) <<32 | data[0 ].effective;
@@ -32,7 +32,7 @@ int cap_enable_effective(__u64 caps, __u64 *old_caps) data[1 ].effective |= cap1; err =capset (&hdr, data);if (err) -return err; +return -errno;return 0 ; }
@@ -49,7 +49,7 @@ int cap_disable_effective(__u64 caps, __u64 *old_caps) err =capget (&hdr, data);if (err) -return err; +return -errno;if (old_caps) *old_caps = (__u64)(data[1 ].effective) <<32 | data[0 ].effective;
@@ -61,7 +61,7 @@ int cap_disable_effective(__u64 caps, __u64 *old_caps) data[1 ].effective &= ~cap1; err =capset (&hdr, data);if (err) -return err; +return -errno;return 0 ; }
tools/testing/selftests/bpf/cap_helpers.h +1 -0
@@ -4,6 +4,7 @@#include <linux/types.h> #include <linux/capability.h> +#include <errno.h> #ifndef CAP_PERFMON #define CAP_PERFMON 38
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -2
@@ -121,7 +121,7 @@ static void run_tests_aux(const char *skel_name,/* test_verifier tests are executed w/o CAP_SYS_ADMIN, do the same here */ err =cap_disable_effective (1ULL <<CAP_SYS_ADMIN , &old_caps);if (err) { -PRINT_FAIL ("failed to drop CAP_SYS_ADMIN: %i, %s\n" , err,strerror (err)); +PRINT_FAIL ("failed to drop CAP_SYS_ADMIN: %i, %s\n" , err,strerror (-err));return ; }
@@ -131,7 +131,7 @@ static void run_tests_aux(const char *skel_name, err =cap_enable_effective (old_caps,NULL );if (err) -PRINT_FAIL ("failed to restore CAP_SYS_ADMIN: %i, %s\n" , err,strerror (err)); +PRINT_FAIL ("failed to restore CAP_SYS_ADMIN: %i, %s\n" , err,strerror (-err)); }#define RUN (skel) run_tests_aux(#skel, skel##__elf_bytes, NULL)
tools/testing/selftests/bpf/test_loader.c +3 -3
@@ -773,7 +773,7 @@ static int drop_capabilities(struct cap_state *caps) err =cap_disable_effective (caps_to_drop, &caps->old_caps);if (err) { -PRINT_FAIL ("failed to drop capabilities: %i, %s\n" , err,strerror (err)); +PRINT_FAIL ("failed to drop capabilities: %i, %s\n" , err,strerror (-err));return err; }
@@ -790,7 +790,7 @@ static int restore_capabilities(struct cap_state *caps) err =cap_enable_effective (caps->old_caps,NULL );if (err) -PRINT_FAIL ("failed to restore capabilities: %i, %s\n" , err,strerror (err)); +PRINT_FAIL ("failed to restore capabilities: %i, %s\n" , err,strerror (-err)); caps->initialized = false;return err; }
@@ -959,7 +959,7 @@ void run_subtest(struct test_loader *tester,if (subspec->caps) { err =cap_enable_effective (subspec->caps,NULL );if (err) { -PRINT_FAIL ("failed to set capabilities: %i, %s\n" , err,strerror (err)); +PRINT_FAIL ("failed to set capabilities: %i, %s\n" , err,strerror (-err)); goto subtest_cleanup; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 193/311 bpf: bpftool: Setting error code in do_loader()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sewon Nam <[email protected]>
[ Upstream commit 02a4694107b4c830d4bd6d194e98b3ac0bc86f29 ]
We are missing setting error code in do_loader() when bpf_object__open_file() fails. This means the command's exit status code will be successful, even though the operation failed. So make sure to return the correct error code. To maintain consistency with other locations where bpf_object__open_file() is called, return -1.
[0] Closes: https://github.com/libbpf/bpftool/issues/156
--- tools/bpf/bpftool/prog.c | 1 + 1 file changed, 1 insertion(+)
tools/bpf/bpftool/prog.c +1 -0
@@ -1928,6 +1928,7 @@ static int do_loader(int argc, char **argv) obj =bpf_object__open_file (file, &open_opts);if (!obj) { + err =-1 ;p_err ("failed to open object file" ); goto err_close_obj; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 194/311 bpf: Only fails the busy counter check in bpf_cgrp_storage_get if it creates storage
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin KaFai Lau <[email protected]>
[ Upstream commit f4edc66e48a694b3e6d164cc71f059de542dfaec ]
The current cgrp storage has a percpu counter, bpf_cgrp_storage_busy, to detect potential deadlock at a spin_lock that the local storage acquires during new storage creation.
There are false positives. It turns out to be too noisy in production. For example, a bpf prog may be doing a bpf_cgrp_storage_get on map_a. An IRQ comes in and triggers another bpf_cgrp_storage_get on a different map_b. It will then trigger the false positive deadlock check in the percpu counter. On top of that, both are doing lookup only and no need to create new storage, so practically it does not need to acquire the spin_lock.
The bpf_task_storage_get already has a strategy to minimize this false positive by only failing if the bpf_task_storage_get needs to create a new storage and the percpu counter is busy. Creating a new storage is the only time it must acquire the spin_lock.
This patch borrows the same idea. Unlike task storage that has a separate variant for tracing (_recur) and non-tracing, this patch stays with one bpf_cgrp_storage_get helper to keep it simple for now in light of the upcoming res_spin_lock.
The variable could potentially use a better name noTbusy instead of nobusy. This patch follows the same naming in bpf_task_storage_get for now.
I have tested it by temporarily adding noinline to
the cgroup_storage_lookup(), traced it by fentry, and the fentry program succeeded in calling bpf_cgrp_storage_get().
--- kernel/bpf/bpf_cgrp_storage.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
kernel/bpf/bpf_cgrp_storage.c +6 -5
@@ -161,6 +161,7 @@ BPF_CALL_5(bpf_cgrp_storage_get, struct bpf_map *, map, struct cgroup *, cgroup, void *, value, u64, flags, gfp_t, gfp_flags) { struct bpf_local_storage_data *sdata; +bool nobusy;WARN_ON_ONCE (!bpf_rcu_lock_held ());if (flags & ~(BPF_LOCAL_STORAGE_GET_F_CREATE ))
@@ -169,21 +170,21 @@ BPF_CALL_5(bpf_cgrp_storage_get, struct bpf_map *, map, struct cgroup *, cgroup,if (!cgroup)return (unsigned long )NULL ; -if (!bpf_cgrp_storage_trylock ()) -return (unsigned long )NULL ; + nobusy =bpf_cgrp_storage_trylock (); - sdata =cgroup_storage_lookup (cgroup, map, true); + sdata =cgroup_storage_lookup (cgroup, map, nobusy);if (sdata) goto unlock;/* only allocate new storage, when the cgroup is refcounted */ if (!percpu_ref_is_dying (&cgroup->self.refcnt) && - (flags &BPF_LOCAL_STORAGE_GET_F_CREATE )) + (flags &BPF_LOCAL_STORAGE_GET_F_CREATE ) && nobusy) sdata =bpf_local_storage_update (cgroup, (struct bpf_local_storage_map *)map, value,BPF_NOEXIST , false, gfp_flags); unlock: -bpf_cgrp_storage_unlock (); +if (nobusy) +bpf_cgrp_storage_unlock ();return IS_ERR_OR_NULL (sdata) ? (unsigned long )NULL : (unsigned long )sdata->data; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 195/311 bpf: Reject attaching fexit/fmod_ret to __noreturn functions
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yafang Shao <[email protected]>
[ Upstream commit cfe816d469dce9c0864062cf65dd7b3c42adc6f8 ]
If we attach fexit/fmod_ret to __noreturn functions, it will cause an issue that the bpf trampoline image will be left over even if the bpf link has been destroyed. Take attaching do_exit() with fexit for example. The fexit works as follows,
bpf_trampoline
+ __bpf_tramp_enter
+ percpu_ref_get(&tr->pcref);
+ call do_exit()
+ __bpf_tramp_exit
+ percpu_ref_put(&tr->pcref);
Since do_exit() never returns, the refcnt of the trampoline image is never decremented, preventing it from being freed. That can be verified with as follows,
$ bpftool link show <<<< nothing output $ grep "bpf_trampoline_[0-9]" /proc/kallsyms ffffffffc04cb000 t bpf_trampoline_6442526459 [bpf] <<<< leftover
In this patch, all functions annotated with __noreturn are rejected, except for the following cases:
- Functions that result in a system reboot, such as panic, machine_real_restart and rust_begin_unwind
- Functions that are never executed by tasks, such as rest_init and cpu_startup_entry
- Functions implemented in assembly, such as rewind_stack_and_make_dead and xen_cpu_bringup_again, lack an associated BTF ID.
With this change, attaching fexit probes to functions like do_exit() will be rejected.
$ ./fexit libbpf: prog 'fexit': BPF program load failed: -EINVAL libbpf: prog 'fexit': -- BEGIN PROG LOAD LOG -- Attaching fexit/fmod_ret to __noreturn functions is rejected.
--- kernel/bpf/verifier.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
kernel/bpf/verifier.c +32 -0
@@ -22863,6 +22863,33 @@ BTF_ID(func, __rcu_read_unlock)#endif BTF_SET_END(btf_id_deny) +/* fexit and fmod_ret can't be used to attach to __noreturn functions. + * Currently, we must manually list all __noreturn functions here. Once a more + * robust solution is implemented, this workaround can be removed. + */ +BTF_SET_START(noreturn_deny) +#ifdef CONFIG_IA32_EMULATION +BTF_ID(func, __ia32_sys_exit) +BTF_ID(func, __ia32_sys_exit_group) +#endif +#ifdef CONFIG_KUNIT +BTF_ID(func, __kunit_abort) +BTF_ID(func, kunit_try_catch_throw) +#endif +#ifdef CONFIG_MODULES +BTF_ID(func, __module_put_and_kthread_exit) +#endif +#ifdef CONFIG_X86_64 +BTF_ID(func, __x64_sys_exit) +BTF_ID(func, __x64_sys_exit_group) +#endif +BTF_ID(func, do_exit) +BTF_ID(func, do_group_exit) +BTF_ID(func, kthread_complete_and_exit) +BTF_ID(func, kthread_exit) +BTF_ID(func, make_task_dead) +BTF_SET_END(noreturn_deny) + static bool can_be_sleepable(struct bpf_prog *prog) { if (prog->type == BPF_PROG_TYPE_TRACING) {
@@ -22951,6 +22978,11 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) }else if (prog->type ==BPF_PROG_TYPE_TRACING &&btf_id_set_contains (&btf_id_deny, btf_id)) {return -EINVAL ; + }else if ((prog->expected_attach_type ==BPF_TRACE_FEXIT || + prog->expected_attach_type ==BPF_MODIFY_RETURN ) && +btf_id_set_contains (&noreturn_deny, btf_id)) { +verbose (env,"Attaching fexit/fmod_ret to __noreturn functions is rejected.\n" ); +return -EINVAL ; } key =bpf_trampoline_compute_key (tgt_prog, prog->aux->attach_btf, btf_id);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 196/311 mailbox: pcc: Fix the possible race in updation of chan_in_use flag
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huisong Li <[email protected]>
[ Upstream commit 9779d45c749340ab461d595c1a4a664cb28f3007 ]
The function mbox_chan_received_data() calls the Rx callback of the mailbox client driver. The callback might set chan_in_use flag from pcc_send_data(). This flag's status determines whether the PCC channel is in use.
However, there is a potential race condition where chan_in_use is updated incorrectly due to concurrency between the interrupt handler (pcc_mbox_irq()) and the command sender(pcc_send_data()).
The 'chan_in_use' flag of a channel is set to true after sending a command. And the flag of the new command may be cleared erroneous by the interrupt handler afer mbox_chan_received_data() returns,
As a result, the interrupt being level triggered can't be cleared in pcc_mbox_irq() and it will be disabled after the number of handled times exceeds the specified value. The error log is as follows:
| kunpeng_hccs HISI04B2:00: PCC command executed timeout! | kunpeng_hccs HISI04B2:00: get port link status info failed, ret = -110 | irq 13: nobody cared (try booting with the "irqpoll" option) | Call trace: | dump_backtrace+0x0/0x210 | show_stack+0x1c/0x2c | dump_stack+0xec/0x130 | __report_bad_irq+0x50/0x190 | note_interrupt+0x1e4/0x260 | handle_irq_event+0x144/0x17c | handle_fasteoi_irq+0xd0/0x240 | __handle_domain_irq+0x80/0xf0 | gic_handle_irq+0x74/0x2d0 | el1_irq+0xbc/0x140 | mnt_clone_write+0x0/0x70 | file_update_time+0xcc/0x160 | fault_dirty_shared_page+0xe8/0x150 | do_shared_fault+0x80/0x1d0 | do_fault+0x118/0x1a4 | handle_pte_fault+0x154/0x230 | __handle_mm_fault+0x1ac/0x390 | handle_mm_fault+0xf0/0x250 | do_page_fault+0x184/0x454 | do_translation_fault+0xac/0xd4 | do_mem_abort+0x44/0xb4 | el0_da+0x40/0x74 | el0_sync_handler+0x60/0xb4 | el0_sync+0x168/0x180 | handlers: | pcc_mbox_irq | Disabling IRQ #13
To solve this issue, pcc_mbox_irq() must clear 'chan_in_use' flag before the call to mbox_chan_received_data().
(sudeep.holla: Minor updates to the subject, commit message and comment)
--- drivers/mailbox/pcc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/mailbox/pcc.c +7 -1
@@ -333,10 +333,16 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p)if (pcc_chan_reg_read_modify_write (&pchan->plat_irq_ack))return IRQ_NONE ; +/* +* Clear this flag after updating interrupt ack register and just +* before mbox_chan_received_data() which might call pcc_send_data() +* where the flag is set again to start new transfer. This is +* required to avoid any possible race in updatation of this flag. +*/ + pchan->chan_in_use = false;mbox_chan_received_data (chan,NULL );check_and_ack (pchan, chan); - pchan->chan_in_use = false;return IRQ_HANDLED ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 197/311 mailbox: pcc: Always clear the platform ack interrupt first
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudeep Holla <[email protected]>
[ Upstream commit cf1338c0e02880cd235a4590eeb15e2039c873bc ]
The PCC mailbox interrupt handler (pcc_mbox_irq()) currently checks for command completion flags and any error status before clearing the interrupt.
The below sequence highlights an issue in the handling of PCC mailbox interrupts, specifically when dealing with doorbell notifications and acknowledgment between the OSPM and the platform where type3 and type4 channels are sharing the interrupt.
-------------------------------------------------------------------------
| T | Platform Firmware | OSPM/Linux PCC driver | |---|---------------------------------|---------------------------------| | 1 | | Build message in shmem | | 2 | | Ring Type3 chan doorbell | | 3 | Receives the doorbell interrupt | | | 4 | Process the message from OSPM | | | 5 | Build response for the message | | | 6 | Ring Platform ACK interrupt on | | | | Type3 chan to OSPM | Received the interrupt | | 7 | Build Notification in Type4 Chan| | | 8 | | Start processing interrupt in | | | | pcc_mbox_irq() handler | | 9 | | Enter PCC handler for Type4 chan| |10 | | Check command complete cleared | |11 | | Read the notification | |12 | | Clear Platform ACK interrupt | | | No effect from the previous step yet as the Platform ACK | | | interrupt has not yet been triggered for this channel | |13 | Ring Platform ACK interrupt on | | | | Type4 chan to OSPM | | |14 | | Enter PCC handler for Type3 chan| |15 | | Command complete is set. | |16 | | Read the response. | |17 | | Clear Platform ACK interrupt | |18 | | Leave PCC handler for Type3 | |19 | | Leave pcc_mbox_irq() handler | |20 | | Re-enter pcc_mbox_irq() handler | |21 | | Enter PCC handler for Type4 chan| |22 | | Leave PCC handler for Type4 chan| |23 | | Enter PCC handler for Type3 chan| |24 | | Leave PCC handler for Type3 chan| |25 | | Leave pcc_mbox_irq() handler |
-------------------------------------------------------------------------
The key issue occurs when OSPM tries to acknowledge platform ack interrupt for a notification which is ready to be read and processed but the interrupt itself is not yet triggered by the platform.
This ineffective acknowledgment leads to an issue later in time where the interrupt remains pending as we exit the interrupt handler without clearing the platform ack interrupt as there is no pending response or notification. The interrupt acknowledgment order is incorrect.
To resolve this issue, the platform acknowledgment interrupt should always be cleared before processing the interrupt for any notifications or response.
--- drivers/mailbox/pcc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mailbox/pcc.c +4 -3
@@ -313,6 +313,10 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p)int ret; pchan = chan->con_priv; + +if (pcc_chan_reg_read_modify_write (&pchan->plat_irq_ack)) +return IRQ_NONE ; +if (pchan->type ==ACPI_PCCT_TYPE_EXT_PCC_MASTER_SUBSPACE && !pchan->chan_in_use)return IRQ_NONE ;
@@ -330,9 +334,6 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p)return IRQ_NONE ; } -if (pcc_chan_reg_read_modify_write (&pchan->plat_irq_ack)) -return IRQ_NONE ; -/* * Clear this flag after updating interrupt ack register and just * before mbox_chan_received_data() which might call pcc_send_data()
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 198/311 staging: gpib: Use min for calculating transfer length
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Penkler <[email protected]>
[ Upstream commit 76d54fd5471b10ee993c217928a39d7351eaff5c ]
In the accel read and write functions the transfer length was being calculated by an if statement setting it to the lesser of the remaining bytes to read/write and the fifo size.
Replace both instances with min() which is clearer and more compact.
--- drivers/staging/gpib/agilent_82350b/agilent_82350b.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/staging/gpib/agilent_82350b/agilent_82350b.c +2 -8
@@ -66,10 +66,7 @@ int agilent_82350b_accel_read(gpib_board_t *board, uint8_t *buffer, size_t lengtint j;int count; -if (num_fifo_bytes - i < agilent_82350b_fifo_size) - block_size = num_fifo_bytes - i; -else - block_size = agilent_82350b_fifo_size; + block_size =min (num_fifo_bytes - i, agilent_82350b_fifo_size);set_transfer_counter (a_priv, block_size);writeb (ENABLE_TI_TO_SRAM |DIRECTION_GPIB_TO_HOST , a_priv->gpib_base +SRAM_ACCESS_CONTROL_REG );
@@ -200,10 +197,7 @@ int agilent_82350b_accel_write(gpib_board_t *board, uint8_t *buffer, size_t lengfor (i =1 ; i < fifotransferlength;) {clear_bit (WRITE_READY_BN , &tms_priv->state); -if (fifotransferlength - i < agilent_82350b_fifo_size) - block_size = fifotransferlength - i; -else - block_size = agilent_82350b_fifo_size; + block_size =min (fifotransferlength - i, agilent_82350b_fifo_size);set_transfer_counter (a_priv, block_size);for (j =0 ; j < block_size; ++j, ++i) {// load data into board's sram
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 199/311 usb: host: max3421-hcd: Add missing spi_device_id table
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Stein <[email protected]>
[ Upstream commit 41d5e3806cf589f658f92c75195095df0b66f66a ]
"maxim,max3421" DT compatible is missing its SPI device ID entry, not allowing module autoloading and leading to the following message:
"SPI driver max3421-hcd has no spi_device_id for maxim,max3421"
Fix this by adding the spi_device_id table.
--- drivers/usb/host/max3421-hcd.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/host/max3421-hcd.c +7 -0
@@ -1946,6 +1946,12 @@ max3421_remove(struct spi_device *spi)usb_put_hcd (hcd); } +static const struct spi_device_id max3421_spi_ids[] = { + {"max3421" }, + { }, +}; +MODULE_DEVICE_TABLE (spi, max3421_spi_ids); +static const struct of_device_id max3421_of_match_table[] = { { .compatible ="maxim,max3421" , }, {},
@@ -1955,6 +1961,7 @@ MODULE_DEVICE_TABLE(of, max3421_of_match_table);static struct spi_driver max3421_driver = { .probe = max3421_probe, .remove = max3421_remove, + .id_table = max3421_spi_ids, .driver = { .name ="max3421-hcd" , .of_match_table = max3421_of_match_table,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 200/311 usb: typec: ucsi: return CCI and message from sync_control callback
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 667ecac55861281c1f5e107c8550ae893b3984f6 ]
Some of the drivers emulate or handle some of the commands in the platform-specific way. The code ends up being split between several callbacks, which complicates emulation.
In preparation to reworking such drivers, move read_cci() and read_message_in() calls into ucsi_sync_control_common().
--- drivers/usb/typec/ucsi/cros_ec_ucsi.c | 5 +++-- drivers/usb/typec/ucsi/ucsi.c | 19 +++++++++++-------- drivers/usb/typec/ucsi/ucsi.h | 6 ++++-- drivers/usb/typec/ucsi/ucsi_acpi.c | 5 +++-- drivers/usb/typec/ucsi/ucsi_ccg.c | 5 +++-- 5 files changed, 24 insertions(+), 16 deletions(-)
drivers/usb/typec/ucsi/cros_ec_ucsi.c +3 -2
@@ -105,12 +105,13 @@ static int cros_ucsi_async_control(struct ucsi *ucsi, u64 cmd)return 0 ; } -static int cros_ucsi_sync_control (struct ucsi *ucsi,u64 cmd) +static int cros_ucsi_sync_control (struct ucsi *ucsi,u64 cmd,u32 *cci, +void *data,size_t size) {struct cros_ucsi_data *udata =ucsi_get_drvdata (ucsi);int ret; - ret =ucsi_sync_control_common (ucsi, cmd); + ret =ucsi_sync_control_common (ucsi, cmd, cci, data, size);switch (ret) {case -EBUSY :/* EC may return -EBUSY if CCI.busy is set.
drivers/usb/typec/ucsi/ucsi.c +11 -8
@@ -55,7 +55,8 @@ void ucsi_notify_common(struct ucsi *ucsi, u32 cci) }EXPORT_SYMBOL_GPL (ucsi_notify_common); -int ucsi_sync_control_common (struct ucsi *ucsi,u64 command) +int ucsi_sync_control_common (struct ucsi *ucsi,u64 command,u32 *cci, +void *data,size_t size) {bool ack =UCSI_COMMAND (command) ==UCSI_ACK_CC_CI ;int ret;
@@ -80,6 +81,13 @@ int ucsi_sync_control_common(struct ucsi *ucsi, u64 command)else clear_bit (COMMAND_PENDING , &ucsi->flags); +if (!ret && cci) + ret = ucsi->ops->read_cci (ucsi, cci); + +if (!ret && data && + (*cci &UCSI_CCI_COMMAND_COMPLETE )) + ret = ucsi->ops->read_message_in (ucsi, data, size); +return ret; }EXPORT_SYMBOL_GPL (ucsi_sync_control_common);
@@ -95,7 +103,7 @@ static int ucsi_acknowledge(struct ucsi *ucsi, bool conn_ack) ctrl |=UCSI_ACK_CONNECTOR_CHANGE ; } -return ucsi->ops->sync_control (ucsi, ctrl); +return ucsi->ops->sync_control (ucsi, ctrl,NULL ,NULL ,0 ); } static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci,
@@ -108,9 +116,7 @@ static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci,if (size >UCSI_MAX_DATA_LENGTH (ucsi))return -EINVAL ; - ret = ucsi->ops->sync_control (ucsi, command); -if (ucsi->ops->read_cci (ucsi, cci)) -return -EIO ; + ret = ucsi->ops->sync_control (ucsi, command, cci, data, size);if (*cci &UCSI_CCI_BUSY )return ucsi_run_command (ucsi,UCSI_CANCEL , cci,NULL ,0 , false) ?: -EBUSY ;
@@ -127,9 +133,6 @@ static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci,else err =0 ; -if (!err && data &&UCSI_CCI_LENGTH (*cci)) - err = ucsi->ops->read_message_in (ucsi, data, size); -/* * Don't ACK connection change if there was an error. */
drivers/usb/typec/ucsi/ucsi.h +4 -2
@@ -79,7 +79,8 @@ struct ucsi_operations {int (*read_cci)(struct ucsi *ucsi,u32 *cci);int (*poll_cci)(struct ucsi *ucsi,u32 *cci);int (*read_message_in)(struct ucsi *ucsi,void *val,size_t val_len); -int (*sync_control)(struct ucsi *ucsi,u64 command); +int (*sync_control)(struct ucsi *ucsi,u64 command,u32 *cci, +void *data,size_t size);int (*async_control)(struct ucsi *ucsi,u64 command);bool (*update_altmodes)(struct ucsi *ucsi,struct ucsi_altmode *orig,struct ucsi_altmode *updated);
@@ -531,7 +532,8 @@ void ucsi_altmode_update_active(struct ucsi_connector *con);int ucsi_resume (struct ucsi *ucsi);void ucsi_notify_common (struct ucsi *ucsi,u32 cci); -int ucsi_sync_control_common (struct ucsi *ucsi,u64 command); +int ucsi_sync_control_common (struct ucsi *ucsi,u64 command,u32 *cci, +void *data,size_t size);#if IS_ENABLED (CONFIG_POWER_SUPPLY )int ucsi_register_port_psy (struct ucsi_connector *con);
drivers/usb/typec/ucsi/ucsi_acpi.c +3 -2
@@ -128,12 +128,13 @@ static int ucsi_gram_read_message_in(struct ucsi *ucsi, void *val, size_t val_lereturn ret; } -static int ucsi_gram_sync_control (struct ucsi *ucsi,u64 command) +static int ucsi_gram_sync_control (struct ucsi *ucsi,u64 command,u32 *cci, +void *data,size_t size) {struct ucsi_acpi *ua =ucsi_get_drvdata (ucsi);int ret; - ret =ucsi_sync_control_common (ucsi, command); + ret =ucsi_sync_control_common (ucsi, command, cci, data, size);if (ret <0 )return ret;
drivers/usb/typec/ucsi/ucsi_ccg.c +3 -2
@@ -628,7 +628,8 @@ static int ucsi_ccg_async_control(struct ucsi *ucsi, u64 command)return ccg_write (uc, reg, (u8 *)&command,sizeof (command)); } -static int ucsi_ccg_sync_control (struct ucsi *ucsi,u64 command) +static int ucsi_ccg_sync_control (struct ucsi *ucsi,u64 command,u32 *cci, +void *data,size_t size) {struct ucsi_ccg *uc =ucsi_get_drvdata (ucsi);struct ucsi_connector *con;
@@ -652,7 +653,7 @@ static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command)ucsi_ccg_update_set_new_cam_cmd (uc, con, &command); } - ret =ucsi_sync_control_common (ucsi, command); + ret =ucsi_sync_control_common (ucsi, command, cci, data, size); err_put:pm_runtime_put_sync (uc->dev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 201/311 usb: typec: ucsi: ccg: move command quirks to ucsi_ccg_sync_control()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 7f82635494ef3391ff6b542249793c7febf99c3f ]
It is easier to keep all command-specific quirks in a single place. Move them to ucsi_ccg_sync_control() as the code now allows us to return modified messages data.
--- drivers/usb/typec/ucsi/ucsi_ccg.c | 62 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 33 deletions(-)
drivers/usb/typec/ucsi/ucsi_ccg.c +29 -33
@@ -222,7 +222,6 @@ struct ucsi_ccg {u16 fw_build;struct work_struct pm_work; -u64 last_cmd_sent;bool has_multiple_dp;struct ucsi_ccg_altmode orig[UCSI_MAX_ALTMODES ];struct ucsi_ccg_altmode updated[UCSI_MAX_ALTMODES ];
@@ -538,9 +537,10 @@ static void ucsi_ccg_update_set_new_cam_cmd(struct ucsi_ccg *uc,* first and then vdo=0x3 */ static void ucsi_ccg_nvidia_altmode (struct ucsi_ccg *uc, -struct ucsi_altmode *alt) +struct ucsi_altmode *alt, +u64 command) { -switch (UCSI_ALTMODE_OFFSET (uc->last_cmd_sent)) { +switch (UCSI_ALTMODE_OFFSET (command)) {case NVIDIA_FTB_DP_OFFSET :if (alt[0 ].mid ==USB_TYPEC_NVIDIA_VLINK_DBG_VDO ) alt[0].mid = USB_TYPEC_NVIDIA_VLINK_DP_VDO |
@@ -578,37 +578,11 @@ static int ucsi_ccg_read_cci(struct ucsi *ucsi, u32 *cci)static int ucsi_ccg_read_message_in (struct ucsi *ucsi,void *val,size_t val_len) {struct ucsi_ccg *uc =ucsi_get_drvdata (ucsi); -struct ucsi_capability *cap; -struct ucsi_altmode *alt;spin_lock (&uc->op_lock);memcpy (val, uc->op_data.message_in, val_len);spin_unlock (&uc->op_lock); -switch (UCSI_COMMAND (uc->last_cmd_sent)) { -case UCSI_GET_CURRENT_CAM : -if (uc->has_multiple_dp) -ucsi_ccg_update_get_current_cam_cmd (uc, (u8 *)val); -break ; -case UCSI_GET_ALTERNATE_MODES : -if (UCSI_ALTMODE_RECIPIENT (uc->last_cmd_sent) == -UCSI_RECIPIENT_SOP ) { - alt = val; -if (alt[0 ].svid ==USB_TYPEC_NVIDIA_VLINK_SID ) -ucsi_ccg_nvidia_altmode (uc, alt); - } -break ; -case UCSI_GET_CAPABILITY : -if (uc->fw_build ==CCG_FW_BUILD_NVIDIA_TEGRA ) { - cap = val; - cap->features &= ~UCSI_CAP_ALT_MODE_DETAILS ; - } -break ; -default : -break ; - } - uc->last_cmd_sent =0 ; -return 0 ; }
@@ -639,11 +613,9 @@ static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command, u32 *cci,mutex_lock (&uc->lock);pm_runtime_get_sync (uc->dev); - uc->last_cmd_sent = command; - -if (UCSI_COMMAND (uc->last_cmd_sent) ==UCSI_SET_NEW_CAM && +if (UCSI_COMMAND (command) ==UCSI_SET_NEW_CAM && uc->has_multiple_dp) { - con_index = (uc->last_cmd_sent >>16 ) & + con_index = (command >>16 ) &UCSI_CMD_CONNECTOR_MASK ;if (con_index ==0 ) { ret = -EINVAL ;
@@ -655,6 +627,30 @@ static int ucsi_ccg_sync_control(struct ucsi *ucsi, u64 command, u32 *cci, ret =ucsi_sync_control_common (ucsi, command, cci, data, size); +switch (UCSI_COMMAND (command)) { +case UCSI_GET_CURRENT_CAM : +if (uc->has_multiple_dp) +ucsi_ccg_update_get_current_cam_cmd (uc, (u8 *)data); +break ; +case UCSI_GET_ALTERNATE_MODES : +if (UCSI_ALTMODE_RECIPIENT (command) ==UCSI_RECIPIENT_SOP ) { +struct ucsi_altmode *alt = data; + +if (alt[0 ].svid ==USB_TYPEC_NVIDIA_VLINK_SID ) +ucsi_ccg_nvidia_altmode (uc, alt, command); + } +break ; +case UCSI_GET_CAPABILITY : +if (uc->fw_build ==CCG_FW_BUILD_NVIDIA_TEGRA ) { +struct ucsi_capability *cap = data; + + cap->features &= ~UCSI_CAP_ALT_MODE_DETAILS ; + } +break ; +default : +break ; + } + err_put:pm_runtime_put_sync (uc->dev);mutex_unlock (&uc->lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 202/311 iio: adc: ad4695: make ad4695_exit_conversion_mode() more robust
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trevor Gamblin <[email protected]>
[ Upstream commit 998d20e4e99d909f14d96fdf0bdcf860f7efe3ef ]
Ensure that conversion mode is successfully exited when the command is issued by adding an extra transfer beforehand, matching the minimum CNV high and low times from the AD4695 datasheet. The AD4695 has a quirk where the exit command only works during a conversion, so guarantee this happens by triggering a conversion in ad4695_exit_conversion_mode(). Then make this even more robust by ensuring that the exit command is run at AD4695_REG_ACCESS_SCLK_HZ rather than the bus maximum.
--- drivers/iio/adc/ad4695.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)
drivers/iio/adc/ad4695.c +28 -6
@@ -92,6 +92,8 @@#define AD4695_T_REFBUF_MS 100#define AD4695_T_REGCONFIG_NS 20#define AD4695_T_SCK_CNV_DELAY_NS 80 +#define AD4695_T_CNVL_NS 80 +#define AD4695_T_CNVH_NS 10#define AD4695_REG_ACCESS_SCLK_HZ (10 * MEGA)/* Max number of voltage input channels. */
@@ -364,11 +366,31 @@ static int ad4695_enter_advanced_sequencer_mode(struct ad4695_state *st, u32 n)*/ static int ad4695_exit_conversion_mode (struct ad4695_state *st) { -struct spi_transfer xfer = { - .tx_buf = &st->cnv_cmd2, - .len =1 , - .delay.value =AD4695_T_REGCONFIG_NS , - .delay.unit =SPI_DELAY_UNIT_NSECS , +/* +* An extra transfer is needed to trigger a conversion here so +* that we can be 100% sure the command will be processed by the +* ADC, rather than relying on it to be in the correct state +* when this function is called (this chip has a quirk where the +* command only works when reading a conversion, and if the +* previous conversion was already read then it won't work). The +* actual conversion command is then run at the slower +* AD4695_REG_ACCESS_SCLK_HZ speed to guarantee this works. +*/ +struct spi_transfer xfers[] = { + { + .delay.value =AD4695_T_CNVL_NS , + .delay.unit =SPI_DELAY_UNIT_NSECS , + .cs_change =1 , + .cs_change_delay.value =AD4695_T_CNVH_NS , + .cs_change_delay.unit =SPI_DELAY_UNIT_NSECS , + }, + { + .speed_hz =AD4695_REG_ACCESS_SCLK_HZ , + .tx_buf = &st->cnv_cmd2, + .len =1 , + .delay.value =AD4695_T_REGCONFIG_NS , + .delay.unit =SPI_DELAY_UNIT_NSECS , + }, };/*
@@ -377,7 +399,7 @@ static int ad4695_exit_conversion_mode(struct ad4695_state *st)*/ st->cnv_cmd2 =AD4695_CMD_EXIT_CNV_MODE <<3 ; -return spi_sync_transfer (st->spi, &xfer,1 ); +return spi_sync_transfer (st->spi, xfers,ARRAY_SIZE (xfers)); }static int ad4695_set_ref_voltage (struct ad4695_state *st,int vref_mv)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 203/311 fs/ntfs3: Keep write operations atomic
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lizhi Xu <[email protected]>
[ Upstream commit 285cec318bf5a7a6c8ba999b2b6ec96f9a20590f ]
syzbot reported a NULL pointer dereference in __generic_file_write_iter. [1]
Before the write operation is completed, the user executes ioctl[2] to clear the compress flag of the file, which causes the is_compressed() judgment to return 0, further causing the program to enter the wrong process and call the wrong ops ntfs_aops_cmpr, which triggers the null pointer dereference of write_begin.
Use inode lock to synchronize ioctl and write to avoid this case.
[1]
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000
Mem abort info:
ESR = 0x0000000086000006
EC = 0x21: IABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC = 0x06: level 2 translation fault
user pgtable: 4k pages, 48-bit VAs, pgdp=000000011896d000
[0000000000000000] pgd=0800000118b44403, p4d=0800000118b44403, pud=0800000117517403, pmd=0000000000000000
Internal error: Oops: 0000000086000006 [#1] PREEMPT SMP Modules linked in: CPU: 0 UID: 0 PID: 6427 Comm: syz-executor347 Not tainted 6.13.0-rc3-syzkaller-g573067a5a685 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024 pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : 0x0 lr : generic_perform_write+0x29c/0x868 mm/filemap.c:4055
sp : ffff80009d4978a0
x29: ffff80009d4979c0 x28: dfff800000000000 x27: ffff80009d497bc8
x26: 0000000000000000 x25: ffff80009d497960 x24: ffff80008ba71c68
x23: 0000000000000000 x22: ffff0000c655dac0 x21: 0000000000001000
x20: 000000000000000c x19: 1ffff00013a92f2c x18: ffff0000e183aa1c
x17: 0004060000000014 x16: ffff800083275834 x15: 0000000000000001
x14: 0000000000000000 x13: 0000000000000001 x12: ffff0000c655dac0
x11: 0000000000ff0100 x10: 0000000000ff0100 x9 : 0000000000000000 x8 : 0000000000000000 x7 : 0000000000000000 x6 : 0000000000000000 x5 : ffff80009d497980 x4 : ffff80009d497960 x3 : 0000000000001000 x2 : 0000000000000000 x1 : ffff0000e183a928 x0 : ffff0000d60b0fc0
Call trace: 0x0 (P) __generic_file_write_iter+0xfc/0x204 mm/filemap.c:4156 ntfs_file_write_iter+0x54c/0x630 fs/ntfs3/file.c:1267 new_sync_write fs/read_write.c:586 [inline] vfs_write+0x920/0xcf4 fs/read_write.c:679 ksys_write+0x15c/0x26c fs/read_write.c:731 __do_sys_write fs/read_write.c:742 [inline] __se_sys_write fs/read_write.c:739 [inline] __arm64_sys_write+0x7c/0x90 fs/read_write.c:739 __invoke_syscall arch/arm64/kernel/syscall.c:35 [inline] invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:49 el0_svc_common+0x130/0x23c arch/arm64/kernel/syscall.c:132 do_el0_svc+0x48/0x58 arch/arm64/kernel/syscall.c:151 el0_svc+0x54/0x168 arch/arm64/kernel/entry-common.c:744 el0t_64_sync_handler+0x84/0x108 arch/arm64/kernel/entry-common.c:762
[2]
ioctl$FS_IOC_SETFLAGS(r0, 0x40086602, &(0x7f00000000c0)=0x20)
--- fs/ntfs3/file.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
fs/ntfs3/file.c +10 -9
@@ -1246,21 +1246,22 @@ static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)ssize_t ret;int err; - err =check_write_restriction (inode); -if (err) -return err; - -if (is_compressed (ni) && (iocb->ki_flags &IOCB_DIRECT )) { -ntfs_inode_warn (inode,"direct i/o + compressed not supported" ); -return -EOPNOTSUPP ; - } -if (!inode_trylock (inode)) {if (iocb->ki_flags &IOCB_NOWAIT )return -EAGAIN ;inode_lock (inode); } + ret =check_write_restriction (inode); +if (ret) + goto out; + +if (is_compressed (ni) && (iocb->ki_flags &IOCB_DIRECT )) { +ntfs_inode_warn (inode,"direct i/o + compressed not supported" ); + ret = -EOPNOTSUPP ; + goto out; + } + ret =generic_write_checks (iocb, from);if (ret <=0 ) goto out;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 204/311 fs/ntfs3: Fix WARNING in ntfs_extend_initialized_size
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edward Adam Davis <[email protected]>
[ Upstream commit ff355926445897cc9fdea3b00611e514232c213c ]
Syzbot reported a WARNING in ntfs_extend_initialized_size. The data type of in->i_valid and to is u64 in ntfs_file_mmap(). If their values are greater than LLONG_MAX, overflow will occur because the data types of the parameters valid and new_valid corresponding to the function ntfs_extend_initialized_size() are loff_t.
Before calling ntfs_extend_initialized_size() in the ntfs_file_mmap(), the "ni->i_valid < to" has been determined, so the same WARN_ON determination is not required in ntfs_extend_initialized_size().
Just execute the ntfs_extend_initialized_size() in ntfs_extend() to make a WARN_ON check.
--- fs/ntfs3/file.c | 1 + 1 file changed, 1 insertion(+)
fs/ntfs3/file.c +1 -0
@@ -430,6 +430,7 @@ static int ntfs_extend(struct inode *inode, loff_t pos, size_t count, }if (extend_init && !is_compressed (ni)) { +WARN_ON (ni->i_valid >= pos); err =ntfs_extend_initialized_size (file, ni, ni->i_valid, pos);if (err) goto out;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 205/311 usb: dwc3: gadget: Refactor loop to avoid NULL endpoints
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit eafba0205426091354f050381c32ad1567c35844 ]
Prepare the gadget driver to handle the reserved endpoints that will be not allocated at the initialisation time.
While at it, add a warning where the NULL endpoint should never happen.
--- drivers/usb/dwc3/gadget.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/usb/dwc3/gadget.c +18 -4
@@ -547,6 +547,7 @@ static int dwc3_gadget_set_xfer_resource(struct dwc3_ep *dep)int dwc3_gadget_start_config (struct dwc3 *dwc,unsigned int resource_index) {struct dwc3_gadget_ep_cmd_params params; +struct dwc3_ep *dep;u32 cmd;int i;int ret;
@@ -563,8 +564,13 @@ int dwc3_gadget_start_config(struct dwc3 *dwc, unsigned int resource_index)return ret;/* Reset resource allocation flags */ -for (i = resource_index; i < dwc->num_eps && dwc->eps[i]; i++) - dwc->eps[i]->flags &= ~DWC3_EP_RESOURCE_ALLOCATED ; +for (i = resource_index; i < dwc->num_eps; i++) { + dep = dwc->eps[i]; +if (!dep) +continue ; + + dep->flags &= ~DWC3_EP_RESOURCE_ALLOCATED ; + }return 0 ; }
@@ -751,9 +757,11 @@ void dwc3_gadget_clear_tx_fifos(struct dwc3 *dwc) dwc->last_fifo_depth = fifo_depth;/* Clear existing TXFIFO for all IN eps except ep0 */ -for (num =3 ; num <min_t (int, dwc->num_eps,DWC3_ENDPOINTS_NUM ); - num +=2 ) { +for (num =3 ; num <min_t (int, dwc->num_eps,DWC3_ENDPOINTS_NUM ); num +=2 ) { dep = dwc->eps[num]; +if (!dep) +continue ; +/* Don't change TXFRAMNUM on usb31 version */ size =DWC3_IP_IS (DWC3 ) ?0 : dwc3_readl(dwc->regs, DWC3_GTXFIFOSIZ(num >> 1)) &
@@ -3703,6 +3711,8 @@ static bool dwc3_gadget_endpoint_trbs_complete(struct dwc3_ep *dep,for (i =0 ; i <DWC3_ENDPOINTS_NUM ; i++) { dep = dwc->eps[i]; +if (!dep) +continue ;if (!(dep->flags &DWC3_EP_ENABLED ))continue ;
@@ -3852,6 +3862,10 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc,u8 epnum = event->endpoint_number; dep = dwc->eps[epnum]; +if (!dep) { +dev_warn (dwc->dev,"spurious event, endpoint %u is not allocated\n" , epnum); +return ; + }if (!(dep->flags &DWC3_EP_ENABLED )) {if ((epnum >1 ) && !(dep->flags &DWC3_EP_TRANSFER_STARTED ))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 206/311 usb: dwc3: gadget: Avoid using reserved endpoints on Intel Merrifield
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 461f24bff86808ee5fbfe74751a825f8a7ab24e0 ]
Intel Merrifield SoC uses these endpoints for tracing and they cannot be re-allocated if being used because the side band flow control signals are hard wired to certain endpoints:
• 1 High BW Bulk IN (IN#1) (RTIT)
• 1 1KB BW Bulk IN (IN#8) + 1 1KB BW Bulk OUT (Run Control) (OUT#8)
In device mode, since RTIT (EP#1) and EXI/RunControl (EP#8) uses External Buffer Control (EBC) mode, these endpoints are to be mapped to EBC mode (to be done by EXI target driver). Additionally TRB for RTIT and EXI are maintained in STM (System Trace Module) unit and the EXI target driver will as well configure the TRB location for EP #1 IN and EP#8 (IN and OUT). Since STM/PTI and EXI hardware blocks manage these endpoints and interface to OTG3 controller through EBC interface, there is no need to enable any events (such as XferComplete etc) for these end points.
--- drivers/usb/dwc3/dwc3-pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/usb/dwc3/dwc3-pci.c +10 -0
@@ -148,11 +148,21 @@ static const struct property_entry dwc3_pci_intel_byt_properties[] = { {} }; +/* +* Intel Merrifield SoC uses these endpoints for tracing and they cannot +* be re-allocated if being used because the side band flow control signals +* are hard wired to certain endpoints: +* - 1 High BW Bulk IN (IN#1) (RTIT) +* - 1 1KB BW Bulk IN (IN#8) + 1 1KB BW Bulk OUT (Run Control) (OUT#8) +*/ +static const u8 dwc3_pci_mrfld_reserved_endpoints[] = {3 ,16 ,17 }; +static const struct property_entry dwc3_pci_mrfld_properties[] = {PROPERTY_ENTRY_STRING ("dr_mode" ,"otg" ),PROPERTY_ENTRY_STRING ("linux,extcon-name" ,"mrfld_bcove_pwrsrc" ),PROPERTY_ENTRY_BOOL ("snps,dis_u3_susphy_quirk" ),PROPERTY_ENTRY_BOOL ("snps,dis_u2_susphy_quirk" ), +PROPERTY_ENTRY_U8_ARRAY ("snps,reserved-endpoints" , dwc3_pci_mrfld_reserved_endpoints),PROPERTY_ENTRY_BOOL ("snps,usb2-gadget-lpm-disable" ),PROPERTY_ENTRY_BOOL ("linux,sysdev_is_parent" ), {}
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 207/311 sound/virtio: Fix cancel_sync warnings on uninitialized work_structs
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Stultz <[email protected]>
[ Upstream commit 3c7df2e27346eb40a0e86230db1ccab195c97cfe ]
Betty reported hitting the following warning:
[ 8.709131][ T221] WARNING: CPU: 2 PID: 221 at kernel/workqueue.c:4182 ... [ 8.713282][ T221] Call trace: [ 8.713365][ T221] __flush_work+0x8d0/0x914 [ 8.713468][ T221] __cancel_work_sync+0xac/0xfc [ 8.713570][ T221] cancel_work_sync+0x24/0x34 [ 8.713667][ T221] virtsnd_remove+0xa8/0xf8 [virtio_snd ab15f34d0dd772f6d11327e08a81d46dc9c36276] [ 8.713868][ T221] virtsnd_probe+0x48c/0x664 [virtio_snd ab15f34d0dd772f6d11327e08a81d46dc9c36276] [ 8.714035][ T221] virtio_dev_probe+0x28c/0x390 [ 8.714139][ T221] really_probe+0x1bc/0x4c8
...
It seems we're hitting the error path in virtsnd_probe(), which triggers a virtsnd_remove() which iterates over the substreams calling cancel_work_sync() on the elapsed_period work_struct.
Looking at the code, from earlier in:
virtsnd_probe()->virtsnd_build_devs()->virtsnd_pcm_parse_cfg()
We set snd->nsubstreams, allocate the snd->substreams, and if we then hit an error on the info allocation or something in virtsnd_ctl_query_info() fails, we will exit without having initialized the elapsed_period work_struct.
When that error path unwinds we then call virtsnd_remove() which as long as the substreams array is allocated, will iterate through calling cancel_work_sync() on the uninitialized work struct hitting this warning.
Takashi Iwai suggested this fix, which initializes the substreams structure right after allocation, so that if we hit the error paths we avoid trying to cleanup uninitialized data.
Note: I have not yet managed to reproduce the issue myself, so this patch has had limited testing.
Feedback or thoughts would be appreciated!
Message-Id: <[email protected]>
--- sound/virtio/virtio_pcm.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
sound/virtio/virtio_pcm.c +15 -6
@@ -339,6 +339,21 @@ int virtsnd_pcm_parse_cfg(struct virtio_snd *snd)if (!snd->substreams)return -ENOMEM ; +/* +* Initialize critical substream fields early in case we hit an +* error path and end up trying to clean up uninitialized structures +* elsewhere. +*/ +for (i =0 ; i < snd->nsubstreams; ++i) { +struct virtio_pcm_substream *vss = &snd->substreams[i]; + + vss->snd = snd; + vss->sid = i; +INIT_WORK (&vss->elapsed_period, virtsnd_pcm_period_elapsed); +init_waitqueue_head (&vss->msg_empty); +spin_lock_init (&vss->lock); + } + info =kcalloc (snd->nsubstreams,sizeof (*info),GFP_KERNEL );if (!info)return -ENOMEM ;
@@ -352,12 +367,6 @@ int virtsnd_pcm_parse_cfg(struct virtio_snd *snd)struct virtio_pcm_substream *vss = &snd->substreams[i];struct virtio_pcm *vpcm; - vss->snd = snd; - vss->sid = i; -INIT_WORK (&vss->elapsed_period, virtsnd_pcm_period_elapsed); -init_waitqueue_head (&vss->msg_empty); -spin_lock_init (&vss->lock); - rc =virtsnd_pcm_build_hw (vss, &info[i]);if (rc) goto on_exit;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 208/311 dmaengine: bcm2835-dma: fix warning when CONFIG_PM=n
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Wahren <[email protected]>
[ Upstream commit 95032938c7c9b2e5ebb69f0ee10ebe340fa3af53 ]
The old SET_LATE_SYSTEM_SLEEP_PM_OPS macro cause a build warning when CONFIG_PM is disabled:
warning: 'bcm2835_dma_suspend_late' defined but not used [-Wunused-function]
Change this to the modern replacement.
--- drivers/dma/bcm2835-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/bcm2835-dma.c +1 -1
@@ -893,7 +893,7 @@ static int bcm2835_dma_suspend_late(struct device *dev) }static const struct dev_pm_ops bcm2835_dma_pm_ops = { -SET_LATE_SYSTEM_SLEEP_PM_OPS (bcm2835_dma_suspend_late,NULL ) +LATE_SYSTEM_SLEEP_PM_OPS (bcm2835_dma_suspend_late,NULL ) };static int bcm2835_dma_probe (struct platform_device *pdev)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 209/311 usb: xhci: Complete error mid TD transfers when handling Missed Service
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Pecio <[email protected]>
[ Upstream commit bfa8459942822bdcc86f0e87f237c0723ae64948 ]
Missed Service Error after an error mid TD means that the failed TD has already been passed by the xHC without acknowledgment of the final TRB, a known hardware bug. So don't wait any more and give back the TD.
Reproduced on NEC uPD720200 under conditions of ludicrously bad USB link quality, confirmed to behave as expected using dynamic debug.
--- drivers/usb/host/xhci-ring.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-ring.c +5 -1
@@ -2789,7 +2789,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,xhci_dbg (xhci,"Miss service interval error for slot %u ep %u, set skip flag\n" , slot_id, ep_index); -return 0 ; +break ;case COMP_NO_PING_RESPONSE_ERROR : ep->skip = true; xhci_dbg(xhci,
@@ -2837,6 +2837,10 @@ static int handle_tx_event(struct xhci_hcd *xhci,xhci_dequeue_td (xhci, td, ep_ring, td->status); } +/* Missed TDs will be skipped on the next event */ +if (trb_comp_code ==COMP_MISSED_SERVICE_ERROR ) +return 0 ; +if (list_empty (&ep_ring->td_list)) {/* * Don't print wanings if ring is empty due to a stopped endpoint generating an
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 210/311 usb: xhci: Fix isochronous Ring Underrun/Overrun event handling
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Pecio <[email protected]>
[ Upstream commit 906dec15b9b321b546fd31a3c99ffc13724c7af4 ]
The TRB pointer of these events points at enqueue at the time of error occurrence on xHCI 1.1+ HCs or it's NULL on older ones. By the time we are handling the event, a new TD may be queued at this ring position.
I can trigger this race by rising interrupt moderation to increase IRQ handling delay. Similar delay may occur naturally due to system load.
If this ever happens after a Missed Service Error, missed TDs will be skipped and the new TD processed as if it matched the event. It could be given back prematurely, risking data loss or buffer UAF by the xHC.
Don't complete TDs on xrun events and don't warn if queued TDs don't match the event's TRB pointer, which can be NULL or a link/no-op TRB. Don't warn if there are no queued TDs at all.
Now that it's safe, also handle xrun events if the skip flag is clear. This ensures completion of any TD stuck in 'error mid TD' state right before the xrun event, which could happen if a driver submits a finite number of URBs to a buggy HC and then an error occurs on the last TD.
--- drivers/usb/host/xhci-ring.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/usb/host/xhci-ring.c +14 -6
@@ -2664,6 +2664,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,int status = -EINPROGRESS ;struct xhci_ep_ctx *ep_ctx;u32 trb_comp_code; +bool ring_xrun_event = false; slot_id =TRB_TO_SLOT_ID (le32_to_cpu (event->flags)); ep_index =TRB_TO_EP_ID (le32_to_cpu (event->flags)) -1 ;
@@ -2770,14 +2771,12 @@ static int handle_tx_event(struct xhci_hcd *xhci,* Underrun Event for OUT Isoch endpoint. */ xhci_dbg (xhci,"Underrun event on slot %u ep %u\n" , slot_id, ep_index); -if (ep->skip) -break ; -return 0 ; + ring_xrun_event = true; +break ;case COMP_RING_OVERRUN :xhci_dbg (xhci,"Overrun event on slot %u ep %u\n" , slot_id, ep_index); -if (ep->skip) -break ; -return 0 ; + ring_xrun_event = true; +break ;case COMP_MISSED_SERVICE_ERROR :/* * When encounter missed service error, one or more isoc tds
@@ -2850,6 +2849,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,*/ if (trb_comp_code !=COMP_STOPPED && trb_comp_code !=COMP_STOPPED_LENGTH_INVALID && + !ring_xrun_event && !ep_ring->last_td_was_short) {xhci_warn (xhci,"Event TRB for slot %u ep %u with no TDs queued\n" , slot_id, ep_index);
@@ -2884,6 +2884,10 @@ static int handle_tx_event(struct xhci_hcd *xhci, goto check_endpoint_halted; } +/* TD was queued after xrun, maybe xrun was on a link, don't panic yet */ +if (ring_xrun_event) +return 0 ; +/* * Skip the Force Stopped Event. The 'ep_trb' of FSE is not in the current * TD pointed by 'ep_ring->dequeue' because that the hardware dequeue
@@ -2930,6 +2934,10 @@ static int handle_tx_event(struct xhci_hcd *xhci,*/ }while (ep->skip); +/* Get out if a TD was queued at enqueue after the xrun occurred */ +if (ring_xrun_event) +return 0 ; +if (trb_comp_code ==COMP_SHORT_PACKET ) ep_ring->last_td_was_short = true;else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 211/311 xhci: Handle spurious events on Etron host isoc enpoints
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
[ Upstream commit b331a3d8097fad4e541d212684192f21fedbd6e5 ]
Unplugging a USB3.0 webcam from Etron hosts while streaming results in errors like this:
[ 2.646387] xhci_hcd 0000:03:00.0: ERROR Transfer event TRB DMA ptr not part of current TD ep_index 18 comp_code 13 [ 2.646446] xhci_hcd 0000:03:00.0: Looking for event-dma 000000002fdf8630 trb-start 000000002fdf8640 trb-end 000000002fdf8650 [ 2.646560] xhci_hcd 0000:03:00.0: ERROR Transfer event TRB DMA ptr not part of current TD ep_index 18 comp_code 13 [ 2.646568] xhci_hcd 0000:03:00.0: Looking for event-dma 000000002fdf8660 trb-start 000000002fdf8670 trb-end 000000002fdf8670
Etron xHC generates two transfer events for the TRB if an error is detected while processing the last TRB of an isoc TD.
The first event can be any sort of error (like USB Transaction or Babble Detected, etc), and the final event is Success.
The xHCI driver will handle the TD after the first event and remove it from its internal list, and then print an "Transfer event TRB DMA ptr not part of current TD" error message after the final event.
Commit 5372c65e1311 ("xhci: process isoc TD properly when there was a transaction error mid TD.") is designed to address isoc transaction errors, but unfortunately it doesn't account for this scenario.
This issue is similar to the XHCI_SPURIOUS_SUCCESS case where a success event follows a 'short transfer' event, but the TD the event points to is already given back.
Expand the spurious success 'short transfer' event handling to cover the spurious success after error on Etron hosts.
Kuangyi Chiang reported this issue and submitted a different solution based on using error_mid_td. This commit message is mostly taken from that patch.
--- drivers/usb/host/xhci-ring.c | 38 ++++++++++++++++++++++++------------ drivers/usb/host/xhci.h | 2 +- 2 files changed, 27 insertions(+), 13 deletions(-)
drivers/usb/host/xhci-ring.c +26 -12
@@ -2644,6 +2644,22 @@ static int handle_transferless_tx_event(struct xhci_hcd *xhci, struct xhci_virt_return 0 ; } +static bool xhci_spurious_success_tx_event (struct xhci_hcd *xhci, +struct xhci_ring *ring) +{ +switch (ring->old_trb_comp_code) { +case COMP_SHORT_PACKET : +return xhci->quirks &XHCI_SPURIOUS_SUCCESS ; +case COMP_USB_TRANSACTION_ERROR : +case COMP_BABBLE_DETECTED_ERROR : +case COMP_ISOCH_BUFFER_OVERRUN : +return xhci->quirks &XHCI_ETRON_HOST && + ring->type ==TYPE_ISOC ; +default : +return false; + } +} +/* * If this function returns an error condition, it means it got a Transfer * event with a corrupted Slot ID, Endpoint ID, or TRB DMA address.
@@ -2698,8 +2714,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,case COMP_SUCCESS :if (EVENT_TRB_LEN (le32_to_cpu (event->transfer_len)) !=0 ) { trb_comp_code =COMP_SHORT_PACKET ; -xhci_dbg (xhci,"Successful completion on short TX for slot %u ep %u with last td short %d\n" , - slot_id, ep_index, ep_ring->last_td_was_short); +xhci_dbg (xhci,"Successful completion on short TX for slot %u ep %u with last td comp code %d\n" , + slot_id, ep_index, ep_ring->old_trb_comp_code); }break ;case COMP_SHORT_PACKET :
@@ -2850,7 +2866,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,if (trb_comp_code !=COMP_STOPPED && trb_comp_code !=COMP_STOPPED_LENGTH_INVALID && !ring_xrun_event && - !ep_ring->last_td_was_short) { + !xhci_spurious_success_tx_event (xhci, ep_ring)) {xhci_warn (xhci,"Event TRB for slot %u ep %u with no TDs queued\n" , slot_id, ep_index); }
@@ -2902,11 +2918,12 @@ static int handle_tx_event(struct xhci_hcd *xhci,/* * Some hosts give a spurious success event after a short -* transfer. Ignore it. +* transfer or error on last TRB. Ignore it. */ -if ((xhci->quirks &XHCI_SPURIOUS_SUCCESS ) && - ep_ring->last_td_was_short) { - ep_ring->last_td_was_short = false; +if (xhci_spurious_success_tx_event (xhci, ep_ring)) { +xhci_dbg (xhci,"Spurious event dma %pad, comp_code %u after %u\n" , + &ep_trb_dma, trb_comp_code, ep_ring->old_trb_comp_code); + ep_ring->old_trb_comp_code = trb_comp_code;return 0 ; }
@@ -2934,15 +2951,12 @@ static int handle_tx_event(struct xhci_hcd *xhci,*/ }while (ep->skip); + ep_ring->old_trb_comp_code = trb_comp_code; +/* Get out if a TD was queued at enqueue after the xrun occurred */ if (ring_xrun_event)return 0 ; -if (trb_comp_code ==COMP_SHORT_PACKET ) - ep_ring->last_td_was_short = true; -else - ep_ring->last_td_was_short = false; - ep_trb = &ep_seg->trbs[(ep_trb_dma - ep_seg->dma) /sizeof (*ep_trb)];trace_xhci_handle_transfer (ep_ring, (struct xhci_generic_trb *) ep_trb, ep_trb_dma);
drivers/usb/host/xhci.h +1 -1
@@ -1371,7 +1371,7 @@ struct xhci_ring {unsigned int num_trbs_free;/* used only by xhci DbC */ unsigned int bounce_buf_len;enum xhci_ring_type type; -bool last_td_was_short; +u32 old_trb_comp_code;struct radix_tree_root *trb_address_map; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 212/311 i3c: master: svc: Add support for Nuvoton npcm845 i3c
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanley Chu <[email protected]>
[ Upstream commit 98d87600a04e42282797631aa6b98dd43999e274 ]
Nuvoton npcm845 SoC uses an older IP version, which has specific hardware issues that need to be addressed with a different compatible string.
Add driver data for different compatible strings to define platform specific quirks.
Add compatible string for npcm845 to define its own driver data.
--- drivers/i3c/master/svc-i3c-master.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/i3c/master/svc-i3c-master.c +16 -1
@@ -158,6 +158,10 @@ struct svc_i3c_regs_save {u32 mdynaddr; }; +struct svc_i3c_drvdata { +u32 quirks; +}; +/** * struct svc_i3c_master - Silvaco I3C Master structure * @base: I3C master controller
@@ -183,6 +187,7 @@ struct svc_i3c_regs_save {* @ibi.tbq_slot: To be queued IBI slot * @ibi.lock: IBI lock * @lock: Transfer lock, protect between IBI work thread and callbacks from master +* @drvdata: Driver data * @enabled_events: Bit masks for enable events (IBI, HotJoin). * @mctrl_config: Configuration value in SVC_I3C_MCTRL for setting speed back. */
@@ -214,6 +219,7 @@ struct svc_i3c_master {spinlock_t lock; } ibi;struct mutex lock; +const struct svc_i3c_drvdata *drvdata;u32 enabled_events;u32 mctrl_config; };
@@ -1817,6 +1823,10 @@ static int svc_i3c_master_probe(struct platform_device *pdev)if (!master)return -ENOMEM ; + master->drvdata =of_device_get_match_data (dev); +if (!master->drvdata) +return -EINVAL ; + master->regs =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (master->regs))return PTR_ERR (master->regs);
@@ -1958,8 +1968,13 @@ static const struct dev_pm_ops svc_i3c_pm_ops = { svc_i3c_runtime_resume, NULL) }; +static const struct svc_i3c_drvdata npcm845_drvdata = {}; + +static const struct svc_i3c_drvdata svc_default_drvdata = {}; +static const struct of_device_id svc_i3c_master_of_match_tbl[] = { - { .compatible ="silvaco,i3c-master-v1" }, + { .compatible ="nuvoton,npcm845-i3c" , .data = &npcm845_drvdata }, + { .compatible ="silvaco,i3c-master-v1" , .data = &svc_default_drvdata }, {/* sentinel */ }, };MODULE_DEVICE_TABLE (of, svc_i3c_master_of_match_tbl);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 213/311 dmaengine: dmatest: Fix dmatest waiting less when interrupted
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vinicius Costa Gomes <[email protected]>
[ Upstream commit e87ca16e99118ab4e130a41bdf12abbf6a87656c ]
Change the "wait for operation finish" logic to take interrupts into account.
When using dmatest with idxd DMA engine, it's possible that during longer tests, the interrupt notifying the finish of an operation happens during wait_event_freezable_timeout(), which causes dmatest to cleanup all the resources, some of which might still be in use.
This fix ensures that the wait logic correctly handles interrupts, preventing premature cleanup of resources.
--- drivers/dma/dmatest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/dma/dmatest.c +3 -3
@@ -841,9 +841,9 @@ static int dmatest_func(void *data) }else {dma_async_issue_pending (chan); -wait_event_freezable_timeout (thread->done_wait, - done->done, -msecs_to_jiffies (params->timeout)); +wait_event_timeout (thread->done_wait, + done->done, +msecs_to_jiffies (params->timeout)); status =dma_async_is_tx_complete (chan, cookie,NULL ,NULL );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 214/311 usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Pecio <[email protected]>
[ Upstream commit 28a76fcc4c85dd39633fb96edb643c91820133e3 ]
Nothing prevents a broken HC from claiming that an endpoint is Running and repeatedly rejecting Stop Endpoint with Context State Error.
Avoid infinite retries and give back cancelled TDs.
No such cases known so far, but HCs have bugs.
--- drivers/usb/host/xhci-ring.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-ring.c +7 -4
@@ -1198,16 +1198,19 @@ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id,* Stopped state, but it will soon change to Running. * * Assume this bug on unexpected Stop Endpoint failures. -* Keep retrying until the EP starts and stops again, on -* chips where this is known to help. Wait for 100ms. +* Keep retrying until the EP starts and stops again. */ -if (time_is_before_jiffies (ep->stop_time +msecs_to_jiffies (100 ))) -break ; fallthrough;case EP_STATE_RUNNING :/* Race, HW handled stop ep cmd before ep was running */ xhci_dbg (xhci,"Stop ep completion ctx error, ctx_state %d\n" ,GET_EP_CTX_STATE (ep_ctx)); +/* +* Don't retry forever if we guessed wrong or a defective HC never starts +* the EP or says 'Running' but fails the command. We must give back TDs. +*/ +if (time_is_before_jiffies (ep->stop_time +msecs_to_jiffies (100 ))) +break ; command =xhci_alloc_command (xhci, false,GFP_ATOMIC );if (!command) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 215/311 phy: rockchip: usbdp: Avoid call hpd_event_trigger in dp_phy_init
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Yan <[email protected]>
[ Upstream commit 28dc672a1a877c77b000c896abd8f15afcdc1b0c ]
Function rk_udphy_dp_hpd_event_trigger will set vogrf let it trigger HPD interrupt to DP by Type-C. This configuration is only required when the DP work in Alternate Mode, and called by typec_mux_set. In standard DP mode, such settings will prevent the DP from receiving HPD interrupts.
--- drivers/phy/rockchip/phy-rockchip-usbdp.c | 1 - 1 file changed, 1 deletion(-)
drivers/phy/rockchip/phy-rockchip-usbdp.c +0 -1
@@ -1045,7 +1045,6 @@ static int rk_udphy_dp_phy_init(struct phy *phy)mutex_lock (&udphy->mutex); udphy->dp_in_use = true; -rk_udphy_dp_hpd_event_trigger (udphy, udphy->dp_sink_hpd_cfg);mutex_unlock (&udphy->mutex);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 216/311 usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit 8c75f3e6a433d92084ad4e78b029ae680865420f ]
The variable d->name, returned by devm_kasprintf(), could be NULL. A pointer check is added to prevent potential NULL pointer dereference. This is similar to the fix in commit 3027e7b15b02
("ice: Fix some null pointer dereference issues in ice_ptp.c").
This issue is found by our static analysis tool
--- drivers/usb/gadget/udc/aspeed-vhub/dev.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/gadget/udc/aspeed-vhub/dev.c +3 -0
@@ -548,6 +548,9 @@ int ast_vhub_init_dev(struct ast_vhub *vhub, unsigned int idx) d->vhub = vhub; d->index = idx; d->name =devm_kasprintf (parent,GFP_KERNEL ,"port%d" , idx+1 ); +if (!d->name) +return -ENOMEM ; + d->regs = vhub->regs +0x100 +0x10 * idx;ast_vhub_init_ep0 (vhub, &d->ep0, d);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 217/311 usb: host: xhci-plat: mvebu: use ->quirks instead of ->init_quirk() func
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Théo Lebrun <[email protected]>
[ Upstream commit 64eb182d5f7a5ec30227bce4f6922ff663432f44 ]
Compatible "marvell,armada3700-xhci" match data uses the struct xhci_plat_priv::init_quirk() function pointer to add XHCI_RESET_ON_RESUME as quirk on XHCI.
Instead, use the struct xhci_plat_priv::quirks field.
--- drivers/usb/host/xhci-mvebu.c | 10 ---------- drivers/usb/host/xhci-mvebu.h | 6 ------ drivers/usb/host/xhci-plat.c | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-)
drivers/usb/host/xhci-mvebu.c +0 -10
@@ -73,13 +73,3 @@ int xhci_mvebu_mbus_init_quirk(struct usb_hcd *hcd)return 0 ; } - -int xhci_mvebu_a3700_init_quirk (struct usb_hcd *hcd) -{ -struct xhci_hcd *xhci =hcd_to_xhci (hcd); - -/* Without reset on resume, the HC won't work at all */ - xhci->quirks |=XHCI_RESET_ON_RESUME ; - -return 0 ; -}
drivers/usb/host/xhci-mvebu.h +0 -6
@@ -12,16 +12,10 @@ struct usb_hcd;#if IS_ENABLED (CONFIG_USB_XHCI_MVEBU )int xhci_mvebu_mbus_init_quirk (struct usb_hcd *hcd); -int xhci_mvebu_a3700_init_quirk (struct usb_hcd *hcd);#else static inline int xhci_mvebu_mbus_init_quirk (struct usb_hcd *hcd) {return 0 ; } - -static inline int xhci_mvebu_a3700_init_quirk (struct usb_hcd *hcd) -{ -return 0 ; -}#endif #endif /* __LINUX_XHCI_MVEBU_H */
drivers/usb/host/xhci-plat.c +1 -1
@@ -106,7 +106,7 @@ static const struct xhci_plat_priv xhci_plat_marvell_armada = { };static const struct xhci_plat_priv xhci_plat_marvell_armada3700 = { - .init_quirk = xhci_mvebu_a3700_init_quirk, + .quirks =XHCI_RESET_ON_RESUME , };static const struct xhci_plat_priv xhci_plat_brcm = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 218/311 thunderbolt: Scan retimers after device router has been enumerated
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mika Westerberg <[email protected]>
[ Upstream commit 75749d2c1d8cef439f8b69fa1f4f36d0fc3193e6 ]
Thomas reported connection issues on AMD system with Pluggable UD-4VPD dock. After some experiments it looks like the device has some sort of internal timeout that triggers reconnect. This is completely against the USB4 spec, as there is no requirement for the host to enumerate the device right away or even at all.
In Linux case the delay is caused by scanning of retimers on the link so we can work this around by doing the scanning after the device router has been enumerated.
--- drivers/thunderbolt/tb.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/thunderbolt/tb.c +14 -2
@@ -1305,11 +1305,15 @@ static void tb_scan_port(struct tb_port *port) goto out_rpm_put; } -tb_retimer_scan (port, true); - sw =tb_switch_alloc (port->sw->tb, &port->sw->dev,tb_downstream_route (port));if (IS_ERR (sw)) { +/* +* Make the downstream retimers available even if there +* is no router connected. +*/ +tb_retimer_scan (port, true); +/* * If there is an error accessing the connected switch * it may be connected to another domain. Also we allow
@@ -1359,6 +1363,14 @@ static void tb_scan_port(struct tb_port *port) upstream_port =tb_upstream_port (sw);tb_configure_link (port, upstream_port, sw); +/* +* Scan for downstream retimers. We only scan them after the +* router has been enumerated to avoid issues with certain +* Pluggable devices that expect the host to enumerate them +* within certain timeout. +*/ +tb_retimer_scan (port, true); +/* * CL0s and CL1 are enabled and supported together. * Silently ignore CLx enabling in case CLx is not supported.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 219/311 um: work around sched_yield not yielding in time-travel mode
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Berg <[email protected]>
[ Upstream commit 887c5c12e80c8424bd471122d2e8b6b462e12874 ]
sched_yield by a userspace may not actually cause scheduling in time-travel mode as no time has passed. In the case seen it appears to be a badly implemented userspace spinlock in ASAN. Unfortunately, with time-travel it causes an extreme slowdown or even deadlock depending on the kernel configuration (CONFIG_UML_MAX_USERSPACE_ITERATIONS).
Work around it by accounting time to the process whenever it executes a sched_yield syscall.
--- arch/um/include/linux/time-internal.h | 2 ++ arch/um/kernel/skas/syscall.c | 11 +++++++++++ 2 files changed, 13 insertions(+)
arch/um/include/linux/time-internal.h +2 -0
@@ -83,6 +83,8 @@ extern void time_travel_not_configured(void);#define time_travel_del_event (...) time_travel_not_configured()#endif /* CONFIG_UML_TIME_TRAVEL_SUPPORT */ +extern unsigned long tt_extra_sched_jiffies; +/* * Without CONFIG_UML_TIME_TRAVEL_SUPPORT this is a linker error if used, * which is intentional since we really shouldn't link it in that case.
arch/um/kernel/skas/syscall.c +11 -0
@@ -31,6 +31,17 @@ void handle_syscall(struct uml_pt_regs *r) goto out; syscall =UPT_SYSCALL_NR (r); + +/* +* If no time passes, then sched_yield may not actually yield, causing +* broken spinlock implementations in userspace (ASAN) to hang for long +* periods of time. +*/ +if ((time_travel_mode ==TT_MODE_INFCPU || + time_travel_mode ==TT_MODE_EXTERNAL ) && + syscall == __NR_sched_yield) + tt_extra_sched_jiffies +=1 ; +if (syscall >=0 && syscall < __NR_syscalls) {unsigned long ret =EXECUTE_SYSCALL (syscall, regs);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 220/311 iommu/arm-smmu-v3: Set MEV bit in nested STE for DoS mitigations
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolin Chen <[email protected]>
[ Upstream commit da0c56520e880441d0503d0cf0d6853dcfb5f1a4 ]
There is a DoS concern on the shared hardware event queue among devices passed through to VMs, that too many translation failures that belong to VMs could overflow the shared hardware event queue if those VMs or their VMMs don't handle/recover the devices properly.
The MEV bit in the STE allows to configure the SMMU HW to merge similar event records, though there is no guarantee. Set it in a nested STE for DoS mitigations.
In the future, we might want to enable the MEV for non-nested cases too such as domain->type == IOMMU_DOMAIN_UNMANAGED or even IOMMU_DOMAIN_DMA.
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 2 ++ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 ++-- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c +2 -0
@@ -43,6 +43,8 @@ static void arm_smmu_make_nested_cd_table_ste( target->data[0 ] |= nested_domain->ste[0 ] & ~cpu_to_le64 (STRTAB_STE_0_CFG ); target->data[1 ] |= nested_domain->ste[1 ]; +/* Merge events for DoS mitigations on eventq */ + target->data[1 ] |=cpu_to_le64 (STRTAB_STE_1_MEV ); }/*
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +2 -2
@@ -1052,7 +1052,7 @@ void arm_smmu_get_ste_used(const __le64 *ent, __le64 *used_bits)cpu_to_le64 (STRTAB_STE_1_S1DSS |STRTAB_STE_1_S1CIR |STRTAB_STE_1_S1COR |STRTAB_STE_1_S1CSH |STRTAB_STE_1_S1STALLD |STRTAB_STE_1_STRW | -STRTAB_STE_1_EATS ); +STRTAB_STE_1_EATS |STRTAB_STE_1_MEV ); used_bits[2 ] |=cpu_to_le64 (STRTAB_STE_2_S2VMID );/*
@@ -1068,7 +1068,7 @@ void arm_smmu_get_ste_used(const __le64 *ent, __le64 *used_bits)if (cfg &BIT (1 )) { used_bits[1 ] |=cpu_to_le64 (STRTAB_STE_1_S2FWB |STRTAB_STE_1_EATS | -STRTAB_STE_1_SHCFG ); +STRTAB_STE_1_SHCFG |STRTAB_STE_1_MEV ); used_bits[2 ] |= cpu_to_le64(STRTAB_STE_2_S2VMID | STRTAB_STE_2_VTCR | STRTAB_STE_2_S2AA64 | STRTAB_STE_2_S2ENDI |
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +1 -0
@@ -266,6 +266,7 @@ static inline u32 arm_smmu_strtab_l2_idx(u32 sid)#define STRTAB_STE_1_S1COR GENMASK_ULL(5, 4)#define STRTAB_STE_1_S1CSH GENMASK_ULL(7, 6) +#define STRTAB_STE_1_MEV (1UL << 19)#define STRTAB_STE_1_S2FWB (1UL << 25)#define STRTAB_STE_1_S1STALLD (1UL << 27)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 221/311 objtool: Silence more KCOV warnings
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 6b023c7842048c4bbeede802f3cf36b96c7a8b25 ]
In the past there were issues with KCOV triggering unreachable instruction warnings, which is why unreachable warnings are now disabled with CONFIG_KCOV.
Now some new KCOV warnings are showing up with GCC 14:
vmlinux.o: warning: objtool: cpuset_write_resmask() falls through to next function cpuset_update_active_cpus.cold() drivers/usb/core/driver.o: error: objtool: usb_deregister() falls through to next function usb_match_device() sound/soc/codecs/snd-soc-wcd934x.o: warning: objtool: .text.wcd934x_slim_irq_handler: unexpected end of section
All are caused by GCC KCOV not finishing an optimization, leaving behind a never-taken conditional branch to a basic block which falls through to the next function (or end of section).
At a high level this is similar to the unreachable warnings mentioned above, in that KCOV isn't fully removing dead code. Treat it the same way by adding these to the list of warnings to ignore with CONFIG_KCOV.
--- tools/objtool/check.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/objtool/check.c +6 -0
@@ -3490,6 +3490,9 @@ static int validate_branch(struct objtool_file *file, struct symbol *func, !strncmp(func->name, "__pfx_", 6))return 0 ; +if (file->ignore_unreachables) +return 0 ; +WARN ("%s() falls through to next function %s()" , func->name,insn_func (insn)->name);return 1 ;
@@ -3709,6 +3712,9 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,if (!next_insn) {if (state.cfi.cfa.base ==CFI_UNDEFINED )return 0 ; +if (file->ignore_unreachables) +return 0 ; +WARN ("%s: unexpected end of section" , sec->name);return 1 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 222/311 objtool, panic: Disable SMAP in __stack_chk_fail()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 72c774aa9d1e16bfd247096935e7dae194d84929 ]
__stack_chk_fail() can be called from uaccess-enabled code. Make sure uaccess gets disabled before calling panic().
Fixes the following warning:
kernel/trace/trace_branch.o: error: objtool: ftrace_likely_update+0x1ea: call to __stack_chk_fail() with UACCESS enabled
--- kernel/panic.c | 6 ++++++ tools/objtool/check.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-)
kernel/panic.c +6 -0
@@ -832,9 +832,15 @@ device_initcall(register_warn_debugfs);*/ __visible noinstr void __stack_chk_fail(void) { +unsigned long flags; +instrumentation_begin (); + flags =user_access_save (); +panic ("stack-protector: Kernel stack is corrupted in: %pB" ,__builtin_return_address (0 )); + +user_access_restore (flags);instrumentation_end (); }EXPORT_SYMBOL (__stack_chk_fail);
tools/objtool/check.c +4 -1
@@ -1189,12 +1189,15 @@ static const char *uaccess_safe_builtin[] = {"__ubsan_handle_load_invalid_value" ,/* STACKLEAK */ "stackleak_track_stack" , +/* TRACE_BRANCH_PROFILING */ +"ftrace_likely_update" , +/* STACKPROTECTOR */ +"__stack_chk_fail" ,/* misc */ "csum_partial_copy_generic" ,"copy_mc_fragile" ,"copy_mc_fragile_handle_tail" ,"copy_mc_enhanced_fast_string" , -"ftrace_likely_update" ,/* CONFIG_TRACE_BRANCH_PROFILING */ "rep_stos_alternative" ,"rep_movs_alternative" , "__copy_user_nocache",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 223/311 objtool, ASoC: codecs: wcd934x: Remove potential undefined behavior in wcd934x_slim_irq_handler()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 060aed9c0093b341480770457093449771cf1496 ]
If 'port_id' is negative, the shift counts in wcd934x_slim_irq_handler() also become negative, resulting in undefined behavior due to shift out of bounds.
If I'm reading the code correctly, that appears to be not possible, but with KCOV enabled, Clang's range analysis isn't always able to determine that and generates undefined behavior.
As a result the code generation isn't optimal, and undefined behavior should be avoided regardless. Improve code generation and remove the undefined behavior by converting the signed variables to unsigned.
Fixes the following warning with UBSAN:
sound/soc/codecs/snd-soc-wcd934x.o: warning: objtool: .text.wcd934x_slim_irq_handler: unexpected end of section
--- sound/soc/codecs/wcd934x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wcd934x.c +1 -1
@@ -2273,7 +2273,7 @@ static irqreturn_t wcd934x_slim_irq_handler(int irq, void *data) {struct wcd934x_codec *wcd = data;unsigned long status =0 ; -int i, j, port_id; +unsigned int i, j, port_id;unsigned int val, int_val =0 ;irqreturn_t ret =IRQ_NONE ;bool tx;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 224/311 objtool, regulator: rk808: Remove potential undefined behavior in rk806_set_mode_dcdc()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 29c578c848402a34e8c8e115bf66cb6008b77062 ]
If 'ctr_bit' is negative, the shift counts become negative, causing a shift of bounds and undefined behavior.
Presumably that's not possible in normal operation, but the code generation isn't optimal. And undefined behavior should be avoided regardless.
Improve code generation and remove the undefined behavior by converting the signed variables to unsigned.
Fixes the following warning with an UBSAN kernel:
vmlinux.o: warning: objtool: rk806_set_mode_dcdc() falls through to next function rk806_get_mode_dcdc() vmlinux.o: warning: objtool: .text.rk806_set_mode_dcdc: unexpected end of section
--- drivers/regulator/rk808-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/rk808-regulator.c +2 -2
@@ -270,8 +270,8 @@ static const unsigned int rk817_buck1_4_ramp_table[] = {static int rk806_set_mode_dcdc (struct regulator_dev *rdev,unsigned int mode) { -int rid =rdev_get_id (rdev); -int ctr_bit, reg; +unsigned int rid =rdev_get_id (rdev); +unsigned int ctr_bit, reg; reg =RK806_POWER_FPWM_EN0 + rid /8 ; ctr_bit = rid %8 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 225/311 objtool, lkdtm: Obfuscate the do_nothing() pointer
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 05026ea01e95ffdeb0e5ac8fb7fb1b551e3a8726 ]
If execute_location()'s memcpy of do_nothing() gets inlined and unrolled by the compiler, it copies one word at a time:
mov 0x0(%rip),%rax R_X86_64_PC32 .text+0x1374
mov %rax,0x38(%rbx)
mov 0x0(%rip),%rax R_X86_64_PC32 .text+0x136c
mov %rax,0x30(%rbx)
...Those .text references point to the middle of the function, causing objtool to complain about their lack of ENDBR.
Prevent that by resolving the function pointer at runtime rather than build time. This fixes the following warning:
drivers/misc/lkdtm/lkdtm.o: warning: objtool: execute_location+0x23: relocation to !ENDBR: .text+0x1378
--- drivers/misc/lkdtm/perms.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/misc/lkdtm/perms.c +11 -3
@@ -28,6 +28,13 @@ static const unsigned long rodata = 0xAA55AA55;/* This is marked __ro_after_init, so it should ultimately be .rodata. */ static unsigned long ro_after_init__ro_after_init =0x55AA5500 ; +/* +* This is a pointer to do_nothing() which is initialized at runtime rather +* than build time to avoid objtool IBT validation warnings caused by an +* inlined unrolled memcpy() in execute_location(). +*/ +static void __ro_after_init *do_nothing_ptr; +/* * This just returns to the caller. It is designed to be copied into * non-executable memory regions.
@@ -65,13 +72,12 @@ static noinline __nocfi void execute_location(void *dst, bool write) {void (*func)(void );func_desc_t fdesc; -void *do_nothing_text =dereference_function_descriptor (do_nothing); -pr_info ("attempting ok execution at %px\n" , do_nothing_text); +pr_info ("attempting ok execution at %px\n" , do_nothing_ptr);do_nothing ();if (write ==CODE_WRITE ) { -memcpy (dst, do_nothing_text,EXEC_SIZE ); +memcpy (dst, do_nothing_ptr,EXEC_SIZE );flush_icache_range ((unsigned long )dst, (unsigned long )dst +EXEC_SIZE ); }
@@ -267,6 +273,8 @@ static void lkdtm_ACCESS_NULL(void)void __init lkdtm_perms_init (void ) { + do_nothing_ptr =dereference_function_descriptor (do_nothing); +/* Make sure we can write to __ro_after_init values during __init */ ro_after_init |=0xAA ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 226/311 qibfs: fix _another_ leak
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit bdb43af4fdb39f844ede401bdb1258f67a580a27 ]
failure to allocate inode => leaked dentry...
this one had been there since the initial merge; to be fair, if we are that far OOM, the odds of failing at that particular allocation are low...
--- drivers/infiniband/hw/qib/qib_fs.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/hw/qib/qib_fs.c +1 -0
@@ -55,6 +55,7 @@ static int qibfs_mknod(struct inode *dir, struct dentry *dentry,struct inode *inode =new_inode (dir->i_sb);if (!inode) { +dput (dentry); error = -EPERM ; goto bail; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 227/311 riscv: tracing: Fix __write_overflow_field in ftrace_partial_regs()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charlie Jenkins <[email protected]>
[ Upstream commit bba547810c66434475d8800b3411c59ef71eafe9 ]
The size of ®s->a0 is unknown, causing the error:
../include/linux/fortify-string.h:571:25: warning: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Wattribute-warning]
Fix this by wrapping the required registers in pt_regs with struct_group() and reference the group when doing the offending memcpy().
--- arch/riscv/include/asm/ftrace.h | 2 +- arch/riscv/include/asm/ptrace.h | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-)
arch/riscv/include/asm/ftrace.h +1 -1
@@ -207,7 +207,7 @@ ftrace_partial_regs(const struct ftrace_regs *fregs, struct pt_regs *regs) {struct __arch_ftrace_regs *afregs =arch_ftrace_regs (fregs); -memcpy (®s->a0, afregs->args,sizeof (afregs->args)); +memcpy (®s->a_regs, afregs->args,sizeof (afregs->args)); regs->epc = afregs->epc; regs->ra = afregs->ra; regs->sp = afregs->sp;
arch/riscv/include/asm/ptrace.h +10 -8
@@ -23,14 +23,16 @@ struct pt_regs {unsigned long t2;unsigned long s0;unsigned long s1; -unsigned long a0; -unsigned long a1; -unsigned long a2; -unsigned long a3; -unsigned long a4; -unsigned long a5; -unsigned long a6; -unsigned long a7; + struct_group(a_regs, + unsigned long a0; +unsigned long a1; +unsigned long a2; +unsigned long a3; +unsigned long a4; +unsigned long a5; +unsigned long a6; +unsigned long a7; + );unsigned long s2;unsigned long s3;unsigned long s4;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 228/311 ntb: reduce stack usage in idt_scan_mws
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit aff12700b8dd7422bfe2277696e192af4df9de8f ]
idt_scan_mws() puts a large fixed-size array on the stack and copies it into a smaller dynamically allocated array at the end. On 32-bit targets, the fixed size can easily exceed the warning limit for possible stack overflow:
drivers/ntb/hw/idt/ntb_hw_idt.c:1041:27: error: stack frame size (1032) exceeds limit (1024) in 'idt_scan_mws' [-Werror,-Wframe-larger-than]
Change it to instead just always use dynamic allocation for the array from the start. It's too big for the stack, but not actually all that much for a permanent allocation.
--- drivers/ntb/hw/idt/ntb_hw_idt.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/ntb/hw/idt/ntb_hw_idt.c +7 -11
@@ -1041,7 +1041,7 @@ static inline char *idt_get_mw_name(enum idt_mw_type mw_type)static struct idt_mw_cfg *idt_scan_mws (struct idt_ntb_dev *ndev,int port,unsigned char *mw_cnt) { -struct idt_mw_cfg mws[IDT_MAX_NR_MWS ], *ret_mws; +struct idt_mw_cfg *mws;const struct idt_ntb_bar *bars;enum idt_mw_type mw_type;unsigned char widx, bidx, en_cnt;
@@ -1049,6 +1049,11 @@ static struct idt_mw_cfg *idt_scan_mws(struct idt_ntb_dev *ndev, int port,int aprt_size;u32 data; + mws =devm_kcalloc (&ndev->ntb.pdev->dev,IDT_MAX_NR_MWS , +sizeof (*mws),GFP_KERNEL ); +if (!mws) +return ERR_PTR (-ENOMEM ); +/* Retrieve the array of the BARs registers */ bars = portdata_tbl[port].bars;
@@ -1103,16 +1108,7 @@ static struct idt_mw_cfg *idt_scan_mws(struct idt_ntb_dev *ndev, int port, } } -/* Allocate memory for memory window descriptors */ - ret_mws =devm_kcalloc (&ndev->ntb.pdev->dev, *mw_cnt,sizeof (*ret_mws), -GFP_KERNEL ); -if (!ret_mws) -return ERR_PTR (-ENOMEM ); - -/* Copy the info of detected memory windows */ -memcpy (ret_mws, mws, (*mw_cnt)*sizeof (*ret_mws)); - -return ret_mws; +return mws; }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 229/311 ntb_hw_amd: Add NTB PCI ID for new gen CPU
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Basavaraj Natikar <[email protected]>
[ Upstream commit bf8a7ce7e4c7267a6f5f2b2023cfc459b330b25e ]
Add NTB support for new generation of processor.
--- drivers/ntb/hw/amd/ntb_hw_amd.c | 1 + 1 file changed, 1 insertion(+)
drivers/ntb/hw/amd/ntb_hw_amd.c +1 -0
@@ -1318,6 +1318,7 @@ static const struct pci_device_id amd_ntb_pci_tbl[] = { { PCI_VDEVICE(AMD, 0x148b), (kernel_ulong_t)&dev_data[1] }, { PCI_VDEVICE(AMD, 0x14c0), (kernel_ulong_t)&dev_data[1] }, { PCI_VDEVICE(AMD, 0x14c3), (kernel_ulong_t)&dev_data[1] }, + { PCI_VDEVICE(AMD, 0x155a), (kernel_ulong_t)&dev_data[1] }, { PCI_VDEVICE(HYGON, 0x145b), (kernel_ulong_t)&dev_data[0] }, { 0, } };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 230/311 9p/net: fix improper handling of bogus negative read/write replies
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dominique Martinet <[email protected]>
[ Upstream commit d0259a856afca31d699b706ed5e2adf11086c73b ]
In p9_client_write() and p9_client_read_once(), if the server incorrectly replies with success but a negative write/read count then we would consider written (negative) <= rsize (positive) because both variables were signed.
Make variables unsigned to avoid this problem.
The reproducer linked below now fails with the following error instead of a null pointer deref:
9pnet: bogus RWRITE count (4294967295 > 3)
Message-ID: <[email protected]>
--- net/9p/client.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
net/9p/client.c +16 -14
@@ -1548,7 +1548,8 @@ p9_client_read_once(struct p9_fid *fid, u64 offset, struct iov_iter *to,struct p9_client *clnt = fid->clnt;struct p9_req_t *req;int count =iov_iter_count (to); -int rsize, received, non_zc =0 ; +u32 rsize, received; +bool non_zc = false;char *dataptr; *err =0 ;
@@ -1571,7 +1572,7 @@ p9_client_read_once(struct p9_fid *fid, u64 offset, struct iov_iter *to,0 ,11 ,"dqd" , fid->fid, offset, rsize); }else { - non_zc =1 ; + non_zc = true; req =p9_client_rpc (clnt,P9_TREAD ,"dqd" , fid->fid, offset, rsize); }
@@ -1592,11 +1593,11 @@ p9_client_read_once(struct p9_fid *fid, u64 offset, struct iov_iter *to,return 0 ; }if (rsize < received) { -pr_err ("bogus RREAD count (%d > %d)\n" , received, rsize); +pr_err ("bogus RREAD count (%u > %u)\n" , received, rsize); received = rsize; } -p9_debug (P9_DEBUG_9P ,"<<< RREAD count %d\n" , received); +p9_debug (P9_DEBUG_9P ,"<<< RREAD count %u\n" , received);if (non_zc) {int n =copy_to_iter (dataptr, received, to);
@@ -1623,9 +1624,9 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err) *err =0 ;while (iov_iter_count (from)) { -int count =iov_iter_count (from); -int rsize = fid->iounit; -int written; +size_t count =iov_iter_count (from); +u32 rsize = fid->iounit; +u32 written;if (!rsize || rsize > clnt->msize -P9_IOHDRSZ ) rsize = clnt->msize -P9_IOHDRSZ ;
@@ -1633,7 +1634,7 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err)if (count < rsize) rsize = count; -p9_debug (P9_DEBUG_9P ,">>> TWRITE fid %d offset %llu count %d (/%d)\n" , +p9_debug (P9_DEBUG_9P ,">>> TWRITE fid %d offset %llu count %u (/%zu)\n" , fid->fid, offset, rsize, count);/* Don't bother zerocopy for small IO (< 1024) */
@@ -1659,11 +1660,11 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err)break ; }if (rsize < written) { -pr_err ("bogus RWRITE count (%d > %d)\n" , written, rsize); +pr_err ("bogus RWRITE count (%u > %u)\n" , written, rsize); written = rsize; } -p9_debug (P9_DEBUG_9P ,"<<< RWRITE count %d\n" , written); +p9_debug (P9_DEBUG_9P ,"<<< RWRITE count %u\n" , written);p9_req_put (clnt, req);iov_iter_revert (from, count - written -iov_iter_count (from));
@@ -2098,7 +2099,8 @@ EXPORT_SYMBOL_GPL(p9_client_xattrcreate);int p9_client_readdir (struct p9_fid *fid,char *data,u32 count,u64 offset) { -int err, rsize, non_zc =0 ; +int err, non_zc =0 ; +u32 rsize;struct p9_client *clnt;struct p9_req_t *req;char *dataptr;
@@ -2107,7 +2109,7 @@ int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset)iov_iter_kvec (&to,ITER_DEST , &kv,1 , count); -p9_debug (P9_DEBUG_9P ,">>> TREADDIR fid %d offset %llu count %d\n" , +p9_debug (P9_DEBUG_9P ,">>> TREADDIR fid %d offset %llu count %u\n" , fid->fid, offset, count); clnt = fid->clnt;
@@ -2142,11 +2144,11 @@ int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset) goto free_and_error; }if (rsize < count) { -pr_err ("bogus RREADDIR count (%d > %d)\n" , count, rsize); +pr_err ("bogus RREADDIR count (%u > %u)\n" , count, rsize); count = rsize; } -p9_debug (P9_DEBUG_9P ,"<<< RREADDIR count %d\n" , count); +p9_debug (P9_DEBUG_9P ,"<<< RREADDIR count %u\n" , count);if (non_zc)memmove (data, dataptr, count);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 231/311 9p/trans_fd: mark concurrent read and writes to p9_conn->err
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ignacio Encinas <[email protected]>
[ Upstream commit fbc0283fbeae27b88448c90305e738991457fee2 ]
Writes for the error value of a connection are spinlock-protected inside p9_conn_cancel, but lockless reads are present elsewhere to avoid performing unnecessary work after an error has been met.
Mark the write and lockless reads to make KCSAN happy. Mark the write as exclusive following the recommendation in "Lock-Protected Writes with Lockless Reads" in tools/memory-model/Documentation/access-marking.txt while we are at it.
Mark p9_fd_request and p9_conn_cancel m->err reads despite the fact that they do not race with concurrent writes for stylistic reasons.
Message-ID: <20250318-p9_conn_err_benign_data_race-v3-1-290bb18335cc@iencinas.com>
--- net/9p/trans_fd.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
net/9p/trans_fd.c +10 -7
@@ -191,12 +191,13 @@ static void p9_conn_cancel(struct p9_conn *m, int err)spin_lock (&m->req_lock); -if (m->err) { +if (READ_ONCE (m->err)) {spin_unlock (&m->req_lock);return ; } - m->err = err; +WRITE_ONCE (m->err, err); +ASSERT_EXCLUSIVE_WRITER (m->err);list_for_each_entry_safe (req, rtmp, &m->req_list, req_list) {list_move (&req->req_list, &cancel_list);
@@ -283,7 +284,7 @@ static void p9_read_work(struct work_struct *work) m = container_of(work, struct p9_conn, rq); -if (m->err <0 ) +if (READ_ONCE (m->err) <0 )return ;p9_debug (P9_DEBUG_TRANS ,"start mux %p pos %zd\n" , m, m->rc.offset);
@@ -450,7 +451,7 @@ static void p9_write_work(struct work_struct *work) m = container_of(work, struct p9_conn, wq); -if (m->err <0 ) { +if (READ_ONCE (m->err) <0 ) {clear_bit (Wworksched, &m->wsched);return ; }
@@ -622,7 +623,7 @@ static void p9_poll_mux(struct p9_conn *m)__poll_t n;int err = -ECONNRESET ; -if (m->err <0 ) +if (READ_ONCE (m->err) <0 )return ; n =p9_fd_poll (m->client,NULL , &err);
@@ -665,6 +666,7 @@ static void p9_poll_mux(struct p9_conn *m)static int p9_fd_request (struct p9_client *client,struct p9_req_t *req) {__poll_t n; +int err;struct p9_trans_fd *ts = client->trans;struct p9_conn *m = &ts->conn;
@@ -673,9 +675,10 @@ static int p9_fd_request(struct p9_client *client, struct p9_req_t *req)spin_lock (&m->req_lock); -if (m->err <0 ) { + err =READ_ONCE (m->err); +if (err <0 ) {spin_unlock (&m->req_lock); -return m->err; +return err; }WRITE_ONCE (req->status,REQ_STATUS_UNSENT );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 232/311 rtc: pcf85063: do a SW reset if POR failed
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Stockmann <[email protected]>
[ Upstream commit 2b7cbd98495f6ee4cd6422fe77828a19e9edf87f ]
Power-on Reset has a documented issue in PCF85063, refer to its datasheet, section "Software reset":
"There is a low probability that some devices will have corruption of the registers after the automatic power-on reset if the device is powered up with a residual VDD level. It is required that the VDD starts at zero volts at power up or upon power cycling to ensure that there is no corruption of the registers. If this is not possible, a reset must be initiated after power-up (i.e. when power is stable) with the software reset command"
Trigger SW reset if there is an indication that POR has failed.
--- drivers/rtc/rtc-pcf85063.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/rtc/rtc-pcf85063.c +18 -1
@@ -35,6 +35,7 @@#define PCF85063_REG_CTRL1_CAP_SEL BIT(0)#define PCF85063_REG_CTRL1_STOP BIT(5)#define PCF85063_REG_CTRL1_EXT_TEST BIT(7) +#define PCF85063_REG_CTRL1_SWR 0x58#define PCF85063_REG_CTRL2 0x01#define PCF85063_CTRL2_AF BIT(6)
@@ -589,7 +590,7 @@ static int pcf85063_probe(struct i2c_client *client)i2c_set_clientdata (client, pcf85063); - err =regmap_read (pcf85063->regmap,PCF85063_REG_CTRL1 , &tmp); + err =regmap_read (pcf85063->regmap,PCF85063_REG_SC , &tmp);if (err) {dev_err (&client->dev,"RTC chip is not present\n" );return err;
@@ -599,6 +600,22 @@ static int pcf85063_probe(struct i2c_client *client)if (IS_ERR (pcf85063->rtc))return PTR_ERR (pcf85063->rtc); +/* +* If a Power loss is detected, SW reset the device. +* From PCF85063A datasheet: +* There is a low probability that some devices will have corruption +* of the registers after the automatic power-on reset... +*/ +if (tmp &PCF85063_REG_SC_OS ) { +dev_warn (&client->dev, +"POR issue detected, sending a SW reset\n" ); + err =regmap_write (pcf85063->regmap,PCF85063_REG_CTRL1 , +PCF85063_REG_CTRL1_SWR ); +if (err <0 ) +dev_warn (&client->dev, +"SW reset failed, trying to continue\n" ); + } + err =pcf85063_load_capacitance (pcf85063, client->dev.of_node, config->force_cap_7000 ?7000 :0 );if (err <0 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 233/311 tracing: Enforce the persistent ring buffer to be page aligned
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
[ Upstream commit c44a14f216f45d8bf1634b52854a699d7090f1e8 ]
Enforce that the address and the size of the memory used by the persistent ring buffer is page aligned. Also update the documentation to reflect this requirement.
--- Documentation/admin-guide/kernel-parameters.txt | 2 ++ Documentation/trace/debugging.rst | 2 ++ kernel/trace/trace.c | 10 ++++++++++ 3 files changed, 14 insertions(+)
Documentation/admin-guide/kernel-parameters.txt +2 -0
@@ -7243,6 +7243,8 @@ This is just one of many ways that can clear memory. Make sure your system keeps the content of memory across reboots before relying on this option. + NB: Both the mapped address and size must be page aligned for the architecture. + See also Documentation/trace/debugging.rst
Documentation/trace/debugging.rst +2 -0
@@ -136,6 +136,8 @@ kernel, so only the same kernel is guaranteed to work if the mapping is preserved. Switching to a different kernel version may find a different layout and mark the buffer as invalid. +NB: Both the mapped address and size must be page aligned for the architecture. + Using trace_printk() in the boot instance ----------------------------------------- By default, the content of trace_printk() goes into the top level tracing
kernel/trace/trace.c +10 -0
@@ -10427,6 +10427,16 @@ __init static void enable_instances(void) }if (start) { +/* Start and size must be page aligned */ +if (start & ~PAGE_MASK ) { +pr_warn ("Tracing: mapping start addr %pa is not page aligned\n" , &start); +continue ; + } +if (size & ~PAGE_MASK ) { +pr_warn ("Tracing: mapping size %pa is not page aligned\n" , &size); +continue ; + } + addr =map_pages (start, size);if (addr) { pr_info("Tracing: mapped boot instance %s at physical memory %pa of size 0x%lx\n",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 234/311 io_uring: always do atomic put from iowq
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Begunkov <[email protected]>
[ Upstream commit 390513642ee6763c7ada07f0a1470474986e6c1c ]
io_uring always switches requests to atomic refcounting for iowq execution before there is any parallilism by setting REQ_F_REFCOUNT, and the flag is not cleared until the request completes. That should be fine as long as the compiler doesn't make up a non existing value for the flags, however KCSAN still complains when the request owner changes oter flag bits:
BUG: KCSAN: data-race in io_req_task_cancel / io_wq_free_work
...
read to 0xffff888117207448 of 8 bytes by task 3871 on cpu 0:
req_ref_put_and_test io_uring/refs.h:22 [inline]
Skip REQ_F_REFCOUNT checks for iowq, we know it's set.
--- io_uring/io_uring.c | 2 +- io_uring/refs.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
io_uring/io_uring.c +1 -1
@@ -1775,7 +1775,7 @@ struct io_wq_work *io_wq_free_work(struct io_wq_work *work) struct io_kiocb *req = container_of(work, struct io_kiocb, work);struct io_kiocb *nxt =NULL ; -if (req_ref_put_and_test (req)) { +if (req_ref_put_and_test_atomic (req)) {if (req->flags &IO_REQ_LINK_FLAGS ) nxt =io_req_find_next (req);io_free_req (req);
io_uring/refs.h +7 -0
@@ -17,6 +17,13 @@ static inline bool req_ref_inc_not_zero(struct io_kiocb *req)return atomic_inc_not_zero (&req->refs); } +static inline bool req_ref_put_and_test_atomic (struct io_kiocb *req) +{ +WARN_ON_ONCE (!(data_race (req->flags) &REQ_F_REFCOUNT )); +WARN_ON_ONCE (req_ref_zero_or_close_to_overflow (req)); +return atomic_dec_and_test (&req->refs); +} +static inline bool req_ref_put_and_test (struct io_kiocb *req) {if (likely (!(req->flags &REQ_F_REFCOUNT )))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 235/311 kbuild, rust: use -fremap-path-prefix to make paths relative
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit dbdffaf50ff9cee3259a7cef8a7bd9e0f0ba9f13 ]
Remap source path prefixes in all output, including compiler diagnostics, debug information, macro expansions, etc. This removes a few absolute paths from the binary and also makes it possible to use core::panic::Location properly.
Equivalent to the same configuration done for C sources in commit 1d3730f0012f ("kbuild: support -fmacro-prefix-map for external modules") and commit a73619a845d5 ("kbuild: use -fmacro-prefix-map to make __FILE__ a relative path").
--- Makefile | 1 + 1 file changed, 1 insertion(+)
Makefile +1 -0
@@ -1070,6 +1070,7 @@ KBUILD_CFLAGS += -fno-builtin-wcslen # change __FILE__ to the relative path to the source directory ifdef building_out_of_srctree KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srcroot)/=) +KBUILD_RUSTFLAGS += --remap-path-prefix=$(srcroot)/= endif # include additional Makefiles when needed
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 236/311 kbuild: add dependency from vmlinux to sorttable
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xi Ruoyao <[email protected]>
[ Upstream commit 82c09de2d4c472ab1b973e6e033671020691e637 ]
Without this dependency it's really puzzling when we bisect for a "bad" commit in a series of sorttable change: when "git bisect" switches to another commit, "make" just does nothing to vmlinux.
--- scripts/Makefile.vmlinux | 4 ++++ 1 file changed, 4 insertions(+)
scripts/Makefile.vmlinux +4 -0
@@ -79,6 +79,10 @@ ifdef CONFIG_DEBUG_INFO_BTF vmlinux: $(RESOLVE_BTFIDS) endif +ifdef CONFIG_BUILDTIME_TABLE_SORT +vmlinux: scripts/sorttable +endif + # module.builtin.ranges # --------------------------------------------------------------------------- ifdef CONFIG_BUILTIN_MODULE_RANGES
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 237/311 sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
[ Upstream commit 975776841e689dd8ba36df9fa72ac3eca3c2957a ]
kernel/sched/isolation.c obviously makes no sense without CONFIG_SMP, but the Kconfig entry we have right now:
config CPU_ISOLATION bool "CPU isolation" depends on SMP || COMPILE_TEST
allows the creation of pointless .config's which cause build failures.
--- init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
init/Kconfig +1 -1
@@ -711,7 +711,7 @@ endmenu # "CPU/Task time and stats accounting" config CPU_ISOLATION bool "CPU isolation" - depends on SMP || COMPILE_TEST + depends on SMP default y help Make sure that CPUs running critical tasks are not disturbed by
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 238/311 KVM: s390: Dont use %pK through tracepoints
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit 6c9567e0850be2f0f94ab64fa6512413fd1a1eb1 ]
Restricted pointers ("%pK") are not meant to be used through TP_format(). It can unintentionally expose security sensitive, raw pointer values.
Use regular pointer formatting instead.
Message-ID: <20250217-restricted-pointers-s390-v1-1-0e4ace75d8aa@linutronix.de>
--- arch/s390/kvm/trace-s390.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/kvm/trace-s390.h +2 -2
@@ -56,7 +56,7 @@ TRACE_EVENT(kvm_s390_create_vcpu, __entry->sie_block = sie_block; ), -TP_printk ("create cpu %d at 0x%pK, sie block at 0x%pK" , +TP_printk ("create cpu %d at 0x%p, sie block at 0x%p" , __entry->id, __entry->vcpu, __entry->sie_block) );
@@ -255,7 +255,7 @@ TRACE_EVENT(kvm_s390_enable_css, __entry->kvm = kvm; ), -TP_printk ("enabling channel I/O support (kvm @ %pK)\n" , +TP_printk ("enabling channel I/O support (kvm @ %p)\n" , __entry->kvm) );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 239/311 KVM: s390: Dont use %pK through debug printing
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit 0c7fbae5bc782429c97d68dc40fb126748d7e352 ]
Restricted pointers ("%pK") are only meant to be used when directly printing to a file from task context.
Otherwise it can unintentionally expose security sensitive, raw pointer values.
Use regular pointer formatting instead.
Message-ID: <20250217-restricted-pointers-s390-v1-2-0e4ace75d8aa@linutronix.de>
--- arch/s390/kvm/intercept.c | 2 +- arch/s390/kvm/interrupt.c | 8 ++++---- arch/s390/kvm/kvm-s390.c | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-)
arch/s390/kvm/intercept.c +1 -1
@@ -95,7 +95,7 @@ static int handle_validity(struct kvm_vcpu *vcpu) vcpu->stat.exit_validity++;trace_kvm_s390_intercept_validity (vcpu, viwhy); -KVM_EVENT (3 ,"validity intercept 0x%x for pid %u (kvm 0x%pK)" , viwhy, +KVM_EVENT (3 ,"validity intercept 0x%x for pid %u (kvm 0x%p)" , viwhy, current->pid, vcpu->kvm);/* do not warn on invalid runtime instrumentation mode */
arch/s390/kvm/interrupt.c +4 -4
@@ -3161,7 +3161,7 @@ void kvm_s390_gisa_clear(struct kvm *kvm)if (!gi->origin)return ;gisa_clear_ipm (gi->origin); -VM_EVENT (kvm,3 ,"gisa 0x%pK cleared" , gi->origin); +VM_EVENT (kvm,3 ,"gisa 0x%p cleared" , gi->origin); }void kvm_s390_gisa_init (struct kvm *kvm)
@@ -3178,7 +3178,7 @@ void kvm_s390_gisa_init(struct kvm *kvm) gi->timer.function = gisa_vcpu_kicker;memset (gi->origin,0 ,sizeof (struct kvm_s390_gisa )); gi->origin->next_alert = (u32 )virt_to_phys (gi->origin); -VM_EVENT (kvm,3 ,"gisa 0x%pK initialized" , gi->origin); +VM_EVENT (kvm,3 ,"gisa 0x%p initialized" , gi->origin); }void kvm_s390_gisa_enable (struct kvm *kvm)
@@ -3219,7 +3219,7 @@ void kvm_s390_gisa_destroy(struct kvm *kvm)process_gib_alert_list ();hrtimer_cancel (&gi->timer); gi->origin =NULL ; -VM_EVENT (kvm,3 ,"gisa 0x%pK destroyed" , gisa); +VM_EVENT (kvm,3 ,"gisa 0x%p destroyed" , gisa); }void kvm_s390_gisa_disable (struct kvm *kvm)
@@ -3468,7 +3468,7 @@ int __init kvm_s390_gib_init(u8 nisc) } } -KVM_EVENT (3 ,"gib 0x%pK (nisc=%d) initialized" , gib, gib->nisc); +KVM_EVENT (3 ,"gib 0x%p (nisc=%d) initialized" , gib, gib->nisc); goto out; out_unreg_gal:
arch/s390/kvm/kvm-s390.c +5 -5
@@ -1020,7 +1020,7 @@ static int kvm_s390_set_mem_control(struct kvm *kvm, struct kvm_device_attr *att }mutex_unlock (&kvm->lock);VM_EVENT (kvm,3 ,"SET: max guest address: %lu" , new_limit); -VM_EVENT (kvm,3 ,"New guest asce: 0x%pK" , +VM_EVENT (kvm,3 ,"New guest asce: 0x%p" , (void *) kvm->arch.gmap->asce);break ; }
@@ -3464,7 +3464,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)kvm_s390_gisa_init (kvm);INIT_LIST_HEAD (&kvm->arch.pv.need_cleanup); kvm->arch.pv.set_aside =NULL ; -KVM_EVENT (3 ,"vm 0x%pK created by pid %u" , kvm, current->pid); +KVM_EVENT (3 ,"vm 0x%p created by pid %u" , kvm, current->pid);return 0 ; out_err:
@@ -3527,7 +3527,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)kvm_s390_destroy_adapters (kvm);kvm_s390_clear_float_irqs (kvm);kvm_s390_vsie_destroy (kvm); -KVM_EVENT (3 ,"vm 0x%pK destroyed" , kvm); +KVM_EVENT (3 ,"vm 0x%p destroyed" , kvm); }/* Section: vcpu related */
@@ -3648,7 +3648,7 @@ static int sca_switch_to_extended(struct kvm *kvm)free_page ((unsigned long )old_sca); -VM_EVENT (kvm,2 ,"Switched to ESCA (0x%pK -> 0x%pK)" , +VM_EVENT (kvm,2 ,"Switched to ESCA (0x%p -> 0x%p)" , old_sca, kvm->arch.sca);return 0 ; }
@@ -4025,7 +4025,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) goto out_free_sie_block; } -VM_EVENT (vcpu->kvm,3 ,"create cpu %d at 0x%pK, sie block at 0x%pK" , +VM_EVENT (vcpu->kvm,3 ,"create cpu %d at 0x%p, sie block at 0x%p" , vcpu->vcpu_id, vcpu, vcpu->arch.sie_block);trace_kvm_s390_create_vcpu (vcpu->vcpu_id, vcpu, vcpu->arch.sie_block);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 240/311 udmabuf: fix a buf size overflow issue during udmabuf creation
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiaogang Chen <[email protected]>
[ Upstream commit 021ba7f1babd029e714d13a6bf2571b08af96d0f ]
by casting size_limit_mb to u64 when calculate pglimit.
--- drivers/dma-buf/udmabuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma-buf/udmabuf.c +1 -1
@@ -393,7 +393,7 @@ static long udmabuf_create(struct miscdevice *device,if (!ubuf)return -ENOMEM ; - pglimit = (size_limit_mb *1024 *1024 ) >>PAGE_SHIFT ; + pglimit = ((u64 )size_limit_mb *1024 *1024 ) >>PAGE_SHIFT ;for (i =0 ; i < head->count; i++) {pgoff_t subpgcnt;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 241/311 cgroup/cpuset: Dont allow creation of local partition over a remote one
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Waiman Long <[email protected]>
[ Upstream commit 6da580ec656a5ed135db2cdf574b47635611a4d7 ]
Currently, we don't allow the creation of a remote partition underneath another local or remote partition. However, it is currently possible to create a new local partition with an existing remote partition underneath it if top_cpuset is the parent. However, the current cpuset code does not set the effective exclusive CPUs correctly to account for those that are taken by the remote partition.
Changing the code to properly account for those remote partition CPUs under all possible circumstances can be complex. It is much easier to not allow such a configuration which is not that useful. So forbid that by making sure that exclusive_cpus mask doesn't overlap with subpartitions_cpus and invalidate the partition if that happens.
--- kernel/cgroup/cpuset-internal.h | 1 + kernel/cgroup/cpuset.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+)
kernel/cgroup/cpuset-internal.h +1 -0
@@ -33,6 +33,7 @@ enum prs_errcode {PERR_CPUSEMPTY ,PERR_HKEEPING ,PERR_ACCESS , + PERR_REMOTE, };/* bits in struct cpuset flags field */
kernel/cgroup/cpuset.c +14 -0
@@ -62,6 +62,7 @@ static const char * const perr_strings[] = { [PERR_CPUSEMPTY] = "cpuset.cpus and cpuset.cpus.exclusive are empty", [PERR_HKEEPING] = "partition config conflicts with housekeeping setup", [PERR_ACCESS] = "Enable partition not permitted", + [PERR_REMOTE] = "Have remote partition underneath", };/*
@@ -2840,6 +2841,19 @@ static int update_prstate(struct cpuset *cs, int new_prs) goto out; } +/* +* We don't support the creation of a new local partition with +* a remote partition underneath it. This unsupported +* setting can happen only if parent is the top_cpuset because +* a remote partition cannot be created underneath an existing +* local or remote partition. +*/ +if ((parent == &top_cpuset) && +cpumask_intersects (cs->exclusive_cpus, subpartitions_cpus)) { + err =PERR_REMOTE ; + goto out; + } +/* * If parent is valid partition, enable local partiion. * Otherwise, enable a remote partition.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 242/311 selftests: ublk: fix test_stripe_04
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit 72070e57b0a518ec8e562a2b68fdfc796ef5c040 ]
Commit 57ed58c13256 ("selftests: ublk: enable zero copy for stripe target") added test entry of test_stripe_04, but forgot to add the test script.
So fix the test by adding the script file.
--- .../testing/selftests/ublk/test_stripe_04.sh | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100755 tools/testing/selftests/ublk/test_stripe_04.sh
tools/testing/selftests/ublk/test_stripe_04.sh new file +24 -0
@@ -0,0 +1,24 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh + +TID="stripe_04" +ERR_CODE=0 + +_prep_test "stripe" "mkfs & mount & umount on zero copy" + +backfile_0=$(_create_backfile 256M) +backfile_1=$(_create_backfile 256M) +dev_id=$(_add_ublk_dev -t stripe -z -q 2 "$backfile_0" "$backfile_1") +_check_add_dev $TID $? "$backfile_0" "$backfile_1" + +_mkfs_mount_test /dev/ublkb"${dev_id}" +ERR_CODE=$? + +_cleanup_test "stripe" + +_remove_backfile "$backfile_0" +_remove_backfile "$backfile_1" + +_show_result $TID $ERR_CODE
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 243/311 perf/core: Fix WARN_ON(!ctx) in __free_event() for partial init
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabriel Shahrouzi <[email protected]>
[ Upstream commit 0ba3a4ab76fd3367b9cb680cad70182c896c795c ]
Move the get_ctx(child_ctx) call and the child_event->ctx assignment to occur immediately after the child event is allocated. Ensure that child_event->ctx is non-NULL before any subsequent error path within inherit_event calls free_event(), satisfying the assumptions of the cleanup code.
Details:
There's no clear Fixes tag, because this bug is a side-effect of multiple interacting commits over time (up to 15 years old), not a single regression.
The code initially incremented refcount then assigned context immediately after the child_event was created. Later, an early validity check for child_event was added before the refcount/assignment. Even later, a WARN_ON_ONCE() cleanup check was added, assuming event->ctx is valid if the pmu_ctx is valid. The problem is that the WARN_ON_ONCE() could trigger after the initial check passed but before child_event->ctx was assigned, violating its precondition. The solution is to assign child_event->ctx right after its initial validation. This ensures the context exists for any subsequent checks or cleanup routines, resolving the WARN_ON_ONCE().
To resolve it, defer the refcount update and child_event->ctx assignment directly after child_event->pmu_ctx is set but before checking if the parent event is orphaned. The cleanup routine depends on event->pmu_ctx being non-NULL before it verifies event->ctx is non-NULL. This also maintains the author's original intent of passing in child_ctx to find_get_pmu_context before its refcount/assignment.
[ mingo: Expanded the changelog from another email by Gabriel Shahrouzi. ]
--- kernel/events/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/events/core.c +3 -3
@@ -13701,6 +13701,9 @@ inherit_event(struct perf_event *parent_event,if (IS_ERR (child_event))return child_event; +get_ctx (child_ctx); + child_event->ctx = child_ctx; + pmu_ctx =find_get_pmu_context (child_event->pmu, child_ctx, child_event);if (IS_ERR (pmu_ctx)) {free_event (child_event);
@@ -13723,8 +13726,6 @@ inherit_event(struct perf_event *parent_event,return NULL ; } -get_ctx (child_ctx); -/* * Make the child state follow the state of the parent event, * not its attr.disabled bit. We hold the parent's mutex,
@@ -13745,7 +13746,6 @@ inherit_event(struct perf_event *parent_event,local64_set (&hwc->period_left, sample_period); } - child_event->ctx = child_ctx; child_event->overflow_handler = parent_event->overflow_handler; child_event->overflow_handler_context = parent_event->overflow_handler_context;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 244/311 xen: Change xen-acpi-processor dom0 dependency
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Andryuk <[email protected]>
[ Upstream commit 0f2946bb172632e122d4033e0b03f85230a29510 ]
xen-acpi-processor functions under a PVH dom0 with only a xen_initial_domain() runtime check. Change the Kconfig dependency from PV dom0 to generic dom0 to reflect that.
Message-ID: <[email protected]>
--- drivers/xen/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/xen/Kconfig +1 -1
@@ -278,7 +278,7 @@ config XEN_PRIVCMD_EVENTFD config XEN_ACPI_PROCESSOR tristate "Xen ACPI processor" - depends on XEN && XEN_PV_DOM0 && X86 && ACPI_PROCESSOR && CPU_FREQ + depends on XEN && XEN_DOM0 && X86 && ACPI_PROCESSOR && CPU_FREQ default m help This ACPI processor uploads Power Management information to the Xen
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 245/311 pwm: Let pwm_set_waveform() succeed even if lowlevel driver rounded up
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 00e53d0f4baedd72196b65f00698b2a5a537dc2b ]
Waveform parameters are supposed to be rounded down to the next value possible for the hardware. However when a requested value is too small, .round_waveform_tohw() is supposed to pick the next bigger value and return 1. Let pwm_set_waveform() behave in the same way.
This creates consistency between pwm_set_waveform_might_sleep() with exact=false and pwm_round_waveform_might_sleep() + pwm_set_waveform_might_sleep() with exact=true.
The PWM_DEBUG rounding check has to be adapted to only trigger if no uprounding happend.
--- drivers/pwm/core.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/pwm/core.c +7 -6
@@ -322,7 +322,7 @@ static int __pwm_set_waveform(struct pwm_device *pwm,const struct pwm_ops *ops = chip->ops;char wfhw[WFHWSIZE ];struct pwm_waveform wf_rounded; -int err; +int err, ret_tohw;BUG_ON (WFHWSIZE < ops->sizeof_wfhw);
@@ -332,16 +332,16 @@ static int __pwm_set_waveform(struct pwm_device *pwm,if (!pwm_wf_valid (wf))return -EINVAL ; - err =__pwm_round_waveform_tohw (chip, pwm, wf, &wfhw); -if (err) -return err; + ret_tohw =__pwm_round_waveform_tohw (chip, pwm, wf, &wfhw); +if (ret_tohw <0 ) +return ret_tohw;if ((IS_ENABLED (CONFIG_PWM_DEBUG ) || exact) && wf->period_length_ns) { err =__pwm_round_waveform_fromhw (chip, pwm, &wfhw, &wf_rounded);if (err)return err; -if (IS_ENABLED (CONFIG_PWM_DEBUG ) && !pwm_check_rounding (wf, &wf_rounded)) +if (IS_ENABLED (CONFIG_PWM_DEBUG ) && ret_tohw ==0 && !pwm_check_rounding (wf, &wf_rounded))dev_err (&chip->dev,"Wrong rounding: requested %llu/%llu [+%llu], result %llu/%llu [+%llu]\n" , wf->duty_length_ns, wf->period_length_ns, wf->duty_offset_ns, wf_rounded.duty_length_ns, wf_rounded.period_length_ns, wf_rounded.duty_offset_ns);
@@ -382,7 +382,8 @@ static int __pwm_set_waveform(struct pwm_device *pwm, wf_rounded.duty_length_ns, wf_rounded.period_length_ns, wf_rounded.duty_offset_ns, wf_set.duty_length_ns, wf_set.period_length_ns, wf_set.duty_offset_ns); } -return 0 ; + +return ret_tohw; }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 246/311 pwm: axi-pwmgen: Let .round_waveform_tohw() signal when request was rounded up
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit a85e08a05bf77d5d03b4ac0c59768a606a1b640b ]
The .round_waveform_tohw() is supposed to return 1 if the requested waveform cannot be implemented by rounding down all parameters. Also adapt the corresponding comment to better describe why the implemented procedure is right.
--- drivers/pwm/pwm-axi-pwmgen.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/pwm/pwm-axi-pwmgen.c +7 -3
@@ -75,6 +75,7 @@ static int axi_pwmgen_round_waveform_tohw(struct pwm_chip *chip, {struct axi_pwmgen_waveform *wfhw = _wfhw;struct axi_pwmgen_ddata *ddata =axi_pwmgen_ddata_from_chip (chip); +int ret =0 ;if (wf->period_length_ns ==0 ) { *wfhw = (struct axi_pwmgen_waveform){
@@ -91,12 +92,15 @@ static int axi_pwmgen_round_waveform_tohw(struct pwm_chip *chip,if (wfhw->period_cnt ==0 ) {/* * The specified period is too short for the hardware. -* Let's round .duty_cycle down to 0 to get a (somewhat) -* valid result. +* So round up .period_cnt to 1 (i.e. the smallest +* possible period). With .duty_cycle and .duty_offset +* being less than or equal to .period, their rounded +* value must be 0. */ wfhw->period_cnt =1 ; wfhw->duty_cycle_cnt =0 ; wfhw->duty_offset_cnt =0 ; + ret =1 ; }else { wfhw->duty_cycle_cnt = min_t(u64, mul_u64_u32_div(wf->duty_length_ns, ddata->clk_rate_hz, NSEC_PER_SEC),
@@ -111,7 +115,7 @@ static int axi_pwmgen_round_waveform_tohw(struct pwm_chip *chip, pwm->hwpwm, wf->duty_length_ns, wf->period_length_ns, wf->duty_offset_ns, ddata->clk_rate_hz, wfhw->period_cnt, wfhw->duty_cycle_cnt, wfhw->duty_offset_cnt); -return 0 ; +return ret; } static int axi_pwmgen_round_waveform_fromhw(struct pwm_chip *chip, struct pwm_device *pwm,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 247/311 nvme: requeue namespace scan on missed AENs
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Reinecke <[email protected]>
[ Upstream commit 9546ad1a9bda7362492114f5866b95b0ac4a100e ]
Scanning for namespaces can take some time, so if the target is reconfigured while the scan is running we may miss a Attached Namespace Attribute Changed AEN.
Check if the NVME_AER_NOTICE_NS_CHANGED bit is set once the scan has finished, and requeue scanning to pick up any missed change.
--- drivers/nvme/host/core.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/nvme/host/core.c +4 -0
@@ -4292,6 +4292,10 @@ static void nvme_scan_work(struct work_struct *work)nvme_scan_ns_sequential (ctrl); }mutex_unlock (&ctrl->scan_lock); + +/* Requeue if we have missed AENs */ +if (test_bit (NVME_AER_NOTICE_NS_CHANGED , &ctrl->events)) +nvme_queue_scan (ctrl); }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 248/311 ACPI: EC: Set ec_no_wakeup for Lenovo Go S
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit b988685388effd648150aab272533f833a2a70f0 ]
When AC adapter is unplugged or plugged in EC wakes from HW sleep but APU doesn't enter back into HW sleep.
The reason this happens is that, when the APU exits HW sleep, the power rails controlled by the EC will power up the TCON. The TCON has a GPIO that will be toggled at this time. The GPIO is not marked as a wakeup source, but the GPIO controller still has an unserviced interrupt. Unserviced interrupts will block entering HW sleep again. Clearing the GPIO doesn't help as the TCON continues to assert it until it's been initialized by i2c-hid.
Fixing this would require TCON F/W changes and it's already broken in the wild on production hardware.
To avoid triggering this issue add a quirk to avoid letting EC wake up system at all. The power button still works properly on this system.
--- drivers/acpi/ec.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/acpi/ec.c +28 -0
@@ -2301,6 +2301,34 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = { DMI_MATCH(DMI_PRODUCT_FAMILY, "103C_5336AN HP ZHAN 66 Pro"), }, }, +/* +* Lenovo Legion Go S; touchscreen blocks HW sleep when woken up from EC +* https://gitlab.freedesktop.org/drm/amd/-/issues/3929 +*/ + { + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "83L3"), + } + }, + { + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "83N6"), + } + }, + { + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "83Q2"), + } + }, + { + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "83Q3"), + } + }, { }, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 249/311 ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean-Marc Eurin <[email protected]>
[ Upstream commit 7ab4f0e37a0f4207e742a8de69be03984db6ebf0 ]
The end of table checks should be done with the structure size, but 2 of the 3 similar calls use the pointer size.
--- drivers/acpi/pptt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/pptt.c +2 -2
@@ -229,7 +229,7 @@ static int acpi_pptt_leaf_node(struct acpi_table_header *table_hdr, node_entry =ACPI_PTR_DIFF (node, table_hdr); entry = ACPI_ADD_PTR(struct acpi_subtable_header, table_hdr,sizeof (struct acpi_table_pptt )); - proc_sz =sizeof (struct acpi_pptt_processor *); + proc_sz =sizeof (struct acpi_pptt_processor );while ((unsigned long )entry + proc_sz < table_end) { cpu_node = (struct acpi_pptt_processor *)entry;
@@ -270,7 +270,7 @@ static struct acpi_pptt_processor *acpi_find_processor_node(struct acpi_table_he table_end = (unsigned long )table_hdr + table_hdr->length; entry = ACPI_ADD_PTR(struct acpi_subtable_header, table_hdr,sizeof (struct acpi_table_pptt )); - proc_sz =sizeof (struct acpi_pptt_processor *); + proc_sz =sizeof (struct acpi_pptt_processor );/* find the processor structure associated with this cpuid */ while ((unsigned long )entry + proc_sz < table_end) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 250/311 drm/amdkfd: sriov doesnt support per queue reset
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Emily Deng <[email protected]>
[ Upstream commit ba6d8f878d6180d4d0ed0574479fc1e232928184 ]
Disable per queue reset for sriov.
--- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +2 -1
@@ -2000,7 +2000,8 @@ static void kfd_topology_set_capabilities(struct kfd_topology_device *dev) dev->node_props.capability |=HSA_CAP_TRAP_DEBUG_PRECISE_MEMORY_OPERATIONS_SUPPORTED ; - dev->node_props.capability |=HSA_CAP_PER_QUEUE_RESET_SUPPORTED ; +if (!amdgpu_sriov_vf (dev->gpu->adev)) + dev->node_props.capability |=HSA_CAP_PER_QUEUE_RESET_SUPPORTED ; }else { dev->node_props.debug_prop |=HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX10 |HSA_DBG_WATCH_ADDR_MASK_HI_BIT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 251/311 drm/amdgpu: Increase KIQ invalidate_tlbs timeout
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jay Cornwall <[email protected]>
[ Upstream commit 3666ed821832f42baaf25f362680dda603cde732 ]
KIQ invalidate_tlbs request has been seen to marginally exceed the configured 100 ms timeout on systems under load.
All other KIQ requests in the driver use a 10 second timeout. Use a similar timeout implementation on the invalidate_tlbs path.
v2: Poll once before msleep
v3: Fix return value
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 19 ++++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -1
@@ -352,7 +352,6 @@ enum amdgpu_kiq_irq {AMDGPU_CP_KIQ_IRQ_DRIVER0 =0 , AMDGPU_CP_KIQ_IRQ_LAST }; -#define SRIOV_USEC_TIMEOUT 1200000/* wait 12 * 100ms for SRIOV */ #define MAX_KIQ_REG_WAIT 5000/* in usecs, 5ms */ #define MAX_KIQ_REG_BAILOUT_INTERVAL 5/* in msecs, 5ms */ #define MAX_KIQ_REG_TRY 1000
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +14 -5
@@ -678,12 +678,10 @@ int amdgpu_gmc_flush_gpu_tlb_pasid(struct amdgpu_device *adev, uint16_t pasid, uint32_t flush_type, bool all_hub, uint32_t inst) { - u32 usec_timeout = amdgpu_sriov_vf(adev) ? SRIOV_USEC_TIMEOUT : - adev->usec_timeout; struct amdgpu_ring *ring = &adev->gfx.kiq[inst].ring;struct amdgpu_kiq *kiq = &adev->gfx.kiq[inst];unsigned int ndw; -int r; +int r, cnt =0 ;uint32_t seq;/*
@@ -740,10 +738,21 @@ int amdgpu_gmc_flush_gpu_tlb_pasid(struct amdgpu_device *adev, uint16_t pasid,amdgpu_ring_commit (ring);spin_unlock (&adev->gfx.kiq[inst].ring_lock); -if (amdgpu_fence_wait_polling (ring, seq, usec_timeout) <1 ) { + + r =amdgpu_fence_wait_polling (ring, seq,MAX_KIQ_REG_WAIT ); + +might_sleep (); +while (r <1 && cnt++ <MAX_KIQ_REG_TRY && + !amdgpu_reset_pending (adev->reset_domain)) { +msleep (MAX_KIQ_REG_BAILOUT_INTERVAL ); + r =amdgpu_fence_wait_polling (ring, seq,MAX_KIQ_REG_WAIT ); + } + +if (cnt >MAX_KIQ_REG_TRY ) {dev_err (adev->dev,"timeout waiting for kiq fence\n" ); r = -ETIME ; - } + }else + r =0 ; } error_unlock_reset:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 252/311 drm/xe/xe3lpg: Apply Wa_14022293748, Wa_22019794406
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Julia Filipchuk <[email protected]>
[ Upstream commit 00e0ae4f1f872800413c819f8a2a909dc29cdc35 ]
Extend Wa_14022293748, Wa_22019794406 to Xe3_LPG
--- drivers/gpu/drm/xe/xe_wa_oob.rules | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/xe/xe_wa_oob.rules +2 -0
@@ -30,8 +30,10 @@ 13011645652 GRAPHICS_VERSION(2004) 14022293748 GRAPHICS_VERSION(2001) GRAPHICS_VERSION(2004) + GRAPHICS_VERSION_RANGE(3000, 3001) 22019794406 GRAPHICS_VERSION(2001) GRAPHICS_VERSION(2004) + GRAPHICS_VERSION_RANGE(3000, 3001) 22019338487 MEDIA_VERSION(2000) GRAPHICS_VERSION(2001) MEDIA_VERSION(3000), MEDIA_STEP(A0, B0), FUNC(xe_rtp_match_not_sriov_vf)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 253/311 nvme: re-read ANA log page after ns scan completes
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Reinecke <[email protected]>
[ Upstream commit 62baf70c327444338c34703c71aa8cc8e4189bd6 ]
When scanning for new namespaces we might have missed an ANA AEN.
The NVMe base spec (NVMe Base Specification v2.1, Figure 151 'Asynchonous Event Information - Notice': Asymmetric Namespace Access Change) states:
A controller shall not send this even if an Attached Namespace Attribute Changed asynchronous event [...] is sent for the same event.
so we need to re-read the ANA log page after we rescanned the namespace list to update the ANA states of the new namespaces.
--- drivers/nvme/host/core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/nvme/host/core.c +5 -0
@@ -4296,6 +4296,11 @@ static void nvme_scan_work(struct work_struct *work)/* Requeue if we have missed AENs */ if (test_bit (NVME_AER_NOTICE_NS_CHANGED , &ctrl->events))nvme_queue_scan (ctrl); +#ifdef CONFIG_NVME_MULTIPATH + else +/* Re-read the ANA log page to not miss updates */ + queue_work(nvme_wq, &ctrl->ana_work); +#endif }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 254/311 nvme: multipath: fix return value of nvme_available_path
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uday Shankar <[email protected]>
[ Upstream commit e3105f54a51554fb1bbf19dcaf93c4411d2d6c8a ]
The function returns bool so we should return false, not NULL. No functional changes are expected.
--- drivers/nvme/host/multipath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/multipath.c +1 -1
@@ -427,7 +427,7 @@ static bool nvme_available_path(struct nvme_ns_head *head)struct nvme_ns *ns;if (!test_bit (NVME_NSHEAD_DISK_LIVE , &head->flags)) -return NULL ; +return false;list_for_each_entry_srcu (ns, &head->list, siblings,srcu_read_lock_held (&head->srcu)) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 255/311 objtool: Stop UNRET validation on UD2
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 9f9cc012c2cbac4833746a0182e06a8eec940d19 ]
In preparation for simplifying INSN_SYSCALL, make validate_unret() terminate control flow on UD2 just like validate_branch() already does.
--- tools/objtool/check.c | 3 +++ 1 file changed, 3 insertions(+)
tools/objtool/check.c +3 -0
@@ -3870,6 +3870,9 @@ static int validate_unret(struct objtool_file *file, struct instruction *insn)break ; } +if (insn->dead_end) +return 0 ; +if (!next) {WARN_INSN (insn,"teh end!" );return -1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 256/311 gpiolib: of: Move Atmel HSMCI quirk up out of the regulator comment
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit b8c7a1ac884cc267d1031f8de07f1a689a69fbab ]
The regulator comment in of_gpio_set_polarity_by_property() made on top of a couple of the cases, while Atmel HSMCI quirk is not related to that. Make it clear by moving Atmel HSMCI quirk up out of the scope of the regulator comment.
--- drivers/gpio/gpiolib-of.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpio/gpiolib-of.c +3 -3
@@ -259,6 +259,9 @@ static void of_gpio_set_polarity_by_property(const struct device_node *np, { "fsl,imx8qm-fec", "phy-reset-gpios", "phy-reset-active-high" }, { "fsl,s32v234-fec", "phy-reset-gpios", "phy-reset-active-high" }, #endif +#if IS_ENABLED(CONFIG_MMC_ATMELMCI) + { "atmel,hsmci", "cd-gpios", "cd-inverted" }, +#endif #if IS_ENABLED(CONFIG_PCI_IMX6) { "fsl,imx6q-pcie", "reset-gpio", "reset-gpio-active-high" }, { "fsl,imx6sx-pcie", "reset-gpio", "reset-gpio-active-high" },
@@ -284,9 +287,6 @@ static void of_gpio_set_polarity_by_property(const struct device_node *np, #if IS_ENABLED(CONFIG_REGULATOR_GPIO) { "regulator-gpio", "enable-gpio", "enable-active-high" }, { "regulator-gpio", "enable-gpios", "enable-active-high" }, -#endif -#if IS_ENABLED(CONFIG_MMC_ATMELMCI) - { "atmel,hsmci", "cd-gpios", "cd-inverted" }, #endif }; unsigned int i;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 257/311 x86/xen: disable CPU idle and frequency drivers for PVH dom0
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roger Pau Monne <[email protected]>
[ Upstream commit 64a66e2c3b3113dc78a6124e14825d68ddc2e188 ]
When running as a PVH dom0 the ACPI tables exposed to Linux are (mostly) the native ones, thus exposing the C and P states, that can lead to attachment of CPU idle and frequency drivers. However the entity in control of the CPU C and P states is Xen, as dom0 doesn't have a full view of the system load, neither has all CPUs assigned and identity pinned.
Like it's done for classic PV guests, prevent Linux from using idle or frequency state drivers when running as a PVH dom0.
On an AMD EPYC 7543P system without this fix a Linux PVH dom0 will keep the host CPUs spinning at 100% even when dom0 is completely idle, as it's attempting to use the acpi_idle driver.
Message-ID: <[email protected]>
--- arch/x86/xen/enlighten_pvh.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
arch/x86/xen/enlighten_pvh.c +18 -1
@@ -1,5 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/acpi.h> +#include <linux/cpufreq.h> +#include <linux/cpuidle.h> #include <linux/export.h> #include <linux/mm.h>
@@ -123,8 +125,23 @@ static void __init pvh_arch_setup(void) {pvh_reserve_extra_memory (); -if (xen_initial_domain ()) +if (xen_initial_domain ()) {xen_add_preferred_consoles (); + +/* +* Disable usage of CPU idle and frequency drivers: when +* running as hardware domain the exposed native ACPI tables +* causes idle and/or frequency drivers to attach and +* malfunction. It's Xen the entity that controls the idle and +* frequency states. +* +* For unprivileged domains the exposed ACPI tables are +* fabricated and don't contain such data. +*/ +disable_cpuidle (); +disable_cpufreq (); +WARN_ON (xen_set_default_idle ()); + } }void __init xen_pvh_init (struct boot_params *boot_params)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 258/311 selftests/mincore: Allow read-ahead pages to reach the end of the file
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qiuxu Zhuo <[email protected]>
[ Upstream commit 197c1eaa7ba633a482ed7588eea6fd4aa57e08d4 ]
When running the mincore_selftest on a system with an XFS file system, it failed the "check_file_mmap" test case due to the read-ahead pages reaching the end of the file. The failure log is as below:
RUN global.check_file_mmap ...
mincore_selftest.c:264:check_file_mmap:Expected i (1024) < vec_size (1024) mincore_selftest.c:265:check_file_mmap:Read-ahead pages reached the end of the file
check_file_mmap: Test failed
FAIL global.check_file_mmap
This is because the read-ahead window size of the XFS file system on this machine is 4 MB, which is larger than the size from the #PF address to the end of the file. As a result, all the pages for this file are populated.
blockdev --getra /dev/nvme0n1p5
8192
blockdev --getbsz /dev/nvme0n1p5
512This issue can be fixed by extending the current FILE_SIZE 4MB to a larger number, but it will still fail if the read-ahead window size of the file system is larger enough. Additionally, in the real world, read-ahead pages reaching the end of the file can happen and is an expected behavior. Therefore, allowing read-ahead pages to reach the end of the file is a better choice for the "check_file_mmap" test case.
--- tools/testing/selftests/mincore/mincore_selftest.c | 3 --- 1 file changed, 3 deletions(-)
tools/testing/selftests/mincore/mincore_selftest.c +0 -3
@@ -261,9 +261,6 @@ TEST(check_file_mmap)TH_LOG ("No read-ahead pages found in memory" ); } - EXPECT_LT(i, vec_size) { -TH_LOG ("Read-ahead pages reached the end of the file" ); - }/* * End of the readahead window. The rest of the pages shouldn't * be in memory.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 259/311 x86/bugs: Use SBPB in write_ibpb() if applicable
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit fc9fd3f98423367c79e0bd85a9515df26dc1b3cc ]
write_ibpb() does IBPB, which (among other things) flushes branch type predictions on AMD. If the CPU has SRSO_NO, or if the SRSO mitigation has been disabled, branch type flushing isn't needed, in which case the lighter-weight SBPB can be used.
The 'x86_pred_cmd' variable already keeps track of whether IBPB or SBPB should be used. Use that instead of hardcoding IBPB.
--- arch/x86/entry/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/entry/entry.S +1 -1
@@ -18,7 +18,7 @@ SYM_FUNC_START(entry_ibpb) movl $MSR_IA32_PRED_CMD, %ecx - movl $PRED_CMD_IBPB, %eax + movl _ASM_RIP(x86_pred_cmd), %eax xorl %edx, %edx wrmsr
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 260/311 x86/bugs: Dont fill RSB on VMEXIT with eIBRS+retpoline
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 18bae0dfec15b24ec14ca17dc18603372f5f254f ]
eIBRS protects against guest->host RSB underflow/poisoning attacks. Adding retpoline to the mix doesn't change that. Retpoline has a balanced CALL/RET anyway.
So the current full RSB filling on VMEXIT with eIBRS+retpoline is overkill. Disable it or do the VMEXIT_LITE mitigation if needed.
--- arch/x86/kernel/cpu/bugs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/bugs.c +4 -4
@@ -1604,20 +1604,20 @@ static void __init spectre_v2_determine_rsb_fill_type_at_vmexit(enum spectre_v2_case SPECTRE_V2_NONE :return ; -case SPECTRE_V2_EIBRS_LFENCE :case SPECTRE_V2_EIBRS : +case SPECTRE_V2_EIBRS_LFENCE : +case SPECTRE_V2_EIBRS_RETPOLINE :if (boot_cpu_has_bug (X86_BUG_EIBRS_PBRSB )) { -setup_force_cpu_cap (X86_FEATURE_RSB_VMEXIT_LITE );pr_info ("Spectre v2 / PBRSB-eIBRS: Retire a single CALL on VMEXIT\n" ); +setup_force_cpu_cap (X86_FEATURE_RSB_VMEXIT_LITE ); }return ; -case SPECTRE_V2_EIBRS_RETPOLINE :case SPECTRE_V2_RETPOLINE :case SPECTRE_V2_LFENCE :case SPECTRE_V2_IBRS : -setup_force_cpu_cap (X86_FEATURE_RSB_VMEXIT );pr_info ("Spectre v2 / SpectreRSB : Filling RSB on VMEXIT\n" ); +setup_force_cpu_cap (X86_FEATURE_RSB_VMEXIT );return ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 261/311 x86/bugs: Dont fill RSB on context switch with eIBRS
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 27ce8299bc1ec6df8306073785ff82b30b3cc5ee ]
User->user Spectre v2 attacks (including RSB) across context switches are already mitigated by IBPB in cond_mitigation(), if enabled globally or if either the prev or the next task has opted in to protection. RSB filling without IBPB serves no purpose for protecting user space, as indirect branches are still vulnerable.
User->kernel RSB attacks are mitigated by eIBRS. In which case the RSB filling on context switch isn't needed, so remove it.
--- arch/x86/kernel/cpu/bugs.c | 24 ++++++++++++------------ arch/x86/mm/tlb.c | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-)
arch/x86/kernel/cpu/bugs.c +12 -12
@@ -1578,7 +1578,7 @@ static void __init spec_ctrl_disable_kernel_rrsba(void) rrsba_disabled = true; } -static void __init spectre_v2_determine_rsb_fill_type_at_vmexit (enum spectre_v2_mitigation mode) +static void __init spectre_v2_select_rsb_mitigation (enum spectre_v2_mitigation mode) {/* * Similar to context switches, there are two types of RSB attacks
@@ -1602,7 +1602,7 @@ static void __init spectre_v2_determine_rsb_fill_type_at_vmexit(enum spectre_v2_*/ switch (mode) {case SPECTRE_V2_NONE : -return ; +break ;case SPECTRE_V2_EIBRS :case SPECTRE_V2_EIBRS_LFENCE :
@@ -1611,18 +1611,21 @@ static void __init spectre_v2_determine_rsb_fill_type_at_vmexit(enum spectre_v2_pr_info ("Spectre v2 / PBRSB-eIBRS: Retire a single CALL on VMEXIT\n" );setup_force_cpu_cap (X86_FEATURE_RSB_VMEXIT_LITE ); } -return ; +break ;case SPECTRE_V2_RETPOLINE :case SPECTRE_V2_LFENCE :case SPECTRE_V2_IBRS : -pr_info ("Spectre v2 / SpectreRSB : Filling RSB on VMEXIT\n" ); +pr_info ("Spectre v2 / SpectreRSB: Filling RSB on context switch and VMEXIT\n" ); +setup_force_cpu_cap (X86_FEATURE_RSB_CTXSW );setup_force_cpu_cap (X86_FEATURE_RSB_VMEXIT ); -return ; - } +break ; -pr_warn_once ("Unknown Spectre v2 mode, disabling RSB mitigation at VM exit" ); -dump_stack (); +default : +pr_warn_once ("Unknown Spectre v2 mode, disabling RSB mitigation\n" ); +dump_stack (); +break ; + } }/*
@@ -1854,10 +1857,7 @@ static void __init spectre_v2_select_mitigation(void)* * FIXME: Is this pointless for retbleed-affected AMD? */ -setup_force_cpu_cap (X86_FEATURE_RSB_CTXSW ); -pr_info ("Spectre v2 / SpectreRSB mitigation: Filling RSB on context switch\n" ); - -spectre_v2_determine_rsb_fill_type_at_vmexit (mode); +spectre_v2_select_rsb_mitigation (mode);/* * Retpoline protects the kernel, but doesn't protect firmware. IBRS
arch/x86/mm/tlb.c +3 -3
@@ -389,9 +389,9 @@ static void cond_mitigation(struct task_struct *next) prev_mm =this_cpu_read (cpu_tlbstate.last_user_mm_spec);/* -* Avoid user/user BTB poisoning by flushing the branch predictor -* when switching between processes. This stops one process from -* doing Spectre-v2 attacks on another. +* Avoid user->user BTB/RSB poisoning by flushing them when switching +* between processes. This stops one process from doing Spectre-v2 +* attacks on another. * * Both, the conditional and the always IBPB mode use the mm * pointer to avoid the IBPB when switching between tasks of the
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 262/311 nvmet-fc: take tgtport reference only once
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Wagner <[email protected]>
[ Upstream commit b0b26ad0e1943de25ce82a7e5af3574f31b1cf99 ]
The reference counting code can be simplified. Instead taking a tgtport refrerence at the beginning of nvmet_fc_alloc_hostport and put it back if not a new hostport object is allocated, only take it when a new hostport object is allocated.
--- drivers/nvme/target/fc.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
drivers/nvme/target/fc.c +7 -15
@@ -1028,33 +1028,24 @@ nvmet_fc_alloc_hostport(struct nvmet_fc_tgtport *tgtport, void *hosthandle)struct nvmet_fc_hostport *newhost, *match =NULL ;unsigned long flags; +/* +* Caller holds a reference on tgtport. +*/ +/* if LLDD not implemented, leave as NULL */ if (!hosthandle)return NULL ; -/* -* take reference for what will be the newly allocated hostport if -* we end up using a new allocation -*/ -if (!nvmet_fc_tgtport_get (tgtport)) -return ERR_PTR (-EINVAL ); -spin_lock_irqsave (&tgtport->lock, flags); match =nvmet_fc_match_hostport (tgtport, hosthandle);spin_unlock_irqrestore (&tgtport->lock, flags); -if (match) { -/* no new allocation - release reference */ -nvmet_fc_tgtport_put (tgtport); +if (match)return match; - } newhost =kzalloc (sizeof (*newhost),GFP_KERNEL ); -if (!newhost) { -/* no new allocation - release reference */ -nvmet_fc_tgtport_put (tgtport); +if (!newhost)return ERR_PTR (-ENOMEM ); - }spin_lock_irqsave (&tgtport->lock, flags); match =nvmet_fc_match_hostport (tgtport, hosthandle);
@@ -1063,6 +1054,7 @@ nvmet_fc_alloc_hostport(struct nvmet_fc_tgtport *tgtport, void *hosthandle)kfree (newhost); newhost = match; }else { +nvmet_fc_tgtport_get (tgtport); newhost->tgtport = tgtport; newhost->hosthandle = hosthandle;INIT_LIST_HEAD (&newhost->host_list);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 263/311 nvmet-fc: put ref when assoc->del_work is already scheduled
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Wagner <[email protected]>
[ Upstream commit 70289ae5cac4d3a39575405aaf63330486cea030 ]
Do not leak the tgtport reference when the work is already scheduled.
--- drivers/nvme/target/fc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/target/fc.c +2 -1
@@ -1089,7 +1089,8 @@ static void nvmet_fc_schedule_delete_assoc(struct nvmet_fc_tgt_assoc *assoc) {nvmet_fc_tgtport_get (assoc->tgtport); -queue_work (nvmet_wq, &assoc->del_work); +if (!queue_work (nvmet_wq, &assoc->del_work)) +nvmet_fc_tgtport_put (assoc->tgtport); } static bool
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 264/311 cifs: Fix encoding of SMB1 Session Setup Kerberos Request in non-UNICODE mode
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pali Rohár <[email protected]>
[ Upstream commit 16cb6b0509b65ac89187e9402e0b7a9ddf1765ef ]
Like in UNICODE mode, SMB1 Session Setup Kerberos Request contains oslm and domain strings.
Extract common code into ascii_oslm_strings() and ascii_domain_string() functions (similar to unicode variants) and use these functions in non-UNICODE code path in sess_auth_kerberos().
Decision if non-UNICODE or UNICODE mode is used is based on the SMBFLG2_UNICODE flag in Flags2 packed field, and not based on the capabilities of server. Fix this check too.
--- fs/smb/client/sess.c | 60 +++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 20 deletions(-)
fs/smb/client/sess.c +40 -20
@@ -679,6 +679,22 @@ unicode_oslm_strings(char **pbcc_area, const struct nls_table *nls_cp) *pbcc_area = bcc_ptr; } +static void +ascii_oslm_strings (char **pbcc_area,const struct nls_table *nls_cp) +{ +char *bcc_ptr = *pbcc_area; + +strcpy (bcc_ptr,"Linux version " ); + bcc_ptr +=strlen ("Linux version " ); +strcpy (bcc_ptr,init_utsname ()->release); + bcc_ptr +=strlen (init_utsname ()->release) +1 ; + +strcpy (bcc_ptr,CIFS_NETWORK_OPSYS ); + bcc_ptr +=strlen (CIFS_NETWORK_OPSYS ) +1 ; + + *pbcc_area = bcc_ptr; +} +static void unicode_domain_string (char **pbcc_area,struct cifs_ses *ses,const struct nls_table *nls_cp) {
@@ -703,6 +719,25 @@ static void unicode_domain_string(char **pbcc_area, struct cifs_ses *ses, *pbcc_area = bcc_ptr; } +static void ascii_domain_string (char **pbcc_area,struct cifs_ses *ses, +const struct nls_table *nls_cp) +{ +char *bcc_ptr = *pbcc_area; +int len; + +/* copy domain */ +if (ses->domainName !=NULL ) { + len =strscpy (bcc_ptr, ses->domainName,CIFS_MAX_DOMAINNAME_LEN ); +if (WARN_ON_ONCE (len <0 )) + len =CIFS_MAX_DOMAINNAME_LEN -1 ; + bcc_ptr += len; + }/* else we send a null domain name so server will default to its own domain */ + *bcc_ptr =0 ; + bcc_ptr++; + + *pbcc_area = bcc_ptr; +} +static void unicode_ssetup_strings (char **pbcc_area,struct cifs_ses *ses,const struct nls_table *nls_cp) {
@@ -748,25 +783,10 @@ static void ascii_ssetup_strings(char **pbcc_area, struct cifs_ses *ses, *bcc_ptr =0 ; bcc_ptr++;/* account for null termination */ -/* copy domain */ -if (ses->domainName !=NULL ) { - len =strscpy (bcc_ptr, ses->domainName,CIFS_MAX_DOMAINNAME_LEN ); -if (WARN_ON_ONCE (len <0 )) - len =CIFS_MAX_DOMAINNAME_LEN -1 ; - bcc_ptr += len; - }/* else we send a null domain name so server will default to its own domain */ - *bcc_ptr =0 ; - bcc_ptr++; -/* BB check for overflow here */ -strcpy (bcc_ptr,"Linux version " ); - bcc_ptr +=strlen ("Linux version " ); -strcpy (bcc_ptr,init_utsname ()->release); - bcc_ptr +=strlen (init_utsname ()->release) +1 ; - -strcpy (bcc_ptr,CIFS_NETWORK_OPSYS ); - bcc_ptr +=strlen (CIFS_NETWORK_OPSYS ) +1 ; +ascii_domain_string (&bcc_ptr, ses, nls_cp); +ascii_oslm_strings (&bcc_ptr, nls_cp); *pbcc_area = bcc_ptr; }
@@ -1569,7 +1589,7 @@ sess_auth_kerberos(struct sess_data *sess_data) sess_data->iov[1 ].iov_len = msg->secblob_len; pSMB->req.SecurityBlobLength =cpu_to_le16 (sess_data->iov[1 ].iov_len); -if (ses->capabilities &CAP_UNICODE ) { +if (pSMB->req.hdr.Flags2 &SMBFLG2_UNICODE ) {/* unicode strings must be word aligned */ if (!IS_ALIGNED (sess_data->iov[0 ].iov_len + sess_data->iov[1 ].iov_len,2 )) { *bcc_ptr =0 ;
@@ -1578,8 +1598,8 @@ sess_auth_kerberos(struct sess_data *sess_data)unicode_oslm_strings (&bcc_ptr, sess_data->nls_cp);unicode_domain_string (&bcc_ptr, ses, sess_data->nls_cp); }else { -/* BB: is this right? */ -ascii_ssetup_strings (&bcc_ptr, ses, sess_data->nls_cp); +ascii_oslm_strings (&bcc_ptr, sess_data->nls_cp); +ascii_domain_string (&bcc_ptr, ses, sess_data->nls_cp); } sess_data->iov[2].iov_len = (long) bcc_ptr -
Signature · 1 line
2.39.5