6.15.3-rc1 review
Subsystems (10)
Greg Kroah-Hartman
maintainerPATCH 612/780 net: dsa: b53: implement setting ageing time
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Gorski <[email protected]>
[ Upstream commit e39d14a760c039af0653e3df967e7525413924a0 ]
b53 supported switches support configuring ageing time between 1 and 1,048,575 seconds, so add an appropriate setter.
This allows b53 to pass the FDB learning test for both vlan aware and vlan unaware bridges.
Stable-dep-of: 75f4f7b2b130 ("net: dsa: b53: do not configure bcm63xx's IMP port interface")
--- drivers/net/dsa/b53/b53_common.c | 28 ++++++++++++++++++++++++++++ drivers/net/dsa/b53/b53_priv.h | 1 + drivers/net/dsa/b53/b53_regs.h | 7 +++++++ drivers/net/dsa/bcm_sf2.c | 1 + 4 files changed, 37 insertions(+)
drivers/net/dsa/b53/b53_common.c +28 -0
@@ -21,6 +21,7 @@#include <linux/export.h> #include <linux/gpio.h> #include <linux/kernel.h> +#include <linux/math.h> #include <linux/module.h> #include <linux/platform_data/b53.h> #include <linux/phy.h>
@@ -1202,6 +1203,10 @@ static int b53_setup(struct dsa_switch *ds)*/ ds->untag_vlan_aware_bridge_pvid = true; +/* Ageing time is set in seconds */ + ds->ageing_time_min =1 *1000 ; + ds->ageing_time_max =AGE_TIME_MAX *1000 ; + ret =b53_reset_switch (dev);if (ret) {dev_err (ds->dev,"failed to reset switch\n" );
@@ -2392,6 +2397,28 @@ static int b53_get_max_mtu(struct dsa_switch *ds, int port)return B53_MAX_MTU ; } +int b53_set_ageing_time (struct dsa_switch *ds,unsigned int msecs) +{ +struct b53_device *dev = ds->priv; +u32 atc; +int reg; + +if (is63xx (dev)) + reg =B53_AGING_TIME_CONTROL_63XX ; +else + reg =B53_AGING_TIME_CONTROL ; + + atc =DIV_ROUND_CLOSEST (msecs,1000 ); + +if (!is5325 (dev) && !is5365 (dev)) + atc |=AGE_CHANGE ; + +b53_write32 (dev,B53_MGMT_PAGE , reg, atc); + +return 0 ; +} +EXPORT_SYMBOL_GPL (b53_set_ageing_time); +static const struct phylink_mac_ops b53_phylink_mac_ops = { .mac_select_pcs = b53_phylink_mac_select_pcs, .mac_config = b53_phylink_mac_config,
@@ -2415,6 +2442,7 @@ static const struct dsa_switch_ops b53_switch_ops = { .port_disable = b53_disable_port, .support_eee = b53_support_eee, .set_mac_eee = b53_set_mac_eee, + .set_ageing_time = b53_set_ageing_time, .port_bridge_join = b53_br_join, .port_bridge_leave = b53_br_leave, .port_pre_bridge_flags = b53_br_flags_pre,
drivers/net/dsa/b53/b53_priv.h +1 -0
@@ -343,6 +343,7 @@ void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset,void b53_get_ethtool_stats (struct dsa_switch *ds,int port,uint64_t *data);int b53_get_sset_count (struct dsa_switch *ds,int port,int sset);void b53_get_ethtool_phy_stats (struct dsa_switch *ds,int port,uint64_t *data); +int b53_set_ageing_time (struct dsa_switch *ds,unsigned int msecs);int b53_br_join (struct dsa_switch *ds,int port,struct dsa_bridge bridge,bool *tx_fwd_offload,struct netlink_ext_ack *extack);void b53_br_leave (struct dsa_switch *ds,int port,struct dsa_bridge bridge);
drivers/net/dsa/b53/b53_regs.h +7 -0
@@ -220,6 +220,13 @@#define BRCM_HDR_P5_EN BIT(1)/* Enable tagging on port 5 */ #define BRCM_HDR_P7_EN BIT(2)/* Enable tagging on port 7 */ +/* Aging Time control register (32 bit) */ +#define B53_AGING_TIME_CONTROL 0x06 +#define B53_AGING_TIME_CONTROL_63XX 0x08 +#define AGE_CHANGE BIT(20) +#define AGE_TIME_MASK 0x7ffff +#define AGE_TIME_MAX 1048575 +/* Mirror capture control register (16 bit) */ #define B53_MIR_CAP_CTL 0x10#define CAP_PORT_MASK 0xf
drivers/net/dsa/bcm_sf2.c +1 -0
@@ -1235,6 +1235,7 @@ static const struct dsa_switch_ops bcm_sf2_ops = { .port_disable = bcm_sf2_port_disable, .support_eee = b53_support_eee, .set_mac_eee = b53_set_mac_eee, + .set_ageing_time = b53_set_ageing_time, .port_bridge_join = b53_br_join, .port_bridge_leave = b53_br_leave, .port_pre_bridge_flags = b53_br_flags_pre,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 613/780 net: dsa: b53: do not configure bcm63xxs IMP port interface
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Gorski <[email protected]>
[ Upstream commit 75f4f7b2b13008803f84768ff90396f9d7553221 ]
The IMP port is not a valid RGMII interface, but hard wired to internal, so we shouldn't touch the undefined register B53_RGMII_CTRL_IMP.
While this does not seem to have any side effects, let's not touch it at all, so limit RGMII configuration on bcm63xx to the actual RGMII ports.
--- drivers/net/dsa/b53/b53_common.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
drivers/net/dsa/b53/b53_common.c +8 -14
@@ -22,6 +22,7 @@#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/math.h> +#include <linux/minmax.h> #include <linux/module.h> #include <linux/platform_data/b53.h> #include <linux/phy.h>
@@ -1322,24 +1323,17 @@ static void b53_adjust_63xx_rgmii(struct dsa_switch *ds, int port, phy_interface_t interface) {struct b53_device *dev = ds->priv; -u8 rgmii_ctrl =0 , off; +u8 rgmii_ctrl =0 ; -if (port == dev->imp_port) - off =B53_RGMII_CTRL_IMP ; -else - off =B53_RGMII_CTRL_P (port); - -b53_read8 (dev,B53_CTRL_PAGE , off, &rgmii_ctrl); +b53_read8 (dev,B53_CTRL_PAGE ,B53_RGMII_CTRL_P (port), &rgmii_ctrl); rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC |RGMII_CTRL_DLL_TXC ); -if (port != dev->imp_port) { -if (is63268 (dev)) - rgmii_ctrl |=RGMII_CTRL_MII_OVERRIDE ; +if (is63268 (dev)) + rgmii_ctrl |=RGMII_CTRL_MII_OVERRIDE ; - rgmii_ctrl |=RGMII_CTRL_ENABLE_GMII ; - } + rgmii_ctrl |=RGMII_CTRL_ENABLE_GMII ; -b53_write8 (dev,B53_CTRL_PAGE , off, rgmii_ctrl); +b53_write8 (dev,B53_CTRL_PAGE ,B53_RGMII_CTRL_P (port), rgmii_ctrl);dev_dbg (ds->dev,"Configured port %d for %s\n" , port,phy_modes (interface));
@@ -1484,7 +1478,7 @@ static void b53_phylink_mac_config(struct phylink_config *config,struct b53_device *dev = ds->priv;int port = dp->index; -if (is63xx (dev) && port >=B53_63XX_RGMII0 ) +if (is63xx (dev) &&in_range (port,B53_63XX_RGMII0 ,4 ))b53_adjust_63xx_rgmii (ds, port, interface);if (mode ==MLO_AN_FIXED ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 614/780 net: dsa: b53: allow RGMII for bcm63xx RGMII ports
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Gorski <[email protected]>
[ Upstream commit 5ea0d42c1980e6d10e5cb56a78021db5bfcebaaf ]
Add RGMII to supported interfaces for BCM63xx RGMII ports so they can be actually used in RGMII mode.
Without this, phylink will fail to configure them:
[ 3.580000] b53-switch 10700000.switch GbE3 (uninitialized): validation of rgmii with support 0000000,00000000,00000000,000062ff and advertisement 0000000,00000000,00000000,000062ff failed: -EINVAL [ 3.600000] b53-switch 10700000.switch GbE3 (uninitialized): failed to connect to PHY: -EINVAL [ 3.610000] b53-switch 10700000.switch GbE3 (uninitialized): error -22 setting up PHY for tree 0, switch 0, port 4
--- drivers/net/dsa/b53/b53_common.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/dsa/b53/b53_common.c +4 -0
@@ -1439,6 +1439,10 @@ static void b53_phylink_get_caps(struct dsa_switch *ds, int port,__set_bit (PHY_INTERFACE_MODE_MII , config->supported_interfaces);__set_bit (PHY_INTERFACE_MODE_REVMII , config->supported_interfaces); +/* BCM63xx RGMII ports support RGMII */ +if (is63xx (dev) &&in_range (port,B53_63XX_RGMII0 ,4 )) +phy_interface_set_rgmii (config->supported_interfaces); + config->mac_capabilities =MAC_ASYM_PAUSE |MAC_SYM_PAUSE |MAC_10 |MAC_100 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 615/780 net: dsa: b53: do not touch DLL_IQQD on bcm53115
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Gorski <[email protected]>
[ Upstream commit bc1a65eb81a21e2aa3c3dca058ee8adf687b6ef5 ]
According to OpenMDK, bit 2 of the RGMII register has a different meaning for BCM53115 [1]:
"DLL_IQQD 1: In the IDDQ mode, power is down0: Normal function
mode"
Configuring RGMII delay works without setting this bit, so let's keep it at the default. For other chips, we always set it, so not clearing it is not an issue.
One would assume BCM53118 works the same, but OpenMDK is not quite sure what this bit actually means [2]:
"BYPASS_IMP_2NS_DEL #1: In the IDDQ mode, power is down#0: Normal
function mode1: Bypass dll65_2ns_del IP0: Use dll65_2ns_del IP"
So lets keep setting it for now.
[1] https://github.com/Broadcom-Network-Switching-Software/OpenMDK/blob/master/cdk/PKG/chip/bcm53115/bcm53115_a0_defs.h#L19871
[2] https://github.com/Broadcom-Network-Switching-Software/OpenMDK/blob/master/cdk/PKG/chip/bcm53118/bcm53118_a0_defs.h#L14392
--- drivers/net/dsa/b53/b53_common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/dsa/b53/b53_common.c +5 -3
@@ -1354,8 +1354,7 @@ static void b53_adjust_531x5_rgmii(struct dsa_switch *ds, int port,* tx_clk aligned timing (restoring to reset defaults) */ b53_read8 (dev,B53_CTRL_PAGE , off, &rgmii_ctrl); - rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC |RGMII_CTRL_DLL_TXC | -RGMII_CTRL_TIMING_SEL ); + rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC |RGMII_CTRL_DLL_TXC );/* PHY_INTERFACE_MODE_RGMII_TXID means TX internal delay, make * sure that we enable the port TX clock internal delay to
@@ -1375,7 +1374,10 @@ static void b53_adjust_531x5_rgmii(struct dsa_switch *ds, int port, rgmii_ctrl |=RGMII_CTRL_DLL_TXC ;if (interface ==PHY_INTERFACE_MODE_RGMII ) rgmii_ctrl |=RGMII_CTRL_DLL_TXC |RGMII_CTRL_DLL_RXC ; - rgmii_ctrl |=RGMII_CTRL_TIMING_SEL ; + +if (dev->chip_id !=BCM53115_DEVICE_ID ) + rgmii_ctrl |=RGMII_CTRL_TIMING_SEL ; +b53_write8 (dev,B53_CTRL_PAGE , off, rgmii_ctrl); dev_info(ds->dev, "Configured port %d for %s\n", port,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 616/780 wifi: cfg80211/mac80211: correctly parse S1G beacon optional elements
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lachlan Hodges <[email protected]>
[ Upstream commit 1e1f706fc2ce90eaaf3480b3d5f27885960d751c ]
S1G beacons are not traditional beacons but a type of extension frame. Extension frames contain the frame control and duration fields, followed by zero or more optional fields before the frame body. These optional fields are distinct from the variable length elements.
The presence of optional fields is indicated in the frame control field. To correctly locate the elements offset, the frame control must be parsed to identify which optional fields are present. Currently, mac80211 parses S1G beacons based on fixed assumptions about the frame layout, without inspecting the frame control field. This can result in incorrect offsets to the "variable" portion of the frame.
Properly parse S1G beacon frames by using the field lengths defined in IEEE 802.11-2024, section 9.3.4.3, ensuring that the elements offset is calculated accurately.
--- include/linux/ieee80211.h | 79 ++++++++++++++++++++++++++++++++++----- net/mac80211/mlme.c | 7 +--- net/mac80211/scan.c | 11 +++--- net/wireless/scan.c | 18 ++++----- 4 files changed, 83 insertions(+), 32 deletions(-)
include/linux/ieee80211.h +69 -10
@@ -111,6 +111,8 @@/* bits unique to S1G beacon */ #define IEEE80211_S1G_BCN_NEXT_TBTT 0x100 +#define IEEE80211_S1G_BCN_CSSID 0x200 +#define IEEE80211_S1G_BCN_ANO 0x400/* see 802.11ah-2016 9.9 NDP CMAC frames */ #define IEEE80211_S1G_1MHZ_NDP_BITS 25
@@ -153,9 +155,6 @@#define IEEE80211_ANO_NETTYPE_WILD 15 -/* bits unique to S1G beacon */ -#define IEEE80211_S1G_BCN_NEXT_TBTT 0x100 -/* control extension - for IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTL_EXT */ #define IEEE80211_CTL_EXT_POLL 0x2000#define IEEE80211_CTL_EXT_SPR 0x3000
@@ -627,6 +626,42 @@ static inline bool ieee80211_is_s1g_beacon(__le16 fc)cpu_to_le16 (IEEE80211_FTYPE_EXT |IEEE80211_STYPE_S1G_BEACON ); } +/** +* ieee80211_s1g_has_next_tbtt - check if IEEE80211_S1G_BCN_NEXT_TBTT +* @fc: frame control bytes in little-endian byteorder +* Return: whether or not the frame contains the variable-length +* next TBTT field +*/ +static inline bool ieee80211_s1g_has_next_tbtt (__le16 fc) +{ +return ieee80211_is_s1g_beacon (fc) && + (fc &cpu_to_le16 (IEEE80211_S1G_BCN_NEXT_TBTT )); +} + +/** +* ieee80211_s1g_has_ano - check if IEEE80211_S1G_BCN_ANO +* @fc: frame control bytes in little-endian byteorder +* Return: whether or not the frame contains the variable-length +* ANO field +*/ +static inline bool ieee80211_s1g_has_ano (__le16 fc) +{ +return ieee80211_is_s1g_beacon (fc) && + (fc &cpu_to_le16 (IEEE80211_S1G_BCN_ANO )); +} + +/** +* ieee80211_s1g_has_cssid - check if IEEE80211_S1G_BCN_CSSID +* @fc: frame control bytes in little-endian byteorder +* Return: whether or not the frame contains the variable-length +* compressed SSID field +*/ +static inline bool ieee80211_s1g_has_cssid (__le16 fc) +{ +return ieee80211_is_s1g_beacon (fc) && + (fc &cpu_to_le16 (IEEE80211_S1G_BCN_CSSID )); +} +/** * ieee80211_is_s1g_short_beacon - check if frame is an S1G short beacon * @fc: frame control bytes in little-endian byteorder
@@ -1245,16 +1280,40 @@ struct ieee80211_ext {u8 change_seq;u8 variable[0 ]; }__packed s1g_beacon; -struct { -u8 sa[ETH_ALEN ]; -__le32 timestamp; -u8 change_seq; -u8 next_tbtt[3 ]; -u8 variable[0 ]; - } __packed s1g_short_beacon; } u; } __packed__aligned(2) ; +/** +* ieee80211_s1g_optional_len - determine length of optional S1G beacon fields +* @fc: frame control bytes in little-endian byteorder +* Return: total length in bytes of the optional fixed-length fields +* +* S1G beacons may contain up to three optional fixed-length fields that +* precede the variable-length elements. Whether these fields are present +* is indicated by flags in the frame control field. +* +* From IEEE 802.11-2024 section 9.3.4.3: +* - Next TBTT field may be 0 or 3 bytes +* - Short SSID field may be 0 or 4 bytes +* - Access Network Options (ANO) field may be 0 or 1 byte +*/ +static inline size_t +ieee80211_s1g_optional_len (__le16 fc) +{ +size_t len =0 ; + +if (ieee80211_s1g_has_next_tbtt (fc)) + len +=3 ; + +if (ieee80211_s1g_has_cssid (fc)) + len +=4 ; + +if (ieee80211_s1g_has_ano (fc)) + len +=1 ; + +return len; +} +#define IEEE80211_TWT_CONTROL_NDP BIT(0)#define IEEE80211_TWT_CONTROL_RESP_MODE BIT(1)#define IEEE80211_TWT_CONTROL_NEG_TYPE_BROADCAST BIT(3)
net/mac80211/mlme.c +2 -5
@@ -7220,11 +7220,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_link_data *link, bssid =ieee80211_get_bssid (hdr, len, sdata->vif.type);if (ieee80211_is_s1g_beacon (mgmt->frame_control)) {struct ieee80211_ext *ext = (void *) mgmt; - -if (ieee80211_is_s1g_short_beacon (ext->frame_control)) - variable = ext->u.s1g_short_beacon.variable; -else - variable = ext->u.s1g_beacon.variable; + variable = ext->u.s1g_beacon.variable + +ieee80211_s1g_optional_len (ext->frame_control); } baselen = (u8 *) variable - (u8 *) mgmt;
net/mac80211/scan.c +5 -6
@@ -260,6 +260,7 @@ void ieee80211_scan_rx(struct ieee80211_local *local, struct sk_buff *skb)struct ieee80211_mgmt *mgmt = (void *)skb->data;struct ieee80211_bss *bss;struct ieee80211_channel *channel; +struct ieee80211_ext *ext;size_t min_hdr_len = offsetof(struct ieee80211_mgmt , u.probe_resp.variable);
@@ -269,12 +270,10 @@ void ieee80211_scan_rx(struct ieee80211_local *local, struct sk_buff *skb)return ;if (ieee80211_is_s1g_beacon (mgmt->frame_control)) { -if (ieee80211_is_s1g_short_beacon (mgmt->frame_control)) - min_hdr_len = offsetof(struct ieee80211_ext , - u.s1g_short_beacon.variable); -else - min_hdr_len = offsetof(struct ieee80211_ext , - u.s1g_beacon); + ext = (struct ieee80211_ext *)mgmt; + min_hdr_len = + offsetof(struct ieee80211_ext, u.s1g_beacon.variable) + +ieee80211_s1g_optional_len (ext->frame_control); }if (skb->len < min_hdr_len)
net/wireless/scan.c +7 -11
@@ -3250,6 +3250,7 @@ cfg80211_inform_bss_frame_data(struct wiphy *wiphy,const u8 *ie;size_t ielen;u64 tsf; +size_t s1g_optional_len;if (WARN_ON (!mgmt))return NULL ;
@@ -3264,12 +3265,11 @@ cfg80211_inform_bss_frame_data(struct wiphy *wiphy,if (ieee80211_is_s1g_beacon (mgmt->frame_control)) { ext = (void *) mgmt; -if (ieee80211_is_s1g_short_beacon (mgmt->frame_control)) - min_hdr_len = offsetof(struct ieee80211_ext , - u.s1g_short_beacon.variable); -else - min_hdr_len = offsetof(struct ieee80211_ext , - u.s1g_beacon.variable); + s1g_optional_len = +ieee80211_s1g_optional_len (ext->frame_control); + min_hdr_len = + offsetof(struct ieee80211_ext, u.s1g_beacon.variable) + + s1g_optional_len; }else {/* same for beacons */ min_hdr_len = offsetof(struct ieee80211_mgmt,
@@ -3285,11 +3285,7 @@ cfg80211_inform_bss_frame_data(struct wiphy *wiphy,const struct ieee80211_s1g_bcn_compat_ie *compat;const struct element *elem; -if (ieee80211_is_s1g_short_beacon (mgmt->frame_control)) - ie = ext->u.s1g_short_beacon.variable; -else - ie = ext->u.s1g_beacon.variable; - + ie = ext->u.s1g_beacon.variable + s1g_optional_len; elem =cfg80211_find_elem (WLAN_EID_S1G_BCN_COMPAT , ie, ielen);if (!elem)return NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 617/780 net: wwan: mhi_wwan_mbim: use correct mux_id for multiplexing
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniele Palmas <[email protected]>
[ Upstream commit 501fe52aa908c96f2c9b8d54767938a1a5960354 ]
Recent Qualcomm chipsets like SDX72/75 require MBIM sessionId mapping to muxId in the range (0x70-0x8F) for the PCIe tethered use.
This has been partially addressed by the referenced commit, mapping the default data call to muxId = 112, but the multiplexed data calls scenario was not properly considered, mapping sessionId = 1 to muxId 1, while it should have been 113.
Fix this by moving the session_id assignment logic to mhi_mbim_newlink, in order to map sessionId = n to muxId = n + WDS_BIND_MUX_DATA_PORT_MUX_ID.
--- drivers/net/wwan/mhi_wwan_mbim.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/wwan/mhi_wwan_mbim.c +3 -6
@@ -550,8 +550,8 @@ static int mhi_mbim_newlink(void *ctxt, struct net_device *ndev, u32 if_id,struct mhi_mbim_link *link =wwan_netdev_drvpriv (ndev);struct mhi_mbim_context *mbim = ctxt; - link->session = if_id; link->mbim = mbim; + link->session =mhi_mbim_get_link_mux_id (link->mbim->mdev->mhi_cntrl) + if_id; link->ndev = ndev;u64_stats_init (&link->rx_syncp);u64_stats_init (&link->tx_syncp);
@@ -607,7 +607,7 @@ static int mhi_mbim_probe(struct mhi_device *mhi_dev, const struct mhi_device_id {struct mhi_controller *cntrl = mhi_dev->mhi_cntrl;struct mhi_mbim_context *mbim; -int err, link_id; +int err; mbim =devm_kzalloc (&mhi_dev->dev,sizeof (*mbim),GFP_KERNEL );if (!mbim)
@@ -628,11 +628,8 @@ static int mhi_mbim_probe(struct mhi_device *mhi_dev, const struct mhi_device_id/* Number of transfer descriptors determines size of the queue */ mbim->rx_queue_sz =mhi_get_free_desc_count (mhi_dev,DMA_FROM_DEVICE ); -/* Get the corresponding mux_id from mhi */ - link_id =mhi_mbim_get_link_mux_id (cntrl); -/* Register wwan link ops with MHI controller representing WWAN instance */ -return wwan_register_ops (&cntrl->mhi_dev->dev, &mhi_mbim_wwan_ops, mbim, link_id); +return wwan_register_ops (&cntrl->mhi_dev->dev, &mhi_mbim_wwan_ops, mbim,0 ); }static void mhi_mbim_remove (struct mhi_device *mhi_dev)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 618/780 netlink: specs: rt-link: add missing byte-order properties
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit de92258e3b22bd4ce920715cc91f09d788e5badf ]
A number of fields in the ip tunnels are lacking the big-endian designation. I suspect this is not intentional, as decoding the ports with the right endian seems objectively beneficial.
--- Documentation/netlink/specs/rt_link.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Documentation/netlink/specs/rt_link.yaml +15 -0
@@ -1778,15 +1778,19 @@ attribute-sets: - name: iflags type: u16 + byte-order: big-endian - name: oflags type: u16 + byte-order: big-endian - name: ikey type: u32 + byte-order: big-endian - name: okey type: u32 + byte-order: big-endian - name: local type: binary
@@ -1810,6 +1814,7 @@ attribute-sets: - name: flowinfo type: u32 + byte-order: big-endian - name: flags type: u32
@@ -1822,9 +1827,11 @@ attribute-sets: - name: encap-sport type: u16 + byte-order: big-endian - name: encap-dport type: u16 + byte-order: big-endian - name: collect-metadata type: flag
@@ -1856,9 +1863,11 @@ attribute-sets: - name: ikey type: u32 + byte-order: big-endian - name: okey type: u32 + byte-order: big-endian - name: local type: binary
@@ -1908,6 +1917,7 @@ attribute-sets: - name: port type: u16 + byte-order: big-endian - name: collect-metadata type: flag
@@ -1927,6 +1937,7 @@ attribute-sets: - name: label type: u32 + byte-order: big-endian - name: ttl-inherit type: u8
@@ -1967,9 +1978,11 @@ attribute-sets: - name: flowinfo type: u32 + byte-order: big-endian - name: flags type: u16 + byte-order: big-endian - name: proto type: u8
@@ -1999,9 +2012,11 @@ attribute-sets: - name: encap-sport type: u16 + byte-order: big-endian - name: encap-dport type: u16 + byte-order: big-endian - name: collect-metadata type: flag
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 619/780 netlink: specs: rt-link: decode ip6gre
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 8af7a919c52f02514a145f995cbdf0deadb8075a ]
Driver tests now require GRE tunnels, while we don't configure them with YNL, YNL will complain when it sees link types it doesn't recognize. Teach it decoding ip6gre tunnels. The attrs are largely the same as IPv4 GRE.
Correct the type of encap-limit, but note that this attr is only used in ip6gre, so the mistake didn't matter until now.
--- Documentation/netlink/specs/rt_link.yaml | 53 +++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-)
Documentation/netlink/specs/rt_link.yaml +52 -1
@@ -1810,7 +1810,7 @@ attribute-sets: type: u8 - name: encap-limit - type: u32 + type: u8 - name: flowinfo type: u32
@@ -1853,6 +1853,54 @@ attribute-sets: - name: erspan-hwid type: u16 + - + name: linkinfo-gre6-attrs + subset-of: linkinfo-gre-attrs + attributes: + - + name: link + - + name: iflags + - + name: oflags + - + name: ikey + - + name: okey + - + name: local + display-hint: ipv6 + - + name: remote + display-hint: ipv6 + - + name: ttl + - + name: encap-limit + - + name: flowinfo + - + name: flags + - + name: encap-type + - + name: encap-flags + - + name: encap-sport + - + name: encap-dport + - + name: collect-metadata + - + name: fwmark + - + name: erspan-index + - + name: erspan-ver + - + name: erspan-dir + - + name: erspan-hwid - name: linkinfo-vti-attrs name-prefix: ifla-vti-
@@ -2314,6 +2362,9 @@ sub-messages: - value: gretap attribute-set: linkinfo-gre-attrs + - + value: ip6gre + attribute-set: linkinfo-gre6-attrs - value: geneve attribute-set: linkinfo-geneve-attrs
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 620/780 wireguard: device: enable threaded NAPI
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mirco Barone <[email protected]>
[ Upstream commit db9ae3b6b43c79b1ba87eea849fd65efa05b4b2e ]
Enable threaded NAPI by default for WireGuard devices in response to low performance behavior that we observed when multiple tunnels (and thus multiple wg devices) are deployed on a single host. This affects any kind of multi-tunnel deployment, regardless of whether the tunnels share the same endpoints or not (i.e., a VPN concentrator type of gateway would also be affected).
The problem is caused by the fact that, in case of a traffic surge that involves multiple tunnels at the same time, the polling of the NAPI instance of all these wg devices tends to converge onto the same core, causing underutilization of the CPU and bottlenecking performance.
This happens because NAPI polling is hosted by default in softirq context, but the WireGuard driver only raises this softirq after the rx peer queue has been drained, which doesn't happen during high traffic. In this case, the softirq already active on a core is reused instead of raising a new one.
As a result, once two or more tunnel softirqs have been scheduled on the same core, they remain pinned there until the surge ends.
In our experiments, this almost always leads to all tunnel NAPIs being handled on a single core shortly after a surge begins, limiting scalability to less than 3× the performance of a single tunnel, despite plenty of unused CPU cores being available.
The proposed mitigation is to enable threaded NAPI for all WireGuard devices. This moves the NAPI polling context to a dedicated per-device kernel thread, allowing the scheduler to balance the load across all available cores.
On our 32-core gateways, enabling threaded NAPI yields a ~4× performance improvement with 16 tunnels, increasing throughput from ~13 Gbps to ~48 Gbps. Meanwhile, CPU usage on the receiver (which is the bottleneck) jumps from 20% to 100%.
We have found no performance regressions in any scenario we tested. Single-tunnel throughput remains unchanged.
More details are available in our Netdev paper.
--- drivers/net/wireguard/device.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireguard/device.c +1 -0
@@ -366,6 +366,7 @@ static int wg_newlink(struct net_device *dev,if (ret <0 ) goto err_free_handshake_queue; +dev_set_threaded (dev, true); ret =register_netdevice (dev);if (ret <0 ) goto err_uninit_ratelimiter;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 621/780 selftests: drv-net: tso: fix the GRE device name
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit c68804c934e3197e34560744854c57cf88dff8e7 ]
The device type for IPv4 GRE is "gre" not "ipgre", unlike for IPv6 which uses "ip6gre".
Not sure how I missed this when writing the test, perhaps because all HW I have access to is on an IPv6-only network.
--- tools/testing/selftests/drivers/net/hw/tso.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/drivers/net/hw/tso.py +1 -1
@@ -216,7 +216,7 @@ def main() -> None: ("", "6", "tx-tcp6-segmentation", None), ("vxlan", "", "tx-udp_tnl-segmentation", ("vxlan", True, "id 100 dstport 4789 noudpcsum")), ("vxlan_csum", "", "tx-udp_tnl-csum-segmentation", ("vxlan", False, "id 100 dstport 4789 udpcsum")), - ("gre", "4", "tx-gre-segmentation", ("ipgre", False, "")), + ("gre", "4", "tx-gre-segmentation", ("gre", False, "")), ("gre", "6", "tx-gre-segmentation", ("ip6gre", False, "")), )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 622/780 selftests: drv-net: tso: make bkg() wait for socat to quit
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit e6854be4d80ea266a7be64a65a0322bcdfa72807 ]
Commit 846742f7e32f ("selftests: drv-net: add a warning for bkg + shell + terminate") added a warning for bkg() used with terminate=True. The tso test was missed as we didn't have it running anywhere in NIPA. Add exit_wait=True, to avoid:
# Warning: combining shell and terminate is risky!
# SIGTERM may not reach the child on zsh/ksh!
getting printed twice for every variant.
--- tools/testing/selftests/drivers/net/hw/tso.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/drivers/net/hw/tso.py +1 -1
@@ -39,7 +39,7 @@ def run_one_stream(cfg, ipver, remote_v4, remote_v6, should_lso): port = rand_port() listen_cmd = f"socat -{ipver} -t 2 -u TCP-LISTEN:{port},reuseport /dev/null,ignoreeof" - with bkg(listen_cmd, host=cfg.remote) as nc: + with bkg(listen_cmd, host=cfg.remote, exit_wait=True) as nc: wait_port_listen(port, host=cfg.remote) if ipver == "4":
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 623/780 net: annotate data-races around cleanup_net_task
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 535caaca921c653b1f9838fbd5c4e9494cafc3d9 ]
from_cleanup_net() reads cleanup_net_task locklessly.
Add READ_ONCE()/WRITE_ONCE() annotations to avoid a potential KCSAN warning, even if the race is harmless.
--- net/core/dev.c | 2 +- net/core/net_namespace.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
net/core/dev.c +1 -1
@@ -10393,7 +10393,7 @@ static void dev_index_release(struct net *net, int ifindex)static bool from_cleanup_net (void ) {#ifdef CONFIG_NET_NS -return current == cleanup_net_task; +return current ==READ_ONCE (cleanup_net_task);#else return false;#endif
net/core/net_namespace.c +2 -2
@@ -600,7 +600,7 @@ static void cleanup_net(struct work_struct *work)LIST_HEAD (net_exit_list);LIST_HEAD (dev_kill_list); - cleanup_net_task = current; +WRITE_ONCE (cleanup_net_task, current);/* Atomically snapshot the list of namespaces to cleanup */ net_kill_list =llist_del_all (&cleanup_list);
@@ -676,7 +676,7 @@ static void cleanup_net(struct work_struct *work)put_user_ns (net->user_ns);net_passive_dec (net); } - cleanup_net_task =NULL ; +WRITE_ONCE (cleanup_net_task,NULL ); }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 624/780 net: prevent a NULL deref in rtnl_create_link()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit feafc73f3e6ae73371777a037d41d2e31c929636 ]
At the time rtnl_create_link() is running, dev->netdev_ops is NULL, we must not use netdev_lock_ops() or risk a NULL deref if CONFIG_NET_SHAPER is defined.
Use netif_set_group() instead of dev_set_group().
RIP: 0010:netdev_need_ops_lock include/net/netdev_lock.h:33 [inline] RIP: 0010:netdev_lock_ops include/net/netdev_lock.h:41 [inline] RIP: 0010:dev_set_group+0xc0/0x230 net/core/dev_api.c:82 Call Trace: <TASK> rtnl_create_link+0x748/0xd10 net/core/rtnetlink.c:3674 rtnl_newlink_create+0x25c/0xb00 net/core/rtnetlink.c:3813 __rtnl_newlink net/core/rtnetlink.c:3940 [inline] rtnl_newlink+0x16d6/0x1c70 net/core/rtnetlink.c:4055 rtnetlink_rcv_msg+0x7cf/0xb70 net/core/rtnetlink.c:6944 netlink_rcv_skb+0x208/0x470 net/netlink/af_netlink.c:2534 netlink_unicast_kernel net/netlink/af_netlink.c:1313 [inline] netlink_unicast+0x75b/0x8d0 net/netlink/af_netlink.c:1339 netlink_sendmsg+0x805/0xb30 net/netlink/af_netlink.c:1883 sock_sendmsg_nosec net/socket.c:712 [inline]
--- net/core/rtnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/rtnetlink.c +1 -1
@@ -3681,7 +3681,7 @@ struct net_device *rtnl_create_link(struct net *net, const char *ifname,if (tb[IFLA_LINKMODE ]) dev->link_mode =nla_get_u8 (tb[IFLA_LINKMODE ]);if (tb[IFLA_GROUP ]) -dev_set_group (dev,nla_get_u32 (tb[IFLA_GROUP ])); +netif_set_group (dev,nla_get_u32 (tb[IFLA_GROUP ]));if (tb[IFLA_GSO_MAX_SIZE ])netif_set_gso_max_size (dev,nla_get_u32 (tb[IFLA_GSO_MAX_SIZE ]));if (tb[IFLA_GSO_MAX_SEGS ])
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 625/780 seg6: Fix validation of nexthop addresses
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 7632fedb266d93ed0ed9f487133e6c6314a9b2d1 ]
The kernel currently validates that the length of the provided nexthop address does not exceed the specified length. This can lead to the kernel reading uninitialized memory if user space provided a shorter length than the specified one.
Fix by validating that the provided length exactly matches the specified one.
--- net/ipv6/seg6_local.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/ipv6/seg6_local.c +2 -4
@@ -1644,10 +1644,8 @@ static const struct nla_policy seg6_local_policy[SEG6_LOCAL_MAX + 1] = { [SEG6_LOCAL_SRH] = { .type = NLA_BINARY }, [SEG6_LOCAL_TABLE] = { .type = NLA_U32 }, [SEG6_LOCAL_VRFTABLE] = { .type = NLA_U32 }, - [SEG6_LOCAL_NH4] = { .type = NLA_BINARY, - .len = sizeof(struct in_addr) }, - [SEG6_LOCAL_NH6] = { .type = NLA_BINARY, - .len = sizeof(struct in6_addr) }, + [SEG6_LOCAL_NH4] = NLA_POLICY_EXACT_LEN(sizeof(struct in_addr)), + [SEG6_LOCAL_NH6] = NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)), [SEG6_LOCAL_IIF] = { .type = NLA_U32 }, [SEG6_LOCAL_OIF] = { .type = NLA_U32 }, [SEG6_LOCAL_BPF] = { .type = NLA_NESTED },
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 626/780 drm/xe/vm: move xe_svm_init() earlier
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Auld <[email protected]>
[ Upstream commit 8cf8cde41ad01150afbd1327ad1942387787f7fd ]
In xe_vm_close_and_put() we need to be able to call xe_svm_fini(), however during vm creation we can call this on the error path, before having actually initialised the svm state, leading to various splats followed by a fatal NPD.
--- drivers/gpu/drm/xe/xe_vm.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/gpu/drm/xe/xe_vm.c +12 -7
@@ -1681,10 +1681,16 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)if (flags &XE_VM_FLAG_LR_MODE )xe_pm_runtime_get_noresume (xe); +if (flags &XE_VM_FLAG_FAULT_MODE ) { + err =xe_svm_init (vm); +if (err) + goto err_no_resv; + } + vm_resv_obj =drm_gpuvm_resv_object_alloc (&xe->drm);if (!vm_resv_obj) { err = -ENOMEM ; - goto err_no_resv; + goto err_svm_fini; } drm_gpuvm_init(&vm->gpuvm, "Xe VM", DRM_GPUVM_RESV_PROTECTED, &xe->drm,
@@ -1757,12 +1763,6 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags) } } -if (flags &XE_VM_FLAG_FAULT_MODE ) { - err =xe_svm_init (vm); -if (err) - goto err_close; - } -if (number_tiles >1 ) vm->composite_fence_ctx =dma_fence_context_alloc (1 );
@@ -1776,6 +1776,11 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)xe_vm_close_and_put (vm);return ERR_PTR (err); +err_svm_fini: +if (flags &XE_VM_FLAG_FAULT_MODE ) { + vm->size =0 ;/* close the vm */ +xe_svm_fini (vm); + } err_no_resv:mutex_destroy (&vm->snap_mutex);for_each_tile (tile, xe, id)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 627/780 drm/xe/vsec: fix CONFIG_INTEL_VSEC dependency
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 2182f358fb138f81a586ffdddd510f2a4fc61702 ]
The XE driver can be built with or without VSEC support, but fails to link as built-in if vsec is in a loadable module:
x86_64-linux-ld: vmlinux.o: in function `xe_vsec_init':
(.text+0x1e83e16): undefined reference to `intel_vsec_register'
The normal fix for this is to add a 'depends on INTEL_VSEC || !INTEL_VSEC', forcing XE to be a loadable module as well, but that causes a circular dependency:
symbol DRM_XE depends on INTEL_VSEC symbol INTEL_VSEC depends on X86_PLATFORM_DEVICES symbol X86_PLATFORM_DEVICES is selected by DRM_XE
The problem here is selecting a symbol from another subsystem, so change that as well and rephrase the 'select' into the corresponding dependency. Since X86_PLATFORM_DEVICES is 'default y', there is no change to defconfig builds here.
--- drivers/gpu/drm/xe/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/Kconfig +2 -1
@@ -2,6 +2,8 @@ config DRM_XE tristate "Intel Xe Graphics" depends on DRM && PCI && MMU && (m || (y && KUNIT=y)) + depends on INTEL_VSEC || !INTEL_VSEC + depends on X86_PLATFORM_DEVICES || !(X86 && ACPI) select INTERVAL_TREE # we need shmfs for the swappable backing store, and in particular # the shmem_readpage() which depends upon tmpfs
@@ -27,7 +29,6 @@ config DRM_XE select BACKLIGHT_CLASS_DEVICE if ACPI select INPUT if ACPI select ACPI_VIDEO if X86 && ACPI - select X86_PLATFORM_DEVICES if X86 && ACPI select ACPI_WMI if X86 && ACPI select SYNC_FILE select IOSF_MBI
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 628/780 drm/xe: Rework eviction rejection of bound external bos
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Hellström <[email protected]>
[ Upstream commit 5cc3325584c425069c1c3355c775314d64bf8770 ]
For preempt_fence mode VM's we're rejecting eviction of shared bos during VM_BIND. However, since we do this in the move() callback, we're getting an eviction failure warning from TTM. The TTM callback intended for these things is eviction_valuable().
However, the latter doesn't pass in the struct ttm_operation_ctx needed to determine whether the caller needs this.
Instead, attach the needed information to the vm under the vm->resv, until we've been able to update TTM to provide the needed information. And add sufficient lockdep checks to prevent misuse and races.
v2:
- Fix a copy-paste error in xe_vm_clear_validating() v3:
- Fix kerneldoc errors.
--- drivers/gpu/drm/xe/xe_bo.c | 46 ++++++++++++--------- drivers/gpu/drm/xe/xe_vm.h | 69 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_vm_types.h | 8 ++++ 3 files changed, 105 insertions(+), 18 deletions(-)
drivers/gpu/drm/xe/xe_bo.c +28 -18
@@ -816,21 +816,6 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict, goto out; } -/* Reject BO eviction if BO is bound to current VM. */ -if (evict && ctx->resv) { -struct drm_gpuvm_bo *vm_bo; - -drm_gem_for_each_gpuvm_bo (vm_bo, &bo->ttm.base) { -struct xe_vm *vm =gpuvm_to_vm (vm_bo->vm); - -if (xe_vm_resv (vm) == ctx->resv && -xe_vm_in_preempt_fence_mode (vm)) { - ret = -EBUSY ; - goto out; - } - } - } -/* * Failed multi-hop where the old_mem is still marked as * TTM_PL_FLAG_TEMPORARY, should just be a dummy move.
@@ -1023,6 +1008,25 @@ static long xe_bo_shrink_purge(struct ttm_operation_ctx *ctx,return lret; } +static bool +xe_bo_eviction_valuable (struct ttm_buffer_object *bo,const struct ttm_place *place) +{ +struct drm_gpuvm_bo *vm_bo; + +if (!ttm_bo_eviction_valuable (bo, place)) +return false; + +if (!xe_bo_is_xe_bo (bo)) +return true; + +drm_gem_for_each_gpuvm_bo (vm_bo, &bo->base) { +if (xe_vm_is_validating (gpuvm_to_vm (vm_bo->vm))) +return false; + } + +return true; +} +/** * xe_bo_shrink() - Try to shrink an xe bo. * @ctx: The struct ttm_operation_ctx used for shrinking.
@@ -1057,7 +1061,7 @@ long xe_bo_shrink(struct ttm_operation_ctx *ctx, struct ttm_buffer_object *bo, (flags.purge && !xe_tt->purgeable))return -EBUSY ; -if (!ttm_bo_eviction_valuable (bo, &place)) +if (!xe_bo_eviction_valuable (bo, &place))return -EBUSY ;if (!xe_bo_is_xe_bo (bo) || !xe_bo_get_unless_zero (xe_bo))
@@ -1418,7 +1422,7 @@ const struct ttm_device_funcs xe_ttm_funcs = { .io_mem_pfn = xe_ttm_io_mem_pfn, .access_memory = xe_ttm_access_memory, .release_notify = xe_ttm_bo_release_notify, - .eviction_valuable = ttm_bo_eviction_valuable, + .eviction_valuable = xe_bo_eviction_valuable, .delete_mem_notify = xe_ttm_bo_delete_mem_notify, .swap_notify = xe_ttm_bo_swap_notify, };
@@ -2260,6 +2264,8 @@ int xe_bo_validate(struct xe_bo *bo, struct xe_vm *vm, bool allow_res_evict) .no_wait_gpu = false, .gfp_retry_mayfail = true, }; +struct pin_cookie cookie; +int ret;if (vm) {lockdep_assert_held (&vm->lock);
@@ -2269,8 +2275,12 @@ int xe_bo_validate(struct xe_bo *bo, struct xe_vm *vm, bool allow_res_evict) ctx.resv =xe_vm_resv (vm); } + cookie =xe_vm_set_validating (vm, allow_res_evict);trace_xe_bo_validate (bo); -return ttm_bo_validate (&bo->ttm, &bo->placement, &ctx); + ret =ttm_bo_validate (&bo->ttm, &bo->placement, &ctx); +xe_vm_clear_validating (vm, allow_res_evict, cookie); + +return ret; }bool xe_bo_is_xe_bo (struct ttm_buffer_object *bo)
drivers/gpu/drm/xe/xe_vm.h +69 -0
75 lines not on this page · raw message
drivers/gpu/drm/xe/xe_vm_types.h +8 -0
@@ -310,6 +310,14 @@ struct xe_vm {* protected by the vm resv. */ u64 tlb_flush_seqno; +/** +* @validating: The task that is currently making bos resident for this vm. +* Protected by the VM's resv for writing. Opportunistic reading can be done +* using READ_ONCE. Note: This is a workaround for the +* TTM eviction_valuable() callback not being passed a struct +* ttm_operation_context(). Future work might want to address this. +*/ +struct task_struct *validating;/** @batch_invalidate_tlb: Always invalidate TLB before batch start */ bool batch_invalidate_tlb;/** @xef: XE file handle for tracking this VM's drm client */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 629/780 drm/xe/pxp: Use the correct define in the set_property_funcs array
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniele Ceraolo Spurio <[email protected]>
[ Upstream commit 6bf4d5649230ca65725ec4793333fb5eba18d646 ]
The define of the extension type was accidentally used instead of the one of the property itself. They're both zero, so no functional issue, but we should use the correct define for code correctness.
--- drivers/gpu/drm/xe/xe_bo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_bo.c +1 -1
@@ -2396,7 +2396,7 @@ typedef int (*xe_gem_create_set_property_fn)(struct xe_device *xe, u64 value);static const xe_gem_create_set_property_fn gem_create_set_property_funcs[] = { - [DRM_XE_GEM_CREATE_EXTENSION_SET_PROPERTY ] = gem_create_set_pxp_type, + [DRM_XE_GEM_CREATE_SET_PROPERTY_PXP_TYPE ] = gem_create_set_pxp_type, }; static int gem_create_user_ext_set_property(struct xe_device *xe,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 630/780 drm/xe/pxp: Clarify PXP queue creation behavior if PXP is not ready
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniele Ceraolo Spurio <[email protected]>
[ Upstream commit 69a58ef4fa77759b0e0c2f79834fa51b00a50c0b ]
The expected flow of operations when using PXP is to query the PXP status and wait for it to transition to "ready" before attempting to create an exec_queue. This flow is followed by the Mesa driver, but there is no guarantee that an incorrectly coded (or malicious) app will not attempt to create the queue first without querying the status. Therefore, we need to clarify what the expected behavior of the queue creation ioctl is in this scenario.
Currently, the ioctl always fails with an -EBUSY code no matter the error, but for consistency it is better to distinguish between "failed to init" (-EIO) and "not ready" (-EBUSY), the same way the query ioctl does. Note that, while this is a change in the return code of an ioctl, the behavior of the ioctl in this particular corner case was not clearly spec'd, so no one should have been relying on it (and we know that Mesa, which is the only known userspace for this, didn't).
v2: Minor rework of the doc (Rodrigo)
--- drivers/gpu/drm/xe/xe_pxp.c | 8 ++++++-- include/uapi/drm/xe_drm.h | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/xe/xe_pxp.c +6 -2
@@ -541,10 +541,14 @@ int xe_pxp_exec_queue_add(struct xe_pxp *pxp, struct xe_exec_queue *q)*/ xe_pm_runtime_get (pxp->xe); -if (!pxp_prerequisites_done (pxp)) { - ret = -EBUSY ; +/* get_readiness_status() returns 0 for in-progress and 1 for done */ + ret =xe_pxp_get_readiness_status (pxp); +if (ret <=0 ) { +if (!ret) + ret = -EBUSY ; goto out; } + ret =0 ; wait_for_idle:/*
include/uapi/drm/xe_drm.h +5 -0
@@ -1206,6 +1206,11 @@ struct drm_xe_vm_bind {* there is no need to explicitly set that. When a queue of type * %DRM_XE_PXP_TYPE_HWDRM is created, the PXP default HWDRM session * (%XE_PXP_HWDRM_DEFAULT_SESSION) will be started, if isn't already running. +* The user is expected to query the PXP status via the query ioctl (see +* %DRM_XE_DEVICE_QUERY_PXP_STATUS) and to wait for PXP to be ready before +* attempting to create a queue with this property. When a queue is created +* before PXP is ready, the ioctl will return -EBUSY if init is still in +* progress or -EIO if init failed. * Given that going into a power-saving state kills PXP HWDRM sessions, * runtime PM will be blocked while queues of this type are alive. * All PXP queues will be killed if a PXP invalidation event occurs.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 631/780 riscv: misaligned: fix sleeping function called during misaligned access handling
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nylon Chen <[email protected]>
[ Upstream commit 61a74ad254628ccd9e88838c3c622885dfb6c588 ]
Use copy_from_user_nofault() and copy_to_user_nofault() instead of copy_from/to_user functions in the misaligned access trap handlers.
The following bug report was found when executing misaligned memory accesses:
BUG: sleeping function called from invalid context at ./include/linux/uaccess.h:162 in_atomic(): 0, irqs_disabled(): 1, non_block: 0, pid: 115, name: two preempt_count: 0, expected: 0 CPU: 0 UID: 0 PID: 115 Comm: two Not tainted 6.14.0-rc5 #24 Hardware name: riscv-virtio,qemu (DT) Call Trace: [<ffffffff800160ea>] dump_backtrace+0x1c/0x24 [<ffffffff80002304>] show_stack+0x28/0x34 [<ffffffff80010fae>] dump_stack_lvl+0x4a/0x68 [<ffffffff80010fe0>] dump_stack+0x14/0x1c [<ffffffff8004e44e>] __might_resched+0xfa/0x104 [<ffffffff8004e496>] __might_sleep+0x3e/0x62 [<ffffffff801963c4>] __might_fault+0x1c/0x24 [<ffffffff80425352>] _copy_from_user+0x28/0xaa [<ffffffff8000296c>] handle_misaligned_store+0x204/0x254 [<ffffffff809eae82>] do_trap_store_misaligned+0x24/0xee [<ffffffff809f4f1a>] handle_exception+0x146/0x152
--- arch/riscv/kernel/traps_misaligned.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kernel/traps_misaligned.c +2 -2
@@ -455,7 +455,7 @@ static int handle_scalar_misaligned_load(struct pt_regs *regs) val.data_u64 =0 ;if (user_mode (regs)) { -if (copy_from_user (&val, (u8 __user *)addr, len)) +if (copy_from_user_nofault (&val, (u8 __user *)addr, len))return -1 ; }else {memcpy (&val, (u8 *)addr, len);
@@ -556,7 +556,7 @@ static int handle_scalar_misaligned_store(struct pt_regs *regs)return -EOPNOTSUPP ;if (user_mode (regs)) { -if (copy_to_user ((u8 __user *)addr, &val, len)) +if (copy_to_user_nofault ((u8 __user *)addr, &val, len))return -1 ; }else {memcpy ((u8 *)addr, &val, len);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 632/780 scsi: ufs: qcom: Check gear against max gear in vop freq_to_gear()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ziqi Chen <[email protected]>
[ Upstream commit 663d0c19f3acc0d697f623d34b8eb3b438bf2bda ]
The vop freq_to_gear() may return a gear greater than the negotiated max gear. Return the negotiated max gear if the mapped gear is greater.
--- drivers/ufs/host/ufs-qcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/ufs/host/ufs-qcom.c +3 -3
@@ -1924,7 +1924,7 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)static u32 ufs_qcom_freq_to_gear_speed (struct ufs_hba *hba,unsigned long freq) { -u32 gear =0 ; +u32 gear =UFS_HS_DONT_CHANGE ;switch (freq) {case 403000000 :
@@ -1946,10 +1946,10 @@ static u32 ufs_qcom_freq_to_gear_speed(struct ufs_hba *hba, unsigned long freq)break ;default :dev_err (hba->dev,"%s: Unsupported clock freq : %lu\n" , __func__, freq); -break ; +return UFS_HS_DONT_CHANGE ; } -return gear; +return min_t (u32, gear, hba->max_pwr_info.info.gear_rx); }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 633/780 scsi: ufs: qcom: Map devfreq OPP freq to UniPro Core Clock freq
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Can Guo <[email protected]>
[ Upstream commit 8c5bcb3daeef9bc54c9939c36dca9a626126eb59 ]
On some platforms, the devfreq OPP freq may be different than the unipro core clock freq. Implement ufs_qcom_opp_freq_to_clk_freq() and use it to find the unipro core clk freq.
--- drivers/ufs/host/ufs-qcom.c | 81 ++++++++++++++++++++++++++++++++----- 1 file changed, 71 insertions(+), 10 deletions(-)
drivers/ufs/host/ufs-qcom.c +71 -10
@@ -103,7 +103,9 @@ static const struct __ufs_qcom_bw_table { };static void ufs_qcom_get_default_testbus_cfg (struct ufs_qcom_host *host); -static int ufs_qcom_set_core_clk_ctrl (struct ufs_hba *hba,unsigned long freq); +static unsigned long ufs_qcom_opp_freq_to_clk_freq (struct ufs_hba *hba, +unsigned long freq,char *name); +static int ufs_qcom_set_core_clk_ctrl (struct ufs_hba *hba,bool is_scale_up,unsigned long freq);static struct ufs_qcom_host *rcdev_to_ufs_host (struct reset_controller_dev *rcd) {
@@ -602,7 +604,7 @@ static int ufs_qcom_link_startup_notify(struct ufs_hba *hba,return -EINVAL ; } - err =ufs_qcom_set_core_clk_ctrl (hba,ULONG_MAX ); + err =ufs_qcom_set_core_clk_ctrl (hba, true,ULONG_MAX );if (err)dev_err (hba->dev,"cfg core clk ctrl failed\n" );/*
@@ -1360,29 +1362,46 @@ static int ufs_qcom_set_clk_40ns_cycles(struct ufs_hba *hba,return ufshcd_dme_set (hba,UIC_ARG_MIB (PA_VS_CORE_CLK_40NS_CYCLES ), reg); } -static int ufs_qcom_set_core_clk_ctrl (struct ufs_hba *hba,unsigned long freq) +static int ufs_qcom_set_core_clk_ctrl (struct ufs_hba *hba,bool is_scale_up,unsigned long freq) {struct ufs_qcom_host *host =ufshcd_get_variant (hba);struct list_head *head = &hba->clk_list_head;struct ufs_clk_info *clki;u32 cycles_in_1us =0 ;u32 core_clk_ctrl_reg; +unsigned long clk_freq;int err; +if (hba->use_pm_opp && freq !=ULONG_MAX ) { + clk_freq =ufs_qcom_opp_freq_to_clk_freq (hba, freq,"core_clk_unipro" ); +if (clk_freq) { + cycles_in_1us =ceil (clk_freq,HZ_PER_MHZ ); + goto set_core_clk_ctrl; + } + } +list_for_each_entry (clki, head, list) {if (!IS_ERR_OR_NULL (clki->clk) && !strcmp (clki->name,"core_clk_unipro" )) { -if (!clki->max_freq) +if (!clki->max_freq) { cycles_in_1us =150 ;/* default for backwards compatibility */ -else if (freq ==ULONG_MAX ) +break ; + } + +if (freq ==ULONG_MAX ) { cycles_in_1us =ceil (clki->max_freq,HZ_PER_MHZ ); -else - cycles_in_1us =ceil (freq,HZ_PER_MHZ ); +break ; + } +if (is_scale_up) + cycles_in_1us =ceil (clki->max_freq,HZ_PER_MHZ ); +else + cycles_in_1us =ceil (clk_get_rate (clki->clk),HZ_PER_MHZ );break ; } } +set_core_clk_ctrl: err =ufshcd_dme_get (hba,UIC_ARG_MIB (DME_VS_CORE_CLK_CTRL ), &core_clk_ctrl_reg);
@@ -1425,7 +1444,7 @@ static int ufs_qcom_clk_scale_up_pre_change(struct ufs_hba *hba, unsigned long freturn ret; }/* set unipro core clock attributes and clear clock divider */ -return ufs_qcom_set_core_clk_ctrl (hba, freq); +return ufs_qcom_set_core_clk_ctrl (hba, true, freq); }static int ufs_qcom_clk_scale_up_post_change (struct ufs_hba *hba)
@@ -1457,7 +1476,7 @@ static int ufs_qcom_clk_scale_down_pre_change(struct ufs_hba *hba)static int ufs_qcom_clk_scale_down_post_change (struct ufs_hba *hba,unsigned long freq) {/* set unipro core clock attributes and clear clock divider */ -return ufs_qcom_set_core_clk_ctrl (hba, freq); +return ufs_qcom_set_core_clk_ctrl (hba, false, freq); } static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba, bool scale_up,
@@ -1922,11 +1941,53 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba)return ret; } +static unsigned long ufs_qcom_opp_freq_to_clk_freq (struct ufs_hba *hba, +unsigned long freq,char *name) +{ +struct ufs_clk_info *clki; +struct dev_pm_opp *opp; +unsigned long clk_freq; +int idx =0 ; +bool found = false; + + opp =dev_pm_opp_find_freq_exact_indexed (hba->dev, freq,0 , true); +if (IS_ERR (opp)) { +dev_err (hba->dev,"Failed to find OPP for exact frequency %lu\n" , freq); +return 0 ; + } + +list_for_each_entry (clki, &hba->clk_list_head, list) { +if (!strcmp (clki->name, name)) { + found = true; +break ; + } + + idx++; + } + +if (!found) { +dev_err (hba->dev,"Failed to find clock '%s' in clk list\n" , name); +dev_pm_opp_put (opp); +return 0 ; + } + + clk_freq =dev_pm_opp_get_freq_indexed (opp, idx); + +dev_pm_opp_put (opp); + +return clk_freq; +} +static u32 ufs_qcom_freq_to_gear_speed (struct ufs_hba *hba,unsigned long freq) {u32 gear =UFS_HS_DONT_CHANGE ; +unsigned long unipro_freq; + +if (!hba->use_pm_opp) +return gear; -switch (freq) { + unipro_freq =ufs_qcom_opp_freq_to_clk_freq (hba, freq,"core_clk_unipro" ); +switch (unipro_freq) {case 403000000 : gear =UFS_HS_G5 ;break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 634/780 scsi: ufs: qcom: Prevent calling phy_exit() before phy_init()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nitin Rawat <[email protected]>
[ Upstream commit 7831003165d37ecb7b33843fcee05cada0359a82 ]
Prevent calling phy_exit() before phy_init() to avoid abnormal power count and the following warning during boot up.
[5.146763] phy phy-1d80000.phy.0: phy_power_on was called before phy_init
--- drivers/ufs/host/ufs-qcom.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/ufs/host/ufs-qcom.c +2 -3
@@ -454,10 +454,9 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)if (ret)return ret; -if (phy->power_count) { +if (phy->power_count)phy_power_off (phy); -phy_exit (phy); - } +/* phy initialization - calibrate the phy */ ret =phy_init (phy);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 635/780 ASoC: codecs: hda: Fix RPM usage count underflow
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit ff0045de4ee0288dec683690f66f2f369b7d3466 ]
RPM manipulation in hda_codec_probe_complete()'s error path is superfluous and leads to RPM usage count underflow if the build-controls operation fails.
hda_codec_probe_complete() is called in:
1) hda_codec_probe() for all non-HDMI codecs
2) in card->late_probe() for HDMI codecs
Error path for hda_codec_probe() takes care of bus' RPM already. For 2) if late_probe() fails, ASoC performs card cleanup what triggers hda_codec_remote() - same treatment is in 1).
--- sound/soc/codecs/hda.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/hda.c +2 -2
@@ -152,7 +152,7 @@ int hda_codec_probe_complete(struct hda_codec *codec) ret =snd_hda_codec_build_controls (codec);if (ret <0 ) {dev_err (&hdev->dev,"unable to create controls %d\n" , ret); - goto out; +return ret; }/* Bus suspended codecs as it does not manage their pm */
@@ -160,7 +160,7 @@ int hda_codec_probe_complete(struct hda_codec *codec)/* rpm was forbidden in snd_hda_codec_device_new() */ snd_hda_codec_set_power_save (codec,2000 );snd_hda_codec_register (codec); -out: +/* Complement pm_runtime_get_sync(bus) in probe */ pm_runtime_mark_last_busy (bus->dev);pm_runtime_put_autosuspend (bus->dev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 636/780 ASoC: Intel: avs: Fix deadlock when the failing IPC is SET_D0IX
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit 9ad1f3cd0d60444c69948854c7e50d2a61b63755 ]
The procedure handling IPC timeouts and EXCEPTION_CAUGHT notification shall cancel any D0IX work before proceeding with DSP recovery. If SET_D0IX called from delayed_work is the failing IPC the procedure will deadlock. Conditionally skip cancelling the work to fix that.
--- sound/soc/intel/avs/ipc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/intel/avs/ipc.c +3 -1
@@ -169,7 +169,9 @@ static void avs_dsp_exception_caught(struct avs_dev *adev, union avs_notify_msgdev_crit (adev->dev,"communication severed, rebooting dsp..\n" ); -cancel_delayed_work_sync (&ipc->d0ix_work); +/* Avoid deadlock as the exception may be the response to SET_D0IX. */ +if (current_work () != &ipc->d0ix_work.work) +cancel_delayed_work_sync (&ipc->d0ix_work); ipc->in_d0ix = false;/* Re-enabled on recovery completion. */ pm_runtime_disable (adev->dev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 637/780 ALSA: hda: Allow to fetch hlink by ID
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit 318c9eef63dd30b59dc8d63c7205ae997aa1e524 ]
Starting with LNL platform, Intel HDAudio Links carry IDs specifying non-HDAudio transfer type they help facilitate e.g.: 0xC0 for I2S as defined by AZX_REG_ML_LEPTR_ID_INTEL_SSP.
The mechanism accounts for LEPTR register as it is Reserved if LCAP.ALT for given Link equals 0.
Stable-dep-of: 347c8d6db7c9 ("ASoC: Intel: avs: Fix PPLCxFMT calculation")
--- include/sound/hdaudio_ext.h | 5 +++++ sound/hda/ext/hdac_ext_controller.c | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+)
include/sound/hdaudio_ext.h +5 -0
@@ -22,6 +22,7 @@ void snd_hdac_ext_bus_ppcap_enable(struct hdac_bus *chip, bool enable);void snd_hdac_ext_bus_ppcap_int_enable (struct hdac_bus *chip,bool enable);int snd_hdac_ext_bus_get_ml_capabilities (struct hdac_bus *bus); +struct hdac_ext_link *snd_hdac_ext_bus_get_hlink_by_id (struct hdac_bus *bus,u32 id);struct hdac_ext_link *snd_hdac_ext_bus_get_hlink_by_addr (struct hdac_bus *bus,int addr);struct hdac_ext_link *snd_hdac_ext_bus_get_hlink_by_name (struct hdac_bus *bus,const char *codec_name);
@@ -97,12 +98,16 @@ struct hdac_ext_link {void __iomem *ml_addr;/* link output stream reg pointer */ u32 lcaps;/* link capablities */ u16 lsdiid;/* link sdi identifier */ +u32 id;int ref_count;struct list_head list; }; +#define hdac_ext_link_alt (link) ((link)->lcaps & AZX_ML_HDA_LCAP_ALT) +#define hdac_ext_link_ofls (link) ((link)->lcaps & AZX_ML_HDA_LCAP_OFLS) +int snd_hdac_ext_bus_link_power_up (struct hdac_ext_link *hlink);int snd_hdac_ext_bus_link_power_down (struct hdac_ext_link *hlink);int snd_hdac_ext_bus_link_power_up_all (struct hdac_bus *bus);
sound/hda/ext/hdac_ext_controller.c +18 -0
@@ -9,6 +9,7 @@* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +#include <linux/bitfield.h> #include <linux/delay.h> #include <linux/slab.h> #include <sound/hda_register.h>
@@ -81,6 +82,7 @@ int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_bus *bus)int idx;u32 link_count;struct hdac_ext_link *hlink; +u32 leptr; link_count =readl (bus->mlcap +AZX_REG_ML_MLCD ) +1 ;
@@ -97,6 +99,11 @@ int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_bus *bus) hlink->lcaps =readl (hlink->ml_addr +AZX_REG_ML_LCAP ); hlink->lsdiid =readw (hlink->ml_addr +AZX_REG_ML_LSDIID ); +if (hdac_ext_link_alt (hlink)) { + leptr =readl (hlink->ml_addr +AZX_REG_ML_LEPTR ); + hlink->id =FIELD_GET (AZX_REG_ML_LEPTR_ID , leptr); + } +/* since link in On, update the ref */ hlink->ref_count =1 ;
@@ -125,6 +132,17 @@ void snd_hdac_ext_link_free_all(struct hdac_bus *bus) }EXPORT_SYMBOL_GPL (snd_hdac_ext_link_free_all); +struct hdac_ext_link *snd_hdac_ext_bus_get_hlink_by_id (struct hdac_bus *bus,u32 id) +{ +struct hdac_ext_link *hlink; + +list_for_each_entry (hlink, &bus->hlink_list, list) +if (hdac_ext_link_alt (hlink) && hlink->id == id) +return hlink; +return NULL ; +} +EXPORT_SYMBOL_GPL (snd_hdac_ext_bus_get_hlink_by_id); +/** * snd_hdac_ext_bus_get_hlink_by_addr - get hlink at specified address * @bus: hlink's parent bus device
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 638/780 ASoC: Intel: avs: PCM operations for LNL-based platforms
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit 716643786f140f2d68f22424c75b9198ffe14290 ]
Starting from LNL platform the so-called non-HDAudio transfer types, e.g.: I2S/DMIC, utilize HDAudio LINK DMA rather than GPDMA for the data streaming. In essence, all transfer types now utilize HDAudio Link. Most of the existing code can be reused with the major difference being HDAudio Link query method:
- fetch the Link by codec.addr in standard HDAudio transfer case
- fetch the Link by LEPTR.ID in non-HDAudio transfer case
To make the unification happen, store pointer to the Link in dma_data and utilize it in the common code. And to avoid confusion in transfer-type naming between cAVS-ACE 1.x (SkyLake till MeteorLake) and ACE 2.0+ architecture (LunarLake onward), use:
- 'hda' for typical HDAudio transfer case
- 'nonhda' for non-HDAudio transfer case, cAVS-ACE 1.x
- 'althda' for non-HDAudio transfer case, ACE 2.0+
Stable-dep-of: 347c8d6db7c9 ("ASoC: Intel: avs: Fix PPLCxFMT calculation")
--- sound/soc/intel/avs/pcm.c | 116 ++++++++++++++++++++++++++++---------- 1 file changed, 85 insertions(+), 31 deletions(-)
sound/soc/intel/avs/pcm.c +85 -31
@@ -36,6 +36,7 @@ struct avs_dma_data {struct snd_pcm_hw_constraint_list sample_bits_list;struct work_struct period_elapsed_work; +struct hdac_ext_link *link;struct snd_pcm_substream *substream; };
@@ -325,32 +326,75 @@ static const struct snd_soc_dai_ops avs_dai_nonhda_be_ops = { .trigger = avs_dai_nonhda_be_trigger, }; -static int avs_dai_hda_be_startup (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) +static int __avs_dai_hda_be_startup (struct snd_pcm_substream *substream,struct snd_soc_dai *dai, +struct hdac_ext_link *link) { -struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);struct hdac_ext_stream *link_stream;struct avs_dma_data *data; -struct hda_codec *codec;int ret; ret =avs_dai_startup (substream, dai);if (ret)return ret; - codec =dev_to_hda_codec (snd_soc_rtd_to_codec (rtd,0 )->dev); - link_stream =snd_hdac_ext_stream_assign (&codec->bus->core, substream, + data =snd_soc_dai_get_dma_data (dai, substream); + link_stream =snd_hdac_ext_stream_assign (&data->adev->base.core, substream,HDAC_EXT_STREAM_TYPE_LINK );if (!link_stream) {avs_dai_shutdown (substream, dai);return -EBUSY ; } - data =snd_soc_dai_get_dma_data (dai, substream); data->link_stream = link_stream; - substream->runtime->private_data = link_stream; + data->link = link;return 0 ; } +static int avs_dai_hda_be_startup (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) +{ +struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream); +struct hdac_ext_link *link; +struct avs_dma_data *data; +struct hda_codec *codec; +int ret; + + codec =dev_to_hda_codec (snd_soc_rtd_to_codec (rtd,0 )->dev); + + link =snd_hdac_ext_bus_get_hlink_by_addr (&codec->bus->core, codec->core.addr); +if (!link) +return -EINVAL ; + + ret =__avs_dai_hda_be_startup (substream, dai, link); +if (!ret) { + data =snd_soc_dai_get_dma_data (dai, substream); + substream->runtime->private_data = data->link_stream; + } + +return ret; +} + +static int avs_dai_i2shda_be_startup (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) +{ +struct avs_dev *adev =to_avs_dev (dai->component->dev); +struct hdac_ext_link *link; + + link =snd_hdac_ext_bus_get_hlink_by_id (&adev->base.core,AZX_REG_ML_LEPTR_ID_INTEL_SSP ); +if (!link) +return -EINVAL ; +return __avs_dai_hda_be_startup (substream, dai, link); +} + +static int avs_dai_dmichda_be_startup (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) +{ +struct avs_dev *adev =to_avs_dev (dai->component->dev); +struct hdac_ext_link *link; + + link =snd_hdac_ext_bus_get_hlink_by_id (&adev->base.core,AZX_REG_ML_LEPTR_ID_INTEL_DMIC ); +if (!link) +return -EINVAL ; +return __avs_dai_hda_be_startup (substream, dai, link); +} +static void avs_dai_hda_be_shutdown (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) {struct avs_dma_data *data =snd_soc_dai_get_dma_data (dai, substream);
@@ -360,6 +404,14 @@ static void avs_dai_hda_be_shutdown(struct snd_pcm_substream *substream, structavs_dai_shutdown (substream, dai); } +static void avs_dai_althda_be_shutdown (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) +{ +struct avs_dma_data *data =snd_soc_dai_get_dma_data (dai, substream); + +snd_hdac_ext_stream_release (data->link_stream,HDAC_EXT_STREAM_TYPE_LINK ); +avs_dai_shutdown (substream, dai); +} +static int avs_dai_hda_be_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *hw_params,struct snd_soc_dai *dai) {
@@ -375,13 +427,8 @@ static int avs_dai_hda_be_hw_params(struct snd_pcm_substream *substream,static int avs_dai_hda_be_hw_free (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) { -struct avs_dma_data *data; -struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);struct hdac_ext_stream *link_stream; -struct hdac_ext_link *link; -struct hda_codec *codec; - -dev_dbg (dai->dev,"%s: %s\n" , __func__, dai->name); +struct avs_dma_data *data; data =snd_soc_dai_get_dma_data (dai, substream);if (!data->path)
@@ -393,27 +440,19 @@ static int avs_dai_hda_be_hw_free(struct snd_pcm_substream *substream, struct sn data->path =NULL ;/* clear link <-> stream mapping */ - codec =dev_to_hda_codec (snd_soc_rtd_to_codec (rtd,0 )->dev); - link =snd_hdac_ext_bus_get_hlink_by_addr (&codec->bus->core, codec->core.addr); -if (!link) -return -EINVAL ; -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) -snd_hdac_ext_bus_link_clear_stream_id (link,hdac_stream (link_stream)->stream_tag); +snd_hdac_ext_bus_link_clear_stream_id (data->link, +hdac_stream (link_stream)->stream_tag);return 0 ; }static int avs_dai_hda_be_prepare (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) { -struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);struct snd_pcm_runtime *runtime = substream->runtime;const struct snd_soc_pcm_stream *stream_info;struct hdac_ext_stream *link_stream; -struct hdac_ext_link *link;struct avs_dma_data *data; -struct hda_codec *codec; -struct hdac_bus *bus;unsigned int format_val;unsigned int bits;int ret;
@@ -424,23 +463,18 @@ static int avs_dai_hda_be_prepare(struct snd_pcm_substream *substream, struct snif (link_stream->link_prepared)return 0 ; - codec =dev_to_hda_codec (snd_soc_rtd_to_codec (rtd,0 )->dev); - bus = &codec->bus->core; stream_info =snd_soc_dai_get_pcm_stream (dai, substream->stream); bits =snd_hdac_stream_format_bits (runtime->format, runtime->subformat, stream_info->sig_bits); format_val =snd_hdac_stream_format (runtime->channels, bits, runtime->rate); -snd_hdac_ext_stream_decouple (bus, link_stream, true); +snd_hdac_ext_stream_decouple (&data->adev->base.core, link_stream, true);snd_hdac_ext_stream_reset (link_stream);snd_hdac_ext_stream_setup (link_stream, format_val); - link =snd_hdac_ext_bus_get_hlink_by_addr (bus, codec->core.addr); -if (!link) -return -EINVAL ; -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) -snd_hdac_ext_bus_link_set_stream_id (link,hdac_stream (link_stream)->stream_tag); +snd_hdac_ext_bus_link_set_stream_id (data->link, +hdac_stream (link_stream)->stream_tag); ret =avs_dai_prepare (substream, dai);if (ret)
@@ -515,6 +549,26 @@ static const struct snd_soc_dai_ops avs_dai_hda_be_ops = { .trigger = avs_dai_hda_be_trigger, }; +__maybe_unused +static const struct snd_soc_dai_ops avs_dai_i2shda_be_ops = { + .startup = avs_dai_i2shda_be_startup, + .shutdown = avs_dai_althda_be_shutdown, + .hw_params = avs_dai_hda_be_hw_params, + .hw_free = avs_dai_hda_be_hw_free, + .prepare = avs_dai_hda_be_prepare, + .trigger = avs_dai_hda_be_trigger, +}; + +__maybe_unused +static const struct snd_soc_dai_ops avs_dai_dmichda_be_ops = { + .startup = avs_dai_dmichda_be_startup, + .shutdown = avs_dai_althda_be_shutdown, + .hw_params = avs_dai_hda_be_hw_params, + .hw_free = avs_dai_hda_be_hw_free, + .prepare = avs_dai_hda_be_prepare, + .trigger = avs_dai_hda_be_trigger, +}; +static int hw_rule_param_size (struct snd_pcm_hw_params *params,struct snd_pcm_hw_rule *rule) {struct snd_interval *interval =hw_param_interval (params, rule->var);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 639/780 ASoC: Intel: avs: Fix PPLCxFMT calculation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit 347c8d6db7c9d65d93ef226849b273823f54eaea ]
HDAudio transfer types utilize SDxFMT for front-end (HOST) and PPLCxFMT for back-end (LINK) side when setting up the stream. BE's substream->runtime duplicates FE runtime so switch to using BE's hw_params to address incorrect format values on the LINK side when FE and BE formats differ.
The problem is introduced with commit d070002a20fc ("ASoC: Intel: avs:
HDA PCM BE operations") but the code has been shuffled around since then so direct 'Fixes:' tag does not apply.
--- sound/soc/intel/avs/pcm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
sound/soc/intel/avs/pcm.c +5 -3
@@ -449,9 +449,10 @@ static int avs_dai_hda_be_hw_free(struct snd_pcm_substream *substream, struct snstatic int avs_dai_hda_be_prepare (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) { -struct snd_pcm_runtime *runtime = substream->runtime; +struct snd_soc_pcm_runtime *be =snd_soc_substream_to_rtd (substream);const struct snd_soc_pcm_stream *stream_info;struct hdac_ext_stream *link_stream; +const struct snd_pcm_hw_params *p;struct avs_dma_data *data;unsigned int format_val;unsigned int bits;
@@ -459,14 +460,15 @@ static int avs_dai_hda_be_prepare(struct snd_pcm_substream *substream, struct sn data =snd_soc_dai_get_dma_data (dai, substream); link_stream = data->link_stream; + p = &be->dpcm[substream->stream].hw_params;if (link_stream->link_prepared)return 0 ; stream_info =snd_soc_dai_get_pcm_stream (dai, substream->stream); - bits =snd_hdac_stream_format_bits (runtime->format, runtime->subformat, + bits =snd_hdac_stream_format_bits (params_format (p),params_subformat (p), stream_info->sig_bits); - format_val =snd_hdac_stream_format (runtime->channels, bits, runtime->rate); + format_val =snd_hdac_stream_format (params_channels (p), bits,params_rate (p));snd_hdac_ext_stream_decouple (&data->adev->base.core, link_stream, true);snd_hdac_ext_stream_reset (link_stream);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 640/780 ASoC: Intel: avs: Fix possible null-ptr-deref when initing hw
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit 2f78724d4f0c665c83e202e3989d5333a2cb1036 ]
Search result of avs_dai_find_path_template() shall be verified before being used. As 'template' is already known when avs_hw_constraints_init() is fired, drop the search entirely.
--- sound/soc/intel/avs/pcm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
sound/soc/intel/avs/pcm.c +1 -4
@@ -82,10 +82,8 @@ void avs_period_elapsed(struct snd_pcm_substream *substream)static int hw_rule_param_size (struct snd_pcm_hw_params *params,struct snd_pcm_hw_rule *rule);static int avs_hw_constraints_init (struct snd_pcm_substream *substream,struct snd_soc_dai *dai) { -struct snd_soc_pcm_runtime *rtd =snd_soc_substream_to_rtd (substream);struct snd_pcm_runtime *runtime = substream->runtime;struct snd_pcm_hw_constraint_list *r, *c, *s; -struct avs_tplg_path_template *template;struct avs_dma_data *data;int ret;
@@ -98,8 +96,7 @@ static int avs_hw_constraints_init(struct snd_pcm_substream *substream, struct s c = &(data->channels_list); s = &(data->sample_bits_list); - template =avs_dai_find_path_template (dai, !rtd->dai_link->no_pcm, substream->stream); - ret =avs_path_set_constraint (data->adev, template, r, c, s); + ret =avs_path_set_constraint (data->adev, data->template, r, c, s);if (ret <=0 )return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 641/780 ASoC: Intel: avs: Ignore Vendor-space manipulation for ACE
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit acd2563f30886730757062b9b3efe8043daabbc3 ]
A number of Vendor Specific registers utilized on cAVS architecture (SkyLake till RaptorLake) are not present on ACE hardware (MeteorLake onward). Similarly, certain recommended procedures do not apply. Adjust existing code to be ACE-friendly.
Stable-dep-of: 9e3285be55e6 ("ASoC: Intel: avs: Fix paths in MODULE_FIRMWARE hints")
--- sound/soc/intel/avs/avs.h | 1 + sound/soc/intel/avs/core.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)
sound/soc/intel/avs/avs.h +1 -0
@@ -72,6 +72,7 @@ extern const struct avs_dsp_ops avs_tgl_dsp_ops;#define AVS_PLATATTR_CLDMA BIT_ULL(0)#define AVS_PLATATTR_IMR BIT_ULL(1) +#define AVS_PLATATTR_ACE BIT_ULL(2)#define avs_platattr_test (adev, attr) \ ((adev)->spec->attributes & AVS_PLATATTR_##attr)
sound/soc/intel/avs/core.c +10 -3
@@ -54,14 +54,17 @@ void avs_hda_power_gating_enable(struct avs_dev *adev, bool enable) {u32 value = enable ?0 : pgctl_mask; -avs_hda_update_config_dword (&adev->base.core,AZX_PCIREG_PGCTL , pgctl_mask, value); +if (!avs_platattr_test (adev,ACE )) +avs_hda_update_config_dword (&adev->base.core,AZX_PCIREG_PGCTL , pgctl_mask, value); }static void avs_hdac_clock_gating_enable (struct hdac_bus *bus,bool enable) { +struct avs_dev *adev =hdac_to_avs (bus);u32 value = enable ? cgctl_mask :0 ; -avs_hda_update_config_dword (bus,AZX_PCIREG_CGCTL , cgctl_mask, value); +if (!avs_platattr_test (adev,ACE )) +avs_hda_update_config_dword (bus,AZX_PCIREG_CGCTL , cgctl_mask, value); }void avs_hda_clock_gating_enable (struct avs_dev *adev,bool enable)
@@ -71,6 +74,8 @@ void avs_hda_clock_gating_enable(struct avs_dev *adev, bool enable)void avs_hda_l1sen_enable (struct avs_dev *adev,bool enable) { +if (avs_platattr_test (adev,ACE )) +return ;if (enable) {if (atomic_inc_and_test (&adev->l1sen_counter)) snd_hdac_chip_updatel(&adev->base.core, VS_EM2, AZX_VS_EM2_L1SEN,
@@ -99,6 +104,7 @@ static int avs_hdac_bus_init_streams(struct hdac_bus *bus)static bool avs_hdac_bus_init_chip (struct hdac_bus *bus,bool full_reset) { +struct avs_dev *adev =hdac_to_avs (bus);struct hdac_ext_link *hlink;bool ret;
@@ -114,7 +120,8 @@ static bool avs_hdac_bus_init_chip(struct hdac_bus *bus, bool full_reset)/* Set DUM bit to address incorrect position reporting for capture * streams. In order to do so, CTRL needs to be out of reset state */ -snd_hdac_chip_updatel (bus,VS_EM2 ,AZX_VS_EM2_DUM ,AZX_VS_EM2_DUM ); +if (!avs_platattr_test (adev,ACE )) +snd_hdac_chip_updatel (bus,VS_EM2 ,AZX_VS_EM2_DUM ,AZX_VS_EM2_DUM );return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 642/780 ASoC: Intel: avs: Read HW capabilities when possible
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit b9a3ec604993074eb6f5d08b14fb7913d1fae48b ]
Starting with LunarLake (LNL) and onward, some hardware capabilities are visible to the sound driver directly. At the same time, these may no longer be visible to the AudioDSP firmware. Update resource allocation function to rely on the registers when possible.
Stable-dep-of: 9e3285be55e6 ("ASoC: Intel: avs: Fix paths in MODULE_FIRMWARE hints")
--- include/sound/hdaudio_ext.h | 1 + sound/hda/ext/hdac_ext_controller.c | 1 + sound/soc/intel/avs/avs.h | 1 + sound/soc/intel/avs/loader.c | 9 +++++++++ 4 files changed, 12 insertions(+)
include/sound/hdaudio_ext.h +1 -0
@@ -99,6 +99,7 @@ struct hdac_ext_link {u32 lcaps;/* link capablities */ u16 lsdiid;/* link sdi identifier */ u32 id; +u8 slcount;int ref_count;
sound/hda/ext/hdac_ext_controller.c +1 -0
@@ -98,6 +98,7 @@ int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_bus *bus) (AZX_ML_INTERVAL * idx); hlink->lcaps =readl (hlink->ml_addr +AZX_REG_ML_LCAP ); hlink->lsdiid =readw (hlink->ml_addr +AZX_REG_ML_LSDIID ); + hlink->slcount =FIELD_GET (AZX_ML_HDA_LCAP_SLCOUNT , hlink->lcaps) +1 ;if (hdac_ext_link_alt (hlink)) { leptr =readl (hlink->ml_addr +AZX_REG_ML_LEPTR );
sound/soc/intel/avs/avs.h +1 -0
@@ -73,6 +73,7 @@ extern const struct avs_dsp_ops avs_tgl_dsp_ops;#define AVS_PLATATTR_CLDMA BIT_ULL(0)#define AVS_PLATATTR_IMR BIT_ULL(1)#define AVS_PLATATTR_ACE BIT_ULL(2) +#define AVS_PLATATTR_ALTHDA BIT_ULL(3)#define avs_platattr_test (adev, attr) \ ((adev)->spec->attributes & AVS_PLATATTR_##attr)
sound/soc/intel/avs/loader.c +9 -0
@@ -683,6 +683,7 @@ int avs_dsp_boot_firmware(struct avs_dev *adev, bool purge)static int avs_dsp_alloc_resources (struct avs_dev *adev) { +struct hdac_ext_link *link;int ret, i; ret =avs_ipc_get_hw_config (adev, &adev->hw_cfg);
@@ -693,6 +694,14 @@ static int avs_dsp_alloc_resources(struct avs_dev *adev)if (ret)return AVS_IPC_RET (ret); +/* If hw allows, read capabilities directly from it. */ +if (avs_platattr_test (adev,ALTHDA )) { + link =snd_hdac_ext_bus_get_hlink_by_id (&adev->base.core, +AZX_REG_ML_LEPTR_ID_INTEL_SSP ); +if (link) + adev->hw_cfg.i2s_caps.ctrl_count = link->slcount; + } + adev->core_refs =devm_kcalloc (adev->dev, adev->hw_cfg.dsp_cores,sizeof (*adev->core_refs),GFP_KERNEL ); adev->lib_names = devm_kcalloc(adev->dev, adev->fw_cfg.max_libs_count,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 643/780 ASoC: Intel: avs: Relocate DSP status registers
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit 75f3c607b1fa1f4d42cde8377cd2276ab01e287d ]
The firmware status and error registers are not part of SRAM on ACE platforms. As these registers take part in IPC on ACE and cAVS platforms both, relocate the field denoting their offset to Host-IPC descriptor.
In consequence, code remains cohesive with the ACE specs while still maintaining high readability for the cAVS platforms.
Stable-dep-of: 9e3285be55e6 ("ASoC: Intel: avs: Fix paths in MODULE_FIRMWARE hints")
--- sound/soc/intel/avs/avs.h | 2 +- sound/soc/intel/avs/core.c | 18 +++++++++++++++--- sound/soc/intel/avs/loader.c | 2 +- sound/soc/intel/avs/registers.h | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-)
sound/soc/intel/avs/avs.h +1 -1
@@ -81,7 +81,6 @@ extern const struct avs_dsp_ops avs_tgl_dsp_ops;struct avs_sram_spec {const u32 base_offset;const u32 window_size; -const u32 rom_status_offset; };struct avs_hipc_spec {
@@ -93,6 +92,7 @@ struct avs_hipc_spec {const u32 rsp_offset;const u32 rsp_busy_mask;const u32 ctl_offset; +const u32 sts_offset; };/* Platform specific descriptor */
sound/soc/intel/avs/core.c +15 -3
@@ -755,13 +755,11 @@ static const struct dev_pm_ops avs_dev_pm = {static const struct avs_sram_spec skl_sram_spec = { .base_offset =SKL_ADSP_SRAM_BASE_OFFSET , .window_size =SKL_ADSP_SRAM_WINDOW_SIZE , - .rom_status_offset =SKL_ADSP_SRAM_BASE_OFFSET , };static const struct avs_sram_spec apl_sram_spec = { .base_offset =APL_ADSP_SRAM_BASE_OFFSET , .window_size =APL_ADSP_SRAM_WINDOW_SIZE , - .rom_status_offset =APL_ADSP_SRAM_BASE_OFFSET , };static const struct avs_hipc_spec skl_hipc_spec = {
@@ -773,6 +771,19 @@ static const struct avs_hipc_spec skl_hipc_spec = { .rsp_offset = SKL_ADSP_REG_HIPCT, .rsp_busy_mask = SKL_ADSP_HIPCT_BUSY, .ctl_offset = SKL_ADSP_REG_HIPCCTL, + .sts_offset = SKL_ADSP_SRAM_BASE_OFFSET, +}; + +static const struct avs_hipc_spec apl_hipc_spec = { + .req_offset =SKL_ADSP_REG_HIPCI , + .req_ext_offset =SKL_ADSP_REG_HIPCIE , + .req_busy_mask =SKL_ADSP_HIPCI_BUSY , + .ack_offset =SKL_ADSP_REG_HIPCIE , + .ack_done_mask =SKL_ADSP_HIPCIE_DONE , + .rsp_offset =SKL_ADSP_REG_HIPCT , + .rsp_busy_mask =SKL_ADSP_HIPCT_BUSY , + .ctl_offset =SKL_ADSP_REG_HIPCCTL , + .sts_offset =APL_ADSP_SRAM_BASE_OFFSET , };static const struct avs_hipc_spec cnl_hipc_spec = {
@@ -784,6 +795,7 @@ static const struct avs_hipc_spec cnl_hipc_spec = { .rsp_offset = CNL_ADSP_REG_HIPCTDR, .rsp_busy_mask = CNL_ADSP_HIPCTDR_BUSY, .ctl_offset = CNL_ADSP_REG_HIPCCTL, + .sts_offset = APL_ADSP_SRAM_BASE_OFFSET, };static const struct avs_spec skl_desc = {
@@ -803,7 +815,7 @@ static const struct avs_spec apl_desc = { .core_init_mask = 3, .attributes = AVS_PLATATTR_IMR, .sram = &apl_sram_spec, - .hipc = &skl_hipc_spec, + .hipc = &apl_hipc_spec, };static const struct avs_spec cnl_desc = {
sound/soc/intel/avs/loader.c +1 -1
@@ -310,7 +310,7 @@ avs_hda_init_rom(struct avs_dev *adev, unsigned int dma_id, bool purge) }/* await ROM init */ - ret =snd_hdac_adsp_readl_poll (adev, spec->sram->rom_status_offset, reg, + ret =snd_hdac_adsp_readl_poll (adev, spec->hipc->sts_offset, reg, (reg &0xF ) ==AVS_ROM_INIT_DONE || (reg &0xF ) ==APL_ROM_FW_ENTERED ,AVS_ROM_INIT_POLLING_US ,APL_ROM_INIT_TIMEOUT_US );
sound/soc/intel/avs/registers.h +1 -1
@@ -74,7 +74,7 @@#define APL_ADSP_SRAM_WINDOW_SIZE 0x20000/* Constants used when accessing SRAM, space shared with firmware */ -#define AVS_FW_REG_BASE (adev) ((adev)->spec->sram->base_offset) +#define AVS_FW_REG_BASE (adev) ((adev)->spec->hipc->sts_offset)#define AVS_FW_REG_STATUS (adev) (AVS_FW_REG_BASE(adev) + 0x0)#define AVS_FW_REG_ERROR (adev) (AVS_FW_REG_BASE(adev) + 0x4)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 644/780 ASoC: Intel: avs: Fix paths in MODULE_FIRMWARE hints
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amadeusz Sławiński <[email protected]>
[ Upstream commit 9e3285be55e6c0829e451b4a341e3059da47ec9d ]
The binaries for cAVS architecture are located in "intel/avs" subdirectory, not "intel".
--- sound/soc/intel/avs/core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
sound/soc/intel/avs/core.c +10 -10
@@ -921,13 +921,13 @@ MODULE_AUTHOR("Cezary Rojewski <[email protected]>");MODULE_AUTHOR ("Amadeusz Slawinski <[email protected]>" );MODULE_DESCRIPTION ("Intel cAVS sound driver" );MODULE_LICENSE ("GPL" ); -MODULE_FIRMWARE ("intel/skl/dsp_basefw.bin" ); -MODULE_FIRMWARE ("intel/apl/dsp_basefw.bin" ); -MODULE_FIRMWARE ("intel/cnl/dsp_basefw.bin" ); -MODULE_FIRMWARE ("intel/icl/dsp_basefw.bin" ); -MODULE_FIRMWARE ("intel/jsl/dsp_basefw.bin" ); -MODULE_FIRMWARE ("intel/lkf/dsp_basefw.bin" ); -MODULE_FIRMWARE ("intel/tgl/dsp_basefw.bin" ); -MODULE_FIRMWARE ("intel/ehl/dsp_basefw.bin" ); -MODULE_FIRMWARE ("intel/adl/dsp_basefw.bin" ); -MODULE_FIRMWARE ("intel/adl_n/dsp_basefw.bin" ); +MODULE_FIRMWARE ("intel/avs/skl/dsp_basefw.bin" ); +MODULE_FIRMWARE ("intel/avs/apl/dsp_basefw.bin" ); +MODULE_FIRMWARE ("intel/avs/cnl/dsp_basefw.bin" ); +MODULE_FIRMWARE ("intel/avs/icl/dsp_basefw.bin" ); +MODULE_FIRMWARE ("intel/avs/jsl/dsp_basefw.bin" ); +MODULE_FIRMWARE ("intel/avs/lkf/dsp_basefw.bin" ); +MODULE_FIRMWARE ("intel/avs/tgl/dsp_basefw.bin" ); +MODULE_FIRMWARE ("intel/avs/ehl/dsp_basefw.bin" ); +MODULE_FIRMWARE ("intel/avs/adl/dsp_basefw.bin" ); +MODULE_FIRMWARE ("intel/avs/adl_n/dsp_basefw.bin" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 645/780 ASoC: Intel: avs: Verify kcalloc() status when setting constraints
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit 5f342aeee2724d31046172eb5caab8e0e8afd57d ]
All memory operations shall be checked.
--- sound/soc/intel/avs/path.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/intel/avs/path.c +2 -0
@@ -134,6 +134,8 @@ int avs_path_set_constraint(struct avs_dev *adev, struct avs_tplg_path_template rlist =kcalloc (i,sizeof (*rlist),GFP_KERNEL ); clist =kcalloc (i,sizeof (*clist),GFP_KERNEL ); slist =kcalloc (i,sizeof (*slist),GFP_KERNEL ); +if (!rlist || !clist || !slist) +return -ENOMEM ; i =0 ;list_for_each_entry (path_template, &template->path_list, node) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 646/780 ASoC: Intel: avs: Verify content returned by parse_int_array()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit 93e246b6769bdacb09cfff4ea0f00fe5ab4f0d7a ]
The first element of the returned array stores its length. If it is 0, any manipulation beyond the element at index 0 ends with null-ptr-deref.
--- sound/soc/intel/avs/debugfs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/intel/avs/debugfs.c +5 -1
@@ -373,7 +373,10 @@ static ssize_t trace_control_write(struct file *file, const char __user *from, sreturn ret; num_elems = *array; - resource_mask = array[1 ]; +if (!num_elems) { + ret = -EINVAL ; + goto free_array; + }/* * Disable if just resource mask is provided - no log priority flags.
@@ -381,6 +384,7 @@ static ssize_t trace_control_write(struct file *file, const char __user *from, s* Enable input format: mask, prio1, .., prioN * Where 'N' equals number of bits set in the 'mask'. */ + resource_mask = array[1 ];if (num_elems ==1 ) { ret =disable_logs (adev, resource_mask); }else {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 647/780 ASoC: ti: omap-hdmi: Re-add dai_link->platform to fix card init
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuuki NAGAO <[email protected]>
[ Upstream commit bae071aa7bcd034054cec91666c80f812adeccd9 ]
The removed dai_link->platform component cause a fail which is exposed at runtime. (ex: when a sound tool is used) This patch re-adds the dai_link->platform component to have a full card registered.
Before this patch:
$ aplay -l **** List of PLAYBACK Hardware Devices **** card 1: HDMI [HDMI], device 0: HDMI snd-soc-dummy-dai-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0
$ speaker-test -D plughw:1,0 -t sine speaker-test 1.2.8 Playback device is plughw:1,0 Stream parameters are 48000Hz, S16_LE, 1 channels Sine wave rate is 440.0000Hz Playback open error: -22,Invalid argument
After this patch which restores the platform component:
$ aplay -l **** List of PLAYBACK Hardware Devices **** card 0: HDMI [HDMI], device 0: HDMI snd-soc-dummy-dai-0 [HDMI snd-soc-dummy-dai-0] Subdevices: 0/1 Subdevice #0: subdevice #0
-> Resolve the playback error.
--- sound/soc/ti/omap-hdmi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/ti/omap-hdmi.c +5 -2
@@ -361,17 +361,20 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)if (!card->dai_link)return -ENOMEM ; - compnent =devm_kzalloc (dev,sizeof (*compnent),GFP_KERNEL ); + compnent =devm_kzalloc (dev,2 *sizeof (*compnent),GFP_KERNEL );if (!compnent)return -ENOMEM ; - card->dai_link->cpus = compnent; + card->dai_link->cpus = &compnent[0 ]; card->dai_link->num_cpus =1 ; card->dai_link->codecs = &snd_soc_dummy_dlc; card->dai_link->num_codecs =1 ; + card->dai_link->platforms = &compnent[1 ]; + card->dai_link->num_platforms =1 ; card->dai_link->name = card->name; card->dai_link->stream_name = card->name; card->dai_link->cpus->dai_name =dev_name (ad->dssdev); + card->dai_link->platforms->name =dev_name (ad->dssdev); card->num_links =1 ; card->dev = dev;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 648/780 iov_iter: use iov_offset for length calculation in iov_iter_aligned_bvec
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nitesh Shetty <[email protected]>
[ Upstream commit 334d7c4fb60cf21e0abac134d92fe49e9b04377e ]
If iov_offset is non-zero, then we need to consider iov_offset in length calculation, otherwise we might pass smaller IOs such as 512 bytes, in below scenario [1].
This issue is reproducible using lib-uring test/fixed-seg.c application with fixed buffer on a 512 LBA formatted device.
[1]
At present we pass the alignment check, for 512 LBA formatted devices, len_mask = 511 when IO is smaller, i->count = 512 has an offset, i->io_offset = 3584 with bvec values, bvec->bv_offset = 256, bvec->bv_len = 3840. In short, the first 256 bytes are in the current page, next 256 bytes are in the another page. Ideally we expect to fail the IO.
I can think of 2 userspace scenarios where we experience this.
a: From userspace, we observe a different behaviour when device LBA
size is 512 vs 4096 bytes. For 4096 LBA formatted device, I see the same liburing test [2] failing, whereas 512 the test passes without this. This is reproducible everytime.
[2] https://github.com/axboe/liburing/
b: Although I was not able to reproduce the below condition, but I
suspect below case should be possible from user space for devices with 512 LBA formatted device. Lets say from userspace while allocating a virtually single chunk of memory, if we get 2 physical chunk of memory, and IO happens to be at the boundary of first physical chunk with length crossing first chunk, then we allow IOs to proceed and hence we might map wrong physical address length and proceed with IO rather than failing.
: --- a/test/fixed-seg.c
: +++ b/test/fixed-seg.c
: @@ -64,7 +64,7 @@ static int test(struct io_uring *ring, int fd, int : vec_off)
: return T_EXIT_FAIL;
: }
:
: - ret = read_it(ring, fd, 4096, vec_off);
: + ret = read_it(ring, fd, 4096, 7*512 + 256);
: if (ret) {
: fprintf(stderr, "4096 0 failed\n");
: return T_EXIT_FAIL;
Effectively this is a write crossing the page boundary.
--- lib/iov_iter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/iov_iter.c +1 -1
@@ -820,7 +820,7 @@ static bool iov_iter_aligned_bvec(const struct iov_iter *i, unsigned addr_mask,size_t size = i->count; do { - size_t len = bvec->bv_len; + size_t len = bvec->bv_len - skip; if (len > size) len = size;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 649/780 fs/fhandle.c: fix a race in call of has_locked_children()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 1f282cdc1d219c4a557f7009e81bc792820d9d9a ]
may_decode_fh() is calling has_locked_children() while holding no locks. That's an oopsable race...
The rest of the callers are safe since they are holding namespace_sem and are guaranteed a positive refcount on the mount in question.
Rename the current has_locked_children() to __has_locked_children(), make it static and switch the fs/namespace.c users to it.
Make has_locked_children() a wrapper for __has_locked_children(), calling the latter under read_seqlock_excl(&mount_lock).
--- fs/namespace.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
fs/namespace.c +14 -4
@@ -2424,7 +2424,7 @@ void drop_collected_mounts(struct vfsmount *mnt)namespace_unlock (); } -bool has_locked_children (struct mount *mnt,struct dentry *dentry) +static bool __has_locked_children (struct mount *mnt,struct dentry *dentry) {struct mount *child;
@@ -2438,6 +2438,16 @@ bool has_locked_children(struct mount *mnt, struct dentry *dentry)return false; } +bool has_locked_children (struct mount *mnt,struct dentry *dentry) +{ +bool res; + +read_seqlock_excl (&mount_lock); + res =__has_locked_children (mnt, dentry); +read_sequnlock_excl (&mount_lock); +return res; +} +/* * Check that there aren't references to earlier/same mount namespaces in the * specified subtree. Such references can act as pins for mount namespaces
@@ -2498,7 +2508,7 @@ struct vfsmount *clone_private_mount(const struct path *path)return ERR_PTR (-EINVAL ); } -if (has_locked_children (old_mnt, path->dentry)) +if (__has_locked_children (old_mnt, path->dentry))return ERR_PTR (-EINVAL ); new_mnt =clone_mnt (old_mnt, path->dentry,CL_PRIVATE );
@@ -3035,7 +3045,7 @@ static struct mount *__do_loopback(struct path *old_path, int recurse)if (!may_copy_tree (old_path))return mnt; -if (!recurse &&has_locked_children (old, old_path->dentry)) +if (!recurse &&__has_locked_children (old, old_path->dentry))return mnt;if (recurse)
@@ -3428,7 +3438,7 @@ static int do_set_group(struct path *from_path, struct path *to_path) goto out;/* From mount should not have locked children in place of To's root */ -if (has_locked_children (from, to->mnt.mnt_root)) +if (__has_locked_children (from, to->mnt.mnt_root)) goto out;/* Setting sharing groups is only allowed on private mounts */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 650/780 path_overmount(): avoid false negatives
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 5f31c549382bcddbbd754c72c5433b19420d485d ]
Holding namespace_sem is enough to make sure that result remains valid. It is *not* enough to avoid false negatives from __lookup_mnt(). Mounts can be unhashed outside of namespace_sem (stuck children getting detached on final mntput() of lazy-umounted mount) and having an unrelated mount removed from the hash chain while we traverse it may end up with false negative from __lookup_mnt(). We need to sample and recheck the seqlock component of mount_lock...
Bug predates the introduction of path_overmount() - it had come from the code in finish_automount() that got abstracted into that helper.
--- fs/namespace.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
fs/namespace.c +13 -6
@@ -3477,18 +3477,25 @@ static int do_set_group(struct path *from_path, struct path *to_path)* Check if path is overmounted, i.e., if there's a mount on top of * @path->mnt with @path->dentry as mountpoint. * -* Context: This function expects namespace_lock() to be held. +* Context: namespace_sem must be held at least shared. +* MUST NOT be called under lock_mount_hash() (there one should just +* call __lookup_mnt() and check if it returns NULL). * Return: If path is overmounted true is returned, false if not. */ static inline bool path_overmounted (const struct path *path) { +unsigned seq =read_seqbegin (&mount_lock); +bool no_child; +rcu_read_lock (); -if (unlikely (__lookup_mnt (path->mnt, path->dentry))) { -rcu_read_unlock (); -return true; - } + no_child = !__lookup_mnt (path->mnt, path->dentry);rcu_read_unlock (); -return false; +if (need_seqretry (&mount_lock, seq)) { +read_seqlock_excl (&mount_lock); + no_child = !__lookup_mnt (path->mnt, path->dentry); +read_sequnlock_excl (&mount_lock); + } +return unlikely (!no_child); }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 651/780 fs: convert mount flags to enum
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Brennan <[email protected]>
[ Upstream commit 101f2bbab541116ab861b9c3ac0ece07a7eaa756 ]
In prior kernel versions (5.8-6.8), commit 9f6c61f96f2d9 ("proc/mounts:
add cursor") introduced MNT_CURSOR, a flag used by readers from /proc/mounts to keep their place while reading the file. Later, commit 2eea9ce4310d8 ("mounts: keep list of mounts in an rbtree") removed this flag and its value has since been repurposed.
For debuggers iterating over the list of mounts, cursors should be skipped as they are irrelevant. Detecting whether an element is a cursor can be difficult. Since the MNT_CURSOR flag is a preprocessor constant, it's not present in debuginfo, and since its value is repurposed, we cannot hard-code it. For this specific issue, cursors are possible to detect in other ways, but ideally, we would be able to read the mount flag definitions out of the debuginfo. For that reason, convert the mount flags to an enum.
Stable-dep-of: bab77c0d191e ("finish_automount(): don't leak MNT_LOCKED from parent to child")
--- include/linux/mount.h | 87 ++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 42 deletions(-)
include/linux/mount.h +45 -42
@@ -22,48 +22,51 @@ struct fs_context;struct file ;struct path ; -#define MNT_NOSUID 0x01 -#define MNT_NODEV 0x02 -#define MNT_NOEXEC 0x04 -#define MNT_NOATIME 0x08 -#define MNT_NODIRATIME 0x10 -#define MNT_RELATIME 0x20 -#define MNT_READONLY 0x40/* does the user want this to be r/o? */ -#define MNT_NOSYMFOLLOW 0x80 - -#define MNT_SHRINKABLE 0x100 -#define MNT_WRITE_HOLD 0x200 - -#define MNT_SHARED 0x1000/* if the vfsmount is a shared mount */ -#define MNT_UNBINDABLE 0x2000/* if the vfsmount is a unbindable mount */ -/* -* MNT_SHARED_MASK is the set of flags that should be cleared when a -* mount becomes shared. Currently, this is only the flag that says a -* mount cannot be bind mounted, since this is how we create a mount -* that shares events with another mount. If you add a new MNT_* -* flag, consider how it interacts with shared mounts. -*/ -#define MNT_SHARED_MASK (MNT_UNBINDABLE) -#define MNT_USER_SETTABLE_MASK (MNT_NOSUID | MNT_NODEV | MNT_NOEXEC \ - | MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME \ - | MNT_READONLY | MNT_NOSYMFOLLOW) -#define MNT_ATIME_MASK (MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME ) - -#define MNT_INTERNAL_FLAGS (MNT_SHARED | MNT_WRITE_HOLD | MNT_INTERNAL | \ - MNT_DOOMED | MNT_SYNC_UMOUNT | MNT_MARKED) - -#define MNT_INTERNAL 0x4000 - -#define MNT_LOCK_ATIME 0x040000 -#define MNT_LOCK_NOEXEC 0x080000 -#define MNT_LOCK_NOSUID 0x100000 -#define MNT_LOCK_NODEV 0x200000 -#define MNT_LOCK_READONLY 0x400000 -#define MNT_LOCKED 0x800000 -#define MNT_DOOMED 0x1000000 -#define MNT_SYNC_UMOUNT 0x2000000 -#define MNT_MARKED 0x4000000 -#define MNT_UMOUNT 0x8000000 +enum mount_flags { +MNT_NOSUID =0x01 , +MNT_NODEV =0x02 , +MNT_NOEXEC =0x04 , +MNT_NOATIME =0x08 , +MNT_NODIRATIME =0x10 , +MNT_RELATIME =0x20 , +MNT_READONLY =0x40 ,/* does the user want this to be r/o? */ +MNT_NOSYMFOLLOW =0x80 , + +MNT_SHRINKABLE =0x100 , +MNT_WRITE_HOLD =0x200 , + +MNT_SHARED =0x1000 ,/* if the vfsmount is a shared mount */ +MNT_UNBINDABLE =0x2000 ,/* if the vfsmount is a unbindable mount */ + +MNT_INTERNAL =0x4000 , + +MNT_LOCK_ATIME =0x040000 , +MNT_LOCK_NOEXEC =0x080000 , +MNT_LOCK_NOSUID =0x100000 , +MNT_LOCK_NODEV =0x200000 , +MNT_LOCK_READONLY =0x400000 , +MNT_LOCKED =0x800000 , +MNT_DOOMED =0x1000000 , +MNT_SYNC_UMOUNT =0x2000000 , +MNT_MARKED =0x4000000 , +MNT_UMOUNT =0x8000000 , + +/* +* MNT_SHARED_MASK is the set of flags that should be cleared when a +* mount becomes shared. Currently, this is only the flag that says a +* mount cannot be bind mounted, since this is how we create a mount +* that shares events with another mount. If you add a new MNT_* +* flag, consider how it interacts with shared mounts. +*/ +MNT_SHARED_MASK =MNT_UNBINDABLE , +MNT_USER_SETTABLE_MASK =MNT_NOSUID |MNT_NODEV |MNT_NOEXEC + |MNT_NOATIME |MNT_NODIRATIME |MNT_RELATIME + |MNT_READONLY |MNT_NOSYMFOLLOW , +MNT_ATIME_MASK =MNT_NOATIME |MNT_NODIRATIME |MNT_RELATIME , + +MNT_INTERNAL_FLAGS =MNT_SHARED |MNT_WRITE_HOLD |MNT_INTERNAL | +MNT_DOOMED |MNT_SYNC_UMOUNT |MNT_MARKED , +};struct vfsmount {struct dentry *mnt_root;/* root of the mounted tree */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 652/780 finish_automount(): dont leak MNT_LOCKED from parent to child
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit bab77c0d191e241d2d59a845c7ed68bfa6e1b257 ]
Intention for MNT_LOCKED had always been to protect the internal mountpoints within a subtree that got copied across the userns boundary, not the mountpoint that tree got attached to - after all, it _was_ exposed before the copying.
For roots of secondary copies that is enforced in attach_recursive_mnt() - MNT_LOCKED is explicitly stripped for those. For the root of primary copy we are almost always guaranteed that MNT_LOCKED won't be there, so attach_recursive_mnt() doesn't bother. Unfortunately, one call chain got overlooked - triggering e.g. NFS referral will have the submount inherit the public flags from parent; that's fine for such things as read-only, nosuid, etc., but not for MNT_LOCKED.
This is particularly pointless since the mount attached by finish_automount() is usually expirable, which makes any protection granted by MNT_LOCKED null and void; just wait for a while and that mount will go away on its own.
Include MNT_LOCKED into the set of flags to be ignored by do_add_mount() - it really is an internal flag.
--- include/linux/mount.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/mount.h +2 -1
@@ -65,7 +65,8 @@ enum mount_flags {MNT_ATIME_MASK =MNT_NOATIME |MNT_NODIRATIME |MNT_RELATIME ,MNT_INTERNAL_FLAGS =MNT_SHARED |MNT_WRITE_HOLD |MNT_INTERNAL | - MNT_DOOMED | MNT_SYNC_UMOUNT | MNT_MARKED, +MNT_DOOMED |MNT_SYNC_UMOUNT |MNT_MARKED | + MNT_LOCKED, }; struct vfsmount {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 653/780 fix propagation graph breakage by MOVE_MOUNT_SET_GROUP move_mount(2)
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit d8cc0362f918d020ca1340d7694f07062dc30f36 ]
9ffb14ef61ba "move_mount: allow to add a mount into an existing group" breaks assertions on ->mnt_share/->mnt_slave. For once, the data structures in question are actually documented.
Documentation/filesystem/sharedsubtree.rst:
All vfsmounts in a peer group have the same ->mnt_master. If it is non-NULL, they form a contiguous (ordered) segment of slave list.
do_set_group() puts a mount into the same place in propagation graph as the old one. As the result, if old mount gets events from somewhere and is not a pure event sink, new one needs to be placed next to the old one in the slave list the old one's on. If it is a pure event sink, we only need to make sure the new one doesn't end up in the middle of some peer group.
"move_mount: allow to add a mount into an existing group" ends up putting the new one in the beginning of list; that's definitely not going to be in the middle of anything, so that's fine for case when old is not marked shared. In case when old one _is_ marked shared (i.e. is not a pure event sink), that breaks the assumptions of propagation graph iterators.
Put the new mount next to the old one on the list - that does the right thing in "old is marked shared" case and is just as correct as the current behaviour if old is not marked shared (kudos to Pavel for pointing that out - my original suggested fix changed behaviour in the "nor marked" case, which complicated things for no good reason).
--- fs/namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/namespace.c +1 -1
@@ -3452,7 +3452,7 @@ static int do_set_group(struct path *from_path, struct path *to_path)if (IS_MNT_SLAVE (from)) {struct mount *m = from->mnt_master; -list_add (&to->mnt_slave, &m->mnt_slave_list); +list_add (&to->mnt_slave, &from->mnt_slave); to->mnt_master = m; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 654/780 fs: allow clone_private_mount() for a path on real rootfs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: KONDO KAZUMA(近藤 和真) <[email protected]>
[ Upstream commit 4954346d80fb047cb78776d9f2ebd6a050f80c5f ]
Mounting overlayfs with a directory on real rootfs (initramfs) as upperdir has failed with following message since commit db04662e2f4f ("fs: allow detached mounts in clone_private_mount()").
[ 4.080134] overlayfs: failed to clone upperpath
Overlayfs mount uses clone_private_mount() to create internal mount for the underlying layers.
The commit made clone_private_mount() reject real rootfs because it does not have a parent mount and is in the initial mount namespace, that is not an anonymous mount namespace.
This issue can be fixed by modifying the permission check of clone_private_mount() following [1].
--- fs/namespace.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
fs/namespace.c +11 -10
@@ -2492,18 +2492,19 @@ struct vfsmount *clone_private_mount(const struct path *path)if (IS_MNT_UNBINDABLE (old_mnt))return ERR_PTR (-EINVAL ); -if (mnt_has_parent (old_mnt)) { -if (!check_mnt (old_mnt)) -return ERR_PTR (-EINVAL ); - }else { -if (!is_mounted (&old_mnt->mnt)) -return ERR_PTR (-EINVAL ); - -/* Make sure this isn't something purely kernel internal. */ -if (!is_anon_ns (old_mnt->mnt_ns)) +/* +* Make sure the source mount is acceptable. +* Anything mounted in our mount namespace is allowed. +* Otherwise, it must be the root of an anonymous mount +* namespace, and we need to make sure no namespace +* loops get created. +*/ +if (!check_mnt (old_mnt)) { +if (!is_mounted (&old_mnt->mnt) || + !is_anon_ns (old_mnt->mnt_ns) || +mnt_has_parent (old_mnt))return ERR_PTR (-EINVAL ); -/* Make sure we don't create mount namespace loops. */ if (!check_for_nsfs_mounts (old_mnt))return ERR_PTR (-EINVAL ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 655/780 clone_private_mnt(): make sure that caller has CAP_SYS_ADMIN in the right userns
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit c28f922c9dcee0e4876a2c095939d77fe7e15116 ]
What we want is to verify there is that clone won't expose something hidden by a mount we wouldn't be able to undo. "Wouldn't be able to undo" may be a result of MNT_LOCKED on a child, but it may also come from lacking admin rights in the userns of the namespace mount belongs to.
clone_private_mnt() checks the former, but not the latter.
There's a number of rather confusing CAP_SYS_ADMIN checks in various userns during the mount, especially with the new mount API; they serve different purposes and in case of clone_private_mnt() they usually, but not always end up covering the missing check mentioned above.
--- fs/namespace.c | 3 +++ 1 file changed, 3 insertions(+)
fs/namespace.c +3 -0
@@ -2509,6 +2509,9 @@ struct vfsmount *clone_private_mount(const struct path *path)return ERR_PTR (-EINVAL ); } +if (!ns_capable (old_mnt->mnt_ns->user_ns,CAP_SYS_ADMIN )) +return ERR_PTR (-EPERM ); +if (__has_locked_children (old_mnt, path->dentry))return ERR_PTR (-EINVAL );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 656/780 do_change_type(): refuse to operate on unmounted/not ours mounts
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 12f147ddd6de7382dad54812e65f3f08d05809fc ]
Ensure that propagation settings can only be changed for mounts located in the caller's mount namespace. This change aligns permission checking with the rest of mount(2).
--- fs/namespace.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/namespace.c +4 -0
@@ -2958,6 +2958,10 @@ static int do_change_type(struct path *path, int ms_flags)return -EINVAL ;namespace_lock (); +if (!check_mnt (mnt)) { + err = -EINVAL ; + goto out_unlock; + }if (type ==MS_SHARED ) { err =invent_group_ids (mnt, recurse);if (err)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 657/780 genksyms: Fix enum consts from a reference affecting new values
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Pavlu <[email protected]>
[ Upstream commit c50a04f8f45c7f13972f9097622d1d929033ea8c ]
Enumeration constants read from a symbol reference file can incorrectly affect new enumeration constants parsed from an actual input file.
Example:
$ cat test.c
enum { E_A, E_B, E_MAX };
struct bar { int mem[E_MAX]; };
int foo(struct bar *a) {}
__GENKSYMS_EXPORT_SYMBOL(foo);$ cat test.c | ./scripts/genksyms/genksyms -T test.0.symtypes #SYMVER foo 0x070d854d
$ cat test.0.symtypes
E#E_MAX 2
s#bar struct bar { int mem [ E#E_MAX ] ; }
foo int foo ( s#bar * )$ cat test.c | ./scripts/genksyms/genksyms -T test.1.symtypes -r test.0.symtypes <stdin>:4: warning: foo: modversion changed because of changes in enum constant E_MAX #SYMVER foo 0x9c9dfd81
$ cat test.1.symtypes
E#E_MAX ( 2 ) + 3
s#bar struct bar { int mem [ E#E_MAX ] ; }
foo int foo ( s#bar * )The __add_symbol() function includes logic to handle the incrementation of enumeration values, but this code is also invoked when reading a reference file. As a result, the variables last_enum_expr and enum_counter might be incorrectly set after reading the reference file, which later affects parsing of the actual input.
Fix the problem by splitting the logic for the incrementation of enumeration values into a separate function process_enum() and call it from __add_symbol() only when processing non-reference data.
--- scripts/genksyms/genksyms.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
scripts/genksyms/genksyms.c +20 -7
@@ -181,13 +181,9 @@ static int is_unknown_symbol(struct symbol *sym) strcmp(defn->string, "{") == 0); } -static struct symbol *__add_symbol (const char *name,enum symbol_type type, -struct string_list *defn,int is_extern, -int is_reference) +static struct string_list *process_enum (const char *name,enum symbol_type type, +struct string_list *defn) { -unsigned long h; -struct symbol *sym; -enum symbol_status status =STATUS_UNCHANGED ;/* The parser adds symbols in the order their declaration completes, * so it is safe to store the value of the previous enum constant in * a static variable.
@@ -216,7 +212,7 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type, defn =mk_node (buf); } } - }else if (type ==SYM_ENUM ) { + }else {free_list (last_enum_expr,NULL ); last_enum_expr =NULL ; enum_counter =0 ;
@@ -225,6 +221,23 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type,return NULL ; } +return defn; +} + +static struct symbol *__add_symbol (const char *name,enum symbol_type type, +struct string_list *defn,int is_extern, +int is_reference) +{ +unsigned long h; +struct symbol *sym; +enum symbol_status status =STATUS_UNCHANGED ; + +if ((type ==SYM_ENUM_CONST || type ==SYM_ENUM ) && !is_reference) { + defn =process_enum (name, type, defn); +if (defn ==NULL ) +return NULL ; + } + h =crc32 (name);hash_for_each_possible (symbol_hashtable, sym, hnode, h) { if (map_to_ns(sym->type) != map_to_ns(type) ||
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 658/780 tools/power turbostat: Fix AMD package-energy reporting
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gautham R. Shenoy <[email protected]>
[ Upstream commit adb49732c8c63665dd3476e8e6b7c67a0f851245 ]
commit 05a2f07db888 ("tools/power turbostat: read RAPL counters via perf") that adds support to read RAPL counters via perf defines the notion of a RAPL domain_id which is set to physical_core_id on platforms which support per_core_rapl counters (Eg: AMD processors Family 17h onwards) and is set to the physical_package_id on all the other platforms.
However, the physical_core_id is only unique within a package and on platforms with multiple packages more than one core can have the same physical_core_id and thus the same domain_id. (For eg, the first cores of each package have the physical_core_id = 0). This results in all these cores with the same physical_core_id using the same entry in the rapl_counter_info_perdomain[]. Since rapl_perf_init() skips the perf-initialization for cores whose domain_ids have already been visited, cores that have the same physical_core_id always read the perf file corresponding to the physical_core_id of the first package and thus the package-energy is incorrectly reported to be the same value for different packages.
Note: This issue only arises when RAPL counters are read via perf and not when they are read via MSRs since in the latter case the MSRs are read separately on each core.
Fix this issue by associating each CPU with rapl_core_id which is unique across all the packages in the system.
--- tools/power/x86/turbostat/turbostat.c | 41 +++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 5 deletions(-)
tools/power/x86/turbostat/turbostat.c +36 -5
@@ -4766,6 +4766,38 @@ unsigned long pmt_read_counter(struct pmt_counter *ppmt, unsigned int domain_id)return (value & value_mask) >> value_shift; } + +/* Rapl domain enumeration helpers */ +static inline int get_rapl_num_domains (void ) +{ +int num_packages = topo.max_package_id +1 ; +int num_cores_per_package; +int num_cores; + +if (!platform->has_per_core_rapl) +return num_packages; + + num_cores_per_package = topo.max_core_id +1 ; + num_cores = num_cores_per_package * num_packages; + +return num_cores; +} + +static inline int get_rapl_domain_id (int cpu) +{ +int nr_cores_per_package = topo.max_core_id +1 ; +int rapl_core_id; + +if (!platform->has_per_core_rapl) +return cpus[cpu].physical_package_id; + +/* Compute the system-wide unique core-id for @cpu */ + rapl_core_id = cpus[cpu].physical_core_id; + rapl_core_id += cpus[cpu].physical_package_id * nr_cores_per_package; + +return rapl_core_id; +} +/* * get_counters(...) * migrate to cpu
@@ -4821,7 +4853,7 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) goto done;if (platform->has_per_core_rapl) { - status =get_rapl_counters (cpu, c->core_id, c, p); + status =get_rapl_counters (cpu,get_rapl_domain_id (cpu), c, p);if (status !=0 )return status; }
@@ -4887,7 +4919,7 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) p->sys_lpi = cpuidle_cur_sys_lpi_us;if (!platform->has_per_core_rapl) { - status =get_rapl_counters (cpu, p->package_id, c, p); + status =get_rapl_counters (cpu,get_rapl_domain_id (cpu), c, p);if (status !=0 )return status; }
@@ -7863,7 +7895,7 @@ void linux_perf_init(void)void rapl_perf_init (void ) { -const unsigned int num_domains = (platform->has_per_core_rapl ? topo.max_core_id : topo.max_package_id) +1 ; +const unsigned int num_domains =get_rapl_num_domains ();bool *domain_visited =calloc (num_domains,sizeof (bool )); rapl_counter_info_perdomain =calloc (num_domains,sizeof (*rapl_counter_info_perdomain));
@@ -7904,8 +7936,7 @@ void rapl_perf_init(void)continue ;/* Skip already seen and handled RAPL domains */ - next_domain = - platform->has_per_core_rapl ? cpus[cpu].physical_core_id : cpus[cpu].physical_package_id; + next_domain =get_rapl_domain_id (cpu);assert (next_domain < num_domains);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 659/780 pinctrl: samsung: refactor drvdata suspend & resume callbacks
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
[ Upstream commit 3ade961e97f3b05dcdd9a4fabfe179c9e75571e0 ]
This enables the clk_enable() and clk_disable() logic to be removed from each callback, but otherwise should have no functional impact.
It is a prepatory patch so that the callbacks can become SoC specific.
Stable-dep-of: bdbe0a0f7100 ("pinctrl: samsung: add gs101 specific eint suspend/resume callbacks")
--- drivers/pinctrl/samsung/pinctrl-exynos.c | 89 ++++++----------------- drivers/pinctrl/samsung/pinctrl-exynos.h | 4 +- drivers/pinctrl/samsung/pinctrl-samsung.c | 21 ++++-- drivers/pinctrl/samsung/pinctrl-samsung.h | 8 +- 4 files changed, 42 insertions(+), 80 deletions(-)
drivers/pinctrl/samsung/pinctrl-exynos.c +21 -68
@@ -762,19 +762,11 @@ __init int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)return 0 ; } -static void exynos_pinctrl_suspend_bank ( -struct samsung_pinctrl_drv_data *drvdata, -struct samsung_pin_bank *bank) +static void exynos_pinctrl_suspend_bank (struct samsung_pin_bank *bank) {struct exynos_eint_gpio_save *save = bank->soc_priv;const void __iomem *regs = bank->eint_base; -if (clk_enable (bank->drvdata->pclk)) { -dev_err (bank->gpio_chip.parent, -"unable to enable clock for saving state\n" ); -return ; - } - save->eint_con =readl (regs +EXYNOS_GPIO_ECON_OFFSET + bank->eint_offset); save->eint_fltcon0 = readl(regs + EXYNOS_GPIO_EFLTCON_OFFSET
@@ -784,71 +776,46 @@ static void exynos_pinctrl_suspend_bank( save->eint_mask =readl (regs + bank->irq_chip->eint_mask + bank->eint_offset); -clk_disable (bank->drvdata->pclk); -pr_debug ("%s: save con %#010x\n" , bank->name, save->eint_con);pr_debug ("%s: save fltcon0 %#010x\n" , bank->name, save->eint_fltcon0);pr_debug ("%s: save fltcon1 %#010x\n" , bank->name, save->eint_fltcon1);pr_debug ("%s: save mask %#010x\n" , bank->name, save->eint_mask); } -static void exynosauto_pinctrl_suspend_bank (struct samsung_pinctrl_drv_data *drvdata, -struct samsung_pin_bank *bank) +static void exynosauto_pinctrl_suspend_bank (struct samsung_pin_bank *bank) {struct exynos_eint_gpio_save *save = bank->soc_priv;const void __iomem *regs = bank->eint_base; -if (clk_enable (bank->drvdata->pclk)) { -dev_err (bank->gpio_chip.parent, -"unable to enable clock for saving state\n" ); -return ; - } - save->eint_con =readl (regs + bank->pctl_offset + bank->eint_con_offset); save->eint_mask =readl (regs + bank->pctl_offset + bank->eint_mask_offset); -clk_disable (bank->drvdata->pclk); -pr_debug ("%s: save con %#010x\n" , bank->name, save->eint_con);pr_debug ("%s: save mask %#010x\n" , bank->name, save->eint_mask); } -void exynos_pinctrl_suspend (struct samsung_pinctrl_drv_data *drvdata) +void exynos_pinctrl_suspend (struct samsung_pin_bank *bank) { -struct samsung_pin_bank *bank = drvdata->pin_banks;struct exynos_irq_chip *irq_chip =NULL ; -int i; -for (i =0 ; i < drvdata->nr_banks; ++i, ++bank) { -if (bank->eint_type ==EINT_TYPE_GPIO ) { -if (bank->eint_con_offset) -exynosauto_pinctrl_suspend_bank (drvdata, bank); -else -exynos_pinctrl_suspend_bank (drvdata, bank); - } -else if (bank->eint_type ==EINT_TYPE_WKUP ) { -if (!irq_chip) { - irq_chip = bank->irq_chip; - irq_chip->set_eint_wakeup_mask (drvdata, - irq_chip); - } +if (bank->eint_type ==EINT_TYPE_GPIO ) { +if (bank->eint_con_offset) +exynosauto_pinctrl_suspend_bank (bank); +else +exynos_pinctrl_suspend_bank (bank); + }else if (bank->eint_type ==EINT_TYPE_WKUP ) { +if (!irq_chip) { + irq_chip = bank->irq_chip; + irq_chip->set_eint_wakeup_mask (bank->drvdata, irq_chip); } } } -static void exynos_pinctrl_resume_bank ( -struct samsung_pinctrl_drv_data *drvdata, -struct samsung_pin_bank *bank) +static void exynos_pinctrl_resume_bank (struct samsung_pin_bank *bank) {struct exynos_eint_gpio_save *save = bank->soc_priv;void __iomem *regs = bank->eint_base; -if (clk_enable (bank->drvdata->pclk)) { -dev_err (bank->gpio_chip.parent, -"unable to enable clock for restoring state\n" ); -return ; - } -pr_debug ("%s: con %#010x => %#010x\n" , bank->name,readl (regs +EXYNOS_GPIO_ECON_OFFSET + bank->eint_offset), save->eint_con);
@@ -870,22 +837,13 @@ static void exynos_pinctrl_resume_bank( + 2 * bank->eint_offset + 4);writel (save->eint_mask, regs + bank->irq_chip->eint_mask + bank->eint_offset); - -clk_disable (bank->drvdata->pclk); } -static void exynosauto_pinctrl_resume_bank (struct samsung_pinctrl_drv_data *drvdata, -struct samsung_pin_bank *bank) +static void exynosauto_pinctrl_resume_bank (struct samsung_pin_bank *bank) {struct exynos_eint_gpio_save *save = bank->soc_priv;void __iomem *regs = bank->eint_base; -if (clk_enable (bank->drvdata->pclk)) { -dev_err (bank->gpio_chip.parent, -"unable to enable clock for restoring state\n" ); -return ; - } -pr_debug ("%s: con %#010x => %#010x\n" , bank->name,readl (regs + bank->pctl_offset + bank->eint_con_offset), save->eint_con); pr_debug("%s: mask %#010x => %#010x\n", bank->name,
@@ -894,21 +852,16 @@ static void exynosauto_pinctrl_resume_bank(struct samsung_pinctrl_drv_data *drvdwritel (save->eint_con, regs + bank->pctl_offset + bank->eint_con_offset);writel (save->eint_mask, regs + bank->pctl_offset + bank->eint_mask_offset); -clk_disable (bank->drvdata->pclk); } -void exynos_pinctrl_resume (struct samsung_pinctrl_drv_data *drvdata) +void exynos_pinctrl_resume (struct samsung_pin_bank *bank) { -struct samsung_pin_bank *bank = drvdata->pin_banks; -int i; - -for (i =0 ; i < drvdata->nr_banks; ++i, ++bank) -if (bank->eint_type ==EINT_TYPE_GPIO ) { -if (bank->eint_con_offset) -exynosauto_pinctrl_resume_bank (drvdata, bank); -else -exynos_pinctrl_resume_bank (drvdata, bank); - } +if (bank->eint_type ==EINT_TYPE_GPIO ) { +if (bank->eint_con_offset) +exynosauto_pinctrl_resume_bank (bank); +else +exynos_pinctrl_resume_bank (bank); + } }static void exynos_retention_enable (struct samsung_pinctrl_drv_data *drvdata)
drivers/pinctrl/samsung/pinctrl-exynos.h +2 -2
@@ -240,8 +240,8 @@ struct exynos_muxed_weint_data {int exynos_eint_gpio_init (struct samsung_pinctrl_drv_data *d);int exynos_eint_wkup_init (struct samsung_pinctrl_drv_data *d); -void exynos_pinctrl_suspend (struct samsung_pinctrl_drv_data *drvdata); -void exynos_pinctrl_resume (struct samsung_pinctrl_drv_data *drvdata); +void exynos_pinctrl_suspend (struct samsung_pin_bank *bank); +void exynos_pinctrl_resume (struct samsung_pin_bank *bank);struct samsung_retention_ctrl *exynos_retention_init (struct samsung_pinctrl_drv_data *drvdata,const struct samsung_retention_data *data);
drivers/pinctrl/samsung/pinctrl-samsung.c +15 -6
@@ -1333,6 +1333,7 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)static int __maybe_unused samsung_pinctrl_suspend (struct device *dev) {struct samsung_pinctrl_drv_data *drvdata =dev_get_drvdata (dev); +struct samsung_pin_bank *bank;int i; i =clk_enable (drvdata->pclk);
@@ -1343,7 +1344,7 @@ static int __maybe_unused samsung_pinctrl_suspend(struct device *dev) }for (i =0 ; i < drvdata->nr_banks; i++) { -struct samsung_pin_bank *bank = &drvdata->pin_banks[i]; + bank = &drvdata->pin_banks[i];const void __iomem *reg = bank->pctl_base + bank->pctl_offset;const u8 *offs = bank->type->reg_offset;const u8 *widths = bank->type->fld_width;
@@ -1371,10 +1372,14 @@ static int __maybe_unused samsung_pinctrl_suspend(struct device *dev) } } +for (i =0 ; i < drvdata->nr_banks; i++) { + bank = &drvdata->pin_banks[i]; +if (drvdata->suspend) + drvdata->suspend (bank); + } +clk_disable (drvdata->pclk); -if (drvdata->suspend) - drvdata->suspend (drvdata);if (drvdata->retention_ctrl && drvdata->retention_ctrl->enable) drvdata->retention_ctrl->enable (drvdata);
@@ -1392,6 +1397,7 @@ static int __maybe_unused samsung_pinctrl_suspend(struct device *dev)static int __maybe_unused samsung_pinctrl_resume (struct device *dev) {struct samsung_pinctrl_drv_data *drvdata =dev_get_drvdata (dev); +struct samsung_pin_bank *bank;int ret;int i;
@@ -1406,11 +1412,14 @@ static int __maybe_unused samsung_pinctrl_resume(struct device *dev)return ret; } -if (drvdata->resume) - drvdata->resume (drvdata); +for (i =0 ; i < drvdata->nr_banks; i++) { + bank = &drvdata->pin_banks[i]; +if (drvdata->resume) + drvdata->resume (bank); + }for (i =0 ; i < drvdata->nr_banks; i++) { -struct samsung_pin_bank *bank = &drvdata->pin_banks[i]; + bank = &drvdata->pin_banks[i];void __iomem *reg = bank->pctl_base + bank->pctl_offset;const u8 *offs = bank->type->reg_offset;const u8 *widths = bank->type->fld_width;
drivers/pinctrl/samsung/pinctrl-samsung.h +4 -4
@@ -285,8 +285,8 @@ struct samsung_pin_ctrl {int (*eint_gpio_init)(struct samsung_pinctrl_drv_data *);int (*eint_wkup_init)(struct samsung_pinctrl_drv_data *);void (*pud_value_init)(struct samsung_pinctrl_drv_data *drvdata); -void (*suspend)(struct samsung_pinctrl_drv_data *); -void (*resume)(struct samsung_pinctrl_drv_data *); +void (*suspend)(struct samsung_pin_bank *bank); +void (*resume)(struct samsung_pin_bank *bank); };/**
@@ -335,8 +335,8 @@ struct samsung_pinctrl_drv_data {struct samsung_retention_ctrl *retention_ctrl; -void (*suspend)(struct samsung_pinctrl_drv_data *); -void (*resume)(struct samsung_pinctrl_drv_data *); +void (*suspend)(struct samsung_pin_bank *bank); +void (*resume)(struct samsung_pin_bank *bank); };/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 660/780 pinctrl: samsung: add dedicated SoC eint suspend/resume callbacks
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
[ Upstream commit 77ac6b742eba063a5b6600cda67834a7a212281a ]
Refactor the existing platform specific suspend/resume callback so that each SoC variant has it's own callback containing the SoC specific logic.
This allows exynosautov920 to have a dedicated function for using eint_con_offset and eint_mask_offset. Also it is easily extendable for gs101 which will need dedicated logic for handling the varying register offset of fltcon0 via eint_fltcon_offset.
Stable-dep-of: bdbe0a0f7100 ("pinctrl: samsung: add gs101 specific eint suspend/resume callbacks")
--- .../pinctrl/samsung/pinctrl-exynos-arm64.c | 28 ++-- drivers/pinctrl/samsung/pinctrl-exynos.c | 152 ++++++++++-------- drivers/pinctrl/samsung/pinctrl-exynos.h | 2 + 3 files changed, 97 insertions(+), 85 deletions(-)
drivers/pinctrl/samsung/pinctrl-exynos-arm64.c +14 -14
@@ -1419,8 +1419,8 @@ static const struct samsung_pin_ctrl exynosautov920_pin_ctrl[] = { .pin_banks = exynosautov920_pin_banks0, .nr_banks = ARRAY_SIZE(exynosautov920_pin_banks0), .eint_wkup_init = exynos_eint_wkup_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = exynosautov920_pinctrl_suspend, + .resume = exynosautov920_pinctrl_resume, .retention_data = &exynosautov920_retention_data, }, {/* pin-controller instance 1 AUD data */
@@ -1431,43 +1431,43 @@ static const struct samsung_pin_ctrl exynosautov920_pin_ctrl[] = { .pin_banks = exynosautov920_pin_banks2, .nr_banks = ARRAY_SIZE(exynosautov920_pin_banks2), .eint_gpio_init = exynos_eint_gpio_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = exynosautov920_pinctrl_suspend, + .resume = exynosautov920_pinctrl_resume, }, { /* pin-controller instance 3 HSI1 data */ .pin_banks = exynosautov920_pin_banks3, .nr_banks = ARRAY_SIZE(exynosautov920_pin_banks3), .eint_gpio_init = exynos_eint_gpio_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = exynosautov920_pinctrl_suspend, + .resume = exynosautov920_pinctrl_resume, }, { /* pin-controller instance 4 HSI2 data */ .pin_banks = exynosautov920_pin_banks4, .nr_banks = ARRAY_SIZE(exynosautov920_pin_banks4), .eint_gpio_init = exynos_eint_gpio_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = exynosautov920_pinctrl_suspend, + .resume = exynosautov920_pinctrl_resume, }, { /* pin-controller instance 5 HSI2UFS data */ .pin_banks = exynosautov920_pin_banks5, .nr_banks = ARRAY_SIZE(exynosautov920_pin_banks5), .eint_gpio_init = exynos_eint_gpio_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = exynosautov920_pinctrl_suspend, + .resume = exynosautov920_pinctrl_resume, }, { /* pin-controller instance 6 PERIC0 data */ .pin_banks = exynosautov920_pin_banks6, .nr_banks = ARRAY_SIZE(exynosautov920_pin_banks6), .eint_gpio_init = exynos_eint_gpio_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = exynosautov920_pinctrl_suspend, + .resume = exynosautov920_pinctrl_resume, }, { /* pin-controller instance 7 PERIC1 data */ .pin_banks = exynosautov920_pin_banks7, .nr_banks = ARRAY_SIZE(exynosautov920_pin_banks7), .eint_gpio_init = exynos_eint_gpio_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = exynosautov920_pinctrl_suspend, + .resume = exynosautov920_pinctrl_resume, }, };
drivers/pinctrl/samsung/pinctrl-exynos.c +81 -71
186 lines not on this page · raw message
drivers/pinctrl/samsung/pinctrl-exynos.h +2 -0
@@ -240,6 +240,8 @@ struct exynos_muxed_weint_data {int exynos_eint_gpio_init (struct samsung_pinctrl_drv_data *d);int exynos_eint_wkup_init (struct samsung_pinctrl_drv_data *d); +void exynosautov920_pinctrl_resume (struct samsung_pin_bank *bank); +void exynosautov920_pinctrl_suspend (struct samsung_pin_bank *bank);void exynos_pinctrl_suspend (struct samsung_pin_bank *bank);void exynos_pinctrl_resume (struct samsung_pin_bank *bank); struct samsung_retention_ctrl *
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 661/780 pinctrl: samsung: add gs101 specific eint suspend/resume callbacks
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
[ Upstream commit bdbe0a0f71003b997d6a2dbe4bc7b5b0438207c7 ]
gs101 differs to other SoCs in that fltcon1 register doesn't always exist. Additionally the offset of fltcon0 is not fixed and needs to use the newly added eint_fltcon_offset variable.
--- .../pinctrl/samsung/pinctrl-exynos-arm64.c | 24 +++---- drivers/pinctrl/samsung/pinctrl-exynos.c | 71 +++++++++++++++++++ drivers/pinctrl/samsung/pinctrl-exynos.h | 2 + 3 files changed, 85 insertions(+), 12 deletions(-)
drivers/pinctrl/samsung/pinctrl-exynos-arm64.c +12 -12
@@ -1762,15 +1762,15 @@ static const struct samsung_pin_ctrl gs101_pin_ctrl[] __initconst = { .pin_banks = gs101_pin_alive, .nr_banks = ARRAY_SIZE(gs101_pin_alive), .eint_wkup_init = exynos_eint_wkup_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = gs101_pinctrl_suspend, + .resume = gs101_pinctrl_resume, }, {/* pin banks of gs101 pin-controller (FAR_ALIVE) */ .pin_banks = gs101_pin_far_alive, .nr_banks = ARRAY_SIZE(gs101_pin_far_alive), .eint_wkup_init = exynos_eint_wkup_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = gs101_pinctrl_suspend, + .resume = gs101_pinctrl_resume, }, {/* pin banks of gs101 pin-controller (GSACORE) */ .pin_banks = gs101_pin_gsacore,
@@ -1784,29 +1784,29 @@ static const struct samsung_pin_ctrl gs101_pin_ctrl[] __initconst = { .pin_banks = gs101_pin_peric0, .nr_banks = ARRAY_SIZE(gs101_pin_peric0), .eint_gpio_init = exynos_eint_gpio_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = gs101_pinctrl_suspend, + .resume = gs101_pinctrl_resume, }, { /* pin banks of gs101 pin-controller (PERIC1) */ .pin_banks = gs101_pin_peric1, .nr_banks = ARRAY_SIZE(gs101_pin_peric1), .eint_gpio_init = exynos_eint_gpio_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = gs101_pinctrl_suspend, + .resume = gs101_pinctrl_resume, }, { /* pin banks of gs101 pin-controller (HSI1) */ .pin_banks = gs101_pin_hsi1, .nr_banks = ARRAY_SIZE(gs101_pin_hsi1), .eint_gpio_init = exynos_eint_gpio_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = gs101_pinctrl_suspend, + .resume = gs101_pinctrl_resume, }, { /* pin banks of gs101 pin-controller (HSI2) */ .pin_banks = gs101_pin_hsi2, .nr_banks = ARRAY_SIZE(gs101_pin_hsi2), .eint_gpio_init = exynos_eint_gpio_init, - .suspend = exynos_pinctrl_suspend, - .resume = exynos_pinctrl_resume, + .suspend = gs101_pinctrl_suspend, + .resume = gs101_pinctrl_resume, }, };
drivers/pinctrl/samsung/pinctrl-exynos.c +71 -0
83 lines not on this page · raw message
drivers/pinctrl/samsung/pinctrl-exynos.h +2 -0
@@ -244,6 +244,8 @@ void exynosautov920_pinctrl_resume(struct samsung_pin_bank *bank);void exynosautov920_pinctrl_suspend (struct samsung_pin_bank *bank);void exynos_pinctrl_suspend (struct samsung_pin_bank *bank);void exynos_pinctrl_resume (struct samsung_pin_bank *bank); +void gs101_pinctrl_suspend (struct samsung_pin_bank *bank); +void gs101_pinctrl_resume (struct samsung_pin_bank *bank);struct samsung_retention_ctrl *exynos_retention_init (struct samsung_pinctrl_drv_data *drvdata,const struct samsung_retention_data *data);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 662/780 scsi: core: ufs: Fix a hang in the error handler
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sanjeev Yadav <[email protected]>
[ Upstream commit 8a3514d348de87a9d5e2ac00fbac4faae0b97996 ]
ufshcd_err_handling_prepare() calls ufshcd_rpm_get_sync(). The latter function can only succeed if UFSHCD_EH_IN_PROGRESS is not set because resuming involves submitting a SCSI command and ufshcd_queuecommand() returns SCSI_MLQUEUE_HOST_BUSY if UFSHCD_EH_IN_PROGRESS is set. Fix this hang by setting UFSHCD_EH_IN_PROGRESS after ufshcd_rpm_get_sync() has been called instead of before.
Backtrace: __switch_to+0x174/0x338 __schedule+0x600/0x9e4 schedule+0x7c/0xe8 schedule_timeout+0xa4/0x1c8 io_schedule_timeout+0x48/0x70 wait_for_common_io+0xa8/0x160 //waiting on START_STOP wait_for_completion_io_timeout+0x10/0x20 blk_execute_rq+0xe4/0x1e4 scsi_execute_cmd+0x108/0x244 ufshcd_set_dev_pwr_mode+0xe8/0x250 __ufshcd_wl_resume+0x94/0x354 ufshcd_wl_runtime_resume+0x3c/0x174 scsi_runtime_resume+0x64/0xa4 rpm_resume+0x15c/0xa1c __pm_runtime_resume+0x4c/0x90 // Runtime resume ongoing ufshcd_err_handler+0x1a0/0xd08 process_one_work+0x174/0x808 worker_thread+0x15c/0x490 kthread+0xf4/0x1ec ret_from_fork+0x10/0x20
--- drivers/ufs/core/ufshcd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/ufs/core/ufshcd.c +6 -1
@@ -6587,9 +6587,14 @@ static void ufshcd_err_handler(struct work_struct *work)up (&hba->host_sem);return ; } -ufshcd_set_eh_in_progress (hba);spin_unlock_irqrestore (hba->host->host_lock, flags); +ufshcd_err_handling_prepare (hba); + +spin_lock_irqsave (hba->host->host_lock, flags); +ufshcd_set_eh_in_progress (hba); +spin_unlock_irqrestore (hba->host->host_lock, flags); +/* Complete requests that have door-bell cleared by h/w */ ufshcd_complete_requests (hba, false);spin_lock_irqsave (hba->host->host_lock, flags);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 663/780 Bluetooth: hci_core: fix list_for_each_entry_rcu usage
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pauli Virtanen <[email protected]>
[ Upstream commit 308a3a8ce8ea41b26c46169f3263e50f5997c28e ]
Releasing + re-acquiring RCU lock inside list_for_each_entry_rcu() loop body is not correct.
Fix by taking the update-side hdev->lock instead.
--- net/bluetooth/hci_core.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
net/bluetooth/hci_core.c +3 -8
@@ -3406,23 +3406,18 @@ static void hci_link_tx_to(struct hci_dev *hdev, __u8 type)bt_dev_err (hdev,"link tx timeout" ); -rcu_read_lock (); +hci_dev_lock (hdev);/* Kill stalled connections */ -list_for_each_entry_rcu (c, &h->list, list) { +list_for_each_entry (c, &h->list, list) {if (c->type == type && c->sent) {bt_dev_err (hdev,"killing stalled connection %pMR" , &c->dst); -/* hci_disconnect might sleep, so, we have to release -* the RCU read lock before calling it. -*/ -rcu_read_unlock ();hci_disconnect (c,HCI_ERROR_REMOTE_USER_TERM ); -rcu_read_lock (); } } -rcu_read_unlock (); +hci_dev_unlock (hdev); } static struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 664/780 Bluetooth: btintel_pcie: Fix driver not posting maximum rx buffers
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kiran K <[email protected]>
[ Upstream commit daabd276985055250528da97e9ce6d277d7009c2 ]
The driver was posting only 6 rx buffers, despite the maximum rx buffers being defined as 16. Having fewer RX buffers caused firmware exceptions in HID use cases when events arrived in bursts.
Exception seen on android 6.12 kernel.
E Bluetooth: hci0: Received hw exception interrupt
E Bluetooth: hci0: Received gp1 mailbox interrupt
D Bluetooth: hci0: 00000000: ff 3e 87 80 03 01 01 01 03 01 0c 0d 02 1c 10 0e D Bluetooth: hci0: 00000010: 01 00 05 14 66 b0 28 b0 c0 b0 28 b0 ac af 28 b0 D Bluetooth: hci0: 00000020: 14 f1 28 b0 00 00 00 00 fa 04 00 00 00 00 40 10 D Bluetooth: hci0: 00000030: 08 00 00 00 7a 7a 7a 7a 47 00 fb a0 10 00 00 00 D Bluetooth: hci0: 00000000: 10 01 0a
E Bluetooth: hci0: ---- Dump of debug registers —
E Bluetooth: hci0: boot stage: 0xe0fb0047
E Bluetooth: hci0: ipc status: 0x00000004
E Bluetooth: hci0: ipc control: 0x00000000
E Bluetooth: hci0: ipc sleep control: 0x00000000
E Bluetooth: hci0: mbox_1: 0x00badbad
E Bluetooth: hci0: mbox_2: 0x0000101c
E Bluetooth: hci0: mbox_3: 0x00000008
E Bluetooth: hci0: mbox_4: 0x7a7a7a7a
--- drivers/bluetooth/btintel_pcie.c | 3 ++- drivers/bluetooth/btintel_pcie.h | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/bluetooth/btintel_pcie.c +2 -1
@@ -303,8 +303,9 @@ static int btintel_pcie_submit_rx(struct btintel_pcie_data *data)static int btintel_pcie_start_rx (struct btintel_pcie_data *data) {int i, ret; +struct rxq *rxq = &data->rxq; -for (i =0 ; i <BTINTEL_PCIE_RX_MAX_QUEUE ; i++) { +for (i =0 ; i < rxq->count; i++) { ret =btintel_pcie_submit_rx (data);if (ret)return ret;
drivers/bluetooth/btintel_pcie.h +0 -3
@@ -158,9 +158,6 @@ enum {/* Doorbell vector for TFD */ #define BTINTEL_PCIE_TX_DB_VEC 0 -/* Number of pending RX requests for downlink */ -#define BTINTEL_PCIE_RX_MAX_QUEUE 6 -/* Doorbell vector for FRBD */ #define BTINTEL_PCIE_RX_DB_VEC 513
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 665/780 Bluetooth: btintel_pcie: Increase the tx and rx descriptor count
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chandrashekar Devegowda <[email protected]>
[ Upstream commit 2dd711102ce69ae41f65d09c012441227d4aa983 ]
This change addresses latency issues observed in HID use cases where events arrive in bursts. By increasing the Rx descriptor count to 64, the firmware can handle bursty data more effectively, reducing latency and preventing buffer overflows.
--- drivers/bluetooth/btintel_pcie.c | 24 ++++++++++++------------ drivers/bluetooth/btintel_pcie.h | 7 +++++-- 2 files changed, 17 insertions(+), 14 deletions(-)
drivers/bluetooth/btintel_pcie.c +12 -12
@@ -1665,8 +1665,8 @@ static int btintel_pcie_alloc(struct btintel_pcie_data *data)* + size of index * Number of queues(2) * type of index array(4) * + size of context information */ - total = (sizeof (struct tfd ) +sizeof (struct urbd0 ) +sizeof (struct frbd ) - +sizeof (struct urbd1 )) *BTINTEL_DESCS_COUNT ; + total = (sizeof (struct tfd ) +sizeof (struct urbd0 )) *BTINTEL_PCIE_TX_DESCS_COUNT ; + total += (sizeof (struct frbd ) +sizeof (struct urbd1 )) *BTINTEL_PCIE_RX_DESCS_COUNT ;/* Add the sum of size of index array and size of ci struct */ total += (sizeof (u16) *BTINTEL_PCIE_NUM_QUEUES *4 ) +sizeof (struct ctx_info );
@@ -1691,36 +1691,36 @@ static int btintel_pcie_alloc(struct btintel_pcie_data *data) data->dma_v_addr = v_addr;/* Setup descriptor count */ - data->txq.count =BTINTEL_DESCS_COUNT ; - data->rxq.count =BTINTEL_DESCS_COUNT ; + data->txq.count =BTINTEL_PCIE_TX_DESCS_COUNT ; + data->rxq.count =BTINTEL_PCIE_RX_DESCS_COUNT ;/* Setup tfds */ data->txq.tfds_p_addr = p_addr; data->txq.tfds = v_addr; - p_addr += (sizeof (struct tfd ) *BTINTEL_DESCS_COUNT ); - v_addr += (sizeof (struct tfd ) *BTINTEL_DESCS_COUNT ); + p_addr += (sizeof (struct tfd ) *BTINTEL_PCIE_TX_DESCS_COUNT ); + v_addr += (sizeof (struct tfd ) *BTINTEL_PCIE_TX_DESCS_COUNT );/* Setup urbd0 */ data->txq.urbd0s_p_addr = p_addr; data->txq.urbd0s = v_addr; - p_addr += (sizeof (struct urbd0 ) *BTINTEL_DESCS_COUNT ); - v_addr += (sizeof (struct urbd0 ) *BTINTEL_DESCS_COUNT ); + p_addr += (sizeof (struct urbd0 ) *BTINTEL_PCIE_TX_DESCS_COUNT ); + v_addr += (sizeof (struct urbd0 ) *BTINTEL_PCIE_TX_DESCS_COUNT );/* Setup FRBD*/ data->rxq.frbds_p_addr = p_addr; data->rxq.frbds = v_addr; - p_addr += (sizeof (struct frbd ) *BTINTEL_DESCS_COUNT ); - v_addr += (sizeof (struct frbd ) *BTINTEL_DESCS_COUNT ); + p_addr += (sizeof (struct frbd ) *BTINTEL_PCIE_RX_DESCS_COUNT ); + v_addr += (sizeof (struct frbd ) *BTINTEL_PCIE_RX_DESCS_COUNT );/* Setup urbd1 */ data->rxq.urbd1s_p_addr = p_addr; data->rxq.urbd1s = v_addr; - p_addr += (sizeof (struct urbd1 ) *BTINTEL_DESCS_COUNT ); - v_addr += (sizeof (struct urbd1 ) *BTINTEL_DESCS_COUNT ); + p_addr += (sizeof (struct urbd1 ) *BTINTEL_PCIE_RX_DESCS_COUNT ); + v_addr += (sizeof (struct urbd1 ) *BTINTEL_PCIE_RX_DESCS_COUNT );/* Setup data buffers for txq */ err =btintel_pcie_setup_txq_bufs (data, &data->txq);
drivers/bluetooth/btintel_pcie.h +5 -2
@@ -135,8 +135,11 @@ enum btintel_pcie_tlv_type {/* Default interrupt timeout in msec */ #define BTINTEL_DEFAULT_INTR_TIMEOUT_MS 3000 -/* The number of descriptors in TX/RX queues */ -#define BTINTEL_DESCS_COUNT 16 +/* The number of descriptors in TX queues */ +#define BTINTEL_PCIE_TX_DESCS_COUNT 32 + +/* The number of descriptors in RX queues */ +#define BTINTEL_PCIE_RX_DESCS_COUNT 64/* Number of Queue for TX and RX * It indicates the index of the IA(Index Array)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 666/780 Bluetooth: btintel_pcie: Reduce driver buffer posting to prevent race condition
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chandrashekar Devegowda <[email protected]>
[ Upstream commit bf2ffc4d14db29cab781549912d2dc69127f4d3e ]
Modify the driver to post 3 fewer buffers than the maximum rx buffers
(64) allowed for the firmware. This change mitigates a hardware issue causing a race condition in the firmware, improving stability and data handling.
--- drivers/bluetooth/btintel_pcie.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/bluetooth/btintel_pcie.c +5 -1
@@ -305,7 +305,11 @@ static int btintel_pcie_start_rx(struct btintel_pcie_data *data)int i, ret;struct rxq *rxq = &data->rxq; -for (i =0 ; i < rxq->count; i++) { +/* Post (BTINTEL_PCIE_RX_DESCS_COUNT - 3) buffers to overcome the +* hardware issues leading to race condition at the firmware. +*/ + +for (i =0 ; i < rxq->count -3 ; i++) { ret =btintel_pcie_submit_rx (data);if (ret)return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 667/780 Bluetooth: MGMT: Fix UAF on mgmt_remove_adv_monitor_complete
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit e6ed54e86aae9e4f7286ce8d5c73780f91b48d1c ]
This reworks MGMT_OP_REMOVE_ADV_MONITOR to not use mgmt_pending_add to avoid crashes like bellow:
==================================================================
BUG: KASAN: slab-use-after-free in mgmt_remove_adv_monitor_complete+0xe5/0x540 net/bluetooth/mgmt.c:5406 Read of size 8 at addr ffff88801c53f318 by task kworker/u5:5/5341 CPU: 0 UID: 0 PID: 5341 Comm: kworker/u5:5 Not tainted 6.15.0-syzkaller-10402-g4cb6c8af8591 #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 Workqueue: hci0 hci_cmd_sync_work Call Trace: <TASK> dump_stack_lvl+0x189/0x250 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:408 [inline] print_report+0xd2/0x2b0 mm/kasan/report.c:521 kasan_report+0x118/0x150 mm/kasan/report.c:634 mgmt_remove_adv_monitor_complete+0xe5/0x540 net/bluetooth/mgmt.c:5406 hci_cmd_sync_work+0x261/0x3a0 net/bluetooth/hci_sync.c:334 process_one_work kernel/workqueue.c:3238 [inline] process_scheduled_works+0xade/0x17b0 kernel/workqueue.c:3321 worker_thread+0x8a0/0xda0 kernel/workqueue.c:3402 kthread+0x711/0x8a0 kernel/kthread.c:464 ret_from_fork+0x3fc/0x770 arch/x86/kernel/process.c:148 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245 </TASK> Allocated by task 5987: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x3e/0x80 mm/kasan/common.c:68 poison_kmalloc_redzone mm/kasan/common.c:377 [inline] __kasan_kmalloc+0x93/0xb0 mm/kasan/common.c:394 kasan_kmalloc include/linux/kasan.h:260 [inline] __kmalloc_cache_noprof+0x230/0x3d0 mm/slub.c:4358 kmalloc_noprof include/linux/slab.h:905 [inline] kzalloc_noprof include/linux/slab.h:1039 [inline] mgmt_pending_new+0x65/0x240 net/bluetooth/mgmt_util.c:252 mgmt_pending_add+0x34/0x120 net/bluetooth/mgmt_util.c:279 remove_adv_monitor+0x103/0x1b0 net/bluetooth/mgmt.c:5454 hci_mgmt_cmd+0x9c9/0xef0 net/bluetooth/hci_sock.c:1719 hci_sock_sendmsg+0x6ca/0xef0 net/bluetooth/hci_sock.c:1839 sock_sendmsg_nosec net/socket.c:712 [inline] __sock_sendmsg+0x219/0x270 net/socket.c:727 sock_write_iter+0x258/0x330 net/socket.c:1131 new_sync_write fs/read_write.c:593 [inline] vfs_write+0x548/0xa90 fs/read_write.c:686 ksys_write+0x145/0x250 fs/read_write.c:738 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xfa/0x3b0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f Freed by task 5989: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x3e/0x80 mm/kasan/common.c:68 kasan_save_free_info+0x46/0x50 mm/kasan/generic.c:576 poison_slab_object mm/kasan/common.c:247 [inline] __kasan_slab_free+0x62/0x70 mm/kasan/common.c:264 kasan_slab_free include/linux/kasan.h:233 [inline] slab_free_hook mm/slub.c:2380 [inline] slab_free mm/slub.c:4642 [inline] kfree+0x18e/0x440 mm/slub.c:4841 mgmt_pending_foreach+0xc9/0x120 net/bluetooth/mgmt_util.c:242 mgmt_index_removed+0x10d/0x2f0 net/bluetooth/mgmt.c:9366 hci_sock_bind+0xbe9/0x1000 net/bluetooth/hci_sock.c:1314 __sys_bind_socket net/socket.c:1810 [inline] __sys_bind+0x2c3/0x3e0 net/socket.c:1841 __do_sys_bind net/socket.c:1846 [inline] __se_sys_bind net/socket.c:1844 [inline] __x64_sys_bind+0x7a/0x90 net/socket.c:1844 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xfa/0x3b0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f
--- include/net/bluetooth/hci_core.h | 1 - net/bluetooth/hci_core.c | 4 +--- net/bluetooth/mgmt.c | 37 ++++++++++---------------------- 3 files changed, 12 insertions(+), 30 deletions(-)
include/net/bluetooth/hci_core.h +0 -1
@@ -2397,7 +2397,6 @@ void mgmt_advertising_added(struct sock *sk, struct hci_dev *hdev, u8 instance);void mgmt_advertising_removed (struct sock *sk,struct hci_dev *hdev,u8 instance); -void mgmt_adv_monitor_removed (struct hci_dev *hdev,u16 handle);int mgmt_phy_configuration_changed (struct hci_dev *hdev,struct sock *skip);void mgmt_adv_monitor_device_lost (struct hci_dev *hdev,u16 handle,bdaddr_t *bdaddr,u8 addr_type);
net/bluetooth/hci_core.c +1 -3
@@ -1877,10 +1877,8 @@ void hci_free_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor)if (monitor->handle)idr_remove (&hdev->adv_monitors_idr, monitor->handle); -if (monitor->state !=ADV_MONITOR_STATE_NOT_REGISTERED ) { +if (monitor->state !=ADV_MONITOR_STATE_NOT_REGISTERED ) hdev->adv_monitors_cnt--; -mgmt_adv_monitor_removed (hdev, monitor->handle); - }kfree (monitor); }
net/bluetooth/mgmt.c +11 -26
@@ -5108,24 +5108,14 @@ static void mgmt_adv_monitor_added(struct sock *sk, struct hci_dev *hdev,mgmt_event (MGMT_EV_ADV_MONITOR_ADDED , hdev, &ev,sizeof (ev), sk); } -void mgmt_adv_monitor_removed (struct hci_dev *hdev,u16 handle) +static void mgmt_adv_monitor_removed (struct sock *sk,struct hci_dev *hdev, +u16 handle) {struct mgmt_ev_adv_monitor_removed ev; -struct mgmt_pending_cmd *cmd; -struct sock *sk_skip =NULL ; -struct mgmt_cp_remove_adv_monitor *cp; - - cmd =pending_find (MGMT_OP_REMOVE_ADV_MONITOR , hdev); -if (cmd) { - cp = cmd->param; - -if (cp->monitor_handle) - sk_skip = cmd->sk; - } ev.monitor_handle =cpu_to_le16 (handle); -mgmt_event (MGMT_EV_ADV_MONITOR_REMOVED , hdev, &ev,sizeof (ev), sk_skip); +mgmt_event (MGMT_EV_ADV_MONITOR_REMOVED , hdev, &ev,sizeof (ev), sk); } static int read_adv_mon_features(struct sock *sk, struct hci_dev *hdev,
@@ -5227,8 +5217,7 @@ static int __add_adv_patterns_monitor(struct sock *sk, struct hci_dev *hdev,if (pending_find (MGMT_OP_SET_LE , hdev) ||pending_find (MGMT_OP_ADD_ADV_PATTERNS_MONITOR , hdev) || -pending_find (MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI , hdev) || -pending_find (MGMT_OP_REMOVE_ADV_MONITOR , hdev)) { +pending_find (MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI , hdev)) { status =MGMT_STATUS_BUSY ; goto unlock; }
@@ -5398,8 +5387,7 @@ static void mgmt_remove_adv_monitor_complete(struct hci_dev *hdev,struct mgmt_pending_cmd *cmd = data;struct mgmt_cp_remove_adv_monitor *cp; -if (status == -ECANCELED || - cmd !=pending_find (MGMT_OP_REMOVE_ADV_MONITOR , hdev)) +if (status == -ECANCELED )return ;hci_dev_lock (hdev);
@@ -5408,12 +5396,14 @@ static void mgmt_remove_adv_monitor_complete(struct hci_dev *hdev, rp.monitor_handle = cp->monitor_handle; -if (!status) +if (!status) { +mgmt_adv_monitor_removed (cmd->sk, hdev, cp->monitor_handle);hci_update_passive_scan (hdev); + }mgmt_cmd_complete (cmd->sk, cmd->index, cmd->opcode,mgmt_status (status), &rp,sizeof (rp)); -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd);hci_dev_unlock (hdev); bt_dev_dbg(hdev, "remove monitor %d complete, status %d",
@@ -5423,10 +5413,6 @@ static void mgmt_remove_adv_monitor_complete(struct hci_dev *hdev,static int mgmt_remove_adv_monitor_sync (struct hci_dev *hdev,void *data) {struct mgmt_pending_cmd *cmd = data; - -if (cmd !=pending_find (MGMT_OP_REMOVE_ADV_MONITOR , hdev)) -return -ECANCELED ; -struct mgmt_cp_remove_adv_monitor *cp = cmd->param;u16 handle =__le16_to_cpu (cp->monitor_handle);
@@ -5445,14 +5431,13 @@ static int remove_adv_monitor(struct sock *sk, struct hci_dev *hdev,hci_dev_lock (hdev);if (pending_find (MGMT_OP_SET_LE , hdev) || -pending_find (MGMT_OP_REMOVE_ADV_MONITOR , hdev) ||pending_find (MGMT_OP_ADD_ADV_PATTERNS_MONITOR , hdev) ||pending_find (MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI , hdev)) { status =MGMT_STATUS_BUSY ; goto unlock; } - cmd =mgmt_pending_add (sk,MGMT_OP_REMOVE_ADV_MONITOR , hdev, data, len); + cmd =mgmt_pending_new (sk,MGMT_OP_REMOVE_ADV_MONITOR , hdev, data, len);if (!cmd) { status =MGMT_STATUS_NO_RESOURCES ; goto unlock;
@@ -5462,7 +5447,7 @@ static int remove_adv_monitor(struct sock *sk, struct hci_dev *hdev, mgmt_remove_adv_monitor_complete);if (err) { -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd);if (err == -ENOMEM ) status =MGMT_STATUS_NO_RESOURCES ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 668/780 Bluetooth: MGMT: Protect mgmt_pending list with its own lock
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 6fe26f694c824b8a4dbf50c635bee1302e3f099c ]
This uses a mutex to protect from concurrent access of mgmt_pending list which can cause crashes like:
==================================================================
BUG: KASAN: slab-use-after-free in hci_sock_get_channel+0x60/0x68 net/bluetooth/hci_sock.c:91 Read of size 2 at addr ffff0000c48885b2 by task syz.4.334/7318 CPU: 0 UID: 0 PID: 7318 Comm: syz.4.334 Not tainted 6.15.0-rc7-syzkaller-g187899f4124a #0 PREEMPT Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2025 Call trace: show_stack+0x2c/0x3c arch/arm64/kernel/stacktrace.c:466 (C) __dump_stack+0x30/0x40 lib/dump_stack.c:94 dump_stack_lvl+0xd8/0x12c lib/dump_stack.c:120 print_address_description+0xa8/0x254 mm/kasan/report.c:408 print_report+0x68/0x84 mm/kasan/report.c:521 kasan_report+0xb0/0x110 mm/kasan/report.c:634 __asan_report_load2_noabort+0x20/0x2c mm/kasan/report_generic.c:379 hci_sock_get_channel+0x60/0x68 net/bluetooth/hci_sock.c:91 mgmt_pending_find+0x7c/0x140 net/bluetooth/mgmt_util.c:223 pending_find net/bluetooth/mgmt.c:947 [inline] remove_adv_monitor+0x44/0x1a4 net/bluetooth/mgmt.c:5445 hci_mgmt_cmd+0x780/0xc00 net/bluetooth/hci_sock.c:1712 hci_sock_sendmsg+0x544/0xbb0 net/bluetooth/hci_sock.c:1832 sock_sendmsg_nosec net/socket.c:712 [inline] __sock_sendmsg net/socket.c:727 [inline] sock_write_iter+0x25c/0x378 net/socket.c:1131 new_sync_write fs/read_write.c:591 [inline] vfs_write+0x62c/0x97c fs/read_write.c:684 ksys_write+0x120/0x210 fs/read_write.c:736 __do_sys_write fs/read_write.c:747 [inline] __se_sys_write fs/read_write.c:744 [inline] __arm64_sys_write+0x7c/0x90 fs/read_write.c:744 __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+0x58/0x17c arch/arm64/kernel/entry-common.c:767 el0t_64_sync_handler+0x78/0x108 arch/arm64/kernel/entry-common.c:786 el0t_64_sync+0x198/0x19c arch/arm64/kernel/entry.S:600 Allocated by task 7037: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x40/0x78 mm/kasan/common.c:68 kasan_save_alloc_info+0x44/0x54 mm/kasan/generic.c:562 poison_kmalloc_redzone mm/kasan/common.c:377 [inline] __kasan_kmalloc+0x9c/0xb4 mm/kasan/common.c:394 kasan_kmalloc include/linux/kasan.h:260 [inline] __do_kmalloc_node mm/slub.c:4327 [inline] __kmalloc_noprof+0x2fc/0x4c8 mm/slub.c:4339 kmalloc_noprof include/linux/slab.h:909 [inline] sk_prot_alloc+0xc4/0x1f0 net/core/sock.c:2198 sk_alloc+0x44/0x3ac net/core/sock.c:2254 bt_sock_alloc+0x4c/0x300 net/bluetooth/af_bluetooth.c:148 hci_sock_create+0xa8/0x194 net/bluetooth/hci_sock.c:2202 bt_sock_create+0x14c/0x24c net/bluetooth/af_bluetooth.c:132 __sock_create+0x43c/0x91c net/socket.c:1541 sock_create net/socket.c:1599 [inline] __sys_socket_create net/socket.c:1636 [inline] __sys_socket+0xd4/0x1c0 net/socket.c:1683 __do_sys_socket net/socket.c:1697 [inline] __se_sys_socket net/socket.c:1695 [inline] __arm64_sys_socket+0x7c/0x94 net/socket.c:1695 __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+0x58/0x17c arch/arm64/kernel/entry-common.c:767 el0t_64_sync_handler+0x78/0x108 arch/arm64/kernel/entry-common.c:786 el0t_64_sync+0x198/0x19c arch/arm64/kernel/entry.S:600 Freed by task 6607: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x40/0x78 mm/kasan/common.c:68 kasan_save_free_info+0x58/0x70 mm/kasan/generic.c:576 poison_slab_object mm/kasan/common.c:247 [inline] __kasan_slab_free+0x68/0x88 mm/kasan/common.c:264 kasan_slab_free include/linux/kasan.h:233 [inline] slab_free_hook mm/slub.c:2380 [inline] slab_free mm/slub.c:4642 [inline] kfree+0x17c/0x474 mm/slub.c:4841 sk_prot_free net/core/sock.c:2237 [inline] __sk_destruct+0x4f4/0x760 net/core/sock.c:2332 sk_destruct net/core/sock.c:2360 [inline] __sk_free+0x320/0x430 net/core/sock.c:2371 sk_free+0x60/0xc8 net/core/sock.c:2382 sock_put include/net/sock.h:1944 [inline] mgmt_pending_free+0x88/0x118 net/bluetooth/mgmt_util.c:290 mgmt_pending_remove+0xec/0x104 net/bluetooth/mgmt_util.c:298 mgmt_set_powered_complete+0x418/0x5cc net/bluetooth/mgmt.c:1355 hci_cmd_sync_work+0x204/0x33c net/bluetooth/hci_sync.c:334 process_one_work+0x7e8/0x156c kernel/workqueue.c:3238 process_scheduled_works kernel/workqueue.c:3319 [inline] worker_thread+0x958/0xed8 kernel/workqueue.c:3400 kthread+0x5fc/0x75c kernel/kthread.c:464 ret_from_fork+0x10/0x20 arch/arm64/kernel/entry.S:847
--- include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_core.c | 1 + net/bluetooth/mgmt.c | 101 +++++++++++++++---------------- net/bluetooth/mgmt_util.c | 32 ++++++++-- net/bluetooth/mgmt_util.h | 4 +- 5 files changed, 80 insertions(+), 59 deletions(-)
include/net/bluetooth/hci_core.h +1 -0
@@ -545,6 +545,7 @@ struct hci_dev {struct hci_conn_hash conn_hash;struct list_head mesh_pending; +struct mutex mgmt_pending_lock;struct list_head mgmt_pending;struct list_head reject_list;struct list_head accept_list;
net/bluetooth/hci_core.c +1 -0
@@ -2485,6 +2485,7 @@ struct hci_dev *hci_alloc_dev_priv(int sizeof_priv)mutex_init (&hdev->lock);mutex_init (&hdev->req_lock); +mutex_init (&hdev->mgmt_pending_lock);ida_init (&hdev->unset_handle_ida);
net/bluetooth/mgmt.c +49 -52
331 lines not on this page · raw message
net/bluetooth/mgmt_util.c +27 -5
@@ -217,30 +217,47 @@ int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,struct mgmt_pending_cmd *mgmt_pending_find (unsigned short channel,u16 opcode,struct hci_dev *hdev) { -struct mgmt_pending_cmd *cmd; +struct mgmt_pending_cmd *cmd, *tmp; + +mutex_lock (&hdev->mgmt_pending_lock); -list_for_each_entry (cmd, &hdev->mgmt_pending, list) { +list_for_each_entry_safe (cmd, tmp, &hdev->mgmt_pending, list) {if (hci_sock_get_channel (cmd->sk) != channel)continue ; -if (cmd->opcode == opcode) + +if (cmd->opcode == opcode) { +mutex_unlock (&hdev->mgmt_pending_lock);return cmd; + } } +mutex_unlock (&hdev->mgmt_pending_lock); +return NULL ; } -void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev, +void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev,bool remove,void (*cb)(struct mgmt_pending_cmd *cmd,void *data),void *data) {struct mgmt_pending_cmd *cmd, *tmp; +mutex_lock (&hdev->mgmt_pending_lock); +list_for_each_entry_safe (cmd, tmp, &hdev->mgmt_pending, list) {if (opcode >0 && cmd->opcode != opcode)continue ; +if (remove) +list_del (&cmd->list); +cb (cmd, data); + +if (remove) +mgmt_pending_free (cmd); } + +mutex_unlock (&hdev->mgmt_pending_lock); } struct mgmt_pending_cmd *mgmt_pending_new(struct sock *sk, u16 opcode,
@@ -254,7 +271,7 @@ struct mgmt_pending_cmd *mgmt_pending_new(struct sock *sk, u16 opcode,return NULL ; cmd->opcode = opcode; - cmd->index = hdev->id; + cmd->hdev = hdev; cmd->param =kmemdup (data, len,GFP_KERNEL );if (!cmd->param) {
@@ -280,7 +297,9 @@ struct mgmt_pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,if (!cmd)return NULL ; +mutex_lock (&hdev->mgmt_pending_lock);list_add_tail (&cmd->list, &hdev->mgmt_pending); +mutex_unlock (&hdev->mgmt_pending_lock);return cmd; }
@@ -294,7 +313,10 @@ void mgmt_pending_free(struct mgmt_pending_cmd *cmd)void mgmt_pending_remove (struct mgmt_pending_cmd *cmd) { +mutex_lock (&cmd->hdev->mgmt_pending_lock);list_del (&cmd->list); +mutex_unlock (&cmd->hdev->mgmt_pending_lock); +mgmt_pending_free (cmd); }
net/bluetooth/mgmt_util.h +2 -2
@@ -33,7 +33,7 @@ struct mgmt_mesh_tx {struct mgmt_pending_cmd {struct list_head list;u16 opcode; -int index; +struct hci_dev *hdev;void *param;size_t param_len;struct sock *sk;
@@ -54,7 +54,7 @@ int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,struct mgmt_pending_cmd *mgmt_pending_find (unsigned short channel,u16 opcode,struct hci_dev *hdev); -void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev, +void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev,bool remove,void (*cb)(struct mgmt_pending_cmd *cmd,void *data),void *data); struct mgmt_pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 669/780 net: dsa: b53: fix untagged traffic sent via cpu tagged with VID 0
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Gorski <[email protected]>
[ Upstream commit 692eb9f8a5b71d852e873375d20cf5da7a046ea6 ]
When Linux sends out untagged traffic from a port, it will enter the CPU port without any VLAN tag, even if the port is a member of a vlan filtering bridge with a PVID egress untagged VLAN.
This makes the CPU port's PVID take effect, and the PVID's VLAN table entry controls if the packet will be tagged on egress.
Since commit 45e9d59d3950 ("net: dsa: b53: do not allow to configure VLAN 0") we remove bridged ports from VLAN 0 when joining or leaving a VLAN aware bridge. But we also clear the untagged bit, causing untagged traffic from the controller to become tagged with VID 0 (and priority 0).
Fix this by not touching the untagged map of VLAN 0. Additionally, always keep the CPU port as a member, as the untag map is only effective as long as there is at least one member, and we would remove it when bridging all ports and leaving no standalone ports.
Since Linux (and the switch) treats VLAN 0 tagged traffic like untagged, the actual impact of this is rather low, but this also prevented earlier detection of the issue.
--- drivers/net/dsa/b53/b53_common.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/dsa/b53/b53_common.c +1 -5
@@ -2034,9 +2034,6 @@ int b53_br_join(struct dsa_switch *ds, int port, struct dsa_bridge bridge,b53_get_vlan_entry (dev, pvid, vl); vl->members &= ~BIT (port); -if (vl->members ==BIT (cpu_port)) - vl->members &= ~BIT (cpu_port); - vl->untag = vl->members;b53_set_vlan_entry (dev, pvid, vl); }
@@ -2115,8 +2112,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct dsa_bridge bridge) }b53_get_vlan_entry (dev, pvid, vl); - vl->members |=BIT (port) |BIT (cpu_port); - vl->untag |=BIT (port) |BIT (cpu_port); + vl->members |=BIT (port);b53_set_vlan_entry (dev, pvid, vl); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 670/780 ptp: remove ptp->n_vclocks check logic in ptp_vclock_in_use()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeongjun Park <[email protected]>
[ Upstream commit 87f7ce260a3c838b49e1dc1ceedf1006795157a2 ]
There is no disagreement that we should check both ptp->is_virtual_clock and ptp->n_vclocks to check if the ptp virtual clock is in use.
However, when we acquire ptp->n_vclocks_mux to read ptp->n_vclocks in ptp_vclock_in_use(), we observe a recursive lock in the call trace starting from n_vclocks_store().
============================================
WARNING: possible recursive locking detected 6.15.0-rc6 #1 Not tainted
--------------------------------------------
syz.0.1540/13807 is trying to acquire lock:ffff888035a24868 (&ptp->n_vclocks_mux){+.+.}-{4:4}, at:
ptp_vclock_in_use drivers/ptp/ptp_private.h:103 [inline]ffff888035a24868 (&ptp->n_vclocks_mux){+.+.}-{4:4}, at:
ptp_clock_unregister+0x21/0x250 drivers/ptp/ptp_clock.c:415
but task is already holding lock:ffff888030704868 (&ptp->n_vclocks_mux){+.+.}-{4:4}, at:
n_vclocks_store+0xf1/0x6d0 drivers/ptp/ptp_sysfs.c:215
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
---- lock(&ptp->n_vclocks_mux);
lock(&ptp->n_vclocks_mux);
*** DEADLOCK ***
....
============================================
The best way to solve this is to remove the logic that checks ptp->n_vclocks in ptp_vclock_in_use().
The reason why this is appropriate is that any path that uses ptp->n_vclocks must unconditionally check if ptp->n_vclocks is greater than 0 before unregistering vclocks, and all functions are already written this way. And in the function that uses ptp->n_vclocks, we already get ptp->n_vclocks_mux before unregistering vclocks.
Therefore, we need to remove the redundant check for ptp->n_vclocks in ptp_vclock_in_use() to prevent recursive locking.
--- drivers/ptp/ptp_private.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/ptp/ptp_private.h +1 -11
@@ -98,17 +98,7 @@ static inline int queue_cnt(const struct timestamp_event_queue *q)/* Check if ptp virtual clock is in use */ static inline bool ptp_vclock_in_use (struct ptp_clock *ptp) { -bool in_use = false; - -if (mutex_lock_interruptible (&ptp->n_vclocks_mux)) -return true; - -if (!ptp->is_virtual_clock && ptp->n_vclocks) - in_use = true; - -mutex_unlock (&ptp->n_vclocks_mux); - -return in_use; +return !ptp->is_virtual_clock; }/* Check if ptp clock shall be free running */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 671/780 ath10k: snoc: fix unbalanced IRQ enable in crash recovery
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Caleb Connolly <[email protected]>
[ Upstream commit 1650d32b92b01db03a1a95d69ee74fcbc34d4b00 ]
In ath10k_snoc_hif_stop() we skip disabling the IRQs in the crash recovery flow, but we still unconditionally call enable again in ath10k_snoc_hif_start().
We can't check the ATH10K_FLAG_CRASH_FLUSH bit since it is cleared before hif_start() is called, so instead check the ATH10K_SNOC_FLAG_RECOVERY flag and skip enabling the IRQs during crash recovery.
This fixes unbalanced IRQ enable splats that happen after recovering from a crash.
--- drivers/net/wireless/ath/ath10k/snoc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/snoc.c +3 -1
@@ -937,7 +937,9 @@ static int ath10k_snoc_hif_start(struct ath10k *ar)dev_set_threaded (ar->napi_dev, true);ath10k_core_napi_enable (ar); -ath10k_snoc_irq_enable (ar); +/* IRQs are left enabled when we restart due to a firmware crash */ +if (!test_bit (ATH10K_SNOC_FLAG_RECOVERY , &ar_snoc->flags)) +ath10k_snoc_irq_enable (ar);ath10k_snoc_rx_post (ar);clear_bit (ATH10K_SNOC_FLAG_RECOVERY , &ar_snoc->flags);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 672/780 wifi: ath11k: avoid burning CPU in ath11k_debugfs_fw_stats_request()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 9f6e82d11bb9692a90d20b10f87345598945c803 ]
We get report [1] that CPU is running a hot loop in ath11k_debugfs_fw_stats_request():
94.60% 0.00% i3status [kernel.kallsyms] [k] do_syscall_64
|
--94.60%--do_syscall_64
|
--94.55%--__sys_sendmsg
___sys_sendmsg
____sys_sendmsg
netlink_sendmsg
netlink_unicast
genl_rcv
netlink_rcv_skb
genl_rcv_msg
|
--94.55%--genl_family_rcv_msg_dumpit
__netlink_dump_start
netlink_dump
genl_dumpit
nl80211_dump_station
|
--94.55%--ieee80211_dump_station
sta_set_sinfo
|
--94.55%--ath11k_mac_op_sta_statistics
ath11k_debugfs_get_fw_stats
|
--94.55%--ath11k_debugfs_fw_stats_request
|
|--41.73%--_raw_spin_lock_bh
|
|--22.74%--__local_bh_enable_ip
|
|--9.22%--_raw_spin_unlock_bh
|
--6.66%--srso_alias_safe_retThis is because, if for whatever reason ar->fw_stats_done is not set by ath11k_update_stats_event(), ath11k_debugfs_fw_stats_request() won't yield CPU before an up to 3s timeout.
Change to completion mechanism to avoid CPU burning.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37
--- drivers/net/wireless/ath/ath11k/core.c | 1 + drivers/net/wireless/ath/ath11k/core.h | 2 +- drivers/net/wireless/ath/ath11k/debugfs.c | 38 +++++++++-------------- drivers/net/wireless/ath/ath11k/mac.c | 2 +- drivers/net/wireless/ath/ath11k/wmi.c | 2 +- 5 files changed, 18 insertions(+), 27 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +1 -0
@@ -951,6 +951,7 @@ void ath11k_fw_stats_init(struct ath11k *ar)INIT_LIST_HEAD (&ar->fw_stats.bcn);init_completion (&ar->fw_stats_complete); +init_completion (&ar->fw_stats_done); }void ath11k_fw_stats_free (struct ath11k_fw_stats *stats)
drivers/net/wireless/ath/ath11k/core.h +1 -1
@@ -783,7 +783,7 @@ struct ath11k {u8 alpha2[REG_ALPHA2_LEN +1 ];struct ath11k_fw_stats fw_stats;struct completion fw_stats_complete; -bool fw_stats_done; +struct completion fw_stats_done;/* protected by conf_mutex */ bool ps_state_enable;
drivers/net/wireless/ath/ath11k/debugfs.c +14 -24
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/vmalloc.h>
@@ -96,7 +96,6 @@ void ath11k_debugfs_add_dbring_entry(struct ath11k *ar,static void ath11k_debugfs_fw_stats_reset (struct ath11k *ar) {spin_lock_bh (&ar->data_lock); - ar->fw_stats_done = false;ath11k_fw_stats_pdevs_free (&ar->fw_stats.pdevs);ath11k_fw_stats_vdevs_free (&ar->fw_stats.vdevs);spin_unlock_bh (&ar->data_lock);
@@ -114,7 +113,7 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats */* WMI_REQUEST_PDEV_STAT request has been already processed */ if (stats->stats_id ==WMI_REQUEST_RSSI_PER_CHAIN_STAT ) { - ar->fw_stats_done = true; +complete (&ar->fw_stats_done);return ; }
@@ -138,7 +137,7 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * &ar->fw_stats.vdevs);if (is_end) { - ar->fw_stats_done = true; +complete (&ar->fw_stats_done); num_vdev =0 ; }return ;
@@ -158,7 +157,7 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * &ar->fw_stats.bcn);if (is_end) { - ar->fw_stats_done = true; +complete (&ar->fw_stats_done); num_bcn =0 ; } }
@@ -168,21 +167,15 @@ static int ath11k_debugfs_fw_stats_request(struct ath11k *ar, struct stats_request_params *req_param) {struct ath11k_base *ab = ar->ab; -unsigned long timeout, time_left; +unsigned long time_left;int ret;lockdep_assert_held (&ar->conf_mutex); -/* FW stats can get split when exceeding the stats data buffer limit. -* In that case, since there is no end marking for the back-to-back -* received 'update stats' event, we keep a 3 seconds timeout in case, -* fw_stats_done is not marked yet -*/ - timeout = jiffies +secs_to_jiffies (3 ); -ath11k_debugfs_fw_stats_reset (ar);reinit_completion (&ar->fw_stats_complete); +reinit_completion (&ar->fw_stats_done); ret =ath11k_wmi_send_stats_request_cmd (ar, req_param);
@@ -193,21 +186,18 @@ static int ath11k_debugfs_fw_stats_request(struct ath11k *ar, } time_left =wait_for_completion_timeout (&ar->fw_stats_complete,1 *HZ ); -if (!time_left)return -ETIMEDOUT ; -for (;;) { -if (time_after (jiffies, timeout)) -break ; +/* FW stats can get split when exceeding the stats data buffer limit. +* In that case, since there is no end marking for the back-to-back +* received 'update stats' event, we keep a 3 seconds timeout in case, +* fw_stats_done is not marked yet +*/ + time_left =wait_for_completion_timeout (&ar->fw_stats_done,3 *HZ ); +if (!time_left) +return -ETIMEDOUT ; -spin_lock_bh (&ar->data_lock); -if (ar->fw_stats_done) { -spin_unlock_bh (&ar->data_lock); -break ; - } -spin_unlock_bh (&ar->data_lock); - }return 0 ; }
drivers/net/wireless/ath/ath11k/mac.c +1 -1
@@ -9384,11 +9384,11 @@ static int ath11k_fw_stats_request(struct ath11k *ar,lockdep_assert_held (&ar->conf_mutex);spin_lock_bh (&ar->data_lock); - ar->fw_stats_done = false;ath11k_fw_stats_pdevs_free (&ar->fw_stats.pdevs);spin_unlock_bh (&ar->data_lock);reinit_completion (&ar->fw_stats_complete); +reinit_completion (&ar->fw_stats_done); ret =ath11k_wmi_send_stats_request_cmd (ar, req_param);if (ret) {
drivers/net/wireless/ath/ath11k/wmi.c +1 -1
@@ -8189,7 +8189,7 @@ static void ath11k_update_stats_event(struct ath11k_base *ab, struct sk_buff *sk*/ if (stats.stats_id ==WMI_REQUEST_PDEV_STAT ) {list_splice_tail_init (&stats.pdevs, &ar->fw_stats.pdevs); - ar->fw_stats_done = true; +complete (&ar->fw_stats_done); goto complete; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 673/780 wifi: ath11k: dont use static variables in ath11k_debugfs_fw_stats_process()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 2bcf73b2612dda7432f2c2eaad6679bd291791f2 ]
Currently ath11k_debugfs_fw_stats_process() is using static variables to count firmware stat events. Taking num_vdev as an example, if for whatever reason ( say ar->num_started_vdevs is 0 or firmware bug etc.) the following condition
(++num_vdev) == total_vdevs_started
is not met, is_end is not set thus num_vdev won't be cleared. Next time when firmware stats is requested again, even if everything is working fine, we will fail due to the condition above will never be satisfied.
The same applies to num_bcn as well.
Change to use non-static counters so that we have a chance to clear them each time firmware stats is requested. Currently only ath11k_fw_stats_request() and ath11k_debugfs_fw_stats_request() are requesting firmware stats, so clear counters there.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37
--- drivers/net/wireless/ath/ath11k/core.h | 2 ++ drivers/net/wireless/ath/ath11k/debugfs.c | 16 +++++++--------- drivers/net/wireless/ath/ath11k/mac.c | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-)
drivers/net/wireless/ath/ath11k/core.h +2 -0
@@ -599,6 +599,8 @@ struct ath11k_fw_stats {struct list_head pdevs;struct list_head vdevs;struct list_head bcn; +u32 num_vdev_recvd; +u32 num_bcn_recvd; };struct ath11k_dbg_htt_stats {
drivers/net/wireless/ath/ath11k/debugfs.c +7 -9
@@ -98,6 +98,8 @@ static void ath11k_debugfs_fw_stats_reset(struct ath11k *ar)spin_lock_bh (&ar->data_lock);ath11k_fw_stats_pdevs_free (&ar->fw_stats.pdevs);ath11k_fw_stats_vdevs_free (&ar->fw_stats.vdevs); + ar->fw_stats.num_vdev_recvd =0 ; + ar->fw_stats.num_bcn_recvd =0 ;spin_unlock_bh (&ar->data_lock); }
@@ -106,7 +108,6 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats *struct ath11k_base *ab = ar->ab;struct ath11k_pdev *pdev;bool is_end; -static unsigned int num_vdev, num_bcn;size_t total_vdevs_started =0 ;int i;
@@ -131,15 +132,14 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * total_vdevs_started += ar->num_started_vdevs; } - is_end = ((++num_vdev) == total_vdevs_started); + is_end = ((++ar->fw_stats.num_vdev_recvd) == total_vdevs_started);list_splice_tail_init (&stats->vdevs, &ar->fw_stats.vdevs); -if (is_end) { +if (is_end)complete (&ar->fw_stats_done); - num_vdev =0 ; - } +return ; }
@@ -151,15 +151,13 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats */* Mark end until we reached the count of all started VDEVs * within the PDEV */ - is_end = ((++num_bcn) == ar->num_started_vdevs); + is_end = ((++ar->fw_stats.num_bcn_recvd) == ar->num_started_vdevs);list_splice_tail_init (&stats->bcn, &ar->fw_stats.bcn); -if (is_end) { +if (is_end)complete (&ar->fw_stats_done); - num_bcn =0 ; - } } }
drivers/net/wireless/ath/ath11k/mac.c +2 -0
@@ -9385,6 +9385,8 @@ static int ath11k_fw_stats_request(struct ath11k *ar,spin_lock_bh (&ar->data_lock);ath11k_fw_stats_pdevs_free (&ar->fw_stats.pdevs); + ar->fw_stats.num_vdev_recvd =0 ; + ar->fw_stats.num_bcn_recvd =0 ;spin_unlock_bh (&ar->data_lock);reinit_completion (&ar->fw_stats_complete);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 674/780 wifi: ath11k: dont wait when there is no vdev started
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 3b6d00fa883075dcaf49221538230e038a9c0b43 ]
For WMI_REQUEST_VDEV_STAT request, firmware might split response into multiple events dut to buffer limit, hence currently in ath11k_debugfs_fw_stats_process() we wait until all events received. In case there is no vdev started, this results in that below condition would never get satisfied
((++ar->fw_stats.num_vdev_recvd) == total_vdevs_started)
finally the requestor would be blocked until wait time out.
The same applies to WMI_REQUEST_BCN_STAT request as well due to:
((++ar->fw_stats.num_bcn_recvd) == ar->num_started_vdevs)
Change to check the number of started vdev first: if it is zero, finish wait directly; if not, follow the old way.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37
--- drivers/net/wireless/ath/ath11k/debugfs.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath11k/debugfs.c +7 -3
@@ -107,7 +107,7 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * {struct ath11k_base *ab = ar->ab;struct ath11k_pdev *pdev; -bool is_end; +bool is_end = true;size_t total_vdevs_started =0 ;int i;
@@ -132,7 +132,9 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * total_vdevs_started += ar->num_started_vdevs; } - is_end = ((++ar->fw_stats.num_vdev_recvd) == total_vdevs_started); +if (total_vdevs_started) + is_end = ((++ar->fw_stats.num_vdev_recvd) == + total_vdevs_started);list_splice_tail_init (&stats->vdevs, &ar->fw_stats.vdevs);
@@ -151,7 +153,9 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats */* Mark end until we reached the count of all started VDEVs * within the PDEV */ - is_end = ((++ar->fw_stats.num_bcn_recvd) == ar->num_started_vdevs); +if (ar->num_started_vdevs) + is_end = ((++ar->fw_stats.num_bcn_recvd) == + ar->num_started_vdevs);list_splice_tail_init (&stats->bcn, &ar->fw_stats.bcn);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 675/780 wifi: ath11k: move some firmware stats related functions outside of debugfs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 72610ed7d79da17ee09102534d6c696a4ea8a08e ]
Commit b488c766442f ("ath11k: report rssi of each chain to mac80211 for QCA6390/WCN6855") and commit c3b39553fc77 ("ath11k: add signal report to mac80211 for QCA6390 and WCN6855") call debugfs functions in mac ops. Those functions are no-ops if CONFIG_ATH11K_DEBUGFS is not enabled, thus cause wrong status reported.
Move them to mac.c.
Besides, since WMI_REQUEST_RSSI_PER_CHAIN_STAT and WMI_REQUEST_VDEV_STAT stats could also be requested via mac ops, process them directly in ath11k_update_stats_event().
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37
--- drivers/net/wireless/ath/ath11k/debugfs.c | 126 ++-------------------- drivers/net/wireless/ath/ath11k/debugfs.h | 10 +- drivers/net/wireless/ath/ath11k/mac.c | 88 ++++++++++++++- drivers/net/wireless/ath/ath11k/mac.h | 4 +- drivers/net/wireless/ath/ath11k/wmi.c | 45 +++++++- 5 files changed, 135 insertions(+), 138 deletions(-)
drivers/net/wireless/ath/ath11k/debugfs.c +6 -120
@@ -93,58 +93,14 @@ void ath11k_debugfs_add_dbring_entry(struct ath11k *ar,spin_unlock_bh (&dbr_data->lock); } -static void ath11k_debugfs_fw_stats_reset (struct ath11k *ar) -{ -spin_lock_bh (&ar->data_lock); -ath11k_fw_stats_pdevs_free (&ar->fw_stats.pdevs); -ath11k_fw_stats_vdevs_free (&ar->fw_stats.vdevs); - ar->fw_stats.num_vdev_recvd =0 ; - ar->fw_stats.num_bcn_recvd =0 ; -spin_unlock_bh (&ar->data_lock); -} -void ath11k_debugfs_fw_stats_process (struct ath11k *ar,struct ath11k_fw_stats *stats) {struct ath11k_base *ab = ar->ab; -struct ath11k_pdev *pdev;bool is_end = true; -size_t total_vdevs_started =0 ; -int i; - -/* WMI_REQUEST_PDEV_STAT request has been already processed */ - -if (stats->stats_id ==WMI_REQUEST_RSSI_PER_CHAIN_STAT ) { -complete (&ar->fw_stats_done); -return ; - } - -if (stats->stats_id ==WMI_REQUEST_VDEV_STAT ) { -if (list_empty (&stats->vdevs)) { -ath11k_warn (ab,"empty vdev stats" ); -return ; - } -/* FW sends all the active VDEV stats irrespective of PDEV, -* hence limit until the count of all VDEVs started -*/ -for (i =0 ; i < ab->num_radios; i++) { - pdev =rcu_dereference (ab->pdevs_active[i]); -if (pdev && pdev->ar) - total_vdevs_started += ar->num_started_vdevs; - } - -if (total_vdevs_started) - is_end = ((++ar->fw_stats.num_vdev_recvd) == - total_vdevs_started); - -list_splice_tail_init (&stats->vdevs, - &ar->fw_stats.vdevs); - -if (is_end) -complete (&ar->fw_stats_done); - -return ; - } +/* WMI_REQUEST_PDEV_STAT, WMI_REQUEST_RSSI_PER_CHAIN_STAT and +* WMI_REQUEST_VDEV_STAT requests have been already processed. +*/ if (stats->stats_id ==WMI_REQUEST_BCN_STAT ) {if (list_empty (&stats->bcn)) {ath11k_warn (ab,"empty bcn stats" );
@@ -165,76 +121,6 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * } } -static int ath11k_debugfs_fw_stats_request (struct ath11k *ar, -struct stats_request_params *req_param) -{ -struct ath11k_base *ab = ar->ab; -unsigned long time_left; -int ret; - -lockdep_assert_held (&ar->conf_mutex); - -ath11k_debugfs_fw_stats_reset (ar); - -reinit_completion (&ar->fw_stats_complete); -reinit_completion (&ar->fw_stats_done); - - ret =ath11k_wmi_send_stats_request_cmd (ar, req_param); - -if (ret) { -ath11k_warn (ab,"could not request fw stats (%d)\n" , - ret); -return ret; - } - - time_left =wait_for_completion_timeout (&ar->fw_stats_complete,1 *HZ ); -if (!time_left) -return -ETIMEDOUT ; - -/* FW stats can get split when exceeding the stats data buffer limit. -* In that case, since there is no end marking for the back-to-back -* received 'update stats' event, we keep a 3 seconds timeout in case, -* fw_stats_done is not marked yet -*/ - time_left =wait_for_completion_timeout (&ar->fw_stats_done,3 *HZ ); -if (!time_left) -return -ETIMEDOUT ; - -return 0 ; -} - -int ath11k_debugfs_get_fw_stats (struct ath11k *ar,u32 pdev_id, -u32 vdev_id,u32 stats_id) -{ -struct ath11k_base *ab = ar->ab; -struct stats_request_params req_param; -int ret; - -mutex_lock (&ar->conf_mutex); - -if (ar->state !=ATH11K_STATE_ON ) { - ret = -ENETDOWN ; - goto err_unlock; - } - - req_param.pdev_id = pdev_id; - req_param.vdev_id = vdev_id; - req_param.stats_id = stats_id; - - ret =ath11k_debugfs_fw_stats_request (ar, &req_param); -if (ret) -ath11k_warn (ab,"failed to request fw stats: %d\n" , ret); - -ath11k_dbg (ab,ATH11K_DBG_WMI , -"debug get fw stat pdev id %d vdev id %d stats id 0x%x\n" , - pdev_id, vdev_id, stats_id); - -err_unlock: -mutex_unlock (&ar->conf_mutex); - -return ret; -} -static int ath11k_open_pdev_stats (struct inode *inode,struct file *file) {struct ath11k *ar = inode->i_private;
@@ -260,7 +146,7 @@ static int ath11k_open_pdev_stats(struct inode *inode, struct file *file) req_param.vdev_id =0 ; req_param.stats_id =WMI_REQUEST_PDEV_STAT ; - ret =ath11k_debugfs_fw_stats_request (ar, &req_param); + ret =ath11k_mac_fw_stats_request (ar, &req_param);if (ret) {ath11k_warn (ab,"failed to request fw pdev stats: %d\n" , ret); goto err_free;
@@ -331,7 +217,7 @@ static int ath11k_open_vdev_stats(struct inode *inode, struct file *file) req_param.vdev_id =0 ; req_param.stats_id =WMI_REQUEST_VDEV_STAT ; - ret =ath11k_debugfs_fw_stats_request (ar, &req_param); + ret =ath11k_mac_fw_stats_request (ar, &req_param);if (ret) {ath11k_warn (ar->ab,"failed to request fw vdev stats: %d\n" , ret); goto err_free;
@@ -407,7 +293,7 @@ static int ath11k_open_bcn_stats(struct inode *inode, struct file *file)continue ; req_param.vdev_id = arvif->vdev_id; - ret =ath11k_debugfs_fw_stats_request (ar, &req_param); + ret =ath11k_mac_fw_stats_request (ar, &req_param);if (ret) {ath11k_warn (ar->ab,"failed to request fw bcn stats: %d\n" , ret); goto err_free;
drivers/net/wireless/ath/ath11k/debugfs.h +1 -9
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2022, 2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _ATH11K_DEBUGFS_H_
@@ -273,8 +273,6 @@ void ath11k_debugfs_unregister(struct ath11k *ar);void ath11k_debugfs_fw_stats_process (struct ath11k *ar,struct ath11k_fw_stats *stats);void ath11k_debugfs_fw_stats_init (struct ath11k *ar); -int ath11k_debugfs_get_fw_stats (struct ath11k *ar,u32 pdev_id, -u32 vdev_id,u32 stats_id);static inline bool ath11k_debugfs_is_pktlog_lite_mode_enabled (struct ath11k *ar) {
@@ -381,12 +379,6 @@ static inline int ath11k_debugfs_rx_filter(struct ath11k *ar)return 0 ; } -static inline int ath11k_debugfs_get_fw_stats (struct ath11k *ar, -u32 pdev_id,u32 vdev_id,u32 stats_id) -{ -return 0 ; -} - static inline void ath11k_debugfs_add_dbring_entry(struct ath11k *ar, enum wmi_direct_buffer_module id,
drivers/net/wireless/ath/ath11k/mac.c +84 -4
106 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/mac.h +3 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023, 2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_MAC_H
@@ -179,4 +179,6 @@ int ath11k_mac_vif_set_keepalive(struct ath11k_vif *arvif,void ath11k_mac_fill_reg_tpc_info (struct ath11k *ar,struct ieee80211_vif *vif,struct ieee80211_chanctx_conf *ctx); +int ath11k_mac_fw_stats_request (struct ath11k *ar, +struct stats_request_params *req_param);#endif
drivers/net/wireless/ath/ath11k/wmi.c +41 -4
63 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 676/780 wifi: ath11k: validate ath11k_crypto_mode on top of ath11k_core_qmi_firmware_ready
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rodrigo Gobbi <[email protected]>
[ Upstream commit b0d226a60856a1b765bb9a3848c7b2322fd08c47 ]
if ath11k_crypto_mode is invalid (not ATH11K_CRYPT_MODE_SW/ATH11K_CRYPT_MODE_HW), ath11k_core_qmi_firmware_ready() will not undo some actions that was previously started/configured. Do the validation as soon as possible in order to avoid undoing actions in that case and also to fix the following smatch warning:
drivers/net/wireless/ath/ath11k/core.c:2166 ath11k_core_qmi_firmware_ready()
warn: missing unwind goto?
--- drivers/net/wireless/ath/ath11k/core.c | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +14 -14
@@ -1947,6 +1947,20 @@ int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab) {int ret; +switch (ath11k_crypto_mode) { +case ATH11K_CRYPT_MODE_SW : +set_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags); +set_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); +break ; +case ATH11K_CRYPT_MODE_HW : +clear_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags); +clear_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); +break ; +default : +ath11k_info (ab,"invalid crypto_mode: %d\n" , ath11k_crypto_mode); +return -EINVAL ; + } + ret =ath11k_core_start_firmware (ab, ab->fw_mode);if (ret) {ath11k_err (ab,"failed to start firmware: %d\n" , ret);
@@ -1965,20 +1979,6 @@ int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab) goto err_firmware_stop; } -switch (ath11k_crypto_mode) { -case ATH11K_CRYPT_MODE_SW : -set_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags); -set_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); -break ; -case ATH11K_CRYPT_MODE_HW : -clear_bit (ATH11K_FLAG_HW_CRYPTO_DISABLED , &ab->dev_flags); -clear_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags); -break ; -default : -ath11k_info (ab,"invalid crypto_mode: %d\n" , ath11k_crypto_mode); -return -EINVAL ; - } -if (ath11k_frame_mode ==ATH11K_HW_TXRX_RAW )set_bit (ATH11K_FLAG_RAW_MODE , &ab->dev_flags);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 677/780 wifi: ath12k: refactor ath12k_hw_regs structure
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 5257324583e32fd5bd6bbb6c82b4f5880b842f99 ]
IPQ5332 device have different register address values for the below registers:
HAL_TCL1_RING_BASE_LSBHAL_TCL1_RING_BASE_MSBHAL_TCL2_RING_BASE_LSB
HAL_SEQ_WCSS_UMAC_CE0_SRC_REGHAL_SEQ_WCSS_UMAC_CE0_DST_REGHAL_SEQ_WCSS_UMAC_CE1_SRC_REGHAL_SEQ_WCSS_UMAC_CE1_DST_REG
Hence, refactor ath12k_hw_regs structure to accommodate these changes in IPQ5332.
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1
Stable-dep-of: 7588a893cde5 ("wifi: ath12k: fix GCC_GCC_PCIE_HOT_RST definition for WCN7850")
--- drivers/net/wireless/ath/ath12k/hal.c | 84 +++++++++++++-------------- drivers/net/wireless/ath/ath12k/hal.h | 63 +++++++++++--------- drivers/net/wireless/ath/ath12k/hw.c | 29 ++++++++- drivers/net/wireless/ath/ath12k/hw.h | 10 +++- 4 files changed, 114 insertions(+), 72 deletions(-)
drivers/net/wireless/ath/ath12k/hal.c +42 -42
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/dma-mapping.h> #include "hal_tx.h"
@@ -547,9 +547,9 @@ static int ath12k_hal_srng_create_config_qcn9274(struct ath12k_base *ab) s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO_STATUS_HP ; s = &hal->srng_config[HAL_TCL_DATA ]; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL1_RING_BASE_LSB ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL1_RING_BASE_LSB (ab); s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL1_RING_HP ; - s->reg_size[0 ] =HAL_TCL2_RING_BASE_LSB -HAL_TCL1_RING_BASE_LSB ; + s->reg_size[0 ] =HAL_TCL2_RING_BASE_LSB (ab) -HAL_TCL1_RING_BASE_LSB (ab); s->reg_size[1 ] =HAL_TCL2_RING_HP -HAL_TCL1_RING_HP ; s = &hal->srng_config[HAL_TCL_CMD ];
@@ -561,29 +561,29 @@ static int ath12k_hal_srng_create_config_qcn9274(struct ath12k_base *ab) s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL_STATUS_RING_HP ; s = &hal->srng_config[HAL_CE_SRC ]; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_SRC_REG +HAL_CE_DST_RING_BASE_LSB ; - s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_SRC_REG +HAL_CE_DST_RING_HP ; - s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_SRC_REG - -HAL_SEQ_WCSS_UMAC_CE0_SRC_REG ; - s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_SRC_REG - -HAL_SEQ_WCSS_UMAC_CE0_SRC_REG ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_SRC_REG (ab) +HAL_CE_DST_RING_BASE_LSB ; + s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_SRC_REG (ab) +HAL_CE_DST_RING_HP ; + s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_SRC_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_SRC_REG (ab); + s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_SRC_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_SRC_REG (ab); s = &hal->srng_config[HAL_CE_DST ]; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG +HAL_CE_DST_RING_BASE_LSB ; - s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG +HAL_CE_DST_RING_HP ; - s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG - -HAL_SEQ_WCSS_UMAC_CE0_DST_REG ; - s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG - -HAL_SEQ_WCSS_UMAC_CE0_DST_REG ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab) +HAL_CE_DST_RING_BASE_LSB ; + s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab) +HAL_CE_DST_RING_HP ; + s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab); + s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab); s = &hal->srng_config[HAL_CE_DST_STATUS ]; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG + + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab) +HAL_CE_DST_STATUS_RING_BASE_LSB ; - s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG +HAL_CE_DST_STATUS_RING_HP ; - s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG - -HAL_SEQ_WCSS_UMAC_CE0_DST_REG ; - s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG - -HAL_SEQ_WCSS_UMAC_CE0_DST_REG ; + s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab) +HAL_CE_DST_STATUS_RING_HP ; + s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab); + s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab); s = &hal->srng_config[HAL_WBM_IDLE_LINK ]; s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_WBM_REG +HAL_WBM_IDLE_LINK_RING_BASE_LSB (ab);
@@ -1353,9 +1353,9 @@ static int ath12k_hal_srng_create_config_wcn7850(struct ath12k_base *ab) s = &hal->srng_config[HAL_TCL_DATA ]; s->max_rings =5 ; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL1_RING_BASE_LSB ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL1_RING_BASE_LSB (ab); s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_TCL_REG +HAL_TCL1_RING_HP ; - s->reg_size[0 ] =HAL_TCL2_RING_BASE_LSB -HAL_TCL1_RING_BASE_LSB ; + s->reg_size[0 ] =HAL_TCL2_RING_BASE_LSB (ab) -HAL_TCL1_RING_BASE_LSB (ab); s->reg_size[1 ] =HAL_TCL2_RING_HP -HAL_TCL1_RING_HP ; s = &hal->srng_config[HAL_TCL_CMD ];
@@ -1368,31 +1368,31 @@ static int ath12k_hal_srng_create_config_wcn7850(struct ath12k_base *ab) s = &hal->srng_config[HAL_CE_SRC ]; s->max_rings =12 ; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_SRC_REG +HAL_CE_DST_RING_BASE_LSB ; - s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_SRC_REG +HAL_CE_DST_RING_HP ; - s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_SRC_REG - -HAL_SEQ_WCSS_UMAC_CE0_SRC_REG ; - s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_SRC_REG - -HAL_SEQ_WCSS_UMAC_CE0_SRC_REG ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_SRC_REG (ab) +HAL_CE_DST_RING_BASE_LSB ; + s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_SRC_REG (ab) +HAL_CE_DST_RING_HP ; + s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_SRC_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_SRC_REG (ab); + s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_SRC_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_SRC_REG (ab); s = &hal->srng_config[HAL_CE_DST ]; s->max_rings =12 ; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG +HAL_CE_DST_RING_BASE_LSB ; - s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG +HAL_CE_DST_RING_HP ; - s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG - -HAL_SEQ_WCSS_UMAC_CE0_DST_REG ; - s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG - -HAL_SEQ_WCSS_UMAC_CE0_DST_REG ; + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab) +HAL_CE_DST_RING_BASE_LSB ; + s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab) +HAL_CE_DST_RING_HP ; + s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab); + s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab); s = &hal->srng_config[HAL_CE_DST_STATUS ]; s->max_rings =12 ; - s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG + + s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab) +HAL_CE_DST_STATUS_RING_BASE_LSB ; - s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG +HAL_CE_DST_STATUS_RING_HP ; - s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG - -HAL_SEQ_WCSS_UMAC_CE0_DST_REG ; - s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG - -HAL_SEQ_WCSS_UMAC_CE0_DST_REG ; + s->reg_start[1 ] =HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab) +HAL_CE_DST_STATUS_RING_HP ; + s->reg_size[0 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab); + s->reg_size[1 ] =HAL_SEQ_WCSS_UMAC_CE1_DST_REG (ab) - +HAL_SEQ_WCSS_UMAC_CE0_DST_REG (ab); s = &hal->srng_config[HAL_WBM_IDLE_LINK ]; s->reg_start[0 ] =HAL_SEQ_WCSS_UMAC_WBM_REG +HAL_WBM_IDLE_LINK_RING_BASE_LSB (ab);
@@ -1737,7 +1737,7 @@ static void ath12k_hal_srng_src_hw_init(struct ath12k_base *ab, HAL_TCL1_RING_BASE_MSB_RING_BASE_ADDR_MSB) |u32_encode_bits ((srng->entry_size * srng->num_entries),HAL_TCL1_RING_BASE_MSB_RING_SIZE ); -ath12k_hif_write32 (ab, reg_base +HAL_TCL1_RING_BASE_MSB_OFFSET , val); +ath12k_hif_write32 (ab, reg_base +HAL_TCL1_RING_BASE_MSB_OFFSET (ab), val); val =u32_encode_bits (srng->entry_size,HAL_REO1_RING_ID_ENTRY_SIZE );ath12k_hif_write32 (ab, reg_base +HAL_TCL1_RING_ID_OFFSET (ab), val);
drivers/net/wireless/ath/ath12k/hal.h +35 -28
90 lines not on this page · raw message
drivers/net/wireless/ath/ath12k/hw.c +28 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/types.h>
@@ -619,6 +619,9 @@ static const struct ath12k_hw_regs qcn9274_v1_regs = { .hal_tcl1_ring_msi1_base_msb = 0x0000094c, .hal_tcl1_ring_msi1_data = 0x00000950, .hal_tcl_ring_base_lsb = 0x00000b58, + .hal_tcl1_ring_base_lsb = 0x00000900, + .hal_tcl1_ring_base_msb = 0x00000904, + .hal_tcl2_ring_base_lsb = 0x00000978,/* TCL STATUS ring address */ .hal_tcl_status_ring_base_lsb = 0x00000d38,
@@ -681,6 +684,12 @@ static const struct ath12k_hw_regs qcn9274_v1_regs = {/* REO status ring address */ .hal_reo_status_ring_base = 0x00000a84, + +/* CE base address */ + .hal_umac_ce0_src_reg_base = 0x01b80000, + .hal_umac_ce0_dest_reg_base = 0x01b81000, + .hal_umac_ce1_src_reg_base = 0x01b82000, + .hal_umac_ce1_dest_reg_base = 0x01b83000, };static const struct ath12k_hw_regs qcn9274_v2_regs = {
@@ -695,6 +704,9 @@ static const struct ath12k_hw_regs qcn9274_v2_regs = { .hal_tcl1_ring_msi1_base_msb = 0x0000094c, .hal_tcl1_ring_msi1_data = 0x00000950, .hal_tcl_ring_base_lsb = 0x00000b58, + .hal_tcl1_ring_base_lsb = 0x00000900, + .hal_tcl1_ring_base_msb = 0x00000904, + .hal_tcl2_ring_base_lsb = 0x00000978,/* TCL STATUS ring address */ .hal_tcl_status_ring_base_lsb = 0x00000d38,
@@ -761,6 +773,12 @@ static const struct ath12k_hw_regs qcn9274_v2_regs = {/* REO status ring address */ .hal_reo_status_ring_base = 0x00000aa0, + +/* CE base address */ + .hal_umac_ce0_src_reg_base = 0x01b80000, + .hal_umac_ce0_dest_reg_base = 0x01b81000, + .hal_umac_ce1_src_reg_base = 0x01b82000, + .hal_umac_ce1_dest_reg_base = 0x01b83000, };static const struct ath12k_hw_regs wcn7850_regs = {
@@ -775,6 +793,9 @@ static const struct ath12k_hw_regs wcn7850_regs = { .hal_tcl1_ring_msi1_base_msb = 0x0000094c, .hal_tcl1_ring_msi1_data = 0x00000950, .hal_tcl_ring_base_lsb = 0x00000b58, + .hal_tcl1_ring_base_lsb = 0x00000900, + .hal_tcl1_ring_base_msb = 0x00000904, + .hal_tcl2_ring_base_lsb = 0x00000978,/* TCL STATUS ring address */ .hal_tcl_status_ring_base_lsb = 0x00000d38,
@@ -837,6 +858,12 @@ static const struct ath12k_hw_regs wcn7850_regs = {/* REO status ring address */ .hal_reo_status_ring_base = 0x00000a84, + +/* CE base address */ + .hal_umac_ce0_src_reg_base = 0x01b80000, + .hal_umac_ce0_dest_reg_base = 0x01b81000, + .hal_umac_ce1_src_reg_base = 0x01b82000, + .hal_umac_ce1_dest_reg_base = 0x01b83000, };static const struct ath12k_hw_hal_params ath12k_hw_hal_params_qcn9274 = {
drivers/net/wireless/ath/ath12k/hw.h +9 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH12K_HW_H
@@ -293,6 +293,9 @@ struct ath12k_hw_regs {u32 hal_tcl1_ring_msi1_base_msb;u32 hal_tcl1_ring_msi1_data;u32 hal_tcl_ring_base_lsb; +u32 hal_tcl1_ring_base_lsb; +u32 hal_tcl1_ring_base_msb; +u32 hal_tcl2_ring_base_lsb;u32 hal_tcl_status_ring_base_lsb;
@@ -316,6 +319,11 @@ struct ath12k_hw_regs {u32 pcie_qserdes_sysclk_en_sel;u32 pcie_pcs_osc_dtct_config_base; +u32 hal_umac_ce0_src_reg_base; +u32 hal_umac_ce0_dest_reg_base; +u32 hal_umac_ce1_src_reg_base; +u32 hal_umac_ce1_dest_reg_base; +u32 hal_ppe_rel_ring_base;u32 hal_reo2_ring_base;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 678/780 wifi: ath12k: fix GCC_GCC_PCIE_HOT_RST definition for WCN7850
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 7588a893cde5385ad308400ff167d29a29913b3a ]
GCC_GCC_PCIE_HOT_RST is wrongly defined for WCN7850, causing kernel crash on some specific platforms.
Since this register is divergent for WCN7850 and QCN9274, move it to register table to allow different definitions. Then correct the register address for WCN7850 to fix this issue.
Note IPQ5332 is not affected as it is not PCIe based device.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/hw.c | 6 ++++++ drivers/net/wireless/ath/ath12k/hw.h | 2 ++ drivers/net/wireless/ath/ath12k/pci.c | 6 +++--- drivers/net/wireless/ath/ath12k/pci.h | 4 +++- 4 files changed, 14 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath12k/hw.c +6 -0
@@ -690,6 +690,8 @@ static const struct ath12k_hw_regs qcn9274_v1_regs = { .hal_umac_ce0_dest_reg_base = 0x01b81000, .hal_umac_ce1_src_reg_base = 0x01b82000, .hal_umac_ce1_dest_reg_base = 0x01b83000, + + .gcc_gcc_pcie_hot_rst = 0x1e38338, };static const struct ath12k_hw_regs qcn9274_v2_regs = {
@@ -779,6 +781,8 @@ static const struct ath12k_hw_regs qcn9274_v2_regs = { .hal_umac_ce0_dest_reg_base = 0x01b81000, .hal_umac_ce1_src_reg_base = 0x01b82000, .hal_umac_ce1_dest_reg_base = 0x01b83000, + + .gcc_gcc_pcie_hot_rst = 0x1e38338, };static const struct ath12k_hw_regs wcn7850_regs = {
@@ -864,6 +868,8 @@ static const struct ath12k_hw_regs wcn7850_regs = { .hal_umac_ce0_dest_reg_base = 0x01b81000, .hal_umac_ce1_src_reg_base = 0x01b82000, .hal_umac_ce1_dest_reg_base = 0x01b83000, + + .gcc_gcc_pcie_hot_rst = 0x1e40304, };static const struct ath12k_hw_hal_params ath12k_hw_hal_params_qcn9274 = {
drivers/net/wireless/ath/ath12k/hw.h +2 -0
@@ -355,6 +355,8 @@ struct ath12k_hw_regs {u32 hal_reo_cmd_ring_base;u32 hal_reo_status_ring_base; + +u32 gcc_gcc_pcie_hot_rst; };static inline const char *ath12k_bd_ie_type_str (enum ath12k_bd_ie_type type)
drivers/net/wireless/ath/ath12k/pci.c +3 -3
@@ -292,10 +292,10 @@ static void ath12k_pci_enable_ltssm(struct ath12k_base *ab)ath12k_dbg (ab,ATH12K_DBG_PCI ,"pci ltssm 0x%x\n" , val); - val =ath12k_pci_read32 (ab,GCC_GCC_PCIE_HOT_RST ); + val =ath12k_pci_read32 (ab,GCC_GCC_PCIE_HOT_RST (ab)); val |=GCC_GCC_PCIE_HOT_RST_VAL ; -ath12k_pci_write32 (ab,GCC_GCC_PCIE_HOT_RST , val); - val =ath12k_pci_read32 (ab,GCC_GCC_PCIE_HOT_RST ); +ath12k_pci_write32 (ab,GCC_GCC_PCIE_HOT_RST (ab), val); + val =ath12k_pci_read32 (ab,GCC_GCC_PCIE_HOT_RST (ab));ath12k_dbg (ab,ATH12K_DBG_PCI ,"pci pcie_hot_rst 0x%x\n" , val);
drivers/net/wireless/ath/ath12k/pci.h +3 -1
@@ -28,7 +28,9 @@#define PCIE_PCIE_PARF_LTSSM 0x1e081b0#define PARM_LTSSM_VALUE 0x111 -#define GCC_GCC_PCIE_HOT_RST 0x1e38338 +#define GCC_GCC_PCIE_HOT_RST (ab) \ + ((ab)->hw_params->regs->gcc_gcc_pcie_hot_rst) +#define GCC_GCC_PCIE_HOT_RST_VAL 0x10#define PCIE_PCIE_INT_ALL_CLEAR 0x1e08228
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 679/780 wifi: ath12k: fix uaf in ath12k_core_init()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miaoqing Pan <[email protected]>
[ Upstream commit f3fe49dbddd73f0155a8935af47cb63693069dbe ]
When the execution of ath12k_core_hw_group_assign() or ath12k_core_hw_group_create() fails, the registered notifier chain is not unregistered properly. Its memory is freed after rmmod, which may trigger to a use-after-free (UAF) issue if there is a subsequent access to this notifier chain.
Fixes the issue by calling ath12k_core_panic_notifier_unregister() in failure cases.
Call trace: notifier_chain_register+0x4c/0x1f0 (P) atomic_notifier_chain_register+0x38/0x68 ath12k_core_init+0x50/0x4e8 [ath12k] ath12k_pci_probe+0x5f8/0xc28 [ath12k] pci_device_probe+0xbc/0x1a8 really_probe+0xc8/0x3a0 __driver_probe_device+0x84/0x1b0 driver_probe_device+0x44/0x130 __driver_attach+0xcc/0x208 bus_for_each_dev+0x84/0x100 driver_attach+0x2c/0x40 bus_add_driver+0x130/0x260 driver_register+0x70/0x138 __pci_register_driver+0x68/0x80 ath12k_pci_init+0x30/0x68 [ath12k] ath12k_init+0x28/0x78 [ath12k]
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath12k/core.c +7 -3
@@ -1902,7 +1902,8 @@ int ath12k_core_init(struct ath12k_base *ab)if (!ag) {mutex_unlock (&ath12k_hw_group_mutex);ath12k_warn (ab,"unable to get hw group\n" ); -return -ENODEV ; + ret = -ENODEV ; + goto err_unregister_notifier; }mutex_unlock (&ath12k_hw_group_mutex);
@@ -1917,7 +1918,7 @@ int ath12k_core_init(struct ath12k_base *ab)if (ret) {mutex_unlock (&ag->mutex);ath12k_warn (ab,"unable to create hw group\n" ); - goto err; + goto err_destroy_hw_group; } }
@@ -1925,9 +1926,12 @@ int ath12k_core_init(struct ath12k_base *ab)return 0 ; -err: +err_destroy_hw_group:ath12k_core_hw_group_destroy (ab->ag);ath12k_core_hw_group_unassign (ab); +err_unregister_notifier: +ath12k_core_panic_notifier_unregister (ab); +return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 680/780 regulator: max20086: Fix refcount leak in max20086_parse_regulators_dt()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 06118ae36855b7d3d22688298e74a766ccf0cb7a ]
There is a missing call to of_node_put() if devm_kcalloc() fails. Fix this by changing the code to use cleanup.h magic to drop the refcount.
--- drivers/regulator/max20086-regulator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/max20086-regulator.c +3 -3
@@ -5,6 +5,7 @@// Copyright (C) 2022 Laurent Pinchart <[email protected]> // Copyright (C) 2018 Avnet, Inc. +#include <linux/cleanup.h> #include <linux/err.h> #include <linux/gpio/consumer.h> #include <linux/i2c.h>
@@ -133,11 +134,11 @@ static int max20086_regulators_register(struct max20086 *chip)static int max20086_parse_regulators_dt (struct max20086 *chip,bool *boot_on) {struct of_regulator_match *matches; -struct device_node *node;unsigned int i;int ret; - node =of_get_child_by_name (chip->dev->of_node,"regulators" ); + struct device_node *node __free(device_node) = +of_get_child_by_name (chip->dev->of_node,"regulators" );if (!node) {dev_err (chip->dev,"regulators node not found\n" );return -ENODEV ;
@@ -153,7 +154,6 @@ static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on) ret =of_regulator_match (chip->dev, node, matches, chip->info->num_outputs); -of_node_put (node);if (ret <0 ) {dev_err (chip->dev,"Failed to match regulators\n" );return -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 681/780 spi: omap2-mcspi: Disable multi mode when CS should be kept asserted after message
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Félix Piédallu <[email protected]>
[ Upstream commit a5bf5272295d3f058adeee025d2a0b6625f8ba7b ]
When the last transfer of a SPI message has the cs_change flag, the CS is kept asserted after the message.
Multi-mode can't respect this as CS is deasserted by the hardware at the end of the message.
Disable multi-mode when not applicable to the current message.
--- drivers/spi/spi-omap2-mcspi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/spi/spi-omap2-mcspi.c +9 -3
@@ -1287,9 +1287,15 @@ static int omap2_mcspi_prepare_message(struct spi_controller *ctlr, mcspi->use_multi_mode = false; } -/* Check if transfer asks to change the CS status after the transfer */ -if (!tr->cs_change) - mcspi->use_multi_mode = false; +if (list_is_last (&tr->transfer_list, &msg->transfers)) { +/* Check if transfer asks to keep the CS status after the whole message */ +if (tr->cs_change) + mcspi->use_multi_mode = false; + }else { +/* Check if transfer asks to change the CS status after the transfer */ +if (!tr->cs_change) + mcspi->use_multi_mode = false; + }/* * If at least one message is not compatible, switch back to single mode
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 682/780 spi: omap2-mcspi: Disable multi-mode when the previous message kept CS asserted
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Félix Piédallu <[email protected]>
[ Upstream commit 10c24e0d2f7cd2bc8a847cf750f01301ce67dbc8 ]
When the last transfer of a SPI message has the cs_change flag, the CS is kept asserted after the message.
The next message can't use multi-mode because the CS will be briefly deasserted before the first transfer.
Remove the early exit of the list_for_each_entry because the last transfer actually needs to be always checked.
--- drivers/spi/spi-omap2-mcspi.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/spi/spi-omap2-mcspi.c +10 -10
@@ -134,6 +134,7 @@ struct omap2_mcspi {size_t max_xfer_len;u32 ref_clk_hz;bool use_multi_mode; +bool last_msg_kept_cs; };struct omap2_mcspi_cs {
@@ -1269,6 +1270,10 @@ static int omap2_mcspi_prepare_message(struct spi_controller *ctlr,* multi-mode is applicable. */ mcspi->use_multi_mode = true; + +if (mcspi->last_msg_kept_cs) + mcspi->use_multi_mode = false; +list_for_each_entry (tr, &msg->transfers, transfer_list) {if (!tr->bits_per_word) bits_per_word = msg->spi->bits_per_word;
@@ -1289,22 +1294,17 @@ static int omap2_mcspi_prepare_message(struct spi_controller *ctlr,if (list_is_last (&tr->transfer_list, &msg->transfers)) {/* Check if transfer asks to keep the CS status after the whole message */ -if (tr->cs_change) +if (tr->cs_change) { mcspi->use_multi_mode = false; + mcspi->last_msg_kept_cs = true; + }else { + mcspi->last_msg_kept_cs = false; + } }else {/* Check if transfer asks to change the CS status after the transfer */ if (!tr->cs_change) mcspi->use_multi_mode = false; } - -/* -* If at least one message is not compatible, switch back to single mode -* -* The bits_per_word of certain transfer can be different, but it will have no -* impact on the signal itself. -*/ -if (!mcspi->use_multi_mode) -break ; }omap2_mcspi_set_mode (ctlr);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 683/780 pinctrl: qcom: pinctrl-qcm2290: Add missing pins
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wojciech Slenska <[email protected]>
[ Upstream commit 315345610faee8a0568b522dba9e35067d1732ab ]
Added the missing pins to the qcm2290_pins table.
--- drivers/pinctrl/qcom/pinctrl-qcm2290.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/pinctrl/qcom/pinctrl-qcm2290.c +9 -0
@@ -165,6 +165,10 @@ static const struct pinctrl_pin_desc qcm2290_pins[] = {PINCTRL_PIN (62 ,"GPIO_62" ),PINCTRL_PIN (63 ,"GPIO_63" ),PINCTRL_PIN (64 ,"GPIO_64" ), +PINCTRL_PIN (65 ,"GPIO_65" ), +PINCTRL_PIN (66 ,"GPIO_66" ), +PINCTRL_PIN (67 ,"GPIO_67" ), +PINCTRL_PIN (68 ,"GPIO_68" ),PINCTRL_PIN (69 ,"GPIO_69" ),PINCTRL_PIN (70 ,"GPIO_70" ), PINCTRL_PIN(71, "GPIO_71"),
@@ -179,12 +183,17 @@ static const struct pinctrl_pin_desc qcm2290_pins[] = {PINCTRL_PIN (80 ,"GPIO_80" ),PINCTRL_PIN (81 ,"GPIO_81" ),PINCTRL_PIN (82 ,"GPIO_82" ), +PINCTRL_PIN (83 ,"GPIO_83" ), +PINCTRL_PIN (84 ,"GPIO_84" ), +PINCTRL_PIN (85 ,"GPIO_85" ),PINCTRL_PIN (86 ,"GPIO_86" ),PINCTRL_PIN (87 ,"GPIO_87" ),PINCTRL_PIN (88 ,"GPIO_88" ),PINCTRL_PIN (89 ,"GPIO_89" ),PINCTRL_PIN (90 ,"GPIO_90" ),PINCTRL_PIN (91 ,"GPIO_91" ), +PINCTRL_PIN (92 ,"GPIO_92" ), +PINCTRL_PIN (93 ,"GPIO_93" ),PINCTRL_PIN (94 ,"GPIO_94" ),PINCTRL_PIN (95 ,"GPIO_95" ), PINCTRL_PIN(96, "GPIO_96"),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 684/780 accel/amdxdna: Fix incorrect PSP firmware size
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lizhi Hou <[email protected]>
[ Upstream commit 779a0c9e06a91d0007f2a4f4071e3b9a8102b15e ]
The incorrect PSP firmware size is used for initializing. It may cause error for newer version firmware.
--- drivers/accel/amdxdna/aie2_psp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/accel/amdxdna/aie2_psp.c +2 -2
@@ -126,8 +126,8 @@ struct psp_device *aie2m_psp_create(struct drm_device *ddev, struct psp_config * psp->ddev = ddev;memcpy (psp->psp_regs, conf->psp_regs,sizeof (psp->psp_regs)); - psp->fw_buf_sz =ALIGN (conf->fw_size,PSP_FW_ALIGN ) +PSP_FW_ALIGN ; - psp->fw_buffer =drmm_kmalloc (ddev, psp->fw_buf_sz,GFP_KERNEL ); + psp->fw_buf_sz =ALIGN (conf->fw_size,PSP_FW_ALIGN ); + psp->fw_buffer =drmm_kmalloc (ddev, psp->fw_buf_sz +PSP_FW_ALIGN ,GFP_KERNEL );if (!psp->fw_buffer) {drm_err (ddev,"no memory for fw buffer" );return NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 685/780 scsi: iscsi: Fix incorrect error path labels for flashnode operations
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit 9b17621366d210ffee83262a8754086ebbde5e55 ]
Correct the error handling goto labels used when host lookup fails in various flashnode-related event handlers:
- iscsi_new_flashnode()
- iscsi_del_flashnode()
- iscsi_login_flashnode()
- iscsi_logout_flashnode()
- iscsi_logout_flashnode_sid()
scsi_host_put() is not required when shost is NULL, so jumping to the correct label avoids unnecessary operations. These functions previously jumped to the wrong goto label (put_host), which did not match the intended cleanup logic.
Use the correct exit labels (exit_new_fnode, exit_del_fnode, etc.) to ensure proper error handling. Also remove the unused put_host label under iscsi_new_flashnode() as it is no longer needed.
No functional changes beyond accurate error path correction.
--- drivers/scsi/scsi_transport_iscsi.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +5 -6
@@ -3499,7 +3499,7 @@ static int iscsi_new_flashnode(struct iscsi_transport *transport,pr_err ("%s could not find host no %u\n" , __func__, ev->u.new_flashnode.host_no); err = -ENODEV ; - goto put_host; + goto exit_new_fnode; } index = transport->new_flashnode (shost, data, len);
@@ -3509,7 +3509,6 @@ static int iscsi_new_flashnode(struct iscsi_transport *transport,else err = -EIO ; -put_host:scsi_host_put (shost); exit_new_fnode:
@@ -3534,7 +3533,7 @@ static int iscsi_del_flashnode(struct iscsi_transport *transport,pr_err ("%s could not find host no %u\n" , __func__, ev->u.del_flashnode.host_no); err = -ENODEV ; - goto put_host; + goto exit_del_fnode; } idx = ev->u.del_flashnode.flashnode_idx;
@@ -3576,7 +3575,7 @@ static int iscsi_login_flashnode(struct iscsi_transport *transport,pr_err ("%s could not find host no %u\n" , __func__, ev->u.login_flashnode.host_no); err = -ENODEV ; - goto put_host; + goto exit_login_fnode; } idx = ev->u.login_flashnode.flashnode_idx;
@@ -3628,7 +3627,7 @@ static int iscsi_logout_flashnode(struct iscsi_transport *transport,pr_err ("%s could not find host no %u\n" , __func__, ev->u.logout_flashnode.host_no); err = -ENODEV ; - goto put_host; + goto exit_logout_fnode; } idx = ev->u.logout_flashnode.flashnode_idx;
@@ -3678,7 +3677,7 @@ static int iscsi_logout_flashnode_sid(struct iscsi_transport *transport,pr_err ("%s could not find host no %u\n" , __func__, ev->u.logout_flashnode.host_no); err = -ENODEV ; - goto put_host; + goto exit_logout_sid; } session =iscsi_session_lookup (ev->u.logout_flashnode_sid.sid);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 686/780 net_sched: sch_sfq: fix a potential crash on gso_skb handling
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 82ffbe7776d0ac084031f114167712269bf3d832 ]
SFQ has an assumption of always being able to queue at least one packet.
However, after the blamed commit, sch->q.len can be inflated by packets in sch->gso_skb, and an enqueue() on an empty SFQ qdisc can be followed by an immediate drop.
Fix sfq_drop() to properly clear q->tail in this situation.
Tested:
ip netns add lb
ip link add dev to-lb type veth peer name in-lb netns lb
ethtool -K to-lb tso off # force qdisc to requeue gso_skb
ip netns exec lb ethtool -K in-lb gro on # enable NAPI ip link set dev to-lb up
ip -netns lb link set dev in-lb up
ip addr add dev to-lb 192.168.20.1/24
ip -netns lb addr add dev in-lb 192.168.20.2/24 tc qdisc replace dev to-lb root sfq limit 100
ip netns exec lb netserver
netperf -H 192.168.20.2 -l 100 &
netperf -H 192.168.20.2 -l 100 &
netperf -H 192.168.20.2 -l 100 &
netperf -H 192.168.20.2 -l 100 &
--- net/sched/sch_sfq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/sched/sch_sfq.c +4 -1
@@ -310,7 +310,10 @@ static unsigned int sfq_drop(struct Qdisc *sch, struct sk_buff **to_free)/* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */ x = q->tail->next; slot = &q->slots[x]; - q->tail->next = slot->next; +if (slot->next == x) + q->tail =NULL ;/* no more active slots */ +else + q->tail->next = slot->next; q->ht[slot->hash] =SFQ_EMPTY_SLOT ; goto drop; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 687/780 powerpc/powernv/memtrace: Fix out of bounds issue in memtrace mmap
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ritesh Harjani (IBM) <[email protected]>
[ Upstream commit cd097df4596f3a1e9d75eb8520162de1eb8485b2 ]
memtrace mmap issue has an out of bounds issue. This patch fixes the by checking that the requested mapping region size should stay within the allocated region size.
--- arch/powerpc/platforms/powernv/memtrace.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/powerpc/platforms/powernv/memtrace.c +6 -2
@@ -48,11 +48,15 @@ static ssize_t memtrace_read(struct file *filp, char __user *ubuf,static int memtrace_mmap (struct file *filp,struct vm_area_struct *vma) {struct memtrace_entry *ent = filp->private_data; +unsigned long ent_nrpages = ent->size >>PAGE_SHIFT ; +unsigned long vma_nrpages =vma_pages (vma); -if (ent->size < vma->vm_end - vma->vm_start) +/* The requested page offset should be within object's page count */ +if (vma->vm_pgoff >= ent_nrpages)return -EINVAL ; -if (vma->vm_pgoff <<PAGE_SHIFT >= ent->size) +/* The requested mapping range should remain within the bounds */ +if (vma_nrpages > ent_nrpages - vma->vm_pgoff)return -EINVAL ; vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 688/780 powerpc/vas: Return -EINVAL if the offset is non-zero in mmap()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haren Myneni <[email protected]>
[ Upstream commit 0d67f0dee6c9176bc09a5482dd7346e3a0f14d0b ]
The user space calls mmap() to map VAS window paste address and the kernel returns the complete mapped page for each window. So return -EINVAL if non-zero is passed for offset parameter to mmap().
See Documentation/arch/powerpc/vas-api.rst for mmap() restrictions.
--- arch/powerpc/platforms/book3s/vas-api.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/powerpc/platforms/book3s/vas-api.c +9 -0
@@ -521,6 +521,15 @@ static int coproc_mmap(struct file *fp, struct vm_area_struct *vma)return -EINVAL ; } +/* +* Map complete page to the paste address. So the user +* space should pass 0ULL to the offset parameter. +*/ +if (vma->vm_pgoff) { +pr_debug ("Page offset unsupported to map paste address\n" ); +return -EINVAL ; + } +/* Ensure instance has an open send window */ if (!txwin) {pr_err ("No send window open?\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 689/780 drm/vc4: fix infinite EPROBE_DEFER loop
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabriel Dalimonte <[email protected]>
[ Upstream commit c0317ad44f45b3c1f0ff46a4e28d14c7bccdedf4 ]
vc4_hdmi_audio_init calls devm_snd_dmaengine_pcm_register which may return EPROBE_DEFER. Calling drm_connector_hdmi_audio_init adds a child device. The driver model docs[1] state that adding a child device prior to returning EPROBE_DEFER may result in an infinite loop.
[1] https://www.kernel.org/doc/html/v6.14/driver-api/driver-model/driver.html
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +6 -6
@@ -559,12 +559,6 @@ static int vc4_hdmi_connector_init(struct drm_device *dev,if (ret)return ret; - ret =drm_connector_hdmi_audio_init (connector, dev->dev, - &vc4_hdmi_audio_funcs, -8 , false,-1 ); -if (ret) -return ret; -drm_connector_helper_add (connector, &vc4_hdmi_connector_helper_funcs);/*
@@ -2274,6 +2268,12 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)return ret; } + ret =drm_connector_hdmi_audio_init (&vc4_hdmi->connector, dev, + &vc4_hdmi_audio_funcs,8 , false, +-1 ); +if (ret) +return ret; + dai_link->cpus = &vc4_hdmi->audio.cpu; dai_link->codecs = &vc4_hdmi->audio.codec; dai_link->platforms = &vc4_hdmi->audio.platform;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 690/780 drm/meson: fix debug log statement when setting the HDMI clocks
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Blumenstingl <[email protected]>
[ Upstream commit d17e61ab63fb7747b340d6a66bf1408cd5c6562b ]
The "phy" and "vclk" frequency labels were swapped, making it more difficult to debug driver errors. Swap the label order to make them match with the actual frequencies printed to correct this.
--- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/meson/meson_encoder_hdmi.c +1 -1
@@ -108,7 +108,7 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, venc_freq /=2 ;dev_dbg (priv->dev, -"vclk:%lluHz phy=%lluHz venc=%lluHz hdmi=%lluHz enci=%d\n" , +"phy:%lluHz vclk=%lluHz venc=%lluHz hdmi=%lluHz enci=%d\n" , phy_freq, vclk_freq, venc_freq, hdmi_freq, priv->venc.hdmi_use_enci);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 691/780 drm/meson: use vclk_freq instead of pixel_freq in debug print
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Blumenstingl <[email protected]>
[ Upstream commit faf2f8382088e8c74bd6eeb236c8c9190e61615e ]
meson_vclk_vic_supported_freq() has a debug print which includes the pixel freq. However, within the whole function the pixel freq is irrelevant, other than checking the end of the params array. Switch to printing the vclk_freq which is being compared / matched against the inputs to the function to avoid confusion when analyzing error reports from users.
--- drivers/gpu/drm/meson/meson_vclk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/meson/meson_vclk.c +3 -3
@@ -790,9 +790,9 @@ meson_vclk_vic_supported_freq(struct meson_drm *priv, }for (i =0 ; params[i].pixel_freq ; ++i) { -DRM_DEBUG_DRIVER ("i = %d pixel_freq = %lluHz alt = %lluHz\n" , - i, params[i].pixel_freq, -PIXEL_FREQ_1000_1001 (params[i].pixel_freq)); +DRM_DEBUG_DRIVER ("i = %d vclk_freq = %lluHz alt = %lluHz\n" , + i, params[i].vclk_freq, +PIXEL_FREQ_1000_1001 (params[i].vclk_freq));DRM_DEBUG_DRIVER ("i = %d phy_freq = %lluHz alt = %lluHz\n" , i, params[i].phy_freq,PHY_FREQ_1000_1001 (params[i].phy_freq));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 692/780 drm/meson: fix more rounding issues with 59.94Hz modes
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Blumenstingl <[email protected]>
[ Upstream commit 0cee6c4d3518b2e757aedae78771f17149f57653 ]
Commit 1017560164b6 ("drm/meson: use unsigned long long / Hz for frequency types") attempts to resolve video playback using 59.94Hz.
using YUV420 by changing the clock calculation to use
Hz instead of kHz (thus yielding more precision).
The basic calculation itself is correct, however the comparisions in meson_vclk_vic_supported_freq() and meson_vclk_setup() don't work anymore for 59.94Hz modes (using the freq * 1000 / 1001 logic). For example, drm/edid specifies a 593407kHz clock for [email protected]. With the mentioend commit we convert this to Hz. Then meson_vclk tries to find a matchig "params" entry (as the clock setup code currently only supports specific frequencies) by taking the venc_freq from the params and calculating the "alt frequency" (used for the 59.94Hz modes) from it, which is:
(594000000Hz * 1000) / 1001 = 593406593Hz
Similar calculation is applied to the phy_freq (TMDS clock), which is 10 times the pixel clock.
Implement a new meson_vclk_freqs_are_matching_param() function whose purpose is to compare if the requested and calculated frequencies. They may not match exactly (for the reasons mentioned above). Allow the clocks to deviate slightly to make the 59.94Hz modes again.
--- drivers/gpu/drm/meson/meson_vclk.c | 55 ++++++++++++++++++------------ 1 file changed, 34 insertions(+), 21 deletions(-)
drivers/gpu/drm/meson/meson_vclk.c +34 -21
@@ -110,10 +110,7 @@#define HDMI_PLL_LOCK BIT(31)#define HDMI_PLL_LOCK_G12A (3 << 30) -#define PIXEL_FREQ_1000_1001 (_freq) \ - DIV_ROUND_CLOSEST_ULL((_freq) * 1000ULL, 1001ULL) -#define PHY_FREQ_1000_1001 (_freq) \ - (PIXEL_FREQ_1000_1001(DIV_ROUND_DOWN_ULL(_freq, 10ULL)) * 10) +#define FREQ_1000_1001 (_freq) DIV_ROUND_CLOSEST_ULL((_freq) * 1000ULL, 1001ULL)/* VID PLL Dividers */ enum {
@@ -772,6 +769,36 @@ static void meson_hdmi_pll_generic_set(struct meson_drm *priv, pll_freq); } +static bool meson_vclk_freqs_are_matching_param (unsigned int idx, +unsigned long long phy_freq, +unsigned long long vclk_freq) +{ +DRM_DEBUG_DRIVER ("i = %d vclk_freq = %lluHz alt = %lluHz\n" , + idx, params[idx].vclk_freq, +FREQ_1000_1001 (params[idx].vclk_freq)); +DRM_DEBUG_DRIVER ("i = %d phy_freq = %lluHz alt = %lluHz\n" , + idx, params[idx].phy_freq, +FREQ_1000_1001 (params[idx].phy_freq)); + +/* Match strict frequency */ +if (phy_freq == params[idx].phy_freq && + vclk_freq == params[idx].vclk_freq) +return true; + +/* Match 1000/1001 variant: vclk deviation has to be less than 1kHz +* (drm EDID is defined in 1kHz steps, so everything smaller must be +* rounding error) and the PHY freq deviation has to be less than +* 10kHz (as the TMDS clock is 10 times the pixel clock, so anything +* smaller must be rounding error as well). +*/ +if (abs (vclk_freq -FREQ_1000_1001 (params[idx].vclk_freq)) <1000 && +abs (phy_freq -FREQ_1000_1001 (params[idx].phy_freq)) <10000 ) +return true; + +/* no match */ +return false; +} + enum drm_mode_status meson_vclk_vic_supported_freq(struct meson_drm *priv, unsigned long long phy_freq,
@@ -790,19 +817,7 @@ meson_vclk_vic_supported_freq(struct meson_drm *priv, }for (i =0 ; params[i].pixel_freq ; ++i) { -DRM_DEBUG_DRIVER ("i = %d vclk_freq = %lluHz alt = %lluHz\n" , - i, params[i].vclk_freq, -PIXEL_FREQ_1000_1001 (params[i].vclk_freq)); -DRM_DEBUG_DRIVER ("i = %d phy_freq = %lluHz alt = %lluHz\n" , - i, params[i].phy_freq, -PHY_FREQ_1000_1001 (params[i].phy_freq)); -/* Match strict frequency */ -if (phy_freq == params[i].phy_freq && - vclk_freq == params[i].vclk_freq) -return MODE_OK ; -/* Match 1000/1001 variant */ -if (phy_freq ==PHY_FREQ_1000_1001 (params[i].phy_freq) && - vclk_freq ==PIXEL_FREQ_1000_1001 (params[i].vclk_freq)) +if (meson_vclk_freqs_are_matching_param (i, phy_freq, vclk_freq))return MODE_OK ; }
@@ -1075,10 +1090,8 @@ void meson_vclk_setup(struct meson_drm *priv, unsigned int target, }for (freq =0 ; params[freq].pixel_freq ; ++freq) { -if ((phy_freq == params[freq].phy_freq || - phy_freq ==PHY_FREQ_1000_1001 (params[freq].phy_freq)) && - (vclk_freq == params[freq].vclk_freq || - vclk_freq ==PIXEL_FREQ_1000_1001 (params[freq].vclk_freq))) { +if (meson_vclk_freqs_are_matching_param (freq, phy_freq, + vclk_freq)) {if (vclk_freq != params[freq].vclk_freq) vic_alternate_clock = true;else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 693/780 pinctrl: sunxi: dt: Consider pin base when calculating bank number from pin
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen-Yu Tsai <[email protected]>
[ Upstream commit 5558f27a58459a4038ebb23bcb5bd40c1e345c57 ]
In prepare_function_table() when the pinctrl function table IRQ entries are generated, the pin bank is calculated from the absolute pin number; however the IRQ bank mux array is indexed from the first pin bank of the controller. For R_PIO controllers, this means the absolute pin bank is way off from the relative pin bank used for array indexing.
Correct this by taking into account the pin base of the controller.
--- drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c +4 -4
@@ -143,7 +143,7 @@ static struct sunxi_desc_pin *init_pins_table(struct device *dev,*/ static int prepare_function_table (struct device *dev,struct device_node *pnode,struct sunxi_desc_pin *pins,int npins, -const u8 *irq_bank_muxes) +unsigned pin_base,const u8 *irq_bank_muxes) {struct device_node *node;struct property *prop;
@@ -166,7 +166,7 @@ static int prepare_function_table(struct device *dev, struct device_node *pnode,*/ for (i =0 ; i < npins; i++) {struct sunxi_desc_pin *pin = &pins[i]; -int bank = pin->pin.number /PINS_PER_BANK ; +int bank = (pin->pin.number - pin_base) /PINS_PER_BANK ;if (irq_bank_muxes[bank]) { pin->variant++;
@@ -211,7 +211,7 @@ static int prepare_function_table(struct device *dev, struct device_node *pnode, last_bank =0 ;for (i =0 ; i < npins; i++) {struct sunxi_desc_pin *pin = &pins[i]; -int bank = pin->pin.number /PINS_PER_BANK ; +int bank = (pin->pin.number - pin_base) /PINS_PER_BANK ;int lastfunc = pin->variant +1 ;int irq_mux = irq_bank_muxes[bank];
@@ -353,7 +353,7 @@ int sunxi_pinctrl_dt_table_init(struct platform_device *pdev,return PTR_ERR (pins); ret =prepare_function_table (&pdev->dev, pnode, pins, desc->npins, - irq_bank_muxes); + desc->pin_base, irq_bank_muxes);if (ret)return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 694/780 i40e: return false from i40e_reset_vf if reset is in progress
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robert Malz <[email protected]>
[ Upstream commit a2c90d63b71223d69a813333c1abf4fdacddbbe5 ]
The function i40e_vc_reset_vf attempts, up to 20 times, to handle a VF reset request, using the return value of i40e_reset_vf as an indicator of whether the reset was successfully triggered. Currently, i40e_reset_vf always returns true, which causes new reset requests to be ignored if a different VF reset is already in progress.
This patch updates the return value of i40e_reset_vf to reflect when another VF reset is in progress, allowing the caller to properly use the retry mechanism.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +3 -3
@@ -1546,8 +1546,8 @@ static void i40e_cleanup_reset_vf(struct i40e_vf *vf)* @vf: pointer to the VF structure * @flr: VFLR was issued or not * -* Returns true if the VF is in reset, resets successfully, or resets -* are disabled and false otherwise. +* Return: True if reset was performed successfully or if resets are disabled. +* False if reset is already in progress. **/ bool i40e_reset_vf (struct i40e_vf *vf,bool flr) {
@@ -1566,7 +1566,7 @@ bool i40e_reset_vf(struct i40e_vf *vf, bool flr)/* If VF is being reset already we don't need to continue. */ if (test_and_set_bit (I40E_VF_STATE_RESETTING , &vf->vf_states)) -return true; +return false;i40e_trigger_vf_reset (vf, flr);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 695/780 i40e: retry VFLR handling if there is ongoing VF reset
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robert Malz <[email protected]>
[ Upstream commit fb4e9239e029954a37a00818b21e837cebf2aa10 ]
When a VFLR interrupt is received during a VF reset initiated from a different source, the VFLR may be not fully handled. This can leave the VF in an undefined state.
To address this, set the I40E_VFLR_EVENT_PENDING bit again during VFLR handling if the reset is not yet complete. This ensures the driver will properly complete the VF reset in such scenarios.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +4 -1
@@ -4328,7 +4328,10 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf) reg =rd32 (hw,I40E_GLGEN_VFLRSTAT (reg_idx));if (reg &BIT (bit_idx))/* i40e_reset_vf will clear the bit in GLGEN_VFLRSTAT */ -i40e_reset_vf (vf, true); +if (!i40e_reset_vf (vf, true)) { +/* At least one VF did not finish resetting, retry next time */ +set_bit (__I40E_VFLR_EVENT_PENDING, pf->state); + } }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 696/780 iavf: fix reset_task for early reset event
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmed Zaki <[email protected]>
[ Upstream commit 0c6f4631436ecea841f1583b98255aedd7495b18 ]
If a reset event is received from the PF early in the init cycle, the state machine hangs for about 25 seconds.
Reproducer:
echo 1 > /sys/class/net/$PF0/device/sriov_numvfs ip link set dev $PF0 vf 0 mac $NEW_MAC
The log shows:
[792.620416] ice 0000:5e:00.0: Enabling 1 VFs [792.738812] iavf 0000:5e:01.0: enabling device (0000 -> 0002) [792.744182] ice 0000:5e:00.0: Enabling 1 VFs with 17 vectors and 16 queues per VF [792.839964] ice 0000:5e:00.0: Setting MAC 52:54:00:00:00:11 on VF 0. VF driver will be reinitialized [813.389684] iavf 0000:5e:01.0: Failed to communicate with PF; waiting before retry [818.635918] iavf 0000:5e:01.0: Hardware came out of reset. Attempting reinit. [818.766273] iavf 0000:5e:01.0: Multiqueue Enabled: Queue pair count = 16
Fix it by scheduling the reset task and making the reset task capable of resetting early in the init cycle.
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 11 +++++++++++ drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 17 +++++++++++++++++ 2 files changed, 28 insertions(+)
drivers/net/ethernet/intel/iavf/iavf_main.c +11 -0
@@ -3209,6 +3209,17 @@ static void iavf_reset_task(struct work_struct *work) } continue_reset: +/* If we are still early in the state machine, just restart. */ +if (adapter->state <= __IAVF_INIT_FAILED) { +iavf_shutdown_adminq (hw); +iavf_change_state (adapter, __IAVF_STARTUP); +iavf_startup (adapter); +queue_delayed_work (adapter->wq, &adapter->watchdog_task, +msecs_to_jiffies (30 )); +netdev_unlock (netdev); +return ; + } +/* We don't use netif_running() because it may be true prior to * ndo_open() returning, so we can't assume it means all our open * tasks have finished, since we're not holding the rtnl_lock here.
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +17 -0
@@ -79,6 +79,23 @@ iavf_poll_virtchnl_msg(struct iavf_hw *hw, struct iavf_arq_event_info *event,return iavf_status_to_errno (status); received_op = (enum virtchnl_ops )le32_to_cpu (event->desc.cookie_high); + +if (received_op ==VIRTCHNL_OP_EVENT ) { +struct iavf_adapter *adapter = hw->back; +struct virtchnl_pf_event *vpe = + (struct virtchnl_pf_event *)event->msg_buf; + +if (vpe->event !=VIRTCHNL_EVENT_RESET_IMPENDING ) +continue ; + +dev_info (&adapter->pdev->dev,"Reset indication received from the PF\n" ); +if (!(adapter->flags &IAVF_FLAG_RESET_PENDING )) +iavf_schedule_reset (adapter, +IAVF_FLAG_RESET_PENDING ); + +return -EIO ; + } +if (op_to_poll == received_op)break ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 697/780 ice/ptp: fix crosstimestamp reporting
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Nadezhdin <[email protected]>
[ Upstream commit a5a441ae283d54ec329aadc7426991dc32786d52 ]
Set use_nsecs=true as timestamp is reported in ns. Lack of this result in smaller timestamp error window which cause error during phc2sys execution on E825 NICs:
phc2sys[1768.256]: ioctl PTP_SYS_OFFSET_PRECISE: Invalid argument
This problem was introduced in the cited commit which omitted setting use_nsecs to true when converting the ice driver to use convert_base_to_cs().
Testing hints (ethX is PF netdev):
phc2sys -s ethX -c CLOCK_REALTIME -O 37 -m
phc2sys[1769.256]: CLOCK_REALTIME phc offset -5 s0 freq -0 delay 0
--- drivers/net/ethernet/intel/ice/ice_ptp.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/ice/ice_ptp.c +1 -0
@@ -2307,6 +2307,7 @@ static int ice_capture_crosststamp(ktime_t *device, ts = ((u64 )ts_hi <<32 ) | ts_lo; system->cycles = ts; system->cs_id =CSID_X86_ART ; + system->use_nsecs = true;/* Read Device source clock time */ ts_lo =rd32 (hw, cfg->dev_time_l[tmr_idx]);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 698/780 e1000: Move cancel_work_sync to avoid deadlock
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Damato <[email protected]>
[ Upstream commit b4a8085ceefb7bbb12c2b71c55e71fc946c6929f ]
Previously, e1000_down called cancel_work_sync for the e1000 reset task (via e1000_down_and_stop), which takes RTNL.
As reported by users and syzbot, a deadlock is possible in the following scenario:
CPU 0:
- RTNL is held
- e1000_close
- e1000_down
- cancel_work_sync (cancel / wait for e1000_reset_task())
CPU 1:
- process_one_work
- e1000_reset_task
- take RTNL
To remedy this, avoid calling cancel_work_sync from e1000_down (e1000_reset_task does nothing if the device is down anyway). Instead, call cancel_work_sync for e1000_reset_task when the device is being removed.
--- drivers/net/ethernet/intel/e1000/e1000_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/e1000/e1000_main.c +4 -4
@@ -477,10 +477,6 @@ static void e1000_down_and_stop(struct e1000_adapter *adapter)cancel_delayed_work_sync (&adapter->phy_info_task);cancel_delayed_work_sync (&adapter->fifo_stall_task); - -/* Only kill reset task if adapter is not resetting */ -if (!test_bit (__E1000_RESETTING, &adapter->flags)) -cancel_work_sync (&adapter->reset_task); }void e1000_down (struct e1000_adapter *adapter)
@@ -1266,6 +1262,10 @@ static void e1000_remove(struct pci_dev *pdev)unregister_netdev (netdev); +/* Only kill reset task if adapter is not resetting */ +if (!test_bit (__E1000_RESETTING, &adapter->flags)) +cancel_work_sync (&adapter->reset_task); +e1000_phy_hw_reset (hw);kfree (adapter->tx_ring);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 699/780 ACPI: CPPC: Fix NULL pointer dereference when nosmp is used
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yunhui Cui <[email protected]>
[ Upstream commit 15eece6c5b05e5f9db0711978c3e3b7f1a2cfe12 ]
With nosmp in cmdline, other CPUs are not brought up, leaving their cpc_desc_ptr NULL. CPU0's iteration via for_each_possible_cpu() dereferences these NULL pointers, causing panic.
Panic backtrace:
[ 0.401123] Unable to handle kernel NULL pointer dereference at virtual address 00000000000000b8 ... [ 0.403255] [<ffffffff809a5818>] cppc_allow_fast_switch+0x6a/0xd4 ... Kernel panic - not syncing: Attempted to kill init!
--- drivers/acpi/cppc_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/cppc_acpi.c +1 -1
@@ -463,7 +463,7 @@ bool cppc_allow_fast_switch(void)struct cpc_desc *cpc_ptr;int cpu; -for_each_possible_cpu (cpu) { +for_each_present_cpu (cpu) { cpc_ptr =per_cpu (cpc_desc_ptr, cpu); desired_reg = &cpc_ptr->cpc_regs[DESIRED_PERF ]; if (!CPC_IN_SYSTEM_MEMORY(desired_reg) &&
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 700/780 net: Fix TOCTOU issue in sk_is_readable()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Luczaj <[email protected]>
[ Upstream commit 2660a544fdc0940bba15f70508a46cf9a6491230 ]
sk->sk_prot->sock_is_readable is a valid function pointer when sk resides in a sockmap. After the last sk_psock_put() (which usually happens when socket is removed from sockmap), sk->sk_prot gets restored and sk->sk_prot->sock_is_readable becomes NULL.
This makes sk_is_readable() racy, if the value of sk->sk_prot is reloaded after the initial check. Which in turn may lead to a null pointer dereference.
Ensure the function pointer does not turn NULL after the check.
--- include/net/sock.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
include/net/sock.h +5 -2
@@ -2978,8 +2978,11 @@ int sock_ioctl_inout(struct sock *sk, unsigned int cmd,int sk_ioctl (struct sock *sk,unsigned int cmd,void __user *arg);static inline bool sk_is_readable (struct sock *sk) { -if (sk->sk_prot->sock_is_readable) -return sk->sk_prot->sock_is_readable (sk); +const struct proto *prot =READ_ONCE (sk->sk_prot); + +if (prot->sock_is_readable) +return prot->sock_is_readable (sk); +return false; }#endif /* _SOCK_H */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 701/780 netconsole: fix appending sysdata when sysdata_fields == SYSDATA_RELEASE
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo Luiz Duarte <[email protected]>
[ Upstream commit c85bf1975108d2e2431c11d1cb7e95aca587dfbe ]
Before appending sysdata, prepare_extradata() checks if any feature is enabled in sysdata_fields (and exits early if none is enabled).
When SYSDATA_RELEASE was introduced, we missed adding it to the list of features being checked against sysdata_fields in prepare_extradata(). The result was that, if only SYSDATA_RELEASE is enabled in sysdata_fields, we incorreclty exit early and fail to append the release.
Instead of checking specific bits in sysdata_fields, check if sysdata_fields has ALL bit zeroed and exit early if true. This fixes case when only SYSDATA_RELEASE enabled and makes the code more general / less error prone in future feature implementation.
--- drivers/net/netconsole.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/netconsole.c +1 -2
@@ -1252,7 +1252,6 @@ static int sysdata_append_release(struct netconsole_target *nt, int offset)*/ static int prepare_extradata (struct netconsole_target *nt) { -u32 fields =SYSDATA_CPU_NR |SYSDATA_TASKNAME ;int extradata_len;/* userdata was appended when configfs write helper was called
@@ -1260,7 +1259,7 @@ static int prepare_extradata(struct netconsole_target *nt)*/ extradata_len = nt->userdata_length; -if (!(nt->sysdata_fields & fields)) +if (!nt->sysdata_fields) goto out;if (nt->sysdata_fields &SYSDATA_CPU_NR )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 702/780 macsec: MACsec SCI assignment for ES = 0
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Fernandez <[email protected]>
[ Upstream commit d9816ec74e6d6aa29219d010bba3f780ba1d9d75 ]
According to 802.1AE standard, when ES and SC flags in TCI are zero, used SCI should be the current active SC_RX. Current code uses the header MAC address. Without this patch, when ES flag is 0 (using a bridge or switch), header MAC will not fit the SCI and MACSec frames will be discarted.
In order to test this issue, MACsec link should be stablished between two interfaces, setting SC and ES flags to zero and a port identifier different than one. For example, using ip macsec tools:
ip link add link $ETH0 macsec0 type macsec port 11 send_sci off end_station off
ip macsec add macsec0 tx sa 0 pn 2 on key 01 $ETH1_KEY
ip macsec add macsec0 rx port 11 address $ETH1_MAC
ip macsec add macsec0 rx port 11 address $ETH1_MAC sa 0 pn 2 on key 02 ip link set dev macsec0 up
ip link add link $ETH1 macsec1 type macsec port 11 send_sci off end_station off
ip macsec add macsec1 tx sa 0 pn 2 on key 01 $ETH0_KEY
ip macsec add macsec1 rx port 11 address $ETH0_MAC
ip macsec add macsec1 rx port 11 address $ETH0_MAC sa 0 pn 2 on key 02 ip link set dev macsec1 up
--- drivers/net/macsec.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-)
drivers/net/macsec.c +34 -6
@@ -247,15 +247,39 @@ static sci_t make_sci(const u8 *addr, __be16 port)return sci; } -static sci_t macsec_frame_sci (struct macsec_eth_header *hdr,bool sci_present) +static sci_t macsec_active_sci (struct macsec_secy *secy) { -sci_t sci; +struct macsec_rx_sc *rx_sc =rcu_dereference_bh (secy->rx_sc); + +/* Case single RX SC */ +if (rx_sc && !rcu_dereference_bh (rx_sc->next)) +return (rx_sc->active) ? rx_sc->sci :0 ; +/* Case no RX SC or multiple */ +else +return 0 ; +} + +static sci_t macsec_frame_sci (struct macsec_eth_header *hdr,bool sci_present, +struct macsec_rxh_data *rxd) +{ +struct macsec_dev *macsec; +sci_t sci =0 ; -if (sci_present) +/* SC = 1 */ +if (sci_present) {memcpy (&sci, hdr->secure_channel_id,sizeof (hdr->secure_channel_id)); -else +/* SC = 0; ES = 0 */ + }else if ((!(hdr->tci_an & (MACSEC_TCI_ES |MACSEC_TCI_SC ))) && + (list_is_singular (&rxd->secys))) { +/* Only one SECY should exist on this scenario */ + macsec = list_first_or_null_rcu(&rxd->secys, struct macsec_dev, + secys); +if (macsec) +return macsec_active_sci (&macsec->secy); + }else { sci =make_sci (hdr->eth.h_source,MACSEC_PORT_ES ); + }return sci; }
@@ -1109,7 +1133,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)struct macsec_rxh_data *rxd;struct macsec_dev *macsec;unsigned int len; -sci_t sci; +sci_t sci =0 ;u32 hdr_pn;bool cbit;struct pcpu_rx_sc_stats *rxsc_stats;
@@ -1156,11 +1180,14 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)macsec_skb_cb (skb)->has_sci = !!(hdr->tci_an &MACSEC_TCI_SC );macsec_skb_cb (skb)->assoc_num = hdr->tci_an &MACSEC_AN_MASK ; - sci =macsec_frame_sci (hdr,macsec_skb_cb (skb)->has_sci);rcu_read_lock (); rxd =macsec_data_rcu (skb->dev); + sci =macsec_frame_sci (hdr,macsec_skb_cb (skb)->has_sci, rxd); +if (!sci) + goto drop_nosc; +list_for_each_entry_rcu (macsec, &rxd->secys, secys) {struct macsec_rx_sc *sc =find_rx_sc (&macsec->secy, sci);
@@ -1283,6 +1310,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)macsec_rxsa_put (rx_sa); drop_nosa:macsec_rxsc_put (rx_sc); +drop_nosc:rcu_read_unlock (); drop_direct:kfree_skb (skb);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 703/780 net/mdiobus: Fix potential out-of-bounds read/write access
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Raczynski <[email protected]>
[ Upstream commit 0e629694126ca388916f059453a1c36adde219c4 ]
When using publicly available tools like 'mdio-tools' to read/write data from/to network interface and its PHY via mdiobus, there is no verification of parameters passed to the ioctl and it accepts any mdio address. Currently there is support for 32 addresses in kernel via PHY_MAX_ADDR define, but it is possible to pass higher value than that via ioctl. While read/write operation should generally fail in this case, mdiobus provides stats array, where wrong address may allow out-of-bounds read/write.
Fix that by adding address verification before read/write operation. While this excludes this access from any statistics, it improves security of read/write operation.
--- drivers/net/phy/mdio_bus.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/phy/mdio_bus.c +6 -0
@@ -903,6 +903,9 @@ int __mdiobus_read(struct mii_bus *bus, int addr, u32 regnum)lockdep_assert_held_once (&bus->mdio_lock); +if (addr >=PHY_MAX_ADDR ) +return -ENXIO ; +if (bus->read) retval = bus->read (bus, addr, regnum);else
@@ -932,6 +935,9 @@ int __mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val)lockdep_assert_held_once (&bus->mdio_lock); +if (addr >=PHY_MAX_ADDR ) +return -ENXIO ; +if (bus->write) err = bus->write (bus, addr, regnum, val);else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 704/780 net/mdiobus: Fix potential out-of-bounds clause 45 read/write access
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Raczynski <[email protected]>
[ Upstream commit 260388f79e94fb3026c419a208ece8358bb7b555 ]
When using publicly available tools like 'mdio-tools' to read/write data from/to network interface and its PHY via C45 (clause 45) mdiobus, there is no verification of parameters passed to the ioctl and
it accepts any mdio address.
Currently there is support for 32 addresses in kernel via PHY_MAX_ADDR define, but it is possible to pass higher value than that via ioctl. While read/write operation should generally fail in this case, mdiobus provides stats array, where wrong address may allow out-of-bounds read/write.
Fix that by adding address verification before C45 read/write operation. While this excludes this access from any statistics, it improves security of read/write operation.
--- drivers/net/phy/mdio_bus.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/phy/mdio_bus.c +6 -0
@@ -999,6 +999,9 @@ int __mdiobus_c45_read(struct mii_bus *bus, int addr, int devad, u32 regnum)lockdep_assert_held_once (&bus->mdio_lock); +if (addr >=PHY_MAX_ADDR ) +return -ENXIO ; +if (bus->read_c45) retval = bus->read_c45 (bus, addr, devad, regnum);else
@@ -1030,6 +1033,9 @@ int __mdiobus_c45_write(struct mii_bus *bus, int addr, int devad, u32 regnum,lockdep_assert_held_once (&bus->mdio_lock); +if (addr >=PHY_MAX_ADDR ) +return -ENXIO ; +if (bus->write_c45) err = bus->write_c45 (bus, addr, devad, regnum, val);else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 705/780 Bluetooth: Fix NULL pointer deference on eir_get_service_data
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 20a2aa01f5aeb6daad9aeaa7c33dd512c58d81eb ]
The len parameter is considered optional so it can be NULL so it cannot be used for skipping to next entry of EIR_SERVICE_DATA.
--- net/bluetooth/eir.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/bluetooth/eir.c +6 -4
@@ -366,17 +366,19 @@ u8 eir_create_scan_rsp(struct hci_dev *hdev, u8 instance, u8 *ptr)void *eir_get_service_data (u8 *eir,size_t eir_len,u16 uuid,size_t *len) { -while ((eir =eir_get_data (eir, eir_len,EIR_SERVICE_DATA , len))) { +size_t dlen; + +while ((eir =eir_get_data (eir, eir_len,EIR_SERVICE_DATA , &dlen))) {u16 value =get_unaligned_le16 (eir);if (uuid == value) {if (len) - *len -=2 ; + *len = dlen -2 ;return &eir[2 ]; } - eir += *len; - eir_len -= *len; + eir += dlen; + eir_len -= dlen; }return NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 706/780 Bluetooth: hci_sync: Fix broadcast/PA when using an existing instance
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 5725bc608252050ed8a4d47d59225b7dd73474c8 ]
When using and existing adv_info instance for broadcast source it needs to be updated to periodic first before it can be reused, also in case the existing instance already have data hci_set_adv_instance_data cannot be used directly since it would overwrite the existing data so this reappend the original data after the Broadcast ID, if one was generated.
Example:
bluetoothctl># Add PBP to EA so it can be later referenced as the BIS ID bluetoothctl> advertise.service 0x1856 0x00 0x00 bluetoothctl> advertise on
...
< HCI Command: LE Set Extended Advertising Data (0x08|0x0037) plen 13
Handle: 0x01
Operation: Complete extended advertising data (0x03)
Fragment preference: Minimize fragmentation (0x01)
Data length: 0x09
Service Data: Public Broadcast Announcement (0x1856)
Data[2]: 0000
Flags: 0x06
LE General Discoverable Mode
BR/EDR Not Supported...
bluetoothctl># Attempt to acquire Broadcast Source transport bluetoothctl>transport.acquire /org/bluez/hci0/pac_bcast0/fd0
...
< HCI Command: LE Set Extended Advertising Data (0x08|0x0037) plen 255
Handle: 0x01
Operation: Complete extended advertising data (0x03)
Fragment preference: Minimize fragmentation (0x01)
Data length: 0x0e
Service Data: Broadcast Audio Announcement (0x1852)
Broadcast ID: 11371620 (0xad8464)
Service Data: Public Broadcast Announcement (0x1856)
Data[2]: 0000
Flags: 0x06
LE General Discoverable Mode
BR/EDR Not Supported--- net/bluetooth/hci_sync.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
net/bluetooth/hci_sync.c +15 -5
@@ -1559,7 +1559,8 @@ static int hci_enable_per_advertising_sync(struct hci_dev *hdev, u8 instance)static int hci_adv_bcast_annoucement (struct hci_dev *hdev,struct adv_info *adv) {u8 bid[3 ]; -u8 ad[4 +3 ]; +u8 ad[HCI_MAX_EXT_AD_LENGTH ]; +u8 len;/* Skip if NULL adv as instance 0x00 is used for general purpose * advertising so it cannot used for the likes of Broadcast Announcement
@@ -1585,8 +1586,10 @@ static int hci_adv_bcast_annoucement(struct hci_dev *hdev, struct adv_info *adv)/* Generate Broadcast ID */ get_random_bytes (bid,sizeof (bid)); -eir_append_service_data (ad,0 ,0x1852 , bid,sizeof (bid)); -hci_set_adv_instance_data (hdev, adv->instance,sizeof (ad), ad,0 ,NULL ); + len =eir_append_service_data (ad,0 ,0x1852 , bid,sizeof (bid)); +memcpy (ad + len, adv->adv_data, adv->adv_data_len); +hci_set_adv_instance_data (hdev, adv->instance, len + adv->adv_data_len, + ad,0 ,NULL );return hci_update_adv_data_sync (hdev, adv->instance); }
@@ -1603,8 +1606,15 @@ int hci_start_per_adv_sync(struct hci_dev *hdev, u8 instance, u8 data_len,if (instance) { adv =hci_find_adv_instance (hdev, instance); -/* Create an instance if that could not be found */ -if (!adv) { +if (adv) { +/* Turn it into periodic advertising */ + adv->periodic = true; + adv->per_adv_data_len = data_len; +if (data) +memcpy (adv->per_adv_data, data, data_len); + adv->flags = flags; + }else if (!adv) { +/* Create an instance if that could not be found */ adv = hci_add_per_instance(hdev, instance, flags, data_len, data, sync_interval,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 707/780 Bluetooth: eir: Fix possible crashes on eir_create_adv_data
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 47c03902269aff377f959dc3fd94a9733aa31d6e ]
eir_create_adv_data may attempt to add EIR_FLAGS and EIR_TX_POWER without checking if that would fit.
--- net/bluetooth/eir.c | 7 ++++--- net/bluetooth/eir.h | 2 +- net/bluetooth/hci_sync.c | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-)
net/bluetooth/eir.c +4 -3
@@ -242,7 +242,7 @@ u8 eir_create_per_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr)return ad_len; } -u8 eir_create_adv_data (struct hci_dev *hdev,u8 instance,u8 *ptr) +u8 eir_create_adv_data (struct hci_dev *hdev,u8 instance,u8 *ptr,u8 size) {struct adv_info *adv =NULL ;u8 ad_len =0 , flags =0 ;
@@ -286,7 +286,7 @@ u8 eir_create_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr)/* If flags would still be empty, then there is no need to * include the "Flags" AD field". */ -if (flags) { +if (flags && (ad_len +eir_precalc_len (1 ) <= size)) { ptr[0 ] =0x02 ; ptr[1 ] =EIR_FLAGS ; ptr[2 ] = flags;
@@ -316,7 +316,8 @@ u8 eir_create_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr) }/* Provide Tx Power only if we can provide a valid value for it */ -if (adv_tx_power !=HCI_TX_POWER_INVALID ) { +if (adv_tx_power !=HCI_TX_POWER_INVALID && + (ad_len +eir_precalc_len (1 ) <= size)) { ptr[0 ] =0x02 ; ptr[1 ] =EIR_TX_POWER ; ptr[2 ] = (u8 )adv_tx_power;
net/bluetooth/eir.h +1 -1
@@ -9,7 +9,7 @@void eir_create (struct hci_dev *hdev,u8 *data); -u8 eir_create_adv_data (struct hci_dev *hdev,u8 instance,u8 *ptr); +u8 eir_create_adv_data (struct hci_dev *hdev,u8 instance,u8 *ptr,u8 size);u8 eir_create_scan_rsp (struct hci_dev *hdev,u8 instance,u8 *ptr);u8 eir_create_per_adv_data (struct hci_dev *hdev,u8 instance,u8 *ptr);
net/bluetooth/hci_sync.c +3 -2
@@ -1822,7 +1822,8 @@ static int hci_set_ext_adv_data_sync(struct hci_dev *hdev, u8 instance)return 0 ; } - len =eir_create_adv_data (hdev, instance, pdu->data); + len =eir_create_adv_data (hdev, instance, pdu->data, +HCI_MAX_EXT_AD_LENGTH ); pdu->length = len; pdu->handle = adv ? adv->handle : instance;
@@ -1853,7 +1854,7 @@ static int hci_set_adv_data_sync(struct hci_dev *hdev, u8 instance)memset (&cp,0 ,sizeof (cp)); - len =eir_create_adv_data (hdev, instance, cp.data); + len =eir_create_adv_data (hdev, instance, cp.data,sizeof (cp.data));/* There's nothing to do if the data hasn't changed */ if (hdev->adv_data_len == len &&
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 708/780 Bluetooth: MGMT: Fix sparse errors
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 7dd38ba4acbea9875b4ee061e20a26413e39d9f4 ]
This fixes the following errors:
net/bluetooth/mgmt.c:5400:59: sparse: sparse: incorrect type in argument 3
(different base types) @@ expected unsigned short [usertype] handle @@
got restricted __le16 [usertype] monitor_handle @@net/bluetooth/mgmt.c:5400:59: sparse: expected unsigned short [usertype] handlenet/bluetooth/mgmt.c:5400:59: sparse: got restricted __le16 [usertype] monitor_handle
--- net/bluetooth/mgmt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/bluetooth/mgmt.c +2 -2
@@ -5102,11 +5102,11 @@ static void mgmt_adv_monitor_added(struct sock *sk, struct hci_dev *hdev, }static void mgmt_adv_monitor_removed (struct sock *sk,struct hci_dev *hdev, -u16 handle) +__le16 handle) {struct mgmt_ev_adv_monitor_removed ev; - ev.monitor_handle =cpu_to_le16 (handle); + ev.monitor_handle = handle;mgmt_event (MGMT_EV_ADV_MONITOR_REMOVED , hdev, &ev,sizeof (ev), sk); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 709/780 net/mlx5: Ensure fw pages are always allocated on same NUMA
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Moshe Shemesh <[email protected]>
[ Upstream commit f37258133c1e95e61db532e14067e28b4881bf24 ]
When firmware asks the driver to allocate more pages, using event of give_pages, the driver should always allocate it from same NUMA, the original device NUMA. Current code uses dev_to_node() which can result in different NUMA as it is changed by other driver flows, such as mlx5_dma_zalloc_coherent_node(). Instead, use saved numa node for allocating firmware pages.
--- drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +1 -1
@@ -291,7 +291,7 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr, u32 function)static int alloc_system_page (struct mlx5_core_dev *dev,u32 function) {struct device *device =mlx5_core_dma_dev (dev); -int nid =dev_to_node (device); +int nid = dev->priv.numa_node;struct page *page;u64 zero_addr =1 ;u64 addr;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 710/780 net/mlx5: Fix ECVF vports unload on shutdown flow
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amir Tzin <[email protected]>
[ Upstream commit 687560d8a9a2d654829ad0da1ec24242f1de711d ]
Fix shutdown flow UAF when a virtual function is created on the embedded chip (ECVF) of a BlueField device. In such case the vport acl ingress table is not properly destroyed.
ECVF functionality is independent of ecpf_vport_exists capability and thus functions mlx5_eswitch_(enable|disable)_pf_vf_vports() should not test it when enabling/disabling ECVF vports.
kernel log:
[] refcount_t: underflow; use-after-free.
[] WARNING: CPU: 3 PID: 1 at lib/refcount.c:28
refcount_warn_saturate+0x124/0x220 ----------------
[] Call trace:
[] refcount_warn_saturate+0x124/0x220
[] tree_put_node+0x164/0x1e0 [mlx5_core]
[] mlx5_destroy_flow_table+0x98/0x2c0 [mlx5_core] [] esw_acl_ingress_table_destroy+0x28/0x40 [mlx5_core] [] esw_acl_ingress_lgcy_cleanup+0x80/0xf4 [mlx5_core] [] esw_legacy_vport_acl_cleanup+0x44/0x60 [mlx5_core] [] esw_vport_cleanup+0x64/0x90 [mlx5_core]
[] mlx5_esw_vport_disable+0xc0/0x1d0 [mlx5_core] [] mlx5_eswitch_unload_ec_vf_vports+0xcc/0x150 [mlx5_core] [] mlx5_eswitch_disable_sriov+0x198/0x2a0 [mlx5_core] [] mlx5_device_disable_sriov+0xb8/0x1e0 [mlx5_core] [] mlx5_sriov_detach+0x40/0x50 [mlx5_core]
[] mlx5_unload+0x40/0xc4 [mlx5_core]
[] mlx5_unload_one_devl_locked+0x6c/0xe4 [mlx5_core] [] mlx5_unload_one+0x3c/0x60 [mlx5_core]
[] shutdown+0x7c/0xa4 [mlx5_core]
[] pci_device_shutdown+0x3c/0xa0
[] device_shutdown+0x170/0x340
[] __do_sys_reboot+0x1f4/0x2a0
[] __arm64_sys_reboot+0x2c/0x40
[] invoke_syscall+0x78/0x100
[] el0_svc_common.constprop.0+0x54/0x184
[] do_el0_svc+0x30/0xac
[] el0_svc+0x48/0x160
[] el0t_64_sync_handler+0xa4/0x12c
[] el0t_64_sync+0x1a4/0x1a8
[] --[ end trace 9c4601d68c70030e ]---
--- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +13 -8
@@ -1295,12 +1295,15 @@ mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitch *esw, ret =mlx5_eswitch_load_pf_vf_vport (esw,MLX5_VPORT_ECPF , enabled_events);if (ret) goto ecpf_err; -if (mlx5_core_ec_sriov_enabled (esw->dev)) { - ret =mlx5_eswitch_load_ec_vf_vports (esw, esw->esw_funcs.num_ec_vfs, - enabled_events); -if (ret) - goto ec_vf_err; - } + } + +/* Enable ECVF vports */ +if (mlx5_core_ec_sriov_enabled (esw->dev)) { + ret =mlx5_eswitch_load_ec_vf_vports (esw, + esw->esw_funcs.num_ec_vfs, + enabled_events); +if (ret) + goto ec_vf_err; }/* Enable VF vports */
@@ -1331,9 +1334,11 @@ void mlx5_eswitch_disable_pf_vf_vports(struct mlx5_eswitch *esw) {mlx5_eswitch_unload_vf_vports (esw, esw->esw_funcs.num_vfs); +if (mlx5_core_ec_sriov_enabled (esw->dev)) +mlx5_eswitch_unload_ec_vf_vports (esw, + esw->esw_funcs.num_ec_vfs); +if (mlx5_ecpf_vport_exists (esw->dev)) { -if (mlx5_core_ec_sriov_enabled (esw->dev)) -mlx5_eswitch_unload_ec_vf_vports (esw, esw->esw_funcs.num_vfs);mlx5_eswitch_unload_pf_vf_vport (esw,MLX5_VPORT_ECPF ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 711/780 net/mlx5: Fix return value when searching for existing flow group
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 8ec40e3f1f72bf8f8accf18020d487caa99f46a4 ]
When attempting to add a rule to an existing flow group, if a matching flow group exists but is not active, the error code returned should be EAGAIN, so that the rule can be added to the matching flow group once it is active, rather than ENOENT, which indicates that no matching flow group was found.
--- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +4 -1
@@ -2207,6 +2207,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,struct mlx5_flow_handle *rule;struct match_list *iter;bool take_write = false; +bool try_again = false;struct fs_fte *fte;u64 version =0 ;int err;
@@ -2271,6 +2272,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,nested_down_write_ref_node (&g->node,FS_LOCK_PARENT );if (!g->node.active) { + try_again = true;up_write_ref_node (&g->node, false);continue ; }
@@ -2292,7 +2294,8 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,tree_put_node (&fte->node, false);return rule; } - rule =ERR_PTR (-ENOENT ); + err = try_again ? -EAGAIN : -ENOENT ; + rule =ERR_PTR (err); out:kmem_cache_free (steering->ftes_cache, fte);return rule;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 712/780 net/mlx5: HWS, fix missing ip_version handling in definer
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yevgeny Kliteynik <[email protected]>
[ Upstream commit b5e3c76f35ee7e814c2469c73406c5bbf110d89c ]
Fix missing field handling in definer - outer IP version.
--- drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c +3 -0
@@ -559,6 +559,9 @@ hws_definer_conv_outer(struct mlx5hws_definer_conv_data *cd,HWS_SET_HDR (fc, match_param,IP_PROTOCOL_O , outer_headers.ip_protocol, eth_l3_outer.protocol_next_header); +HWS_SET_HDR (fc, match_param,IP_VERSION_O , + outer_headers.ip_version, + eth_l3_outer.ip_version);HWS_SET_HDR (fc, match_param,IP_TTL_O , outer_headers.ttl_hoplimit, eth_l3_outer.time_to_live_hop_limit);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 713/780 net/mlx5: HWS, make sure the uplink is the last destination
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Dogaru <[email protected]>
[ Upstream commit b8335829518ec5988294280e37d735799209d70d ]
When there are more than one destinations, we create a FW flow table and provide it with all the destinations. FW requires to have wire as the last destination in the list (if it exists), otherwise the operation fails with FW syndrome.
This patch fixes the destination array action creation: if it contains a wire destination, it is moved to the end.
--- .../mellanox/mlx5/core/steering/hws/action.c | 14 +++++++------- .../mellanox/mlx5/core/steering/hws/fs_hws.c | 3 +++ .../mellanox/mlx5/core/steering/hws/mlx5hws.h | 1 + 3 files changed, 11 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c +7 -7
@@ -1361,8 +1361,8 @@ mlx5hws_action_create_dest_array(struct mlx5hws_context *ctx,struct mlx5hws_cmd_set_fte_attr fte_attr = {0 };struct mlx5hws_cmd_forward_tbl *fw_island;struct mlx5hws_action *action; -u32 i/*, packet_reformat_id*/ ; -int ret; +int ret, last_dest_idx =-1 ; +u32 i;if (num_dest <=1 ) {mlx5hws_err (ctx,"Action must have multiple dests\n" );
@@ -1392,11 +1392,8 @@ mlx5hws_action_create_dest_array(struct mlx5hws_context *ctx, dest_list[i].destination_id = dests[i].dest->dest_obj.obj_id; fte_attr.action_flags |=MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ; fte_attr.ignore_flow_level = ignore_flow_level; -/* ToDo: In SW steering we have a handling of 'go to WIRE' -* destination here by upper layer setting 'is_wire_ft' flag -* if the destination is wire. -* This is because uplink should be last dest in the list. -*/ +if (dests[i].is_wire_ft) + last_dest_idx = i;break ;case MLX5HWS_ACTION_TYP_VPORT : dest_list[i].destination_type =MLX5_FLOW_DESTINATION_TYPE_VPORT ;
@@ -1420,6 +1417,9 @@ mlx5hws_action_create_dest_array(struct mlx5hws_context *ctx, } } +if (last_dest_idx !=-1 ) +swap (dest_list[last_dest_idx], dest_list[num_dest -1 ]); + fte_attr.dests_num = num_dest; fte_attr.dests = dest_list;
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c +3 -0
@@ -966,6 +966,9 @@ static int mlx5_fs_fte_get_hws_actions(struct mlx5_flow_root_namespace *ns,switch (attr->type) {case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE : dest_action =mlx5_fs_get_dest_action_ft (fs_ctx, dst); +if (dst->dest_attr.ft->flags & +MLX5_FLOW_TABLE_UPLINK_VPORT ) + dest_actions[num_dest_actions].is_wire_ft = true;break ;case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM : dest_action = mlx5_fs_get_dest_action_table_num(fs_ctx,
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h +1 -0
@@ -211,6 +211,7 @@ struct mlx5hws_action_dest_attr {struct mlx5hws_action *dest;/* Optional reformat action */ struct mlx5hws_action *reformat; +bool is_wire_ft; };/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 714/780 net/mlx5e: Fix leak of Geneve TLV option object
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jianbo Liu <[email protected]>
[ Upstream commit aa9c44b842096c553871bc68a8cebc7861fa192b ]
Previously, a unique tunnel id was added for the matching on TC non-zero chains, to support inner header rewrite with goto action. Later, it was used to support VF tunnel offload for vxlan, then for Geneve and GRE. To support VF tunnel, a temporary mlx5_flow_spec is used to parse tunnel options. For Geneve, if there is TLV option, a object is created, or refcnt is added if already exists. But the temporary mlx5_flow_spec is directly freed after parsing, which causes the leak because no information regarding the object is saved in flow's mlx5_flow_spec, which is used to free the object when deleting the flow.
To fix the leak, call mlx5_geneve_tlv_option_del() before free the temporary spec if it has TLV object.
--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +6 -6
@@ -2028,9 +2028,8 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,return err; } -static bool mlx5_flow_has_geneve_opt (struct mlx5e_tc_flow *flow) +static bool mlx5_flow_has_geneve_opt (struct mlx5_flow_spec *spec) { -struct mlx5_flow_spec *spec = &flow->attr->parse_attr->spec;void *headers_v =MLX5_ADDR_OF (fte_match_param, spec->match_value, misc_parameters_3);
@@ -2069,7 +2068,7 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv, }complete_all (&flow->del_hw_done); -if (mlx5_flow_has_geneve_opt (flow)) +if (mlx5_flow_has_geneve_opt (&attr->parse_attr->spec))mlx5_geneve_tlv_option_del (priv->mdev->geneve);if (flow->decap_route)
@@ -2574,12 +2573,13 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv, err =mlx5e_tc_tun_parse (filter_dev, priv, tmp_spec, f, match_level);if (err) { -kvfree (tmp_spec);NL_SET_ERR_MSG_MOD (extack,"Failed to parse tunnel attributes" );netdev_warn (priv->netdev,"Failed to parse tunnel attributes" ); -return err; + }else { + err =mlx5e_tc_set_attr_rx_tun (flow, tmp_spec); } - err =mlx5e_tc_set_attr_rx_tun (flow, tmp_spec); +if (mlx5_flow_has_geneve_opt (tmp_spec)) +mlx5_geneve_tlv_option_del (priv->mdev->geneve);kvfree (tmp_spec);if (err)return err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 715/780 net/mlx5e: Fix number of lanes to UNKNOWN when using data_rate_oper
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shahar Shitrit <[email protected]>
[ Upstream commit 875d7c160d60616ff06dedb70470ad199661efe7 ]
When the link is up, either eth_proto_oper or ext_eth_proto_oper typically reports the active link protocol, from which both speed and number of lanes can be retrieved. However, in certain cases, such as when a NIC is connected via a non-standard cable, the firmware may not report the protocol.
In such scenarios, the speed can still be obtained from the data_rate_oper field in PTYS register. Since data_rate_oper provides only speed information and lacks lane details, it is incorrect to derive the number of lanes from it.
This patch corrects the behavior by setting the number of lanes to UNKNOWN instead of incorrectly using MAX_LANES when relying on data_rate_oper.
--- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +1 -4
@@ -43,7 +43,6 @@#include "en/fs_ethtool.h" #define LANES_UNKNOWN 0 -#define MAX_LANES 8void mlx5e_ethtool_get_drvinfo (struct mlx5e_priv *priv,struct ethtool_drvinfo *drvinfo)
@@ -1098,10 +1097,8 @@ static void get_link_properties(struct net_device *netdev, speed = info->speed; lanes = info->lanes; duplex =DUPLEX_FULL ; - }else if (data_rate_oper) { + }else if (data_rate_oper) speed =100 * data_rate_oper; - lanes =MAX_LANES ; - } out: link_ksettings->base.duplex = duplex;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 716/780 net: phy: phy_caps: Dont skip better duplex macth on non-exact match
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxime Chevallier <[email protected]>
[ Upstream commit d4e6cb324dcc952618fec6b25aa3fc7bfc2750b4 ]
When performing a non-exact phy_caps lookup, we are looking for a supported mode that matches as closely as possible the passed speed/duplex.
Blamed patch broke that logic by returning a match too early in case the caller asks for half-duplex, as a full-duplex linkmode may match first, and returned as a non-exact match without even trying to mach on half-duplex modes.
--- drivers/net/phy/phy_caps.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/net/phy/phy_caps.c +12 -6
@@ -188,6 +188,9 @@ phy_caps_lookup_by_linkmode_rev(const unsigned long *linkmodes, bool fdx_only)* When @exact is not set, we return either an exact match, or matching capabilities * at lower speed, or the lowest matching speed, or NULL. * +* Non-exact matches will try to return an exact speed and duplex match, but may +* return matching capabilities with same speed but a different duplex. +* * Returns: a matched link_capabilities according to the above process, NULL * otherwise. */
@@ -195,7 +198,7 @@ const struct link_capabilities * phy_caps_lookup(int speed, unsigned int duplex, const unsigned long *supported, bool exact) { - const struct link_capabilities *lcap, *last = NULL; + const struct link_capabilities *lcap, *match = NULL, *last = NULL;for_each_link_caps_desc_speed (lcap) {if (linkmode_intersects (lcap->linkmodes, supported)) {
@@ -204,16 +207,19 @@ phy_caps_lookup(int speed, unsigned int duplex, const unsigned long *supported,if (lcap->speed == speed && lcap->duplex == duplex) {return lcap; }else if (!exact) { -if (lcap->speed <= speed) -return lcap; +if (!match && lcap->speed <= speed) + match = lcap; + +if (lcap->speed < speed) +break ; } } } -if (!exact) -return last; +if (!match && !exact) + match = last; -return NULL ; +return match; }EXPORT_SYMBOL_GPL (phy_caps_lookup);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 717/780 net_sched: prio: fix a race in prio_tune()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit d35acc1be3480505b5931f17e4ea9b7617fea4d3 ]
Gerrard Tai reported a race condition in PRIO, whenever SFQ perturb timer fires at the wrong time.
The race is as follows:
CPU 0 CPU 1
[1]: lock root
[2]: qdisc_tree_flush_backlog()
[3]: unlock root
| | [5]: lock root | [6]: rehash | [7]: qdisc_tree_reduce_backlog() |
[4]: qdisc_put()
This can be abused to underflow a parent's qlen.
Calling qdisc_purge_queue() instead of qdisc_tree_flush_backlog() should fix the race, because all packets will be purged from the qdisc before releasing the lock.
--- net/sched/sch_prio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_prio.c +1 -1
@@ -211,7 +211,7 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt,memcpy (q->prio2band, qopt->priomap,TC_PRIO_MAX +1 );for (i = q->bands; i < oldbands; i++) -qdisc_tree_flush_backlog (q->queues[i]); +qdisc_purge_queue (q->queues[i]);for (i = oldbands; i < q->bands; i++) { q->queues[i] = queues[i];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 718/780 net_sched: red: fix a race in __red_change()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 85a3e0ede38450ea3053b8c45d28cf55208409b8 ]
Gerrard Tai reported a race condition in RED, whenever SFQ perturb timer fires at the wrong time.
The race is as follows:
CPU 0 CPU 1
[1]: lock root
[2]: qdisc_tree_flush_backlog()
[3]: unlock root
| | [5]: lock root | [6]: rehash | [7]: qdisc_tree_reduce_backlog() |
[4]: qdisc_put()
This can be abused to underflow a parent's qlen.
Calling qdisc_purge_queue() instead of qdisc_tree_flush_backlog() should fix the race, because all packets will be purged from the qdisc before releasing the lock.
--- net/sched/sch_red.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_red.c +1 -1
@@ -285,7 +285,7 @@ static int __red_change(struct Qdisc *sch, struct nlattr **tb, q->userbits = userbits; q->limit = ctl->limit;if (child) { -qdisc_tree_flush_backlog (q->qdisc); +qdisc_purge_queue (q->qdisc); old_child = q->qdisc; q->qdisc = child; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 719/780 net_sched: tbf: fix a race in tbf_change()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 43eb466041216d25dedaef1c383ad7bd89929cbc ]
Gerrard Tai reported a race condition in TBF, whenever SFQ perturb timer fires at the wrong time.
The race is as follows:
CPU 0 CPU 1
[1]: lock root
[2]: qdisc_tree_flush_backlog()
[3]: unlock root
| | [5]: lock root | [6]: rehash | [7]: qdisc_tree_reduce_backlog() |
[4]: qdisc_put()
This can be abused to underflow a parent's qlen.
Calling qdisc_purge_queue() instead of qdisc_tree_flush_backlog() should fix the race, because all packets will be purged from the qdisc before releasing the lock.
--- net/sched/sch_tbf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_tbf.c +1 -1
@@ -452,7 +452,7 @@ static int tbf_change(struct Qdisc *sch, struct nlattr *opt,sch_tree_lock (sch);if (child) { -qdisc_tree_flush_backlog (q->qdisc); +qdisc_purge_queue (q->qdisc); old = q->qdisc; q->qdisc = child; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 720/780 net_sched: ets: fix a race in ets_qdisc_change()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit d92adacdd8c2960be856e0b82acc5b7c5395fddb ]
Gerrard Tai reported a race condition in ETS, whenever SFQ perturb timer fires at the wrong time.
The race is as follows:
CPU 0 CPU 1
[1]: lock root
[2]: qdisc_tree_flush_backlog()
[3]: unlock root
| | [5]: lock root | [6]: rehash | [7]: qdisc_tree_reduce_backlog() |
[4]: qdisc_put()
This can be abused to underflow a parent's qlen.
Calling qdisc_purge_queue() instead of qdisc_tree_flush_backlog() should fix the race, because all packets will be purged from the qdisc before releasing the lock.
--- net/sched/sch_ets.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_ets.c +1 -1
@@ -661,7 +661,7 @@ static int ets_qdisc_change(struct Qdisc *sch, struct nlattr *opt,for (i = q->nbands; i < oldbands; i++) {if (i >= q->nstrict && q->classes[i].qdisc->q.qlen)list_del_init (&q->classes[i].alist); -qdisc_tree_flush_backlog (q->classes[i].qdisc); +qdisc_purge_queue (q->classes[i].qdisc); }WRITE_ONCE (q->nstrict, nstrict);memcpy (q->prio2band, priomap,sizeof (priomap));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 721/780 net: drv: netdevsim: dont napi_complete() from netpoll
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 1264971017b4d7141352a7fe29021bdfce5d885d ]
netdevsim supports netpoll. Make sure we don't call napi_complete() from it, since it may not be scheduled. Breno reports hitting a warning in napi_complete_done():
WARNING: CPU: 14 PID: 104 at net/core/dev.c:6592 napi_complete_done+0x2cc/0x560 __napi_poll+0x2d8/0x3a0 handle_softirqs+0x1fe/0x710
This is presumably after netpoll stole the SCHED bit prematurely.
--- drivers/net/netdevsim/netdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/netdevsim/netdev.c +2 -1
@@ -369,7 +369,8 @@ static int nsim_poll(struct napi_struct *napi, int budget)int done; done =nsim_rcv (rq, budget); -napi_complete (napi); +if (done < budget) +napi_complete_done (napi, done);return done; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 722/780 net: ethtool: Dont check if RSS context exists in case of context 0
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gal Pressman <[email protected]>
[ Upstream commit d78ebc772c7ceccf6e655ddb93099f49a1268af4 ]
Context 0 (default context) always exists, there is no need to check whether it exists or not when adding a flow steering rule.
The existing check fails when creating a flow steering rule for context 0 as it is not stored in the rss_ctx xarray.
For example:
$ ethtool --config-ntuple eth2 flow-type tcp4 dst-ip 194.237.147.23 dst-port 19983 context 0 loc 618 rmgr: Cannot insert RX class rule: Invalid argument Cannot insert classification rule
An example usecase for this could be:
- A high-priority rule (loc 0) directing specific port traffic to context 0.
- A low-priority rule (loc 1) directing all other TCP traffic to context 1.
This is a user-visible regression that was caught in our testing environment, it was not reported by a user yet.
--- net/ethtool/ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ethtool/ioctl.c +2 -1
@@ -1001,7 +1001,8 @@ static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev, ethtool_get_flow_spec_ring(info.fs.ring_cookie)) return -EINVAL; -if (!xa_load (&dev->ethtool->rss_ctx, info.rss_context)) +if (info.rss_context && + !xa_load (&dev->ethtool->rss_ctx, info.rss_context))return -EINVAL ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 723/780 drm/xe/lrc: Use a temporary buffer for WA BB
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucas De Marchi <[email protected]>
[ Upstream commit 9c7632faad434c98f1f2cc06f3647a5a5d05ddbf ]
In case the BO is in iomem, we can't simply take the vaddr and write to it. Instead, prepare a separate buffer that is later copied into io memory. Right now it's just a few words that could be using xe_map_write32(), but the intention is to grow the WA BB for other uses.
--- drivers/gpu/drm/xe/xe_lrc.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)
drivers/gpu/drm/xe/xe_lrc.c +20 -4
@@ -941,11 +941,18 @@ static void xe_lrc_finish(struct xe_lrc *lrc)* store it in the PPHSWP. */ #define CONTEXT_ACTIVE 1ULL -static void xe_lrc_setup_utilization (struct xe_lrc *lrc) +static int xe_lrc_setup_utilization (struct xe_lrc *lrc) { -u32 *cmd; +u32 *cmd, *buf =NULL ; - cmd = lrc->bb_per_ctx_bo->vmap.vaddr; +if (lrc->bb_per_ctx_bo->vmap.is_iomem) { + buf =kmalloc (lrc->bb_per_ctx_bo->size,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + cmd = buf; + }else { + cmd = lrc->bb_per_ctx_bo->vmap.vaddr; + } *cmd++ =MI_STORE_REGISTER_MEM |MI_SRM_USE_GGTT |MI_SRM_ADD_CS_OFFSET ; *cmd++ =ENGINE_ID (0 ).addr;
@@ -966,9 +973,16 @@ static void xe_lrc_setup_utilization(struct xe_lrc *lrc) *cmd++ =MI_BATCH_BUFFER_END ; +if (buf) { +xe_map_memcpy_to (gt_to_xe (lrc->gt), &lrc->bb_per_ctx_bo->vmap,0 , + buf, (cmd - buf) *sizeof (*cmd)); +kfree (buf); + } +xe_lrc_write_ctx_reg (lrc,CTX_BB_PER_CTX_PTR ,xe_bo_ggtt_addr (lrc->bb_per_ctx_bo) |1 ); +return 0 ; }#define PVC_CTX_ASID (0x2e + 1)
@@ -1123,7 +1137,9 @@ static int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe, map =__xe_lrc_start_seqno_map (lrc);xe_map_write32 (lrc_to_xe (lrc), &map, lrc->fence_ctx.next_seqno -1 ); -xe_lrc_setup_utilization (lrc); + err =xe_lrc_setup_utilization (lrc); +if (err) + goto err_lrc_finish;return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 724/780 btrfs: exit after state insertion failure at btrfs_convert_extent_bit()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit 3bf179e36da917c5d9bec71c714573ed1649b7c1 ]
If insert_state() state failed it returns an error pointer and we call extent_io_tree_panic() which will trigger a BUG() call. However if CONFIG_BUG is disabled, which is an uncommon and exotic scenario, then we fallthrough and call cache_state() which will dereference the error pointer, resulting in an invalid memory access.
So jump to the 'out' label after calling extent_io_tree_panic(), it also makes the code more clear besides dealing with the exotic scenario where CONFIG_BUG is disabled.
--- fs/btrfs/extent-io-tree.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/extent-io-tree.c +1 -0
@@ -1456,6 +1456,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,if (IS_ERR (inserted_state)) { ret =PTR_ERR (inserted_state);extent_io_tree_panic (tree, prealloc,"insert" , ret); + goto out; }cache_state (inserted_state, cached_state);if (inserted_state == prealloc)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 725/780 fs/filesystems: Fix potential unsigned integer underflow in fs_name()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
[ Upstream commit 1363c134ade81e425873b410566e957fecebb261 ]
fs_name() has @index as unsigned int, so there is underflow risk for operation '@index--'.
Fix by breaking the for loop when '@index == 0' which is also more proper than '@index <= 0' for unsigned integer comparison.
--- fs/filesystems.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
fs/filesystems.c +9 -5
@@ -156,15 +156,19 @@ static int fs_index(const char __user * __name)static int fs_name (unsigned int index,char __user * buf) {struct file_system_type * tmp; -int len, res; +int len, res = -EINVAL ;read_lock (&file_systems_lock); -for (tmp = file_systems; tmp; tmp = tmp->next, index--) -if (index <=0 &&try_module_get (tmp->owner)) +for (tmp = file_systems; tmp; tmp = tmp->next, index--) { +if (index ==0 ) { +if (try_module_get (tmp->owner)) + res =0 ;break ; + } + }read_unlock (&file_systems_lock); -if (!tmp) -return -EINVAL ; +if (res) +return res;/* OK, we got the reference, so we can safely block */ len =strlen (tmp->name) +1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 726/780 btrfs: fix fsync of files with no hard links not persisting deletion
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit 5e85262e542d6da8898bb8563a724ad98f6fc936 ]
If we fsync a file (or directory) that has no more hard links, because while a process had a file descriptor open on it, the file's last hard link was removed and then the process did an fsync against the file descriptor, after a power failure or crash the file still exists after replaying the log.
This behaviour is incorrect since once an inode has no more hard links it's not accessible anymore and we insert an orphan item into its subvolume's tree so that the deletion of all its items is not missed in case of a power failure or crash.
So after log replay the file shouldn't exist anymore, which is also the behaviour on ext4, xfs, f2fs and other filesystems.
Fix this by not ignoring inodes with zero hard links at btrfs_log_inode_parent() and by committing an inode's delayed inode when we are not doing a fast fsync (either BTRFS_INODE_COPY_EVERYTHING or BTRFS_INODE_NEEDS_FULL_SYNC is set in the inode's runtime flags). This last step is necessary because when removing the last hard link we don't delete the corresponding ref (or extref) item, instead we record the change in the inode's delayed inode with the BTRFS_DELAYED_NODE_DEL_IREF flag, so that when the delayed inode is committed we delete the ref/extref item from the inode's subvolume tree - otherwise the logging code will log the last hard link and therefore upon log replay the inode is not deleted.
The base code for a fstests test case that reproduces this bug is the following:
. ./common/dmflakey
_require_scratch
_require_dm_target flakey
_require_mknod
_scratch_mkfs >>$seqres.full 2>&1 || _fail "mkfs failed" _require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey
touch $SCRATCH_MNT/foo
# Commit the current transaction and persist the file. _scratch_sync
# A fifo to communicate with a background xfs_io process that will
# fsync the file after we deleted its hard link while it's open by # xfs_io. mkfifo $SCRATCH_MNT/fifo
tail -f $SCRATCH_MNT/fifo | \
$XFS_IO_PROG $SCRATCH_MNT/foo >>$seqres.full &
XFS_IO_PID=$! # Give some time for the xfs_io process to open a file descriptor for
# the file. sleep 1
# Now while the file is open by the xfs_io process, delete its only
# hard link. rm -f $SCRATCH_MNT/foo
# Now that it has no more hard links, make the xfs_io process fsync it. echo "fsync" > $SCRATCH_MNT/fifo
# Terminate the xfs_io process so that we can unmount. echo "quit" > $SCRATCH_MNT/fifo
wait $XFS_IO_PID
unset XFS_IO_PID
# Simulate a power failure and then mount again the filesystem to
# replay the journal/log. _flakey_drop_and_remount
# We don't expect the file to exist anymore, since it was fsynced when # it had no more hard links. [ -f $SCRATCH_MNT/foo ] && echo "file foo still exists"
_unmount_flakey
# success, all done
echo "Silence is golden"
status=0
exit
A test case for fstests will be submitted soon.
--- fs/btrfs/tree-log.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
fs/btrfs/tree-log.c +16 -8
@@ -6583,6 +6583,19 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,btrfs_log_get_delayed_items (inode, &delayed_ins_list, &delayed_del_list); +/* +* If we are fsyncing a file with 0 hard links, then commit the delayed +* inode because the last inode ref (or extref) item may still be in the +* subvolume tree and if we log it the file will still exist after a log +* replay. So commit the delayed inode to delete that last ref and we +* skip logging it. +*/ +if (inode->vfs_inode.i_nlink ==0 ) { + ret =btrfs_commit_inode_delayed_inode (inode); +if (ret) + goto out_unlock; + } + ret = copy_inode_items_to_log(trans, inode, &min_key, &max_key, path, dst_path, logged_isize, inode_only, ctx,
@@ -7051,14 +7064,9 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,if (btrfs_root_generation (&root->root_item) == trans->transid)return BTRFS_LOG_FORCE_COMMIT ; -/* -* Skip already logged inodes or inodes corresponding to tmpfiles -* (since logging them is pointless, a link count of 0 means they -* will never be accessible). -*/ -if ((btrfs_inode_in_log (inode, trans->transid) && -list_empty (&ctx->ordered_extents)) || - inode->vfs_inode.i_nlink ==0 ) +/* Skip already logged inodes and without new extents. */ +if (btrfs_inode_in_log (inode, trans->transid) && +list_empty (&ctx->ordered_extents))return BTRFS_NO_LOG_SYNC ; ret =start_log_trans (trans, root, ctx);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 727/780 gfs2: pass through holder from the VFS for freeze/thaw
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
[ Upstream commit 62a2175ddf7e72941868f164b7c1f92e00f213bd ]
The filesystem's freeze/thaw functions can be called from contexts where the holder isn't userspace but the kernel, e.g., during systemd suspend/hibernate. So pass through the freeze/thaw flags from the VFS instead of hard-coding them.
--- fs/gfs2/super.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
fs/gfs2/super.c +8 -6
@@ -674,7 +674,7 @@ static int gfs2_sync_fs(struct super_block *sb, int wait)return sdp->sd_log_error; } -static int gfs2_do_thaw (struct gfs2_sbd *sdp) +static int gfs2_do_thaw (struct gfs2_sbd *sdp,enum freeze_holder who) {struct super_block *sb = sdp->sd_vfs;int error;
@@ -682,7 +682,7 @@ static int gfs2_do_thaw(struct gfs2_sbd *sdp) error =gfs2_freeze_lock_shared (sdp);if (error) goto fail; - error =thaw_super (sb,FREEZE_HOLDER_USERSPACE ); + error =thaw_super (sb, who);if (!error)return 0 ;
@@ -710,7 +710,7 @@ void gfs2_freeze_func(struct work_struct *work)gfs2_freeze_unlock (sdp);set_bit (SDF_FROZEN , &sdp->sd_flags); - error =gfs2_do_thaw (sdp); + error =gfs2_do_thaw (sdp,FREEZE_HOLDER_USERSPACE );if (error) goto out;
@@ -728,6 +728,7 @@ void gfs2_freeze_func(struct work_struct *work)/** * gfs2_freeze_super - prevent further writes to the filesystem * @sb: the VFS structure for the filesystem +* @who: freeze flags * */
@@ -744,7 +745,7 @@ static int gfs2_freeze_super(struct super_block *sb, enum freeze_holder who) }for (;;) { - error =freeze_super (sb,FREEZE_HOLDER_USERSPACE ); + error =freeze_super (sb, who);if (error) {fs_info (sdp,"GFS2: couldn't freeze filesystem: %d\n" , error);
@@ -758,7 +759,7 @@ static int gfs2_freeze_super(struct super_block *sb, enum freeze_holder who)break ; } - error =gfs2_do_thaw (sdp); + error =gfs2_do_thaw (sdp, who);if (error) goto out;
@@ -796,6 +797,7 @@ static int gfs2_freeze_fs(struct super_block *sb)/** * gfs2_thaw_super - reallow writes to the filesystem * @sb: the VFS structure for the filesystem +* @who: freeze flags * */
@@ -814,7 +816,7 @@ static int gfs2_thaw_super(struct super_block *sb, enum freeze_holder who)atomic_inc (&sb->s_active);gfs2_freeze_unlock (sdp); - error =gfs2_do_thaw (sdp); + error =gfs2_do_thaw (sdp, who);if (!error) {clear_bit (SDF_FREEZE_INITIATOR , &sdp->sd_flags);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 728/780 btrfs: exit after state split error at set_extent_bit()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit 41d69d4d78d8b179bf3bcdfc56d28a12b3a608d2 ]
If split_state() returned an error we call extent_io_tree_panic() which will trigger a BUG() call. However if CONFIG_BUG is disabled, which is an uncommon and exotic scenario, then we fallthrough and hit a use after free when calling set_state_bits() since the extent state record which the local variable 'prealloc' points to was freed by split_state().
So jump to the label 'out' after calling extent_io_tree_panic() and set the 'prealloc' pointer to NULL since split_state() has already freed it when it hit an error.
--- fs/btrfs/extent-io-tree.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/btrfs/extent-io-tree.c +4 -1
@@ -1252,8 +1252,11 @@ static int __set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,if (!prealloc) goto search_again; ret =split_state (tree, state, prealloc, end +1 ); -if (ret) +if (ret) {extent_io_tree_panic (tree, state,"split" , ret); + prealloc =NULL ; + goto out; + }set_state_bits (tree, prealloc, bits, changeset);cache_state (prealloc, cached_state);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 729/780 nvmet-fcloop: access fcpreq only when holding reqlock
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Wagner <[email protected]>
[ Upstream commit 47a827cd7929d0550c3496d70b417fcb5649b27b ]
The abort handling logic expects that the state and the fcpreq are only accessed when holding the reqlock lock.
While at it, only handle the aborts in the abort handler.
--- drivers/nvme/target/fcloop.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
drivers/nvme/target/fcloop.c +16 -15
@@ -618,12 +618,13 @@ fcloop_fcp_recv_work(struct work_struct *work) {struct fcloop_fcpreq *tfcp_req = container_of(work, struct fcloop_fcpreq, fcp_rcv_work); -struct nvmefc_fcp_req *fcpreq = tfcp_req->fcpreq; +struct nvmefc_fcp_req *fcpreq;unsigned long flags;int ret =0 ;bool aborted = false;spin_lock_irqsave (&tfcp_req->reqlock, flags); + fcpreq = tfcp_req->fcpreq;switch (tfcp_req->inistate) {case INI_IO_START : tfcp_req->inistate =INI_IO_ACTIVE ;
@@ -638,16 +639,19 @@ fcloop_fcp_recv_work(struct work_struct *work) }spin_unlock_irqrestore (&tfcp_req->reqlock, flags); -if (unlikely (aborted)) - ret = -ECANCELED ; -else { -if (likely (!check_for_drop (tfcp_req))) - ret =nvmet_fc_rcv_fcp_req (tfcp_req->tport->targetport, - &tfcp_req->tgt_fcp_req, - fcpreq->cmdaddr, fcpreq->cmdlen); -else -pr_info ("%s: dropped command ********\n" , __func__); +if (unlikely (aborted)) { +/* the abort handler will call fcloop_call_host_done */ +return ; + } + +if (unlikely (check_for_drop (tfcp_req))) { +pr_info ("%s: dropped command ********\n" , __func__); +return ; } + + ret =nvmet_fc_rcv_fcp_req (tfcp_req->tport->targetport, + &tfcp_req->tgt_fcp_req, + fcpreq->cmdaddr, fcpreq->cmdlen);if (ret)fcloop_call_host_done (fcpreq, tfcp_req, ret); }
@@ -662,9 +666,10 @@ fcloop_fcp_abort_recv_work(struct work_struct *work)unsigned long flags;spin_lock_irqsave (&tfcp_req->reqlock, flags); - fcpreq = tfcp_req->fcpreq;switch (tfcp_req->inistate) {case INI_IO_ABORTED : + fcpreq = tfcp_req->fcpreq; + tfcp_req->fcpreq =NULL ;break ;case INI_IO_COMPLETED : completed = true;
@@ -686,10 +691,6 @@ fcloop_fcp_abort_recv_work(struct work_struct *work)nvmet_fc_rcv_fcp_abort (tfcp_req->tport->targetport, &tfcp_req->tgt_fcp_req); -spin_lock_irqsave (&tfcp_req->reqlock, flags); - tfcp_req->fcpreq =NULL ; -spin_unlock_irqrestore (&tfcp_req->reqlock, flags); -fcloop_call_host_done (fcpreq, tfcp_req, -ECANCELED );/* call_host_done releases reference for abort downcall */ }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 730/780 io_uring: fix spurious drain flushing
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Begunkov <[email protected]>
[ Upstream commit fde04c7e2775feb0746301e0ef86a04d3598c3fe ]
io_queue_deferred() is not tolerant to spurious calls not completing some requests. You can have an inflight drain-marked request and another request that came after and got queued into the drain list. Now, if io_queue_deferred() is called before the first request completes, it'll check the 2nd req with req_need_defer(), find that there is no drain flag set, and queue it for execution.
To make io_queue_deferred() work, it should at least check sequences for the first request, and then we need also need to check if there is another drain request creating another bubble.
--- io_uring/io_uring.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
io_uring/io_uring.c +13 -1
@@ -537,18 +537,30 @@ void io_req_queue_iowq(struct io_kiocb *req)io_req_task_work_add (req); } +static bool io_drain_defer_seq (struct io_kiocb *req,u32 seq) +{ +struct io_ring_ctx *ctx = req->ctx; + +return seq +READ_ONCE (ctx->cq_extra) != ctx->cached_cq_tail; +} + static __cold noinline void io_queue_deferred(struct io_ring_ctx *ctx) { +bool drain_seen = false, first = true; +spin_lock (&ctx->completion_lock);while (!list_empty (&ctx->defer_list)) {struct io_defer_entry *de =list_first_entry (&ctx->defer_list, struct io_defer_entry, list); -if (req_need_defer (de->req, de->seq)) + drain_seen |= de->req->flags &REQ_F_IO_DRAIN ; +if ((drain_seen || first) &&io_drain_defer_seq (de->req, de->seq))break ; +list_del_init (&de->list);io_req_task_queue (de->req);kfree (de); + first = false; }spin_unlock (&ctx->completion_lock); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 731/780 perf: Ensure bpf_perf_link path is properly serialized
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit 7ed9138a72829d2035ecbd8dbd35b1bc3c137c40 ]
Ravi reported that the bpf_perf_link_attach() usage of perf_event_set_bpf_prog() is not serialized by ctx->mutex, unlike the PERF_EVENT_IOC_SET_BPF case.
--- kernel/events/core.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)
kernel/events/core.c +30 -4
@@ -6239,6 +6239,9 @@ static int perf_event_set_output(struct perf_event *event,static int perf_event_set_filter (struct perf_event *event,void __user *arg);static int perf_copy_attr (struct perf_event_attr __user *uattr,struct perf_event_attr *attr); +static int __perf_event_set_bpf_prog (struct perf_event *event, +struct bpf_prog *prog, +u64 bpf_cookie);static long _perf_ioctl (struct perf_event *event,unsigned int cmd,unsigned long arg) {
@@ -6301,7 +6304,7 @@ static long _perf_ioctl(struct perf_event *event, unsigned int cmd, unsigned lonif (IS_ERR (prog))return PTR_ERR (prog); - err =perf_event_set_bpf_prog (event, prog,0 ); + err =__perf_event_set_bpf_prog (event, prog,0 );if (err) {bpf_prog_put (prog);return err;
@@ -11069,8 +11072,9 @@ static inline bool perf_event_is_tracing(struct perf_event *event)return false; } -int perf_event_set_bpf_prog (struct perf_event *event,struct bpf_prog *prog, -u64 bpf_cookie) +static int __perf_event_set_bpf_prog (struct perf_event *event, +struct bpf_prog *prog, +u64 bpf_cookie) {bool is_kprobe, is_uprobe, is_tracepoint, is_syscall_tp;
@@ -11108,6 +11112,20 @@ int perf_event_set_bpf_prog(struct perf_event *event, struct bpf_prog *prog,return perf_event_attach_bpf_prog (event, prog, bpf_cookie); } +int perf_event_set_bpf_prog (struct perf_event *event, +struct bpf_prog *prog, +u64 bpf_cookie) +{ +struct perf_event_context *ctx; +int ret; + + ctx =perf_event_ctx_lock (event); + ret =__perf_event_set_bpf_prog (event, prog, bpf_cookie); +perf_event_ctx_unlock (event, ctx); + +return ret; +} +void perf_event_free_bpf_prog (struct perf_event *event) {if (!event->prog)
@@ -11130,7 +11148,15 @@ static void perf_event_free_filter(struct perf_event *event) { } -int perf_event_set_bpf_prog (struct perf_event *event,struct bpf_prog *prog, +static int __perf_event_set_bpf_prog (struct perf_event *event, +struct bpf_prog *prog, +u64 bpf_cookie) +{ +return -ENOENT ; +} + +int perf_event_set_bpf_prog (struct perf_event *event, +struct bpf_prog *prog,u64 bpf_cookie) {return -ENOENT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 732/780 block: use q->elevator with ->elevator_lock held in elv_iosched_show()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit 94209d27d14104ed828ca88cd5403a99162fe51a ]
Use q->elevator with ->elevator_lock held in elv_iosched_show(), since the local cached elevator reference may become stale after getting ->elevator_lock.
--- block/elevator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
block/elevator.c +1 -2
@@ -744,7 +744,6 @@ ssize_t elv_iosched_store(struct gendisk *disk, const char *buf,ssize_t elv_iosched_show (struct gendisk *disk,char *name) {struct request_queue *q = disk->queue; -struct elevator_queue *eq = q->elevator;struct elevator_type *cur =NULL , *e;int len =0 ;
@@ -753,7 +752,7 @@ ssize_t elv_iosched_show(struct gendisk *disk, char *name) len +=sprintf (name+len,"[none] " ); }else { len +=sprintf (name+len,"none " ); - cur = eq->type; + cur = q->elevator->type; }spin_lock (&elv_list_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 733/780 io_uring: fix use-after-free of sq->thread in __io_uring_show_fdinfo()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Penglei Jiang <[email protected]>
[ Upstream commit ac0b8b327a5677dc6fecdf353d808161525b1ff0 ]
syzbot reports:
BUG: KASAN: slab-use-after-free in getrusage+0x1109/0x1a60 Read of size 8 at addr ffff88810de2d2c8 by task a.out/304 CPU: 0 UID: 0 PID: 304 Comm: a.out Not tainted 6.16.0-rc1 #1 PREEMPT(voluntary) Hardware name: QEMU Ubuntu 24.04 PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x53/0x70 print_report+0xd0/0x670 ? __pfx__raw_spin_lock_irqsave+0x10/0x10 ? getrusage+0x1109/0x1a60 kasan_report+0xce/0x100 ? getrusage+0x1109/0x1a60 getrusage+0x1109/0x1a60 ? __pfx_getrusage+0x10/0x10 __io_uring_show_fdinfo+0x9fe/0x1790 ? ksys_read+0xf7/0x1c0 ? do_syscall_64+0xa4/0x260 ? vsnprintf+0x591/0x1100 ? __pfx___io_uring_show_fdinfo+0x10/0x10 ? __pfx_vsnprintf+0x10/0x10 ? mutex_trylock+0xcf/0x130 ? __pfx_mutex_trylock+0x10/0x10 ? __pfx_show_fd_locks+0x10/0x10 ? io_uring_show_fdinfo+0x57/0x80 io_uring_show_fdinfo+0x57/0x80 seq_show+0x38c/0x690 seq_read_iter+0x3f7/0x1180 ? inode_set_ctime_current+0x160/0x4b0 seq_read+0x271/0x3e0 ? __pfx_seq_read+0x10/0x10 ? __pfx__raw_spin_lock+0x10/0x10 ? __mark_inode_dirty+0x402/0x810 ? selinux_file_permission+0x368/0x500 ? file_update_time+0x10f/0x160 vfs_read+0x177/0xa40 ? __pfx___handle_mm_fault+0x10/0x10 ? __pfx_vfs_read+0x10/0x10 ? mutex_lock+0x81/0xe0 ? __pfx_mutex_lock+0x10/0x10 ? fdget_pos+0x24d/0x4b0 ksys_read+0xf7/0x1c0 ? __pfx_ksys_read+0x10/0x10 ? do_user_addr_fault+0x43b/0x9c0 do_syscall_64+0xa4/0x260 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f0f74170fc9 Code: 00 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 8 RSP: 002b:00007fffece049e8 EFLAGS: 00000206 ORIG_RAX: 0000000000000000 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f0f74170fc9 RDX: 0000000000001000 RSI: 00007fffece049f0 RDI: 0000000000000004 RBP: 00007fffece05ad0 R08: 0000000000000000 R09: 00007fffece04d90 R10: 0000000000000000 R11: 0000000000000206 R12: 00005651720a1100 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 </TASK> Allocated by task 298: kasan_save_stack+0x33/0x60 kasan_save_track+0x14/0x30 __kasan_slab_alloc+0x6e/0x70 kmem_cache_alloc_node_noprof+0xe8/0x330 copy_process+0x376/0x5e00 create_io_thread+0xab/0xf0 io_sq_offload_create+0x9ed/0xf20 io_uring_setup+0x12b0/0x1cc0 do_syscall_64+0xa4/0x260 entry_SYSCALL_64_after_hwframe+0x77/0x7f Freed by task 22: kasan_save_stack+0x33/0x60 kasan_save_track+0x14/0x30 kasan_save_free_info+0x3b/0x60 __kasan_slab_free+0x37/0x50 kmem_cache_free+0xc4/0x360 rcu_core+0x5ff/0x19f0 handle_softirqs+0x18c/0x530 run_ksoftirqd+0x20/0x30 smpboot_thread_fn+0x287/0x6c0 kthread+0x30d/0x630 ret_from_fork+0xef/0x1a0 ret_from_fork_asm+0x1a/0x30 Last potentially related work creation: kasan_save_stack+0x33/0x60 kasan_record_aux_stack+0x8c/0xa0 __call_rcu_common.constprop.0+0x68/0x940 __schedule+0xff2/0x2930 __cond_resched+0x4c/0x80 mutex_lock+0x5c/0xe0 io_uring_del_tctx_node+0xe1/0x2b0 io_uring_clean_tctx+0xb7/0x160 io_uring_cancel_generic+0x34e/0x760 do_exit+0x240/0x2350 do_group_exit+0xab/0x220 __x64_sys_exit_group+0x39/0x40 x64_sys_call+0x1243/0x1840 do_syscall_64+0xa4/0x260 entry_SYSCALL_64_after_hwframe+0x77/0x7f The buggy address belongs to the object at ffff88810de2cb00 which belongs to the cache task_struct of size 3712
The buggy address is located 1992 bytes inside of
freed 3712-byte region [ffff88810de2cb00, ffff88810de2d980)
which is caused by the task_struct pointed to by sq->thread being released while it is being used in the function __io_uring_show_fdinfo(). Holding ctx->uring_lock does not prevent ehre relase or exit of sq->thread.
Fix this by assigning and looking up ->thread under RCU, and grabbing a reference to the task_struct. This ensures that it cannot get released while fdinfo is using it.
--- io_uring/fdinfo.c | 12 ++++++++++-- io_uring/sqpoll.c | 9 ++++----- 2 files changed, 14 insertions(+), 7 deletions(-)
io_uring/fdinfo.c +10 -2
@@ -172,18 +172,26 @@ static void __io_uring_show_fdinfo(struct io_ring_ctx *ctx, struct seq_file *m)if (ctx->flags &IORING_SETUP_SQPOLL ) {struct io_sq_data *sq = ctx->sq_data; +struct task_struct *tsk; +rcu_read_lock (); + tsk =rcu_dereference (sq->thread);/* * sq->thread might be NULL if we raced with the sqpoll * thread termination. */ -if (sq->thread) { +if (tsk) { +get_task_struct (tsk); +rcu_read_unlock (); +getrusage (tsk,RUSAGE_SELF , &sq_usage); +put_task_struct (tsk); sq_pid = sq->task_pid; sq_cpu = sq->sq_cpu; -getrusage (sq->thread,RUSAGE_SELF , &sq_usage); sq_total_time = (sq_usage.ru_stime.tv_sec *1000000 + sq_usage.ru_stime.tv_usec); sq_work_time = sq->work_time; + }else { +rcu_read_unlock (); } }
io_uring/sqpoll.c +4 -5
@@ -270,7 +270,8 @@ static int io_sq_thread(void *data)/* offload context creation failed, just exit */ if (!current->io_uring) {mutex_lock (&sqd->lock); - sqd->thread =NULL ; +rcu_assign_pointer (sqd->thread,NULL ); +put_task_struct (current);mutex_unlock (&sqd->lock); goto err_out; }
@@ -379,7 +380,8 @@ static int io_sq_thread(void *data)io_sq_tw (&retry_list,UINT_MAX );io_uring_cancel_generic (true, sqd); - sqd->thread =NULL ; +rcu_assign_pointer (sqd->thread,NULL ); +put_task_struct (current);list_for_each_entry (ctx, &sqd->ctx_list, sqd_list)atomic_or (IORING_SQ_NEED_WAKEUP , &ctx->rings->sq_flags);io_run_task_work ();
@@ -495,9 +497,6 @@ __cold int io_sq_offload_create(struct io_ring_ctx *ctx, ret = -EINVAL ; goto err; } - -if (task_to_put) -put_task_struct (task_to_put);return 0 ; err_sqpoll:complete (&ctx->sq_data->exited);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 734/780 block: dont use submit_bio_noacct_nocheck in blk_zone_wplug_bio_work
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit cf625013d8741c01407bbb4a60c111b61b9fa69d ]
Bios queued up in the zone write plug have already gone through all all preparation in the submit_bio path, including the freeze protection.
Submitting them through submit_bio_noacct_nocheck duplicates the work and can can cause deadlocks when freezing a queue with pending bio write plugs.
Go straight to ->submit_bio or blk_mq_submit_bio to bypass the superfluous extra freeze protection and checks.
--- block/blk-zoned.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
block/blk-zoned.c +5 -2
@@ -1306,7 +1306,6 @@ static void blk_zone_wplug_bio_work(struct work_struct *work)spin_unlock_irqrestore (&zwplug->lock, flags); bdev = bio->bi_bdev; -submit_bio_noacct_nocheck (bio);/* * blk-mq devices will reuse the extra reference on the request queue
@@ -1314,8 +1313,12 @@ static void blk_zone_wplug_bio_work(struct work_struct *work)* path for BIO-based devices will not do that. So drop this extra * reference here. */ -if (bdev_test_flag (bdev,BD_HAS_SUBMIT_BIO )) +if (bdev_test_flag (bdev,BD_HAS_SUBMIT_BIO )) { + bdev->bd_disk->fops->submit_bio (bio);blk_queue_exit (bdev->bd_disk->queue); + }else { +blk_mq_submit_bio (bio); + } put_zwplug:/* Drop the reference we took in disk_zone_wplug_schedule_bio_work(). */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 735/780 io_uring: consistently use rcu semantics with sqpoll thread
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Keith Busch <[email protected]>
[ Upstream commit c538f400fae22725580842deb2bef546701b64bd ]
The sqpoll thread is dereferenced with rcu read protection in one place, so it needs to be annotated as an __rcu type, and should consistently use rcu helpers for access and assignment to make sparse happy.
Since most of the accesses occur under the sqd->lock, we can use rcu_dereference_protected() without declaring an rcu read section. Provide a simple helper to get the thread from a locked context.
--- io_uring/io_uring.c | 4 ++-- io_uring/register.c | 7 +++++-- io_uring/sqpoll.c | 34 ++++++++++++++++++++++++---------- io_uring/sqpoll.h | 8 +++++++- 4 files changed, 38 insertions(+), 15 deletions(-)
io_uring/io_uring.c +2 -2
@@ -2913,7 +2913,7 @@ static __cold void io_ring_exit_work(struct work_struct *work)struct task_struct *tsk;io_sq_thread_park (sqd); - tsk = sqd->thread; + tsk =sqpoll_task_locked (sqd);if (tsk && tsk->io_uring && tsk->io_uring->io_wq)io_wq_cancel_cb (tsk->io_uring->io_wq, io_cancel_ctx_cb, ctx, true);
@@ -3150,7 +3150,7 @@ __cold void io_uring_cancel_generic(bool cancel_all, struct io_sq_data *sqd)s64 inflight;DEFINE_WAIT (wait); -WARN_ON_ONCE (sqd && sqd->thread != current); +WARN_ON_ONCE (sqd &&sqpoll_task_locked (sqd) != current);if (!current->io_uring)return ;
io_uring/register.c +5 -2
@@ -273,6 +273,8 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx,if (ctx->flags &IORING_SETUP_SQPOLL ) { sqd = ctx->sq_data;if (sqd) { +struct task_struct *tsk; +/* * Observe the correct sqd->lock -> ctx->uring_lock * ordering. Fine to drop uring_lock here, we hold
@@ -282,8 +284,9 @@ static __cold int io_register_iowq_max_workers(struct io_ring_ctx *ctx,mutex_unlock (&ctx->uring_lock);mutex_lock (&sqd->lock);mutex_lock (&ctx->uring_lock); -if (sqd->thread) - tctx = sqd->thread->io_uring; + tsk =sqpoll_task_locked (sqd); +if (tsk) + tctx = tsk->io_uring; } }else { tctx = current->io_uring;
io_uring/sqpoll.c +24 -10
@@ -30,7 +30,7 @@ enum {void io_sq_thread_unpark (struct io_sq_data *sqd) __releases(&sqd->lock) { -WARN_ON_ONCE (sqd->thread == current); +WARN_ON_ONCE (sqpoll_task_locked (sqd) == current);/* * Do the dance but not conditional clear_bit() because it'd race with
@@ -46,24 +46,32 @@ void io_sq_thread_unpark(struct io_sq_data *sqd)void io_sq_thread_park (struct io_sq_data *sqd) __acquires(&sqd->lock) { -WARN_ON_ONCE (data_race (sqd->thread) == current); +struct task_struct *tsk;atomic_inc (&sqd->park_pending);set_bit (IO_SQ_THREAD_SHOULD_PARK , &sqd->state);mutex_lock (&sqd->lock); -if (sqd->thread) -wake_up_process (sqd->thread); + + tsk =sqpoll_task_locked (sqd); +if (tsk) { +WARN_ON_ONCE (tsk == current); +wake_up_process (tsk); + } }void io_sq_thread_stop (struct io_sq_data *sqd) { -WARN_ON_ONCE (sqd->thread == current); +struct task_struct *tsk; +WARN_ON_ONCE (test_bit (IO_SQ_THREAD_SHOULD_STOP , &sqd->state));set_bit (IO_SQ_THREAD_SHOULD_STOP , &sqd->state);mutex_lock (&sqd->lock); -if (sqd->thread) -wake_up_process (sqd->thread); + tsk =sqpoll_task_locked (sqd); +if (tsk) { +WARN_ON_ONCE (tsk == current); +wake_up_process (tsk); + }mutex_unlock (&sqd->lock);wait_for_completion (&sqd->exited); }
@@ -486,7 +494,10 @@ __cold int io_sq_offload_create(struct io_ring_ctx *ctx, goto err_sqpoll; } - sqd->thread = tsk; +mutex_lock (&sqd->lock); +rcu_assign_pointer (sqd->thread, tsk); +mutex_unlock (&sqd->lock); + task_to_put =get_task_struct (tsk); ret =io_uring_alloc_task_context (tsk, ctx);wake_up_new_task (tsk);
@@ -514,10 +525,13 @@ __cold int io_sqpoll_wq_cpu_affinity(struct io_ring_ctx *ctx,int ret = -EINVAL ;if (sqd) { +struct task_struct *tsk; +io_sq_thread_park (sqd);/* Don't set affinity for a dying thread */ -if (sqd->thread) - ret =io_wq_cpu_affinity (sqd->thread->io_uring, mask); + tsk =sqpoll_task_locked (sqd); +if (tsk) + ret =io_wq_cpu_affinity (tsk->io_uring, mask);io_sq_thread_unpark (sqd); }
io_uring/sqpoll.h +7 -1
@@ -8,7 +8,7 @@ struct io_sq_data {/* ctx's that are using this sqd */ struct list_head ctx_list; -struct task_struct *thread; +struct task_struct __rcu *thread;struct wait_queue_head wait;unsigned sq_thread_idle;
@@ -29,3 +29,9 @@ void io_sq_thread_unpark(struct io_sq_data *sqd);void io_put_sq_data (struct io_sq_data *sqd);void io_sqpoll_wait_sq (struct io_ring_ctx *ctx);int io_sqpoll_wq_cpu_affinity (struct io_ring_ctx *ctx,cpumask_var_t mask); + +static inline struct task_struct *sqpoll_task_locked (struct io_sq_data *sqd) +{ +return rcu_dereference_protected (sqd->thread, +lockdep_is_held (&sqd->lock)); +}
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 736/780 smb: client: fix perf regression with deferred closes
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paulo Alcantara <[email protected]>
[ Upstream commit b64af6bcd3b0f3fc633d6a70adb0991737abfef4 ]
Customer reported that one of their applications started failing to open files with STATUS_INSUFFICIENT_RESOURCES due to NetApp server hitting the maximum number of opens to same file that it would allow for a single client connection.
It turned out the client was failing to reuse open handles with deferred closes because matching ->f_flags directly without masking off O_CREAT|O_EXCL|O_TRUNC bits first broke the comparision and then client ended up with thousands of deferred closes to same file. Those bits are already satisfied on the original open, so no need to check them against existing open handles.
Reproducer:
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
#include <pthread.h>
#define NR_THREADS 4 #define NR_ITERATIONS 2500 #define TEST_FILE "/mnt/1/test/dir/foo"
static char buf[64];
static void *worker(void *arg)
{
int i, j;
int fd;
for (i = 0; i < NR_ITERATIONS; i++) {
fd = open(TEST_FILE, O_WRONLY|O_CREAT|O_APPEND, 0666);
for (j = 0; j < 16; j++)
write(fd, buf, sizeof(buf));
close(fd);
}}
int main(int argc, char *argv[])
{
pthread_t t[NR_THREADS];
int fd;
int i;
fd = open(TEST_FILE, O_WRONLY|O_CREAT|O_TRUNC, 0666);
close(fd);
memset(buf, 'a', sizeof(buf));
for (i = 0; i < NR_THREADS; i++)
pthread_create(&t[i], NULL, worker, NULL);
for (i = 0; i < NR_THREADS; i++)
pthread_join(t[i], NULL);
return 0;}
Before patch:
$ mount.cifs //srv/share /mnt/1 -o ... $ mkdir -p /mnt/1/test/dir $ gcc repro.c && ./a.out ... number of opens: 1391
After patch:
$ mount.cifs //srv/share /mnt/1 -o ... $ mkdir -p /mnt/1/test/dir $ gcc repro.c && ./a.out ... number of opens: 1
--- fs/smb/client/file.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
fs/smb/client/file.c +6 -3
@@ -999,15 +999,18 @@ int cifs_open(struct inode *inode, struct file *file) rc =cifs_get_readable_path (tcon, full_path, &cfile); }if (rc ==0 ) { -if (file->f_flags == cfile->f_flags) { +unsigned int oflags = file->f_flags & ~(O_CREAT |O_EXCL |O_TRUNC ); +unsigned int cflags = cfile->f_flags & ~(O_CREAT |O_EXCL |O_TRUNC ); + +if (cifs_convert_flags (oflags,0 ) ==cifs_convert_flags (cflags,0 ) && + (oflags & (O_SYNC |O_DIRECT )) == (cflags & (O_SYNC |O_DIRECT ))) { file->private_data = cfile;spin_lock (&CIFS_I (inode)->deferred_lock);cifs_del_deferred_close (cfile);spin_unlock (&CIFS_I (inode)->deferred_lock); goto use_cache; - }else { -_cifsFileInfo_put (cfile, true, false); } +_cifsFileInfo_put (cfile, true, false); }else {/* hard link on the defeered close file */ rc =cifs_get_hardlink_path (tcon, inode, file);
Signature · 1 line
2.39.5