From: Sasha Levin Date: Tue, 30 Mar 2021 21:59:20 +0000 (-0400) Subject: Fixes for 5.4 X-Git-Tag: v4.4.265~72 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17b289585bbb9ec591f5f329776ebcb00edcf7a9;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/asoc-cs42l42-always-wait-at-least-3ms-after-reset.patch b/queue-5.4/asoc-cs42l42-always-wait-at-least-3ms-after-reset.patch new file mode 100644 index 00000000000..bc85864f884 --- /dev/null +++ b/queue-5.4/asoc-cs42l42-always-wait-at-least-3ms-after-reset.patch @@ -0,0 +1,57 @@ +From 47d9b68c90d4cbdd7701373a51eca48090347883 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Mar 2021 17:34:32 +0000 +Subject: ASoC: cs42l42: Always wait at least 3ms after reset + +From: Lucas Tanure + +[ Upstream commit 19325cfea04446bc79b36bffd4978af15f46a00e ] + +This delay is part of the power-up sequence defined in the datasheet. +A runtime_resume is a power-up so must also include the delay. + +Signed-off-by: Lucas Tanure +Link: https://lore.kernel.org/r/20210305173442.195740-6-tanureal@opensource.cirrus.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/cs42l42.c | 3 ++- + sound/soc/codecs/cs42l42.h | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c +index 95930018a1a4..dcd2acb2c3ce 100644 +--- a/sound/soc/codecs/cs42l42.c ++++ b/sound/soc/codecs/cs42l42.c +@@ -1796,7 +1796,7 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, + dev_dbg(&i2c_client->dev, "Found reset GPIO\n"); + gpiod_set_value_cansleep(cs42l42->reset_gpio, 1); + } +- mdelay(3); ++ usleep_range(CS42L42_BOOT_TIME_US, CS42L42_BOOT_TIME_US * 2); + + /* Request IRQ */ + ret = devm_request_threaded_irq(&i2c_client->dev, +@@ -1921,6 +1921,7 @@ static int cs42l42_runtime_resume(struct device *dev) + } + + gpiod_set_value_cansleep(cs42l42->reset_gpio, 1); ++ usleep_range(CS42L42_BOOT_TIME_US, CS42L42_BOOT_TIME_US * 2); + + regcache_cache_only(cs42l42->regmap, false); + regcache_sync(cs42l42->regmap); +diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h +index 9b017b76828a..866d7c873e3c 100644 +--- a/sound/soc/codecs/cs42l42.h ++++ b/sound/soc/codecs/cs42l42.h +@@ -740,6 +740,7 @@ + #define CS42L42_FRAC2_VAL(val) (((val) & 0xff0000) >> 16) + + #define CS42L42_NUM_SUPPLIES 5 ++#define CS42L42_BOOT_TIME_US 3000 + + static const char *const cs42l42_supply_names[CS42L42_NUM_SUPPLIES] = { + "VA", +-- +2.30.1 + diff --git a/queue-5.4/asoc-cs42l42-fix-bitclock-polarity-inversion.patch b/queue-5.4/asoc-cs42l42-fix-bitclock-polarity-inversion.patch new file mode 100644 index 00000000000..856afa70737 --- /dev/null +++ b/queue-5.4/asoc-cs42l42-fix-bitclock-polarity-inversion.patch @@ -0,0 +1,87 @@ +From 7e0666da76ebe4c72233728fd64b0635330cee0f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Mar 2021 17:34:28 +0000 +Subject: ASoC: cs42l42: Fix Bitclock polarity inversion + +From: Lucas Tanure + +[ Upstream commit e793c965519b8b7f2fea51a48398405e2a501729 ] + +The driver was setting bit clock polarity opposite to intended polarity. +Also simplify the code by grouping ADC and DAC clock configurations into +a single field. + +Signed-off-by: Lucas Tanure +Link: https://lore.kernel.org/r/20210305173442.195740-2-tanureal@opensource.cirrus.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/cs42l42.c | 20 ++++++++------------ + sound/soc/codecs/cs42l42.h | 11 ++++++----- + 2 files changed, 14 insertions(+), 17 deletions(-) + +diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c +index 5125bb9b37b5..c78e2ce37930 100644 +--- a/sound/soc/codecs/cs42l42.c ++++ b/sound/soc/codecs/cs42l42.c +@@ -797,27 +797,23 @@ static int cs42l42_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) + /* Bitclock/frame inversion */ + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: ++ asp_cfg_val |= CS42L42_ASP_SCPOL_NOR << CS42L42_ASP_SCPOL_SHIFT; + break; + case SND_SOC_DAIFMT_NB_IF: +- asp_cfg_val |= CS42L42_ASP_POL_INV << +- CS42L42_ASP_LCPOL_IN_SHIFT; ++ asp_cfg_val |= CS42L42_ASP_SCPOL_NOR << CS42L42_ASP_SCPOL_SHIFT; ++ asp_cfg_val |= CS42L42_ASP_LCPOL_INV << CS42L42_ASP_LCPOL_SHIFT; + break; + case SND_SOC_DAIFMT_IB_NF: +- asp_cfg_val |= CS42L42_ASP_POL_INV << +- CS42L42_ASP_SCPOL_IN_DAC_SHIFT; + break; + case SND_SOC_DAIFMT_IB_IF: +- asp_cfg_val |= CS42L42_ASP_POL_INV << +- CS42L42_ASP_LCPOL_IN_SHIFT; +- asp_cfg_val |= CS42L42_ASP_POL_INV << +- CS42L42_ASP_SCPOL_IN_DAC_SHIFT; ++ asp_cfg_val |= CS42L42_ASP_LCPOL_INV << CS42L42_ASP_LCPOL_SHIFT; + break; + } + +- snd_soc_component_update_bits(component, CS42L42_ASP_CLK_CFG, +- CS42L42_ASP_MODE_MASK | +- CS42L42_ASP_SCPOL_IN_DAC_MASK | +- CS42L42_ASP_LCPOL_IN_MASK, asp_cfg_val); ++ snd_soc_component_update_bits(component, CS42L42_ASP_CLK_CFG, CS42L42_ASP_MODE_MASK | ++ CS42L42_ASP_SCPOL_MASK | ++ CS42L42_ASP_LCPOL_MASK, ++ asp_cfg_val); + + return 0; + } +diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h +index 9e3cc528dcff..1f0d67c95a9a 100644 +--- a/sound/soc/codecs/cs42l42.h ++++ b/sound/soc/codecs/cs42l42.h +@@ -258,11 +258,12 @@ + #define CS42L42_ASP_SLAVE_MODE 0x00 + #define CS42L42_ASP_MODE_SHIFT 4 + #define CS42L42_ASP_MODE_MASK (1 << CS42L42_ASP_MODE_SHIFT) +-#define CS42L42_ASP_SCPOL_IN_DAC_SHIFT 2 +-#define CS42L42_ASP_SCPOL_IN_DAC_MASK (1 << CS42L42_ASP_SCPOL_IN_DAC_SHIFT) +-#define CS42L42_ASP_LCPOL_IN_SHIFT 0 +-#define CS42L42_ASP_LCPOL_IN_MASK (1 << CS42L42_ASP_LCPOL_IN_SHIFT) +-#define CS42L42_ASP_POL_INV 1 ++#define CS42L42_ASP_SCPOL_SHIFT 2 ++#define CS42L42_ASP_SCPOL_MASK (3 << CS42L42_ASP_SCPOL_SHIFT) ++#define CS42L42_ASP_SCPOL_NOR 3 ++#define CS42L42_ASP_LCPOL_SHIFT 0 ++#define CS42L42_ASP_LCPOL_MASK (3 << CS42L42_ASP_LCPOL_SHIFT) ++#define CS42L42_ASP_LCPOL_INV 3 + + #define CS42L42_ASP_FRM_CFG (CS42L42_PAGE_12 + 0x08) + #define CS42L42_ASP_STP_SHIFT 4 +-- +2.30.1 + diff --git a/queue-5.4/asoc-cs42l42-fix-channel-width-support.patch b/queue-5.4/asoc-cs42l42-fix-channel-width-support.patch new file mode 100644 index 00000000000..fe5d6ed056c --- /dev/null +++ b/queue-5.4/asoc-cs42l42-fix-channel-width-support.patch @@ -0,0 +1,112 @@ +From 3c9de11daaef322b49abfe3e8754887a728e7300 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Mar 2021 17:34:29 +0000 +Subject: ASoC: cs42l42: Fix channel width support + +From: Lucas Tanure + +[ Upstream commit 2bdc4f5c6838f7c3feb4fe68e4edbeea158ec0a2 ] + +Remove the hard coded 32 bits width and replace with the correct width +calculated by params_width. + +Signed-off-by: Lucas Tanure +Link: https://lore.kernel.org/r/20210305173442.195740-3-tanureal@opensource.cirrus.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/cs42l42.c | 47 ++++++++++++++++++-------------------- + sound/soc/codecs/cs42l42.h | 1 - + 2 files changed, 22 insertions(+), 26 deletions(-) + +diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c +index c78e2ce37930..26ca5acf0136 100644 +--- a/sound/soc/codecs/cs42l42.c ++++ b/sound/soc/codecs/cs42l42.c +@@ -691,24 +691,6 @@ static int cs42l42_pll_config(struct snd_soc_component *component) + CS42L42_CLK_OASRC_SEL_MASK, + CS42L42_CLK_OASRC_SEL_12 << + CS42L42_CLK_OASRC_SEL_SHIFT); +- /* channel 1 on low LRCLK, 32 bit */ +- snd_soc_component_update_bits(component, +- CS42L42_ASP_RX_DAI0_CH1_AP_RES, +- CS42L42_ASP_RX_CH_AP_MASK | +- CS42L42_ASP_RX_CH_RES_MASK, +- (CS42L42_ASP_RX_CH_AP_LOW << +- CS42L42_ASP_RX_CH_AP_SHIFT) | +- (CS42L42_ASP_RX_CH_RES_32 << +- CS42L42_ASP_RX_CH_RES_SHIFT)); +- /* Channel 2 on high LRCLK, 32 bit */ +- snd_soc_component_update_bits(component, +- CS42L42_ASP_RX_DAI0_CH2_AP_RES, +- CS42L42_ASP_RX_CH_AP_MASK | +- CS42L42_ASP_RX_CH_RES_MASK, +- (CS42L42_ASP_RX_CH_AP_HI << +- CS42L42_ASP_RX_CH_AP_SHIFT) | +- (CS42L42_ASP_RX_CH_RES_32 << +- CS42L42_ASP_RX_CH_RES_SHIFT)); + if (pll_ratio_table[i].mclk_src_sel == 0) { + /* Pass the clock straight through */ + snd_soc_component_update_bits(component, +@@ -824,14 +806,29 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream, + { + struct snd_soc_component *component = dai->component; + struct cs42l42_private *cs42l42 = snd_soc_component_get_drvdata(component); +- int retval; ++ unsigned int width = (params_width(params) / 8) - 1; ++ unsigned int val = 0; + + cs42l42->srate = params_rate(params); +- cs42l42->swidth = params_width(params); + +- retval = cs42l42_pll_config(component); ++ switch(substream->stream) { ++ case SNDRV_PCM_STREAM_PLAYBACK: ++ val |= width << CS42L42_ASP_RX_CH_RES_SHIFT; ++ /* channel 1 on low LRCLK */ ++ snd_soc_component_update_bits(component, CS42L42_ASP_RX_DAI0_CH1_AP_RES, ++ CS42L42_ASP_RX_CH_AP_MASK | ++ CS42L42_ASP_RX_CH_RES_MASK, val); ++ /* Channel 2 on high LRCLK */ ++ val |= CS42L42_ASP_RX_CH_AP_HI << CS42L42_ASP_RX_CH_AP_SHIFT; ++ snd_soc_component_update_bits(component, CS42L42_ASP_RX_DAI0_CH2_AP_RES, ++ CS42L42_ASP_RX_CH_AP_MASK | ++ CS42L42_ASP_RX_CH_RES_MASK, val); ++ break; ++ default: ++ break; ++ } + +- return retval; ++ return cs42l42_pll_config(component); + } + + static int cs42l42_set_sysclk(struct snd_soc_dai *dai, +@@ -896,9 +893,9 @@ static int cs42l42_digital_mute(struct snd_soc_dai *dai, int mute) + return 0; + } + +-#define CS42L42_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S18_3LE | \ +- SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE | \ +- SNDRV_PCM_FMTBIT_S32_LE) ++#define CS42L42_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ ++ SNDRV_PCM_FMTBIT_S24_LE |\ ++ SNDRV_PCM_FMTBIT_S32_LE ) + + + static const struct snd_soc_dai_ops cs42l42_ops = { +diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h +index 1f0d67c95a9a..9b017b76828a 100644 +--- a/sound/soc/codecs/cs42l42.h ++++ b/sound/soc/codecs/cs42l42.h +@@ -757,7 +757,6 @@ struct cs42l42_private { + struct completion pdn_done; + u32 sclk; + u32 srate; +- u32 swidth; + u8 plug_state; + u8 hs_type; + u8 ts_inv; +-- +2.30.1 + diff --git a/queue-5.4/asoc-cs42l42-fix-mixer-volume-control.patch b/queue-5.4/asoc-cs42l42-fix-mixer-volume-control.patch new file mode 100644 index 00000000000..48981d4c328 --- /dev/null +++ b/queue-5.4/asoc-cs42l42-fix-mixer-volume-control.patch @@ -0,0 +1,44 @@ +From a755cf2f4f885407f08bb27750ddf7d38ce116a6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Mar 2021 17:34:30 +0000 +Subject: ASoC: cs42l42: Fix mixer volume control + +From: Lucas Tanure + +[ Upstream commit 72d904763ae6a8576e7ad034f9da4f0e3c44bf24 ] + +The minimum value is 0x3f (-63dB), which also is mute + +Signed-off-by: Lucas Tanure +Link: https://lore.kernel.org/r/20210305173442.195740-4-tanureal@opensource.cirrus.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/cs42l42.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c +index 26ca5acf0136..95930018a1a4 100644 +--- a/sound/soc/codecs/cs42l42.c ++++ b/sound/soc/codecs/cs42l42.c +@@ -401,7 +401,7 @@ static const struct regmap_config cs42l42_regmap = { + }; + + static DECLARE_TLV_DB_SCALE(adc_tlv, -9600, 100, false); +-static DECLARE_TLV_DB_SCALE(mixer_tlv, -6200, 100, false); ++static DECLARE_TLV_DB_SCALE(mixer_tlv, -6300, 100, true); + + static const char * const cs42l42_hpf_freq_text[] = { + "1.86Hz", "120Hz", "235Hz", "466Hz" +@@ -458,7 +458,7 @@ static const struct snd_kcontrol_new cs42l42_snd_controls[] = { + CS42L42_DAC_HPF_EN_SHIFT, true, false), + SOC_DOUBLE_R_TLV("Mixer Volume", CS42L42_MIXER_CHA_VOL, + CS42L42_MIXER_CHB_VOL, CS42L42_MIXER_CH_VOL_SHIFT, +- 0x3e, 1, mixer_tlv) ++ 0x3f, 1, mixer_tlv) + }; + + static int cs42l42_hpdrv_evt(struct snd_soc_dapm_widget *w, +-- +2.30.1 + diff --git a/queue-5.4/asoc-es8316-simplify-adc_pga_gain_tlv-table.patch b/queue-5.4/asoc-es8316-simplify-adc_pga_gain_tlv-table.patch new file mode 100644 index 00000000000..eb55394436f --- /dev/null +++ b/queue-5.4/asoc-es8316-simplify-adc_pga_gain_tlv-table.patch @@ -0,0 +1,48 @@ +From 7858f9d7948fdd438d69f4a93197de3bfcc928b5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 28 Feb 2021 17:04:41 +0100 +Subject: ASoC: es8316: Simplify adc_pga_gain_tlv table + +From: Hans de Goede + +[ Upstream commit bb18c678754ce1514100fb4c0bf6113b5af36c48 ] + +Most steps in this table are steps of 3dB (300 centi-dB), so we can +simplify the table. + +This not only reduces the amount of space it takes inside the kernel, +this also makes alsa-lib's mixer code actually accept the table, where +as before this change alsa-lib saw the "ADC PGA Gain" control as a +control without a dB scale. + +Signed-off-by: Hans de Goede +Link: https://lore.kernel.org/r/20210228160441.241110-1-hdegoede@redhat.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/es8316.c | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c +index 36eef1fb3d18..b781b28de012 100644 +--- a/sound/soc/codecs/es8316.c ++++ b/sound/soc/codecs/es8316.c +@@ -63,13 +63,8 @@ static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(adc_pga_gain_tlv, + 1, 1, TLV_DB_SCALE_ITEM(0, 0, 0), + 2, 2, TLV_DB_SCALE_ITEM(250, 0, 0), + 3, 3, TLV_DB_SCALE_ITEM(450, 0, 0), +- 4, 4, TLV_DB_SCALE_ITEM(700, 0, 0), +- 5, 5, TLV_DB_SCALE_ITEM(1000, 0, 0), +- 6, 6, TLV_DB_SCALE_ITEM(1300, 0, 0), +- 7, 7, TLV_DB_SCALE_ITEM(1600, 0, 0), +- 8, 8, TLV_DB_SCALE_ITEM(1800, 0, 0), +- 9, 9, TLV_DB_SCALE_ITEM(2100, 0, 0), +- 10, 10, TLV_DB_SCALE_ITEM(2400, 0, 0), ++ 4, 7, TLV_DB_SCALE_ITEM(700, 300, 0), ++ 8, 10, TLV_DB_SCALE_ITEM(1800, 300, 0), + ); + + static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpout_vol_tlv, +-- +2.30.1 + diff --git a/queue-5.4/asoc-rt5640-fix-dac-and-adc-vol-tlv-values-being-off.patch b/queue-5.4/asoc-rt5640-fix-dac-and-adc-vol-tlv-values-being-off.patch new file mode 100644 index 00000000000..f5ee8e9448c --- /dev/null +++ b/queue-5.4/asoc-rt5640-fix-dac-and-adc-vol-tlv-values-being-off.patch @@ -0,0 +1,54 @@ +From d6a01c4e3936d8181780b1c72399edbee908c1c2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 26 Feb 2021 15:38:13 +0100 +Subject: ASoC: rt5640: Fix dac- and adc- vol-tlv values being off by a factor + of 10 + +From: Hans de Goede + +[ Upstream commit cfa26ed1f9f885c2fd8f53ca492989d1e16d0199 ] + +The adc_vol_tlv volume-control has a range from -17.625 dB to +30 dB, +not -176.25 dB to + 300 dB. This wrong scale is esp. a problem in userspace +apps which translate the dB scale to a linear scale. With the logarithmic +dB scale being of by a factor of 10 we loose all precision in the lower +area of the range when apps translate things to a linear scale. + +E.g. the 0 dB default, which corresponds with a value of 47 of the +0 - 127 range for the control, would be shown as 0/100 in alsa-mixer. + +Since the centi-dB values used in the TLV struct cannot represent the +0.375 dB step size used by these controls, change the TLV definition +for them to specify a min and max value instead of min + stepsize. + +Note this mirrors commit 3f31f7d9b540 ("ASoC: rt5670: Fix dac- and adc- +vol-tlv values being off by a factor of 10") which made the exact same +change to the rt5670 codec driver. + +Signed-off-by: Hans de Goede +Link: https://lore.kernel.org/r/20210226143817.84287-2-hdegoede@redhat.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/rt5640.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c +index 747ca248bf10..3bc63fbcb188 100644 +--- a/sound/soc/codecs/rt5640.c ++++ b/sound/soc/codecs/rt5640.c +@@ -339,9 +339,9 @@ static bool rt5640_readable_register(struct device *dev, unsigned int reg) + } + + static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0); +-static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -65625, 375, 0); ++static const DECLARE_TLV_DB_MINMAX(dac_vol_tlv, -6562, 0); + static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0); +-static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0); ++static const DECLARE_TLV_DB_MINMAX(adc_vol_tlv, -1762, 3000); + static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0); + + /* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */ +-- +2.30.1 + diff --git a/queue-5.4/asoc-rt5651-fix-dac-and-adc-vol-tlv-values-being-off.patch b/queue-5.4/asoc-rt5651-fix-dac-and-adc-vol-tlv-values-being-off.patch new file mode 100644 index 00000000000..76f7c5875d3 --- /dev/null +++ b/queue-5.4/asoc-rt5651-fix-dac-and-adc-vol-tlv-values-being-off.patch @@ -0,0 +1,54 @@ +From 584770689bb18a22faed10b93db10fe4f424dcc0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 26 Feb 2021 15:38:14 +0100 +Subject: ASoC: rt5651: Fix dac- and adc- vol-tlv values being off by a factor + of 10 + +From: Hans de Goede + +[ Upstream commit eee51df776bd6cac10a76b2779a9fdee3f622b2b ] + +The adc_vol_tlv volume-control has a range from -17.625 dB to +30 dB, +not -176.25 dB to + 300 dB. This wrong scale is esp. a problem in userspace +apps which translate the dB scale to a linear scale. With the logarithmic +dB scale being of by a factor of 10 we loose all precision in the lower +area of the range when apps translate things to a linear scale. + +E.g. the 0 dB default, which corresponds with a value of 47 of the +0 - 127 range for the control, would be shown as 0/100 in alsa-mixer. + +Since the centi-dB values used in the TLV struct cannot represent the +0.375 dB step size used by these controls, change the TLV definition +for them to specify a min and max value instead of min + stepsize. + +Note this mirrors commit 3f31f7d9b540 ("ASoC: rt5670: Fix dac- and adc- +vol-tlv values being off by a factor of 10") which made the exact same +change to the rt5670 codec driver. + +Signed-off-by: Hans de Goede +Link: https://lore.kernel.org/r/20210226143817.84287-3-hdegoede@redhat.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/rt5651.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c +index c506c9305043..829cf552fe3e 100644 +--- a/sound/soc/codecs/rt5651.c ++++ b/sound/soc/codecs/rt5651.c +@@ -285,9 +285,9 @@ static bool rt5651_readable_register(struct device *dev, unsigned int reg) + } + + static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0); +-static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -65625, 375, 0); ++static const DECLARE_TLV_DB_MINMAX(dac_vol_tlv, -6562, 0); + static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0); +-static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0); ++static const DECLARE_TLV_DB_MINMAX(adc_vol_tlv, -1762, 3000); + static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0); + + /* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */ +-- +2.30.1 + diff --git a/queue-5.4/asoc-rt5659-update-mclk-rate-in-set_sysclk.patch b/queue-5.4/asoc-rt5659-update-mclk-rate-in-set_sysclk.patch new file mode 100644 index 00000000000..1b9580172b0 --- /dev/null +++ b/queue-5.4/asoc-rt5659-update-mclk-rate-in-set_sysclk.patch @@ -0,0 +1,49 @@ +From 97282260660e5bb15f8bfd84e58786f3b726cb8a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Mar 2021 23:01:32 +0530 +Subject: ASoC: rt5659: Update MCLK rate in set_sysclk() + +From: Sameer Pujar + +[ Upstream commit dbf54a9534350d6aebbb34f5c1c606b81a4f35dd ] + +Simple-card/audio-graph-card drivers do not handle MCLK clock when it +is specified in the codec device node. The expectation here is that, +the codec should actually own up the MCLK clock and do necessary setup +in the driver. + +Suggested-by: Mark Brown +Suggested-by: Michael Walle +Signed-off-by: Sameer Pujar +Link: https://lore.kernel.org/r/1615829492-8972-3-git-send-email-spujar@nvidia.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/rt5659.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c +index e66d08398f74..afd61599d94c 100644 +--- a/sound/soc/codecs/rt5659.c ++++ b/sound/soc/codecs/rt5659.c +@@ -3463,12 +3463,17 @@ static int rt5659_set_component_sysclk(struct snd_soc_component *component, int + { + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); + unsigned int reg_val = 0; ++ int ret; + + if (freq == rt5659->sysclk && clk_id == rt5659->sysclk_src) + return 0; + + switch (clk_id) { + case RT5659_SCLK_S_MCLK: ++ ret = clk_set_rate(rt5659->mclk, freq); ++ if (ret) ++ return ret; ++ + reg_val |= RT5659_SCLK_SRC_MCLK; + break; + case RT5659_SCLK_S_PLL1: +-- +2.30.1 + diff --git a/queue-5.4/asoc-sgtl5000-set-dap_avc_ctrl-register-to-correct-d.patch b/queue-5.4/asoc-sgtl5000-set-dap_avc_ctrl-register-to-correct-d.patch new file mode 100644 index 00000000000..743491e2d96 --- /dev/null +++ b/queue-5.4/asoc-sgtl5000-set-dap_avc_ctrl-register-to-correct-d.patch @@ -0,0 +1,72 @@ +From 54a311061c893bde3a88e2529a75f5c1e81df4bd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Feb 2021 13:33:08 -0500 +Subject: ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on + probe + +From: Benjamin Rood + +[ Upstream commit f86f58e3594fb0ab1993d833d3b9a2496f3c928c ] + +According to the SGTL5000 datasheet [1], the DAP_AVC_CTRL register has +the following bit field definitions: + +| BITS | FIELD | RW | RESET | DEFINITION | +| 15 | RSVD | RO | 0x0 | Reserved | +| 14 | RSVD | RW | 0x1 | Reserved | +| 13:12 | MAX_GAIN | RW | 0x1 | Max Gain of AVC in expander mode | +| 11:10 | RSVD | RO | 0x0 | Reserved | +| 9:8 | LBI_RESP | RW | 0x1 | Integrator Response | +| 7:6 | RSVD | RO | 0x0 | Reserved | +| 5 | HARD_LMT_EN | RW | 0x0 | Enable hard limiter mode | +| 4:1 | RSVD | RO | 0x0 | Reserved | +| 0 | EN | RW | 0x0 | Enable/Disable AVC | + +The original default value written to the DAP_AVC_CTRL register during +sgtl5000_i2c_probe() was 0x0510. This would incorrectly write values to +bits 4 and 10, which are defined as RESERVED. It would also not set +bits 12 and 14 to their correct RESET values of 0x1, and instead set +them to 0x0. While the DAP_AVC module is effectively disabled because +the EN bit is 0, this default value is still writing invalid values to +registers that are marked as read-only and RESERVED as well as not +setting bits 12 and 14 to their correct default values as defined by the +datasheet. + +The correct value that should be written to the DAP_AVC_CTRL register is +0x5100, which configures the register bits to the default values defined +by the datasheet, and prevents any writes to bits defined as +'read-only'. Generally speaking, it is best practice to NOT attempt to +write values to registers/bits defined as RESERVED, as it generally +produces unwanted/undefined behavior, or errors. + +Also, all credit for this patch should go to my colleague Dan MacDonald + for finding this error in the first +place. + +[1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf + +Signed-off-by: Benjamin Rood +Reviewed-by: Fabio Estevam +Link: https://lore.kernel.org/r/20210219183308.GA2117@ubuntu-dev +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/sgtl5000.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c +index f5b59305c957..8a1e485982d8 100644 +--- a/sound/soc/codecs/sgtl5000.c ++++ b/sound/soc/codecs/sgtl5000.c +@@ -71,7 +71,7 @@ static const struct reg_default sgtl5000_reg_defaults[] = { + { SGTL5000_DAP_EQ_BASS_BAND4, 0x002f }, + { SGTL5000_DAP_MAIN_CHAN, 0x8000 }, + { SGTL5000_DAP_MIX_CHAN, 0x0000 }, +- { SGTL5000_DAP_AVC_CTRL, 0x0510 }, ++ { SGTL5000_DAP_AVC_CTRL, 0x5100 }, + { SGTL5000_DAP_AVC_THRESHOLD, 0x1473 }, + { SGTL5000_DAP_AVC_ATTACK, 0x0028 }, + { SGTL5000_DAP_AVC_DECAY, 0x0050 }, +-- +2.30.1 + diff --git a/queue-5.4/ext4-do-not-iput-inode-under-running-transaction-in-.patch b/queue-5.4/ext4-do-not-iput-inode-under-running-transaction-in-.patch new file mode 100644 index 00000000000..22f365a3baf --- /dev/null +++ b/queue-5.4/ext4-do-not-iput-inode-under-running-transaction-in-.patch @@ -0,0 +1,90 @@ +From 35c788d857b1eb64f128f3014d1551c9c4534659 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Mar 2021 21:17:03 +0800 +Subject: ext4: do not iput inode under running transaction in ext4_rename() + +From: zhangyi (F) + +[ Upstream commit 5dccdc5a1916d4266edd251f20bbbb113a5c495f ] + +In ext4_rename(), when RENAME_WHITEOUT failed to add new entry into +directory, it ends up dropping new created whiteout inode under the +running transaction. After commit <9b88f9fb0d2> ("ext4: Do not iput inode +under running transaction"), we follow the assumptions that evict() does +not get called from a transaction context but in ext4_rename() it breaks +this suggestion. Although it's not a real problem, better to obey it, so +this patch add inode to orphan list and stop transaction before final +iput(). + +Signed-off-by: zhangyi (F) +Link: https://lore.kernel.org/r/20210303131703.330415-2-yi.zhang@huawei.com +Signed-off-by: Theodore Ts'o +Signed-off-by: Sasha Levin +--- + fs/ext4/namei.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c +index e992a9f15671..4c37abe76851 100644 +--- a/fs/ext4/namei.c ++++ b/fs/ext4/namei.c +@@ -3731,14 +3731,14 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, + */ + retval = -ENOENT; + if (!old.bh || le32_to_cpu(old.de->inode) != old.inode->i_ino) +- goto end_rename; ++ goto release_bh; + + new.bh = ext4_find_entry(new.dir, &new.dentry->d_name, + &new.de, &new.inlined); + if (IS_ERR(new.bh)) { + retval = PTR_ERR(new.bh); + new.bh = NULL; +- goto end_rename; ++ goto release_bh; + } + if (new.bh) { + if (!new.inode) { +@@ -3755,15 +3755,13 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, + handle = ext4_journal_start(old.dir, EXT4_HT_DIR, credits); + if (IS_ERR(handle)) { + retval = PTR_ERR(handle); +- handle = NULL; +- goto end_rename; ++ goto release_bh; + } + } else { + whiteout = ext4_whiteout_for_rename(&old, credits, &handle); + if (IS_ERR(whiteout)) { + retval = PTR_ERR(whiteout); +- whiteout = NULL; +- goto end_rename; ++ goto release_bh; + } + } + +@@ -3871,16 +3869,18 @@ end_rename: + ext4_resetent(handle, &old, + old.inode->i_ino, old_file_type); + drop_nlink(whiteout); ++ ext4_orphan_add(handle, whiteout); + } + unlock_new_inode(whiteout); ++ ext4_journal_stop(handle); + iput(whiteout); +- ++ } else { ++ ext4_journal_stop(handle); + } ++release_bh: + brelse(old.dir_bh); + brelse(old.bh); + brelse(new.bh); +- if (handle) +- ext4_journal_stop(handle); + return retval; + } + +-- +2.30.1 + diff --git a/queue-5.4/ext4-fix-bh-ref-count-on-error-paths.patch b/queue-5.4/ext4-fix-bh-ref-count-on-error-paths.patch new file mode 100644 index 00000000000..bf9e03e876f --- /dev/null +++ b/queue-5.4/ext4-fix-bh-ref-count-on-error-paths.patch @@ -0,0 +1,43 @@ +From 4b03e576f915c5d941be3eb3eddfe153f05c3135 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Mar 2021 17:42:31 +0800 +Subject: ext4: fix bh ref count on error paths + +From: Zhaolong Zhang + +[ Upstream commit c915fb80eaa6194fa9bd0a4487705cd5b0dda2f1 ] + +__ext4_journalled_writepage should drop bhs' ref count on error paths + +Signed-off-by: Zhaolong Zhang +Link: https://lore.kernel.org/r/1614678151-70481-1-git-send-email-zhangzl2013@126.com +Signed-off-by: Theodore Ts'o +Signed-off-by: Sasha Levin +--- + fs/ext4/inode.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c +index efce97b938b7..1429d01d836b 100644 +--- a/fs/ext4/inode.c ++++ b/fs/ext4/inode.c +@@ -2076,13 +2076,13 @@ static int __ext4_journalled_writepage(struct page *page, + if (!ret) + ret = err; + +- if (!ext4_has_inline_data(inode)) +- ext4_walk_page_buffers(NULL, page_bufs, 0, len, +- NULL, bput_one); + ext4_set_inode_state(inode, EXT4_STATE_JDATA); + out: + unlock_page(page); + out_no_pagelock: ++ if (!inline_data && page_bufs) ++ ext4_walk_page_buffers(NULL, page_bufs, 0, len, ++ NULL, bput_one); + brelse(inode_bh); + return ret; + } +-- +2.30.1 + diff --git a/queue-5.4/ext4-shrink-race-window-in-ext4_should_retry_alloc.patch b/queue-5.4/ext4-shrink-race-window-in-ext4_should_retry_alloc.patch new file mode 100644 index 00000000000..87898d6b1d6 --- /dev/null +++ b/queue-5.4/ext4-shrink-race-window-in-ext4_should_retry_alloc.patch @@ -0,0 +1,199 @@ +From f0ded26fe5e64d76e7f548c3605a74bc8f3881f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 18 Feb 2021 10:11:32 -0500 +Subject: ext4: shrink race window in ext4_should_retry_alloc() + +From: Eric Whitney + +[ Upstream commit efc61345274d6c7a46a0570efbc916fcbe3e927b ] + +When generic/371 is run on kvm-xfstests using 5.10 and 5.11 kernels, it +fails at significant rates on the two test scenarios that disable +delayed allocation (ext3conv and data_journal) and force actual block +allocation for the fallocate and pwrite functions in the test. The +failure rate on 5.10 for both ext3conv and data_journal on one test +system typically runs about 85%. On 5.11, the failure rate on ext3conv +sometimes drops to as low as 1% while the rate on data_journal +increases to nearly 100%. + +The observed failures are largely due to ext4_should_retry_alloc() +cutting off block allocation retries when s_mb_free_pending (used to +indicate that a transaction in progress will free blocks) is 0. +However, free space is usually available when this occurs during runs +of generic/371. It appears that a thread attempting to allocate +blocks is just missing transaction commits in other threads that +increase the free cluster count and reset s_mb_free_pending while +the allocating thread isn't running. Explicitly testing for free space +availability avoids this race. + +The current code uses a post-increment operator in the conditional +expression that determines whether the retry limit has been exceeded. +This means that the conditional expression uses the value of the +retry counter before it's increased, resulting in an extra retry cycle. +The current code actually retries twice before hitting its retry limit +rather than once. + +Increasing the retry limit to 3 from the current actual maximum retry +count of 2 in combination with the change described above reduces the +observed failure rate to less that 0.1% on both ext3conv and +data_journal with what should be limited impact on users sensitive to +the overhead caused by retries. + +A per filesystem percpu counter exported via sysfs is added to allow +users or developers to track the number of times the retry limit is +exceeded without resorting to debugging methods. This should provide +some insight into worst case retry behavior. + +Signed-off-by: Eric Whitney +Link: https://lore.kernel.org/r/20210218151132.19678-1-enwlinux@gmail.com +Signed-off-by: Theodore Ts'o +Signed-off-by: Sasha Levin +--- + fs/ext4/balloc.c | 38 ++++++++++++++++++++++++++------------ + fs/ext4/ext4.h | 1 + + fs/ext4/super.c | 5 +++++ + fs/ext4/sysfs.c | 7 +++++++ + 4 files changed, 39 insertions(+), 12 deletions(-) + +diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c +index 5aba67a504cf..031ff3f19018 100644 +--- a/fs/ext4/balloc.c ++++ b/fs/ext4/balloc.c +@@ -612,27 +612,41 @@ int ext4_claim_free_clusters(struct ext4_sb_info *sbi, + + /** + * ext4_should_retry_alloc() - check if a block allocation should be retried +- * @sb: super block +- * @retries: number of attemps has been made ++ * @sb: superblock ++ * @retries: number of retry attempts made so far + * +- * ext4_should_retry_alloc() is called when ENOSPC is returned, and if +- * it is profitable to retry the operation, this function will wait +- * for the current or committing transaction to complete, and then +- * return TRUE. We will only retry once. ++ * ext4_should_retry_alloc() is called when ENOSPC is returned while ++ * attempting to allocate blocks. If there's an indication that a pending ++ * journal transaction might free some space and allow another attempt to ++ * succeed, this function will wait for the current or committing transaction ++ * to complete and then return TRUE. + */ + int ext4_should_retry_alloc(struct super_block *sb, int *retries) + { +- if (!ext4_has_free_clusters(EXT4_SB(sb), 1, 0) || +- (*retries)++ > 1 || +- !EXT4_SB(sb)->s_journal) ++ struct ext4_sb_info *sbi = EXT4_SB(sb); ++ ++ if (!sbi->s_journal) + return 0; + +- smp_mb(); +- if (EXT4_SB(sb)->s_mb_free_pending == 0) ++ if (++(*retries) > 3) { ++ percpu_counter_inc(&sbi->s_sra_exceeded_retry_limit); + return 0; ++ } + ++ /* ++ * if there's no indication that blocks are about to be freed it's ++ * possible we just missed a transaction commit that did so ++ */ ++ smp_mb(); ++ if (sbi->s_mb_free_pending == 0) ++ return ext4_has_free_clusters(sbi, 1, 0); ++ ++ /* ++ * it's possible we've just missed a transaction commit here, ++ * so ignore the returned status ++ */ + jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id); +- jbd2_journal_force_commit_nested(EXT4_SB(sb)->s_journal); ++ (void) jbd2_journal_force_commit_nested(sbi->s_journal); + return 1; + } + +diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h +index 1c558b554788..bf3eaa903033 100644 +--- a/fs/ext4/ext4.h ++++ b/fs/ext4/ext4.h +@@ -1420,6 +1420,7 @@ struct ext4_sb_info { + struct percpu_counter s_freeinodes_counter; + struct percpu_counter s_dirs_counter; + struct percpu_counter s_dirtyclusters_counter; ++ struct percpu_counter s_sra_exceeded_retry_limit; + struct blockgroup_lock *s_blockgroup_lock; + struct proc_dir_entry *s_proc; + struct kobject s_kobj; +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index 06568467b0c2..2ecf4594a20d 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1017,6 +1017,7 @@ static void ext4_put_super(struct super_block *sb) + percpu_counter_destroy(&sbi->s_freeinodes_counter); + percpu_counter_destroy(&sbi->s_dirs_counter); + percpu_counter_destroy(&sbi->s_dirtyclusters_counter); ++ percpu_counter_destroy(&sbi->s_sra_exceeded_retry_limit); + percpu_free_rwsem(&sbi->s_writepages_rwsem); + #ifdef CONFIG_QUOTA + for (i = 0; i < EXT4_MAXQUOTAS; i++) +@@ -4597,6 +4598,9 @@ no_journal: + if (!err) + err = percpu_counter_init(&sbi->s_dirtyclusters_counter, 0, + GFP_KERNEL); ++ if (!err) ++ err = percpu_counter_init(&sbi->s_sra_exceeded_retry_limit, 0, ++ GFP_KERNEL); + if (!err) + err = percpu_init_rwsem(&sbi->s_writepages_rwsem); + +@@ -4699,6 +4703,7 @@ failed_mount6: + percpu_counter_destroy(&sbi->s_freeinodes_counter); + percpu_counter_destroy(&sbi->s_dirs_counter); + percpu_counter_destroy(&sbi->s_dirtyclusters_counter); ++ percpu_counter_destroy(&sbi->s_sra_exceeded_retry_limit); + percpu_free_rwsem(&sbi->s_writepages_rwsem); + failed_mount5: + ext4_ext_release(sb); +diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c +index eb1efad0e20a..9394360ff137 100644 +--- a/fs/ext4/sysfs.c ++++ b/fs/ext4/sysfs.c +@@ -23,6 +23,7 @@ typedef enum { + attr_session_write_kbytes, + attr_lifetime_write_kbytes, + attr_reserved_clusters, ++ attr_sra_exceeded_retry_limit, + attr_inode_readahead, + attr_trigger_test_error, + attr_first_error_time, +@@ -176,6 +177,7 @@ EXT4_ATTR_FUNC(delayed_allocation_blocks, 0444); + EXT4_ATTR_FUNC(session_write_kbytes, 0444); + EXT4_ATTR_FUNC(lifetime_write_kbytes, 0444); + EXT4_ATTR_FUNC(reserved_clusters, 0644); ++EXT4_ATTR_FUNC(sra_exceeded_retry_limit, 0444); + + EXT4_ATTR_OFFSET(inode_readahead_blks, 0644, inode_readahead, + ext4_sb_info, s_inode_readahead_blks); +@@ -207,6 +209,7 @@ static struct attribute *ext4_attrs[] = { + ATTR_LIST(session_write_kbytes), + ATTR_LIST(lifetime_write_kbytes), + ATTR_LIST(reserved_clusters), ++ ATTR_LIST(sra_exceeded_retry_limit), + ATTR_LIST(inode_readahead_blks), + ATTR_LIST(inode_goal), + ATTR_LIST(mb_stats), +@@ -308,6 +311,10 @@ static ssize_t ext4_attr_show(struct kobject *kobj, + return snprintf(buf, PAGE_SIZE, "%llu\n", + (unsigned long long) + atomic64_read(&sbi->s_resv_clusters)); ++ case attr_sra_exceeded_retry_limit: ++ return snprintf(buf, PAGE_SIZE, "%llu\n", ++ (unsigned long long) ++ percpu_counter_sum(&sbi->s_sra_exceeded_retry_limit)); + case attr_inode_readahead: + case attr_pointer_ui: + if (!ptr) +-- +2.30.1 + diff --git a/queue-5.4/fs-nfsd-fix-kconfig-dependency-warning-for-nfsd_v4.patch b/queue-5.4/fs-nfsd-fix-kconfig-dependency-warning-for-nfsd_v4.patch new file mode 100644 index 00000000000..fd0b48c9963 --- /dev/null +++ b/queue-5.4/fs-nfsd-fix-kconfig-dependency-warning-for-nfsd_v4.patch @@ -0,0 +1,48 @@ +From b73169af2719510e239393b6ed5b27044e7daa3f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Feb 2021 16:56:10 -0500 +Subject: fs: nfsd: fix kconfig dependency warning for NFSD_V4 + +From: Julian Braha + +[ Upstream commit 7005227369079963d25fb2d5d736d0feb2c44cf6 ] + +When NFSD_V4 is enabled and CRYPTO is disabled, +Kbuild gives the following warning: + +WARNING: unmet direct dependencies detected for CRYPTO_SHA256 + Depends on [n]: CRYPTO [=n] + Selected by [y]: + - NFSD_V4 [=y] && NETWORK_FILESYSTEMS [=y] && NFSD [=y] && PROC_FS [=y] + +WARNING: unmet direct dependencies detected for CRYPTO_MD5 + Depends on [n]: CRYPTO [=n] + Selected by [y]: + - NFSD_V4 [=y] && NETWORK_FILESYSTEMS [=y] && NFSD [=y] && PROC_FS [=y] + +This is because NFSD_V4 selects CRYPTO_MD5 and CRYPTO_SHA256, +without depending on or selecting CRYPTO, despite those config options +being subordinate to CRYPTO. + +Signed-off-by: Julian Braha +Signed-off-by: Chuck Lever +Signed-off-by: Sasha Levin +--- + fs/nfsd/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig +index f2f81561ebb6..4d6e71335bce 100644 +--- a/fs/nfsd/Kconfig ++++ b/fs/nfsd/Kconfig +@@ -73,6 +73,7 @@ config NFSD_V4 + select NFSD_V3 + select FS_POSIX_ACL + select SUNRPC_GSS ++ select CRYPTO + select CRYPTO_MD5 + select CRYPTO_SHA256 + select GRACE_PERIOD +-- +2.30.1 + diff --git a/queue-5.4/iomap-fix-negative-assignment-to-unsigned-sis-pages-.patch b/queue-5.4/iomap-fix-negative-assignment-to-unsigned-sis-pages-.patch new file mode 100644 index 00000000000..8e46ff3bc31 --- /dev/null +++ b/queue-5.4/iomap-fix-negative-assignment-to-unsigned-sis-pages-.patch @@ -0,0 +1,91 @@ +From a7340a96639a0b1306318571adf9ea5c42a7f6dd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Mar 2021 09:29:11 -0800 +Subject: iomap: Fix negative assignment to unsigned sis->pages in + iomap_swapfile_activate + +From: Ritesh Harjani + +[ Upstream commit 5808fecc572391867fcd929662b29c12e6d08d81 ] + +In case if isi.nr_pages is 0, we are making sis->pages (which is +unsigned int) a huge value in iomap_swapfile_activate() by assigning -1. +This could cause a kernel crash in kernel v4.18 (with below signature). +Or could lead to unknown issues on latest kernel if the fake big swap gets +used. + +Fix this issue by returning -EINVAL in case of nr_pages is 0, since it +is anyway a invalid swapfile. Looks like this issue will be hit when +we have pagesize < blocksize type of configuration. + +I was able to hit the issue in case of a tiny swap file with below +test script. +https://raw.githubusercontent.com/riteshharjani/LinuxStudy/master/scripts/swap-issue.sh + +kernel crash analysis on v4.18 +============================== +On v4.18 kernel, it causes a kernel panic, since sis->pages becomes +a huge value and isi.nr_extents is 0. When 0 is returned it is +considered as a swapfile over NFS and SWP_FILE is set (sis->flags |= SWP_FILE). +Then when swapoff was getting called it was calling a_ops->swap_deactivate() +if (sis->flags & SWP_FILE) is true. Since a_ops->swap_deactivate() is +NULL in case of XFS, it causes below panic. + +Panic signature on v4.18 kernel: +======================================= +root@qemu:/home/qemu# [ 8291.723351] XFS (loop2): Unmounting Filesystem +[ 8292.123104] XFS (loop2): Mounting V5 Filesystem +[ 8292.132451] XFS (loop2): Ending clean mount +[ 8292.263362] Adding 4294967232k swap on /mnt1/test/swapfile. Priority:-2 extents:1 across:274877906880k +[ 8292.277834] Unable to handle kernel paging request for instruction fetch +[ 8292.278677] Faulting instruction address: 0x00000000 +cpu 0x19: Vector: 400 (Instruction Access) at [c0000009dd5b7ad0] + pc: 0000000000000000 + lr: c0000000003eb9dc: destroy_swap_extents+0xfc/0x120 + sp: c0000009dd5b7d50 + msr: 8000000040009033 + current = 0xc0000009b6710080 + paca = 0xc00000003ffcb280 irqmask: 0x03 irq_happened: 0x01 + pid = 5604, comm = swapoff +Linux version 4.18.0 (riteshh@xxxxxxx) (gcc version 8.4.0 (Ubuntu 8.4.0-1ubuntu1~18.04)) #57 SMP Wed Mar 3 01:33:04 CST 2021 +enter ? for help +[link register ] c0000000003eb9dc destroy_swap_extents+0xfc/0x120 +[c0000009dd5b7d50] c0000000025a7058 proc_poll_event+0x0/0x4 (unreliable) +[c0000009dd5b7da0] c0000000003f0498 sys_swapoff+0x3f8/0x910 +[c0000009dd5b7e30] c00000000000bbe4 system_call+0x5c/0x70 +Exception: c01 (System Call) at 00007ffff7d208d8 + +Signed-off-by: Ritesh Harjani +[djwong: rework the comment to provide more details] +Reviewed-by: Darrick J. Wong +Signed-off-by: Darrick J. Wong +Reviewed-by: Christoph Hellwig +Signed-off-by: Sasha Levin +--- + fs/iomap/swapfile.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/fs/iomap/swapfile.c b/fs/iomap/swapfile.c +index 152a230f668d..bd0cc3dcc980 100644 +--- a/fs/iomap/swapfile.c ++++ b/fs/iomap/swapfile.c +@@ -169,6 +169,16 @@ int iomap_swapfile_activate(struct swap_info_struct *sis, + return ret; + } + ++ /* ++ * If this swapfile doesn't contain even a single page-aligned ++ * contiguous range of blocks, reject this useless swapfile to ++ * prevent confusion later on. ++ */ ++ if (isi.nr_pages == 0) { ++ pr_warn("swapon: Cannot find a single usable page in file.\n"); ++ return -EINVAL; ++ } ++ + *pagespan = 1 + isi.highest_ppage - isi.lowest_ppage; + sis->max = isi.nr_pages; + sis->pages = isi.nr_pages - 1; +-- +2.30.1 + diff --git a/queue-5.4/locking-ww_mutex-simplify-use_ww_ctx-ww_ctx-handling.patch b/queue-5.4/locking-ww_mutex-simplify-use_ww_ctx-ww_ctx-handling.patch new file mode 100644 index 00000000000..ba65c15d3a3 --- /dev/null +++ b/queue-5.4/locking-ww_mutex-simplify-use_ww_ctx-ww_ctx-handling.patch @@ -0,0 +1,138 @@ +From 76134b226022abaeab210b81684df37ad6506b2f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Mar 2021 11:31:16 -0400 +Subject: locking/ww_mutex: Simplify use_ww_ctx & ww_ctx handling + +From: Waiman Long + +[ Upstream commit 5de2055d31ea88fd9ae9709ac95c372a505a60fa ] + +The use_ww_ctx flag is passed to mutex_optimistic_spin(), but the +function doesn't use it. The frequent use of the (use_ww_ctx && ww_ctx) +combination is repetitive. + +In fact, ww_ctx should not be used at all if !use_ww_ctx. Simplify +ww_mutex code by dropping use_ww_ctx from mutex_optimistic_spin() an +clear ww_ctx if !use_ww_ctx. In this way, we can replace (use_ww_ctx && +ww_ctx) by just (ww_ctx). + +Signed-off-by: Waiman Long +Signed-off-by: Ingo Molnar +Acked-by: Davidlohr Bueso +Link: https://lore.kernel.org/r/20210316153119.13802-2-longman@redhat.com +Signed-off-by: Sasha Levin +--- + kernel/locking/mutex.c | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c +index 468a9b8422e3..07a9f9f46e03 100644 +--- a/kernel/locking/mutex.c ++++ b/kernel/locking/mutex.c +@@ -636,7 +636,7 @@ static inline int mutex_can_spin_on_owner(struct mutex *lock) + */ + static __always_inline bool + mutex_optimistic_spin(struct mutex *lock, struct ww_acquire_ctx *ww_ctx, +- const bool use_ww_ctx, struct mutex_waiter *waiter) ++ struct mutex_waiter *waiter) + { + if (!waiter) { + /* +@@ -712,7 +712,7 @@ fail: + #else + static __always_inline bool + mutex_optimistic_spin(struct mutex *lock, struct ww_acquire_ctx *ww_ctx, +- const bool use_ww_ctx, struct mutex_waiter *waiter) ++ struct mutex_waiter *waiter) + { + return false; + } +@@ -932,6 +932,9 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + struct ww_mutex *ww; + int ret; + ++ if (!use_ww_ctx) ++ ww_ctx = NULL; ++ + might_sleep(); + + #ifdef CONFIG_DEBUG_MUTEXES +@@ -939,7 +942,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + #endif + + ww = container_of(lock, struct ww_mutex, base); +- if (use_ww_ctx && ww_ctx) { ++ if (ww_ctx) { + if (unlikely(ww_ctx == READ_ONCE(ww->ctx))) + return -EALREADY; + +@@ -956,10 +959,10 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + mutex_acquire_nest(&lock->dep_map, subclass, 0, nest_lock, ip); + + if (__mutex_trylock(lock) || +- mutex_optimistic_spin(lock, ww_ctx, use_ww_ctx, NULL)) { ++ mutex_optimistic_spin(lock, ww_ctx, NULL)) { + /* got the lock, yay! */ + lock_acquired(&lock->dep_map, ip); +- if (use_ww_ctx && ww_ctx) ++ if (ww_ctx) + ww_mutex_set_context_fastpath(ww, ww_ctx); + preempt_enable(); + return 0; +@@ -970,7 +973,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + * After waiting to acquire the wait_lock, try again. + */ + if (__mutex_trylock(lock)) { +- if (use_ww_ctx && ww_ctx) ++ if (ww_ctx) + __ww_mutex_check_waiters(lock, ww_ctx); + + goto skip_wait; +@@ -1023,7 +1026,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + goto err; + } + +- if (use_ww_ctx && ww_ctx) { ++ if (ww_ctx) { + ret = __ww_mutex_check_kill(lock, &waiter, ww_ctx); + if (ret) + goto err; +@@ -1036,7 +1039,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + * ww_mutex needs to always recheck its position since its waiter + * list is not FIFO ordered. + */ +- if ((use_ww_ctx && ww_ctx) || !first) { ++ if (ww_ctx || !first) { + first = __mutex_waiter_is_first(lock, &waiter); + if (first) + __mutex_set_flag(lock, MUTEX_FLAG_HANDOFF); +@@ -1049,7 +1052,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + * or we must see its unlock and acquire. + */ + if (__mutex_trylock(lock) || +- (first && mutex_optimistic_spin(lock, ww_ctx, use_ww_ctx, &waiter))) ++ (first && mutex_optimistic_spin(lock, ww_ctx, &waiter))) + break; + + spin_lock(&lock->wait_lock); +@@ -1058,7 +1061,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, + acquired: + __set_current_state(TASK_RUNNING); + +- if (use_ww_ctx && ww_ctx) { ++ if (ww_ctx) { + /* + * Wound-Wait; we stole the lock (!first_waiter), check the + * waiters as anyone might want to wound us. +@@ -1078,7 +1081,7 @@ skip_wait: + /* got the lock - cleanup and rejoice! */ + lock_acquired(&lock->dep_map, ip); + +- if (use_ww_ctx && ww_ctx) ++ if (ww_ctx) + ww_mutex_lock_acquired(ww, ww_ctx); + + spin_unlock(&lock->wait_lock); +-- +2.30.1 + diff --git a/queue-5.4/module-avoid-goto-s-in-module_sig_check.patch b/queue-5.4/module-avoid-goto-s-in-module_sig_check.patch new file mode 100644 index 00000000000..6803fcc81b6 --- /dev/null +++ b/queue-5.4/module-avoid-goto-s-in-module_sig_check.patch @@ -0,0 +1,66 @@ +From 7a9bbc844ac1e30feab9d61b16c2a86997bc9f65 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 31 Oct 2020 23:09:31 +0300 +Subject: module: avoid *goto*s in module_sig_check() + +From: Sergey Shtylyov + +[ Upstream commit 10ccd1abb808599a6dc7c9389560016ea3568085 ] + +Let's move the common handling of the non-fatal errors after the *switch* +statement -- this avoids *goto*s inside that *switch*... + +Suggested-by: Joe Perches +Reviewed-by: Miroslav Benes +Signed-off-by: Sergey Shtylyov +Signed-off-by: Jessica Yu +Signed-off-by: Sasha Levin +--- + kernel/module.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/kernel/module.c b/kernel/module.c +index 9fe3e9b85348..8d1def62a415 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2909,20 +2909,13 @@ static int module_sig_check(struct load_info *info, int flags) + */ + case -ENODATA: + reason = "unsigned module"; +- goto decide; ++ break; + case -ENOPKG: + reason = "module with unsupported crypto"; +- goto decide; ++ break; + case -ENOKEY: + reason = "module with unavailable key"; +- decide: +- if (is_module_sig_enforced()) { +- pr_notice("%s: loading of %s is rejected\n", +- info->name, reason); +- return -EKEYREJECTED; +- } +- +- return security_locked_down(LOCKDOWN_MODULE_SIGNATURE); ++ break; + + /* All other errors are fatal, including nomem, unparseable + * signatures and signature check failures - even if signatures +@@ -2931,6 +2924,13 @@ static int module_sig_check(struct load_info *info, int flags) + default: + return err; + } ++ ++ if (is_module_sig_enforced()) { ++ pr_notice("%s: loading of %s is rejected\n", info->name, reason); ++ return -EKEYREJECTED; ++ } ++ ++ return security_locked_down(LOCKDOWN_MODULE_SIGNATURE); + } + #else /* !CONFIG_MODULE_SIG */ + static int module_sig_check(struct load_info *info, int flags) +-- +2.30.1 + diff --git a/queue-5.4/module-harden-elf-info-handling.patch b/queue-5.4/module-harden-elf-info-handling.patch new file mode 100644 index 00000000000..d30cb758393 --- /dev/null +++ b/queue-5.4/module-harden-elf-info-handling.patch @@ -0,0 +1,295 @@ +From bfdb8629c5bc11d722511712204b27c96c843d40 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Jan 2021 22:21:46 +0000 +Subject: module: harden ELF info handling + +From: Frank van der Linden + +[ Upstream commit ec2a29593c83ed71a7f16e3243941ebfcf75fdf6 ] + +5fdc7db644 ("module: setup load info before module_sig_check()") +moved the ELF setup, so that it was done before the signature +check. This made the module name available to signature error +messages. + +However, the checks for ELF correctness in setup_load_info +are not sufficient to prevent bad memory references due to +corrupted offset fields, indices, etc. + +So, there's a regression in behavior here: a corrupt and unsigned +(or badly signed) module, which might previously have been rejected +immediately, can now cause an oops/crash. + +Harden ELF handling for module loading by doing the following: + +- Move the signature check back up so that it comes before ELF + initialization. It's best to do the signature check to see + if we can trust the module, before using the ELF structures + inside it. This also makes checks against info->len + more accurate again, as this field will be reduced by the + length of the signature in mod_check_sig(). + + The module name is now once again not available for error + messages during the signature check, but that seems like + a fair tradeoff. + +- Check if sections have offset / size fields that at least don't + exceed the length of the module. + +- Check if sections have section name offsets that don't fall + outside the section name table. + +- Add a few other sanity checks against invalid section indices, + etc. + +This is not an exhaustive consistency check, but the idea is to +at least get through the signature and blacklist checks without +crashing because of corrupted ELF info, and to error out gracefully +for most issues that would have caused problems later on. + +Fixes: 5fdc7db6448a ("module: setup load info before module_sig_check()") +Signed-off-by: Frank van der Linden +Signed-off-by: Jessica Yu +Signed-off-by: Sasha Levin +--- + kernel/module.c | 143 +++++++++++++++++++++++++++++++++----- + kernel/module_signature.c | 2 +- + kernel/module_signing.c | 2 +- + 3 files changed, 127 insertions(+), 20 deletions(-) + +diff --git a/kernel/module.c b/kernel/module.c +index 8d1def62a415..c60559b5bf10 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2926,7 +2926,7 @@ static int module_sig_check(struct load_info *info, int flags) + } + + if (is_module_sig_enforced()) { +- pr_notice("%s: loading of %s is rejected\n", info->name, reason); ++ pr_notice("Loading of %s is rejected\n", reason); + return -EKEYREJECTED; + } + +@@ -2939,9 +2939,33 @@ static int module_sig_check(struct load_info *info, int flags) + } + #endif /* !CONFIG_MODULE_SIG */ + +-/* Sanity checks against invalid binaries, wrong arch, weird elf version. */ +-static int elf_header_check(struct load_info *info) ++static int validate_section_offset(struct load_info *info, Elf_Shdr *shdr) + { ++ unsigned long secend; ++ ++ /* ++ * Check for both overflow and offset/size being ++ * too large. ++ */ ++ secend = shdr->sh_offset + shdr->sh_size; ++ if (secend < shdr->sh_offset || secend > info->len) ++ return -ENOEXEC; ++ ++ return 0; ++} ++ ++/* ++ * Sanity checks against invalid binaries, wrong arch, weird elf version. ++ * ++ * Also do basic validity checks against section offsets and sizes, the ++ * section name string table, and the indices used for it (sh_name). ++ */ ++static int elf_validity_check(struct load_info *info) ++{ ++ unsigned int i; ++ Elf_Shdr *shdr, *strhdr; ++ int err; ++ + if (info->len < sizeof(*(info->hdr))) + return -ENOEXEC; + +@@ -2951,11 +2975,78 @@ static int elf_header_check(struct load_info *info) + || info->hdr->e_shentsize != sizeof(Elf_Shdr)) + return -ENOEXEC; + ++ /* ++ * e_shnum is 16 bits, and sizeof(Elf_Shdr) is ++ * known and small. So e_shnum * sizeof(Elf_Shdr) ++ * will not overflow unsigned long on any platform. ++ */ + if (info->hdr->e_shoff >= info->len + || (info->hdr->e_shnum * sizeof(Elf_Shdr) > + info->len - info->hdr->e_shoff)) + return -ENOEXEC; + ++ info->sechdrs = (void *)info->hdr + info->hdr->e_shoff; ++ ++ /* ++ * Verify if the section name table index is valid. ++ */ ++ if (info->hdr->e_shstrndx == SHN_UNDEF ++ || info->hdr->e_shstrndx >= info->hdr->e_shnum) ++ return -ENOEXEC; ++ ++ strhdr = &info->sechdrs[info->hdr->e_shstrndx]; ++ err = validate_section_offset(info, strhdr); ++ if (err < 0) ++ return err; ++ ++ /* ++ * The section name table must be NUL-terminated, as required ++ * by the spec. This makes strcmp and pr_* calls that access ++ * strings in the section safe. ++ */ ++ info->secstrings = (void *)info->hdr + strhdr->sh_offset; ++ if (info->secstrings[strhdr->sh_size - 1] != '\0') ++ return -ENOEXEC; ++ ++ /* ++ * The code assumes that section 0 has a length of zero and ++ * an addr of zero, so check for it. ++ */ ++ if (info->sechdrs[0].sh_type != SHT_NULL ++ || info->sechdrs[0].sh_size != 0 ++ || info->sechdrs[0].sh_addr != 0) ++ return -ENOEXEC; ++ ++ for (i = 1; i < info->hdr->e_shnum; i++) { ++ shdr = &info->sechdrs[i]; ++ switch (shdr->sh_type) { ++ case SHT_NULL: ++ case SHT_NOBITS: ++ continue; ++ case SHT_SYMTAB: ++ if (shdr->sh_link == SHN_UNDEF ++ || shdr->sh_link >= info->hdr->e_shnum) ++ return -ENOEXEC; ++ fallthrough; ++ default: ++ err = validate_section_offset(info, shdr); ++ if (err < 0) { ++ pr_err("Invalid ELF section in module (section %u type %u)\n", ++ i, shdr->sh_type); ++ return err; ++ } ++ ++ if (shdr->sh_flags & SHF_ALLOC) { ++ if (shdr->sh_name >= strhdr->sh_size) { ++ pr_err("Invalid ELF section name in module (section %u type %u)\n", ++ i, shdr->sh_type); ++ return -ENOEXEC; ++ } ++ } ++ break; ++ } ++ } ++ + return 0; + } + +@@ -3052,11 +3143,6 @@ static int rewrite_section_headers(struct load_info *info, int flags) + + for (i = 1; i < info->hdr->e_shnum; i++) { + Elf_Shdr *shdr = &info->sechdrs[i]; +- if (shdr->sh_type != SHT_NOBITS +- && info->len < shdr->sh_offset + shdr->sh_size) { +- pr_err("Module len %lu truncated\n", info->len); +- return -ENOEXEC; +- } + + /* Mark all sections sh_addr with their address in the + temporary image. */ +@@ -3088,11 +3174,6 @@ static int setup_load_info(struct load_info *info, int flags) + { + unsigned int i; + +- /* Set up the convenience variables */ +- info->sechdrs = (void *)info->hdr + info->hdr->e_shoff; +- info->secstrings = (void *)info->hdr +- + info->sechdrs[info->hdr->e_shstrndx].sh_offset; +- + /* Try to find a name early so we can log errors with a module name */ + info->index.info = find_sec(info, ".modinfo"); + if (info->index.info) +@@ -3820,23 +3901,49 @@ static int load_module(struct load_info *info, const char __user *uargs, + long err = 0; + char *after_dashes; + +- err = elf_header_check(info); ++ /* ++ * Do the signature check (if any) first. All that ++ * the signature check needs is info->len, it does ++ * not need any of the section info. That can be ++ * set up later. This will minimize the chances ++ * of a corrupt module causing problems before ++ * we even get to the signature check. ++ * ++ * The check will also adjust info->len by stripping ++ * off the sig length at the end of the module, making ++ * checks against info->len more correct. ++ */ ++ err = module_sig_check(info, flags); + if (err) + goto free_copy; + ++ /* ++ * Do basic sanity checks against the ELF header and ++ * sections. ++ */ ++ err = elf_validity_check(info); ++ if (err) { ++ pr_err("Module has invalid ELF structures\n"); ++ goto free_copy; ++ } ++ ++ /* ++ * Everything checks out, so set up the section info ++ * in the info structure. ++ */ + err = setup_load_info(info, flags); + if (err) + goto free_copy; + ++ /* ++ * Now that we know we have the correct module name, check ++ * if it's blacklisted. ++ */ + if (blacklisted(info->name)) { + err = -EPERM; + goto free_copy; + } + +- err = module_sig_check(info, flags); +- if (err) +- goto free_copy; +- + err = rewrite_section_headers(info, flags); + if (err) + goto free_copy; +diff --git a/kernel/module_signature.c b/kernel/module_signature.c +index 4224a1086b7d..00132d12487c 100644 +--- a/kernel/module_signature.c ++++ b/kernel/module_signature.c +@@ -25,7 +25,7 @@ int mod_check_sig(const struct module_signature *ms, size_t file_len, + return -EBADMSG; + + if (ms->id_type != PKEY_ID_PKCS7) { +- pr_err("%s: Module is not signed with expected PKCS#7 message\n", ++ pr_err("%s: not signed with expected PKCS#7 message\n", + name); + return -ENOPKG; + } +diff --git a/kernel/module_signing.c b/kernel/module_signing.c +index 9d9fc678c91d..8723ae70ea1f 100644 +--- a/kernel/module_signing.c ++++ b/kernel/module_signing.c +@@ -30,7 +30,7 @@ int mod_verify_sig(const void *mod, struct load_info *info) + + memcpy(&ms, mod + (modlen - sizeof(ms)), sizeof(ms)); + +- ret = mod_check_sig(&ms, modlen, info->name); ++ ret = mod_check_sig(&ms, modlen, "module"); + if (ret) + return ret; + +-- +2.30.1 + diff --git a/queue-5.4/module-merge-repetitive-strings-in-module_sig_check.patch b/queue-5.4/module-merge-repetitive-strings-in-module_sig_check.patch new file mode 100644 index 00000000000..73efe4f349f --- /dev/null +++ b/queue-5.4/module-merge-repetitive-strings-in-module_sig_check.patch @@ -0,0 +1,52 @@ +From 3b69672d8fd44e02cfb51250ecf90d3573a29e7e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 31 Oct 2020 23:06:45 +0300 +Subject: module: merge repetitive strings in module_sig_check() + +From: Sergey Shtylyov + +[ Upstream commit 705e9195187d85249fbb0eaa844b1604a98fbc9a ] + +The 'reason' variable in module_sig_check() points to 3 strings across +the *switch* statement, all needlessly starting with the same text. +Let's put the starting text into the pr_notice() call -- it saves 21 +bytes of the object code (x86 gcc 10.2.1). + +Suggested-by: Joe Perches +Reviewed-by: Miroslav Benes +Signed-off-by: Sergey Shtylyov +Signed-off-by: Jessica Yu +Signed-off-by: Sasha Levin +--- + kernel/module.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/kernel/module.c b/kernel/module.c +index ab1f97cfe18d..9fe3e9b85348 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -2908,16 +2908,17 @@ static int module_sig_check(struct load_info *info, int flags) + * enforcing, certain errors are non-fatal. + */ + case -ENODATA: +- reason = "Loading of unsigned module"; ++ reason = "unsigned module"; + goto decide; + case -ENOPKG: +- reason = "Loading of module with unsupported crypto"; ++ reason = "module with unsupported crypto"; + goto decide; + case -ENOKEY: +- reason = "Loading of module with unavailable key"; ++ reason = "module with unavailable key"; + decide: + if (is_module_sig_enforced()) { +- pr_notice("%s is rejected\n", reason); ++ pr_notice("%s: loading of %s is rejected\n", ++ info->name, reason); + return -EKEYREJECTED; + } + +-- +2.30.1 + diff --git a/queue-5.4/nfsd-fix-error-handling-in-nfsv4.0-callbacks.patch b/queue-5.4/nfsd-fix-error-handling-in-nfsv4.0-callbacks.patch new file mode 100644 index 00000000000..0ed7d448cf1 --- /dev/null +++ b/queue-5.4/nfsd-fix-error-handling-in-nfsv4.0-callbacks.patch @@ -0,0 +1,38 @@ +From 7595f27e6ea407bc3794868386f8cba4fb90a0c9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Mar 2021 10:55:00 -0500 +Subject: NFSD: fix error handling in NFSv4.0 callbacks + +From: Olga Kornievskaia + +[ Upstream commit b4250dd868d1b42c0a65de11ef3afbee67ba5d2f ] + +When the server tries to do a callback and a client fails it due to +authentication problems, we need the server to set callback down +flag in RENEW so that client can recover. + +Suggested-by: Bruce Fields +Signed-off-by: Olga Kornievskaia +Signed-off-by: Chuck Lever +Tested-by: Benjamin Coddington +Link: https://lore.kernel.org/linux-nfs/FB84E90A-1A03-48B3-8BF7-D9D10AC2C9FE@oracle.com/T/#t +Signed-off-by: Sasha Levin +--- + fs/nfsd/nfs4callback.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c +index efe55d101b0e..3c50d18fe8a9 100644 +--- a/fs/nfsd/nfs4callback.c ++++ b/fs/nfsd/nfs4callback.c +@@ -1121,6 +1121,7 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata) + switch (task->tk_status) { + case -EIO: + case -ETIMEDOUT: ++ case -EACCES: + nfsd4_mark_cb_down(clp, task->tk_status); + } + break; +-- +2.30.1 + diff --git a/queue-5.4/powerpc-force-inlining-of-cpu_has_feature-to-avoid-b.patch b/queue-5.4/powerpc-force-inlining-of-cpu_has_feature-to-avoid-b.patch new file mode 100644 index 00000000000..b450d42ccfa --- /dev/null +++ b/queue-5.4/powerpc-force-inlining-of-cpu_has_feature-to-avoid-b.patch @@ -0,0 +1,58 @@ +From 5cabcd4c0ac4e6d9ac6442322bc708fa1899001a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Mar 2021 12:10:34 +0000 +Subject: powerpc: Force inlining of cpu_has_feature() to avoid build failure + +From: Christophe Leroy + +[ Upstream commit eed5fae00593ab9d261a0c1ffc1bdb786a87a55a ] + +The code relies on constant folding of cpu_has_feature() based +on possible and always true values as defined per +CPU_FTRS_ALWAYS and CPU_FTRS_POSSIBLE. + +Build failure is encountered with for instance +book3e_all_defconfig on kisskb in the AMDGPU driver which uses +cpu_has_feature(CPU_FTR_VSX_COMP) to decide whether calling +kernel_enable_vsx() or not. + +The failure is due to cpu_has_feature() not being inlined with +that configuration with gcc 4.9. + +In the same way as commit acdad8fb4a15 ("powerpc: Force inlining of +mmu_has_feature to fix build failure"), for inlining of +cpu_has_feature(). + +Signed-off-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/b231dfa040ce4cc37f702f5c3a595fdeabfe0462.1615378209.git.christophe.leroy@csgroup.eu +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/cpu_has_feature.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/powerpc/include/asm/cpu_has_feature.h b/arch/powerpc/include/asm/cpu_has_feature.h +index 7897d16e0990..727d4b321937 100644 +--- a/arch/powerpc/include/asm/cpu_has_feature.h ++++ b/arch/powerpc/include/asm/cpu_has_feature.h +@@ -7,7 +7,7 @@ + #include + #include + +-static inline bool early_cpu_has_feature(unsigned long feature) ++static __always_inline bool early_cpu_has_feature(unsigned long feature) + { + return !!((CPU_FTRS_ALWAYS & feature) || + (CPU_FTRS_POSSIBLE & cur_cpu_spec->cpu_features & feature)); +@@ -46,7 +46,7 @@ static __always_inline bool cpu_has_feature(unsigned long feature) + return static_branch_likely(&cpu_feature_keys[i]); + } + #else +-static inline bool cpu_has_feature(unsigned long feature) ++static __always_inline bool cpu_has_feature(unsigned long feature) + { + return early_cpu_has_feature(feature); + } +-- +2.30.1 + diff --git a/queue-5.4/rpc-fix-null-dereference-on-kmalloc-failure.patch b/queue-5.4/rpc-fix-null-dereference-on-kmalloc-failure.patch new file mode 100644 index 00000000000..fa8b308007b --- /dev/null +++ b/queue-5.4/rpc-fix-null-dereference-on-kmalloc-failure.patch @@ -0,0 +1,64 @@ +From 1fc6e5cf9ee3ad9f67a31a5f2556b715eace0a87 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Mar 2021 10:48:38 -0500 +Subject: rpc: fix NULL dereference on kmalloc failure + +From: J. Bruce Fields + +[ Upstream commit 0ddc942394013f08992fc379ca04cffacbbe3dae ] + +I think this is unlikely but possible: + +svc_authenticate sets rq_authop and calls svcauth_gss_accept. The +kmalloc(sizeof(*svcdata), GFP_KERNEL) fails, leaving rq_auth_data NULL, +and returning SVC_DENIED. + +This causes svc_process_common to go to err_bad_auth, and eventually +call svc_authorise. That calls ->release == svcauth_gss_release, which +tries to dereference rq_auth_data. + +Signed-off-by: J. Bruce Fields +Link: https://lore.kernel.org/linux-nfs/3F1B347F-B809-478F-A1E9-0BE98E22B0F0@oracle.com/T/#t +Signed-off-by: Chuck Lever +Signed-off-by: Sasha Levin +--- + net/sunrpc/auth_gss/svcauth_gss.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c +index cf4d6d7e7282..d5470c7fe879 100644 +--- a/net/sunrpc/auth_gss/svcauth_gss.c ++++ b/net/sunrpc/auth_gss/svcauth_gss.c +@@ -1782,11 +1782,14 @@ static int + svcauth_gss_release(struct svc_rqst *rqstp) + { + struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data; +- struct rpc_gss_wire_cred *gc = &gsd->clcred; ++ struct rpc_gss_wire_cred *gc; + struct xdr_buf *resbuf = &rqstp->rq_res; + int stat = -EINVAL; + struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id); + ++ if (!gsd) ++ goto out; ++ gc = &gsd->clcred; + if (gc->gc_proc != RPC_GSS_PROC_DATA) + goto out; + /* Release can be called twice, but we only wrap once. */ +@@ -1827,10 +1830,10 @@ out_err: + if (rqstp->rq_cred.cr_group_info) + put_group_info(rqstp->rq_cred.cr_group_info); + rqstp->rq_cred.cr_group_info = NULL; +- if (gsd->rsci) ++ if (gsd && gsd->rsci) { + cache_put(&gsd->rsci->h, sn->rsc_cache); +- gsd->rsci = NULL; +- ++ gsd->rsci = NULL; ++ } + return stat; + } + +-- +2.30.1 + diff --git a/queue-5.4/scsi-qla2xxx-fix-broken-endif-placement.patch b/queue-5.4/scsi-qla2xxx-fix-broken-endif-placement.patch new file mode 100644 index 00000000000..73b66c83f71 --- /dev/null +++ b/queue-5.4/scsi-qla2xxx-fix-broken-endif-placement.patch @@ -0,0 +1,44 @@ +From e89d437c831db10cb59818a8fccdc73d213aa883 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 14 Mar 2021 18:32:46 +0300 +Subject: scsi: qla2xxx: Fix broken #endif placement + +From: Alexey Dobriyan + +[ Upstream commit 5999b9e5b1f8a2f5417b755130919b3ac96f5550 ] + +Only half of the file is under include guard because terminating #endif +is placed too early. + +Link: https://lore.kernel.org/r/YE4snvoW1SuwcXAn@localhost.localdomain +Reviewed-by: Himanshu Madhani +Signed-off-by: Alexey Dobriyan +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/qla2xxx/qla_target.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h +index d006f0a97b8c..2236751a3a56 100644 +--- a/drivers/scsi/qla2xxx/qla_target.h ++++ b/drivers/scsi/qla2xxx/qla_target.h +@@ -116,7 +116,6 @@ + (min(1270, ((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD_24XX + \ + QLA_TGT_DATASEGS_PER_CONT_24XX*((ql) - 1)) : 0)) + #endif +-#endif + + #define GET_TARGET_ID(ha, iocb) ((HAS_EXTENDED_IDS(ha)) \ + ? le16_to_cpu((iocb)->u.isp2x.target.extended) \ +@@ -244,6 +243,7 @@ struct ctio_to_2xxx { + #ifndef CTIO_RET_TYPE + #define CTIO_RET_TYPE 0x17 /* CTIO return entry */ + #define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */ ++#endif + + struct fcp_hdr { + uint8_t r_ctl; +-- +2.30.1 + diff --git a/queue-5.4/scsi-st-fix-a-use-after-free-in-st_open.patch b/queue-5.4/scsi-st-fix-a-use-after-free-in-st_open.patch new file mode 100644 index 00000000000..6207ef21ff1 --- /dev/null +++ b/queue-5.4/scsi-st-fix-a-use-after-free-in-st_open.patch @@ -0,0 +1,42 @@ +From 971f1993dc0761cea8e9f9d2bcc9136639c657c2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Mar 2021 22:46:36 -0800 +Subject: scsi: st: Fix a use after free in st_open() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Lv Yunlong + +[ Upstream commit c8c165dea4c8f5ad67b1240861e4f6c5395fa4ac ] + +In st_open(), if STp->in_use is true, STp will be freed by +scsi_tape_put(). However, STp is still used by DEBC_printk() after. It is +better to DEBC_printk() before scsi_tape_put(). + +Link: https://lore.kernel.org/r/20210311064636.10522-1-lyl2019@mail.ustc.edu.cn +Acked-by: Kai Mäkisara +Signed-off-by: Lv Yunlong +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/st.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c +index e3266a64a477..2121e44c342f 100644 +--- a/drivers/scsi/st.c ++++ b/drivers/scsi/st.c +@@ -1267,8 +1267,8 @@ static int st_open(struct inode *inode, struct file *filp) + spin_lock(&st_use_lock); + if (STp->in_use) { + spin_unlock(&st_use_lock); +- scsi_tape_put(STp); + DEBC_printk(STp, "Device already in use.\n"); ++ scsi_tape_put(STp); + return (-EBUSY); + } + +-- +2.30.1 + diff --git a/queue-5.4/series b/queue-5.4/series index d63543cac89..99430f74a6e 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,2 +1,29 @@ selinux-vsock-set-sid-for-socket-returned-by-accept.patch ipv6-weaken-the-v4mapped-source-check.patch +module-merge-repetitive-strings-in-module_sig_check.patch +module-avoid-goto-s-in-module_sig_check.patch +module-harden-elf-info-handling.patch +ext4-shrink-race-window-in-ext4_should_retry_alloc.patch +ext4-fix-bh-ref-count-on-error-paths.patch +fs-nfsd-fix-kconfig-dependency-warning-for-nfsd_v4.patch +rpc-fix-null-dereference-on-kmalloc-failure.patch +iomap-fix-negative-assignment-to-unsigned-sis-pages-.patch +asoc-rt5640-fix-dac-and-adc-vol-tlv-values-being-off.patch +asoc-rt5651-fix-dac-and-adc-vol-tlv-values-being-off.patch +asoc-sgtl5000-set-dap_avc_ctrl-register-to-correct-d.patch +asoc-es8316-simplify-adc_pga_gain_tlv-table.patch +asoc-cs42l42-fix-bitclock-polarity-inversion.patch +asoc-cs42l42-fix-channel-width-support.patch +asoc-cs42l42-fix-mixer-volume-control.patch +asoc-cs42l42-always-wait-at-least-3ms-after-reset.patch +nfsd-fix-error-handling-in-nfsv4.0-callbacks.patch +powerpc-force-inlining-of-cpu_has_feature-to-avoid-b.patch +vhost-fix-vhost_vq_reset.patch +scsi-st-fix-a-use-after-free-in-st_open.patch +scsi-qla2xxx-fix-broken-endif-placement.patch +staging-comedi-cb_pcidas-fix-request_irq-warn.patch +staging-comedi-cb_pcidas64-fix-request_irq-warn.patch +asoc-rt5659-update-mclk-rate-in-set_sysclk.patch +thermal-core-add-null-pointer-check-before-using-coo.patch +locking-ww_mutex-simplify-use_ww_ctx-ww_ctx-handling.patch +ext4-do-not-iput-inode-under-running-transaction-in-.patch diff --git a/queue-5.4/staging-comedi-cb_pcidas-fix-request_irq-warn.patch b/queue-5.4/staging-comedi-cb_pcidas-fix-request_irq-warn.patch new file mode 100644 index 00000000000..52164631c9a --- /dev/null +++ b/queue-5.4/staging-comedi-cb_pcidas-fix-request_irq-warn.patch @@ -0,0 +1,49 @@ +From 097b5d1043a817d530fa029655b905adf9ac631c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Mar 2021 15:59:14 -0400 +Subject: staging: comedi: cb_pcidas: fix request_irq() warn + +From: Tong Zhang + +[ Upstream commit 2e5848a3d86f03024ae096478bdb892ab3d79131 ] + +request_irq() wont accept a name which contains slash so we need to +repalce it with something else -- otherwise it will trigger a warning +and the entry in /proc/irq/ will not be created +since the .name might be used by userspace and we don't want to break +userspace, so we are changing the parameters passed to request_irq() + +[ 1.630764] name 'pci-das1602/16' +[ 1.630950] WARNING: CPU: 0 PID: 181 at fs/proc/generic.c:180 __xlate_proc_name+0x93/0xb0 +[ 1.634009] RIP: 0010:__xlate_proc_name+0x93/0xb0 +[ 1.639441] Call Trace: +[ 1.639976] proc_mkdir+0x18/0x20 +[ 1.641946] request_threaded_irq+0xfe/0x160 +[ 1.642186] cb_pcidas_auto_attach+0xf4/0x610 [cb_pcidas] + +Suggested-by: Ian Abbott +Reviewed-by: Ian Abbott +Signed-off-by: Tong Zhang +Link: https://lore.kernel.org/r/20210315195914.4801-1-ztong0001@gmail.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/comedi/drivers/cb_pcidas.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c +index 1893c70de0b9..10f097a7d847 100644 +--- a/drivers/staging/comedi/drivers/cb_pcidas.c ++++ b/drivers/staging/comedi/drivers/cb_pcidas.c +@@ -1281,7 +1281,7 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev, + devpriv->amcc + AMCC_OP_REG_INTCSR); + + ret = request_irq(pcidev->irq, cb_pcidas_interrupt, IRQF_SHARED, +- dev->board_name, dev); ++ "cb_pcidas", dev); + if (ret) { + dev_dbg(dev->class_dev, "unable to allocate irq %d\n", + pcidev->irq); +-- +2.30.1 + diff --git a/queue-5.4/staging-comedi-cb_pcidas64-fix-request_irq-warn.patch b/queue-5.4/staging-comedi-cb_pcidas64-fix-request_irq-warn.patch new file mode 100644 index 00000000000..04f8bd90384 --- /dev/null +++ b/queue-5.4/staging-comedi-cb_pcidas64-fix-request_irq-warn.patch @@ -0,0 +1,49 @@ +From 401981a11a2c4d2ef4018298d46f15552bc6a12f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Mar 2021 15:58:12 -0400 +Subject: staging: comedi: cb_pcidas64: fix request_irq() warn + +From: Tong Zhang + +[ Upstream commit d2d106fe3badfc3bf0dd3899d1c3f210c7203eab ] + +request_irq() wont accept a name which contains slash so we need to +repalce it with something else -- otherwise it will trigger a warning +and the entry in /proc/irq/ will not be created +since the .name might be used by userspace and we don't want to break +userspace, so we are changing the parameters passed to request_irq() + +[ 1.565966] name 'pci-das6402/16' +[ 1.566149] WARNING: CPU: 0 PID: 184 at fs/proc/generic.c:180 __xlate_proc_name+0x93/0xb0 +[ 1.568923] RIP: 0010:__xlate_proc_name+0x93/0xb0 +[ 1.574200] Call Trace: +[ 1.574722] proc_mkdir+0x18/0x20 +[ 1.576629] request_threaded_irq+0xfe/0x160 +[ 1.576859] auto_attach+0x60a/0xc40 [cb_pcidas64] + +Suggested-by: Ian Abbott +Reviewed-by: Ian Abbott +Signed-off-by: Tong Zhang +Link: https://lore.kernel.org/r/20210315195814.4692-1-ztong0001@gmail.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/comedi/drivers/cb_pcidas64.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c +index e1774e09a320..9fe8b65cd9e3 100644 +--- a/drivers/staging/comedi/drivers/cb_pcidas64.c ++++ b/drivers/staging/comedi/drivers/cb_pcidas64.c +@@ -4035,7 +4035,7 @@ static int auto_attach(struct comedi_device *dev, + init_stc_registers(dev); + + retval = request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED, +- dev->board_name, dev); ++ "cb_pcidas64", dev); + if (retval) { + dev_dbg(dev->class_dev, "unable to allocate irq %u\n", + pcidev->irq); +-- +2.30.1 + diff --git a/queue-5.4/thermal-core-add-null-pointer-check-before-using-coo.patch b/queue-5.4/thermal-core-add-null-pointer-check-before-using-coo.patch new file mode 100644 index 00000000000..0c61e57c2bc --- /dev/null +++ b/queue-5.4/thermal-core-add-null-pointer-check-before-using-coo.patch @@ -0,0 +1,61 @@ +From 8375a84b443bdf7beeac094b61859841d0d32a70 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Dec 2020 00:23:01 +0530 +Subject: thermal/core: Add NULL pointer check before using cooling device + stats + +From: Manaf Meethalavalappu Pallikunhi + +[ Upstream commit 2046a24ae121cd107929655a6aaf3b8c5beea01f ] + +There is a possible chance that some cooling device stats buffer +allocation fails due to very high cooling device max state value. +Later cooling device update sysfs can try to access stats data +for the same cooling device. It will lead to NULL pointer +dereference issue. + +Add a NULL pointer check before accessing thermal cooling device +stats data. It fixes the following bug + +[ 26.812833] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000004 +[ 27.122960] Call trace: +[ 27.122963] do_raw_spin_lock+0x18/0xe8 +[ 27.122966] _raw_spin_lock+0x24/0x30 +[ 27.128157] thermal_cooling_device_stats_update+0x24/0x98 +[ 27.128162] cur_state_store+0x88/0xb8 +[ 27.128166] dev_attr_store+0x40/0x58 +[ 27.128169] sysfs_kf_write+0x50/0x68 +[ 27.133358] kernfs_fop_write+0x12c/0x1c8 +[ 27.133362] __vfs_write+0x54/0x160 +[ 27.152297] vfs_write+0xcc/0x188 +[ 27.157132] ksys_write+0x78/0x108 +[ 27.162050] ksys_write+0xf8/0x108 +[ 27.166968] __arm_smccc_hvc+0x158/0x4b0 +[ 27.166973] __arm_smccc_hvc+0x9c/0x4b0 +[ 27.186005] el0_svc+0x8/0xc + +Signed-off-by: Manaf Meethalavalappu Pallikunhi +Signed-off-by: Daniel Lezcano +Link: https://lore.kernel.org/r/1607367181-24589-1-git-send-email-manafm@codeaurora.org +Signed-off-by: Sasha Levin +--- + drivers/thermal/thermal_sysfs.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c +index aa99edb4dff7..4dce4a8f71ed 100644 +--- a/drivers/thermal/thermal_sysfs.c ++++ b/drivers/thermal/thermal_sysfs.c +@@ -770,6 +770,9 @@ void thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, + { + struct cooling_dev_stats *stats = cdev->stats; + ++ if (!stats) ++ return; ++ + spin_lock(&stats->lock); + + if (stats->state == new_state) +-- +2.30.1 + diff --git a/queue-5.4/vhost-fix-vhost_vq_reset.patch b/queue-5.4/vhost-fix-vhost_vq_reset.patch new file mode 100644 index 00000000000..387bb0b7678 --- /dev/null +++ b/queue-5.4/vhost-fix-vhost_vq_reset.patch @@ -0,0 +1,49 @@ +From 35155dba85924be58482346a43f06f623cf9a726 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Mar 2021 15:09:13 +0100 +Subject: vhost: Fix vhost_vq_reset() + +From: Laurent Vivier + +[ Upstream commit beb691e69f4dec7bfe8b81b509848acfd1f0dbf9 ] + +vhost_reset_is_le() is vhost_init_is_le(), and in the case of +cross-endian legacy, vhost_init_is_le() depends on vq->user_be. + +vq->user_be is set by vhost_disable_cross_endian(). + +But in vhost_vq_reset(), we have: + + vhost_reset_is_le(vq); + vhost_disable_cross_endian(vq); + +And so user_be is used before being set. + +To fix that, reverse the lines order as there is no other dependency +between them. + +Signed-off-by: Laurent Vivier +Link: https://lore.kernel.org/r/20210312140913.788592-1-lvivier@redhat.com +Signed-off-by: Michael S. Tsirkin +Signed-off-by: Sasha Levin +--- + drivers/vhost/vhost.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c +index 57ab79fbcee9..a279ecacbf60 100644 +--- a/drivers/vhost/vhost.c ++++ b/drivers/vhost/vhost.c +@@ -320,8 +320,8 @@ static void vhost_vq_reset(struct vhost_dev *dev, + vq->kick = NULL; + vq->call_ctx = NULL; + vq->log_ctx = NULL; +- vhost_reset_is_le(vq); + vhost_disable_cross_endian(vq); ++ vhost_reset_is_le(vq); + vq->busyloop_timeout = 0; + vq->umem = NULL; + vq->iotlb = NULL; +-- +2.30.1 +