5.10.195-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainerPATCH 285/406 media: dvb: symbol fixup for dvb_attach()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 86495af1171e1feec79faa9b64c05c89f46e41d1 upstream.
In commit 9011e49d54dc ("modules: only allow symbol_get of EXPORT_SYMBOL_GPL modules") the use of symbol_get is properly restricted to GPL-only marked symbols. This interacts oddly with the DVB logic which only uses dvb_attach() to load the dvb driver which then uses symbol_get().
Fix this up by properly marking all of the dvb_attach attach symbols as EXPORT_SYMBOL_GPL().
--- drivers/media/dvb-frontends/ascot2e.c | 2 +- drivers/media/dvb-frontends/atbm8830.c | 2 +- drivers/media/dvb-frontends/au8522_dig.c | 2 +- drivers/media/dvb-frontends/bcm3510.c | 2 +- drivers/media/dvb-frontends/cx22700.c | 2 +- drivers/media/dvb-frontends/cx22702.c | 2 +- drivers/media/dvb-frontends/cx24110.c | 2 +- drivers/media/dvb-frontends/cx24113.c | 2 +- drivers/media/dvb-frontends/cx24116.c | 2 +- drivers/media/dvb-frontends/cx24120.c | 2 +- drivers/media/dvb-frontends/cx24123.c | 2 +- drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- drivers/media/dvb-frontends/cxd2841er.c | 4 ++-- drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 2 +- drivers/media/dvb-frontends/dib0070.c | 2 +- drivers/media/dvb-frontends/dib0090.c | 4 ++-- drivers/media/dvb-frontends/dib3000mb.c | 2 +- drivers/media/dvb-frontends/dib3000mc.c | 2 +- drivers/media/dvb-frontends/dib7000m.c | 2 +- drivers/media/dvb-frontends/dib7000p.c | 2 +- drivers/media/dvb-frontends/dib8000.c | 2 +- drivers/media/dvb-frontends/dib9000.c | 2 +- drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +- drivers/media/dvb-frontends/drxd_hard.c | 2 +- drivers/media/dvb-frontends/drxk_hard.c | 2 +- drivers/media/dvb-frontends/ds3000.c | 2 +- drivers/media/dvb-frontends/dvb-pll.c | 2 +- drivers/media/dvb-frontends/ec100.c | 2 +- drivers/media/dvb-frontends/helene.c | 4 ++-- drivers/media/dvb-frontends/horus3a.c | 2 +- drivers/media/dvb-frontends/isl6405.c | 2 +- drivers/media/dvb-frontends/isl6421.c | 2 +- drivers/media/dvb-frontends/isl6423.c | 2 +- drivers/media/dvb-frontends/itd1000.c | 2 +- drivers/media/dvb-frontends/ix2505v.c | 2 +- drivers/media/dvb-frontends/l64781.c | 2 +- drivers/media/dvb-frontends/lg2160.c | 2 +- drivers/media/dvb-frontends/lgdt3305.c | 2 +- drivers/media/dvb-frontends/lgdt3306a.c | 2 +- drivers/media/dvb-frontends/lgdt330x.c | 2 +- drivers/media/dvb-frontends/lgs8gxx.c | 2 +- drivers/media/dvb-frontends/lnbh25.c | 2 +- drivers/media/dvb-frontends/lnbp21.c | 4 ++-- drivers/media/dvb-frontends/lnbp22.c | 2 +- drivers/media/dvb-frontends/m88ds3103.c | 2 +- drivers/media/dvb-frontends/m88rs2000.c | 2 +- drivers/media/dvb-frontends/mb86a16.c | 2 +- drivers/media/dvb-frontends/mb86a20s.c | 2 +- drivers/media/dvb-frontends/mt312.c | 2 +- drivers/media/dvb-frontends/mt352.c | 2 +- drivers/media/dvb-frontends/nxt200x.c | 2 +- drivers/media/dvb-frontends/nxt6000.c | 2 +- drivers/media/dvb-frontends/or51132.c | 2 +- drivers/media/dvb-frontends/or51211.c | 2 +- drivers/media/dvb-frontends/s5h1409.c | 2 +- drivers/media/dvb-frontends/s5h1411.c | 2 +- drivers/media/dvb-frontends/s5h1420.c | 2 +- drivers/media/dvb-frontends/s5h1432.c | 2 +- drivers/media/dvb-frontends/s921.c | 2 +- drivers/media/dvb-frontends/si21xx.c | 2 +- drivers/media/dvb-frontends/sp887x.c | 2 +- drivers/media/dvb-frontends/stb0899_drv.c | 2 +- drivers/media/dvb-frontends/stb6000.c | 2 +- drivers/media/dvb-frontends/stb6100.c | 2 +- drivers/media/dvb-frontends/stv0288.c | 2 +- drivers/media/dvb-frontends/stv0297.c | 2 +- drivers/media/dvb-frontends/stv0299.c | 2 +- drivers/media/dvb-frontends/stv0367.c | 6 +++--- drivers/media/dvb-frontends/stv0900_core.c | 2 +- drivers/media/dvb-frontends/stv090x.c | 2 +- drivers/media/dvb-frontends/stv6110.c | 2 +- drivers/media/dvb-frontends/stv6110x.c | 2 +- drivers/media/dvb-frontends/tda10021.c | 2 +- drivers/media/dvb-frontends/tda10023.c | 2 +- drivers/media/dvb-frontends/tda10048.c | 2 +- drivers/media/dvb-frontends/tda1004x.c | 4 ++-- drivers/media/dvb-frontends/tda10086.c | 2 +- drivers/media/dvb-frontends/tda665x.c | 2 +- drivers/media/dvb-frontends/tda8083.c | 2 +- drivers/media/dvb-frontends/tda8261.c | 2 +- drivers/media/dvb-frontends/tda826x.c | 2 +- drivers/media/dvb-frontends/ts2020.c | 2 +- drivers/media/dvb-frontends/tua6100.c | 2 +- drivers/media/dvb-frontends/ves1820.c | 2 +- drivers/media/dvb-frontends/ves1x93.c | 2 +- drivers/media/dvb-frontends/zl10036.c | 2 +- drivers/media/dvb-frontends/zl10039.c | 2 +- drivers/media/dvb-frontends/zl10353.c | 2 +- drivers/media/pci/bt8xx/dst.c | 2 +- drivers/media/pci/bt8xx/dst_ca.c | 2 +- drivers/media/pci/ddbridge/ddbridge-dummy-fe.c | 2 +- drivers/media/tuners/fc0011.c | 2 +- drivers/media/tuners/fc0012.c | 2 +- drivers/media/tuners/fc0013.c | 2 +- drivers/media/tuners/max2165.c | 2 +- drivers/media/tuners/mc44s803.c | 2 +- drivers/media/tuners/mt2060.c | 2 +- drivers/media/tuners/mt2131.c | 2 +- drivers/media/tuners/mt2266.c | 2 +- drivers/media/tuners/mxl5005s.c | 2 +- drivers/media/tuners/qt1010.c | 2 +- drivers/media/tuners/tda18218.c | 2 +- drivers/media/tuners/xc4000.c | 2 +- drivers/media/tuners/xc5000.c | 2 +- 104 files changed, 111 insertions(+), 111 deletions(-)
drivers/media/dvb-frontends/ascot2e.c +1 -1
@@ -533,7 +533,7 @@ struct dvb_frontend *ascot2e_attach(stru priv->i2c_address, priv->i2c);return fe; } -EXPORT_SYMBOL (ascot2e_attach); +EXPORT_SYMBOL_GPL (ascot2e_attach);MODULE_DESCRIPTION ("Sony ASCOT2E terr/cab tuner driver" );MODULE_AUTHOR ("[email protected]" );
drivers/media/dvb-frontends/atbm8830.c +1 -1
@@ -489,7 +489,7 @@ error_out:return NULL ; } -EXPORT_SYMBOL (atbm8830_attach); +EXPORT_SYMBOL_GPL (atbm8830_attach);MODULE_DESCRIPTION ("AltoBeam ATBM8830/8831 GB20600 demodulator driver" );MODULE_AUTHOR ("David T. L. Wong <[email protected]>" );
drivers/media/dvb-frontends/au8522_dig.c +1 -1
@@ -879,7 +879,7 @@ error:au8522_release_state (state);return NULL ; } -EXPORT_SYMBOL (au8522_attach); +EXPORT_SYMBOL_GPL (au8522_attach);static const struct dvb_frontend_ops au8522_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/bcm3510.c +1 -1
@@ -835,7 +835,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (bcm3510_attach); +EXPORT_SYMBOL_GPL (bcm3510_attach);static const struct dvb_frontend_ops bcm3510_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/cx22700.c +1 -1
@@ -432,4 +432,4 @@ MODULE_DESCRIPTION("Conexant CX22700 DVBMODULE_AUTHOR ("Holger Waechtler" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (cx22700_attach); +EXPORT_SYMBOL_GPL (cx22700_attach);
drivers/media/dvb-frontends/cx22702.c +1 -1
@@ -604,7 +604,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (cx22702_attach); +EXPORT_SYMBOL_GPL (cx22702_attach);static const struct dvb_frontend_ops cx22702_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/cx24110.c +1 -1
@@ -653,4 +653,4 @@ MODULE_DESCRIPTION("Conexant CX24110 DVBMODULE_AUTHOR ("Peter Hettkamp" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (cx24110_attach); +EXPORT_SYMBOL_GPL (cx24110_attach);
drivers/media/dvb-frontends/cx24113.c +1 -1
@@ -590,7 +590,7 @@ error:return NULL ; } -EXPORT_SYMBOL (cx24113_attach); +EXPORT_SYMBOL_GPL (cx24113_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Activates frontend debugging (default:0)" );
drivers/media/dvb-frontends/cx24116.c +1 -1
@@ -1133,7 +1133,7 @@ struct dvb_frontend *cx24116_attach(cons state->frontend.demodulator_priv = state;return &state->frontend; } -EXPORT_SYMBOL (cx24116_attach); +EXPORT_SYMBOL_GPL (cx24116_attach);/* * Initialise or wake up device
drivers/media/dvb-frontends/cx24120.c +1 -1
@@ -305,7 +305,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (cx24120_attach); +EXPORT_SYMBOL_GPL (cx24120_attach);static int cx24120_test_rom (struct cx24120_state *state) {
drivers/media/dvb-frontends/cx24123.c +1 -1
@@ -1096,7 +1096,7 @@ error:return NULL ; } -EXPORT_SYMBOL (cx24123_attach); +EXPORT_SYMBOL_GPL (cx24123_attach);static const struct dvb_frontend_ops cx24123_ops = { .delsys = {SYS_DVBS },
drivers/media/dvb-frontends/cxd2820r_core.c +1 -1
@@ -536,7 +536,7 @@ struct dvb_frontend *cxd2820r_attach(conreturn pdata.get_dvb_frontend (client); } -EXPORT_SYMBOL (cxd2820r_attach); +EXPORT_SYMBOL_GPL (cxd2820r_attach);static struct dvb_frontend *cxd2820r_get_dvb_frontend (struct i2c_client *client) {
drivers/media/dvb-frontends/cxd2841er.c +2 -2
@@ -3930,14 +3930,14 @@ struct dvb_frontend *cxd2841er_attach_s( {return cxd2841er_attach (cfg, i2c,SYS_DVBS ); } -EXPORT_SYMBOL (cxd2841er_attach_s); +EXPORT_SYMBOL_GPL (cxd2841er_attach_s);struct dvb_frontend *cxd2841er_attach_t_c (struct cxd2841er_config *cfg,struct i2c_adapter *i2c) {return cxd2841er_attach (cfg, i2c,0 ); } -EXPORT_SYMBOL (cxd2841er_attach_t_c); +EXPORT_SYMBOL_GPL (cxd2841er_attach_t_c);static const struct dvb_frontend_ops cxd2841er_dvbs_s2_ops = { .delsys = {SYS_DVBS ,SYS_DVBS2 },
drivers/media/dvb-frontends/cxd2880/cxd2880_top.c +1 -1
@@ -1950,7 +1950,7 @@ struct dvb_frontend *cxd2880_attach(strureturn fe; } -EXPORT_SYMBOL (cxd2880_attach); +EXPORT_SYMBOL_GPL (cxd2880_attach);MODULE_DESCRIPTION ("Sony CXD2880 DVB-T2/T tuner + demod driver" );MODULE_AUTHOR ("Sony Semiconductor Solutions Corporation" );
drivers/media/dvb-frontends/dib0070.c +1 -1
@@ -762,7 +762,7 @@ free_mem: fe->tuner_priv =NULL ;return NULL ; } -EXPORT_SYMBOL (dib0070_attach); +EXPORT_SYMBOL_GPL (dib0070_attach);MODULE_AUTHOR ("Patrick Boettcher <[email protected]>" );MODULE_DESCRIPTION ("Driver for the DiBcom 0070 base-band RF Tuner" );
drivers/media/dvb-frontends/dib0090.c +2 -2
@@ -2632,7 +2632,7 @@ struct dvb_frontend *dib0090_register(streturn NULL ; } -EXPORT_SYMBOL (dib0090_register); +EXPORT_SYMBOL_GPL (dib0090_register);struct dvb_frontend *dib0090_fw_register (struct dvb_frontend *fe,struct i2c_adapter *i2c,const struct dib0090_config *config) {
@@ -2658,7 +2658,7 @@ free_mem: fe->tuner_priv =NULL ;return NULL ; } -EXPORT_SYMBOL (dib0090_fw_register); +EXPORT_SYMBOL_GPL (dib0090_fw_register);MODULE_AUTHOR ("Patrick Boettcher <[email protected]>" );MODULE_AUTHOR ("Olivier Grenie <[email protected]>" );
drivers/media/dvb-frontends/dib3000mb.c +1 -1
@@ -815,4 +815,4 @@ MODULE_AUTHOR(DRIVER_AUTHOR);MODULE_DESCRIPTION (DRIVER_DESC );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (dib3000mb_attach); +EXPORT_SYMBOL_GPL (dib3000mb_attach);
drivers/media/dvb-frontends/dib3000mc.c +1 -1
@@ -935,7 +935,7 @@ error:kfree (st);return NULL ; } -EXPORT_SYMBOL (dib3000mc_attach); +EXPORT_SYMBOL_GPL (dib3000mc_attach);static const struct dvb_frontend_ops dib3000mc_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/dib7000m.c +1 -1
@@ -1434,7 +1434,7 @@ error:kfree (st);return NULL ; } -EXPORT_SYMBOL (dib7000m_attach); +EXPORT_SYMBOL_GPL (dib7000m_attach);static const struct dvb_frontend_ops dib7000m_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/dib7000p.c +1 -1
@@ -2822,7 +2822,7 @@ void *dib7000p_attach(struct dib7000p_opreturn ops; } -EXPORT_SYMBOL (dib7000p_attach); +EXPORT_SYMBOL_GPL (dib7000p_attach);static const struct dvb_frontend_ops dib7000p_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/dib8000.c +1 -1
@@ -4527,7 +4527,7 @@ void *dib8000_attach(struct dib8000_opsreturn ops; } -EXPORT_SYMBOL (dib8000_attach); +EXPORT_SYMBOL_GPL (dib8000_attach);MODULE_AUTHOR ("Olivier Grenie <[email protected], Patrick Boettcher <[email protected]>" );MODULE_DESCRIPTION ("Driver for the DiBcom 8000 ISDB-T demodulator" );
drivers/media/dvb-frontends/dib9000.c +1 -1
@@ -2546,7 +2546,7 @@ error:kfree (st);return NULL ; } -EXPORT_SYMBOL (dib9000_attach); +EXPORT_SYMBOL_GPL (dib9000_attach);static const struct dvb_frontend_ops dib9000_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/drx39xyj/drxj.c +1 -1
@@ -12375,7 +12375,7 @@ error:return NULL ; } -EXPORT_SYMBOL (drx39xxj_attach); +EXPORT_SYMBOL_GPL (drx39xxj_attach);static const struct dvb_frontend_ops drx39xxj_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/drxd_hard.c +1 -1
@@ -2948,7 +2948,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (drxd_attach); +EXPORT_SYMBOL_GPL (drxd_attach);MODULE_DESCRIPTION ("DRXD driver" );MODULE_AUTHOR ("Micronas" );
drivers/media/dvb-frontends/drxk_hard.c +1 -1
@@ -6845,7 +6845,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (drxk_attach); +EXPORT_SYMBOL_GPL (drxk_attach);MODULE_DESCRIPTION ("DRX-K driver" );MODULE_AUTHOR ("Ralph Metzler" );
drivers/media/dvb-frontends/ds3000.c +1 -1
@@ -859,7 +859,7 @@ struct dvb_frontend *ds3000_attach(constds3000_set_voltage (&state->frontend,SEC_VOLTAGE_OFF );return &state->frontend; } -EXPORT_SYMBOL (ds3000_attach); +EXPORT_SYMBOL_GPL (ds3000_attach);static int ds3000_set_carrier_offset (struct dvb_frontend *fe,s32 carrier_offset_khz)
drivers/media/dvb-frontends/dvb-pll.c +1 -1
@@ -866,7 +866,7 @@ out:return NULL ; } -EXPORT_SYMBOL (dvb_pll_attach); +EXPORT_SYMBOL_GPL (dvb_pll_attach); static int
drivers/media/dvb-frontends/ec100.c +1 -1
@@ -299,7 +299,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (ec100_attach); +EXPORT_SYMBOL_GPL (ec100_attach);static const struct dvb_frontend_ops ec100_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/helene.c +2 -2
@@ -1025,7 +1025,7 @@ struct dvb_frontend *helene_attach_s(str priv->i2c_address, priv->i2c);return fe; } -EXPORT_SYMBOL (helene_attach_s); +EXPORT_SYMBOL_GPL (helene_attach_s); struct dvb_frontend *helene_attach(struct dvb_frontend *fe, const struct helene_config *config,
@@ -1061,7 +1061,7 @@ struct dvb_frontend *helene_attach(struc priv->i2c_address, priv->i2c);return fe; } -EXPORT_SYMBOL (helene_attach); +EXPORT_SYMBOL_GPL (helene_attach);static int helene_probe (struct i2c_client *client,const struct i2c_device_id *id)
drivers/media/dvb-frontends/horus3a.c +1 -1
@@ -395,7 +395,7 @@ struct dvb_frontend *horus3a_attach(stru priv->i2c_address, priv->i2c);return fe; } -EXPORT_SYMBOL (horus3a_attach); +EXPORT_SYMBOL_GPL (horus3a_attach);MODULE_DESCRIPTION ("Sony HORUS3A satellite tuner driver" );MODULE_AUTHOR ("Sergey Kozlov <[email protected]>" );
drivers/media/dvb-frontends/isl6405.c +1 -1
@@ -141,7 +141,7 @@ struct dvb_frontend *isl6405_attach(strureturn fe; } -EXPORT_SYMBOL (isl6405_attach); +EXPORT_SYMBOL_GPL (isl6405_attach);MODULE_DESCRIPTION ("Driver for lnb supply and control ic isl6405" );MODULE_AUTHOR ("Hartmut Hackmann & Oliver Endriss" );
drivers/media/dvb-frontends/isl6421.c +1 -1
@@ -213,7 +213,7 @@ struct dvb_frontend *isl6421_attach(strureturn fe; } -EXPORT_SYMBOL (isl6421_attach); +EXPORT_SYMBOL_GPL (isl6421_attach);MODULE_DESCRIPTION ("Driver for lnb supply and control ic isl6421" );MODULE_AUTHOR ("Andrew de Quincey & Oliver Endriss" );
drivers/media/dvb-frontends/isl6423.c +1 -1
@@ -289,7 +289,7 @@ exit: fe->sec_priv =NULL ;return NULL ; } -EXPORT_SYMBOL (isl6423_attach); +EXPORT_SYMBOL_GPL (isl6423_attach);MODULE_DESCRIPTION ("ISL6423 SEC" );MODULE_AUTHOR ("Manu Abraham" );
drivers/media/dvb-frontends/itd1000.c +1 -1
@@ -389,7 +389,7 @@ struct dvb_frontend *itd1000_attach(strureturn fe; } -EXPORT_SYMBOL (itd1000_attach); +EXPORT_SYMBOL_GPL (itd1000_attach);MODULE_AUTHOR ("Patrick Boettcher <[email protected]>" );MODULE_DESCRIPTION ("Integrant ITD1000 driver" );
drivers/media/dvb-frontends/ix2505v.c +1 -1
@@ -302,7 +302,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (ix2505v_attach); +EXPORT_SYMBOL_GPL (ix2505v_attach);module_param_named (debug, ix2505v_debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/l64781.c +1 -1
@@ -593,4 +593,4 @@ MODULE_DESCRIPTION("LSI L64781 DVB-T DemMODULE_AUTHOR ("Holger Waechtler, Marko Kohtala" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (l64781_attach); +EXPORT_SYMBOL_GPL (l64781_attach);
drivers/media/dvb-frontends/lg2160.c +1 -1
@@ -1426,7 +1426,7 @@ struct dvb_frontend *lg2160_attach(constreturn &state->frontend; } -EXPORT_SYMBOL (lg2160_attach); +EXPORT_SYMBOL_GPL (lg2160_attach);MODULE_DESCRIPTION ("LG Electronics LG216x ATSC/MH Demodulator Driver" );MODULE_AUTHOR ("Michael Krufky <[email protected]>" );
drivers/media/dvb-frontends/lgdt3305.c +1 -1
@@ -1148,7 +1148,7 @@ fail:kfree (state);return NULL ; } -EXPORT_SYMBOL (lgdt3305_attach); +EXPORT_SYMBOL_GPL (lgdt3305_attach);static const struct dvb_frontend_ops lgdt3304_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/lgdt3306a.c +1 -1
@@ -1895,7 +1895,7 @@ fail:kfree (state);return NULL ; } -EXPORT_SYMBOL (lgdt3306a_attach); +EXPORT_SYMBOL_GPL (lgdt3306a_attach);#ifdef DBG_DUMP
drivers/media/dvb-frontends/lgdt330x.c +1 -1
@@ -928,7 +928,7 @@ struct dvb_frontend *lgdt330x_attach(conreturn lgdt330x_get_dvb_frontend (client); } -EXPORT_SYMBOL (lgdt330x_attach); +EXPORT_SYMBOL_GPL (lgdt330x_attach);static const struct dvb_frontend_ops lgdt3302_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/lgs8gxx.c +1 -1
@@ -1043,7 +1043,7 @@ error_out:return NULL ; } -EXPORT_SYMBOL (lgs8gxx_attach); +EXPORT_SYMBOL_GPL (lgs8gxx_attach);MODULE_DESCRIPTION ("Legend Silicon LGS8913/LGS8GXX DMB-TH demodulator driver" );MODULE_AUTHOR ("David T. L. Wong <[email protected]>" );
drivers/media/dvb-frontends/lnbh25.c +1 -1
@@ -173,7 +173,7 @@ struct dvb_frontend *lnbh25_attach(struc __func__, priv->i2c_address);return fe; } -EXPORT_SYMBOL (lnbh25_attach); +EXPORT_SYMBOL_GPL (lnbh25_attach);MODULE_DESCRIPTION ("ST LNBH25 driver" );MODULE_AUTHOR ("[email protected]" );
drivers/media/dvb-frontends/lnbp21.c +2 -2
@@ -155,7 +155,7 @@ struct dvb_frontend *lnbh24_attach(strucreturn lnbx2x_attach (fe, i2c, override_set, override_clear, i2c_addr,LNBH24_TTX ); } -EXPORT_SYMBOL (lnbh24_attach); +EXPORT_SYMBOL_GPL (lnbh24_attach); struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set,
@@ -164,7 +164,7 @@ struct dvb_frontend *lnbp21_attach(strucreturn lnbx2x_attach (fe, i2c, override_set, override_clear,0x08 ,LNBP21_ISEL ); } -EXPORT_SYMBOL (lnbp21_attach); +EXPORT_SYMBOL_GPL (lnbp21_attach);MODULE_DESCRIPTION ("Driver for lnb supply and control ic lnbp21, lnbh24" );MODULE_AUTHOR ("Oliver Endriss, Igor M. Liplianin" );
drivers/media/dvb-frontends/lnbp22.c +1 -1
@@ -125,7 +125,7 @@ struct dvb_frontend *lnbp22_attach(strucreturn fe; } -EXPORT_SYMBOL (lnbp22_attach); +EXPORT_SYMBOL_GPL (lnbp22_attach);MODULE_DESCRIPTION ("Driver for lnb supply and control ic lnbp22" );MODULE_AUTHOR ("Dominik Kuhlen" );
drivers/media/dvb-frontends/m88ds3103.c +1 -1
@@ -1699,7 +1699,7 @@ struct dvb_frontend *m88ds3103_attach(co *tuner_i2c_adapter = pdata.get_i2c_adapter (client);return pdata.get_dvb_frontend (client); } -EXPORT_SYMBOL (m88ds3103_attach); +EXPORT_SYMBOL_GPL (m88ds3103_attach);static const struct dvb_frontend_ops m88ds3103_ops = { .delsys = {SYS_DVBS ,SYS_DVBS2 },
drivers/media/dvb-frontends/m88rs2000.c +1 -1
@@ -807,7 +807,7 @@ error:return NULL ; } -EXPORT_SYMBOL (m88rs2000_attach); +EXPORT_SYMBOL_GPL (m88rs2000_attach);MODULE_DESCRIPTION ("M88RS2000 DVB-S Demodulator driver" );MODULE_AUTHOR ("Malcolm Priestley [email protected]" );
drivers/media/dvb-frontends/mb86a16.c +1 -1
@@ -1848,6 +1848,6 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (mb86a16_attach); +EXPORT_SYMBOL_GPL (mb86a16_attach);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Manu Abraham" );
drivers/media/dvb-frontends/mb86a20s.c +1 -1
@@ -2081,7 +2081,7 @@ struct dvb_frontend *mb86a20s_attach(condev_info (&i2c->dev,"Detected a Fujitsu mb86a20s frontend\n" );return &state->frontend; } -EXPORT_SYMBOL (mb86a20s_attach); +EXPORT_SYMBOL_GPL (mb86a20s_attach);static const struct dvb_frontend_ops mb86a20s_ops = { .delsys = {SYS_ISDBT },
drivers/media/dvb-frontends/mt312.c +1 -1
@@ -827,7 +827,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (mt312_attach); +EXPORT_SYMBOL_GPL (mt312_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/mt352.c +1 -1
@@ -593,4 +593,4 @@ MODULE_DESCRIPTION("Zarlink MT352 DVB-TMODULE_AUTHOR ("Holger Waechtler, Daniel Mack, Antonio Mancuso" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (mt352_attach); +EXPORT_SYMBOL_GPL (mt352_attach);
drivers/media/dvb-frontends/nxt200x.c +1 -1
@@ -1232,5 +1232,5 @@ MODULE_DESCRIPTION("NXT200X (ATSC 8VSB &MODULE_AUTHOR ("Kirk Lapray, Michael Krufky, Jean-Francois Thibert, and Taylor Jacob" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (nxt200x_attach); +EXPORT_SYMBOL_GPL (nxt200x_attach);
drivers/media/dvb-frontends/nxt6000.c +1 -1
@@ -621,4 +621,4 @@ MODULE_DESCRIPTION("NxtWave NXT6000 DVB-MODULE_AUTHOR ("Florian Schirmer" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (nxt6000_attach); +EXPORT_SYMBOL_GPL (nxt6000_attach);
drivers/media/dvb-frontends/or51132.c +1 -1
@@ -605,4 +605,4 @@ MODULE_AUTHOR("Kirk Lapray");MODULE_AUTHOR ("Trent Piepho" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (or51132_attach); +EXPORT_SYMBOL_GPL (or51132_attach);
drivers/media/dvb-frontends/or51211.c +1 -1
@@ -551,5 +551,5 @@ MODULE_DESCRIPTION("Oren OR51211 VSB [pcMODULE_AUTHOR ("Kirk Lapray" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (or51211_attach); +EXPORT_SYMBOL_GPL (or51211_attach);
drivers/media/dvb-frontends/s5h1409.c +1 -1
@@ -981,7 +981,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (s5h1409_attach); +EXPORT_SYMBOL_GPL (s5h1409_attach);static const struct dvb_frontend_ops s5h1409_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/s5h1411.c +1 -1
@@ -900,7 +900,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (s5h1411_attach); +EXPORT_SYMBOL_GPL (s5h1411_attach);static const struct dvb_frontend_ops s5h1411_ops = { .delsys = {SYS_ATSC ,SYS_DVBC_ANNEX_B },
drivers/media/dvb-frontends/s5h1420.c +1 -1
@@ -918,7 +918,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (s5h1420_attach); +EXPORT_SYMBOL_GPL (s5h1420_attach);static const struct dvb_frontend_ops s5h1420_ops = { .delsys = {SYS_DVBS },
drivers/media/dvb-frontends/s5h1432.c +1 -1
@@ -355,7 +355,7 @@ struct dvb_frontend *s5h1432_attach(consreturn &state->frontend; } -EXPORT_SYMBOL (s5h1432_attach); +EXPORT_SYMBOL_GPL (s5h1432_attach);static const struct dvb_frontend_ops s5h1432_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/s921.c +1 -1
@@ -495,7 +495,7 @@ struct dvb_frontend *s921_attach(const sreturn &state->frontend; } -EXPORT_SYMBOL (s921_attach); +EXPORT_SYMBOL_GPL (s921_attach);static const struct dvb_frontend_ops s921_ops = { .delsys = {SYS_ISDBT },
drivers/media/dvb-frontends/si21xx.c +1 -1
@@ -938,7 +938,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (si21xx_attach); +EXPORT_SYMBOL_GPL (si21xx_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/sp887x.c +1 -1
@@ -626,4 +626,4 @@ MODULE_PARM_DESC(debug, "Turn on/off froMODULE_DESCRIPTION ("Spase sp887x DVB-T demodulator driver" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (sp887x_attach); +EXPORT_SYMBOL_GPL (sp887x_attach);
drivers/media/dvb-frontends/stb0899_drv.c +1 -1
@@ -1638,7 +1638,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stb0899_attach); +EXPORT_SYMBOL_GPL (stb0899_attach);MODULE_PARM_DESC (verbose,"Set Verbosity level" );MODULE_AUTHOR ("Manu Abraham" );MODULE_DESCRIPTION ("STB0899 Multi-Std frontend" );
drivers/media/dvb-frontends/stb6000.c +1 -1
@@ -232,7 +232,7 @@ struct dvb_frontend *stb6000_attach(strureturn fe; } -EXPORT_SYMBOL (stb6000_attach); +EXPORT_SYMBOL_GPL (stb6000_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/stb6100.c +1 -1
@@ -557,7 +557,7 @@ static void stb6100_release(struct dvb_fkfree (state); } -EXPORT_SYMBOL (stb6100_attach); +EXPORT_SYMBOL_GPL (stb6100_attach);MODULE_PARM_DESC (verbose,"Set Verbosity level" );MODULE_AUTHOR ("Manu Abraham" );
drivers/media/dvb-frontends/stv0288.c +1 -1
@@ -590,7 +590,7 @@ error:return NULL ; } -EXPORT_SYMBOL (stv0288_attach); +EXPORT_SYMBOL_GPL (stv0288_attach);module_param (debug_legacy_dish_switch, int,0444 ); MODULE_PARM_DESC(debug_legacy_dish_switch,
drivers/media/dvb-frontends/stv0297.c +1 -1
@@ -710,4 +710,4 @@ MODULE_DESCRIPTION("ST STV0297 DVB-C DemMODULE_AUTHOR ("Dennis Noermann and Andrew de Quincey" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (stv0297_attach); +EXPORT_SYMBOL_GPL (stv0297_attach);
drivers/media/dvb-frontends/stv0299.c +1 -1
@@ -751,4 +751,4 @@ MODULE_DESCRIPTION("ST STV0299 DVB DemodMODULE_AUTHOR ("Ralph Metzler, Holger Waechtler, Peter Schildmann, Felix Domke, Andreas Oberritter, Andrew de Quincey, Kenneth Aafly" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (stv0299_attach); +EXPORT_SYMBOL_GPL (stv0299_attach);
drivers/media/dvb-frontends/stv0367.c +3 -3
@@ -1750,7 +1750,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stv0367ter_attach); +EXPORT_SYMBOL_GPL (stv0367ter_attach);static int stv0367cab_gate_ctrl (struct dvb_frontend *fe,int enable) {
@@ -2923,7 +2923,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stv0367cab_attach); +EXPORT_SYMBOL_GPL (stv0367cab_attach);/* * Functions for operation on Digital Devices hardware
@@ -3344,7 +3344,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stv0367ddb_attach); +EXPORT_SYMBOL_GPL (stv0367ddb_attach);MODULE_PARM_DESC (debug,"Set debug" );MODULE_PARM_DESC (i2c_debug,"Set i2c debug" );
drivers/media/dvb-frontends/stv0900_core.c +1 -1
@@ -1957,7 +1957,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stv0900_attach); +EXPORT_SYMBOL_GPL (stv0900_attach);MODULE_PARM_DESC (debug,"Set debug" );
drivers/media/dvb-frontends/stv090x.c +1 -1
@@ -5073,7 +5073,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (stv090x_attach); +EXPORT_SYMBOL_GPL (stv090x_attach);static const struct i2c_device_id stv090x_id_table[] = { {"stv090x" ,0 },
drivers/media/dvb-frontends/stv6110.c +1 -1
@@ -427,7 +427,7 @@ struct dvb_frontend *stv6110_attach(strureturn fe; } -EXPORT_SYMBOL (stv6110_attach); +EXPORT_SYMBOL_GPL (stv6110_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/stv6110x.c +1 -1
@@ -469,7 +469,7 @@ const struct stv6110x_devctl *stv6110x_adev_info (&stv6110x->i2c->dev,"Attaching STV6110x\n" );return stv6110x->devctl; } -EXPORT_SYMBOL (stv6110x_attach); +EXPORT_SYMBOL_GPL (stv6110x_attach);static const struct i2c_device_id stv6110x_id_table[] = { {"stv6110x" ,0 },
drivers/media/dvb-frontends/tda10021.c +1 -1
@@ -523,4 +523,4 @@ MODULE_DESCRIPTION("Philips TDA10021 DVBMODULE_AUTHOR ("Ralph Metzler, Holger Waechtler, Markus Schulz" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (tda10021_attach); +EXPORT_SYMBOL_GPL (tda10021_attach);
drivers/media/dvb-frontends/tda10023.c +1 -1
@@ -594,4 +594,4 @@ MODULE_DESCRIPTION("Philips TDA10023 DVBMODULE_AUTHOR ("Georg Acher, Hartmut Birr" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (tda10023_attach); +EXPORT_SYMBOL_GPL (tda10023_attach);
drivers/media/dvb-frontends/tda10048.c +1 -1
@@ -1138,7 +1138,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (tda10048_attach); +EXPORT_SYMBOL_GPL (tda10048_attach);static const struct dvb_frontend_ops tda10048_ops = { .delsys = {SYS_DVBT },
drivers/media/dvb-frontends/tda1004x.c +2 -2
@@ -1378,5 +1378,5 @@ MODULE_DESCRIPTION("Philips TDA10045H &MODULE_AUTHOR ("Andrew de Quincey & Robert Schlabbach" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (tda10045_attach); -EXPORT_SYMBOL (tda10046_attach); +EXPORT_SYMBOL_GPL (tda10045_attach); +EXPORT_SYMBOL_GPL (tda10046_attach);
drivers/media/dvb-frontends/tda10086.c +1 -1
@@ -764,4 +764,4 @@ MODULE_DESCRIPTION("Philips TDA10086 DVBMODULE_AUTHOR ("Andrew de Quincey" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (tda10086_attach); +EXPORT_SYMBOL_GPL (tda10086_attach);
drivers/media/dvb-frontends/tda665x.c +1 -1
@@ -227,7 +227,7 @@ struct dvb_frontend *tda665x_attach(strureturn fe; } -EXPORT_SYMBOL (tda665x_attach); +EXPORT_SYMBOL_GPL (tda665x_attach);MODULE_DESCRIPTION ("TDA665x driver" );MODULE_AUTHOR ("Manu Abraham" );
drivers/media/dvb-frontends/tda8083.c +1 -1
@@ -481,4 +481,4 @@ MODULE_DESCRIPTION("Philips TDA8083 DVB-MODULE_AUTHOR ("Ralph Metzler, Holger Waechtler" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (tda8083_attach); +EXPORT_SYMBOL_GPL (tda8083_attach);
drivers/media/dvb-frontends/tda8261.c +1 -1
@@ -188,7 +188,7 @@ exit:return NULL ; } -EXPORT_SYMBOL (tda8261_attach); +EXPORT_SYMBOL_GPL (tda8261_attach);MODULE_AUTHOR ("Manu Abraham" );MODULE_DESCRIPTION ("TDA8261 8PSK/QPSK Tuner" );
drivers/media/dvb-frontends/tda826x.c +1 -1
@@ -164,7 +164,7 @@ struct dvb_frontend *tda826x_attach(strureturn fe; } -EXPORT_SYMBOL (tda826x_attach); +EXPORT_SYMBOL_GPL (tda826x_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/ts2020.c +1 -1
@@ -525,7 +525,7 @@ struct dvb_frontend *ts2020_attach(strucreturn fe; } -EXPORT_SYMBOL (ts2020_attach); +EXPORT_SYMBOL_GPL (ts2020_attach);/* * We implement own regmap locking due to legacy DVB attach which uses frontend
drivers/media/dvb-frontends/tua6100.c +1 -1
@@ -186,7 +186,7 @@ struct dvb_frontend *tua6100_attach(stru fe->tuner_priv = priv;return fe; } -EXPORT_SYMBOL (tua6100_attach); +EXPORT_SYMBOL_GPL (tua6100_attach);MODULE_DESCRIPTION ("DVB tua6100 driver" );MODULE_AUTHOR ("Andrew de Quincey" );
drivers/media/dvb-frontends/ves1820.c +1 -1
@@ -434,4 +434,4 @@ MODULE_DESCRIPTION("VLSI VES1820 DVB-C DMODULE_AUTHOR ("Ralph Metzler, Holger Waechtler" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (ves1820_attach); +EXPORT_SYMBOL_GPL (ves1820_attach);
drivers/media/dvb-frontends/ves1x93.c +1 -1
@@ -540,4 +540,4 @@ MODULE_DESCRIPTION("VLSI VES1x93 DVB-S DMODULE_AUTHOR ("Ralph Metzler" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (ves1x93_attach); +EXPORT_SYMBOL_GPL (ves1x93_attach);
drivers/media/dvb-frontends/zl10036.c +1 -1
@@ -496,7 +496,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (zl10036_attach); +EXPORT_SYMBOL_GPL (zl10036_attach);module_param_named (debug, zl10036_debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/zl10039.c +1 -1
@@ -295,7 +295,7 @@ error:kfree (state);return NULL ; } -EXPORT_SYMBOL (zl10039_attach); +EXPORT_SYMBOL_GPL (zl10039_attach);module_param (debug, int,0644 );MODULE_PARM_DESC (debug,"Turn on/off frontend debugging (default:off)." );
drivers/media/dvb-frontends/zl10353.c +1 -1
@@ -665,4 +665,4 @@ MODULE_DESCRIPTION("Zarlink ZL10353 DVB-MODULE_AUTHOR ("Chris Pascoe" );MODULE_LICENSE ("GPL" ); -EXPORT_SYMBOL (zl10353_attach); +EXPORT_SYMBOL_GPL (zl10353_attach);
drivers/media/pci/bt8xx/dst.c +1 -1
@@ -1722,7 +1722,7 @@ struct dst_state *dst_attach(struct dst_return state;/* Manu (DST is a card not a frontend) */ } -EXPORT_SYMBOL (dst_attach); +EXPORT_SYMBOL_GPL (dst_attach);static const struct dvb_frontend_ops dst_dvbt_ops = { .delsys = {SYS_DVBT },
drivers/media/pci/bt8xx/dst_ca.c +1 -1
@@ -668,7 +668,7 @@ struct dvb_device *dst_ca_attach(structreturn NULL ; } -EXPORT_SYMBOL (dst_ca_attach); +EXPORT_SYMBOL_GPL (dst_ca_attach);MODULE_DESCRIPTION ("DST DVB-S/T/C Combo CA driver" );MODULE_AUTHOR ("Manu Abraham" );
drivers/media/pci/ddbridge/ddbridge-dummy-fe.c +1 -1
@@ -112,7 +112,7 @@ struct dvb_frontend *ddbridge_dummy_fe_q state->frontend.demodulator_priv = state;return &state->frontend; } -EXPORT_SYMBOL (ddbridge_dummy_fe_qam_attach); +EXPORT_SYMBOL_GPL (ddbridge_dummy_fe_qam_attach);static const struct dvb_frontend_ops ddbridge_dummy_fe_qam_ops = { .delsys = {SYS_DVBC_ANNEX_A },
drivers/media/tuners/fc0011.c +1 -1
@@ -499,7 +499,7 @@ struct dvb_frontend *fc0011_attach(strucreturn fe; } -EXPORT_SYMBOL (fc0011_attach); +EXPORT_SYMBOL_GPL (fc0011_attach);MODULE_DESCRIPTION ("Fitipower FC0011 silicon tuner driver" );MODULE_AUTHOR ("Michael Buesch <[email protected]>" );
drivers/media/tuners/fc0012.c +1 -1
@@ -495,7 +495,7 @@ err:return fe; } -EXPORT_SYMBOL (fc0012_attach); +EXPORT_SYMBOL_GPL (fc0012_attach);MODULE_DESCRIPTION ("Fitipower FC0012 silicon tuner driver" );MODULE_AUTHOR ("Hans-Frieder Vogt <[email protected]>" );
drivers/media/tuners/fc0013.c +1 -1
@@ -608,7 +608,7 @@ struct dvb_frontend *fc0013_attach(strucreturn fe; } -EXPORT_SYMBOL (fc0013_attach); +EXPORT_SYMBOL_GPL (fc0013_attach);MODULE_DESCRIPTION ("Fitipower FC0013 silicon tuner driver" );MODULE_AUTHOR ("Hans-Frieder Vogt <[email protected]>" );
drivers/media/tuners/max2165.c +1 -1
@@ -410,7 +410,7 @@ struct dvb_frontend *max2165_attach(strureturn fe; } -EXPORT_SYMBOL (max2165_attach); +EXPORT_SYMBOL_GPL (max2165_attach);MODULE_AUTHOR ("David T. L. Wong <[email protected]>" );MODULE_DESCRIPTION ("Maxim MAX2165 silicon tuner driver" );
drivers/media/tuners/mc44s803.c +1 -1
@@ -356,7 +356,7 @@ error:kfree (priv);return NULL ; } -EXPORT_SYMBOL (mc44s803_attach); +EXPORT_SYMBOL_GPL (mc44s803_attach);MODULE_AUTHOR ("Jochen Friedrich" );MODULE_DESCRIPTION ("Freescale MC44S803 silicon tuner driver" );
drivers/media/tuners/mt2060.c +1 -1
@@ -440,7 +440,7 @@ struct dvb_frontend * mt2060_attach(strureturn fe; } -EXPORT_SYMBOL (mt2060_attach); +EXPORT_SYMBOL_GPL (mt2060_attach);static int mt2060_probe (struct i2c_client *client,const struct i2c_device_id *id)
drivers/media/tuners/mt2131.c +1 -1
@@ -274,7 +274,7 @@ struct dvb_frontend * mt2131_attach(stru fe->tuner_priv = priv;return fe; } -EXPORT_SYMBOL (mt2131_attach); +EXPORT_SYMBOL_GPL (mt2131_attach);MODULE_AUTHOR ("Steven Toth" );MODULE_DESCRIPTION ("Microtune MT2131 silicon tuner driver" );
drivers/media/tuners/mt2266.c +1 -1
@@ -336,7 +336,7 @@ struct dvb_frontend * mt2266_attach(strumt2266_calibrate (priv);return fe; } -EXPORT_SYMBOL (mt2266_attach); +EXPORT_SYMBOL_GPL (mt2266_attach);MODULE_AUTHOR ("Olivier DANET" );MODULE_DESCRIPTION ("Microtune MT2266 silicon tuner driver" );
drivers/media/tuners/mxl5005s.c +1 -1
@@ -4114,7 +4114,7 @@ struct dvb_frontend *mxl5005s_attach(str fe->tuner_priv = state;return fe; } -EXPORT_SYMBOL (mxl5005s_attach); +EXPORT_SYMBOL_GPL (mxl5005s_attach);MODULE_DESCRIPTION ("MaxLinear MXL5005S silicon tuner driver" );MODULE_AUTHOR ("Steven Toth" );
drivers/media/tuners/qt1010.c +1 -1
@@ -440,7 +440,7 @@ struct dvb_frontend * qt1010_attach(stru fe->tuner_priv = priv;return fe; } -EXPORT_SYMBOL (qt1010_attach); +EXPORT_SYMBOL_GPL (qt1010_attach);MODULE_DESCRIPTION ("Quantek QT1010 silicon tuner driver" );MODULE_AUTHOR ("Antti Palosaari <[email protected]>" );
drivers/media/tuners/tda18218.c +1 -1
@@ -336,7 +336,7 @@ struct dvb_frontend *tda18218_attach(strreturn fe; } -EXPORT_SYMBOL (tda18218_attach); +EXPORT_SYMBOL_GPL (tda18218_attach);MODULE_DESCRIPTION ("NXP TDA18218HN silicon tuner driver" );MODULE_AUTHOR ("Antti Palosaari <[email protected]>" );
drivers/media/tuners/xc4000.c +1 -1
@@ -1744,7 +1744,7 @@ fail2:xc4000_release (fe);return NULL ; } -EXPORT_SYMBOL (xc4000_attach); +EXPORT_SYMBOL_GPL (xc4000_attach);MODULE_AUTHOR ("Steven Toth, Davide Ferri" );MODULE_DESCRIPTION ("Xceive xc4000 silicon tuner driver" );
drivers/media/tuners/xc5000.c +1 -1
@@ -1460,7 +1460,7 @@ fail:xc5000_release (fe);return NULL ; } -EXPORT_SYMBOL (xc5000_attach); +EXPORT_SYMBOL_GPL (xc5000_attach);MODULE_AUTHOR ("Steven Toth" );MODULE_DESCRIPTION ("Xceive xc5000 silicon tuner driver" );
Greg Kroah-Hartman
maintainerPATCH 286/406 Revert "scsi: qla2xxx: Fix buffer overrun"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nilesh Javali <[email protected]>
commit 641671d97b9199f1ba35ccc2222d4b189a6a5de5 upstream.
Revert due to Get PLOGI Template failed.
This reverts commit b68710a8094fdffe8dd4f7a82c82649f479bb453.
--- drivers/scsi/qla2xxx/qla_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_init.c +1 -1
@@ -5107,7 +5107,7 @@ static void qla_get_login_template(scsi___be32 *q;memset (ha->init_cb,0 , ha->init_cb_size); - sz =min_t (int,sizeof (struct fc_els_csp ), ha->init_cb_size); + sz =min_t (int,sizeof (struct fc_els_flogi ), ha->init_cb_size); rval =qla24xx_get_port_login_templ (vha, ha->init_cb_dma, ha->init_cb, sz);if (rval !=QLA_SUCCESS ) {
Greg Kroah-Hartman
maintainerPATCH 287/406 scsi: mpt3sas: Perform additional retries if doorbell read returns 0
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ranjan Kumar <[email protected]>
commit 4ca10f3e31745d35249a727ecd108eb58f0a8c5e upstream.
The driver retries certain register reads 3 times if the returned value is
0. This was done because the controller could return 0 for certain registers if other registers were being accessed concurrently by the BMC.
In certain systems with increased BMC interactions, the register values returned can be 0 for longer than 3 retries. Change the retry count from 3 to 30 for the affected registers to prevent problems with out-of-band management.
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 46 +++++++++++++++++++++++++----------- drivers/scsi/mpt3sas/mpt3sas_base.h | 1 2 files changed, 34 insertions(+), 13 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +33 -13
@@ -131,6 +131,9 @@ _base_get_ioc_facts(struct MPT3SAS_ADAPTstatic void _base_clear_outstanding_commands (struct MPT3SAS_ADAPTER *ioc); +static u32 +_base_readl_ext_retry (const volatile void __iomem *addr); +/** * mpt3sas_base_check_cmd_timeout - Function * to check timeout and command termination due
@@ -206,6 +209,20 @@ _base_readl_aero(const volatile void __ireturn ret_val; } +static u32 +_base_readl_ext_retry (const volatile void __iomem *addr) +{ +u32 i, ret_val; + +for (i =0 ; i <30 ; i++) { + ret_val =readl (addr); +if (ret_val ==0 ) +continue ; + } + +return ret_val; +} +static inline u32 _base_readl (const volatile void __iomem *addr) {
@@ -861,7 +878,7 @@ mpt3sas_halt_firmware(struct MPT3SAS_ADAdump_stack (); - doorbell = ioc->base_readl (&ioc->chip->Doorbell); + doorbell = ioc->base_readl_ext_retry (&ioc->chip->Doorbell);if ((doorbell &MPI2_IOC_STATE_MASK ) ==MPI2_IOC_STATE_FAULT ) {mpt3sas_print_fault_code (ioc, doorbell &MPI2_DOORBELL_DATA_MASK );
@@ -5667,7 +5684,7 @@ mpt3sas_base_get_iocstate(struct MPT3SAS {u32 s, sc; - s = ioc->base_readl (&ioc->chip->Doorbell); + s = ioc->base_readl_ext_retry (&ioc->chip->Doorbell); sc = s &MPI2_IOC_STATE_MASK ;return cooked ? sc : s; }
@@ -5812,7 +5829,7 @@ _base_wait_for_doorbell_ack(struct MPT3S __func__, count, timeout));return 0 ; }else if (int_status &MPI2_HIS_IOC2SYS_DB_STATUS ) { - doorbell = ioc->base_readl (&ioc->chip->Doorbell); + doorbell = ioc->base_readl_ext_retry (&ioc->chip->Doorbell);if ((doorbell &MPI2_IOC_STATE_MASK ) ==MPI2_IOC_STATE_FAULT ) {mpt3sas_print_fault_code (ioc, doorbell);
@@ -5852,7 +5869,7 @@ _base_wait_for_doorbell_not_used(struct count =0 ; cntdn =1000 * timeout; do { - doorbell_reg = ioc->base_readl(&ioc->chip->Doorbell); + doorbell_reg = ioc->base_readl_ext_retry(&ioc->chip->Doorbell); if (!(doorbell_reg & MPI2_DOORBELL_USED)) { dhsprintk(ioc, ioc_info(ioc, "%s: successful count(%d), timeout(%d)\n",
@@ -5989,7 +6006,7 @@ _base_handshake_req_reply_wait(struct MP__le32 *mfp;/* make sure doorbell is not in use */ -if ((ioc->base_readl (&ioc->chip->Doorbell) &MPI2_DOORBELL_USED )) { +if ((ioc->base_readl_ext_retry (&ioc->chip->Doorbell) &MPI2_DOORBELL_USED )) {ioc_err (ioc,"doorbell is in use (line=%d)\n" , __LINE__);return -EFAULT ; }
@@ -6038,7 +6055,7 @@ _base_handshake_req_reply_wait(struct MP }/* read the first two 16-bits, it gives the total length of the reply */ - reply[0 ] =le16_to_cpu (ioc->base_readl (&ioc->chip->Doorbell) + reply[0 ] =le16_to_cpu (ioc->base_readl_ext_retry (&ioc->chip->Doorbell) &MPI2_DOORBELL_DATA_MASK );writel (0 , &ioc->chip->HostInterruptStatus);if ((_base_wait_for_doorbell_int (ioc,5 ))) {
@@ -6046,7 +6063,7 @@ _base_handshake_req_reply_wait(struct MP __LINE__);return -EFAULT ; } - reply[1 ] =le16_to_cpu (ioc->base_readl (&ioc->chip->Doorbell) + reply[1 ] =le16_to_cpu (ioc->base_readl_ext_retry (&ioc->chip->Doorbell) &MPI2_DOORBELL_DATA_MASK );writel (0 , &ioc->chip->HostInterruptStatus);
@@ -6057,10 +6074,10 @@ _base_handshake_req_reply_wait(struct MPreturn -EFAULT ; }if (i >= reply_bytes/2 )/* overflow case */ - ioc->base_readl (&ioc->chip->Doorbell); + ioc->base_readl_ext_retry (&ioc->chip->Doorbell);else reply[i] =le16_to_cpu ( - ioc->base_readl (&ioc->chip->Doorbell) + ioc->base_readl_ext_retry (&ioc->chip->Doorbell) &MPI2_DOORBELL_DATA_MASK );writel (0 , &ioc->chip->HostInterruptStatus); }
@@ -6906,7 +6923,7 @@ _base_diag_reset(struct MPT3SAS_ADAPTER goto out; } - host_diagnostic = ioc->base_readl (&ioc->chip->HostDiagnostic); + host_diagnostic = ioc->base_readl_ext_retry (&ioc->chip->HostDiagnostic);drsprintk (ioc,ioc_info (ioc,"wrote magic sequence: count(%d), host_diagnostic(0x%08x)\n" , count, host_diagnostic));
@@ -6926,7 +6943,7 @@ _base_diag_reset(struct MPT3SAS_ADAPTERfor (count =0 ; count < (300000000 /MPI2_HARD_RESET_PCIE_SECOND_READ_DELAY_MICRO_SEC ); count++) { - host_diagnostic = ioc->base_readl (&ioc->chip->HostDiagnostic); + host_diagnostic = ioc->base_readl_ext_retry (&ioc->chip->HostDiagnostic);if (host_diagnostic ==0xFFFFFFFF ) { ioc_info(ioc,
@@ -7313,10 +7330,13 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPT ioc->rdpq_array_enable_assigned =0 ; ioc->use_32bit_dma = false; ioc->dma_mask =64 ; -if (ioc->is_aero_ioc) +if (ioc->is_aero_ioc) { ioc->base_readl = &_base_readl_aero; -else + ioc->base_readl_ext_retry = &_base_readl_ext_retry; + }else { ioc->base_readl = &_base_readl; + ioc->base_readl_ext_retry = &_base_readl; + } r =mpt3sas_base_map_resources (ioc);if (r) goto out_free_resources;
drivers/scsi/mpt3sas/mpt3sas_base.h +1 -0
@@ -1469,6 +1469,7 @@ struct MPT3SAS_ADAPTER {u8 diag_trigger_active;u8 atomic_desc_capable;BASE_READ_REG base_readl; +BASE_READ_REG base_readl_ext_retry;struct SL_WH_MASTER_TRIGGER_T diag_trigger_master;struct SL_WH_EVENT_TRIGGERS_T diag_trigger_event;struct SL_WH_SCSI_TRIGGERS_T diag_trigger_scsi;
Greg Kroah-Hartman
maintainerPATCH 288/406 ntb: Drop packets when qp link is down
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
commit f195a1a6fe416882984f8bd6c61afc1383171860 upstream.
Currently when the transport receive packets after netdev has closed the transport returns error and triggers tx errors to be incremented and carrier to be stopped. There is no reason to return error if the device is already closed. Drop the packet and return 0.
--- drivers/ntb/ntb_transport.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/ntb/ntb_transport.c +5 -1
@@ -2278,9 +2278,13 @@ int ntb_transport_tx_enqueue(struct ntb_struct ntb_queue_entry *entry;int rc; -if (!qp || !qp->link_is_up || !len) +if (!qp || !len)return -EINVAL ; +/* If the qp link is down already, just ignore. */ +if (!qp->link_is_up) +return 0 ; + entry =ntb_list_rm (&qp->ntb_tx_free_q_lock, &qp->tx_free_q);if (!entry) { qp->tx_err_no_buf++;
Greg Kroah-Hartman
maintainerPATCH 289/406 ntb: Clean up tx tail index on link down
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
commit cc79bd2738c2d40aba58b2be6ce47dc0e471df0e upstream.
The tx tail index is not reset when the link goes down. This causes the tail index to go out of sync when the link goes down and comes back up. Refactor the ntb_qp_link_down_reset() and reset the tail index as well.
--- drivers/ntb/ntb_transport.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/ntb/ntb_transport.c +9 -2
@@ -911,7 +911,7 @@ static int ntb_set_mw(struct ntb_transporeturn 0 ; } -static void ntb_qp_link_down_reset (struct ntb_transport_qp *qp) +static void ntb_qp_link_context_reset (struct ntb_transport_qp *qp) { qp->link_is_up = false; qp->active = false;
@@ -934,6 +934,13 @@ static void ntb_qp_link_down_reset(struc qp->tx_async =0 ; } +static void ntb_qp_link_down_reset (struct ntb_transport_qp *qp) +{ +ntb_qp_link_context_reset (qp); +if (qp->remote_rx_info) + qp->remote_rx_info->entry = qp->rx_max_entry -1 ; +} +static void ntb_qp_link_cleanup (struct ntb_transport_qp *qp) {struct ntb_transport_ctx *nt = qp->transport;
@@ -1176,7 +1183,7 @@ static int ntb_transport_init_queue(stru qp->ndev = nt->ndev; qp->client_ready = false; qp->event_handler =NULL ; -ntb_qp_link_down_reset (qp); +ntb_qp_link_context_reset (qp);if (mw_num < qp_count % mw_count) num_qps_mw = qp_count / mw_count +1 ;
Greg Kroah-Hartman
maintainerPATCH 290/406 ntb: Fix calculation ntb_transport_tx_free_entry()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
commit 5a7693e6bbf19b22fd6c1d2c4b7beb0a03969e2c upstream.
ntb_transport_tx_free_entry() never returns 0 with the current calculation. If head == tail, then it would return qp->tx_max_entry. Change compare to tail >= head and when they are equal, a 0 would be returned.
--- drivers/ntb/ntb_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ntb/ntb_transport.c +1 -1
@@ -2431,7 +2431,7 @@ unsigned int ntb_transport_tx_free_entryunsigned int head = qp->tx_index;unsigned int tail = qp->remote_rx_info->entry; -return tail > head ? tail - head : qp->tx_max_entry + tail - head; +return tail >= head ? tail - head : qp->tx_max_entry + tail - head; }EXPORT_SYMBOL_GPL (ntb_transport_tx_free_entry);
Greg Kroah-Hartman
maintainerPATCH 291/406 Revert "PCI: Mark NVIDIA T4 GPUs to avoid bus reset"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Helgaas <[email protected]>
commit 5260bd6d36c83c5b269c33baaaf8c78e520908b0 upstream.
This reverts commit d5af729dc2071273f14cbb94abbc60608142fd83.
d5af729dc207 ("PCI: Mark NVIDIA T4 GPUs to avoid bus reset") avoided Secondary Bus Reset on the T4 because the reset seemed to not work when the T4 was directly attached to a Root Port.
But NVIDIA thinks the issue is probably related to some issue with the Root Port, not with the T4. The T4 provides neither PM nor FLR reset, so masking bus reset compromises this device for assignment scenarios.
Revert d5af729dc207 as requested by Wu Zongyong. This will leave SBR broken in the specific configuration Wu tested, as it was in v6.5, so Wu will debug that further.
--- drivers/pci/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/quirks.c +1 -1
@@ -3578,7 +3578,7 @@ static void quirk_no_bus_reset(struct pc*/ static void quirk_nvidia_no_bus_reset (struct pci_dev *dev) { -if ((dev->device &0xffc0 ) ==0x2340 || dev->device ==0x1eb8 ) +if ((dev->device &0xffc0 ) ==0x2340 )quirk_no_bus_reset (dev); } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
Greg Kroah-Hartman
maintainerPATCH 292/406 procfs: block chmod on /proc/thread-self/comm
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksa Sarai <[email protected]>
commit ccf61486fe1e1a48e18c638d1813cda77b3c0737 upstream.
Due to an oversight in commit 1b3044e39a89 ("procfs: fix pthread cross-thread naming if !PR_DUMPABLE") in switching from REG to NOD, chmod operations on /proc/thread-self/comm were no longer blocked as they are on almost all other procfs files.
A very similar situation with /proc/self/environ was used to as a root exploit a long time ago, but procfs has SB_I_NOEXEC so this is simply a correctness issue.
Ref: https://lwn.net/Articles/191954/
Ref: 6d76fa58b050 ("Don't allow chmod() on the /proc/<pid>/ files")
Message-Id: <[email protected]>
--- fs/proc/base.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/proc/base.c +2 -1
@@ -3506,7 +3506,8 @@ static int proc_tid_comm_permission(stru }static const struct inode_operations proc_tid_comm_inode_operations = { - .permission = proc_tid_comm_permission, + .setattr = proc_setattr, + .permission = proc_tid_comm_permission, };/*
Greg Kroah-Hartman
maintainerPATCH 293/406 parisc: Fix /proc/cpuinfo output for lscpu
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 9f5ba4b3e1b3c123eeca5d2d09161e8720048b5c upstream.
The lscpu command is broken since commit cab56b51ec0e ("parisc: Fix device names in /proc/iomem") added the PA pathname to all PA devices, includig the CPUs.
lscpu parses /proc/cpuinfo and now believes it found different CPU types since every CPU is listed with an unique identifier (PA pathname).
Fix this problem by simply dropping the PA pathname when listing the CPUs in /proc/cpuinfo. There is no need to show the pathname in this procfs file.
--- arch/parisc/kernel/processor.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
arch/parisc/kernel/processor.c +10 -3
@@ -373,10 +373,18 @@ int show_cpuinfo (struct seq_file *m, void *v) { unsigned long cpu; +char cpu_name[60 ], *p; + +/* strip PA path from CPU name to not confuse lscpu */ +strlcpy (cpu_name,per_cpu (cpu_data,0 ).dev->name,sizeof (cpu_name)); + p =strrchr (cpu_name,'[' ); +if (p) + *(--p) =0 ;for_each_online_cpu (cpu) { -const struct cpuinfo_parisc *cpuinfo = &per_cpu (cpu_data, cpu);#ifdef CONFIG_SMP +const struct cpuinfo_parisc *cpuinfo = &per_cpu (cpu_data, cpu); +if (0 == cpuinfo->hpa)continue ;#endif
@@ -421,8 +429,7 @@ show_cpuinfo (struct seq_file *m, void *seq_printf (m,"model\t\t: %s - %s\n" , boot_cpu_data.pdc.sys_model_name, - cpuinfo->dev ? - cpuinfo->dev->name :"Unknown" ); + cpu_name); seq_printf(m, "hversion\t: 0x%08x\n" "sversion\t: 0x%08x\n",
Greg Kroah-Hartman
maintainerPATCH 294/406 bpf: Fix issue in verifying allow_ptr_leaks
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yafang Shao <[email protected]>
commit d75e30dddf73449bc2d10bb8e2f1a2c446bc67a2 upstream.
After we converted the capabilities of our networking-bpf program from cap_sys_admin to cap_net_admin+cap_bpf, our networking-bpf program failed to start. Because it failed the bpf verifier, and the error log is "R3 pointer comparison prohibited".
A simple reproducer as follows,
SEC("cls-ingress")
int ingress(struct __sk_buff *skb)
{
struct iphdr *iph = (void *)(long)skb->data + sizeof(struct ethhdr);
if ((long)(iph + 1) > (long)skb->data_end)
return TC_ACT_STOLEN;
return TC_ACT_OK;
}Per discussion with Yonghong and Alexei [1], comparison of two packet pointers is not a pointer leak. This patch fixes it.
Our local kernel is 6.1.y and we expect this fix to be backported to 6.1.y, so stable is CCed.
[1]. https://lore.kernel.org/bpf/CAADnVQ+Nmspr7Si+pxWn8zkE7hX-7s93ugwC+94aXSy4uQ9vBg@mail.gmail.com/
--- kernel/bpf/verifier.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
kernel/bpf/verifier.c +9 -8
@@ -8178,6 +8178,12 @@ static int check_cond_jmp_op(struct bpf_return -EINVAL ; } +/* check src2 operand */ + err =check_reg_arg (env, insn->dst_reg,SRC_OP ); +if (err) +return err; + + dst_reg = ®s[insn->dst_reg];if (BPF_SRC (insn->code) ==BPF_X ) {if (insn->imm !=0 ) {verbose (env,"BPF_JMP/JMP32 uses reserved fields\n" );
@@ -8189,12 +8195,13 @@ static int check_cond_jmp_op(struct bpf_if (err)return err; -if (is_pointer_value (env, insn->src_reg)) { + src_reg = ®s[insn->src_reg]; +if (!(reg_is_pkt_pointer_any (dst_reg) &®_is_pkt_pointer_any (src_reg)) && +is_pointer_value (env, insn->src_reg)) {verbose (env,"R%d pointer comparison prohibited\n" , insn->src_reg);return -EACCES ; } - src_reg = ®s[insn->src_reg]; }else {if (insn->src_reg !=BPF_REG_0 ) {verbose (env,"BPF_JMP/JMP32 uses reserved fields\n" );
@@ -8202,12 +8209,6 @@ static int check_cond_jmp_op(struct bpf_ } } -/* check src2 operand */ - err =check_reg_arg (env, insn->dst_reg,SRC_OP ); -if (err) -return err; - - dst_reg = ®s[insn->dst_reg]; is_jmp32 =BPF_CLASS (insn->code) ==BPF_JMP32 ;if (BPF_SRC (insn->code) ==BPF_K ) {
Re: [PATCH 5.10 294/406] bpf: Fix issue in verifying allow_ptr_leaks
Quoted 1 line · Greg Kroah-Hartman
5.10-stable review patch. If anyone has any objections, please let me know.
I believe Luis Gerhorst posted an objection to this patch for 6.1 in [1], for reasons described in [2]. The objection is relevant for 5.10 as well (does not depend on kernel version, actually).
[1] https://lore.kernel.org/all/2023091653-peso-sprint-889d@gregkh/
[2] https://lore.kernel.org/bpf/[email protected]/
Quoted 90 lines
------------------
From: Yafang Shao <[email protected]>
commit
d75e30dddf73449bc2d10bb8e2f1a2c446bc67a2upstream.After we converted the capabilities of our networking-bpf program from
cap_sys_adminto cap_net_admin+cap_bpf, our networking-bpf program failed to start. Because it failed the bpf verifier, and the error log is "R3 pointer comparison prohibited".A simple reproducer as follows,
SEC("cls-ingress")
intingress(struct __sk_buff *skb){ struct iphdr *iph = (void *)(long)skb->data + sizeof(struct ethhdr); if ((long)(iph + 1) > (long)skb->data_end) return TC_ACT_STOLEN; return TC_ACT_OK; }Per discussion with Yonghong and Alexei [1], comparison of two packet pointers is not a pointer leak. This patch fixes it.
Our local kernel is 6.1.y and we expect this fix to be backported to 6.1.y, so stable is CCed.
[1]. https://lore.kernel.org/bpf/CAADnVQ+Nmspr7Si+pxWn8zkE7hX-7s93ugwC+94aXSy4uQ9vBg@mail.gmail.com/
Suggested-by Yonghong Song <[email protected]>Suggested-by Alexei Starovoitov <[email protected]>Signed-off-by Yafang Shao <[email protected]>Acked-by Eduard Zingerman <[email protected]>Signed-off-by Alexei Starovoitov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- kernel/bpf/verifier.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)kernel/bpf/verifier.c +9
-8@@ -8178,6 +8178,12 @@ static int check_cond_jmp_op(struct bpf_return -EINVAL ; } +/* check src2 operand */ + err =check_reg_arg (env, insn->dst_reg,SRC_OP ); +if (err) +return err; + + dst_reg = ®s[insn->dst_reg];if (BPF_SRC (insn->code) ==BPF_X ) {if (insn->imm !=0 ) {verbose (env,"BPF_JMP/JMP32 uses reserved fields\n" );@@ -8189,12 +8195,13 @@ static int check_cond_jmp_op(struct bpf_if (err)return err; -if (is_pointer_value (env, insn->src_reg)) { + src_reg = ®s[insn->src_reg]; +if (!(reg_is_pkt_pointer_any (dst_reg) &®_is_pkt_pointer_any (src_reg)) && +is_pointer_value (env, insn->src_reg)) {verbose (env,"R%d pointer comparison prohibited\n" , insn->src_reg);return -EACCES ; } - src_reg = ®s[insn->src_reg]; }else {if (insn->src_reg !=BPF_REG_0 ) {verbose (env,"BPF_JMP/JMP32 uses reserved fields\n" );@@ -8202,12 +8209,6 @@ static int check_cond_jmp_op(struct bpf_ } } -/* check src2 operand */ - err =check_reg_arg (env, insn->dst_reg,SRC_OP ); -if (err) -return err; - - dst_reg = ®s[insn->dst_reg]; is_jmp32 =BPF_CLASS (insn->code) ==BPF_JMP32 ;if (BPF_SRC (insn->code) ==BPF_K ) {
Re: [PATCH 5.10 294/406] bpf: Fix issue in verifying allow_ptr_leaks
Quoted 7 lines · Eduard Zingerman
Quoted 1 line · Greg Kroah-Hartman
5.10-stable review patch. If anyone has any objections, please let me know.
I believe Luis Gerhorst posted an objection to this patch for 6.1 in [1], for reasons described in [2]. The objection is relevant for 5.10 as well (does not depend on kernel version, actually).
Yes. Let's delay the backport of this patch until that thread is resolved.
Greg Kroah-Hartman
maintainerRe: [PATCH 5.10 294/406] bpf: Fix issue in verifying allow_ptr_leaks
Quoted 10 lines · Alexei Starovoitov
Quoted 7 lines · Eduard Zingerman
Quoted 1 line · Greg Kroah-Hartman
5.10-stable review patch. If anyone has any objections, please let me know.
I believe Luis Gerhorst posted an objection to this patch for 6.1 in [1], for reasons described in [2]. The objection is relevant for 5.10 as well (does not depend on kernel version, actually).
Yes. Let's delay the backport of this patch until that thread is resolved.
Ok, but note, this is already in a released 6.1.y and 6.5.y release so we need fixes in there for whatever ends up in Linus's tree to resolve this. I'll drop this from the pending queues right now for now.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 295/406 dlm: fix plock lookup when using multiple lockspaces
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Aring <[email protected]>
commit 7c53e847ff5e97f033fdd31f71949807633d506b upstream.
All posix lock ops, for all lockspaces (gfs2 file systems) are sent to userspace (dlm_controld) through a single misc device. The dlm_controld daemon reads the ops from the misc device and sends them to other cluster nodes using separate, per-lockspace cluster api communication channels. The ops for a single lockspace are ordered at this level, so that the results are received in the same sequence that the requests were sent. When the results are sent back to the kernel via the misc device, they are again funneled through the single misc device for all lockspaces. When the dlm code in the kernel processes the results from the misc device, these results will be returned in the same sequence that the requests were sent, on a per-lockspace basis. A recent change in this request/reply matching code missed the "per-lockspace" check (fsid comparison) when matching request and reply, so replies could be incorrectly matched to requests from other lockspaces.
--- fs/dlm/plock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/dlm/plock.c +3 -3
@@ -466,7 +466,8 @@ static ssize_t dev_write(struct file *fi } }else {list_for_each_entry (iter, &recv_list, list) { -if (!iter->info.wait) { +if (!iter->info.wait && + iter->info.fsid == info.fsid) { op = iter;break ; }
@@ -478,8 +479,7 @@ static ssize_t dev_write(struct file *fiif (info.wait)WARN_ON (op->info.optype !=DLM_PLOCK_OP_LOCK );else -WARN_ON (op->info.fsid != info.fsid || - op->info.number != info.number || +WARN_ON (op->info.number != info.number || op->info.owner != info.owner || op->info.optype != info.optype);
Greg Kroah-Hartman
maintainerPATCH 296/406 dccp: Fix out of bounds access in DCCP error handler
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
commit 977ad86c2a1bcaf58f01ab98df5cc145083c489c upstream.
There was a previous attempt to fix an out-of-bounds access in the DCCP error handlers, but that fix assumed that the error handlers only want to access the first 8 bytes of the DCCP header. Actually, they also look at the DCCP sequence number, which is stored beyond 8 bytes, so an explicit pskb_may_pull() is required.
--- net/dccp/ipv4.c | 13 +++++++++---- net/dccp/ipv6.c | 15 ++++++++++----- 2 files changed, 19 insertions(+), 9 deletions(-)
net/dccp/ipv4.c +9 -4
@@ -243,12 +243,17 @@ static int dccp_v4_err(struct sk_buff *sint err;struct net *net =dev_net (skb->dev); -/* Only need dccph_dport & dccph_sport which are the first -* 4 bytes in dccp header. +/* For the first __dccp_basic_hdr_len() check, we only need dh->dccph_x, +* which is in byte 7 of the dccp header. * Our caller (icmp_socket_deliver()) already pulled 8 bytes for us. +* +* Later on, we want to access the sequence number fields, which are +* beyond 8 bytes, so we have to pskb_may_pull() ourselves. */ - BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_sport) > 8); - BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8); + dh = (struct dccp_hdr *)(skb->data + offset); +if (!pskb_may_pull (skb, offset +__dccp_basic_hdr_len (dh))) +return -EINVAL ; + iph = (struct iphdr *)skb->data; dh = (struct dccp_hdr *)(skb->data + offset); sk = __inet_lookup_established(net, &dccp_hashinfo,
net/dccp/ipv6.c +10 -5
@@ -67,7 +67,7 @@ static inline __u64 dccp_v6_init_sequencstatic int dccp_v6_err (struct sk_buff *skb,struct inet6_skb_parm *opt,u8 type,u8 code,int offset,__be32 info) { -const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data; +const struct ipv6hdr *hdr;const struct dccp_hdr *dh;struct dccp_sock *dp;struct ipv6_pinfo *np;
@@ -76,12 +76,17 @@ static int dccp_v6_err(struct sk_buff *s__u64 seq;struct net *net =dev_net (skb->dev); -/* Only need dccph_dport & dccph_sport which are the first -* 4 bytes in dccp header. +/* For the first __dccp_basic_hdr_len() check, we only need dh->dccph_x, +* which is in byte 7 of the dccp header. * Our caller (icmpv6_notify()) already pulled 8 bytes for us. +* +* Later on, we want to access the sequence number fields, which are +* beyond 8 bytes, so we have to pskb_may_pull() ourselves. */ - BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_sport) > 8); - BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8); + dh = (struct dccp_hdr *)(skb->data + offset); +if (!pskb_may_pull (skb, offset +__dccp_basic_hdr_len (dh))) +return -EINVAL ; + hdr = (const struct ipv6hdr *)skb->data; dh = (struct dccp_hdr *)(skb->data + offset); sk = __inet6_lookup_established(net, &dccp_hashinfo,
Greg Kroah-Hartman
maintainerPATCH 297/406 X.509: if signature is unsupported skip validation
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thore Sommer <[email protected]>
commit ef5b52a631f8c18353e80ccab8408b963305510c upstream.
When the hash algorithm for the signature is not available the digest size is 0 and the signature in the certificate is marked as unsupported.
When validating a self-signed certificate, this needs to be checked, because otherwise trying to validate the signature will fail with an warning:
Loading compiled-in X.509 certificates
WARNING: CPU: 0 PID: 1 at crypto/rsa-pkcs1pad.c:537 \ pkcs1pad_verify+0x46/0x12c
...
Problem loading in-kernel X.509 certificate (-22)
--- crypto/asymmetric_keys/x509_public_key.c | 5 +++++ 1 file changed, 5 insertions(+)
crypto/asymmetric_keys/x509_public_key.c +5 -0
@@ -132,6 +132,11 @@ int x509_check_for_self_signed(struct x5if (strcmp (cert->pub->pkey_algo, cert->sig->pkey_algo) !=0 ) goto out; +if (cert->unsupported_sig) { + ret =0 ; + goto out; + } + ret =public_key_verify_signature (cert->pub, cert->sig);if (ret <0 ) {if (ret == -ENOPKG ) {
Greg Kroah-Hartman
maintainerPATCH 298/406 net: handle ARPHRD_PPP in dev_is_mac_header_xmit()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Dichtel <[email protected]>
commit a4f39c9f14a634e4cd35fcd338c239d11fcc73fc upstream.
The goal is to support a bpf_redirect() from an ethernet device (ingress) to a ppp device (egress).
The l2 header is added automatically by the ppp driver, thus the ethernet header should be removed.
--- include/linux/if_arp.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/if_arp.h +4 -0
@@ -52,6 +52,10 @@ static inline bool dev_is_mac_header_xmicase ARPHRD_NONE :case ARPHRD_RAWIP :case ARPHRD_PIMREG : +/* PPP adds its l2 header automatically in ppp_start_xmit(). +* This makes it look like an l3 device to __bpf_redirect() and tcf_mirred_init(). +*/ +case ARPHRD_PPP :return false;default :return true;
Greg Kroah-Hartman
maintainerPATCH 299/406 fsverity: skip PKCS#7 parser when keyring is empty
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
commit 919dc320956ea353a7fb2d84265195ad5ef525ac upstream.
If an fsverity builtin signature is given for a file but the ".fs-verity" keyring is empty, there's no real reason to run the PKCS#7 parser. Skip this to avoid the PKCS#7 attack surface when builtin signature support is configured into the kernel but is not being used.
This is a hardening improvement, not a fix per se, but I've added Fixes and Cc stable to get it out to more users.
--- fs/verity/signature.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
fs/verity/signature.c +16 -0
@@ -61,6 +61,22 @@ int fsverity_verify_signature(const strureturn -EBADMSG ; } +if (fsverity_keyring->keys.nr_leaves_on_tree ==0 ) { +/* +* The ".fs-verity" keyring is empty, due to builtin signatures +* being supported by the kernel but not actually being used. +* In this case, verify_pkcs7_signature() would always return an +* error, usually ENOKEY. It could also be EBADMSG if the +* PKCS#7 is malformed, but that isn't very important to +* distinguish. So, just skip to ENOKEY to avoid the attack +* surface of the PKCS#7 parser, which would otherwise be +* reachable by any task able to execute FS_IOC_ENABLE_VERITY. +*/ +fsverity_err (inode, +"fs-verity keyring is empty, rejecting signed file!" ); +return -ENOKEY ; + } + d =kzalloc (sizeof (*d) + hash_alg->digest_size,GFP_KERNEL );if (!d)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 300/406 pstore/ram: Check start of empty przs during init
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Enlin Mu <[email protected]>
commit fe8c3623ab06603eb760444a032d426542212021 upstream.
After commit 30696378f68a ("pstore/ram: Do not treat empty buffers as valid"), initialization would assume a prz was valid after seeing that the buffer_size is zero (regardless of the buffer start position). This unchecked start value means it could be outside the bounds of the buffer, leading to future access panics when written to:
sysdump_panic_event+0x3b4/0x5b8 atomic_notifier_call_chain+0x54/0x90 panic+0x1c8/0x42c die+0x29c/0x2a8 die_kernel_fault+0x68/0x78 __do_kernel_fault+0x1c4/0x1e0 do_bad_area+0x40/0x100 do_translation_fault+0x68/0x80 do_mem_abort+0x68/0xf8 el1_da+0x1c/0xc0 __raw_writeb+0x38/0x174 __memcpy_toio+0x40/0xac persistent_ram_update+0x44/0x12c persistent_ram_write+0x1a8/0x1b8 ramoops_pstore_write+0x198/0x1e8 pstore_console_write+0x94/0xe0 ...
To avoid this, also check if the prz start is 0 during the initialization phase. If not, the next prz sanity check case will discover it (start > size) and zap the buffer back to a sane state.
--- fs/pstore/ram_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/pstore/ram_core.c +1 -1
@@ -504,7 +504,7 @@ static int persistent_ram_post_init(stru sig ^=PERSISTENT_RAM_SIG ;if (prz->buffer->sig == sig) { -if (buffer_size (prz) ==0 ) { +if (buffer_size (prz) ==0 &&buffer_start (prz) ==0 ) {pr_debug ("found existing empty buffer\n" );return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 301/406 s390/ipl: add missing secure/has_secure file to ipl type unknown
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Schnelle <[email protected]>
commit ea5717cb13468323a7c3dd394748301802991f39 upstream.
OS installers are relying on /sys/firmware/ipl/has_secure to be present on machines supporting secure boot. This file is present for all IPL types, but not the unknown type, which prevents a secure installation when an LPAR is booted in HMC via FTP(s), because this is an unknown IPL type in linux. While at it, also add the secure file.
--- arch/s390/kernel/ipl.c | 2 ++ 1 file changed, 2 insertions(+)
arch/s390/kernel/ipl.c +2 -0
@@ -501,6 +501,8 @@ static struct attribute_group ipl_ccw_atstatic struct attribute *ipl_unknown_attrs[] = { &sys_ipl_type_attr.attr, + &sys_ipl_secure_attr.attr, + &sys_ipl_has_secure_attr.attr,NULL , };
Greg Kroah-Hartman
maintainerPATCH 302/406 crypto: stm32 - fix loop iterating through scatterlist for DMA
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Bourgoin <[email protected]>
commit d9c83f71eeceed2cb54bb78be84f2d4055fd9a1f upstream.
We were reading the length of the scatterlist sg after copying value of tsg inside.
So we are using the size of the previous scatterlist and for the first one we are using an unitialised value.
Fix this by copying tsg in sg[0] before reading the size.
--- drivers/crypto/stm32/stm32-hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/stm32/stm32-hash.c +1 -1
@@ -564,9 +564,9 @@ static int stm32_hash_dma_send(struct st }for_each_sg (rctx->sg, tsg, rctx->nents, i) { + sg[0 ] = *tsg; len = sg->length; - sg[0 ] = *tsg;if (sg_is_last (sg)) {if (hdev->dma_mode ==1 ) { len = (ALIGN (sg->length,16 ) -16 );
Greg Kroah-Hartman
maintainerPATCH 303/406 cpufreq: brcmstb-avs-cpufreq: Fix -Warray-bounds bug
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
commit e520d0b6be950ce3738cf4b9bd3b392be818f1dc upstream.
Allocate extra space for terminating element at:
drivers/cpufreq/brcmstb-avs-cpufreq.c:
449 table[i].frequency = CPUFREQ_TABLE_END;
and add code comment to make this clear.
This fixes the following -Warray-bounds warning seen after building
ARM with multi_v7_defconfig (GCC 13):
In function 'brcm_avs_get_freq_table',
inlined from 'brcm_avs_cpufreq_init' at drivers/cpufreq/brcmstb-avs-cpufreq.c:623:15:drivers/cpufreq/brcmstb-avs-cpufreq.c:449:28: warning: array subscript 5 is outside array bounds of 'void[60]' [-Warray-bounds=]
449 | table[i].frequency = CPUFREQ_TABLE_END;
In file included from include/linux/node.h:18,
from include/linux/cpu.h:17,
from include/linux/cpufreq.h:12,
from drivers/cpufreq/brcmstb-avs-cpufreq.c:44:
In function 'devm_kmalloc_array',
inlined from 'devm_kcalloc' at include/linux/device.h:328:9,
inlined from 'brcm_avs_get_freq_table' at drivers/cpufreq/brcmstb-avs-cpufreq.c:437:10,
inlined from 'brcm_avs_cpufreq_init' at drivers/cpufreq/brcmstb-avs-cpufreq.c:623:15:include/linux/device.h:323:16: note: at offset 60 into object of size 60 allocated by 'devm_kmalloc'
323 | return devm_kmalloc(dev, bytes, flags);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy() and help us make progress towards globally enabling -Warray-bounds.
--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/cpufreq/brcmstb-avs-cpufreq.c +5 -1
@@ -434,7 +434,11 @@ brcm_avs_get_freq_table(struct device *dif (ret)return ERR_PTR (ret); - table =devm_kcalloc (dev,AVS_PSTATE_MAX +1 ,sizeof (*table), +/* +* We allocate space for the 5 different P-STATES AVS, +* plus extra space for a terminating element. +*/ + table =devm_kcalloc (dev,AVS_PSTATE_MAX +1 +1 ,sizeof (*table),GFP_KERNEL );if (!table)return ERR_PTR (-ENOMEM );
Greg Kroah-Hartman
maintainerPATCH 304/406 usb: typec: bus: verify partner exists in typec_altmode_attention
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: RD Babiera <[email protected]>
commit f23643306430f86e2f413ee2b986e0773e79da31 upstream.
Some usb hubs will negotiate DisplayPort Alt mode with the device but will then negotiate a data role swap after entering the alt mode. The data role swap causes the device to unregister all alt modes, however the usb hub will still send Attention messages even after failing to reregister the Alt Mode. type_altmode_attention currently does not verify whether or not a device's altmode partner exists, which results in a NULL pointer error when dereferencing the typec_altmode and typec_altmode_ops belonging to the altmode partner.
Verify the presence of a device's altmode partner before sending the Attention message to the Alt Mode driver.
--- drivers/usb/typec/bus.c | 12 ++++++++++-- drivers/usb/typec/tcpm/tcpm.c | 3 ++- include/linux/usb/typec_altmode.h | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-)
drivers/usb/typec/bus.c +10 -2
@@ -152,12 +152,20 @@ EXPORT_SYMBOL_GPL(typec_altmode_exit);* * Notifies the partner of @adev about Attention command. */ -void typec_altmode_attention (struct typec_altmode *adev,u32 vdo) +int typec_altmode_attention (struct typec_altmode *adev,u32 vdo) { -struct typec_altmode *pdev = &to_altmode (adev)->partner->adev; +struct altmode *partner =to_altmode (adev)->partner; +struct typec_altmode *pdev; + +if (!partner) +return -ENODEV ; + + pdev = &partner->adev;if (pdev->ops && pdev->ops->attention) pdev->ops->attention (pdev, vdo); + +return 0 ; }EXPORT_SYMBOL_GPL (typec_altmode_attention);
drivers/usb/typec/tcpm/tcpm.c +2 -1
@@ -1395,7 +1395,8 @@ static void tcpm_handle_vdm_request(stru }break ;case ADEV_ATTENTION : -typec_altmode_attention (adev, p[1 ]); +if (typec_altmode_attention (adev, p[1 ])) +tcpm_log (port,"typec_altmode_attention no port partner altmode" );break ; } }
include/linux/usb/typec_altmode.h +1 -1
@@ -67,7 +67,7 @@ struct typec_altmode_ops {int typec_altmode_enter (struct typec_altmode *altmode,u32 *vdo);int typec_altmode_exit (struct typec_altmode *altmode); -void typec_altmode_attention (struct typec_altmode *altmode,u32 vdo); +int typec_altmode_attention (struct typec_altmode *altmode,u32 vdo);int typec_altmode_vdm (struct typec_altmode *altmode,const u32 header,const u32 *vdo,int count); int typec_altmode_notify(struct typec_altmode *altmode, unsigned long conf,
Greg Kroah-Hartman
maintainerPATCH 305/406 USB: core: Unite old scheme and new scheme descriptor reads
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 85d07c55621676d47d873d2749b88f783cd4d5a1 upstream.
In preparation for reworking the usb_get_device_descriptor() routine, it is desirable to unite the two different code paths responsible for initially determining endpoint 0's maximum packet size in a newly discovered USB device. Making this determination presents a chicken-and-egg sort of problem, in that the only way to learn the maxpacket value is to get it from the device descriptor retrieved from the device, but communicating with the device to retrieve a descriptor requires us to know beforehand the ep0 maxpacket size.
In practice this problem is solved in two different ways, referred to in hub.c as the "old scheme" and the "new scheme". The old scheme (which is the approach recommended by the USB-2 spec) involves asking the device to send just the first eight bytes of its device descriptor. Such a transfer uses packets containing no more than eight bytes each, and every USB device must have an ep0 maxpacket size
Quoted 1 line
= 8, so this should succeed. Since the bMaxPacketSize0 field of the
device descriptor lies within the first eight bytes, this is all we need.
The new scheme is an imitation of the technique used in an early Windows USB implementation, giving it the happy advantage of working with a wide variety of devices (some of them at the time would not work with the old scheme, although that's probably less true now). It involves making an initial guess of the ep0 maxpacket size, asking the device to send up to 64 bytes worth of its device descriptor (which is only 18 bytes long), and then resetting the device to clear any error condition that might have resulted from the guess being wrong. The initial guess is determined by the connection speed; it should be correct in all cases other than full speed, for which the allowed values are 8, 16, 32, and 64 (in this case the initial guess is 64).
The reason for this patch is that the old- and new-scheme parts of hub_port_init() use different code paths, one involving usb_get_device_descriptor() and one not, for their initial reads of the device descriptor. Since these reads have essentially the same purpose and are made under essentially the same circumstances, this is illogical. It makes more sense to have both of them use a common subroutine.
This subroutine does basically what the new scheme's code did, because that approach is more general than the one used by the old scheme. It only needs to know how many bytes to transfer and whether or not it is being called for the first iteration of a retry loop (in case of certain time-out errors). There are two main differences from the former code:
We initialize the bDescriptorType field of the transfer buffer to 0 before performing the transfer, to avoid possibly accessing an uninitialized value afterward.
We read the device descriptor into a temporary buffer rather than storing it directly into udev->descriptor, which the old scheme implementation used to do.
Since the whole point of this first read of the device descriptor is to determine the bMaxPacketSize0 value, that is what the new routine returns (or an error code). The value is stored in a local variable rather than in udev->descriptor. As a side effect, this necessitates moving a section of code that checks the bcdUSB field for SuperSpeed devices until after the full device descriptor has been retrieved.
--- drivers/usb/core/hub.c | 173 ++++++++++++++++++++++++++----------------------- 1 file changed, 94 insertions(+), 79 deletions(-)
drivers/usb/core/hub.c +94 -79
@@ -4594,6 +4594,67 @@ static int hub_enable_device(struct usb_return hcd->driver->enable_device (hcd, udev); } +/* +* Get the bMaxPacketSize0 value during initialization by reading the +* device's device descriptor. Since we don't already know this value, +* the transfer is unsafe and it ignores I/O errors, only testing for +* reasonable received values. +* +* For "old scheme" initialization, size will be 8 so we read just the +* start of the device descriptor, which should work okay regardless of +* the actual bMaxPacketSize0 value. For "new scheme" initialization, +* size will be 64 (and buf will point to a sufficiently large buffer), +* which might not be kosher according to the USB spec but it's what +* Windows does and what many devices expect. +* +* Returns: bMaxPacketSize0 or a negative error code. +*/ +static int get_bMaxPacketSize0 (struct usb_device *udev, +struct usb_device_descriptor *buf,int size,bool first_time) +{ +int i, rc; + +/* +* Retry on all errors; some devices are flakey. +* 255 is for WUSB devices, we actually need to use +* 512 (WUSB1.0[4.8.1]). +*/ +for (i =0 ; i <GET_MAXPACKET0_TRIES ; ++i) { +/* Start with invalid values in case the transfer fails */ + buf->bDescriptorType = buf->bMaxPacketSize0 =0 ; + rc =usb_control_msg (udev,usb_rcvaddr0pipe (), +USB_REQ_GET_DESCRIPTOR ,USB_DIR_IN , +USB_DT_DEVICE <<8 ,0 , + buf, size, + initial_descriptor_timeout); +switch (buf->bMaxPacketSize0) { +case 8 :case 16 :case 32 :case 64 :case 255 : +if (buf->bDescriptorType ==USB_DT_DEVICE ) { + rc = buf->bMaxPacketSize0; +break ; + } + fallthrough; +default : +if (rc >=0 ) + rc = -EPROTO ; +break ; + } + +/* +* Some devices time out if they are powered on +* when already connected. They need a second +* reset, so return early. But only on the first +* attempt, lest we get into a time-out/reset loop. +*/ +if (rc >0 || (rc == -ETIMEDOUT && first_time && + udev->speed >USB_SPEED_FULL )) +break ; + } +return rc; +} + +#define GET_DESCRIPTOR_BUFSIZE 64 +/* Reset device, (re)assign address, get device descriptor. * Device connection must be stable, no more debouncing needed. * Returns device in USB_STATE_ADDRESS, except on error.
@@ -4618,6 +4679,12 @@ hub_port_init(struct usb_hub *hub, strucint devnum = udev->devnum;const char *driver_name;bool do_new_scheme; +int maxp0; +struct usb_device_descriptor *buf; + + buf =kmalloc (GET_DESCRIPTOR_BUFSIZE ,GFP_NOIO ); +if (!buf) +return -ENOMEM ;/* root hub ports have a slightly longer reset period * (from USB 2.0 spec, section 7.1.7.5)
@@ -4732,9 +4799,6 @@ hub_port_init(struct usb_hub *hub, strucfor (retries =0 ; retries <GET_DESCRIPTOR_TRIES ; (++retries,msleep (100 ))) {if (do_new_scheme) { -struct usb_device_descriptor *buf; -int r =0 ; - retval =hub_enable_device (udev);if (retval <0 ) { dev_err(&udev->dev,
@@ -4743,52 +4807,8 @@ hub_port_init(struct usb_hub *hub, struc goto fail; } -#define GET_DESCRIPTOR_BUFSIZE 64 - buf =kmalloc (GET_DESCRIPTOR_BUFSIZE ,GFP_NOIO ); -if (!buf) { - retval = -ENOMEM ; -continue ; - } - -/* Retry on all errors; some devices are flakey. -* 255 is for WUSB devices, we actually need to use -* 512 (WUSB1.0[4.8.1]). -*/ -for (operations =0 ; operations <GET_MAXPACKET0_TRIES ; - ++operations) { - buf->bMaxPacketSize0 =0 ; - r =usb_control_msg (udev,usb_rcvaddr0pipe (), -USB_REQ_GET_DESCRIPTOR ,USB_DIR_IN , -USB_DT_DEVICE <<8 ,0 , - buf,GET_DESCRIPTOR_BUFSIZE , - initial_descriptor_timeout); -switch (buf->bMaxPacketSize0) { -case 8 :case 16 :case 32 :case 64 :case 255 : -if (buf->bDescriptorType == -USB_DT_DEVICE ) { - r =0 ; -break ; - } - fallthrough; -default : -if (r ==0 ) - r = -EPROTO ; -break ; - } -/* -* Some devices time out if they are powered on -* when already connected. They need a second -* reset. But only on the first attempt, -* lest we get into a time out/reset loop -*/ -if (r ==0 || (r == -ETIMEDOUT && - retries ==0 && - udev->speed >USB_SPEED_FULL )) -break ; - } - udev->descriptor.bMaxPacketSize0 = - buf->bMaxPacketSize0; -kfree (buf); + maxp0 =get_bMaxPacketSize0 (udev, buf, +GET_DESCRIPTOR_BUFSIZE , retries ==0 ); retval =hub_port_reset (hub, port1, udev, delay, false);if (retval <0 )/* error or disconnect */
@@ -4799,14 +4819,13 @@ hub_port_init(struct usb_hub *hub, struc retval = -ENODEV ; goto fail; } -if (r) { -if (r != -ENODEV ) +if (maxp0 <0 ) { +if (maxp0 != -ENODEV )dev_err (&udev->dev,"device descriptor read/64, error %d\n" , - r); - retval = -EMSGSIZE ; + maxp0); + retval = maxp0;continue ; } -#undef GET_DESCRIPTOR_BUFSIZE }/*
@@ -4848,19 +4867,17 @@ hub_port_init(struct usb_hub *hub, strucbreak ; } - retval =usb_get_device_descriptor (udev,8 ); -if (retval <8 ) { +/* !do_new_scheme || wusb */ + maxp0 =get_bMaxPacketSize0 (udev, buf,8 , retries ==0 ); +if (maxp0 <0 ) { + retval = maxp0;if (retval != -ENODEV )dev_err (&udev->dev,"device descriptor read/8, error %d\n" , retval); -if (retval >=0 ) - retval = -EMSGSIZE ; }else {u32 delay; - retval =0 ; - delay = udev->parent->hub_delay; udev->hub_delay =min_t (u32, delay,USB_TP_TRANSMISSION_DELAY_MAX );
@@ -4877,27 +4894,10 @@ hub_port_init(struct usb_hub *hub, strucif (retval) goto fail; -/* -* Some superspeed devices have finished the link training process -* and attached to a superspeed hub port, but the device descriptor -* got from those devices show they aren't superspeed devices. Warm -* reset the port attached by the devices can fix them. -*/ -if ((udev->speed >=USB_SPEED_SUPER ) && - (le16_to_cpu (udev->descriptor.bcdUSB) <0x0300 )) { -dev_err (&udev->dev,"got a wrong device descriptor, " -"warm reset device\n" ); -hub_port_reset (hub, port1, udev, -HUB_BH_RESET_TIME , true); - retval = -EINVAL ; - goto fail; - } - -if (udev->descriptor.bMaxPacketSize0 ==0xff || - udev->speed >=USB_SPEED_SUPER ) +if (maxp0 ==0xff || udev->speed >=USB_SPEED_SUPER ) i =512 ;else - i = udev->descriptor.bMaxPacketSize0; + i = maxp0;if (usb_endpoint_maxp (&udev->ep0.desc) != i) {if (udev->speed ==USB_SPEED_LOW || !(i ==8 || i ==16 || i ==32 || i ==64 )) {
@@ -4923,6 +4923,20 @@ hub_port_init(struct usb_hub *hub, struc goto fail; } +/* +* Some superspeed devices have finished the link training process +* and attached to a superspeed hub port, but the device descriptor +* got from those devices show they aren't superspeed devices. Warm +* reset the port attached by the devices can fix them. +*/ +if ((udev->speed >=USB_SPEED_SUPER ) && + (le16_to_cpu (udev->descriptor.bcdUSB) <0x0300 )) { +dev_err (&udev->dev,"got a wrong device descriptor, warm reset device\n" ); +hub_port_reset (hub, port1, udev,HUB_BH_RESET_TIME , true); + retval = -EINVAL ; + goto fail; + } +usb_detect_quirks (udev);if (udev->wusb ==0 &&le16_to_cpu (udev->descriptor.bcdUSB) >=0x0201 ) {
@@ -4943,6 +4957,7 @@ fail:hub_port_disable (hub, port1,0 );update_devnum (udev, devnum);/* for disconnect processing */ } +kfree (buf);return retval; }
Greg Kroah-Hartman
maintainerPATCH 306/406 USB: core: Change usb_get_device_descriptor() API
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit de28e469da75359a2bb8cd8778b78aa64b1be1f4 upstream.
The usb_get_device_descriptor() routine reads the device descriptor from the udev device and stores it directly in udev->descriptor. This interface is error prone, because the USB subsystem expects in-memory copies of a device's descriptors to be immutable once the device has been initialized.
The interface is changed so that the device descriptor is left in a kmalloc-ed buffer, not copied into the usb_device structure. A pointer to the buffer is returned to the caller, who is then responsible for kfree-ing it. The corresponding changes needed in the various callers are fairly small.
--- drivers/usb/core/hcd.c | 10 +++++++--- drivers/usb/core/hub.c | 44 +++++++++++++++++++++++--------------------- drivers/usb/core/message.c | 29 ++++++++++++----------------- drivers/usb/core/usb.h | 4 ++-- 4 files changed, 44 insertions(+), 43 deletions(-)
drivers/usb/core/hcd.c +7 -3
@@ -982,6 +982,7 @@ static int register_root_hub(struct usb_ {struct device *parent_dev = hcd->self.controller;struct usb_device *usb_dev = hcd->self.root_hub; +struct usb_device_descriptor *descr;const int devnum =1 ;int retval;
@@ -993,13 +994,16 @@ static int register_root_hub(struct usb_mutex_lock (&usb_bus_idr_lock); usb_dev->ep0.desc.wMaxPacketSize =cpu_to_le16 (64 ); - retval =usb_get_device_descriptor (usb_dev,USB_DT_DEVICE_SIZE ); -if (retval !=sizeof usb_dev->descriptor) { + descr =usb_get_device_descriptor (usb_dev); +if (IS_ERR (descr)) { + retval =PTR_ERR (descr);mutex_unlock (&usb_bus_idr_lock);dev_dbg (parent_dev,"can't read %s device descriptor %d\n" ,dev_name (&usb_dev->dev), retval); -return (retval <0 ) ? retval : -EMSGSIZE ; +return retval; } + usb_dev->descriptor = *descr; +kfree (descr);if (le16_to_cpu (usb_dev->descriptor.bcdUSB) >=0x0201 ) { retval =usb_get_bos_descriptor (usb_dev);
drivers/usb/core/hub.c +23 -21
104 lines not on this page · raw message
drivers/usb/core/message.c +12 -17
@@ -1039,39 +1039,34 @@ char *usb_cache_string(struct usb_device }/* -* usb_get_device_descriptor - (re)reads the device descriptor (usbcore) -* @dev: the device whose device descriptor is being updated -* @size: how much of the descriptor to read +* usb_get_device_descriptor - read the device descriptor +* @udev: the device whose device descriptor should be read * Context: !in_interrupt () * -* Updates the copy of the device descriptor stored in the device structure, -* which dedicates space for this purpose. -* * Not exported, only for use by the core. If drivers really want to read * the device descriptor directly, they can call usb_get_descriptor() with * type = USB_DT_DEVICE and index = 0. * -* This call is synchronous, and may not be used in an interrupt context. -* -* Return: The number of bytes received on success, or else the status code -* returned by the underlying usb_control_msg() call. +* Returns: a pointer to a dynamically allocated usb_device_descriptor +* structure (which the caller must deallocate), or an ERR_PTR value. */ -int usb_get_device_descriptor (struct usb_device *dev,unsigned int size) +struct usb_device_descriptor *usb_get_device_descriptor (struct usb_device *udev) {struct usb_device_descriptor *desc;int ret; -if (size >sizeof (*desc)) -return -EINVAL ; desc =kmalloc (sizeof (*desc),GFP_NOIO );if (!desc) -return -ENOMEM ; +return ERR_PTR (-ENOMEM ); + + ret =usb_get_descriptor (udev,USB_DT_DEVICE ,0 , desc,sizeof (*desc)); +if (ret ==sizeof (*desc)) +return desc; - ret =usb_get_descriptor (dev,USB_DT_DEVICE ,0 , desc, size);if (ret >=0 ) -memcpy (&dev->descriptor, desc, size); + ret = -EMSGSIZE ;kfree (desc); -return ret; +return ERR_PTR (ret); }/*
drivers/usb/core/usb.h +2 -2
@@ -42,8 +42,8 @@ extern bool usb_endpoint_is_ignored(stru struct usb_endpoint_descriptor *epd);extern int usb_remove_device (struct usb_device *udev); -extern int usb_get_device_descriptor (struct usb_device *dev, -unsigned int size); +extern struct usb_device_descriptor *usb_get_device_descriptor ( +struct usb_device *udev);extern int usb_set_isoch_delay (struct usb_device *dev);extern int usb_get_bos_descriptor (struct usb_device *dev);extern void usb_release_bos_descriptor (struct usb_device *dev);
Greg Kroah-Hartman
maintainerPATCH 307/406 USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit ff33299ec8bb80cdcc073ad9c506bd79bb2ed20b upstream.
Syzbot reported an out-of-bounds read in sysfs.c:read_descriptors():
BUG: KASAN: slab-out-of-bounds in read_descriptors+0x263/0x280 drivers/usb/core/sysfs.c:883 Read of size 8 at addr ffff88801e78b8c8 by task udevd/5011 CPU: 0 PID: 5011 Comm: udevd Not tainted 6.4.0-rc6-syzkaller-00195-g40f71e7cd3c6 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/27/2023 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xd9/0x150 lib/dump_stack.c:106 print_address_description.constprop.0+0x2c/0x3c0 mm/kasan/report.c:351 print_report mm/kasan/report.c:462 [inline] kasan_report+0x11c/0x130 mm/kasan/report.c:572 read_descriptors+0x263/0x280 drivers/usb/core/sysfs.c:883 ... Allocated by task 758: ... __do_kmalloc_node mm/slab_common.c:966 [inline] __kmalloc+0x5e/0x190 mm/slab_common.c:979 kmalloc include/linux/slab.h:563 [inline] kzalloc include/linux/slab.h:680 [inline] usb_get_configuration+0x1f7/0x5170 drivers/usb/core/config.c:887 usb_enumerate_device drivers/usb/core/hub.c:2407 [inline] usb_new_device+0x12b0/0x19d0 drivers/usb/core/hub.c:2545
As analyzed by Khazhy Kumykov, the cause of this bug is a race between read_descriptors() and hub_port_init(): The first routine uses a field in udev->descriptor, not expecting it to change, while the second overwrites it.
Prior to commit 45bf39f8df7f ("USB: core: Don't hold device lock while reading the "descriptors" sysfs file") this race couldn't occur, because the routines were mutually exclusive thanks to the device locking. Removing that locking from read_descriptors() exposed it to the race.
The best way to fix the bug is to keep hub_port_init() from changing udev->descriptor once udev has been initialized and registered. Drivers expect the descriptors stored in the kernel to be immutable; we should not undermine this expectation. In fact, this change should have been made long ago.
So now hub_port_init() will take an additional argument, specifying a buffer in which to store the device descriptor it reads. (If udev has not yet been initialized, the buffer pointer will be NULL and then hub_port_init() will store the device descriptor in udev as before.) This eliminates the data race responsible for the out-of-bounds read.
The changes to hub_port_init() appear more extensive than they really are, because of indentation changes resulting from an attempt to avoid writing to other parts of the usb_device structure after it has been initialized. Similar changes should be made to the code that reads the BOS descriptor, but that can be handled in a separate patch later on. This patch is sufficient to fix the bug found by syzbot.
--- drivers/usb/core/hub.c | 114 ++++++++++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 44 deletions(-)
drivers/usb/core/hub.c +70 -44
@@ -4669,10 +4669,17 @@ static int get_bMaxPacketSize0(struct us* the port lock. For a newly detected device that is not accessible * through any global pointers, it's not necessary to lock the device, * but it is still necessary to lock the port. +* +* For a newly detected device, @dev_descr must be NULL. The device +* descriptor retrieved from the device will then be stored in +* @udev->descriptor. For an already existing device, @dev_descr +* must be non-NULL. The device descriptor will be stored there, +* not in @udev->descriptor, because descriptors for registered +* devices are meant to be immutable. */ static int hub_port_init (struct usb_hub *hub,struct usb_device *udev,int port1, -int retry_counter) +int retry_counter,struct usb_device_descriptor *dev_descr) {struct usb_device *hdev = hub->hdev;struct usb_hcd *hcd =bus_to_hcd (hdev->bus);
@@ -4684,6 +4691,7 @@ hub_port_init(struct usb_hub *hub, strucint devnum = udev->devnum;const char *driver_name;bool do_new_scheme; +const bool initial = !dev_descr;int maxp0;struct usb_device_descriptor *buf, *descr;
@@ -4722,32 +4730,34 @@ hub_port_init(struct usb_hub *hub, struc } oldspeed = udev->speed; -/* USB 2.0 section 5.5.3 talks about ep0 maxpacket ... -* it's fixed size except for full speed devices. -* For Wireless USB devices, ep0 max packet is always 512 (tho -* reported as 0xff in the device descriptor). WUSB1.0[4.8.1]. -*/ -switch (udev->speed) { -case USB_SPEED_SUPER_PLUS : -case USB_SPEED_SUPER : -case USB_SPEED_WIRELESS :/* fixed at 512 */ - udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (512 ); -break ; -case USB_SPEED_HIGH :/* fixed at 64 */ - udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (64 ); -break ; -case USB_SPEED_FULL :/* 8, 16, 32, or 64 */ -/* to determine the ep0 maxpacket size, try to read -* the device descriptor to get bMaxPacketSize0 and -* then correct our initial guess. +if (initial) { +/* USB 2.0 section 5.5.3 talks about ep0 maxpacket ... +* it's fixed size except for full speed devices. +* For Wireless USB devices, ep0 max packet is always 512 (tho +* reported as 0xff in the device descriptor). WUSB1.0[4.8.1]. */ - udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (64 ); -break ; -case USB_SPEED_LOW :/* fixed at 8 */ - udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (8 ); -break ; -default : - goto fail; +switch (udev->speed) { +case USB_SPEED_SUPER_PLUS : +case USB_SPEED_SUPER : +case USB_SPEED_WIRELESS :/* fixed at 512 */ + udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (512 ); +break ; +case USB_SPEED_HIGH :/* fixed at 64 */ + udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (64 ); +break ; +case USB_SPEED_FULL :/* 8, 16, 32, or 64 */ +/* to determine the ep0 maxpacket size, try to read +* the device descriptor to get bMaxPacketSize0 and +* then correct our initial guess. +*/ + udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (64 ); +break ; +case USB_SPEED_LOW :/* fixed at 8 */ + udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (8 ); +break ; +default : + goto fail; + } }if (udev->speed ==USB_SPEED_WIRELESS )
@@ -4770,22 +4780,24 @@ hub_port_init(struct usb_hub *hub, strucif (udev->speed <USB_SPEED_SUPER )dev_info (&udev->dev,"%s %s USB device number %d using %s\n" , - (udev->config) ?"reset" :"new" , speed, + (initial ?"new" :"reset" ), speed, devnum, driver_name); -/* Set up TT records, if needed */ -if (hdev->tt) { - udev->tt = hdev->tt; - udev->ttport = hdev->ttport; - }else if (udev->speed !=USB_SPEED_HIGH - && hdev->speed ==USB_SPEED_HIGH ) { -if (!hub->tt.hub) { -dev_err (&udev->dev,"parent hub has no TT\n" ); - retval = -EINVAL ; - goto fail; +if (initial) { +/* Set up TT records, if needed */ +if (hdev->tt) { + udev->tt = hdev->tt; + udev->ttport = hdev->ttport; + }else if (udev->speed !=USB_SPEED_HIGH + && hdev->speed ==USB_SPEED_HIGH ) { +if (!hub->tt.hub) { +dev_err (&udev->dev,"parent hub has no TT\n" ); + retval = -EINVAL ; + goto fail; + } + udev->tt = &hub->tt; + udev->ttport = port1; } - udev->tt = &hub->tt; - udev->ttport = port1; }/* Why interleave GET_DESCRIPTOR and SET_ADDRESS this way?
@@ -4814,6 +4826,12 @@ hub_port_init(struct usb_hub *hub, struc maxp0 =get_bMaxPacketSize0 (udev, buf,GET_DESCRIPTOR_BUFSIZE , retries ==0 ); +if (maxp0 >0 && !initial && + maxp0 != udev->descriptor.bMaxPacketSize0) { +dev_err (&udev->dev,"device reset changed ep0 maxpacket size!\n" ); + retval = -ENODEV ; + goto fail; + } retval =hub_port_reset (hub, port1, udev, delay, false);if (retval <0 )/* error or disconnect */
@@ -4883,6 +4901,12 @@ hub_port_init(struct usb_hub *hub, struc }else {u32 delay; +if (!initial && maxp0 != udev->descriptor.bMaxPacketSize0) { +dev_err (&udev->dev,"device reset changed ep0 maxpacket size!\n" ); + retval = -ENODEV ; + goto fail; + } + delay = udev->parent->hub_delay; udev->hub_delay =min_t (u32, delay,USB_TP_TRANSMISSION_DELAY_MAX );
@@ -4926,7 +4950,10 @@ hub_port_init(struct usb_hub *hub, struc retval); goto fail; } - udev->descriptor = *descr; +if (initial) + udev->descriptor = *descr; +else + *dev_descr = *descr;kfree (descr);/*
@@ -5229,7 +5256,7 @@ static void hub_port_connect(struct usb_ }/* reset (non-USB 3.0 devices) and get descriptor */ - status =hub_port_init (hub, udev, port1, i); + status =hub_port_init (hub, udev, port1, i,NULL );if (status <0 ) goto loop;
@@ -5845,7 +5872,7 @@ static int usb_reset_and_verify_device(sstruct usb_device *parent_hdev = udev->parent;struct usb_hub *parent_hub;struct usb_hcd *hcd =bus_to_hcd (udev->bus); -struct usb_device_descriptor descriptor = udev->descriptor; +struct usb_device_descriptor descriptor;struct usb_host_bos *bos;int i, j, ret =0 ;int port1 = udev->portnum;
@@ -5887,7 +5914,7 @@ static int usb_reset_and_verify_device(s/* ep0 maxpacket size may change; let the HCD know about it. * Other endpoints will be handled by re-enumeration. */ usb_ep0_reinit (udev); - ret =hub_port_init (parent_hub, udev, port1, i); + ret =hub_port_init (parent_hub, udev, port1, i, &descriptor);if (ret >=0 || ret == -ENOTCONN || ret == -ENODEV )break ; }
@@ -5899,7 +5926,6 @@ static int usb_reset_and_verify_device(s/* Device might have changed firmware (DFU or similar) */ if (descriptors_changed (udev, &descriptor, bos)) {dev_info (&udev->dev,"device firmware changed\n" ); - udev->descriptor = descriptor;/* for disconnect() calls */ goto re_enumerate; }
Greg Kroah-Hartman
maintainerPATCH 308/406 USB: core: Fix oversight in SuperSpeed initialization
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 59cf445754566984fd55af19ba7146c76e6627bc upstream.
Commit 85d07c556216 ("USB: core: Unite old scheme and new scheme descriptor reads") altered the way USB devices are enumerated following detection, and in the process it messed up the initialization of SuperSpeed (or faster) devices:
[ 31.650759] usb 2-1: new SuperSpeed Plus Gen 2x1 USB device number 2 using xhci_hcd [ 31.663107] usb 2-1: device descriptor read/8, error -71 [ 31.952697] usb 2-1: new SuperSpeed Plus Gen 2x1 USB device number 3 using xhci_hcd [ 31.965122] usb 2-1: device descriptor read/8, error -71 [ 32.080991] usb usb2-port1: attempt power cycle
...
The problem was caused by the commit forgetting that in SuperSpeed or faster devices, the device descriptor uses a logarithmic encoding of the bMaxPacketSize0 value. (For some reason I thought the 255 case in the switch statement was meant for these devices, but it isn't -- it was meant for Wireless USB and is no longer needed.)
We can fix the oversight by testing for buf->bMaxPacketSize0 = 9 (meaning 512, the actual maxpacket size for ep0 on all SuperSpeed devices) and straightening out the logic that checks and adjusts our initial guesses of the maxpacket value.
--- drivers/usb/core/hub.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
drivers/usb/core/hub.c +24 -12
@@ -4633,7 +4633,7 @@ static int get_bMaxPacketSize0(struct us buf, size, initial_descriptor_timeout);switch (buf->bMaxPacketSize0) { -case 8 :case 16 :case 32 :case 64 :case 255 : +case 8 :case 16 :case 32 :case 64 :case 9 :if (buf->bDescriptorType ==USB_DT_DEVICE ) { rc = buf->bMaxPacketSize0;break ;
@@ -4923,23 +4923,35 @@ hub_port_init(struct usb_hub *hub, strucif (retval) goto fail; -if (maxp0 ==0xff || udev->speed >=USB_SPEED_SUPER ) - i =512 ; -else - i = maxp0; -if (usb_endpoint_maxp (&udev->ep0.desc) != i) { -if (udev->speed ==USB_SPEED_LOW || - !(i ==8 || i ==16 || i ==32 || i ==64 )) { -dev_err (&udev->dev,"Invalid ep0 maxpacket: %d\n" , i); - retval = -EMSGSIZE ; - goto fail; - } +/* +* Check the ep0 maxpacket guess and correct it if necessary. +* maxp0 is the value stored in the device descriptor; +* i is the value it encodes (logarithmic for SuperSpeed or greater). +*/ + i = maxp0; +if (udev->speed >=USB_SPEED_SUPER ) { +if (maxp0 <=16 ) + i =1 << maxp0; +else + i =0 ;/* Invalid */ + } +if (usb_endpoint_maxp (&udev->ep0.desc) == i) { + ;/* Initial ep0 maxpacket guess is right */ + }else if ((udev->speed ==USB_SPEED_FULL || + udev->speed ==USB_SPEED_HIGH ) && + (i ==8 || i ==16 || i ==32 || i ==64 )) { +/* Initial guess is wrong; use the descriptor's value */ if (udev->speed ==USB_SPEED_FULL )dev_dbg (&udev->dev,"ep0 maxpacket = %d\n" , i);else dev_warn (&udev->dev,"Using ep0 maxpacket: %d\n" , i); udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (i);usb_ep0_reinit (udev); + }else { +/* Initial guess is wrong and descriptor's value is invalid */ +dev_err (&udev->dev,"Invalid ep0 maxpacket: %d\n" , maxp0); + retval = -EMSGSIZE ; + goto fail; } descr =usb_get_device_descriptor (udev);
Greg Kroah-Hartman
maintainerPATCH 309/406 usb: typec: tcpci: clear the fault status bit
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Felsch <[email protected]>
[ Upstream commit 23e60c8daf5ec2ab1b731310761b668745fcf6ed ]
According the "USB Type-C Port Controller Interface Specification v2.0" the TCPC sets the fault status register bit-7 (AllRegistersResetToDefault) once the registers have been reset to their default values.
This triggers an alert(-irq) on PTN5110 devices albeit we do mask the fault-irq, which may cause a kernel hang. Fix this generically by writing a one to the corresponding bit-7.
--- drivers/usb/typec/tcpm/tcpci.c | 4 ++++ drivers/usb/typec/tcpm/tcpci.h | 1 + 2 files changed, 5 insertions(+)
drivers/usb/typec/tcpm/tcpci.c +4 -0
@@ -475,6 +475,10 @@ static int tcpci_init(struct tcpc_dev *tcpc)if (time_after (jiffies, timeout))return -ETIMEDOUT ; + ret =tcpci_write16 (tcpci,TCPC_FAULT_STATUS ,TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT ); +if (ret <0 ) +return ret; +/* Handle vendor init */ if (tcpci->data->init) { ret = tcpci->data->init (tcpci, tcpci->data);
drivers/usb/typec/tcpm/tcpci.h +1 -0
@@ -84,6 +84,7 @@#define TCPC_POWER_STATUS_VBUS_PRES BIT(2)#define TCPC_FAULT_STATUS 0x1f +#define TCPC_FAULT_STATUS_ALL_REG_RST_TO_DEFAULT BIT(7)#define TCPC_ALERT_EXTENDED 0x21
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 310/406 tracing: Zero the pipe cpumask on alloc to avoid spurious -EBUSY
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Foster <[email protected]>
commit 3d07fa1dd19035eb0b13ae6697efd5caa9033e74 upstream.
The pipe cpumask used to serialize opens between the main and percpu trace pipes is not zeroed or initialized. This can result in spurious -EBUSY returns if underlying memory is not fully zeroed. This has been observed by immediate failure to read the main trace_pipe file on an otherwise newly booted and idle system:
# cat /sys/kernel/debug/tracing/trace_pipe cat: /sys/kernel/debug/tracing/trace_pipe: Device or resource busy
Zero the allocation of pipe_cpumask to avoid the problem.
--- kernel/trace/trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace.c +2 -2
@@ -8890,7 +8890,7 @@ static struct trace_array *trace_array_cif (!alloc_cpumask_var (&tr->tracing_cpumask,GFP_KERNEL )) goto out_free_tr; -if (!alloc_cpumask_var (&tr->pipe_cpumask,GFP_KERNEL )) +if (!zalloc_cpumask_var (&tr->pipe_cpumask,GFP_KERNEL )) goto out_free_tr; tr->trace_flags = global_trace.trace_flags & ~ZEROED_TRACE_FLAGS ;
@@ -9736,7 +9736,7 @@ __init static int tracer_alloc_buffers(vif (trace_create_savedcmd () <0 ) goto out_free_temp_buffer; -if (!alloc_cpumask_var (&global_trace.pipe_cpumask,GFP_KERNEL )) +if (!zalloc_cpumask_var (&global_trace.pipe_cpumask,GFP_KERNEL )) goto out_free_savedcmd;/* TODO: make the number of buffers hot pluggable with CPUS */
Greg Kroah-Hartman
maintainerPATCH 311/406 md/md-bitmap: remove unnecessary local variable in backlog_store()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
commit b4d129640f194ffc4cc64c3e97f98ae944c072e8 upstream.
Local variable is definied first in the beginning of backlog_store(), there is no need to define it again.
--- drivers/md/md-bitmap.c | 2 -- 1 file changed, 2 deletions(-)
drivers/md/md-bitmap.c +0 -2
@@ -2512,8 +2512,6 @@ backlog_store(struct mddev *mddev, constmddev_destroy_serial_pool (mddev,NULL , false); }else if (backlog && !mddev->serial_info_pool) {/* serial_info_pool is needed since backlog is not zero */ -struct md_rdev *rdev; -rdev_for_each (rdev, mddev)mddev_create_serial_pool (mddev, rdev, false); }
Greg Kroah-Hartman
maintainerPATCH 312/406 udf: initialize newblock to 0
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tom Rix <[email protected]>
commit 23970a1c9475b305770fd37bebfec7a10f263787 upstream.
The clang build reports this errorfs/udf/inode.c:805:6: error: variable 'newblock' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
if (*err < 0)
^~~~~~~~newblock is never set before error handling jump. Initialize newblock to 0 and remove redundant settings.
Message-Id: <[email protected]>
--- fs/udf/inode.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/udf/inode.c +1 -3
@@ -695,7 +695,7 @@ static sector_t inode_getblk(struct inodstruct kernel_lb_addr eloc, tmpeloc;int c =1 ;loff_t lbcount =0 , b_off =0 ; -udf_pblk_t newblocknum, newblock; +udf_pblk_t newblocknum, newblock =0 ;sector_t offset =0 ;int8_t etype;struct udf_inode_info *iinfo =UDF_I (inode);
@@ -798,7 +798,6 @@ static sector_t inode_getblk(struct inod ret =udf_do_extend_file (inode, &prev_epos, laarr, hole_len);if (ret <0 ) { *err = ret; - newblock =0 ; goto out_free; } c =0 ;
@@ -861,7 +860,6 @@ static sector_t inode_getblk(struct inod goal, err);if (!newblocknum) { *err = -ENOSPC ; - newblock =0 ; goto out_free; }if (isBeyondEOF)
Greg Kroah-Hartman
maintainerPATCH 313/406 net/ipv6: SKB symmetric hash should incorporate transport ports
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quan Tian <[email protected]>
commit a5e2151ff9d5852d0ababbbcaeebd9646af9c8d9 upstream.
__skb_get_hash_symmetric() was added to compute a symmetric hash over the protocol, addresses and transport ports, by commit eb70db875671 ("packet: Use symmetric hash for PACKET_FANOUT_HASH."). It uses flow_keys_dissector_symmetric_keys as the flow_dissector to incorporate IPv4 addresses, IPv6 addresses and ports. However, it should not specify the flag as FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL, which stops further dissection when an IPv6 flow label is encountered, making transport ports not being incorporated in such case.
As a consequence, the symmetric hash is based on 5-tuple for IPv4 but 3-tuple for IPv6 when flow label is present. It caused a few problems, e.g. when nft symhash and openvswitch l4_sym rely on the symmetric hash to perform load balancing as different L4 flows between two given IPv6 addresses would always get the same symmetric hash, leading to uneven traffic distribution.
Removing the use of FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL makes sure the symmetric hash is based on 5-tuple for both IPv4 and IPv6 consistently.
--- net/core/flow_dissector.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/core/flow_dissector.c +1 -2
@@ -1589,8 +1589,7 @@ u32 __skb_get_hash_symmetric(const strucmemset (&keys,0 ,sizeof (keys));__skb_flow_dissect (NULL , skb, &flow_keys_dissector_symmetric, - &keys,NULL ,0 ,0 ,0 , -FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL ); + &keys,NULL ,0 ,0 ,0 ,0 );return __flow_hash_from_keys (&keys, &hashrnd); }
Greg Kroah-Hartman
maintainerPATCH 314/406 io_uring: always lock in io_apoll_task_func
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Begunkov <[email protected]>
From: Dylan Yudaken <[email protected]>
[ upstream commit c06c6c5d276707e04cedbcc55625e984922118aa ]
This is required for the failure case (io_req_complete_failed) and is missing.
The alternative would be to only lock in the failure path, however all of the non-error paths in io_poll_check_events that do not do not return IOU_POLL_NO_ACTION end up locking anyway. The only extraneous lock would be for the multishot poll overflowing the CQE ring, however multishot poll would probably benefit from being locked as it will allow completions to be batched.
So it seems reasonable to lock always.
--- io_uring/io_uring.c | 1 + 1 file changed, 1 insertion(+)
io_uring/io_uring.c +1 -0
@@ -5571,6 +5571,7 @@ static void io_apoll_task_func(struct ioif (ret >0 )return ; +io_tw_lock (req->ctx, locked);io_poll_remove_entries (req);spin_lock (&ctx->completion_lock);hash_del (&req->hash_node);
Greg Kroah-Hartman
maintainerPATCH 315/406 io_uring: break out of iowq iopoll on teardown
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Begunkov <[email protected]>
[ upstream commit 45500dc4e01c167ee063f3dcc22f51ced5b2b1e9 ]
io-wq will retry iopoll even when it failed with -EAGAIN. If that races with task exit, which sets TIF_NOTIFY_SIGNAL for all its workers, such workers might potentially infinitely spin retrying iopoll again and again and each time failing on some allocation / waiting / etc. Don't keep spinning if io-wq is dying.
--- io_uring/io-wq.c | 10 ++++++++++ io_uring/io-wq.h | 1 + io_uring/io_uring.c | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-)
io_uring/io-wq.c +10 -0
@@ -176,6 +176,16 @@ static void io_worker_ref_put(struct io_complete (&wq->worker_done); } +bool io_wq_worker_stopped (void ) +{ +struct io_worker *worker = current->pf_io_worker; + +if (WARN_ON_ONCE (!io_wq_current_is_worker ())) +return true; + +return test_bit (IO_WQ_BIT_EXIT , &worker->wqe->wq->state); +} +static void io_worker_cancel_cb (struct io_worker *worker) {struct io_wqe_acct *acct =io_wqe_get_acct (worker);
io_uring/io-wq.h +1 -0
@@ -129,6 +129,7 @@ void io_wq_hash_work(struct io_wq_work *int io_wq_cpu_affinity (struct io_wq *wq,cpumask_var_t mask);int io_wq_max_workers (struct io_wq *wq,int *new_count); +bool io_wq_worker_stopped (void );static inline bool io_wq_is_hashed (struct io_wq_work *work) {
io_uring/io_uring.c +2 -1
@@ -6898,7 +6898,8 @@ static void io_wq_submit_work(struct io_*/ if (ret != -EAGAIN || !(req->ctx->flags &IORING_SETUP_IOPOLL ))break ; - +if (io_wq_worker_stopped ()) +break ;/* * If REQ_F_NOWAIT is set, then don't wait or retry with * poll. -EAGAIN is final for that case.
Greg Kroah-Hartman
maintainerPATCH 316/406 io_uring: break iopolling on signal
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Begunkov <[email protected]>
[ upstream commit dc314886cb3d0e4ab2858003e8de2917f8a3ccbd ]
Don't keep spinning iopoll with a signal set. It'll eventually return back, e.g. by virtue of need_resched(), but it's not a nice user experience.
--- io_uring/io_uring.c | 5 +++++ 1 file changed, 5 insertions(+)
io_uring/io_uring.c +5 -0
@@ -2665,6 +2665,11 @@ static int io_iopoll_check(struct io_rinbreak ; } ret =io_do_iopoll (ctx, &nr_events, min); + +if (task_sigpending (current)) { + ret = -EINTR ; + goto out; + } }while (!ret && nr_events < min && !need_resched ()); out:mutex_unlock (&ctx->uring_lock);
Greg Kroah-Hartman
maintainerPATCH 317/406 scsi: qla2xxx: Fix deletion race condition
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
commit 6dfe4344c168c6ca20fe7640649aacfcefcccb26 upstream.
System crash when using debug kernel due to link list corruption. The cause of the link list corruption is due to session deletion was allowed to queue up twice. Here's the internal trace that show the same port was allowed to double queue for deletion on different cpu.
20808683956 015 qla2xxx [0000:13:00.1]-e801:4: Scheduling sess ffff93ebf9306800 for deletion 50:06:0e:80:12:48:ff:50 fc4_type 1 20808683957 027 qla2xxx [0000:13:00.1]-e801:4: Scheduling sess ffff93ebf9306800 for deletion 50:06:0e:80:12:48:ff:50 fc4_type 1
Move the clearing/setting of deleted flag lock.
--- drivers/scsi/qla2xxx/qla_init.c | 16 ++++++++++++++-- drivers/scsi/qla2xxx/qla_target.c | 14 +++++++------- 2 files changed, 21 insertions(+), 9 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +14 -2
@@ -483,6 +483,7 @@ staticvoid qla24xx_handle_adisc_event (scsi_qla_host_t *vha,struct event_arg *ea) {struct fc_port *fcport = ea->fcport; +unsigned long flags; ql_dbg(ql_dbg_disc, vha, 0x20d2, "%s %8phC DS %d LS %d rc %d login %d|%d rscn %d|%d lid %d\n",
@@ -497,9 +498,15 @@ void qla24xx_handle_adisc_event(scsi_qlaql_dbg (ql_dbg_disc, vha,0x2066 ,"%s %8phC: adisc fail: post delete\n" , __func__, ea->fcport->port_name); + +spin_lock_irqsave (&vha->work_lock, flags);/* deleted = 0 & logout_on_delete = force fw cleanup */ - fcport->deleted =0 ; +if (fcport->deleted ==QLA_SESS_DELETED ) + fcport->deleted =0 ; + fcport->logout_on_delete =1 ; +spin_unlock_irqrestore (&vha->work_lock, flags); +qlt_schedule_sess_for_deletion (ea->fcport);return ; }
@@ -1405,7 +1412,6 @@ void __qla24xx_handle_gpdb_event(scsi_qlspin_lock_irqsave (&vha->hw->tgt.sess_lock, flags); ea->fcport->login_gen++; - ea->fcport->deleted =0 ; ea->fcport->logout_on_delete =1 ;if (!ea->fcport->login_succ && !IS_SW_RESV_ADDR (ea->fcport->d_id)) {
@@ -5639,6 +5645,8 @@ qla2x00_reg_remote_port(scsi_qla_host_tvoid qla2x00_update_fcport (scsi_qla_host_t *vha,fc_port_t *fcport) { +unsigned long flags; +if (IS_SW_RESV_ADDR (fcport->d_id))return ;
@@ -5648,7 +5656,11 @@ qla2x00_update_fcport(scsi_qla_host_t *vqla2x00_set_fcport_disc_state (fcport,DSC_UPD_FCPORT ); fcport->login_retry = vha->hw->login_retry_count; fcport->flags &= ~(FCF_LOGIN_NEEDED |FCF_ASYNC_SENT ); + +spin_lock_irqsave (&vha->work_lock, flags); fcport->deleted =0 ; +spin_unlock_irqrestore (&vha->work_lock, flags); +if (vha->hw->current_topology ==ISP_CFG_NL ) fcport->logout_on_delete =0 ;else
drivers/scsi/qla2xxx/qla_target.c +7 -7
@@ -1044,10 +1044,6 @@ void qlt_free_session_done(struct work_s (struct imm_ntfy_from_isp *)sess->iocb, SRB_NACK_LOGO); } -spin_lock_irqsave (&vha->work_lock, flags); - sess->flags &= ~FCF_ASYNC_SENT ; -spin_unlock_irqrestore (&vha->work_lock, flags); -spin_lock_irqsave (&ha->tgt.sess_lock, flags);if (sess->se_sess) { sess->se_sess =NULL ;
@@ -1057,7 +1053,6 @@ void qlt_free_session_done(struct work_sqla2x00_set_fcport_disc_state (sess,DSC_DELETED ); sess->fw_login_state =DSC_LS_PORT_UNAVAIL ; - sess->deleted =QLA_SESS_DELETED ;if (sess->login_succ && !IS_SW_RESV_ADDR (sess->d_id)) { vha->fcport_count--;
@@ -1109,10 +1104,15 @@ void qlt_free_session_done(struct work_s sess->explicit_logout =0 ;spin_unlock_irqrestore (&ha->tgt.sess_lock, flags); - sess->free_pending =0 ;qla2x00_dfs_remove_rport (vha, sess); +spin_lock_irqsave (&vha->work_lock, flags); + sess->flags &= ~FCF_ASYNC_SENT ; + sess->deleted =QLA_SESS_DELETED ; + sess->free_pending =0 ; +spin_unlock_irqrestore (&vha->work_lock, flags); +ql_dbg (ql_dbg_disc, vha,0xf001 ,"Unregistration of sess %p %8phC finished fcp_cnt %d\n" , sess, sess->port_name, vha->fcport_count);
@@ -1161,12 +1161,12 @@ void qlt_unreg_sess(struct fc_port *sess* management from being sent. */ sess->flags |=FCF_ASYNC_SENT ; + sess->deleted =QLA_SESS_DELETION_IN_PROGRESS ;spin_unlock_irqrestore (&sess->vha->work_lock, flags);if (sess->se_sess) vha->hw->tgt.tgt_ops->clear_nacl_from_fcport_map (sess); - sess->deleted =QLA_SESS_DELETION_IN_PROGRESS ;qla2x00_set_fcport_disc_state (sess,DSC_DELETE_PEND ); sess->last_rscn_gen = sess->rscn_gen; sess->last_login_gen = sess->login_gen;
Greg Kroah-Hartman
maintainerPATCH 318/406 scsi: qla2xxx: fix inconsistent TMF timeout
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
commit 009e7fe4a1ed52276b332842a6b6e23b07200f2d upstream.
Different behavior were experienced of session being torn down vs not when TMF is timed out. When FW detects the time out, the session is torn down. When driver detects the time out, the session is not torn down.
Allow TMF error to return to upper layer without session tear down.
--- drivers/scsi/qla2xxx/qla_isr.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/qla2xxx/qla_isr.c +0 -1
@@ -3139,7 +3139,6 @@ check_scsi_status:case CS_PORT_BUSY :case CS_INCOMPLETE :case CS_PORT_UNAVAILABLE : -case CS_TIMEOUT :case CS_RESET :/*
Greg Kroah-Hartman
maintainerPATCH 319/406 scsi: qla2xxx: Fix erroneous link up failure
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
commit 5b51f35d127e7bef55fa869d2465e2bca4636454 upstream.
Link up failure occurred where driver failed to see certain events from FW indicating link up (AEN 8011) and fabric login completion (AEN 8014). Without these 2 events, driver would not proceed forward to scan the fabric. The cause of this is due to delay in the receive of interrupt for Mailbox 60 that causes qla to set the fw_started flag late. The late setting of this flag causes other interrupts to be dropped. These dropped interrupts happen to be the link up (AEN 8011) and fabric login completion (AEN 8014).
Set fw_started flag early to prevent interrupts being dropped.
--- drivers/scsi/qla2xxx/qla_init.c | 3 ++- drivers/scsi/qla2xxx/qla_isr.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +2 -1
@@ -4342,15 +4342,16 @@ qla2x00_init_rings(scsi_qla_host_t *vha)memcpy (ha->port_name, ha->init_cb->port_name,WWN_SIZE ); } +QLA_FW_STARTED (ha); rval =qla2x00_init_firmware (vha, ha->init_cb_size); next_check:if (rval) { +QLA_FW_STOPPED (ha);ql_log (ql_log_fatal, vha,0x00d2 ,"Init Firmware **** FAILED ****.\n" ); }else {ql_dbg (ql_dbg_init, vha,0x00d3 ,"Init Firmware -- success.\n" ); -QLA_FW_STARTED (ha); vha->u_ql2xexchoffld = vha->u_ql2xiniexchg =0 ; }
drivers/scsi/qla2xxx/qla_isr.c +5 -1
@@ -982,8 +982,12 @@ qla2x00_async_event(scsi_qla_host_t *vhaunsigned long flags;fc_port_t *fcport =NULL ; -if (!vha->hw->flags.fw_started) +if (!vha->hw->flags.fw_started) { +ql_log (ql_log_warn, vha,0x50ff , +"Dropping AEN - %04x %04x %04x %04x.\n" , + mb[0 ], mb[1 ], mb[2 ], mb[3 ]);return ; + }/* Setup to process RIO completion. */ handle_cnt =0 ;
Greg Kroah-Hartman
maintainerPATCH 320/406 scsi: qla2xxx: Turn off noisy message log
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
commit 8ebaa45163a3fedc885c1dc7d43ea987a2f00a06 upstream.
Some consider noisy log as test failure. Turn off noisy message log.
--- drivers/scsi/qla2xxx/qla_nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_nvme.c +1 -1
@@ -604,7 +604,7 @@ static int qla_nvme_post_cmd(struct nvme rval =qla2x00_start_nvme_mq (sp);if (rval !=QLA_SUCCESS ) { -ql_log (ql_log_warn, vha,0x212d , +ql_dbg (ql_dbg_io + ql_dbg_verbose, vha,0x212d ,"qla2x00_start_nvme_mq failed = %d\n" , rval); sp->priv =NULL ; priv->sp =NULL ;
Greg Kroah-Hartman
maintainerPATCH 321/406 scsi: qla2xxx: Remove unsupported ql2xenabledif option
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manish Rangankar <[email protected]>
commit e9105c4b7a9208a21a9bda133707624f12ddabc2 upstream.
User accidently passed module parameter ql2xenabledif=1 which is unsupported. However, driver still initialized which lead to guard tag errors during device discovery.
Remove unsupported ql2xenabledif=1 option and validate the user input.
--- drivers/scsi/qla2xxx/qla_attr.c | 2 -- drivers/scsi/qla2xxx/qla_dbg.c | 2 +- drivers/scsi/qla2xxx/qla_os.c | 9 +++++++-- 3 files changed, 8 insertions(+), 5 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +0 -2
@@ -3028,8 +3028,6 @@ qla24xx_vport_create(struct fc_vport *fc vha->flags.difdix_supported =1 ;ql_dbg (ql_dbg_user, vha,0x7082 ,"Registered for DIF/DIX type 1 and 3 protection.\n" ); -if (ql2xenabledif ==1 ) - prot =SHOST_DIX_TYPE0_PROTECTION ;scsi_host_set_prot (vha->host, prot |SHOST_DIF_TYPE1_PROTECTION | SHOST_DIF_TYPE2_PROTECTION
drivers/scsi/qla2xxx/qla_dbg.c +1 -1
@@ -18,7 +18,7 @@* | Queue Command and IO tracing | 0x3074 | 0x300b | * | | | 0x3027-0x3028 | * | | | 0x303d-0x3041 | -* | | | 0x302d,0x3033 | +* | | | 0x302e,0x3033 | * | | | 0x3036,0x3038 | * | | | 0x303a | * | DPC Thread | 0x4023 | 0x4002,0x4013 |
drivers/scsi/qla2xxx/qla_os.c +7 -2
@@ -3141,6 +3141,13 @@ qla2x00_probe_one(struct pci_dev *pdev, host->max_id = ha->max_fibre_devices; host->cmd_per_lun =3 ; host->unique_id = host->host_no; + +if (ql2xenabledif && ql2xenabledif !=2 ) { +ql_log (ql_log_warn, base_vha,0x302d , +"Invalid value for ql2xenabledif, resetting it to default (2)\n" ); + ql2xenabledif =2 ; + } +if (IS_T10_PI_CAPABLE (ha) && ql2xenabledif) host->max_cmd_len =32 ;else
@@ -3373,8 +3380,6 @@ skip_dpc: base_vha->flags.difdix_supported =1 ;ql_dbg (ql_dbg_init, base_vha,0x00f1 ,"Registering for DIF/DIX type 1 and 3 protection.\n" ); -if (ql2xenabledif ==1 ) - prot =SHOST_DIX_TYPE0_PROTECTION ;if (ql2xprotmask)scsi_host_set_prot (host, ql2xprotmask);else
Greg Kroah-Hartman
maintainerPATCH 322/406 fbdev/ep93xx-fb: Do not assign to struct fb_info.dev
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
commit f90a0e5265b60cdd3c77990e8105f79aa2fac994 upstream.
Do not assing the Linux device to struct fb_info.dev. The call to register_framebuffer() initializes the field to the fbdev device. Drivers should not override its value.
Fixes a bug where the driver incorrectly decreases the hardware device's reference counter and leaks the fbdev device.
v2:
* add Fixes tag (Dan)
--- drivers/video/fbdev/ep93xx-fb.c | 1 - 1 file changed, 1 deletion(-)
drivers/video/fbdev/ep93xx-fb.c +0 -1
@@ -474,7 +474,6 @@ static int ep93xxfb_probe(struct platforif (!info)return -ENOMEM ; - info->dev = &pdev->dev;platform_set_drvdata (pdev, info); fbi = info->par; fbi->mach_info = mach_info;
Greg Kroah-Hartman
maintainerPATCH 323/406 drm/ast: Fix DRAM init on AST2200
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
commit 4cfe75f0f14f044dae66ad0e6eea812d038465d9 upstream.
Fix the test for the AST2200 in the DRAM initialization. The value in ast->chip has to be compared against an enum constant instead of a numerical value.
This bug got introduced when the driver was first imported into the kernel.
--- drivers/gpu/drm/ast/ast_post.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ast/ast_post.c +1 -1
@@ -290,7 +290,7 @@ static void ast_init_dram_reg(struct drm ; }while (ast_read32 (ast,0x10100 ) !=0xa8 ); }else {/* AST2100/1100 */ -if (ast->chip ==AST2100 || ast->chip ==2200 ) +if (ast->chip ==AST2100 || ast->chip ==AST2200 ) dram_reg_info = ast2100_dram_table_data;else dram_reg_info = ast1100_dram_table_data;
Greg Kroah-Hartman
maintainerPATCH 324/406 lib/test_meminit: allocate pages up to order MAX_ORDER
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Donnellan <[email protected]>
commit efb78fa86e95832b78ca0ba60f3706788a818938 upstream.
test_pages() tests the page allocator by calling alloc_pages() with different orders up to order 10.
However, different architectures and platforms support different maximum contiguous allocation sizes. The default maximum allocation order (MAX_ORDER) is 10, but architectures can use CONFIG_ARCH_FORCE_MAX_ORDER to override this. On platforms where this is less than 10, test_meminit() will blow up with a WARN(). This is expected, so let's not do that.
Replace the hardcoded "10" with the MAX_ORDER macro so that we test allocations up to the expected platform limit.
--- lib/test_meminit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/test_meminit.c +1 -1
@@ -86,7 +86,7 @@ static int __init test_pages(int *total_int failures =0 , num_tests =0 ;int i; -for (i =0 ; i <10 ; i++) +for (i =0 ; i <=MAX_ORDER ; i++) num_tests +=do_alloc_pages_order (i, &failures);REPORT_FAILURES_IN_FN ();
Greg Kroah-Hartman
maintainerPATCH 325/406 parisc: led: Fix LAN receive and transmit LEDs
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 4db89524b084f712a887256391fc19d9f66c8e55 upstream.
Fix the LAN receive and LAN transmit LEDs, which where swapped up to now.
--- arch/parisc/include/asm/led.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/parisc/include/asm/led.h +2 -2
@@ -11,8 +11,8 @@#define LED1 0x02#define LED0 0x01/* bottom (or furthest left) LED */ -#define LED_LAN_TX LED0/* for LAN transmit activity */ -#define LED_LAN_RCV LED1/* for LAN receive activity */ +#define LED_LAN_RCV LED0/* for LAN receive activity */ +#define LED_LAN_TX LED1/* for LAN transmit activity */ #define LED_DISK_IO LED2/* for disk activity */ #define LED_HEARTBEAT LED3/* heartbeat */
Greg Kroah-Hartman
maintainerPATCH 326/406 parisc: led: Reduce CPU overhead for disk & lan LED computation
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 358ad816e52d4253b38c2f312e6b1cbd89e0dbf7 upstream.
Older PA-RISC machines have LEDs which show the disk- and LAN-activity. The computation is done in software and takes quite some time, e.g. on a J6500 this may take up to 60% time of one CPU if the machine is loaded via network traffic.
Since most people don't care about the LEDs, start with LEDs disabled and just show a CPU heartbeat LED. The disk and LAN LEDs can be turned on manually via /proc/pdc/led.
--- drivers/parisc/led.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/parisc/led.c +2 -2
@@ -56,8 +56,8 @@static int led_type__read_mostly =-1 ;static unsigned char lastleds;/* LED state from most recent update */ static unsigned int led_heartbeat__read_mostly =1 ; -static unsigned int led_diskio__read_mostly =1 ; -static unsigned int led_lanrxtx__read_mostly =1 ; +static unsigned int led_diskio__read_mostly ; +static unsigned int led_lanrxtx__read_mostly ;static char lcd_text[32 ]__read_mostly ;static char lcd_text_default[32 ]__read_mostly ;static int lcd_no_led_support__read_mostly =0 ;/* KittyHawk doesn't support LED on its LCD */
Greg Kroah-Hartman
maintainerPATCH 327/406 pinctrl: cherryview: fix address_space_handler() argument
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raag Jadav <[email protected]>
commit d5301c90716a8e20bc961a348182daca00c8e8f0 upstream.
First argument of acpi_*_address_space_handler() APIs is acpi_handle of the device, which is incorrectly passed in driver ->remove() path here. Fix it by passing the appropriate argument and while at it, make both API calls consistent using ACPI_HANDLE().
--- drivers/pinctrl/intel/pinctrl-cherryview.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/pinctrl/intel/pinctrl-cherryview.c +2 -3
@@ -1625,7 +1625,6 @@ static int chv_pinctrl_probe(struct platconst struct intel_pinctrl_soc_data *soc_data;struct intel_community *community;struct device *dev = &pdev->dev; -struct acpi_device *adev =ACPI_COMPANION (dev);struct intel_pinctrl *pctrl;acpi_status status;int ret, irq;
@@ -1688,7 +1687,7 @@ static int chv_pinctrl_probe(struct platif (ret)return ret; - status =acpi_install_address_space_handler (adev->handle, + status =acpi_install_address_space_handler (ACPI_HANDLE (dev), community->acpi_space_id, chv_pinctrl_mmio_access_handler,NULL , pctrl);
@@ -1705,7 +1704,7 @@ static int chv_pinctrl_remove(struct plastruct intel_pinctrl *pctrl =platform_get_drvdata (pdev);const struct intel_community *community = &pctrl->communities[0 ]; -acpi_remove_address_space_handler (ACPI_COMPANION (&pdev->dev), +acpi_remove_address_space_handler (ACPI_HANDLE (&pdev->dev), community->acpi_space_id, chv_pinctrl_mmio_access_handler);
Greg Kroah-Hartman
maintainerPATCH 328/406 dt-bindings: clock: xlnx,versal-clk: drop select:false
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit 172044e30b00977784269e8ab72132a48293c654 upstream.
select:false makes the schema basically ignored and not effective, which is clearly not what we want for a device binding.
--- Documentation/devicetree/bindings/clock/xlnx,versal-clk.yaml | 2 -- 1 file changed, 2 deletions(-)
Documentation/devicetree/bindings/clock/xlnx,versal-clk.yaml +0 -2
@@ -16,8 +16,6 @@ description: | reads required input clock frequencies from the devicetree and acts as clock provider for all clock consumers of PS clocks. -select: false - properties: compatible: const: xlnx,versal-clk
Greg Kroah-Hartman
maintainerPATCH 329/406 clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmad Fatoum <[email protected]>
commit 72d00e560d10665e6139c9431956a87ded6e9880 upstream.
Since commit b09c68dc57c9 ("clk: imx: pll14xx: Support dynamic rates"), the driver has the ability to dynamically compute PLL parameters to approximate the requested rates. This is not always used, because the logic is as follows:
- Check if the target rate is hardcoded in the frequency table
- Check if varying only kdiv is possible, so switch over is glitch free
- Compute rate dynamically by iterating over pdiv range
If we skip the frequency table for the 1443x PLL, we find that the computed values differ to the hardcoded ones. This can be valid if the hardcoded values guarantee for example an earlier lock-in or if the divisors are chosen, so that other important rates are more likely to be reached glitch-free.
For rates (393216000 and 361267200, this doesn't seem to be the case:
They are only approximated by existing parameters (393215995 and 361267196 Hz, respectively) and they aren't reachable glitch-free from other hardcoded frequencies. Dropping them from the table allows us to lock-in to these frequencies exactly.
This is immediately noticeable because they are the assigned-clock-rates for IMX8MN_AUDIO_PLL1 and IMX8MN_AUDIO_PLL2, respectively and a look into clk_summary so far showed that they were a few Hz short of the target:
imx8mn-board:~# grep audio_pll[12]_out /sys/kernel/debug/clk/clk_summary audio_pll2_out 0 0 0 361267196 0 0 50000 N audio_pll1_out 1 1 0 393215995 0 0 50000 Y
and afterwards:
imx8mn-board:~# grep audio_pll[12]_out /sys/kernel/debug/clk/clk_summary audio_pll2_out 0 0 0 361267200 0 0 50000 N audio_pll1_out 1 1 0 393216000 0 0 50000 Y
This change is equivalent to adding following hardcoded values:
/* rate mdiv pdiv sdiv kdiv */
PLL_1443X_RATE(393216000, 655, 5, 3, 23593),
PLL_1443X_RATE(361267200, 497, 33, 0, -16882),
--- drivers/clk/imx/clk-pll14xx.c | 2 -- 1 file changed, 2 deletions(-)
drivers/clk/imx/clk-pll14xx.c +0 -2
@@ -60,8 +60,6 @@ static const struct imx_pll14xx_rate_tabPLL_1443X_RATE (650000000U ,325 ,3 ,2 ,0 ),PLL_1443X_RATE (594000000U ,198 ,2 ,2 ,0 ), PLL_1443X_RATE(519750000U, 173, 2, 2, 16384), -PLL_1443X_RATE (393216000U ,262 ,2 ,3 ,9437 ), - PLL_1443X_RATE(361267200U, 361, 3, 3, 17511), }; struct imx_pll14xx_clk imx_1443x_pll = {
Re: [PATCH 5.10 329/406] clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz
Hi,
Quoted 43 lines · Greg Kroah-Hartman
5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmad Fatoum <[email protected]>
commit
72d00e560d10665e6139c9431956a87ded6e9880upstream.Since commit
b09c68dc57c9("clk: imx: pll14xx: Support dynamic rates"), the driver has the ability to dynamically compute PLL parameters to approximate the requested rates. This is not always used, because the logic is as follows:- Check if the target rate is hardcoded in the frequency table
- Check if varying only kdiv is possible, so switch over is glitch free
- Compute rate dynamically by iterating over pdiv rangeIf we skip the frequency table for the 1443x PLL, we find that the computed values differ to the hardcoded ones. This can be valid if the hardcoded values guarantee for example an earlier lock-in or if the divisors are chosen, so that other important rates are more likely to be reached glitch-free.
For rates (393216000 and 361267200, this doesn't seem to be the case:
They are only approximated by existing parameters (393215995 and 361267196 Hz, respectively) and they aren't reachable glitch-free from other hardcoded frequencies. Dropping them from the table allows us to lock-in to these frequencies exactly.This is immediately noticeable because they are the assigned-clock-rates for
IMX8MN_AUDIO_PLL1andIMX8MN_AUDIO_PLL2, respectively and a look intoclk_summaryso far showed that they were a few Hz short of the target:imx8mn-board:~# grep audio_pll[12]_out /sys/kernel/debug/clk/clk_summary audio_pll2_out 0 0 0 361267196 0 0 50000 N audio_pll1_out 1 1 0 393215995 0 0 50000 Yand afterwards:
imx8mn-board:~# grep audio_pll[12]_out /sys/kernel/debug/clk/clk_summary audio_pll2_out 0 0 0 361267200 0 0 50000 N audio_pll1_out 1 1 0 393216000 0 0 50000 Y
Quoted 8 lines
This change is equivalent to adding following hardcoded values:
/* rate mdiv pdiv sdiv kdiv */
PLL_1443X_RATE(393216000, 655, 5, 3, 23593),
PLL_1443X_RATE(361267200, 497, 33, 0, -16882),Fixes 053a4ffe2988 ("clk: imx: imx8mm: fix audio pll setting")Cc [email protected] # v5.18+
Patch is only correct for v5.18 onward. Please drop for v5.10.
Thanks,
Ahmad
Quoted 23 lines
Signed-off-by Ahmad Fatoum <[email protected]>Signed-off-by Marco Felsch <[email protected]>Signed-off-by Abel Vesa <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/clk/imx/clk-pll14xx.c | 2 -- 1 file changed, 2 deletions(-)drivers/clk/imx/clk-pll14xx.c +0
-2@@ -60,8 +60,6 @@ static const struct imx_pll14xx_rate_tabPLL_1443X_RATE (650000000U ,325 ,3 ,2 ,0 ),PLL_1443X_RATE (594000000U ,198 ,2 ,2 ,0 ), PLL_1443X_RATE(519750000U, 173, 2, 2, 16384), -PLL_1443X_RATE (393216000U ,262 ,2 ,3 ,9437 ), - PLL_1443X_RATE(361267200U, 361, 3, 3, 17511), }; struct imx_pll14xx_clk imx_1443x_pll = {
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Greg Kroah-Hartman
maintainerPATCH 330/406 clk: qcom: gcc-mdm9615: use proper parent for pll0_vote clock
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
commit 1583694bb4eaf186f17131dbc1b83d6057d2749b upstream.
The pll0_vote clock definitely should have pll0 as a parent (instead of pll8).
--- drivers/clk/qcom/gcc-mdm9615.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/gcc-mdm9615.c +1 -1
@@ -58,7 +58,7 @@ static struct clk_regmap pll0_vote = { .enable_mask = BIT(0), .hw.init = &(struct clk_init_data ){ .name ="pll0_vote" , - .parent_names = (const char *[]){"pll8" }, + .parent_names = (const char *[]){"pll0" }, .num_parents =1 , .ops = &clk_pll_vote_ops, },
Greg Kroah-Hartman
maintainerPATCH 331/406 soc: qcom: qmi_encdec: Restrict string length in decode
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Lew <[email protected]>
commit 8d207400fd6b79c92aeb2f33bb79f62dff904ea2 upstream.
The QMI TLV value for strings in a lot of qmi element info structures account for null terminated strings with MAX_LEN + 1. If a string is actually MAX_LEN + 1 length, this will cause an out of bounds access when the NULL character is appended in decoding.
--- drivers/soc/qcom/qmi_encdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/qcom/qmi_encdec.c +2 -2
@@ -534,8 +534,8 @@ static int qmi_decode_string_elem(struct decoded_bytes += rc; } -if (string_len > temp_ei->elem_len) { -pr_err ("%s: String len %d > Max Len %d\n" , +if (string_len >= temp_ei->elem_len) { +pr_err ("%s: String len %d >= Max Len %d\n" , __func__, string_len, temp_ei->elem_len);return -ETOOSMALL ; }else if (string_len > tlv_len) {
Greg Kroah-Hartman
maintainerPATCH 332/406 NFS: Fix a potential data corruption
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
commit 88975a55969e11f26fe3846bf4fbf8e7dc8cbbd4 upstream.
We must ensure that the subrequests are joined back into the head before we can retransmit a request. If the head was not on the commit lists, because the server wrote it synchronously, we still need to add it back to the retransmission list.
Add a call that mirrors the effect of nfs_cancel_remove_inode() for O_DIRECT.
--- fs/nfs/direct.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
fs/nfs/direct.c +19 -1
@@ -509,13 +509,31 @@ out:return result; } +static void nfs_direct_add_page_head (struct list_head *list, +struct nfs_page *req) +{ +struct nfs_page *head = req->wb_head; + +if (!list_empty (&head->wb_list) || !nfs_lock_request (head)) +return ; +if (!list_empty (&head->wb_list)) { +nfs_unlock_request (head); +return ; + } +list_add (&head->wb_list, list); +kref_get (&head->wb_kref); +kref_get (&head->wb_kref); +} +static void nfs_direct_join_group (struct list_head *list,struct inode *inode) {struct nfs_page *req, *subreq;list_for_each_entry (req, list, wb_list) { -if (req->wb_head != req) +if (req->wb_head != req) { +nfs_direct_add_page_head (&req->wb_list, req);continue ; + } subreq = req->wb_this_page;if (subreq == req)continue ;
Greg Kroah-Hartman
maintainerPATCH 333/406 NFSv4/pnfs: minor fix for cleanup path in nfs4_get_device_info
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 96562c45af5c31b89a197af28f79bfa838fb8391 upstream.
It is an almost improbable error case but when page allocating loop in nfs4_get_device_info() fails then we should only free the already allocated pages, as __free_page() can't deal with NULL arguments.
Found by Linux Verification Center (linuxtesting.org).
--- fs/nfs/pnfs_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/pnfs_dev.c +1 -1
@@ -152,7 +152,7 @@ nfs4_get_device_info(struct nfs_server *set_bit (NFS_DEVICEID_NOCACHE , &d->flags); out_free_pages: -for (i =0 ; i < max_pages; i++) +while (--i >=0 )__free_page (pages[i]);kfree (pages); out_free_pdev:
Greg Kroah-Hartman
maintainerPATCH 334/406 kconfig: fix possible buffer overflow
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Meskhidze <[email protected]>
[ Upstream commit a3b7039bb2b22fcd2ad20d59c00ed4e606ce3754 ]
Buffer 'new_argv' is accessed without bound check after accessing with bound check via 'new_argc' index.
--- scripts/kconfig/preprocess.c | 3 +++ 1 file changed, 3 insertions(+)
scripts/kconfig/preprocess.c +3 -0
@@ -396,6 +396,9 @@ static char *eval_clause(const char *str, size_t len, int argc, char *argv[]) p++; } + +if (new_argc >=FUNCTION_MAX_ARGS ) +pperror ("too many function arguments" ); new_argv[new_argc++] = prev;/*
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 335/406 backlight: gpio_backlight: Drop output GPIO direction check for initial power state
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ying Liu <[email protected]>
[ Upstream commit fe1328b5b2a087221e31da77e617f4c2b70f3b7f ]
So, let's drop output GPIO direction check and only check GPIO value to set the initial power state.
--- drivers/video/backlight/gpio_backlight.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/video/backlight/gpio_backlight.c +1 -2
@@ -87,8 +87,7 @@ static int gpio_backlight_probe(struct platform_device *pdev)/* Not booted with device tree or no phandle link to the node */ bl->props.power = def_value ?FB_BLANK_UNBLANK :FB_BLANK_POWERDOWN ; - else if (gpiod_get_direction(gbl->gpiod) == 0 && - gpiod_get_value_cansleep(gbl->gpiod) == 0) + else if (gpiod_get_value_cansleep(gbl->gpiod) == 0) bl->props.power = FB_BLANK_POWERDOWN; else bl->props.power = FB_BLANK_UNBLANK;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 336/406 perf annotate bpf: Dont enclose non-debug code with an assert()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 979e9c9fc9c2a761303585e07fe2699bdd88182f ]
In 616b14b47a86d880 ("perf build: Conditionally define NDEBUG") we started using NDEBUG=1 when DEBUG=1 isn't present, so code that is enclosed with assert() is not called.
In dd317df072071903 ("perf build: Make binutil libraries opt in") we stopped linking against binutils-devel, for licensing reasons.
Recently people asked me why annotation of BPF programs wasn't working, i.e. this:
$ perf annotate bpf_prog_5280546344e3f45c_kfree_skb
was returning:
case SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF:
scnprintf(buf, buflen, "Please link with binutils's libopcode to enable BPF annotation");
This was on a fedora rpm, so its new enough that I had to try to test by rebuilding using BUILD_NONDISTRO=1, only to get it segfaulting on me.
This combination made this libopcode function not to be called:
assert(bfd_check_format(bfdf, bfd_object));
Changing it to:
if (!bfd_check_format(bfdf, bfd_object)) abort();
Made it work, looking at this "check" function made me realize it changes the 'bfdf' internal state, i.e. we better call it.
So stop using assert() on it, just call it and abort if it fails.
Probably it is better to propagate the error, etc, but it seems it is unlikely to fail from the usage done so far and we really need to stop using libopcodes, so do the quick fix above and move on.
With it we have BPF annotation back working when built with BUILD_NONDISTRO=1:
⬢[acme@toolbox perf-tools-next]$ perf annotate --stdio2 bpf_prog_5280546344e3f45c_kfree_skb | head
No kallsyms or vmlinux with build-id 939bc71a1a51cdc434e60af93c7e734f7d5c0e7e was found
Samples: 12 of event 'cpu-clock:ppp', 4000 Hz, Event count (approx.): 3000000, [percent: local period]
bpf_prog_5280546344e3f45c_kfree_skb() bpf_prog_5280546344e3f45c_kfree_skb
Percent int kfree_skb(struct trace_event_raw_kfree_skb *args) {
nop
33.33 xchg %ax,%ax
push %rbp
mov %rsp,%rbp
sub $0x180,%rsp
push %rbx
push %r13
⬢[acme@toolbox perf-tools-next]$--- tools/perf/util/annotate.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
tools/perf/util/annotate.c +7 -3
@@ -1718,8 +1718,11 @@ static int symbol__disassemble_bpf(struct symbol *sym,perf_exe (tpath,sizeof (tpath)); bfdf =bfd_openr (tpath,NULL ); -assert (bfdf); -assert (bfd_check_format (bfdf, bfd_object)); +if (bfdf ==NULL ) +abort (); + +if (!bfd_check_format (bfdf, bfd_object)) +abort (); s =open_memstream (&buf, &buf_size);if (!s) {
@@ -1767,7 +1770,8 @@ static int symbol__disassemble_bpf(struct symbol *sym,#else disassemble =disassembler (bfdf);#endif -assert (disassemble); +if (disassemble ==NULL ) +abort ();fflush (s); do {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 337/406 x86/virt: Drop unnecessary check on extended CPUID level in cpu_has_svm()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 5df8ecfe3632d5879d1f154f7aa8de441b5d1c89 ]
Drop the explicit check on the extended CPUID level in cpu_has_svm(), the kernel's cached CPUID info will leave the entire SVM leaf unset if said leaf is not supported by hardware. Prior to using cached information, the check was needed to avoid false positives due to Intel's rather crazy CPUID behavior of returning the values of the maximum supported leaf if the specified leaf is unsupported.
--- arch/x86/include/asm/virtext.h | 6 ------ 1 file changed, 6 deletions(-)
arch/x86/include/asm/virtext.h +0 -6
@@ -95,12 +95,6 @@ static inline int cpu_has_svm(const char **msg)return 0 ; } -if (boot_cpu_data.extended_cpuid_level <SVM_CPUID_FUNC ) { -if (msg) - *msg ="can't execute cpuid_8000000a" ; -return 0 ; - } -if (!boot_cpu_has (X86_FEATURE_SVM )) {if (msg) *msg ="svm not available" ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 338/406 perf top: Dont pass an ERR_PTR() directly to perf_session__delete()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit ef23cb593304bde0cc046fd4cc83ae7ea2e24f16 ]
While debugging a segfault on 'perf lock contention' without an available perf.data file I noticed that it was basically calling:
perf_session__delete(ERR_PTR(-1))
Resulting in:
(gdb) run lock contention
Starting program: /root/bin/perf lock contention
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib64/libthread_db.so.1". failed to open perf.data: No such file or directory (try 'perf record' first) Initializing perf session failed
Program received signal SIGSEGV, Segmentation fault.
0x00000000005e7515 in auxtrace__free (session=0xffffffffffffffff) at util/auxtrace.c:2858
2858 if (!session->auxtrace)
(gdb) p session
$1 = (struct perf_session *) 0xffffffffffffffff
(gdb) bt
#0 0x00000000005e7515 in auxtrace__free (session=0xffffffffffffffff) at util/auxtrace.c:2858 #1 0x000000000057bb4d in perf_session__delete (session=0xffffffffffffffff) at util/session.c:300 #2 0x000000000047c421 in __cmd_contention (argc=0, argv=0x7fffffffe200) at builtin-lock.c:2161 #3 0x000000000047dc95 in cmd_lock (argc=0, argv=0x7fffffffe200) at builtin-lock.c:2604 #4 0x0000000000501466 in run_builtin (p=0xe597a8 <commands+552>, argc=2, argv=0x7fffffffe200) at perf.c:322 #5 0x00000000005016d5 in handle_internal_command (argc=2, argv=0x7fffffffe200) at perf.c:375 #6 0x0000000000501824 in run_argv (argcp=0x7fffffffe02c, argv=0x7fffffffe020) at perf.c:419 #7 0x0000000000501b11 in main (argc=2, argv=0x7fffffffe200) at perf.c:535
(gdb)
So just set it to NULL after using PTR_ERR(session) to decode the error as perf_session__delete(NULL) is supported.
The same problem was found in 'perf top' after an audit of all perf_session__new() failure handling.
--- tools/perf/builtin-top.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/builtin-top.c +1 -0
@@ -1743,6 +1743,7 @@ int cmd_top(int argc, const char **argv) top.session =perf_session__new (NULL , false,NULL );if (IS_ERR (top.session)) { status =PTR_ERR (top.session); + top.session =NULL ; goto out_delete_evlist; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 339/406 watchdog: intel-mid_wdt: add MODULE_ALIAS() to allow auto-load
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raag Jadav <[email protected]>
[ Upstream commit cf38e7691c85f1b09973b22a0b89bf1e1228d2f9 ]
When built with CONFIG_INTEL_MID_WATCHDOG=m, currently the driver needs to be loaded manually, for the lack of module alias. This causes unintended resets in cases where watchdog timer is set-up by bootloader and the driver is not explicitly loaded. Add MODULE_ALIAS() to load the driver automatically at boot and avoid this issue.
--- drivers/watchdog/intel-mid_wdt.c | 1 + 1 file changed, 1 insertion(+)
drivers/watchdog/intel-mid_wdt.c +1 -0
@@ -203,3 +203,4 @@ module_platform_driver(mid_wdt_driver);MODULE_AUTHOR ("David Cohen <[email protected]>" );MODULE_DESCRIPTION ("Watchdog Driver for Intel MID platform" );MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:intel_mid_wdt" );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 340/406 pwm: lpc32xx: Remove handling of PWM channels
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Zapolskiy <[email protected]>
[ Upstream commit 4aae44f65827f0213a7361cf9c32cfe06114473f ]
Because LPC32xx PWM controllers have only a single output which is registered as the only PWM device/channel per controller, it is known in advance that pwm->hwpwm value is always 0. On basis of this fact simplify the code by removing operations with pwm->hwpwm, there is no controls which require channel number as input.
Even though I wasn't aware at the time when I forward ported that patch, this fixes a null pointer dereference as lpc32xx->chip.pwms is NULL before devm_pwmchip_add() is called.
--- drivers/pwm/pwm-lpc32xx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pwm/pwm-lpc32xx.c +8 -8
@@ -51,10 +51,10 @@ static int lpc32xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,if (duty_cycles >255 ) duty_cycles =255 ; - val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val =readl (lpc32xx->base); val &= ~0xFFFF ; val |= (period_cycles <<8 ) | duty_cycles; -writel (val, lpc32xx->base + (pwm->hwpwm <<2 )); +writel (val, lpc32xx->base);return 0 ; }
@@ -69,9 +69,9 @@ static int lpc32xx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)if (ret)return ret; - val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val =readl (lpc32xx->base); val |=PWM_ENABLE ; -writel (val, lpc32xx->base + (pwm->hwpwm <<2 )); +writel (val, lpc32xx->base);return 0 ; }
@@ -81,9 +81,9 @@ static void lpc32xx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)struct lpc32xx_pwm_chip *lpc32xx =to_lpc32xx_pwm_chip (chip);u32 val; - val =readl (lpc32xx->base + (pwm->hwpwm <<2 )); + val =readl (lpc32xx->base); val &= ~PWM_ENABLE ; -writel (val, lpc32xx->base + (pwm->hwpwm <<2 )); +writel (val, lpc32xx->base);clk_disable_unprepare (lpc32xx->clk); }
@@ -121,9 +121,9 @@ static int lpc32xx_pwm_probe(struct platform_device *pdev) lpc32xx->chip.base =-1 ;/* If PWM is disabled, configure the output to the default value */ - val =readl (lpc32xx->base + (lpc32xx->chip.pwms[0 ].hwpwm <<2 )); + val =readl (lpc32xx->base); val &= ~PWM_PIN_LEVEL ; -writel (val, lpc32xx->base + (lpc32xx->chip.pwms[0 ].hwpwm <<2 )); +writel (val, lpc32xx->base); ret =pwmchip_add (&lpc32xx->chip);if (ret <0 ) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 341/406 net/sched: fq_pie: avoid stalls in fq_pie_timer()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 8c21ab1bae945686c602c5bfa4e3f3352c2452c5 ]
When setting a high number of flows (limit being 65536), fq_pie_timer() is currently using too much time as syzbot reported.
Add logic to yield the cpu every 2048 flows (less than 150 usec on debug kernels).
It should also help by not blocking qdisc fast paths for too long. Worst case (65536 flows) would need 31 jiffies for a complete scan.
Relevant extract from syzbot report:
rcu: INFO: rcu_preempt detected expedited stalls on CPUs/tasks: { 0-.... } 2663 jiffies s: 873 root: 0x1/.
rcu: blocking rcu_node structures (internal RCU debug):
Sending NMI from CPU 1 to CPUs 0:
NMI backtrace for cpu 0
CPU: 0 PID: 5177 Comm: syz-executor273 Not tainted 6.5.0-syzkaller-00453-g727dbda16b83 #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/26/2023
RIP: 0010:check_kcov_mode kernel/kcov.c:173 [inline]
RIP: 0010:write_comp_data+0x21/0x90 kernel/kcov.c:236
Code: 2e 0f 1f 84 00 00 00 00 00 65 8b 05 01 b2 7d 7e 49 89 f1 89 c6 49 89 d2 81 e6 00 01 00 00 49 89 f8 65 48 8b 14 25 80 b9 03 00 <a9> 00 01 ff 00 74 0e 85 f6 74 59 8b 82 04 16 00 00 85 c0 74 4f 8b
RSP: 0018:ffffc90000007bb8 EFLAGS: 00000206
RAX: 0000000000000101 RBX: ffffc9000dc0d140 RCX: ffffffff885893b0
RDX: ffff88807c075940 RSI: 0000000000000100 RDI: 0000000000000001
RBP: 0000000000000000 R08: 0000000000000001 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000000 R12: ffffc9000dc0d178
R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
FS: 0000555555d54380(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f6b442f6130 CR3: 000000006fe1c000 CR4: 00000000003506f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<NMI>
</NMI>
<IRQ>
pie_calculate_probability+0x480/0x850 net/sched/sch_pie.c:415
fq_pie_timer+0x1da/0x4f0 net/sched/sch_fq_pie.c:387
call_timer_fn+0x1a0/0x580 kernel/time/timer.c:1700--- net/sched/sch_fq_pie.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
net/sched/sch_fq_pie.c +19 -8
@@ -61,6 +61,7 @@ struct fq_pie_sched_data {struct pie_params p_params;u32 ecn_prob;u32 flows_cnt; +u32 flows_cursor;u32 quantum;u32 memory_limit;u32 new_flow_count;
@@ -378,21 +379,31 @@ static int fq_pie_change(struct Qdisc *sch, struct nlattr *opt,static void fq_pie_timer (struct timer_list *t) {struct fq_pie_sched_data *q =from_timer (q, t, adapt_timer); +unsigned long next, tupdate;struct Qdisc *sch = q->sch;spinlock_t *root_lock;/* to lock qdisc for probability calculations */ -u32 idx; +int max_cnt, i; root_lock =qdisc_lock (qdisc_root_sleeping (sch));spin_lock (root_lock); -for (idx =0 ; idx < q->flows_cnt; idx++) -pie_calculate_probability (&q->p_params, &q->flows[idx].vars, - q->flows[idx].backlog); - -/* reset the timer to fire after 'tupdate' jiffies. */ -if (q->p_params.tupdate) -mod_timer (&q->adapt_timer, jiffies + q->p_params.tupdate); +/* Limit this expensive loop to 2048 flows per round. */ + max_cnt =min_t (int, q->flows_cnt - q->flows_cursor,2048 ); +for (i =0 ; i < max_cnt; i++) { +pie_calculate_probability (&q->p_params, + &q->flows[q->flows_cursor].vars, + q->flows[q->flows_cursor].backlog); + q->flows_cursor++; + } + tupdate = q->p_params.tupdate; + next =0 ; +if (q->flows_cursor >= q->flows_cnt) { + q->flows_cursor =0 ; + next = tupdate; + } +if (tupdate) +mod_timer (&q->adapt_timer, jiffies + next);spin_unlock (root_lock); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 342/406 sctp: annotate data-races around sk->sk_wmem_queued
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit dc9511dd6f37fe803f6b15b61b030728d7057417 ]
sk->sk_wmem_queued can be read locklessly from sctp_poll()
Use sk_wmem_queued_add() when the field is changed, and add READ_ONCE() annotations in sctp_writeable() and sctp_assocs_seq_show()
syzbot reported:
BUG: KCSAN: data-race in sctp_poll / sctp_wfree
read-write to 0xffff888149d77810 of 4 bytes by interrupt on cpu 0:
sctp_wfree+0x170/0x4a0 net/sctp/socket.c:9147 skb_release_head_state+0xb7/0x1a0 net/core/skbuff.c:988 skb_release_all net/core/skbuff.c:1000 [inline] __kfree_skb+0x16/0x140 net/core/skbuff.c:1016 consume_skb+0x57/0x180 net/core/skbuff.c:1232 sctp_chunk_destroy net/sctp/sm_make_chunk.c:1503 [inline] sctp_chunk_put+0xcd/0x130 net/sctp/sm_make_chunk.c:1530 sctp_datamsg_put+0x29a/0x300 net/sctp/chunk.c:128 sctp_chunk_free+0x34/0x50 net/sctp/sm_make_chunk.c:1515 sctp_outq_sack+0xafa/0xd70 net/sctp/outqueue.c:1381 sctp_cmd_process_sack net/sctp/sm_sideeffect.c:834 [inline] sctp_cmd_interpreter net/sctp/sm_sideeffect.c:1366 [inline] sctp_side_effects net/sctp/sm_sideeffect.c:1198 [inline] sctp_do_sm+0x12c7/0x31b0 net/sctp/sm_sideeffect.c:1169 sctp_assoc_bh_rcv+0x2b2/0x430 net/sctp/associola.c:1051 sctp_inq_push+0x108/0x120 net/sctp/inqueue.c:80 sctp_rcv+0x116e/0x1340 net/sctp/input.c:243 sctp6_rcv+0x25/0x40 net/sctp/ipv6.c:1120 ip6_protocol_deliver_rcu+0x92f/0xf30 net/ipv6/ip6_input.c:437 ip6_input_finish net/ipv6/ip6_input.c:482 [inline] NF_HOOK include/linux/netfilter.h:303 [inline] ip6_input+0xbd/0x1b0 net/ipv6/ip6_input.c:491 dst_input include/net/dst.h:468 [inline] ip6_rcv_finish+0x1e2/0x2e0 net/ipv6/ip6_input.c:79 NF_HOOK include/linux/netfilter.h:303 [inline] ipv6_rcv+0x74/0x150 net/ipv6/ip6_input.c:309 __netif_receive_skb_one_core net/core/dev.c:5452 [inline] __netif_receive_skb+0x90/0x1b0 net/core/dev.c:5566 process_backlog+0x21f/0x380 net/core/dev.c:5894 __napi_poll+0x60/0x3b0 net/core/dev.c:6460 napi_poll net/core/dev.c:6527 [inline] net_rx_action+0x32b/0x750 net/core/dev.c:6660 __do_softirq+0xc1/0x265 kernel/softirq.c:553 run_ksoftirqd+0x17/0x20 kernel/softirq.c:921 smpboot_thread_fn+0x30a/0x4a0 kernel/smpboot.c:164 kthread+0x1d7/0x210 kernel/kthread.c:389 ret_from_fork+0x2e/0x40 arch/x86/kernel/process.c:145 ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:304
read to 0xffff888149d77810 of 4 bytes by task 17828 on cpu 1:
sctp_writeable net/sctp/socket.c:9304 [inline] sctp_poll+0x265/0x410 net/sctp/socket.c:8671 sock_poll+0x253/0x270 net/socket.c:1374 vfs_poll include/linux/poll.h:88 [inline] do_pollfd fs/select.c:873 [inline] do_poll fs/select.c:921 [inline] do_sys_poll+0x636/0xc00 fs/select.c:1015 __do_sys_ppoll fs/select.c:1121 [inline] __se_sys_ppoll+0x1af/0x1f0 fs/select.c:1101 __x64_sys_ppoll+0x67/0x80 fs/select.c:1101 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
value changed: 0x00019e80 -> 0x0000cc80
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 17828 Comm: syz-executor.1 Not tainted 6.5.0-rc7-syzkaller-00185-g28f20a19294d #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/26/2023
--- net/sctp/proc.c | 2 +- net/sctp/socket.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
net/sctp/proc.c +1 -1
@@ -284,7 +284,7 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) assoc->init_retries, assoc->shutdown_retries, assoc->rtx_data_chunks,refcount_read (&sk->sk_wmem_alloc), - sk->sk_wmem_queued, +READ_ONCE (sk->sk_wmem_queued), sk->sk_sndbuf, sk->sk_rcvbuf);seq_printf (seq,"\n" );
net/sctp/socket.c +5 -5
@@ -68,7 +68,7 @@#include <net/sctp/stream_sched.h> /* Forward declarations for internal helper functions. */ -static bool sctp_writeable (struct sock *sk); +static bool sctp_writeable (const struct sock *sk);static void sctp_wfree (struct sk_buff *skb);static int sctp_wait_for_sndbuf (struct sctp_association *asoc,long *timeo_p,size_t msg_len);
@@ -138,7 +138,7 @@ static inline void sctp_set_owner_w(struct sctp_chunk *chunk)refcount_add (sizeof (struct sctp_chunk ), &sk->sk_wmem_alloc); asoc->sndbuf_used += chunk->skb->truesize +sizeof (struct sctp_chunk ); - sk->sk_wmem_queued += chunk->skb->truesize +sizeof (struct sctp_chunk ); +sk_wmem_queued_add (sk, chunk->skb->truesize +sizeof (struct sctp_chunk ));sk_mem_charge (sk, chunk->skb->truesize); }
@@ -8900,7 +8900,7 @@ static void sctp_wfree(struct sk_buff *skb)struct sock *sk = asoc->base.sk;sk_mem_uncharge (sk, skb->truesize); - sk->sk_wmem_queued -= skb->truesize +sizeof (struct sctp_chunk ); +sk_wmem_queued_add (sk, -(skb->truesize +sizeof (struct sctp_chunk ))); asoc->sndbuf_used -= skb->truesize +sizeof (struct sctp_chunk );WARN_ON (refcount_sub_and_test (sizeof (struct sctp_chunk ), &sk->sk_wmem_alloc));
@@ -9055,9 +9055,9 @@ void sctp_write_space(struct sock *sk)* UDP-style sockets or TCP-style sockets, this code should work. * - Daisy */ -static bool sctp_writeable (struct sock *sk) +static bool sctp_writeable (const struct sock *sk) { -return sk->sk_sndbuf > sk->sk_wmem_queued; +return READ_ONCE (sk->sk_sndbuf) >READ_ONCE (sk->sk_wmem_queued); }/* Wait for an association to go into ESTABLISHED state. If timeout is 0,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 343/406 ipv4: annotate data-races around fi->fib_dead
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit fce92af1c29d90184dfec638b5738831097d66e9 ]
syzbot complained about a data-race in fib_table_lookup() [1]
Add appropriate annotations to document it.
[1]
BUG: KCSAN: data-race in fib_release_info / fib_table_lookup
write to 0xffff888150f31744 of 1 bytes by task 1189 on cpu 0:
fib_release_info+0x3a0/0x460 net/ipv4/fib_semantics.c:281 fib_table_delete+0x8d2/0x900 net/ipv4/fib_trie.c:1777 fib_magic+0x1c1/0x1f0 net/ipv4/fib_frontend.c:1106 fib_del_ifaddr+0x8cf/0xa60 net/ipv4/fib_frontend.c:1317 fib_inetaddr_event+0x77/0x200 net/ipv4/fib_frontend.c:1448 notifier_call_chain kernel/notifier.c:93 [inline] blocking_notifier_call_chain+0x90/0x200 kernel/notifier.c:388 __inet_del_ifa+0x4df/0x800 net/ipv4/devinet.c:432 inet_del_ifa net/ipv4/devinet.c:469 [inline] inetdev_destroy net/ipv4/devinet.c:322 [inline] inetdev_event+0x553/0xaf0 net/ipv4/devinet.c:1606 notifier_call_chain kernel/notifier.c:93 [inline] raw_notifier_call_chain+0x6b/0x1c0 kernel/notifier.c:461 call_netdevice_notifiers_info net/core/dev.c:1962 [inline] call_netdevice_notifiers_mtu+0xd2/0x130 net/core/dev.c:2037 dev_set_mtu_ext+0x30b/0x3e0 net/core/dev.c:8673 do_setlink+0x5be/0x2430 net/core/rtnetlink.c:2837 rtnl_setlink+0x255/0x300 net/core/rtnetlink.c:3177 rtnetlink_rcv_msg+0x807/0x8c0 net/core/rtnetlink.c:6445 netlink_rcv_skb+0x126/0x220 net/netlink/af_netlink.c:2549 rtnetlink_rcv+0x1c/0x20 net/core/rtnetlink.c:6463 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x56f/0x640 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x665/0x770 net/netlink/af_netlink.c:1914 sock_sendmsg_nosec net/socket.c:725 [inline] sock_sendmsg net/socket.c:748 [inline] sock_write_iter+0x1aa/0x230 net/socket.c:1129 do_iter_write+0x4b4/0x7b0 fs/read_write.c:860 vfs_writev+0x1a8/0x320 fs/read_write.c:933 do_writev+0xf8/0x220 fs/read_write.c:976 __do_sys_writev fs/read_write.c:1049 [inline] __se_sys_writev fs/read_write.c:1046 [inline] __x64_sys_writev+0x45/0x50 fs/read_write.c:1046 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
read to 0xffff888150f31744 of 1 bytes by task 21839 on cpu 1:
fib_table_lookup+0x2bf/0xd50 net/ipv4/fib_trie.c:1585 fib_lookup include/net/ip_fib.h:383 [inline] ip_route_output_key_hash_rcu+0x38c/0x12c0 net/ipv4/route.c:2751 ip_route_output_key_hash net/ipv4/route.c:2641 [inline] __ip_route_output_key include/net/route.h:134 [inline] ip_route_output_flow+0xa6/0x150 net/ipv4/route.c:2869 send4+0x1e7/0x500 drivers/net/wireguard/socket.c:61 wg_socket_send_skb_to_peer+0x94/0x130 drivers/net/wireguard/socket.c:175 wg_socket_send_buffer_to_peer+0xd6/0x100 drivers/net/wireguard/socket.c:200 wg_packet_send_handshake_initiation drivers/net/wireguard/send.c:40 [inline] wg_packet_handshake_send_worker+0x10c/0x150 drivers/net/wireguard/send.c:51 process_one_work+0x434/0x860 kernel/workqueue.c:2600 worker_thread+0x5f2/0xa10 kernel/workqueue.c:2751 kthread+0x1d7/0x210 kernel/kthread.c:389 ret_from_fork+0x2e/0x40 arch/x86/kernel/process.c:145 ret_from_fork_asm+0x11/0x20 arch/x86/entry/entry_64.S:304
value changed: 0x00 -> 0x01
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 21839 Comm: kworker/u4:18 Tainted: G W 6.5.0-syzkaller #0
--- net/ipv4/fib_semantics.c | 5 ++++- net/ipv4/fib_trie.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-)
net/ipv4/fib_semantics.c +4 -1
@@ -278,7 +278,8 @@ void fib_release_info(struct fib_info *fi)hlist_del (&nexthop_nh->nh_hash); } endfor_nexthops(fi) } - fi->fib_dead =1 ; +/* Paired with READ_ONCE() from fib_table_lookup() */ +WRITE_ONCE (fi->fib_dead,1 );fib_info_put (fi); }spin_unlock_bh (&fib_info_lock);
@@ -1599,6 +1600,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, link_it: ofi =fib_find_info (fi);if (ofi) { +/* fib_table_lookup() should not see @fi yet. */ fi->fib_dead =1 ;free_fib_info (fi); ofi->fib_treeref++;
@@ -1637,6 +1639,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, failure:if (fi) { +/* fib_table_lookup() should not see @fi yet. */ fi->fib_dead =1 ;free_fib_info (fi); }
net/ipv4/fib_trie.c +2 -1
@@ -1534,7 +1534,8 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp, }if (fa->fa_tos && fa->fa_tos != flp->flowi4_tos)continue ; -if (fi->fib_dead) +/* Paired with WRITE_ONCE() in fib_release_info() */ +if (READ_ONCE (fi->fib_dead))continue ;if (fa->fa_info->fib_scope < flp->flowi4_scope)continue ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 344/406 net: read sk->sk_family once in sk_mc_loop()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit a3e0fdf71bbe031de845e8e08ed7fba49f9c702c ]
syzbot is playing with IPV6_ADDRFORM quite a lot these days, and managed to hit the WARN_ON_ONCE(1) in sk_mc_loop()
We have many more similar issues to fix.
WARNING: CPU: 1 PID: 1593 at net/core/sock.c:782 sk_mc_loop+0x165/0x260 Modules linked in: CPU: 1 PID: 1593 Comm: kworker/1:3 Not tainted 6.1.40-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/26/2023 Workqueue: events_power_efficient gc_worker RIP: 0010:sk_mc_loop+0x165/0x260 net/core/sock.c:782 Code: 34 1b fd 49 81 c7 18 05 00 00 4c 89 f8 48 c1 e8 03 42 80 3c 20 00 74 08 4c 89 ff e8 25 36 6d fd 4d 8b 37 eb 13 e8 db 33 1b fd <0f> 0b b3 01 eb 34 e8 d0 33 1b fd 45 31 f6 49 83 c6 38 4c 89 f0 48 RSP: 0018:ffffc90000388530 EFLAGS: 00010246 RAX: ffffffff846d9b55 RBX: 0000000000000011 RCX: ffff88814f884980 RDX: 0000000000000102 RSI: ffffffff87ae5160 RDI: 0000000000000011 RBP: ffffc90000388550 R08: 0000000000000003 R09: ffffffff846d9a65 R10: 0000000000000002 R11: ffff88814f884980 R12: dffffc0000000000 R13: ffff88810dbee000 R14: 0000000000000010 R15: ffff888150084000 FS: 0000000000000000(0000) GS:ffff8881f6b00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000180 CR3: 000000014ee5b000 CR4: 00000000003506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <IRQ> [<ffffffff8507734f>] ip6_finish_output2+0x33f/0x1ae0 net/ipv6/ip6_output.c:83 [<ffffffff85062766>] __ip6_finish_output net/ipv6/ip6_output.c:200 [inline] [<ffffffff85062766>] ip6_finish_output+0x6c6/0xb10 net/ipv6/ip6_output.c:211 [<ffffffff85061f8c>] NF_HOOK_COND include/linux/netfilter.h:298 [inline] [<ffffffff85061f8c>] ip6_output+0x2bc/0x3d0 net/ipv6/ip6_output.c:232 [<ffffffff852071cf>] dst_output include/net/dst.h:444 [inline] [<ffffffff852071cf>] ip6_local_out+0x10f/0x140 net/ipv6/output_core.c:161 [<ffffffff83618fb4>] ipvlan_process_v6_outbound drivers/net/ipvlan/ipvlan_core.c:483 [inline] [<ffffffff83618fb4>] ipvlan_process_outbound drivers/net/ipvlan/ipvlan_core.c:529 [inline] [<ffffffff83618fb4>] ipvlan_xmit_mode_l3 drivers/net/ipvlan/ipvlan_core.c:602 [inline] [<ffffffff83618fb4>] ipvlan_queue_xmit+0x1174/0x1be0 drivers/net/ipvlan/ipvlan_core.c:677 [<ffffffff8361ddd9>] ipvlan_start_xmit+0x49/0x100 drivers/net/ipvlan/ipvlan_main.c:229 [<ffffffff84763fc0>] netdev_start_xmit include/linux/netdevice.h:4925 [inline] [<ffffffff84763fc0>] xmit_one net/core/dev.c:3644 [inline] [<ffffffff84763fc0>] dev_hard_start_xmit+0x320/0x980 net/core/dev.c:3660 [<ffffffff8494c650>] sch_direct_xmit+0x2a0/0x9c0 net/sched/sch_generic.c:342 [<ffffffff8494d883>] qdisc_restart net/sched/sch_generic.c:407 [inline] [<ffffffff8494d883>] __qdisc_run+0xb13/0x1e70 net/sched/sch_generic.c:415 [<ffffffff8478c426>] qdisc_run+0xd6/0x260 include/net/pkt_sched.h:125 [<ffffffff84796eac>] net_tx_action+0x7ac/0x940 net/core/dev.c:5247 [<ffffffff858002bd>] __do_softirq+0x2bd/0x9bd kernel/softirq.c:599 [<ffffffff814c3fe8>] invoke_softirq kernel/softirq.c:430 [inline] [<ffffffff814c3fe8>] __irq_exit_rcu+0xc8/0x170 kernel/softirq.c:683 [<ffffffff814c3f09>] irq_exit_rcu+0x9/0x20 kernel/softirq.c:695
--- net/core/sock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/sock.c +2 -1
@@ -690,7 +690,8 @@ bool sk_mc_loop(struct sock *sk)return false;if (!sk)return true; -switch (sk->sk_family) { +/* IPV6_ADDRFORM can change sk->sk_family under us. */ +switch (READ_ONCE (sk->sk_family)) {case AF_INET :return inet_sk (sk)->mc_loop;#if IS_ENABLED (CONFIG_IPV6 )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 345/406 drm/i915/gvt: Save/restore HW status to support GVT suspend/resume
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Colin Xu <[email protected]>
[ Upstream commit 5f60b12edcd0c2e83650a6f9aa4a969bd9fc5732 ]
This patch save/restore necessary GVT info during i915 suspend/resume so that GVT enabled QEMU VM can continue running.
Only GGTT and fence regs are saved/restored now. GVT will save GGTT entries on each host_entry update, restore the saved dirty entries and re-init fence regs in resume routine.
V2:
- Change kzalloc/kfree to vzalloc/vfree since the space allocated from kmalloc may not enough for all saved GGTT entries.
- Keep gvt suspend/resume wrapper in intel_gvt.h/intel_gvt.c and move the actual implementation to gvt.h/gvt.c. (zhenyu)
- Check gvt config on and active with intel_gvt_active(). (zhenyu)
V3: (zhenyu)
- Incorrect copy length. Should be num entries * entry size.
- Use memcpy_toio()/memcpy_fromio() instead of memcpy for iomem.
- Add F_PM_SAVE flags to indicate which MMIOs to save/restore for PM.
V4:
Rebase.
V5:
Fail intel_gvt_save_ggtt as -ENOMEM if fail to alloc memory to save ggtt. Free allocated ggtt_entries on failure.
V6:
Save host entry to per-vGPU gtt.ggtt_mm on each host_entry update.
V7:
Restore GGTT entry based on present bit.
Split fence restore and mmio restore in different functions.
Stable-dep-of: a90c367e5af6 ("drm/i915/gvt: Drop unused helper intel_vgpu_reset_gtt()")
--- drivers/gpu/drm/i915/gvt/gtt.c | 64 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/gvt/gtt.h | 4 ++ drivers/gpu/drm/i915/gvt/gvt.c | 9 ++++ drivers/gpu/drm/i915/gvt/gvt.h | 3 ++ drivers/gpu/drm/i915/gvt/handlers.c | 44 ++++++++++++++++++-- drivers/gpu/drm/i915/gvt/mmio.h | 4 ++ drivers/gpu/drm/i915/intel_gvt.c | 15 +++++++ drivers/gpu/drm/i915/intel_gvt.h | 5 +++ 8 files changed, 145 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gvt/gtt.c +64 -0
@@ -636,9 +636,18 @@ static void ggtt_set_host_entry(struct intel_vgpu_mm *mm, struct intel_gvt_gtt_entry *entry, unsigned long index) {struct intel_gvt_gtt_pte_ops *pte_ops = mm->vgpu->gvt->gtt.pte_ops; +unsigned long offset = index;GEM_BUG_ON (mm->type !=INTEL_GVT_MM_GGTT ); +if (vgpu_gmadr_is_aperture (mm->vgpu, index <<I915_GTT_PAGE_SHIFT )) { + offset -= (vgpu_aperture_gmadr_base (mm->vgpu) >>PAGE_SHIFT ); + mm->ggtt_mm.host_ggtt_aperture[offset] = entry->val64; + }else if (vgpu_gmadr_is_hidden (mm->vgpu, index <<I915_GTT_PAGE_SHIFT )) { + offset -= (vgpu_hidden_gmadr_base (mm->vgpu) >>PAGE_SHIFT ); + mm->ggtt_mm.host_ggtt_hidden[offset] = entry->val64; + } + pte_ops->set_entry (NULL , entry, index, false,0 , mm->vgpu); }
@@ -1953,6 +1962,21 @@ static struct intel_vgpu_mm *intel_vgpu_create_ggtt_mm(struct intel_vgpu *vgpu)return ERR_PTR (-ENOMEM ); } + mm->ggtt_mm.host_ggtt_aperture =vzalloc ((vgpu_aperture_sz (vgpu) >>PAGE_SHIFT ) *sizeof (u64)); +if (!mm->ggtt_mm.host_ggtt_aperture) { +vfree (mm->ggtt_mm.virtual_ggtt); +vgpu_free_mm (mm); +return ERR_PTR (-ENOMEM ); + } + + mm->ggtt_mm.host_ggtt_hidden =vzalloc ((vgpu_hidden_sz (vgpu) >>PAGE_SHIFT ) *sizeof (u64)); +if (!mm->ggtt_mm.host_ggtt_hidden) { +vfree (mm->ggtt_mm.host_ggtt_aperture); +vfree (mm->ggtt_mm.virtual_ggtt); +vgpu_free_mm (mm); +return ERR_PTR (-ENOMEM ); + } +return mm; }
@@ -1980,6 +2004,8 @@ void _intel_vgpu_mm_release(struct kref *mm_ref)invalidate_ppgtt_mm (mm); }else {vfree (mm->ggtt_mm.virtual_ggtt); +vfree (mm->ggtt_mm.host_ggtt_aperture); +vfree (mm->ggtt_mm.host_ggtt_hidden); }vgpu_free_mm (mm);
@@ -2861,3 +2887,41 @@ void intel_vgpu_reset_gtt(struct intel_vgpu *vgpu)intel_vgpu_destroy_all_ppgtt_mm (vgpu);intel_vgpu_reset_ggtt (vgpu, true); } + +/** +* intel_gvt_restore_ggtt - restore all vGPU's ggtt entries +* @gvt: intel gvt device +* +* This function is called at driver resume stage to restore +* GGTT entries of every vGPU. +* +*/ +void intel_gvt_restore_ggtt (struct intel_gvt *gvt) +{ +struct intel_vgpu *vgpu; +struct intel_vgpu_mm *mm; +int id; +gen8_pte_t pte; +u32 idx, num_low, num_hi, offset; + +/* Restore dirty host ggtt for all vGPUs */ +idr_for_each_entry (&(gvt)->vgpu_idr, vgpu, id) { + mm = vgpu->gtt.ggtt_mm; + + num_low =vgpu_aperture_sz (vgpu) >>PAGE_SHIFT ; + offset =vgpu_aperture_gmadr_base (vgpu) >>PAGE_SHIFT ; +for (idx =0 ; idx < num_low; idx++) { + pte = mm->ggtt_mm.host_ggtt_aperture[idx]; +if (pte & _PAGE_PRESENT) +write_pte64 (vgpu->gvt->gt->ggtt, offset + idx, pte); + } + + num_hi =vgpu_hidden_sz (vgpu) >>PAGE_SHIFT ; + offset =vgpu_hidden_gmadr_base (vgpu) >>PAGE_SHIFT ; +for (idx =0 ; idx < num_hi; idx++) { + pte = mm->ggtt_mm.host_ggtt_hidden[idx]; +if (pte & _PAGE_PRESENT) +write_pte64 (vgpu->gvt->gt->ggtt, offset + idx, pte); + } + } +}
drivers/gpu/drm/i915/gvt/gtt.h +4 -0
@@ -164,6 +164,9 @@ struct intel_vgpu_mm { } ppgtt_mm;struct {void *virtual_ggtt; +/* Save/restore for PM */ +u64 *host_ggtt_aperture; +u64 *host_ggtt_hidden;struct list_head partial_pte_list; } ggtt_mm; };
@@ -280,5 +283,6 @@ int intel_vgpu_emulate_ggtt_mmio_write(struct intel_vgpu *vgpu, unsigned int off, void *p_data, unsigned int bytes);void intel_vgpu_destroy_all_ppgtt_mm (struct intel_vgpu *vgpu); +void intel_gvt_restore_ggtt (struct intel_gvt *gvt);#endif /* _GVT_GTT_H_ */
drivers/gpu/drm/i915/gvt/gvt.c +9 -0
@@ -405,6 +405,15 @@ int intel_gvt_init_device(struct drm_i915_private *i915)return ret; } +int +intel_gvt_pm_resume (struct intel_gvt *gvt) +{ +intel_gvt_restore_fence (gvt); +intel_gvt_restore_mmio (gvt); +intel_gvt_restore_ggtt (gvt); +return 0 ; +} +int intel_gvt_register_hypervisor (struct intel_gvt_mpt *m) {
drivers/gpu/drm/i915/gvt/gvt.h +3 -0
@@ -255,6 +255,8 @@ struct intel_gvt_mmio {#define F_CMD_ACCESS (1 << 3)/* This reg has been accessed by a VM */ #define F_ACCESSED (1 << 4) +/* This reg requires save & restore during host PM suspend/resume */ +#define F_PM_SAVE (1 << 5)/* This reg could be accessed by unaligned address */ #define F_UNALIGN (1 << 6)/* This reg is in GVT's mmio save-restor list and in hardware
@@ -685,6 +687,7 @@ void intel_gvt_debugfs_remove_vgpu(struct intel_vgpu *vgpu);void intel_gvt_debugfs_init (struct intel_gvt *gvt);void intel_gvt_debugfs_clean (struct intel_gvt *gvt); +int intel_gvt_pm_resume (struct intel_gvt *gvt);#include "trace.h" #include "mpt.h"
drivers/gpu/drm/i915/gvt/handlers.c +41 -3
53 lines not on this page · raw message
drivers/gpu/drm/i915/gvt/mmio.h +4 -0
@@ -104,4 +104,8 @@ int intel_vgpu_mmio_reg_rw(struct intel_vgpu *vgpu, unsigned int offset,int intel_vgpu_mask_mmio_write (struct intel_vgpu *vgpu,unsigned int offset,void *p_data,unsigned int bytes); + +void intel_gvt_restore_fence (struct intel_gvt *gvt); +void intel_gvt_restore_mmio (struct intel_gvt *gvt); +#endif
drivers/gpu/drm/i915/intel_gvt.c +15 -0
@@ -24,6 +24,7 @@#include "i915_drv.h" #include "i915_vgpu.h" #include "intel_gvt.h" +#include "gvt/gvt.h" /** * DOC: Intel GVT-g host support
@@ -147,3 +148,17 @@ void intel_gvt_driver_remove(struct drm_i915_private *dev_priv)intel_gvt_clean_device (dev_priv); } + +/** +* intel_gvt_resume - GVT resume routine wapper +* +* @dev_priv: drm i915 private * +* +* This function is called at the i915 driver resume stage to restore required +* HW status for GVT so that vGPU can continue running after resumed. +*/ +void intel_gvt_resume (struct drm_i915_private *dev_priv) +{ +if (intel_gvt_active (dev_priv)) +intel_gvt_pm_resume (dev_priv->gvt); +}
drivers/gpu/drm/i915/intel_gvt.h +5 -0
@@ -33,6 +33,7 @@ int intel_gvt_init_device(struct drm_i915_private *dev_priv);void intel_gvt_clean_device (struct drm_i915_private *dev_priv);int intel_gvt_init_host (void );void intel_gvt_sanitize_options (struct drm_i915_private *dev_priv); +void intel_gvt_resume (struct drm_i915_private *dev_priv);#else static inline int intel_gvt_init (struct drm_i915_private *dev_priv) {
@@ -46,6 +47,10 @@ static inline void intel_gvt_driver_remove(struct drm_i915_private *dev_priv)static inline void intel_gvt_sanitize_options (struct drm_i915_private *dev_priv) { } + +static inline void intel_gvt_resume (struct drm_i915_private *dev_priv) +{ +}#endif #endif /* _INTEL_GVT_H_ */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 346/406 drm/i915/gvt: Drop unused helper intel_vgpu_reset_gtt()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit a90c367e5af63880008e21dd199dac839e0e9e0f ]
Drop intel_vgpu_reset_gtt() as it no longer has any callers. In addition to eliminating dead code, this eliminates the last possible scenario where __kvmgt_protect_table_find() can be reached without holding vgpu_lock. Requiring vgpu_lock to be held when calling __kvmgt_protect_table_find() will allow a protecting the gfn hash with vgpu_lock without too much fuss.
No functional change intended.
--- drivers/gpu/drm/i915/gvt/gtt.c | 18 ------------------ drivers/gpu/drm/i915/gvt/gtt.h | 1 - 2 files changed, 19 deletions(-)
drivers/gpu/drm/i915/gvt/gtt.c +0 -18
@@ -2870,24 +2870,6 @@ void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu, bool invalidate_old)ggtt_invalidate (gvt->gt); } -/** -* intel_vgpu_reset_gtt - reset the all GTT related status -* @vgpu: a vGPU -* -* This function is called from vfio core to reset reset all -* GTT related status, including GGTT, PPGTT, scratch page. -* -*/ -void intel_vgpu_reset_gtt (struct intel_vgpu *vgpu) -{ -/* Shadow pages are only created when there is no page -* table tracking data, so remove page tracking data after -* removing the shadow pages. -*/ -intel_vgpu_destroy_all_ppgtt_mm (vgpu); -intel_vgpu_reset_ggtt (vgpu, true); -} -/** * intel_gvt_restore_ggtt - restore all vGPU's ggtt entries * @gvt: intel gvt device
drivers/gpu/drm/i915/gvt/gtt.h +0 -1
@@ -215,7 +215,6 @@ void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu, bool invalidate_old);void intel_vgpu_invalidate_ppgtt (struct intel_vgpu *vgpu);int intel_gvt_init_gtt (struct intel_gvt *gvt); -void intel_vgpu_reset_gtt (struct intel_vgpu *vgpu);void intel_gvt_clean_gtt (struct intel_gvt *gvt); struct intel_vgpu_mm *intel_gvt_find_ppgtt_mm(struct intel_vgpu *vgpu,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 347/406 ipv4: ignore dst hint for multipath routes
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sriram Yagnaraman <[email protected]>
[ Upstream commit 6ac66cb03ae306c2e288a9be18226310529f5b25 ]
Route hints when the nexthop is part of a multipath group causes packets in the same receive batch to be sent to the same nexthop irrespective of the multipath hash of the packet. So, do not extract route hint for packets whose destination is part of a multipath group.
A new SKB flag IPSKB_MULTIPATH is introduced for this purpose, set the flag when route is looked up in ip_mkroute_input() and use it in ip_extract_route_hint() to check for the existence of the flag.
--- include/net/ip.h | 1 + net/ipv4/ip_input.c | 3 ++- net/ipv4/route.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
include/net/ip.h +1 -0
@@ -56,6 +56,7 @@ struct inet_skb_parm {#define IPSKB_FRAG_PMTU BIT(6)#define IPSKB_L3SLAVE BIT(7)#define IPSKB_NOPOLICY BIT(8) +#define IPSKB_MULTIPATH BIT(9)u16 frag_max_size; };
net/ipv4/ip_input.c +2 -1
@@ -566,7 +566,8 @@ static void ip_sublist_rcv_finish(struct list_head *head)static struct sk_buff *ip_extract_route_hint (const struct net *net,struct sk_buff *skb,int rt_type) { -if (fib4_has_custom_rules (net) || rt_type ==RTN_BROADCAST ) +if (fib4_has_custom_rules (net) || rt_type ==RTN_BROADCAST || +IPCB (skb)->flags &IPSKB_MULTIPATH )return NULL ;return skb;
net/ipv4/route.c +1 -0
@@ -2066,6 +2066,7 @@ static int ip_mkroute_input(struct sk_buff *skb,int h =fib_multipath_hash (res->fi->fib_net,NULL , skb, hkeys);fib_select_multipath (res, h); + IPCB(skb)->flags |= IPSKB_MULTIPATH; }#endif
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 348/406 igb: disable virtualization features on 82580
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Corinna Vinschen <[email protected]>
[ Upstream commit fa09bc40b21a33937872c4c4cf0f266ec9fa4869 ]
Disable virtualization features on 82580 just as on i210/i211. This avoids that virt functions are acidentally called on 82850.
--- drivers/net/ethernet/intel/igb/igb_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +3 -2
@@ -3857,8 +3857,9 @@ static void igb_probe_vfs(struct igb_adapter *adapter)struct pci_dev *pdev = adapter->pdev;struct e1000_hw *hw = &adapter->hw; -/* Virtualization features not supported on i210 family. */ -if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)) +/* Virtualization features not supported on i210 and 82580 family. */ +if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211) || + (hw->mac.type == e1000_82580))return ;/* Of the below we really only want the effect of getting
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 349/406 veth: Fixing transmit return status for dropped packets
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liang Chen <[email protected]>
[ Upstream commit 151e887d8ff97e2e42110ffa1fb1e6a2128fb364 ]
The veth_xmit function returns NETDEV_TX_OK even when packets are dropped. This behavior leads to incorrect calculations of statistics counts, as well as things like txq->trans_start updates.
--- drivers/net/veth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/veth.c +3 -1
@@ -285,6 +285,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) {struct veth_priv *rcv_priv, *priv =netdev_priv (dev);struct veth_rq *rq =NULL ; +int ret =NETDEV_TX_OK ;struct net_device *rcv;int length = skb->len;bool rcv_xdp = false;
@@ -311,6 +312,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) }else { drop:atomic64_inc (&priv->dropped); + ret =NET_XMIT_DROP ; }if (rcv_xdp)
@@ -318,7 +320,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)rcu_read_unlock (); -return NETDEV_TX_OK ; +return ret; }static u64 veth_stats_tx (struct net_device *dev,u64 *packets,u64 *bytes)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 350/406 net: ipv6/addrconf: avoid integer underflow in ipv6_create_tempaddr
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Henrie <[email protected]>
[ Upstream commit f31867d0d9d82af757c1e0178b659438f4c1ea3c ]
The existing code incorrectly casted a negative value (the result of a subtraction) to an unsigned value without checking. For example, if /proc/sys/net/ipv6/conf/*/temp_prefered_lft was set to 1, the preferred lifetime would jump to 4 billion seconds. On my machine and network the shortest lifetime that avoided underflow was 3 seconds.
--- net/ipv6/addrconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/addrconf.c +1 -1
@@ -1359,7 +1359,7 @@ static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp, bool block)* idev->desync_factor if it's larger */ cnf_temp_preferred_lft =READ_ONCE (idev->cnf.temp_prefered_lft); - max_desync_factor =min_t (__u32, + max_desync_factor =min_t (long, idev->cnf.max_desync_factor, cnf_temp_preferred_lft - regen_advance);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 351/406 af_unix: Fix data-races around user->unix_inflight.
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 0bc36c0650b21df36fbec8136add83936eaf0607 ]
user->unix_inflight is changed under spin_lock(unix_gc_lock), but too_many_unix_fds() reads it locklessly.
Let's annotate the write/read accesses to user->unix_inflight.
BUG: KCSAN: data-race in unix_attach_fds / unix_inflight
write to 0xffffffff8546f2d0 of 8 bytes by task 44798 on cpu 1:
unix_inflight+0x157/0x180 net/unix/scm.c:66 unix_attach_fds+0x147/0x1e0 net/unix/scm.c:123 unix_scm_to_skb net/unix/af_unix.c:1827 [inline] unix_dgram_sendmsg+0x46a/0x14f0 net/unix/af_unix.c:1950 unix_seqpacket_sendmsg net/unix/af_unix.c:2308 [inline] unix_seqpacket_sendmsg+0xba/0x130 net/unix/af_unix.c:2292 sock_sendmsg_nosec net/socket.c:725 [inline] sock_sendmsg+0x148/0x160 net/socket.c:748 ____sys_sendmsg+0x4e4/0x610 net/socket.c:2494 ___sys_sendmsg+0xc6/0x140 net/socket.c:2548 __sys_sendmsg+0x94/0x140 net/socket.c:2577 __do_sys_sendmsg net/socket.c:2586 [inline] __se_sys_sendmsg net/socket.c:2584 [inline] __x64_sys_sendmsg+0x45/0x50 net/socket.c:2584 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3b/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
read to 0xffffffff8546f2d0 of 8 bytes by task 44814 on cpu 0:
too_many_unix_fds net/unix/scm.c:101 [inline] unix_attach_fds+0x54/0x1e0 net/unix/scm.c:110 unix_scm_to_skb net/unix/af_unix.c:1827 [inline] unix_dgram_sendmsg+0x46a/0x14f0 net/unix/af_unix.c:1950 unix_seqpacket_sendmsg net/unix/af_unix.c:2308 [inline] unix_seqpacket_sendmsg+0xba/0x130 net/unix/af_unix.c:2292 sock_sendmsg_nosec net/socket.c:725 [inline] sock_sendmsg+0x148/0x160 net/socket.c:748 ____sys_sendmsg+0x4e4/0x610 net/socket.c:2494 ___sys_sendmsg+0xc6/0x140 net/socket.c:2548 __sys_sendmsg+0x94/0x140 net/socket.c:2577 __do_sys_sendmsg net/socket.c:2586 [inline] __se_sys_sendmsg net/socket.c:2584 [inline] __x64_sys_sendmsg+0x45/0x50 net/socket.c:2584 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3b/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
value changed: 0x000000000000000c -> 0x000000000000000d
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 44814 Comm: systemd-coredum Not tainted 6.4.0-11989-g6843306689af #6 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014
--- net/unix/scm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/unix/scm.c +3 -3
@@ -63,7 +63,7 @@ void unix_inflight(struct user_struct *user, struct file *fp)/* Paired with READ_ONCE() in wait_for_unix_gc() */ WRITE_ONCE (unix_tot_inflight, unix_tot_inflight +1 ); } - user->unix_inflight++; +WRITE_ONCE (user->unix_inflight, user->unix_inflight +1 );spin_unlock (&unix_gc_lock); }
@@ -84,7 +84,7 @@ void unix_notinflight(struct user_struct *user, struct file *fp)/* Paired with READ_ONCE() in wait_for_unix_gc() */ WRITE_ONCE (unix_tot_inflight, unix_tot_inflight -1 ); } - user->unix_inflight--; +WRITE_ONCE (user->unix_inflight, user->unix_inflight -1 );spin_unlock (&unix_gc_lock); }
@@ -98,7 +98,7 @@ static inline bool too_many_unix_fds(struct task_struct *p) {struct user_struct *user =current_user (); -if (unlikely (user->unix_inflight >task_rlimit (p,RLIMIT_NOFILE ))) +if (unlikely (READ_ONCE (user->unix_inflight) >task_rlimit (p,RLIMIT_NOFILE )))return !capable (CAP_SYS_RESOURCE ) && !capable (CAP_SYS_ADMIN );return false; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 352/406 af_unix: Fix data-race around unix_tot_inflight.
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit ade32bd8a738d7497ffe9743c46728db26740f78 ]
unix_tot_inflight is changed under spin_lock(unix_gc_lock), but unix_release_sock() reads it locklessly.
Let's use READ_ONCE() for unix_tot_inflight.
Note that the writer side was marked by commit 9d6d7f1cb67c ("af_unix:
annote lockless accesses to unix_tot_inflight & gc_in_progress")
BUG: KCSAN: data-race in unix_inflight / unix_release_sock
write (marked) to 0xffffffff871852b8 of 4 bytes by task 123 on cpu 1:
unix_inflight+0x130/0x180 net/unix/scm.c:64 unix_attach_fds+0x137/0x1b0 net/unix/scm.c:123 unix_scm_to_skb net/unix/af_unix.c:1832 [inline] unix_dgram_sendmsg+0x46a/0x14f0 net/unix/af_unix.c:1955 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x148/0x160 net/socket.c:747 ____sys_sendmsg+0x4e4/0x610 net/socket.c:2493 ___sys_sendmsg+0xc6/0x140 net/socket.c:2547 __sys_sendmsg+0x94/0x140 net/socket.c:2576 __do_sys_sendmsg net/socket.c:2585 [inline] __se_sys_sendmsg net/socket.c:2583 [inline] __x64_sys_sendmsg+0x45/0x50 net/socket.c:2583 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3b/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc
read to 0xffffffff871852b8 of 4 bytes by task 4891 on cpu 0:
unix_release_sock+0x608/0x910 net/unix/af_unix.c:671 unix_release+0x59/0x80 net/unix/af_unix.c:1058 __sock_release+0x7d/0x170 net/socket.c:653 sock_close+0x19/0x30 net/socket.c:1385 __fput+0x179/0x5e0 fs/file_table.c:321 ____fput+0x15/0x20 fs/file_table.c:349 task_work_run+0x116/0x1a0 kernel/task_work.c:179 resume_user_mode_work include/linux/resume_user_mode.h:49 [inline] exit_to_user_mode_loop kernel/entry/common.c:171 [inline] exit_to_user_mode_prepare+0x174/0x180 kernel/entry/common.c:204 __syscall_exit_to_user_mode_work kernel/entry/common.c:286 [inline] syscall_exit_to_user_mode+0x1a/0x30 kernel/entry/common.c:297 do_syscall_64+0x4b/0x90 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x72/0xdc
value changed: 0x00000000 -> 0x00000001
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 4891 Comm: systemd-coredum Not tainted 6.4.0-rc5-01219-gfa0e21fa4443 #5 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014
--- net/unix/af_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/unix/af_unix.c +1 -1
@@ -587,7 +587,7 @@ static void unix_release_sock(struct sock *sk, int embrion)* What the above comment does talk about? --ANK(980817) */ -if (unix_tot_inflight) +if (READ_ONCE (unix_tot_inflight))unix_gc ();/* Garbage collect fds */ }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 353/406 af_unix: Fix data-races around sk->sk_shutdown.
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit afe8764f76346ba838d4f162883e23d2fcfaa90e ]
sk->sk_shutdown is changed under unix_state_lock(sk), but unix_dgram_sendmsg() calls two functions to read sk_shutdown locklessly.
sock_alloc_send_pskb
`- sock_wait_for_wmem
Let's use READ_ONCE() there.
Note that the writer side was marked by commit e1d09c2c2f57 ("af_unix:
Fix data races around sk->sk_shutdown.").
BUG: KCSAN: data-race in sock_alloc_send_pskb / unix_release_sock
write (marked) to 0xffff8880069af12c of 1 bytes by task 1 on cpu 1:
unix_release_sock+0x75c/0x910 net/unix/af_unix.c:631 unix_release+0x59/0x80 net/unix/af_unix.c:1053 __sock_release+0x7d/0x170 net/socket.c:654 sock_close+0x19/0x30 net/socket.c:1386 __fput+0x2a3/0x680 fs/file_table.c:384 ____fput+0x15/0x20 fs/file_table.c:412 task_work_run+0x116/0x1a0 kernel/task_work.c:179 resume_user_mode_work include/linux/resume_user_mode.h:49 [inline] exit_to_user_mode_loop kernel/entry/common.c:171 [inline] exit_to_user_mode_prepare+0x174/0x180 kernel/entry/common.c:204 __syscall_exit_to_user_mode_work kernel/entry/common.c:286 [inline] syscall_exit_to_user_mode+0x1a/0x30 kernel/entry/common.c:297 do_syscall_64+0x4b/0x90 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
read to 0xffff8880069af12c of 1 bytes by task 28650 on cpu 0:
sock_alloc_send_pskb+0xd2/0x620 net/core/sock.c:2767 unix_dgram_sendmsg+0x2f8/0x14f0 net/unix/af_unix.c:1944 unix_seqpacket_sendmsg net/unix/af_unix.c:2308 [inline] unix_seqpacket_sendmsg+0xba/0x130 net/unix/af_unix.c:2292 sock_sendmsg_nosec net/socket.c:725 [inline] sock_sendmsg+0x148/0x160 net/socket.c:748 ____sys_sendmsg+0x4e4/0x610 net/socket.c:2494 ___sys_sendmsg+0xc6/0x140 net/socket.c:2548 __sys_sendmsg+0x94/0x140 net/socket.c:2577 __do_sys_sendmsg net/socket.c:2586 [inline] __se_sys_sendmsg net/socket.c:2584 [inline] __x64_sys_sendmsg+0x45/0x50 net/socket.c:2584 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3b/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
value changed: 0x00 -> 0x03
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 28650 Comm: systemd-coredum Not tainted 6.4.0-11989-g6843306689af #6 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014
--- net/core/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/sock.c +2 -2
@@ -2315,7 +2315,7 @@ static long sock_wait_for_wmem(struct sock *sk, long timeo)prepare_to_wait (sk_sleep (sk), &wait,TASK_INTERRUPTIBLE );if (refcount_read (&sk->sk_wmem_alloc) <READ_ONCE (sk->sk_sndbuf))break ; -if (sk->sk_shutdown &SEND_SHUTDOWN ) +if (READ_ONCE (sk->sk_shutdown) &SEND_SHUTDOWN )break ;if (sk->sk_err)break ;
@@ -2345,7 +2345,7 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len, goto failure; err = -EPIPE ; -if (sk->sk_shutdown &SEND_SHUTDOWN ) +if (READ_ONCE (sk->sk_shutdown) &SEND_SHUTDOWN ) goto failure;if (sk_wmem_alloc_get (sk) <READ_ONCE (sk->sk_sndbuf))
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 354/406 af_unix: Fix data race around sk->sk_err.
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit b192812905e4b134f7b7994b079eb647e9d2d37e ]
As with sk->sk_shutdown shown in the previous patch, sk->sk_err can be read locklessly by unix_dgram_sendmsg().
Let's use READ_ONCE() for sk_err as well.
Note that the writer side is marked by commit cc04410af7de ("af_unix:
annotate lockless accesses to sk->sk_err").
--- net/core/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/sock.c +1 -1
@@ -2317,7 +2317,7 @@ static long sock_wait_for_wmem(struct sock *sk, long timeo)break ;if (READ_ONCE (sk->sk_shutdown) &SEND_SHUTDOWN )break ; -if (sk->sk_err) +if (READ_ONCE (sk->sk_err))break ; timeo =schedule_timeout (timeo); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 355/406 net: sched: sch_qfq: Fix UAF in qfq_dequeue()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: valis <[email protected]>
[ Upstream commit 8fc134fee27f2263988ae38920bc03da416b03d8 ]
When the plug qdisc is used as a class of the qfq qdisc it could trigger a UAF. This issue can be reproduced with following commands:
tc qdisc add dev lo root handle 1: qfq
tc class add dev lo parent 1: classid 1:1 qfq weight 1 maxpkt 512 tc qdisc add dev lo parent 1:1 handle 2: plug
tc filter add dev lo parent 1: basic classid 1:1
ping -c1 127.0.0.1
and boom:
[ 285.353793] BUG: KASAN: slab-use-after-free in qfq_dequeue+0xa7/0x7f0 [ 285.354910] Read of size 4 at addr ffff8880bad312a8 by task ping/144 [ 285.355903] [ 285.356165] CPU: 1 PID: 144 Comm: ping Not tainted 6.5.0-rc3+ #4 [ 285.357112] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-2 04/01/2014 [ 285.358376] Call Trace: [ 285.358773] <IRQ> [ 285.359109] dump_stack_lvl+0x44/0x60 [ 285.359708] print_address_description.constprop.0+0x2c/0x3c0 [ 285.360611] kasan_report+0x10c/0x120 [ 285.361195] ? qfq_dequeue+0xa7/0x7f0 [ 285.361780] qfq_dequeue+0xa7/0x7f0 [ 285.362342] __qdisc_run+0xf1/0x970 [ 285.362903] net_tx_action+0x28e/0x460 [ 285.363502] __do_softirq+0x11b/0x3de [ 285.364097] do_softirq.part.0+0x72/0x90 [ 285.364721] </IRQ> [ 285.365072] <TASK> [ 285.365422] __local_bh_enable_ip+0x77/0x90 [ 285.366079] __dev_queue_xmit+0x95f/0x1550 [ 285.366732] ? __pfx_csum_and_copy_from_iter+0x10/0x10 [ 285.367526] ? __pfx___dev_queue_xmit+0x10/0x10 [ 285.368259] ? __build_skb_around+0x129/0x190 [ 285.368960] ? ip_generic_getfrag+0x12c/0x170 [ 285.369653] ? __pfx_ip_generic_getfrag+0x10/0x10 [ 285.370390] ? csum_partial+0x8/0x20 [ 285.370961] ? raw_getfrag+0xe5/0x140 [ 285.371559] ip_finish_output2+0x539/0xa40 [ 285.372222] ? __pfx_ip_finish_output2+0x10/0x10 [ 285.372954] ip_output+0x113/0x1e0 [ 285.373512] ? __pfx_ip_output+0x10/0x10 [ 285.374130] ? icmp_out_count+0x49/0x60 [ 285.374739] ? __pfx_ip_finish_output+0x10/0x10 [ 285.375457] ip_push_pending_frames+0xf3/0x100 [ 285.376173] raw_sendmsg+0xef5/0x12d0 [ 285.376760] ? do_syscall_64+0x40/0x90 [ 285.377359] ? __static_call_text_end+0x136578/0x136578 [ 285.378173] ? do_syscall_64+0x40/0x90 [ 285.378772] ? kasan_enable_current+0x11/0x20 [ 285.379469] ? __pfx_raw_sendmsg+0x10/0x10 [ 285.380137] ? __sock_create+0x13e/0x270 [ 285.380673] ? __sys_socket+0xf3/0x180 [ 285.381174] ? __x64_sys_socket+0x3d/0x50 [ 285.381725] ? entry_SYSCALL_64_after_hwframe+0x6e/0xd8 [ 285.382425] ? __rcu_read_unlock+0x48/0x70 [ 285.382975] ? ip4_datagram_release_cb+0xd8/0x380 [ 285.383608] ? __pfx_ip4_datagram_release_cb+0x10/0x10 [ 285.384295] ? preempt_count_sub+0x14/0xc0 [ 285.384844] ? __list_del_entry_valid+0x76/0x140 [ 285.385467] ? _raw_spin_lock_bh+0x87/0xe0 [ 285.386014] ? __pfx__raw_spin_lock_bh+0x10/0x10 [ 285.386645] ? release_sock+0xa0/0xd0 [ 285.387148] ? preempt_count_sub+0x14/0xc0 [ 285.387712] ? freeze_secondary_cpus+0x348/0x3c0 [ 285.388341] ? aa_sk_perm+0x177/0x390 [ 285.388856] ? __pfx_aa_sk_perm+0x10/0x10 [ 285.389441] ? check_stack_object+0x22/0x70 [ 285.390032] ? inet_send_prepare+0x2f/0x120 [ 285.390603] ? __pfx_inet_sendmsg+0x10/0x10 [ 285.391172] sock_sendmsg+0xcc/0xe0 [ 285.391667] __sys_sendto+0x190/0x230 [ 285.392168] ? __pfx___sys_sendto+0x10/0x10 [ 285.392727] ? kvm_clock_get_cycles+0x14/0x30 [ 285.393328] ? set_normalized_timespec64+0x57/0x70 [ 285.393980] ? _raw_spin_unlock_irq+0x1b/0x40 [ 285.394578] ? __x64_sys_clock_gettime+0x11c/0x160 [ 285.395225] ? __pfx___x64_sys_clock_gettime+0x10/0x10 [ 285.395908] ? _copy_to_user+0x3e/0x60 [ 285.396432] ? exit_to_user_mode_prepare+0x1a/0x120 [ 285.397086] ? syscall_exit_to_user_mode+0x22/0x50 [ 285.397734] ? do_syscall_64+0x71/0x90 [ 285.398258] __x64_sys_sendto+0x74/0x90 [ 285.398786] do_syscall_64+0x64/0x90 [ 285.399273] ? exit_to_user_mode_prepare+0x1a/0x120 [ 285.399949] ? syscall_exit_to_user_mode+0x22/0x50 [ 285.400605] ? do_syscall_64+0x71/0x90 [ 285.401124] entry_SYSCALL_64_after_hwframe+0x6e/0xd8 [ 285.401807] RIP: 0033:0x495726 [ 285.402233] Code: ff ff ff f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b8 0f 1f 00 41 89 ca 64 8b 04 25 18 00 00 00 85 c0 75 11 b8 2c 00 00 00 0f 09 [ 285.404683] RSP: 002b:00007ffcc25fb618 EFLAGS: 00000246 ORIG_RAX: 000000000000002c [ 285.405677] RAX: ffffffffffffffda RBX: 0000000000000040 RCX: 0000000000495726 [ 285.406628] RDX: 0000000000000040 RSI: 0000000002518750 RDI: 0000000000000000 [ 285.407565] RBP: 00000000005205ef R08: 00000000005f8838 R09: 000000000000001c [ 285.408523] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000002517634 [ 285.409460] R13: 00007ffcc25fb6f0 R14: 0000000000000003 R15: 0000000000000000 [ 285.410403] </TASK> [ 285.410704] [ 285.410929] Allocated by task 144: [ 285.411402] kasan_save_stack+0x1e/0x40 [ 285.411926] kasan_set_track+0x21/0x30 [ 285.412442] __kasan_slab_alloc+0x55/0x70 [ 285.412973] kmem_cache_alloc_node+0x187/0x3d0 [ 285.413567] __alloc_skb+0x1b4/0x230 [ 285.414060] __ip_append_data+0x17f7/0x1b60 [ 285.414633] ip_append_data+0x97/0xf0 [ 285.415144] raw_sendmsg+0x5a8/0x12d0 [ 285.415640] sock_sendmsg+0xcc/0xe0 [ 285.416117] __sys_sendto+0x190/0x230 [ 285.416626] __x64_sys_sendto+0x74/0x90 [ 285.417145] do_syscall_64+0x64/0x90 [ 285.417624] entry_SYSCALL_64_after_hwframe+0x6e/0xd8 [ 285.418306] [ 285.418531] Freed by task 144: [ 285.418960] kasan_save_stack+0x1e/0x40 [ 285.419469] kasan_set_track+0x21/0x30 [ 285.419988] kasan_save_free_info+0x27/0x40 [ 285.420556] ____kasan_slab_free+0x109/0x1a0 [ 285.421146] kmem_cache_free+0x1c2/0x450 [ 285.421680] __netif_receive_skb_core+0x2ce/0x1870 [ 285.422333] __netif_receive_skb_one_core+0x97/0x140 [ 285.423003] process_backlog+0x100/0x2f0 [ 285.423537] __napi_poll+0x5c/0x2d0 [ 285.424023] net_rx_action+0x2be/0x560 [ 285.424510] __do_softirq+0x11b/0x3de [ 285.425034] [ 285.425254] The buggy address belongs to the object at ffff8880bad31280 [ 285.425254] which belongs to the cache skbuff_head_cache of size 224 [ 285.426993] The buggy address is located 40 bytes inside of [ 285.426993] freed 224-byte region [ffff8880bad31280, ffff8880bad31360) [ 285.428572] [ 285.428798] The buggy address belongs to the physical page: [ 285.429540] page:00000000f4b77674 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0xbad31 [ 285.430758] flags: 0x100000000000200(slab|node=0|zone=1) [ 285.431447] page_type: 0xffffffff() [ 285.431934] raw: 0100000000000200 ffff88810094a8c0 dead000000000122 0000000000000000 [ 285.432757] raw: 0000000000000000 00000000800c000c 00000001ffffffff 0000000000000000 [ 285.433562] page dumped because: kasan: bad access detected [ 285.434144] [ 285.434320] Memory state around the buggy address: [ 285.434828] ffff8880bad31180: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 285.435580] ffff8880bad31200: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 285.436264] >ffff8880bad31280: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 285.436777] ^ [ 285.437106] ffff8880bad31300: fb fb fb fb fb fb fb fb fb fb fb fb fc fc fc fc [ 285.437616] ffff8880bad31380: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 285.438126] ================================================================== [ 285.438662] Disabling lock debugging due to kernel taint
Fix this by:
1. Changing sch_plug's .peek handler to qdisc_peek_dequeued(), a function compatible with non-work-conserving qdiscs
2. Checking the return value of qdisc_dequeue_peeked() in sch_qfq.
--- net/sched/sch_plug.c | 2 +- net/sched/sch_qfq.c | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-)
net/sched/sch_plug.c +1 -1
@@ -210,7 +210,7 @@ static struct Qdisc_ops plug_qdisc_ops __read_mostly = { .priv_size = sizeof(struct plug_sched_data), .enqueue = plug_enqueue, .dequeue = plug_dequeue, - .peek = qdisc_peek_head, + .peek = qdisc_peek_dequeued, .init = plug_init, .change = plug_change, .reset = qdisc_reset_queue,
net/sched/sch_qfq.c +17 -5
@@ -979,10 +979,13 @@ static void qfq_update_eligible(struct qfq_sched *q) }/* Dequeue head packet of the head class in the DRR queue of the aggregate. */ -static void agg_dequeue (struct qfq_aggregate *agg, -struct qfq_class *cl,unsigned int len) +static struct sk_buff *agg_dequeue (struct qfq_aggregate *agg, +struct qfq_class *cl,unsigned int len) { -qdisc_dequeue_peeked (cl->qdisc); +struct sk_buff *skb =qdisc_dequeue_peeked (cl->qdisc); + +if (!skb) +return NULL ; cl->deficit -= (int ) len;
@@ -992,6 +995,8 @@ static void agg_dequeue(struct qfq_aggregate *agg, cl->deficit += agg->lmax;list_move_tail (&cl->alist, &agg->active); } + +return skb; } static inline struct sk_buff *qfq_peek_skb(struct qfq_aggregate *agg,
@@ -1137,11 +1142,18 @@ static struct sk_buff *qfq_dequeue(struct Qdisc *sch)if (!skb)return NULL ; -qdisc_qstats_backlog_dec (sch, skb); sch->q.qlen--; + + skb =agg_dequeue (in_serv_agg, cl, len); + +if (!skb) { + sch->q.qlen++; +return NULL ; + } + +qdisc_qstats_backlog_dec (sch, skb);qdisc_bstats_update (sch, skb); -agg_dequeue (in_serv_agg, cl, len);/* If lmax is lowered, through qfq_change_class, for a class * owning pending packets with larger size than the new value * of lmax, then the following condition may hold.
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 356/406 kcm: Destroy mutex in kcm_exit_net()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shigeru Yoshida <[email protected]>
[ Upstream commit 6ad40b36cd3b04209e2d6c89d252c873d8082a59 ]
kcm_exit_net() should call mutex_destroy() on knet->mutex. This is especially needed if CONFIG_DEBUG_MUTEXES is enabled.
--- net/kcm/kcmsock.c | 2 ++ 1 file changed, 2 insertions(+)
net/kcm/kcmsock.c +2 -0
@@ -1982,6 +1982,8 @@ static __net_exit void kcm_exit_net(struct net *net)* that all multiplexors and psocks have been destroyed. */ WARN_ON (!list_empty (&knet->mux_list)); + +mutex_destroy (&knet->mutex); }static struct pernet_operations kcm_net_ops = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 357/406 igc: Change IGC_MIN to allow set rx/tx value between 64 and 80
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Zaborska <[email protected]>
[ Upstream commit 5aa48279712e1f134aac908acde4df798955a955 ]
Change the minimum value of RX/TX descriptors to 64 to enable setting the rx/tx value between 64 and 80. All igc devices can use as low as 64 descriptors. This change will unify igc with other drivers.
Based on commit 7b1be1987c1e ("e1000e: lower ring minimum size to 64")
--- drivers/net/ethernet/intel/igc/igc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igc/igc.h +2 -2
@@ -319,11 +319,11 @@ static inline u32 igc_rss_type(const union igc_adv_rx_desc *rx_desc)/* TX/RX descriptor defines */ #define IGC_DEFAULT_TXD 256#define IGC_DEFAULT_TX_WORK 128 -#define IGC_MIN_TXD 80 +#define IGC_MIN_TXD 64#define IGC_MAX_TXD 4096#define IGC_DEFAULT_RXD 256 -#define IGC_MIN_RXD 80 +#define IGC_MIN_RXD 64#define IGC_MAX_RXD 4096/* Supported Rx Buffer Sizes */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 358/406 igbvf: Change IGBVF_MIN to allow set rx/tx value between 64 and 80
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Zaborska <[email protected]>
[ Upstream commit 8360717524a24a421c36ef8eb512406dbd42160a ]
Change the minimum value of RX/TX descriptors to 64 to enable setting the rx/tx value between 64 and 80. All igbvf devices can use as low as 64 descriptors. This change will unify igbvf with other drivers.
Based on commit 7b1be1987c1e ("e1000e: lower ring minimum size to 64")
--- drivers/net/ethernet/intel/igbvf/igbvf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igbvf/igbvf.h +2 -2
@@ -39,11 +39,11 @@ enum latency_range {/* Tx/Rx descriptor defines */ #define IGBVF_DEFAULT_TXD 256#define IGBVF_MAX_TXD 4096 -#define IGBVF_MIN_TXD 80 +#define IGBVF_MIN_TXD 64#define IGBVF_DEFAULT_RXD 256#define IGBVF_MAX_RXD 4096 -#define IGBVF_MIN_RXD 80 +#define IGBVF_MIN_RXD 64#define IGBVF_MIN_ITR_USECS 10/* 100000 irq/sec */ #define IGBVF_MAX_ITR_USECS 10000/* 100 irq/sec */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 359/406 igb: Change IGB_MIN to allow set rx/tx value between 64 and 80
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Zaborska <[email protected]>
[ Upstream commit 6319685bdc8ad5310890add907b7c42f89302886 ]
Change the minimum value of RX/TX descriptors to 64 to enable setting the rx/tx value between 64 and 80. All igb devices can use as low as 64 descriptors. This change will unify igb with other drivers.
Based on commit 7b1be1987c1e ("e1000e: lower ring minimum size to 64")
--- drivers/net/ethernet/intel/igb/igb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igb/igb.h +2 -2
@@ -34,11 +34,11 @@ struct igb_adapter;/* TX/RX descriptor defines */ #define IGB_DEFAULT_TXD 256#define IGB_DEFAULT_TX_WORK 128 -#define IGB_MIN_TXD 80 +#define IGB_MIN_TXD 64#define IGB_MAX_TXD 4096#define IGB_DEFAULT_RXD 256 -#define IGB_MIN_RXD 80 +#define IGB_MIN_RXD 64#define IGB_MAX_RXD 4096#define IGB_DEFAULT_ITR 3/* dynamic */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 360/406 s390/zcrypt: dont leak memory if dev_set_name() fails
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 6252f47b78031979ad919f971dc8468b893488bd ]
When dev_set_name() fails, zcdn_create() doesn't free the newly allocated resources. Do it.
--- drivers/s390/crypto/zcrypt_api.c | 1 + 1 file changed, 1 insertion(+)
drivers/s390/crypto/zcrypt_api.c +1 -0
@@ -399,6 +399,7 @@ static int zcdn_create(const char *name) ZCRYPT_NAME "_%d", (int) MINOR(devt)); nodename[sizeof (nodename)-1 ] ='\0' ;if (dev_set_name (&zcdndev->device, nodename)) { +kfree (zcdndev); rc = -EINVAL ; goto unlockout; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 361/406 idr: fix param name in idr_alloc_cyclic() doc
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ariel Marcovitch <[email protected]>
[ Upstream commit 2a15de80dd0f7e04a823291aa9eb49c5294f56af ]
The relevant parameter is 'start' and not 'nextid'
--- lib/idr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/idr.c +1 -1
@@ -100,7 +100,7 @@ EXPORT_SYMBOL_GPL(idr_alloc);* @end: The maximum ID (exclusive). * @gfp: Memory allocation flags. * -* Allocates an unused ID in the range specified by @nextid and @end. If +* Allocates an unused ID in the range specified by @start and @end. If * @end is <= 0, it is treated as one larger than %INT_MAX. This allows * callers to use @start + N as @end as long as N is within integer range. * The search for an unused ID will start at the last ID allocated and will
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 362/406 ip_tunnels: use DEV_STATS_INC()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 9b271ebaf9a2c5c566a54bc6cd915962e8241130 ]
syzbot/KCSAN reported data-races in iptunnel_xmit_stats() [1]
This can run from multiple cpus without mutual exclusion.
Adopt SMP safe DEV_STATS_INC() to update dev->stats fields.
[1]
BUG: KCSAN: data-race in iptunnel_xmit / iptunnel_xmit
read-write to 0xffff8881353df170 of 8 bytes by task 30263 on cpu 1:
iptunnel_xmit_stats include/net/ip_tunnels.h:493 [inline] iptunnel_xmit+0x432/0x4a0 net/ipv4/ip_tunnel_core.c:87 ip_tunnel_xmit+0x1477/0x1750 net/ipv4/ip_tunnel.c:831 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:662 __netdev_start_xmit include/linux/netdevice.h:4889 [inline] netdev_start_xmit include/linux/netdevice.h:4903 [inline] xmit_one net/core/dev.c:3544 [inline] dev_hard_start_xmit+0x11b/0x3f0 net/core/dev.c:3560 __dev_queue_xmit+0xeee/0x1de0 net/core/dev.c:4340 dev_queue_xmit include/linux/netdevice.h:3082 [inline] __bpf_tx_skb net/core/filter.c:2129 [inline] __bpf_redirect_no_mac net/core/filter.c:2159 [inline] __bpf_redirect+0x723/0x9c0 net/core/filter.c:2182 ____bpf_clone_redirect net/core/filter.c:2453 [inline] bpf_clone_redirect+0x16c/0x1d0 net/core/filter.c:2425 ___bpf_prog_run+0xd7d/0x41e0 kernel/bpf/core.c:1954 __bpf_prog_run512+0x74/0xa0 kernel/bpf/core.c:2195 bpf_dispatcher_nop_func include/linux/bpf.h:1181 [inline] __bpf_prog_run include/linux/filter.h:609 [inline] bpf_prog_run include/linux/filter.h:616 [inline] bpf_test_run+0x15d/0x3d0 net/bpf/test_run.c:423 bpf_prog_test_run_skb+0x77b/0xa00 net/bpf/test_run.c:1045 bpf_prog_test_run+0x265/0x3d0 kernel/bpf/syscall.c:3996 __sys_bpf+0x3af/0x780 kernel/bpf/syscall.c:5353 __do_sys_bpf kernel/bpf/syscall.c:5439 [inline] __se_sys_bpf kernel/bpf/syscall.c:5437 [inline] __x64_sys_bpf+0x43/0x50 kernel/bpf/syscall.c:5437 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
read-write to 0xffff8881353df170 of 8 bytes by task 30249 on cpu 0:
iptunnel_xmit_stats include/net/ip_tunnels.h:493 [inline] iptunnel_xmit+0x432/0x4a0 net/ipv4/ip_tunnel_core.c:87 ip_tunnel_xmit+0x1477/0x1750 net/ipv4/ip_tunnel.c:831 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:662 __netdev_start_xmit include/linux/netdevice.h:4889 [inline] netdev_start_xmit include/linux/netdevice.h:4903 [inline] xmit_one net/core/dev.c:3544 [inline] dev_hard_start_xmit+0x11b/0x3f0 net/core/dev.c:3560 __dev_queue_xmit+0xeee/0x1de0 net/core/dev.c:4340 dev_queue_xmit include/linux/netdevice.h:3082 [inline] __bpf_tx_skb net/core/filter.c:2129 [inline] __bpf_redirect_no_mac net/core/filter.c:2159 [inline] __bpf_redirect+0x723/0x9c0 net/core/filter.c:2182 ____bpf_clone_redirect net/core/filter.c:2453 [inline] bpf_clone_redirect+0x16c/0x1d0 net/core/filter.c:2425 ___bpf_prog_run+0xd7d/0x41e0 kernel/bpf/core.c:1954 __bpf_prog_run512+0x74/0xa0 kernel/bpf/core.c:2195 bpf_dispatcher_nop_func include/linux/bpf.h:1181 [inline] __bpf_prog_run include/linux/filter.h:609 [inline] bpf_prog_run include/linux/filter.h:616 [inline] bpf_test_run+0x15d/0x3d0 net/bpf/test_run.c:423 bpf_prog_test_run_skb+0x77b/0xa00 net/bpf/test_run.c:1045 bpf_prog_test_run+0x265/0x3d0 kernel/bpf/syscall.c:3996 __sys_bpf+0x3af/0x780 kernel/bpf/syscall.c:5353 __do_sys_bpf kernel/bpf/syscall.c:5439 [inline] __se_sys_bpf kernel/bpf/syscall.c:5437 [inline] __x64_sys_bpf+0x43/0x50 kernel/bpf/syscall.c:5437 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
value changed: 0x0000000000018830 -> 0x0000000000018831
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 30249 Comm: syz-executor.4 Not tainted 6.5.0-syzkaller-11704-g3f86ed6ec0b3 #0
--- include/net/ip_tunnels.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
include/net/ip_tunnels.h +7 -8
@@ -455,15 +455,14 @@ static inline void iptunnel_xmit_stats(struct net_device *dev, int pkt_len) tstats->tx_packets++;u64_stats_update_end (&tstats->syncp);put_cpu_ptr (tstats); +return ; + } + +if (pkt_len <0 ) { +DEV_STATS_INC (dev, tx_errors); +DEV_STATS_INC (dev, tx_aborted_errors); }else { -struct net_device_stats *err_stats = &dev->stats; - -if (pkt_len <0 ) { - err_stats->tx_errors++; - err_stats->tx_aborted_errors++; - }else { - err_stats->tx_dropped++; - } +DEV_STATS_INC (dev, tx_dropped); } }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 363/406 net: dsa: sja1105: fix bandwidth discrepancy between tc-cbs software and offload
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 954ad9bf13c4f95a4958b5f8433301f2ab99e1f5 ]
More careful measurement of the tc-cbs bandwidth shows that the stream bandwidth (effectively idleslope) increases, there is a larger and larger discrepancy between the rate limit obtained by the software Qdisc, and the rate limit obtained by its offloaded counterpart.
The discrepancy becomes so large, that e.g. at an idleslope of 40000 (40Mbps), the offloaded cbs does not actually rate limit anything, and traffic will pass at line rate through a 100 Mbps port.
The reason for the discrepancy is that the hardware documentation I've been following is incorrect. UM11040.pdf (for SJA1105P/Q/R/S) states about IDLE_SLOPE that it is "the rate (in unit of bytes/sec) at which the credit counter is increased".
Cross-checking with UM10944.pdf (for SJA1105E/T) and UM11107.pdf (for SJA1110), the wording is different: "This field specifies the value, in bytes per second times link speed, by which the credit counter is increased".
So there's an extra scaling for link speed that the driver is currently not accounting for, and apparently (empirically), that link speed is expressed in Kbps.
I've pondered whether to pollute the sja1105_mac_link_up() implementation with CBS shaper reprogramming, but I don't think it is worth it. IMO, the UAPI exposed by tc-cbs requires user space to recalculate the sendslope anyway, since the formula for that depends on port_transmit_rate (see man tc-cbs), which is not an invariant from tc's perspective.
So we use the offload->sendslope and offload->idleslope to deduce the original port_transmit_rate from the CBS formula, and use that value to scale the offload->sendslope and offload->idleslope to values that the hardware understands.
Some numerical data points:
40Mbps stream, max interfering frame size 1500, port speed 100M
---------------------------------------------------------------
tc-cbs parameters:
idleslope 40000 sendslope -60000 locredit -900 hicredit 600
which result in hardware values:
Before (doesn't work) After (works) credit_hi 600 600 credit_lo 900 900 send_slope 7500000 75 idle_slope 5000000 50
40Mbps stream, max interfering frame size 1500, port speed 1G
-------------------------------------------------------------
tc-cbs parameters:
idleslope 40000 sendslope -960000 locredit -1440 hicredit 60
which result in hardware values:
Before (doesn't work) After (works) credit_hi 60 60 credit_lo 1440 1440 send_slope 120000000 120 idle_slope 5000000 5
5.12Mbps stream, max interfering frame size 1522, port speed 100M
-----------------------------------------------------------------
tc-cbs parameters:
idleslope 5120 sendslope -94880 locredit -1444 hicredit 77
which result in hardware values:
Before (doesn't work) After (works) credit_hi 77 77 credit_lo 1444 1444 send_slope 11860000 118 idle_slope 640000 6
Tested on SJA1105T, SJA1105S and SJA1110A, at 1Gbps and 100Mbps.
--- drivers/net/dsa/sja1105/sja1105_main.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/net/dsa/sja1105/sja1105_main.c +12 -3
@@ -1725,6 +1725,7 @@ static int sja1105_setup_tc_cbs(struct dsa_switch *ds, int port, {struct sja1105_private *priv = ds->priv;struct sja1105_cbs_entry *cbs; +s64 port_transmit_rate_kbps;int index;if (!offload->enable)
@@ -1742,9 +1743,17 @@ static int sja1105_setup_tc_cbs(struct dsa_switch *ds, int port,*/ cbs->credit_hi = offload->hicredit; cbs->credit_lo =abs (offload->locredit); -/* User space is in kbits/sec, hardware in bytes/sec */ - cbs->idle_slope = offload->idleslope *BYTES_PER_KBIT ; - cbs->send_slope =abs (offload->sendslope *BYTES_PER_KBIT ); +/* User space is in kbits/sec, while the hardware in bytes/sec times +* link speed. Since the given offload->sendslope is good only for the +* current link speed anyway, and user space is likely to reprogram it +* when that changes, don't even bother to track the port's link speed, +* but deduce the port transmit rate from idleslope - sendslope. +*/ + port_transmit_rate_kbps = offload->idleslope - offload->sendslope; + cbs->idle_slope =div_s64 (offload->idleslope *BYTES_PER_KBIT , + port_transmit_rate_kbps); + cbs->send_slope =div_s64 (abs (offload->sendslope *BYTES_PER_KBIT ), + port_transmit_rate_kbps);/* Convert the negative values from 64-bit 2's complement * to 32-bit 2's complement (for the case of 0x80000000 whose * negative is still negative).
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 364/406 net: dsa: sja1105: fix -ENOSPC when replacing the same tc-cbs too many times
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 894cafc5c62ccced758077bd4e970dc714c42637 ]
After running command [2] too many times in a row:
[1] $ tc qdisc add dev sw2p0 root handle 1: mqprio num_tc 8 \ map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 hw 0 [2] $ tc qdisc replace dev sw2p0 parent 1:1 cbs offload 1 \ idleslope 120000 sendslope -880000 locredit -1320 hicredit 180
(aka more than priv->info->num_cbs_shapers times)
we start seeing the following error message:
Error: Specified device failed to setup cbs hardware offload.
This comes from the fact that ndo_setup_tc(TC_SETUP_QDISC_CBS) presents the same API for the qdisc create and replace cases, and the sja1105 driver fails to distinguish between the 2. Thus, it always thinks that it must allocate the same shaper for a {port, queue} pair, when it may instead have to replace an existing one.
--- drivers/net/dsa/sja1105/sja1105_main.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
drivers/net/dsa/sja1105/sja1105_main.c +20 -3
@@ -1691,6 +1691,18 @@ static void sja1105_bridge_leave(struct dsa_switch *ds, int port,#define BYTES_PER_KBIT (1000LL / 8) +static int sja1105_find_cbs_shaper (struct sja1105_private *priv, +int port,int prio) +{ +int i; + +for (i =0 ; i < priv->info->num_cbs_shapers; i++) +if (priv->cbs[i].port == port && priv->cbs[i].prio == prio) +return i; + +return -1 ; +} +static int sja1105_find_unused_cbs_shaper (struct sja1105_private *priv) {int i;
@@ -1731,9 +1743,14 @@ static int sja1105_setup_tc_cbs(struct dsa_switch *ds, int port,if (!offload->enable)return sja1105_delete_cbs_shaper (priv, port, offload->queue); - index =sja1105_find_unused_cbs_shaper (priv); -if (index <0 ) -return -ENOSPC ; +/* The user may be replacing an existing shaper */ + index =sja1105_find_cbs_shaper (priv, port, offload->queue); +if (index <0 ) { +/* That isn't the case - see if we can allocate a new one */ + index =sja1105_find_unused_cbs_shaper (priv); +if (index <0 ) +return -ENOSPC ; + } cbs = &priv->cbs[index]; cbs->port = port;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 365/406 netfilter: nfnetlink_osf: avoid OOB read
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wander Lairson Costa <[email protected]>
[ Upstream commit f4f8a7803119005e87b716874bec07c751efafec ]
The opt_num field is controlled by user mode and is not currently validated inside the kernel. An attacker can take advantage of this to trigger an OOB read and potentially leak information.
BUG: KASAN: slab-out-of-bounds in nf_osf_match_one+0xbed/0xd10 net/netfilter/nfnetlink_osf.c:88 Read of size 2 at addr ffff88804bc64272 by task poc/6431 CPU: 1 PID: 6431 Comm: poc Not tainted 6.0.0-rc4 #1 Call Trace: nf_osf_match_one+0xbed/0xd10 net/netfilter/nfnetlink_osf.c:88 nf_osf_find+0x186/0x2f0 net/netfilter/nfnetlink_osf.c:281 nft_osf_eval+0x37f/0x590 net/netfilter/nft_osf.c:47 expr_call_ops_eval net/netfilter/nf_tables_core.c:214 nft_do_chain+0x2b0/0x1490 net/netfilter/nf_tables_core.c:264 nft_do_chain_ipv4+0x17c/0x1f0 net/netfilter/nft_chain_filter.c:23 [..]
Also add validation to genre, subtype and version fields.
--- net/netfilter/nfnetlink_osf.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/netfilter/nfnetlink_osf.c +8 -0
@@ -316,6 +316,14 @@ static int nfnl_osf_add_callback(struct net *net, struct sock *ctnl, f =nla_data (osf_attrs[OSF_ATTR_FINGER ]); +if (f->opt_num >ARRAY_SIZE (f->opt)) +return -EINVAL ; + +if (!memchr (f->genre,0 ,MAXGENRELEN ) || + !memchr (f->subtype,0 ,MAXGENRELEN ) || + !memchr (f->version,0 ,MAXGENRELEN )) +return -EINVAL ; + kf =kmalloc (sizeof (struct nf_osf_finger ),GFP_KERNEL );if (!kf)return -ENOMEM ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 366/406 net: hns3: fix the port information display when sfp is absent
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yisen Zhuang <[email protected]>
[ Upstream commit 674d9591a32d01df75d6b5fffed4ef942a294376 ]
When sfp is absent or unidentified, the port type should be displayed as PORT_OTHERS, rather than PORT_FIBRE.
--- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +3 -1
@@ -704,7 +704,9 @@ static int hns3_get_link_ksettings(struct net_device *netdev,hns3_get_ksettings (h, cmd);break ;case HNAE3_MEDIA_TYPE_FIBER : -if (module_type ==HNAE3_MODULE_TYPE_CR ) +if (module_type ==HNAE3_MODULE_TYPE_UNKNOWN ) + cmd->base.port =PORT_OTHER ; +else if (module_type ==HNAE3_MODULE_TYPE_CR ) cmd->base.port =PORT_DA ;else cmd->base.port =PORT_FIBRE ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 367/406 sh: boards: Fix CEU buffer size passed to dma_declare_coherent_memory()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Tesarik <[email protected]>
[ Upstream commit fb60211f377b69acffead3147578f86d0092a7a5 ]
In all these cases, the last argument to dma_declare_coherent_memory() is the buffer end address, but the expected value should be the size of the reserved region.
--- arch/sh/boards/mach-ap325rxa/setup.c | 2 +- arch/sh/boards/mach-ecovec24/setup.c | 6 ++---- arch/sh/boards/mach-kfr2r09/setup.c | 2 +- arch/sh/boards/mach-migor/setup.c | 2 +- arch/sh/boards/mach-se/7724/setup.c | 6 ++---- 5 files changed, 7 insertions(+), 11 deletions(-)
arch/sh/boards/mach-ap325rxa/setup.c +1 -1
@@ -530,7 +530,7 @@ static int __init ap325rxa_devices_setup(void)device_initialize (&ap325rxa_ceu_device.dev);dma_declare_coherent_memory (&ap325rxa_ceu_device.dev, ceu_dma_membase, ceu_dma_membase, - ceu_dma_membase +CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (&ap325rxa_ceu_device);
arch/sh/boards/mach-ecovec24/setup.c +2 -4
@@ -1454,15 +1454,13 @@ static int __init arch_setup(void)device_initialize (&ecovec_ceu_devices[0 ]->dev);dma_declare_coherent_memory (&ecovec_ceu_devices[0 ]->dev, ceu0_dma_membase, ceu0_dma_membase, - ceu0_dma_membase + -CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (ecovec_ceu_devices[0 ]);device_initialize (&ecovec_ceu_devices[1 ]->dev);dma_declare_coherent_memory (&ecovec_ceu_devices[1 ]->dev, ceu1_dma_membase, ceu1_dma_membase, - ceu1_dma_membase + -CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (ecovec_ceu_devices[1 ]);gpiod_add_lookup_table (&cn12_power_gpiod_table);
arch/sh/boards/mach-kfr2r09/setup.c +1 -1
@@ -603,7 +603,7 @@ static int __init kfr2r09_devices_setup(void)device_initialize (&kfr2r09_ceu_device.dev);dma_declare_coherent_memory (&kfr2r09_ceu_device.dev, ceu_dma_membase, ceu_dma_membase, - ceu_dma_membase +CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (&kfr2r09_ceu_device);
arch/sh/boards/mach-migor/setup.c +1 -1
@@ -604,7 +604,7 @@ static int __init migor_devices_setup(void)device_initialize (&migor_ceu_device.dev);dma_declare_coherent_memory (&migor_ceu_device.dev, ceu_dma_membase, ceu_dma_membase, - ceu_dma_membase +CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (&migor_ceu_device);
arch/sh/boards/mach-se/7724/setup.c +2 -4
@@ -940,15 +940,13 @@ static int __init devices_setup(void)device_initialize (&ms7724se_ceu_devices[0 ]->dev);dma_declare_coherent_memory (&ms7724se_ceu_devices[0 ]->dev, ceu0_dma_membase, ceu0_dma_membase, - ceu0_dma_membase + -CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (ms7724se_ceu_devices[0 ]);device_initialize (&ms7724se_ceu_devices[1 ]->dev);dma_declare_coherent_memory (&ms7724se_ceu_devices[1 ]->dev, ceu1_dma_membase, ceu1_dma_membase, - ceu1_dma_membase + -CEU_BUFFER_MEMORY_SIZE -1 ); +CEU_BUFFER_MEMORY_SIZE );platform_device_add (ms7724se_ceu_devices[1 ]); return platform_add_devices(ms7724se_devices,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 368/406 ext4: add correct group descriptors and reserved GDT blocks to system zone
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Jianjian <[email protected]>
commit 68228da51c9a436872a4ef4b5a7692e29f7e5bc7 upstream.
When setup_system_zone, flex_bg is not initialized so it is always 1. Use a new helper function, ext4_num_base_meta_blocks() which does not depend on sbi->s_log_groups_per_flex being initialized.
[ Squashed two patches in the Link URL's below together into a single
commit, which is simpler to review/understand. Also fix checkpatch warnings. --TYT ]
--- fs/ext4/balloc.c | 15 +++++++++++---- fs/ext4/block_validity.c | 8 ++++---- fs/ext4/ext4.h | 2 ++ 3 files changed, 17 insertions(+), 8 deletions(-)
fs/ext4/balloc.c +11 -4
@@ -903,11 +903,11 @@ unsigned long ext4_bg_num_gdb(struct sup }/* -* This function returns the number of file system metadata clusters at +* This function returns the number of file system metadata blocks at * the beginning of a block group, including the reserved gdt blocks. */ -static unsigned ext4_num_base_meta_clusters (struct super_block *sb, -ext4_group_t block_group) +unsigned int ext4_num_base_meta_blocks (struct super_block *sb, +ext4_group_t block_group) {struct ext4_sb_info *sbi =EXT4_SB (sb);unsigned num;
@@ -925,8 +925,15 @@ static unsigned ext4_num_base_meta_clust }else {/* For META_BG_BLOCK_GROUPS */ num +=ext4_bg_num_gdb (sb, block_group); } -return EXT4_NUM_B2C (sbi, num); +return num; } + +static unsigned int ext4_num_base_meta_clusters (struct super_block *sb, +ext4_group_t block_group) +{ +return EXT4_NUM_B2C (EXT4_SB (sb),ext4_num_base_meta_blocks (sb, block_group)); +} +/** * ext4_inode_to_goal_block - return a hint for block allocation * @inode: inode for block allocation
fs/ext4/block_validity.c +4 -4
@@ -217,7 +217,6 @@ int ext4_setup_system_zone(struct super_struct ext4_system_blocks *system_blks;struct ext4_group_desc *gdp;ext4_group_t i; -int flex_size =ext4_flex_bg_size (sbi);int ret; system_blks =kzalloc (sizeof (*system_blks),GFP_KERNEL );
@@ -225,12 +224,13 @@ int ext4_setup_system_zone(struct super_return -ENOMEM ;for (i=0 ; i < ngroups; i++) { +unsigned int meta_blks =ext4_num_base_meta_blocks (sb, i); +cond_resched (); -if (ext4_bg_has_super (sb, i) && - ((i <5 ) || ((i % flex_size) ==0 ))) { +if (meta_blks !=0 ) { ret =add_system_zone (system_blks,ext4_group_first_block_no (sb, i), -ext4_bg_num_gdb (sb, i) +1 ,0 ); + meta_blks,0 );if (ret) goto err; }
fs/ext4/ext4.h +2 -0
@@ -2967,6 +2967,8 @@ extern const char *ext4_decode_error(strextern void ext4_mark_group_bitmap_corrupted (struct super_block *sb,ext4_group_t block_group,unsigned int flags); +extern unsigned int ext4_num_base_meta_blocks (struct super_block *sb, +ext4_group_t block_group); extern __printf(6, 7) void __ext4_error(struct super_block *, const char *, unsigned int, int, __u64,
Greg Kroah-Hartman
maintainerPATCH 369/406 ata: sata_gemini: Add missing MODULE_DESCRIPTION
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 8566572bf3b4d6e416a4bf2110dbb4817d11ba59 upstream.
Add the missing MODULE_DESCRIPTION() to avoid warnings such as:
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/ata/sata_gemini.o
when compiling with W=1.
--- drivers/ata/sata_gemini.c | 1 + 1 file changed, 1 insertion(+)
drivers/ata/sata_gemini.c +1 -0
@@ -435,6 +435,7 @@ static struct platform_driver gemini_sat };module_platform_driver (gemini_sata_driver); +MODULE_DESCRIPTION ("low level driver for Cortina Systems Gemini SATA bridge" );MODULE_AUTHOR ("Linus Walleij <[email protected]>" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:" DRV_NAME );
Greg Kroah-Hartman
maintainerPATCH 370/406 ata: pata_ftide010: Add missing MODULE_DESCRIPTION
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 7274eef5729037300f29d14edeb334a47a098f65 upstream.
Add the missing MODULE_DESCRIPTION() to avoid warnings such as:
WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/ata/pata_ftide010.o
when compiling with W=1.
--- drivers/ata/pata_ftide010.c | 1 + 1 file changed, 1 insertion(+)
drivers/ata/pata_ftide010.c +1 -0
@@ -570,6 +570,7 @@ static struct platform_driver pata_ftide };module_platform_driver (pata_ftide010_driver); +MODULE_DESCRIPTION ("low level driver for Faraday Technology FTIDE010" );MODULE_AUTHOR ("Linus Walleij <[email protected]>" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:" DRV_NAME );
Greg Kroah-Hartman
maintainerPATCH 371/406 fuse: nlookup missing decrement in fuse_direntplus_link
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: ruanmeisi <[email protected]>
commit b8bd342d50cbf606666488488f9fea374aceb2d5 upstream.
During our debugging of glusterfs, we found an Assertion failed error:inode_lookup >= nlookup, which was caused by the nlookup value in the kernel being greater than that in the FUSE file system.
The issue was introduced by fuse_direntplus_link, where in the function, fuse_iget increments nlookup, and if d_splice_alias returns failure, fuse_direntplus_link returns failure without decrementing nlookup
https://github.com/gluster/glusterfs/pull/4081
--- fs/fuse/readdir.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
fs/fuse/readdir.c +9 -1
@@ -243,8 +243,16 @@ retry:dput (dentry); dentry = alias; } -if (IS_ERR (dentry)) +if (IS_ERR (dentry)) { +if (!IS_ERR (inode)) { +struct fuse_inode *fi =get_fuse_inode (inode); + +spin_lock (&fi->lock); + fi->nlookup--; +spin_unlock (&fi->lock); + }return PTR_ERR (dentry); + } }if (fc->readdirplus_auto)set_bit (FUSE_I_INIT_RDPLUS , &get_fuse_inode (inode)->state);
Greg Kroah-Hartman
maintainerPATCH 372/406 btrfs: dont start transaction when joining with TRANS_JOIN_NOSTART
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit 4490e803e1fe9fab8db5025e44e23b55df54078b upstream.
When joining a transaction with TRANS_JOIN_NOSTART, if we don't find a running transaction we end up creating one. This goes against the purpose of TRANS_JOIN_NOSTART which is to join a running transaction if its state is at or below the state TRANS_STATE_COMMIT_START, otherwise return an -ENOENT error and don't start a new transaction. So fix this to not create a new transaction if there's no running transaction at or below that state.
--- fs/btrfs/transaction.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/btrfs/transaction.c +4 -3
@@ -301,10 +301,11 @@ loop:spin_unlock (&fs_info->trans_lock);/* -* If we are ATTACH, we just want to catch the current transaction, -* and commit it. If there is no transaction, just return ENOENT. +* If we are ATTACH or TRANS_JOIN_NOSTART, we just want to catch the +* current transaction, and commit it. If there is no transaction, just +* return ENOENT. */ -if (type ==TRANS_ATTACH ) +if (type ==TRANS_ATTACH || type ==TRANS_JOIN_NOSTART )return -ENOENT ;/*
Greg Kroah-Hartman
maintainerPATCH 373/406 btrfs: use the correct superblock to compare fsid in btrfs_validate_super
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anand Jain <[email protected]>
commit d167aa76dc0683828588c25767da07fb549e4f48 upstream.
The function btrfs_validate_super() should verify the fsid in the provided superblock argument. Because, all its callers expect it to do that.
Such as in the following stack:
write_all_supers()
sb = fs_info->super_for_commit;
btrfs_validate_write_super(.., sb)
btrfs_validate_super(.., sb, ..) scrub_one_super()
btrfs_validate_super(.., sb, ..)
And
check_dev_super()
btrfs_validate_super(.., sb, ..)
However, it currently verifies the fs_info::super_copy::fsid instead, which is not correct. Fix this using the correct fsid in the superblock argument.
--- fs/btrfs/disk-io.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/btrfs/disk-io.c +2 -3
@@ -2496,11 +2496,10 @@ static int validate_super(struct btrfs_f ret = -EINVAL ; } -if (memcmp (fs_info->fs_devices->fsid, fs_info->super_copy->fsid, -BTRFS_FSID_SIZE )) { +if (memcmp (fs_info->fs_devices->fsid, sb->fsid,BTRFS_FSID_SIZE ) !=0 ) {btrfs_err (fs_info,"superblock fsid doesn't match fsid of fs_devices: %pU != %pU" , - fs_info->super_copy->fsid, fs_info->fs_devices->fsid); + sb->fsid, fs_info->fs_devices->fsid); ret = -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 374/406 mtd: rawnand: brcmnand: Fix crash during the panic_write
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Zhang <[email protected]>
commit e66dd317194daae0475fe9e5577c80aa97f16cb9 upstream.
When executing a NAND command within the panic write path, wait for any pending command instead of calling BUG_ON to avoid crashing while already crashing.
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +11 -1
@@ -1543,7 +1543,17 @@ static void brcmnand_send_cmd(struct brcdev_dbg (ctrl->dev,"send native cmd %d addr 0x%llx\n" , cmd, cmd_addr); -BUG_ON (ctrl->cmd_pending !=0 ); +/* +* If we came here through _panic_write and there is a pending +* command, try to wait for it. If it times out, rather than +* hitting BUG_ON, just return so we don't crash while crashing. +*/ +if (oops_in_progress) { +if (ctrl->cmd_pending && +bcmnand_ctrl_poll_status (ctrl,NAND_CTRL_RDY ,NAND_CTRL_RDY ,0 )) +return ; + }else +BUG_ON (ctrl->cmd_pending !=0 ); ctrl->cmd_pending = cmd; ret =bcmnand_ctrl_poll_status (ctrl,NAND_CTRL_RDY ,NAND_CTRL_RDY ,0 );
Greg Kroah-Hartman
maintainerPATCH 375/406 mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Zhang <[email protected]>
commit 5d53244186c9ac58cb88d76a0958ca55b83a15cd upstream.
When the oob buffer length is not in multiple of words, the oob write function does out-of-bounds read on the oob source buffer at the last iteration. Fix that by always checking length limit on the oob buffer read and fill with 0xff when reaching the end of the buffer to the oob registers.
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +16 -2
@@ -1429,19 +1429,33 @@ static int write_oob_to_regs(struct brcm const u8 *oob, int sas, int sector_1k) { int tbytes = sas << sector_1k; -int j; +int j, k =0 ; +u32 last =0xffffffff ; +u8 *plast = (u8 *)&last;/* Adjust OOB values for 1K sector size */ if (sector_1k && (i &0x01 )) tbytes =max (0 , tbytes - (int )ctrl->max_oob); tbytes =min_t (int, tbytes, ctrl->max_oob); -for (j =0 ; j < tbytes; j +=4 ) +/* +* tbytes may not be multiple of words. Make sure we don't read out of +* the boundary and stop at last word. +*/ +for (j =0 ; (j +3 ) < tbytes; j +=4 )oob_reg_write (ctrl, j, (oob[j +0 ] <<24 ) | (oob[j +1 ] <<16 ) | (oob[j +2 ] <<8 ) | (oob[j +3 ] <<0 )); + +/* handle the remaing bytes */ +while (j < tbytes) + plast[k++] = oob[j++]; + +if (tbytes &0x3 ) +oob_reg_write (ctrl, (tbytes & ~0x3 ), (__force u32 )cpu_to_be32 (last)); +return tbytes; }
Greg Kroah-Hartman
maintainerPATCH 376/406 mtd: rawnand: brcmnand: Fix potential false time out warning
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Zhang <[email protected]>
commit 9cc0a598b944816f2968baf2631757f22721b996 upstream.
If system is busy during the command status polling function, the driver may not get the chance to poll the status register till the end of time out and return the premature status. Do a final check after time out happens to ensure reading the correct status.
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +8 -0
@@ -1040,6 +1040,14 @@ static int bcmnand_ctrl_poll_status(strucpu_relax (); }while (time_after (limit, jiffies)); +/* +* do a final check after time out in case the CPU was busy and the driver +* did not get enough time to perform the polling to avoid false alarms +*/ + val =brcmnand_read_reg (ctrl,BRCMNAND_INTFC_STATUS ); +if ((val & mask) == expected_val) +return 0 ; +dev_warn (ctrl->dev,"timeout on status poll (expected %x got %x)\n" , expected_val, val & mask);
Greg Kroah-Hartman
maintainerPATCH 377/406 drm/amd/display: prevent potential division by zero errors
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hamza Mahfooz <[email protected]>
commit 07e388aab042774f284a2ad75a70a194517cdad4 upstream.
There are two places in apply_below_the_range() where it's possible for a divide by zero error to occur. So, to fix this make sure the divisor is non-zero before attempting the computation in both cases.
--- drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +6 -3
@@ -327,7 +327,9 @@ static void apply_below_the_range(struct* - Delta for CEIL: delta_from_mid_point_in_us_1 * - Delta for FLOOR: delta_from_mid_point_in_us_2 */ -if ((last_render_time_in_us / mid_point_frames_ceil) < in_out_vrr->min_duration_in_us) { +if (mid_point_frames_ceil && + (last_render_time_in_us / mid_point_frames_ceil) < + in_out_vrr->min_duration_in_us) {/* Check for out of range. * If using CEIL produces a value that is out of range, * then we are forced to use FLOOR.
@@ -374,8 +376,9 @@ static void apply_below_the_range(struct/* Either we've calculated the number of frames to insert, * or we need to insert min duration frames */ -if (last_render_time_in_us / frames_to_insert < - in_out_vrr->min_duration_in_us){ +if (frames_to_insert && + (last_render_time_in_us / frames_to_insert) < + in_out_vrr->min_duration_in_us){ frames_to_insert -= (frames_to_insert >1 ) ?1 :0 ; }
Greg Kroah-Hartman
maintainerPATCH 378/406 perf hists browser: Fix hierarchy mode header
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
commit e2cabf2a44791f01c21f8d5189b946926e34142e upstream.
The commit ef9ff6017e3c4593 ("perf ui browser: Move the extra title lines from the hists browser") introduced ui_browser__gotorc_title() to help moving non-title lines easily. But it missed to update the title for the hierarchy mode so it won't print the header line on TUI at all.
$ perf report --hierarchy
--- tools/perf/ui/browsers/hists.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/ui/browsers/hists.c +1 -1
@@ -1778,7 +1778,7 @@ static void hists_browser__hierarchy_heahists_browser__scnprintf_hierarchy_headers (browser, headers,sizeof (headers)); -ui_browser__gotorc (&browser->b,0 ,0 ); +ui_browser__gotorc_title (&browser->b,0 ,0 );ui_browser__set_color (&browser->b,HE_COLORSET_ROOT );ui_browser__write_nstring (&browser->b, headers, browser->b.width +1 ); }
Greg Kroah-Hartman
maintainerPATCH 379/406 perf tools: Handle old data in PERF_RECORD_ATTR
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
commit 9bf63282ea77a531ea58acb42fb3f40d2d1e4497 upstream.
The PERF_RECORD_ATTR is used for a pipe mode to describe an event with attribute and IDs. The ID table comes after the attr and it calculate size of the table using the total record size and the attr size.
n_ids = (total_record_size - end_of_the_attr_field) / sizeof(u64)
This is fine for most use cases, but sometimes it saves the pipe output in a file and then process it later. And it becomes a problem if there is a change in attr size between the record and report.
$ perf record -o- > perf-pipe.data # old version $ perf report -i- < perf-pipe.data # new version
For example, if the attr size is 128 and it has 4 IDs, then it would save them in 168 byte like below:
8 byte: perf event header { .type = PERF_RECORD_ATTR, .size = 168 },
128 byte: perf event attr { .size = 128, ... },
32 byte: event IDs [] = { 1234, 1235, 1236, 1237 },
But when report later, it thinks the attr size is 136 then it only read the last 3 entries as ID.
8 byte: perf event header { .type = PERF_RECORD_ATTR, .size = 168 },
136 byte: perf event attr { .size = 136, ... },
24 byte: event IDs [] = { 1235, 1236, 1237 }, // 1234 is missing
So it should use the recorded version of the attr. The attr has the size field already then it should honor the size when reading data.
--- tools/perf/util/header.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
tools/perf/util/header.c +6 -5
@@ -3987,7 +3987,8 @@ int perf_event__process_attr(struct perfunion perf_event *event, struct evlist **pevlist) { - u32 i, ids, n_ids; + u32 i, n_ids; +u64 *ids;struct evsel *evsel;struct evlist *evlist = *pevlist;
@@ -4003,9 +4004,8 @@ int perf_event__process_attr(struct perfevlist__add (evlist, evsel); - ids = event->header.size; - ids -= (void *)&event->attr.id - (void *)event; - n_ids = ids /sizeof (u64); + n_ids = event->header.size -sizeof (event->header) - event->attr.attr.size; + n_ids = n_ids /sizeof (u64);/* * We don't have the cpu and thread maps on the header, so * for allocating the perf_sample_id table we fake 1 cpu and
@@ -4014,8 +4014,9 @@ int perf_event__process_attr(struct perfif (perf_evsel__alloc_id (&evsel->core,1 , n_ids))return -ENOMEM ; + ids = (void *)&event->attr.attr + event->attr.attr.size;for (i =0 ; i < n_ids; i++) { -perf_evlist__id_add (&evlist->core, &evsel->core,0 , i, event->attr.id[i]); +perf_evlist__id_add (&evlist->core, &evsel->core,0 , i, ids[i]); }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 380/406 perf hists browser: Fix the number of entries for e key
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
commit f6b8436bede3e80226e8b2100279c4450c73806a upstream.
The 'e' key is to toggle expand/collapse the selected entry only. But the current code has a bug that it only increases the number of entries by 1 in the hierarchy mode so users cannot move under the current entry after the key stroke. This is due to a wrong assumption in the hist_entry__set_folding().
The commit b33f922651011eff ("perf hists browser: Put hist_entry folding logic into single function") factored out the code, but actually it should be handled separately. The hist_browser__set_folding() is to update fold state for each entry so it needs to traverse all (child) entries regardless of the current fold state. So it increases the number of entries by 1.
But the hist_entry__set_folding() only cares the currently selected entry and its all children. So it should count all unfolded child entries. This code is implemented in hist_browser__toggle_fold() already so we can just call it.
--- tools/perf/ui/browsers/hists.c | 58 ++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 34 deletions(-)
tools/perf/ui/browsers/hists.c +24 -34
@@ -407,11 +407,6 @@ static bool hist_browser__selection_has_ return container_of(ms, struct callchain_list, ms)->has_children; } -static bool hist_browser__he_selection_unfolded (struct hist_browser *browser) -{ -return browser->he_selection ? browser->he_selection->unfolded : false; -} -static bool hist_browser__selection_unfolded (struct hist_browser *browser) {struct hist_entry *he = browser->he_selection;
@@ -584,8 +579,8 @@ static int hierarchy_set_folding(structreturn n; } -static void __hist_entry__set_folding (struct hist_entry *he, -struct hist_browser *hb,bool unfold) +static void hist_entry__set_folding (struct hist_entry *he, +struct hist_browser *hb,bool unfold) {hist_entry__init_have_children (he); he->unfolded = unfold ? he->has_children : false;
@@ -603,34 +598,12 @@ static void __hist_entry__set_folding(st he->nr_rows =0 ; } -static void hist_entry__set_folding (struct hist_entry *he, -struct hist_browser *browser,bool unfold) -{ -double percent; - - percent =hist_entry__get_percent_limit (he); -if (he->filtered || percent < browser->min_pcnt) -return ; - -__hist_entry__set_folding (he, browser, unfold); - -if (!he->depth || unfold) - browser->nr_hierarchy_entries++; -if (he->leaf) - browser->nr_callchain_rows += he->nr_rows; -else if (unfold && !hist_entry__has_hierarchy_children (he, browser->min_pcnt)) { - browser->nr_hierarchy_entries++; - he->has_no_entry = true; - he->nr_rows =1 ; - }else - he->has_no_entry = false; -} -static void __hist_browser__set_folding (struct hist_browser *browser,bool unfold) {struct rb_node *nd;struct hist_entry *he; +double percent; nd =rb_first_cached (&browser->hists->entries);while (nd) {
@@ -640,6 +613,21 @@ __hist_browser__set_folding(struct hist_ nd =__rb_hierarchy_next (nd,HMD_FORCE_CHILD );hist_entry__set_folding (he, browser, unfold); + + percent =hist_entry__get_percent_limit (he); +if (he->filtered || percent < browser->min_pcnt) +continue ; + +if (!he->depth || unfold) + browser->nr_hierarchy_entries++; +if (he->leaf) + browser->nr_callchain_rows += he->nr_rows; +else if (unfold && !hist_entry__has_hierarchy_children (he, browser->min_pcnt)) { + browser->nr_hierarchy_entries++; + he->has_no_entry = true; + he->nr_rows =1 ; + }else + he->has_no_entry = false; } }
@@ -659,8 +647,10 @@ static void hist_browser__set_folding_seif (!browser->he_selection)return ; -hist_entry__set_folding (browser->he_selection, browser, unfold); - browser->b.nr_entries =hist_browser__nr_entries (browser); +if (unfold == browser->he_selection->unfolded) +return ; + +hist_browser__toggle_fold (browser); }static void ui_browser__warn_lost_events (struct ui_browser *browser)
@@ -731,8 +721,8 @@ static int hist_browser__handle_hotkey(shist_browser__set_folding (browser, true);break ;case 'e' : -/* Expand the selected entry. */ -hist_browser__set_folding_selected (browser, !hist_browser__he_selection_unfolded (browser)); +/* Toggle expand/collapse the selected entry. */ +hist_browser__toggle_fold (browser);break ;case 'H' : browser->show_headers = !browser->show_headers;
Greg Kroah-Hartman
maintainerPATCH 381/406 ACPI: APEI: explicit init of HEST and GHES in apci_init()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuai Xue <[email protected]>
[ Upstream commit dc4e8c07e9e2f69387579c49caca26ba239f7270 ]
Quoted 1 line
From commit
e147133a42cb("ACPI / APEI: Makehest.cmanage the estatus
memory pool") was merged, ghes_init() relies on acpi_hest_init() to manage the estatus memory pool. On the other hand, ghes_init() relies on sdei_init() to detect the SDEI version and (un)register events. The dependencies are as follows:
ghes_init() => acpi_hest_init() => acpi_bus_init() => acpi_init()
ghes_init() => sdei_init()HEST is not PCI-specific and initcall ordering is implicit and not well-defined within a level.
Based on above, remove acpi_hest_init() from acpi_pci_root_init() and convert ghes_init() and sdei_init() from initcalls to explicit calls in the following order:
acpi_hest_init()
ghes_init()
sdei_init()Stable-dep-of: 5cd474e57368 ("arm64: sdei: abort running SDEI handlers during crash")
--- drivers/acpi/apei/ghes.c | 19 ++++++++----------- drivers/acpi/bus.c | 2 ++ drivers/acpi/pci_root.c | 3 --- drivers/firmware/Kconfig | 1 + drivers/firmware/arm_sdei.c | 13 ++----------- include/acpi/apei.h | 4 +++- include/linux/arm_sdei.h | 2 ++ 7 files changed, 18 insertions(+), 26 deletions(-)
drivers/acpi/apei/ghes.c +8 -11
@@ -1457,33 +1457,35 @@ static struct platform_driver ghes_platform_driver = { .remove = ghes_remove, }; -static int __init ghes_init (void ) +void __init ghes_init (void ) {int rc; +sdei_init (); +if (acpi_disabled) -return -ENODEV ; +return ;switch (hest_disable) {case HEST_NOT_FOUND : -return -ENODEV ; +return ;case HEST_DISABLED :pr_info (GHES_PFX "HEST is not enabled!\n" ); -return -EINVAL ; +return ;default :break ; }if (ghes_disable) {pr_info (GHES_PFX "GHES is not enabled!\n" ); -return -EINVAL ; +return ; }ghes_nmi_init_cxt (); rc =platform_driver_register (&ghes_platform_driver);if (rc) - goto err; +return ; rc =apei_osc_setup ();if (rc ==0 && osc_sb_apei_support_acked)
@@ -1494,9 +1496,4 @@ static int __init ghes_init(void)pr_info (GHES_PFX "APEI firmware first mode is enabled by APEI bit.\n" ); else pr_info(GHES_PFX "Failed to enable APEI firmware first mode.\n"); - -return 0 ; -err: -return rc; } -device_initcall (ghes_init);
drivers/acpi/bus.c +2 -0
@@ -1252,6 +1252,8 @@ static int __init acpi_init(void)pci_mmcfg_late_init ();acpi_iort_init (); +acpi_hest_init (); +ghes_init ();acpi_scan_init ();acpi_ec_init ();acpi_debugfs_init ();
drivers/acpi/pci_root.c +0 -3
@@ -20,8 +20,6 @@#include <linux/slab.h> #include <linux/dmi.h> #include <linux/platform_data/x86/apple.h> -#include <acpi/apei.h> /* for acpi_hest_init() */ -#include "internal.h" #define ACPI_PCI_ROOT_CLASS "pci_bridge"
@@ -950,7 +948,6 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,void __init acpi_pci_root_init (void ) { -acpi_hest_init ();if (acpi_pci_disabled)return ;
drivers/firmware/Kconfig +1 -0
@@ -72,6 +72,7 @@ config ARM_SCPI_POWER_DOMAIN config ARM_SDE_INTERFACE bool "ARM Software Delegated Exception Interface (SDEI)" depends on ARM64 + depends on ACPI_APEI_GHES help The Software Delegated Exception Interface (SDEI) is an ARM standard for registering callbacks from the platform firmware
drivers/firmware/arm_sdei.c +2 -11
@@ -1063,14 +1063,14 @@ static bool __init sdei_present_acpi(void)return true; } -static int __init sdei_init (void ) +void __init sdei_init (void ) {struct platform_device *pdev;int ret; ret =platform_driver_register (&sdei_driver);if (ret || !sdei_present_acpi ()) -return ret; +return ; pdev =platform_device_register_simple (sdei_driver.driver.name,0 ,NULL ,0 );
@@ -1080,17 +1080,8 @@ static int __init sdei_init(void)pr_info ("Failed to register ACPI:SDEI platform device %d\n" , ret); } - -return ret; } -/* -* On an ACPI system SDEI needs to be ready before HEST:GHES tries to register -* its events. ACPI is initialised from a subsys_initcall(), GHES is initialised -* by device_initcall(). We want to be called in the middle. -*/ -subsys_initcall_sync (sdei_init); -int sdei_event_handler (struct pt_regs *regs,struct sdei_registered_event *arg) {
include/acpi/apei.h +3 -1
@@ -27,14 +27,16 @@ extern int hest_disable;extern int erst_disable;#ifdef CONFIG_ACPI_APEI_GHES extern bool ghes_disable; +void __init ghes_init (void );#else #define ghes_disable 1 +static inline void ghes_init (void ) { }#endif #ifdef CONFIG_ACPI_APEI void __init acpi_hest_init (void );#else -static inline void acpi_hest_init (void ) {return ; } +static inline void acpi_hest_init (void ) { }#endif typedef int (*apei_hest_func_t )(struct acpi_hest_header *hest_hdr,void *data);
include/linux/arm_sdei.h +2 -0
@@ -46,9 +46,11 @@ int sdei_unregister_ghes(struct ghes *ghes);/* For use by arch code when CPU hotplug notifiers are not appropriate. */ int sdei_mask_local_cpu (void );int sdei_unmask_local_cpu (void ); +void __init sdei_init (void );#else static inline int sdei_mask_local_cpu (void ) {return 0 ; }static inline int sdei_unmask_local_cpu (void ) {return 0 ; } +static inline void sdei_init (void ) { }#endif /* CONFIG_ARM_SDE_INTERFACE */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 382/406 arm64: sdei: abort running SDEI handlers during crash
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: D Scott Phillips <[email protected]>
[ Upstream commit 5cd474e57368f0957c343bb21e309cf82826b1ef ]
Interrupts are blocked in SDEI context, per the SDEI spec: "The client interrupts cannot preempt the event handler." If we crashed in the SDEI handler-running context (as with ACPI's AGDI) then we need to clean up the SDEI state before proceeding to the crash kernel so that the crash kernel can have working interrupts.
Track the active SDEI handler per-cpu so that we can COMPLETE_AND_RESUME the handler, discarding the interrupted context.
--- arch/arm64/include/asm/sdei.h | 6 ++++++ arch/arm64/kernel/entry.S | 27 +++++++++++++++++++++++++-- arch/arm64/kernel/sdei.c | 3 +++ arch/arm64/kernel/smp.c | 8 ++++---- drivers/firmware/arm_sdei.c | 19 +++++++++++++++++++ include/linux/arm_sdei.h | 2 ++ 6 files changed, 59 insertions(+), 6 deletions(-)
arch/arm64/include/asm/sdei.h +6 -0
@@ -17,6 +17,9 @@#include <asm/virt.h> +DECLARE_PER_CPU(struct sdei_registered_event *, sdei_active_normal_event); +DECLARE_PER_CPU(struct sdei_registered_event *, sdei_active_critical_event); +extern unsigned long sdei_exit_mode;/* Software Delegated Exception entry point from firmware*/
@@ -29,6 +32,9 @@ asmlinkage void __sdei_asm_entry_trampoline(unsigned long event_num,unsigned long pc, unsigned long pstate); +/* Abort a running handler. Context is discarded. */ +void __sdei_handler_abort (void ); +/* * The above entry point does the minimum to call C code. This function does * anything else, before calling the driver.
arch/arm64/kernel/entry.S +25 -2
@@ -1137,9 +1137,13 @@ SYM_CODE_START(__sdei_asm_handler) mov x19, x1 -#if defined(CONFIG_VMAP_STACK) || defined(CONFIG_SHADOW_CALL_STACK) + /* Store the registered-event for crash_smp_send_stop() */ ldrb w4, [x19, #SDEI_EVENT_PRIORITY] -#endif + cbnz w4, 1f + adr_this_cpu dst=x5, sym=sdei_active_normal_event, tmp=x6 + b 2f +1: adr_this_cpu dst=x5, sym=sdei_active_critical_event, tmp=x6 +2: str x19, [x5] #ifdef CONFIG_VMAP_STACK /*
@@ -1204,6 +1208,14 @@ SYM_CODE_START(__sdei_asm_handler) ldr_l x2, sdei_exit_mode + /* Clear the registered-event seen by crash_smp_send_stop() */ + ldrb w3, [x4, #SDEI_EVENT_PRIORITY] + cbnz w3, 1f + adr_this_cpu dst=x5, sym=sdei_active_normal_event, tmp=x6 + b 2f +1: adr_this_cpu dst=x5, sym=sdei_active_critical_event, tmp=x6 +2: str xzr, [x5] + alternative_if_not ARM64_UNMAP_KERNEL_AT_EL0 sdei_handler_exit exit_mode=x2 alternative_else_nop_endif
@@ -1214,4 +1226,15 @@ alternative_else_nop_endif #endif SYM_CODE_END(__sdei_asm_handler) NOKPROBE(__sdei_asm_handler) + +SYM_CODE_START(__sdei_handler_abort) + mov_q x0, SDEI_1_0_FN_SDEI_EVENT_COMPLETE_AND_RESUME + adr x1, 1f + ldr_l x2, sdei_exit_mode + sdei_handler_exit exit_mode=x2 + // exit the handler and jump to the next instruction. + // Exit will stomp x0-x17, PSTATE, ELR_ELx, and SPSR_ELx. +1: ret +SYM_CODE_END(__sdei_handler_abort) +NOKPROBE(__sdei_handler_abort) #endif /* CONFIG_ARM_SDE_INTERFACE */
arch/arm64/kernel/sdei.c +3 -0
@@ -38,6 +38,9 @@ DEFINE_PER_CPU(unsigned long *, sdei_stack_normal_ptr); DEFINE_PER_CPU(unsigned long *, sdei_stack_critical_ptr);#endif +DEFINE_PER_CPU(struct sdei_registered_event *, sdei_active_normal_event); +DEFINE_PER_CPU(struct sdei_registered_event *, sdei_active_critical_event); +static void _free_sdei_stack (unsigned long *__percpu *ptr,int cpu) {unsigned long *p;
arch/arm64/kernel/smp.c +4 -4
@@ -1072,10 +1072,8 @@ void crash_smp_send_stop(void)* If this cpu is the only one alive at this point in time, online or * not, there are no stop messages to be sent around, so just back out. */ -if (num_other_online_cpus () ==0 ) { -sdei_mask_local_cpu (); -return ; - } +if (num_other_online_cpus () ==0 ) + goto skip_ipi;cpumask_copy (&mask, cpu_online_mask);cpumask_clear_cpu (smp_processor_id (), &mask);
@@ -1094,7 +1092,9 @@ void crash_smp_send_stop(void)pr_warn ("SMP: failed to stop secondary CPUs %*pbl\n" ,cpumask_pr_args (&mask)); +skip_ipi:sdei_mask_local_cpu (); +sdei_handler_abort (); }bool smp_crash_stop_failed (void )
drivers/firmware/arm_sdei.c +19 -0
@@ -1109,3 +1109,22 @@ int sdei_event_handler(struct pt_regs *regs,return err; }NOKPROBE_SYMBOL (sdei_event_handler); + +void sdei_handler_abort (void ) +{ +/* +* If the crash happened in an SDEI event handler then we need to +* finish the handler with the firmware so that we can have working +* interrupts in the crash kernel. +*/ +if (__this_cpu_read (sdei_active_critical_event)) { +pr_warn ("still in SDEI critical event context, attempting to finish handler.\n" ); +__sdei_handler_abort (); +__this_cpu_write (sdei_active_critical_event,NULL ); + } +if (__this_cpu_read (sdei_active_normal_event)) { +pr_warn ("still in SDEI normal event context, attempting to finish handler.\n" ); +__sdei_handler_abort (); +__this_cpu_write (sdei_active_normal_event,NULL ); + } +}
include/linux/arm_sdei.h +2 -0
@@ -47,10 +47,12 @@ int sdei_unregister_ghes(struct ghes *ghes);int sdei_mask_local_cpu (void );int sdei_unmask_local_cpu (void );void __init sdei_init (void ); +void sdei_handler_abort (void );#else static inline int sdei_mask_local_cpu (void ) {return 0 ; }static inline int sdei_unmask_local_cpu (void ) {return 0 ; }static inline void sdei_init (void ) { } +static inline void sdei_handler_abort (void ) { }#endif /* CONFIG_ARM_SDE_INTERFACE */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 383/406 scsi: qla2xxx: If fcport is undergoing deletion complete I/O with retry
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saurav Kashyap <[email protected]>
[ Upstream commit 707531bc2626c1959a03b93566ebb4e629c99276 ]
Driver unload with I/Os in flight causes server to crash. Complete I/O with DID_IMM_RETRY if fcport undergoing deletion.
CPU: 44 PID: 35008 Comm: qla2xxx_4_dpc Kdump: loaded Tainted: G
OE X 5.3.18-22-default #1 SLE15-SP2 (unreleased)
Hardware name: HPE ProLiant DL380 Gen10/ProLiant DL380 Gen10, BIOS U30 07/16/2020
RIP: 0010:dma_direct_unmap_sg+0x24/0x60
Code: 4c 8b 04 24 eb b9 0f 1f 44 00 00 85 d2 7e 4e 41 57
4d 89 c7 41 56 41 89 ce 41 55 49 89 fd 41 54 41 89 d4 55 31 ed 53 48 89
f3 <8b> 53 18 48 8b 73 10 4d 89 f8 44 89 f1 4c 89 ef 83 c5 01 e8 44 ff
RSP: 0018:ffffc0c661037d88 EFLAGS: 00010046
RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000002
RDX: 000000000000001d RSI: 0000000000000000 RDI: ffff9a51ee53b0b0
RBP: 0000000000000000 R08: 0000000000000000 R09: ffff9a51ee53b0b0
R10: ffffc0c646463dc8 R11: ffff9a4a067087c8 R12: 000000000000001d
R13: ffff9a51ee53b0b0 R14: 0000000000000002 R15: 0000000000000000
FS: 0000000000000000(0000) GS:ffff9a523f800000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000000018 CR3: 000000043740a004 CR4: 00000000007606e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
PKRU: 55555554
Call Trace:
qla2xxx_qpair_sp_free_dma+0x20d/0x3c0 [qla2xxx]
qla2xxx_qpair_sp_compl+0x35/0x90 [qla2xxx]
__qla2x00_abort_all_cmds+0x180/0x390 [qla2xxx]
? qla24xx_process_purex_list+0x100/0x100 [qla2xxx]
qla2x00_abort_all_cmds+0x5e/0x80 [qla2xxx]
qla2x00_do_dpc+0x317/0xa30 [qla2xxx]
kthread+0x10d/0x130
? kthread_park+0xa0/0xa0
ret_from_fork+0x35/0x40Stable-dep-of: 6d0b65569c0a ("scsi: qla2xxx: Flush mailbox commands on chip reset")
--- drivers/scsi/qla2xxx/qla_os.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +4 -4
@@ -879,8 +879,8 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) goto qc24_fail_command; } -if (!fcport) { - cmd->result =DID_NO_CONNECT <<16 ; +if (!fcport || fcport->deleted) { + cmd->result =DID_IMM_RETRY <<16 ; goto qc24_fail_command; }
@@ -961,8 +961,8 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd, goto qc24_fail_command; } -if (!fcport) { - cmd->result =DID_NO_CONNECT <<16 ; +if (!fcport || fcport->deleted) { + cmd->result =DID_IMM_RETRY <<16 ; goto qc24_fail_command; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 384/406 scsi: qla2xxx: Consolidate zio threshold setting for both FCP & NVMe
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
[ Upstream commit 5777fef788a59f5ac9ab6661988a95a045fc0574 ]
Consolidate zio threshold setting for both FCP & NVMe to prevent one protocol from clobbering the setting of the other protocol.
Stable-dep-of: 6d0b65569c0a ("scsi: qla2xxx: Flush mailbox commands on chip reset")
--- drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_os.c | 34 ++++++++++++++-------------------- 2 files changed, 14 insertions(+), 21 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +0 -1
@@ -4706,7 +4706,6 @@ typedef struct scsi_qla_host {#define FX00_CRITEMP_RECOVERY 25#define FX00_HOST_INFO_RESEND 26#define QPAIR_ONLINE_CHECK_NEEDED 27 -#define SET_NVME_ZIO_THRESHOLD_NEEDED 28#define DETECT_SFP_CHANGE 29#define N2N_LOGIN_NEEDED 30#define IOCB_WORK_ACTIVE 31
drivers/scsi/qla2xxx/qla_os.c +14 -20
@@ -6973,28 +6973,23 @@ qla2x00_do_dpc(void *data)mutex_unlock (&ha->mq_lock); } -if (test_and_clear_bit (SET_NVME_ZIO_THRESHOLD_NEEDED , - &base_vha->dpc_flags)) { +if (test_and_clear_bit (SET_ZIO_THRESHOLD_NEEDED , + &base_vha->dpc_flags)) { +u16 threshold = ha->nvme_last_rptd_aen + ha->last_zio_threshold; + +if (threshold > ha->orig_fw_xcb_count) + threshold = ha->orig_fw_xcb_count; +ql_log (ql_log_info, base_vha,0xffffff , -"nvme: SET ZIO Activity exchange threshold to %d.\n" , - ha->nvme_last_rptd_aen); -if (qla27xx_set_zio_threshold (base_vha, - ha->nvme_last_rptd_aen)) { +"SET ZIO Activity exchange threshold to %d.\n" , + threshold); +if (qla27xx_set_zio_threshold (base_vha, threshold)) {ql_log (ql_log_info, base_vha,0xffffff , -"nvme: Unable to SET ZIO Activity exchange threshold to %d.\n" , - ha->nvme_last_rptd_aen); +"Unable to SET ZIO Activity exchange threshold to %d.\n" , + threshold); } } -if (test_and_clear_bit (SET_ZIO_THRESHOLD_NEEDED , - &base_vha->dpc_flags)) { -ql_log (ql_log_info, base_vha,0xffffff , -"SET ZIO Activity exchange threshold to %d.\n" , - ha->last_zio_threshold); -qla27xx_set_zio_threshold (base_vha, - ha->last_zio_threshold); - } -if (!IS_QLAFX00 (ha))qla2x00_do_dpc_all_vps (base_vha);
@@ -7210,14 +7205,13 @@ qla2x00_timer(struct timer_list *t) index =atomic_read (&ha->nvme_active_aen_cnt);if (!vha->vp_idx && (index != ha->nvme_last_rptd_aen) && - (index >=DEFAULT_ZIO_THRESHOLD ) && ha->zio_mode ==QLA_ZIO_MODE_6 && !ha->flags.host_shutting_down) { + ha->nvme_last_rptd_aen =atomic_read (&ha->nvme_active_aen_cnt);ql_log (ql_log_info, vha,0x3002 ,"nvme: Sched: Set ZIO exchange threshold to %d.\n" , ha->nvme_last_rptd_aen); - ha->nvme_last_rptd_aen =atomic_read (&ha->nvme_active_aen_cnt); -set_bit (SET_NVME_ZIO_THRESHOLD_NEEDED , &vha->dpc_flags); +set_bit (SET_ZIO_THRESHOLD_NEEDED , &vha->dpc_flags); start_dpc++; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 385/406 scsi: qla2xxx: Fix crash in PCIe error handling
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
[ Upstream commit f7a0ed479e66ab177801301a1a72c37775c40450 ]
BUG: unable to handle kernel NULL pointer dereference at (null) IP: qla2x00_abort_isp+0x21/0x6b0 [qla2xxx] PGD 0 P4D 0 Oops: 0000 [#1] SMP PTI CPU: 0 PID: 1715 Comm: kworker/0:2 Tainted: GOE 4.12.14-122.37-default #1 SLE12-SP5 Hardware name: HPE Superdome Flex/Superdome Flex, BIOS Bundle:3.30.100 SFW:IP147.007.004.017.000.2009211957 09/21/2020 Workqueue: events aer_recover_work_func task: ffff9e399c14ca80 task.stack: ffffc1c58e4ac000 RIP: 0010:qla2x00_abort_isp+0x21/0x6b0 [qla2xxx] RSP: 0018:ffffc1c58e4afd50 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffff9e419cdef480 RCX: 0000000000000000 RDX: ffff9e399c14ca80 RSI: 0000000000000246 RDI: ffff9e419bbc27b8 RBP: ffff9e419bbc27b8 R08: 0000000000000004 R09: 00000000a0440000 R10: 0000000000000000 R11: ffff9e399416d1a0 R12: ffff9e419cdef000 R13: ffff9e3a7cfae800 R14: ffff9e3a7cfae800 R15: 00000000000000c0 FS: 0000000000000000(0000) GS:ffff9e39a0000000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 00000006cd00a005 CR4: 00000000007606f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: qla2xxx_pci_slot_reset+0x141/0x160 [qla2xxx] report_slot_reset+0x41/0x80 ? merge_result.part.4+0x30/0x30 pci_walk_bus+0x70/0x90 pcie_do_recovery+0x1db/0x2e0 aer_recover_work_func+0xc2/0xf0 process_one_work+0x14c/0x390
Disable board_disable logic where driver resources are freed while OS is in the process of recovering the adapter.
Stable-dep-of: 6d0b65569c0a ("scsi: qla2xxx: Flush mailbox commands on chip reset")
--- drivers/scsi/qla2xxx/qla_dbg.c | 16 ++- drivers/scsi/qla2xxx/qla_def.h | 10 ++ drivers/scsi/qla2xxx/qla_gbl.h | 3 + drivers/scsi/qla2xxx/qla_init.c | 40 ++++--- drivers/scsi/qla2xxx/qla_inline.h | 46 ++++++++ drivers/scsi/qla2xxx/qla_iocb.c | 60 +++++++++-- drivers/scsi/qla2xxx/qla_isr.c | 9 +- drivers/scsi/qla2xxx/qla_mbx.c | 3 +- drivers/scsi/qla2xxx/qla_nvme.c | 10 +- drivers/scsi/qla2xxx/qla_os.c | 173 ++++++++++++++++++------------ 10 files changed, 265 insertions(+), 105 deletions(-)
drivers/scsi/qla2xxx/qla_dbg.c +15 -1
@@ -112,8 +112,13 @@ qla27xx_dump_mpi_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,uint32_t stat;ulong i, j, timer =6000000 ;int rval =QLA_FUNCTION_FAILED ; +scsi_qla_host_t *vha =pci_get_drvdata (ha->pdev);clear_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags); + +if (qla_pci_disconnected (vha, reg)) +return rval; +for (i =0 ; i < ram_dwords; i += dwords, addr += dwords) {if (i + dwords > ram_dwords) dwords = ram_dwords - i;
@@ -137,6 +142,9 @@ qla27xx_dump_mpi_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,while (timer--) {udelay (5 ); +if (qla_pci_disconnected (vha, reg)) +return rval; + stat =rd_reg_dword (®->host_status);/* Check for pending interrupts. */ if (!(stat &HSRX_RISC_INT ))
@@ -191,9 +199,13 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram,uint32_t dwords =qla2x00_gid_list_size (ha) /4 ;uint32_t stat;ulong i, j, timer =6000000 ; +scsi_qla_host_t *vha =pci_get_drvdata (ha->pdev);clear_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags); +if (qla_pci_disconnected (vha, reg)) +return rval; +for (i =0 ; i < ram_dwords; i += dwords, addr += dwords) {if (i + dwords > ram_dwords) dwords = ram_dwords - i;
@@ -215,8 +227,10 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram, ha->flags.mbox_int =0 ;while (timer--) {udelay (5 ); - stat =rd_reg_dword (®->host_status); +if (qla_pci_disconnected (vha, reg)) +return rval; + stat =rd_reg_dword (®->host_status);/* Check for pending interrupts. */ if (!(stat &HSRX_RISC_INT ))continue ;
drivers/scsi/qla2xxx/qla_def.h +10 -0
@@ -396,6 +396,7 @@ typedef union { } b; } port_id_t;#define INVALID_PORT_ID 0xFFFFFF +#define ISP_REG16_DISCONNECT 0xFFFFstatic inline le_id_t be_id_to_le (be_id_t id) {
@@ -3848,6 +3849,13 @@ struct qla_hw_data_stat {u32 num_mpi_reset; }; +/* refer to pcie_do_recovery reference */ +typedef enum { +QLA_PCI_RESUME , +QLA_PCI_ERR_DETECTED , +QLA_PCI_MMIO_ENABLED , +QLA_PCI_SLOT_RESET , +}pci_error_state_t ;/* * Qlogic host adapter specific data structure. */
@@ -4586,6 +4594,7 @@ struct qla_hw_data {#define DEFAULT_ZIO_THRESHOLD 5struct qla_hw_data_stat stat; +pci_error_state_t pci_error_state; };struct active_regions {
@@ -4706,6 +4715,7 @@ typedef struct scsi_qla_host {#define FX00_CRITEMP_RECOVERY 25#define FX00_HOST_INFO_RESEND 26#define QPAIR_ONLINE_CHECK_NEEDED 27 +#define DO_EEH_RECOVERY 28#define DETECT_SFP_CHANGE 29#define N2N_LOGIN_NEEDED 30#define IOCB_WORK_ACTIVE 31
drivers/scsi/qla2xxx/qla_gbl.h +3 -0
@@ -222,6 +222,7 @@ extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32);extern int qla2x00_post_uevent_work (struct scsi_qla_host *,u32 );extern void qla2x00_disable_board_on_pci_error (struct work_struct *); +extern void qla_eeh_work (struct work_struct *);extern void qla2x00_sp_compl (srb_t *sp,int );extern void qla2xxx_qpair_sp_free_dma (srb_t *sp);extern void qla2xxx_qpair_sp_compl (srb_t *sp,int );
@@ -233,6 +234,8 @@ int qla24xx_post_relogin_work(struct scsi_qla_host *vha);void qla2x00_wait_for_sess_deletion (scsi_qla_host_t *);void qla24xx_process_purex_rdp (struct scsi_qla_host *vha,struct purex_item *pkt); +void qla_pci_set_eeh_busy (struct scsi_qla_host *); +void qla_schedule_eeh_work (struct scsi_qla_host *);/* * Global Functions in qla_mid.c source file.
drivers/scsi/qla2xxx/qla_init.c +26 -14
@@ -6982,22 +6982,18 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha) }spin_unlock_irqrestore (&ha->vport_slock, flags); -if (!ha->flags.eeh_busy) { -/* Make sure for ISP 82XX IO DMA is complete */ -if (IS_P3P_TYPE (ha)) { -qla82xx_chip_reset_cleanup (vha); -ql_log (ql_log_info, vha,0x00b4 , -"Done chip reset cleanup.\n" ); - -/* Done waiting for pending commands. -* Reset the online flag. -*/ - vha->flags.online =0 ; - } +/* Make sure for ISP 82XX IO DMA is complete */ +if (IS_P3P_TYPE (ha)) { +qla82xx_chip_reset_cleanup (vha); +ql_log (ql_log_info, vha,0x00b4 , +"Done chip reset cleanup.\n" ); -/* Requeue all commands in outstanding command list. */ -qla2x00_abort_all_cmds (vha,DID_RESET <<16 ); +/* Done waiting for pending commands. Reset online flag */ + vha->flags.online =0 ; } + +/* Requeue all commands in outstanding command list. */ +qla2x00_abort_all_cmds (vha,DID_RESET <<16 );/* memory barrier */ wmb (); }
@@ -7025,6 +7021,12 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)if (vha->flags.online) {qla2x00_abort_isp_cleanup (vha); +if (qla2x00_isp_reg_stat (ha)) { +ql_log (ql_log_info, vha,0x803f , +"ISP Abort - ISP reg disconnect, exiting.\n" ); +return status; + } +if (test_and_clear_bit (ISP_ABORT_TO_ROM , &vha->dpc_flags)) { ha->flags.chip_reset_done =1 ; vha->flags.online =1 ;
@@ -7065,8 +7067,18 @@ qla2x00_abort_isp(scsi_qla_host_t *vha) ha->isp_ops->get_flash_version (vha, req->ring); +if (qla2x00_isp_reg_stat (ha)) { +ql_log (ql_log_info, vha,0x803f , +"ISP Abort - ISP reg disconnect pre nvram config, exiting.\n" ); +return status; + } ha->isp_ops->nvram_config (vha); +if (qla2x00_isp_reg_stat (ha)) { +ql_log (ql_log_info, vha,0x803f , +"ISP Abort - ISP reg disconnect post nvmram config, exiting.\n" ); +return status; + }if (!qla2x00_restart_isp (vha)) {clear_bit (RESET_MARKER_NEEDED , &vha->dpc_flags);
drivers/scsi/qla2xxx/qla_inline.h +46 -0
49 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_iocb.c +50 -10
119 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_isr.c +1 -8
@@ -269,12 +269,7 @@ qla2x00_check_reg32_for_disconnect(scsi_qla_host_t *vha, uint32_t reg)if (!test_and_set_bit (PFLG_DISCONNECTED , &vha->pci_flags) && !test_bit (PFLG_DRIVER_REMOVING , &vha->pci_flags) && !test_bit (PFLG_DRIVER_PROBING , &vha->pci_flags)) { -/* -* Schedule this (only once) on the default system -* workqueue so that all the adapter workqueues and the -* DPC thread can be shutdown cleanly. -*/ -schedule_work (&vha->hw->board_disable); +qla_schedule_eeh_work (vha); }return true; }else
@@ -1643,8 +1638,6 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)case MBA_TEMPERATURE_ALERT :ql_dbg (ql_dbg_async, vha,0x505e ,"TEMPERATURE ALERT: %04x %04x %04x\n" , mb[1 ], mb[2 ], mb[3 ]); -if (mb[1 ] ==0x12 ) -schedule_work (&ha->board_disable);break ;case MBA_TRANS_INSERT :
drivers/scsi/qla2xxx/qla_mbx.c +2 -1
@@ -167,7 +167,8 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)/* check if ISP abort is active and return cmd with timeout */ if ((test_bit (ABORT_ISP_ACTIVE , &base_vha->dpc_flags) ||test_bit (ISP_ABORT_RETRY , &base_vha->dpc_flags) || -test_bit (ISP_ABORT_NEEDED , &base_vha->dpc_flags)) && +test_bit (ISP_ABORT_NEEDED , &base_vha->dpc_flags) || + ha->flags.eeh_busy) && !is_rom_cmd (mcp->mb[0 ])) { ql_log(ql_log_info, vha, 0x1005, "Cmd 0x%x aborted with timeout since ISP Abort is pending\n",
drivers/scsi/qla2xxx/qla_nvme.c +8 -2
@@ -397,8 +397,13 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) } req_cnt =qla24xx_calc_iocbs (vha, tot_dsds);if (req->cnt < (req_cnt +2 )) { - cnt =IS_SHADOW_REG_CAPABLE (ha) ? *req->out_ptr : -rd_reg_dword_relaxed (req->req_q_out); +if (IS_SHADOW_REG_CAPABLE (ha)) { + cnt = *req->out_ptr; + }else { + cnt =rd_reg_dword_relaxed (req->req_q_out); +if (qla2x00_check_reg16_for_disconnect (vha, cnt)) + goto queuing_error; + }if (req->ring_index < cnt) req->cnt = cnt - req->ring_index;
@@ -535,6 +540,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) queuing_error:spin_unlock_irqrestore (&qpair->qp_lock, flags); +return rval; }
drivers/scsi/qla2xxx/qla_os.c +104 -69
307 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 386/406 scsi: qla2xxx: Flush mailbox commands on chip reset
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
[ Upstream commit 6d0b65569c0a10b27c49bacd8d25bcd406003533 ]
Fix race condition between Interrupt thread and Chip reset thread in trying to flush the same mailbox. With the race condition, the "ha->mbx_intr_comp" will get an extra complete() call. The extra complete call create erroneous mailbox timeout condition when the next mailbox is sent where the mailbox call does not wait for interrupt to arrive. Instead, it advances without waiting.
Add lock protection around the check for mailbox completion.
--- drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_init.c | 7 ++++--- drivers/scsi/qla2xxx/qla_mbx.c | 4 ---- drivers/scsi/qla2xxx/qla_os.c | 1 - 4 files changed, 4 insertions(+), 9 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +0 -1
@@ -4200,7 +4200,6 @@ struct qla_hw_data {uint8_t aen_mbx_count;atomic_t num_pend_mbx_stage1;atomic_t num_pend_mbx_stage2; -atomic_t num_pend_mbx_stage3;uint16_t frame_payload_size;uint32_t login_retry_count;
drivers/scsi/qla2xxx/qla_init.c +4 -3
@@ -6926,14 +6926,15 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha) }/* purge MBox commands */ -if (atomic_read (&ha->num_pend_mbx_stage3)) { +spin_lock_irqsave (&ha->hardware_lock, flags); +if (test_bit (MBX_INTR_WAIT , &ha->mbx_cmd_flags)) {clear_bit (MBX_INTR_WAIT , &ha->mbx_cmd_flags);complete (&ha->mbx_intr_comp); } +spin_unlock_irqrestore (&ha->hardware_lock, flags); i =0 ; -while (atomic_read (&ha->num_pend_mbx_stage3) || -atomic_read (&ha->num_pend_mbx_stage2) || +while (atomic_read (&ha->num_pend_mbx_stage2) ||atomic_read (&ha->num_pend_mbx_stage1)) {msleep (20 ); i++;
drivers/scsi/qla2xxx/qla_mbx.c +0 -4
@@ -269,7 +269,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)spin_unlock_irqrestore (&ha->hardware_lock, flags); wait_time = jiffies; -atomic_inc (&ha->num_pend_mbx_stage3);if (!wait_for_completion_timeout (&ha->mbx_intr_comp, mcp->tov *HZ )) { ql_dbg(ql_dbg_mbx, vha, 0x117a,
@@ -284,7 +283,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)spin_unlock_irqrestore (&ha->hardware_lock, flags);atomic_dec (&ha->num_pend_mbx_stage2); -atomic_dec (&ha->num_pend_mbx_stage3); rval =QLA_ABORTED ; goto premature_exit; }
@@ -294,11 +292,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) ha->flags.mbox_busy =0 ;spin_unlock_irqrestore (&ha->hardware_lock, flags);atomic_dec (&ha->num_pend_mbx_stage2); -atomic_dec (&ha->num_pend_mbx_stage3); rval =QLA_ABORTED ; goto premature_exit; } -atomic_dec (&ha->num_pend_mbx_stage3);if (time_after (jiffies, wait_time +5 *HZ )) ql_log(ql_log_warn, vha, 0x1015, "cmd=0x%x, waited %d msecs\n",
drivers/scsi/qla2xxx/qla_os.c +0 -1
@@ -2848,7 +2848,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ha->max_exchg =FW_MAX_EXCHANGES_CNT ;atomic_set (&ha->num_pend_mbx_stage1,0 );atomic_set (&ha->num_pend_mbx_stage2,0 ); -atomic_set (&ha->num_pend_mbx_stage3,0 );atomic_set (&ha->zio_threshold,DEFAULT_ZIO_THRESHOLD ); ha->last_zio_threshold =DEFAULT_ZIO_THRESHOLD ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 387/406 ARM: dts: samsung: exynos4210-i9100: Fix LCD screens physical size
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Cercueil <[email protected]>
[ Upstream commit b3f3fc32e5ff1e848555af8616318cc667457f90 ]
The previous values were completely bogus, and resulted in the computed DPI ratio being much lower than reality, causing applications and UIs to misbehave.
The new values were measured by myself with a ruler.
--- arch/arm/boot/dts/exynos4210-i9100.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/exynos4210-i9100.dts +2 -2
@@ -170,8 +170,8 @@ power-on-delay = <10>; reset-delay = <10>; - panel-width-mm = <90>; - panel-height-mm = <154>; + panel-width-mm = <56>; + panel-height-mm = <93>; display-timings { timing {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 388/406 ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksey Nasibulin <[email protected]>
[ Upstream commit 91994e59079dcb455783d3f9ea338eea6f671af3 ]
Linksys ea6500-v2 have 256MB of ram. Currently we only use 128MB. Expand the definition to use all the available RAM.
--- arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts +2 -1
@@ -19,7 +19,8 @@ memory@0 { device_type = "memory"; - reg = <0x00000000 0x08000000>; + reg = <0x00000000 0x08000000>, + <0x88000000 0x08000000>; }; gpio-keys {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 389/406 bus: mhi: host: Skip MHI reset if device is in RDDM
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qiang Yu <[email protected]>
[ Upstream commit cabce92dd805945a090dc6fc73b001bb35ed083a ]
In RDDM EE, device can not process MHI reset issued by host. In case of MHI power off, host is issuing MHI reset and polls for it to get cleared until it times out. Since this timeout can not be avoided in case of RDDM, skip the MHI reset in this scenarios.
--- drivers/bus/mhi/host/pm.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/bus/mhi/host/pm.c +5 -0
@@ -490,6 +490,10 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl,u32 in_reset =-1 ;unsigned long timeout =msecs_to_jiffies (mhi_cntrl->timeout_ms); +/* Skip MHI RESET if in RDDM state */ +if (mhi_cntrl->rddm_image &&mhi_get_exec_env (mhi_cntrl) ==MHI_EE_RDDM ) + goto skip_mhi_reset; +dev_dbg (dev,"Triggering MHI Reset in device\n" );mhi_set_mhi_state (mhi_cntrl,MHI_STATE_RESET );
@@ -515,6 +519,7 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl,mhi_write_reg (mhi_cntrl, mhi_cntrl->bhi,BHI_INTVEC ,0 ); } +skip_mhi_reset:dev_dbg (dev,"Waiting for all pending event ring processing to complete\n" ); mhi_event = mhi_cntrl->mhi_event;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 390/406 net: ipv4: fix one memleak in __inet_del_ifa()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liu Jian <[email protected]>
[ Upstream commit ac28b1ec6135649b5d78b028e47264cb3ebca5ea ]
I got the below warning when do fuzzing test:unregister_netdevice: waiting for bond0 to become free. Usage count = 2
It can be repoduced via:
ip link add bond0 type bond
sysctl -w net.ipv4.conf.bond0.promote_secondaries=1 ip addr add 4.117.174.103/0 scope 0x40 dev bond0
ip addr add 192.168.100.111/255.255.255.254 scope 0 dev bond0 ip addr add 0.0.0.4/0 scope 0x40 secondary dev bond0 ip addr del 4.117.174.103/0 scope 0x40 dev bond0
ip link delete bond0 type bond
In this reproduction test case, an incorrect 'last_prim' is found in __inet_del_ifa(), as a result, the secondary address(0.0.0.4/0 scope 0x40) is lost. The memory of the secondary address is leaked and the reference of in_device and net_device is leaked.
Fix this problem:
Look for 'last_prim' starting at location of the deleted IP and inserting the promoted IP into the location of 'last_prim'.
--- net/ipv4/devinet.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/ipv4/devinet.c +5 -5
@@ -351,14 +351,14 @@ static void __inet_del_ifa(struct in_device *in_dev, {struct in_ifaddr *promote =NULL ;struct in_ifaddr *ifa, *ifa1; -struct in_ifaddr *last_prim; +struct in_ifaddr __rcu **last_prim;struct in_ifaddr *prev_prom =NULL ;int do_promote =IN_DEV_PROMOTE_SECONDARIES (in_dev);ASSERT_RTNL (); ifa1 =rtnl_dereference (*ifap); - last_prim =rtnl_dereference (in_dev->ifa_list); + last_prim = ifap;if (in_dev->dead) goto no_promotions;
@@ -372,7 +372,7 @@ static void __inet_del_ifa(struct in_device *in_dev,while ((ifa =rtnl_dereference (*ifap1)) !=NULL ) {if (!(ifa->ifa_flags &IFA_F_SECONDARY ) && ifa1->ifa_scope <= ifa->ifa_scope) - last_prim = ifa; + last_prim = &ifa->ifa_next; if (!(ifa->ifa_flags & IFA_F_SECONDARY) || ifa1->ifa_mask != ifa->ifa_mask ||
@@ -436,9 +436,9 @@ static void __inet_del_ifa(struct in_device *in_dev,rcu_assign_pointer (prev_prom->ifa_next, next_sec); - last_sec =rtnl_dereference (last_prim->ifa_next); + last_sec =rtnl_dereference (*last_prim);rcu_assign_pointer (promote->ifa_next, last_sec); -rcu_assign_pointer (last_prim->ifa_next, promote); +rcu_assign_pointer (*last_prim, promote); } promote->ifa_flags &= ~IFA_F_SECONDARY ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 391/406 selftests/kselftest/runner/run_one(): allow running non-executable files
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: SeongJae Park <[email protected]>
[ Upstream commit 303f8e2d02002dbe331cab7813ee091aead3cd39 ]
When running a test program, 'run_one()' checks if the program has the execution permission and fails if it doesn't. However, it's easy to mistakenly lose the permissions, as some common tools like 'diff' don't support the permission change well[1]. Compared to that, making mistakes in the test program's path would only rare, as those are explicitly listed in 'TEST_PROGS'. Therefore, it might make more sense to resolve the situation on our own and run the program.
For this reason, this commit makes the test program runner function still print the warning message but to try parsing the interpreter of the program and to explicitly run it with the interpreter, in this case.
[1] https://lore.kernel.org/mm-commits/[email protected]/
Stable-dep-of: 9616cb34b08e ("kselftest/runner.sh: Propagate SIGTERM to runner child")
--- tools/testing/selftests/kselftest/runner.sh | 28 +++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-)
tools/testing/selftests/kselftest/runner.sh +18 -10
@@ -33,9 +33,9 @@ tap_timeout() { # Make sure tests will time out if utility is available. if [ -x /usr/bin/timeout ] ; then - /usr/bin/timeout --foreground "$kselftest_timeout" "$1" + /usr/bin/timeout --foreground "$kselftest_timeout" $1 else - "$1" + $1 fi }
@@ -65,17 +65,25 @@ run_one() TEST_HDR_MSG="selftests: $DIR: $BASENAME_TEST" echo "# $TEST_HDR_MSG" - if [ ! -x "$TEST" ]; then - echo -n "# Warning: file $TEST is " - if [ ! -e "$TEST" ]; then - echo "missing!" - else - echo "not executable, correct this." - fi + if [ ! -e "$TEST" ]; then + echo "# Warning: file $TEST is missing!" echo "not ok $test_num $TEST_HDR_MSG" else + cmd="./$BASENAME_TEST" + if [ ! -x "$TEST" ]; then + echo "# Warning: file $TEST is not executable" + + if [ $(head -n 1 "$TEST" | cut -c -2) = "#!" ] + then + interpreter=$(head -n 1 "$TEST" | cut -c 3-) + cmd="$interpreter ./$BASENAME_TEST" + else + echo "not ok $test_num $TEST_HDR_MSG" + return + fi + fi cd `dirname $TEST` > /dev/null - ((((( tap_timeout ./$BASENAME_TEST 2>&1; echo $? >&3) | + ((((( tap_timeout "$cmd" 2>&1; echo $? >&3) | tap_prefix >&4) 3>&1) | (read xs; exit $xs)) 4>>"$logfile" && echo "ok $test_num $TEST_HDR_MSG") ||
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 392/406 kselftest/runner.sh: Propagate SIGTERM to runner child
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Björn Töpel <[email protected]>
[ Upstream commit 9616cb34b08ec86642b162eae75c5a7ca8debe3c ]
Timeouts in kselftest are done using the "timeout" command with the "--foreground" option. Without the "foreground" option, it is not possible for a user to cancel the runner using SIGINT, because the signal is not propagated to timeout which is running in a different process group. The "forground" options places the timeout in the same process group as its parent, but only sends the SIGTERM (on timeout) signal to the forked process. Unfortunately, this does not play nice with all kselftests, e.g. "net:fcnal-test.sh", where the child processes will linger because timeout does not send SIGTERM to the group.
Some users have noted these hangs [1].
Fix this by nesting the timeout with an additional timeout without the foreground option.
--- tools/testing/selftests/kselftest/runner.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/kselftest/runner.sh +2 -1
@@ -33,7 +33,8 @@ tap_timeout() { # Make sure tests will time out if utility is available. if [ -x /usr/bin/timeout ] ; then - /usr/bin/timeout --foreground "$kselftest_timeout" $1 + /usr/bin/timeout --foreground "$kselftest_timeout" \ + /usr/bin/timeout "$kselftest_timeout" $1 else $1 fi
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 393/406 net/smc: use smc_lgr_list.lock to protect smc_lgr_list.list iterate in smcr_port_add
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guangguan Wang <[email protected]>
[ Upstream commit f5146e3ef0a9eea405874b36178c19a4863b8989 ]
While doing smcr_port_add, there maybe linkgroup add into or delete from smc_lgr_list.list at the same time, which may result kernel crash. So, use smc_lgr_list.lock to protect smc_lgr_list.list iterate in smcr_port_add.
The crash calltrace show below:
BUG: kernel NULL pointer dereference, address: 0000000000000000 PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI CPU: 0 PID: 559726 Comm: kworker/0:92 Kdump: loaded Tainted: G Hardware name: Alibaba Cloud Alibaba Cloud ECS, BIOS 449e491 04/01/2014 Workqueue: events smc_ib_port_event_work [smc] RIP: 0010:smcr_port_add+0xa6/0xf0 [smc] RSP: 0000:ffffa5a2c8f67de0 EFLAGS: 00010297 RAX: 0000000000000001 RBX: ffff9935e0650000 RCX: 0000000000000000 RDX: 0000000000000010 RSI: ffff9935e0654290 RDI: ffff9935c8560000 RBP: 0000000000000000 R08: 0000000000000000 R09: ffff9934c0401918 R10: 0000000000000000 R11: ffffffffb4a5c278 R12: ffff99364029aae4 R13: ffff99364029aa00 R14: 00000000ffffffed R15: ffff99364029ab08 FS: 0000000000000000(0000) GS:ffff994380600000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 0000000f06a10003 CR4: 0000000002770ef0 PKRU: 55555554 Call Trace: smc_ib_port_event_work+0x18f/0x380 [smc] process_one_work+0x19b/0x340 worker_thread+0x30/0x370 ? process_one_work+0x340/0x340 kthread+0x114/0x130 ? __kthread_cancel_work+0x50/0x50 ret_from_fork+0x1f/0x30
--- net/smc/smc_core.c | 2 ++ 1 file changed, 2 insertions(+)
net/smc/smc_core.c +2 -0
@@ -1101,6 +1101,7 @@ void smcr_port_add(struct smc_ib_device *smcibdev, u8 ibport) {struct smc_link_group *lgr, *n; +spin_lock_bh (&smc_lgr_list.lock);list_for_each_entry_safe (lgr, n, &smc_lgr_list.list, list) {struct smc_link *link;
@@ -1115,6 +1116,7 @@ void smcr_port_add(struct smc_ib_device *smcibdev, u8 ibport)if (link)smc_llc_add_link_local (link); } +spin_unlock_bh (&smc_lgr_list.lock); }/* link is down - switch connections to alternate link,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 394/406 net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangyu Hua <[email protected]>
[ Upstream commit 51fe0a470543f345e3c62b6798929de3ddcedc1d ]
rules is allocated in ethtool_get_rxnfc and the size is determined by rule_cnt from user space. So rule_cnt needs to be check before using rules to avoid OOB writing or NULL pointer dereference.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +5 -0
@@ -5201,6 +5201,11 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev,break ;case ETHTOOL_GRXCLSRLALL :for (i =0 ; i <MVPP2_N_RFS_ENTRIES_PER_FLOW ; i++) { +if (loc == info->rule_cnt) { + ret = -EMSGSIZE ; +break ; + } +if (port->rfs_rules[i]) rules[loc++] = i; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 395/406 net: ethernet: mtk_eth_soc: fix possible NULL pointer dereference in mtk_hwlro_get_fdir_all()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangyu Hua <[email protected]>
[ Upstream commit e4c79810755f66c9a933ca810da2724133b1165a ]
rule_locs is allocated in ethtool_get_rxnfc and the size is determined by rule_cnt from user space. So rule_cnt needs to be check before using rule_locs to avoid NULL pointer dereference.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +3 -0
@@ -2013,6 +2013,9 @@ static int mtk_hwlro_get_fdir_all(struct net_device *dev,int i;for (i =0 ; i <MTK_MAX_LRO_IP_CNT ; i++) { +if (cnt == cmd->rule_cnt) +return -EMSGSIZE ; +if (mac->hwlro_ip[i]) { rule_locs[cnt] = i; cnt++;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 396/406 hsr: Fix uninit-value access in fill_frame_info()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ziyang Xuan <[email protected]>
[ Upstream commit 484b4833c604c0adcf19eac1ca14b60b757355b5 ]
Syzbot reports the following uninit-value access problem.
=====================================================
BUG: KMSAN: uninit-value in fill_frame_info net/hsr/hsr_forward.c:601 [inline] BUG: KMSAN: uninit-value in hsr_forward_skb+0x9bd/0x30f0 net/hsr/hsr_forward.c:616 fill_frame_info net/hsr/hsr_forward.c:601 [inline] hsr_forward_skb+0x9bd/0x30f0 net/hsr/hsr_forward.c:616 hsr_dev_xmit+0x192/0x330 net/hsr/hsr_device.c:223 __netdev_start_xmit include/linux/netdevice.h:4889 [inline] netdev_start_xmit include/linux/netdevice.h:4903 [inline] xmit_one net/core/dev.c:3544 [inline] dev_hard_start_xmit+0x247/0xa10 net/core/dev.c:3560 __dev_queue_xmit+0x34d0/0x52a0 net/core/dev.c:4340 dev_queue_xmit include/linux/netdevice.h:3082 [inline] packet_xmit+0x9c/0x6b0 net/packet/af_packet.c:276 packet_snd net/packet/af_packet.c:3087 [inline] packet_sendmsg+0x8b1d/0x9f30 net/packet/af_packet.c:3119 sock_sendmsg_nosec net/socket.c:730 [inline] sock_sendmsg net/socket.c:753 [inline] __sys_sendto+0x781/0xa30 net/socket.c:2176 __do_sys_sendto net/socket.c:2188 [inline] __se_sys_sendto net/socket.c:2184 [inline] __ia32_sys_sendto+0x11f/0x1c0 net/socket.c:2184 do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline] __do_fast_syscall_32+0xa2/0x100 arch/x86/entry/common.c:178 do_fast_syscall_32+0x37/0x80 arch/x86/entry/common.c:203 do_SYSENTER_32+0x1f/0x30 arch/x86/entry/common.c:246 entry_SYSENTER_compat_after_hwframe+0x70/0x82
Uninit was created at:
slab_post_alloc_hook+0x12f/0xb70 mm/slab.h:767 slab_alloc_node mm/slub.c:3478 [inline] kmem_cache_alloc_node+0x577/0xa80 mm/slub.c:3523 kmalloc_reserve+0x148/0x470 net/core/skbuff.c:559 __alloc_skb+0x318/0x740 net/core/skbuff.c:644 alloc_skb include/linux/skbuff.h:1286 [inline] alloc_skb_with_frags+0xc8/0xbd0 net/core/skbuff.c:6299 sock_alloc_send_pskb+0xa80/0xbf0 net/core/sock.c:2794 packet_alloc_skb net/packet/af_packet.c:2936 [inline] packet_snd net/packet/af_packet.c:3030 [inline] packet_sendmsg+0x70e8/0x9f30 net/packet/af_packet.c:3119 sock_sendmsg_nosec net/socket.c:730 [inline] sock_sendmsg net/socket.c:753 [inline] __sys_sendto+0x781/0xa30 net/socket.c:2176 __do_sys_sendto net/socket.c:2188 [inline] __se_sys_sendto net/socket.c:2184 [inline] __ia32_sys_sendto+0x11f/0x1c0 net/socket.c:2184 do_syscall_32_irqs_on arch/x86/entry/common.c:112 [inline] __do_fast_syscall_32+0xa2/0x100 arch/x86/entry/common.c:178 do_fast_syscall_32+0x37/0x80 arch/x86/entry/common.c:203 do_SYSENTER_32+0x1f/0x30 arch/x86/entry/common.c:246 entry_SYSENTER_compat_after_hwframe+0x70/0x82
It is because VLAN not yet supported in hsr driver. Return error when protocol is ETH_P_8021Q in fill_frame_info() now to fix it.
--- net/hsr/hsr_forward.c | 1 + 1 file changed, 1 insertion(+)
net/hsr/hsr_forward.c +1 -0
@@ -531,6 +531,7 @@ static int fill_frame_info(struct hsr_frame_info *frame, proto = vlan_hdr->vlanhdr.h_vlan_encapsulated_proto;/* FIXME: */ netdev_warn_once (skb->dev,"VLAN not yet supported" ); +return -EINVAL ; } frame->is_from_san = false;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 397/406 r8152: check budget for r8152_poll()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hayes Wang <[email protected]>
[ Upstream commit a7b8d60b37237680009dd0b025fe8c067aba0ee3 ]
According to the document of napi, there is no rx process when the budget is 0. Therefore, r8152_poll() has to return 0 directly when the budget is equal to 0.
--- drivers/net/usb/r8152.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/r8152.c +3 -0
@@ -2439,6 +2439,9 @@ static int r8152_poll(struct napi_struct *napi, int budget) struct r8152 *tp = container_of(napi, struct r8152, napi);int work_done; +if (!budget) +return 0 ; + work_done =rx_bottom (tp, budget);if (work_done < budget) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 398/406 kcm: Fix memory leak in error path of kcm_sendmsg()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shigeru Yoshida <[email protected]>
[ Upstream commit c821a88bd720b0046433173185fd841a100d44ad ]
syzbot reported a memory leak like below:
BUG: memory leak
unreferenced object 0xffff88810b088c00 (size 240):
comm "syz-executor186", pid 5012, jiffies 4294943306 (age 13.680s)
hex dump (first 32 bytes):
00 89 08 0b 81 88 ff ff 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff83e5d5ff>] __alloc_skb+0x1ef/0x230 net/core/skbuff.c:634
[<ffffffff84606e59>] alloc_skb include/linux/skbuff.h:1289 [inline]
[<ffffffff84606e59>] kcm_sendmsg+0x269/0x1050 net/kcm/kcmsock.c:815
[<ffffffff83e479c6>] sock_sendmsg_nosec net/socket.c:725 [inline]
[<ffffffff83e479c6>] sock_sendmsg+0x56/0xb0 net/socket.c:748
[<ffffffff83e47f55>] ____sys_sendmsg+0x365/0x470 net/socket.c:2494
[<ffffffff83e4c389>] ___sys_sendmsg+0xc9/0x130 net/socket.c:2548
[<ffffffff83e4c536>] __sys_sendmsg+0xa6/0x120 net/socket.c:2577
[<ffffffff84ad7bb8>] do_syscall_x64 arch/x86/entry/common.c:50 [inline]
[<ffffffff84ad7bb8>] do_syscall_64+0x38/0xb0 arch/x86/entry/common.c:80
[<ffffffff84c0008b>] entry_SYSCALL_64_after_hwframe+0x63/0xcdIn kcm_sendmsg(), kcm_tx_msg(head)->last_skb is used as a cursor to append newly allocated skbs to 'head'. If some bytes are copied, an error occurred, and jumped to out_error label, 'last_skb' is left unmodified. A later kcm_sendmsg() will use an obsoleted 'last_skb' reference, corrupting the 'head' frag_list and causing the leak.
This patch fixes this issue by properly updating the last allocated skb in 'last_skb'.
--- net/kcm/kcmsock.c | 2 ++ 1 file changed, 2 insertions(+)
net/kcm/kcmsock.c +2 -0
@@ -1073,6 +1073,8 @@ static int kcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)if (head != kcm->seq_skb)kfree_skb (head); +else if (copied) +kcm_tx_msg (head)->last_skb = skb; err =sk_stream_error (sk, msg->msg_flags, err);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 399/406 platform/mellanox: mlxbf-tmfifo: Drop the Rx packet if no more descriptors
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liming Sun <[email protected]>
[ Upstream commit 78034cbece79c2d730ad0770b3b7f23eedbbecf5 ]
This commit fixes tmfifo console stuck issue when the virtual networking interface is in down state. In such case, the network Rx descriptors runs out and causes the Rx network packet staying in the head of the tmfifo thus blocking the console packets. The fix is to drop the Rx network packet when no more Rx descriptors. Function name mlxbf_tmfifo_release_pending_pkt() is also renamed to mlxbf_tmfifo_release_pkt() to be more approperiate.
--- drivers/platform/mellanox/mlxbf-tmfifo.c | 66 ++++++++++++++++++------ 1 file changed, 49 insertions(+), 17 deletions(-)
drivers/platform/mellanox/mlxbf-tmfifo.c +49 -17
@@ -56,6 +56,7 @@ struct mlxbf_tmfifo;* @vq: pointer to the virtio virtqueue * @desc: current descriptor of the pending packet * @desc_head: head descriptor of the pending packet +* @drop_desc: dummy desc for packet dropping * @cur_len: processed length of the current descriptor * @rem_len: remaining length of the pending packet * @pkt_len: total length of the pending packet
@@ -72,6 +73,7 @@ struct mlxbf_tmfifo_vring {struct virtqueue *vq;struct vring_desc *desc;struct vring_desc *desc_head; +struct vring_desc drop_desc;int cur_len;int rem_len;u32 pkt_len;
@@ -83,6 +85,14 @@ struct mlxbf_tmfifo_vring {struct mlxbf_tmfifo *fifo; }; +/* Check whether vring is in drop mode. */ +#define IS_VRING_DROP (_r) ({ \ + typeof(_r) (r) = (_r); \ + (r->desc_head == &r->drop_desc ? true : false); }) + +/* A stub length to drop maximum length packet. */ +#define VRING_DROP_DESC_MAX_LEN GENMASK(15, 0) +/* Interrupt types. */ enum {MLXBF_TM_RX_LWM_IRQ ,
@@ -243,6 +253,7 @@ static int mlxbf_tmfifo_alloc_vrings(struct mlxbf_tmfifo *fifo, vring->align =SMP_CACHE_BYTES ; vring->index = i; vring->vdev_id = tm_vdev->vdev.id.device; + vring->drop_desc.len =VRING_DROP_DESC_MAX_LEN ; dev = &tm_vdev->vdev.dev; size =vring_size (vring->num, vring->align);
@@ -348,7 +359,7 @@ static u32 mlxbf_tmfifo_get_pkt_len(struct mlxbf_tmfifo_vring *vring,return len; } -static void mlxbf_tmfifo_release_pending_pkt (struct mlxbf_tmfifo_vring *vring) +static void mlxbf_tmfifo_release_pkt (struct mlxbf_tmfifo_vring *vring) {struct vring_desc *desc_head;u32 len =0 ;
@@ -577,19 +588,25 @@ static void mlxbf_tmfifo_rxtx_word(struct mlxbf_tmfifo_vring *vring,if (vring->cur_len +sizeof (u64) <= len) {/* The whole word. */ -if (is_rx) -memcpy (addr + vring->cur_len, &data,sizeof (u64)); -else -memcpy (&data, addr + vring->cur_len,sizeof (u64)); +if (!IS_VRING_DROP (vring)) { +if (is_rx) +memcpy (addr + vring->cur_len, &data, +sizeof (u64)); +else +memcpy (&data, addr + vring->cur_len, +sizeof (u64)); + } vring->cur_len +=sizeof (u64); }else {/* Leftover bytes. */ -if (is_rx) -memcpy (addr + vring->cur_len, &data, - len - vring->cur_len); -else -memcpy (&data, addr + vring->cur_len, - len - vring->cur_len); +if (!IS_VRING_DROP (vring)) { +if (is_rx) +memcpy (addr + vring->cur_len, &data, + len - vring->cur_len); +else +memcpy (&data, addr + vring->cur_len, + len - vring->cur_len); + } vring->cur_len = len; }
@@ -690,8 +707,16 @@ static bool mlxbf_tmfifo_rxtx_one_desc(struct mlxbf_tmfifo_vring *vring,/* Get the descriptor of the next packet. */ if (!vring->desc) { desc =mlxbf_tmfifo_get_next_pkt (vring, is_rx); -if (!desc) -return false; +if (!desc) { +/* Drop next Rx packet to avoid stuck. */ +if (is_rx) { + desc = &vring->drop_desc; + vring->desc_head = desc; + vring->desc = desc; + }else { +return false; + } + } }else { desc = vring->desc; }
@@ -724,17 +749,24 @@ static bool mlxbf_tmfifo_rxtx_one_desc(struct mlxbf_tmfifo_vring *vring, vring->rem_len -= len;/* Get the next desc on the chain. */ -if (vring->rem_len >0 && +if (!IS_VRING_DROP (vring) && vring->rem_len >0 && (virtio16_to_cpu (vdev, desc->flags) &VRING_DESC_F_NEXT )) { idx =virtio16_to_cpu (vdev, desc->next); desc = &vr->desc[idx]; goto mlxbf_tmfifo_desc_done; } -/* Done and release the pending packet. */ -mlxbf_tmfifo_release_pending_pkt (vring); +/* Done and release the packet. */ desc =NULL ; fifo->vring[is_rx] =NULL ; +if (!IS_VRING_DROP (vring)) { +mlxbf_tmfifo_release_pkt (vring); + }else { + vring->pkt_len =0 ; + vring->desc_head =NULL ; + vring->desc =NULL ; +return false; + }/* * Make sure the load/store are in order before
@@ -914,7 +946,7 @@ static void mlxbf_tmfifo_virtio_del_vqs(struct virtio_device *vdev)/* Release the pending packet. */ if (vring->desc) -mlxbf_tmfifo_release_pending_pkt (vring); +mlxbf_tmfifo_release_pkt (vring); vq = vring->vq;if (vq) { vring->vq =NULL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 400/406 platform/mellanox: mlxbf-tmfifo: Drop jumbo frames
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liming Sun <[email protected]>
[ Upstream commit fc4c655821546239abb3cf4274d66b9747aa87dd ]
This commit drops over-sized network packets to avoid tmfifo queue stuck.
--- drivers/platform/mellanox/mlxbf-tmfifo.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
drivers/platform/mellanox/mlxbf-tmfifo.c +17 -7
@@ -205,7 +205,7 @@ static u8 mlxbf_tmfifo_net_default_mac[ETH_ALEN] = {static efi_char16_t mlxbf_tmfifo_efi_name[] =L"RshimMacAddr" ;/* Maximum L2 header length. */ -#define MLXBF_TMFIFO_NET_L2_OVERHEAD 36 +#define MLXBF_TMFIFO_NET_L2_OVERHEAD (ETH_HLEN + VLAN_HLEN)/* Supported virtio-net features. */ #define MLXBF_TMFIFO_NET_FEATURES \
@@ -623,13 +623,14 @@ static void mlxbf_tmfifo_rxtx_word(struct mlxbf_tmfifo_vring *vring,* flag is set. */ static void mlxbf_tmfifo_rxtx_header (struct mlxbf_tmfifo_vring *vring, -struct vring_desc *desc, +struct vring_desc **desc,bool is_rx,bool *vring_change) {struct mlxbf_tmfifo *fifo = vring->fifo;struct virtio_net_config *config;struct mlxbf_tmfifo_msg_hdr hdr;int vdev_id, hdr_len; +bool drop_rx = false;/* Read/Write packet header. */ if (is_rx) {
@@ -649,8 +650,8 @@ static void mlxbf_tmfifo_rxtx_header(struct mlxbf_tmfifo_vring *vring,if (ntohs (hdr.len) >__virtio16_to_cpu (virtio_legacy_is_little_endian (), config->mtu) + -MLXBF_TMFIFO_NET_L2_OVERHEAD ) -return ; +MLXBF_TMFIFO_NET_L2_OVERHEAD ) + drop_rx = true; }else { vdev_id =VIRTIO_ID_CONSOLE ; hdr_len =0 ;
@@ -665,16 +666,25 @@ static void mlxbf_tmfifo_rxtx_header(struct mlxbf_tmfifo_vring *vring,if (!tm_dev2)return ; - vring->desc = desc; + vring->desc = *desc; vring = &tm_dev2->vrings[MLXBF_TMFIFO_VRING_RX ]; *vring_change = true; } + +if (drop_rx && !IS_VRING_DROP (vring)) { +if (vring->desc_head) +mlxbf_tmfifo_release_pkt (vring); + *desc = &vring->drop_desc; + vring->desc_head = *desc; + vring->desc = *desc; + } + vring->pkt_len =ntohs (hdr.len) + hdr_len; }else {/* Network virtio has an extra header. */ hdr_len = (vring->vdev_id ==VIRTIO_ID_NET ) ?sizeof (struct virtio_net_hdr ) :0 ; - vring->pkt_len =mlxbf_tmfifo_get_pkt_len (vring, desc); + vring->pkt_len =mlxbf_tmfifo_get_pkt_len (vring, *desc); hdr.type = (vring->vdev_id ==VIRTIO_ID_NET ) ?VIRTIO_ID_NET :VIRTIO_ID_CONSOLE ; hdr.len =htons (vring->pkt_len - hdr_len);
@@ -723,7 +733,7 @@ static bool mlxbf_tmfifo_rxtx_one_desc(struct mlxbf_tmfifo_vring *vring,/* Beginning of a packet. Start to Rx/Tx packet header. */ if (vring->pkt_len ==0 ) { -mlxbf_tmfifo_rxtx_header (vring, desc, is_rx, &vring_change); +mlxbf_tmfifo_rxtx_header (vring, &desc, is_rx, &vring_change); (*avail)--;/* Return if new packet is for another ring. */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 401/406 net/tls: do not free tls_rec on async operation in bpf_exec_tx_verdict()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liu Jian <[email protected]>
[ Upstream commit cfaa80c91f6f99b9342b6557f0f0e1143e434066 ]
I got the below warning when do fuzzing test:
BUG: KASAN: null-ptr-deref in scatterwalk_copychunks+0x320/0x470 Read of size 4 at addr 0000000000000008 by task kworker/u8:1/9 CPU: 0 PID: 9 Comm: kworker/u8:1 Tainted: G OE Hardware name: linux,dummy-virt (DT) Workqueue: pencrypt_parallel padata_parallel_worker Call trace: dump_backtrace+0x0/0x420 show_stack+0x34/0x44 dump_stack+0x1d0/0x248 __kasan_report+0x138/0x140 kasan_report+0x44/0x6c __asan_load4+0x94/0xd0 scatterwalk_copychunks+0x320/0x470 skcipher_next_slow+0x14c/0x290 skcipher_walk_next+0x2fc/0x480 skcipher_walk_first+0x9c/0x110 skcipher_walk_aead_common+0x380/0x440 skcipher_walk_aead_encrypt+0x54/0x70 ccm_encrypt+0x13c/0x4d0 crypto_aead_encrypt+0x7c/0xfc pcrypt_aead_enc+0x28/0x84 padata_parallel_worker+0xd0/0x2dc process_one_work+0x49c/0xbdc worker_thread+0x124/0x880 kthread+0x210/0x260 ret_from_fork+0x10/0x18
This is because the value of rec_seq of tls_crypto_info configured by the user program is too large, for example, 0xffffffffffffff. In addition, TLS is asynchronously accelerated. When tls_do_encryption() returns -EINPROGRESS and sk->sk_err is set to EBADMSG due to rec_seq overflow, skmsg is released before the asynchronous encryption process ends. As a result, the UAF problem occurs during the asynchronous processing of the encryption module.
If the operation is asynchronous and the encryption module returns EINPROGRESS, do not free the record information.
--- net/tls/tls_sw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/tls/tls_sw.c +2 -2
@@ -810,7 +810,7 @@ static int bpf_exec_tx_verdict(struct sk_msg *msg, struct sock *sk, psock =sk_psock_get (sk);if (!psock || !policy) { err =tls_push_record (sk, flags, record_type); -if (err && sk->sk_err ==EBADMSG ) { +if (err && err != -EINPROGRESS && sk->sk_err ==EBADMSG ) { *copied -=sk_msg_free (sk, msg);tls_free_open_rec (sk); err = -sk->sk_err;
@@ -839,7 +839,7 @@ static int bpf_exec_tx_verdict(struct sk_msg *msg, struct sock *sk,switch (psock->eval) {case __SK_PASS: err =tls_push_record (sk, flags, record_type); -if (err && sk->sk_err ==EBADMSG ) { +if (err && err != -EINPROGRESS && sk->sk_err ==EBADMSG ) { *copied -=sk_msg_free (sk, msg);tls_free_open_rec (sk); err = -sk->sk_err;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 402/406 ipv6: fix ip6_sock_set_addr_preferences() typo
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 8cdd9f1aaedf823006449faa4e540026c692ac43 ]
ip6_sock_set_addr_preferences() second argument should be an integer.
SUNRPC attempts to set IPV6_PREFER_SRC_PUBLIC were translated to IPV6_PREFER_SRC_TMP
--- include/net/ipv6.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/ipv6.h +1 -1
@@ -1249,7 +1249,7 @@ static inline int __ip6_sock_set_addr_preferences(struct sock *sk, int val)return 0 ; } -static inline int ip6_sock_set_addr_preferences (struct sock *sk,bool val) +static inline int ip6_sock_set_addr_preferences (struct sock *sk,int val) {int ret;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 403/406 ixgbe: fix timestamp configuration code
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vadim Fedorenko <[email protected]>
[ Upstream commit 3c44191dd76cf9c0cc49adaf34384cbd42ef8ad2 ]
The commit in fixes introduced flags to control the status of hardware configuration while processing packets. At the same time another structure is used to provide configuration of timestamper to user-space applications. The way it was coded makes this structures go out of sync easily. The repro is easy for 82599 chips:
[root@hostname ~]# hwstamp_ctl -i eth0 -r 12 -t 1
current settings:tx_type 0rx_filter 0
new settings:tx_type 1rx_filter 12
The eth0 device is properly configured to timestamp any PTPv2 events.
[root@hostname ~]# hwstamp_ctl -i eth0 -r 1 -t 1 current settings:tx_type 1rx_filter 12
SIOCSHWTSTAMP failed: Numerical result out of range
The requested time stamping mode is not supported by the hardware.
The error is properly returned because HW doesn't support all packets timestamping. But the adapter->flags is cleared of timestamp flags even though no HW configuration was done. From that point no RX timestamps are received by user-space application. But configuration shows good values:
[root@hostname ~]# hwstamp_ctl -i eth0
current settings:tx_type 1rx_filter 12
Fix the issue by applying new flags only when the HW was actually configured.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 28 +++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c +15 -13
@@ -989,6 +989,7 @@ static int ixgbe_ptp_set_timestamp_mode(struct ixgbe_adapter *adapter,u32 tsync_tx_ctl =IXGBE_TSYNCTXCTL_ENABLED ;u32 tsync_rx_ctl =IXGBE_TSYNCRXCTL_ENABLED ;u32 tsync_rx_mtrl =PTP_EV_PORT <<16 ; +u32 aflags = adapter->flags;bool is_l2 = false;u32 regval;
@@ -1009,20 +1010,20 @@ static int ixgbe_ptp_set_timestamp_mode(struct ixgbe_adapter *adapter,case HWTSTAMP_FILTER_NONE : tsync_rx_ctl =0 ; tsync_rx_mtrl =0 ; - adapter->flags &= ~(IXGBE_FLAG_RX_HWTSTAMP_ENABLED | -IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER ); + aflags &= ~(IXGBE_FLAG_RX_HWTSTAMP_ENABLED | +IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER );break ;case HWTSTAMP_FILTER_PTP_V1_L4_SYNC : tsync_rx_ctl |=IXGBE_TSYNCRXCTL_TYPE_L4_V1 ; tsync_rx_mtrl |=IXGBE_RXMTRL_V1_SYNC_MSG ; - adapter->flags |= (IXGBE_FLAG_RX_HWTSTAMP_ENABLED | -IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER ); + aflags |= (IXGBE_FLAG_RX_HWTSTAMP_ENABLED | +IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER );break ;case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ : tsync_rx_ctl |=IXGBE_TSYNCRXCTL_TYPE_L4_V1 ; tsync_rx_mtrl |=IXGBE_RXMTRL_V1_DELAY_REQ_MSG ; - adapter->flags |= (IXGBE_FLAG_RX_HWTSTAMP_ENABLED | -IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER ); + aflags |= (IXGBE_FLAG_RX_HWTSTAMP_ENABLED | +IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER );break ;case HWTSTAMP_FILTER_PTP_V2_EVENT :case HWTSTAMP_FILTER_PTP_V2_L2_EVENT :
@@ -1036,8 +1037,8 @@ static int ixgbe_ptp_set_timestamp_mode(struct ixgbe_adapter *adapter, tsync_rx_ctl |=IXGBE_TSYNCRXCTL_TYPE_EVENT_V2 ; is_l2 = true; config->rx_filter =HWTSTAMP_FILTER_PTP_V2_EVENT ; - adapter->flags |= (IXGBE_FLAG_RX_HWTSTAMP_ENABLED | -IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER ); + aflags |= (IXGBE_FLAG_RX_HWTSTAMP_ENABLED | +IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER );break ;case HWTSTAMP_FILTER_PTP_V1_L4_EVENT :case HWTSTAMP_FILTER_NTP_ALL :
@@ -1048,7 +1049,7 @@ static int ixgbe_ptp_set_timestamp_mode(struct ixgbe_adapter *adapter,if (hw->mac.type >= ixgbe_mac_X550) { tsync_rx_ctl |=IXGBE_TSYNCRXCTL_TYPE_ALL ; config->rx_filter =HWTSTAMP_FILTER_ALL ; - adapter->flags |=IXGBE_FLAG_RX_HWTSTAMP_ENABLED ; + aflags |=IXGBE_FLAG_RX_HWTSTAMP_ENABLED ;break ; } fallthrough;
@@ -1059,8 +1060,6 @@ static int ixgbe_ptp_set_timestamp_mode(struct ixgbe_adapter *adapter,* Delay_Req messages and hardware does not support * timestamping all packets => return error */ - adapter->flags &= ~(IXGBE_FLAG_RX_HWTSTAMP_ENABLED | -IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER ); config->rx_filter =HWTSTAMP_FILTER_NONE ;return -ERANGE ; }
@@ -1092,8 +1091,8 @@ static int ixgbe_ptp_set_timestamp_mode(struct ixgbe_adapter *adapter,IXGBE_TSYNCRXCTL_TYPE_ALL |IXGBE_TSYNCRXCTL_TSIP_UT_EN ; config->rx_filter =HWTSTAMP_FILTER_ALL ; - adapter->flags |=IXGBE_FLAG_RX_HWTSTAMP_ENABLED ; - adapter->flags &= ~IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER ; + aflags |=IXGBE_FLAG_RX_HWTSTAMP_ENABLED ; + aflags &= ~IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER ; is_l2 = true;break ;default :
@@ -1126,6 +1125,9 @@ static int ixgbe_ptp_set_timestamp_mode(struct ixgbe_adapter *adapter,IXGBE_WRITE_FLUSH (hw); +/* configure adapter flags only when HW is actually configured */ + adapter->flags = aflags; +/* clear TX/RX time stamp registers, just to be sure */ ixgbe_ptp_clear_tx_timestamp (adapter);IXGBE_READ_REG (hw,IXGBE_RXSTMPH );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 404/406 kcm: Fix error handling for SOCK_DGRAM in kcm_sendmsg().
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit a22730b1b4bf437c6bbfdeff5feddf54be4aeada ]
syzkaller found a memory leak in kcm_sendmsg(), and commit c821a88bd720 ("kcm: Fix memory leak in error path of kcm_sendmsg()") suppressed it by updating kcm_tx_msg(head)->last_skb if partial data is copied so that the following sendmsg() will resume from the skb.
However, we cannot know how many bytes were copied when we get the error. Thus, we could mess up the MSG_MORE queue.
When kcm_sendmsg() fails for SOCK_DGRAM, we should purge the queue as we do so for UDP by udp_flush_pending_frames().
Even without this change, when the error occurred, the following sendmsg() resumed from a wrong skb and the queue was messed up. However, we have yet to get such a report, and only syzkaller stumbled on it. So, this can be changed safely.
Note this does not change SOCK_SEQPACKET behaviour.
--- net/kcm/kcmsock.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
net/kcm/kcmsock.c +8 -7
@@ -1064,17 +1064,18 @@ static int kcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) out_error:kcm_push (kcm); -if (copied && sock->type ==SOCK_SEQPACKET ) { +if (sock->type ==SOCK_SEQPACKET ) {/* Wrote some bytes before encountering an * error, return partial success. */ - goto partial_message; - } - -if (head != kcm->seq_skb) +if (copied) + goto partial_message; +if (head != kcm->seq_skb) +kfree_skb (head); + }else {kfree_skb (head); -else if (copied) -kcm_tx_msg (head)->last_skb = skb; + kcm->seq_skb =NULL ; + } err =sk_stream_error (sk, msg->msg_flags, err);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 405/406 drm/amd/display: Fix a bug when searching for insert_above_mpcc
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Chalmers <[email protected]>
commit 3d028d5d60d516c536de1ddd3ebf3d55f3f8983b upstream.
[WHY]
Currently, when insert_plane is called with insert_above_mpcc parameter that is equal to tree->opp_list, the function returns NULL.
[HOW]
Instead, the function should insert the plane at the top of the tree.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c +3 -2
@@ -206,8 +206,9 @@ struct mpcc *mpc1_insert_plane(/* check insert_above_mpcc exist in tree->opp_list */ struct mpcc *temp_mpcc = tree->opp_list; -while (temp_mpcc && temp_mpcc->mpcc_bot != insert_above_mpcc) - temp_mpcc = temp_mpcc->mpcc_bot; +if (temp_mpcc != insert_above_mpcc) +while (temp_mpcc && temp_mpcc->mpcc_bot != insert_above_mpcc) + temp_mpcc = temp_mpcc->mpcc_bot;if (temp_mpcc ==NULL )return NULL ; }
Greg Kroah-Hartman
maintainerPATCH 406/406 parisc: Drop loops_per_jiffy from per_cpu struct
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit 93346da8ff47cc00f953c7f38a2d6ba11977fc42 upstream.
There is no need to keep a loops_per_jiffy value per cpu. Drop it.
--- arch/parisc/include/asm/processor.h | 1 - arch/parisc/kernel/processor.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-)
arch/parisc/include/asm/processor.h +0 -1
@@ -97,7 +97,6 @@ struct cpuinfo_parisc {unsigned long cpu_loc;/* CPU location from PAT firmware */ unsigned int state;struct parisc_device *dev; -unsigned long loops_per_jiffy; };extern struct system_cpuinfo_parisc boot_cpu_data;
arch/parisc/kernel/processor.c +2 -3
@@ -163,7 +163,6 @@ static int __init processor_probe(structif (cpuid)memset (p,0 ,sizeof (struct cpuinfo_parisc )); - p->loops_per_jiffy = loops_per_jiffy; p->dev = dev;/* Save IODC data in case we need it */ p->hpa = dev->hpa.start;/* save CPU hpa */ p->cpuid = cpuid;/* save CPU id */
@@ -440,8 +439,8 @@ show_cpuinfo (struct seq_file *m, void *show_cache_info (m);seq_printf (m,"bogomips\t: %lu.%02lu\n" , - cpuinfo->loops_per_jiffy / (500000 /HZ ), - (cpuinfo->loops_per_jiffy / (5000 /HZ )) %100 ); + loops_per_jiffy / (500000 /HZ ), + loops_per_jiffy / (5000 /HZ ) %100 );seq_printf (m,"software id\t: %ld\n\n" , boot_cpu_data.pdc.model.sw_id);
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 5.10.195 release. There are 406 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.10.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.195 release. There are 406 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 19 Sep 2023 19:10:04 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.195-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.10:
11 builds: 11 pass, 0 fail
28 boots: 28 pass, 0 fail
75 tests: 75 pass, 0 failLinux version: 5.10.195-rc1-g95379666b7a6
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.195 release. There are 406 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 19 Sep 2023 19:10:04 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.195-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.195 release. There are 406 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 19 Sep 2023 19:10:04 +0000. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 495 pass: 495 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.195 release. There are 406 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 19 Sep 2023 19:10:04 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.195-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.195 release. There are 406 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 19 Sep 2023 19:10:04 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.195-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.195 release. There are 406 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 19 Sep 2023 19:10:04 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.195-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.10.195-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.10.y
* git commit: 95379666b7a68327e8f4c3a0dbf28ae0c479ab4c
* git describe: v5.10.194-407-g95379666b7a6
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.10.y/build/v5.10.194-407-g95379666b7a6
## Test Regressions (compared to v5.10.194)
## Metric Regressions (compared to v5.10.194)
## Test Fixes (compared to v5.10.194)
## Metric Fixes (compared to v5.10.194)
## Test result summary
total: 80823, pass: 63120, fail: 2111, skip: 15541, xfail: 51
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 111 total, 111 passed, 0 failed
* arm64: 38 total, 38 passed, 0 failed
* i386: 28 total, 28 passed, 0 failed
* mips: 23 total, 23 passed, 0 failed
* parisc: 3 total, 0 passed, 3 failed
* powerpc: 23 total, 23 passed, 0 failed
* riscv: 8 total, 8 passed, 0 failed
* s390: 9 total, 9 passed, 0 failed
* sh: 11 total, 11 passed, 0 failed
* sparc: 6 total, 6 passed, 0 failed
* x86_64: 33 total, 33 passed, 0 failed
## Test suites summary
* boot
* kselftest-android
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-exec
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-filesystems-epoll
* kselftest-firmware
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-lib
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-net-forwarding
* kselftest-net-mptcp
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-sigaltstack
* kselftest-size
* kselftest-tc-testing
* kselftest-timens
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-user_events
* kselftest-vDSO
* kselftest-vm
* kselftest-watchdog
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* perf
* rcutorture
--
Linaro LKFT
https://lkft.linaro.org