6.5.12-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 523/550 r8169: respect userspace disabling IFF_MULTICAST
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
[ Upstream commit 8999ce4cfc87e61b4143ec2e7b93d8e92e11fa7f ]
So far we ignore the setting of IFF_MULTICAST. Fix this and clear bit AcceptMulticast if IFF_MULTICAST isn't set.
Note: Based on the implementations I've seen it doesn't seem to be 100% clear what a driver is supposed to do if IFF_ALLMULTI is set but IFF_MULTICAST is not. This patch is based on the understanding that IFF_MULTICAST has precedence.
--- drivers/net/ethernet/realtek/r8169_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/realtek/r8169_main.c +2 -0
@@ -2582,6 +2582,8 @@ static void rtl_set_rx_mode(struct net_device *dev)if (dev->flags &IFF_PROMISC ) { rx_mode |= AcceptAllPhys; + }else if (!(dev->flags &IFF_MULTICAST )) { + rx_mode &= ~AcceptMulticast; } else if (netdev_mc_count(dev) > MC_FILTER_LIMIT || dev->flags & IFF_ALLMULTI || tp->mac_version == RTL_GIGA_MAC_VER_35 ||
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 524/550 net: enetc: shorten enetc_setup_xdp_prog() error message to fit NETLINK_MAX_FMTMSG_LEN
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit f968c56417f00be4cb62eadeed042a1e3c80dc53 ]
NETLINK_MAX_FMTMSG_LEN is currently hardcoded to 80, and we provide an error printf-formatted string having 96 characters including the terminating \0. Assuming each %d (representing a queue) gets replaced by a number having at most 2 digits (a reasonable assumption), the final string is also 96 characters wide, which is too much.
Reduce the verbiage a bit by removing some (partially) redundant words, which makes the new printf-formatted string be 73 characters wide with the trailing newline.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc.c +1 -1
@@ -2769,7 +2769,7 @@ static int enetc_setup_xdp_prog(struct net_device *ndev, struct bpf_prog *prog,if (priv->min_num_stack_tx_queues + num_xdp_tx_queues > priv->num_tx_rings) {NL_SET_ERR_MSG_FMT_MOD (extack, -"Reserving %d XDP TXQs does not leave a minimum of %d TXQs for network stack (total %d available)" , +"Reserving %d XDP TXQs does not leave a minimum of %d for stack (total %d)" , num_xdp_tx_queues, priv->min_num_stack_tx_queues, priv->num_tx_rings);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 525/550 i2c: iproc: handle invalid slave state
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Bacik <[email protected]>
[ Upstream commit ba15a14399c262f91ce30c19fcbdc952262dd1be ]
Add the code to handle an invalid state when both bits S_RX_EVENT (indicating a transaction) and S_START_BUSY (indicating the end of transaction - transition of START_BUSY from 1 to 0) are set in the interrupt status register during a slave read.
--- drivers/i2c/busses/i2c-bcm-iproc.c | 133 ++++++++++++++++------------- 1 file changed, 75 insertions(+), 58 deletions(-)
drivers/i2c/busses/i2c-bcm-iproc.c +75 -58
@@ -316,26 +316,44 @@ static void bcm_iproc_i2c_slave_init(iproc_i2c_wr_reg (iproc_i2c,IE_OFFSET , val); } -static void bcm_iproc_i2c_check_slave_status ( -struct bcm_iproc_i2c_dev *iproc_i2c) +static bool bcm_iproc_i2c_check_slave_status + (struct bcm_iproc_i2c_dev *iproc_i2c,u32 status) {u32 val; +bool recover = false; - val =iproc_i2c_rd_reg (iproc_i2c,S_CMD_OFFSET ); -/* status is valid only when START_BUSY is cleared after it was set */ -if (val &BIT (S_CMD_START_BUSY_SHIFT )) -return ; +/* check slave transmit status only if slave is transmitting */ +if (!iproc_i2c->slave_rx_only) { + val =iproc_i2c_rd_reg (iproc_i2c,S_CMD_OFFSET ); +/* status is valid only when START_BUSY is cleared */ +if (!(val &BIT (S_CMD_START_BUSY_SHIFT ))) { + val = (val >>S_CMD_STATUS_SHIFT ) &S_CMD_STATUS_MASK ; +if (val ==S_CMD_STATUS_TIMEOUT || + val ==S_CMD_STATUS_MASTER_ABORT ) { +dev_warn (iproc_i2c->device, + (val ==S_CMD_STATUS_TIMEOUT ) ? +"slave random stretch time timeout\n" : +"Master aborted read transaction\n" ); + recover = true; + } + } + } + +/* RX_EVENT is not valid when START_BUSY is set */ +if ((status &BIT (IS_S_RX_EVENT_SHIFT )) && + (status &BIT (IS_S_START_BUSY_SHIFT ))) { +dev_warn (iproc_i2c->device,"Slave aborted read transaction\n" ); + recover = true; + } - val = (val >>S_CMD_STATUS_SHIFT ) &S_CMD_STATUS_MASK ; -if (val ==S_CMD_STATUS_TIMEOUT || val ==S_CMD_STATUS_MASTER_ABORT ) { -dev_err (iproc_i2c->device, (val ==S_CMD_STATUS_TIMEOUT ) ? -"slave random stretch time timeout\n" : -"Master aborted read transaction\n" ); +if (recover) {/* re-initialize i2c for recovery */ bcm_iproc_i2c_enable_disable (iproc_i2c, false);bcm_iproc_i2c_slave_init (iproc_i2c, true);bcm_iproc_i2c_enable_disable (iproc_i2c, true); } + +return recover; }static void bcm_iproc_i2c_slave_read (struct bcm_iproc_i2c_dev *iproc_i2c)
@@ -420,48 +438,6 @@ static bool bcm_iproc_i2c_slave_isr(struct bcm_iproc_i2c_dev *iproc_i2c,u32 val;u8 value; -/* -* Slave events in case of master-write, master-write-read and, -* master-read -* -* Master-write : only IS_S_RX_EVENT_SHIFT event -* Master-write-read: both IS_S_RX_EVENT_SHIFT and IS_S_RD_EVENT_SHIFT -* events -* Master-read : both IS_S_RX_EVENT_SHIFT and IS_S_RD_EVENT_SHIFT -* events or only IS_S_RD_EVENT_SHIFT -* -* iproc has a slave rx fifo size of 64 bytes. Rx fifo full interrupt -* (IS_S_RX_FIFO_FULL_SHIFT) will be generated when RX fifo becomes -* full. This can happen if Master issues write requests of more than -* 64 bytes. -*/ -if (status &BIT (IS_S_RX_EVENT_SHIFT ) || - status &BIT (IS_S_RD_EVENT_SHIFT ) || - status &BIT (IS_S_RX_FIFO_FULL_SHIFT )) { -/* disable slave interrupts */ - val =iproc_i2c_rd_reg (iproc_i2c,IE_OFFSET ); - val &= ~iproc_i2c->slave_int_mask; -iproc_i2c_wr_reg (iproc_i2c,IE_OFFSET , val); - -if (status &BIT (IS_S_RD_EVENT_SHIFT )) -/* Master-write-read request */ - iproc_i2c->slave_rx_only = false; -else -/* Master-write request only */ - iproc_i2c->slave_rx_only = true; - -/* schedule tasklet to read data later */ -tasklet_schedule (&iproc_i2c->slave_rx_tasklet); - -/* -* clear only IS_S_RX_EVENT_SHIFT and -* IS_S_RX_FIFO_FULL_SHIFT interrupt. -*/ - val =BIT (IS_S_RX_EVENT_SHIFT ); -if (status &BIT (IS_S_RX_FIFO_FULL_SHIFT )) - val |=BIT (IS_S_RX_FIFO_FULL_SHIFT ); -iproc_i2c_wr_reg (iproc_i2c,IS_OFFSET , val); - }if (status &BIT (IS_S_TX_UNDERRUN_SHIFT )) { iproc_i2c->tx_underrun++;
@@ -493,8 +469,9 @@ static bool bcm_iproc_i2c_slave_isr(struct bcm_iproc_i2c_dev *iproc_i2c,* less than PKT_LENGTH bytes were output on the SMBUS */ iproc_i2c->slave_int_mask &= ~BIT (IE_S_TX_UNDERRUN_SHIFT ); -iproc_i2c_wr_reg (iproc_i2c,IE_OFFSET , - iproc_i2c->slave_int_mask); + val =iproc_i2c_rd_reg (iproc_i2c,IE_OFFSET ); + val &= ~BIT (IE_S_TX_UNDERRUN_SHIFT ); +iproc_i2c_wr_reg (iproc_i2c,IE_OFFSET , val);/* End of SMBUS for Master Read */ val =BIT (S_TX_WR_STATUS_SHIFT );
@@ -515,9 +492,49 @@ static bool bcm_iproc_i2c_slave_isr(struct bcm_iproc_i2c_dev *iproc_i2c, BIT(IS_S_START_BUSY_SHIFT)); } -/* check slave transmit status only if slave is transmitting */ -if (!iproc_i2c->slave_rx_only) -bcm_iproc_i2c_check_slave_status (iproc_i2c); +/* if the controller has been reset, immediately return from the ISR */ +if (bcm_iproc_i2c_check_slave_status (iproc_i2c, status)) +return true; + +/* +* Slave events in case of master-write, master-write-read and, +* master-read +* +* Master-write : only IS_S_RX_EVENT_SHIFT event +* Master-write-read: both IS_S_RX_EVENT_SHIFT and IS_S_RD_EVENT_SHIFT +* events +* Master-read : both IS_S_RX_EVENT_SHIFT and IS_S_RD_EVENT_SHIFT +* events or only IS_S_RD_EVENT_SHIFT +* +* iproc has a slave rx fifo size of 64 bytes. Rx fifo full interrupt +* (IS_S_RX_FIFO_FULL_SHIFT) will be generated when RX fifo becomes +* full. This can happen if Master issues write requests of more than +* 64 bytes. +*/ +if (status &BIT (IS_S_RX_EVENT_SHIFT ) || + status &BIT (IS_S_RD_EVENT_SHIFT ) || + status &BIT (IS_S_RX_FIFO_FULL_SHIFT )) { +/* disable slave interrupts */ + val =iproc_i2c_rd_reg (iproc_i2c,IE_OFFSET ); + val &= ~iproc_i2c->slave_int_mask; +iproc_i2c_wr_reg (iproc_i2c,IE_OFFSET , val); + +if (status &BIT (IS_S_RD_EVENT_SHIFT )) +/* Master-write-read request */ + iproc_i2c->slave_rx_only = false; +else +/* Master-write request only */ + iproc_i2c->slave_rx_only = true; + +/* schedule tasklet to read data later */ +tasklet_schedule (&iproc_i2c->slave_rx_tasklet); + +/* clear IS_S_RX_FIFO_FULL_SHIFT interrupt */ +if (status &BIT (IS_S_RX_FIFO_FULL_SHIFT )) { + val =BIT (IS_S_RX_FIFO_FULL_SHIFT ); +iproc_i2c_wr_reg (iproc_i2c,IS_OFFSET , val); + } + }return true; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 526/550 netfilter: xt_recent: fix (increase) ipv6 literal buffer length
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Żenczykowski <[email protected]>
[ Upstream commit 7b308feb4fd2d1c06919445c65c8fbf8e9fd1781 ]
in6_pton() supports 'low-32-bit dot-decimal representation' (this is useful with DNS64/NAT64 networks for example):
# echo +aaaa:bbbb:cccc:dddd:eeee:ffff:1.2.3.4 > /proc/self/net/xt_recent/DEFAULT # cat /proc/self/net/xt_recent/DEFAULT src=aaaa:bbbb:cccc:dddd:eeee:ffff:0102:0304 ttl: 0 last_seen: 9733848829 oldest_pkt: 1 9733848829
but the provided buffer is too short:
# echo +aaaa:bbbb:cccc:dddd:eeee:ffff:255.255.255.255 > /proc/self/net/xt_recent/DEFAULT -bash: echo: write error: Invalid argument
--- net/netfilter/xt_recent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/xt_recent.c +1 -1
@@ -561,7 +561,7 @@ recent_mt_proc_write(struct file *file, const char __user *input, {struct recent_table *t =pde_data (file_inode (file));struct recent_entry *e; -char buf[sizeof ("+b335:1d35:1e55:dead:c0de:1715:5afe:c0de" )]; +char buf[sizeof ("+b335:1d35:1e55:dead:c0de:1715:255.255.255.255" )];const char *c = buf;union nf_inet_addr addr = {};u_int16_t family;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 527/550 netfilter: nat: fix ipv6 nat redirect with mapped and scoped addresses
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 80abbe8a8263106fe45a4f293b92b5c74cc9cc8a ]
The ipv6 redirect target was derived from the ipv4 one, i.e. its identical to a 'dnat' with the first (primary) address assigned to the network interface. The code has been moved around to make it usable from nf_tables too, but its still the same as it was back when this was added in 2012.
IPv6, however, has different types of addresses, if the 'wrong' address comes first the redirection does not work.
In Daniels case, the addresses are:
inet6 ::ffff:192 ...
inet6 2a01: ...
... so the function attempts to redirect to the mapped address.
Add more checks before the address is deemed correct:
1. If the packets' daddr is scoped, search for a scoped address too
2. skip tentative addresses
3. skip mapped addresses
Use the first address that appears to match our needs.
--- net/netfilter/nf_nat_redirect.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
net/netfilter/nf_nat_redirect.c +26 -1
@@ -80,6 +80,26 @@ EXPORT_SYMBOL_GPL(nf_nat_redirect_ipv4);static const struct in6_addr loopback_addr =IN6ADDR_LOOPBACK_INIT ; +static bool nf_nat_redirect_ipv6_usable (const struct inet6_ifaddr *ifa,unsigned int scope) +{ +unsigned int ifa_addr_type =ipv6_addr_type (&ifa->addr); + +if (ifa_addr_type &IPV6_ADDR_MAPPED ) +return false; + +if ((ifa->flags &IFA_F_TENTATIVE ) && (!(ifa->flags &IFA_F_OPTIMISTIC ))) +return false; + +if (scope) { +unsigned int ifa_scope = ifa_addr_type &IPV6_ADDR_SCOPE_MASK ; + +if (!(scope & ifa_scope)) +return false; + } + +return true; +} +unsigned int nf_nat_redirect_ipv6 (struct sk_buff *skb,const struct nf_nat_range2 *range,unsigned int hooknum)
@@ -89,14 +109,19 @@ nf_nat_redirect_ipv6(struct sk_buff *skb, const struct nf_nat_range2 *range,if (hooknum ==NF_INET_LOCAL_OUT ) { newdst.in6 = loopback_addr; }else { +unsigned int scope =ipv6_addr_scope (&ipv6_hdr (skb)->daddr);struct inet6_dev *idev; -struct inet6_ifaddr *ifa;bool addr = false; idev =__in6_dev_get (skb->dev);if (idev !=NULL ) { +const struct inet6_ifaddr *ifa; +read_lock_bh (&idev->lock);list_for_each_entry (ifa, &idev->addr_list, if_list) { +if (!nf_nat_redirect_ipv6_usable (ifa, scope)) +continue ; + newdst.in6 = ifa->addr; addr = true;break ;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 528/550 net/sched: act_ct: Always fill offloading tuple iifidx
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Buslov <[email protected]>
[ Upstream commit 9bc64bd0cd765f696fcd40fc98909b1f7c73b2ba ]
Referenced commit doesn't always set iifidx when offloading the flow to hardware. Fix the following cases:
- nf_conn_act_ct_ext_fill() is called before extension is created with nf_conn_act_ct_ext_add() in tcf_ct_act(). This can cause rule offload with unspecified iifidx when connection is offloaded after only single original-direction packet has been processed by tc data path. Always fill the new nf_conn_act_ct_ext instance after creating it in nf_conn_act_ct_ext_add().
- Offloading of unidirectional UDP NEW connections is now supported, but ct flow iifidx field is not updated when connection is promoted to bidirectional which can result reply-direction iifidx to be zero when refreshing the connection. Fill in the extension and update flow iifidx before calling flow_offload_refresh().
--- include/net/netfilter/nf_conntrack_act_ct.h | 30 ++++++++++++--------- net/openvswitch/conntrack.c | 2 +- net/sched/act_ct.c | 15 ++++++++++- 3 files changed, 32 insertions(+), 15 deletions(-)
include/net/netfilter/nf_conntrack_act_ct.h +17 -13
@@ -20,7 +20,22 @@ static inline struct nf_conn_act_ct_ext *nf_conn_act_ct_ext_find(const struct nf#endif } -static inline struct nf_conn_act_ct_ext *nf_conn_act_ct_ext_add (struct nf_conn *ct) +static inline void nf_conn_act_ct_ext_fill (struct sk_buff *skb,struct nf_conn *ct, +enum ip_conntrack_info ctinfo) +{ +#if IS_ENABLED (CONFIG_NET_ACT_CT ) +struct nf_conn_act_ct_ext *act_ct_ext; + + act_ct_ext =nf_conn_act_ct_ext_find (ct); +if (dev_net (skb->dev) == &init_net && act_ct_ext) + act_ct_ext->ifindex[CTINFO2DIR (ctinfo)] = skb->dev->ifindex; +#endif +} + +static inline struct +nf_conn_act_ct_ext *nf_conn_act_ct_ext_add (struct sk_buff *skb, +struct nf_conn *ct, +enum ip_conntrack_info ctinfo) {#if IS_ENABLED (CONFIG_NET_ACT_CT )struct nf_conn_act_ct_ext *act_ct =nf_ct_ext_find (ct,NF_CT_EXT_ACT_CT );
@@ -29,22 +44,11 @@ static inline struct nf_conn_act_ct_ext *nf_conn_act_ct_ext_add(struct nf_conn *return act_ct; act_ct =nf_ct_ext_add (ct,NF_CT_EXT_ACT_CT ,GFP_ATOMIC ); +nf_conn_act_ct_ext_fill (skb, ct, ctinfo);return act_ct;#else return NULL ; #endif } -static inline void nf_conn_act_ct_ext_fill (struct sk_buff *skb,struct nf_conn *ct, -enum ip_conntrack_info ctinfo) -{ -#if IS_ENABLED (CONFIG_NET_ACT_CT ) -struct nf_conn_act_ct_ext *act_ct_ext; - - act_ct_ext =nf_conn_act_ct_ext_find (ct); -if (dev_net (skb->dev) == &init_net && act_ct_ext) - act_ct_ext->ifindex[CTINFO2DIR (ctinfo)] = skb->dev->ifindex; -#endif -} -#endif /* _NF_CONNTRACK_ACT_CT_H */
net/openvswitch/conntrack.c +1 -1
@@ -1043,7 +1043,7 @@ static int ovs_ct_commit(struct net *net, struct sw_flow_key *key,if (err)return err; -nf_conn_act_ct_ext_add (ct); +nf_conn_act_ct_ext_add (skb, ct, ctinfo); }else if (IS_ENABLED (CONFIG_NF_CONNTRACK_LABELS ) &&labels_nonzero (&info->labels.mask)) { err = ovs_ct_set_labels(ct, key, &info->labels.value,
net/sched/act_ct.c +14 -1
@@ -376,6 +376,17 @@ static void tcf_ct_flow_tc_ifidx(struct flow_offload *entry, entry->tuplehash[dir].tuple.tc.iifidx = act_ct_ext->ifindex[dir]; } +static void tcf_ct_flow_ct_ext_ifidx_update (struct flow_offload *entry) +{ +struct nf_conn_act_ct_ext *act_ct_ext; + + act_ct_ext =nf_conn_act_ct_ext_find (entry->ct); +if (act_ct_ext) { +tcf_ct_flow_tc_ifidx (entry, act_ct_ext,FLOW_OFFLOAD_DIR_ORIGINAL ); +tcf_ct_flow_tc_ifidx (entry, act_ct_ext,FLOW_OFFLOAD_DIR_REPLY ); + } +} +static void tcf_ct_flow_table_add (struct tcf_ct_flow_table *ct_ft,struct nf_conn *ct,bool tcp,bool bidirectional)
@@ -671,6 +682,8 @@ static bool tcf_ct_flow_table_lookup(struct tcf_ct_params *p,else ctinfo =IP_CT_ESTABLISHED_REPLY ; +nf_conn_act_ct_ext_fill (skb, ct, ctinfo); +tcf_ct_flow_ct_ext_ifidx_update (flow);flow_offload_refresh (nf_ft, flow, force_refresh);if (!test_bit (IPS_ASSURED_BIT , &ct->status)) {/* Process this flow in SW to allow promoting to ASSURED */
@@ -1030,7 +1043,7 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,tcf_ct_act_set_labels (ct, p->labels, p->labels_mask);if (!nf_ct_is_confirmed (ct)) -nf_conn_act_ct_ext_add (ct); +nf_conn_act_ct_ext_add (skb, ct, ctinfo);/* This will take care of sending queued events * even if the connection is already confirmed.
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 529/550 RISC-V: Dont fail in riscv_of_parent_hartid() for disabled HARTs
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anup Patel <[email protected]>
[ Upstream commit c4676f8dc1e12e68d6511f9ed89707fdad4c962c ]
The riscv_of_processor_hartid() used by riscv_of_parent_hartid() fails for HARTs disabled in the DT. This results in the following warning thrown by the RISC-V INTC driver for the E-core on SiFive boards:
[ 0.000000] riscv-intc: unable to find hart id for /cpus/cpu@0/interrupt-controller
The riscv_of_parent_hartid() is only expected to read the hartid from the DT so we directly call of_get_cpu_hwid() instead of calling riscv_of_processor_hartid().
--- arch/riscv/kernel/cpu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
arch/riscv/kernel/cpu.c +6 -5
@@ -88,13 +88,14 @@ int riscv_early_of_processor_hartid(struct device_node *node, unsigned long *har*/ int riscv_of_parent_hartid (struct device_node *node,unsigned long *hartid) { -int rc; -for (; node; node = node->parent) {if (of_device_is_compatible (node,"riscv" )) { - rc =riscv_of_processor_hartid (node, hartid); -if (!rc) -return 0 ; + *hartid = (unsigned long )of_get_cpu_hwid (node,0 ); +if (*hartid == ~0UL ) { +pr_warn ("Found CPU without hart ID\n" ); +return -ENODEV ; + } +return 0 ; } }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 530/550 module/decompress: use kvmalloc() consistently
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrea Righi <[email protected]>
[ Upstream commit 17fc8084aa8f9d5235f252fc3978db657dd77e92 ]
We consistently switched from kmalloc() to vmalloc() in module decompression to prevent potential memory allocation failures with large modules, however vmalloc() is not as memory-efficient and fast as kmalloc().
Since we don't know in general the size of the workspace required by the decompression algorithm, it is more reasonable to use kvmalloc() consistently, also considering that we don't have special memory requirements here.
--- kernel/module/decompress.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/module/decompress.c +4 -4
@@ -100,7 +100,7 @@ static ssize_t module_gzip_decompress(struct load_info *info, s.next_in = buf + gzip_hdr_len; s.avail_in = size - gzip_hdr_len; - s.workspace =vmalloc (zlib_inflate_workspacesize ()); + s.workspace =kvmalloc (zlib_inflate_workspacesize (),GFP_KERNEL );if (!s.workspace)return -ENOMEM ;
@@ -138,7 +138,7 @@ static ssize_t module_gzip_decompress(struct load_info *info, out_inflate_end:zlib_inflateEnd (&s); out: -vfree (s.workspace); +kvfree (s.workspace); return retval; }#elif defined(CONFIG_MODULE_COMPRESS_XZ)
@@ -241,7 +241,7 @@ static ssize_t module_zstd_decompress(struct load_info *info, } wksp_size =zstd_dstream_workspace_bound (header.windowSize); - wksp =vmalloc (wksp_size); + wksp =kvmalloc (wksp_size,GFP_KERNEL );if (!wksp) { retval = -ENOMEM ; goto out;
@@ -284,7 +284,7 @@ static ssize_t module_zstd_decompress(struct load_info *info, retval = new_size; out: -vfree (wksp); +kvfree (wksp); return retval; }#else
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 531/550 drm/vc4: tests: Fix UAF in the mock helpers
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxime Ripard <[email protected]>
[ Upstream commit cdcd6aef9db5797995d4153ea19fdf56d189f0e4 ]
The VC4 mock helpers allocate the CRTC, encoders and connectors using a call to kunit_kzalloc(), but the DRM device they are attache to survives for longer than the test itself which leads to use-after-frees reported by KASAN.
Switch to drmm_kzalloc to tie the lifetime of these objects to the main DRM device.
--- drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c | 2 +- drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c +1 -1
@@ -26,7 +26,7 @@ struct vc4_dummy_crtc *vc4_mock_pv(struct kunit *test,struct vc4_crtc *vc4_crtc;int ret; - dummy_crtc =kunit_kzalloc (test,sizeof (*dummy_crtc),GFP_KERNEL ); + dummy_crtc =drmm_kzalloc (drm,sizeof (*dummy_crtc),GFP_KERNEL );KUNIT_ASSERT_NOT_NULL (test, dummy_crtc); vc4_crtc = &dummy_crtc->crtc;
drivers/gpu/drm/vc4/tests/vc4_mock_output.c +1 -1
@@ -32,7 +32,7 @@ struct vc4_dummy_output *vc4_dummy_output(struct kunit *test,struct drm_encoder *enc;int ret; - dummy_output =kunit_kzalloc (test,sizeof (*dummy_output),GFP_KERNEL ); + dummy_output =drmm_kzalloc (drm,sizeof (*dummy_output),GFP_KERNEL );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, dummy_output); dummy_output->encoder.type = vc4_encoder_type;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 532/550 drm/syncobj: fix DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Erik Kurzinger <[email protected]>
[ Upstream commit 101c9f637efa1655f55876644d4439e552267527 ]
If DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT is invoked with the DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE flag set but no fence has yet been submitted for the given timeline point the call will fail immediately with EINVAL. This does not match the intended behavior where the call should wait until the fence has been submitted (or the timeout expires).
The following small example program illustrates the issue. It should wait for 5 seconds and then print ETIME, but instead it terminates right away after printing EINVAL.
#include <stdio.h>
#include <fcntl.h>
#include <time.h>
#include <errno.h>
#include <xf86drm.h>
int main(void)
{
int fd = open("/dev/dri/card0", O_RDWR);
uint32_t syncobj;
drmSyncobjCreate(fd, 0, &syncobj);
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
uint64_t point = 1;
if (drmSyncobjTimelineWait(fd, &syncobj, &point, 1,
ts.tv_sec * 1000000000 + ts.tv_nsec + 5000000000, // 5s
DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE, NULL)) {
printf("drmSyncobjTimelineWait failed %d\n", errno);
}
}Reviewed by: Simon Ser <[email protected]>
--- drivers/gpu/drm/drm_syncobj.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_syncobj.c +2 -1
@@ -1015,7 +1015,8 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, fence =drm_syncobj_fence_get (syncobjs[i]);if (!fence ||dma_fence_chain_find_seqno (&fence, points[i])) {dma_fence_put (fence); -if (flags &DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT ) { +if (flags & (DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT | +DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE )) {continue ; }else { timeout = -EINVAL ;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 533/550 ASoC: mediatek: mt8186_mt6366_rt1019_rt5682s: trivial: fix error messages
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eugen Hristev <[email protected]>
[ Upstream commit 004fc58edea6f00db9ad07b40b882e8d976f7a54 ]
Property 'playback-codecs' is referenced as 'speaker-codec' in the error message, and this can lead to confusion.
Correct the error message such that the correct property name is referenced.
--- sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +2 -2
@@ -1179,7 +1179,7 @@ static int mt8186_mt6366_rt1019_rt5682s_dev_probe(struct platform_device *pdev) playback_codec =of_get_child_by_name (pdev->dev.of_node,"playback-codecs" );if (!playback_codec) { ret = -EINVAL ; -dev_err_probe (&pdev->dev, ret,"Property 'speaker-codecs' missing or invalid\n" ); +dev_err_probe (&pdev->dev, ret,"Property 'playback-codecs' missing or invalid\n" ); goto err_playback_codec; }
@@ -1193,7 +1193,7 @@ static int mt8186_mt6366_rt1019_rt5682s_dev_probe(struct platform_device *pdev)for_each_card_prelinks (card, i, dai_link) { ret =mt8186_mt6366_card_set_be_link (card, dai_link, playback_codec,"I2S3" );if (ret) { -dev_err_probe (&pdev->dev, ret,"%s set speaker_codec fail\n" , +dev_err_probe (&pdev->dev, ret,"%s set playback_codec fail\n" , dai_link->name); goto err_probe; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 534/550 ASoC: hdmi-codec: register hpd callback on component probe
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit 15be353d55f9e12e34f9a819f51eb41fdef5eda8 ]
The HDMI hotplug callback to the hdmi-codec is currently registered when jack is set.
The hotplug not only serves to report the ASoC jack state but also to get the ELD. It should be registered when the component probes instead, so it does not depend on the card driver registering a jack for the HDMI to properly report the ELD.
--- sound/soc/codecs/hdmi-codec.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
sound/soc/codecs/hdmi-codec.c +19 -8
@@ -895,18 +895,13 @@ static int hdmi_codec_set_jack(struct snd_soc_component *component, void *data) {struct hdmi_codec_priv *hcp =snd_soc_component_get_drvdata (component); -int ret = -ENOTSUPP ;if (hcp->hcd.ops->hook_plugged_cb) { hcp->jack = jack; - ret = hcp->hcd.ops->hook_plugged_cb (component->dev->parent, - hcp->hcd.data, - plugged_cb, - component->dev); -if (ret) - hcp->jack =NULL ; +return 0 ; } -return ret; + +return -ENOTSUPP ; }static int hdmi_dai_spdif_probe (struct snd_soc_dai *dai)
@@ -982,6 +977,21 @@ static int hdmi_of_xlate_dai_id(struct snd_soc_component *component,return ret; } +static int hdmi_probe (struct snd_soc_component *component) +{ +struct hdmi_codec_priv *hcp =snd_soc_component_get_drvdata (component); +int ret =0 ; + +if (hcp->hcd.ops->hook_plugged_cb) { + ret = hcp->hcd.ops->hook_plugged_cb (component->dev->parent, + hcp->hcd.data, + plugged_cb, + component->dev); + } + +return ret; +} +static void hdmi_remove (struct snd_soc_component *component) {struct hdmi_codec_priv *hcp =snd_soc_component_get_drvdata (component);
@@ -992,6 +1002,7 @@ static void hdmi_remove(struct snd_soc_component *component) }static const struct snd_soc_component_driver hdmi_driver = { + .probe = hdmi_probe, .remove = hdmi_remove, .dapm_widgets = hdmi_widgets, .num_dapm_widgets =ARRAY_SIZE (hdmi_widgets),
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 535/550 ASoC: dapm: fix clock get name
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit 4bdcbc31ad2112385ad525b28972c45015e6ad70 ]
The name currently used to get the clock includes the dapm prefix. It should use the name as provided to the widget, without the prefix.
--- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-dapm.c +1 -1
@@ -3668,7 +3668,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,dapm_pinctrl_event (w,NULL ,SND_SOC_DAPM_POST_PMD );break ;case snd_soc_dapm_clock_supply: - w->clk =devm_clk_get (dapm->dev, w->name); + w->clk =devm_clk_get (dapm->dev, widget->name);if (IS_ERR (w->clk)) { ret =PTR_ERR (w->clk); goto request_failed;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 536/550 spi: spi-zynq-qspi: add spi-mem to driver kconfig dependencies
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amit Kumar Mahapatra <[email protected]>
[ Upstream commit c2ded280a4b1b7bd93e53670528504be08d24967 ]
Zynq QSPI driver has been converted to use spi-mem framework so add spi-mem to driver kconfig dependencies.
--- drivers/spi/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/spi/Kconfig +1 -0
@@ -1124,6 +1124,7 @@ config SPI_XTENSA_XTFPGA config SPI_ZYNQ_QSPI tristate "Xilinx Zynq QSPI controller" depends on ARCH_ZYNQ || COMPILE_TEST + depends on SPI_MEM help This enables support for the Zynq Quad SPI controller in master mode.
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 537/550 arm64/arm: arm_pmuv3: perf: Dont truncate 64-bit registers
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilkka Koskinen <[email protected]>
[ Upstream commit 403edfa436286b21f5ffe6856ae5b36396e8966c ]
The driver used to truncate several 64-bit registers such as PMCEID[n] registers used to describe whether architectural and microarchitectural events in range 0x4000-0x401f exist. Due to discarding the bits, the driver made the events invisible, even if they existed.
Moreover, PMCCFILTR and PMCR registers have additional bits in the upper 32 bits. This patch makes them available although they aren't currently used. Finally, functions handling PMXEVCNTR and PMXEVTYPER registers are removed as they not being used at all.
--- arch/arm/include/asm/arm_pmuv3.h | 48 ++++++++++++++---------------- arch/arm64/include/asm/arm_pmuv3.h | 25 ++++------------ drivers/perf/arm_pmuv3.c | 6 ++-- 3 files changed, 31 insertions(+), 48 deletions(-)
arch/arm/include/asm/arm_pmuv3.h +23 -25
@@ -23,6 +23,8 @@#define PMUSERENR __ACCESS_CP15(c9, 0, c14, 0)#define PMINTENSET __ACCESS_CP15(c9, 0, c14, 1)#define PMINTENCLR __ACCESS_CP15(c9, 0, c14, 2) +#define PMCEID2 __ACCESS_CP15(c9, 0, c14, 4) +#define PMCEID3 __ACCESS_CP15(c9, 0, c14, 5)#define PMMIR __ACCESS_CP15(c9, 0, c14, 6)#define PMCCFILTR __ACCESS_CP15(c14, 0, c15, 7)
@@ -150,21 +152,6 @@ static inline u64 read_pmccntr(void)return read_sysreg (PMCCNTR ); } -static inline void write_pmxevcntr (u32 val) -{ -write_sysreg (val,PMXEVCNTR ); -} - -static inline u32 read_pmxevcntr (void ) -{ -return read_sysreg (PMXEVCNTR ); -} - -static inline void write_pmxevtyper (u32 val) -{ -write_sysreg (val,PMXEVTYPER ); -} -static inline void write_pmcntenset (u32 val) {write_sysreg (val,PMCNTENSET );
@@ -205,16 +192,6 @@ static inline void write_pmuserenr(u32 val)write_sysreg (val,PMUSERENR ); } -static inline u32 read_pmceid0 (void ) -{ -return read_sysreg (PMCEID0 ); -} - -static inline u32 read_pmceid1 (void ) -{ -return read_sysreg (PMCEID1 ); -} -static inline void kvm_set_pmu_events (u32 set,struct perf_event_attr *attr) {}static inline void kvm_clr_pmu_events (u32 clr) {}static inline bool kvm_pmu_counter_deferred (struct perf_event_attr *attr)
@@ -229,6 +206,7 @@ static inline bool kvm_set_pmuserenr(u64 val)/* PMU Version in DFR Register */ #define ARMV8_PMU_DFR_VER_NI 0 +#define ARMV8_PMU_DFR_VER_V3P1 0x4#define ARMV8_PMU_DFR_VER_V3P4 0x5#define ARMV8_PMU_DFR_VER_V3P5 0x6#define ARMV8_PMU_DFR_VER_IMP_DEF 0xF
@@ -249,4 +227,24 @@ static inline bool is_pmuv3p5(int pmuver) return pmuver >= ARMV8_PMU_DFR_VER_V3P5; } +static inline u64 read_pmceid0 (void ) +{ +u64 val =read_sysreg (PMCEID0 ); + +if (read_pmuver () >=ARMV8_PMU_DFR_VER_V3P1 ) + val |= (u64 )read_sysreg (PMCEID2 ) <<32 ; + +return val; +} + +static inline u64 read_pmceid1 (void ) +{ +u64 val =read_sysreg (PMCEID1 ); + +if (read_pmuver () >=ARMV8_PMU_DFR_VER_V3P1 ) + val |= (u64 )read_sysreg (PMCEID3 ) <<32 ; + +return val; +} +#endif
arch/arm64/include/asm/arm_pmuv3.h +5 -20
@@ -46,12 +46,12 @@ static inline u32 read_pmuver(void) ID_AA64DFR0_EL1_PMUVer_SHIFT); } -static inline void write_pmcr (u32 val) +static inline void write_pmcr (u64 val) {write_sysreg (val, pmcr_el0); } -static inline u32 read_pmcr (void ) +static inline u64 read_pmcr (void ) {return read_sysreg (pmcr_el0); }
@@ -71,21 +71,6 @@ static inline u64 read_pmccntr(void)return read_sysreg (pmccntr_el0); } -static inline void write_pmxevcntr (u32 val) -{ -write_sysreg (val, pmxevcntr_el0); -} - -static inline u32 read_pmxevcntr (void ) -{ -return read_sysreg (pmxevcntr_el0); -} - -static inline void write_pmxevtyper (u32 val) -{ -write_sysreg (val, pmxevtyper_el0); -} -static inline void write_pmcntenset (u32 val) {write_sysreg (val, pmcntenset_el0);
@@ -106,7 +91,7 @@ static inline void write_pmintenclr(u32 val)write_sysreg (val, pmintenclr_el1); } -static inline void write_pmccfiltr (u32 val) +static inline void write_pmccfiltr (u64 val) {write_sysreg (val, pmccfiltr_el0); }
@@ -126,12 +111,12 @@ static inline void write_pmuserenr(u32 val)write_sysreg (val, pmuserenr_el0); } -static inline u32 read_pmceid0 (void ) +static inline u64 read_pmceid0 (void ) {return read_sysreg (pmceid0_el0); } -static inline u32 read_pmceid1 (void ) +static inline u64 read_pmceid1 (void ) {return read_sysreg (pmceid1_el0); }
drivers/perf/arm_pmuv3.c +3 -3
@@ -428,12 +428,12 @@ static inline bool armv8pmu_event_is_chained(struct perf_event *event)#define ARMV8_IDX_TO_COUNTER (x) \ (((x) - ARMV8_IDX_COUNTER0) & ARMV8_PMU_COUNTER_MASK) -static inline u32 armv8pmu_pmcr_read (void ) +static inline u64 armv8pmu_pmcr_read (void ) {return read_pmcr (); } -static inline void armv8pmu_pmcr_write (u32 val) +static inline void armv8pmu_pmcr_write (u64 val) { val &=ARMV8_PMU_PMCR_MASK ;isb ();
@@ -978,7 +978,7 @@ static int armv8pmu_set_event_filter(struct hw_perf_event *event,static void armv8pmu_reset (void *info) {struct arm_pmu *cpu_pmu = (struct arm_pmu *)info; -u32 pmcr; +u64 pmcr;/* The counter and interrupt enable registers are unknown at reset. */ armv8pmu_disable_counter (U32_MAX );
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 538/550 fbdev: imsttfb: fix double free in probe()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit e08c30efda21ef4c0ec084a3a9581c220b442ba9 ]
The init_imstt() function calls framebuffer_release() on error and then the probe() function calls it again. It should only be done in probe.
--- drivers/video/fbdev/imsttfb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/video/fbdev/imsttfb.c +1 -5
@@ -1419,7 +1419,6 @@ static int init_imstt(struct fb_info *info)if ((info->var.xres * info->var.yres) * (info->var.bits_per_pixel >>3 ) > info->fix.smem_len || !(compute_imstt_regvals (par, info->var.xres, info->var.yres))) {printk ("imsttfb: %ux%ux%u not supported\n" , info->var.xres, info->var.yres, info->var.bits_per_pixel); -framebuffer_release (info);return -ENODEV ; }
@@ -1452,14 +1451,11 @@ static int init_imstt(struct fb_info *info)FBINFO_HWACCEL_FILLRECT |FBINFO_HWACCEL_YPAN ; -if (fb_alloc_cmap (&info->cmap,0 ,0 )) { -framebuffer_release (info); +if (fb_alloc_cmap (&info->cmap,0 ,0 ))return -ENODEV ; - }if (register_framebuffer (info) <0 ) {fb_dealloc_cmap (&info->cmap); -framebuffer_release (info);return -ENODEV ; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 539/550 fbdev: imsttfb: fix a resource leak in probe
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit aba6ab57a910ad4b940c2024d15f2cdbf5b7f76b ]
I've re-written the error handling but the bug is that if init_imstt() fails we need to call iounmap(par->cmap_regs).
--- drivers/video/fbdev/imsttfb.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)
drivers/video/fbdev/imsttfb.c +16 -13
@@ -1495,8 +1495,8 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (!request_mem_region (addr, size,"imsttfb" )) {printk (KERN_ERR "imsttfb: Can't reserve memory region\n" ); -framebuffer_release (info); -return -ENODEV ; + ret = -ENODEV ; + goto release_info; }switch (pdev->device) {
@@ -1513,36 +1513,39 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)printk (KERN_INFO "imsttfb: Device 0x%x unknown, " "contact maintainer.\n" , pdev->device); ret = -ENODEV ; - goto error; + goto release_mem_region; } info->fix.smem_start = addr; info->screen_base = (__u8 *)ioremap (addr, par->ramdac ==IBM ?0x400000 :0x800000 );if (!info->screen_base) - goto error; + goto release_mem_region; info->fix.mmio_start = addr +0x800000 ; par->dc_regs =ioremap (addr +0x800000 ,0x1000 );if (!par->dc_regs) - goto error; + goto unmap_screen_base; par->cmap_regs_phys = addr +0x840000 ; par->cmap_regs = (__u8 *)ioremap (addr +0x840000 ,0x1000 );if (!par->cmap_regs) - goto error; + goto unmap_dc_regs; info->pseudo_palette = par->palette; ret =init_imstt (info);if (ret) - goto error; + goto unmap_cmap_regs;pci_set_drvdata (pdev, info); -return ret; +return 0 ; -error: -if (par->dc_regs) -iounmap (par->dc_regs); -if (info->screen_base) -iounmap (info->screen_base); +unmap_cmap_regs: +iounmap (par->cmap_regs); +unmap_dc_regs: +iounmap (par->dc_regs); +unmap_screen_base: +iounmap (info->screen_base); +release_mem_region:release_mem_region (addr, size); +release_info:framebuffer_release (info);return ret; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 540/550 ALSA: hda/realtek: Add support dual speaker for Dell
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kailang Yang <[email protected]>
[ Upstream commit f0d9da19d7de9e845e7a93a901c4b9658df6b492 ]
Dell new platform support dual speaker. But BIOS verb table only show one speaker. It will fill verb table for second speaker. Then bind with CS AMP model.
--- sound/pci/hda/patch_realtek.c | 40 +++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 7 deletions(-)
sound/pci/hda/patch_realtek.c +33 -7
@@ -7193,8 +7193,10 @@ enum {ALC256_FIXUP_ASUS_MIC_NO_PRESENCE ,ALC299_FIXUP_PREDATOR_SPK ,ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE , +ALC289_FIXUP_DELL_SPK1 ,ALC289_FIXUP_DELL_SPK2 ,ALC289_FIXUP_DUAL_SPK , +ALC289_FIXUP_RTK_AMP_DUAL_SPK ,ALC294_FIXUP_SPK2_TO_DAC1 ,ALC294_FIXUP_ASUS_DUAL_SPK , ALC285_FIXUP_THINKPAD_X1_GEN7,
@@ -7293,6 +7295,7 @@ enum {ALC287_FIXUP_THINKPAD_I2S_SPK ,ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD ,ALC2XX_FIXUP_HEADSET_MIC , + ALC289_FIXUP_DELL_CS35L41_SPI_2, };/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -8519,6 +8522,15 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id =ALC256_FIXUP_ASUS_HEADSET_MODE }, + [ALC289_FIXUP_DELL_SPK1] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x14 ,0x90170140 }, + { } + }, + .chained = true, + .chain_id =ALC269_FIXUP_DELL4_MIC_NO_PRESENCE + }, [ALC289_FIXUP_DELL_SPK2] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl []) {
@@ -8534,6 +8546,12 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id =ALC289_FIXUP_DELL_SPK2 }, + [ALC289_FIXUP_RTK_AMP_DUAL_SPK] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc285_fixup_speaker2_to_dac1, + .chained = true, + .chain_id =ALC289_FIXUP_DELL_SPK1 + }, [ALC294_FIXUP_SPK2_TO_DAC1] = { .type = HDA_FIXUP_FUNC, .v.func = alc285_fixup_speaker2_to_dac1,
@@ -9395,6 +9413,12 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc_fixup_headset_mic, }, + [ALC289_FIXUP_DELL_CS35L41_SPI_2] = { + .type = HDA_FIXUP_FUNC, + .v.func = cs35l41_fixup_spi_two, + .chained = true, + .chain_id =ALC289_FIXUP_DUAL_SPK + }, };static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -9505,13 +9529,15 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x0c1c ,"Dell Precision 3540" ,ALC236_FIXUP_DELL_DUAL_CODECS ),SND_PCI_QUIRK (0x1028 ,0x0c1d ,"Dell Precision 3440" ,ALC236_FIXUP_DELL_DUAL_CODECS ),SND_PCI_QUIRK (0x1028 ,0x0c1e ,"Dell Precision 3540" ,ALC236_FIXUP_DELL_DUAL_CODECS ), -SND_PCI_QUIRK (0x1028 ,0x0cbd ,"Dell Oasis 13 CS MTL-U" ,ALC245_FIXUP_CS35L41_SPI_2 ), -SND_PCI_QUIRK (0x1028 ,0x0cbe ,"Dell Oasis 13 2-IN-1 MTL-U" ,ALC245_FIXUP_CS35L41_SPI_2 ), -SND_PCI_QUIRK (0x1028 ,0x0cbf ,"Dell Oasis 13 Low Weight MTU-L" ,ALC245_FIXUP_CS35L41_SPI_2 ), -SND_PCI_QUIRK (0x1028 ,0x0cc1 ,"Dell Oasis 14 MTL-H/U" ,ALC245_FIXUP_CS35L41_SPI_2 ), -SND_PCI_QUIRK (0x1028 ,0x0cc2 ,"Dell Oasis 14 2-in-1 MTL-H/U" ,ALC245_FIXUP_CS35L41_SPI_2 ), -SND_PCI_QUIRK (0x1028 ,0x0cc3 ,"Dell Oasis 14 Low Weight MTL-U" ,ALC245_FIXUP_CS35L41_SPI_2 ), -SND_PCI_QUIRK (0x1028 ,0x0cc4 ,"Dell Oasis 16 MTL-H/U" ,ALC245_FIXUP_CS35L41_SPI_2 ), +SND_PCI_QUIRK (0x1028 ,0x0cbd ,"Dell Oasis 13 CS MTL-U" ,ALC289_FIXUP_DELL_CS35L41_SPI_2 ), +SND_PCI_QUIRK (0x1028 ,0x0cbe ,"Dell Oasis 13 2-IN-1 MTL-U" ,ALC289_FIXUP_DELL_CS35L41_SPI_2 ), +SND_PCI_QUIRK (0x1028 ,0x0cbf ,"Dell Oasis 13 Low Weight MTU-L" ,ALC289_FIXUP_DELL_CS35L41_SPI_2 ), +SND_PCI_QUIRK (0x1028 ,0x0cc0 ,"Dell Oasis 13" ,ALC289_FIXUP_RTK_AMP_DUAL_SPK ), +SND_PCI_QUIRK (0x1028 ,0x0cc1 ,"Dell Oasis 14 MTL-H/U" ,ALC289_FIXUP_DELL_CS35L41_SPI_2 ), +SND_PCI_QUIRK (0x1028 ,0x0cc2 ,"Dell Oasis 14 2-in-1 MTL-H/U" ,ALC289_FIXUP_DELL_CS35L41_SPI_2 ), +SND_PCI_QUIRK (0x1028 ,0x0cc3 ,"Dell Oasis 14 Low Weight MTL-U" ,ALC289_FIXUP_DELL_CS35L41_SPI_2 ), +SND_PCI_QUIRK (0x1028 ,0x0cc4 ,"Dell Oasis 16 MTL-H/U" ,ALC289_FIXUP_DELL_CS35L41_SPI_2 ), +SND_PCI_QUIRK (0x1028 ,0x0cc5 ,"Dell Oasis 14" ,ALC289_FIXUP_RTK_AMP_DUAL_SPK ),SND_PCI_QUIRK (0x1028 ,0x164a ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x164b ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 541/550 fbdev: fsl-diu-fb: mark wr_reg_wa() static
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit a5035c81847430dfa3482807b07325f29e9e8c09 ]
wr_reg_wa() is not an appropriate name for a global function, and doesn't need to be global anyway, so mark it static and avoid the warning:
drivers/video/fbdev/fsl-diu-fb.c:493:6: error: no previous prototype for 'wr_reg_wa' [-Werror=missing-prototypes]
--- drivers/video/fbdev/fsl-diu-fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/fsl-diu-fb.c +1 -1
@@ -490,7 +490,7 @@ static enum fsl_diu_monitor_port fsl_diu_name_to_port(const char *s)* Workaround for failed writing desc register of planes. * Needed with MPC5121 DIU rev 2.0 silicon. */ -void wr_reg_wa (u32 *reg,u32 val) +static void wr_reg_wa (u32 *reg,u32 val) { do { out_be32(reg, val);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 542/550 tracing/kprobes: Fix the order of argument descriptions
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yujie Liu <[email protected]>
[ Upstream commit f032c53bea6d2057c14553832d846be2f151cfb2 ]
The order of descriptions should be consistent with the argument list of the function, so "kretprobe" should be the second one.
int __kprobe_event_gen_cmd_start(struct dynevent_cmd *cmd, bool kretprobe,
const char *name, const char *loc, ...)
--- kernel/trace/trace_kprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace_kprobe.c +1 -1
@@ -1019,9 +1019,9 @@ EXPORT_SYMBOL_GPL(kprobe_event_cmd_init);/** * __kprobe_event_gen_cmd_start - Generate a kprobe event command from arg list * @cmd: A pointer to the dynevent_cmd struct representing the new event +* @kretprobe: Is this a return probe? * @name: The name of the kprobe event * @loc: The location of the kprobe event -* @kretprobe: Is this a return probe? * @...: Variable number of arg (pairs), one pair for each field * * NOTE: Users normally won't want to call this function directly, but
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 543/550 Revert "drm/ast: report connection status on Display Port."
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
This reverts commit f81bb0ac7872893241319ea82504956676ef02fd.
The commit depends on e329cb53b45d ("drm/ast: Add BMC virtual connector") and will cause hangs on boot without that dependency.
--- drivers/gpu/drm/ast/ast_dp.c | 11 ---------- drivers/gpu/drm/ast/ast_dp501.c | 37 +++++++++++---------------------- drivers/gpu/drm/ast/ast_drv.h | 2 -- drivers/gpu/drm/ast/ast_mode.c | 30 ++------------------------ 4 files changed, 14 insertions(+), 66 deletions(-)
drivers/gpu/drm/ast/ast_dp.c +0 -11
@@ -7,17 +7,6 @@#include <drm/drm_print.h> #include "ast_drv.h" -bool ast_astdp_is_connected (struct ast_device *ast) -{ -if (!ast_get_index_reg_mask (ast,AST_IO_CRTC_PORT ,0xD1 ,ASTDP_MCU_FW_EXECUTING )) -return false; -if (!ast_get_index_reg_mask (ast,AST_IO_CRTC_PORT ,0xDF ,ASTDP_HPD )) -return false; -if (!ast_get_index_reg_mask (ast,AST_IO_CRTC_PORT ,0xDC ,ASTDP_LINK_SUCCESS )) -return false; -return true; -} -int ast_astdp_read_edid (struct drm_device *dev,u8 *ediddata) {struct ast_device *ast =to_ast_device (dev);
drivers/gpu/drm/ast/ast_dp501.c +12 -25
@@ -272,9 +272,11 @@ static bool ast_launch_m68k(struct drm_device *dev)return true; } -bool ast_dp501_is_connected (struct ast_device *ast) +bool ast_dp501_read_edid (struct drm_device *dev,u8 *ediddata) { -u32 boot_address, offset, data; +struct ast_device *ast =to_ast_device (dev); +u32 i, boot_address, offset, data; +u32 *pEDIDidx;if (ast->config_mode == ast_use_p2a) { boot_address =get_fw_base (ast);
@@ -290,6 +292,14 @@ bool ast_dp501_is_connected(struct ast_device *ast) data =ast_mindwm (ast, boot_address + offset);if (!(data &AST_DP501_PNP_CONNECTED ))return false; + +/* Read EDID */ + offset =AST_DP501_EDID_DATA ; +for (i =0 ; i <128 ; i +=4 ) { + data =ast_mindwm (ast, boot_address + offset + i); + pEDIDidx = (u32 *)(ediddata + i); + *pEDIDidx = data; + } }else {if (!ast->dp501_fw_buf)return false;
@@ -309,30 +319,7 @@ bool ast_dp501_is_connected(struct ast_device *ast) data =readl (ast->dp501_fw_buf + offset);if (!(data &AST_DP501_PNP_CONNECTED ))return false; - } -return true; -} - -bool ast_dp501_read_edid (struct drm_device *dev,u8 *ediddata) -{ -struct ast_device *ast =to_ast_device (dev); -u32 i, boot_address, offset, data; -u32 *pEDIDidx; - -if (!ast_dp501_is_connected (ast)) -return false; - -if (ast->config_mode == ast_use_p2a) { - boot_address =get_fw_base (ast); -/* Read EDID */ - offset =AST_DP501_EDID_DATA ; -for (i =0 ; i <128 ; i +=4 ) { - data =ast_mindwm (ast, boot_address + offset + i); - pEDIDidx = (u32 *)(ediddata + i); - *pEDIDidx = data; - } - }else {/* Read EDID */ offset =AST_DP501_EDID_DATA ;for (i =0 ; i <128 ; i +=4 ) {
drivers/gpu/drm/ast/ast_drv.h +0 -2
@@ -468,7 +468,6 @@ void ast_patch_ahb_2500(struct ast_device *ast);/* ast dp501 */ void ast_set_dp501_video_output (struct drm_device *dev,u8 mode);bool ast_backup_fw (struct drm_device *dev,u8 *addr,u32 size); -bool ast_dp501_is_connected (struct ast_device *ast);bool ast_dp501_read_edid (struct drm_device *dev,u8 *ediddata);u8 ast_get_dp501_max_clk (struct drm_device *dev);void ast_init_3rdtx (struct drm_device *dev);
@@ -477,7 +476,6 @@ void ast_init_3rdtx(struct drm_device *dev);struct ast_i2c_chan *ast_i2c_create (struct drm_device *dev);/* aspeed DP */ -bool ast_astdp_is_connected (struct ast_device *ast);int ast_astdp_read_edid (struct drm_device *dev,u8 *ediddata);void ast_dp_launch (struct drm_device *dev);void ast_dp_power_on_off (struct drm_device *dev,bool no);
drivers/gpu/drm/ast/ast_mode.c +2 -28
@@ -1585,20 +1585,8 @@ static int ast_dp501_connector_helper_get_modes(struct drm_connector *connector)return 0 ; } -static int ast_dp501_connector_helper_detect_ctx (struct drm_connector *connector, -struct drm_modeset_acquire_ctx *ctx, -bool force) -{ -struct ast_device *ast =to_ast_device (connector->dev); - -if (ast_dp501_is_connected (ast)) -return connector_status_connected; -return connector_status_disconnected; -} -static const struct drm_connector_helper_funcs ast_dp501_connector_helper_funcs = { .get_modes = ast_dp501_connector_helper_get_modes, - .detect_ctx = ast_dp501_connector_helper_detect_ctx, };static const struct drm_connector_funcs ast_dp501_connector_funcs = {
@@ -1623,7 +1611,7 @@ static int ast_dp501_connector_init(struct drm_device *dev, struct drm_connector connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; - connector->polled =DRM_CONNECTOR_POLL_CONNECT |DRM_CONNECTOR_POLL_DISCONNECT ; + connector->polled =DRM_CONNECTOR_POLL_CONNECT ;return 0 ; }
@@ -1695,20 +1683,8 @@ static int ast_astdp_connector_helper_get_modes(struct drm_connector *connector)return 0 ; } -static int ast_astdp_connector_helper_detect_ctx (struct drm_connector *connector, -struct drm_modeset_acquire_ctx *ctx, -bool force) -{ -struct ast_device *ast =to_ast_device (connector->dev); - -if (ast_astdp_is_connected (ast)) -return connector_status_connected; -return connector_status_disconnected; -} -static const struct drm_connector_helper_funcs ast_astdp_connector_helper_funcs = { .get_modes = ast_astdp_connector_helper_get_modes, - .detect_ctx = ast_astdp_connector_helper_detect_ctx, };static const struct drm_connector_funcs ast_astdp_connector_funcs = {
@@ -1733,7 +1709,7 @@ static int ast_astdp_connector_init(struct drm_device *dev, struct drm_connector connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; - connector->polled =DRM_CONNECTOR_POLL_CONNECT |DRM_CONNECTOR_POLL_DISCONNECT ; + connector->polled =DRM_CONNECTOR_POLL_CONNECT ;return 0 ; }
@@ -1872,7 +1848,5 @@ int ast_mode_config_init(struct ast_device *ast)drm_mode_config_reset (dev); -drm_kms_helper_poll_init (dev); -return 0 ; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 544/550 selftests: mptcp: fix wait_rm_addr/sf parameters
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
commit 9168ea02b898d3dde98b51e4bd3fb082bd438dab upstream.
The second input parameter of 'wait_rm_addr/sf $1 1' is misused. If it's 1, wait_rm_addr/sf will never break, and will loop ten times, then 'wait_rm_addr/sf' equals to 'sleep 1'. This delay time is too long, which can sometimes make the tests fail.
A better way to use wait_rm_addr/sf is to use rm_addr/sf_count to obtain the current value, and then pass into wait_rm_addr/sf.
--- tools/testing/selftests/net/mptcp/mptcp_join.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +10 -4
@@ -3259,6 +3259,7 @@ userspace_pm_rm_sf_addr_ns1() local addr=$1 local id=$2 local tk sp da dp + local cnt_addr cnt_sf tk=$(grep "type:1," "$evts_ns1" | sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q')
@@ -3268,11 +3269,13 @@ userspace_pm_rm_sf_addr_ns1() sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') dp=$(grep "type:10" "$evts_ns1" | sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q') + cnt_addr=$(rm_addr_count ${ns1}) + cnt_sf=$(rm_sf_count ${ns1}) ip netns exec $ns1 ./pm_nl_ctl rem token $tk id $id ip netns exec $ns1 ./pm_nl_ctl dsf lip "::ffff:$addr" \ lport $sp rip $da rport $dp token $tk - wait_rm_addr $ns1 1 - wait_rm_sf $ns1 1 + wait_rm_addr $ns1 "${cnt_addr}" + wait_rm_sf $ns1 "${cnt_sf}" } userspace_pm_add_sf()
@@ -3294,17 +3297,20 @@ userspace_pm_rm_sf_addr_ns2() local addr=$1 local id=$2 local tk da dp sp + local cnt_addr cnt_sf tk=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") da=$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") dp=$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") sp=$(grep "type:10" "$evts_ns2" | sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + cnt_addr=$(rm_addr_count ${ns2}) + cnt_sf=$(rm_sf_count ${ns2}) ip netns exec $ns2 ./pm_nl_ctl rem token $tk id $id ip netns exec $ns2 ./pm_nl_ctl dsf lip $addr lport $sp \ rip $da rport $dp token $tk - wait_rm_addr $ns2 1 - wait_rm_sf $ns2 1 + wait_rm_addr $ns2 "${cnt_addr}" + wait_rm_sf $ns2 "${cnt_sf}" } userspace_tests()
Greg Kroah-Hartman
maintainerPATCH 545/550 io_uring/net: ensure socket is marked connected on connect retry
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit f8f9ab2d98116e79d220f1d089df7464ad4e026d upstream.
io_uring does non-blocking connection attempts, which can yield some unexpected results if a connect request is re-attempted by an an application. This is equivalent to the following sync syscall sequence:
sock = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, IPPROTO_TCP); connect(sock, &addr, sizeof(addr);
ret == -1 and errno == EINPROGRESS expected here. Now poll for POLLOUT on sock, and when that returns, we expect the socket to be connected. But if we follow that procedure with:
connect(sock, &addr, sizeof(addr));
you'd expect ret == -1 and errno == EISCONN here, but you actually get ret == 0. If we attempt the connection one more time, then we get EISCON as expected.
io_uring used to do this, but turns out that bluetooth fails with EBADFD if you attempt to re-connect. Also looks like EISCONN _could_ occur with this sequence.
Retain the ->in_progress logic, but work-around a potential EISCONN or EBADFD error and only in those cases look at the sock_error(). This should work in general and avoid the odd sequence of a repeated connect request returning success when the socket is already connected.
This is all a side effect of the socket state being in a CONNECTING state when we get EINPROGRESS, and only a re-connect or other related operation will turn that into CONNECTED.
--- io_uring/net.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
io_uring/net.c +11 -13
@@ -1461,16 +1461,6 @@ int io_connect(struct io_kiocb *req, unsint ret;bool force_nonblock = issue_flags &IO_URING_F_NONBLOCK ; -if (connect->in_progress) { -struct socket *socket; - - ret = -ENOTSOCK ; - socket =sock_from_file (req->file); -if (socket) - ret =sock_error (socket->sk); - goto out; - } -if (req_has_async_data (req)) { io = req->async_data; }else {
@@ -1490,9 +1480,7 @@ int io_connect(struct io_kiocb *req, uns && force_nonblock) {if (ret == -EINPROGRESS ) { connect->in_progress = true; -return -EAGAIN ; - } -if (ret == -ECONNABORTED ) { + }else if (ret == -ECONNABORTED ) {if (connect->seen_econnaborted) goto out; connect->seen_econnaborted = true;
@@ -1506,6 +1494,16 @@ int io_connect(struct io_kiocb *req, unsmemcpy (req->async_data, &__io,sizeof (__io));return -EAGAIN ; } +if (connect->in_progress) { +/* +* At least bluetooth will return -EBADFD on a re-connect +* attempt, and it's (supposedly) also valid to get -EISCONN +* which means the previous result is good. For both of these, +* grab the sock_error() and use that for the completion. +*/ +if (ret == -EBADFD || ret == -EISCONN ) + ret =sock_error (sock_from_file (req->file)->sk); + }if (ret == -ERESTARTSYS ) ret = -EINTR ; out:
Greg Kroah-Hartman
maintainerPATCH 546/550 x86/amd_nb: Use Family 19h Models 60h-7Fh Function 4 IDs
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yazen Ghannam <[email protected]>
commit 2a565258b3f4bbdc7a3c09cd02082cb286a7bffc upstream.
Three PCI IDs for DF Function 4 were defined but not used.
Add them to the "link" list.
--- arch/x86/kernel/amd_nb.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/kernel/amd_nb.c +3 -0
@@ -112,6 +112,9 @@ static const struct pci_device_id amd_nb { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) },
Greg Kroah-Hartman
maintainerPATCH 547/550 Revert "PCI/ASPM: Disable only ASPM_STATE_L1 when driver, disables L1"
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
commit 3cb4f534bac010258b2688395c2f13459a932be9 upstream.
This reverts commit fb097dcd5a28c0a2325632405c76a66777a6bed9.
After fb097dcd5a28 ("PCI/ASPM: Disable only ASPM_STATE_L1 when driver disables L1"), disabling L1 via pci_disable_link_state(PCIE_LINK_STATE_L1), then enabling one substate, e.g., L1.1, via sysfs actually enables *all* the substates.
For example, r8169 disables L1 because of hardware issues on a number of systems, which implicitly disables the L1.1 and L1.2 substates.
On some systems, L1 and L1.1 work fine, but L1.2 causes missed rx packets. Enabling L1.1 via the sysfs "aspm_l1_1" attribute unexpectedly enables L1.2 as well as L1.1.
After fb097dcd5a28, pci_disable_link_state(PCIE_LINK_STATE_L1) adds only ASPM_L1 (but not any of the L1.x substates) to the "aspm_disable" mask:
--- Before fb097dcd5a28
+++ After fb097dcd5a28
# r8169 disables L1:
pci_disable_link_state(PCIE_LINK_STATE_L1)
- disable |= ASPM_L1 | ASPM_L1_1 | ASPM_L1_2 | ... # disable L1, L1.x
+ disable |= ASPM_L1 # disable L1 only # write "1" to sysfs "aspm_l1_1" attribute:
l1_1_aspm
aspm_attr_store_common(state = ASPM_L1_1)
disable &= ~ASPM_L1_1 # enable L1.1
if (state & (ASPM_L1_1 | ...)) # if enabling any substate
disable &= ~ASPM_L1 # enable L1# final state: - disable = ASPM_L1_2 | ... # L1, L1.1 enabled; L1.2 disabled + disable = 0 # L1, L1.1, L1.2 all enabled
Enabling an L1.x substate removes the substate and L1 from the "aspm_disable" mask. After fb097dcd5a28, the substates were not added to the mask when disabling L1, so enabling one substate implicitly enables all of them.
Revert fb097dcd5a28 so enabling one substate doesn't enable the others.
--- drivers/pci/pcie/aspm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/pcie/aspm.c +2 -1
@@ -1059,7 +1059,8 @@ static int __pci_disable_link_state(struif (state &PCIE_LINK_STATE_L0S ) link->aspm_disable |=ASPM_STATE_L0S ;if (state &PCIE_LINK_STATE_L1 ) - link->aspm_disable |=ASPM_STATE_L1 ; +/* L1 PM substates require L1 */ + link->aspm_disable |=ASPM_STATE_L1 |ASPM_STATE_L1SS ;if (state &PCIE_LINK_STATE_L1_1 ) link->aspm_disable |=ASPM_STATE_L1_1 ;if (state &PCIE_LINK_STATE_L1_2 )
Greg Kroah-Hartman
maintainerPATCH 548/550 Revert "mmc: core: Capture correct oemid-bits for eMMC cards"
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dominique Martinet <[email protected]>
commit 421b605edb1ce611dee06cf6fd9a1c1f2fd85ad0 upstream.
This reverts commit 84ee19bffc9306128cd0f1c650e89767079efeff.
The commit above made quirks with an OEMID fail to be applied, as they were checking card->cid.oemid for the full 16 bits defined in MMC_FIXUP macros but the field would only contain the bottom 8 bits.
eMMC v5.1A might have bogus values in OEMID's higher bits so another fix will be made, but it has been decided to revert this until that is ready.
--- drivers/mmc/core/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/core/mmc.c +1 -1
@@ -104,7 +104,7 @@ static int mmc_decode_cid(struct mmc_carcase 3 :/* MMC v3.1 - v3.3 */ case 4 :/* MMC v4 */ card->cid.manfid =UNSTUFF_BITS (resp,120 ,8 ); - card->cid.oemid =UNSTUFF_BITS (resp,104 ,8 ); + card->cid.oemid =UNSTUFF_BITS (resp,104 ,16 ); card->cid.prod_name[0 ] =UNSTUFF_BITS (resp,96 ,8 ); card->cid.prod_name[1 ] =UNSTUFF_BITS (resp,88 ,8 ); card->cid.prod_name[2 ] =UNSTUFF_BITS (resp,80 ,8 );
Greg Kroah-Hartman
maintainerPATCH 549/550 btrfs: use u64 for buffer sizes in the tree search ioctls
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit dec96fc2dcb59723e041416b8dc53e011b4bfc2e ]
In the tree search v2 ioctl we use the type size_t, which is an unsigned long, to track the buffer size in the local variable 'buf_size'. An unsigned long is 32 bits wide on a 32 bits architecture. The buffer size defined in struct btrfs_ioctl_search_args_v2 is a u64, so when we later try to copy the local variable 'buf_size' to the argument struct, when the search returns -EOVERFLOW, we copy only 32 bits which will be a problem on big endian systems.
Fix this by using a u64 type for the buffer sizes, not only at btrfs_ioctl_tree_search_v2(), but also everywhere down the call chain so that we can use the u64 at btrfs_ioctl_tree_search_v2().
--- fs/btrfs/ioctl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/btrfs/ioctl.c +5 -5
@@ -1528,7 +1528,7 @@ static noinline int key_in_sk(struct btrfs_key *key, static noinline int copy_to_sk(struct btrfs_path *path,struct btrfs_key *key,struct btrfs_ioctl_search_key *sk, -size_t *buf_size, +u64 *buf_size,char __user *ubuf,unsigned long *sk_offset,int *num_found)
@@ -1660,7 +1660,7 @@ static noinline int copy_to_sk(struct btrfs_path *path, static noinline int search_ioctl(struct inode *inode,struct btrfs_ioctl_search_key *sk, -size_t *buf_size, +u64 *buf_size,char __user *ubuf) {struct btrfs_fs_info *info =btrfs_sb (inode->i_sb);
@@ -1733,7 +1733,7 @@ static noinline int btrfs_ioctl_tree_search(struct inode *inode,struct btrfs_ioctl_search_args __user *uargs = argp;struct btrfs_ioctl_search_key sk;int ret; -size_t buf_size; +u64 buf_size;if (!capable (CAP_SYS_ADMIN ))return -EPERM ;
@@ -1763,8 +1763,8 @@ static noinline int btrfs_ioctl_tree_search_v2(struct inode *inode,struct btrfs_ioctl_search_args_v2 __user *uarg = argp;struct btrfs_ioctl_search_args_v2 args;int ret; -size_t buf_size; -const size_t buf_limit =SZ_16M ; +u64 buf_size; +const u64 buf_limit =SZ_16M ;if (!capable (CAP_SYS_ADMIN ))return -EPERM ;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 550/550 btrfs: make found_logical_ret parameter mandatory for function queue_scrub_stripe()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit 47e2b06b7b5cb356a987ba3429550c3a89ea89d6 ]
[BUG]
There is a compilation warning reported on commit ae76d8e3e135 ("btrfs:
scrub: fix grouping of read IO"), where gcc (14.0.0 20231022 experimental) is reporting the following uninitialized variable:
fs/btrfs/scrub.c: In function ‘scrub_simple_mirror.isra’:
fs/btrfs/scrub.c:2075:29: error: ‘found_logical’ may be used uninitialized [-Werror=maybe-uninitialized[https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wmaybe-uninitialized]]
2075 | cur_logical = found_logical + BTRFS_STRIPE_LEN;
fs/btrfs/scrub.c:2040:21: note: ‘found_logical’ was declared here
2040 | u64 found_logical;
| ^~~~~~~~~~~~~[CAUSE]
This is a false alert, as @found_logical is passed as parameter @found_logical_ret of function queue_scrub_stripe().
As long as queue_scrub_stripe() returned 0, we would update @found_logical_ret. And if queue_scrub_stripe() returned >0 or <0, the caller would not utilized @found_logical, thus there should be nothing wrong.
Although the triggering gcc is still experimental, it looks like the extra check on "if (found_logical_ret)" can sometimes confuse the compiler.
Meanwhile the only caller of queue_scrub_stripe() is always passing a valid pointer, there is no need for such check at all.
[FIX]
Although the report itself is a false alert, we can still make it more explicit by:
- Replace the check for @found_logical_ret with ASSERT()
- Initialize @found_logical to U64_MAX
- Add one extra ASSERT() to make sure @found_logical got updated
--- fs/btrfs/scrub.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
fs/btrfs/scrub.c +7 -3
@@ -1803,6 +1803,9 @@ static int queue_scrub_stripe(struct scrub_ctx *sctx, struct btrfs_block_group **/ ASSERT (sctx->cur_stripe <SCRUB_TOTAL_STRIPES ); +/* @found_logical_ret must be specified. */ +ASSERT (found_logical_ret); + stripe = &sctx->stripes[sctx->cur_stripe];scrub_reset_stripe (stripe); ret = scrub_find_fill_first_stripe(bg, &sctx->extent_path,
@@ -1811,8 +1814,7 @@ static int queue_scrub_stripe(struct scrub_ctx *sctx, struct btrfs_block_group */* Either >0 as no more extents or <0 for error. */ if (ret)return ret; -if (found_logical_ret) - *found_logical_ret = stripe->logical; + *found_logical_ret = stripe->logical; sctx->cur_stripe++;/* We filled one group, submit it. */
@@ -2037,7 +2039,7 @@ static int scrub_simple_mirror(struct scrub_ctx *sctx, path.skip_locking =1 ;/* Go through each extent items inside the logical range */ while (cur_logical < logical_end) { -u64 found_logical; +u64 found_logical =U64_MAX ;u64 cur_physical = physical + cur_logical - logical_start;/* Canceled? */
@@ -2072,6 +2074,8 @@ static int scrub_simple_mirror(struct scrub_ctx *sctx,if (ret <0 )break ; +/* queue_scrub_stripe() returned 0, @found_logical must be updated. */ +ASSERT (found_logical !=U64_MAX ); cur_logical = found_logical +BTRFS_STRIPE_LEN ;/* Don't hold CPU for too long time */
Signature · 1 line
2.42.0
Hello!
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.12 release. There are 550 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 17 Nov 2023 19:14:03 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
We're seeing build regressions on Arm, Arm64, i386, x86, with KUnit defconfigs (and multi_v5_defconfig on Arm32):
-----8<-----
In file included from /builds/linux/lib/kunit/executor.c:225:
/builds/linux/lib/kunit/executor_test.c: In function 'free_suite_set':
/builds/linux/lib/kunit/executor_test.c:130:30: error: invalid use
of undefined type 'struct kunit_suite_set'
130 | kunit_free_suite_set(*(struct kunit_suite_set *)suite_set);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/builds/linux/lib/kunit/executor_test.c: In function 'free_suite_set_at_end':
/builds/linux/lib/kunit/executor_test.c:141:49: error: invalid use
of undefined type 'struct kunit_suite_set'
141 | if (!((struct kunit_suite_set *)to_free)->start)
| ^~
/builds/linux/lib/kunit/executor_test.c:144:31: error: invalid
application of 'sizeof' to incomplete type 'struct kunit_suite_set'
144 | free = kzalloc(sizeof(struct kunit_suite_set), GFP_KERNEL);
| ^~~~~~
/builds/linux/lib/kunit/executor_test.c:145:17: error: invalid use
of undefined type 'struct kunit_suite_set'
145 | *free = *(struct kunit_suite_set *)to_free;
| ^
/builds/linux/lib/kunit/executor_test.c:145:15: error: invalid use
of undefined type 'struct kunit_suite_set'
145 | *free = *(struct kunit_suite_set *)to_free;
| ^ make[5]: *** [/builds/linux/scripts/Makefile.build:243:lib/kunit/executor.o] Error 1
----->8-----
This is with defconfig, CONFIG_KASAN=y, CONFIG_KUNIT=y, and CONFIG_KUNIT_ALL_TESTS=y. To reproduce,
tuxmake \
--runtime podman \
--target-arch arm64 \
--toolchain gcc-13 \
--kconfig defconfig \
--kconfig-add CONFIG_KASAN=y \
--kconfig-add CONFIG_KUNIT=y \
--kconfig-add CONFIG_KUNIT_ALL_TESTS=y
Bisection is on-going.
Greetings!
Daniel Díaz
[email protected]
Hello!
Quoted 62 lines · Daniel Díaz
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.12 release. There are 550 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 17 Nov 2023 19:14:03 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
We're seeing build regressions on Arm, Arm64, i386, x86, with KUnit defconfigs (and
multi_v5_defconfigon Arm32):
-----8<-----
In file included from /builds/linux/lib/kunit/executor.c:225:
/builds/linux/lib/kunit/executor_test.c: In function 'free_suite_set':
/builds/linux/lib/kunit/executor_test.c:130:30: error: invalid use
of undefined type 'structkunit_suite_set'130 | kunit_free_suite_set(*(struct kunit_suite_set *)suite_set); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /builds/linux/lib/kunit/executor_test.c: In function 'free_suite_set_at_end': /builds/linux/lib/kunit/executor_test.c:141:49: error: invalid use of undefined type 'struct kunit_suite_set' 141 | if (!((struct kunit_suite_set *)to_free)->start) | ^~ /builds/linux/lib/kunit/executor_test.c:144:31: error: invalid application of 'sizeof' to incomplete type 'struct kunit_suite_set' 144 | free = kzalloc(sizeof(struct kunit_suite_set), GFP_KERNEL); | ^~~~~~ /builds/linux/lib/kunit/executor_test.c:145:17: error: invalid use of undefined type 'struct kunit_suite_set' 145 | *free = *(struct kunit_suite_set *)to_free; | ^ /builds/linux/lib/kunit/executor_test.c:145:15: error: invalid use of undefined type 'struct kunit_suite_set' 145 | *free = *(struct kunit_suite_set *)to_free; | ^make[5]: *** [/builds/linux/scripts/Makefile.build:243:
lib/kunit/executor.o] Error 1
----->8-----This is with defconfig,
CONFIG_KASAN=y,CONFIG_KUNIT=y, andCONFIG_KUNIT_ALL_TESTS=y. To reproduce,tuxmake \
--runtime podman \
--target-arch arm64 \
--toolchain gcc-13 \
--kconfig defconfig \
--kconfig-addCONFIG_KASAN=y\
--kconfig-addCONFIG_KUNIT=y\
--kconfig-addCONFIG_KUNIT_ALL_TESTS=y
Quoted 3 lines
Bisection is on-going.
Bisection points to 3aed6e0618a9 ("kunit: test: Fix the possible memory leak in executor_test"), upstream commit 8040345fdae4cb256c5d981f91ae0f22bea8adcc. Reverting this commit brings happiness back to the build.
This problem is not observed on other branches.
Greetings!
Daniel Díaz
[email protected]
+ kunit team
Quoted 69 lines · Daniel Díaz
Hello!
Quoted 65 lines · Daniel Díaz
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.12 release. There are 550 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 17 Nov 2023 19:14:03 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
We're seeing build regressions on Arm, Arm64, i386, x86, with KUnit defconfigs (and
multi_v5_defconfigon Arm32):
-----8<-----
In file included from /builds/linux/lib/kunit/executor.c:225:
/builds/linux/lib/kunit/executor_test.c: In function 'free_suite_set':
/builds/linux/lib/kunit/executor_test.c:130:30: error: invalid use
of undefined type 'structkunit_suite_set'130 | kunit_free_suite_set(*(struct kunit_suite_set *)suite_set); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /builds/linux/lib/kunit/executor_test.c: In function 'free_suite_set_at_end': /builds/linux/lib/kunit/executor_test.c:141:49: error: invalid use of undefined type 'struct kunit_suite_set' 141 | if (!((struct kunit_suite_set *)to_free)->start) | ^~ /builds/linux/lib/kunit/executor_test.c:144:31: error: invalid application of 'sizeof' to incomplete type 'struct kunit_suite_set' 144 | free = kzalloc(sizeof(struct kunit_suite_set), GFP_KERNEL); | ^~~~~~ /builds/linux/lib/kunit/executor_test.c:145:17: error: invalid use of undefined type 'struct kunit_suite_set' 145 | *free = *(struct kunit_suite_set *)to_free; | ^ /builds/linux/lib/kunit/executor_test.c:145:15: error: invalid use of undefined type 'struct kunit_suite_set' 145 | *free = *(struct kunit_suite_set *)to_free; | ^make[5]: *** [/builds/linux/scripts/Makefile.build:243:
lib/kunit/executor.o] Error 1
----->8-----This is with defconfig,
CONFIG_KASAN=y,CONFIG_KUNIT=y, andCONFIG_KUNIT_ALL_TESTS=y. To reproduce,tuxmake \
--runtime podman \
--target-arch arm64 \
--toolchain gcc-13 \
--kconfig defconfig \
--kconfig-addCONFIG_KASAN=y\
--kconfig-addCONFIG_KUNIT=y\
--kconfig-addCONFIG_KUNIT_ALL_TESTS=yBisection is on-going.
Thanks Daniel for bisecting this.
Quoted 6 lines
Bisection points to
3aed6e0618a9("kunit: test: Fix the possible memory leak inexecutor_test"), upstream commit8040345fdae4cb256c5d981f91ae0f22bea8adcc. Reverting this commit brings happiness back to the build.This problem is not observed on other branches.
stable-rc linux-6.6.y - kunit build pass
stable-rc linux-6.5.y - kunit build failed
## Test Regressions (compared to v6.5.11)
* arm, build
- gcc-13-lkftconfig-kunit
* arm64, build
- gcc-13-lkftconfig-kunit
Quoted 5 lines
Greetings!
Daniel Díaz
[email protected]
- Naresh
Sasha Levin
maintainerQuoted 80 lines · Naresh Kamboju
+ kunit team
Quoted 69 lines · Daniel Díaz
Hello!
Quoted 65 lines · Daniel Díaz
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.12 release. There are 550 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 17 Nov 2023 19:14:03 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
We're seeing build regressions on Arm, Arm64, i386, x86, with KUnit defconfigs (and
multi_v5_defconfigon Arm32):
-----8<-----
In file included from /builds/linux/lib/kunit/executor.c:225:
/builds/linux/lib/kunit/executor_test.c: In function 'free_suite_set':
/builds/linux/lib/kunit/executor_test.c:130:30: error: invalid use
of undefined type 'structkunit_suite_set'130 | kunit_free_suite_set(*(struct kunit_suite_set *)suite_set); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /builds/linux/lib/kunit/executor_test.c: In function 'free_suite_set_at_end': /builds/linux/lib/kunit/executor_test.c:141:49: error: invalid use of undefined type 'struct kunit_suite_set' 141 | if (!((struct kunit_suite_set *)to_free)->start) | ^~ /builds/linux/lib/kunit/executor_test.c:144:31: error: invalid application of 'sizeof' to incomplete type 'struct kunit_suite_set' 144 | free = kzalloc(sizeof(struct kunit_suite_set), GFP_KERNEL); | ^~~~~~ /builds/linux/lib/kunit/executor_test.c:145:17: error: invalid use of undefined type 'struct kunit_suite_set' 145 | *free = *(struct kunit_suite_set *)to_free; | ^ /builds/linux/lib/kunit/executor_test.c:145:15: error: invalid use of undefined type 'struct kunit_suite_set' 145 | *free = *(struct kunit_suite_set *)to_free; | ^make[5]: *** [/builds/linux/scripts/Makefile.build:243:
lib/kunit/executor.o] Error 1
----->8-----This is with defconfig,
CONFIG_KASAN=y,CONFIG_KUNIT=y, andCONFIG_KUNIT_ALL_TESTS=y. To reproduce,tuxmake \
--runtime podman \
--target-arch arm64 \
--toolchain gcc-13 \
--kconfig defconfig \
--kconfig-addCONFIG_KASAN=y\
--kconfig-addCONFIG_KUNIT=y\
--kconfig-addCONFIG_KUNIT_ALL_TESTS=yBisection is on-going.
Thanks Daniel for bisecting this.
Quoted 5 lines
Bisection points to
3aed6e0618a9("kunit: test: Fix the possible memory leak inexecutor_test"), upstream commit8040345fdae4cb256c5d981f91ae0f22bea8adcc. Reverting this commit brings happiness back to the build.
Quoted 4 lines
Quoted 1 line
This problem is not observed on other branches.
stable-rc linux-6.6.y - kunit build pass
stable-rc linux-6.5.y - kunit build failed
Dropping the offending patch from 6.5, thanks!
Signature · 2 lines
Thanks, Sasha
Hello,
Quoted 5 lines · On Wed, 15 Nov 2023 14:09:44 -0500 Greg Kroah-Hartman…
This is the start of the stable review cycle for the 6.5.12 release. There are 550 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Responses should be made by Fri, 17 Nov 2023 19:14:03 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.
This rc kernel passes DAMON functionality test[1] on my test machine. Attaching the test results summary below. Please note that I retrieved the kernel from linux-stable-rc tree[2].
[1] https://github.com/awslabs/damon-tests/tree/next/corr
[2] 06e3a5988baa ("Linux 6.5.12-rc1")
Thanks,
SJ
[...]
---
ok 1 selftests: damon: debugfs_attrs.sh
ok 2 selftests: damon: debugfs_schemes.sh
ok 3 selftests: damon: debugfs_target_ids.sh
ok 4 selftests: damon: debugfs_empty_targets.sh
ok 5 selftests: damon: debugfs_huge_count_read_write.sh
ok 6 selftests: damon: debugfs_duplicate_context_creation.sh
ok 7 selftests: damon: debugfs_rm_non_contexts.sh
ok 8 selftests: damon: sysfs.sh
ok 9 selftests: damon: sysfs_update_removed_scheme_dir.sh
ok 10 selftests: damon: reclaim.sh
ok 11 selftests: damon: lru_sort.sh
ok 1 selftests: damon-tests: kunit.sh
ok 2 selftests: damon-tests: huge_count_read_write.sh
ok 3 selftests: damon-tests: buffer_overflow.sh
ok 4 selftests: damon-tests: rm_contexts.sh
ok 5 selftests: damon-tests: record_null_deref.sh
ok 6 selftests: damon-tests: dbgfs_target_ids_read_before_terminate_race.sh ok 7 selftests: damon-tests: dbgfs_target_ids_pid_leak.sh
ok 8 selftests: damon-tests: damo_tests.sh
ok 9 selftests: damon-tests: masim-record.sh
ok 10 selftests: damon-tests: build_i386.sh
ok 11 selftests: damon-tests: build_arm64.sh
ok 12 selftests: damon-tests: build_i386_idle_flag.sh
ok 13 selftests: damon-tests: build_i386_highpte.sh
ok 14 selftests: damon-tests: build_nomemcg.sh
[33m
[92mPASS [39m_remote_run_corr.sh SUCCESS
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.12 release. There are 550 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 17 Nov 2023 19:14:03 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.12 release. There are 550 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 17 Nov 2023 19:14:03 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.12 release. There are 550 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 17 Nov 2023 19:14:03 +0000. Anything received after that time might be too late.
Build results:
total: 157 pass: 155 fail: 2 Failed builds: i386:allyesconfig x86_64:allyesconfig Qemu test results: total: 530 pass: 100 fail: 430 Failed tests: lots ...
I didn't check all failed tests, but it looks like the already reported kunit build failures are responsible for at least a large majority of the failures.
Guenter