6.10.3-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 131/809 arm64: dts: rockchip: fix regulator name for Lunzn Fastrhino R6xS
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit 2dad31528de9ea8b05245ce6ac4f76ebf8dae947 ]
Make the regulator name the same as those marked by schematics.
--- arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +4 -4
@@ -39,9 +39,9 @@ status_led: led-status { }; }; - dc_12v: dc-12v-regulator { + vcc12v_dcin: vcc12v-dcin-regulator { compatible = "regulator-fixed"; - regulator-name = "dc_12v"; + regulator-name = "vcc12v_dcin"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <12000000>;
@@ -65,7 +65,7 @@ vcc3v3_sys: vcc3v3-sys-regulator { regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - vin-supply = <&dc_12v>; + vin-supply = <&vcc12v_dcin>; }; vcc5v0_sys: vcc5v0-sys-regulator {
@@ -75,7 +75,7 @@ vcc5v0_sys: vcc5v0-sys-regulator { regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&dc_12v>; + vin-supply = <&vcc12v_dcin>; }; vcc5v0_usb_host: vcc5v0-usb-host-regulator {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 132/809 arm64: dts: rockchip: fix usb regulator for Lunzn Fastrhino R6xS
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit 9e823ba92118510c0d1c050b67bb000f9b9a73d7 ]
Remove the non-existent usb_host regulator and fix the supply according to the schematic. Also remove the unnecessary always-on and boot-on for the usb_otg regulator.
--- .../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +4 -12
@@ -78,15 +78,6 @@ vcc5v0_sys: vcc5v0-sys-regulator { vin-supply = <&vcc12v_dcin>; }; - vcc5v0_usb_host: vcc5v0-usb-host-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_usb_host"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; - vcc5v0_usb_otg: vcc5v0-usb-otg-regulator { compatible = "regulator-fixed"; enable-active-high;
@@ -94,8 +85,9 @@ vcc5v0_usb_otg: vcc5v0-usb-otg-regulator { pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_usb_otg_en>; regulator-name = "vcc5v0_usb_otg"; - regulator-always-on; - regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc5v0_sys>; }; };
@@ -460,7 +452,7 @@ &usb2phy0 { }; &usb2phy0_host { - phy-supply = <&vcc5v0_usb_host>; + phy-supply = <&vcc5v0_sys>; status = "okay"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 133/809 arm64: dts: rockchip: fix pmu_io supply for Lunzn Fastrhino R6xS
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit cfeac8e5d05815521f5c5568680735a92ee91fe4 ]
Fixes pmu_io_domains supply according to the schematic. Among them, the vccio3 is responsible for the io voltage of sdcard. There is no sdcard slot on the R68S, and it's connected to vcc_3v3, so describe the supply of vccio3 separately.
--- arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 4 ++++ arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts +4 -0
@@ -11,6 +11,10 @@ aliases { }; }; +&pmu_io_domains { + vccio3-supply = <&vccio_sd>; +}; + &sdmmc0 { bus-width = <4>; cap-mmc-highspeed;
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +2 -2
@@ -397,8 +397,8 @@ vcc5v0_usb_otg_en: vcc5v0-usb-otg-en { &pmu_io_domains { pmuio1-supply = <&vcc3v3_pmu>; pmuio2-supply = <&vcc3v3_pmu>; - vccio1-supply = <&vccio_acodec>; - vccio3-supply = <&vccio_sd>; + vccio1-supply = <&vcc_3v3>; + vccio2-supply = <&vcc_1v8>; vccio4-supply = <&vcc_1v8>; vccio5-supply = <&vcc_3v3>; vccio6-supply = <&vcc_1v8>;
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts +4 -0
@@ -102,6 +102,10 @@ eth_phy1_reset_pin: eth-phy1-reset-pin { }; }; +&pmu_io_domains { + vccio3-supply = <&vcc_3v3>; +}; + &sdhci { bus-width = <8>; max-frequency = <200000000>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 134/809 arm64: dts: rockchip: remove unused usb2 nodes for Lunzn Fastrhino R6xS
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit cd77139a307fbabe75e6b5cb8a3753e3c700f394 ]
Fix the following error when booting:
[ 15.851853] platform fd800000.usb: deferred probe pending [ 15.852384] platform fd840000.usb: deferred probe pending [ 15.852881] platform fd880000.usb: deferred probe pending
This is due to usb2phy1 is not enabled. There is no USB 2.0 port on the board, just remove it.
--- .../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 16 ---------------- 1 file changed, 16 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +0 -16
@@ -421,28 +421,12 @@ &uart2 { status = "okay"; }; -&usb_host0_ehci { - status = "okay"; -}; - -&usb_host0_ohci { - status = "okay"; -}; - &usb_host0_xhci { dr_mode = "host"; extcon = <&usb2phy0>; status = "okay"; }; -&usb_host1_ehci { - status = "okay"; -}; - -&usb_host1_ohci { - status = "okay"; -}; - &usb_host1_xhci { status = "okay"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 135/809 arm64: dts: rockchip: disable display subsystem for Lunzn Fastrhino R6xS
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit 2bf5d445df2ec89689d15ea259a916260c936959 ]
The R66S and R68S boards do not have HDMI output, so disable the display subsystem.
--- arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +4 -0
@@ -115,6 +115,10 @@ &cpu3 { cpu-supply = <&vdd_cpu>; }; +&display_subsystem { + status = "disabled"; +}; + &gpu { mali-supply = <&vdd_gpu>; status = "okay";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 136/809 arm64: dts: rockchip: fixes PHY reset for Lunzn Fastrhino R68S
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit e261bd74000ca80e5483ba8a8bda509de8cbe7fd ]
Fixed the PHY address and reset GPIOs (does not match the corresponding pinctrl) for gmac0 and gmac1.
--- .../boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts +6 -6
@@ -39,7 +39,7 @@ &gmac0_tx_bus2 &gmac0_rx_bus2 &gmac0_rgmii_clk &gmac0_rgmii_bus>; - snps,reset-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_LOW>; + snps,reset-gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; snps,reset-active-low; /* Reset time is 15ms, 50ms for rtl8211f */ snps,reset-delays-us = <0 15000 50000>;
@@ -61,7 +61,7 @@ &gmac1m1_tx_bus2 &gmac1m1_rx_bus2 &gmac1m1_rgmii_clk &gmac1m1_rgmii_bus>; - snps,reset-gpio = <&gpio0 RK_PB1 GPIO_ACTIVE_LOW>; + snps,reset-gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; snps,reset-active-low; /* Reset time is 15ms, 50ms for rtl8211f */ snps,reset-delays-us = <0 15000 50000>;
@@ -71,18 +71,18 @@ &gmac1m1_rgmii_clk }; &mdio0 { - rgmii_phy0: ethernet-phy@0 { + rgmii_phy0: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0>; + reg = <0x1>; pinctrl-0 = <ð_phy0_reset_pin>; pinctrl-names = "default"; }; }; &mdio1 { - rgmii_phy1: ethernet-phy@0 { + rgmii_phy1: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0>; + reg = <0x1>; pinctrl-0 = <ð_phy1_reset_pin>; pinctrl-names = "default"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 137/809 arm64: dts: qcom: sm6350: Add missing qcom,non-secure-domain property
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Weiss <[email protected]>
[ Upstream commit 81008068ee4f2c4c26e97a0404405bb4b450241b ]
By default the DSP domains are secure, add the missing qcom,non-secure-domain property to mark them as non-secure.
--- arch/arm64/boot/dts/qcom/sm6350.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sm6350.dtsi +2 -0
@@ -1323,6 +1323,7 @@ fastrpc { compatible = "qcom,fastrpc"; qcom,glink-channels = "fastrpcglink-apps-dsp"; label = "adsp"; + qcom,non-secure-domain; #address-cells = <1>; #size-cells = <0>;
@@ -1582,6 +1583,7 @@ fastrpc { compatible = "qcom,fastrpc"; qcom,glink-channels = "fastrpcglink-apps-dsp"; label = "cdsp"; + qcom,non-secure-domain; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 138/809 cpufreq/amd-pstate-ut: Convert nominal_freq to khz during comparisons
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dhananjay Ugwekar <[email protected]>
[ Upstream commit f21ab5ed4e8758b06230900f44b9dcbcfdc0c3ae ]
cpudata->nominal_freq being in MHz whereas other frequencies being in KHz breaks the amd-pstate-ut frequency sanity check. This fixes it.
--- drivers/cpufreq/amd-pstate-ut.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/cpufreq/amd-pstate-ut.c +7 -5
@@ -202,6 +202,7 @@ static void amd_pstate_ut_check_freq(u32 index)int cpu =0 ;struct cpufreq_policy *policy =NULL ;struct amd_cpudata *cpudata =NULL ; +u32 nominal_freq_khz;for_each_possible_cpu (cpu) { policy =cpufreq_cpu_get (cpu);
@@ -209,13 +210,14 @@ static void amd_pstate_ut_check_freq(u32 index)break ; cpudata = policy->driver_data; -if (!((cpudata->max_freq >= cpudata->nominal_freq) && - (cpudata->nominal_freq > cpudata->lowest_nonlinear_freq) && + nominal_freq_khz = cpudata->nominal_freq*1000 ; +if (!((cpudata->max_freq >= nominal_freq_khz) && + (nominal_freq_khz > cpudata->lowest_nonlinear_freq) && (cpudata->lowest_nonlinear_freq > cpudata->min_freq) && (cpudata->min_freq >0 ))) { amd_pstate_ut_cases[index].result =AMD_PSTATE_UT_RESULT_FAIL ;pr_err ("%s cpu%d max=%d >= nominal=%d > lowest_nonlinear=%d > min=%d > 0, the formula is incorrect!\n" , - __func__, cpu, cpudata->max_freq, cpudata->nominal_freq, + __func__, cpu, cpudata->max_freq, nominal_freq_khz, cpudata->lowest_nonlinear_freq, cpudata->min_freq); goto skip_test; }
@@ -229,13 +231,13 @@ static void amd_pstate_ut_check_freq(u32 index)if (cpudata->boost_supported) {if ((policy->max == cpudata->max_freq) || - (policy->max == cpudata->nominal_freq)) + (policy->max == nominal_freq_khz)) amd_pstate_ut_cases[index].result =AMD_PSTATE_UT_RESULT_PASS ;else { amd_pstate_ut_cases[index].result =AMD_PSTATE_UT_RESULT_FAIL ;pr_err ("%s cpu%d policy_max=%d should be equal cpu_max=%d or cpu_nominal=%d !\n" , __func__, cpu, policy->max, cpudata->max_freq, - cpudata->nominal_freq); + nominal_freq_khz); goto skip_test; } }else {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 139/809 cpufreq/amd-pstate: Fix the scaling_max_freq setting on shared memory CPPC systems
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dhananjay Ugwekar <[email protected]>
[ Upstream commit 738d7d03571c7e38565bd245c0815a2c74665018 ]
On shared memory CPPC systems, with amd_pstate=active mode, the change in scaling_max_freq doesn't get written to the shared memory region. Due to this, the writes to the scaling_max_freq sysfs file don't take effect. Fix this by propagating the scaling_max_freq changes to the shared memory region.
--- drivers/cpufreq/amd-pstate.c | 43 +++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 20 deletions(-)
drivers/cpufreq/amd-pstate.c +23 -20
@@ -247,6 +247,26 @@ static int amd_pstate_get_energy_pref_index(struct amd_cpudata *cpudata)return index; } +static void pstate_update_perf (struct amd_cpudata *cpudata,u32 min_perf, +u32 des_perf,u32 max_perf,bool fast_switch) +{ +if (fast_switch) +wrmsrl (MSR_AMD_CPPC_REQ ,READ_ONCE (cpudata->cppc_req_cached)); +else +wrmsrl_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , +READ_ONCE (cpudata->cppc_req_cached)); +} + +DEFINE_STATIC_CALL (amd_pstate_update_perf, pstate_update_perf); + +static inline void amd_pstate_update_perf (struct amd_cpudata *cpudata, +u32 min_perf,u32 des_perf, +u32 max_perf,bool fast_switch) +{ +static_call (amd_pstate_update_perf)(cpudata, min_perf, des_perf, + max_perf, fast_switch); +} +static int amd_pstate_set_epp (struct amd_cpudata *cpudata,u32 epp) {int ret;
@@ -263,6 +283,9 @@ static int amd_pstate_set_epp(struct amd_cpudata *cpudata, u32 epp)if (!ret) cpudata->epp_cached = epp; }else { +amd_pstate_update_perf (cpudata, cpudata->min_limit_perf,0U , + cpudata->max_limit_perf, false); + perf_ctrls.energy_perf = epp; ret =cppc_set_epp_perf (cpudata->cpu, &perf_ctrls,1 );if (ret) {
@@ -452,16 +475,6 @@ static inline int amd_pstate_init_perf(struct amd_cpudata *cpudata)return static_call (amd_pstate_init_perf)(cpudata); } -static void pstate_update_perf (struct amd_cpudata *cpudata,u32 min_perf, -u32 des_perf,u32 max_perf,bool fast_switch) -{ -if (fast_switch) -wrmsrl (MSR_AMD_CPPC_REQ ,READ_ONCE (cpudata->cppc_req_cached)); -else -wrmsrl_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , -READ_ONCE (cpudata->cppc_req_cached)); -} -static void cppc_update_perf (struct amd_cpudata *cpudata,u32 min_perf,u32 des_perf,u32 max_perf,bool fast_switch)
@@ -475,16 +488,6 @@ static void cppc_update_perf(struct amd_cpudata *cpudata,cppc_set_perf (cpudata->cpu, &perf_ctrls); } -DEFINE_STATIC_CALL (amd_pstate_update_perf, pstate_update_perf); - -static inline void amd_pstate_update_perf (struct amd_cpudata *cpudata, -u32 min_perf,u32 des_perf, -u32 max_perf,bool fast_switch) -{ -static_call (amd_pstate_update_perf)(cpudata, min_perf, des_perf, - max_perf, fast_switch); -} -static inline bool amd_pstate_sample (struct amd_cpudata *cpudata) {u64 aperf, mperf, tsc;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 140/809 m68k: cmpxchg: Fix return value for default case in __arch_xchg()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Blum <[email protected]>
[ Upstream commit 21b9e722ad28c19c2bc83f18f540b3dbd89bf762 ]
The return value of __invalid_xchg_size() is assigned to tmp instead of the return variable x. Assign it to x instead.
--- arch/m68k/include/asm/cmpxchg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/include/asm/cmpxchg.h +1 -1
@@ -32,7 +32,7 @@ static inline unsigned long __arch_xchg(unsigned long x, volatile void * ptr, in x = tmp;break ;default : - tmp =__invalid_xchg_size (x, ptr, size); + x =__invalid_xchg_size (x, ptr, size);break ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 141/809 ARM: spitz: fix GPIO assignment for backlight
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
[ Upstream commit 78ab3d352f2982bf3f7e506bfbaba7afee1ed8a9 ]
GPIOs controlling backlight on Spitz and Akita are coming from GPIO expanders, not the pxa27xx-gpio block, correct it.
Additionally GPIO lookup tables operate with pin numbers rather than legacy GPIO numbers, fix that as well. Use raw numbers instead of legacy GPIO names to avoid confusion.
--- arch/arm/mach-pxa/spitz.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-)
arch/arm/mach-pxa/spitz.c +10 -20
@@ -520,10 +520,8 @@ static struct gpiod_lookup_table spitz_ads7846_gpio_table = {static struct gpiod_lookup_table spitz_lcdcon_gpio_table = { .dev_id ="spi2.1" , .table = { -GPIO_LOOKUP ("gpio-pxa" ,SPITZ_GPIO_BACKLIGHT_CONT , -"BL_CONT" ,GPIO_ACTIVE_LOW ), -GPIO_LOOKUP ("gpio-pxa" ,SPITZ_GPIO_BACKLIGHT_ON , -"BL_ON" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.1" ,6 ,"BL_CONT" ,GPIO_ACTIVE_LOW ), +GPIO_LOOKUP ("sharp-scoop.1" ,7 ,"BL_ON" ,GPIO_ACTIVE_HIGH ), { }, }, };
@@ -531,10 +529,8 @@ static struct gpiod_lookup_table spitz_lcdcon_gpio_table = {static struct gpiod_lookup_table akita_lcdcon_gpio_table = { .dev_id ="spi2.1" , .table = { -GPIO_LOOKUP ("gpio-pxa" ,AKITA_GPIO_BACKLIGHT_CONT , -"BL_CONT" ,GPIO_ACTIVE_LOW ), -GPIO_LOOKUP ("gpio-pxa" ,AKITA_GPIO_BACKLIGHT_ON , -"BL_ON" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("i2c-max7310" ,3 ,"BL_ON" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("i2c-max7310" ,4 ,"BL_CONT" ,GPIO_ACTIVE_LOW ), { }, }, };
@@ -964,12 +960,9 @@ static inline void spitz_i2c_init(void) {}static struct gpiod_lookup_table spitz_audio_gpio_table = { .dev_id ="spitz-audio" , .table = { -GPIO_LOOKUP ("sharp-scoop.0" ,SPITZ_GPIO_MUTE_L -SPITZ_SCP_GPIO_BASE , -"mute-l" ,GPIO_ACTIVE_HIGH ), -GPIO_LOOKUP ("sharp-scoop.0" ,SPITZ_GPIO_MUTE_R -SPITZ_SCP_GPIO_BASE , -"mute-r" ,GPIO_ACTIVE_HIGH ), -GPIO_LOOKUP ("sharp-scoop.1" ,SPITZ_GPIO_MIC_BIAS -SPITZ_SCP2_GPIO_BASE , -"mic" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.0" ,3 ,"mute-l" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.0" ,4 ,"mute-r" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.1" ,8 ,"mic" ,GPIO_ACTIVE_HIGH ), { }, }, };
@@ -977,12 +970,9 @@ static struct gpiod_lookup_table spitz_audio_gpio_table = {static struct gpiod_lookup_table akita_audio_gpio_table = { .dev_id ="spitz-audio" , .table = { -GPIO_LOOKUP ("sharp-scoop.0" ,SPITZ_GPIO_MUTE_L -SPITZ_SCP_GPIO_BASE , -"mute-l" ,GPIO_ACTIVE_HIGH ), -GPIO_LOOKUP ("sharp-scoop.0" ,SPITZ_GPIO_MUTE_R -SPITZ_SCP_GPIO_BASE , -"mute-r" ,GPIO_ACTIVE_HIGH ), -GPIO_LOOKUP ("i2c-max7310" ,AKITA_GPIO_MIC_BIAS -AKITA_IOEXP_GPIO_BASE , -"mic" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.0" ,3 ,"mute-l" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sharp-scoop.0" ,4 ,"mute-r" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("i2c-max7310" ,2 ,"mic" ,GPIO_ACTIVE_HIGH ), { }, }, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 142/809 ARM: Remove address checking for MMUless devices
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yanjun Yang <[email protected]>
[ Upstream commit 3ccea4784fddd96fbd6c4497eb28b45dab638c2a ]
Commit 169f9102f9198b ("ARM: 9350/1: fault: Implement copy_from_kernel_nofault_allowed()") added the function to check address before use. However, for devices without MMU, addr > TASK_SIZE will always fail. This patch move this function after the #ifdef CONFIG_MMU statement.
--- arch/arm/mm/fault.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mm/fault.c +2 -2
@@ -25,6 +25,8 @@#include "fault.h" +#ifdef CONFIG_MMU +bool copy_from_kernel_nofault_allowed (const void *unsafe_src,size_t size) {unsigned long addr = (unsigned long )unsafe_src;
@@ -32,8 +34,6 @@ bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size)return addr >=TASK_SIZE &&ULONG_MAX - addr >= size; } -#ifdef CONFIG_MMU -/* * This is useful to dump out the page tables associated with * 'addr' in mm 'mm'.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 143/809 x86/sev: Do RMP memory coverage check after max_pfn has been set
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tom Lendacky <[email protected]>
[ Upstream commit 0440feb090790c6243bca85d6a794824e71ff26c ]
The RMP table is probed early in the boot process before max_pfn has been set, so the logic to check if the RMP covers all of system memory is not valid.
Move the RMP memory coverage check from snp_probe_rmptable_info() into snp_rmptable_init(), which is well after max_pfn has been set. Also, fix the calculation to use PFN_UP instead of PHYS_PFN, in order to compute the required RMP size properly.
--- arch/x86/virt/svm/sev.c | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-)
arch/x86/virt/svm/sev.c +22 -22
@@ -120,7 +120,7 @@ static __init void snp_enable(void *arg)bool snp_probe_rmptable_info (void ) { -u64 max_rmp_pfn, calc_rmp_sz, rmp_sz, rmp_base, rmp_end; +u64 rmp_sz, rmp_base, rmp_end;rdmsrl (MSR_AMD64_RMP_BASE , rmp_base);rdmsrl (MSR_AMD64_RMP_END , rmp_end);
@@ -137,28 +137,11 @@ bool snp_probe_rmptable_info(void) rmp_sz = rmp_end - rmp_base +1 ; -/* -* Calculate the amount the memory that must be reserved by the BIOS to -* address the whole RAM, including the bookkeeping area. The RMP itself -* must also be covered. -*/ - max_rmp_pfn = max_pfn; -if (PHYS_PFN (rmp_end) > max_pfn) - max_rmp_pfn =PHYS_PFN (rmp_end); - - calc_rmp_sz = (max_rmp_pfn <<4 ) +RMPTABLE_CPU_BOOKKEEPING_SZ ; - -if (calc_rmp_sz > rmp_sz) { -pr_err ("Memory reserved for the RMP table does not cover full system RAM (expected 0x%llx got 0x%llx)\n" , - calc_rmp_sz, rmp_sz); -return false; - } - probed_rmp_base = rmp_base; probed_rmp_size = rmp_sz;pr_info ("RMP table physical range [0x%016llx - 0x%016llx]\n" , - probed_rmp_base, probed_rmp_base + probed_rmp_size -1 ); + rmp_base, rmp_end);return true; }
@@ -206,9 +189,8 @@ void __init snp_fixup_e820_tables(void)*/ static int __init snp_rmptable_init (void ) { +u64 max_rmp_pfn, calc_rmp_sz, rmptable_size, rmp_end, val;void *rmptable_start; -u64 rmptable_size; -u64 val;if (!cc_platform_has (CC_ATTR_HOST_SEV_SNP ))return 0 ;
@@ -219,10 +201,28 @@ static int __init snp_rmptable_init(void)if (!probed_rmp_size) goto nosnp; + rmp_end = probed_rmp_base + probed_rmp_size -1 ; + +/* +* Calculate the amount the memory that must be reserved by the BIOS to +* address the whole RAM, including the bookkeeping area. The RMP itself +* must also be covered. +*/ + max_rmp_pfn = max_pfn; +if (PFN_UP (rmp_end) > max_pfn) + max_rmp_pfn =PFN_UP (rmp_end); + + calc_rmp_sz = (max_rmp_pfn <<4 ) +RMPTABLE_CPU_BOOKKEEPING_SZ ; +if (calc_rmp_sz > probed_rmp_size) { +pr_err ("Memory reserved for the RMP table does not cover full system RAM (expected 0x%llx got 0x%llx)\n" , + calc_rmp_sz, probed_rmp_size); + goto nosnp; + } + rmptable_start =memremap (probed_rmp_base, probed_rmp_size,MEMREMAP_WB );if (!rmptable_start) {pr_err ("Failed to map RMP table\n" ); -return 1 ; + goto nosnp; }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 144/809 vmlinux.lds.h: catch .bss..L* sections into BSS")
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit 1a7b7326d587c9a5e8ff067e70d6aaf0333f4bb3 ]
Commit 9a427556fb8e ("vmlinux.lds.h: catch compound literals into data and BSS") added catches for .data..L* and .rodata..L* but missed .bss..L*
Since commit 5431fdd2c181 ("ptrace: Convert ptrace_attach() to use lock guards") the following appears at build:
LD .tmp_vmlinux.kallsyms1
powerpc64-linux-ld: warning: orphan section .bss..Lubsan_data33' from kernel/ptrace.o' being placed in section `.bss..Lubsan_data33'
NM .tmp_vmlinux.kallsyms1.syms KSYMS .tmp_vmlinux.kallsyms1.S AS .tmp_vmlinux.kallsyms1.S LD .tmp_vmlinux.kallsyms2 powerpc64-linux-ld: warning: orphan section `.bss..Lubsan_data33' from `kernel/ptrace.o' being placed in section `.bss..Lubsan_data33' NM .tmp_vmlinux.kallsyms2.syms KSYMS .tmp_vmlinux.kallsyms2.S AS .tmp_vmlinux.kallsyms2.S LD vmlinux
powerpc64-linux-ld: warning: orphan section .bss..Lubsan_data33' from kernel/ptrace.o' being placed in section `.bss..Lubsan_data33'
Lets add .bss..L* to BSS_MAIN macro to catch those sections into BSS.
--- include/asm-generic/vmlinux.lds.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/asm-generic/vmlinux.lds.h +1 -1
@@ -103,7 +103,7 @@#define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data..L* .data..compoundliteral* .data.$__unnamed_* .data.$L*#define SDATA_MAIN .sdata .sdata.[0-9a-zA-Z_]*#define RODATA_MAIN .rodata .rodata.[0-9a-zA-Z_]* .rodata..L* -#define BSS_MAIN .bss .bss.[0-9a-zA-Z_]* .bss..compoundliteral* +#define BSS_MAIN .bss .bss.[0-9a-zA-Z_]* .bss..L* .bss..compoundliteral*#define SBSS_MAIN .sbss .sbss.[0-9a-zA-Z_]*#else #define TEXT_MAIN .text
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 145/809 firmware: turris-mox-rwtm: Do not complete if there are no waiters
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
[ Upstream commit 0bafb172b111ab27251af0eb684e7bde9570ce4c ]
Do not complete the "command done" completion if there are no waiters. This can happen if a wait_for_completion() timed out or was interrupted.
--- drivers/firmware/turris-mox-rwtm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/firmware/turris-mox-rwtm.c +4 -1
@@ -2,7 +2,7 @@/* * Turris Mox rWTM firmware driver * -* Copyright (C) 2019 Marek Behún <[email protected]> +* Copyright (C) 2019, 2024 Marek Behún <[email protected]> */ #include <linux/armada-37xx-rwtm-mailbox.h>
@@ -174,6 +174,9 @@ static void mox_rwtm_rx_callback(struct mbox_client *cl, void *data)struct mox_rwtm *rwtm =dev_get_drvdata (cl->dev);struct armada_37xx_rwtm_rx_msg *msg = data; +if (completion_done (&rwtm->cmd_done)) +return ; + rwtm->reply = *msg;complete (&rwtm->cmd_done); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 146/809 firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
[ Upstream commit 8467cfe821ac3526f7598682ad5f90689fa8cc49 ]
The wait_for_completion_timeout() function returns 0 if timed out, and a positive value if completed. Fix the usage of this function.
--- drivers/firmware/turris-mox-rwtm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/firmware/turris-mox-rwtm.c +6 -9
@@ -202,9 +202,8 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)if (ret <0 )return ret; - ret =wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 ); -if (ret <0 ) -return ret; +if (!wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 )) +return -ETIMEDOUT ; ret =mox_get_status (MBOX_CMD_BOARD_INFO , reply->retval);if (ret == -ENODATA ) {
@@ -238,9 +237,8 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)if (ret <0 )return ret; - ret =wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 ); -if (ret <0 ) -return ret; +if (!wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 )) +return -ETIMEDOUT ; ret =mox_get_status (MBOX_CMD_ECDSA_PUB_KEY , reply->retval);if (ret == -ENODATA ) {
@@ -277,9 +275,8 @@ static int check_get_random_support(struct mox_rwtm *rwtm)if (ret <0 )return ret; - ret =wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 ); -if (ret <0 ) -return ret; +if (!wait_for_completion_timeout (&rwtm->cmd_done,HZ /2 )) +return -ETIMEDOUT ;return mox_get_status (MBOX_CMD_GET_RANDOM , rwtm->reply.retval); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 147/809 firmware: turris-mox-rwtm: Initialize completion before mailbox
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
[ Upstream commit 49e24c80d3c81c43e2a56101449e1eea32fcf292 ]
Initialize the completion before the mailbox channel is requested.
--- drivers/firmware/turris-mox-rwtm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/firmware/turris-mox-rwtm.c +1 -2
@@ -499,6 +499,7 @@ static int turris_mox_rwtm_probe(struct platform_device *pdev)platform_set_drvdata (pdev, rwtm);mutex_init (&rwtm->busy); +init_completion (&rwtm->cmd_done); rwtm->mbox_client.dev = dev; rwtm->mbox_client.rx_callback = mox_rwtm_rx_callback;
@@ -512,8 +513,6 @@ static int turris_mox_rwtm_probe(struct platform_device *pdev) goto remove_files; } -init_completion (&rwtm->cmd_done); - ret =mox_get_board_info (rwtm);if (ret <0 )dev_warn (dev,"Cannot read board information: %i\n" , ret);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 148/809 wifi: ath12k: Dont drop tx_status in failure case
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Eckelmann <[email protected]>
[ Upstream commit 5453bbd6fef4ca2fea3b4b338fc715d7135afc6f ]
When a station idles for a long time, hostapd will try to send a QoS Null frame to the station as "poll". NL80211_CMD_PROBE_CLIENT is used for this purpose.
And the skb will be added to ack_status_frame - waiting for a completion via ieee80211_report_ack_skb().
But when the peer was already removed before the tx_complete arrives, the peer will be missing. And when using dev_kfree_skb_any (instead of going through mac80211), the entry will stay inside ack_status_frames thus not clean up related information in its internal data structures. This IDR will therefore run full after 8K request were generated for such clients.
At this point, the access point will then just stall and not allow any new clients because idr_alloc() for ack_status_frame will fail.
ieee80211_free_txskb() on the other hand will (when required) call ieee80211_report_ack_skb() and make sure that (when required) remove the entry from the ack_status_frame and clean up related information in its internal data structures.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp_tx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath12k/dp_tx.c +5 -4
@@ -352,15 +352,15 @@ static void ath12k_dp_tx_free_txbuf(struct ath12k_base *ab,u8 pdev_id =ath12k_hw_mac_id_to_pdev_id (ab->hw_params, mac_id); skb_cb =ATH12K_SKB_CB (msdu); + ar = ab->pdevs[pdev_id].ar;dma_unmap_single (ab->dev, skb_cb->paddr, msdu->len,DMA_TO_DEVICE );if (skb_cb->paddr_ext_desc)dma_unmap_single (ab->dev, skb_cb->paddr_ext_desc,sizeof (struct hal_tx_msdu_ext_desc ),DMA_TO_DEVICE ); -dev_kfree_skb_any (msdu); +ieee80211_free_txskb (ar->ah->hw, msdu); - ar = ab->pdevs[pdev_id].ar;if (atomic_dec_and_test (&ar->dp.num_tx_pending))wake_up (&ar->dp.tx_empty_waitq); }
@@ -448,6 +448,7 @@ static void ath12k_dp_tx_complete_msdu(struct ath12k *ar, struct hal_tx_status *ts) {struct ath12k_base *ab = ar->ab; +struct ath12k_hw *ah = ar->ah;struct ieee80211_tx_info *info;struct ath12k_skb_cb *skb_cb;
@@ -466,12 +467,12 @@ static void ath12k_dp_tx_complete_msdu(struct ath12k *ar,rcu_read_lock ();if (!rcu_dereference (ab->pdevs_active[ar->pdev_idx])) { -dev_kfree_skb_any (msdu); +ieee80211_free_txskb (ah->hw, msdu); goto exit; }if (!skb_cb->vif) { -dev_kfree_skb_any (msdu); +ieee80211_free_txskb (ah->hw, msdu); goto exit; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 149/809 wifi: ath12k: drop failed transmitted frames from metric calculation.
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karthikeyan Kathirvel <[email protected]>
[ Upstream commit 50971dc6694c0845fcddfe337ea39c5b723d5a92 ]
In mesh node traffic, internal firmware-transmitted failures are reported as transmitted failures in mesh metric calculation, leading to the breakage of the mesh link.
Fix the issue by dropping the internal firmware-transmitted failures before updating the TX completion status to mac80211, in order to prevent false failure averaging in mesh metric calculation.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp_tx.c | 38 ++++++++++++++++------ drivers/net/wireless/ath/ath12k/hal_desc.h | 22 ++++++++++++- 2 files changed, 49 insertions(+), 11 deletions(-)
drivers/net/wireless/ath/ath12k/dp_tx.c +28 -10
@@ -482,18 +482,36 @@ static void ath12k_dp_tx_complete_msdu(struct ath12k *ar,/* skip tx rate update from ieee80211_status*/ info->status.rates[0 ].idx =-1 ; -if (ts->status ==HAL_WBM_TQM_REL_REASON_FRAME_ACKED && - !(info->flags &IEEE80211_TX_CTL_NO_ACK )) { - info->flags |=IEEE80211_TX_STAT_ACK ; - info->status.ack_signal =ATH12K_DEFAULT_NOISE_FLOOR + - ts->ack_rssi; - info->status.flags =IEEE80211_TX_STATUS_ACK_SIGNAL_VALID ; +switch (ts->status) { +case HAL_WBM_TQM_REL_REASON_FRAME_ACKED : +if (!(info->flags &IEEE80211_TX_CTL_NO_ACK )) { + info->flags |=IEEE80211_TX_STAT_ACK ; + info->status.ack_signal =ATH12K_DEFAULT_NOISE_FLOOR + + ts->ack_rssi; + info->status.flags =IEEE80211_TX_STATUS_ACK_SIGNAL_VALID ; + } +break ; +case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX : +if (info->flags &IEEE80211_TX_CTL_NO_ACK ) { + info->flags |=IEEE80211_TX_STAT_NOACK_TRANSMITTED ; +break ; + } + fallthrough; +case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_MPDU : +case HAL_WBM_TQM_REL_REASON_DROP_THRESHOLD : +case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_AGED_FRAMES : +/* The failure status is due to internal firmware tx failure +* hence drop the frame; do not update the status of frame to +* the upper layer +*/ +ieee80211_free_txskb (ah->hw, msdu); + goto exit; +default : +ath12k_dbg (ab,ATH12K_DBG_DP_TX ,"tx frame is not acked status %d\n" , + ts->status); +break ; } -if (ts->status ==HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX && - (info->flags &IEEE80211_TX_CTL_NO_ACK )) - info->flags |=IEEE80211_TX_STAT_NOACK_TRANSMITTED ; -/* NOTE: Tx rate status reporting. Tx completion status does not have * necessary information (for example nss) to build the tx rate. * Might end up reporting it out-of-band from HTT stats.
drivers/net/wireless/ath/ath12k/hal_desc.h +21 -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-2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "core.h"
@@ -2048,6 +2048,19 @@ struct hal_wbm_release_ring {* fw with fw_reason2. * @HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON3: Remove command initiated by * fw with fw_reason3. +* @HAL_WBM_TQM_REL_REASON_CMD_DISABLE_QUEUE: Remove command initiated by +* fw with disable queue. +* @HAL_WBM_TQM_REL_REASON_CMD_TILL_NONMATCHING: Remove command initiated by +* fw to remove all mpdu until 1st non-match. +* @HAL_WBM_TQM_REL_REASON_DROP_THRESHOLD: Dropped due to drop threshold +* criteria +* @HAL_WBM_TQM_REL_REASON_DROP_LINK_DESC_UNAVAIL: Dropped due to link desc +* not available +* @HAL_WBM_TQM_REL_REASON_DROP_OR_INVALID_MSDU: Dropped due drop bit set or +* null flow +* @HAL_WBM_TQM_REL_REASON_MULTICAST_DROP: Dropped due mcast drop set for VDEV +* @HAL_WBM_TQM_REL_REASON_VDEV_MISMATCH_DROP: Dropped due to being set with +* 'TCL_drop_reason' */ enum hal_wbm_tqm_rel_reason {HAL_WBM_TQM_REL_REASON_FRAME_ACKED ,
@@ -2058,6 +2071,13 @@ enum hal_wbm_tqm_rel_reason {HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON1 ,HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON2 ,HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON3 , +HAL_WBM_TQM_REL_REASON_CMD_DISABLE_QUEUE , +HAL_WBM_TQM_REL_REASON_CMD_TILL_NONMATCHING , +HAL_WBM_TQM_REL_REASON_DROP_THRESHOLD , +HAL_WBM_TQM_REL_REASON_DROP_LINK_DESC_UNAVAIL , +HAL_WBM_TQM_REL_REASON_DROP_OR_INVALID_MSDU , +HAL_WBM_TQM_REL_REASON_MULTICAST_DROP , + HAL_WBM_TQM_REL_REASON_VDEV_MISMATCH_DROP, }; struct hal_wbm_buffer_ring {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 150/809 wifi: ath12k: avoid duplicated vdev stop
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kang Yang <[email protected]>
[ Upstream commit 3b0989e925f38df733a03ff5a320d6841006b3f9 ]
ath12k_mac_op_unassign_vif_chanctx() will do vdev stop in ath12k_mac_monitor_stop(). This ath12k_mac_vdev_stop() will do vdev stop again, then might trigger firmware crash.
So add judgement to avoid duplicated vdev stop.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/mac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/mac.c +2 -1
@@ -7386,7 +7386,8 @@ ath12k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw, arvif->is_started = false; } -if (arvif->vdev_type !=WMI_VDEV_TYPE_STA ) { +if (arvif->vdev_type !=WMI_VDEV_TYPE_STA && + arvif->vdev_type !=WMI_VDEV_TYPE_MONITOR ) {ath12k_bss_disassoc (ar, arvif); ret =ath12k_mac_vdev_stop (arvif);if (ret)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 151/809 wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samasth Norway Ananda <[email protected]>
[ Upstream commit c636fa85feb450ca414a10010ed05361a73c93a6 ]
The band_idx variable in the function wlc_lcnphy_tx_iqlo_cal() will never be set to 1 as BCM4313 is the only device for which the LCN PHY code is used. This is a 2G-only device.
--- .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c +9 -9
@@ -2567,7 +2567,6 @@ wlc_lcnphy_tx_iqlo_cal(struct brcms_phy *pi,struct lcnphy_txgains cal_gains, temp_gains;u16 hash; -u8 band_idx;int j;u16 ncorr_override[5 ];u16 syst_coeffs[] = {0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,0x0000 ,
@@ -2599,6 +2598,9 @@ wlc_lcnphy_tx_iqlo_cal(struct brcms_phy *pi,u16 *values_to_save;struct brcms_phy_lcnphy *pi_lcn = pi->u.pi_lcnphy; +if (WARN_ON (CHSPEC_IS5G (pi->radio_chanspec))) +return ; + values_to_save =kmalloc_array (20 ,sizeof (u16),GFP_ATOMIC );if (NULL == values_to_save)return ;
@@ -2662,20 +2664,18 @@ wlc_lcnphy_tx_iqlo_cal(struct brcms_phy *pi, hash = (target_gains->gm_gain <<8 ) | (target_gains->pga_gain <<4 ) | (target_gains->pad_gain); - band_idx = (CHSPEC_IS5G (pi->radio_chanspec) ?1 :0 ); - cal_gains = *target_gains;memset (ncorr_override,0 ,sizeof (ncorr_override)); -for (j =0 ; j < iqcal_gainparams_numgains_lcnphy[band_idx]; j++) { -if (hash == tbl_iqcal_gainparams_lcnphy[band_idx][j][0 ]) { +for (j =0 ; j < iqcal_gainparams_numgains_lcnphy[0 ]; j++) { +if (hash == tbl_iqcal_gainparams_lcnphy[0 ][j][0 ]) { cal_gains.gm_gain = - tbl_iqcal_gainparams_lcnphy[band_idx][j][1 ]; + tbl_iqcal_gainparams_lcnphy[0 ][j][1 ]; cal_gains.pga_gain = - tbl_iqcal_gainparams_lcnphy[band_idx][j][2 ]; + tbl_iqcal_gainparams_lcnphy[0 ][j][2 ]; cal_gains.pad_gain = - tbl_iqcal_gainparams_lcnphy[band_idx][j][3 ]; + tbl_iqcal_gainparams_lcnphy[0 ][j][3 ];memcpy (ncorr_override, - &tbl_iqcal_gainparams_lcnphy[band_idx][j][3 ], + &tbl_iqcal_gainparams_lcnphy[0 ][j][3 ],sizeof (ncorr_override));break ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 152/809 wifi: ath12k: Correct 6 GHz frequency value in rx status
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pradeep Kumar Chitrapu <[email protected]>
[ Upstream commit c3c84a74bd797f76d7da036c9fef947d674bbc18 ]
The frequency in the rx status is currently being filled incorrectly for the 6 GHz band. The channel number received is invalid in this case, resulting in packet drops. Fix this issue by correcting the frequency calculation.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 9 ++++++--- drivers/net/wireless/ath/ath12k/wmi.c | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +6 -3
@@ -2383,8 +2383,10 @@ void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct hal_rx_desc *rx_desc, channel_num = meta_data; center_freq = meta_data >>16 ; -if (center_freq >=5935 && center_freq <=7105 ) { +if (center_freq >=ATH12K_MIN_6G_FREQ && + center_freq <=ATH12K_MAX_6G_FREQ ) { rx_status->band =NL80211_BAND_6GHZ ; + rx_status->freq = center_freq; }else if (channel_num >=1 && channel_num <=14 ) { rx_status->band =NL80211_BAND_2GHZ ; }else if (channel_num >=36 && channel_num <=173 ) {
@@ -2402,8 +2404,9 @@ void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct hal_rx_desc *rx_desc, rx_desc, sizeof(*rx_desc)); } - rx_status->freq =ieee80211_channel_to_frequency (channel_num, - rx_status->band); +if (rx_status->band !=NL80211_BAND_6GHZ ) + rx_status->freq =ieee80211_channel_to_frequency (channel_num, + rx_status->band);ath12k_dp_rx_h_rate (ar, rx_desc, rx_status); }
drivers/net/wireless/ath/ath12k/wmi.c +7 -3
@@ -6022,8 +6022,10 @@ static void ath12k_mgmt_rx_event(struct ath12k_base *ab, struct sk_buff *skb)if (rx_ev.status &WMI_RX_STATUS_ERR_MIC ) status->flag |=RX_FLAG_MMIC_ERROR ; -if (rx_ev.chan_freq >=ATH12K_MIN_6G_FREQ ) { +if (rx_ev.chan_freq >=ATH12K_MIN_6G_FREQ && + rx_ev.chan_freq <=ATH12K_MAX_6G_FREQ ) { status->band =NL80211_BAND_6GHZ ; + status->freq = rx_ev.chan_freq; }else if (rx_ev.channel >=1 && rx_ev.channel <=14 ) { status->band =NL80211_BAND_2GHZ ; }else if (rx_ev.channel >=36 && rx_ev.channel <=ATH12K_MAX_5G_CHAN ) {
@@ -6044,8 +6046,10 @@ static void ath12k_mgmt_rx_event(struct ath12k_base *ab, struct sk_buff *skb) sband = &ar->mac.sbands[status->band]; - status->freq =ieee80211_channel_to_frequency (rx_ev.channel, - status->band); +if (status->band !=NL80211_BAND_6GHZ ) + status->freq =ieee80211_channel_to_frequency (rx_ev.channel, + status->band); + status->signal = rx_ev.snr +ATH12K_DEFAULT_NOISE_FLOOR ; status->rate_idx =ath12k_mac_bitrate_to_idx (sband, rx_ev.rate /100 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 153/809 wifi: ath12k: Fix tx completion ring (WBM2SW) setup failure
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nithyanantham Paramasivam <[email protected]>
[ Upstream commit 0ce9ab2785e4e9ca0752390d8e5ab65bd08f0e78 ]
We observe intermittent ping failures from the access point (AP) to station (STA) in any mode (AP-STA or Mesh) configured. Specifically, the transmission completion status is not received at tx completion ring id 4 (WBM2SW ring4) for the packets transmitted via TCL DATA ring id 3. This prevents freeing up tx descriptors and leads to buffer exhaustion.
Currently, during initialization of the WBM2SW ring, we are directly mapping the ring number to the ring mask to obtain the ring mask group index. This approach is causing setup failures for WBM2SW ring 4. Similarly, during runtime, when receiving incoming transmission completion status, the validation of the ring number by mapping the interrupted ring mask. This is resulting in validation failure. Thereby preventing entry into the completion handler ath12k_dp_tx_completion_handler().
The existing design assumed that the ring numbers would always be sequential and could be directly mapped with the ring mask. However, this assumption does not hold true for WBM2SW ring 4. Therefore, modify the design such that, instead of mapping the ring number, the ring ID is mapped with the ring mask.
According to this design:
1. During initialization of the WBM2SW ring, mapping the ring ID to the ring mask will ensure obtaining the correct ring mask group ID.
2. During runtime, validating the interrupted ring mask group ID within the transmission completion group is sufficient. This approach allows the ring ID to be derived from the interrupted ring mask and enables entry into the completion handler.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp.c | 18 +++++++++++++----- drivers/net/wireless/ath/ath12k/hw.c | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath12k/dp.c +13 -5
@@ -132,7 +132,9 @@ static int ath12k_dp_srng_find_ring_in_mask(int ring_num, const u8 *grp_mask)static int ath12k_dp_srng_calculate_msi_group (struct ath12k_base *ab,enum hal_ring_type type,int ring_num) { +const struct ath12k_hal_tcl_to_wbm_rbm_map *map;const u8 *grp_mask; +int i;switch (type) {case HAL_WBM2SW_RELEASE :
@@ -140,6 +142,14 @@ static int ath12k_dp_srng_calculate_msi_group(struct ath12k_base *ab, grp_mask = &ab->hw_params->ring_mask->rx_wbm_rel[0 ]; ring_num =0 ; }else { + map = ab->hw_params->hal_ops->tcl_to_wbm_rbm_map; +for (i =0 ; i < ab->hw_params->max_tx_ring; i++) { +if (ring_num == map[i].wbm_ring_num) { + ring_num = i; +break ; + } + } + grp_mask = &ab->hw_params->ring_mask->tx[0 ]; }break ;
@@ -881,11 +891,9 @@ int ath12k_dp_service_srng(struct ath12k_base *ab,enum dp_monitor_mode monitor_mode;u8 ring_mask; -while (i < ab->hw_params->max_tx_ring) { -if (ab->hw_params->ring_mask->tx[grp_id] & -BIT (ab->hw_params->hal_ops->tcl_to_wbm_rbm_map[i].wbm_ring_num)) -ath12k_dp_tx_completion_handler (ab, i); - i++; +if (ab->hw_params->ring_mask->tx[grp_id]) { + i =fls (ab->hw_params->ring_mask->tx[grp_id]) -1 ; +ath12k_dp_tx_completion_handler (ab, i); }if (ab->hw_params->ring_mask->rx_err[grp_id]) {
drivers/net/wireless/ath/ath12k/hw.c +1 -1
@@ -580,8 +580,8 @@ static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn9274 = {static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_wcn7850 = { .tx = {ATH12K_TX_RING_MASK_0 , +ATH12K_TX_RING_MASK_1 ,ATH12K_TX_RING_MASK_2 , -ATH12K_TX_RING_MASK_4 , }, .rx_mon_dest = { },
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 154/809 wifi: ath12k: fix Smatch warnings on ath12k_core_suspend()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 33370412eced2dc7f81f4324e109d69319cafd82 ]
Smatch is throwing below warning:
Commit 692921ead832 ("wifi: ath12k: flush all packets before suspend") leads to the following Smatch static checker warning:
drivers/net/wireless/ath/ath12k/core.c:58 ath12k_core_suspend() warn: sleeping in atomic context
and also gives the reason:
drivers/net/wireless/ath/ath12k/core.c
48 int ret, i;
49
50 if (!ab->hw_params->supports_suspend)
51 return -EOPNOTSUPP;
52
53 rcu_read_lock();
^^^^^^^^^^^^^^^Disables preemption.
54 for (i = 0; i < ab->num_radios; i++) {
55 ar = ath12k_mac_get_ar_by_pdev_id(ab, i);
56 if (!ar)
57 continue;
--> 58 ret = ath12k_mac_wait_tx_complete(ar);
^^^^^^^Sleeping in atomic context.
59 if (ret) {
60 ath12k_warn(ab, "failed to wait tx complete: %d\n", ret);
61 rcu_read_unlock();
62 return ret;
63 }
64 }
65 rcu_read_unlock();But it is weird that no warning on this in run time even with CONFIG_DEBUG_ATOMIC_SLEEP=y. With some debug it is found that this is
because: when system goes to suspend, ath12k_mac_op_stop() gets called where then in ath12k_mac_stop() ab->pdevs_active[ar->pdev_idx] is cleared. This results in ath12k_mac_get_ar_by_pdev_id() always returning a NULL ar, and thereby ath12k_mac_wait_tx_complete() never gets a chance to run.
Fix it by retrieving ar directly from ab->pdevs[].ar instead of using ath12k_mac_get_ar_by_pdev_id(). Since ab->pdevs[].ar is set at boot time and won't get cleared when suspend, ath12k_mac_wait_tx_complete() won't be skipped. In addition, with ath12k_mac_get_ar_by_pdev_id() removed, rcu_read_lock()/unlock() are not needed any more, so remove them. This also fixes the warning above.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4
--- drivers/net/wireless/ath/ath12k/core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/wireless/ath/ath12k/core.c +1 -4
@@ -50,19 +50,16 @@ int ath12k_core_suspend(struct ath12k_base *ab)if (!ab->hw_params->supports_suspend)return -EOPNOTSUPP ; -rcu_read_lock ();for (i =0 ; i < ab->num_radios; i++) { - ar =ath12k_mac_get_ar_by_pdev_id (ab, i); + ar = ab->pdevs[i].ar;if (!ar)continue ; ret =ath12k_mac_wait_tx_complete (ar);if (ret) {ath12k_warn (ab,"failed to wait tx complete: %d\n" , ret); -rcu_read_unlock ();return ret; } } -rcu_read_unlock ();/* PM framework skips suspend_late/resume_early callbacks * if other devices report errors in their suspend callbacks.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 155/809 bpftool: Un-const bpf_func_info to fix it for llvm 17 and newer
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Babrou <[email protected]>
[ Upstream commit f4aba3471cfb9ccf69b476463f19b4c50fef6b14 ]
LLVM 17 started treating const structs as constants:
* https://github.com/llvm/llvm-project/commit/0b2d5b967d98
Combined with pointer laundering via ptr_to_u64, which takes a const ptr, but in reality treats the underlying memory as mutable, this makes clang always pass zero to btf__type_by_id, which breaks full name resolution.
Disassembly before (LLVM 16) and after (LLVM 17):
- 8b 75 cc mov -0x34(%rbp),%esi
- e8 47 8d 02 00 call 3f5b0 <btf__type_by_id>
+ 31 f6 xor %esi,%esi
+ e8 a9 8c 02 00 call 3f510 <btf__type_by_id>It's a bigger project to fix this properly (and a question whether LLVM itself should detect this), but for right now let's just fix bpftool.
For more information, see this thread in bpf mailing list:
* https://lore.kernel.org/bpf/CABWYdi0ymezpYsQsPv7qzpx2fWuTkoD1-wG1eT-9x-TSREFrQg@mail.gmail.com/T/
--- tools/bpf/bpftool/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/common.c +1 -1
@@ -410,7 +410,7 @@ void get_prog_full_name(const struct bpf_prog_info *prog_info, int prog_fd, {const char *prog_name = prog_info->name;const struct btf_type *func_type; -const struct bpf_func_info finfo = {}; +struct bpf_func_info finfo = {};struct bpf_prog_info info = {};__u32 info_len =sizeof (info);struct btf *prog_btf =NULL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 156/809 selftests/bpf: Fix prog numbers in test_sockmap
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit 6c8d7598dfed759bf1d9d0322b4c2b42eb7252d8 ]
bpf_prog5 and bpf_prog7 are removed from progs/test_sockmap_kern.h in commit d79a32129b21 ("bpf: Selftests, remove prints from sockmap tests"), now there are only 9 progs in it, not 11:
SEC("sk_skb1")
int bpf_prog1(struct __sk_buff *skb)
SEC("sk_skb2")
int bpf_prog2(struct __sk_buff *skb)
SEC("sk_skb3")
int bpf_prog3(struct __sk_buff *skb)
SEC("sockops")
int bpf_sockmap(struct bpf_sock_ops *skops)
SEC("sk_msg1")
int bpf_prog4(struct sk_msg_md *msg)
SEC("sk_msg2")
int bpf_prog6(struct sk_msg_md *msg)
SEC("sk_msg3")
int bpf_prog8(struct sk_msg_md *msg)
SEC("sk_msg4")
int bpf_prog9(struct sk_msg_md *msg)
SEC("sk_msg5")
int bpf_prog10(struct sk_msg_md *msg)This patch updates the array sizes of prog_fd[], prog_attach_type[] and prog_type[] from 11 to 9 accordingly.
--- tools/testing/selftests/bpf/test_sockmap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
tools/testing/selftests/bpf/test_sockmap.c +1 -5
@@ -63,7 +63,7 @@ int passed;int failed;int map_fd[9 ];struct bpf_map *maps[9 ]; -int prog_fd[11 ]; +int prog_fd[9 ];int txmsg_pass;int txmsg_redir;
@@ -1793,8 +1793,6 @@ int prog_attach_type[] = {BPF_SK_MSG_VERDICT ,BPF_SK_MSG_VERDICT , BPF_SK_MSG_VERDICT, -BPF_SK_MSG_VERDICT , - BPF_SK_MSG_VERDICT, }; int prog_type[] = {
@@ -1807,8 +1805,6 @@ int prog_type[] = {BPF_PROG_TYPE_SK_MSG ,BPF_PROG_TYPE_SK_MSG , BPF_PROG_TYPE_SK_MSG, -BPF_PROG_TYPE_SK_MSG , - BPF_PROG_TYPE_SK_MSG, };static int populate_progs (char *bpf_file)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 157/809 wifi: rtw89: 8852b: restore setting for RFE type 5 after device resume
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
[ Upstream commit 2c1fc7c24cd47396580c5a7b238673da618aeedd ]
The RFE type 5 set SPS analog parameters only once at probe stage, but the setting is missing after suspend/resume, so remove restriction and set the value when card power on/off.
--- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8852b.c +3 -3
@@ -403,6 +403,8 @@ static int rtw8852b_pwr_on_func(struct rtw89_dev *rtwdev)u32 val32;u32 ret; +rtw8852b_pwr_sps_ana (rtwdev); +rtw89_write32_clr (rtwdev,R_AX_SYS_PW_CTRL ,B_AX_AFSM_WLSUS_EN |B_AX_AFSM_PCIE_SUS_EN );rtw89_write32_set (rtwdev,R_AX_SYS_PW_CTRL ,B_AX_DIS_WLBT_PDNSUSEN_SOPC );
@@ -530,9 +532,7 @@ static int rtw8852b_pwr_off_func(struct rtw89_dev *rtwdev)u32 val32;u32 ret; -/* Only do once during probe stage after reading efuse */ -if (!test_bit (RTW89_FLAG_PROBE_DONE , rtwdev->flags)) -rtw8852b_pwr_sps_ana (rtwdev); +rtw8852b_pwr_sps_ana (rtwdev); ret =rtw89_mac_write_xtal_si (rtwdev,XTAL_SI_ANAPAR_WL ,XTAL_SI_RFC2RF ,XTAL_SI_RFC2RF );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 158/809 net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hagar Hemdan <[email protected]>
[ Upstream commit 96f887a612e4cda89efc3f54bc10c1997e3ab0e9 ]
xmit() functions should consume skb or return error codes in error paths.
When the configuration "CONFIG_INET_ESPINTCP" is not set, the implementation of the function "esp_output_tail_tcp" violates this rule. The function frees the skb and returns the error code.
This change removes the kfree_skb from both functions, for both esp4 and esp6.WARN_ON is added because esp_output_tail_tcp() should never be called if CONFIG_INET_ESPINTCP is not set.
This bug was discovered and resolved using Coverity Static Analysis Security Testing (SAST) by Synopsys, Inc.
--- net/ipv4/esp4.c | 3 +-- net/ipv6/esp6.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
net/ipv4/esp4.c +1 -2
@@ -239,8 +239,7 @@ static int esp_output_tail_tcp(struct xfrm_state *x, struct sk_buff *skb)#else static int esp_output_tail_tcp (struct xfrm_state *x,struct sk_buff *skb) { -kfree_skb (skb); - +WARN_ON (1 );return -EOPNOTSUPP ; }#endif
net/ipv6/esp6.c +1 -2
@@ -256,8 +256,7 @@ static int esp_output_tail_tcp(struct xfrm_state *x, struct sk_buff *skb)#else static int esp_output_tail_tcp (struct xfrm_state *x,struct sk_buff *skb) { -kfree_skb (skb); - +WARN_ON (1 );return -EOPNOTSUPP ; }#endif
Signature · 30 lines
2.43.0
inline int __down_read_trylock(struct rw_semaphore *sem)
/*
* lock for writing
*/
-static inline int __down_write_common(struct rw_semaphore *sem, int state)
+static __always_inline int __down_write_common(struct rw_semaphore *sem, int state)
{
int ret = 0;
@@ -1310,12 +1310,12 @@ static inline int __down_write_common(struct rw_semaphore *sem, int state)
return ret;
}
-static inline void __down_write(struct rw_semaphore *sem)
+static __always_inline void __down_write(struct rw_semaphore *sem)
{
__down_write_common(sem, TASK_UNINTERRUPTIBLE);
}
-static inline int __down_write_killable(struct rw_semaphore *sem)
+static __always_inline int __down_write_killable(struct rw_semaphore *sem)
{
return __down_write_common(sem, TASK_KILLABLE);
}
--
2.43.0Greg Kroah-Hartman
maintainerPATCH 159/809 wifi: iwlwifi: mvm: dont skip link selection
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 46144103ace2863e26f4e911aa45200753b7dbca ]
If we exit EMLSR due to a IWL_MVM_ESR_EXIT*, a MLO scan followed by a link selection is scheduled with a delay of 30 seconds.
If during that 30 seconds EMLSR was blocked and unblocked (IWL_MVM_ESR_BLOCKED*), we would still want to get the needed data from the MLO scan and select link accordingly, and not return immediately to EMLSR.
--- drivers/net/wireless/intel/iwlwifi/mvm/link.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/link.c +7 -0
@@ -1082,6 +1082,13 @@ static void iwl_mvm_esr_unblocked(struct iwl_mvm *mvm,IWL_DEBUG_INFO (mvm,"EMLSR is unblocked\n" ); +/* We exited due to an EXIT reason, so MLO scan was scheduled already */ +if (mvmvif->last_esr_exit.reason && + !(mvmvif->last_esr_exit.reason &IWL_MVM_BLOCK_ESR_REASONS )) { +IWL_DEBUG_INFO (mvm,"Wait for MLO scan\n" ); +return ; + } +/* * If EMLSR was blocked for more than 30 seconds, or the last link * selection decided to not enter EMLSR, trigger a new scan.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 160/809 wifi: mac80211: fix TTLM teardown work
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 2fe0a605d083b884490ee4de02be071b5b4291b1 ]
The worker calculates the wrong sdata pointer, so if it ever runs, it'll crash. Fix that.
--- net/mac80211/mlme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/mlme.c +1 -1
@@ -6834,7 +6834,7 @@ static void ieee80211_teardown_ttlm_work(struct wiphy *wiphy,u16 new_dormant_links;struct ieee80211_sub_if_data *sdata = container_of(work, struct ieee80211_sub_if_data, - u.mgd.neg_ttlm_timeout_work.work); + u.mgd.teardown_ttlm_work);if (!sdata->vif.neg_ttlm.valid)return ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 161/809 wifi: mac80211: cancel multi-link reconf work on disconnect
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 53b739fd46462dc40fd18390d76f2ee05c18ea3a ]
This work shouldn't run after we're disconnecting. Cancel it earlier (and then don't cancel it in stop later.)
--- net/mac80211/mlme.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/mac80211/mlme.c +5 -2
@@ -3289,6 +3289,11 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,wiphy_delayed_work_cancel (sdata->local->hw.wiphy, &ifmgd->neg_ttlm_timeout_work); + + sdata->u.mgd.removed_links =0 ; +wiphy_delayed_work_cancel (sdata->local->hw.wiphy, + &sdata->u.mgd.ml_reconf_work); +ieee80211_vif_set_links (sdata,0 ,0 ); ifmgd->mcast_seq_last =IEEE80211_SN_MODULO ;
@@ -8708,8 +8713,6 @@ void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata) &ifmgd->teardown_ttlm_work);wiphy_delayed_work_cancel (sdata->local->hw.wiphy, &ifmgd->tdls_peer_del_work); -wiphy_delayed_work_cancel (sdata->local->hw.wiphy, - &ifmgd->ml_reconf_work);wiphy_delayed_work_cancel (sdata->local->hw.wiphy, &ifmgd->ttlm_work);wiphy_delayed_work_cancel (sdata->local->hw.wiphy, &ifmgd->neg_ttlm_timeout_work);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 162/809 wifi: mac80211: cancel TTLM teardown work earlier
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 3567bd6dcd1467d2ad0f597be94114c6f9c62680 ]
It shouldn't be possible to run this after disconnecting, so cancel the work earlier.
--- net/mac80211/mlme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/mac80211/mlme.c +3 -2
@@ -3294,6 +3294,9 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,wiphy_delayed_work_cancel (sdata->local->hw.wiphy, &sdata->u.mgd.ml_reconf_work); +wiphy_work_cancel (sdata->local->hw.wiphy, + &ifmgd->teardown_ttlm_work); +ieee80211_vif_set_links (sdata,0 ,0 ); ifmgd->mcast_seq_last =IEEE80211_SN_MODULO ;
@@ -8709,8 +8712,6 @@ void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata) &ifmgd->beacon_connection_loss_work);wiphy_work_cancel (sdata->local->hw.wiphy, &ifmgd->csa_connection_drop_work); -wiphy_work_cancel (sdata->local->hw.wiphy, - &ifmgd->teardown_ttlm_work);wiphy_delayed_work_cancel (sdata->local->hw.wiphy, &ifmgd->tdls_peer_del_work);wiphy_delayed_work_cancel (sdata->local->hw.wiphy, &ifmgd->ttlm_work);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 163/809 wifi: mac80211: reset negotiated TTLM on disconnect
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 609c12a2af046c3674af2d5c7978b025718de5e8 ]
The negotiated TTLM data must be reset on disconnect, otherwise it may end up getting reused on another connection. Fix that.
--- net/mac80211/mlme.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/mlme.c +1 -0
@@ -3287,6 +3287,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, sizeof(sdata->u.mgd.ttlm_info));wiphy_delayed_work_cancel (sdata->local->hw.wiphy, &ifmgd->ttlm_work); +memset (&sdata->vif.neg_ttlm,0 ,sizeof (sdata->vif.neg_ttlm));wiphy_delayed_work_cancel (sdata->local->hw.wiphy, &ifmgd->neg_ttlm_timeout_work);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 164/809 wifi: ath11k: refactor setting country code logic
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit b363614c0c80f9e2f3ffe8e77270e783a0fb8ab5 ]
ath11k_wmi_send_set_current_country_cmd() is called in several places and all of them are just simply repeating the same logic.
Refactor to make code clean.
Compile tested only.
Stable-dep-of: 7f0343b7b871 ("wifi: ath11k: restore country code during resume")
--- drivers/net/wireless/ath/ath11k/core.c | 19 ++++++++----------- drivers/net/wireless/ath/ath11k/mac.c | 13 +++---------- drivers/net/wireless/ath/ath11k/reg.c | 14 ++++++++++---- drivers/net/wireless/ath/ath11k/reg.h | 4 ++-- 4 files changed, 23 insertions(+), 27 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +8 -11
@@ -1978,23 +1978,20 @@ static void ath11k_update_11d(struct work_struct *work) struct ath11k_base *ab = container_of(work, struct ath11k_base, update_11d_work);struct ath11k *ar;struct ath11k_pdev *pdev; -struct wmi_set_current_country_params set_current_param = {};int ret, i; -spin_lock_bh (&ab->base_lock); -memcpy (&set_current_param.alpha2, &ab->new_alpha2,2 ); -spin_unlock_bh (&ab->base_lock); - -ath11k_dbg (ab,ATH11K_DBG_WMI ,"update 11d new cc %c%c\n" , - set_current_param.alpha2[0 ], - set_current_param.alpha2[1 ]); -for (i =0 ; i < ab->num_radios; i++) { pdev = &ab->pdevs[i]; ar = pdev->ar; -memcpy (&ar->alpha2, &set_current_param.alpha2,2 ); - ret =ath11k_wmi_send_set_current_country_cmd (ar, &set_current_param); +spin_lock_bh (&ab->base_lock); +memcpy (&ar->alpha2, &ab->new_alpha2,2 ); +spin_unlock_bh (&ab->base_lock); + +ath11k_dbg (ab,ATH11K_DBG_WMI ,"update 11d new cc %c%c for pdev %d\n" , + ar->alpha2[0 ], ar->alpha2[1 ], i); + + ret =ath11k_reg_set_cc (ar);if (ret) ath11k_warn(ar->ab, "pdev id %d failed set current country code: %d\n",
drivers/net/wireless/ath/ath11k/mac.c +3 -10
@@ -8851,12 +8851,8 @@ ath11k_mac_op_reconfig_complete(struct ieee80211_hw *hw,ieee80211_wake_queues (ar->hw);if (ar->ab->hw_params.current_cc_support && - ar->alpha2[0 ] !=0 && ar->alpha2[1 ] !=0 ) { -struct wmi_set_current_country_params set_current_param = {}; - -memcpy (&set_current_param.alpha2, ar->alpha2,2 ); -ath11k_wmi_send_set_current_country_cmd (ar, &set_current_param); - } + ar->alpha2[0 ] !=0 && ar->alpha2[1 ] !=0 ) +ath11k_reg_set_cc (ar);if (ab->is_reset) { recovery_count =atomic_inc_return (&ab->recovery_count);
@@ -10325,11 +10321,8 @@ static int __ath11k_mac_register(struct ath11k *ar) }if (ab->hw_params.current_cc_support && ab->new_alpha2[0 ]) { -struct wmi_set_current_country_params set_current_param = {}; - -memcpy (&set_current_param.alpha2, ab->new_alpha2,2 );memcpy (&ar->alpha2, ab->new_alpha2,2 ); - ret =ath11k_wmi_send_set_current_country_cmd (ar, &set_current_param); + ret =ath11k_reg_set_cc (ar);if (ret)ath11k_warn (ar->ab,"failed set cc code for mac register: %d\n" , ret);
drivers/net/wireless/ath/ath11k/reg.c +10 -4
@@ -49,7 +49,6 @@ ath11k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request) {struct ieee80211_hw *hw =wiphy_to_ieee80211_hw (wiphy);struct wmi_init_country_params init_country_param; -struct wmi_set_current_country_params set_current_param = {};struct ath11k *ar = hw->priv;int ret;
@@ -83,9 +82,8 @@ ath11k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)* reg info */ if (ar->ab->hw_params.current_cc_support) { -memcpy (&set_current_param.alpha2, request->alpha2,2 ); -memcpy (&ar->alpha2, &set_current_param.alpha2,2 ); - ret =ath11k_wmi_send_set_current_country_cmd (ar, &set_current_param); +memcpy (&ar->alpha2, request->alpha2,2 ); + ret =ath11k_reg_set_cc (ar);if (ret)ath11k_warn (ar->ab,"failed set current country code: %d\n" , ret);
@@ -1017,3 +1015,11 @@ void ath11k_reg_free(struct ath11k_base *ab)kfree (ab->new_regd[i]); } } + +int ath11k_reg_set_cc (struct ath11k *ar) +{ +struct wmi_set_current_country_params set_current_param = {}; + +memcpy (&set_current_param.alpha2, ar->alpha2,2 ); +return ath11k_wmi_send_set_current_country_cmd (ar, &set_current_param); +}
drivers/net/wireless/ath/ath11k/reg.h +2 -2
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_REG_H
@@ -45,5 +45,5 @@ ath11k_reg_ap_pwr_convert(enum ieee80211_ap_reg_power power_type);int ath11k_reg_handle_chan_list (struct ath11k_base *ab,struct cur_regulatory_info *reg_info,enum ieee80211_ap_reg_power power_type); - +int ath11k_reg_set_cc (struct ath11k *ar);#endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 165/809 wifi: ath11k: restore country code during resume
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 7f0343b7b8710436c1e6355c71782d32ada47e0c ]
We got report that regdomain is not correct after
return from hibernation:
Before hibernation:
% iw reg get
[...]
phy#0 (self-managed)
country CH: DFS-ETSI
(2402 - 2482 @ 40), (N/A, 20), (N/A)
(5170 - 5250 @ 80), (N/A, 23), (N/A), NO-OUTDOOR, AUTO-BW
(5250 - 5330 @ 80), (N/A, 23), (0 ms), NO-OUTDOOR, DFS, AUTO-BW
(5490 - 5590 @ 80), (N/A, 30), (0 ms), DFS, AUTO-BW
(5590 - 5650 @ 40), (N/A, 30), (600000 ms), DFS, AUTO-BW
(5650 - 5730 @ 80), (N/A, 30), (0 ms), DFS, AUTO-BW
(5735 - 5875 @ 80), (N/A, 14), (N/A), AUTO-BWAfter hibernation:
% iw reg get
[...]
phy#0 (self-managed)
country na: DFS-UNSET
(2402 - 2472 @ 40), (N/A, 20), (N/A)
(2457 - 2482 @ 20), (N/A, 20), (N/A), PASSIVE-SCAN
(5170 - 5330 @ 160), (N/A, 20), (N/A), AUTO-BW, PASSIVE-SCAN
(5490 - 5730 @ 160), (N/A, 20), (N/A), AUTO-BW, PASSIVE-SCAN
(5735 - 5895 @ 160), (N/A, 20), (N/A), AUTO-BW, PASSIVE-SCAN
(5945 - 7125 @ 160), (N/A, 30), (N/A), AUTO-BW, PASSIVE-SCANThe reason is, during resume, firmware is reinitialized but host does not send current country code to firmware. So default reg rules with country code set to 'na' is uploaded to host, as shown above.
Fix it by restoring country code to firmware during resume.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.30
--- drivers/net/wireless/ath/ath11k/core.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/wireless/ath/ath11k/core.c +10 -0
@@ -1009,6 +1009,16 @@ int ath11k_core_resume(struct ath11k_base *ab)return -ETIMEDOUT ; } +if (ab->hw_params.current_cc_support && + ar->alpha2[0 ] !=0 && ar->alpha2[1 ] !=0 ) { + ret =ath11k_reg_set_cc (ar); +if (ret) { +ath11k_warn (ab,"failed to set country code during resume: %d\n" , + ret); +return ret; + } + } + ret =ath11k_dp_rx_pktlog_start (ab);if (ret) ath11k_warn(ab, "failed to start rx pktlog during resume: %d\n",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 166/809 wifi: ath12k: change DMA direction while mapping reinjected packets
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 33322e3ef07409278a18c6919c448e369d66a18e ]
For fragmented packets, ath12k reassembles each fragment as a normal packet and then reinjects it into HW ring. In this case, the DMA direction should be DMA_TO_DEVICE, not DMA_FROM_DEVICE. Otherwise, an invalid payload may be reinjected into the HW and subsequently delivered to the host.
Given that arbitrary memory can be allocated to the skb buffer, knowledge about the data contained in the reinjected buffer is lacking. Consequently, there’s a risk of private information being leaked.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00209-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +2 -2
@@ -3030,7 +3030,7 @@ static int ath12k_dp_rx_h_defrag_reo_reinject(struct ath12k *ar, buf_paddr =dma_map_single (ab->dev, defrag_skb->data, defrag_skb->len +skb_tailroom (defrag_skb), -DMA_FROM_DEVICE ); +DMA_TO_DEVICE );if (dma_mapping_error (ab->dev, buf_paddr))return -ENOMEM ;
@@ -3116,7 +3116,7 @@ static int ath12k_dp_rx_h_defrag_reo_reinject(struct ath12k *ar,spin_unlock_bh (&dp->rx_desc_lock); err_unmap_dma:dma_unmap_single (ab->dev, buf_paddr, defrag_skb->len +skb_tailroom (defrag_skb), -DMA_FROM_DEVICE ); +DMA_TO_DEVICE );return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 167/809 wifi: ath12k: fix invalid memory access while processing fragmented packets
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit 073f9f249eecd64ab9d59c91c4a23cfdcc02afe4 ]
The monitor ring and the reo reinject ring share the same ring mask index. When the driver receives an interrupt for the reo reinject ring, the monitor ring is also processed, leading to invalid memory access. Since monitor support is not yet enabled in ath12k, the ring mask for the monitor ring should be removed.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00209-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/hw.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/wireless/ath/ath12k/hw.c +1 -5
@@ -544,9 +544,6 @@ static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn9274 = { }, .rx_mon_dest = { 0, 0, 0, -ATH12K_RX_MON_RING_MASK_0 , -ATH12K_RX_MON_RING_MASK_1 , - ATH12K_RX_MON_RING_MASK_2, }, .rx = { 0, 0, 0, 0,
@@ -572,8 +569,7 @@ static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn9274 = { ATH12K_HOST2RXDMA_RING_MASK_0, }, .tx_mon_dest = { -ATH12K_TX_MON_RING_MASK_0 , - ATH12K_TX_MON_RING_MASK_1, + 0, 0, 0, }, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 168/809 wifi: ath12k: fix firmware crash during reo reinject
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit a57ab7cced454f69b8ee8aa5f5019ea8de4674da ]
When handling fragmented packets, the ath12k driver reassembles each fragment into a normal packet and then reinjects it into the HW ring. However, a firmware crash occurs during this reinjection process. The issue arises because the driver populates peer metadata in reo_ent_ring->queue_addr_lo, while the firmware expects the physical address obtained from the corresponding peer’s queue descriptor. Fix it by filling peer's queue descriptor's physical address in queue_addr_lo.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00209-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +6 -8
@@ -2994,7 +2994,7 @@ static int ath12k_dp_rx_h_defrag_reo_reinject(struct ath12k *ar,struct hal_srng *srng;dma_addr_t link_paddr, buf_paddr;u32 desc_bank, msdu_info, msdu_ext_info, mpdu_info; -u32 cookie, hal_rx_desc_sz, dest_ring_info0; +u32 cookie, hal_rx_desc_sz, dest_ring_info0, queue_addr_hi;int ret;struct ath12k_rx_desc_info *desc_info;u8 dst_ind;
@@ -3086,13 +3086,11 @@ static int ath12k_dp_rx_h_defrag_reo_reinject(struct ath12k *ar, reo_ent_ring->rx_mpdu_info.peer_meta_data = reo_dest_ring->rx_mpdu_info.peer_meta_data; -/* Firmware expects physical address to be filled in queue_addr_lo in -* the MLO scenario and in case of non MLO peer meta data needs to be -* filled. -* TODO: Need to handle for MLO scenario. -*/ - reo_ent_ring->queue_addr_lo = reo_dest_ring->rx_mpdu_info.peer_meta_data; - reo_ent_ring->info0 =le32_encode_bits (dst_ind, + reo_ent_ring->queue_addr_lo =cpu_to_le32 (lower_32_bits (rx_tid->paddr)); + queue_addr_hi =upper_32_bits (rx_tid->paddr); + reo_ent_ring->info0 =le32_encode_bits (queue_addr_hi, +HAL_REO_ENTR_RING_INFO0_QUEUE_ADDR_HI ) | +le32_encode_bits (dst_ind,HAL_REO_ENTR_RING_INFO0_DEST_IND ); reo_ent_ring->info1 = le32_encode_bits(rx_tid->cur_sn,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 169/809 wifi: rtw89: 8852c: correct logic and restore PCI PHY EQ after device resume
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
[ Upstream commit 9e305a6f01ad539dc134b8017521495378d8e00e ]
PCI PHY EQ value is missing after card off/on, so update the value after device resume. The original commit only updates once at probe stage, which could lead problem after suspend/resume.
The logic should be read a value from one register and write to another register with a mask to avoid affecting unrelated bits.
--- drivers/net/wireless/realtek/rtw89/pci.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +12 -11
@@ -2330,21 +2330,20 @@ static void rtw89_pci_disable_eq(struct rtw89_dev *rtwdev)u32 backup_aspm;u32 phy_offset;u16 oobs_val; -u16 val16;int ret;if (rtwdev->chip->chip_id !=RTL8852C )return ; - backup_aspm =rtw89_read32 (rtwdev,R_AX_PCIE_MIX_CFG_V1 ); -rtw89_write32_clr (rtwdev,R_AX_PCIE_MIX_CFG_V1 ,B_AX_ASPM_CTRL_MASK ); - g1_oobs =rtw89_read16_mask (rtwdev,R_RAC_DIRECT_OFFSET_G1 +RAC_ANA09 *RAC_MULT ,BAC_OOBS_SEL ); g2_oobs =rtw89_read16_mask (rtwdev,R_RAC_DIRECT_OFFSET_G2 +RAC_ANA09 *RAC_MULT ,BAC_OOBS_SEL );if (g1_oobs && g2_oobs) - goto out; +return ; + + backup_aspm =rtw89_read32 (rtwdev,R_AX_PCIE_MIX_CFG_V1 ); +rtw89_write32_clr (rtwdev,R_AX_PCIE_MIX_CFG_V1 ,B_AX_ASPM_CTRL_MASK ); ret =rtw89_pci_get_phy_offset_by_link_speed (rtwdev, &phy_offset);if (ret)
@@ -2354,15 +2353,16 @@ static void rtw89_pci_disable_eq(struct rtw89_dev *rtwdev)rtw89_write16 (rtwdev, phy_offset +RAC_ANA10 *RAC_MULT ,ADDR_SEL_PINOUT_DIS_VAL );rtw89_write16_set (rtwdev, phy_offset +RAC_ANA19 *RAC_MULT ,B_PCIE_BIT_RD_SEL ); - val16 =rtw89_read16_mask (rtwdev, phy_offset +RAC_ANA1F *RAC_MULT , -OOBS_LEVEL_MASK ); - oobs_val =u16_encode_bits (val16,OOBS_SEN_MASK ); + oobs_val =rtw89_read16_mask (rtwdev, phy_offset +RAC_ANA1F *RAC_MULT , +OOBS_LEVEL_MASK ); -rtw89_write16 (rtwdev,R_RAC_DIRECT_OFFSET_G1 +RAC_ANA03 *RAC_MULT , oobs_val); +rtw89_write16_mask (rtwdev,R_RAC_DIRECT_OFFSET_G1 +RAC_ANA03 *RAC_MULT , +OOBS_SEN_MASK , oobs_val);rtw89_write16_set (rtwdev,R_RAC_DIRECT_OFFSET_G1 +RAC_ANA09 *RAC_MULT ,BAC_OOBS_SEL ); -rtw89_write16 (rtwdev,R_RAC_DIRECT_OFFSET_G2 +RAC_ANA03 *RAC_MULT , oobs_val); +rtw89_write16_mask (rtwdev,R_RAC_DIRECT_OFFSET_G2 +RAC_ANA03 *RAC_MULT , +OOBS_SEN_MASK , oobs_val);rtw89_write16_set (rtwdev,R_RAC_DIRECT_OFFSET_G2 +RAC_ANA09 *RAC_MULT ,BAC_OOBS_SEL );
@@ -2783,7 +2783,6 @@ static int rtw89_pci_ops_mac_pre_init_ax(struct rtw89_dev *rtwdev)const struct rtw89_pci_info *info = rtwdev->pci_info;int ret; -rtw89_pci_disable_eq (rtwdev);rtw89_pci_ber (rtwdev);rtw89_pci_rxdma_prefth (rtwdev);rtw89_pci_l1off_pwroff (rtwdev);
@@ -4155,6 +4154,7 @@ static int __maybe_unused rtw89_pci_resume(struct device *dev) B_AX_SEL_REQ_ENTR_L1); }rtw89_pci_l2_hci_ldo (rtwdev); +rtw89_pci_disable_eq (rtwdev);rtw89_pci_filter_out (rtwdev);rtw89_pci_link_cfg (rtwdev);rtw89_pci_l1ss_cfg (rtwdev);
@@ -4289,6 +4289,7 @@ int rtw89_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto err_clear_resource; } +rtw89_pci_disable_eq (rtwdev);rtw89_pci_filter_out (rtwdev);rtw89_pci_link_cfg (rtwdev);rtw89_pci_l1ss_cfg (rtwdev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 170/809 wifi: ath11k: fix wrong definition of CE rings base address
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 5714e25f1d1875b300fb337dadfaa75324c1161a ]
Base address of CE ring is defined as u32, currently this works because coherent DMA mask configured as 32 bit:
#define ATH11K_PCI_COHERENT_DMA_MASK 32
However this mask could be changed once firmware bugs are fixed to fully support 36 bit DMA addressing. So to protect against any future changes to the DMA mask, change the type of the fields that are dependent upon it.
This is found during code review. Compile tested only.
--- drivers/net/wireless/ath/ath11k/ce.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath11k/ce.h +3 -3
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_CE_H
@@ -146,7 +146,7 @@ struct ath11k_ce_ring {/* Host address space */ void *base_addr_owner_space_unaligned;/* CE address space */ -u32 base_addr_ce_space_unaligned; +dma_addr_t base_addr_ce_space_unaligned;/* Actual start of descriptors. * Aligned to descriptor-size boundary.
@@ -156,7 +156,7 @@ struct ath11k_ce_ring {void *base_addr_owner_space;/* CE address space */ -u32 base_addr_ce_space; +dma_addr_t base_addr_ce_space;/* HAL ring id */ u32 hal_ring_id;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 171/809 wifi: ath12k: fix wrong definition of CE rings base address
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 0ae570703754858a77cc42b3c9fff42e9f084608 ]
Base address of CE ring is defined as u32, currently this works because DMA mask configured as 32 bit:
#define ATH12K_PCI_DMA_MASK 32
However this mask could be changed once firmware bugs are fixed to fully support 36 bit DMA addressing. So to protect against any future changes to the DMA mask, change the type of the fields that are dependent upon it.
This is found during code review. Compile tested only.
--- drivers/net/wireless/ath/ath12k/ce.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath12k/ce.h +3 -3
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH12K_CE_H
@@ -119,7 +119,7 @@ struct ath12k_ce_ring {/* Host address space */ void *base_addr_owner_space_unaligned;/* CE address space */ -u32 base_addr_ce_space_unaligned; +dma_addr_t base_addr_ce_space_unaligned;/* Actual start of descriptors. * Aligned to descriptor-size boundary.
@@ -129,7 +129,7 @@ struct ath12k_ce_ring {void *base_addr_owner_space;/* CE address space */ -u32 base_addr_ce_space; +dma_addr_t base_addr_ce_space;/* HAL ring id */ u32 hal_ring_id;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 172/809 net: ethernet: cortina: Restore TSO support
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
[ Upstream commit 2942dfab630444d46aaa37fb7d629b620abbf6ba ]
An earlier commit deleted the TSO support in the Cortina Gemini driver because the driver was confusing gso_size and MTU, probably because what the Linux kernel calls "gso_size" was called "MTU" in the datasheet.
Restore the functionality properly reading the gso_size from the skbuff.
Tested with iperf3, running a server on a different machine and client on the device with the cortina gemini ethernet:
Connecting to host 192.168.1.2, port 5201 60008000.ethernet-port eth0: segment offloading mss = 05ea len=1c8a 60008000.ethernet-port eth0: segment offloading mss = 05ea len=1c8a 60008000.ethernet-port eth0: segment offloading mss = 05ea len=27da 60008000.ethernet-port eth0: segment offloading mss = 05ea len=0b92 60008000.ethernet-port eth0: segment offloading mss = 05ea len=2bda (...)
(The hardware MSS 0x05ea here includes the ethernet headers.)
If I disable all segment offloading on the receiving host and dump packets using tcpdump -xx like this:
ethtool -K enp2s0 gro off gso off tso off
tcpdump -xx -i enp2s0 host 192.168.1.136
I get segmented packages such as this when running iperf3:
23:16:54.024139 IP OpenWrt.lan.59168 > Fecusia.targus-getdata1:
Flags [.], seq 1486:2934, ack 1, win 4198,
options [nop,nop,TS val 3886192908 ecr 3601341877], length 1448
0x0000: fc34 9701 a0c6 14d6 4da8 3c4f 0800 4500 0x0010: 05dc 16a0 4000 4006 9aa1 c0a8 0188 c0a8 0x0020: 0102 e720 1451 ff25 9822 4c52 29cf 8010 0x0030: 1066 ac8c 0000 0101 080a e7a2 990c d6a8 (...) 0x05c0: 5e49 e109 fe8c 4617 5e18 7a82 7eae d647 0x05d0: e8ee ae64 dc88 c897 3f8a 07a4 3a33 6b1b 0x05e0: 3501 a30f 2758 cc44 4b4a
Several such packets often follow after each other verifying the segmentation into 0x05a8 (1448) byte packages also on the reveiving end. As can be seen, the ethernet frames are 0x05ea (1514) in size.
Performance with iperf3 before this patch: ~15.5 Mbit/s Performance with iperf3 after this patch: ~175 Mbit/s
This was running a 60 second test (twice) the best measurement was 179 Mbit/s.
For comparison if I run iperf3 with UDP I get around 1.05 Mbit/s both before and after this patch.
While this is a gigabit ethernet interface, the CPU is a cheap D-Link DIR-685 router (based on the ARMv5 Faraday FA526 at ~50 MHz), and the software is not supposed to drive traffic, as the device has a DSA chip, so this kind of numbers can be expected.
--- drivers/net/ethernet/cortina/gemini.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
drivers/net/ethernet/cortina/gemini.c +19 -4
@@ -79,7 +79,8 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");#define GMAC0_IRQ4_8 (GMAC0_MIB_INT_BIT | GMAC0_RX_OVERRUN_INT_BIT)#define GMAC_OFFLOAD_FEATURES (NETIF_F_SG | NETIF_F_IP_CSUM | \ - NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM) + NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | \ + NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)/** * struct gmac_queue_page - page buffer per-page info
@@ -1148,13 +1149,25 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb,skb_frag_t *skb_frag;dma_addr_t mapping;void *buffer; +u16 mss;int ret; -/* TODO: implement proper TSO using MTU in word3 */ word1 = skb->len; word3 =SOF_BIT ; -if (skb->len >=ETH_FRAME_LEN ) { + mss =skb_shinfo (skb)->gso_size; +if (mss) { +/* This means we are dealing with TCP and skb->len is the +* sum total of all the segments. The TSO will deal with +* chopping this up for us. +*/ +/* The accelerator needs the full frame size here */ + mss +=skb_tcp_all_headers (skb); +netdev_dbg (netdev,"segment offloading mss = %04x len=%04x\n" , + mss, skb->len); + word1 |=TSS_MTU_ENABLE_BIT ; + word3 |= mss; + }else if (skb->len >=ETH_FRAME_LEN ) {/* Hardware offloaded checksumming isn't working on frames * bigger than 1514 bytes. A hypothesis about this is that the * checksum buffer is only 1518 bytes, so when the frames get
@@ -1169,7 +1182,9 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb,return ret; } word1 |=TSS_BYPASS_BIT ; - }else if (skb->ip_summed ==CHECKSUM_PARTIAL ) { + } + +if (skb->ip_summed ==CHECKSUM_PARTIAL ) {int tcp =0 ;/* We do not switch off the checksumming on non TCP/UDP
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 173/809 tcp: add tcp_done_with_error() helper
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 5e514f1cba090e1c8fff03e92a175eccfe46305f ]
tcp_reset() ends with a sequence that is carefuly ordered.
We need to fix [e]poll bugs in the following patches, it makes sense to use a common helper.
Stable-dep-of: 853c3bd7b791 ("tcp: fix race in tcp_write_err()")
--- include/net/tcp.h | 1 + net/ipv4/tcp.c | 2 +- net/ipv4/tcp_input.c | 32 +++++++++++++++++++++----------- 3 files changed, 23 insertions(+), 12 deletions(-)
include/net/tcp.h +1 -0
@@ -677,6 +677,7 @@ void tcp_skb_collapse_tstamp(struct sk_buff *skb,/* tcp_input.c */ void tcp_rearm_rto (struct sock *sk);void tcp_synack_rtt_meas (struct sock *sk,struct request_sock *req); +void tcp_done_with_error (struct sock *sk,int err);void tcp_reset (struct sock *sk,struct sk_buff *skb);void tcp_fin (struct sock *sk);void tcp_check_space (struct sock *sk);
net/ipv4/tcp.c +1 -1
@@ -598,7 +598,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)*/ mask |=EPOLLOUT |EPOLLWRNORM ; } -/* This barrier is coupled with smp_wmb() in tcp_reset() */ +/* This barrier is coupled with smp_wmb() in tcp_done_with_error() */ smp_rmb ();if (READ_ONCE (sk->sk_err) || !skb_queue_empty_lockless (&sk->sk_error_queue))
net/ipv4/tcp_input.c +21 -11
@@ -4469,9 +4469,26 @@ static enum skb_drop_reason tcp_sequence(const struct tcp_sock *tp,return SKB_NOT_DROPPED_YET ; } + +void tcp_done_with_error (struct sock *sk,int err) +{ +/* This barrier is coupled with smp_rmb() in tcp_poll() */ +WRITE_ONCE (sk->sk_err, err); +smp_wmb (); + +tcp_write_queue_purge (sk); +tcp_done (sk); + +if (!sock_flag (sk,SOCK_DEAD )) +sk_error_report (sk); +} +EXPORT_SYMBOL (tcp_done_with_error); +/* When we get a reset we do this. */ void tcp_reset (struct sock *sk,struct sk_buff *skb) { +int err; +trace_tcp_receive_reset (sk);/* mptcp can't tell us to ignore reset pkts,
@@ -4483,24 +4500,17 @@ void tcp_reset(struct sock *sk, struct sk_buff *skb)/* We want the right error as BSD sees it (and indeed as we do). */ switch (sk->sk_state) {case TCP_SYN_SENT : -WRITE_ONCE (sk->sk_err,ECONNREFUSED ); + err =ECONNREFUSED ;break ;case TCP_CLOSE_WAIT : -WRITE_ONCE (sk->sk_err,EPIPE ); + err =EPIPE ;break ;case TCP_CLOSE :return ;default : -WRITE_ONCE (sk->sk_err,ECONNRESET ); + err =ECONNRESET ; } -/* This barrier is coupled with smp_rmb() in tcp_poll() */ -smp_wmb (); - -tcp_write_queue_purge (sk); -tcp_done (sk); - -if (!sock_flag (sk,SOCK_DEAD )) -sk_error_report (sk); +tcp_done_with_error (sk, err); }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 174/809 tcp: fix race in tcp_write_err()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 853c3bd7b7917670224c9fe5245bd045cac411dd ]
I noticed flakes in a packetdrill test, expecting an epoll_wait() to return EPOLLERR | EPOLLHUP on a failed connect() attempt, after multiple SYN retransmits. It sometimes return EPOLLERR only.
The issue is that tcp_write_err():
1) writes an error in sk->sk_err,
2) calls sk_error_report(),
3) then calls tcp_done().
tcp_done() is writing SHUTDOWN_MASK into sk->sk_shutdown, among other things.
Problem is that the awaken user thread (from 2) sk_error_report()) might call tcp_poll() before tcp_done() has written sk->sk_shutdown.
tcp_poll() only sees a non zero sk->sk_err and returns EPOLLERR.
This patch fixes the issue by making sure to call sk_error_report() after tcp_done().
tcp_write_err() also lacks an smp_wmb().
We can reuse tcp_done_with_error() to factor out the details, as Neal suggested.
--- net/ipv4/tcp_timer.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
net/ipv4/tcp_timer.c +1 -5
@@ -74,11 +74,7 @@ u32 tcp_clamp_probe0_to_user_timeout(const struct sock *sk, u32 when)static void tcp_write_err (struct sock *sk) { -WRITE_ONCE (sk->sk_err,READ_ONCE (sk->sk_err_soft) ? :ETIMEDOUT ); -sk_error_report (sk); - -tcp_write_queue_purge (sk); -tcp_done (sk); +tcp_done_with_error (sk,READ_ONCE (sk->sk_err_soft) ? :ETIMEDOUT );__NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPABORTONTIMEOUT ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 175/809 tcp: fix races in tcp_abort()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 5ce4645c23cf5f048eb8e9ce49e514bababdee85 ]
tcp_abort() has the same issue than the one fixed in the prior patch in tcp_write_err().
In order to get consistent results from tcp_poll(), we must call sk_error_report() after tcp_done().
We can use tcp_done_with_error() to centralize this logic.
--- net/ipv4/tcp.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
net/ipv4/tcp.c +1 -5
@@ -4583,14 +4583,10 @@ int tcp_abort(struct sock *sk, int err)bh_lock_sock (sk);if (!sock_flag (sk,SOCK_DEAD )) { -WRITE_ONCE (sk->sk_err, err); -/* This barrier is coupled with smp_rmb() in tcp_poll() */ -smp_wmb (); -sk_error_report (sk);if (tcp_need_reset (sk->sk_state))tcp_send_active_reset (sk,GFP_ATOMIC ,SK_RST_REASON_NOT_SPECIFIED ); -tcp_done (sk); +tcp_done_with_error (sk, err); }bh_unlock_sock (sk);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 176/809 tcp: fix races in tcp_v[46]_err()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit fde6f897f2a184546bf5516ac736523ef24dc6a7 ]
These functions have races when they:
1) Write sk->sk_err
2) call sk_error_report(sk)
3) call tcp_done(sk)
As described in prior patches in this series:
An smp_wmb() is missing.
We should call tcp_done() before sk_error_report(sk) to have consistent tcp_poll() results on SMP hosts.
Use tcp_done_with_error() where we centralized the correct sequence.
--- net/ipv4/tcp_ipv4.c | 11 +++-------- net/ipv6/tcp_ipv6.c | 10 +++------- 2 files changed, 6 insertions(+), 15 deletions(-)
net/ipv4/tcp_ipv4.c +3 -8
@@ -611,15 +611,10 @@ int tcp_v4_err(struct sk_buff *skb, u32 info)ip_icmp_error (sk, skb, err, th->dest, info, (u8 *)th); -if (!sock_owned_by_user (sk)) { -WRITE_ONCE (sk->sk_err, err); - -sk_error_report (sk); - -tcp_done (sk); - }else { +if (!sock_owned_by_user (sk)) +tcp_done_with_error (sk, err); +else WRITE_ONCE (sk->sk_err_soft, err); - } goto out; }
net/ipv6/tcp_ipv6.c +3 -7
@@ -490,14 +490,10 @@ static int tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,ipv6_icmp_error (sk, skb, err, th->dest,ntohl (info), (u8 *)th); -if (!sock_owned_by_user (sk)) { -WRITE_ONCE (sk->sk_err, err); -sk_error_report (sk);/* Wake people up to see the error (see connect in sock.c) */ - -tcp_done (sk); - }else { +if (!sock_owned_by_user (sk)) +tcp_done_with_error (sk, err); +else WRITE_ONCE (sk->sk_err_soft, err); - } goto out;case TCP_LISTEN :break ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 177/809 hns3: avoid linking objects into multiple modules
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit e3bbb994a7e0ead1e028c5a8ec5f8526b4a9c5c9 ]
Each object file contains information about which module it gets linked into, so linking the same file into multiple modules now causes a warning:
scripts/Makefile.build:254: drivers/net/ethernet/hisilicon/hns3/Makefile: hns3_common/hclge_comm_cmd.o is added to multiple modules: hclge hclgevf scripts/Makefile.build:254: drivers/net/ethernet/hisilicon/hns3/Makefile: hns3_common/hclge_comm_rss.o is added to multiple modules: hclge hclgevf scripts/Makefile.build:254: drivers/net/ethernet/hisilicon/hns3/Makefile: hns3_common/hclge_comm_tqp_stats.o is added to multiple modules: hclge hclgevf
Change the way that hns3 is built by moving the three common files into a separate module with exported symbols instead.
--- drivers/net/ethernet/hisilicon/hns3/Makefile | 11 +++++------ .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 11 +++++++++++ .../hisilicon/hns3/hns3_common/hclge_comm_rss.c | 14 ++++++++++++++ .../hns3/hns3_common/hclge_comm_tqp_stats.c | 5 +++++ 4 files changed, 35 insertions(+), 6 deletions(-)
drivers/net/ethernet/hisilicon/hns3/Makefile +5 -6
@@ -15,15 +15,14 @@ hns3-objs = hns3_enet.o hns3_ethtool.o hns3_debugfs.o hns3-$(CONFIG_HNS3_DCB) += hns3_dcbnl.o -obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o +obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o hclge-common.o -hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_mbx.o hns3vf/hclgevf_devlink.o hns3vf/hclgevf_regs.o \ - hns3_common/hclge_comm_cmd.o hns3_common/hclge_comm_rss.o hns3_common/hclge_comm_tqp_stats.o +hclge-common-objs += hns3_common/hclge_comm_cmd.o hns3_common/hclge_comm_rss.o hns3_common/hclge_comm_tqp_stats.o -obj-$(CONFIG_HNS3_HCLGE) += hclge.o +hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_mbx.o hns3vf/hclgevf_devlink.o hns3vf/hclgevf_regs.o + +obj-$(CONFIG_HNS3_HCLGE) += hclge.o hclge-common.o hclge-objs = hns3pf/hclge_main.o hns3pf/hclge_mdio.o hns3pf/hclge_tm.o hns3pf/hclge_regs.o \ hns3pf/hclge_mbx.o hns3pf/hclge_err.o hns3pf/hclge_debugfs.o hns3pf/hclge_ptp.o hns3pf/hclge_devlink.o \ - hns3_common/hclge_comm_cmd.o hns3_common/hclge_comm_rss.o hns3_common/hclge_comm_tqp_stats.o - hclge-$(CONFIG_HNS3_DCB) += hns3pf/hclge_dcb.o
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c +11 -0
@@ -48,6 +48,7 @@ void hclge_comm_cmd_reuse_desc(struct hclge_desc *desc, bool is_read)else desc->flag &=cpu_to_le16 (~HCLGE_COMM_CMD_FLAG_WR ); } +EXPORT_SYMBOL_GPL (hclge_comm_cmd_reuse_desc);static void hclge_comm_set_default_capability (struct hnae3_ae_dev *ae_dev,bool is_pf)
@@ -72,6 +73,7 @@ void hclge_comm_cmd_setup_basic_desc(struct hclge_desc *desc,if (is_read) desc->flag |=cpu_to_le16 (HCLGE_COMM_CMD_FLAG_WR ); } +EXPORT_SYMBOL_GPL (hclge_comm_cmd_setup_basic_desc);int hclge_comm_firmware_compat_config (struct hnae3_ae_dev *ae_dev,struct hclge_comm_hw *hw,bool en)
@@ -517,6 +519,7 @@ int hclge_comm_cmd_send(struct hclge_comm_hw *hw, struct hclge_desc *desc,return ret; } +EXPORT_SYMBOL_GPL (hclge_comm_cmd_send);static void hclge_comm_cmd_uninit_regs (struct hclge_comm_hw *hw) {
@@ -553,6 +556,7 @@ void hclge_comm_cmd_uninit(struct hnae3_ae_dev *ae_dev,hclge_comm_free_cmd_desc (&cmdq->csq);hclge_comm_free_cmd_desc (&cmdq->crq); } +EXPORT_SYMBOL_GPL (hclge_comm_cmd_uninit);int hclge_comm_cmd_queue_init (struct pci_dev *pdev,struct hclge_comm_hw *hw) {
@@ -591,6 +595,7 @@ int hclge_comm_cmd_queue_init(struct pci_dev *pdev, struct hclge_comm_hw *hw)hclge_comm_free_cmd_desc (&hw->cmq.csq);return ret; } +EXPORT_SYMBOL_GPL (hclge_comm_cmd_queue_init);void hclge_comm_cmd_init_ops (struct hclge_comm_hw *hw,const struct hclge_comm_cmq_ops *ops)
@@ -602,6 +607,7 @@ void hclge_comm_cmd_init_ops(struct hclge_comm_hw *hw, cmdq->ops.trace_cmd_get = ops->trace_cmd_get; } } +EXPORT_SYMBOL_GPL (hclge_comm_cmd_init_ops); int hclge_comm_cmd_init(struct hnae3_ae_dev *ae_dev, struct hclge_comm_hw *hw, u32 *fw_version, bool is_pf,
@@ -672,3 +678,8 @@ int hclge_comm_cmd_init(struct hnae3_ae_dev *ae_dev, struct hclge_comm_hw *hw,return ret; } +EXPORT_SYMBOL_GPL (hclge_comm_cmd_init); + +MODULE_LICENSE ("GPL" ); +MODULE_DESCRIPTION ("HNS3: Hisilicon Ethernet PF/VF Common Library" ); +MODULE_AUTHOR ("Huawei Tech. Co., Ltd." );
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c +14 -0
@@ -62,6 +62,7 @@ int hclge_comm_rss_init_cfg(struct hnae3_handle *nic,return 0 ; } +EXPORT_SYMBOL_GPL (hclge_comm_rss_init_cfg);void hclge_comm_get_rss_tc_info (u16 rss_size,u8 hw_tc_map,u16 *tc_offset,u16 *tc_valid,u16 *tc_size)
@@ -78,6 +79,7 @@ void hclge_comm_get_rss_tc_info(u16 rss_size, u8 hw_tc_map, u16 *tc_offset, tc_offset[i] = (hw_tc_map &BIT (i)) ? rss_size * i :0 ; } } +EXPORT_SYMBOL_GPL (hclge_comm_get_rss_tc_info);int hclge_comm_set_rss_tc_mode (struct hclge_comm_hw *hw,u16 *tc_offset,u16 *tc_valid,u16 *tc_size)
@@ -113,6 +115,7 @@ int hclge_comm_set_rss_tc_mode(struct hclge_comm_hw *hw, u16 *tc_offset,return ret; } +EXPORT_SYMBOL_GPL (hclge_comm_set_rss_tc_mode); int hclge_comm_set_rss_hash_key(struct hclge_comm_rss_cfg *rss_cfg, struct hclge_comm_hw *hw, const u8 *key,
@@ -143,6 +146,7 @@ int hclge_comm_set_rss_hash_key(struct hclge_comm_rss_cfg *rss_cfg,return 0 ; } +EXPORT_SYMBOL_GPL (hclge_comm_set_rss_hash_key); int hclge_comm_set_rss_tuple(struct hnae3_ae_dev *ae_dev, struct hclge_comm_hw *hw,
@@ -185,11 +189,13 @@ int hclge_comm_set_rss_tuple(struct hnae3_ae_dev *ae_dev, rss_cfg->rss_tuple_sets.ipv6_fragment_en = req->ipv6_fragment_en;return 0 ; } +EXPORT_SYMBOL_GPL (hclge_comm_set_rss_tuple);u32 hclge_comm_get_rss_key_size (struct hnae3_handle *handle) {return HCLGE_COMM_RSS_KEY_SIZE ; } +EXPORT_SYMBOL_GPL (hclge_comm_get_rss_key_size);int hclge_comm_parse_rss_hfunc (struct hclge_comm_rss_cfg *rss_cfg,const u8 hfunc,u8 *hash_algo)
@@ -217,6 +223,7 @@ void hclge_comm_rss_indir_init_cfg(struct hnae3_ae_dev *ae_dev,for (i =0 ; i < ae_dev->dev_specs.rss_ind_tbl_size; i++) rss_cfg->rss_indirection_tbl[i] = i % rss_cfg->rss_size; } +EXPORT_SYMBOL_GPL (hclge_comm_rss_indir_init_cfg);int hclge_comm_get_rss_tuple (struct hclge_comm_rss_cfg *rss_cfg,int flow_type,u8 *tuple_sets)
@@ -250,6 +257,7 @@ int hclge_comm_get_rss_tuple(struct hclge_comm_rss_cfg *rss_cfg, int flow_type,return 0 ; } +EXPORT_SYMBOL_GPL (hclge_comm_get_rss_tuple); static void hclge_comm_append_rss_msb_info(struct hclge_comm_rss_ind_tbl_cmd *req,
@@ -304,6 +312,7 @@ int hclge_comm_set_rss_indir_table(struct hnae3_ae_dev *ae_dev, }return 0 ; } +EXPORT_SYMBOL_GPL (hclge_comm_set_rss_indir_table);int hclge_comm_set_rss_input_tuple (struct hclge_comm_hw *hw,struct hclge_comm_rss_cfg *rss_cfg)
@@ -332,6 +341,7 @@ int hclge_comm_set_rss_input_tuple(struct hclge_comm_hw *hw, "failed to configure rss input, ret = %d.\n", ret);return ret; } +EXPORT_SYMBOL_GPL (hclge_comm_set_rss_input_tuple);void hclge_comm_get_rss_hash_info (struct hclge_comm_rss_cfg *rss_cfg,u8 *key,u8 *hfunc)
@@ -355,6 +365,7 @@ void hclge_comm_get_rss_hash_info(struct hclge_comm_rss_cfg *rss_cfg, u8 *key,if (key)memcpy (key, rss_cfg->rss_hash_key,HCLGE_COMM_RSS_KEY_SIZE ); } +EXPORT_SYMBOL_GPL (hclge_comm_get_rss_hash_info);void hclge_comm_get_rss_indir_tbl (struct hclge_comm_rss_cfg *rss_cfg,u32 *indir,u16 rss_ind_tbl_size)
@@ -367,6 +378,7 @@ void hclge_comm_get_rss_indir_tbl(struct hclge_comm_rss_cfg *rss_cfg,for (i =0 ; i < rss_ind_tbl_size; i++) indir[i] = rss_cfg->rss_indirection_tbl[i]; } +EXPORT_SYMBOL_GPL (hclge_comm_get_rss_indir_tbl);int hclge_comm_set_rss_algo_key (struct hclge_comm_hw *hw,const u8 hfunc,const u8 *key)
@@ -408,6 +420,7 @@ int hclge_comm_set_rss_algo_key(struct hclge_comm_hw *hw, const u8 hfunc,return 0 ; } +EXPORT_SYMBOL_GPL (hclge_comm_set_rss_algo_key);static u8 hclge_comm_get_rss_hash_bits (struct ethtool_rxnfc *nfc) {
@@ -502,3 +515,4 @@ u64 hclge_comm_convert_rss_tuple(u8 tuple_sets)return tuple_data; } +EXPORT_SYMBOL_GPL (hclge_comm_convert_rss_tuple);
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c +5 -0
@@ -26,6 +26,7 @@ u64 *hclge_comm_tqps_get_stats(struct hnae3_handle *handle, u64 *data)return buff; } +EXPORT_SYMBOL_GPL (hclge_comm_tqps_get_stats);int hclge_comm_tqps_get_sset_count (struct hnae3_handle *handle) {
@@ -33,6 +34,7 @@ int hclge_comm_tqps_get_sset_count(struct hnae3_handle *handle)return kinfo->num_tqps *HCLGE_COMM_QUEUE_PAIR_SIZE ; } +EXPORT_SYMBOL_GPL (hclge_comm_tqps_get_sset_count);u8 *hclge_comm_tqps_get_strings (struct hnae3_handle *handle,u8 *data) {
@@ -56,6 +58,7 @@ u8 *hclge_comm_tqps_get_strings(struct hnae3_handle *handle, u8 *data)return buff; } +EXPORT_SYMBOL_GPL (hclge_comm_tqps_get_strings);int hclge_comm_tqps_update_stats (struct hnae3_handle *handle,struct hclge_comm_hw *hw)
@@ -99,6 +102,7 @@ int hclge_comm_tqps_update_stats(struct hnae3_handle *handle,return 0 ; } +EXPORT_SYMBOL_GPL (hclge_comm_tqps_update_stats);void hclge_comm_reset_tqp_stats (struct hnae3_handle *handle) {
@@ -113,3 +117,4 @@ void hclge_comm_reset_tqp_stats(struct hnae3_handle *handle)memset (&tqp->tqp_stats,0 ,sizeof (tqp->tqp_stats)); } } +EXPORT_SYMBOL_GPL (hclge_comm_reset_tqp_stats);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 178/809 libbpf: keep FD_CLOEXEC flag when dup()ing FD
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrii Nakryiko <[email protected]>
[ Upstream commit 531876c80004ecff7bfdbd8ba6c6b48835ef5e22 ]
Make sure to preserve and/or enforce FD_CLOEXEC flag on duped FDs. Use dup3() with O_CLOEXEC flag for that.
Without this fix libbpf effectively clears FD_CLOEXEC flag on each of BPF map/prog FD, which is definitely not the right or expected behavior.
--- tools/lib/bpf/libbpf_internal.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
tools/lib/bpf/libbpf_internal.h +3 -7
@@ -597,13 +597,9 @@ static inline int ensure_good_fd(int fd)return fd; } -static inline int sys_dup2 (int oldfd,int newfd) +static inline int sys_dup3 (int oldfd,int newfd,int flags) { -#ifdef __NR_dup2 -return syscall (__NR_dup2, oldfd, newfd); -#else -return syscall (__NR_dup3, oldfd, newfd,0 ); -#endif +return syscall (__NR_dup3, oldfd, newfd, flags); }/* Point *fixed_fd* to the same file that *tmp_fd* points to.
@@ -614,7 +610,7 @@ static inline int reuse_fd(int fixed_fd, int tmp_fd) {int err; - err =sys_dup2 (tmp_fd, fixed_fd); + err =sys_dup3 (tmp_fd, fixed_fd,O_CLOEXEC ); err = err <0 ? -errno :0 ;close (tmp_fd);/* clean up temporary FD */ return err;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 179/809 net/smc: set rmbs SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guangguan Wang <[email protected]>
[ Upstream commit 3ac14b9dfbd345e891d48d89f6c2fa519848f0f4 ]
SG_MAX_SINGLE_ALLOC is used to limit maximum number of entries that will be allocated in one piece of scatterlist. When the entries of scatterlist exceeds SG_MAX_SINGLE_ALLOC, sg chain will be used. From commit 7c703e54cc71 ("arch: switch the default on ARCH_HAS_SG_CHAIN"), we can know that the macro CONFIG_ARCH_NO_SG_CHAIN is used to identify whether sg chain is supported. So, SMC-R's rmb buffer should be limited by SG_MAX_SINGLE_ALLOC only when the macro CONFIG_ARCH_NO_SG_CHAIN is defined.
--- net/smc/smc_core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/smc/smc_core.c +3 -2
@@ -2015,7 +2015,6 @@ int smc_conn_create(struct smc_sock *smc, struct smc_init_info *ini)*/ static u8 smc_compress_bufsize (int size,bool is_smcd,bool is_rmb) { -const unsigned int max_scat =SG_MAX_SINGLE_ALLOC *PAGE_SIZE ;u8 compressed;if (size <=SMC_BUF_MIN_SIZE )
@@ -2025,9 +2024,11 @@ static u8 smc_compress_bufsize(int size, bool is_smcd, bool is_rmb) compressed =min_t (u8,ilog2 (size) +1 , is_smcd ?SMCD_DMBE_SIZES :SMCR_RMBE_SIZES ); +#ifdef CONFIG_ARCH_NO_SG_CHAIN if (!is_smcd && is_rmb)/* RMBs are backed by & limited to max size of scatterlists */ - compressed =min_t (u8, compressed,ilog2 (max_scat >>14 )); + compressed =min_t (u8, compressed,ilog2 ((SG_MAX_SINGLE_ALLOC *PAGE_SIZE ) >>14 )); +#endif return compressed; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 180/809 selftests/bpf: Check length of recv in test_sockmap
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit de1b5ea789dc28066cc8dc634b6825bd6148f38b ]
The value of recv in msg_loop may be negative, like EWOULDBLOCK, so it's necessary to check if it is positive before accumulating it to bytes_recvd.
--- tools/testing/selftests/bpf/test_sockmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/test_sockmap.c +2 -1
@@ -680,7 +680,8 @@ static int msg_loop(int fd, int iov_count, int iov_length, int cnt, } } - s->bytes_recvd += recv; +if (recv >0 ) + s->bytes_recvd += recv;if (opt->check_recved_len && s->bytes_recvd > total_bytes) { errno =EMSGSIZE ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 181/809 udf: Fix lock ordering in udf_evict_inode()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 8832fc1e502687869606bb0a7b79848ed3bf036f ]
udf_evict_inode() calls udf_setsize() to truncate deleted inode. However inode deletion through udf_evict_inode() can happen from inode reclaim context and udf_setsize() grabs mapping->invalidate_lock which isn't generally safe to acquire from fs reclaim context since we allocate pages under mapping->invalidate_lock for example in a page fault path. This is however not a real deadlock possibility as by the time udf_evict_inode() is called, nobody can be accessing the inode, even less work with its page cache. So this is just a lockdep triggering false positive. Fix the problem by moving mapping->invalidate_lock locking outsize of udf_setsize() into udf_setattr() as grabbing mapping->invalidate_lock from udf_evict_inode() is pointless.
--- fs/udf/file.c | 2 ++ fs/udf/inode.c | 11 ++++------- 2 files changed, 6 insertions(+), 7 deletions(-)
fs/udf/file.c +2 -0
@@ -232,7 +232,9 @@ static int udf_setattr(struct mnt_idmap *idmap, struct dentry *dentry,if ((attr->ia_valid &ATTR_SIZE ) && attr->ia_size !=i_size_read (inode)) { +filemap_invalidate_lock (inode->i_mapping); error =udf_setsize (inode, attr->ia_size); +filemap_invalidate_unlock (inode->i_mapping);if (error)return error; }
fs/udf/inode.c +4 -7
@@ -1250,7 +1250,6 @@ int udf_setsize(struct inode *inode, loff_t newsize)if (IS_APPEND (inode) ||IS_IMMUTABLE (inode))return -EPERM ; -filemap_invalidate_lock (inode->i_mapping); iinfo =UDF_I (inode);if (newsize > inode->i_size) {if (iinfo->i_alloc_type ==ICBTAG_FLAG_AD_IN_ICB ) {
@@ -1263,11 +1262,11 @@ int udf_setsize(struct inode *inode, loff_t newsize) } err =udf_expand_file_adinicb (inode);if (err) - goto out_unlock; +return err; } err =udf_extend_file (inode, newsize);if (err) - goto out_unlock; +return err; set_size:truncate_setsize (inode, newsize); }else {
@@ -1285,14 +1284,14 @@ int udf_setsize(struct inode *inode, loff_t newsize) err =block_truncate_page (inode->i_mapping, newsize, udf_get_block);if (err) - goto out_unlock; +return err;truncate_setsize (inode, newsize);down_write (&iinfo->i_data_sem);udf_clear_extent_cache (inode); err =udf_truncate_extents (inode);up_write (&iinfo->i_data_sem);if (err) - goto out_unlock; +return err; } update_time:inode_set_mtime_to_ts (inode,inode_set_ctime_current (inode));
@@ -1300,8 +1299,6 @@ int udf_setsize(struct inode *inode, loff_t newsize)udf_sync_inode (inode); elsemark_inode_dirty (inode ); -out_unlock: -filemap_invalidate_unlock (inode->i_mapping);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 182/809 sched/core: Move preempt_model_*() helpers from sched.h to preempt.h
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit f0dc887f21d18791037c0166f652c67da761f16f ]
Move the declarations and inlined implementations of the preempt_model_*() helpers to preempt.h so that they can be referenced in spinlock.h without creating a potential circular dependency between spinlock.h and sched.h.
No functional change intended.
Stable-dep-of: c793a62823d1 ("sched/core: Drop spinlocks on contention iff kernel is preemptible")
--- include/linux/preempt.h | 41 +++++++++++++++++++++++++++++++++++++++++ include/linux/sched.h | 41 ----------------------------------------- 2 files changed, 41 insertions(+), 41 deletions(-)
include/linux/preempt.h +41 -0
@@ -481,4 +481,45 @@ DEFINE_LOCK_GUARD_0(preempt, preempt_disable(), preempt_enable()) DEFINE_LOCK_GUARD_0(preempt_notrace, preempt_disable_notrace(), preempt_enable_notrace()) DEFINE_LOCK_GUARD_0(migrate, migrate_disable(), migrate_enable()) +#ifdef CONFIG_PREEMPT_DYNAMIC + +extern bool preempt_model_none (void ); +extern bool preempt_model_voluntary (void ); +extern bool preempt_model_full (void ); + +#else + +static inline bool preempt_model_none (void ) +{ +return IS_ENABLED (CONFIG_PREEMPT_NONE ); +} +static inline bool preempt_model_voluntary (void ) +{ +return IS_ENABLED (CONFIG_PREEMPT_VOLUNTARY ); +} +static inline bool preempt_model_full (void ) +{ +return IS_ENABLED (CONFIG_PREEMPT ); +} + +#endif + +static inline bool preempt_model_rt (void ) +{ +return IS_ENABLED (CONFIG_PREEMPT_RT ); +} + +/* +* Does the preemption model allow non-cooperative preemption? +* +* For !CONFIG_PREEMPT_DYNAMIC kernels this is an exact match with +* CONFIG_PREEMPTION; for CONFIG_PREEMPT_DYNAMIC this doesn't work as the +* kernel is *built* with CONFIG_PREEMPTION=y but may run with e.g. the +* PREEMPT_NONE model. +*/ +static inline bool preempt_model_preemptible (void ) +{ +return preempt_model_full () ||preempt_model_rt (); +} +#endif /* __LINUX_PREEMPT_H */
include/linux/sched.h +0 -41
47 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 183/809 sched/core: Drop spinlocks on contention iff kernel is preemptible
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit c793a62823d1ce8f70d9cfc7803e3ea436277cda ]
Use preempt_model_preemptible() to detect a preemptible kernel when deciding whether or not to reschedule in order to drop a contended spinlock or rwlock. Because PREEMPT_DYNAMIC selects PREEMPTION, kernels built with PREEMPT_DYNAMIC=y will yield contended locks even if the live preemption model is "none" or "voluntary". In short, make kernels with dynamically selected models behave the same as kernels with statically selected models.
Somewhat counter-intuitively, NOT yielding a lock can provide better latency for the relevant tasks/processes. E.g. KVM x86's mmu_lock, a rwlock, is often contended between an invalidation event (takes mmu_lock for write) and a vCPU servicing a guest page fault (takes mmu_lock for read). For _some_ setups, letting the invalidation task complete even if there is mmu_lock contention provides lower latency for *all* tasks, i.e. the invalidation completes sooner *and* the vCPU services the guest page fault sooner.
But even KVM's mmu_lock behavior isn't uniform, e.g. the "best" behavior can vary depending on the host VMM, the guest workload, the number of vCPUs, the number of pCPUs in the host, why there is lock contention, etc.
In other words, simply deleting the CONFIG_PREEMPTION guard (or doing the opposite and removing contention yielding entirely) needs to come with a big pile of data proving that changing the status quo is a net positive.
Opportunistically document this side effect of preempt=full, as yielding contended spinlocks can have significant, user-visible impact.
--- Documentation/admin-guide/kernel-parameters.txt | 4 +++- include/linux/spinlock.h | 14 ++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +3 -1
@@ -4749,7 +4749,9 @@ none - Limited to cond_resched() calls voluntary - Limited to cond_resched() and might_sleep() calls full - Any section that isn't explicitly preempt disabled - can be preempted anytime. + can be preempted anytime. Tasks will also yield + contended spinlocks (if the critical section isn't + explicitly preempt disabled beyond the lock itself). print-fatal-signals= [KNL] debug: print fatal signals
include/linux/spinlock.h +6 -8
@@ -462,11 +462,10 @@ static __always_inline int spin_is_contended(spinlock_t *lock)*/ static inline int spin_needbreak (spinlock_t *lock) { -#ifdef CONFIG_PREEMPTION +if (!preempt_model_preemptible ()) +return 0 ; +return spin_is_contended (lock); -#else -return 0 ; -#endif }/*
@@ -479,11 +478,10 @@ static inline int spin_needbreak(spinlock_t *lock)*/ static inline int rwlock_needbreak (rwlock_t *lock) { -#ifdef CONFIG_PREEMPTION +if (!preempt_model_preemptible ()) +return 0 ; +return rwlock_is_contended (lock); -#else -return 0 ; -#endif }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 184/809 lib: objagg: Fix general protection fault
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit b4a3a89fffcdf09702b1f161b914e52abca1894d ]
The library supports aggregation of objects into other objects only if the parent object does not have a parent itself. That is, nesting is not supported.
Aggregation happens in two cases: Without and with hints, where hints are a pre-computed recommendation on how to aggregate the provided objects.
Nesting is not possible in the first case due to a check that prevents it, but in the second case there is no check because the assumption is that nesting cannot happen when creating objects based on hints. The violation of this assumption leads to various warnings and eventually to a general protection fault [1].
Before fixing the root cause, error out when nesting happens and warn.
[1]
general protection fault, probably for non-canonical address 0xdead000000000d90: 0000 [#1] PREEMPT SMP PTI CPU: 1 PID: 1083 Comm: kworker/1:9 Tainted: G W 6.9.0-rc6-custom-gd9b4f1cca7fb #7 Hardware name: Mellanox Technologies Ltd. MSN3700/VMOD0005, BIOS 5.11 01/06/2019 Workqueue: mlxsw_core mlxsw_sp_acl_tcam_vregion_rehash_work RIP: 0010:mlxsw_sp_acl_erp_bf_insert+0x25/0x80 [...] Call Trace: <TASK> mlxsw_sp_acl_atcam_entry_add+0x256/0x3c0 mlxsw_sp_acl_tcam_entry_create+0x5e/0xa0 mlxsw_sp_acl_tcam_vchunk_migrate_one+0x16b/0x270 mlxsw_sp_acl_tcam_vregion_rehash_work+0xbe/0x510 process_one_work+0x151/0x370 worker_thread+0x2cb/0x3e0 kthread+0xd0/0x100 ret_from_fork+0x34/0x50 ret_from_fork_asm+0x1a/0x30 </TASK>
--- lib/objagg.c | 3 +++ 1 file changed, 3 insertions(+)
lib/objagg.c +3 -0
@@ -167,6 +167,9 @@ static int objagg_obj_parent_assign(struct objagg *objagg, {void *delta_priv; +if (WARN_ON (!objagg_obj_is_root (parent))) +return -EINVAL ; + delta_priv = objagg->ops->delta_create (objagg->priv, parent->obj, objagg_obj->obj);if (IS_ERR (delta_priv))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 185/809 mlxsw: spectrum_acl_erp: Fix object nesting warning
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 97d833ceb27dc19f8777d63f90be4a27b5daeedf ]
ACLs in Spectrum-2 and newer ASICs can reside in the algorithmic TCAM (A-TCAM) or in the ordinary circuit TCAM (C-TCAM). The former can contain more ACLs (i.e., tc filters), but the number of masks in each region (i.e., tc chain) is limited.
In order to mitigate the effects of the above limitation, the device allows filters to share a single mask if their masks only differ in up to 8 consecutive bits. For example, dst_ip/25 can be represented using dst_ip/24 with a delta of 1 bit. The C-TCAM does not have a limit on the number of masks being used (and therefore does not support mask aggregation), but can contain a limited number of filters.
The driver uses the "objagg" library to perform the mask aggregation by passing it objects that consist of the filter's mask and whether the filter is to be inserted into the A-TCAM or the C-TCAM since filters in different TCAMs cannot share a mask.
The set of created objects is dependent on the insertion order of the filters and is not necessarily optimal. Therefore, the driver will periodically ask the library to compute a more optimal set ("hints") by looking at all the existing objects.
When the library asks the driver whether two objects can be aggregated the driver only compares the provided masks and ignores the A-TCAM / C-TCAM indication. This is the right thing to do since the goal is to move as many filters as possible to the A-TCAM. The driver also forbids two identical masks from being aggregated since this can only happen if one was intentionally put in the C-TCAM to avoid a conflict in the A-TCAM.
The above can result in the following set of hints:
H1: {mask X, A-TCAM} -> H2: {mask Y, A-TCAM} // X is Y + delta
H3: {mask Y, C-TCAM} -> H4: {mask Z, A-TCAM} // Y is Z + delta
After getting the hints from the library the driver will start migrating filters from one region to another while consulting the computed hints and instructing the device to perform a lookup in both regions during the transition.
Assuming a filter with mask X is being migrated into the A-TCAM in the new region, the hints lookup will return H1. Since H2 is the parent of H1, the library will try to find the object associated with it and create it if necessary in which case another hints lookup (recursive) will be performed. This hints lookup for {mask Y, A-TCAM} will either return H2 or H3 since the driver passes the library an object comparison function that ignores the A-TCAM / C-TCAM indication.
This can eventually lead to nested objects which are not supported by the library [1].
Fix by removing the object comparison function from both the driver and the library as the driver was the only user. That way the lookup will only return exact matches.
I do not have a reliable reproducer that can reproduce the issue in a timely manner, but before the fix the issue would reproduce in several minutes and with the fix it does not reproduce in over an hour.
Note that the current usefulness of the hints is limited because they include the C-TCAM indication and represent aggregation that cannot actually happen. This will be addressed in net-next.
[1]
WARNING: CPU: 0 PID: 153 at lib/objagg.c:170 objagg_obj_parent_assign+0xb5/0xd0 Modules linked in: CPU: 0 PID: 153 Comm: kworker/0:18 Not tainted 6.9.0-rc6-custom-g70fbc2c1c38b #42 Hardware name: Mellanox Technologies Ltd. MSN3700C/VMOD0008, BIOS 5.11 10/10/2018 Workqueue: mlxsw_core mlxsw_sp_acl_tcam_vregion_rehash_work RIP: 0010:objagg_obj_parent_assign+0xb5/0xd0 [...] Call Trace: <TASK> __objagg_obj_get+0x2bb/0x580 objagg_obj_get+0xe/0x80 mlxsw_sp_acl_erp_mask_get+0xb5/0xf0 mlxsw_sp_acl_atcam_entry_add+0xe8/0x3c0 mlxsw_sp_acl_tcam_entry_create+0x5e/0xa0 mlxsw_sp_acl_tcam_vchunk_migrate_one+0x16b/0x270 mlxsw_sp_acl_tcam_vregion_rehash_work+0xbe/0x510 process_one_work+0x151/0x370
--- .../ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13 ------------- include/linux/objagg.h | 1 - lib/objagg.c | 15 --------------- 3 files changed, 29 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c +0 -13
@@ -1217,18 +1217,6 @@ static bool mlxsw_sp_acl_erp_delta_check(void *priv, const void *parent_obj,return err ? false : true; } -static int mlxsw_sp_acl_erp_hints_obj_cmp (const void *obj1,const void *obj2) -{ -const struct mlxsw_sp_acl_erp_key *key1 = obj1; -const struct mlxsw_sp_acl_erp_key *key2 = obj2; - -/* For hints purposes, two objects are considered equal -* in case the masks are the same. Does not matter what -* the "ctcam" value is. -*/ -return memcmp (key1->mask, key2->mask,sizeof (key1->mask)); -} -static void *mlxsw_sp_acl_erp_delta_create (void *priv,void *parent_obj,void *obj) {
@@ -1308,7 +1296,6 @@ static void mlxsw_sp_acl_erp_root_destroy(void *priv, void *root_priv)static const struct objagg_ops mlxsw_sp_acl_erp_objagg_ops = { .obj_size =sizeof (struct mlxsw_sp_acl_erp_key ), .delta_check = mlxsw_sp_acl_erp_delta_check, - .hints_obj_cmp = mlxsw_sp_acl_erp_hints_obj_cmp, .delta_create = mlxsw_sp_acl_erp_delta_create, .delta_destroy = mlxsw_sp_acl_erp_delta_destroy, .root_create = mlxsw_sp_acl_erp_root_create,
include/linux/objagg.h +0 -1
@@ -8,7 +8,6 @@ struct objagg_ops {size_t obj_size;bool (*delta_check)(void *priv,const void *parent_obj,const void *obj); -int (*hints_obj_cmp)(const void *obj1,const void *obj2);void * (*delta_create)(void *priv,void *parent_obj,void *obj);void (*delta_destroy)(void *priv,void *delta_priv);void * (*root_create)(void *priv,void *obj,unsigned int root_id);
lib/objagg.c +0 -15
@@ -906,20 +906,6 @@ static const struct objagg_opt_algo *objagg_opt_algos[] = { [OBJAGG_OPT_ALGO_SIMPLE_GREEDY] = &objagg_opt_simple_greedy, }; -static int objagg_hints_obj_cmp (struct rhashtable_compare_arg *arg, -const void *obj) -{ -struct rhashtable *ht = arg->ht; -struct objagg_hints *objagg_hints = - container_of(ht, struct objagg_hints, node_ht); -const struct objagg_ops *ops = objagg_hints->ops; -const char *ptr = obj; - - ptr += ht->p.key_offset; -return ops->hints_obj_cmp ? ops->hints_obj_cmp (ptr, arg->key) : -memcmp (ptr, arg->key, ht->p.key_len); -} -/** * objagg_hints_get - obtains hints instance * @objagg: objagg instance
@@ -958,7 +944,6 @@ struct objagg_hints *objagg_hints_get(struct objagg *objagg, offsetof(struct objagg_hints_node , obj); objagg_hints->ht_params.head_offset = offsetof(struct objagg_hints_node , ht_node); - objagg_hints->ht_params.obj_cmpfn = objagg_hints_obj_cmp; err =rhashtable_init (&objagg_hints->node_ht, &objagg_hints->ht_params);if (err)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 186/809 mlxsw: spectrum_acl: Fix ACL scale regression and firmware errors
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 75d8d7a63065b18df9555dbaab0b42d4c6f20943 ]
ACLs that reside in the algorithmic TCAM (A-TCAM) in Spectrum-2 and newer ASICs can share the same mask if their masks only differ in up to 8 consecutive bits. For example, consider the following filters:
# tc filter add dev swp1 ingress pref 1 proto ip flower dst_ip 192.0.2.0/24 action drop # tc filter add dev swp1 ingress pref 1 proto ip flower dst_ip 198.51.100.128/25 action drop
The second filter can use the same mask as the first (dst_ip/24) with a delta of 1 bit.
However, the above only works because the two filters have different values in the common unmasked part (dst_ip/24). When entries have the same value in the common unmasked part they create undesired collisions in the device since many entries now have the same key. This leads to firmware errors such as [1] and to a reduced scale.
Fix by adjusting the hash table key to only include the value in the common unmasked part. That is, without including the delta bits. That way the driver will detect the collision during filter insertion and spill the filter into the circuit TCAM (C-TCAM).
Add a test case that fails without the fix and adjust existing cases that check C-TCAM spillage according to the above limitation.
[1]mlxsw_spectrum2 0000:06:00.0: EMAD reg access failed (tid=3379b18a00003394,reg_id=3027(ptce3),type=write,status=8(resource not available))
--- .../mellanox/mlxsw/spectrum_acl_atcam.c | 18 +++--- .../mlxsw/spectrum_acl_bloom_filter.c | 2 +- .../mellanox/mlxsw/spectrum_acl_tcam.h | 9 +-- .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 55 +++++++++++++++++-- 4 files changed, 63 insertions(+), 21 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c +8 -10
@@ -391,7 +391,8 @@ mlxsw_sp_acl_atcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp,if (err)return err; - lkey_id = aregion->ops->lkey_id_get (aregion, aentry->enc_key, erp_id); + lkey_id = aregion->ops->lkey_id_get (aregion, aentry->ht_key.enc_key, + erp_id);if (IS_ERR (lkey_id))return PTR_ERR (lkey_id); aentry->lkey_id = lkey_id;
@@ -399,7 +400,7 @@ mlxsw_sp_acl_atcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp, kvdl_index =mlxsw_afa_block_first_kvdl_index (rulei->act_block); mlxsw_reg_ptce3_pack(ptce3_pl, true, MLXSW_REG_PTCE3_OP_WRITE_WRITE, priority, region->tcam_region_info, - aentry->enc_key, erp_id, + aentry->ht_key.enc_key, erp_id, aentry->delta_info.start, aentry->delta_info.mask, aentry->delta_info.value,
@@ -428,7 +429,7 @@ mlxsw_sp_acl_atcam_region_entry_remove(struct mlxsw_sp *mlxsw_sp, mlxsw_reg_ptce3_pack(ptce3_pl, false, MLXSW_REG_PTCE3_OP_WRITE_WRITE, 0, region->tcam_region_info, - aentry->enc_key, erp_id, + aentry->ht_key.enc_key, erp_id, aentry->delta_info.start, aentry->delta_info.mask, aentry->delta_info.value,
@@ -457,7 +458,7 @@ mlxsw_sp_acl_atcam_region_entry_action_replace(struct mlxsw_sp *mlxsw_sp, kvdl_index =mlxsw_afa_block_first_kvdl_index (rulei->act_block); mlxsw_reg_ptce3_pack(ptce3_pl, true, MLXSW_REG_PTCE3_OP_WRITE_UPDATE, priority, region->tcam_region_info, - aentry->enc_key, erp_id, + aentry->ht_key.enc_key, erp_id, aentry->delta_info.start, aentry->delta_info.mask, aentry->delta_info.value,
@@ -480,15 +481,13 @@ __mlxsw_sp_acl_atcam_entry_add(struct mlxsw_sp *mlxsw_sp,int err;mlxsw_afk_encode (afk, region->key_info, &rulei->values, - aentry->ht_key.full_enc_key, mask); + aentry->ht_key.enc_key, mask); erp_mask =mlxsw_sp_acl_erp_mask_get (aregion, mask, false);if (IS_ERR (erp_mask))return PTR_ERR (erp_mask); aentry->erp_mask = erp_mask; aentry->ht_key.erp_id =mlxsw_sp_acl_erp_mask_erp_id (erp_mask); -memcpy (aentry->enc_key, aentry->ht_key.full_enc_key, -sizeof (aentry->enc_key));/* Compute all needed delta information and clear the delta bits * from the encrypted key.
@@ -497,9 +496,8 @@ __mlxsw_sp_acl_atcam_entry_add(struct mlxsw_sp *mlxsw_sp, aentry->delta_info.start =mlxsw_sp_acl_erp_delta_start (delta); aentry->delta_info.mask =mlxsw_sp_acl_erp_delta_mask (delta); aentry->delta_info.value = -mlxsw_sp_acl_erp_delta_value (delta, - aentry->ht_key.full_enc_key); -mlxsw_sp_acl_erp_delta_clear (delta, aentry->enc_key); +mlxsw_sp_acl_erp_delta_value (delta, aentry->ht_key.enc_key); +mlxsw_sp_acl_erp_delta_clear (delta, aentry->ht_key.enc_key);/* Add rule to the list of A-TCAM rules, assuming this * rule is intended to A-TCAM. In case this rule does
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c +1 -1
@@ -249,7 +249,7 @@ __mlxsw_sp_acl_bf_key_encode(struct mlxsw_sp_acl_atcam_region *aregion,memcpy (chunk + pad_bytes, &erp_region_id,sizeof (erp_region_id));memcpy (chunk + key_offset, - &aentry->enc_key[chunk_key_offsets[chunk_index]], + &aentry->ht_key.enc_key[chunk_key_offsets[chunk_index]], chunk_key_len); chunk += chunk_len; }
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h +3 -6
@@ -167,9 +167,9 @@ struct mlxsw_sp_acl_atcam_region { };struct mlxsw_sp_acl_atcam_entry_ht_key { -char full_enc_key[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN ];/* Encoded -* key. -*/ +char enc_key[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN ];/* Encoded key, minus +* delta bits. +*/ u8 erp_id; };
@@ -181,9 +181,6 @@ struct mlxsw_sp_acl_atcam_entry {struct rhash_head ht_node;struct list_head list;/* Member in entries_list */ struct mlxsw_sp_acl_atcam_entry_ht_key ht_key; -char enc_key[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN ];/* Encoded key, -* minus delta bits. -*/ struct {u16 start;u8 mask;
tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh +51 -4
79 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 187/809 perf/x86: Serialize set_attr_rdpmc()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit bb9bb45f746b0f9457de9c3fc4da143a6351bdc9 ]
Yue and Xingwei reported a jump label failure. It's caused by the lack of serialization in set_attr_rdpmc():
CPU0 CPU1
Assume: x86_pmu.attr_rdpmc == 0
if (val != x86_pmu.attr_rdpmc) {
if (val == 0)
...
else if (x86_pmu.attr_rdpmc == 0)
static_branch_dec(&rdpmc_never_available_key);
if (val != x86_pmu.attr_rdpmc) {
if (val == 0)
...
else if (x86_pmu.attr_rdpmc == 0)
FAIL, due to imbalance ---> static_branch_dec(&rdpmc_never_available_key);The reported BUG() is a consequence of the above and of another bug in the jump label core code. The core code needs a separate fix, but that cannot prevent the imbalance problem caused by set_attr_rdpmc().
Prevent this by serializing set_attr_rdpmc() locally.
--- arch/x86/events/core.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/events/core.c +3 -0
@@ -2547,6 +2547,7 @@ static ssize_t set_attr_rdpmc(struct device *cdev,struct device_attribute *attr, const char *buf, size_t count) { + static DEFINE_MUTEX(rdpmc_mutex);unsigned long val;ssize_t ret;
@@ -2560,6 +2561,8 @@ static ssize_t set_attr_rdpmc(struct device *cdev,if (x86_pmu.attr_rdpmc_broken)return -ENOTSUPP ; +guard (mutex)(&rdpmc_mutex); +if (val != x86_pmu.attr_rdpmc) {/* * Changing into or out of never available or always available,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 188/809 jump_label: Fix concurrency issues in static_key_slow_dec()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 83ab38ef0a0b2407d43af9575bb32333fdd74fb2 ]
The commit which tried to fix the concurrency issues of concurrent static_key_slow_inc() failed to fix the equivalent issues vs. static_key_slow_dec():
CPU0 CPU1
static_key_slow_dec()
static_key_slow_try_dec()
key->enabled == 1 val = atomic_fetch_add_unless(&key->enabled, -1, 1); if (val == 1) return false;
jump_label_lock();
if (atomic_dec_and_test(&key->enabled)) {
--> key->enabled == 0
__jump_label_update()static_key_slow_dec() static_key_slow_try_dec() key->enabled == 0 val = atomic_fetch_add_unless(&key->enabled, -1, 1); --> key->enabled == -1 <- FAIL
There is another bug in that code, when there is a concurrent static_key_slow_inc() which enables the key as that sets key->enabled to -1 so on the other CPU
val = atomic_fetch_add_unless(&key->enabled, -1, 1);
will succeed and decrement to -2, which is invalid.
Cure all of this by replacing the atomic_fetch_add_unless() with a atomic_try_cmpxchg() loop similar to static_key_fast_inc_not_disabled().
--- kernel/jump_label.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-)
kernel/jump_label.c +29 -16
@@ -131,7 +131,7 @@ bool static_key_fast_inc_not_disabled(struct static_key *key)STATIC_KEY_CHECK_USE (key);/* * Negative key->enabled has a special meaning: it sends -* static_key_slow_inc() down the slow path, and it is non-zero +* static_key_slow_inc/dec() down the slow path, and it is non-zero * so it counts as "enabled" in jump_label_update(). Note that * atomic_inc_unless_negative() checks >= 0, so roll our own. */
@@ -150,7 +150,7 @@ bool static_key_slow_inc_cpuslocked(struct static_key *key)lockdep_assert_cpus_held ();/* -* Careful if we get concurrent static_key_slow_inc() calls; +* Careful if we get concurrent static_key_slow_inc/dec() calls; * later calls must wait for the first one to _finish_ the * jump_label_update() process. At the same time, however, * the jump_label_update() call below wants to see
@@ -247,20 +247,32 @@ EXPORT_SYMBOL_GPL(static_key_disable);static bool static_key_slow_try_dec (struct static_key *key) { -int val; - - val =atomic_fetch_add_unless (&key->enabled,-1 ,1 ); -if (val ==1 ) -return false; +int v;/* -* The negative count check is valid even when a negative -* key->enabled is in use by static_key_slow_inc(); a -* __static_key_slow_dec() before the first static_key_slow_inc() -* returns is unbalanced, because all other static_key_slow_inc() -* instances block while the update is in progress. +* Go into the slow path if key::enabled is less than or equal than +* one. One is valid to shut down the key, anything less than one +* is an imbalance, which is handled at the call site. +* +* That includes the special case of '-1' which is set in +* static_key_slow_inc_cpuslocked(), but that's harmless as it is +* fully serialized in the slow path below. By the time this task +* acquires the jump label lock the value is back to one and the +* retry under the lock must succeed. */ -WARN (val <0 ,"jump label: negative count!\n" ); + v =atomic_read (&key->enabled); +do { +/* +* Warn about the '-1' case though; since that means a +* decrement is concurrent with a first (0->1) increment. IOW +* people are trying to disable something that wasn't yet fully +* enabled. This suggests an ordering problem on the user side. +*/ +WARN_ON_ONCE (v <0 ); +if (v <=1 ) +return false; + }while (!likely (atomic_try_cmpxchg (&key->enabled, &v, v -1 ))); +return true; }
@@ -271,10 +283,11 @@ static void __static_key_slow_dec_cpuslocked(struct static_key *key)if (static_key_slow_try_dec (key))return ; -jump_label_lock (); -if (atomic_dec_and_test (&key->enabled)) +guard (mutex)(&jump_label_mutex); +if (atomic_cmpxchg (&key->enabled,1 ,0 ))jump_label_update (key); -jump_label_unlock (); +else +WARN_ON_ONCE (!static_key_slow_try_dec (key)); }static void __static_key_slow_dec (struct static_key *key)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 189/809 wifi: ath12k: fix ACPI warning when resume
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 8b2a12749b08726f006303814ecc1c37024d3617 ]
Currently ACPI notification handler is installed when driver loads and only gets removed when driver unloads. During resume after firmware is reloaded, ath12k tries to install it by default. Since it is installed already, ACPI subsystem rejects it and returns an error:
[ 83.094206] ath12k_pci 0000:03:00.0: failed to install DSM notify callback: 7
Fix it by removing that handler when going to suspend. This also avoid any possible ACPI call to firmware before firmware is reloaded/reinitialized.
Note ab->acpi also needs to be cleared in ath12k_acpi_stop() such that we are in a clean state when ACPI structures are reinitialized in ath12k_acpi_start().
Tested-on: WCN7850 HW2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/acpi.c | 2 ++ drivers/net/wireless/ath/ath12k/core.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/net/wireless/ath/ath12k/acpi.c +2 -0
@@ -391,4 +391,6 @@ void ath12k_acpi_stop(struct ath12k_base *ab)acpi_remove_notify_handler (ACPI_HANDLE (ab->dev),ACPI_DEVICE_NOTIFY , ath12k_acpi_dsm_notify); + +memset (&ab->acpi,0 ,sizeof (ab->acpi)); }
drivers/net/wireless/ath/ath12k/core.c +2 -0
@@ -83,6 +83,8 @@ int ath12k_core_suspend_late(struct ath12k_base *ab)if (!ab->hw_params->supports_suspend)return -EOPNOTSUPP ; +ath12k_acpi_stop (ab); +ath12k_hif_irq_disable (ab);ath12k_hif_ce_irq_disable (ab);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 190/809 wifi: ath11k: fix wrong handling of CCMP256 and GCMP ciphers
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit d2b0ca38d362ebf16ca79cd7f309d5bb8b581deb ]
Currently for CCMP256, GCMP128 and GCMP256 ciphers, in ath11k_install_key() IEEE80211_KEY_FLAG_GENERATE_IV_MGMT is not set. And in ath11k_mac_mgmt_tx_wmi() a length of IEEE80211_CCMP_MIC_LEN is reserved for all ciphers.
This results in unexpected management frame drop in case either of above 3 ciphers is used. The reason is, without IEEE80211_KEY_FLAG_GENERATE_IV_MGMT set, mac80211 will not generate CCMP/GCMP headers in frame for ath11k. Also MIC length reserved is wrong. Such frame is dropped later by hardware:
ath11k_pci 0000:5a:00.0: mac tx mgmt frame, buf id 0 ath11k_pci 0000:5a:00.0: mgmt tx compl ev pdev_id 1, desc_id 0, status 1
Quoted 1 line
From user point of view, we have observed very low throughput due to this issue:
action frames are all dropped so ADDBA response from DUT never reaches AP. AP can not use aggregation thus throughput is low.
Fix this by setting IEEE80211_KEY_FLAG_GENERATE_IV_MGMT flag and by reserving proper MIC length for those ciphers.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.30
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/dp_rx.c | 3 +-- drivers/net/wireless/ath/ath11k/dp_rx.h | 3 +++ drivers/net/wireless/ath/ath11k/mac.c | 15 +++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath11k/dp_rx.c +1 -2
@@ -1877,8 +1877,7 @@ static void ath11k_dp_rx_h_csum_offload(struct ath11k *ar, struct sk_buff *msdu) CHECKSUM_NONE :CHECKSUM_UNNECESSARY ; } -static int ath11k_dp_rx_crypto_mic_len (struct ath11k *ar, -enum hal_encrypt_type enctype) +int ath11k_dp_rx_crypto_mic_len (struct ath11k *ar,enum hal_encrypt_type enctype) {switch (enctype) {case HAL_ENCRYPT_TYPE_OPEN :
drivers/net/wireless/ath/ath11k/dp_rx.h +3 -0
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. +* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_DP_RX_H #define ATH11K_DP_RX_H
@@ -95,4 +96,6 @@ int ath11k_peer_rx_frag_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_idint ath11k_dp_rx_pktlog_start (struct ath11k_base *ab);int ath11k_dp_rx_pktlog_stop (struct ath11k_base *ab,bool stop_timer); +int ath11k_dp_rx_crypto_mic_len (struct ath11k *ar,enum hal_encrypt_type enctype); +#endif /* ATH11K_DP_RX_H */
drivers/net/wireless/ath/ath11k/mac.c +11 -4
@@ -4229,6 +4229,7 @@ static int ath11k_install_key(struct ath11k_vif *arvif,switch (key->cipher) {case WLAN_CIPHER_SUITE_CCMP : +case WLAN_CIPHER_SUITE_CCMP_256 : arg.key_cipher =WMI_CIPHER_AES_CCM ;/* TODO: Re-check if flag is valid */ key->flags |=IEEE80211_KEY_FLAG_GENERATE_IV_MGMT ;
@@ -4238,12 +4239,10 @@ static int ath11k_install_key(struct ath11k_vif *arvif, arg.key_txmic_len =8 ; arg.key_rxmic_len =8 ;break ; -case WLAN_CIPHER_SUITE_CCMP_256 : - arg.key_cipher =WMI_CIPHER_AES_CCM ; -break ;case WLAN_CIPHER_SUITE_GCMP :case WLAN_CIPHER_SUITE_GCMP_256 : arg.key_cipher =WMI_CIPHER_AES_GCM ; + key->flags |=IEEE80211_KEY_FLAG_GENERATE_IV_MGMT ;break ;default :ath11k_warn (ar->ab,"cipher %d is not supported\n" , key->cipher);
@@ -5903,7 +5902,10 @@ static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, struct ath11k_vif *arvif, {struct ath11k_base *ab = ar->ab;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; +struct ath11k_skb_cb *skb_cb =ATH11K_SKB_CB (skb);struct ieee80211_tx_info *info; +enum hal_encrypt_type enctype; +unsigned int mic_len;dma_addr_t paddr;int buf_id;int ret;
@@ -5927,7 +5929,12 @@ static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, struct ath11k_vif *arvif, ieee80211_is_deauth(hdr->frame_control) || ieee80211_is_disassoc(hdr->frame_control)) && ieee80211_has_protected(hdr->frame_control)) { -skb_put (skb,IEEE80211_CCMP_MIC_LEN ); +if (!(skb_cb->flags &ATH11K_SKB_CIPHER_SET )) +ath11k_warn (ab,"WMI management tx frame without ATH11K_SKB_CIPHER_SET" ); + + enctype =ath11k_dp_tx_get_encrypt_type (skb_cb->cipher); + mic_len =ath11k_dp_rx_crypto_mic_len (ar, enctype); +skb_put (skb, mic_len); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 191/809 wifi: ath12k: fix per pdev debugfs registration
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aditya Kumar Singh <[email protected]>
[ Upstream commit 8dd65ccbdf91e2fe3ab6e4da158b38f81746c3b4 ]
Function ath12k_debugfs_register() is called once inside the function ath12k_mac_hw_register(). However, with single wiphy model, there could be multiple pdevs registered under single hardware. Hence, need to register debugfs for each one of them.
Move the caller inside the loop which iterates over all underlying pdevs.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/mac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/mac.c +2 -2
@@ -8778,9 +8778,9 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)ath12k_err (ar->ab,"ath12k regd update failed: %d\n" , ret); goto err_unregister_hw; } - } -ath12k_debugfs_register (ar); +ath12k_debugfs_register (ar); + }return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 192/809 wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 9ee0d44f055276fe2802b2f65058e920853f4f99 ]
rates_996 is mistakenly written as rates_969, fix it.
--- net/wireless/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/wireless/util.c +2 -2
@@ -1504,7 +1504,7 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate) 5120, /* 0.833333... */ };u32 rates_160M[3 ] = {960777777 ,907400000 ,816666666 }; -u32 rates_969[3 ] = {480388888 ,453700000 ,408333333 }; +u32 rates_996[3 ] = {480388888 ,453700000 ,408333333 };u32 rates_484[3 ] = {229411111 ,216666666 ,195000000 };u32 rates_242[3 ] = {114711111 ,108333333 ,97500000 };u32 rates_106[3 ] = {40000000 ,37777777 ,34000000 };
@@ -1529,7 +1529,7 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate)else if (rate->bw ==RATE_INFO_BW_80 || (rate->bw ==RATE_INFO_BW_HE_RU && rate->he_ru_alloc ==NL80211_RATE_INFO_HE_RU_ALLOC_996 )) - result = rates_969[rate->he_gi]; + result = rates_996[rate->he_gi];else if (rate->bw ==RATE_INFO_BW_40 || (rate->bw ==RATE_INFO_BW_HE_RU && rate->he_ru_alloc ==NL80211_RATE_INFO_HE_RU_ALLOC_484 ))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 193/809 wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit bcbd771cd5d68c0c52567556097d75f9fc4e7cd6 ]
Currently NL80211_RATE_INFO_HE_RU_ALLOC_2x996 is not handled in cfg80211_calculate_bitrate_he(), leading to below warning:
kernel: invalid HE MCS: bw:6, ru:6
kernel: WARNING: CPU: 0 PID: 2312 at net/wireless/util.c:1501 cfg80211_calculate_bitrate_he+0x22b/0x270 [cfg80211]
Fix it by handling 2x996 RU allocation in the same way as 160 MHz bandwidth.
--- net/wireless/util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/wireless/util.c +3 -1
@@ -1524,7 +1524,9 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate)if (WARN_ON_ONCE (rate->nss <1 || rate->nss >8 ))return 0 ; -if (rate->bw ==RATE_INFO_BW_160 ) +if (rate->bw ==RATE_INFO_BW_160 || + (rate->bw ==RATE_INFO_BW_HE_RU && + rate->he_ru_alloc == NL80211_RATE_INFO_HE_RU_ALLOC_2x996)) result = rates_160M[rate->he_gi]; else if (rate->bw == RATE_INFO_BW_80 || (rate->bw == RATE_INFO_BW_HE_RU &&
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 194/809 wifi: nl80211: expose can-monitor channel property
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit f3269b7912f75b6e34926334377ede45656a8950 ]
It may be possible to monitor on disabled channels per the can-monitor flag, but evidently I forgot to expose that out to userspace. Fix that.
--- net/wireless/nl80211.c | 3 +++ 1 file changed, 3 insertions(+)
net/wireless/nl80211.c +3 -0
@@ -1208,6 +1208,9 @@ static int nl80211_msg_put_channel(struct sk_buff *msg, struct wiphy *wiphy,if ((chan->flags &IEEE80211_CHAN_NO_6GHZ_AFC_CLIENT ) &&nla_put_flag (msg,NL80211_FREQUENCY_ATTR_NO_6GHZ_AFC_CLIENT )) goto nla_put_failure; +if ((chan->flags &IEEE80211_CHAN_CAN_MONITOR ) && +nla_put_flag (msg,NL80211_FREQUENCY_ATTR_CAN_MONITOR )) + goto nla_put_failure; } if (nla_put_u32(msg, NL80211_FREQUENCY_ATTR_MAX_TX_POWER,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 195/809 wifi: iwlwifi: mvm: fix re-enabling EMLSR
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit bd40215b19d255b433a91a8bb8088937e5db4284 ]
When EMLSR gets unblocked, the current code checks if the last exit was due to an EXIT reason (as opposed to a BLOCKING one), and if so, it does nothing, as in this case a MLO scan was scheduled to run in 30 seconds.
But the code doesn't consider the time that passed from the last exit, so if immediately after the exit a blocker occurred (e.g. non-BSS interface), and lasts for more than 30 seconds, then the MLO scan and the following link selection will decide not to enter EMLSR, and when the unblocking event finally happens, the reason is still set to the EXIT one, so it will do nothing, and we will not have the chance to re-enable EMLSR.
Fix this by checking also the time that has passed since the last exit, only if it is less than 30 seconds, we can count on the scheduled MLO scan.
Note that clearing the reason itself can't be done since it is needed for the EMLSR prevention mechanism.
--- drivers/net/wireless/intel/iwlwifi/mvm/link.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/link.c +4 -2
@@ -1082,8 +1082,10 @@ static void iwl_mvm_esr_unblocked(struct iwl_mvm *mvm,IWL_DEBUG_INFO (mvm,"EMLSR is unblocked\n" ); -/* We exited due to an EXIT reason, so MLO scan was scheduled already */ -if (mvmvif->last_esr_exit.reason && +/* If we exited due to an EXIT reason, and the exit was in less than +* 30 seconds, then a MLO scan was scheduled already. +*/ +if (!need_new_sel && !(mvmvif->last_esr_exit.reason &IWL_MVM_BLOCK_ESR_REASONS )) {IWL_DEBUG_INFO (mvm,"Wait for MLO scan\n" );return ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 196/809 wifi: iwlwifi: mvm: separate non-BSS/ROC EMLSR blocking
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 5f1fee9644759d07f3d3a468389c7c18027083d7 ]
If non-BSS and remain-on-channel (ROC) blocking were to occur simultaneously, they'd step on each other's toes, unblocking when not yet supported. Disentangle these bits, and ROC doesn't need to use the non_bss_link() function then.
--- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 10 +++++++--- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 5 ++++- drivers/net/wireless/intel/iwlwifi/mvm/time-event.c | 5 +++-- 3 files changed, 14 insertions(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +7 -3
@@ -4861,6 +4861,7 @@ int iwl_mvm_roc_common(struct ieee80211_hw *hw, struct ieee80211_vif *vif, const struct iwl_mvm_roc_ops *ops) {struct iwl_mvm *mvm =IWL_MAC80211_GET_MVM (hw); +struct ieee80211_vif *bss_vif =iwl_mvm_get_bss_vif (mvm);u32 lmac_id;int ret;
@@ -4873,9 +4874,12 @@ int iwl_mvm_roc_common(struct ieee80211_hw *hw, struct ieee80211_vif *vif,*/ flush_work (&mvm->roc_done_wk); - ret =iwl_mvm_esr_non_bss_link (mvm, vif,0 , true); -if (ret) -return ret; +if (!IS_ERR_OR_NULL (bss_vif)) { + ret =iwl_mvm_block_esr_sync (mvm, bss_vif, +IWL_MVM_ESR_BLOCKED_ROC ); +if (ret) +return ret; + }mutex_lock (&mvm->mutex);
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +4 -1
@@ -360,7 +360,9 @@ struct iwl_mvm_vif_link_info {* @IWL_MVM_ESR_BLOCKED_WOWLAN: WOWLAN is preventing the enablement of EMLSR * @IWL_MVM_ESR_BLOCKED_TPT: block EMLSR when there is not enough traffic * @IWL_MVM_ESR_BLOCKED_FW: FW didn't recommended/forced exit from EMLSR -* @IWL_MVM_ESR_BLOCKED_NON_BSS: An active non-bssid link's preventing EMLSR +* @IWL_MVM_ESR_BLOCKED_NON_BSS: An active non-BSS interface's link is +* preventing EMLSR +* @IWL_MVM_ESR_BLOCKED_ROC: remain-on-channel is preventing EMLSR * @IWL_MVM_ESR_EXIT_MISSED_BEACON: exited EMLSR due to missed beacons * @IWL_MVM_ESR_EXIT_LOW_RSSI: link is deactivated/not allowed for EMLSR * due to low RSSI.
@@ -377,6 +379,7 @@ enum iwl_mvm_esr_state {IWL_MVM_ESR_BLOCKED_TPT =0x4 ,IWL_MVM_ESR_BLOCKED_FW =0x8 ,IWL_MVM_ESR_BLOCKED_NON_BSS =0x10 , +IWL_MVM_ESR_BLOCKED_ROC =0x20 ,IWL_MVM_ESR_EXIT_MISSED_BEACON =0x10000 ,IWL_MVM_ESR_EXIT_LOW_RSSI =0x20000 , IWL_MVM_ESR_EXIT_COEX = 0x40000,
drivers/net/wireless/intel/iwlwifi/mvm/time-event.c +3 -2
@@ -47,6 +47,7 @@ void iwl_mvm_te_clear_data(struct iwl_mvm *mvm,static void iwl_mvm_cleanup_roc (struct iwl_mvm *mvm) { +struct ieee80211_vif *bss_vif =iwl_mvm_get_bss_vif (mvm);struct ieee80211_vif *vif = mvm->p2p_device_vif;lockdep_assert_held (&mvm->mutex);
@@ -119,9 +120,9 @@ static void iwl_mvm_cleanup_roc(struct iwl_mvm *mvm)iwl_mvm_rm_aux_sta (mvm); } +if (vif && !IS_ERR_OR_NULL (bss_vif)) +iwl_mvm_unblock_esr (mvm, bss_vif,IWL_MVM_ESR_BLOCKED_ROC );mutex_unlock (&mvm->mutex); -if (vif) -iwl_mvm_esr_non_bss_link (mvm, vif,0 , false); }void iwl_mvm_roc_done_wk (struct work_struct *wk)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 197/809 bpf: Make bpf_session_cookie() kfunc return long *
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Xu <[email protected]>
[ Upstream commit 2b8dd87332cd2782b5b3f0c423bd6693e487ed30 ]
We will soon be generating kfunc prototypes from BTF. As part of that, we need to align the manual signatures in bpf_kfuncs.h with the actual kfunc definitions. There is currently a conflicting signature for bpf_session_cookie() w.r.t. return type.
The original intent was to return long * and not __u64 *. You can see evidence of that intent in a3a5113393cc ("selftests/bpf: Add kprobe session cookie test").
Fix conflict by changing kfunc definition.
--- kernel/trace/bpf_trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/bpf_trace.c +1 -1
@@ -3527,7 +3527,7 @@ __bpf_kfunc bool bpf_session_is_return(void)return session_ctx->is_return; } -__bpf_kfunc __u64 *bpf_session_cookie(void) +__bpf_kfunc long *bpf_session_cookie (void ) {struct bpf_session_run_ctx *session_ctx;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 198/809 xfrm: Fix input error path memory access
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antony Antony <[email protected]>
[ Upstream commit 54fcc6189dfb822eea984fa2b3e477a02447279d ]
When there is a misconfiguration of input state slow path KASAN report error. Fix this error.
west login:
[ 52.987278] eth1: renamed from veth11 [ 53.078814] eth1: renamed from veth21 [ 53.181355] eth1: renamed from veth31 [ 54.921702] ================================================================== [ 54.922602] BUG: KASAN: wild-memory-access in xfrmi_rcv_cb+0x2d/0x295 [ 54.923393] Read of size 8 at addr 6b6b6b6b00000000 by task ping/512 [ 54.924169] [ 54.924386] CPU: 0 PID: 512 Comm: ping Not tainted 6.9.0-08574-gcd29a4313a1b #25 [ 54.925290] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 [ 54.926401] Call Trace: [ 54.926731] <IRQ> [ 54.927009] dump_stack_lvl+0x2a/0x3b [ 54.927478] kasan_report+0x84/0xa6 [ 54.927930] ? xfrmi_rcv_cb+0x2d/0x295 [ 54.928410] xfrmi_rcv_cb+0x2d/0x295 [ 54.928872] ? xfrm4_rcv_cb+0x3d/0x5e [ 54.929354] xfrm4_rcv_cb+0x46/0x5e [ 54.929804] xfrm_rcv_cb+0x7e/0xa1 [ 54.930240] xfrm_input+0x1b3a/0x1b96 [ 54.930715] ? xfrm_offload+0x41/0x41 [ 54.931182] ? raw_rcv+0x292/0x292 [ 54.931617] ? nf_conntrack_confirm+0xa2/0xa2 [ 54.932158] ? skb_sec_path+0xd/0x3f [ 54.932610] ? xfrmi_input+0x90/0xce [ 54.933066] xfrm4_esp_rcv+0x33/0x54 [ 54.933521] ip_protocol_deliver_rcu+0xd7/0x1b2 [ 54.934089] ip_local_deliver_finish+0x110/0x120 [ 54.934659] ? ip_protocol_deliver_rcu+0x1b2/0x1b2 [ 54.935248] NF_HOOK.constprop.0+0xf8/0x138 [ 54.935767] ? ip_sublist_rcv_finish+0x68/0x68 [ 54.936317] ? secure_tcpv6_ts_off+0x23/0x168 [ 54.936859] ? ip_protocol_deliver_rcu+0x1b2/0x1b2 [ 54.937454] ? __xfrm_policy_check2.constprop.0+0x18d/0x18d [ 54.938135] NF_HOOK.constprop.0+0xf8/0x138 [ 54.938663] ? ip_sublist_rcv_finish+0x68/0x68 [ 54.939220] ? __xfrm_policy_check2.constprop.0+0x18d/0x18d [ 54.939904] ? ip_local_deliver_finish+0x120/0x120 [ 54.940497] __netif_receive_skb_one_core+0xc9/0x107 [ 54.941121] ? __netif_receive_skb_list_core+0x1c2/0x1c2 [ 54.941771] ? blk_mq_start_stopped_hw_queues+0xc7/0xf9 [ 54.942413] ? blk_mq_start_stopped_hw_queue+0x38/0x38 [ 54.943044] ? virtqueue_get_buf_ctx+0x295/0x46b [ 54.943618] process_backlog+0xb3/0x187 [ 54.944102] __napi_poll.constprop.0+0x57/0x1a7 [ 54.944669] net_rx_action+0x1cb/0x380 [ 54.945150] ? __napi_poll.constprop.0+0x1a7/0x1a7 [ 54.945744] ? vring_new_virtqueue+0x17a/0x17a [ 54.946300] ? note_interrupt+0x2cd/0x367 [ 54.946805] handle_softirqs+0x13c/0x2c9 [ 54.947300] do_softirq+0x5f/0x7d [ 54.947727] </IRQ> [ 54.948014] <TASK> [ 54.948300] __local_bh_enable_ip+0x48/0x62 [ 54.948832] __neigh_event_send+0x3fd/0x4ca [ 54.949361] neigh_resolve_output+0x1e/0x210 [ 54.949896] ip_finish_output2+0x4bf/0x4f0 [ 54.950410] ? __ip_finish_output+0x171/0x1b8 [ 54.950956] ip_send_skb+0x25/0x57 [ 54.951390] raw_sendmsg+0xf95/0x10c0 [ 54.951850] ? check_new_pages+0x45/0x71 [ 54.952343] ? raw_hash_sk+0x21b/0x21b [ 54.952815] ? kernel_init_pages+0x42/0x51 [ 54.953337] ? prep_new_page+0x44/0x51 [ 54.953811] ? get_page_from_freelist+0x72b/0x915 [ 54.954390] ? signal_pending_state+0x77/0x77 [ 54.954936] ? preempt_count_sub+0x14/0xb3 [ 54.955450] ? __might_resched+0x8a/0x240 [ 54.955951] ? __might_sleep+0x25/0xa0 [ 54.956424] ? first_zones_zonelist+0x2c/0x43 [ 54.956977] ? __rcu_read_lock+0x2d/0x3a [ 54.957476] ? __pte_offset_map+0x32/0xa4 [ 54.957980] ? __might_resched+0x8a/0x240 [ 54.958483] ? __might_sleep+0x25/0xa0 [ 54.958963] ? inet_send_prepare+0x54/0x54 [ 54.959478] ? sock_sendmsg_nosec+0x42/0x6c [ 54.960000] sock_sendmsg_nosec+0x42/0x6c [ 54.960502] __sys_sendto+0x15d/0x1cc [ 54.960966] ? __x64_sys_getpeername+0x44/0x44 [ 54.961522] ? __handle_mm_fault+0x679/0xae4 [ 54.962068] ? find_vma+0x6b/0x8b [ 54.962497] ? find_vma_intersection+0x8a/0x8a [ 54.963052] ? handle_mm_fault+0x38/0x154 [ 54.963556] ? handle_mm_fault+0xeb/0x154 [ 54.964059] ? preempt_latency_start+0x29/0x34 [ 54.964613] ? preempt_count_sub+0x14/0xb3 [ 54.965141] ? up_read+0x4b/0x5c [ 54.965557] __x64_sys_sendto+0x76/0x82 [ 54.966041] do_syscall_64+0x69/0xd5 [ 54.966497] entry_SYSCALL_64_after_hwframe+0x4b/0x53 [ 54.967119] RIP: 0033:0x7f2d2fec9a73 [ 54.967572] Code: 8b 15 a9 83 0c 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b8 0f 1f 00 80 3d 71 0b 0d 00 00 41 89 ca 74 14 b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 75 c3 0f 1f 40 00 55 48 83 ec 30 44 89 4c 24 [ 54.969747] RSP: 002b:00007ffe85756418 EFLAGS: 00000202 ORIG_RAX: 000000000000002c [ 54.970655] RAX: ffffffffffffffda RBX: 0000558bebad1340 RCX: 00007f2d2fec9a73 [ 54.971511] RDX: 0000000000000040 RSI: 0000558bebad73c0 RDI: 0000000000000003 [ 54.972366] RBP: 0000558bebad73c0 R08: 0000558bebad35c0 R09: 0000000000000010 [ 54.973234] R10: 0000000000000000 R11: 0000000000000202 R12: 0000000000000040 [ 54.974091] R13: 00007ffe85757b00 R14: 0000001d00000001 R15: 0000558bebad4680 [ 54.974951] </TASK> [ 54.975244] ================================================================== [ 54.976133] Disabling lock debugging due to kernel taint [ 54.976784] Oops: stack segment: 0000 [#1] PREEMPT DEBUG_PAGEALLOC KASAN [ 54.977603] CPU: 0 PID: 512 Comm: ping Tainted: G B 6.9.0-08574-gcd29a4313a1b #25 [ 54.978654] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 [ 54.979750] RIP: 0010:xfrmi_rcv_cb+0x2d/0x295 [ 54.980293] Code: 00 00 41 57 41 56 41 89 f6 41 55 41 54 55 53 48 89 fb 51 85 f6 75 31 48 89 df e8 d7 e8 ff ff 48 89 c5 48 89 c7 e8 8b a4 4f ff <48> 8b 7d 00 48 89 ee e8 eb f3 ff ff 49 89 c5 b8 01 00 00 00 4d 85 [ 54.982462] RSP: 0018:ffffc90000007990 EFLAGS: 00010282 [ 54.983099] RAX: 0000000000000001 RBX: ffff8881126e9900 RCX: fffffbfff07b77cd [ 54.983948] RDX: fffffbfff07b77cd RSI: fffffbfff07b77cd RDI: ffffffff83dbbe60 [ 54.984794] RBP: 6b6b6b6b00000000 R08: 0000000000000008 R09: 0000000000000001 [ 54.985647] R10: ffffffff83dbbe67 R11: fffffbfff07b77cc R12: 00000000ffffffff [ 54.986512] R13: 00000000ffffffff R14: 00000000ffffffff R15: 0000000000000002 [ 54.987365] FS: 00007f2d2fc0dc40(0000) GS:ffffffff82eb2000(0000) knlGS:0000000000000000 [ 54.988329] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 54.989026] CR2: 00007ffe85755ff8 CR3: 0000000109941000 CR4: 0000000000350ef0 [ 54.989897] Call Trace: [ 54.990223] <IRQ> [ 54.990500] ? __die_body+0x1a/0x56 [ 54.990950] ? die+0x30/0x49 [ 54.991326] ? do_trap+0x9b/0x132 [ 54.991751] ? do_error_trap+0x7d/0xaf [ 54.992223] ? exc_stack_segment+0x35/0x45 [ 54.992734] ? asm_exc_stack_segment+0x22/0x30 [ 54.993294] ? xfrmi_rcv_cb+0x2d/0x295 [ 54.993764] ? xfrm4_rcv_cb+0x3d/0x5e [ 54.994228] xfrm4_rcv_cb+0x46/0x5e [ 54.994670] xfrm_rcv_cb+0x7e/0xa1 [ 54.995106] xfrm_input+0x1b3a/0x1b96 [ 54.995572] ? xfrm_offload+0x41/0x41 [ 54.996038] ? raw_rcv+0x292/0x292 [ 54.996472] ? nf_conntrack_confirm+0xa2/0xa2 [ 54.997011] ? skb_sec_path+0xd/0x3f [ 54.997466] ? xfrmi_input+0x90/0xce [ 54.997925] xfrm4_esp_rcv+0x33/0x54 [ 54.998378] ip_protocol_deliver_rcu+0xd7/0x1b2 [ 54.998944] ip_local_deliver_finish+0x110/0x120 [ 54.999520] ? ip_protocol_deliver_rcu+0x1b2/0x1b2 [ 55.000111] NF_HOOK.constprop.0+0xf8/0x138 [ 55.000630] ? ip_sublist_rcv_finish+0x68/0x68 [ 55.001195] ? secure_tcpv6_ts_off+0x23/0x168 [ 55.001743] ? ip_protocol_deliver_rcu+0x1b2/0x1b2 [ 55.002331] ? __xfrm_policy_check2.constprop.0+0x18d/0x18d [ 55.003008] NF_HOOK.constprop.0+0xf8/0x138 [ 55.003527] ? ip_sublist_rcv_finish+0x68/0x68 [ 55.004078] ? __xfrm_policy_check2.constprop.0+0x18d/0x18d [ 55.004755] ? ip_local_deliver_finish+0x120/0x120 [ 55.005351] __netif_receive_skb_one_core+0xc9/0x107 [ 55.005972] ? __netif_receive_skb_list_core+0x1c2/0x1c2 [ 55.006626] ? blk_mq_start_stopped_hw_queues+0xc7/0xf9 [ 55.007266] ? blk_mq_start_stopped_hw_queue+0x38/0x38 [ 55.007899] ? virtqueue_get_buf_ctx+0x295/0x46b [ 55.008476] process_backlog+0xb3/0x187 [ 55.008961] __napi_poll.constprop.0+0x57/0x1a7 [ 55.009540] net_rx_action+0x1cb/0x380 [ 55.010020] ? __napi_poll.constprop.0+0x1a7/0x1a7 [ 55.010610] ? vring_new_virtqueue+0x17a/0x17a [ 55.011173] ? note_interrupt+0x2cd/0x367 [ 55.011675] handle_softirqs+0x13c/0x2c9 [ 55.012169] do_softirq+0x5f/0x7d [ 55.012597] </IRQ> [ 55.012882] <TASK> [ 55.013179] __local_bh_enable_ip+0x48/0x62 [ 55.013704] __neigh_event_send+0x3fd/0x4ca [ 55.014227] neigh_resolve_output+0x1e/0x210 [ 55.014761] ip_finish_output2+0x4bf/0x4f0 [ 55.015278] ? __ip_finish_output+0x171/0x1b8 [ 55.015823] ip_send_skb+0x25/0x57 [ 55.016261] raw_sendmsg+0xf95/0x10c0 [ 55.016729] ? check_new_pages+0x45/0x71 [ 55.017229] ? raw_hash_sk+0x21b/0x21b [ 55.017708] ? kernel_init_pages+0x42/0x51 [ 55.018225] ? prep_new_page+0x44/0x51 [ 55.018704] ? get_page_from_freelist+0x72b/0x915 [ 55.019292] ? signal_pending_state+0x77/0x77 [ 55.019840] ? preempt_count_sub+0x14/0xb3 [ 55.020357] ? __might_resched+0x8a/0x240 [ 55.020860] ? __might_sleep+0x25/0xa0 [ 55.021345] ? first_zones_zonelist+0x2c/0x43 [ 55.021896] ? __rcu_read_lock+0x2d/0x3a [ 55.022396] ? __pte_offset_map+0x32/0xa4 [ 55.022901] ? __might_resched+0x8a/0x240 [ 55.023404] ? __might_sleep+0x25/0xa0 [ 55.023879] ? inet_send_prepare+0x54/0x54 [ 55.024391] ? sock_sendmsg_nosec+0x42/0x6c [ 55.024918] sock_sendmsg_nosec+0x42/0x6c [ 55.025428] __sys_sendto+0x15d/0x1cc [ 55.025892] ? __x64_sys_getpeername+0x44/0x44 [ 55.026441] ? __handle_mm_fault+0x679/0xae4 [ 55.026988] ? find_vma+0x6b/0x8b [ 55.027414] ? find_vma_intersection+0x8a/0x8a [ 55.027966] ? handle_mm_fault+0x38/0x154 [ 55.028470] ? handle_mm_fault+0xeb/0x154 [ 55.028972] ? preempt_latency_start+0x29/0x34 [ 55.029532] ? preempt_count_sub+0x14/0xb3 [ 55.030047] ? up_read+0x4b/0x5c [ 55.030463] __x64_sys_sendto+0x76/0x82 [ 55.030949] do_syscall_64+0x69/0xd5 [ 55.031406] entry_SYSCALL_64_after_hwframe+0x4b/0x53 [ 55.032028] RIP: 0033:0x7f2d2fec9a73 [ 55.032481] Code: 8b 15 a9 83 0c 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b8 0f 1f 00 80 3d 71 0b 0d 00 00 41 89 ca 74 14 b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 75 c3 0f 1f 40 00 55 48 83 ec 30 44 89 4c 24 [ 55.034660] RSP: 002b:00007ffe85756418 EFLAGS: 00000202 ORIG_RAX: 000000000000002c [ 55.035567] RAX: ffffffffffffffda RBX: 0000558bebad1340 RCX: 00007f2d2fec9a73 [ 55.036424] RDX: 0000000000000040 RSI: 0000558bebad73c0 RDI: 0000000000000003 [ 55.037293] RBP: 0000558bebad73c0 R08: 0000558bebad35c0 R09: 0000000000000010 [ 55.038153] R10: 0000000000000000 R11: 0000000000000202 R12: 0000000000000040 [ 55.039012] R13: 00007ffe85757b00 R14: 0000001d00000001 R15: 0000558bebad4680 [ 55.039871] </TASK> [ 55.040167] Modules linked in: [ 55.040585] ---[ end trace 0000000000000000 ]--- [ 55.041164] RIP: 0010:xfrmi_rcv_cb+0x2d/0x295 [ 55.041714] Code: 00 00 41 57 41 56 41 89 f6 41 55 41 54 55 53 48 89 fb 51 85 f6 75 31 48 89 df e8 d7 e8 ff ff 48 89 c5 48 89 c7 e8 8b a4 4f ff <48> 8b 7d 00 48 89 ee e8 eb f3 ff ff 49 89 c5 b8 01 00 00 00 4d 85 [ 55.043889] RSP: 0018:ffffc90000007990 EFLAGS: 00010282 [ 55.044528] RAX: 0000000000000001 RBX: ffff8881126e9900 RCX: fffffbfff07b77cd [ 55.045386] RDX: fffffbfff07b77cd RSI: fffffbfff07b77cd RDI: ffffffff83dbbe60 [ 55.046250] RBP: 6b6b6b6b00000000 R08: 0000000000000008 R09: 0000000000000001 [ 55.047104] R10: ffffffff83dbbe67 R11: fffffbfff07b77cc R12: 00000000ffffffff [ 55.047960] R13: 00000000ffffffff R14: 00000000ffffffff R15: 0000000000000002 [ 55.048820] FS: 00007f2d2fc0dc40(0000) GS:ffffffff82eb2000(0000) knlGS:0000000000000000 [ 55.049805] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 55.050507] CR2: 00007ffe85755ff8 CR3: 0000000109941000 CR4: 0000000000350ef0 [ 55.051366] Kernel panic - not syncing: Fatal exception in interrupt [ 55.052136] Kernel Offset: disabled [ 55.052577] ---[ end Kernel panic - not syncing: Fatal exception in interrupt ]---
--- net/xfrm/xfrm_input.c | 3 +++ 1 file changed, 3 insertions(+)
net/xfrm/xfrm_input.c +3 -0
@@ -585,8 +585,11 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) }if (unlikely (x->dir && x->dir !=XFRM_SA_DIR_IN )) { +secpath_reset (skb);XFRM_INC_STATS (net,LINUX_MIB_XFRMINSTATEDIRERROR ); +xfrm_audit_state_notfound (skb, family, spi, seq);xfrm_state_put (x); + x =NULL ; goto drop; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 199/809 xfrm: Log input direction mismatch error in one place
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antony Antony <[email protected]>
[ Upstream commit 15f5fe9e84839dcc9eaa69b08ced9d24cb464369 ]
Previously, the offload data path decrypted the packet before checking the direction, leading to error logging and packet dropping. However, dropped packets wouldn't be visible in tcpdump or audit log.
With this fix, the offload path, upon noticing SA direction mismatch, will pass the packet to the stack without decrypting it. The L3 layer will then log the error, audit, and drop ESP without decrypting or decapsulating it.
This also ensures that the slow path records the error and audit log, making dropped packets visible in tcpdump.
--- net/ipv4/esp4_offload.c | 7 +++++++ net/ipv6/esp6_offload.c | 7 +++++++ net/xfrm/xfrm_input.c | 5 ----- 3 files changed, 14 insertions(+), 5 deletions(-)
net/ipv4/esp4_offload.c +7 -0
@@ -56,6 +56,13 @@ static struct sk_buff *esp4_gro_receive(struct list_head *head, x =xfrm_state_lookup (dev_net (skb->dev), skb->mark, (xfrm_address_t *)&ip_hdr (skb)->daddr, spi,IPPROTO_ESP ,AF_INET ); + +if (unlikely (x && x->dir && x->dir !=XFRM_SA_DIR_IN )) { +/* non-offload path will record the error and audit log */ +xfrm_state_put (x); + x =NULL ; + } +if (!x) goto out_reset;
net/ipv6/esp6_offload.c +7 -0
@@ -83,6 +83,13 @@ static struct sk_buff *esp6_gro_receive(struct list_head *head, x =xfrm_state_lookup (dev_net (skb->dev), skb->mark, (xfrm_address_t *)&ipv6_hdr (skb)->daddr, spi,IPPROTO_ESP ,AF_INET6 ); + +if (unlikely (x && x->dir && x->dir !=XFRM_SA_DIR_IN )) { +/* non-offload path will record the error and audit log */ +xfrm_state_put (x); + x =NULL ; + } +if (!x) goto out_reset;
net/xfrm/xfrm_input.c +0 -5
@@ -474,11 +474,6 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)if (encap_type <0 || (xo && xo->flags &XFRM_GRO )) { x =xfrm_input_state (skb); -if (unlikely (x->dir && x->dir !=XFRM_SA_DIR_IN )) { -XFRM_INC_STATS (net,LINUX_MIB_XFRMINSTATEDIRERROR ); - goto drop; - } -if (unlikely (x->km.state !=XFRM_STATE_VALID )) {if (x->km.state ==XFRM_STATE_ACQ )XFRM_INC_STATS (net,LINUX_MIB_XFRMACQUIREERROR );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 200/809 udf: Fix bogus checksum computation in udf_rename()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 27ab33854873e6fb958cb074681a0107cc2ecc4c ]
Syzbot reports uninitialized memory access in udf_rename() when updating checksum of '..' directory entry of a moved directory. This is indeed true as we pass on-stack diriter.fi to the udf_update_tag() and because that has only struct fileIdentDesc included in it and not the impUse or name fields, the checksumming function is going to checksum random stack contents beyond the end of the structure. This is actually harmless because the following udf_fiiter_write_fi() will recompute the checksum from on-disk buffers where everything is properly included. So all that is needed is just removing the bogus calculation.
--- fs/udf/namei.c | 2 -- 1 file changed, 2 deletions(-)
fs/udf/namei.c +0 -2
@@ -876,8 +876,6 @@ static int udf_rename(struct mnt_idmap *idmap, struct inode *old_dir,if (has_diriter) { diriter.fi.icb.extLocation =cpu_to_lelb (UDF_I (new_dir)->i_location); -udf_update_tag ((char *)&diriter.fi, -udf_dir_entry_len (&diriter.fi));udf_fiiter_write_fi (&diriter,NULL );udf_fiiter_release (&diriter); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 201/809 net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Csókás, Bence <[email protected]>
[ Upstream commit c32fe1986f27cac329767d3497986e306cad1d5e ]
FEC_ECR_EN1588 bit gets cleared after MAC reset in fec_stop(), which makes all 1588 functionality shut down, and all the extended registers disappear, on link-down, making the adapter fall back to compatibility "dumb mode". However, some functionality needs to be retained (e.g. PPS) even without link.
--- drivers/net/ethernet/freescale/fec_main.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/freescale/fec_main.c +6 -0
@@ -1361,6 +1361,12 @@ fec_stop(struct net_device *ndev)writel (FEC_ECR_ETHEREN , fep->hwp +FEC_ECNTRL );writel (rmii_mode, fep->hwp +FEC_R_CNTRL ); } + +if (fep->bufdesc_ex) { + val =readl (fep->hwp +FEC_ECNTRL ); + val |=FEC_ECR_EN1588 ; +writel (val, fep->hwp +FEC_ECNTRL ); + } } static void
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 202/809 net: dsa: ksz_common: Allow only up to two HSR HW offloaded ports for KSZ9477
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukasz Majewski <[email protected]>
[ Upstream commit dcec8d291da8813b5e1c7c0967ae63463a8521f6 ]
The KSZ9477 allows HSR in-HW offloading for any of two selected ports. This patch adds check if one tries to use more than two ports with HSR offloading enabled.
The problem is with RedBox configuration (HSR-SAN) - when configuring:
ip link add name hsr0 type hsr slave1 lan1 slave2 lan2 interlink lan3 \
supervision 45 version 1
The lan1 (port0) and lan2 (port1) are correctly configured as ports, which can use HSR offloading on ksz9477.
However, when we do already have two bits set in hsr_ports, we need to return (-ENOTSUPP), so the interlink port (lan3) would be used with SW based HSR RedBox support.
Otherwise, I do see some strange network behavior, as some HSR frames are visible on non-HSR network and vice versa.
This causes the switch connected to interlink port (lan3) to drop frames and no communication is possible.
Moreover, conceptually - the interlink (i.e. HSR-SAN port - lan3/port2) shall be only supported in software as it is also possible to use ksz9477 with only SW based HSR (i.e. port0/1 -> hsr0 with offloading, port2 -> HSR-SAN/interlink, port4/5 -> hsr1 with SW based HSR).
--- drivers/net/dsa/microchip/ksz_common.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/dsa/microchip/ksz_common.c +7 -0
@@ -3917,6 +3917,13 @@ static int ksz_hsr_join(struct dsa_switch *ds, int port, struct net_device *hsr,return -EOPNOTSUPP ; } +/* KSZ9477 can only perform HSR offloading for up to two ports */ +if (hweight8 (dev->hsr_ports) >=2 ) { +NL_SET_ERR_MSG_MOD (extack, +"Cannot offload more than two ports - using software HSR" ); +return -EOPNOTSUPP ; + } +/* Self MAC address filtering, to avoid frames traversing * the HSR ring more than once. */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 203/809 bpf: Change bpf_session_cookie return value to __u64 *
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
[ Upstream commit 717d6313bba1b3179f0bf1026aaec6b7e26f484e ]
This reverts [1] and changes return value for bpf_session_cookie in bpf selftests. Having long * might lead to problems on 32-bit architectures.
--- kernel/trace/bpf_trace.c | 2 +- tools/testing/selftests/bpf/bpf_kfuncs.h | 2 +- tools/testing/selftests/bpf/progs/kprobe_multi_session_cookie.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
kernel/trace/bpf_trace.c +1 -1
@@ -3527,7 +3527,7 @@ __bpf_kfunc bool bpf_session_is_return(void)return session_ctx->is_return; } -__bpf_kfunc long *bpf_session_cookie (void ) +__bpf_kfunc __u64 *bpf_session_cookie(void) {struct bpf_session_run_ctx *session_ctx;
tools/testing/selftests/bpf/bpf_kfuncs.h +1 -1
@@ -77,5 +77,5 @@ extern int bpf_verify_pkcs7_signature(struct bpf_dynptr *data_ptr, struct bpf_key *trusted_keyring) __ksym; extern bool bpf_session_is_return(void) __ksym __weak; -extern long *bpf_session_cookie (void ) __ksym__weak ; +extern __u64 *bpf_session_cookie (void ) __ksym__weak ;#endif
tools/testing/selftests/bpf/progs/kprobe_multi_session_cookie.c +1 -1
@@ -25,7 +25,7 @@ int BPF_PROG(trigger)static int check_cookie (__u64 val,__u64 *result) { -long *cookie; +__u64 *cookie;if (bpf_get_current_pid_tgid () >>32 != pid)return 1 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 204/809 libbpf: Checking the btf_type kind when fixing variable offsets
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Donglin Peng <[email protected]>
[ Upstream commit cc5083d1f3881624ad2de1f3cbb3a07e152cb254 ]
I encountered an issue when building the test_progs from the repository [1]:
$ pwd /work/Qemu/x86_64/linux-6.10-rc2/tools/testing/selftests/bpf/
$ make test_progs V=1 [...] ./tools/sbin/bpftool gen object ./ip_check_defrag.bpf.linked2.o ./ip_check_defrag.bpf.linked1.o libbpf: failed to find symbol for variable 'bpf_dynptr_slice' in section '.ksyms' Error: failed to link './ip_check_defrag.bpf.linked1.o': No such file or directory (2) [...]
Upon investigation, I discovered that the btf_types referenced in the '.ksyms' section had a kind of BTF_KIND_FUNC instead of BTF_KIND_VAR:
$ bpftool btf dump file ./ip_check_defrag.bpf.linked1.o
[...]
[2] DATASEC '.ksyms' size=0 vlen=2
type_id=16 offset=0 size=0 (FUNC 'bpf_dynptr_from_skb')
type_id=17 offset=0 size=0 (FUNC 'bpf_dynptr_slice')
[...]
[16] FUNC 'bpf_dynptr_from_skb' type_id=82 linkage=extern
[17] FUNC 'bpf_dynptr_slice' type_id=85 linkage=extern
[...]For a detailed analysis, please refer to [2]. We can add a kind checking to fix the issue.
[1] https://github.com/eddyz87/bpf/tree/binsort-btf-dedup
[2] https://lore.kernel.org/all/[email protected]/
--- tools/lib/bpf/linker.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
tools/lib/bpf/linker.c +9 -2
@@ -2213,10 +2213,17 @@ static int linker_fixup_btf(struct src_obj *obj) vi =btf_var_secinfos (t);for (j =0 , m =btf_vlen (t); j < m; j++, vi++) {const struct btf_type *vt =btf__type_by_id (obj->btf, vi->type); -const char *var_name =btf__str_by_offset (obj->btf, vt->name_off); -int var_linkage =btf_var (vt)->linkage; +const char *var_name; +int var_linkage;Elf64_Sym *sym; +/* could be a variable or function */ +if (!btf_is_var (vt)) +continue ; + + var_name =btf__str_by_offset (obj->btf, vt->name_off); + var_linkage =btf_var (vt)->linkage; +/* no need to patch up static or extern vars */ if (var_linkage !=BTF_VAR_GLOBAL_ALLOCATED )continue ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 205/809 libbpf: Skip base btf sanity checks
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antoine Tenart <[email protected]>
[ Upstream commit c73a9683cb21012b6c0f14217974837151c527a8 ]
When upgrading to libbpf 1.3 we noticed a big performance hit while loading programs using CORE on non base-BTF symbols. This was tracked down to the new BTF sanity check logic. The issue is the base BTF definitions are checked first for the base BTF and then again for every module BTF.
Loading 5 dummy programs (using libbpf-rs) that are using CORE on a non-base BTF symbol on my system:
- Before this fix: 3s.
- With this fix: 0.1s.
Fix this by only checking the types starting at the BTF start id. This should ensure the base BTF is still checked as expected but only once (btf->start_id == 1 when creating the base BTF), and then only additional types are checked for each module BTF.
--- tools/lib/bpf/btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/btf.c +1 -1
@@ -598,7 +598,7 @@ static int btf_sanity_check(const struct btf *btf)__u32 i, n =btf__type_cnt (btf);int err; -for (i =1 ; i < n; i++) { +for (i = btf->start_id; i < n; i++) { t =btf_type_by_id (btf, i); err =btf_validate_type (btf, t, i);if (err)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 206/809 xfrm: Fix unregister netdevice hang on hardware offload.
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 07b87f9eea0c30675084d50c82532d20168da009 ]
When offloading xfrm states to hardware, the offloading device is attached to the skbs secpath. If a skb is free is deferred, an unregister netdevice hangs because the netdevice is still refcounted.
Fix this by removing the netdevice from the xfrm states when the netdevice is unregistered. To find all xfrm states that need to be cleared we add another list where skbs linked to that are unlinked from the lists (deleted) but not yet freed.
--- include/net/xfrm.h | 36 +++++++------------------ net/xfrm/xfrm_state.c | 61 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 69 insertions(+), 28 deletions(-)
include/net/xfrm.h +10 -26
@@ -178,7 +178,10 @@ struct xfrm_state {struct hlist_node gclist;struct hlist_node bydst; }; -struct hlist_node bysrc; +union { +struct hlist_node dev_gclist; +struct hlist_node bysrc; + };struct hlist_node byspi;struct hlist_node byseq;
@@ -1588,7 +1591,7 @@ void xfrm_state_update_stats(struct net *net);static inline void xfrm_dev_state_update_stats (struct xfrm_state *x) {struct xfrm_dev_offload *xdo = &x->xso; -struct net_device *dev = xdo->dev; +struct net_device *dev =READ_ONCE (xdo->dev);if (dev && dev->xfrmdev_ops && dev->xfrmdev_ops->xdo_dev_state_update_stats)
@@ -1946,13 +1949,16 @@ int xfrm_dev_policy_add(struct net *net, struct xfrm_policy *xp, struct xfrm_user_offload *xuo, u8 dir, struct netlink_ext_ack *extack);bool xfrm_dev_offload_ok (struct sk_buff *skb,struct xfrm_state *x); +void xfrm_dev_state_delete (struct xfrm_state *x); +void xfrm_dev_state_free (struct xfrm_state *x);static inline void xfrm_dev_state_advance_esn (struct xfrm_state *x) {struct xfrm_dev_offload *xso = &x->xso; +struct net_device *dev =READ_ONCE (xso->dev); -if (xso->dev && xso->dev->xfrmdev_ops->xdo_dev_state_advance_esn) - xso->dev->xfrmdev_ops->xdo_dev_state_advance_esn (x); +if (dev && dev->xfrmdev_ops->xdo_dev_state_advance_esn) + dev->xfrmdev_ops->xdo_dev_state_advance_esn (x); }static inline bool xfrm_dst_offload_ok (struct dst_entry *dst)
@@ -1973,28 +1979,6 @@ static inline bool xfrm_dst_offload_ok(struct dst_entry *dst)return false; } -static inline void xfrm_dev_state_delete (struct xfrm_state *x) -{ -struct xfrm_dev_offload *xso = &x->xso; - -if (xso->dev) - xso->dev->xfrmdev_ops->xdo_dev_state_delete (x); -} - -static inline void xfrm_dev_state_free (struct xfrm_state *x) -{ -struct xfrm_dev_offload *xso = &x->xso; -struct net_device *dev = xso->dev; - -if (dev && dev->xfrmdev_ops) { -if (dev->xfrmdev_ops->xdo_dev_state_free) - dev->xfrmdev_ops->xdo_dev_state_free (x); - xso->dev =NULL ; - xso->type =XFRM_DEV_OFFLOAD_UNSPECIFIED ; -netdev_put (dev, &xso->dev_tracker); - } -} -static inline void xfrm_dev_policy_delete (struct xfrm_policy *x) {struct xfrm_dev_offload *xdo = &x->xdo;
net/xfrm/xfrm_state.c +59 -2
103 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 207/809 ipvs: Avoid unnecessary calls to skb_is_gso_sctp
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ismael Luceno <[email protected]>
[ Upstream commit 53796b03295cf7ab1fc8600016fa6dfbf4a494a0 ]
In the context of the SCTP SNAT/DNAT handler, these calls can only return true.
--- net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/ipvs/ip_vs_proto_sctp.c +2 -2
@@ -126,7 +126,7 @@ sctp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp,if (sctph->source != cp->vport || payload_csum || skb->ip_summed ==CHECKSUM_PARTIAL ) { sctph->source = cp->vport; -if (!skb_is_gso (skb) || !skb_is_gso_sctp (skb)) +if (!skb_is_gso (skb))sctp_nat_csum (skb, sctph, sctphoff); }else { skb->ip_summed =CHECKSUM_UNNECESSARY ;
@@ -175,7 +175,7 @@ sctp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, (skb->ip_summed == CHECKSUM_PARTIAL && !(skb_dst(skb)->dev->features & NETIF_F_SCTP_CRC))) { sctph->dest = cp->dport; -if (!skb_is_gso (skb) || !skb_is_gso_sctp (skb)) +if (!skb_is_gso (skb))sctp_nat_csum (skb, sctph, sctphoff); } else if (skb->ip_summed != CHECKSUM_PARTIAL) { skb->ip_summed =CHECKSUM_UNNECESSARY ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 208/809 netfilter: nf_tables: rise cap on SELinux secmark context
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit e29630247be24c3987e2b048f8e152771b32d38b ]
secmark context is artificially limited 256 bytes, rise it to 4Kbytes.
--- include/uapi/linux/netfilter/nf_tables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/netfilter/nf_tables.h +1 -1
@@ -1376,7 +1376,7 @@ enum nft_secmark_attributes {#define NFTA_SECMARK_MAX (__NFTA_SECMARK_MAX - 1)/* Max security context length */ -#define NFT_SECMARK_CTX_MAXLEN 256 +#define NFT_SECMARK_CTX_MAXLEN 4096/** * enum nft_reject_types - nf_tables reject expression reject types
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 209/809 wifi: mac80211: add ieee80211_tdls_sta_link_id()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit d42fcaece03654a4b21d2da88d68ed913e0b6c46 ]
We've open-coded this twice and will need it again, add ieee80211_tdls_sta_link_id() to get the one link ID for a TDLS STA.
Stable-dep-of: 0b2d9d9aec2b ("wifi: mac80211: correcty limit wider BW TDLS STAs")
--- net/mac80211/sta_info.h | 6 ++++++ net/mac80211/tx.c | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-)
net/mac80211/sta_info.h +6 -0
@@ -727,6 +727,12 @@ struct sta_info {struct ieee80211_sta sta; }; +static inline int ieee80211_tdls_sta_link_id (struct sta_info *sta) +{ +/* TDLS STA can only have a single link */ +return sta->sta.valid_links ?__ffs (sta->sta.valid_links) :0 ; +} +static inline enum nl80211_plink_state sta_plink_state (struct sta_info *sta) {#ifdef CONFIG_MAC80211_MESH
net/mac80211/tx.c +2 -4
@@ -2774,8 +2774,7 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata,if (tdls_peer) {/* For TDLS only one link can be valid with peer STA */ -int tdls_link_id = sta->sta.valid_links ? -__ffs (sta->sta.valid_links) :0 ; +int tdls_link_id =ieee80211_tdls_sta_link_id (sta);struct ieee80211_link_data *link;/* DA SA BSSID */
@@ -3101,8 +3100,7 @@ void ieee80211_check_fast_xmit(struct sta_info *sta)case NL80211_IFTYPE_STATION :if (test_sta_flag (sta,WLAN_STA_TDLS_PEER )) {/* For TDLS only one link can be valid with peer STA */ -int tdls_link_id = sta->sta.valid_links ? -__ffs (sta->sta.valid_links) :0 ; +int tdls_link_id =ieee80211_tdls_sta_link_id (sta);struct ieee80211_link_data *link;/* DA SA BSSID */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 210/809 wifi: mac80211: correcty limit wider BW TDLS STAs
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 0b2d9d9aec2be212a28b7d14b5462c56d9adc3a3 ]
When updating a channel context, the code can apply wider bandwidth TDLS STA channel definitions to each and every channel context used by the device, an approach that will surely lead to problems if there is ever more than one.
Restrict the wider BW TDLS STA consideration to only TDLS STAs that are actually related to links using the channel context being updated.
--- net/mac80211/chan.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
net/mac80211/chan.c +11 -0
@@ -775,13 +775,24 @@ void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local,/* TDLS peers can sometimes affect the chandef width */ list_for_each_entry (sta, &local->sta_list, list) { +struct ieee80211_sub_if_data *sdata = sta->sdata;struct ieee80211_chan_req tdls_chanreq = {}; +int tdls_link_id; +if (!sta->uploaded || !test_sta_flag (sta,WLAN_STA_TDLS_WIDER_BW ) || !test_sta_flag (sta,WLAN_STA_AUTHORIZED ) || !sta->tdls_chandef.chan)continue ; + tdls_link_id =ieee80211_tdls_sta_link_id (sta); + link =sdata_dereference (sdata->link[tdls_link_id], sdata); +if (!link) +continue ; + +if (rcu_access_pointer (link->conf->chanctx_conf) != conf) +continue ; + tdls_chanreq.oper = sta->tdls_chandef;/* note this always fills and returns &tmp if compat */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 211/809 wifi: iwlwifi: fix iwl_mvm_get_valid_rx_ant()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Gabay <[email protected]>
[ Upstream commit 0091eda01412805e0d2c8025638ac0992102a7fc ]
Fix incorrect use of _tx_ valid ant data in the function.
--- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +2 -2
@@ -1863,10 +1863,10 @@ static inline u8 iwl_mvm_get_valid_tx_ant(struct iwl_mvm *mvm)static inline u8 iwl_mvm_get_valid_rx_ant (struct iwl_mvm *mvm) { -u8 rx_ant = mvm->fw->valid_tx_ant; +u8 rx_ant = mvm->fw->valid_rx_ant;if (mvm->nvm_data && mvm->nvm_data->valid_rx_ant) - rx_ant &= mvm->nvm_data->valid_tx_ant; + rx_ant &= mvm->nvm_data->valid_rx_ant;if (mvm->set_rx_ant) rx_ant &= mvm->set_rx_ant;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 212/809 wifi: iwlwifi: mvm: always unblock EMLSR on ROC end
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit f9068fe4fd49f9e4409c30546d7e16238942ce62 ]
Since we always block EMLSR for ROC, we also need to always unblock it, even if we don't have a P2P device interface. Fix this.
--- drivers/net/wireless/intel/iwlwifi/mvm/time-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/time-event.c +1 -1
@@ -120,7 +120,7 @@ static void iwl_mvm_cleanup_roc(struct iwl_mvm *mvm)iwl_mvm_rm_aux_sta (mvm); } -if (vif && !IS_ERR_OR_NULL (bss_vif)) +if (!IS_ERR_OR_NULL (bss_vif))iwl_mvm_unblock_esr (mvm, bss_vif,IWL_MVM_ESR_BLOCKED_ROC );mutex_unlock (&mvm->mutex); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 213/809 wifi: ath12k: advertise driver capabilities for MBSSID and EMA
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aloka Dixit <[email protected]>
[ Upstream commit 519a545cfee790024c623c7aacd165f7431773d5 ]
Advertise the driver support for multiple BSSID (MBSSID) and enhanced multi-BSSID advertisements (EMA) by setting extended capabilities.
Configure mbssid_max_interfaces and ema_max_profile_periodicity fields in structure wiphy which are used to advertise maximum number of interfaces and profile periodicity supported by the driver.
Add new WMI fields to configure maximum vdev count supported for MBSSID and profile periodicity in case of EMA.
Set WMI_RSRC_CFG_FLAGS2_CALC_NEXT_DTIM_COUNT_SET flag to allow firmware to track and update the DTIM counts for each nontransmitted profile.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
Stable-dep-of: 1eeafd64c7b4 ("wifi: ath12k: fix peer metadata parsing")
--- drivers/net/wireless/ath/ath12k/hw.h | 1 + drivers/net/wireless/ath/ath12k/mac.c | 7 +++++++ drivers/net/wireless/ath/ath12k/wmi.c | 7 ++++++- drivers/net/wireless/ath/ath12k/wmi.h | 3 +++ 4 files changed, 17 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/hw.h +1 -0
@@ -80,6 +80,7 @@#define TARGET_RX_BATCHMODE 1#define TARGET_RX_PEER_METADATA_VER_V1A 2#define TARGET_RX_PEER_METADATA_VER_V1B 3 +#define TARGET_EMA_MAX_PROFILE_PERIOD 8#define ATH12K_HW_DEFAULT_QUEUE 0#define ATH12K_HW_MAX_QUEUES 4
drivers/net/wireless/ath/ath12k/mac.c +7 -0
@@ -8489,19 +8489,23 @@ static int ath12k_mac_setup_iface_combinations(struct ath12k_hw *ah)static const u8 ath12k_if_types_ext_capa[] = { [0 ] =WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING , + [2 ] =WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT , [7 ] =WLAN_EXT_CAPA8_OPMODE_NOTIF , };static const u8 ath12k_if_types_ext_capa_sta[] = { [0 ] =WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING , + [2 ] =WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT , [7 ] =WLAN_EXT_CAPA8_OPMODE_NOTIF , [9 ] =WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT , };static const u8 ath12k_if_types_ext_capa_ap[] = { [0 ] =WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING , + [2 ] =WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT , [7 ] =WLAN_EXT_CAPA8_OPMODE_NOTIF , [9 ] =WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT , + [10 ] =WLAN_EXT_CAPA11_EMA_SUPPORT , };static const struct wiphy_iftype_ext_capab ath12k_iftypes_ext_capa[] = {
@@ -8740,6 +8744,9 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah) wiphy->iftype_ext_capab = ath12k_iftypes_ext_capa; wiphy->num_iftype_ext_capab =ARRAY_SIZE (ath12k_iftypes_ext_capa); + wiphy->mbssid_max_interfaces =TARGET_NUM_VDEVS ; + wiphy->ema_max_profile_periodicity =TARGET_EMA_MAX_PROFILE_PERIOD ; +if (is_6ghz) {wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_FILS_DISCOVERY );
drivers/net/wireless/ath/ath12k/wmi.c +6 -1
@@ -228,6 +228,9 @@ void ath12k_wmi_init_qcn9274(struct ath12k_base *ab, config->peer_map_unmap_version =0x32 ; config->twt_ap_pdev_count = ab->num_radios; config->twt_ap_sta_count =1000 ; + config->ema_max_vap_cnt = ab->num_radios; + config->ema_max_profile_period =TARGET_EMA_MAX_PROFILE_PERIOD ; + config->beacon_tx_offload_max_vdev += config->ema_max_vap_cnt;if (test_bit (WMI_TLV_SERVICE_PEER_METADATA_V1A_V1B_SUPPORT , ab->wmi_ab.svc_map)) config->dp_peer_meta_data_ver =TARGET_RX_PEER_METADATA_VER_V1B ;
@@ -3475,9 +3478,11 @@ ath12k_wmi_copy_resource_config(struct ath12k_wmi_resource_config_params *wmi_cf wmi_cfg->twt_ap_sta_count =cpu_to_le32 (tg_cfg->twt_ap_sta_count); wmi_cfg->flags2 =le32_encode_bits (tg_cfg->dp_peer_meta_data_ver,WMI_RSRC_CFG_FLAGS2_RX_PEER_METADATA_VERSION ); - wmi_cfg->host_service_flags =cpu_to_le32 (tg_cfg->is_reg_cc_ext_event_supported <<WMI_RSRC_CFG_HOST_SVC_FLAG_REG_CC_EXT_SUPPORT_BIT ); + wmi_cfg->ema_max_vap_cnt =cpu_to_le32 (tg_cfg->ema_max_vap_cnt); + wmi_cfg->ema_max_profile_period =cpu_to_le32 (tg_cfg->ema_max_profile_period); + wmi_cfg->flags2 |=cpu_to_le32 (WMI_RSRC_CFG_FLAGS2_CALC_NEXT_DTIM_COUNT_SET ); } static int ath12k_init_cmd_send(struct ath12k_wmi_pdev *wmi,
drivers/net/wireless/ath/ath12k/wmi.h +3 -0
@@ -2356,6 +2356,8 @@ struct ath12k_wmi_resource_config_arg {u32 twt_ap_sta_count;bool is_reg_cc_ext_event_supported;u8 dp_peer_meta_data_ver; +u32 ema_max_vap_cnt; +u32 ema_max_profile_period; };struct ath12k_wmi_init_cmd_arg {
@@ -2410,6 +2412,7 @@ struct wmi_init_cmd {#define WMI_RSRC_CFG_HOST_SVC_FLAG_REG_CC_EXT_SUPPORT_BIT 4#define WMI_RSRC_CFG_FLAGS2_RX_PEER_METADATA_VERSION GENMASK(5, 4)#define WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64 BIT(5) +#define WMI_RSRC_CFG_FLAGS2_CALC_NEXT_DTIM_COUNT_SET BIT(9)struct ath12k_wmi_resource_config_params {__le32 tlv_header;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 214/809 wifi: ath12k: fix peer metadata parsing
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karthikeyan Periyasamy <[email protected]>
[ Upstream commit 1eeafd64c7b455381b77c546e41bc267e13e2809 ]
Currently, the Rx data path only supports parsing peer metadata of version zero. However, the QCN9274 platform configures the peer metadata version as V1B. When V1B peer metadata is parsed using the version zero logic, invalid data is populated, causing valid packets to be dropped. To address this issue, refactor the peer metadata version and add the version based parsing to populate the data from peer metadata correctly.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp.h | 1 + drivers/net/wireless/ath/ath12k/dp_rx.c | 40 ++++++++++++++++++---- drivers/net/wireless/ath/ath12k/hal_desc.h | 26 ++++++++++++-- drivers/net/wireless/ath/ath12k/hw.h | 2 -- drivers/net/wireless/ath/ath12k/wmi.c | 6 ++-- drivers/net/wireless/ath/ath12k/wmi.h | 11 ++++-- 6 files changed, 72 insertions(+), 14 deletions(-)
drivers/net/wireless/ath/ath12k/dp.h +1 -0
@@ -334,6 +334,7 @@ struct ath12k_dp {struct dp_srng reo_except_ring;struct dp_srng reo_cmd_ring;struct dp_srng reo_status_ring; +enum ath12k_peer_metadata_version peer_metadata_ver;struct dp_srng reo_dst_ring[DP_REO_DST_RING_MAX ];struct dp_tx_ring tx_ring[DP_TCL_NUM_RING_MAX ];struct hal_wbm_idle_scatter_list scatter_list[DP_IDLE_SCATTER_BUFS_MAX ];
drivers/net/wireless/ath/ath12k/dp_rx.c +34 -6
@@ -2607,6 +2607,29 @@ static void ath12k_dp_rx_process_received_packets(struct ath12k_base *ab,rcu_read_unlock (); } +static u16 ath12k_dp_rx_get_peer_id (struct ath12k_base *ab, +enum ath12k_peer_metadata_version ver, +__le32 peer_metadata) +{ +switch (ver) { +default : +ath12k_warn (ab,"Unknown peer metadata version: %d" , ver); + fallthrough; +case ATH12K_PEER_METADATA_V0 : +return le32_get_bits (peer_metadata, +RX_MPDU_DESC_META_DATA_V0_PEER_ID ); +case ATH12K_PEER_METADATA_V1 : +return le32_get_bits (peer_metadata, +RX_MPDU_DESC_META_DATA_V1_PEER_ID ); +case ATH12K_PEER_METADATA_V1A : +return le32_get_bits (peer_metadata, +RX_MPDU_DESC_META_DATA_V1A_PEER_ID ); +case ATH12K_PEER_METADATA_V1B : +return le32_get_bits (peer_metadata, +RX_MPDU_DESC_META_DATA_V1B_PEER_ID ); + } +} +int ath12k_dp_rx_process (struct ath12k_base *ab,int ring_id,struct napi_struct *napi,int budget) {
@@ -2635,6 +2658,8 @@ int ath12k_dp_rx_process(struct ath12k_base *ab, int ring_id,ath12k_hal_srng_access_begin (ab, srng);while ((desc =ath12k_hal_srng_dst_get_next_entry (ab, srng))) { +struct rx_mpdu_desc *mpdu_info; +struct rx_msdu_desc *msdu_info;enum hal_reo_dest_ring_push_reason push_reason;u32 cookie;
@@ -2681,16 +2706,19 @@ int ath12k_dp_rx_process(struct ath12k_base *ab, int ring_id,continue ; } - rxcb->is_first_msdu = !!(le32_to_cpu (desc->rx_msdu_info.info0) & + msdu_info = &desc->rx_msdu_info; + mpdu_info = &desc->rx_mpdu_info; + + rxcb->is_first_msdu = !!(le32_to_cpu (msdu_info->info0) &RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU ); - rxcb->is_last_msdu = !!(le32_to_cpu (desc->rx_msdu_info.info0) & + rxcb->is_last_msdu = !!(le32_to_cpu (msdu_info->info0) &RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU ); - rxcb->is_continuation = !!(le32_to_cpu (desc->rx_msdu_info.info0) & + rxcb->is_continuation = !!(le32_to_cpu (msdu_info->info0) &RX_MSDU_DESC_INFO0_MSDU_CONTINUATION ); rxcb->mac_id = mac_id; - rxcb->peer_id =le32_get_bits (desc->rx_mpdu_info.peer_meta_data, -RX_MPDU_DESC_META_DATA_PEER_ID ); - rxcb->tid =le32_get_bits (desc->rx_mpdu_info.info0, + rxcb->peer_id =ath12k_dp_rx_get_peer_id (ab, dp->peer_metadata_ver, + mpdu_info->peer_meta_data); + rxcb->tid =le32_get_bits (mpdu_info->info0,RX_MPDU_DESC_INFO0_TID );__skb_queue_tail (&msdu_list, msdu);
drivers/net/wireless/ath/ath12k/hal_desc.h +24 -2
@@ -597,8 +597,30 @@ struct hal_tlv_64_hdr {#define RX_MPDU_DESC_INFO0_MPDU_QOS_CTRL_VALID BIT(27)#define RX_MPDU_DESC_INFO0_TID GENMASK(31, 28) -/* TODO revisit after meta data is concluded */ -#define RX_MPDU_DESC_META_DATA_PEER_ID GENMASK(15, 0) +/* Peer Metadata classification */ + +/* Version 0 */ +#define RX_MPDU_DESC_META_DATA_V0_PEER_ID GENMASK(15, 0) +#define RX_MPDU_DESC_META_DATA_V0_VDEV_ID GENMASK(23, 16) + +/* Version 1 */ +#define RX_MPDU_DESC_META_DATA_V1_PEER_ID GENMASK(13, 0) +#define RX_MPDU_DESC_META_DATA_V1_LOGICAL_LINK_ID GENMASK(15, 14) +#define RX_MPDU_DESC_META_DATA_V1_VDEV_ID GENMASK(23, 16) +#define RX_MPDU_DESC_META_DATA_V1_LMAC_ID GENMASK(25, 24) +#define RX_MPDU_DESC_META_DATA_V1_DEVICE_ID GENMASK(28, 26) + +/* Version 1A */ +#define RX_MPDU_DESC_META_DATA_V1A_PEER_ID GENMASK(13, 0) +#define RX_MPDU_DESC_META_DATA_V1A_VDEV_ID GENMASK(21, 14) +#define RX_MPDU_DESC_META_DATA_V1A_LOGICAL_LINK_ID GENMASK(25, 22) +#define RX_MPDU_DESC_META_DATA_V1A_DEVICE_ID GENMASK(28, 26) + +/* Version 1B */ +#define RX_MPDU_DESC_META_DATA_V1B_PEER_ID GENMASK(13, 0) +#define RX_MPDU_DESC_META_DATA_V1B_VDEV_ID GENMASK(21, 14) +#define RX_MPDU_DESC_META_DATA_V1B_HW_LINK_ID GENMASK(25, 22) +#define RX_MPDU_DESC_META_DATA_V1B_DEVICE_ID GENMASK(28, 26)struct rx_mpdu_desc {__le32 info0;/* %RX_MPDU_DESC_INFO */
drivers/net/wireless/ath/ath12k/hw.h +0 -2
@@ -78,8 +78,6 @@#define TARGET_NUM_WDS_ENTRIES 32#define TARGET_DMA_BURST_SIZE 1#define TARGET_RX_BATCHMODE 1 -#define TARGET_RX_PEER_METADATA_VER_V1A 2 -#define TARGET_RX_PEER_METADATA_VER_V1B 3#define TARGET_EMA_MAX_PROFILE_PERIOD 8#define ATH12K_HW_DEFAULT_QUEUE 0
drivers/net/wireless/ath/ath12k/wmi.c +4 -2
@@ -233,7 +233,7 @@ void ath12k_wmi_init_qcn9274(struct ath12k_base *ab, config->beacon_tx_offload_max_vdev += config->ema_max_vap_cnt;if (test_bit (WMI_TLV_SERVICE_PEER_METADATA_V1A_V1B_SUPPORT , ab->wmi_ab.svc_map)) - config->dp_peer_meta_data_ver =TARGET_RX_PEER_METADATA_VER_V1B ; + config->peer_metadata_ver =ATH12K_PEER_METADATA_V1B ; } void ath12k_wmi_init_wcn7850(struct ath12k_base *ab,
@@ -3476,7 +3476,7 @@ ath12k_wmi_copy_resource_config(struct ath12k_wmi_resource_config_params *wmi_cf wmi_cfg->sched_params =cpu_to_le32 (tg_cfg->sched_params); wmi_cfg->twt_ap_pdev_count =cpu_to_le32 (tg_cfg->twt_ap_pdev_count); wmi_cfg->twt_ap_sta_count =cpu_to_le32 (tg_cfg->twt_ap_sta_count); - wmi_cfg->flags2 =le32_encode_bits (tg_cfg->dp_peer_meta_data_ver, + wmi_cfg->flags2 =le32_encode_bits (tg_cfg->peer_metadata_ver,WMI_RSRC_CFG_FLAGS2_RX_PEER_METADATA_VERSION ); wmi_cfg->host_service_flags =cpu_to_le32 (tg_cfg->is_reg_cc_ext_event_supported <<WMI_RSRC_CFG_HOST_SVC_FLAG_REG_CC_EXT_SUPPORT_BIT );
@@ -3706,6 +3706,8 @@ int ath12k_wmi_cmd_init(struct ath12k_base *ab) arg.num_band_to_mac = ab->num_radios;ath12k_fill_band_to_mac_param (ab, arg.band_to_mac); + ab->dp.peer_metadata_ver = arg.res_cfg.peer_metadata_ver; +return ath12k_init_cmd_send (&wmi_ab->wmi[0 ], &arg); }
drivers/net/wireless/ath/ath12k/wmi.h +9 -2
@@ -2292,6 +2292,13 @@ struct ath12k_wmi_host_mem_chunk_arg {u32 req_id; }; +enum ath12k_peer_metadata_version { +ATH12K_PEER_METADATA_V0 , +ATH12K_PEER_METADATA_V1 , +ATH12K_PEER_METADATA_V1A , +ATH12K_PEER_METADATA_V1B +}; +struct ath12k_wmi_resource_config_arg {u32 num_vdevs;u32 num_peers;
@@ -2354,10 +2361,10 @@ struct ath12k_wmi_resource_config_arg {u32 sched_params;u32 twt_ap_pdev_count;u32 twt_ap_sta_count; -bool is_reg_cc_ext_event_supported; -u8 dp_peer_meta_data_ver; +enum ath12k_peer_metadata_version peer_metadata_ver;u32 ema_max_vap_cnt;u32 ema_max_profile_period; +bool is_reg_cc_ext_event_supported; };struct ath12k_wmi_init_cmd_arg {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 215/809 wifi: rtw89: wow: fix GTK offload H2C skbuff issue
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chih-Kang Chang <[email protected]>
[ Upstream commit dda364c345913fe03ddbe4d5ae14a2754c100296 ]
We mistakenly put skb too large and that may exceed skb->end. Therefore, we fix it.
skbuff: skb_over_panic: text:ffffffffc09e9a9d len:416 put:204 head:ffff8fba04eca780 data:ffff8fba04eca7e0 tail:0x200 end:0x140 dev:<NULL>
------------[ cut here ]------------ kernel BUG at net/core/skbuff.c:192! invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 1 PID: 4747 Comm: kworker/u4:44 Tainted: G O 6.6.30-02659-gc18865c4dfbd #1 86547039b47e46935493f615ee31d0b2d711d35e Hardware name: HP Meep/Meep, BIOS Google_Meep.11297.262.0 03/18/2021 Workqueue: events_unbound async_run_entry_fn RIP: 0010:skb_panic+0x5d/0x60 Code: c6 63 8b 8f bb 4c 0f 45 f6 48 c7 c7 4d 89 8b bb 48 89 ce 44 89 d1 41 56 53 41 53 ff b0 c8 00 00 00 e8 27 5f 23 00 48 83 c4 20 <0f> 0b 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f 44 RSP: 0018:ffffaa700144bad0 EFLAGS: 00010282 RAX: 0000000000000089 RBX: 0000000000000140 RCX: 14432c5aad26c900 RDX: 0000000000000000 RSI: 00000000ffffdfff RDI: 0000000000000001 RBP: ffffaa700144bae0 R08: 0000000000000000 R09: ffffaa700144b920 R10: 00000000ffffdfff R11: ffffffffbc28fbc0 R12: ffff8fba4e57a010 R13: 0000000000000000 R14: ffffffffbb8f8b63 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8fba7bd00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007999c4ad1000 CR3: 000000015503a000 CR4: 0000000000350ee0 Call Trace: <TASK> ? __die_body+0x1f/0x70 ? die+0x3d/0x60 ? do_trap+0xa4/0x110 ? skb_panic+0x5d/0x60 ? do_error_trap+0x6d/0x90 ? skb_panic+0x5d/0x60 ? handle_invalid_op+0x30/0x40 ? skb_panic+0x5d/0x60 ? exc_invalid_op+0x3c/0x50 ? asm_exc_invalid_op+0x16/0x20 ? skb_panic+0x5d/0x60 skb_put+0x49/0x50 rtw89_fw_h2c_wow_gtk_ofld+0xbd/0x220 [rtw89_core 778b32de31cd1f14df2d6721ae99ba8a83636fa5] rtw89_wow_resume+0x31f/0x540 [rtw89_core 778b32de31cd1f14df2d6721ae99ba8a83636fa5] rtw89_ops_resume+0x2b/0xa0 [rtw89_core 778b32de31cd1f14df2d6721ae99ba8a83636fa5] ieee80211_reconfig+0x84/0x13e0 [mac80211 818a894e3b77da6298269c59ed7cdff065a4ed52] ? __pfx_wiphy_resume+0x10/0x10 [cfg80211 1a793119e2aeb157c4ca4091ff8e1d9ae233b59d] ? dev_printk_emit+0x51/0x70 ? _dev_info+0x6e/0x90 ? __pfx_wiphy_resume+0x10/0x10 [cfg80211 1a793119e2aeb157c4ca4091ff8e1d9ae233b59d] wiphy_resume+0x89/0x180 [cfg80211 1a793119e2aeb157c4ca4091ff8e1d9ae233b59d] ? __pfx_wiphy_resume+0x10/0x10 [cfg80211 1a793119e2aeb157c4ca4091ff8e1d9ae233b59d] dpm_run_callback+0x3c/0x140 device_resume+0x1f9/0x3c0 ? __pfx_dpm_watchdog_handler+0x10/0x10 async_resume+0x1d/0x30 async_run_entry_fn+0x29/0xd0 process_scheduled_works+0x1d8/0x3d0 worker_thread+0x1fc/0x2f0 kthread+0xed/0x110 ? __pfx_worker_thread+0x10/0x10 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x38/0x50 ? __pfx_kthread+0x10/0x10 ret_from_fork_asm+0x1b/0x30 </TASK> Modules linked in: ccm 8021q r8153_ecm cdc_ether usbnet r8152 mii dm_integrity async_xor xor async_tx lz4 lz4_compress zstd zstd_compress zram zsmalloc uinput rfcomm cmac algif_hash rtw89_8922ae(O) algif_skcipher rtw89_8922a(O) af_alg rtw89_pci(O) rtw89_core(O) btusb(O) snd_soc_sst_bxt_da7219_max98357a btbcm(O) snd_soc_hdac_hdmi btintel(O) snd_soc_intel_hda_dsp_common snd_sof_probes btrtl(O) btmtk(O) snd_hda_codec_hdmi snd_soc_dmic uvcvideo videobuf2_vmalloc uvc videobuf2_memops videobuf2_v4l2 videobuf2_common snd_sof_pci_intel_apl snd_sof_intel_hda_common snd_soc_hdac_hda snd_sof_intel_hda soundwire_intel soundwire_generic_allocation snd_sof_intel_hda_mlink soundwire_cadence snd_sof_pci snd_sof_xtensa_dsp mac80211 snd_soc_acpi_intel_match snd_soc_acpi snd_sof snd_sof_utils soundwire_bus snd_soc_max98357a snd_soc_avs snd_soc_hda_codec snd_hda_ext_core snd_intel_dspcfg snd_intel_sdw_acpi snd_soc_da7219 snd_hda_codec snd_hwdep snd_hda_core veth ip6table_nat xt_MASQUERADE xt_cgroup fuse bluetooth ecdh_generic cfg80211 ecc gsmi: Log Shutdown Reason 0x03 ---[ end trace 0000000000000000 ]---
--- drivers/net/wireless/realtek/rtw89/fw.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +1 -3
@@ -6715,10 +6715,8 @@ int rtw89_fw_h2c_wow_gtk_ofld(struct rtw89_dev *rtwdev,skb_put (skb, len); h2c = (struct rtw89_h2c_wow_gtk_ofld *)skb->data; -if (!enable) { -skb_put_zero (skb,sizeof (*gtk_info)); +if (!enable) goto hdr; - } ret = rtw89_fw_h2c_add_general_pkt(rtwdev, rtwvif, RTW89_PKT_OFLD_TYPE_EAPOL_KEY,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 216/809 wifi: rtw89: 8852b: fix definition of KIP register number
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuan-Chung Chen <[email protected]>
[ Upstream commit 2f35712ab82683554c660bc2456f05785835efbe ]
An incorrect definition caused DPK to fail to backup and restore a set of KIP registers. Fixing this will improve RX throughput from 902 to 997 Mbps.
--- drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c +1 -1
@@ -20,7 +20,7 @@#define RTW8852B_RF_REL_VERSION 34#define RTW8852B_DPK_VER 0x0d#define RTW8852B_DPK_RF_PATH 2 -#define RTW8852B_DPK_KIP_REG_NUM 2 +#define RTW8852B_DPK_KIP_REG_NUM 3#define _TSSI_DE_MASK GENMASK(21, 12)#define ADDC_T_AVG 100
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 217/809 wifi: rtl8xxxu: 8188f: Limit TX power index
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Kaistra <[email protected]>
[ Upstream commit d0b4b8ef083ca46d5d318e66a30fb80e0abbb90d ]
TX power index is read from the efuse on init, the values get written to the TX power registers when the channel gets switched.
When the chip has not yet been calibrated, the efuse values are 0xFF, which on some boards leads to USB timeouts for reading/writing registers after the first frames have been sent.
The vendor driver (v5.11.5-1) checks for these invalid values and sets default values instead. Implement something similar in rtl8188fu_parse_efuse().
--- drivers/net/wireless/realtek/rtl8xxxu/8188f.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/wireless/realtek/rtl8xxxu/8188f.c +15 -0
@@ -697,9 +697,14 @@ static void rtl8188fu_init_statistics(struct rtl8xxxu_priv *priv)rtl8xxxu_write32 (priv,REG_OFDM0_FA_RSTC , val32); } +#define TX_POWER_INDEX_MAX 0x3F +#define TX_POWER_INDEX_DEFAULT_CCK 0x22 +#define TX_POWER_INDEX_DEFAULT_HT40 0x27 +static int rtl8188fu_parse_efuse (struct rtl8xxxu_priv *priv) {struct rtl8188fu_efuse *efuse = &priv->efuse_wifi.efuse8188fu; +int i;if (efuse->rtl_id !=cpu_to_le16 (0x8129 ))return -EINVAL ;
@@ -713,6 +718,16 @@ static int rtl8188fu_parse_efuse(struct rtl8xxxu_priv *priv) efuse->tx_power_index_A.ht40_base, sizeof(efuse->tx_power_index_A.ht40_base)); +for (i =0 ; i <ARRAY_SIZE (priv->cck_tx_power_index_A); i++) { +if (priv->cck_tx_power_index_A[i] >TX_POWER_INDEX_MAX ) + priv->cck_tx_power_index_A[i] =TX_POWER_INDEX_DEFAULT_CCK ; + } + +for (i =0 ; i <ARRAY_SIZE (priv->ht40_1s_tx_power_index_A); i++) { +if (priv->ht40_1s_tx_power_index_A[i] >TX_POWER_INDEX_MAX ) + priv->ht40_1s_tx_power_index_A[i] =TX_POWER_INDEX_DEFAULT_HT40 ; + } + priv->ofdm_tx_power_diff[0 ].a = efuse->tx_power_index_A.ht20_ofdm_1s_diff.a; priv->ht20_tx_power_diff[0 ].a = efuse->tx_power_index_A.ht20_ofdm_1s_diff.b;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 218/809 xfrm: Export symbol xfrm_dev_state_delete.
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Klassert <[email protected]>
[ Upstream commit 2d5317753e5f02a66e6d0afb9b25105d0beab1be ]
This fixes a build failure if xfrm_user is build as a module.
--- net/xfrm/xfrm_state.c | 1 + 1 file changed, 1 insertion(+)
net/xfrm/xfrm_state.c +1 -0
@@ -698,6 +698,7 @@ void xfrm_dev_state_delete(struct xfrm_state *x)spin_unlock_bh (&xfrm_state_dev_gc_lock); } } +EXPORT_SYMBOL_GPL (xfrm_dev_state_delete);void xfrm_dev_state_free (struct xfrm_state *x) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 219/809 riscv, bpf: Fix out-of-bounds issue when preparing trampoline image
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pu Lehui <[email protected]>
[ Upstream commit 9f1e16fb1fc9826001c69e0551d51fbbcd2d74e9 ]
We get the size of the trampoline image during the dry run phase and allocate memory based on that size. The allocated image will then be populated with instructions during the real patch phase. But after commit 26ef208c209a ("bpf: Use arch_bpf_trampoline_size"), the im argument is inconsistent in the dry run and real patch phase. This may cause emit_imm in RV64 to generate a different number of instructions when generating the 'im' address, potentially causing out-of-bounds issues. Let's emit the maximum number of instructions for the "im" address during dry run to fix this problem.
--- arch/riscv/net/bpf_jit_comp64.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
arch/riscv/net/bpf_jit_comp64.c +13 -5
@@ -16,6 +16,8 @@#include "bpf_jit.h" #define RV_FENTRY_NINSNS 2 +/* imm that allows emit_imm to emit max count insns */ +#define RV_MAX_COUNT_IMM 0x7FFF7FF7FF7FF7FF#define RV_REG_TCC RV_REG_A6#define RV_REG_TCC_SAVED RV_REG_S6/* Store A6 in S6 if program do calls */
@@ -915,7 +917,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, orig_call +=RV_FENTRY_NINSNS *4 ;if (flags &BPF_TRAMP_F_CALL_ORIG ) { -emit_imm (RV_REG_A0 , (const s64 )im, ctx); +emit_imm (RV_REG_A0 , ctx->insns ? (const s64 )im :RV_MAX_COUNT_IMM , ctx); ret =emit_call ((const u64 )__bpf_tramp_enter, true, ctx);if (ret)return ret;
@@ -976,7 +978,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,if (flags &BPF_TRAMP_F_CALL_ORIG ) { im->ip_epilogue = ctx->insns + ctx->ninsns; -emit_imm (RV_REG_A0 , (const s64 )im, ctx); +emit_imm (RV_REG_A0 , ctx->insns ? (const s64 )im :RV_MAX_COUNT_IMM , ctx); ret =emit_call ((const u64 )__bpf_tramp_exit, true, ctx);if (ret) goto out;
@@ -1045,6 +1047,7 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, {int ret;struct rv_jit_context ctx; +u32 size = image_end - image; ctx.ninsns =0 ;/*
@@ -1058,11 +1061,16 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, ctx.ro_insns = image; ret =__arch_prepare_bpf_trampoline (im, m, tlinks, func_addr, flags, &ctx);if (ret <0 ) -return ret; + goto out; -bpf_flush_icache (ctx.insns, ctx.insns + ctx.ninsns); +if (WARN_ON (size <ninsns_rvoff (ctx.ninsns))) { + ret = -E2BIG ; + goto out; + } -return ninsns_rvoff (ret); +bpf_flush_icache (image, image_end); +out: +return ret <0 ? ret : size; } int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 220/809 bpftool: Mount bpffs when pinmaps path not under the bpffs
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tao Chen <[email protected]>
[ Upstream commit da5f8fd1f0d393d5eaaba9ad8c22d1c26bb2bf9b ]
As Quentin said [0], BPF map pinning will fail if the pinmaps path is not under the bpffs, like:
libbpf: specified path /home/ubuntu/test/sock_ops_map is not on BPF FS
Error: failed to pin all maps
[0] https://github.com/libbpf/bpftool/issues/146
--- tools/bpf/bpftool/prog.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/bpf/bpftool/prog.c +4 -0
@@ -1813,6 +1813,10 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) }if (pinmaps) { + err =create_and_mount_bpffs_dir (pinmaps); +if (err) + goto err_unpin; + err =bpf_object__pin_maps (obj, pinmaps);if (err) {p_err ("failed to pin all maps" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 221/809 bpf: Fix atomic probe zero-extension
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Leoshkevich <[email protected]>
[ Upstream commit df34ec9db6f521118895f22795da49f2ec01f8cf ]
Zero-extending results of atomic probe operations fails with:
verifier bug. zext_dst is set, but no reg is defined
The problem is that insn_def_regno() handles BPF_ATOMICs, but not BPF_PROBE_ATOMICs. Fix by adding the missing condition.
--- kernel/bpf/verifier.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +2 -1
@@ -3215,7 +3215,8 @@ static int insn_def_regno(const struct bpf_insn *insn)case BPF_ST :return -1 ;case BPF_STX : -if (BPF_MODE (insn->code) ==BPF_ATOMIC && +if ((BPF_MODE (insn->code) ==BPF_ATOMIC || +BPF_MODE (insn->code) ==BPF_PROBE_ATOMIC ) && (insn->imm &BPF_FETCH )) {if (insn->imm ==BPF_CMPXCHG )return BPF_REG_0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 222/809 perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit 3520b251dcae2b4a27b95cd6f745c54fd658bda5 ]
Currently, perf allocates an array of page pointers which is limited in size by MAX_PAGE_ORDER. That in turn limits the maximum Intel PT buffer size to 2GiB. Should that limitation be lifted, the Intel PT driver can support larger sizes, except for one calculation in pt_topa_entry_for_page(), which is limited to 32-bits.
Fix pt_topa_entry_for_page() address calculation by adding a cast.
--- arch/x86/events/intel/pt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/pt.c +1 -1
@@ -990,7 +990,7 @@ pt_topa_entry_for_page(struct pt_buffer *buf, unsigned int pg)* order allocations, there shouldn't be many of these. */ list_for_each_entry (topa, &buf->tables, list) { -if (topa->offset + topa->size > pg <<PAGE_SHIFT ) +if (topa->offset + topa->size > (unsigned long )pg <<PAGE_SHIFT ) goto found; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 223/809 perf: Fix perf_aux_size() for greater-than 32-bit size
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit 3df94a5b1078dfe2b0c03f027d018800faf44c82 ]
perf_buffer->aux_nr_pages uses a 32-bit type, so a cast is needed to calculate a 64-bit size.
--- kernel/events/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/internal.h +1 -1
@@ -128,7 +128,7 @@ static inline unsigned long perf_data_size(struct perf_buffer *rb)static inline unsigned long perf_aux_size (struct perf_buffer *rb) { -return rb->aux_nr_pages <<PAGE_SHIFT ; +return (unsigned long )rb->aux_nr_pages <<PAGE_SHIFT ; }#define __DEFINE_OUTPUT_COPY_BODY (advance_buf, memcpy_func, ...) \
Signature · 16 lines
2.43.0
rt_streaming(struct vb2_queue *q, unsigned int count)
dev_dbg(ctx->mxc_jpeg->dev, "Start streaming ctx=%p", ctx);
q_data->sequence = 0;
+ if (V4L2_TYPE_IS_CAPTURE(q->type))
+ ctx->need_initial_source_change_evt = false;
+
ret = pm_runtime_resume_and_get(ctx->mxc_jpeg->dev);
if (ret < 0) {
dev_err(ctx->mxc_jpeg->dev, "Failed to power up jpeg\n");
--
2.43.0Greg Kroah-Hartman
maintainerPATCH 224/809 perf: Prevent passing zero nr_pages to rb_alloc_aux()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit dbc48c8f41c208082cfa95e973560134489e3309 ]
nr_pages is unsigned long but gets passed to rb_alloc_aux() as an int, and is stored as an int.
Only power-of-2 values are accepted, so if nr_pages is a 64_bit value, it will be passed to rb_alloc_aux() as zero.
That is not ideal because:
1. the value is incorrect
2. rb_alloc_aux() is at risk of misbehaving, although it manages to return -ENOMEM in that case, it is a result of passing zero to get_order() even though the get_order() result is documented to be undefined in that case.
Fix by simply validating the maximum supported value in the first place. Use -ENOMEM error code for consistency with the current error code that is returned in that case.
--- kernel/events/core.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/events/core.c +2 -0
@@ -6509,6 +6509,8 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)return -EINVAL ; nr_pages = vma_size /PAGE_SIZE ; +if (nr_pages >INT_MAX ) +return -ENOMEM ;mutex_lock (&event->mmap_mutex); ret = -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 225/809 perf: Fix default aux_watermark calculation
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrian Hunter <[email protected]>
[ Upstream commit 43deb76b19663a96ec2189d8f4eb9a9dc2d7623f ]
The default aux_watermark is half the AUX area buffer size. In general, on a 64-bit architecture, the AUX area buffer size could be a bigger than fits in a 32-bit type, but the calculation does not allow for that possibility.
However the aux_watermark value is recorded in a u32, so should not be more than U32_MAX either.
Fix by doing the calculation in a correctly sized type, and limiting the result to U32_MAX.
--- kernel/events/ring_buffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/events/ring_buffer.c +3 -1
@@ -688,7 +688,9 @@ int rb_alloc_aux(struct perf_buffer *rb, struct perf_event *event,* max_order, to aid PMU drivers in double buffering. */ if (!watermark) - watermark = nr_pages << (PAGE_SHIFT -1 ); + watermark = min_t(unsigned long, +U32_MAX , + (unsigned long )nr_pages << (PAGE_SHIFT -1 ));/* * Use aux_watermark as the basis for chunking to
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 226/809 perf/x86/intel/cstate: Fix Alderlake/Raptorlake/Meteorlake
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Rui <[email protected]>
[ Upstream commit 2c3aedd9db6295619d21e50ad29efda614023bf1 ]
For Alderlake, the spec changes after the patch submitted and PC7/PC9 are removed.
Raptorlake and Meteorlake, which copy the Alderlake cstate PMU, also don't have PC7/PC9.
Remove PC7/PC9 support for Alderlake/Raptorlake/Meteorlake.
--- arch/x86/events/intel/cstate.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
arch/x86/events/intel/cstate.c +2 -5
@@ -81,7 +81,7 @@* MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. * perf code: 0x03 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL, -* KBL,CML,ICL,TGL,RKL,ADL,RPL,MTL +* KBL,CML,ICL,TGL,RKL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04
@@ -90,8 +90,7 @@* Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 -* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL,RPL,MTL +* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06
@@ -637,9 +636,7 @@ static const struct cstate_model adl_cstates __initconst = { .pkg_events = BIT(PERF_CSTATE_PKG_C2_RES) |BIT (PERF_CSTATE_PKG_C3_RES ) |BIT (PERF_CSTATE_PKG_C6_RES ) | -BIT (PERF_CSTATE_PKG_C7_RES ) |BIT (PERF_CSTATE_PKG_C8_RES ) | -BIT (PERF_CSTATE_PKG_C9_RES ) | BIT(PERF_CSTATE_PKG_C10_RES), };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 227/809 perf/x86/amd/uncore: Avoid PMU registration if counters are unavailable
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sandipan Das <[email protected]>
[ Upstream commit f997e208b6c96858a2f6c0855debfbdb9b52f131 ]
X86_FEATURE_PERFCTR_NB and X86_FEATURE_PERFCTR_LLC are derived from CPUID leaf 0x80000001 ECX bits 24 and 28 respectively and denote the availability of DF and L3 counters. When these bits are not set, the corresponding PMUs have no counters and hence, should not be registered.
--- arch/x86/events/amd/uncore.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
arch/x86/events/amd/uncore.c +14 -8
@@ -654,17 +654,20 @@ int amd_uncore_df_ctx_init(struct amd_uncore *uncore, unsigned int cpu) {struct attribute **df_attr = amd_uncore_df_format_attr;struct amd_uncore_pmu *pmu; +int num_counters;/* Run just once */ if (uncore->init_done)return amd_uncore_ctx_init (uncore, cpu); + num_counters =amd_uncore_ctx_num_pmcs (uncore, cpu); +if (!num_counters) + goto done; +/* No grouping, single instance for a system */ uncore->pmus =kzalloc (sizeof (*uncore->pmus),GFP_KERNEL ); -if (!uncore->pmus) { - uncore->num_pmus =0 ; +if (!uncore->pmus) goto done; - }/* * For Family 17h and above, the Northbridge counters are repurposed
@@ -674,7 +677,7 @@ int amd_uncore_df_ctx_init(struct amd_uncore *uncore, unsigned int cpu) pmu = &uncore->pmus[0 ];strscpy (pmu->name, boot_cpu_data.x86 >=0x17 ?"amd_df" :"amd_nb" ,sizeof (pmu->name)); - pmu->num_counters =amd_uncore_ctx_num_pmcs (uncore, cpu); + pmu->num_counters = num_counters; pmu->msr_base =MSR_F15H_NB_PERF_CTL ; pmu->rdpmc_base =RDPMC_BASE_NB ; pmu->group =amd_uncore_ctx_gid (uncore, cpu);
@@ -785,17 +788,20 @@ int amd_uncore_l3_ctx_init(struct amd_uncore *uncore, unsigned int cpu) {struct attribute **l3_attr = amd_uncore_l3_format_attr;struct amd_uncore_pmu *pmu; +int num_counters;/* Run just once */ if (uncore->init_done)return amd_uncore_ctx_init (uncore, cpu); + num_counters =amd_uncore_ctx_num_pmcs (uncore, cpu); +if (!num_counters) + goto done; +/* No grouping, single instance for a system */ uncore->pmus =kzalloc (sizeof (*uncore->pmus),GFP_KERNEL ); -if (!uncore->pmus) { - uncore->num_pmus =0 ; +if (!uncore->pmus) goto done; - }/* * For Family 17h and above, L3 cache counters are available instead
@@ -805,7 +811,7 @@ int amd_uncore_l3_ctx_init(struct amd_uncore *uncore, unsigned int cpu) pmu = &uncore->pmus[0 ];strscpy (pmu->name, boot_cpu_data.x86 >=0x17 ?"amd_l3" :"amd_l2" ,sizeof (pmu->name)); - pmu->num_counters =amd_uncore_ctx_num_pmcs (uncore, cpu); + pmu->num_counters = num_counters; pmu->msr_base =MSR_F16H_L2I_PERF_CTL ; pmu->rdpmc_base =RDPMC_BASE_LLC ; pmu->group =amd_uncore_ctx_gid (uncore, cpu);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 228/809 perf/x86/amd/uncore: Fix DF and UMC domain identification
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sandipan Das <[email protected]>
[ Upstream commit 57e11990f45f89bc29d0f84dd7b13a4e4263eeb2 ]
For uncore PMUs, a single context is shared across all CPUs in a domain. The domain can be a CCX, like in the case of the L3 PMU, or a socket, like in the case of DF and UMC PMUs. This information is available via the PMU's cpumask.
For contexts shared across a socket, the domain is currently determined from topology_die_id() which is incorrect after the introduction of commit 63edbaa48a57 ("x86/cpu/topology: Add support for the AMD 0x80000026 leaf") as it now returns a CCX identifier on Zen 4 and later systems which support CPUID leaf 0x80000026.
Use topology_logical_package_id() instead as it always returns a socket identifier irrespective of the availability of CPUID leaf 0x80000026.
--- arch/x86/events/amd/uncore.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/events/amd/uncore.c +3 -3
@@ -639,7 +639,7 @@ void amd_uncore_df_ctx_scan(struct amd_uncore *uncore, unsigned int cpu) info.split.aux_data =0 ; info.split.num_pmcs =NUM_COUNTERS_NB ; info.split.gid =0 ; - info.split.cid =topology_die_id (cpu); + info.split.cid =topology_logical_package_id (cpu);if (pmu_version >=2 ) { ebx.full =cpuid_ebx (EXT_PERFMON_DEBUG_FEATURES );
@@ -899,8 +899,8 @@ void amd_uncore_umc_ctx_scan(struct amd_uncore *uncore, unsigned int cpu)cpuid (EXT_PERFMON_DEBUG_FEATURES , &eax, &ebx.full, &ecx, &edx); info.split.aux_data = ecx;/* stash active mask */ info.split.num_pmcs = ebx.split.num_umc_pmc; - info.split.gid =topology_die_id (cpu); - info.split.cid =topology_die_id (cpu); + info.split.gid =topology_logical_package_id (cpu); + info.split.cid =topology_logical_package_id (cpu); *per_cpu_ptr (uncore->info, cpu) = info; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 229/809 wifi: rtw89: Fix array index mistake in rtw89_sta_info_get_iter()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Mishin <[email protected]>
[ Upstream commit 85099c7ce4f9e64c66aa397cd9a37473637ab891 ]
In rtw89_sta_info_get_iter() 'status->he_gi' is compared to array size. But then 'rate->he_gi' is used as array index instead of 'status->he_gi'. This can lead to go beyond array boundaries in case of 'rate->he_gi' is not equal to 'status->he_gi' and is bigger than array size. Looks like "copy-paste" mistake.
Fix this mistake by replacing 'rate->he_gi' with 'status->he_gi'.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/realtek/rtw89/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/debug.c +1 -1
@@ -3531,7 +3531,7 @@ static void rtw89_sta_info_get_iter(void *data, struct ieee80211_sta *sta)case RX_ENC_HE :seq_printf (m,"HE %dSS MCS-%d GI:%s" , status->nss, status->rate_idx, status->he_gi <=NL80211_RATE_INFO_HE_GI_3_2 ? - he_gi_str[rate->he_gi] :"N/A" ); + he_gi_str[status->he_gi] :"N/A" );break ;case RX_ENC_EHT : seq_printf(m, "EHT %dSS MCS-%d GI:%s", status->nss, status->rate_idx,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 230/809 xfrm: fix netdev reference count imbalance
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jianbo Liu <[email protected]>
[ Upstream commit 9199b915e9fad7f5eff6160d24ff6b38e970107d ]
In cited commit, netdev_tracker_alloc() is called for the newly allocated xfrm state, but dev_hold() is missed, which causes netdev reference count imbalance, because netdev_put() is called when the state is freed in xfrm_dev_state_free(). Fix the issue by replacing netdev_tracker_alloc() with netdev_hold().
--- net/xfrm/xfrm_state.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/xfrm/xfrm_state.c +1 -2
@@ -1331,8 +1331,7 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, xso->dev = xdo->dev; xso->real_dev = xdo->real_dev; xso->flags =XFRM_DEV_OFFLOAD_FLAG_ACQ ; -netdev_tracker_alloc (xso->dev, &xso->dev_tracker, -GFP_ATOMIC ); +netdev_hold (xso->dev, &xso->dev_tracker,GFP_ATOMIC ); error = xso->dev->xfrmdev_ops->xdo_dev_state_add (x,NULL );if (error) { xso->dir =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 231/809 xfrm: call xfrm_dev_policy_delete when kill policy
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jianbo Liu <[email protected]>
[ Upstream commit 89a2aefe4b084686c2ffc1ee939585111ea4fc0f ]
xfrm_policy_kill() is called at different places to delete xfrm policy. It will call xfrm_pol_put(). But xfrm_dev_policy_delete() is not called to free the policy offloaded to hardware.
The three commits cited here are to handle this issue by calling xfrm_dev_policy_delete() outside xfrm_get_policy(). But they didn't cover all the cases. An example, which is not handled for now, is xfrm_policy_insert(). It is called when XFRM_MSG_UPDPOLICY request is received. Old policy is replaced by new one, but the offloaded policy is not deleted, so driver doesn't have the chance to release hardware resources.
To resolve this issue for all cases, move xfrm_dev_policy_delete() into xfrm_policy_kill(), so the offloaded policy can be deleted from hardware when it is called, which avoids hardware resources leakage.
--- net/xfrm/xfrm_policy.c | 5 ++--- net/xfrm/xfrm_user.c | 1 - 2 files changed, 2 insertions(+), 4 deletions(-)
net/xfrm/xfrm_policy.c +2 -3
@@ -452,6 +452,8 @@ EXPORT_SYMBOL(xfrm_policy_destroy);static void xfrm_policy_kill (struct xfrm_policy *policy) { +xfrm_dev_policy_delete (policy); +write_lock_bh (&policy->lock); policy->walk.dead =1 ;write_unlock_bh (&policy->lock);
@@ -1850,7 +1852,6 @@ int xfrm_policy_flush(struct net *net, u8 type, bool task_valid)__xfrm_policy_unlink (pol, dir);spin_unlock_bh (&net->xfrm.xfrm_policy_lock); -xfrm_dev_policy_delete (pol); cnt++;xfrm_audit_policy_delete (pol,1 , task_valid);xfrm_policy_kill (pol);
@@ -1891,7 +1892,6 @@ int xfrm_dev_policy_flush(struct net *net, struct net_device *dev,__xfrm_policy_unlink (pol, dir);spin_unlock_bh (&net->xfrm.xfrm_policy_lock); -xfrm_dev_policy_delete (pol); cnt++;xfrm_audit_policy_delete (pol,1 , task_valid);xfrm_policy_kill (pol);
@@ -2342,7 +2342,6 @@ int xfrm_policy_delete(struct xfrm_policy *pol, int dir) pol =__xfrm_policy_unlink (pol, dir);spin_unlock_bh (&net->xfrm.xfrm_policy_lock);if (pol) { -xfrm_dev_policy_delete (pol);xfrm_policy_kill (pol);return 0 ; }
net/xfrm/xfrm_user.c +0 -1
@@ -2455,7 +2455,6 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh, NETLINK_CB(skb).portid); } }else { -xfrm_dev_policy_delete (xp);xfrm_audit_policy_delete (xp, err ?0 :1 , true);if (err !=0 )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 232/809 wifi: virt_wifi: avoid reporting connection success with wrong SSID
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: En-Wei Wu <[email protected]>
[ Upstream commit b5d14b0c6716fad7f0c94ac6e1d6f60a49f985c7 ]
When user issues a connection with a different SSID than the one virt_wifi has advertised, the __cfg80211_connect_result() will trigger the warning: WARN_ON(bss_not_found).
The issue is because the connection code in virt_wifi does not check the SSID from user space (it only checks the BSSID), and virt_wifi will call cfg80211_connect_result() with WLAN_STATUS_SUCCESS even if the SSID is different from the one virt_wifi has advertised. Eventually cfg80211 won't be able to find the cfg80211_bss and generate the warning.
Fixed it by checking the SSID (from user space) in the connection code.
--- drivers/net/wireless/virtual/virt_wifi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/net/wireless/virtual/virt_wifi.c +16 -3
@@ -136,6 +136,8 @@ static struct ieee80211_supported_band band_5ghz = {/* Assigned at module init. Guaranteed locally-administered and unicast. */ static u8 fake_router_bssid[ETH_ALEN ]__ro_after_init = {}; +#define VIRT_WIFI_SSID "VirtWifi" +static void virt_wifi_inform_bss (struct wiphy *wiphy) {u64 tsf =div_u64 (ktime_get_boottime_ns (),1000 );
@@ -146,8 +148,8 @@ static void virt_wifi_inform_bss(struct wiphy *wiphy)u8 ssid[8 ]; }__packed ssid = { .tag =WLAN_EID_SSID , - .len =8 , - .ssid ="VirtWifi" , + .len =strlen (VIRT_WIFI_SSID ), + .ssid =VIRT_WIFI_SSID , }; informed_bss = cfg80211_inform_bss(wiphy, &channel_5ghz,
@@ -213,6 +215,8 @@ struct virt_wifi_netdev_priv {struct net_device *upperdev;u32 tx_packets;u32 tx_failed; +u32 connect_requested_ssid_len; +u8 connect_requested_ssid[IEEE80211_MAX_SSID_LEN ];u8 connect_requested_bss[ETH_ALEN ];bool is_up;bool is_connected;
@@ -229,6 +233,12 @@ static int virt_wifi_connect(struct wiphy *wiphy, struct net_device *netdev,if (priv->being_deleted || !priv->is_up)return -EBUSY ; +if (!sme->ssid) +return -EINVAL ; + + priv->connect_requested_ssid_len = sme->ssid_len; +memcpy (priv->connect_requested_ssid, sme->ssid, sme->ssid_len); + could_schedule =schedule_delayed_work (&priv->connect,HZ *2 );if (!could_schedule)return -EBUSY ;
@@ -252,12 +262,15 @@ static void virt_wifi_connect_complete(struct work_struct *work) container_of(work, struct virt_wifi_netdev_priv, connect.work);u8 *requested_bss = priv->connect_requested_bss;bool right_addr =ether_addr_equal (requested_bss, fake_router_bssid); +bool right_ssid = priv->connect_requested_ssid_len ==strlen (VIRT_WIFI_SSID ) && + !memcmp (priv->connect_requested_ssid,VIRT_WIFI_SSID , + priv->connect_requested_ssid_len);u16 status =WLAN_STATUS_SUCCESS ;if (is_zero_ether_addr (requested_bss)) requested_bss =NULL ; -if (!priv->is_up || (requested_bss && !right_addr)) +if (!priv->is_up || (requested_bss && !right_addr) || !right_ssid) status =WLAN_STATUS_UNSPECIFIED_FAILURE ;else priv->is_connected = true;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 233/809 bpf: helpers: fix bpf_wq_set_callback_impl signature
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Tissoires <[email protected]>
[ Upstream commit f56f4d541eab1ae060a46b56dd6ec9130d6e3a98 ]
I realized this while having a map containing both a struct bpf_timer and a struct bpf_wq: the third argument provided to the bpf_wq callback is not the struct bpf_wq pointer itself, but the pointer to the value in the map.
Which means that the users need to double cast the provided "value" as this is not a struct bpf_wq *.
This is a change of API, but there doesn't seem to be much users of bpf_wq right now, so we should be able to go with this right now.
--- kernel/bpf/helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/helpers.c +1 -1
@@ -2786,7 +2786,7 @@ __bpf_kfunc int bpf_wq_start(struct bpf_wq *wq, unsigned int flags) } __bpf_kfunc int bpf_wq_set_callback_impl(struct bpf_wq *wq, -int (callback_fn )(void *map,int *key,struct bpf_wq *wq), +int (callback_fn )(void *map,int *key,void *value),unsigned int flags,void *aux__ign) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 234/809 NFSD: Fix nfsdcld warning
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 18a5450684c312e98eb2253f0acf88b3f780af20 ]
Since CONFIG_NFSD_LEGACY_CLIENT_TRACKING is a new config option, its initial default setting should have been Y (if we are to follow the common practice of "default Y, wait, default N, wait, remove code").
Paul also suggested adding a clearer remedy action to the warning message.
Message-Id: <[email protected]>
--- fs/nfsd/Kconfig | 2 +- fs/nfsd/nfs4recover.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
fs/nfsd/Kconfig +1 -1
@@ -162,7 +162,7 @@ config NFSD_V4_SECURITY_LABEL config NFSD_LEGACY_CLIENT_TRACKING bool "Support legacy NFSv4 client tracking methods (DEPRECATED)" depends on NFSD_V4 - default n + default y help The NFSv4 server needs to store a small amount of information on stable storage in order to handle state recovery after reboot. Most
fs/nfsd/nfs4recover.c +2 -2
@@ -2086,8 +2086,8 @@ nfsd4_client_tracking_init(struct net *net) status = nn->client_tracking_ops->init (net); out:if (status) { -printk (KERN_WARNING "NFSD: Unable to initialize client " -"recovery tracking! (%d)\n" , status); +pr_warn ("NFSD: Unable to initialize client recovery tracking! (%d)\n" , status); +pr_warn ("NFSD: Is nfsdcld running? If not, enable CONFIG_NFSD_LEGACY_CLIENT_TRACKING.\n" ); nn->client_tracking_ops =NULL ; }return status;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 235/809 gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gaosheng Cui <[email protected]>
[ Upstream commit a3123341dc358952ce2bf8067fbdfb7eaadf71bb ]
If we fail to call crypto_sync_skcipher_setkey, we should free the memory allocation for cipher, replace err_return with err_free_cipher to free the memory of cipher.
--- net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/auth_gss/gss_krb5_keys.c +1 -1
@@ -168,7 +168,7 @@ static int krb5_DK(const struct gss_krb5_enctype *gk5e, goto err_return; blocksize =crypto_sync_skcipher_blocksize (cipher);if (crypto_sync_skcipher_setkey (cipher, inkey->data, inkey->len)) - goto err_return; + goto err_free_cipher; ret = -ENOMEM ; inblockdata =kmalloc (blocksize, gfp_mask);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 236/809 net: page_pool: fix warning code
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 946b6c48cca48591fb495508c5dbfade767173d0 ]
WARN_ON_ONCE("string") doesn't really do what appears to be intended, so fix that.
--- net/core/page_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/page_pool.c +1 -1
@@ -445,7 +445,7 @@ static bool page_pool_dma_map(struct page_pool *pool, struct page *page)return true; unmap_failed: -WARN_ON_ONCE ("unexpected DMA address, please report to netdev@" ); +WARN_ONCE (1 ,"unexpected DMA address, please report to netdev@" );dma_unmap_page_attrs (pool->p.dev, dma,PAGE_SIZE << pool->p.order, pool->p.dma_dir,DMA_ATTR_SKIP_CPU_SYNC |DMA_ATTR_WEAK_ORDERING );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 237/809 wifi: virt_wifi: dont use strlen() in const context
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 6e909f489191b365364e9d636dec33b5dfd4e5eb ]
Looks like not all compilers allow strlen(constant) as a constant, so don't do that. Instead, revert back to defining the length as the first submission had it.
--- drivers/net/wireless/virtual/virt_wifi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/virtual/virt_wifi.c +3 -2
@@ -137,6 +137,7 @@ static struct ieee80211_supported_band band_5ghz = {static u8 fake_router_bssid[ETH_ALEN ]__ro_after_init = {};#define VIRT_WIFI_SSID "VirtWifi" +#define VIRT_WIFI_SSID_LEN 8static void virt_wifi_inform_bss (struct wiphy *wiphy) {
@@ -148,7 +149,7 @@ static void virt_wifi_inform_bss(struct wiphy *wiphy)u8 ssid[8 ]; }__packed ssid = { .tag =WLAN_EID_SSID , - .len =strlen (VIRT_WIFI_SSID ), + .len =VIRT_WIFI_SSID_LEN , .ssid =VIRT_WIFI_SSID , };
@@ -262,7 +263,7 @@ static void virt_wifi_connect_complete(struct work_struct *work) container_of(work, struct virt_wifi_netdev_priv, connect.work);u8 *requested_bss = priv->connect_requested_bss;bool right_addr =ether_addr_equal (requested_bss, fake_router_bssid); -bool right_ssid = priv->connect_requested_ssid_len ==strlen (VIRT_WIFI_SSID ) && +bool right_ssid = priv->connect_requested_ssid_len ==VIRT_WIFI_SSID_LEN && !memcmp (priv->connect_requested_ssid,VIRT_WIFI_SSID , priv->connect_requested_ssid_len);u16 status =WLAN_STATUS_SUCCESS ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 238/809 locking/rwsem: Add __always_inline annotation to __down_write_common() and inlined callers
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Stultz <[email protected]>
[ Upstream commit e81859fe64ad42dccefe134d1696e0635f78d763 ]
Apparently despite it being marked inline, the compiler may not inline __down_write_common() which makes it difficult to identify the cause of lock contention, as the wchan of the blocked function will always be listed as __down_write_common().
So add __always_inline annotation to the common function (as well as the inlined helper callers) to force it to be inlined so a more useful blocking function will be listed (via wchan).
This mirrors commit 92cc5d00a431 ("locking/rwsem: Add __always_inline annotation to __down_read_common() and inlined callers") which did the same for __down_read_common.
I sort of worry that I'm playing wack-a-mole here, and talking with compiler people, they tell me inline means nothing, which makes me want to cry a little. So I'm wondering if we need to replace all the inlines with __always_inline, or remove them because either we mean something by it, or not.
--- kernel/locking/rwsem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/locking/rwsem.c +3 -3
@@ -1297,7 +1297,7 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)/* * lock for writing */ -static inline int __down_write_common (struct rw_semaphore *sem,int state) +static __always_inline int __down_write_common(struct rw_semaphore *sem, int state) {int ret =0 ;
@@ -1310,12 +1310,12 @@ static inline int __down_write_common(struct rw_semaphore *sem, int state)return ret; } -static inline void __down_write (struct rw_semaphore *sem) +static __always_inline void __down_write(struct rw_semaphore *sem) {__down_write_common (sem,TASK_UNINTERRUPTIBLE ); } -static inline int __down_write_killable (struct rw_semaphore *sem) +static __always_inline int __down_write_killable(struct rw_semaphore *sem) {return __down_write_common (sem,TASK_KILLABLE ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 239/809 selftests/bpf: Close fd in error path in drop_on_reuseport
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit adae187ebedcd95d02f045bc37dfecfd5b29434b ]
In the error path when update_lookup_map() fails in drop_on_reuseport in prog_tests/sk_lookup.c, "server1", the fd of server 1, should be closed. This patch fixes this by using "goto close_srv1" lable instead of "detach" to close "server1" in this case.
--- tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +1 -1
@@ -994,7 +994,7 @@ static void drop_on_reuseport(const struct test *t) err =update_lookup_map (t->sock_map,SERVER_A , server1);if (err) - goto detach; + goto close_srv1;/* second server on destination address we should never reach */ server2 = make_server(t->sotype, t->connect_to.ip, t->connect_to.port,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 240/809 selftests/bpf: Null checks for links in bpf_tcp_ca
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit eef0532e900c20a6760da829e82dac3ee18688c5 ]
Run bpf_tcp_ca selftests (./test_progs -t bpf_tcp_ca) on a Loongarch platform, some "Segmentation fault" errors occur:
'''
test_dctcp:PASS:bpf_dctcp__open_and_load 0 nsec test_dctcp:FAIL:bpf_map__attach_struct_ops unexpected error: -524
#29/1 bpf_tcp_ca/dctcp:FAIL
test_cubic:PASS:bpf_cubic__open_and_load 0 nsec test_cubic:FAIL:bpf_map__attach_struct_ops unexpected error: -524
#29/2 bpf_tcp_ca/cubic:FAIL
test_dctcp_fallback:PASS:dctcp_skel 0 nsec test_dctcp_fallback:PASS:bpf_dctcp__load 0 nsec test_dctcp_fallback:FAIL:dctcp link unexpected error: -524
#29/4 bpf_tcp_ca/dctcp_fallback:FAIL
test_write_sk_pacing:PASS:open_and_load 0 nsec test_write_sk_pacing:FAIL:attach_struct_ops unexpected error: -524
#29/6 bpf_tcp_ca/write_sk_pacing:FAIL
test_update_ca:PASS:open 0 nsec test_update_ca:FAIL:attach_struct_ops unexpected error: -524
settcpca:FAIL:setsockopt unexpected setsockopt: \ actual -1 == expected -1 (network_helpers.c:99: errno: No such file or directory) \ Failed to call post_socket_cb start_test:FAIL:start_server_str unexpected start_server_str: \ actual -1 == expected -1
test_update_ca:FAIL:ca1_ca1_cnt unexpected ca1_ca1_cnt: \
actual 0 <= expected 0
#29/9 bpf_tcp_ca/update_ca:FAIL
#29 bpf_tcp_ca:FAIL
Caught signal #11!
Stack trace:
./test_progs(crash_handler+0x28)[0x5555567ed91c] linux-vdso.so.1(__vdso_rt_sigreturn+0x0)[0x7ffffee408b0] ./test_progs(bpf_link__update_map+0x80)[0x555556824a78] ./test_progs(+0x94d68)[0x5555564c4d68] ./test_progs(test_bpf_tcp_ca+0xe8)[0x5555564c6a88] ./test_progs(+0x3bde54)[0x5555567ede54] ./test_progs(main+0x61c)[0x5555567efd54] /usr/lib64/libc.so.6(+0x22208)[0x7ffff2aaa208] /usr/lib64/libc.so.6(__libc_start_main+0xac)[0x7ffff2aaa30c] ./test_progs(_start+0x48)[0x55555646bca8] Segmentation fault
'''
This is because BPF trampoline is not implemented on Loongarch yet, "link" returned by bpf_map__attach_struct_ops() is NULL. test_progs crashs when this NULL link passes to bpf_link__update_map(). This patch adds NULL checks for all links in bpf_tcp_ca to fix these errors. If "link" is NULL, goto the newly added label "out" to destroy the skel.
v2:
- use "goto out" instead of "return" as Eduard suggested.
--- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +12 -4
@@ -307,7 +307,8 @@ static void test_update_ca(void)return ; link =bpf_map__attach_struct_ops (skel->maps.ca_update_1); -ASSERT_OK_PTR (link,"attach_struct_ops" ); +if (!ASSERT_OK_PTR (link,"attach_struct_ops" )) + goto out;do_test ("tcp_ca_update" ,NULL ); saved_ca1_cnt = skel->bss->ca1_cnt;
@@ -321,6 +322,7 @@ static void test_update_ca(void)ASSERT_GT (skel->bss->ca2_cnt,0 ,"ca2_ca2_cnt" );bpf_link__destroy (link); +out:tcp_ca_update__destroy (skel); }
@@ -336,7 +338,8 @@ static void test_update_wrong(void)return ; link =bpf_map__attach_struct_ops (skel->maps.ca_update_1); -ASSERT_OK_PTR (link,"attach_struct_ops" ); +if (!ASSERT_OK_PTR (link,"attach_struct_ops" )) + goto out;do_test ("tcp_ca_update" ,NULL ); saved_ca1_cnt = skel->bss->ca1_cnt;
@@ -349,6 +352,7 @@ static void test_update_wrong(void)ASSERT_GT (skel->bss->ca1_cnt, saved_ca1_cnt,"ca2_ca1_cnt" );bpf_link__destroy (link); +out:tcp_ca_update__destroy (skel); }
@@ -363,7 +367,8 @@ static void test_mixed_links(void)return ; link_nl =bpf_map__attach_struct_ops (skel->maps.ca_no_link); -ASSERT_OK_PTR (link_nl,"attach_struct_ops_nl" ); +if (!ASSERT_OK_PTR (link_nl,"attach_struct_ops_nl" )) + goto out; link =bpf_map__attach_struct_ops (skel->maps.ca_update_1);ASSERT_OK_PTR (link,"attach_struct_ops" );
@@ -376,6 +381,7 @@ static void test_mixed_links(void)bpf_link__destroy (link);bpf_link__destroy (link_nl); +out:tcp_ca_update__destroy (skel); }
@@ -418,7 +424,8 @@ static void test_link_replace(void)bpf_link__destroy (link); link =bpf_map__attach_struct_ops (skel->maps.ca_update_2); -ASSERT_OK_PTR (link,"attach_struct_ops_2nd" ); +if (!ASSERT_OK_PTR (link,"attach_struct_ops_2nd" )) + goto out;/* BPF_F_REPLACE with a wrong old map Fd. It should fail! *
@@ -441,6 +448,7 @@ static void test_link_replace(void)bpf_link__destroy (link); +out:tcp_ca_update__destroy (skel); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 241/809 selftests/bpf: Close obj in error path in xdp_adjust_tail
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit 52b49ec1b2c78deb258596c3b231201445ef5380 ]
If bpf_object__load() fails in test_xdp_adjust_frags_tail_grow(), "obj" opened before this should be closed. So use "goto out" to close it instead of using "return" here.
--- tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c +1 -1
@@ -222,7 +222,7 @@ static void test_xdp_adjust_frags_tail_grow(void) prog =bpf_object__next_program (obj,NULL );if (bpf_object__load (obj)) -return ; + goto out; prog_fd =bpf_program__fd (prog);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 242/809 bpf, arm64: Fix trampoline for BPF_TRAMP_F_CALL_ORIG
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Puranjay Mohan <[email protected]>
[ Upstream commit 19d3c179a37730caf600a97fed3794feac2b197b ]
When BPF_TRAMP_F_CALL_ORIG is set, the trampoline calls __bpf_tramp_enter() and __bpf_tramp_exit() functions, passing them the struct bpf_tramp_image *im pointer as an argument in R0.
The trampoline generation code uses emit_addr_mov_i64() to emit instructions for moving the bpf_tramp_image address into R0, but emit_addr_mov_i64() assumes the address to be in the vmalloc() space and uses only 48 bits. Because bpf_tramp_image is allocated using kzalloc(), its address can use more than 48-bits, in this case the trampoline will pass an invalid address to __bpf_tramp_enter/exit() causing a kernel crash.
Fix this by using emit_a64_mov_i64() in place of emit_addr_mov_i64() as it can work with addresses that are greater than 48-bits.
--- arch/arm64/net/bpf_jit_comp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/net/bpf_jit_comp.c +2 -2
@@ -2141,7 +2141,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,emit (A64_STR64I (A64_R (20 ),A64_SP , regs_off +8 ), ctx);if (flags &BPF_TRAMP_F_CALL_ORIG ) { -emit_addr_mov_i64 (A64_R (0 ), (const u64 )im, ctx); +emit_a64_mov_i64 (A64_R (0 ), (const u64 )im, ctx);emit_call ((const u64 )__bpf_tramp_enter, ctx); }
@@ -2185,7 +2185,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,if (flags &BPF_TRAMP_F_CALL_ORIG ) { im->ip_epilogue = ctx->ro_image + ctx->idx; -emit_addr_mov_i64 (A64_R (0 ), (const u64 )im, ctx); +emit_a64_mov_i64 (A64_R (0 ), (const u64 )im, ctx);emit_call ((const u64 )__bpf_tramp_exit, ctx); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 243/809 selftests/resctrl: Fix closing IMC fds on error and open-code R+W instead of loops
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit c44000b6535dc9806b9128d1aed403862b2adab9 ]
The imc perf fd close() calls are missing from all error paths. In addition, get_mem_bw_imc() handles fds in a for loop but close() is based on two fixed indexes READ and WRITE.
Open code inner for loops to READ+WRITE entries for clarity and add a function to close() IMC fds properly in all cases.
--- tools/testing/selftests/resctrl/resctrl_val.c | 54 ++++++++++++------- 1 file changed, 36 insertions(+), 18 deletions(-)
tools/testing/selftests/resctrl/resctrl_val.c +36 -18
@@ -293,6 +293,18 @@ static int initialize_mem_bw_imc(void)return 0 ; } +static void perf_close_imc_mem_bw (void ) +{ +int mc; + +for (mc =0 ; mc < imcs; mc++) { +if (imc_counters_config[mc][READ ].fd !=-1 ) +close (imc_counters_config[mc][READ ].fd); +if (imc_counters_config[mc][WRITE ].fd !=-1 ) +close (imc_counters_config[mc][WRITE ].fd); + } +} +/* * get_mem_bw_imc: Memory band width as reported by iMC counters * @cpu_no: CPU number that the benchmark PID is binded to
@@ -306,26 +318,33 @@ static int initialize_mem_bw_imc(void)static int get_mem_bw_imc (int cpu_no,char *bw_report,float *bw_imc) {float reads, writes, of_mul_read, of_mul_write; -int imc, j, ret; +int imc, ret; + +for (imc =0 ; imc < imcs; imc++) { + imc_counters_config[imc][READ ].fd =-1 ; + imc_counters_config[imc][WRITE ].fd =-1 ; + }/* Start all iMC counters to log values (both read and write) */ reads =0 , writes =0 , of_mul_read =1 , of_mul_write =1 ;for (imc =0 ; imc < imcs; imc++) { -for (j =0 ; j <2 ; j++) { - ret =open_perf_event (imc, cpu_no, j); -if (ret) -return -1 ; - } -for (j =0 ; j <2 ; j++) -membw_ioctl_perf_event_ioc_reset_enable (imc, j); + ret =open_perf_event (imc, cpu_no,READ ); +if (ret) + goto close_fds; + ret =open_perf_event (imc, cpu_no,WRITE ); +if (ret) + goto close_fds; + +membw_ioctl_perf_event_ioc_reset_enable (imc,READ ); +membw_ioctl_perf_event_ioc_reset_enable (imc,WRITE ); }sleep (1 );/* Stop counters after a second to get results (both read and write) */ for (imc =0 ; imc < imcs; imc++) { -for (j =0 ; j <2 ; j++) -membw_ioctl_perf_event_ioc_disable (imc, j); +membw_ioctl_perf_event_ioc_disable (imc,READ ); +membw_ioctl_perf_event_ioc_disable (imc,WRITE ); }/*
@@ -341,15 +360,13 @@ static int get_mem_bw_imc(int cpu_no, char *bw_report, float *bw_imc)if (read (r->fd, &r->return_value,sizeof (struct membw_read_format )) ==-1 ) {ksft_perror ("Couldn't get read b/w through iMC" ); - -return -1 ; + goto close_fds; }if (read (w->fd, &w->return_value,sizeof (struct membw_read_format )) ==-1 ) {ksft_perror ("Couldn't get write bw through iMC" ); - -return -1 ; + goto close_fds; }__u64 r_time_enabled = r->return_value.time_enabled;
@@ -369,10 +386,7 @@ static int get_mem_bw_imc(int cpu_no, char *bw_report, float *bw_imc) writes += w->return_value.value * of_mul_write *SCALE ; } -for (imc =0 ; imc < imcs; imc++) { -close (imc_counters_config[imc][READ ].fd); -close (imc_counters_config[imc][WRITE ].fd); - } +perf_close_imc_mem_bw ();if (strcmp (bw_report,"reads" ) ==0 ) { *bw_imc = reads;
@@ -386,6 +400,10 @@ static int get_mem_bw_imc(int cpu_no, char *bw_report, float *bw_imc) *bw_imc = reads + writes;return 0 ; + +close_fds: +perf_close_imc_mem_bw (); +return -1 ; }void set_mbm_path (const char *ctrlgrp,const char *mongrp,int domain_id)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 244/809 bpf: annotate BTF show functions with __printf
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Maguire <[email protected]>
[ Upstream commit b3470da314fd8018ee237e382000c4154a942420 ]
-Werror=suggest-attribute=format warns about two functions in kernel/bpf/btf.c [1]; add __printf() annotations to silence these warnings since for CONFIG_WERROR=y they will trigger build failures.
[1] https://lore.kernel.org/bpf/[email protected]/
--- kernel/bpf/btf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/bpf/btf.c +4 -4
@@ -7370,8 +7370,8 @@ static void btf_type_show(const struct btf *btf, u32 type_id, void *obj,btf_type_ops (t)->show (btf, t, type_id, obj,0 , show); } -static void btf_seq_show (struct btf_show *show,const char *fmt, -va_list args) +__printf(2, 0) static void btf_seq_show(struct btf_show *show, const char *fmt, +va_list args) {seq_vprintf ((struct seq_file *)show->target, fmt, args); }
@@ -7404,8 +7404,8 @@ struct btf_show_snprintf {int len;/* length we would have written */ }; -static void btf_snprintf_show (struct btf_show *show,const char *fmt, -va_list args) +__printf(2, 0) static void btf_snprintf_show(struct btf_show *show, const char *fmt, +va_list args) {struct btf_show_snprintf *ssnprintf = (struct btf_show_snprintf *)show;int len;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 245/809 bna: adjust name buf size of bna_tcb and bna_ccb structures
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Kodanev <[email protected]>
[ Upstream commit c9741a03dc8e491e57b95fba0058ab46b7e506da ]
To have enough space to write all possible sprintf() args. Currently 'name' size is 16, but the first '%s' specifier may already need at least 16 characters, since 'bnad->netdev->name' is used there.
For '%d' specifiers, assume that they require:
* 1 char for 'tx_id + tx_info->tcb[i]->id' sum, BNAD_MAX_TXQ_PER_TX is 8
* 2 chars for 'rx_id + rx_info->rx_ctrl[i].ccb->id', BNAD_MAX_RXP_PER_RX is 16
And replace sprintf with snprintf.
Detected using the static analysis tool - Svace.
--- drivers/net/ethernet/brocade/bna/bna_types.h | 2 +- drivers/net/ethernet/brocade/bna/bnad.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/brocade/bna/bna_types.h +1 -1
@@ -416,7 +416,7 @@ struct bna_ib {/* Tx object */ /* Tx datapath control structure */ -#define BNA_Q_NAME_SIZE 16 +#define BNA_Q_NAME_SIZE (IFNAMSIZ + 6)struct bna_tcb {/* Fast path */ void **sw_qpt;
drivers/net/ethernet/brocade/bna/bnad.c +6 -5
@@ -1534,8 +1534,9 @@ bnad_tx_msix_register(struct bnad *bnad, struct bnad_tx_info *tx_info,for (i =0 ; i < num_txqs; i++) { vector_num = tx_info->tcb[i]->intr_vector; -sprintf (tx_info->tcb[i]->name,"%s TXQ %d" , bnad->netdev->name, - tx_id + tx_info->tcb[i]->id); +snprintf (tx_info->tcb[i]->name,BNA_Q_NAME_SIZE ,"%s TXQ %d" , + bnad->netdev->name, + tx_id + tx_info->tcb[i]->id); err = request_irq(bnad->msix_table[vector_num].vector, (irq_handler_t)bnad_msix_tx, 0, tx_info->tcb[i]->name,
@@ -1585,9 +1586,9 @@ bnad_rx_msix_register(struct bnad *bnad, struct bnad_rx_info *rx_info,for (i =0 ; i < num_rxps; i++) { vector_num = rx_info->rx_ctrl[i].ccb->intr_vector; -sprintf (rx_info->rx_ctrl[i].ccb->name,"%s CQ %d" , - bnad->netdev->name, - rx_id + rx_info->rx_ctrl[i].ccb->id); +snprintf (rx_info->rx_ctrl[i].ccb->name,BNA_Q_NAME_SIZE , +"%s CQ %d" , bnad->netdev->name, + rx_id + rx_info->rx_ctrl[i].ccb->id); err = request_irq(bnad->msix_table[vector_num].vector, (irq_handler_t)bnad_msix_rx, 0, rx_info->rx_ctrl[i].ccb->name,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 246/809 bpf: Eliminate remaining "make W=1" warnings in kernel/bpf/btf.o
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Maguire <[email protected]>
[ Upstream commit 2454075f8e2915cebbe52a1195631bc7efe2b7e1 ]
As reported by Mirsad [1] we still see format warnings in kernel/bpf/btf.o at W=1 warning level:
CC kernel/bpf/btf.o./kernel/bpf/btf.c: In function ‘btf_type_seq_show_flags’:./kernel/bpf/btf.c:7553:21: warning: assignment left-hand side might be a candidate for a format attribute [-Wsuggest-attribute=format]
7553 | sseq.showfn = btf_seq_show;
| ^./kernel/bpf/btf.c: In function ‘btf_type_snprintf_show’:./kernel/bpf/btf.c:7604:31: warning: assignment left-hand side might be a candidate for a format attribute [-Wsuggest-attribute=format]
7604 | ssnprintf.show.showfn = btf_snprintf_show;
| ^
Combined with CONFIG_WERROR=y these can halt the build.
The fix (annotating the structure field with __printf()) suggested by Mirsad resolves these. Apologies I missed this last time. No other W=1 warnings were observed in kernel/bpf after this fix.
[1] https://lore.kernel.org/bpf/[email protected]/
--- kernel/bpf/btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/btf.c +1 -1
@@ -414,7 +414,7 @@ const char *btf_type_str(const struct btf_type *t)struct btf_show {u64 flags;void *target;/* target of show operation (seq file, buffer) */ -void (*showfn)(struct btf_show *show,const char *fmt,va_list args); + __printf(2, 0) void (*showfn)(struct btf_show *show, const char *fmt, va_list args);const struct btf *btf;/* below are used during iteration */ struct {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 247/809 bpf: fix overflow check in adjust_jmp_off()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shung-Hsi Yu <[email protected]>
[ Upstream commit 4a04b4f0de59dd5c621e78f15803ee0b0544eeb8 ]
adjust_jmp_off() incorrectly used the insn->imm field for all overflow check, which is incorrect as that should only be done or the BPF_JMP32 | BPF_JA case, not the general jump instruction case. Fix it by using insn->off for overflow check in the general case.
--- kernel/bpf/verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/verifier.c +1 -1
@@ -18768,7 +18768,7 @@ static int adjust_jmp_off(struct bpf_prog *prog, u32 tgt_idx, u32 delta) }else {if (i +1 + insn->off != tgt_idx)continue ; -if (signed_add16_overflows (insn->imm, delta)) +if (signed_add16_overflows (insn->off, delta))return -ERANGE ; insn->off += delta; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 248/809 nfsd: nfsd_file_lease_notifier_call gets a file_lease as an argument
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
[ Upstream commit 769d20028f45a4f442cfe558a32faba357a7f5e2 ]
"data" actually refers to a file_lease and not a file_lock. Both structs have their file_lock_core as the first field though, so this bug should be harmless without struct randomization in play.
--- fs/nfsd/filecache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/filecache.c +1 -1
@@ -664,7 +664,7 @@ static int nfsd_file_lease_notifier_call(struct notifier_block *nb, unsigned long arg, void *data) { - struct file_lock *fl = data; + struct file_lease *fl = data;/* Only close files for F_SETLEASE leases */ if (fl->c.flc_flags &FL_LEASE )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 249/809 bpf: Fix null pointer dereference in resolve_prog_type() for BPF_PROG_TYPE_EXT
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tengda Wu <[email protected]>
[ Upstream commit f7866c35873377313ff94398f17d425b28b71de1 ]
When loading a EXT program without specifying attr->attach_prog_fd, the prog->aux->dst_prog will be null. At this time, calling resolve_prog_type() anywhere will result in a null pointer dereference.
Example stack trace:
[ 8.107863] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000004 [ 8.108262] Mem abort info: [ 8.108384] ESR = 0x0000000096000004 [ 8.108547] EC = 0x25: DABT (current EL), IL = 32 bits [ 8.108722] SET = 0, FnV = 0 [ 8.108827] EA = 0, S1PTW = 0 [ 8.108939] FSC = 0x04: level 0 translation fault [ 8.109102] Data abort info: [ 8.109203] ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 [ 8.109399] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 [ 8.109614] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [ 8.109836] user pgtable: 4k pages, 48-bit VAs, pgdp=0000000101354000 [ 8.110011] [0000000000000004] pgd=0000000000000000, p4d=0000000000000000 [ 8.112624] Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP [ 8.112783] Modules linked in: [ 8.113120] CPU: 0 PID: 99 Comm: may_access_dire Not tainted 6.10.0-rc3-next-20240613-dirty #1 [ 8.113230] Hardware name: linux,dummy-virt (DT) [ 8.113390] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 8.113429] pc : may_access_direct_pkt_data+0x24/0xa0 [ 8.113746] lr : add_subprog_and_kfunc+0x634/0x8e8 [ 8.113798] sp : ffff80008283b9f0 [ 8.113813] x29: ffff80008283b9f0 x28: ffff800082795048 x27: 0000000000000001 [ 8.113881] x26: ffff0000c0bb2600 x25: 0000000000000000 x24: 0000000000000000 [ 8.113897] x23: ffff0000c1134000 x22: 000000000001864f x21: ffff0000c1138000 [ 8.113912] x20: 0000000000000001 x19: ffff0000c12b8000 x18: ffffffffffffffff [ 8.113929] x17: 0000000000000000 x16: 0000000000000000 x15: 0720072007200720 [ 8.113944] x14: 0720072007200720 x13: 0720072007200720 x12: 0720072007200720 [ 8.113958] x11: 0720072007200720 x10: 0000000000f9fca4 x9 : ffff80008021f4e4 [ 8.113991] x8 : 0101010101010101 x7 : 746f72705f6d656d x6 : 000000001e0e0f5f [ 8.114006] x5 : 000000000001864f x4 : ffff0000c12b8000 x3 : 000000000000001c [ 8.114020] x2 : 0000000000000002 x1 : 0000000000000000 x0 : 0000000000000000 [ 8.114126] Call trace: [ 8.114159] may_access_direct_pkt_data+0x24/0xa0 [ 8.114202] bpf_check+0x3bc/0x28c0 [ 8.114214] bpf_prog_load+0x658/0xa58 [ 8.114227] __sys_bpf+0xc50/0x2250 [ 8.114240] __arm64_sys_bpf+0x28/0x40 [ 8.114254] invoke_syscall.constprop.0+0x54/0xf0 [ 8.114273] do_el0_svc+0x4c/0xd8 [ 8.114289] el0_svc+0x3c/0x140 [ 8.114305] el0t_64_sync_handler+0x134/0x150 [ 8.114331] el0t_64_sync+0x168/0x170 [ 8.114477] Code: 7100707f 54000081 f9401c00 f9403800 (b9400403) [ 8.118672] ---[ end trace 0000000000000000 ]---
One way to fix it is by forcing attach_prog_fd non-empty when bpf_prog_load(). But this will lead to libbpf_probe_bpf_prog_type API broken which use verifier log to probe prog type and will log nothing if we reject invalid EXT prog before bpf_check().
Another way is by adding null check in resolve_prog_type().
The issue was introduced by commit 4a9c7bbe2ed4 ("bpf: Resolve to prog->aux->dst_prog->type only for BPF_PROG_TYPE_EXT") which wanted to correct type resolution for BPF_PROG_TYPE_TRACING programs. Before that, the type resolution of BPF_PROG_TYPE_EXT prog actually follows the logic below:
prog->aux->dst_prog ? prog->aux->dst_prog->type : prog->type;
It implies that when EXT program is not yet attached to dst_prog, the prog type should be EXT itself. This code worked fine in the past. So just keep using it.
Fix this by returning prog->type for BPF_PROG_TYPE_EXT if dst_prog is not present in resolve_prog_type().
--- include/linux/bpf_verifier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/bpf_verifier.h +1 -1
@@ -846,7 +846,7 @@ static inline u32 type_flag(u32 type)/* only use after check_attach_btf_id() */ static inline enum bpf_prog_type resolve_prog_type (const struct bpf_prog *prog) { -return prog->type ==BPF_PROG_TYPE_EXT ? +return (prog->type ==BPF_PROG_TYPE_EXT && prog->aux->dst_prog) ? prog->aux->dst_prog->type : prog->type; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 250/809 net: pse-pd: Do not return EOPNOSUPP if config is null
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kory Maincent <[email protected]>
[ Upstream commit 93c3a96c301f0b1ac0bafb5e74bef58e79937648 ]
For a PSE supporting both c33 and PoDL, setting config for one type of PoE leaves the other type's config null. Currently, this case returns EOPNOTSUPP, which is incorrect. Instead, we should do nothing if the configuration is empty.
--- drivers/net/pse-pd/pse_core.c | 4 ++-- net/ethtool/pse-pd.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/pse-pd/pse_core.c +2 -2
@@ -719,13 +719,13 @@ int pse_ethtool_set_config(struct pse_control *psec, {int err =0 ; -if (pse_has_c33 (psec)) { +if (pse_has_c33 (psec) && config->c33_admin_control) { err =pse_ethtool_c33_set_config (psec, config);if (err)return err; } -if (pse_has_podl (psec)) +if (pse_has_podl (psec) && config->podl_admin_control) err =pse_ethtool_podl_set_config (psec, config);return err;
net/ethtool/pse-pd.c +3 -1
@@ -183,7 +183,9 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info)if (pse_has_c33 (phydev->psec)) config.c33_admin_control =nla_get_u32 (tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL ]); -/* Return errno directly - PSE has no notification */ +/* Return errno directly - PSE has no notification +* pse_ethtool_set_config() will do nothing if the config is null +*/ return pse_ethtool_set_config (phydev->psec, info->extack, &config); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 251/809 net: ethtool: pse-pd: Fix possible null-deref
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kory Maincent <[email protected]>
[ Upstream commit 4cddb0f15ea9c62f81b4889ea69a99368cc63a86 ]
Fix a possible null dereference when a PSE supports both c33 and PoDL, but only one of the netlink attributes is specified. The c33 or PoDL PSE capabilities are already validated in the ethnl_set_pse_validate() call.
--- net/ethtool/pse-pd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ethtool/pse-pd.c +2 -2
@@ -178,9 +178,9 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info) phydev = dev->phydev;/* These values are already validated by the ethnl_pse_set_policy */ -if (pse_has_podl (phydev->psec)) +if (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL ]) config.podl_admin_control =nla_get_u32 (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL ]); -if (pse_has_c33 (phydev->psec)) +if (tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL ]) config.c33_admin_control =nla_get_u32 (tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL ]);/* Return errno directly - PSE has no notification
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 252/809 selftests: forwarding: devlink_lib: Wait for udev events after reloading
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amit Cohen <[email protected]>
[ Upstream commit f67a90a0c8f5b3d0acc18f10650d90fec44775f9 ]
Lately, an additional locking was added by commit c0a40097f0bc ("drivers: core: synchronize really_probe() and dev_uevent()"). The locking protects dev_uevent() calling. This function is used to send messages from the kernel to user space. Uevent messages notify user space about changes in device states, such as when a device is added, removed, or changed. These messages are used by udev (or other similar user-space tools) to apply device-specific rules.
After reloading devlink instance, udev events should be processed. This locking causes a short delay of udev events handling.
One example for useful udev rule is renaming ports. 'forwading.config' can be configured to use names after udev rules are applied. Some tests run devlink_reload() and immediately use the updated names. This worked before the above mentioned commit was pushed, but now the delay of uevent messages causes that devlink_reload() returns before udev events are handled and tests fail.
Adjust devlink_reload() to not assume that udev events are already processed when devlink reload is done, instead, wait for udev events to ensure they are processed before returning from the function.
Without this patch:
TESTS='rif_mac_profile' ./resource_scale.sh
TEST: 'rif_mac_profile' 4 [ OK ]
sysctl: cannot stat /proc/sys/net/ipv6/conf/swp1/disable_ipv6: No such file or directory
sysctl: cannot stat /proc/sys/net/ipv6/conf/swp1/disable_ipv6: No such file or directory
sysctl: cannot stat /proc/sys/net/ipv6/conf/swp2/disable_ipv6: No such file or directory
sysctl: cannot stat /proc/sys/net/ipv6/conf/swp2/disable_ipv6: No such file or directory Cannot find device "swp1"
Cannot find device "swp2"
TEST: setup_wait_dev (: Interface swp1 does not come up.) [FAIL]
With this patch:
$ TESTS='rif_mac_profile' ./resource_scale.sh TEST: 'rif_mac_profile' 4 [ OK ] TEST: 'rif_mac_profile' overflow 5 [ OK ]
This is relevant not only for this test.
--- tools/testing/selftests/net/forwarding/devlink_lib.sh | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/net/forwarding/devlink_lib.sh +2 -0
@@ -122,6 +122,8 @@ devlink_reload() still_pending=$(devlink resource show "$DEVLINK_DEV" | \ grep -c "size_new") check_err $still_pending "Failed reload - There are still unset sizes" + + udevadm settle } declare -A DEVLINK_ORIG
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 253/809 Bluetooth: hci_bcm4377: Use correct unit for timeouts
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Peter <[email protected]>
[ Upstream commit 56c695a823e4ee1e5294a8340d5afe5de73828ec ]
BCM4377_TIMEOUT is always used to wait for completitions and their API expects a timeout in jiffies instead of msecs.
--- drivers/bluetooth/hci_bcm4377.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/hci_bcm4377.c +1 -1
@@ -32,7 +32,7 @@ enum bcm4377_chip {#define BCM4378_DEVICE_ID 0x5f69#define BCM4387_DEVICE_ID 0x5f71 -#define BCM4377_TIMEOUT 1000 +#define BCM4377_TIMEOUT msecs_to_jiffies(1000)/* * These devices only support DMA transactions inside a 32bit window
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 254/809 Bluetooth: btintel: Refactor btintel_set_ppag()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kiran K <[email protected]>
[ Upstream commit 0a3e2eca1daa5627c8ecd1554e3146de82d61dd2 ]
Current flow iterates the ACPI table associated with Bluetooth controller looking for PPAG method. Method name can be directly passed to acpi_evaluate_object function instead of iterating the table.
--- drivers/bluetooth/btintel.c | 119 +++++++++++------------------------- 1 file changed, 34 insertions(+), 85 deletions(-)
drivers/bluetooth/btintel.c +34 -85
@@ -26,21 +26,11 @@#define ECDSA_OFFSET 644#define ECDSA_HEADER_LEN 320 -#define BTINTEL_PPAG_NAME "PPAG" -enum {DSM_SET_WDISABLE2_DELAY =1 ,DSM_SET_RESET_METHOD =3 , }; -/* structure to store the PPAG data read from ACPI table */ -struct btintel_ppag { -u32 domain; -u32 mode; -acpi_status status; -struct hci_dev *hdev; -}; -#define CMD_WRITE_BOOT_PARAMS 0xfc0estruct cmd_write_boot_params {__le32 boot_addr;
@@ -1324,65 +1314,6 @@ static int btintel_read_debug_features(struct hci_dev *hdev,return 0 ; } -static acpi_status btintel_ppag_callback (acpi_handle handle,u32 lvl,void *data, -void **ret) -{ -acpi_status status; -size_t len; -struct btintel_ppag *ppag = data; -union acpi_object *p, *elements; -struct acpi_buffer string = {ACPI_ALLOCATE_BUFFER ,NULL }; -struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL }; -struct hci_dev *hdev = ppag->hdev; - - status =acpi_get_name (handle,ACPI_FULL_PATHNAME , &string); -if (ACPI_FAILURE (status)) { -bt_dev_warn (hdev,"PPAG-BT: ACPI Failure: %s" ,acpi_format_exception (status)); -return status; - } - - len =strlen (string.pointer); -if (len <strlen (BTINTEL_PPAG_NAME )) { -kfree (string.pointer); -return AE_OK ; - } - -if (strncmp ((char *)string.pointer + len -4 ,BTINTEL_PPAG_NAME ,4 )) { -kfree (string.pointer); -return AE_OK ; - } -kfree (string.pointer); - - status =acpi_evaluate_object (handle,NULL ,NULL , &buffer); -if (ACPI_FAILURE (status)) { - ppag->status = status; -bt_dev_warn (hdev,"PPAG-BT: ACPI Failure: %s" ,acpi_format_exception (status)); -return status; - } - - p = buffer.pointer; - ppag = (struct btintel_ppag *)data; - -if (p->type !=ACPI_TYPE_PACKAGE || p->package.count !=2 ) { -kfree (buffer.pointer); -bt_dev_warn (hdev,"PPAG-BT: Invalid object type: %d or package count: %d" , - p->type, p->package.count); - ppag->status =AE_ERROR ; -return AE_ERROR ; - } - - elements = p->package.elements; - -/* PPAG table is located at element[1] */ - p = &elements[1 ]; - - ppag->domain = (u32 )p->package.elements[0 ].integer.value; - ppag->mode = (u32 )p->package.elements[1 ].integer.value; - ppag->status =AE_OK ; -kfree (buffer.pointer); -return AE_CTRL_TERMINATE ; -} -static int btintel_set_debug_features (struct hci_dev *hdev,const struct intel_debug_features *features) {
@@ -2427,10 +2358,13 @@ static int btintel_configure_offload(struct hci_dev *hdev)static void btintel_set_ppag (struct hci_dev *hdev,struct intel_version_tlv *ver) { -struct btintel_ppag ppag;struct sk_buff *skb;struct hci_ppag_enable_cmd ppag_cmd;acpi_handle handle; +struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL }; +union acpi_object *p, *elements; +u32 domain, mode; +acpi_status status;/* PPAG is not supported if CRF is HrP2, Jfp2, JfP1 */ switch (ver->cnvr_top &0xFFF ) {
@@ -2448,22 +2382,34 @@ static void btintel_set_ppag(struct hci_dev *hdev, struct intel_version_tlv *verreturn ; } -memset (&ppag,0 ,sizeof (ppag)); - - ppag.hdev = hdev; - ppag.status =AE_NOT_FOUND ; -acpi_walk_namespace (ACPI_TYPE_PACKAGE , handle,1 ,NULL , - btintel_ppag_callback, &ppag,NULL ); - -if (ACPI_FAILURE (ppag.status)) { -if (ppag.status ==AE_NOT_FOUND ) { + status =acpi_evaluate_object (handle,"PPAG" ,NULL , &buffer); +if (ACPI_FAILURE (status)) { +if (status ==AE_NOT_FOUND ) {bt_dev_dbg (hdev,"PPAG-BT: ACPI entry not found" );return ; } +bt_dev_warn (hdev,"PPAG-BT: ACPI Failure: %s" ,acpi_format_exception (status)); +return ; + } + + p = buffer.pointer; +if (p->type !=ACPI_TYPE_PACKAGE || p->package.count !=2 ) { +bt_dev_warn (hdev,"PPAG-BT: Invalid object type: %d or package count: %d" , + p->type, p->package.count); +kfree (buffer.pointer);return ; } -if (ppag.domain !=0x12 ) { + elements = p->package.elements; + +/* PPAG table is located at element[1] */ + p = &elements[1 ]; + + domain = (u32 )p->package.elements[0 ].integer.value; + mode = (u32 )p->package.elements[1 ].integer.value; +kfree (buffer.pointer); + +if (domain !=0x12 ) {bt_dev_dbg (hdev,"PPAG-BT: Bluetooth domain is disabled in ACPI firmware" );return ; }
@@ -2474,19 +2420,22 @@ static void btintel_set_ppag(struct hci_dev *hdev, struct intel_version_tlv *ver* BIT 1 : 0 Disabled in China * 1 Enabled in China */ -if ((ppag.mode &0x01 ) !=BIT (0 ) && (ppag.mode &0x02 ) !=BIT (1 )) { -bt_dev_dbg (hdev,"PPAG-BT: EU, China mode are disabled in CB/BIOS" ); + mode &=0x03 ; + +if (!mode) { +bt_dev_dbg (hdev,"PPAG-BT: EU, China mode are disabled in BIOS" );return ; } - ppag_cmd.ppag_enable_flags =cpu_to_le32 (ppag.mode); + ppag_cmd.ppag_enable_flags =cpu_to_le32 (mode); - skb =__hci_cmd_sync (hdev,INTEL_OP_PPAG_CMD ,sizeof (ppag_cmd), &ppag_cmd,HCI_CMD_TIMEOUT ); + skb =__hci_cmd_sync (hdev,INTEL_OP_PPAG_CMD ,sizeof (ppag_cmd), + &ppag_cmd,HCI_CMD_TIMEOUT );if (IS_ERR (skb)) {bt_dev_warn (hdev,"Failed to send PPAG Enable (%ld)" ,PTR_ERR (skb));return ; } -bt_dev_info (hdev,"PPAG-BT: Enabled (Mode %d)" , ppag.mode); +bt_dev_info (hdev,"PPAG-BT: Enabled (Mode %d)" , mode);kfree_skb (skb); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 255/809 Bluetooth: btintel_pcie: Fix irq leak
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kiran K <[email protected]>
[ Upstream commit 041677e7aad6f57020aa271aafd4cb9e2af1536f ]
Free irq before releasing irq vector.
--- drivers/bluetooth/btintel_pcie.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/bluetooth/btintel_pcie.c +6 -0
@@ -1327,6 +1327,12 @@ static void btintel_pcie_remove(struct pci_dev *pdev) data =pci_get_drvdata (pdev);btintel_pcie_reset_bt (data); +for (int i =0 ; i < data->alloc_vecs; i++) { +struct msix_entry *msix_entry; + + msix_entry = &data->msix_entries[i]; +free_irq (msix_entry->vector, msix_entry); + }pci_free_irq_vectors (pdev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 256/809 Bluetooth: btnxpuart: Add handling for boot-signature timeout errors
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neeraj Sanjay Kale <[email protected]>
[ Upstream commit 27489364299a2ddb5c54cd9f29a3f41bd8d151ab ]
This handles the timeout error codes sent by the chip as part of the bootloader signatures during firmware download process.
When the bootloader does not receive a response packet from the host within a specific time, it adds an error code to the bootloader signature while requesting for the FW chunk from the same offset.
The host is expected to clear this error code with a NAK, and reply to only those bootloader signatures which have error code 0.
However, the driver was ignoring this error code and replying with the firmware chunks instead, which is apparently ignored by the chip and the chip resends the same bootloader signature with the error code again. This happens in a loop until the error code self clears and firmware download proceeds ahead, adding a couple of milliseconds to the total firmware download time.
Commit 689ca16e5232 was an initial implementation which simply printed the following line during driver debug:
- FW Download received err 0x04 from chip
This commit adds the expected handling to the error codes.
This error handling is valid for data_req bootloader signatures for V3 and future bootloader versions.
--- drivers/bluetooth/btnxpuart.c | 52 ++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 4 deletions(-)
drivers/bluetooth/btnxpuart.c +48 -4
@@ -187,6 +187,11 @@ struct btnxpuart_dev {#define NXP_NAK_V3 0x7b#define NXP_CRC_ERROR_V3 0x7c +/* Bootloader signature error codes */ +#define NXP_ACK_RX_TIMEOUT 0x0002/* ACK not received from host */ +#define NXP_HDR_RX_TIMEOUT 0x0003/* FW Header chunk not received */ +#define NXP_DATA_RX_TIMEOUT 0x0004/* FW Data chunk not received */ +#define HDR_LEN 16#define NXP_RECV_CHIP_VER_V1 \
@@ -277,6 +282,17 @@ struct nxp_bootloader_cmd {__be32 crc; } __packed; +struct nxp_v3_rx_timeout_nak { +u8 nak; +__le32 offset; +u8 crc; +} __packed; + +union nxp_v3_rx_timeout_nak_u { +struct nxp_v3_rx_timeout_nak pkt; +u8 buf[6 ]; +}; +static u8 crc8_table[CRC8_TABLE_SIZE ];/* Default configurations */
@@ -899,6 +915,32 @@ static int nxp_recv_chip_ver_v3(struct hci_dev *hdev, struct sk_buff *skb)return 0 ; } +static void nxp_handle_fw_download_error (struct hci_dev *hdev,struct v3_data_req *req) +{ +struct btnxpuart_dev *nxpdev =hci_get_drvdata (hdev); +__u32 offset =__le32_to_cpu (req->offset); +__u16 err =__le16_to_cpu (req->error); +union nxp_v3_rx_timeout_nak_u nak_tx_buf; + +switch (err) { +case NXP_ACK_RX_TIMEOUT : +case NXP_HDR_RX_TIMEOUT : +case NXP_DATA_RX_TIMEOUT : + nak_tx_buf.pkt.nak =NXP_NAK_V3 ; + nak_tx_buf.pkt.offset =__cpu_to_le32 (offset); + nak_tx_buf.pkt.crc =crc8 (crc8_table, nak_tx_buf.buf, +sizeof (nak_tx_buf) -1 ,0xff ); +serdev_device_write_buf (nxpdev->serdev, nak_tx_buf.buf, +sizeof (nak_tx_buf)); +break ; +default : +bt_dev_dbg (hdev,"Unknown bootloader error code: %d" , err); +break ; + + } + +} +static int nxp_recv_fw_req_v3 (struct hci_dev *hdev,struct sk_buff *skb) {struct btnxpuart_dev *nxpdev =hci_get_drvdata (hdev);
@@ -913,7 +955,12 @@ static int nxp_recv_fw_req_v3(struct hci_dev *hdev, struct sk_buff *skb)if (!req || !nxpdev->fw) goto free_skb; -nxp_send_ack (NXP_ACK_V3 , hdev); +if (!req->error) { +nxp_send_ack (NXP_ACK_V3 , hdev); + }else { +nxp_handle_fw_download_error (hdev, req); + goto free_skb; + } len =__le16_to_cpu (req->len);
@@ -940,9 +987,6 @@ static int nxp_recv_fw_req_v3(struct hci_dev *hdev, struct sk_buff *skb)wake_up_interruptible (&nxpdev->fw_dnld_done_wait_q); goto free_skb; } -if (req->error) -bt_dev_dbg (hdev,"FW Download received err 0x%02x from chip" , - req->error); offset =__le32_to_cpu (req->offset);if (offset < nxpdev->fw_v3_offset_correction) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 257/809 Bluetooth: hci_event: Set QoS encryption from BIGInfo report
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Iulia Tanasescu <[email protected]>
[ Upstream commit 5a820b13db3988122080f8de2920721f770c37a0 ]
On a Broadcast Sink, after synchronizing to the PA transimitted by a Broadcast Source, the BIGInfo advertising reports emitted by the Controller hold the encryption field, which indicates whether the Broadcast Source is transmitting encrypted streams.
This updates the PA sync hcon QoS with the encryption value reported in the BIGInfo report, so that this information is accurate if the userspace tries to access the QoS struct via getsockopt.
--- net/bluetooth/hci_event.c | 2 ++ 1 file changed, 2 insertions(+)
net/bluetooth/hci_event.c +2 -0
@@ -6988,6 +6988,8 @@ static void hci_le_big_info_adv_report_evt(struct hci_dev *hdev, void *data,if (!pa_sync) goto unlock; + pa_sync->iso_qos.bcast.encryption = ev->encryption; +/* Notify iso layer */ hci_connect_cfm (pa_sync,0 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 258/809 Bluetooth: hci_core, hci_sync: cleanup struct discovery_state
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
[ Upstream commit da63f331353c9e1e6dc29e49e28f8f4fe5d642fd ]
After commit 78db544b5d27 ("Bluetooth: hci_core: Remove le_restart_scan work"), 'scan_start' and 'scan_duration' of 'struct discovery_state' are still initialized but actually unused. So remove the aforementioned fields and adjust 'hci_discovery_filter_clear()' and 'le_scan_disable()' accordingly. Compile tested only.
--- include/net/bluetooth/hci_core.h | 4 ---- net/bluetooth/hci_sync.c | 2 -- 2 files changed, 6 deletions(-)
include/net/bluetooth/hci_core.h +0 -4
@@ -91,8 +91,6 @@ struct discovery_state {s8 rssi;u16 uuid_count;u8 (*uuids)[16 ]; -unsigned long scan_start; -unsigned long scan_duration;unsigned long name_resolve_timeout; };
@@ -890,8 +888,6 @@ static inline void hci_discovery_filter_clear(struct hci_dev *hdev) hdev->discovery.uuid_count =0 ;kfree (hdev->discovery.uuids); hdev->discovery.uuids =NULL ; - hdev->discovery.scan_start =0 ; - hdev->discovery.scan_duration =0 ; }bool hci_discovery_active (struct hci_dev *hdev);
net/bluetooth/hci_sync.c +0 -2
@@ -371,8 +371,6 @@ static void le_scan_disable(struct work_struct *work) goto _return; } - hdev->discovery.scan_start =0 ; -/* If we were running LE only scan, change discovery state. If * we were running both LE and BR/EDR inquiry simultaneously, * and BR/EDR inquiry is already finished, stop discovery,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 259/809 virtio_net: add support for Byte Queue Limits
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Pirko <[email protected]>
[ Upstream commit c8bd1f7f3e61fc6c562c806045f3ccd2cc819c01 ]
Add support for Byte Queue Limits (BQL).
Tested on qemu emulated virtio_net device with 1, 2 and 4 queues. Tested with fq_codel and pfifo_fast. Super netperf with 50 threads is running in background. Netperf TCP_RR results:
NOBQL FQC 1q: 159.56 159.33 158.50 154.31 agv: 157.925 NOBQL FQC 2q: 184.64 184.96 174.73 174.15 agv: 179.62 NOBQL FQC 4q: 994.46 441.96 416.50 499.56 agv: 588.12 NOBQL PFF 1q: 148.68 148.92 145.95 149.48 agv: 148.2575 NOBQL PFF 2q: 171.86 171.20 170.42 169.42 agv: 170.725 NOBQL PFF 4q: 1505.23 1137.23 2488.70 3507.99 agv: 2159.7875 BQL FQC 1q: 1332.80 1297.97 1351.41 1147.57 agv: 1282.4375 BQL FQC 2q: 768.30 817.72 864.43 974.40 agv: 856.2125 BQL FQC 4q: 945.66 942.68 878.51 822.82 agv: 897.4175 BQL PFF 1q: 149.69 151.49 149.40 147.47 agv: 149.5125 BQL PFF 2q: 2059.32 798.74 1844.12 381.80 agv: 1270.995 BQL PFF 4q: 1871.98 4420.02 4916.59 13268.16 agv: 6119.1875
Stable-dep-of: f8321fa75102 ("virtio_net: Fix napi_skb_cache_put warning")
--- drivers/net/virtio_net.c | 81 ++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 24 deletions(-)
drivers/net/virtio_net.c +57 -24
@@ -47,7 +47,8 @@ module_param(napi_tx, bool, 0644);#define VIRTIO_XDP_TX BIT(0)#define VIRTIO_XDP_REDIR BIT(1) -#define VIRTIO_XDP_FLAG BIT(0) +#define VIRTIO_XDP_FLAG BIT(0) +#define VIRTIO_ORPHAN_FLAG BIT(1)/* RX packet size EWMA. The average packet size is used to determine the packet * buffer size when refilling RX rings. As the entire RX ring may be refilled
@@ -85,6 +86,8 @@ struct virtnet_stat_desc {struct virtnet_sq_free_stats {u64 packets;u64 bytes; +u64 napi_packets; +u64 napi_bytes; };struct virtnet_sq_stats {
@@ -506,29 +509,50 @@ static struct xdp_frame *ptr_to_xdp(void *ptr)return (struct xdp_frame *)((unsigned long )ptr & ~VIRTIO_XDP_FLAG ); } -static void __free_old_xmit (struct send_queue *sq,bool in_napi, -struct virtnet_sq_free_stats *stats) +static bool is_orphan_skb (void *ptr) +{ +return (unsigned long )ptr &VIRTIO_ORPHAN_FLAG ; +} + +static void *skb_to_ptr (struct sk_buff *skb,bool orphan) +{ +return (void *)((unsigned long )skb | (orphan ?VIRTIO_ORPHAN_FLAG :0 )); +} + +static struct sk_buff *ptr_to_skb (void *ptr) +{ +return (struct sk_buff *)((unsigned long )ptr & ~VIRTIO_ORPHAN_FLAG ); +} + +static void __free_old_xmit (struct send_queue *sq,struct netdev_queue *txq, +bool in_napi,struct virtnet_sq_free_stats *stats) {unsigned int len;void *ptr;while ((ptr =virtqueue_get_buf (sq->vq, &len)) !=NULL ) { - ++stats->packets; -if (!is_xdp_frame (ptr)) { -struct sk_buff *skb = ptr; +struct sk_buff *skb =ptr_to_skb (ptr);pr_debug ("Sent skb %p\n" , skb); - stats->bytes += skb->len; +if (is_orphan_skb (ptr)) { + stats->packets++; + stats->bytes += skb->len; + }else { + stats->napi_packets++; + stats->napi_bytes += skb->len; + }napi_consume_skb (skb, in_napi); }else {struct xdp_frame *frame =ptr_to_xdp (ptr); + stats->packets++; stats->bytes +=xdp_get_frame_len (frame);xdp_return_frame (frame); } } +netdev_tx_completed_queue (txq, stats->napi_packets, stats->napi_bytes); }/* Converting between virtqueue no. and kernel tx/rx queue no.
@@ -955,21 +979,22 @@ static void virtnet_rq_unmap_free_buf(struct virtqueue *vq, void *buf)virtnet_rq_free_buf (vi, rq, buf); } -static void free_old_xmit (struct send_queue *sq,bool in_napi) +static void free_old_xmit (struct send_queue *sq,struct netdev_queue *txq, +bool in_napi) {struct virtnet_sq_free_stats stats = {0 }; -__free_old_xmit (sq, in_napi, &stats); +__free_old_xmit (sq, txq, in_napi, &stats);/* Avoid overhead when no packets have been processed * happens when called speculatively from start_xmit. */ -if (!stats.packets) +if (!stats.packets && !stats.napi_packets)return ;u64_stats_update_begin (&sq->stats.syncp); -u64_stats_add (&sq->stats.bytes, stats.bytes); -u64_stats_add (&sq->stats.packets, stats.packets); +u64_stats_add (&sq->stats.bytes, stats.bytes + stats.napi_bytes); +u64_stats_add (&sq->stats.packets, stats.packets + stats.napi_packets);u64_stats_update_end (&sq->stats.syncp); }
@@ -1003,7 +1028,9 @@ static void check_sq_full_and_disable(struct virtnet_info *vi,* early means 16 slots are typically wasted. */ if (sq->vq->num_free <2 +MAX_SKB_FRAGS ) { -netif_stop_subqueue (dev, qnum); +struct netdev_queue *txq =netdev_get_tx_queue (dev, qnum); + +netif_tx_stop_queue (txq);u64_stats_update_begin (&sq->stats.syncp);u64_stats_inc (&sq->stats.stop);u64_stats_update_end (&sq->stats.syncp);
@@ -1012,7 +1039,7 @@ static void check_sq_full_and_disable(struct virtnet_info *vi,virtqueue_napi_schedule (&sq->napi, sq->vq); }else if (unlikely (!virtqueue_enable_cb_delayed (sq->vq))) {/* More just got used, free them then recheck. */ -free_old_xmit (sq, false); +free_old_xmit (sq, txq, false);if (sq->vq->num_free >=2 +MAX_SKB_FRAGS ) {netif_start_subqueue (dev, qnum);u64_stats_update_begin (&sq->stats.syncp);
@@ -1138,7 +1165,8 @@ static int virtnet_xdp_xmit(struct net_device *dev, }/* Free up any pending old buffers before queueing new ones. */ -__free_old_xmit (sq, false, &stats); +__free_old_xmit (sq,netdev_get_tx_queue (dev, sq - vi->sq), + false, &stats);for (i =0 ; i < n; i++) {struct xdp_frame *xdpf = frames[i];
@@ -2331,7 +2359,7 @@ static void virtnet_poll_cleantx(struct receive_queue *rq)do {virtqueue_disable_cb (sq->vq); -free_old_xmit (sq, true); +free_old_xmit (sq, txq, true); }while (unlikely (!virtqueue_enable_cb_delayed (sq->vq)));if (sq->vq->num_free >=2 +MAX_SKB_FRAGS ) {
@@ -2430,6 +2458,7 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index) goto err_xdp_reg_mem_model;virtnet_napi_enable (vi->rq[qp_index].vq, &vi->rq[qp_index].napi); +netdev_tx_reset_queue (netdev_get_tx_queue (vi->dev, qp_index));virtnet_napi_tx_enable (vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi);return 0 ;
@@ -2489,7 +2518,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) txq =netdev_get_tx_queue (vi->dev, index);__netif_tx_lock (txq,raw_smp_processor_id ());virtqueue_disable_cb (sq->vq); -free_old_xmit (sq, true); +free_old_xmit (sq, txq, true);if (sq->vq->num_free >=2 +MAX_SKB_FRAGS ) {if (netif_tx_queue_stopped (txq)) {
@@ -2523,7 +2552,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget)return 0 ; } -static int xmit_skb (struct send_queue *sq,struct sk_buff *skb) +static int xmit_skb (struct send_queue *sq,struct sk_buff *skb,bool orphan) {struct virtio_net_hdr_mrg_rxbuf *hdr;const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;
@@ -2567,7 +2596,8 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)return num_sg; num_sg++; } -return virtqueue_add_outbuf (sq->vq, sq->sg, num_sg, skb,GFP_ATOMIC ); +return virtqueue_add_outbuf (sq->vq, sq->sg, num_sg, +skb_to_ptr (skb, orphan),GFP_ATOMIC ); }static netdev_tx_t start_xmit (struct sk_buff *skb,struct net_device *dev)
@@ -2577,24 +2607,25 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)struct send_queue *sq = &vi->sq[qnum];int err;struct netdev_queue *txq =netdev_get_tx_queue (dev, qnum); -bool kick = !netdev_xmit_more (); +bool xmit_more =netdev_xmit_more ();bool use_napi = sq->napi.weight; +bool kick;/* Free up any pending old buffers before queueing new ones. */ do {if (use_napi)virtqueue_disable_cb (sq->vq); -free_old_xmit (sq, false); +free_old_xmit (sq, txq, false); - }while (use_napi && kick && + }while (use_napi && !xmit_more &&unlikely (!virtqueue_enable_cb_delayed (sq->vq)));/* timestamp packet in software */ skb_tx_timestamp (skb);/* Try to transmit */ - err =xmit_skb (sq, skb); + err =xmit_skb (sq, skb, !use_napi);/* This should not happen! */ if (unlikely (err)) {
@@ -2616,7 +2647,9 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)check_sq_full_and_disable (vi, dev, sq); -if (kick ||netif_xmit_stopped (txq)) { + kick = use_napi ?__netdev_tx_sent_queue (txq, skb->len, xmit_more) : + !xmit_more ||netif_xmit_stopped (txq); +if (kick) {if (virtqueue_kick_prepare (sq->vq) &&virtqueue_notify (sq->vq)) {u64_stats_update_begin (&sq->stats.syncp);u64_stats_inc (&sq->stats.kicks);
Signature · 1 line
2.43.0
Michael S. Tsirkin
maintainerRe: [PATCH 6.10 259/809] virtio_net: add support for Byte Queue Limits
Quoted 1 line · Greg Kroah-Hartman
6.10-stable review patch. If anyone has any objections, please let me know.
Wow.
It's clearly a feature, not a bugfix. And a risky one, at that.
Applies to any stable tree.
Quoted 264 lines
------------------
From: Jiri Pirko <[email protected]>
[ Upstream commit
c8bd1f7f3e61fc6c562c806045f3ccd2cc819c01]Add support for Byte Queue Limits (BQL).
Tested on qemu emulated
virtio_netdevice with 1, 2 and 4 queues. Tested withfq_codelandpfifo_fast. Super netperf with 50 threads is running in background. NetperfTCP_RRresults:NOBQL FQC 1q: 159.56 159.33 158.50 154.31 agv: 157.925 NOBQL FQC 2q: 184.64 184.96 174.73 174.15 agv: 179.62 NOBQL FQC 4q: 994.46 441.96 416.50 499.56 agv: 588.12 NOBQL PFF 1q: 148.68 148.92 145.95 149.48 agv: 148.2575 NOBQL PFF 2q: 171.86 171.20 170.42 169.42 agv: 170.725 NOBQL PFF 4q: 1505.23 1137.23 2488.70 3507.99 agv: 2159.7875 BQL FQC 1q: 1332.80 1297.97 1351.41 1147.57 agv: 1282.4375 BQL FQC 2q: 768.30 817.72 864.43 974.40 agv: 856.2125 BQL FQC 4q: 945.66 942.68 878.51 822.82 agv: 897.4175 BQL PFF 1q: 149.69 151.49 149.40 147.47 agv: 149.5125 BQL PFF 2q: 2059.32 798.74 1844.12 381.80 agv: 1270.995 BQL PFF 4q: 1871.98 4420.02 4916.59 13268.16 agv: 6119.1875Signed-off-by Jiri Pirko <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Stable-dep-of:
f8321fa75102("virtio_net: Fixnapi_skb_cache_putwarning")Signed-off-by Sasha Levin <[email protected]>--- drivers/net/virtio_net.c | 81 ++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 24 deletions(-)drivers/net/virtio_net.c +57
-24@@ -47,7 +47,8 @@ module_param(napi_tx, bool, 0644);#define VIRTIO_XDP_TX BIT(0)#define VIRTIO_XDP_REDIR BIT(1) -#define VIRTIO_XDP_FLAG BIT(0) +#define VIRTIO_XDP_FLAG BIT(0) +#define VIRTIO_ORPHAN_FLAG BIT(1)/* RX packet size EWMA. The average packet size is used to determine the packet * buffer size when refilling RX rings. As the entire RX ring may be refilled @@ -85,6 +86,8 @@ struct virtnet_stat_desc {struct virtnet_sq_free_stats {u64 packets;u64 bytes; +u64 napi_packets; +u64 napi_bytes; };struct virtnet_sq_stats {@@ -506,29 +509,50 @@ static struct xdp_frame *ptr_to_xdp(void *ptr)return (struct xdp_frame *)((unsigned long )ptr & ~VIRTIO_XDP_FLAG ); } -static void __free_old_xmit (struct send_queue *sq,bool in_napi, -struct virtnet_sq_free_stats *stats) +static bool is_orphan_skb (void *ptr) +{ +return (unsigned long )ptr &VIRTIO_ORPHAN_FLAG ; +} + +static void *skb_to_ptr (struct sk_buff *skb,bool orphan) +{ +return (void *)((unsigned long )skb | (orphan ?VIRTIO_ORPHAN_FLAG :0 )); +} + +static struct sk_buff *ptr_to_skb (void *ptr) +{ +return (struct sk_buff *)((unsigned long )ptr & ~VIRTIO_ORPHAN_FLAG ); +} + +static void __free_old_xmit (struct send_queue *sq,struct netdev_queue *txq, +bool in_napi,struct virtnet_sq_free_stats *stats) {unsigned int len;void *ptr;while ((ptr =virtqueue_get_buf (sq->vq, &len)) !=NULL ) { - ++stats->packets; -if (!is_xdp_frame (ptr)) { -struct sk_buff *skb = ptr; +struct sk_buff *skb =ptr_to_skb (ptr);pr_debug ("Sent skb %p\n" , skb); - stats->bytes += skb->len; +if (is_orphan_skb (ptr)) { + stats->packets++; + stats->bytes += skb->len; + }else { + stats->napi_packets++; + stats->napi_bytes += skb->len; + }napi_consume_skb (skb, in_napi); }else {struct xdp_frame *frame =ptr_to_xdp (ptr); + stats->packets++; stats->bytes +=xdp_get_frame_len (frame);xdp_return_frame (frame); } } +netdev_tx_completed_queue (txq, stats->napi_packets, stats->napi_bytes); }/* Converting between virtqueue no. and kernel tx/rx queue no. @@ -955,21 +979,22 @@ static void virtnet_rq_unmap_free_buf(struct virtqueue *vq, void *buf)virtnet_rq_free_buf (vi, rq, buf); } -static void free_old_xmit (struct send_queue *sq,bool in_napi) +static void free_old_xmit (struct send_queue *sq,struct netdev_queue *txq, +bool in_napi) {struct virtnet_sq_free_stats stats = {0 }; -__free_old_xmit (sq, in_napi, &stats); +__free_old_xmit (sq, txq, in_napi, &stats);/* Avoid overhead when no packets have been processed * happens when called speculatively from start_xmit. */ -if (!stats.packets) +if (!stats.packets && !stats.napi_packets)return ;u64_stats_update_begin (&sq->stats.syncp); -u64_stats_add (&sq->stats.bytes, stats.bytes); -u64_stats_add (&sq->stats.packets, stats.packets); +u64_stats_add (&sq->stats.bytes, stats.bytes + stats.napi_bytes); +u64_stats_add (&sq->stats.packets, stats.packets + stats.napi_packets);u64_stats_update_end (&sq->stats.syncp); }@@ -1003,7 +1028,9 @@ static void check_sq_full_and_disable(struct virtnet_info *vi,* early means 16 slots are typically wasted. */ if (sq->vq->num_free <2 +MAX_SKB_FRAGS ) { -netif_stop_subqueue (dev, qnum); +struct netdev_queue *txq =netdev_get_tx_queue (dev, qnum); + +netif_tx_stop_queue (txq);u64_stats_update_begin (&sq->stats.syncp);u64_stats_inc (&sq->stats.stop);u64_stats_update_end (&sq->stats.syncp);@@ -1012,7 +1039,7 @@ static void check_sq_full_and_disable(struct virtnet_info *vi,virtqueue_napi_schedule (&sq->napi, sq->vq); }else if (unlikely (!virtqueue_enable_cb_delayed (sq->vq))) {/* More just got used, free them then recheck. */ -free_old_xmit (sq, false); +free_old_xmit (sq, txq, false);if (sq->vq->num_free >=2 +MAX_SKB_FRAGS ) {netif_start_subqueue (dev, qnum);u64_stats_update_begin (&sq->stats.syncp);@@ -1138,7 +1165,8 @@ static int virtnet_xdp_xmit(struct net_device *dev, }/* Free up any pending old buffers before queueing new ones. */ -__free_old_xmit (sq, false, &stats); +__free_old_xmit (sq,netdev_get_tx_queue (dev, sq - vi->sq), + false, &stats);for (i =0 ; i < n; i++) {struct xdp_frame *xdpf = frames[i];@@ -2331,7 +2359,7 @@ static void virtnet_poll_cleantx(struct receive_queue *rq)do {virtqueue_disable_cb (sq->vq); -free_old_xmit (sq, true); +free_old_xmit (sq, txq, true); }while (unlikely (!virtqueue_enable_cb_delayed (sq->vq)));if (sq->vq->num_free >=2 +MAX_SKB_FRAGS ) {@@ -2430,6 +2458,7 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index) goto err_xdp_reg_mem_model;virtnet_napi_enable (vi->rq[qp_index].vq, &vi->rq[qp_index].napi); +netdev_tx_reset_queue (netdev_get_tx_queue (vi->dev, qp_index));virtnet_napi_tx_enable (vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi);return 0 ;@@ -2489,7 +2518,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) txq =netdev_get_tx_queue (vi->dev, index);__netif_tx_lock (txq,raw_smp_processor_id ());virtqueue_disable_cb (sq->vq); -free_old_xmit (sq, true); +free_old_xmit (sq, txq, true);if (sq->vq->num_free >=2 +MAX_SKB_FRAGS ) {if (netif_tx_queue_stopped (txq)) {@@ -2523,7 +2552,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget)return 0 ; } -static int xmit_skb (struct send_queue *sq,struct sk_buff *skb) +static int xmit_skb (struct send_queue *sq,struct sk_buff *skb,bool orphan) {struct virtio_net_hdr_mrg_rxbuf *hdr;const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;@@ -2567,7 +2596,8 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)return num_sg; num_sg++; } -return virtqueue_add_outbuf (sq->vq, sq->sg, num_sg, skb,GFP_ATOMIC ); +return virtqueue_add_outbuf (sq->vq, sq->sg, num_sg, +skb_to_ptr (skb, orphan),GFP_ATOMIC ); }static netdev_tx_t start_xmit (struct sk_buff *skb,struct net_device *dev)@@ -2577,24 +2607,25 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)struct send_queue *sq = &vi->sq[qnum];int err;struct netdev_queue *txq =netdev_get_tx_queue (dev, qnum); -bool kick = !netdev_xmit_more (); +bool xmit_more =netdev_xmit_more ();bool use_napi = sq->napi.weight; +bool kick;/* Free up any pending old buffers before queueing new ones. */ do {if (use_napi)virtqueue_disable_cb (sq->vq); -free_old_xmit (sq, false); +free_old_xmit (sq, txq, false); - }while (use_napi && kick && + }while (use_napi && !xmit_more &&unlikely (!virtqueue_enable_cb_delayed (sq->vq)));/* timestamp packet in software */ skb_tx_timestamp (skb);/* Try to transmit */ - err =xmit_skb (sq, skb); + err =xmit_skb (sq, skb, !use_napi);/* This should not happen! */ if (unlikely (err)) {@@ -2616,7 +2647,9 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)check_sq_full_and_disable (vi, dev, sq); -if (kick ||netif_xmit_stopped (txq)) { + kick = use_napi ?__netdev_tx_sent_queue (txq, skb->len, xmit_more) : + !xmit_more ||netif_xmit_stopped (txq); +if (kick) {if (virtqueue_kick_prepare (sq->vq) &&virtqueue_notify (sq->vq)) {u64_stats_update_begin (&sq->stats.syncp);u64_stats_inc (&sq->stats.kicks);Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerRe: [PATCH 6.10 259/809] virtio_net: add support for Byte Queue Limits
Quoted 8 lines · Michael S. Tsirkin
Quoted 1 line · Greg Kroah-Hartman
6.10-stable review patch. If anyone has any objections, please let me know.
Wow.
It's clearly a feature, not a bugfix. And a risky one, at that.
Applies to any stable tree.
Now dropped, thanks.
greg k-h
Re: [PATCH 6.10 259/809] virtio_net: add support for Byte Queue Limits
Quoted 11 lines · Wed, Jul 31, 2024 at 07:46:26AM CEST, [email protected] wrote:
Quoted 8 lines · Michael S. Tsirkin
Quoted 1 line · Greg Kroah-Hartman
6.10-stable review patch. If anyone has any objections, please let me know.
Wow.
It's clearly a feature, not a bugfix. And a risky one, at that.
Applies to any stable tree.
Now dropped, thanks.
I wonder, how this got into the stable queue?
Quoted 2 lines
greg k-h
Greg Kroah-Hartman
maintainerRe: [PATCH 6.10 259/809] virtio_net: add support for Byte Queue Limits
Quoted 7 lines · Jiri Pirko
Quoted 6 lines · Wed, Jul 31, 2024 at 07:46:26AM CEST, [email protected] wrote:
Quoted 5 lines · Michael S. Tsirkin
Quoted 1 line · Greg Kroah-Hartman
6.10-stable review patch. If anyone has any objections, please let me know.
Wow.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
It's clearly a feature, not a bugfix. And a risky one, at that.
Applies to any stable tree.
Now dropped, thanks.
I wonder, how this got into the stable queue?
Stable-dep-of: f8321fa75102 ("virtio_net: Fix napi_skb_cache_put warning")
Michael S. Tsirkin
maintainerRe: [PATCH 6.10 259/809] virtio_net: add support for Byte Queue Limits
Quoted 10 lines · Greg Kroah-Hartman
Quoted 9 lines · Jiri Pirko
Quoted 8 lines · Wed, Jul 31, 2024 at 07:46:26AM CEST, [email protected] wrote:
Quoted 7 lines · Michael S. Tsirkin
Quoted 1 line · Greg Kroah-Hartman
6.10-stable review patch. If anyone has any objections, please let me know.
Wow.
It's clearly a feature, not a bugfix. And a risky one, at that.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Applies to any stable tree.
Now dropped, thanks.
I wonder, how this got into the stable queue?
Stable-dep-of:
f8321fa75102("virtio_net: Fixnapi_skb_cache_putwarning")
Well, hmm. Something to fix in the auto-backport machinery then.
Signature · 1 line
MST
Greg Kroah-Hartman
maintainerPATCH 260/809 virtio_net: Fix napi_skb_cache_put warning
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit f8321fa75102246d7415a6af441872f6637c93ab ]
After the commit bdacf3e34945 ("net: Use nested-BH locking for napi_alloc_cache.") was merged, the following warning began to appear:
WARNING: CPU: 5 PID: 1 at net/core/skbuff.c:1451 napi_skb_cache_put+0x82/0x4b0 __warn+0x12f/0x340 napi_skb_cache_put+0x82/0x4b0 napi_skb_cache_put+0x82/0x4b0 report_bug+0x165/0x370 handle_bug+0x3d/0x80 exc_invalid_op+0x1a/0x50 asm_exc_invalid_op+0x1a/0x20 __free_old_xmit+0x1c8/0x510 napi_skb_cache_put+0x82/0x4b0 __free_old_xmit+0x1c8/0x510 __free_old_xmit+0x1c8/0x510 __pfx___free_old_xmit+0x10/0x10
The issue arises because virtio is assuming it's running in NAPI context even when it's not, such as in the netpoll case.
To resolve this, modify virtnet_poll_tx() to only set NAPI when budget is available. Same for virtnet_poll_cleantx(), which always assumed that it was in a NAPI context.
--- drivers/net/virtio_net.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/virtio_net.c +4 -4
@@ -2341,7 +2341,7 @@ static int virtnet_receive(struct receive_queue *rq, int budget,return packets; } -static void virtnet_poll_cleantx (struct receive_queue *rq) +static void virtnet_poll_cleantx (struct receive_queue *rq,int budget) {struct virtnet_info *vi = rq->vq->vdev->priv;unsigned int index =vq2rxq (rq->vq);
@@ -2359,7 +2359,7 @@ static void virtnet_poll_cleantx(struct receive_queue *rq)do {virtqueue_disable_cb (sq->vq); -free_old_xmit (sq, txq, true); +free_old_xmit (sq, txq, !!budget); }while (unlikely (!virtqueue_enable_cb_delayed (sq->vq)));if (sq->vq->num_free >=2 +MAX_SKB_FRAGS ) {
@@ -2403,7 +2403,7 @@ static int virtnet_poll(struct napi_struct *napi, int budget)unsigned int xdp_xmit =0 ;bool napi_complete; -virtnet_poll_cleantx (rq); +virtnet_poll_cleantx (rq, budget); received =virtnet_receive (rq, budget, &xdp_xmit); rq->packets_in_napi += received;
@@ -2518,7 +2518,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget) txq =netdev_get_tx_queue (vi->dev, index);__netif_tx_lock (txq,raw_smp_processor_id ());virtqueue_disable_cb (sq->vq); -free_old_xmit (sq, txq, true); +free_old_xmit (sq, txq, !!budget);if (sq->vq->num_free >=2 +MAX_SKB_FRAGS ) {if (netif_tx_queue_stopped (txq)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 261/809 xdp: fix invalid wait context of page_pool_destroy()
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taehee Yoo <[email protected]>
[ Upstream commit 59a931c5b732ca5fc2ca727f5a72aeabaafa85ec ]
If the driver uses a page pool, it creates a page pool with page_pool_create().
The reference count of page pool is 1 as default.
A page pool will be destroyed only when a reference count reaches 0. page_pool_destroy() is used to destroy page pool, it decreases a reference count.
When a page pool is destroyed, ->disconnect() is called, which is mem_allocator_disconnect().
This function internally acquires mutex_lock().
If the driver uses XDP, it registers a memory model with xdp_rxq_info_reg_mem_model().
The xdp_rxq_info_reg_mem_model() internally increases a page pool reference count if a memory model is a page pool.
Now the reference count is 2.
To destroy a page pool, the driver should call both page_pool_destroy() and xdp_unreg_mem_model().
The xdp_unreg_mem_model() internally calls page_pool_destroy(). Only page_pool_destroy() decreases a reference count.
If a driver calls page_pool_destroy() then xdp_unreg_mem_model(), we will face an invalid wait context warning.
Because xdp_unreg_mem_model() calls page_pool_destroy() with rcu_read_lock().
The page_pool_destroy() internally acquires mutex_lock().
Splat looks like:
=============================
[ BUG: Invalid wait context ]
6.10.0-rc6+ #4 Tainted: G W
-----------------------------
ethtool/1806 is trying to lock:ffffffff90387b90 (mem_id_lock){+.+.}-{4:4}, at: mem_allocator_disconnect+0x73/0x150 other info that might help us debug this:
context-{5:5}
3 locks held by ethtool/1806:
stack backtrace: CPU: 0 PID: 1806 Comm: ethtool Tainted: G W 6.10.0-rc6+ #4 f916f41f172891c800f2fed Hardware name: ASUS System Product Name/PRIME Z690-P D4, BIOS 0603 11/01/2021 Call Trace: <TASK> dump_stack_lvl+0x7e/0xc0 __lock_acquire+0x1681/0x4de0 ? _printk+0x64/0xe0 ? __pfx_mark_lock.part.0+0x10/0x10 ? __pfx___lock_acquire+0x10/0x10 lock_acquire+0x1b3/0x580 ? mem_allocator_disconnect+0x73/0x150 ? __wake_up_klogd.part.0+0x16/0xc0 ? __pfx_lock_acquire+0x10/0x10 ? dump_stack_lvl+0x91/0xc0 __mutex_lock+0x15c/0x1690 ? mem_allocator_disconnect+0x73/0x150 ? __pfx_prb_read_valid+0x10/0x10 ? mem_allocator_disconnect+0x73/0x150 ? __pfx_llist_add_batch+0x10/0x10 ? console_unlock+0x193/0x1b0 ? lockdep_hardirqs_on+0xbe/0x140 ? __pfx___mutex_lock+0x10/0x10 ? tick_nohz_tick_stopped+0x16/0x90 ? __irq_work_queue_local+0x1e5/0x330 ? irq_work_queue+0x39/0x50 ? __wake_up_klogd.part.0+0x79/0xc0 ? mem_allocator_disconnect+0x73/0x150 mem_allocator_disconnect+0x73/0x150 ? __pfx_mem_allocator_disconnect+0x10/0x10 ? mark_held_locks+0xa5/0xf0 ? rcu_is_watching+0x11/0xb0 page_pool_release+0x36e/0x6d0 page_pool_destroy+0xd7/0x440 xdp_unreg_mem_model+0x1a7/0x2a0 ? __pfx_xdp_unreg_mem_model+0x10/0x10 ? kfree+0x125/0x370 ? bnxt_free_ring.isra.0+0x2eb/0x500 ? bnxt_free_mem+0x5ac/0x2500 xdp_rxq_info_unreg+0x4a/0xd0 bnxt_free_mem+0x1356/0x2500 bnxt_close_nic+0xf0/0x3b0 ? __pfx_bnxt_close_nic+0x10/0x10 ? ethnl_parse_bit+0x2c6/0x6d0 ? __pfx___nla_validate_parse+0x10/0x10 ? __pfx_ethnl_parse_bit+0x10/0x10 bnxt_set_features+0x2a8/0x3e0 __netdev_update_features+0x4dc/0x1370 ? ethnl_parse_bitset+0x4ff/0x750 ? __pfx_ethnl_parse_bitset+0x10/0x10 ? __pfx___netdev_update_features+0x10/0x10 ? mark_held_locks+0xa5/0xf0 ? _raw_spin_unlock_irqrestore+0x42/0x70 ? __pm_runtime_resume+0x7d/0x110 ethnl_set_features+0x32d/0xa20
To fix this problem, it uses rhashtable_lookup_fast() instead of rhashtable_lookup() with rcu_read_lock().
Using xa without rcu_read_lock() here is safe.
xa is freed by __xdp_mem_allocator_rcu_free() and this is called by call_rcu() of mem_xa_remove().
The mem_xa_remove() is called by page_pool_destroy() if a reference count reaches 0.
The xa is already protected by the reference count mechanism well in the control plane.
So removing rcu_read_lock() for page_pool_destroy() is safe.
--- net/core/xdp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/core/xdp.c +1 -3
@@ -127,10 +127,8 @@ void xdp_unreg_mem_model(struct xdp_mem_info *mem)return ;if (type ==MEM_TYPE_PAGE_POOL ) { -rcu_read_lock (); - xa =rhashtable_lookup (mem_id_ht, &id, mem_id_rht_params); + xa =rhashtable_lookup_fast (mem_id_ht, &id, mem_id_rht_params);page_pool_destroy (xa->page_pool); -rcu_read_unlock (); } }EXPORT_SYMBOL_GPL (xdp_unreg_mem_model);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 262/809 net: bridge: mst: Check vlan state for egress decision
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Elliot Ayrey <[email protected]>
[ Upstream commit 0a1868b93fad5938dbcca77286b25bf211c49f7a ]
If a port is blocking in the common instance but forwarding in an MST instance, traffic egressing the bridge will be dropped because the state of the common instance is overriding that of the MST instance.
Fix this by skipping the port state check in MST mode to allow checking the vlan state via br_allowed_egress(). This is similar to what happens in br_handle_frame_finish() when checking ingress traffic, which was introduced in the change below.
--- net/bridge/br_forward.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/bridge/br_forward.c +2 -2
@@ -25,8 +25,8 @@ static inline int should_deliver(const struct net_bridge_port *p, vg =nbp_vlan_group_rcu (p);return ((p->flags &BR_HAIRPIN_MODE ) || skb->dev != p->dev) && - p->state ==BR_STATE_FORWARDING &&br_allowed_egress (vg, skb) && -nbp_switchdev_allowed_egress (p, skb) && + (br_mst_is_enabled (p->br) || p->state ==BR_STATE_FORWARDING ) && +br_allowed_egress (vg, skb) &&nbp_switchdev_allowed_egress (p, skb) && !br_skb_isolated (p, skb); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 263/809 Bluetooth: Fix usage of __hci_cmd_sync_status
In reply to Greg Kroah-Hartman6.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 87be7b189b2c50d4b51512f59e4e97db4eedee8a ]
__hci_cmd_sync_status shall only be used if hci_req_sync_lock is _not_ required which is not the case of hci_dev_cmd so it needs to use hci_cmd_sync_status which uses hci_req_sync_lock internally.
--- net/bluetooth/hci_core.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)
net/bluetooth/hci_core.c +12 -15
@@ -718,8 +718,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)switch (cmd) {case HCISETAUTH : - err =__hci_cmd_sync_status (hdev,HCI_OP_WRITE_AUTH_ENABLE , -1 , &dr.dev_opt,HCI_CMD_TIMEOUT ); + err =hci_cmd_sync_status (hdev,HCI_OP_WRITE_AUTH_ENABLE , +1 , &dr.dev_opt,HCI_CMD_TIMEOUT );break ;case HCISETENCRYPT :
@@ -730,23 +730,21 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)if (!test_bit (HCI_AUTH , &hdev->flags)) {/* Auth must be enabled first */ - err =__hci_cmd_sync_status (hdev, -HCI_OP_WRITE_AUTH_ENABLE , -1 , &dr.dev_opt, -HCI_CMD_TIMEOUT ); + err =hci_cmd_sync_status (hdev, +HCI_OP_WRITE_AUTH_ENABLE , +1 , &dr.dev_opt, +HCI_CMD_TIMEOUT );if (err)break ; } - err =__hci_cmd_sync_status (hdev,HCI_OP_WRITE_ENCRYPT_MODE , -1 , &dr.dev_opt, -HCI_CMD_TIMEOUT ); + err =hci_cmd_sync_status (hdev,HCI_OP_WRITE_ENCRYPT_MODE , +1 , &dr.dev_opt,HCI_CMD_TIMEOUT );break ;case HCISETSCAN : - err =__hci_cmd_sync_status (hdev,HCI_OP_WRITE_SCAN_ENABLE , -1 , &dr.dev_opt, -HCI_CMD_TIMEOUT ); + err =hci_cmd_sync_status (hdev,HCI_OP_WRITE_SCAN_ENABLE , +1 , &dr.dev_opt,HCI_CMD_TIMEOUT );/* Ensure that the connectable and discoverable states * get correctly modified as this was a non-mgmt change.
@@ -758,9 +756,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)case HCISETLINKPOL : policy =cpu_to_le16 (dr.dev_opt); - err =__hci_cmd_sync_status (hdev,HCI_OP_WRITE_DEF_LINK_POLICY , -2 , &policy, -HCI_CMD_TIMEOUT ); + err =hci_cmd_sync_status (hdev,HCI_OP_WRITE_DEF_LINK_POLICY , +2 , &policy,HCI_CMD_TIMEOUT );break ;case HCISETLINKMODE :
Signature · 1 line
2.43.0