5.8.6-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 1/255 khugepaged: khugepaged_test_exit() check mmget_still_valid()
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
[ Upstream commit bbe98f9cadff58cdd6a4acaeba0efa8565dabe65 ]
Move collapse_huge_page()'s mmget_still_valid() check into khugepaged_test_exit() itself. collapse_huge_page() is used for anon THP only, and earned its mmget_still_valid() check because it inserts a huge pmd entry in place of the page table's pmd entry; whereas collapse_file()'s retract_page_tables() or collapse_pte_mapped_thp() merely clears the page table's pmd entry. But core dumping without mmap lock must have been as open to mistaking a racily cleared pmd entry for a page table at physical page 0, as exit_mmap() was. And we certainly have no interest in mapping as a THP once dumping core.
--- mm/khugepaged.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
mm/khugepaged.c +1 -4
@@ -431,7 +431,7 @@ static void insert_to_mm_slots_hash(struct mm_struct *mm,static inline int khugepaged_test_exit (struct mm_struct *mm) { -return atomic_read (&mm->mm_users) ==0 ; +return atomic_read (&mm->mm_users) ==0 || !mmget_still_valid (mm); } static bool hugepage_vma_check(struct vm_area_struct *vma,
@@ -1100,9 +1100,6 @@ static void collapse_huge_page(struct mm_struct *mm,* handled by the anon_vma lock + PG_lock. */ mmap_write_lock (mm); - result =SCAN_ANY_PROCESS ; -if (!mmget_still_valid (mm)) - goto out; result =hugepage_vma_revalidate (mm, address, &vma);if (result) goto out;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 10/255 ASoC: img-parallel-out: Fix a reference count leak
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 6b9fbb073636906eee9fe4d4c05a4f445b9e2a23 ]
pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code, causing incorrect ref count if pm_runtime_put_noidle() is not called in error handling paths. Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails.
--- sound/soc/img/img-parallel-out.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/img/img-parallel-out.c +3 -1
@@ -163,8 +163,10 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) } ret =pm_runtime_get_sync (prl->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_noidle (prl->dev);return ret; + } reg =img_prl_out_readl (prl,IMG_PRL_OUT_CTL ); reg = (reg & ~IMG_PRL_OUT_CTL_EDGE_MASK ) | control_set;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 11/255 ASoC: tegra: Fix reference count leaks.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit deca195383a6085be62cb453079e03e04d618d6e ]
Calling pm_runtime_get_sync increments the counter even in case of failure, causing incorrect ref count if pm_runtime_put is not called in error handling paths. Call pm_runtime_put if pm_runtime_get_sync fails.
--- sound/soc/tegra/tegra30_ahub.c | 4 +++- sound/soc/tegra/tegra30_i2s.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
sound/soc/tegra/tegra30_ahub.c +3 -1
@@ -643,8 +643,10 @@ static int tegra30_ahub_resume(struct device *dev)int ret; ret =pm_runtime_get_sync (dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put (dev);return ret; + } ret =regcache_sync (ahub->regmap_ahub); ret |=regcache_sync (ahub->regmap_apbif);pm_runtime_put (dev);
sound/soc/tegra/tegra30_i2s.c +3 -1
@@ -567,8 +567,10 @@ static int tegra30_i2s_resume(struct device *dev)int ret; ret =pm_runtime_get_sync (dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put (dev);return ret; + } ret =regcache_sync (i2s->regmap);pm_runtime_put (dev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 15/255 media: pci: ttpci: av7110: fix possible buffer overflow caused by bad DMA value in debiirq()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 6499a0db9b0f1e903d52f8244eacc1d4be00eea2 ]
The value av7110->debi_virt is stored in DMA memory, and it is assigned to data, and thus data[0] can be modified at any time by malicious hardware. In this case, "if (data[0] < 2)" can be passed, but then data[0] can be changed into a large number, which may cause buffer overflow when the code "av7110->ci_slot[data[0]]" is used.
To fix this possible bug, data[0] is assigned to a local variable, which replaces the use of data[0].
--- drivers/media/pci/ttpci/av7110.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/pci/ttpci/av7110.c +3 -2
@@ -406,14 +406,15 @@ static void debiirq(unsigned long cookie)case DATA_CI_GET : {u8 *data = av7110->debi_virt; +u8 data_0 = data[0 ]; -if ((data[0 ] <2 ) && data[2 ] ==0xff ) { +if (data_0 <2 && data[2 ] ==0xff ) {int flags =0 ;if (data[5 ] >0 ) flags |=CA_CI_MODULE_PRESENT ;if (data[5 ] >5 ) flags |=CA_CI_MODULE_READY ; - av7110->ci_slot[data[0 ]].flags = flags; + av7110->ci_slot[data_0].flags = flags; }else ci_get_data(&av7110->ci_rbuffer, av7110->debi_virt,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 3/255 ALSA: hda/hdmi: Add quirk to force connectivity
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit cd72c317a0a11f64225b9a3f1fe503bb8c7327b5 ]
HDMI on some platforms doesn't enable audio support because its Port Connectivity [31:30] is set to AC_JACK_PORT_NONE:
Node 0x05 [Pin Complex] wcaps 0x40778d: 8-Channels Digital Amp-Out CP
Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00]
Pincap 0x0b000094: OUT Detect HBR HDMI DP
Pin Default 0x58560010: [N/A] Digital Out at Int HDMI
Conn = Digital, Color = Unknown
DefAssociation = 0x1, Sequence = 0x0
Pin-ctls: 0x40: OUT
Unsolicited: tag=00, enabled=0
Power states: D0 D3 EPSS
Power: setting=D0, actual=D0
Devices: 0
Connection: 3
0x02 0x03* 0x04
For now, use a quirk to force connectivity based on SSID. If there are more platforms affected by the same issue, we can eye for a more generic solution.
--- sound/pci/hda/patch_hdmi.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
sound/pci/hda/patch_hdmi.c +15 -1
@@ -160,6 +160,7 @@ struct hdmi_spec {bool use_acomp_notifier;/* use eld_notify callback for hotplug */ bool acomp_registered;/* audio component registered in this driver */ +bool force_connect;/* force connectivity */ struct drm_audio_component_audio_ops drm_audio_ops;int (*port2pin)(struct hda_codec *,int );/* reverse port/pin mapping */
@@ -1701,7 +1702,8 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)* all device entries on the same pin */ config =snd_hda_codec_get_pincfg (codec, pin_nid); -if (get_defcfg_connect (config) ==AC_JACK_PORT_NONE ) +if (get_defcfg_connect (config) ==AC_JACK_PORT_NONE && + !spec->force_connect)return 0 ;/*
@@ -1803,11 +1805,18 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)return 0 ; } +static const struct snd_pci_quirk force_connect_list[] = { +SND_PCI_QUIRK (0x103c ,0x871a ,"HP" ,1 ), + {} +}; +static int hdmi_parse_codec (struct hda_codec *codec) { +struct hdmi_spec *spec = codec->spec;hda_nid_t start_nid;unsigned int caps;int i, nodes; +const struct snd_pci_quirk *q; nodes =snd_hda_get_sub_nodes (codec, codec->core.afg, &start_nid);if (!start_nid || nodes <0 ) {
@@ -1815,6 +1824,11 @@ static int hdmi_parse_codec(struct hda_codec *codec)return -EINVAL ; } + q =snd_pci_quirk_lookup (codec->bus->pci, force_connect_list); + +if (q && q->value) + spec->force_connect = true; +/* * hdmi_add_pin() assumes total amount of converters to * be known, so first discover all converters
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 2/255 ASoC: intel/skl/hda - fix probe regression on systems without i915
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit ffc6d45d96f07a32700cb6b7be2d3459e63c255a ]
Starting in commit cbc7a6b5a87a ("ASoC: soc-card: add snd_soc_card_add_dai_link()"), error value from ASoc add_dai_link() is no longer ignored.
The generic HDA machine driver relied on the old semantics to disable i915 HDMI/DP audio codec at runtime. If no display codec was present, add_dai_link() returned an error, but this was ignored and rest of the card was successfully probed.
Fix the problem by changing the machine driver add_dai_link() to not return an error in this case.
--- sound/soc/intel/boards/skl_hda_dsp_common.h | 1 + sound/soc/intel/boards/skl_hda_dsp_generic.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-)
sound/soc/intel/boards/skl_hda_dsp_common.h +1 -0
@@ -33,6 +33,7 @@ struct skl_hda_private {int dai_index;const char *platform_name;bool common_hdmi_codec_drv; +bool idisp_codec; };extern struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS ];
sound/soc/intel/boards/skl_hda_dsp_generic.c +11 -6
@@ -79,6 +79,9 @@ skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link) link->platforms->name = ctx->platform_name; link->nonatomic =1 ; +if (!ctx->idisp_codec) +return 0 ; +if (strstr (link->name,"HDMI" )) { ret =skl_hda_hdmi_add_pcm (card, ctx->pcm_count);
@@ -118,19 +121,20 @@ static char hda_soc_components[30];static int skl_hda_fill_card_info (struct snd_soc_acpi_mach_params *mach_params) {struct snd_soc_card *card = &hda_soc_card; +struct skl_hda_private *ctx =snd_soc_card_get_drvdata (card);struct snd_soc_dai_link *dai_link; -u32 codec_count, codec_mask, idisp_mask; +u32 codec_count, codec_mask;int i, num_links, num_route; codec_mask = mach_params->codec_mask; codec_count =hweight_long (codec_mask); - idisp_mask = codec_mask &IDISP_CODEC_MASK ; + ctx->idisp_codec = !!(codec_mask &IDISP_CODEC_MASK );if (!codec_count || codec_count >2 || - (codec_count ==2 && !idisp_mask)) + (codec_count ==2 && !ctx->idisp_codec))return -EINVAL ; -if (codec_mask == idisp_mask) { +if (codec_mask ==IDISP_CODEC_MASK ) {/* topology with iDisp as the only HDA codec */ num_links =IDISP_DAI_COUNT +DMIC_DAI_COUNT ; num_route =IDISP_ROUTE_COUNT ;
@@ -152,7 +156,7 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params) num_route =ARRAY_SIZE (skl_hda_map); card->dapm_widgets = skl_hda_widgets; card->num_dapm_widgets =ARRAY_SIZE (skl_hda_widgets); -if (!idisp_mask) { +if (!ctx->idisp_codec) {for (i =0 ; i <IDISP_DAI_COUNT ; i++) { skl_hda_be_dai_links[i].codecs = dummy_codec; skl_hda_be_dai_links[i].num_codecs =
@@ -211,6 +215,8 @@ static int skl_hda_audio_probe(struct platform_device *pdev)if (!mach)return -EINVAL ; +snd_soc_card_set_drvdata (&hda_soc_card, ctx); + ret =skl_hda_fill_card_info (&mach->mach_params);if (ret <0 ) {dev_err (&pdev->dev,"Unsupported HDAudio/iDisp configuration found\n" );
@@ -223,7 +229,6 @@ static int skl_hda_audio_probe(struct platform_device *pdev) ctx->common_hdmi_codec_drv = mach->mach_params.common_hdmi_codec_drv; hda_soc_card.dev = &pdev->dev; -snd_soc_card_set_drvdata (&hda_soc_card, ctx);if (mach->mach_params.dmic_num >0 ) { snprintf(hda_soc_components, sizeof(hda_soc_components),
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 4/255 ALSA: pci: delete repeated words in comments
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit c7fabbc51352f50cc58242a6dc3b9c1a3599849b ]
Drop duplicated words in sound/pci/.
{and, the, at}
--- sound/pci/cs46xx/cs46xx_lib.c | 2 +- sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/patch_sigmatel.c | 2 +- sound/pci/ice1712/prodigy192.c | 2 +- sound/pci/oxygen/xonar_dg.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
sound/pci/cs46xx/cs46xx_lib.c +1 -1
@@ -766,7 +766,7 @@ static void snd_cs46xx_set_capture_sample_rate(struct snd_cs46xx *chip, unsigned rate =48000 /9 ;/* -* We can not capture at at rate greater than the Input Rate (48000). +* We can not capture at a rate greater than the Input Rate (48000). * Return an error if an attempt is made to stray outside that limit. */ if (rate >48000 )
sound/pci/cs46xx/dsp_spos_scb_lib.c +1 -1
@@ -1716,7 +1716,7 @@ int cs46xx_iec958_pre_open (struct snd_cs46xx *chip)struct dsp_spos_instance * ins = chip->dsp_spos_instance;if ( ins->spdif_status_out &DSP_SPDIF_STATUS_OUTPUT_ENABLED ) { -/* remove AsynchFGTxSCB and and PCMSerialInput_II */ +/* remove AsynchFGTxSCB and PCMSerialInput_II */ cs46xx_dsp_disable_spdif_out (chip);/* save state */
sound/pci/hda/hda_codec.c +1 -1
@@ -3427,7 +3427,7 @@ EXPORT_SYMBOL_GPL(snd_hda_set_power_save);* @nid: NID to check / update * * Check whether the given NID is in the amp list. If it's in the list, -* check the current AMP status, and update the the power-status according +* check the current AMP status, and update the power-status according * to the mute status. * * This function is supposed to be set or called from the check_power_status
sound/pci/hda/hda_generic.c +1 -1
@@ -813,7 +813,7 @@ static void activate_amp_in(struct hda_codec *codec, struct nid_path *path, } } -/* sync power of each widget in the the given path */ +/* sync power of each widget in the given path */ static hda_nid_t path_power_update (struct hda_codec *codec,struct nid_path *path,bool allow_powerdown)
sound/pci/hda/patch_sigmatel.c +1 -1
@@ -832,7 +832,7 @@ static int stac_auto_create_beep_ctls(struct hda_codec *codec,static const struct snd_kcontrol_new beep_vol_ctl =HDA_CODEC_VOLUME (NULL ,0 ,0 ,0 ); -/* check for mute support for the the amp */ +/* check for mute support for the amp */ if ((caps &AC_AMPCAP_MUTE ) >>AC_AMPCAP_MUTE_SHIFT ) {const struct snd_kcontrol_new *temp;if (spec->anabeep_nid == nid)
sound/pci/ice1712/prodigy192.c +1 -1
@@ -32,7 +32,7 @@* Experimentally I found out that only a combination of * OCKS0=1, OCKS1=1 (128fs, 64fs output) and ice1724 - * VT1724_MT_I2S_MCLK_128X=0 (256fs input) yields correct -* sampling rate. That means the the FPGA doubles the +* sampling rate. That means that the FPGA doubles the * MCK01 rate. * * Copyright (c) 2003 Takashi Iwai <[email protected]>
sound/pci/oxygen/xonar_dg.c +1 -1
@@ -29,7 +29,7 @@* GPIO 4 <- headphone detect * GPIO 5 -> enable ADC analog circuit for the left channel * GPIO 6 -> enable ADC analog circuit for the right channel -* GPIO 7 -> switch green rear output jack between CS4245 and and the first +* GPIO 7 -> switch green rear output jack between CS4245 and the first * channel of CS4361 (mechanical relay) * GPIO 8 -> enable output to speakers *
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 7/255 drm/amdgpu: fix RAS memory leak in error case
In reply to Greg Kroah-HartmanFrom: Guchun Chen <[email protected]>
[ Upstream commit 5e91160ac0b5cfbbaeb62cbff8b069262095f744 ]
RAS context memory needs to freed in failure case.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +10 -9
@@ -1914,9 +1914,8 @@ int amdgpu_ras_init(struct amdgpu_device *adev)amdgpu_ras_check_supported (adev, &con->hw_supported, &con->supported);if (!con->hw_supported) { -amdgpu_ras_set_context (adev,NULL ); -kfree (con); -return 0 ; + r =0 ; + goto err_out; } con->features =0 ;
@@ -1927,29 +1926,31 @@ int amdgpu_ras_init(struct amdgpu_device *adev)if (adev->nbio.funcs->init_ras_controller_interrupt) { r = adev->nbio.funcs->init_ras_controller_interrupt (adev);if (r) -return r; + goto err_out; }if (adev->nbio.funcs->init_ras_err_event_athub_interrupt) { r = adev->nbio.funcs->init_ras_err_event_athub_interrupt (adev);if (r) -return r; + goto err_out; } amdgpu_ras_mask &=AMDGPU_RAS_BLOCK_MASK ; -if (amdgpu_ras_fs_init (adev)) - goto fs_out; +if (amdgpu_ras_fs_init (adev)) { + r = -EINVAL ; + goto err_out; + }dev_info (adev->dev,"RAS INFO: ras initialized successfully, " "hardware ability[%x] ras_mask[%x]\n" , con->hw_supported, con->supported);return 0 ; -fs_out: +err_out:amdgpu_ras_set_context (adev,NULL );kfree (con); -return -EINVAL ; +return r; }/* helper function to handle common stuff in ip late init phase */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainercover 5.8.6-rc1 review
This is the start of the stable review cycle for the 5.8.6 release. There are 255 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 Thu, 03 Sep 2020 15:09:01 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.8.6-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.8.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.8.6-rc1
Hector Martin <[email protected]>
ALSA: usb-audio: Update documentation comment for MS2109 quirk
Dan Carpenter <[email protected]>
dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()
Andrii Nakryiko <[email protected]>
libbpf: Fix build on ppc64le architecture
Roland Scheidegger <[email protected]>
drm/vmwgfx/ldu: Use drm_mode_config_reset
Roland Scheidegger <[email protected]>
drm/vmwgfx/sou: Use drm_mode_config_reset
Daniel Vetter <[email protected]>
drm/vmwgfx/stdu: Use drm_mode_config_reset
Peilin Ye <[email protected]>
HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage()
Qian Cai <[email protected]>
mm/page_counter: fix various data races at memsw
Tetsuo Handa <[email protected]>
fbmem: pull fbcon_update_vcs() out of fb_set_var()
Daniel Vetter <[email protected]>
drm/atomic-helper: reset vblank on crtc reset
Jens Axboe <[email protected]>
io_uring: make offset == -1 consistent with preadv2/pwritev2
Jens Axboe <[email protected]>
io_uring: don't use poll handler if file can't be nonblocking read/written
Jens Axboe <[email protected]>
io_uring: don't recurse on tsk->sighand->siglock with signalfd
Badhri Jagan Sridharan <[email protected]>
usb: typec: tcpm: Fix Fix source hard reset response for TDA 2.3.1.1 and TDA 2.3.1.2 failures
Hans de Goede <[email protected]>
usb: typec: ucsi: Hold con->lock for the entire duration of ucsi_register_port()
Hans de Goede <[email protected]>
usb: typec: ucsi: Rework ppm_lock handling
Hans de Goede <[email protected]>
usb: typec: ucsi: Fix 2 unlocked ucsi_run_command calls
Hans de Goede <[email protected]>
usb: typec: ucsi: Fix AB BA lock inversion
Bastien Nocera <[email protected]>
USB: Fix device driver race
Bastien Nocera <[email protected]>
USB: Also match device drivers using the ->match vfunc
Alan Stern <[email protected]>
usb: storage: Add unusual_uas entry for Sony PSZ drives
Tom Rix <[email protected]>
USB: cdc-acm: rework notification_buffer resizing
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Handle ZLP for sg requests
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Fix handling ZLP
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Don't setup more than requested
Andy Shevchenko <[email protected]>
USB: gadget: u_f: Unbreak offset calculation in VLAs
Brooke Basile <[email protected]>
USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb()
Brooke Basile <[email protected]>
USB: gadget: u_f: add overflow checks to VLA macros
Tang Bin <[email protected]>
usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe()
Cyril Roelandt <[email protected]>
USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge
Alan Stern <[email protected]>
USB: quirks: Ignore duplicate endpoint on Sound Devices MixPre-D
Kai-Heng Feng <[email protected]>
USB: quirks: Add no-lpm quirk for another Raydium touchscreen
Thinh Nguyen <[email protected]>
usb: uas: Add quirk for PNY Pro Elite
Alan Stern <[email protected]>
USB: yurex: Fix bad gfp argument
Evan Quan <[email protected]>
drm/amd/pm: correct the thermal alert temperature limit settings
Evan Quan <[email protected]>
drm/amd/pm: correct Vega20 swctf limit setting
Evan Quan <[email protected]>
drm/amd/pm: correct Vega12 swctf limit setting
Evan Quan <[email protected]>
drm/amd/pm: correct Vega10 swctf limit setting
Nicholas Kazlauskas <[email protected]>
drm/amd/powerplay: Fix hardmins not being sent to SMU for RV
Jiansong Chen <[email protected]>
drm/amdgpu/gfx10: refine mgcg setting
Alexander Monakov <[email protected]>
drm/amd/display: use correct scale for actual_brightness
Alex Deucher <[email protected]>
drm/amdgpu: Fix buffer overflow in INFO ioctl
Daniel Vetter <[email protected]>
drm/modeset-lock: Take the modeset BKL for legacy drivers
Bhawanpreet Lakha <[email protected]>
drm/dp_mst: Don't return error code when crtc is null
Christian Gmeiner <[email protected]>
drm/etnaviv: fix external abort seen on GC600 rev 0x19
Mika Kuoppala <[email protected]>
drm/i915: Fix cmd parser desc matching with masks
Ashok Raj <[email protected]>
x86/hotplug: Silence APIC only after all interrupts are migrated
Thomas Gleixner <[email protected]>
x86/irq: Unbreak interrupt affinity setting
qiuguorui1 <[email protected]>
irqchip/stm32-exti: Avoid losing interrupts due to clearing pending bits by mistake
Thomas Gleixner <[email protected]>
genirq/matrix: Deal with the sillyness of for_each_cpu() on UP
M. Vefa Bicakci <[email protected]>
usbip: Implement a match function to fix usbip
Herbert Xu <[email protected]>
crypto: af_alg - Work around empty control messages without MSG_MORE
Heikki Krogerus <[email protected]>
device property: Fix the secondary firmware node handling in set_primary_fwnode()
Alexey Kardashevskiy <[email protected]>
powerpc/perf: Fix crashes with generic_compat_pmu & BHRB
Christophe Leroy <[email protected]>
powerpc/32s: Disable VMAP stack which CONFIG_ADB_PMU
Rafael J. Wysocki <[email protected]>
PM: sleep: core: Fix the handling of pending runtime resume requests
Frank van der Linden <[email protected]>
arm64: vdso32: make vdso32 install conditional
James Morse <[email protected]>
KVM: arm64: Set HCR_EL2.PTW to prevent AT taking synchronous exception
Pavel Begunkov <[email protected]>
io-wq: fix hang after cancelling pending hashed work
Ding Hui <[email protected]>
xhci: Always restore EP_SOFT_CLEAR_TOGGLE even if ep reset failed
Kai-Heng Feng <[email protected]>
xhci: Do warm-reset when both CAS and XDEV_RESUME are set
Li Jun <[email protected]>
usb: host: xhci: fix ep context print mismatch in debugfs
JC Kuo <[email protected]>
usb: host: xhci-tegra: fix tegra_xusb_get_phy()
JC Kuo <[email protected]>
usb: host: xhci-tegra: otg usb2/usb3 port init
Vinod Koul <[email protected]>
usb: renesas-xhci: remove version check
Thomas Gleixner <[email protected]>
XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information.
Jan Kara <[email protected]>
writeback: Fix sync livelock due to b_dirty_time processing
Jan Kara <[email protected]>
writeback: Avoid skipping inode writeback
Jan Kara <[email protected]>
writeback: Protect inode->i_io_list with inode->i_lock
Jens Axboe <[email protected]>
io_uring: clear req->result on IOPOLL re-issue
Sergey Senozhatsky <[email protected]>
serial: 8250: change lock order in serial8250_do_startup()
Valmer Huhn <[email protected]>
serial: 8250_exar: Fix number of ports for Commtech PCIe cards
Holger Assmann <[email protected]>
serial: stm32: avoid kernel warning on absence of optional IRQ
Lukas Wunner <[email protected]>
serial: pl011: Don't leak amba_ports entry on driver register error
Lukas Wunner <[email protected]>
serial: pl011: Fix oops on -EPROBE_DEFER
Tamseel Shams <[email protected]>
serial: samsung: Removes the IRQ not found warning
George Kennedy <[email protected]>
vt_ioctl: change VT_RESIZEX ioctl to check for error return from vc_resize()
Tetsuo Handa <[email protected]>
vt: defer kfree() of vc_screenbuf in vc_do_resize()
Evgeny Novikov <[email protected]>
USB: lvtest: return proper error code in probe
George Kennedy <[email protected]>
fbcon: prevent user font height or width change from causing potential out-of-bounds access
Boris Burkov <[email protected]>
btrfs: detect nocow for swap after snapshot delete
Filipe Manana <[email protected]>
btrfs: fix space cache memory leak after transaction abort
Josef Bacik <[email protected]>
btrfs: check the right error variable in btrfs_del_dir_entries_in_log
Marcos Paulo de Souza <[email protected]>
btrfs: reset compression level for lzo on remount
Ming Lei <[email protected]>
blk-mq: order adding requests to hctx->dispatch and checking SCHED_RESTART
Hans de Goede <[email protected]>
HID: i2c-hid: Always sleep 60ms after I2C_HID_PWR_ON commands
Ming Lei <[email protected]>
block: loop: set discard granularity and alignment for block device backed loop
Keith Busch <[email protected]>
block: fix get_max_io_size()
Tim Harvey <[email protected]>
hwmon: (gsc-hwmon) Scale temperature to millidegrees
Marc Zyngier <[email protected]>
arm64: Allow booting of late CPUs affected by erratum 1418040
Marc Zyngier <[email protected]>
arm64: Move handling of erratum 1418040 into C code
Yauheni Kaliuta <[email protected]>
bpf: selftests: global_funcs: Check err_str before strstr
Toke Høiland-Jørgensen <[email protected]>
libbpf: Fix map index used in error message
Athira Rajeev <[email protected]>
powerpc/perf: Fix soft lockups due to missed interrupt accounting
brookxu <[email protected]>
ext4: limit the length of per-inode prealloc list
Yonghong Song <[email protected]>
bpf: Avoid visit same object multiple times
Yonghong Song <[email protected]>
bpf: Fix a rcu_sched stall issue with bpf task/task_file iterator
Huang Rui <[email protected]>
drm/amdkfd: fix the wrong sdma instance query for renoir
Guchun Chen <[email protected]>
drm/amdgpu: fix NULL pointer access issue when unloading driver
Sumera Priyadarsini <[email protected]>
net: gianfar: Add of_node_put() before goto statement
Alvin Šipraga <[email protected]>
macvlan: validate setting of multiple remote source MAC addresses
Saurav Kashyap <[email protected]>
Revert "scsi: qla2xxx: Fix crash on qla2x00_mailbox_command"
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix null pointer access during disconnect from subsystem
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Check if FW supports MQ before enabling
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix login timeout
Quinn Tran <[email protected]>
scsi: qla2xxx: Indicate correct supported speeds for Mezz card
Quinn Tran <[email protected]>
scsi: qla2xxx: Flush I/O on zone disable
Quinn Tran <[email protected]>
scsi: qla2xxx: Flush all sessions on zone disable
Douglas Gilbert <[email protected]>
scsi: scsi_debug: Fix scp is NULL errors
Stanley Chu <[email protected]>
scsi: ufs: Clean up completed request without interrupt notification
Adrian Hunter <[email protected]>
scsi: ufs: Improve interrupt handling for shared interrupts
Stanley Chu <[email protected]>
scsi: ufs: Fix possible infinite loop in ufshcd_hold
Mike Christie <[email protected]>
scsi: fcoe: Fix I/O path allocation
David Ahern <[email protected]>
selftests: disable rp_filter for icmp_redirect.sh
Tom Yan <[email protected]>
ALSA: usb-audio: ignore broken processing/extension unit
Sylwester Nawrocki <[email protected]>
ASoC: wm8994: Avoid attempts to read unreadable registers
Vineeth Vijayan <[email protected]>
s390/cio: add cond_resched() in the slow_eval_known_fn() loop
Mike Pozulp <[email protected]>
ALSA: hda/realtek: Add model alc298-samsung-headphone
Xie He <[email protected]>
drivers/net/wan/hdlc_x25: Added needed_headroom and a skb->len check
Nicolas Saenz Julienne <[email protected]>
dma-pool: Only allocate from CMA when in same memory zone
Christoph Hellwig <[email protected]>
dma-pool: fix coherent pool allocations for IOMMU mappings
Oleksij Rempel <[email protected]>
can: j1939: transport: j1939_xtp_rx_dat_one(): compare own packets to detect corruptions
Andrii Nakryiko <[email protected]>
selftests/bpf: Correct various core_reloc 64-bit assumptions
Andrii Nakryiko <[email protected]>
selftests/bpf: Fix btf_dump test cases on 32-bit arches
Andrii Nakryiko <[email protected]>
selftest/bpf: Fix compilation warnings in 32-bit mode
Andrii Nakryiko <[email protected]>
tools/bpftool: Fix compilation warnings in 32-bit mode
Toke Høiland-Jørgensen <[email protected]>
libbpf: Prevent overriding errno when logging errors
Florian Westphal <[email protected]>
netfilter: avoid ipv6 -> nf_defrag_ipv6 module dependency
Jean-Philippe Brucker <[email protected]>
libbpf: Handle GCC built-in types for Arm NEON
Jianlin Lv <[email protected]>
selftests/bpf: Fix segmentation fault in test_progs
Anthony Koo <[email protected]>
drm/amd/display: Switch to immediate mode for updating infopackets
Anthony Koo <[email protected]>
drm/amd/display: Fix LFC multiplier changing erratically
Evan Quan <[email protected]>
drm/amd/powerplay: correct UVD/VCE PG state on custom pptable uploading
Evan Quan <[email protected]>
drm/amd/powerplay: correct Vega20 cached smu feature state
Alain Volmat <[email protected]>
spi: stm32: always perform registers configuration prior to transfer
Amelie Delaunay <[email protected]>
spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate
Amelie Delaunay <[email protected]>
spi: stm32: fix fifo threshold level in case of short transfer
Antonio Borneo <[email protected]>
spi: stm32h7: fix race condition at end of transfer
Xianting Tian <[email protected]>
fs: prevent BUG_ON in submit_bh_wbc()
Jan Kara <[email protected]>
ext4: correctly restore system zone info when remount fails
Jan Kara <[email protected]>
ext4: handle error of ext4_setup_system_zone() on remount
Lukas Czerner <[email protected]>
ext4: handle option set by mount flags correctly
zhangyi (F) <[email protected]>
jbd2: abort journal if free a async write error metadata buffer
zhangyi (F) <[email protected]>
ext4: abort the filesystem if failed to async write metadata buffer
Xin He <[email protected]>
drm/virtio: fix memory leak in virtio_gpu_cleanup_object()
Alex Zhuravlev <[email protected]>
ext4: skip non-loaded groups at cr=0/1 when scanning for good groups
Lukas Czerner <[email protected]>
ext4: handle read only external journal device
Jan Kara <[email protected]>
ext4: don't BUG on inconsistent journal feature
Lukas Czerner <[email protected]>
jbd2: make sure jh have b_transaction set in refile/unfile_buffer
Tobias Schramm <[email protected]>
spi: stm32: clear only asserted irq flags on interrupt
Michael Ellerman <[email protected]>
video: fbdev: controlfb: Fix build for COMPILE_TEST=y && PPC_PMAC=n
Christophe JAILLET <[email protected]>
usb: gadget: f_tcm: Fix some resource leaks in some error paths
Jason Wang <[email protected]>
vdpa: ifcvf: free config irq in ifcvf_free_irq()
Jason Wang <[email protected]>
vdpa: ifcvf: return err when fail to request config irq
Wolfram Sang <[email protected]>
i2c: rcar: in slave mode, clear NACK earlier
Andy Shevchenko <[email protected]>
i2c: core: Don't fail PRP0001 enumeration when no ID table exist
Lucas Stach <[email protected]>
drm/etnaviv: always start/stop scheduler in timeout processing
Dan Carpenter <[email protected]>
habanalabs: Fix memory corruption in debugfs
Hou Pu <[email protected]>
null_blk: fix passing of REQ_FUA flag in null_handle_rq
Martin Wilck <[email protected]>
nvme: multipath: round-robin: fix single non-optimized path case
Tianjia Zhang <[email protected]>
nvme-fc: Fix wrong return value in __nvme_fc_init_request()
Sagi Grimberg <[email protected]>
nvmet: fix a memory leak
Yufen Yu <[email protected]>
blkcg: fix memleak for iolatency
Ming Lei <[email protected]>
blk-mq: insert request not through ->queue_rq into sw/scheduler queue
Jason Baron <[email protected]>
hwmon: (nct7904) Correct divide by 0
Dmitry Monakhov <[email protected]>
bfq: fix blkio cgroup leakage v4
Matthew Wilcox (Oracle) <[email protected]>
block: Fix page_is_mergeable() for compound pages
Rob Clark <[email protected]>
drm/msm/adreno: fix updating ring fence
Ming Lei <[email protected]>
block: virtio_blk: fix handling single range discard request
Ming Lei <[email protected]>
block: respect queue limit of max discard segment
J. Bruce Fields <[email protected]>
nfsd: fix oops on mixed NFSv4/NFSv3 client access
Alexander Tsoy <[email protected]>
ALSA: usb-audio: Add capture support for Saffire 6 (USB 1.1)
Rafael J. Wysocki <[email protected]>
cpufreq: intel_pstate: Fix EPP setting via sysfs in active mode
Chanwoo Choi <[email protected]>
PM / devfreq: Fix the wrong end with semicolon
Ansuel Smith <[email protected]>
PCI: qcom: Add missing reset for ipq806x
Abhishek Sahu <[email protected]>
PCI: qcom: Change duplicate PCI reset to phy reset
Ansuel Smith <[email protected]>
PCI: qcom: Add missing ipq806x clocks in PCIe driver
Tonghao Zhang <[email protected]>
net: openvswitch: introduce common code for flushing flows
Kefeng Wang <[email protected]>
arm64: Fix __cpu_logical_map undefined issue
Andrey Konovalov <[email protected]>
efi: provide empty efi_enter_virtual_mode implementation
Randy Dunlap <[email protected]>
pinctrl: mediatek: fix build for tristate changes
Hanks Chen <[email protected]>
pinctrl: mediatek: avoid virtual gpio trying to set reg
Nicolas Saenz Julienne <[email protected]>
brcmfmac: Set timeout value when configuring power save
Manish Narani <[email protected]>
mmc: sdhci-of-arasan: fix timings allocation code
Changming Liu <[email protected]>
USB: sisusbvga: Fix a potential UB casued by left shifting a negative value
Sasha Levin <[email protected]>
dmaengine: idxd: fix PCI_MSI build errors
Arnd Bergmann <[email protected]>
powerpc/spufs: add CONFIG_COREDUMP dependency
David Brazdil <[email protected]>
KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe
Qingqing Zhuo <[email protected]>
drm/amd/display: fix compilation error on allmodconfig
Lewis Huang <[email protected]>
drm/amd/display: change global buffer to local buffer
Andrey Konovalov <[email protected]>
media: i2c: imx290: fix reset GPIO pin handling
Evgeny Novikov <[email protected]>
media: davinci: vpif_capture: fix potential double free
Mike Kravetz <[email protected]>
hugetlbfs: prevent filesystem stacking of hugetlbfs
Jason Baron <[email protected]>
EDAC/ie31200: Fallback if host bridge device is already initialized
Jarkko Nikula <[email protected]>
i2c: i801: Add support for Intel Tiger Lake PCH-H
Javed Hasan <[email protected]>
scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del()
Xiubo Li <[email protected]>
ceph: do not access the kiocb after aio requests
Xiubo Li <[email protected]>
ceph: fix potential mdsc use-after-free crash
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: report EEXIST on overlaps
Jing Xiangfeng <[email protected]>
scsi: iscsi: Do not put host in iscsi_set_flashnode_param()
Nikolay Borisov <[email protected]>
btrfs: make btrfs_qgroup_check_reserved_leak take btrfs_inode
Qu Wenruo <[email protected]>
btrfs: file: reserve qgroup space after the hole punch range is locked
Chris Wilson <[email protected]>
locking/lockdep: Fix overflow in presentation of average lock-time
Aditya Pakki <[email protected]>
drm/nouveau: Fix reference count leak in nouveau_connector_detect
Aditya Pakki <[email protected]>
drm/nouveau: fix reference count leak in nv50_disp_atomic_commit
Aditya Pakki <[email protected]>
drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open
Li Guifu <[email protected]>
f2fs: fix use-after-free issue
Ikjoon Jang <[email protected]>
HID: quirks: add NOGET quirk for Logitech GROUP
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: sof_sdw_rt711: remove properties in card remove
Hans Verkuil <[email protected]>
cec-api: prevent leaking memory through hole in structure
Dmitry Osipenko <[email protected]>
gpu: host1x: Put gather's BO on pinning error
Kaige Li <[email protected]>
ALSA: hda: Add support for Loongson 7A1000 controller
Peng Fan <[email protected]>
mips/vdso: Fix resource leaks in genvdso.c
Reto Schneider <[email protected]>
rtlwifi: rtl8192cu: Prevent leaking urb
Yangbo Lu <[email protected]>
ARM: dts: ls1021a: output PPS signal on FIPER2
Qiushi Wu <[email protected]>
PCI: Fix pci_create_slot() reference count leak
Aditya Pakki <[email protected]>
omapfb: fix multiple reference count leaks due to pm_runtime_get_sync
Jiaxun Yang <[email protected]>
MIPS: KVM: Limit Trap-and-Emulate to MIPS32R2 only
Chao Yu <[email protected]>
f2fs: fix error path in do_recover_data()
Dehe Gu <[email protected]>
f2fs: remove write attribute of main_blkaddr sysfs node
Desnes A. Nunes do Rosario <[email protected]>
selftests/powerpc: Purge extra count_pmc() calls of ebb selftests
Mike Christie <[email protected]>
scsi: target: Fix xcopy sess release leak
Dave Chinner <[email protected]>
xfs: Don't allow logging of XFS_ISTALE inodes
Dick Kennedy <[email protected]>
scsi: lpfc: Fix shost refcount mismatch when deleting vport
Alex Deucher <[email protected]>
drm/amdgpu/pm: fix ref count leak when pm_runtime_get_sync fails
Alex Deucher <[email protected]>
drm/amdkfd: fix ref count leak when pm_runtime_get_sync fails
Alex Deucher <[email protected]>
drm/amdgpu/fence: fix ref count leak when pm_runtime_get_sync fails
Navid Emamdoost <[email protected]>
drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails
Navid Emamdoost <[email protected]>
drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config
Navid Emamdoost <[email protected]>
drm/amd/display: fix ref count leak in amdgpu_drm_ioctl
Navid Emamdoost <[email protected]>
drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms
Aditya Pakki <[email protected]>
drm/radeon: fix multiple reference count leak
Qiushi Wu <[email protected]>
drm/amdkfd: Fix reference count leaks.
Gwendal Grignou <[email protected]>
platform/chrome: cros_ec_sensorhub: Fix EC timestamp overflow
Robin Murphy <[email protected]>
iommu/iova: Don't BUG on invalid PFNs
Andy Shevchenko <[email protected]>
mfd: intel-lpss: Add Intel Tiger Lake PCH-H PCI IDs
Bodo Stroesser <[email protected]>
scsi: target: tcmu: Fix crash on ARM during cmd completion
Evgeny Novikov <[email protected]>
staging: rts5208: fix memleaks on error handling paths in probe
Luis Chamberlain <[email protected]>
blktrace: ensure our debugfs dir exists
Alexander Popov <[email protected]>
gcc-plugins/stackleak: Don't instrument itself
Jia-Ju Bai <[email protected]>
media: pci: ttpci: av7110: fix possible buffer overflow caused by bad DMA value in debiirq()
Alexey Kardashevskiy <[email protected]>
powerpc/xive: Ignore kmemleak false positives
Stephan Gerhold <[email protected]>
arm64: dts: qcom: msm8916: Pull down PDM GPIOs during sleep
Andy Shevchenko <[email protected]>
mfd: intel-lpss: Add Intel Emmitsburg PCH PCI IDs
Qiushi Wu <[email protected]>
ASoC: tegra: Fix reference count leaks.
Qiushi Wu <[email protected]>
ASoC: img-parallel-out: Fix a reference count leak
Qiushi Wu <[email protected]>
ASoC: img: Fix a reference count leak in img_i2s_in_set_fmt
Zhenzhong Duan <[email protected]>
EDAC/mc: Call edac_inc_ue_error() before panic
Guchun Chen <[email protected]>
drm/amdgpu: fix RAS memory leak in error case
Kai-Heng Feng <[email protected]>
ALSA: hda/hdmi: Use force connectivity quirk on another HP desktop
Kai-Heng Feng <[email protected]>
ALSA: hda/realtek: Fix pin default on Intel NUC 8 Rugged
Randy Dunlap <[email protected]>
ALSA: pci: delete repeated words in comments
Kai-Heng Feng <[email protected]>
ALSA: hda/hdmi: Add quirk to force connectivity
Kai Vehmanen <[email protected]>
ASoC: intel/skl/hda - fix probe regression on systems without i915
Hugh Dickins <[email protected]>
khugepaged: khugepaged_test_exit() check mmget_still_valid()
-------------
Diffstat:
Documentation/admin-guide/ext4.rst | 3 + Makefile | 4 +- arch/arm/boot/dts/ls1021a.dtsi | 2 +- arch/arm64/Makefile | 3 +- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 2 +- arch/arm64/include/asm/kvm_arm.h | 3 +- arch/arm64/include/asm/smp.h | 7 +- arch/arm64/kernel/cpu_errata.c | 2 + arch/arm64/kernel/entry.S | 21 -- arch/arm64/kernel/process.c | 34 ++++ arch/arm64/kernel/setup.c | 8 +- arch/arm64/kernel/smp.c | 6 +- arch/arm64/kvm/hyp/switch.c | 2 +- arch/mips/Kconfig | 1 + arch/mips/kvm/Kconfig | 3 +- arch/mips/vdso/genvdso.c | 10 + arch/powerpc/perf/core-book3s.c | 23 ++- arch/powerpc/platforms/Kconfig.cputype | 2 +- arch/powerpc/platforms/cell/Kconfig | 1 + arch/powerpc/sysdev/xive/native.c | 2 + arch/x86/kernel/apic/vector.c | 16 +- arch/x86/kernel/smpboot.c | 26 ++- block/bfq-cgroup.c | 2 +- block/bfq-iosched.h | 1 - block/bfq-wf2q.c | 12 +- block/bio.c | 10 +- block/blk-cgroup.c | 8 +- block/blk-merge.c | 13 +- block/blk-mq-sched.c | 9 + block/blk-mq.c | 12 +- crypto/af_alg.c | 13 +- drivers/base/core.c | 12 +- drivers/base/power/main.c | 16 +- drivers/block/loop.c | 33 ++-- drivers/block/null_blk_main.c | 2 +- drivers/block/virtio_blk.c | 31 ++- drivers/cpufreq/intel_pstate.c | 18 +- drivers/devfreq/devfreq.c | 4 +- drivers/dma/Kconfig | 1 + drivers/edac/edac_mc.c | 4 +- drivers/edac/ie31200_edac.c | 50 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 31 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 220 +++++++++++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 21 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 20 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 81 ++++---- .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 10 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 16 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 14 ++ drivers/gpu/drm/amd/display/modules/color/Makefile | 2 +- .../drm/amd/display/modules/color/color_gamma.c | 115 ++++++----- .../drm/amd/display/modules/color/color_gamma.h | 18 +- .../drm/amd/display/modules/color/color_table.c | 48 +++++ .../drm/amd/display/modules/color/color_table.h | 47 +++++ .../drm/amd/display/modules/freesync/freesync.c | 36 +++- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 9 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 22 ++- .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 21 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 44 ++--- .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 21 +- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 7 +- drivers/gpu/drm/arm/malidp_drv.c | 1 - drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 7 +- drivers/gpu/drm/drm_atomic_helper.c | 7 +- drivers/gpu/drm/drm_atomic_state_helper.c | 4 + drivers/gpu/drm/drm_color_mgmt.c | 2 +- drivers/gpu/drm/drm_crtc.c | 4 +- drivers/gpu/drm/drm_dp_mst_topology.c | 4 +- drivers/gpu/drm/drm_mode_object.c | 4 +- drivers/gpu/drm/drm_plane.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 11 +- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 11 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 14 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 2 - drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- drivers/gpu/drm/omapdrm/omap_crtc.c | 8 +- drivers/gpu/drm/omapdrm/omap_drv.c | 4 - drivers/gpu/drm/radeon/radeon_connectors.c | 20 +- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +- drivers/gpu/drm/tegra/dc.c | 1 - drivers/gpu/drm/tidss/tidss_crtc.c | 3 +- drivers/gpu/drm/tidss/tidss_kms.c | 5 - drivers/gpu/drm/virtio/virtgpu_object.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 +- drivers/gpu/host1x/job.c | 13 +- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + drivers/hid/i2c-hid/i2c-hid-core.c | 22 ++- drivers/hid/usbhid/hiddev.c | 4 + drivers/hwmon/gsc-hwmon.c | 1 + drivers/hwmon/nct7904.c | 4 +- drivers/i2c/busses/i2c-i801.c | 4 + drivers/i2c/busses/i2c-rcar.c | 1 + drivers/i2c/i2c-core-base.c | 2 +- drivers/iommu/dma-iommu.c | 4 +- drivers/iommu/iova.c | 4 +- drivers/irqchip/irq-stm32-exti.c | 14 +- drivers/media/cec/core/cec-api.c | 8 +- drivers/media/i2c/imx290.c | 7 +- drivers/media/pci/ttpci/av7110.c | 5 +- drivers/media/platform/davinci/vpif_capture.c | 2 - drivers/mfd/intel-lpss-pci.c | 19 ++ drivers/misc/habanalabs/debugfs.c | 8 +- drivers/mmc/host/sdhci-of-arasan.c | 25 +-- drivers/net/ethernet/freescale/gianfar.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- drivers/net/macvlan.c | 21 +- drivers/net/wan/hdlc.c | 1 + drivers/net/wan/hdlc_x25.c | 17 +- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 8 + drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +- drivers/nvme/host/fc.c | 4 +- drivers/nvme/host/multipath.c | 15 +- drivers/nvme/target/configfs.c | 1 + drivers/pci/controller/dwc/pcie-qcom.c | 58 +++++- drivers/pci/slot.c | 6 +- drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 26 +++ drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 1 + drivers/pinctrl/mediatek/pinctrl-paris.c | 7 + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 4 +- drivers/s390/cio/css.c | 5 + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 26 +-- drivers/scsi/qla2xxx/qla_gs.c | 48 ++++- drivers/scsi/qla2xxx/qla_mbx.c | 8 - drivers/scsi/qla2xxx/qla_nvme.c | 5 + drivers/scsi/qla2xxx/qla_os.c | 5 + drivers/scsi/qla2xxx/qla_target.c | 2 +- drivers/scsi/scsi_debug.c | 2 + drivers/scsi/scsi_transport_iscsi.c | 2 +- drivers/scsi/ufs/ufshcd.c | 14 +- drivers/spi/spi-stm32.c | 73 +++---- drivers/staging/rts5208/rtsx.c | 1 + drivers/target/target_core_internal.h | 1 + drivers/target/target_core_transport.c | 7 +- drivers/target/target_core_user.c | 9 +- drivers/target/target_core_xcopy.c | 11 +- drivers/tty/serial/8250/8250_exar.c | 24 ++- drivers/tty/serial/8250/8250_port.c | 9 +- drivers/tty/serial/amba-pl011.c | 16 +- drivers/tty/serial/samsung_tty.c | 8 +- drivers/tty/serial/stm32-usart.c | 2 +- drivers/tty/vt/vt.c | 5 +- drivers/tty/vt/vt_ioctl.c | 12 +- drivers/usb/class/cdc-acm.c | 22 +-- drivers/usb/core/driver.c | 40 +++- drivers/usb/core/generic.c | 5 +- drivers/usb/core/quirks.c | 7 + drivers/usb/dwc3/gadget.c | 107 ++++++++-- drivers/usb/gadget/function/f_ncm.c | 81 ++++++-- drivers/usb/gadget/function/f_tcm.c | 7 +- drivers/usb/gadget/u_f.h | 38 ++-- drivers/usb/host/ohci-exynos.c | 5 +- drivers/usb/host/xhci-debugfs.c | 8 +- drivers/usb/host/xhci-hub.c | 19 +- drivers/usb/host/xhci-pci-renesas.c | 19 +- drivers/usb/host/xhci-tegra.c | 4 +- drivers/usb/host/xhci.c | 3 +- drivers/usb/misc/lvstest.c | 2 +- drivers/usb/misc/sisusbvga/sisusb.c | 2 +- drivers/usb/misc/yurex.c | 2 +- drivers/usb/storage/unusual_devs.h | 2 +- drivers/usb/storage/unusual_uas.h | 14 ++ drivers/usb/typec/tcpm/tcpm.c | 28 ++- drivers/usb/typec/ucsi/displayport.c | 9 +- drivers/usb/typec/ucsi/ucsi.c | 103 +++++----- drivers/usb/usbip/stub_dev.c | 6 + drivers/vdpa/ifcvf/ifcvf_base.h | 2 +- drivers/vdpa/ifcvf/ifcvf_main.c | 9 +- drivers/video/fbdev/controlfb.c | 2 + drivers/video/fbdev/core/fbcon.c | 25 ++- drivers/video/fbdev/core/fbmem.c | 8 +- drivers/video/fbdev/core/fbsysfs.c | 4 +- drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 +- drivers/video/fbdev/omap2/omapfb/dss/venc.c | 7 +- drivers/video/fbdev/ps3fb.c | 5 +- drivers/xen/events/events_base.c | 16 +- fs/btrfs/ctree.h | 4 +- fs/btrfs/disk-io.c | 1 + fs/btrfs/extent-tree.c | 17 +- fs/btrfs/file.c | 10 +- fs/btrfs/free-space-cache.c | 2 +- fs/btrfs/inode.c | 18 +- fs/btrfs/qgroup.c | 14 +- fs/btrfs/qgroup.h | 2 +- fs/btrfs/super.c | 1 + fs/btrfs/tree-log.c | 10 +- fs/buffer.c | 9 + fs/ceph/file.c | 5 +- fs/ceph/mds_client.c | 14 +- fs/ext4/block_validity.c | 8 - fs/ext4/ext4.h | 7 +- fs/ext4/ext4_jbd2.c | 25 +++ fs/ext4/extents.c | 10 +- fs/ext4/file.c | 2 +- fs/ext4/indirect.c | 2 +- fs/ext4/inode.c | 6 +- fs/ext4/ioctl.c | 2 +- fs/ext4/mballoc.c | 95 ++++++++- fs/ext4/mballoc.h | 4 + fs/ext4/move_extent.c | 4 +- fs/ext4/super.c | 195 ++++++++++++------ fs/ext4/sysfs.c | 2 + fs/f2fs/f2fs.h | 4 +- fs/f2fs/inline.c | 19 +- fs/f2fs/node.c | 6 +- fs/f2fs/recovery.c | 10 +- fs/f2fs/super.c | 5 +- fs/f2fs/sysfs.c | 9 +- fs/fs-writeback.c | 83 ++++---- fs/hugetlbfs/inode.c | 6 + fs/io-wq.c | 21 +- fs/io_uring.c | 40 +++- fs/jbd2/transaction.c | 26 +++ fs/nfsd/nfs4state.c | 2 + fs/xfs/libxfs/xfs_trans_inode.c | 2 + fs/xfs/xfs_icache.c | 3 +- fs/xfs/xfs_inode.c | 25 ++- include/drm/drm_modeset_lock.h | 9 +- include/linux/dma-direct.h | 3 - include/linux/dma-mapping.h | 5 +- include/linux/efi.h | 4 + include/linux/fb.h | 2 - include/linux/fs.h | 8 +- include/linux/netfilter_ipv6.h | 18 -- include/trace/events/ext4.h | 17 +- include/trace/events/writeback.h | 13 +- kernel/Makefile | 1 + kernel/bpf/bpf_iter.c | 15 +- kernel/bpf/task_iter.c | 3 +- kernel/dma/direct.c | 13 +- kernel/dma/pool.c | 147 +++++++------- kernel/irq/matrix.c | 7 + kernel/locking/lockdep_proc.c | 2 +- kernel/trace/blktrace.c | 12 ++ mm/khugepaged.c | 5 +- mm/page_counter.c | 13 +- net/bridge/netfilter/nf_conntrack_bridge.c | 8 +- net/can/j1939/transport.c | 15 +- net/ipv6/netfilter.c | 3 - net/netfilter/nf_tables_api.c | 16 +- net/openvswitch/datapath.c | 10 +- net/openvswitch/flow_table.c | 35 ++-- net/openvswitch/flow_table.h | 3 + sound/pci/cs46xx/cs46xx_lib.c | 2 +- sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/hda_intel.c | 2 + sound/pci/hda/patch_hdmi.c | 17 +- sound/pci/hda/patch_realtek.c | 12 ++ sound/pci/hda/patch_sigmatel.c | 2 +- sound/pci/ice1712/prodigy192.c | 2 +- sound/pci/oxygen/xonar_dg.c | 2 +- sound/soc/codecs/wm8958-dsp2.c | 4 + sound/soc/img/img-i2s-in.c | 4 +- sound/soc/img/img-parallel-out.c | 4 +- sound/soc/intel/boards/skl_hda_dsp_common.h | 1 + sound/soc/intel/boards/skl_hda_dsp_generic.c | 17 +- sound/soc/intel/boards/sof_sdw.c | 1 + sound/soc/intel/boards/sof_sdw_common.h | 1 + sound/soc/intel/boards/sof_sdw_rt711.c | 15 ++ sound/soc/tegra/tegra30_ahub.c | 4 +- sound/soc/tegra/tegra30_i2s.c | 4 +- sound/usb/mixer.c | 8 +- sound/usb/quirks-table.h | 34 +++- tools/bpf/bpftool/btf_dumper.c | 2 +- tools/bpf/bpftool/link.c | 4 +- tools/bpf/bpftool/main.h | 10 +- tools/bpf/bpftool/prog.c | 16 +- tools/lib/bpf/btf_dump.c | 35 +++- tools/lib/bpf/libbpf.c | 14 +- .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 8 +- tools/testing/selftests/bpf/prog_tests/btf_dump.c | 27 ++- .../testing/selftests/bpf/prog_tests/core_extern.c | 4 +- .../testing/selftests/bpf/prog_tests/core_reloc.c | 20 +- .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 6 +- .../selftests/bpf/prog_tests/flow_dissector.c | 2 +- .../testing/selftests/bpf/prog_tests/global_data.c | 6 +- tools/testing/selftests/bpf/prog_tests/mmap.c | 19 +- .../selftests/bpf/prog_tests/prog_run_xattr.c | 2 +- tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 2 +- .../selftests/bpf/prog_tests/test_global_funcs.c | 2 +- .../testing/selftests/bpf/progs/core_reloc_types.h | 69 ++++--- tools/testing/selftests/bpf/test_btf.c | 8 +- tools/testing/selftests/bpf/test_progs.h | 5 + tools/testing/selftests/net/icmp_redirect.sh | 2 + .../powerpc/pmu/ebb/back_to_back_ebbs_test.c | 2 - .../selftests/powerpc/pmu/ebb/cycles_test.c | 2 - .../powerpc/pmu/ebb/cycles_with_freeze_test.c | 2 - .../powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 2 - tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 2 - .../powerpc/pmu/ebb/ebb_on_willing_child_test.c | 2 - .../powerpc/pmu/ebb/lost_exception_test.c | 1 - .../selftests/powerpc/pmu/ebb/multi_counter_test.c | 7 - .../powerpc/pmu/ebb/multi_ebb_procs_test.c | 2 - .../selftests/powerpc/pmu/ebb/pmae_handling_test.c | 2 - .../powerpc/pmu/ebb/pmc56_overflow_test.c | 2 - 314 files changed, 2904 insertions(+), 1353 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 17/255 blktrace: ensure our debugfs dir exists
From: Luis Chamberlain <[email protected]>
[ Upstream commit b431ef837e3374da0db8ff6683170359aaa0859c ]
We make an assumption that a debugfs directory exists, but since this can fail ensure it exists before allowing blktrace setup to complete. Otherwise we end up stuffing blktrace files on the debugfs root directory. In the worst case scenario this *in theory* can create an eventual panic *iff* in the future a similarly named file is created prior on the debugfs root directory. This theoretical crash can happen due to a recursive removal followed by a specific dentry removal.
This doesn't fix any known crash, however I have seen the files go into the main debugfs root directory in cases where the debugfs directory was not created due to other internal bugs with blktrace now fixed.
blktrace is also completely useless without this directory, so this ensures to userspace we only setup blktrace if the kernel can stuff files where they are supposed to go into.
debugfs directory creations typically aren't checked for, and we have maintainers doing sweep removals of these checks, but since we need this check to ensure proper userspace blktrace functionality we make sure to annotate the justification for the check.
--- kernel/trace/blktrace.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
kernel/trace/blktrace.c +12 -0
@@ -536,6 +536,18 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,#endif bt->dir = dir =debugfs_create_dir (buts->name, blk_debugfs_root); +/* +* As blktrace relies on debugfs for its interface the debugfs directory +* is required, contrary to the usual mantra of not checking for debugfs +* files or directories. +*/ +if (IS_ERR_OR_NULL (dir)) { +pr_warn ("debugfs_dir not present for %s so skipping\n" , + buts->name); + ret = -ENOENT ; + goto err; + } + bt->dev = dev;atomic_set (&bt->dropped,0 );INIT_LIST_HEAD (&bt->running_list);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 26/255 drm/amd/display: fix ref count leak in amdgpu_drm_ioctl
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 5509ac65f2fe5aa3c0003237ec629ca55024307c ]
in amdgpu_drm_ioctl the call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect
ref count. In case of failure, decrement the ref count before returning.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -1
@@ -1373,11 +1373,12 @@ long amdgpu_drm_ioctl(struct file *filp, dev = file_priv->minor->dev; ret =pm_runtime_get_sync (dev->dev);if (ret <0 ) -return ret; + goto out; ret =drm_ioctl (filp, cmd, arg);pm_runtime_mark_last_busy (dev->dev); +out:pm_runtime_put_autosuspend (dev->dev);return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 27/255 drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit e008fa6fb41544b63973a529b704ef342f47cc65 ]
in amdgpu_display_crtc_set_config, the call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect ref count. In case of failure, decrement the ref count before returning.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +3 -2
@@ -282,7 +282,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, ret =pm_runtime_get_sync (dev->dev);if (ret <0 ) -return ret; + goto out; ret =drm_crtc_helper_set_config (set, ctx);
@@ -297,7 +297,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set,take the current one */ if (active && !adev->have_disp_power_ref) { adev->have_disp_power_ref = true; -return ret; + goto out; }/* if we have no active crtcs, then drop the power ref we got before */
@@ -306,6 +306,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, adev->have_disp_power_ref = false; } +out:/* drop the power reference we got coming in here */ pm_runtime_put_autosuspend (dev->dev);return ret;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 18/255 staging: rts5208: fix memleaks on error handling paths in probe
In reply to Greg Kroah-HartmanFrom: Evgeny Novikov <[email protected]>
[ Upstream commit 11507bf9a8832741db69efd32bf09a2ab26426bf ]
rtsx_probe() allocates host, but does not free it on error handling paths. The patch adds missed scsi_host_put().
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/staging/rts5208/rtsx.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/rts5208/rtsx.c +1 -0
@@ -972,6 +972,7 @@ ioremap_fail:kfree (dev->chip); chip_alloc_fail:dev_err (&pci->dev,"%s failed\n" , __func__); +scsi_host_put (host); scsi_host_alloc_fail:pci_release_regions (pci);return err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 38/255 MIPS: KVM: Limit Trap-and-Emulate to MIPS32R2 only
In reply to Greg Kroah-HartmanFrom: Jiaxun Yang <[email protected]>
[ Upstream commit 01edc5e76ecfecf9a79eec2658f6146ef47bc816 ]
After tons of fixes to get Trap-and-Emulate build on Loongson64, I've got panic on host machine when trying to run a VM.
I found that it can never work on 64bit systems. Revewing the code, it looks like R6 can't supportrd by TE as well.
Message-Id: <[email protected]>
--- arch/mips/Kconfig | 1 + arch/mips/kvm/Kconfig | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
arch/mips/Kconfig +1 -0
@@ -2203,6 +2203,7 @@ endchoice config KVM_GUEST bool "KVM Guest Kernel" + depends on CPU_MIPS32_R2 depends on BROKEN_ON_SMP help Select this option if building a guest kernel for KVM (Trap & Emulate)
arch/mips/kvm/Kconfig +2 -1
@@ -37,10 +37,11 @@ choice config KVM_MIPS_TE bool "Trap & Emulate" + depends on CPU_MIPS32_R2 help Use trap and emulate to virtualize 32-bit guests in user mode. This does not require any special hardware Virtualization support beyond - standard MIPS32/64 r2 or later, but it does require the guest kernel + standard MIPS32 r2 or later, but it does require the guest kernel to be configured with CONFIG_KVM_GUEST=y so that it resides in the user address segment.
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 39/255 omapfb: fix multiple reference count leaks due to pm_runtime_get_sync
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
[ Upstream commit 78c2ce9bde70be5be7e3615a2ae7024ed8173087 ]
On calling pm_runtime_get_sync() the reference count of the device is incremented. In case of failure, decrement the reference count before returning the error.
--- drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 7 +++++-- drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 7 +++++-- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 7 +++++-- drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 +++-- drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 +++-- drivers/video/fbdev/omap2/omapfb/dss/venc.c | 7 +++++-- 6 files changed, 26 insertions(+), 12 deletions(-)
drivers/video/fbdev/omap2/omapfb/dss/dispc.c +5 -2
@@ -520,8 +520,11 @@ int dispc_runtime_get(void)DSSDBG ("dispc_runtime_get\n" ); r =pm_runtime_get_sync (&dispc.pdev->dev); -WARN_ON (r <0 ); -return r <0 ? r :0 ; +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&dispc.pdev->dev); +return r; + } +return 0 ; }EXPORT_SYMBOL (dispc_runtime_get);
drivers/video/fbdev/omap2/omapfb/dss/dsi.c +5 -2
@@ -1137,8 +1137,11 @@ static int dsi_runtime_get(struct platform_device *dsidev)DSSDBG ("dsi_runtime_get\n" ); r =pm_runtime_get_sync (&dsi->pdev->dev); -WARN_ON (r <0 ); -return r <0 ? r :0 ; +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&dsi->pdev->dev); +return r; + } +return 0 ; }static void dsi_runtime_put (struct platform_device *dsidev)
drivers/video/fbdev/omap2/omapfb/dss/dss.c +5 -2
@@ -768,8 +768,11 @@ int dss_runtime_get(void)DSSDBG ("dss_runtime_get\n" ); r =pm_runtime_get_sync (&dss.pdev->dev); -WARN_ON (r <0 ); -return r <0 ? r :0 ; +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&dss.pdev->dev); +return r; + } +return 0 ; }void dss_runtime_put (void )
drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c +3 -2
@@ -39,9 +39,10 @@ static int hdmi_runtime_get(void)DSSDBG ("hdmi_runtime_get\n" ); r =pm_runtime_get_sync (&hdmi.pdev->dev); -WARN_ON (r <0 ); -if (r <0 ) +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&hdmi.pdev->dev);return r; + }return 0 ; }
drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c +3 -2
@@ -43,9 +43,10 @@ static int hdmi_runtime_get(void)DSSDBG ("hdmi_runtime_get\n" ); r =pm_runtime_get_sync (&hdmi.pdev->dev); -WARN_ON (r <0 ); -if (r <0 ) +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&hdmi.pdev->dev);return r; + }return 0 ; }
drivers/video/fbdev/omap2/omapfb/dss/venc.c +5 -2
@@ -348,8 +348,11 @@ static int venc_runtime_get(void)DSSDBG ("venc_runtime_get\n" ); r =pm_runtime_get_sync (&venc.pdev->dev); -WARN_ON (r <0 ); -return r <0 ? r :0 ; +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&venc.pdev->dev); +return r; + } +return 0 ; }static void venc_runtime_put (void )
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 42/255 rtlwifi: rtl8192cu: Prevent leaking urb
In reply to Greg Kroah-HartmanFrom: Reto Schneider <[email protected]>
[ Upstream commit 03128643eb5453a798db5770952c73dc64fcaf00 ]
If usb_submit_urb fails the allocated urb should be unanchored and released.
--- drivers/net/wireless/realtek/rtlwifi/usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtlwifi/usb.c +4 -1
@@ -718,8 +718,11 @@ static int _rtl_usb_receive(struct ieee80211_hw *hw)usb_anchor_urb (urb, &rtlusb->rx_submitted); err =usb_submit_urb (urb,GFP_KERNEL ); -if (err) +if (err) { +usb_unanchor_urb (urb); +usb_free_urb (urb); goto err_out; + }usb_free_urb (urb); }return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 45/255 gpu: host1x: Put gathers BO on pinning error
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit fd323e9ef0a19112c0c85b85afc4848c0518174b ]
This patch fixes gather's BO refcounting on a pinning error. Gather's BO won't be leaked now if something goes wrong.
--- drivers/gpu/host1x/job.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/gpu/host1x/job.c +8 -5
@@ -102,6 +102,7 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job) {struct host1x_client *client = job->client;struct device *dev = client->dev; +struct host1x_job_gather *g;struct iommu_domain *domain;unsigned int i;int err;
@@ -184,7 +185,6 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job) }for (i =0 ; i < job->num_gathers; i++) { -struct host1x_job_gather *g = &job->gathers[i];size_t gather_size =0 ;struct scatterlist *sg;struct sg_table *sgt;
@@ -194,6 +194,7 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job)dma_addr_t *phys;unsigned int j; + g = &job->gathers[i]; g->bo =host1x_bo_get (g->bo);if (!g->bo) { err = -EINVAL ;
@@ -213,7 +214,7 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job) sgt =host1x_bo_pin (host->dev, g->bo, phys);if (IS_ERR (sgt)) { err =PTR_ERR (sgt); - goto unpin; + goto put; }if (!IS_ENABLED (CONFIG_TEGRA_HOST1X_FIREWALL ) && host->domain) {
@@ -226,7 +227,7 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job) host->iova_end >> shift, true);if (!alloc) { err = -ENOMEM ; - goto unpin; + goto put; } err = iommu_map_sg(host->domain,
@@ -235,7 +236,7 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job)if (err ==0 ) {__free_iova (&host->iova, alloc); err = -EINVAL ; - goto unpin; + goto put; } job->unpins[job->num_unpins].size = gather_size;
@@ -245,7 +246,7 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job) DMA_TO_DEVICE);if (!err) { err = -ENOMEM ; - goto unpin; + goto put; } job->unpins[job->num_unpins].dir =DMA_TO_DEVICE ;
@@ -263,6 +264,8 @@ static unsigned int pin_job(struct host1x *host, struct host1x_job *job)return 0 ; +put: +host1x_bo_put (g->bo); unpin:host1x_job_unpin (job);return err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 19/255 scsi: target: tcmu: Fix crash on ARM during cmd completion
In reply to Greg Kroah-HartmanFrom: Bodo Stroesser <[email protected]>
[ Upstream commit 5a0c256d96f020e4771f6fd5524b80f89a2d3132 ]
If tcmu_handle_completions() has to process a padding shorter than sizeof(struct tcmu_cmd_entry), the current call to tcmu_flush_dcache_range() with sizeof(struct tcmu_cmd_entry) as length param is wrong and causes crashes on e.g. ARM, because tcmu_flush_dcache_range() in this case calls flush_dcache_page(vmalloc_to_page(start)); with start being an invalid address above the end of the vmalloc'ed area.
The fix is to use the minimum of remaining ring space and sizeof(struct tcmu_cmd_entry) as the length param.
The patch was tested on kernel 4.19.118.
See https://bugzilla.kernel.org/show_bug.cgi?id=208045#c10
--- drivers/target/target_core_user.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/target/target_core_user.c +8 -1
@@ -1220,7 +1220,14 @@ static unsigned int tcmu_handle_completions(struct tcmu_dev *udev)struct tcmu_cmd_entry *entry = (void *) mb +CMDR_OFF + udev->cmdr_last_cleaned; -tcmu_flush_dcache_range (entry,sizeof (*entry)); +/* +* Flush max. up to end of cmd ring since current entry might +* be a padding that is shorter than sizeof(*entry) +*/ +size_t ring_left =head_to_end (udev->cmdr_last_cleaned, + udev->cmdr_size); +tcmu_flush_dcache_range (entry, ring_left <sizeof (*entry) ? + ring_left :sizeof (*entry));if (tcmu_hdr_get_op (entry->hdr.len_op) ==TCMU_OP_PAD ) { UPDATE_HEAD(udev->cmdr_last_cleaned,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 46/255 cec-api: prevent leaking memory through hole in structure
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 6c42227c3467549ddc65efe99c869021d2f4a570 ]
Fix this smatch warning:
drivers/media/cec/core/cec-api.c:156 cec_adap_g_log_addrs() warn: check that 'log_addrs' doesn't leak information (struct has a hole after 'features')
--- drivers/media/cec/core/cec-api.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/media/cec/core/cec-api.c +7 -1
@@ -147,7 +147,13 @@ static long cec_adap_g_log_addrs(struct cec_adapter *adap,struct cec_log_addrs log_addrs;mutex_lock (&adap->lock); - log_addrs = adap->log_addrs; +/* +* We use memcpy here instead of assignment since there is a +* hole at the end of struct cec_log_addrs that an assignment +* might ignore. So when we do copy_to_user() we could leak +* one byte of memory. +*/ +memcpy (&log_addrs, &adap->log_addrs,sizeof (log_addrs));if (!adap->is_configured)memset (log_addrs.log_addr,CEC_LOG_ADDR_INVALID ,sizeof (log_addrs.log_addr));
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 47/255 ASoC: Intel: sof_sdw_rt711: remove properties in card remove
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit cf0418cd06ce42fcf35beb33e315b5a77e596926 ]
The rt711 jack detection properties are set from the machine drivers during the card probe, as done in other ASoC examples.
KASAN reports a use-after-free error when unbinding drivers due to a confusing sequence between the ACPI core, the device core and the SoundWire device cleanups.
Rather than fixing this sequence, follow the recommendation to have the same caller add and remove properties, add an explicit device_remove_properties() in the card .remove() callback.
In future patches the use of device_add/remove_properties will be replaced by a direct handling of a swnode, but the sequence will remain the same.
--- sound/soc/intel/boards/sof_sdw.c | 1 + sound/soc/intel/boards/sof_sdw_common.h | 1 + sound/soc/intel/boards/sof_sdw_rt711.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+)
sound/soc/intel/boards/sof_sdw.c +1 -0
@@ -184,6 +184,7 @@ static struct sof_sdw_codec_info codec_info_list[] = { .direction = {true, true}, .dai_name = "rt711-aif1", .init = sof_sdw_rt711_init, + .exit = sof_sdw_rt711_exit, }, { .id = 0x1308,
sound/soc/intel/boards/sof_sdw_common.h +1 -0
@@ -84,6 +84,7 @@ int sof_sdw_rt711_init(const struct snd_soc_acpi_link_adr *link,struct snd_soc_dai_link *dai_links, struct sof_sdw_codec_info *info, bool playback); +int sof_sdw_rt711_exit (struct device *dev,struct snd_soc_dai_link *dai_link);/* RT700 support */ int sof_sdw_rt700_init(const struct snd_soc_acpi_link_adr *link,
sound/soc/intel/boards/sof_sdw_rt711.c +15 -0
@@ -133,6 +133,21 @@ static int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd)return ret; } +int sof_sdw_rt711_exit (struct device *dev,struct snd_soc_dai_link *dai_link) +{ +struct device *sdw_dev; + + sdw_dev =bus_find_device_by_name (&sdw_bus_type,NULL , + dai_link->codecs[0 ].name); +if (!sdw_dev) +return -EINVAL ; + +device_remove_properties (sdw_dev); +put_device (sdw_dev); + +return 0 ; +} + int sof_sdw_rt711_init(const struct snd_soc_acpi_link_adr *link, struct snd_soc_dai_link *dai_links, struct sof_sdw_codec_info *info,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 23/255 drm/amdkfd: Fix reference count leaks.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 20eca0123a35305e38b344d571cf32768854168c ]
kobject_init_and_add() takes reference even when it fails. If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object.
--- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +15 -5
@@ -632,8 +632,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev, ret =kobject_init_and_add (dev->kobj_node, &node_type, sys_props.kobj_nodes,"%d" , id); -if (ret <0 ) +if (ret <0 ) { +kobject_put (dev->kobj_node);return ret; + } dev->kobj_mem =kobject_create_and_add ("mem_banks" , dev->kobj_node);if (!dev->kobj_mem)
@@ -680,8 +682,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,return -ENOMEM ; ret =kobject_init_and_add (mem->kobj, &mem_type, dev->kobj_mem,"%d" , i); -if (ret <0 ) +if (ret <0 ) { +kobject_put (mem->kobj);return ret; + } mem->attr.name ="properties" ; mem->attr.mode =KFD_SYSFS_FILE_MODE ;
@@ -699,8 +703,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,return -ENOMEM ; ret =kobject_init_and_add (cache->kobj, &cache_type, dev->kobj_cache,"%d" , i); -if (ret <0 ) +if (ret <0 ) { +kobject_put (cache->kobj);return ret; + } cache->attr.name ="properties" ; cache->attr.mode =KFD_SYSFS_FILE_MODE ;
@@ -718,8 +724,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,return -ENOMEM ; ret =kobject_init_and_add (iolink->kobj, &iolink_type, dev->kobj_iolink,"%d" , i); -if (ret <0 ) +if (ret <0 ) { +kobject_put (iolink->kobj);return ret; + } iolink->attr.name ="properties" ; iolink->attr.mode =KFD_SYSFS_FILE_MODE ;
@@ -798,8 +806,10 @@ static int kfd_topology_update_sysfs(void) ret =kobject_init_and_add (sys_props.kobj_topology, &sysprops_type, &kfd_device->kobj,"topology" ); -if (ret <0 ) +if (ret <0 ) { +kobject_put (sys_props.kobj_topology);return ret; + } sys_props.kobj_nodes =kobject_create_and_add ("nodes" , sys_props.kobj_topology);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 50/255 drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
[ Upstream commit bfad51c7633325b5d4b32444efe04329d53297b2 ]
nouveau_fbcon_open() calls calls pm_runtime_get_sync() that increments the reference count. In case of failure, decrement the ref count before returning the error.
--- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_fbcon.c +3 -1
@@ -189,8 +189,10 @@ nouveau_fbcon_open(struct fb_info *info, int user)struct nouveau_fbdev *fbcon = info->par;struct nouveau_drm *drm =nouveau_drm (fbcon->helper.dev);int ret =pm_runtime_get_sync (drm->dev->dev); -if (ret <0 && ret != -EACCES ) +if (ret <0 && ret != -EACCES ) { +pm_runtime_put (drm->dev->dev);return ret; + }return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 60/255 scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del()
In reply to Greg Kroah-HartmanFrom: Javed Hasan <[email protected]>
[ Upstream commit e95b4789ff4380733006836d28e554dc296b2298 ]
In fcoe_sysfs_fcf_del(), we first deleted the fcf from the list and then freed it if ctlr_dev was not NULL. This was causing a memory leak.
Free the fcf even if ctlr_dev is NULL.
--- drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/fcoe/fcoe_ctlr.c +1 -1
@@ -255,9 +255,9 @@ static void fcoe_sysfs_fcf_del(struct fcoe_fcf *new)WARN_ON (!fcf_dev); new->fcf_dev =NULL ;fcoe_fcf_device_delete (fcf_dev); -kfree (new);mutex_unlock (&cdev->lock); } +kfree (new); }/**
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 61/255 i2c: i801: Add support for Intel Tiger Lake PCH-H
In reply to Greg Kroah-HartmanFrom: Jarkko Nikula <[email protected]>
[ Upstream commit f46efbcad97bfb2caded0397eccce7c71402868c ]
Add SMBus PCI ID on Intel Tiger Lake PCH-H.
--- drivers/i2c/busses/i2c-i801.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/i2c/busses/i2c-i801.c +4 -0
@@ -67,6 +67,7 @@* Comet Lake-H (PCH) 0x06a3 32 hard yes yes yes * Elkhart Lake (PCH) 0x4b23 32 hard yes yes yes * Tiger Lake-LP (PCH) 0xa0a3 32 hard yes yes yes +* Tiger Lake-H (PCH) 0x43a3 32 hard yes yes yes * Jasper Lake (SOC) 0x4da3 32 hard yes yes yes * Comet Lake-V (PCH) 0xa3a3 32 hard yes yes yes *
@@ -221,6 +222,7 @@#define PCI_DEVICE_ID_INTEL_GEMINILAKE_SMBUS 0x31d4#define PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS 0x34a3#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS 0x3b30 +#define PCI_DEVICE_ID_INTEL_TIGERLAKE_H_SMBUS 0x43a3#define PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS 0x4b23#define PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS 0x4da3#define PCI_DEVICE_ID_INTEL_BROXTON_SMBUS 0x5ad4
@@ -1074,6 +1076,7 @@ static const struct pci_device_id i801_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COMETLAKE_V_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TIGERLAKE_LP_SMBUS) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TIGERLAKE_H_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS) }, { 0, } };
@@ -1748,6 +1751,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)case PCI_DEVICE_ID_INTEL_COMETLAKE_H_SMBUS :case PCI_DEVICE_ID_INTEL_ELKHART_LAKE_SMBUS :case PCI_DEVICE_ID_INTEL_TIGERLAKE_LP_SMBUS : +case PCI_DEVICE_ID_INTEL_TIGERLAKE_H_SMBUS :case PCI_DEVICE_ID_INTEL_JASPER_LAKE_SMBUS : priv->features |=FEATURE_BLOCK_PROC ; priv->features |=FEATURE_I2C_BLOCK_READ ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 62/255 EDAC/ie31200: Fallback if host bridge device is already initialized
In reply to Greg Kroah-HartmanFrom: Jason Baron <[email protected]>
[ Upstream commit 709ed1bcef12398ac1a35c149f3e582db04456c2 ]
The Intel uncore driver may claim some of the pci ids from ie31200 which means that the ie31200 edac driver will not initialize them as part of pci_register_driver().
Let's add a fallback for this case to 'pci_get_device()' to get a reference on the device such that it can still be configured. This is similar in approach to other edac drivers.
--- drivers/edac/ie31200_edac.c | 50 ++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)
drivers/edac/ie31200_edac.c +47 -3
@@ -170,6 +170,8 @@ (n << (28 + (2 * skl) - PAGE_SHIFT))static int nr_channels; +static struct pci_dev *mci_pdev; +static int ie31200_registered =1 ;struct ie31200_priv {void __iomem *window;
@@ -538,12 +540,16 @@ fail_free:static int ie31200_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -edac_dbg (0 ,"MC:\n" ); +int rc; +edac_dbg (0 ,"MC:\n" );if (pci_enable_device (pdev) <0 )return -EIO ; + rc =ie31200_probe1 (pdev, ent->driver_data); +if (rc ==0 && !mci_pdev) + mci_pdev =pci_dev_get (pdev); -return ie31200_probe1 (pdev, ent->driver_data); +return rc; }static void ie31200_remove_one (struct pci_dev *pdev)
@@ -552,6 +558,8 @@ static void ie31200_remove_one(struct pci_dev *pdev)struct ie31200_priv *priv;edac_dbg (0 ,"\n" ); +pci_dev_put (mci_pdev); + mci_pdev =NULL ; mci =edac_mc_del_mc (&pdev->dev);if (!mci)return ;
@@ -593,17 +601,53 @@ static struct pci_driver ie31200_driver = {static int __init ie31200_init (void ) { +int pci_rc, i; +edac_dbg (3 ,"MC:\n" );/* Ensure that the OPSTATE is set correctly for POLL or NMI */ opstate_init (); -return pci_register_driver (&ie31200_driver); + pci_rc =pci_register_driver (&ie31200_driver); +if (pci_rc <0 ) + goto fail0; + +if (!mci_pdev) { + ie31200_registered =0 ; +for (i =0 ; ie31200_pci_tbl[i].vendor !=0 ; i++) { + mci_pdev =pci_get_device (ie31200_pci_tbl[i].vendor, + ie31200_pci_tbl[i].device, +NULL ); +if (mci_pdev) +break ; + } +if (!mci_pdev) { +edac_dbg (0 ,"ie31200 pci_get_device fail\n" ); + pci_rc = -ENODEV ; + goto fail1; + } + pci_rc =ie31200_init_one (mci_pdev, &ie31200_pci_tbl[i]); +if (pci_rc <0 ) { +edac_dbg (0 ,"ie31200 init fail\n" ); + pci_rc = -ENODEV ; + goto fail1; + } + } +return 0 ; + +fail1: +pci_unregister_driver (&ie31200_driver); +fail0: +pci_dev_put (mci_pdev); + +return pci_rc; } static void __exit ie31200_exit(void) {edac_dbg (3 ,"MC:\n" );pci_unregister_driver (&ie31200_driver); +if (!ie31200_registered) +ie31200_remove_one (mci_pdev); }module_init (ie31200_init);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 68/255 KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe
In reply to Greg Kroah-HartmanFrom: David Brazdil <[email protected]>
[ Upstream commit b38b298aa4397e2dc74a89b4dd3eac9e59b64c96 ]
__hyp_call_panic_nvhe contains inline assembly which did not declare its dependency on the __hyp_panic_string symbol.
The static-declared string has previously been kept alive because of a use in __hyp_call_panic_vhe. Fix this in preparation for separating the source files between VHE and nVHE when the two users land in two different compilation units. The static variable otherwise gets dropped when compiling the nVHE source file, causing an undefined symbol linker error later.
--- arch/arm64/kvm/hyp/switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kvm/hyp/switch.c +1 -1
@@ -897,7 +897,7 @@ static void __hyp_text __hyp_call_panic_nvhe(u64 spsr, u64 elr, u64 par,* making sure it is a kernel address and not a PC-relative * reference. */ - asmvolatile ("ldr %0, =__hyp_panic_string" :"=r" (str_va)); + asmvolatile ("ldr %0, =%1" :"=r" (str_va) :"S" (__hyp_panic_string)); __hyp_do_panic(str_va, spsr, elr,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 28/255 drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit f79f94765f8c39db0b7dec1d335ab046aac03f20 ]
The call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect ref count.
In case of failure, decrement the ref count before returning.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +12 -4
@@ -716,8 +716,10 @@ amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (encoder) {
@@ -854,8 +856,10 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } } encoder =amdgpu_connector_best_single_encoder (connector);
@@ -977,8 +981,10 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (!force &&amdgpu_connector_check_hpd_status_unchanged (connector)) {
@@ -1328,8 +1334,10 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (!force &&amdgpu_connector_check_hpd_status_unchanged (connector)) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 71/255 USB: sisusbvga: Fix a potential UB casued by left shifting a negative value
In reply to Greg Kroah-HartmanFrom: Changming Liu <[email protected]>
[ Upstream commit 2b53a19284f537168fb506f2f40d7fda40a01162 ]
The char buffer buf, receives data directly from user space, so its content might be negative and its elements are left shifted to form an unsigned integer.
Since left shifting a negative value is undefined behavior, thus change the char to u8 to elimintate this UB.
--- drivers/usb/misc/sisusbvga/sisusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/sisusbvga/sisusb.c +1 -1
@@ -761,7 +761,7 @@ static int sisusb_write_mem_bulk(struct sisusb_usb_data *sisusb, u32 addr,u8 swap8, fromkern = kernbuffer ?1 :0 ;u16 swap16;u32 swap32, flag = (length >>28 ) &1 ; -char buf[4 ]; +u8 buf[4 ];/* if neither kernbuffer not userbuffer are given, assume * data in obuf
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 73/255 brcmfmac: Set timeout value when configuring power save
In reply to Greg Kroah-HartmanFrom: Nicolas Saenz Julienne <[email protected]>
[ Upstream commit 3dc05ffb04436020f63138186dbc4f37bd938552 ]
Set the timeout value as per cfg80211's set_power_mgmt() request. If the requested value value is left undefined we set it to 2 seconds, the maximum supported value.
--- .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +8 -0
@@ -84,6 +84,8 @@#define BRCMF_ND_INFO_TIMEOUT msecs_to_jiffies(2000) +#define BRCMF_PS_MAX_TIMEOUT_MS 2000 +#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \ (sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
@@ -2941,6 +2943,12 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,else bphy_err (drvr,"error (%d)\n" , err); } + + err =brcmf_fil_iovar_int_set (ifp,"pm2_sleep_ret" , +min_t (u32, timeout,BRCMF_PS_MAX_TIMEOUT_MS )); +if (err) +bphy_err (drvr,"Unable to set pm timeout, (%d)\n" , err); + done:brcmf_dbg (TRACE ,"Exit\n" );return err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 37/255 f2fs: fix error path in do_recover_data()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 9627a7b31f3c4ff8bc8f3be3683983ffe6eaebe6 ]
- don't panic kernel if f2fs_get_node_page() fails in f2fs_recover_inline_data() or f2fs_recover_inline_xattr();
- return error number of f2fs_truncate_blocks() to f2fs_recover_inline_data()'s caller;
--- fs/f2fs/f2fs.h | 4 ++-- fs/f2fs/inline.c | 19 ++++++++++++------- fs/f2fs/node.c | 6 ++++-- fs/f2fs/recovery.c | 10 ++++++++-- 4 files changed, 26 insertions(+), 13 deletions(-)
fs/f2fs/f2fs.h +2 -2
@@ -3287,7 +3287,7 @@ bool f2fs_alloc_nid(struct f2fs_sb_info *sbi, nid_t *nid);void f2fs_alloc_nid_done (struct f2fs_sb_info *sbi,nid_t nid);void f2fs_alloc_nid_failed (struct f2fs_sb_info *sbi,nid_t nid);int f2fs_try_to_free_nids (struct f2fs_sb_info *sbi,int nr_shrink); -void f2fs_recover_inline_xattr (struct inode *inode,struct page *page); +int f2fs_recover_inline_xattr (struct inode *inode,struct page *page);int f2fs_recover_xattr_data (struct inode *inode,struct page *page);int f2fs_recover_inode_page (struct f2fs_sb_info *sbi,struct page *page); int f2fs_restore_node_summary(struct f2fs_sb_info *sbi,
@@ -3750,7 +3750,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page);int f2fs_convert_inline_inode (struct inode *inode);int f2fs_try_convert_inline_dir (struct inode *dir,struct dentry *dentry);int f2fs_write_inline_data (struct inode *inode,struct page *page); -bool f2fs_recover_inline_data (struct inode *inode,struct page *npage); +int f2fs_recover_inline_data (struct inode *inode,struct page *npage);struct f2fs_dir_entry *f2fs_find_in_inline_dir (struct inode *dir,const struct f2fs_filename *fname,struct page **res_page);
fs/f2fs/inline.c +12 -7
@@ -253,7 +253,7 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page)return 0 ; } -bool f2fs_recover_inline_data (struct inode *inode,struct page *npage) +int f2fs_recover_inline_data (struct inode *inode,struct page *npage) {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct f2fs_inode *ri =NULL ;
@@ -275,7 +275,8 @@ bool f2fs_recover_inline_data(struct inode *inode, struct page *npage) ri && (ri->i_inline & F2FS_INLINE_DATA)) { process_inline: ipage =f2fs_get_node_page (sbi, inode->i_ino); -f2fs_bug_on (sbi,IS_ERR (ipage)); +if (IS_ERR (ipage)) +return PTR_ERR (ipage);f2fs_wait_on_page_writeback (ipage,NODE , true, true);
@@ -288,21 +289,25 @@ process_inline:set_page_dirty (ipage);f2fs_put_page (ipage,1 ); -return true; +return 1 ; }if (f2fs_has_inline_data (inode)) { ipage =f2fs_get_node_page (sbi, inode->i_ino); -f2fs_bug_on (sbi,IS_ERR (ipage)); +if (IS_ERR (ipage)) +return PTR_ERR (ipage);f2fs_truncate_inline_inode (inode, ipage,0 );clear_inode_flag (inode,FI_INLINE_DATA );f2fs_put_page (ipage,1 ); }else if (ri && (ri->i_inline &F2FS_INLINE_DATA )) { -if (f2fs_truncate_blocks (inode,0 , false)) -return false; +int ret; + + ret =f2fs_truncate_blocks (inode,0 , false); +if (ret) +return ret; goto process_inline; } -return false; +return 0 ; } struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,
fs/f2fs/node.c +4 -2
@@ -2576,7 +2576,7 @@ int f2fs_try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink)return nr - nr_shrink; } -void f2fs_recover_inline_xattr (struct inode *inode,struct page *page) +int f2fs_recover_inline_xattr (struct inode *inode,struct page *page) {void *src_addr, *dst_addr;size_t inline_size;
@@ -2584,7 +2584,8 @@ void f2fs_recover_inline_xattr(struct inode *inode, struct page *page)struct f2fs_inode *ri; ipage =f2fs_get_node_page (F2FS_I_SB (inode), inode->i_ino); -f2fs_bug_on (F2FS_I_SB (inode),IS_ERR (ipage)); +if (IS_ERR (ipage)) +return PTR_ERR (ipage); ri =F2FS_INODE (page);if (ri->i_inline &F2FS_INLINE_XATTR ) {
@@ -2603,6 +2604,7 @@ void f2fs_recover_inline_xattr(struct inode *inode, struct page *page) update_inode:f2fs_update_inode (inode, ipage);f2fs_put_page (ipage,1 ); +return 0 ; }int f2fs_recover_xattr_data (struct inode *inode,struct page *page)
fs/f2fs/recovery.c +8 -2
@@ -544,7 +544,9 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,/* step 1: recover xattr */ if (IS_INODE (page)) { -f2fs_recover_inline_xattr (inode, page); + err =f2fs_recover_inline_xattr (inode, page); +if (err) + goto out; }else if (f2fs_has_xattr_block (ofs_of_node (page))) { err =f2fs_recover_xattr_data (inode, page);if (!err)
@@ -553,8 +555,12 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, }/* step 2: recover inline data */ -if (f2fs_recover_inline_data (inode, page)) + err =f2fs_recover_inline_data (inode, page); +if (err) { +if (err ==1 ) + err =0 ; goto out; + }/* step 3: recover data indices */ start =f2fs_start_bidx_of_node (ofs_of_node (page), inode);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 76/255 efi: provide empty efi_enter_virtual_mode implementation
In reply to Greg Kroah-HartmanFrom: Andrey Konovalov <[email protected]>
[ Upstream commit 2c547f9da0539ad1f7ef7f08c8c82036d61b011a ]
When CONFIG_EFI is not enabled, we might get an undefined reference to efi_enter_virtual_mode() error, if this efi_enabled() call isn't inlined into start_kernel(). This happens in particular, if start_kernel() is annodated with __no_sanitize_address.
--- include/linux/efi.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/efi.h +4 -0
@@ -606,7 +606,11 @@ extern void *efi_get_pal_addr (void);extern void efi_map_pal_code (void );extern void efi_memmap_walk (efi_freemem_callback_t callback,void *arg);extern void efi_gettimeofday (struct timespec64 *ts); +#ifdef CONFIG_EFI extern void efi_enter_virtual_mode (void );/* switch EFI to virtual mode, if possible */ +#else +static inline void efi_enter_virtual_mode (void ) {} +#endif #ifdef CONFIG_X86 extern efi_status_t efi_query_variable_store(u32 attributes, unsigned long size,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 75/255 pinctrl: mediatek: fix build for tristate changes
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 047cd9a6bd8a2a73e8d92eb97a1b50c7bcd59279 ]
Export mtk_is_virt_gpio() for the case whenCONFIG_PINCTRL_MTK=yCONFIG_PINCTRL_MTK_V2=yCONFIG_PINCTRL_MTK_MOORE=yCONFIG_PINCTRL_MTK_PARIS=m
to fix this build error:
ERROR: modpost: "mtk_is_virt_gpio" [drivers/pinctrl/mediatek/pinctrl-paris.ko] undefined!
--- drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +1 -0
@@ -264,6 +264,7 @@ bool mtk_is_virt_gpio(struct mtk_pinctrl *hw, unsigned int gpio_n)return virt_gpio; } +EXPORT_SYMBOL_GPL (mtk_is_virt_gpio); static int mtk_xt_get_gpio_n(void *data, unsigned long eint_n, unsigned int *gpio_n,
Signature · 9 lines
2.25.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Greg Kroah-Hartman
maintainerPATCH 77/255 arm64: Fix __cpu_logical_map undefined issue
In reply to Greg Kroah-HartmanFrom: Kefeng Wang <[email protected]>
[ Upstream commit eaecca9e7710281be7c31d892c9f447eafd7ddd9 ]
The __cpu_logical_map undefined issue occued when the new tegra194-cpufreq drvier building as a module.
ERROR: modpost: "__cpu_logical_map" [drivers/cpufreq/tegra194-cpufreq.ko] undefined!
The driver using cpu_logical_map() macro which will expand to __cpu_logical_map, we can't access it in a drvier. Let's turn cpu_logical_map() into a C wrapper and export it to fix the build issue.
Also create a function set_cpu_logical_map(cpu, hwid) when assign a value to cpu_logical_map(cpu).
--- arch/arm64/include/asm/smp.h | 7 ++++++- arch/arm64/kernel/setup.c | 8 +++++++- arch/arm64/kernel/smp.c | 6 +++--- 3 files changed, 16 insertions(+), 5 deletions(-)
arch/arm64/include/asm/smp.h +6 -1
@@ -46,7 +46,12 @@ DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);* Logical CPU mapping. */ extern u64 __cpu_logical_map[NR_CPUS ]; -#define cpu_logical_map (cpu) __cpu_logical_map[cpu] +extern u64 cpu_logical_map (int cpu); + +static inline void set_cpu_logical_map (int cpu,u64 hwid) +{ + __cpu_logical_map[cpu] = hwid; +}struct seq_file ;
arch/arm64/kernel/setup.c +7 -1
@@ -85,7 +85,7 @@ u64 __cacheline_aligned boot_args[4];void __init smp_setup_processor_id (void ) {u64 mpidr =read_cpuid_mpidr () &MPIDR_HWID_BITMASK ; -cpu_logical_map (0 ) = mpidr; +set_cpu_logical_map (0 , mpidr);/* * clear __my_cpu_offset on boot CPU to avoid hang caused by
@@ -276,6 +276,12 @@ arch_initcall(reserve_memblock_reserved_regions);u64 __cpu_logical_map[NR_CPUS ] = { [0 ...NR_CPUS -1 ] =INVALID_HWID }; +u64 cpu_logical_map (int cpu) +{ +return __cpu_logical_map[cpu]; +} +EXPORT_SYMBOL_GPL (cpu_logical_map); +void __init setup_arch (char **cmdline_p) { init_mm.start_code = (unsigned long ) _text;
arch/arm64/kernel/smp.c +3 -3
@@ -567,7 +567,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)return ;/* map the logical cpu id to cpu MPIDR */ -cpu_logical_map (cpu_count) = hwid; +set_cpu_logical_map (cpu_count, hwid); cpu_madt_gicc[cpu_count] = *processor;
@@ -681,7 +681,7 @@ static void __init of_parse_and_init_cpus(void) goto next;pr_debug ("cpu logical map 0x%llx\n" , hwid); -cpu_logical_map (cpu_count) = hwid; +set_cpu_logical_map (cpu_count, hwid);early_map_cpu_to_node (cpu_count,of_node_to_nid (dn)); next:
@@ -722,7 +722,7 @@ void __init smp_init_cpus(void)for (i =1 ; i < nr_cpu_ids; i++) {if (cpu_logical_map (i) !=INVALID_HWID ) {if (smp_cpu_setup (i)) -cpu_logical_map (i) =INVALID_HWID ; +set_cpu_logical_map (i,INVALID_HWID ); } } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 44/255 ALSA: hda: Add support for Loongson 7A1000 controller
In reply to Greg Kroah-HartmanFrom: Kaige Li <[email protected]>
[ Upstream commit 61eee4a7fc406f94e441778c3cecbbed30373c89 ]
Add the new PCI ID 0x0014 0x7a07 to support Loongson 7A1000 controller.
--- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/hda_intel.c +2 -0
@@ -2747,6 +2747,8 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },/* Zhaoxin */ { PCI_DEVICE(0x1d17, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN }, + /* Loongson */ + { PCI_DEVICE(0x0014, 0x7a07), .driver_data = AZX_DRIVER_GENERIC }, { 0, } };MODULE_DEVICE_TABLE (pci, azx_ids);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 79/255 PCI: qcom: Add missing ipq806x clocks in PCIe driver
In reply to Greg Kroah-HartmanFrom: Ansuel Smith <[email protected]>
[ Upstream commit 8b6f0330b5f9a7543356bfa9e76d580f03aa2c1e ]
Aux and Ref clk are missing in PCIe qcom driver. Add support for this optional clks for ipq8064/apq8064 SoC.
--- drivers/pci/controller/dwc/pcie-qcom.c | 38 ++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/pcie-qcom.c +33 -5
@@ -106,6 +106,8 @@ struct qcom_pcie_resources_2_1_0 {struct clk *iface_clk;struct clk *core_clk;struct clk *phy_clk; +struct clk *aux_clk; +struct clk *ref_clk;struct reset_control *pci_reset;struct reset_control *axi_reset;struct reset_control *ahb_reset;
@@ -264,6 +266,14 @@ static int qcom_pcie_get_resources_2_1_0(struct qcom_pcie *pcie)if (IS_ERR (res->phy_clk))return PTR_ERR (res->phy_clk); + res->aux_clk =devm_clk_get_optional (dev,"aux" ); +if (IS_ERR (res->aux_clk)) +return PTR_ERR (res->aux_clk); + + res->ref_clk =devm_clk_get_optional (dev,"ref" ); +if (IS_ERR (res->ref_clk)) +return PTR_ERR (res->ref_clk); + res->pci_reset =devm_reset_control_get_exclusive (dev,"pci" );if (IS_ERR (res->pci_reset))return PTR_ERR (res->pci_reset);
@@ -296,6 +306,8 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie)clk_disable_unprepare (res->iface_clk);clk_disable_unprepare (res->core_clk);clk_disable_unprepare (res->phy_clk); +clk_disable_unprepare (res->aux_clk); +clk_disable_unprepare (res->ref_clk);regulator_bulk_disable (ARRAY_SIZE (res->supplies), res->supplies); }
@@ -326,16 +338,28 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) goto err_assert_ahb; } + ret =clk_prepare_enable (res->core_clk); +if (ret) { +dev_err (dev,"cannot prepare/enable core clock\n" ); + goto err_clk_core; + } + ret =clk_prepare_enable (res->phy_clk);if (ret) {dev_err (dev,"cannot prepare/enable phy clock\n" ); goto err_clk_phy; } - ret =clk_prepare_enable (res->core_clk); + ret =clk_prepare_enable (res->aux_clk);if (ret) { -dev_err (dev,"cannot prepare/enable core clock\n" ); - goto err_clk_core; +dev_err (dev,"cannot prepare/enable aux clock\n" ); + goto err_clk_aux; + } + + ret =clk_prepare_enable (res->ref_clk); +if (ret) { +dev_err (dev,"cannot prepare/enable ref clock\n" ); + goto err_clk_ref; } ret =reset_control_deassert (res->ahb_reset);
@@ -411,10 +435,14 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)return 0 ; err_deassert_ahb: -clk_disable_unprepare (res->core_clk); -err_clk_core: +clk_disable_unprepare (res->ref_clk); +err_clk_ref: +clk_disable_unprepare (res->aux_clk); +err_clk_aux:clk_disable_unprepare (res->phy_clk); err_clk_phy: +clk_disable_unprepare (res->core_clk); +err_clk_core:clk_disable_unprepare (res->iface_clk); err_assert_ahb:regulator_bulk_disable (ARRAY_SIZE (res->supplies), res->supplies);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 81/255 PCI: qcom: Add missing reset for ipq806x
In reply to Greg Kroah-HartmanFrom: Ansuel Smith <[email protected]>
[ Upstream commit ee367e2cdd2202b5714982739e684543cd2cee0e ]
Add missing ext reset used by ipq8064 SoC in PCIe qcom driver.
--- drivers/pci/controller/dwc/pcie-qcom.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/pci/controller/dwc/pcie-qcom.c +12 -0
@@ -113,6 +113,7 @@ struct qcom_pcie_resources_2_1_0 {struct reset_control *ahb_reset;struct reset_control *por_reset;struct reset_control *phy_reset; +struct reset_control *ext_reset;struct regulator_bulk_data supplies[QCOM_PCIE_2_1_0_MAX_SUPPLY ]; };
@@ -290,6 +291,10 @@ static int qcom_pcie_get_resources_2_1_0(struct qcom_pcie *pcie)if (IS_ERR (res->por_reset))return PTR_ERR (res->por_reset); + res->ext_reset =devm_reset_control_get_optional_exclusive (dev,"ext" ); +if (IS_ERR (res->ext_reset)) +return PTR_ERR (res->ext_reset); + res->phy_reset =devm_reset_control_get_exclusive (dev,"phy" );return PTR_ERR_OR_ZERO (res->phy_reset); }
@@ -303,6 +308,7 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie)reset_control_assert (res->axi_reset);reset_control_assert (res->ahb_reset);reset_control_assert (res->por_reset); +reset_control_assert (res->ext_reset);reset_control_assert (res->phy_reset);clk_disable_unprepare (res->iface_clk);clk_disable_unprepare (res->core_clk);
@@ -362,6 +368,12 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) goto err_deassert_ahb; } + ret =reset_control_deassert (res->ext_reset); +if (ret) { +dev_err (dev,"cannot deassert ext reset\n" ); + goto err_deassert_ahb; + } +/* enable PCIe clocks and resets */ val =readl (pcie->parf +PCIE20_PARF_PHY_CTRL ); val &= ~BIT (0 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 55/255 btrfs: make btrfs_qgroup_check_reserved_leak take btrfs_inode
In reply to Greg Kroah-HartmanFrom: Nikolay Borisov <[email protected]>
[ Upstream commit cfdd45921571eb24073e0737fa0bd44b4218f914 ]
vfs_inode is used only for the inode number everything else requires btrfs_inode.
--- fs/btrfs/inode.c | 2 +- fs/btrfs/qgroup.c | 14 +++++++------- fs/btrfs/qgroup.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)
fs/btrfs/inode.c +1 -1
@@ -8640,7 +8640,7 @@ void btrfs_destroy_inode(struct inode *inode)btrfs_put_ordered_extent (ordered); } } -btrfs_qgroup_check_reserved_leak (inode); +btrfs_qgroup_check_reserved_leak (BTRFS_I (inode));inode_tree_del (inode);btrfs_drop_extent_cache (BTRFS_I (inode),0 , (u64)-1 ,0 );btrfs_inode_clear_file_extent_range (BTRFS_I (inode),0 , (u64)-1 );
fs/btrfs/qgroup.c +7 -7
@@ -3742,7 +3742,7 @@ void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes)* Check qgroup reserved space leaking, normally at destroy inode * time */ -void btrfs_qgroup_check_reserved_leak (struct inode *inode) +void btrfs_qgroup_check_reserved_leak (struct btrfs_inode *inode) {struct extent_changeset changeset;struct ulist_node *unode;
@@ -3750,19 +3750,19 @@ void btrfs_qgroup_check_reserved_leak(struct inode *inode)int ret;extent_changeset_init (&changeset); - ret =clear_record_extent_bits (&BTRFS_I (inode)->io_tree,0 , (u64)-1 , + ret =clear_record_extent_bits (&inode->io_tree,0 , (u64)-1 ,EXTENT_QGROUP_RESERVED , &changeset);WARN_ON (ret <0 );if (WARN_ON (changeset.bytes_changed)) {ULIST_ITER_INIT (&iter);while ((unode =ulist_next (&changeset.range_changed, &iter))) { -btrfs_warn (BTRFS_I (inode)->root->fs_info, -"leaking qgroup reserved space, ino: %lu, start: %llu, end: %llu" , - inode->i_ino, unode->val, unode->aux); +btrfs_warn (inode->root->fs_info, +"leaking qgroup reserved space, ino: %llu, start: %llu, end: %llu" , +btrfs_ino (inode), unode->val, unode->aux); } -btrfs_qgroup_free_refroot (BTRFS_I (inode)->root->fs_info, -BTRFS_I (inode)->root->root_key.objectid, +btrfs_qgroup_free_refroot (inode->root->fs_info, + inode->root->root_key.objectid, changeset.bytes_changed,BTRFS_QGROUP_RSV_DATA ); }
fs/btrfs/qgroup.h +1 -1
@@ -399,7 +399,7 @@ void btrfs_qgroup_free_meta_all_pertrans(struct btrfs_root *root);*/ void btrfs_qgroup_convert_reserved_meta (struct btrfs_root *root,int num_bytes); -void btrfs_qgroup_check_reserved_leak (struct inode *inode); +void btrfs_qgroup_check_reserved_leak (struct btrfs_inode *inode);/* btrfs_qgroup_swapped_blocks related functions */ void btrfs_qgroup_init_swapped_blocks(
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 49/255 f2fs: fix use-after-free issue
In reply to Greg Kroah-HartmanFrom: Li Guifu <[email protected]>
[ Upstream commit 99c787cfd2bd04926f1f553b30bd7dcea2caaba1 ]
During umount, f2fs_put_super() unregisters procfs entries after f2fs_destroy_segment_manager(), it may cause use-after-free issue when umount races with procfs accessing, fix it by relocating f2fs_unregister_sysfs().
[Chao Yu: change commit title/message a bit]
--- fs/f2fs/super.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/f2fs/super.c +3 -2
@@ -1173,6 +1173,9 @@ static void f2fs_put_super(struct super_block *sb)int i;bool dropped; +/* unregister procfs/sysfs entries in advance to avoid race case */ +f2fs_unregister_sysfs (sbi); +f2fs_quota_off_umount (sb);/* prevent remaining shrinker jobs */
@@ -1238,8 +1241,6 @@ static void f2fs_put_super(struct super_block *sb)kvfree (sbi->ckpt); -f2fs_unregister_sysfs (sbi); - sb->s_fs_info =NULL ;if (sbi->s_chksum_driver)crypto_free_shash (sbi->s_chksum_driver);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 22/255 platform/chrome: cros_ec_sensorhub: Fix EC timestamp overflow
In reply to Greg Kroah-HartmanFrom: Gwendal Grignou <[email protected]>
[ Upstream commit e48bc01ed5adec203676c735365373b31c3c7600 ]
EC is using 32 bit timestamps (us), and before converting it to 64bit they were not casted, so it would overflow every 4s. Regular overflow every ~70 minutes was not taken into account either.
--- drivers/platform/chrome/cros_ec_sensorhub_ring.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/platform/chrome/cros_ec_sensorhub_ring.c +1 -3
@@ -419,9 +419,7 @@ cros_ec_sensor_ring_process_event(struct cros_ec_sensorhub *sensorhub,* Disable filtering since we might add more jitter * if b is in a random point in time. */ - new_timestamp = fifo_timestamp - - fifo_info->timestamp *1000 + - in->timestamp *1000 ; + new_timestamp = c - b *1000 + a *1000 ;/* * The timestamp can be stale if we had to use the fifo * info timestamp.
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 83/255 cpufreq: intel_pstate: Fix EPP setting via sysfs in active mode
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit de002c55cadfc2f6cdf0ed427526f6085d240238 ]
Because intel_pstate_set_energy_pref_index() reads and writes the MSR_HWP_REQUEST register without using the cached value of it used by intel_pstate_hwp_boost_up() and intel_pstate_hwp_boost_down(), those functions may overwrite the value written by it and so the EPP value set via sysfs may be lost.
To avoid that, make intel_pstate_set_energy_pref_index() take the cached value of MSR_HWP_REQUEST just like the other two routines mentioned above and update it with the new EPP value coming from user space in addition to updating the MSR.
Note that the MSR itself still needs to be updated too in case hwp_boost is unset or the boosting mechanism is not active at the EPP change time.
--- drivers/cpufreq/intel_pstate.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/cpufreq/intel_pstate.c +12 -6
@@ -649,11 +649,12 @@ static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data,mutex_lock (&intel_pstate_limits_lock);if (boot_cpu_has (X86_FEATURE_HWP_EPP )) { -u64 value; - - ret =rdmsrl_on_cpu (cpu_data->cpu,MSR_HWP_REQUEST , &value); -if (ret) - goto return_pref; +/* +* Use the cached HWP Request MSR value, because the register +* itself may be updated by intel_pstate_hwp_boost_up() or +* intel_pstate_hwp_boost_down() at any time. +*/ +u64 value =READ_ONCE (cpu_data->hwp_req_cached); value &= ~GENMASK_ULL (31 ,24 );
@@ -661,13 +662,18 @@ static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data, epp = epp_values[pref_index -1 ]; value |= (u64 )epp <<24 ; +/* +* The only other updater of hwp_req_cached in the active mode, +* intel_pstate_hwp_set(), is called under the same lock as this +* function, so it cannot run in parallel with the update below. +*/ +WRITE_ONCE (cpu_data->hwp_req_cached, value); ret =wrmsrl_on_cpu (cpu_data->cpu,MSR_HWP_REQUEST , value); }else {if (epp == -EINVAL ) epp = (pref_index -1 ) <<2 ; ret =intel_pstate_set_epb (cpu_data->cpu, epp); } -return_pref:mutex_unlock (&intel_pstate_limits_lock);return ret;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 92/255 blk-mq: insert request not through ->queue_rq into sw/scheduler queue
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit db03f88fae8a2c8007caafa70287798817df2875 ]
c616cbee97ae ("blk-mq: punt failed direct issue to dispatch list") supposed to add request which has been through ->queue_rq() to the hw queue dispatch list, however it adds request running out of budget or driver tag to hw queue too. This way basically bypasses request merge, and causes too many request dispatched to LLD, and system% is unnecessary increased.
Fixes this issue by adding request not through ->queue_rq into sw/scheduler queue, and this way is safe because no ->queue_rq is called on this request yet.
High %system can be observed on Azure storvsc device, and even soft lock is observed. This patch reduces %system during heavy sequential IO, meantime decreases soft lockup risk.
--- block/blk-mq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/blk-mq.c +2 -1
@@ -1909,7 +1909,8 @@ insert:if (bypass_insert)return BLK_STS_RESOURCE ; -blk_mq_request_bypass_insert (rq, false, run_queue); +blk_mq_sched_insert_request (rq, false, run_queue, false); +return BLK_STS_OK ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 93/255 blkcg: fix memleak for iolatency
In reply to Greg Kroah-HartmanFrom: Yufen Yu <[email protected]>
[ Upstream commit 27029b4b18aa5d3b060f0bf2c26dae254132cfce ]
Normally, blkcg_iolatency_exit() will free related memory in iolatency when cleanup queue. But if blk_throtl_init() return error and queue init fail, blkcg_iolatency_exit() will not do that for us. Then it cause memory leak.
--- block/blk-cgroup.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
block/blk-cgroup.c +5 -3
@@ -1056,13 +1056,15 @@ int blkcg_init_queue(struct request_queue *q)if (preloaded)radix_tree_preload_end (); - ret =blk_iolatency_init (q); + ret =blk_throtl_init (q);if (ret) goto err_destroy_all; - ret =blk_throtl_init (q); -if (ret) + ret =blk_iolatency_init (q); +if (ret) { +blk_throtl_exit (q); goto err_destroy_all; + }return 0 ; err_destroy_all:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 24/255 drm/radeon: fix multiple reference count leak
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
[ Upstream commit 6f2e8acdb48ed166b65d47837c31b177460491ec ]
On calling pm_runtime_get_sync() the reference count of the device is incremented. In case of failure, decrement the reference count before returning the error.
--- drivers/gpu/drm/radeon/radeon_connectors.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/radeon/radeon_connectors.c +15 -5
@@ -879,8 +879,10 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (encoder) {
@@ -1025,8 +1027,10 @@ radeon_vga_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } } encoder =radeon_best_single_encoder (connector);
@@ -1163,8 +1167,10 @@ radeon_tv_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } } encoder =radeon_best_single_encoder (connector);
@@ -1247,8 +1253,10 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (radeon_connector->detected_hpd_without_ddc) {
@@ -1657,8 +1665,10 @@ radeon_dp_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (!force &&radeon_check_hpd_status_unchanged (connector)) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 95/255 nvme-fc: Fix wrong return value in __nvme_fc_init_request()
In reply to Greg Kroah-HartmanFrom: Tianjia Zhang <[email protected]>
[ Upstream commit f34448cd0dc697723fb5f4118f8431d9233b370d ]
On an error exit path, a negative error code should be returned instead of a positive return value.
--- drivers/nvme/host/fc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/host/fc.c +2 -2
@@ -2076,7 +2076,7 @@ __nvme_fc_init_request(struct nvme_fc_ctrl *ctrl,if (fc_dma_mapping_error (ctrl->lport->dev, op->fcp_req.cmddma)) {dev_err (ctrl->dev,"FCP Op failed - cmdiu dma mapping failed.\n" ); - ret =EFAULT ; + ret = -EFAULT ; goto out_on_error; }
@@ -2086,7 +2086,7 @@ __nvme_fc_init_request(struct nvme_fc_ctrl *ctrl,if (fc_dma_mapping_error (ctrl->lport->dev, op->fcp_req.rspdma)) {dev_err (ctrl->dev,"FCP Op failed - rspiu dma mapping failed.\n" ); - ret =EFAULT ; + ret = -EFAULT ; }atomic_set (&op->state,FCPOP_STATE_IDLE );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 96/255 nvme: multipath: round-robin: fix single non-optimized path case
In reply to Greg Kroah-HartmanFrom: Martin Wilck <[email protected]>
[ Upstream commit 93eb0381e13d249a18ed4aae203291ff977e7ffb ]
If there's only one usable, non-optimized path, nvme_round_robin_path() returns NULL, which is wrong. Fix it by falling back to "old", like in the single optimized path case. Also, if the active path isn't changed, there's no need to re-assign the pointer.
--- drivers/nvme/host/multipath.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/nvme/host/multipath.c +10 -5
@@ -255,12 +255,17 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, fallback = ns; } -/* No optimized path found, re-check the current path */ +/* +* The loop above skips the current path for round-robin semantics. +* Fall back to the current path if either: +* - no other optimized path found and current is optimized, +* - no other usable path found and current is usable. +*/ if (!nvme_path_is_disabled (old) && - old->ana_state ==NVME_ANA_OPTIMIZED ) { - found = old; - goto out; - } + (old->ana_state ==NVME_ANA_OPTIMIZED || + (!fallback && old->ana_state ==NVME_ANA_NONOPTIMIZED ))) +return old; +if (!fallback)return NULL ; found = fallback;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 99/255 drm/etnaviv: always start/stop scheduler in timeout processing
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
[ Upstream commit 50248a3ec0f5e5debd18033eb2a29f0b793a7000 ]
The drm scheduler currently expects that the stop/start sequence is always executed in the timeout handling, as the job at the head of the hardware execution list is always removed from the ring mirror before the driver function is called and only inserted back into the list when starting the scheduler.
This adds some unnecessary overhead if the timeout handler determines that the GPU is still executing jobs normally and just wished to extend the timeout, but a better solution requires a major rearchitecture of the scheduler, which is not applicable as a fix.
--- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_sched.c +6 -5
@@ -89,12 +89,15 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job)u32 dma_addr;int change; +/* block scheduler */ +drm_sched_stop (&gpu->sched, sched_job); +/* * If the GPU managed to complete this jobs fence, the timout is * spurious. Bail out. */ if (dma_fence_is_signaled (submit->out_fence)) -return ; + goto out_no_timeout;/* * If the GPU is still making forward progress on the front-end (which
@@ -105,12 +108,9 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job) change = dma_addr - gpu->hangcheck_dma_addr;if (change <0 || change >16 ) { gpu->hangcheck_dma_addr = dma_addr; -return ; + goto out_no_timeout; } -/* block scheduler */ -drm_sched_stop (&gpu->sched, sched_job); -if (sched_job)drm_sched_increase_karma (sched_job);
@@ -120,6 +120,7 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job)drm_sched_resubmit_jobs (&gpu->sched); +out_no_timeout:/* restart scheduler after GPU is usable again */ drm_sched_start (&gpu->sched, true); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 100/255 i2c: core: Dont fail PRP0001 enumeration when no ID table exist
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit e3cb82c6d6f6c27ab754e13ae29bdd6b949982e2 ]
When commit c64ffff7a9d1 ("i2c: core: Allow empty id_table in ACPI case as well") fixed the enumeration of I²C devices on ACPI enabled platforms when driver has no ID table, it missed the PRP0001 support.
i2c_device_match() and i2c_acpi_match_device() differently match driver against given device. Use acpi_driver_match_device(), that is used in the former, in i2c_device_probe() and don't fail PRP0001 enumeration when no ID table exist.
--- drivers/i2c/i2c-core-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/i2c-core-base.c +1 -1
@@ -354,7 +354,7 @@ static int i2c_device_probe(struct device *dev)* or ACPI ID table is supplied for the probing device. */ if (!driver->id_table && - !i2c_acpi_match_device (dev->driver->acpi_match_table, client) && + !acpi_driver_match_device (dev, dev->driver) && !i2c_of_match_device (dev->driver->of_match_table, client)) { status = -ENODEV ; goto put_sync_adapter;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 105/255 video: fbdev: controlfb: Fix build for COMPILE_TEST=y && PPC_PMAC=n
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 4d618b9f3fcab84e9ec28c180de46fb2c929d096 ]
The build is currently broken, if COMPILE_TEST=y and PPC_PMAC=n:
linux/drivers/video/fbdev/controlfb.c: In function ‘control_set_hardware’:
linux/drivers/video/fbdev/controlfb.c:276:2: error: implicit declaration of function ‘btext_update_display’
276 | btext_update_display(p->frame_buffer_phys + CTRLFB_OFF,
| ^~~~~~~~~~~~~~~~~~~~Fix it by including btext.h whenever CONFIG_BOOTX_TEXT is enabled.
--- drivers/video/fbdev/controlfb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/fbdev/controlfb.c +2 -0
@@ -49,6 +49,8 @@#include <linux/cuda.h> #ifdef CONFIG_PPC_PMAC #include <asm/prom.h> +#endif +#ifdef CONFIG_BOOTX_TEXT #include <asm/btext.h> #endif
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 69/255 powerpc/spufs: add CONFIG_COREDUMP dependency
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit b648a5132ca3237a0f1ce5d871fff342b0efcf8a ]
The kernel test robot pointed out a slightly different error message after recent commit 5456ffdee666 ("powerpc/spufs: simplify spufs core dumping") to spufs for a configuration that never worked:
powerpc64-linux-ld: arch/powerpc/platforms/cell/spufs/file.o: in function `.spufs_proxydma_info_dump':
Quoted 1 line
Quoted 1 line
file.c:(.text+0x4c68): undefined reference to `.dump_emit'
powerpc64-linux-ld: arch/powerpc/platforms/cell/spufs/file.o: in function `.spufs_dma_info_dump':
file.c:(.text+0x4d70): undefined reference to `.dump_emit'
powerpc64-linux-ld: arch/powerpc/platforms/cell/spufs/file.o: in function `.spufs_wbox_info_dump':
file.c:(.text+0x4df4): undefined reference to `.dump_emit'
Add a Kconfig dependency to prevent this from happening again.
--- arch/powerpc/platforms/cell/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/platforms/cell/Kconfig +1 -0
@@ -44,6 +44,7 @@ config SPU_FS tristate "SPU file system" default m depends on PPC_CELL + depends on COREDUMP select SPU_BASE help The SPU file system is used to access Synergistic Processing
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 106/255 spi: stm32: clear only asserted irq flags on interrupt
In reply to Greg Kroah-HartmanFrom: Tobias Schramm <[email protected]>
[ Upstream commit ae1ba50f1e706dfd7ce402ac52c1f1f10becad68 ]
Previously the stm32h7 interrupt thread cleared all non-masked interrupts. If an interrupt was to occur during the handling of another interrupt its flag would be unset, resulting in a lost interrupt.
This patches fixes the issue by clearing only the currently set interrupt flags.
--- drivers/spi/spi-stm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-stm32.c +1 -1
@@ -967,7 +967,7 @@ static irqreturn_t stm32h7_spi_irq_thread(int irq, void *dev_id)if (!spi->cur_usedma && (spi->rx_buf && (spi->rx_len >0 )))stm32h7_spi_read_rxfifo (spi, false); -writel_relaxed (mask, spi->base +STM32H7_SPI_IFCR ); +writel_relaxed (sr & mask, spi->base +STM32H7_SPI_IFCR );spin_unlock_irqrestore (&spi->lock, flags);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 108/255 ext4: dont BUG on inconsistent journal feature
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit 11215630aada28307ba555a43138db6ac54fa825 ]
A customer has reported a BUG_ON in ext4_clear_journal_err() hitting during an LTP testing. Either this has been caused by a test setup issue where the filesystem was being overwritten while LTP was mounting it or the journal replay has overwritten the superblock with invalid data. In either case it is preferable we don't take the machine down with a BUG_ON. So handle the situation of unexpectedly missing has_journal feature more gracefully. We issue warning and fail the mount in the cases where the race window is narrow and the failed check is most likely a programming error. In cases where fs corruption is more likely, we do full ext4_error() handling before failing mount / remount.
--- fs/ext4/super.c | 68 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 21 deletions(-)
fs/ext4/super.c +47 -21
@@ -66,10 +66,10 @@ static int ext4_load_journal(struct super_block *, struct ext4_super_block *, unsigned long journal_devnum);static int ext4_show_options (struct seq_file *seq,struct dentry *root);static int ext4_commit_super (struct super_block *sb,int sync); -static void ext4_mark_recovery_complete (struct super_block *sb, +static int ext4_mark_recovery_complete (struct super_block *sb,struct ext4_super_block *es); -static void ext4_clear_journal_err (struct super_block *sb, -struct ext4_super_block *es); +static int ext4_clear_journal_err (struct super_block *sb, +struct ext4_super_block *es);static int ext4_sync_fs (struct super_block *sb,int wait);static int ext4_remount (struct super_block *sb,int *flags,char *data);static int ext4_statfs (struct dentry *dentry,struct kstatfs *buf);
@@ -4770,7 +4770,9 @@ no_journal:EXT4_SB (sb)->s_mount_state &= ~EXT4_ORPHAN_FS ;if (needs_recovery) {ext4_msg (sb,KERN_INFO ,"recovery complete" ); -ext4_mark_recovery_complete (sb, es); + err =ext4_mark_recovery_complete (sb, es); +if (err) + goto failed_mount8; }if (EXT4_SB (sb)->s_journal) {if (test_opt (sb,DATA_FLAGS ) ==EXT4_MOUNT_JOURNAL_DATA )
@@ -4813,10 +4815,8 @@ cantfind_ext4:ext4_msg (sb,KERN_ERR ,"VFS: Can't find ext4 filesystem" ); goto failed_mount; -#ifdef CONFIG_QUOTA failed_mount8:ext4_unregister_sysfs (sb); -#endif failed_mount7:ext4_unregister_li_request (sb); failed_mount6:
@@ -4956,7 +4956,8 @@ static journal_t *ext4_get_journal(struct super_block *sb,struct inode *journal_inode;journal_t *journal; -BUG_ON (!ext4_has_feature_journal (sb)); +if (WARN_ON_ONCE (!ext4_has_feature_journal (sb))) +return NULL ; journal_inode =ext4_get_journal_inode (sb, journal_inum);if (!journal_inode)
@@ -4986,7 +4987,8 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb,struct ext4_super_block *es;struct block_device *bdev; -BUG_ON (!ext4_has_feature_journal (sb)); +if (WARN_ON_ONCE (!ext4_has_feature_journal (sb))) +return NULL ; bdev =ext4_blkdev_get (j_dev, sb);if (bdev ==NULL )
@@ -5078,7 +5080,8 @@ static int ext4_load_journal(struct super_block *sb,int err =0 ;int really_read_only; -BUG_ON (!ext4_has_feature_journal (sb)); +if (WARN_ON_ONCE (!ext4_has_feature_journal (sb))) +return -EFSCORRUPTED ;if (journal_devnum && journal_devnum !=le32_to_cpu (es->s_journal_dev)) {
@@ -5148,7 +5151,12 @@ static int ext4_load_journal(struct super_block *sb, }EXT4_SB (sb)->s_journal = journal; -ext4_clear_journal_err (sb, es); + err =ext4_clear_journal_err (sb, es); +if (err) { +EXT4_SB (sb)->s_journal =NULL ; +jbd2_journal_destroy (journal); +return err; + }if (!really_read_only && journal_devnum && journal_devnum !=le32_to_cpu (es->s_journal_dev)) {
@@ -5244,26 +5252,32 @@ static int ext4_commit_super(struct super_block *sb, int sync)* remounting) the filesystem readonly, then we will end up with a * consistent fs on disk. Record that fact. */ -static void ext4_mark_recovery_complete (struct super_block *sb, -struct ext4_super_block *es) +static int ext4_mark_recovery_complete (struct super_block *sb, +struct ext4_super_block *es) { +int err;journal_t *journal =EXT4_SB (sb)->s_journal;if (!ext4_has_feature_journal (sb)) { -BUG_ON (journal !=NULL ); -return ; +if (journal !=NULL ) { +ext4_error (sb,"Journal got removed while the fs was " +"mounted!" ); +return -EFSCORRUPTED ; + } +return 0 ; }jbd2_journal_lock_updates (journal); -if (jbd2_journal_flush (journal) <0 ) + err =jbd2_journal_flush (journal); +if (err <0 ) goto out;if (ext4_has_feature_journal_needs_recovery (sb) &&sb_rdonly (sb)) {ext4_clear_feature_journal_needs_recovery (sb);ext4_commit_super (sb,1 ); } - out:jbd2_journal_unlock_updates (journal); +return err; }/*
@@ -5271,14 +5285,17 @@ out:* has recorded an error from a previous lifetime, move that error to the * main filesystem now. */ -static void ext4_clear_journal_err (struct super_block *sb, +static int ext4_clear_journal_err (struct super_block *sb,struct ext4_super_block *es) {journal_t *journal;int j_errno;const char *errstr; -BUG_ON (!ext4_has_feature_journal (sb)); +if (!ext4_has_feature_journal (sb)) { +ext4_error (sb,"Journal got removed while the fs was mounted!" ); +return -EFSCORRUPTED ; + } journal =EXT4_SB (sb)->s_journal;
@@ -5303,6 +5320,7 @@ static void ext4_clear_journal_err(struct super_block *sb,jbd2_journal_clear_err (journal);jbd2_journal_update_sb_errno (journal); } +return 0 ; }/*
@@ -5573,8 +5591,13 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) (sbi->s_mount_state & EXT4_VALID_FS)) es->s_state =cpu_to_le16 (sbi->s_mount_state); -if (sbi->s_journal) +if (sbi->s_journal) { +/* +* We let remount-ro finish even if marking fs +* as clean failed... +*/ ext4_mark_recovery_complete (sb, es); + }if (sbi->s_mmp_tsk)kthread_stop (sbi->s_mmp_tsk); }else {
@@ -5622,8 +5645,11 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)* been changed by e2fsck since we originally mounted * the partition.) */ -if (sbi->s_journal) -ext4_clear_journal_err (sb, es); +if (sbi->s_journal) { + err =ext4_clear_journal_err (sb, es); +if (err) + goto restore_opts; + } sbi->s_mount_state =le16_to_cpu (es->s_state); err =ext4_setup_super (sb, es,0 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 109/255 ext4: handle read only external journal device
In reply to Greg Kroah-HartmanFrom: Lukas Czerner <[email protected]>
[ Upstream commit 273108fa5015eeffc4bacfa5ce272af3434b96e4 ]
Ext4 uses blkdev_get_by_dev() to get the block_device for journal device which does check to see if the read-only block device was opened read-only.
As a result ext4 will hapily proceed mounting the file system with external journal on read-only device. This is bad as we would not be able to use the journal leading to errors later on.
Instead of simply failing to mount file system in this case, treat it in a similar way we treat internal journal on read-only device. Allow to mount with -o noload in read-only mode.
This can be reproduced easily like this:
mke2fs -F -O journal_dev $JOURNAL_DEV 100M
mkfs.$FSTYPE -F -J device=$JOURNAL_DEV $FS_DEV
blockdev --setro $JOURNAL_DEV
mount $FS_DEV $MNT
touch $MNT/file
umount $MNT
leading to error like this
[ 1307.318713] ------------[ cut here ]------------ [ 1307.323362] generic_make_request: Trying to write to read-only block-device dm-2 (partno 0) [ 1307.331741] WARNING: CPU: 36 PID: 3224 at block/blk-core.c:855 generic_make_request_checks+0x2c3/0x580 [ 1307.341041] Modules linked in: ext4 mbcache jbd2 rfkill intel_rapl_msr intel_rapl_common isst_if_commd [ 1307.419445] CPU: 36 PID: 3224 Comm: jbd2/dm-2 Tainted: G W I 5.8.0-rc5 #2 [ 1307.427359] Hardware name: Dell Inc. PowerEdge R740/01KPX8, BIOS 2.3.10 08/15/2019 [ 1307.434932] RIP: 0010:generic_make_request_checks+0x2c3/0x580 [ 1307.440676] Code: 94 03 00 00 48 89 df 48 8d 74 24 08 c6 05 cf 2b 18 01 01 e8 7f a4 ff ff 48 c7 c7 50e [ 1307.459420] RSP: 0018:ffffc0d70eb5fb48 EFLAGS: 00010286 [ 1307.464646] RAX: 0000000000000000 RBX: ffff9b33b2978300 RCX: 0000000000000000 [ 1307.471780] RDX: ffff9b33e12a81e0 RSI: ffff9b33e1298000 RDI: ffff9b33e1298000 [ 1307.478913] RBP: ffff9b7b9679e0c0 R08: 0000000000000837 R09: 0000000000000024 [ 1307.486044] R10: 0000000000000000 R11: ffffc0d70eb5f9f0 R12: 0000000000000400 [ 1307.493177] R13: 0000000000000000 R14: 0000000000000001 R15: 0000000000000000 [ 1307.500308] FS: 0000000000000000(0000) GS:ffff9b33e1280000(0000) knlGS:0000000000000000 [ 1307.508396] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1307.514142] CR2: 000055eaf4109000 CR3: 0000003dee40a006 CR4: 00000000007606e0 [ 1307.521273] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1307.528407] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 1307.535538] PKRU: 55555554 [ 1307.538250] Call Trace: [ 1307.540708] generic_make_request+0x30/0x340 [ 1307.544985] submit_bio+0x43/0x190 [ 1307.548393] ? bio_add_page+0x62/0x90 [ 1307.552068] submit_bh_wbc+0x16a/0x190 [ 1307.555833] jbd2_write_superblock+0xec/0x200 [jbd2] [ 1307.560803] jbd2_journal_update_sb_log_tail+0x65/0xc0 [jbd2] [ 1307.566557] jbd2_journal_commit_transaction+0x2ae/0x1860 [jbd2] [ 1307.572566] ? check_preempt_curr+0x7a/0x90 [ 1307.576756] ? update_curr+0xe1/0x1d0 [ 1307.580421] ? account_entity_dequeue+0x7b/0xb0 [ 1307.584955] ? newidle_balance+0x231/0x3d0 [ 1307.589056] ? __switch_to_asm+0x42/0x70 [ 1307.592986] ? __switch_to_asm+0x36/0x70 [ 1307.596918] ? lock_timer_base+0x67/0x80 [ 1307.600851] kjournald2+0xbd/0x270 [jbd2] [ 1307.604873] ? finish_wait+0x80/0x80 [ 1307.608460] ? commit_timeout+0x10/0x10 [jbd2] [ 1307.612915] kthread+0x114/0x130 [ 1307.616152] ? kthread_park+0x80/0x80 [ 1307.619816] ret_from_fork+0x22/0x30 [ 1307.623400] ---[ end trace 27490236265b1630 ]---
--- fs/ext4/super.c | 51 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 18 deletions(-)
fs/ext4/super.c +33 -18
@@ -5079,6 +5079,7 @@ static int ext4_load_journal(struct super_block *sb,dev_t journal_dev;int err =0 ;int really_read_only; +int journal_dev_ro;if (WARN_ON_ONCE (!ext4_has_feature_journal (sb)))return -EFSCORRUPTED ;
@@ -5091,7 +5092,31 @@ static int ext4_load_journal(struct super_block *sb, }else journal_dev =new_decode_dev (le32_to_cpu (es->s_journal_dev)); - really_read_only =bdev_read_only (sb->s_bdev); +if (journal_inum && journal_dev) { +ext4_msg (sb,KERN_ERR , +"filesystem has both journal inode and journal device!" ); +return -EINVAL ; + } + +if (journal_inum) { + journal =ext4_get_journal (sb, journal_inum); +if (!journal) +return -EINVAL ; + }else { + journal =ext4_get_dev_journal (sb, journal_dev); +if (!journal) +return -EINVAL ; + } + + journal_dev_ro =bdev_read_only (journal->j_dev); + really_read_only =bdev_read_only (sb->s_bdev) | journal_dev_ro; + +if (journal_dev_ro && !sb_rdonly (sb)) { +ext4_msg (sb,KERN_ERR , +"journal device read-only, try mounting with '-o ro'" ); + err = -EROFS ; + goto err_out; + }/* * Are we loading a blank journal or performing recovery after a
@@ -5106,27 +5131,14 @@ static int ext4_load_journal(struct super_block *sb,ext4_msg (sb,KERN_ERR ,"write access " "unavailable, cannot proceed " "(try mounting with noload)" ); -return -EROFS ; + err = -EROFS ; + goto err_out; }ext4_msg (sb,KERN_INFO ,"write access will " "be enabled during recovery" ); } } -if (journal_inum && journal_dev) { -ext4_msg (sb,KERN_ERR ,"filesystem has both journal " -"and inode journals!" ); -return -EINVAL ; - } - -if (journal_inum) { -if (!(journal =ext4_get_journal (sb, journal_inum))) -return -EINVAL ; - }else { -if (!(journal =ext4_get_dev_journal (sb, journal_dev))) -return -EINVAL ; - } -if (!(journal->j_flags &JBD2_BARRIER ))ext4_msg (sb,KERN_INFO ,"barriers disabled" );
@@ -5146,8 +5158,7 @@ static int ext4_load_journal(struct super_block *sb,if (err) {ext4_msg (sb,KERN_ERR ,"error loading journal" ); -jbd2_journal_destroy (journal); -return err; + goto err_out; }EXT4_SB (sb)->s_journal = journal;
@@ -5167,6 +5178,10 @@ static int ext4_load_journal(struct super_block *sb, }return 0 ; + +err_out: +jbd2_journal_destroy (journal); +return err; }static int ext4_commit_super (struct super_block *sb,int sync)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 85/255 nfsd: fix oops on mixed NFSv4/NFSv3 client access
In reply to Greg Kroah-HartmanFrom: J. Bruce Fields <[email protected]>
[ Upstream commit 34b09af4f54e6485e28f138ccad159611a240cc1 ]
If an NFSv2/v3 client breaks an NFSv4 client's delegation, it will hit a NULL dereference in nfsd_breaker_owns_lease().
Easily reproduceable with for example
mount -overs=4.2 server:/export /mnt/
sleep 1h </mnt/file &
mount -overs=3 server:/export /mnt2/
touch /mnt2/file
--- fs/nfsd/nfs4state.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfsd/nfs4state.c +2 -0
@@ -4597,6 +4597,8 @@ static bool nfsd_breaker_owns_lease(struct file_lock *fl)if (!i_am_nfsd ())return NULL ; rqst =kthread_data (current); +if (!rqst->rq_lease_breaker) +return NULL ; clp = *(rqst->rq_lease_breaker);return dl->dl_stid.sc_client == clp; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 74/255 pinctrl: mediatek: avoid virtual gpio trying to set reg
In reply to Greg Kroah-HartmanFrom: Hanks Chen <[email protected]>
[ Upstream commit edd546465002621665a3a275abe908a30efdce5b ]
for virtual gpios, they should not do reg setting and should behave as expected for eint function.
--- .../pinctrl/mediatek/pinctrl-mtk-common-v2.c | 25 +++++++++++++++++++ .../pinctrl/mediatek/pinctrl-mtk-common-v2.h | 1 + drivers/pinctrl/mediatek/pinctrl-paris.c | 7 ++++++ 3 files changed, 33 insertions(+)
drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +25 -0
@@ -243,6 +243,28 @@ static int mtk_xt_find_eint_num(struct mtk_pinctrl *hw, unsigned long eint_n)return EINT_NA ; } +/* +* Virtual GPIO only used inside SOC and not being exported to outside SOC. +* Some modules use virtual GPIO as eint (e.g. pmif or usb). +* In MTK platform, external interrupt (EINT) and GPIO is 1-1 mapping +* and we can set GPIO as eint. +* But some modules use specific eint which doesn't have real GPIO pin. +* So we use virtual GPIO to map it. +*/ + +bool mtk_is_virt_gpio (struct mtk_pinctrl *hw,unsigned int gpio_n) +{ +const struct mtk_pin_desc *desc; +bool virt_gpio = false; + + desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio_n]; + +if (desc->funcs && !desc->funcs[desc->eint.eint_m].name) + virt_gpio = true; + +return virt_gpio; +} +static int mtk_xt_get_gpio_n (void *data,unsigned long eint_n,unsigned int *gpio_n,struct gpio_chip **gpio_chip)
@@ -295,6 +317,9 @@ static int mtk_xt_set_gpio_as_eint(void *data, unsigned long eint_n)if (err)return err; +if (mtk_is_virt_gpio (hw, gpio_n)) +return 0 ; + desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio_n]; err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_MODE,
drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h +1 -0
@@ -315,4 +315,5 @@ int mtk_pinconf_adv_drive_set(struct mtk_pinctrl *hw,int mtk_pinconf_adv_drive_get (struct mtk_pinctrl *hw,const struct mtk_pin_desc *desc,u32 *val); +bool mtk_is_virt_gpio (struct mtk_pinctrl *hw,unsigned int gpio_n);#endif /* __PINCTRL_MTK_COMMON_V2_H */
drivers/pinctrl/mediatek/pinctrl-paris.c +7 -0
@@ -769,6 +769,13 @@ static int mtk_gpio_get_direction(struct gpio_chip *chip, unsigned int gpio)if (gpio >= hw->soc->npins)return -EINVAL ; +/* +* "Virtual" GPIOs are always and only used for interrupts +* Since they are only used for interrupts, they are always inputs +*/ +if (mtk_is_virt_gpio (hw, gpio)) +return 1 ; + desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio]; err =mtk_hw_get_value (hw, desc,PINCTRL_PIN_REG_DIR , &value);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 112/255 ext4: abort the filesystem if failed to async write metadata buffer
In reply to Greg Kroah-HartmanFrom: zhangyi (F) <[email protected]>
[ Upstream commit bc71726c725767205757821df364acff87f92ac5 ]
There is a risk of filesystem inconsistency if we failed to async write back metadata buffer in the background. Because of current buffer's end io procedure is handled by end_buffer_async_write() in the block layer, and it only clear the buffer's uptodate flag and mark the write_io_error flag, so ext4 cannot detect such failure immediately. In most cases of getting metadata buffer (e.g. ext4_read_inode_bitmap()), although the buffer's data is actually uptodate, it may still read data from disk because the buffer's uptodate flag has been cleared. Finally, it may lead to on-disk filesystem inconsistency if reading old data from the disk successfully and write them out again.
This patch detect bdev mapping->wb_err when getting journal's write access and mark the filesystem error if bdev's mapping->wb_err was increased, this could prevent further writing and potential inconsistency.
--- fs/ext4/ext4.h | 3 +++ fs/ext4/ext4_jbd2.c | 25 +++++++++++++++++++++++++ fs/ext4/super.c | 17 +++++++++++++++++ 3 files changed, 45 insertions(+)
fs/ext4/ext4.h +3 -0
@@ -1585,6 +1585,9 @@ struct ext4_sb_info {#ifdef CONFIG_EXT4_DEBUG unsigned long s_simulate_fail;#endif +/* Record the errseq of the backing block device */ +errseq_t s_bdev_wb_err; +spinlock_t s_bdev_wb_lock; };static inline struct ext4_sb_info *EXT4_SB (struct super_block *sb)
fs/ext4/ext4_jbd2.c +25 -0
@@ -195,6 +195,28 @@ static void ext4_journal_abort_handle(const char *caller, unsigned int line,jbd2_journal_abort_handle (handle); } +static void ext4_check_bdev_write_error (struct super_block *sb) +{ +struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping; +struct ext4_sb_info *sbi =EXT4_SB (sb); +int err; + +/* +* If the block device has write error flag, it may have failed to +* async write out metadata buffers in the background. In this case, +* we could read old data from disk and write it out again, which +* may lead to on-disk filesystem inconsistency. +*/ +if (errseq_check (&mapping->wb_err,READ_ONCE (sbi->s_bdev_wb_err))) { +spin_lock (&sbi->s_bdev_wb_lock); + err =errseq_check_and_advance (&mapping->wb_err, &sbi->s_bdev_wb_err); +spin_unlock (&sbi->s_bdev_wb_lock); +if (err) +ext4_error_err (sb, -err, +"Error while async write back metadata" ); + } +} +int __ext4_journal_get_write_access (const char *where,unsigned int line,handle_t *handle,struct buffer_head *bh) {
@@ -202,6 +224,9 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line,might_sleep (); +if (bh->b_bdev->bd_super) +ext4_check_bdev_write_error (bh->b_bdev->bd_super); +if (ext4_handle_valid (handle)) { err =jbd2_journal_get_write_access (handle, bh);if (err)
fs/ext4/super.c +17 -0
@@ -4765,6 +4765,15 @@ no_journal: }#endif /* CONFIG_QUOTA */ +/* +* Save the original bdev mapping's wb_err value which could be +* used to detect the metadata async write error. +*/ +spin_lock_init (&sbi->s_bdev_wb_lock); +if (!sb_rdonly (sb)) +errseq_check_and_advance (&sb->s_bdev->bd_inode->i_mapping->wb_err, + &sbi->s_bdev_wb_err); + sb->s_bdev->bd_super = sb;EXT4_SB (sb)->s_mount_state |=EXT4_ORPHAN_FS ;ext4_orphan_cleanup (sb, es);EXT4_SB (sb)->s_mount_state &= ~EXT4_ORPHAN_FS ;
@@ -5654,6 +5663,14 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) goto restore_opts; } +/* +* Update the original bdev mapping's wb_err value +* which could be used to detect the metadata async +* write error. +*/ +errseq_check_and_advance (&sb->s_bdev->bd_inode->i_mapping->wb_err, + &sbi->s_bdev_wb_err); +/* * Mounting a RDONLY partition read-write, so reread * and store the current valid flag. (It may have
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 113/255 jbd2: abort journal if free a async write error metadata buffer
In reply to Greg Kroah-HartmanFrom: zhangyi (F) <[email protected]>
[ Upstream commit c044f3d8360d2ecf831ba2cc9f08cf9fb2c699fb ]
If we free a metadata buffer which has been failed to async write out in the background, the jbd2 checkpoint procedure will not detect this failure in jbd2_log_do_checkpoint(), so it may lead to filesystem inconsistency after cleanup journal tail. This patch abort the journal if free a buffer has write_io_error flag to prevent potential further inconsistency.
--- fs/jbd2/transaction.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
fs/jbd2/transaction.c +16 -0
@@ -2120,6 +2120,7 @@ int jbd2_journal_try_to_free_buffers(journal_t *journal, {struct buffer_head *head;struct buffer_head *bh; +bool has_write_io_error = false;int ret =0 ;J_ASSERT (PageLocked (page));
@@ -2144,11 +2145,26 @@ int jbd2_journal_try_to_free_buffers(journal_t *journal,jbd2_journal_put_journal_head (jh);if (buffer_jbd (bh)) goto busy; + +/* +* If we free a metadata buffer which has been failed to +* write out, the jbd2 checkpoint procedure will not detect +* this failure and may lead to filesystem inconsistency +* after cleanup journal tail. +*/ +if (buffer_write_io_error (bh)) { +pr_err ("JBD2: Error while async write back metadata bh %llu." , + (unsigned long long )bh->b_blocknr); + has_write_io_error = true; + } }while ((bh = bh->b_this_page) != head); ret =try_to_free_buffers (page); busy: +if (has_write_io_error) +jbd2_journal_abort (journal, -EIO ); +return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 114/255 ext4: handle option set by mount flags correctly
In reply to Greg Kroah-HartmanFrom: Lukas Czerner <[email protected]>
[ Upstream commit f25391ebb475d3ffb3aa61bb90e3594c841749ef ]
Currently there is a problem with mount options that can be both set by vfs using mount flags or by a string parsing in ext4.
i_version/iversion options gets lost after remount, for example
$ mount -o i_version /dev/pmem0 /mnt $ grep pmem0 /proc/self/mountinfo | grep i_version 310 95 259:0 / /mnt rw,relatime shared:163 - ext4 /dev/pmem0 rw,seclabel,i_version $ mount -o remount,ro /mnt $ grep pmem0 /proc/self/mountinfo | grep i_version
nolazytime gets ignored by ext4 on remount, for example
$ mount -o lazytime /dev/pmem0 /mnt $ grep pmem0 /proc/self/mountinfo | grep lazytime 310 95 259:0 / /mnt rw,relatime shared:163 - ext4 /dev/pmem0 rw,lazytime,seclabel $ mount -o remount,nolazytime /mnt $ grep pmem0 /proc/self/mountinfo | grep lazytime 310 95 259:0 / /mnt rw,relatime shared:163 - ext4 /dev/pmem0 rw,lazytime,seclabel
Fix it by applying the SB_LAZYTIME and SB_I_VERSION flags from *flags to s_flags before we parse the option and use the resulting state of the same flags in *flags at the end of successful remount.
--- fs/ext4/super.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
fs/ext4/super.c +16 -5
@@ -5487,7 +5487,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) {struct ext4_super_block *es;struct ext4_sb_info *sbi =EXT4_SB (sb); -unsigned long old_sb_flags; +unsigned long old_sb_flags, vfs_flags;struct ext4_mount_options old_opts;int enable_quota =0 ;ext4_group_t g;
@@ -5530,6 +5530,14 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)if (sbi->s_journal && sbi->s_journal->j_task->io_context) journal_ioprio = sbi->s_journal->j_task->io_context->ioprio; +/* +* Some options can be enabled by ext4 and/or by VFS mount flag +* either way we need to make sure it matches in both *flags and +* s_flags. Copy those selected flags from *flags to s_flags +*/ + vfs_flags =SB_LAZYTIME |SB_I_VERSION ; + sb->s_flags = (sb->s_flags & ~vfs_flags) | (*flags & vfs_flags); +if (!parse_options (data, sb,NULL , &journal_ioprio,1 )) { err = -EINVAL ; goto restore_opts;
@@ -5583,9 +5591,6 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)set_task_ioprio (sbi->s_journal->j_task, journal_ioprio); } -if (*flags &SB_LAZYTIME ) - sb->s_flags |=SB_LAZYTIME ; -if ((bool )(*flags &SB_RDONLY ) !=sb_rdonly (sb)) {if (sbi->s_mount_flags &EXT4_MF_FS_ABORTED ) { err = -EROFS ;
@@ -5733,7 +5738,13 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) }#endif - *flags = (*flags & ~SB_LAZYTIME ) | (sb->s_flags &SB_LAZYTIME ); +/* +* Some options can be enabled by ext4 and/or by VFS mount flag +* either way we need to make sure it matches in both *flags and +* s_flags. Copy those selected flags from s_flags to *flags +*/ + *flags = (*flags & ~vfs_flags) | (sb->s_flags & vfs_flags); +ext4_msg (sb,KERN_INFO ,"re-mounted. Opts: %s" , orig_data);kfree (orig_data);return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 87/255 block: virtio_blk: fix handling single range discard request
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit af822aa68fbdf0a480a17462ed70232998127453 ]
1f23816b8eb8 ("virtio_blk: add discard and write zeroes support") starts to support multi-range discard for virtio-blk. However, the virtio-blk disk may report max discard segment as 1, at least that is exactly what qemu is doing.
So far, block layer switches to normal request merge if max discard segment limit is 1, and multiple bios can be merged to single segment. This way may cause memory corruption in virtblk_setup_discard_write_zeroes().
Fix the issue by handling single max discard segment in straightforward way.
--- drivers/block/virtio_blk.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)
drivers/block/virtio_blk.c +23 -8
@@ -126,16 +126,31 @@ static int virtblk_setup_discard_write_zeroes(struct request *req, bool unmap)if (!range)return -ENOMEM ; -__rq_for_each_bio (bio, req) { -u64 sector = bio->bi_iter.bi_sector; -u32 num_sectors = bio->bi_iter.bi_size >>SECTOR_SHIFT ; - - range[n].flags =cpu_to_le32 (flags); - range[n].num_sectors =cpu_to_le32 (num_sectors); - range[n].sector =cpu_to_le64 (sector); - n++; +/* +* Single max discard segment means multi-range discard isn't +* supported, and block layer only runs contiguity merge like +* normal RW request. So we can't reply on bio for retrieving +* each range info. +*/ +if (queue_max_discard_segments (req->q) ==1 ) { + range[0 ].flags =cpu_to_le32 (flags); + range[0 ].num_sectors =cpu_to_le32 (blk_rq_sectors (req)); + range[0 ].sector =cpu_to_le64 (blk_rq_pos (req)); + n =1 ; + }else { +__rq_for_each_bio (bio, req) { +u64 sector = bio->bi_iter.bi_sector; +u32 num_sectors = bio->bi_iter.bi_size >>SECTOR_SHIFT ; + + range[n].flags =cpu_to_le32 (flags); + range[n].num_sectors =cpu_to_le32 (num_sectors); + range[n].sector =cpu_to_le64 (sector); + n++; + } } +WARN_ON_ONCE (n != segments); + req->special_vec.bv_page =virt_to_page (range); req->special_vec.bv_offset =offset_in_page (range); req->special_vec.bv_len =sizeof (*range) * segments;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 116/255 ext4: correctly restore system zone info when remount fails
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit 0f5bde1db174f6c471f0bd27198575719dabe3e5 ]
When remounting filesystem fails late during remount handling and block_validity mount option is also changed during the remount, we fail to restore system zone information to a state matching the mount option. This is mostly harmless, just the block validity checking will not match the situation described by the mount option. Make sure these two are always consistent.
--- fs/ext4/block_validity.c | 8 -------- fs/ext4/super.c | 29 +++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-)
fs/ext4/block_validity.c +0 -8
@@ -254,14 +254,6 @@ int ext4_setup_system_zone(struct super_block *sb)int flex_size =ext4_flex_bg_size (sbi);int ret; -if (!test_opt (sb,BLOCK_VALIDITY )) { -if (sbi->system_blks) -ext4_release_system_zone (sb); -return 0 ; - } -if (sbi->system_blks) -return 0 ; - system_blks =kzalloc (sizeof (*system_blks),GFP_KERNEL );if (!system_blks)return -ENOMEM ;
fs/ext4/super.c +21 -8
@@ -4698,11 +4698,13 @@ no_journal:ext4_set_resv_clusters (sb); - err =ext4_setup_system_zone (sb); -if (err) { -ext4_msg (sb,KERN_ERR ,"failed to initialize system " -"zone (%d)" , err); - goto failed_mount4a; +if (test_opt (sb,BLOCK_VALIDITY )) { + err =ext4_setup_system_zone (sb); +if (err) { +ext4_msg (sb,KERN_ERR ,"failed to initialize system " +"zone (%d)" , err); + goto failed_mount4a; + } }ext4_ext_init (sb);
@@ -5716,9 +5718,16 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)ext4_register_li_request (sb, first_not_zeroed); } - err =ext4_setup_system_zone (sb); -if (err) - goto restore_opts; +/* +* Handle creation of system zone data early because it can fail. +* Releasing of existing data is done when we are sure remount will +* succeed. +*/ +if (test_opt (sb,BLOCK_VALIDITY ) && !sbi->system_blks) { + err =ext4_setup_system_zone (sb); +if (err) + goto restore_opts; + }if (sbi->s_journal ==NULL && !(old_sb_flags &SB_RDONLY )) { err =ext4_commit_super (sb,1 );
@@ -5740,6 +5749,8 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) } }#endif +if (!test_opt (sb,BLOCK_VALIDITY ) && sbi->system_blks) +ext4_release_system_zone (sb);/* * Some options can be enabled by ext4 and/or by VFS mount flag
@@ -5761,6 +5772,8 @@ restore_opts: sbi->s_commit_interval = old_opts.s_commit_interval; sbi->s_min_batch_time = old_opts.s_min_batch_time; sbi->s_max_batch_time = old_opts.s_max_batch_time; +if (!test_opt (sb,BLOCK_VALIDITY ) && sbi->system_blks) +ext4_release_system_zone (sb);#ifdef CONFIG_QUOTA sbi->s_jquota_fmt = old_opts.s_jquota_fmt;for (i =0 ; i <EXT4_MAXQUOTAS ; i++) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 127/255 libbpf: Handle GCC built-in types for Arm NEON
In reply to Greg Kroah-HartmanFrom: Jean-Philippe Brucker <[email protected]>
[ Upstream commit 702eddc77a905782083b14ccd05b23840675fd18 ]
When building Arm NEON (SIMD) code from lib/raid6/neon.uc, GCC emits DWARF information using a base type "__Poly8_t", which is internal to GCC and not recognized by Clang. This causes build failures when building with Clang a vmlinux.h generated from an arm64 kernel that was built with GCC.
vmlinux.h:47284:9: error: unknown type name '__Poly8_t' typedef __Poly8_t poly8x16_t[16]; ^~~~~~~~~
The polyX_t types are defined as unsigned integers in the "Arm C Language Extension" document (101028_Q220_00_en). Emit typedefs based on standard integer types for the GCC internal types, similar to those emitted by Clang.
Including linux/kernel.h to use ARRAY_SIZE() incidentally redefined max(), causing a build bug due to different types, hence the seemingly unrelated change.
--- tools/lib/bpf/btf_dump.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)
tools/lib/bpf/btf_dump.c +34 -1
@@ -13,6 +13,7 @@#include <errno.h> #include <linux/err.h> #include <linux/btf.h> +#include <linux/kernel.h> #include "btf.h" #include "hashmap.h" #include "libbpf.h"
@@ -548,6 +549,9 @@ static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr) } } +static void btf_dump_emit_missing_aliases (struct btf_dump *d,__u32 id, +const struct btf_type *t); +static void btf_dump_emit_struct_fwd (struct btf_dump *d,__u32 id,const struct btf_type *t); static void btf_dump_emit_struct_def(struct btf_dump *d, __u32 id,
@@ -670,6 +674,9 @@ static void btf_dump_emit_type(struct btf_dump *d, __u32 id, __u32 cont_id)switch (kind) {case BTF_KIND_INT : +/* Emit type alias definitions if necessary */ +btf_dump_emit_missing_aliases (d, id, t); + tstate->emit_state =EMITTED ;break ;case BTF_KIND_ENUM :
@@ -869,7 +876,7 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,btf_dump_printf (d,": %d" , m_sz); off = m_off + m_sz; }else { - m_sz =max (0 ,btf__resolve_size (d->btf, m->type)); + m_sz =max (0LL ,btf__resolve_size (d->btf, m->type)); off = m_off + m_sz *8 ; }btf_dump_printf (d,";" );
@@ -889,6 +896,32 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,btf_dump_printf (d," __attribute__((packed))" ); } +static const char *missing_base_types[][2 ] = { +/* +* GCC emits typedefs to its internal __PolyX_t types when compiling Arm +* SIMD intrinsics. Alias them to standard base types. +*/ + {"__Poly8_t" ,"unsigned char" }, + {"__Poly16_t" ,"unsigned short" }, + {"__Poly64_t" ,"unsigned long long" }, + {"__Poly128_t" ,"unsigned __int128" }, +}; + +static void btf_dump_emit_missing_aliases (struct btf_dump *d,__u32 id, +const struct btf_type *t) +{ +const char *name =btf_dump_type_name (d, id); +int i; + +for (i =0 ; i <ARRAY_SIZE (missing_base_types); i++) { +if (strcmp (name, missing_base_types[i][0 ]) ==0 ) { +btf_dump_printf (d,"typedef %s %s;\n\n" , + missing_base_types[i][1 ], name); +break ; + } + } +} +static void btf_dump_emit_enum_fwd (struct btf_dump *d,__u32 id,const struct btf_type *t) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 91/255 hwmon: (nct7904) Correct divide by 0
In reply to Greg Kroah-HartmanFrom: Jason Baron <[email protected]>
[ Upstream commit 8aebbbb2d573d0b4afc08b90ac7d73dba2d9da97 ]
We hit a kernel panic due to a divide by 0 in nct7904_read_fan() for the hwmon_fan_min case. Extend the check to hwmon_fan_input case as well for safety.
[ 1656.545650] divide error: 0000 [#1] SMP PTI [ 1656.545779] CPU: 12 PID: 18010 Comm: sensors Not tainted 5.4.47 #1 [ 1656.546065] RIP: 0010:nct7904_read+0x1e9/0x510 [nct7904] ... [ 1656.546549] RAX: 0000000000149970 RBX: ffffbd6b86bcbe08 RCX: 0000000000000000 ... [ 1656.547548] Call Trace: [ 1656.547665] hwmon_attr_show+0x32/0xd0 [hwmon] [ 1656.547783] dev_attr_show+0x18/0x50 [ 1656.547898] sysfs_kf_seq_show+0x99/0x120 [ 1656.548013] seq_read+0xd8/0x3e0 [ 1656.548127] vfs_read+0x89/0x130 [ 1656.548234] ksys_read+0x7d/0xb0 [ 1656.548342] do_syscall_64+0x48/0x110 [ 1656.548451] entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/hwmon/nct7904.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/nct7904.c +2 -2
@@ -231,7 +231,7 @@ static int nct7904_read_fan(struct device *dev, u32 attr, int channel,if (ret <0 )return ret; cnt = ((ret &0xff00 ) >>3 ) | (ret &0x1f ); -if (cnt ==0x1fff ) +if (cnt ==0 || cnt ==0x1fff ) rpm =0 ;else rpm =1350000 / cnt;
@@ -243,7 +243,7 @@ static int nct7904_read_fan(struct device *dev, u32 attr, int channel,if (ret <0 )return ret; cnt = ((ret &0xff00 ) >>3 ) | (ret &0x1f ); -if (cnt ==0x1fff ) +if (cnt ==0 || cnt ==0x1fff ) rpm =0 ;else rpm =1350000 / cnt;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 126/255 selftests/bpf: Fix segmentation fault in test_progs
In reply to Greg Kroah-HartmanFrom: Jianlin Lv <[email protected]>
[ Upstream commit 0390c429dbed4068bd2cd8dded937d9a5ec24cd2 ]
test_progs reports the segmentation fault as below:
$ sudo ./test_progs -t mmap --verbose test_mmap:PASS:skel_open_and_load 0 nsec [...] test_mmap:PASS:adv_mmap1 0 nsec test_mmap:PASS:adv_mmap2 0 nsec test_mmap:PASS:adv_mmap3 0 nsec test_mmap:PASS:adv_mmap4 0 nsec Segmentation fault
This issue was triggered because mmap() and munmap() used inconsistent length parameters; mmap() creates a new mapping of 3 * page_size, but the length parameter set in the subsequent re-map and munmap() functions is 4 * page_size; this leads to the destruction of the process space.
To fix this issue, first create 4 pages of anonymous mapping, then do all the mmap() with MAP_FIXED.
Another issue is that when unmap the second page fails, the length parameter to delete tmp1 mappings should be 4 * page_size.
--- tools/testing/selftests/bpf/prog_tests/mmap.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
tools/testing/selftests/bpf/prog_tests/mmap.c +13 -6
@@ -21,7 +21,7 @@ void test_mmap(void)const long page_size =sysconf (_SC_PAGE_SIZE);int err, duration =0 , i, data_map_fd, data_map_id, tmp_fd, rdmap_fd;struct bpf_map *data_map, *bss_map; -void *bss_mmaped =NULL , *map_mmaped =NULL , *tmp1, *tmp2; +void *bss_mmaped =NULL , *map_mmaped =NULL , *tmp0, *tmp1, *tmp2;struct test_mmap__bss *bss_data;struct bpf_map_info map_info;__u32 map_info_sz =sizeof (map_info);
@@ -183,16 +183,23 @@ void test_mmap(void)/* check some more advanced mmap() manipulations */ + tmp0 =mmap (NULL ,4 * page_size,PROT_READ ,MAP_SHARED |MAP_ANONYMOUS , +-1 ,0 ); +if (CHECK (tmp0 ==MAP_FAILED ,"adv_mmap0" ,"errno %d\n" , errno)) + goto cleanup; +/* map all but last page: pages 1-3 mapped */ - tmp1 =mmap (NULL ,3 * page_size,PROT_READ ,MAP_SHARED , + tmp1 =mmap (tmp0,3 * page_size,PROT_READ ,MAP_SHARED |MAP_FIXED , data_map_fd,0 ); -if (CHECK (tmp1 ==MAP_FAILED ,"adv_mmap1" ,"errno %d\n" , errno)) +if (CHECK (tmp0 != tmp1,"adv_mmap1" ,"tmp0: %p, tmp1: %p\n" , tmp0, tmp1)) { +munmap (tmp0,4 * page_size); goto cleanup; + }/* unmap second page: pages 1, 3 mapped */ err =munmap (tmp1 + page_size, page_size);if (CHECK (err,"adv_mmap2" ,"errno %d\n" , errno)) { -munmap (tmp1, map_sz); +munmap (tmp1,4 * page_size); goto cleanup; }
@@ -201,7 +208,7 @@ void test_mmap(void) MAP_SHARED | MAP_FIXED, data_map_fd, 0);if (CHECK (tmp2 ==MAP_FAILED ,"adv_mmap3" ,"errno %d\n" , errno)) {munmap (tmp1, page_size); -munmap (tmp1 +2 *page_size, page_size); +munmap (tmp1 +2 *page_size,2 * page_size); goto cleanup; } CHECK(tmp1 + page_size != tmp2, "adv_mmap4",
@@ -211,7 +218,7 @@ void test_mmap(void) tmp2 =mmap (tmp1,4 * page_size,PROT_READ ,MAP_SHARED |MAP_FIXED , data_map_fd,0 );if (CHECK (tmp2 ==MAP_FAILED ,"adv_mmap5" ,"errno %d\n" , errno)) { -munmap (tmp1,3 * page_size);/* unmap page 1 */ +munmap (tmp1,4 * page_size);/* unmap page 1 */ goto cleanup; }CHECK (tmp1 != tmp2,"adv_mmap6" ,"tmp1: %p, tmp2: %p\n" , tmp1, tmp2);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 129/255 libbpf: Prevent overriding errno when logging errors
In reply to Greg Kroah-HartmanFrom: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit 23ab656be263813acc3c20623757d3cd1496d9e1 ]
Turns out there were a few more instances where libbpf didn't save the errno before writing an error message, causing errno to be overridden by the printf() return and the error disappearing if logging is enabled.
--- tools/lib/bpf/libbpf.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
tools/lib/bpf/libbpf.c +7 -5
@@ -3319,10 +3319,11 @@ bpf_object__probe_global_data(struct bpf_object *obj) map =bpf_create_map_xattr (&map_attr);if (map <0 ) { - cp =libbpf_strerror_r (errno, errmsg,sizeof (errmsg)); + ret = -errno; + cp =libbpf_strerror_r (ret, errmsg,sizeof (errmsg));pr_warn ("Error in %s():%s(%d). Couldn't create simple array map.\n" , - __func__, cp, errno); -return -errno; + __func__, cp, -ret); +return ret; } insns[0 ].imm = map;
@@ -5779,9 +5780,10 @@ int bpf_program__pin_instance(struct bpf_program *prog, const char *path, }if (bpf_obj_pin (prog->instances.fds[instance], path)) { - cp =libbpf_strerror_r (errno, errmsg,sizeof (errmsg)); + err = -errno; + cp =libbpf_strerror_r (err, errmsg,sizeof (errmsg));pr_warn ("failed to pin program: %s\n" , cp); -return -errno; +return err; }pr_debug ("pinned program '%s'\n" , path);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 54/255 btrfs: file: reserve qgroup space after the hole punch range is locked
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
[ Upstream commit a7f8b1c2ac21bf081b41264c9cfd6260dffa6246 ]
The incoming qgroup reserved space timing will move the data reservation to ordered extent completely.
However in btrfs_punch_hole_lock_range() will call btrfs_invalidate_page(), which will clear QGROUP_RESERVED bit for the range.
In current stage it's OK, but if we're making ordered extents handle the reserved space, then btrfs_punch_hole_lock_range() can clear the QGROUP_RESERVED bit before we submit ordered extent, leading to qgroup reserved space leakage.
So here change the timing to make reserve data space after btrfs_punch_hole_lock_range().
The new timing is fine for either current code or the new code.
--- fs/btrfs/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/btrfs/file.c +4 -4
@@ -3176,14 +3176,14 @@ reserve_space:if (ret <0 ) goto out; space_reserved = true; - ret =btrfs_qgroup_reserve_data (inode, &data_reserved, - alloc_start, bytes_to_reserve); -if (ret) - goto out; ret =btrfs_punch_hole_lock_range (inode, lockstart, lockend, &cached_state);if (ret) goto out; + ret =btrfs_qgroup_reserve_data (inode, &data_reserved, + alloc_start, bytes_to_reserve); +if (ret) + goto out; ret = btrfs_prealloc_file_range(inode, mode, alloc_start, alloc_end - alloc_start, i_blocksize(inode),
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 132/255 selftests/bpf: Fix btf_dump test cases on 32-bit arches
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit eed7818adf03e874994b966aa33bc00204dd275a ]
Fix btf_dump test cases by hard-coding BPF's pointer size of 8 bytes for cases where it's impossible to deterimne the pointer size (no long type in BTF). In cases where it's known, validate libbpf correctly determines it as 8.
--- .../selftests/bpf/prog_tests/btf_dump.c | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-)
tools/testing/selftests/bpf/prog_tests/btf_dump.c +20 -7
@@ -12,15 +12,16 @@ void btf_dump_printf(void *ctx, const char *fmt, va_list args)static struct btf_dump_test_case {const char *name;const char *file; +bool known_ptr_sz;struct btf_dump_opts opts; } btf_dump_test_cases[] = { - {"btf_dump: syntax" ,"btf_dump_test_case_syntax" , {}}, - {"btf_dump: ordering" ,"btf_dump_test_case_ordering" , {}}, - {"btf_dump: padding" ,"btf_dump_test_case_padding" , {}}, - {"btf_dump: packing" ,"btf_dump_test_case_packing" , {}}, - {"btf_dump: bitfields" ,"btf_dump_test_case_bitfields" , {}}, - {"btf_dump: multidim" ,"btf_dump_test_case_multidim" , {}}, - {"btf_dump: namespacing" ,"btf_dump_test_case_namespacing" , {}}, + {"btf_dump: syntax" ,"btf_dump_test_case_syntax" , true, {}}, + {"btf_dump: ordering" ,"btf_dump_test_case_ordering" , false, {}}, + {"btf_dump: padding" ,"btf_dump_test_case_padding" , true, {}}, + {"btf_dump: packing" ,"btf_dump_test_case_packing" , true, {}}, + {"btf_dump: bitfields" ,"btf_dump_test_case_bitfields" , true, {}}, + {"btf_dump: multidim" ,"btf_dump_test_case_multidim" , false, {}}, + {"btf_dump: namespacing" ,"btf_dump_test_case_namespacing" , false, {}}, }; static int btf_dump_all_types(const struct btf *btf,
@@ -62,6 +63,18 @@ static int test_btf_dump_case(int n, struct btf_dump_test_case *t) goto done; } +/* tests with t->known_ptr_sz have no "long" or "unsigned long" type, +* so it's impossible to determine correct pointer size; but if they +* do, it should be 8 regardless of host architecture, becaues BPF +* target is always 64-bit +*/ +if (!t->known_ptr_sz) { +btf__set_pointer_size (btf,8 ); + }else { +CHECK (btf__pointer_size (btf) !=8 ,"ptr_sz" ,"exp %d, got %zu\n" , +8 ,btf__pointer_size (btf)); + } +snprintf (out_file,sizeof (out_file),"/tmp/%s.output.XXXXXX" , t->file); fd =mkstemp (out_file);if (CHECK (fd <0 ,"create_tmp" ,"failed to create file: %d\n" , fd)) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 133/255 selftests/bpf: Correct various core_reloc 64-bit assumptions
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 5705d705832f74395c5465ce93192688f543006a ]
Ensure that types are memory layout- and field alignment-compatible regardless of 32/64-bitness mix of libbpf and BPF architecture.
--- .../selftests/bpf/prog_tests/core_reloc.c | 20 +++--- .../selftests/bpf/progs/core_reloc_types.h | 69 ++++++++++--------- 2 files changed, 47 insertions(+), 42 deletions(-)
tools/testing/selftests/bpf/prog_tests/core_reloc.c +10 -10
@@ -237,8 +237,8 @@ .union_sz = sizeof(((type *)0)->union_field), \ .arr_sz = sizeof(((type *)0)->arr_field), \ .arr_elem_sz = sizeof(((type *)0)->arr_field[0]), \ - .ptr_sz = sizeof(((type *)0)->ptr_field), \ - .enum_sz = sizeof(((type *)0)->enum_field), \ + .ptr_sz = 8, /* always 8-byte pointer for BPF */ \ + .enum_sz = sizeof(((type *)0)->enum_field), \ }#define SIZE_CASE (name) { \
@@ -432,20 +432,20 @@ static struct core_reloc_test_case test_cases[] = { .sb4 = -1, .sb20 = -0x17654321, .u32 = 0xBEEF, - .s32 =-0x3FEDCBA987654321 , + .s32 =-0x3FEDCBA987654321LL , }),BITFIELDS_CASE (bitfields___bitfield_vs_int, { - .ub1 = 0xFEDCBA9876543210, + .ub1 = 0xFEDCBA9876543210LL, .ub2 = 0xA6, - .ub7 = -0x7EDCBA987654321, - .sb4 = -0x6123456789ABCDE, - .sb20 = 0xD00D, + .ub7 = -0x7EDCBA987654321LL, + .sb4 = -0x6123456789ABCDELL, + .sb20 = 0xD00DLL, .u32 = -0x76543, - .s32 = 0x0ADEADBEEFBADB0B, + .s32 = 0x0ADEADBEEFBADB0BLL, }),BITFIELDS_CASE (bitfields___just_big_enough, { - .ub1 = 0xF, - .ub2 = 0x0812345678FEDCBA, + .ub1 = 0xFLL, + .ub2 = 0x0812345678FEDCBALL, }), BITFIELDS_ERR_CASE(bitfields___err_too_big_bitfield),
tools/testing/selftests/bpf/progs/core_reloc_types.h +37 -32
158 lines not on this page · raw message
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 131/255 selftest/bpf: Fix compilation warnings in 32-bit mode
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 9028bbcc3e12510cac13a9554f1a1e39667a4387 ]
Fix compilation warnings emitted when compiling selftests for 32-bit platform (x86 in my case).
--- tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c | 8 ++++---- tools/testing/selftests/bpf/prog_tests/core_extern.c | 4 ++-- tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c | 6 +++--- tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 2 +- tools/testing/selftests/bpf/prog_tests/global_data.c | 6 +++--- tools/testing/selftests/bpf/prog_tests/prog_run_xattr.c | 2 +- tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 2 +- tools/testing/selftests/bpf/test_btf.c | 8 ++++---- tools/testing/selftests/bpf/test_progs.h | 5 +++++ 9 files changed, 24 insertions(+), 19 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c +4 -4
@@ -159,15 +159,15 @@ void test_bpf_obj_id(void)/* Check getting link info */ info_len =sizeof (struct bpf_link_info ) *2 ;bzero (&link_infos[i], info_len); - link_infos[i].raw_tracepoint.tp_name = (__u64)&tp_name; + link_infos[i].raw_tracepoint.tp_name =ptr_to_u64 (&tp_name); link_infos[i].raw_tracepoint.tp_name_len =sizeof (tp_name); err =bpf_obj_get_info_by_fd (bpf_link__fd (links[i]), &link_infos[i], &info_len); if (CHECK(err || link_infos[i].type != BPF_LINK_TYPE_RAW_TRACEPOINT || link_infos[i].prog_id != prog_infos[i].id || - link_infos[i].raw_tracepoint.tp_name != (__u64)&tp_name || - strcmp((char *)link_infos[i].raw_tracepoint.tp_name, + link_infos[i].raw_tracepoint.tp_name != ptr_to_u64(&tp_name) || + strcmp(u64_to_ptr(link_infos[i].raw_tracepoint.tp_name), "sys_enter") || info_len != sizeof(struct bpf_link_info), "get-link-info(fd)",
@@ -178,7 +178,7 @@ void test_bpf_obj_id(void) link_infos[i].type,BPF_LINK_TYPE_RAW_TRACEPOINT , link_infos[i].id, link_infos[i].prog_id, prog_infos[i].id, - (char *)link_infos[i].raw_tracepoint.tp_name, + (const char *)u64_to_ptr (link_infos[i].raw_tracepoint.tp_name), "sys_enter")) goto done;
tools/testing/selftests/bpf/prog_tests/core_extern.c +2 -2
@@ -159,8 +159,8 @@ void test_core_extern(void) exp = (uint64_t *)&t->data;for (j =0 ; j < n; j++) {CHECK (got[j] != exp[j],"check_res" , -"result #%d: expected %lx, but got %lx\n" , - j, exp[j], got[j]); +"result #%d: expected %llx, but got %llx\n" , + j, (__u64 )exp[j], (__u64 )got[j]); } cleanup:test_core_extern__destroy (skel);
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +3 -3
@@ -16,7 +16,7 @@ static void test_fexit_bpf2bpf_common(const char *obj_file,__u32 duration =0 , retval;struct bpf_map *data_map;const int zero =0 ; -u64 *result =NULL ; +__u64 *result =NULL ; err =bpf_prog_load (target_obj_file,BPF_PROG_TYPE_UNSPEC , &pkt_obj, &pkt_fd);
@@ -29,7 +29,7 @@ static void test_fexit_bpf2bpf_common(const char *obj_file, link =calloc (sizeof (struct bpf_link *), prog_cnt); prog =calloc (sizeof (struct bpf_program *), prog_cnt); - result =malloc ((prog_cnt +32 /* spare */ ) *sizeof (u64)); + result =malloc ((prog_cnt +32 /* spare */ ) *sizeof (__u64));if (CHECK (!link || !prog || !result,"alloc_memory" ,"failed to alloc memory" )) goto close_prog;
@@ -72,7 +72,7 @@ static void test_fexit_bpf2bpf_common(const char *obj_file, goto close_prog;for (i =0 ; i < prog_cnt; i++) -if (CHECK (result[i] !=1 ,"result" ,"fexit_bpf2bpf failed err %ld\n" , +if (CHECK (result[i] !=1 ,"result" ,"fexit_bpf2bpf failed err %llu\n" , result[i])) goto close_prog;
tools/testing/selftests/bpf/prog_tests/flow_dissector.c +1 -1
@@ -591,7 +591,7 @@ void test_flow_dissector(void)CHECK_ATTR (tattr.data_size_out !=sizeof (flow_keys) || err || tattr.retval !=1 , tests[i].name, -"err %d errno %d retval %d duration %d size %u/%lu\n" , +"err %d errno %d retval %d duration %d size %u/%zu\n" , err, errno, tattr.retval, tattr.duration, tattr.data_size_out,sizeof (flow_keys));CHECK_FLOW_KEYS (tests[i].name, flow_keys, tests[i].keys);
tools/testing/selftests/bpf/prog_tests/global_data.c +3 -3
@@ -5,7 +5,7 @@static void test_global_data_number (struct bpf_object *obj,__u32 duration) {int i, err, map_fd; -uint64_t num; +__u64 num; map_fd =bpf_find_map (__func__, obj,"result_number" );if (CHECK_FAIL (map_fd <0 ))
@@ -14,7 +14,7 @@ static void test_global_data_number(struct bpf_object *obj, __u32 duration)struct {char *name;uint32_t key; -uint64_t num; +__u64 num; } tests[] = { {"relocate .bss reference" ,0 ,0 }, {"relocate .data reference" ,1 ,42 },
@@ -32,7 +32,7 @@ static void test_global_data_number(struct bpf_object *obj, __u32 duration)for (i =0 ; i <sizeof (tests) /sizeof (tests[0 ]); i++) { err =bpf_map_lookup_elem (map_fd, &tests[i].key, &num);CHECK (err || num != tests[i].num, tests[i].name, -"err %d result %lx expected %lx\n" , +"err %d result %llx expected %llx\n" , err, num, tests[i].num); } }
tools/testing/selftests/bpf/prog_tests/prog_run_xattr.c +1 -1
@@ -28,7 +28,7 @@ void test_prog_run_xattr(void) "err %d errno %d retval %d\n", err, errno, tattr.retval);CHECK_ATTR (tattr.data_size_out !=sizeof (pkt_v4),"data_size_out" , -"incorrect output size, want %lu have %u\n" , +"incorrect output size, want %zu have %u\n" ,sizeof (pkt_v4), tattr.data_size_out); CHECK_ATTR(buf[5] != 0, "overflow",
tools/testing/selftests/bpf/prog_tests/skb_ctx.c +1 -1
@@ -80,7 +80,7 @@ void test_skb_ctx(void)CHECK_ATTR (tattr.ctx_size_out !=sizeof (skb),"ctx_size_out" , -"incorrect output size, want %lu have %u\n" , +"incorrect output size, want %zu have %u\n" ,sizeof (skb), tattr.ctx_size_out);for (i =0 ; i <5 ; i++)
tools/testing/selftests/bpf/test_btf.c +4 -4
@@ -3883,7 +3883,7 @@ static int test_big_btf_info(unsigned int test_num) info_garbage.garbage =0 ; err =bpf_obj_get_info_by_fd (btf_fd, info, &info_len);if (CHECK (err || info_len !=sizeof (*info), -"err:%d errno:%d info_len:%u sizeof(*info):%lu" , +"err:%d errno:%d info_len:%u sizeof(*info):%zu" , err, errno, info_len,sizeof (*info))) { err =-1 ; goto done;
@@ -4094,7 +4094,7 @@ static int do_test_get_info(unsigned int test_num)if (CHECK (err || !info.id || info_len !=sizeof (info) || info.btf_size != raw_btf_size || (ret =memcmp (raw_btf, user_btf, expected_nbytes)), -"err:%d errno:%d info.id:%u info_len:%u sizeof(info):%lu raw_btf_size:%u info.btf_size:%u expected_nbytes:%u memcmp:%d" , +"err:%d errno:%d info.id:%u info_len:%u sizeof(info):%zu raw_btf_size:%u info.btf_size:%u expected_nbytes:%u memcmp:%d" , err, errno, info.id, info_len,sizeof (info), raw_btf_size, info.btf_size, expected_nbytes, ret)) { err =-1 ;
@@ -4730,7 +4730,7 @@ ssize_t get_pprint_expected_line(enum pprint_mapv_kind_t mapv_kind, nexpected_line = snprintf(expected_line, line_size, "%s%u: {%u,0,%d,0x%x,0x%x,0x%x," - "{%lu|[%u,%u,%u,%u,%u,%u,%u,%u]},%s," + "{%llu|[%u,%u,%u,%u,%u,%u,%u,%u]},%s," "%u,0x%x,[[%d,%d],[%d,%d]]}\n", percpu_map ? "\tcpu" : "", percpu_map ? cpu : next_key,
@@ -4738,7 +4738,7 @@ ssize_t get_pprint_expected_line(enum pprint_mapv_kind_t mapv_kind, v->unused_bits2a, v->bits28, v->unused_bits2b, - v->ui64, + (__u64 )v->ui64, v->ui8a[0 ], v->ui8a[1 ], v->ui8a[2 ], v->ui8a[3 ], v->ui8a[4], v->ui8a[5],
tools/testing/selftests/bpf/test_progs.h +5 -0
@@ -133,6 +133,11 @@ static inline __u64 ptr_to_u64(const void *ptr)return (__u64 ) (unsigned long ) ptr; } +static inline void *u64_to_ptr (__u64 ptr) +{ +return (void *) (unsigned long ) ptr; +} +int bpf_find_map (const char *test,struct bpf_object *obj,const char *name);int compare_map_keys (int map1_fd,int map2_fd);int compare_stack_ips (int smap_fd,int amap_fd,int stack_trace_len);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 117/255 fs: prevent BUG_ON in submit_bh_wbc()
In reply to Greg Kroah-HartmanFrom: Xianting Tian <[email protected]>
[ Upstream commit 377254b2cd2252c7c3151b113cbdf93a7736c2e9 ]
If a device is hot-removed --- for example, when a physical device is unplugged from pcie slot or a nbd device's network is shutdown --- this can result in a BUG_ON() crash in submit_bh_wbc(). This is because the when the block device dies, the buffer heads will have their Buffer_Mapped flag get cleared, leading to the crash in submit_bh_wbc.
We had attempted to work around this problem in commit a17712c8 ("ext4: check superblock mapped prior to committing"). Unfortunately, it's still possible to hit the BUG_ON(!buffer_mapped(bh)) if the device dies between when the work-around check in ext4_commit_super() and when submit_bh_wbh() is finally called:
Code path:ext4_commit_super
judge if 'buffer_mapped(sbh)' is false, return <== commit a17712c8
lock_buffer(sbh)
...
unlock_buffer(sbh)
__sync_dirty_buffer(sbh,...
lock_buffer(sbh)
judge if 'buffer_mapped(sbh))' is false, return <== added by this patch
submit_bh(...,sbh)
submit_bh_wbc(...,sbh,...)[100722.966497] kernel BUG at fs/buffer.c:3095! <== BUG_ON(!buffer_mapped(bh))' in submit_bh_wbc() [100722.966503] invalid opcode: 0000 [#1] SMP [100722.966566] task: ffff8817e15a9e40 task.stack: ffffc90024744000 [100722.966574] RIP: 0010:submit_bh_wbc+0x180/0x190 [100722.966575] RSP: 0018:ffffc90024747a90 EFLAGS: 00010246 [100722.966576] RAX: 0000000000620005 RBX: ffff8818a80603a8 RCX: 0000000000000000 [100722.966576] RDX: ffff8818a80603a8 RSI: 0000000000020800 RDI: 0000000000000001 [100722.966577] RBP: ffffc90024747ac0 R08: 0000000000000000 R09: ffff88207f94170d [100722.966578] R10: 00000000000437c8 R11: 0000000000000001 R12: 0000000000020800 [100722.966578] R13: 0000000000000001 R14: 000000000bf9a438 R15: ffff88195f333000 [100722.966580] FS: 00007fa2eee27700(0000) GS:ffff88203d840000(0000) knlGS:0000000000000000 [100722.966580] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [100722.966581] CR2: 0000000000f0b008 CR3: 000000201a622003 CR4: 00000000007606e0 [100722.966582] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [100722.966583] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [100722.966583] PKRU: 55555554 [100722.966583] Call Trace: [100722.966588] __sync_dirty_buffer+0x6e/0xd0 [100722.966614] ext4_commit_super+0x1d8/0x290 [ext4] [100722.966626] __ext4_std_error+0x78/0x100 [ext4] [100722.966635] ? __ext4_journal_get_write_access+0xca/0x120 [ext4] [100722.966646] ext4_reserve_inode_write+0x58/0xb0 [ext4] [100722.966655] ? ext4_dirty_inode+0x48/0x70 [ext4] [100722.966663] ext4_mark_inode_dirty+0x53/0x1e0 [ext4] [100722.966671] ? __ext4_journal_start_sb+0x6d/0xf0 [ext4] [100722.966679] ext4_dirty_inode+0x48/0x70 [ext4] [100722.966682] __mark_inode_dirty+0x17f/0x350 [100722.966686] generic_update_time+0x87/0xd0 [100722.966687] touch_atime+0xa9/0xd0 [100722.966690] generic_file_read_iter+0xa09/0xcd0 [100722.966694] ? page_cache_tree_insert+0xb0/0xb0 [100722.966704] ext4_file_read_iter+0x4a/0x100 [ext4] [100722.966707] ? __inode_security_revalidate+0x4f/0x60 [100722.966709] __vfs_read+0xec/0x160 [100722.966711] vfs_read+0x8c/0x130 [100722.966712] SyS_pread64+0x87/0xb0 [100722.966716] do_syscall_64+0x67/0x1b0 [100722.966719] entry_SYSCALL64_slow_path+0x25/0x25
To address this, add the check of 'buffer_mapped(bh)' to __sync_dirty_buffer(). This also has the benefit of fixing this for other file systems.
With this addition, we can drop the workaround in ext4_commit_supper().
[ Commit description rewritten by tytso. ]
--- fs/buffer.c | 9 +++++++++ fs/ext4/super.c | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-)
fs/buffer.c +9 -0
@@ -3160,6 +3160,15 @@ int __sync_dirty_buffer(struct buffer_head *bh, int op_flags)WARN_ON (atomic_read (&bh->b_count) <1 );lock_buffer (bh);if (test_clear_buffer_dirty (bh)) { +/* +* The bh should be mapped, but it might not be if the +* device was hot-removed. Not much we can do but fail the I/O. +*/ +if (!buffer_mapped (bh)) { +unlock_buffer (bh); +return -EIO ; + } +get_bh (bh); bh->b_end_io = end_buffer_write_sync; ret =submit_bh (REQ_OP_WRITE , op_flags, bh);
fs/ext4/super.c +0 -7
@@ -5204,13 +5204,6 @@ static int ext4_commit_super(struct super_block *sb, int sync)if (!sbh ||block_device_ejected (sb))return error; -/* -* The superblock bh should be mapped, but it might not be if the -* device was hot-removed. Not much we can do but fail the I/O. -*/ -if (!buffer_mapped (sbh)) -return error; -/* * If the file system is mounted read-only, don't update the * superblock write time. This avoids updating the superblock
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 137/255 drivers/net/wan/hdlc_x25: Added needed_headroom and a skb->len check
In reply to Greg Kroah-HartmanFrom: Xie He <[email protected]>
[ Upstream commit 77b981c82c1df7c7ad32a046f17f007450b46954 ]
1. Added a skb->len check
This driver expects upper layers to include a pseudo header of 1 byte when passing down a skb for transmission. This driver will read this 1-byte header. This patch added a skb->len check before reading the header to make sure the header exists.
2. Added needed_headroom and set hard_header_len to 0
When this driver transmits data,
first this driver will remove a pseudo header of 1 byte, then the lapb module will prepend the LAPB header of 2 or 3 bytes.
So the value of needed_headroom in this driver should be 3 - 1.
Because this driver has no header_ops, according to the logic of af_packet.c, the value of hard_header_len should be 0.
Reason of setting needed_headroom and hard_header_len at this place:
This driver is written using the API of the hdlc module, the hdlc module enables this driver (the protocol driver) to run on any hardware that has a driver (the hardware driver) written using the API of the hdlc module.
Two other hdlc protocol drivers - hdlc_ppp and hdlc_raw_eth, also set things like hard_header_len at this place. In hdlc_ppp, it sets hard_header_len after attach_hdlc_protocol and before setting dev->type. In hdlc_raw_eth, it sets hard_header_len by calling ether_setup after attach_hdlc_protocol and after memcpy the settings.
3. Reset needed_headroom when detaching protocols (in hdlc.c)
When detaching a protocol from a hardware device, the hdlc module will reset various parameters of the device (including hard_header_len) to the default values. We add needed_headroom here so that needed_headroom will also be reset.
--- drivers/net/wan/hdlc.c | 1 + drivers/net/wan/hdlc_x25.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/net/wan/hdlc.c +1 -0
@@ -230,6 +230,7 @@ static void hdlc_setup_dev(struct net_device *dev) dev->max_mtu =HDLC_MAX_MTU ; dev->type =ARPHRD_RAWHDLC ; dev->hard_header_len =16 ; + dev->needed_headroom =0 ; dev->addr_len =0 ; dev->header_ops = &hdlc_null_ops; }
drivers/net/wan/hdlc_x25.c +16 -1
@@ -107,8 +107,14 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev) {int result; +/* There should be a pseudo header of 1 byte added by upper layers. +* Check to make sure it is there before reading it. +*/ +if (skb->len <1 ) { +kfree_skb (skb); +return NETDEV_TX_OK ; + } -/* X.25 to LAPB */ switch (skb->data[0 ]) {case X25_IFACE_DATA :/* Data to be transmitted */ skb_pull (skb,1 );
@@ -294,6 +300,15 @@ static int x25_ioctl(struct net_device *dev, struct ifreq *ifr)return result;memcpy (&state (hdlc)->settings, &new_settings, size); + +/* There's no header_ops so hard_header_len should be 0. */ + dev->hard_header_len =0 ; +/* When transmitting data: +* first we'll remove a pseudo header of 1 byte, +* then we'll prepend an LAPB header of at most 3 bytes. +*/ + dev->needed_headroom =3 -1 ; + dev->type =ARPHRD_X25 ;call_netdevice_notifiers (NETDEV_POST_TYPE_CHANGE , dev);netif_dormant_off (dev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 57/255 netfilter: nf_tables: report EEXIST on overlaps
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 77a92189ecfd061616ad531d386639aab7baaad9 ]
Replace EBUSY by EEXIST in the following cases:
- If the user adds a chain with a different configuration such as different type, hook and priority.
- If the user adds a non-base chain that clashes with an existing basechain.
- If the user adds a { key : value } mapping element and the key exists but the value differs.
- If the device already belongs to an existing flowtable.
User describe that this error reporting is confusing:
- https://bugzilla.netfilter.org/show_bug.cgi?id=1176
- https://bugzilla.netfilter.org/show_bug.cgi?id=1413
--- net/netfilter/nf_tables_api.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
net/netfilter/nf_tables_api.c +7 -9
@@ -2037,7 +2037,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,if (nla[NFTA_CHAIN_HOOK ]) {if (!nft_is_base_chain (chain)) -return -EBUSY ; +return -EEXIST ; err =nft_chain_parse_hook (ctx->net, nla, &hook, ctx->family, false);
@@ -2047,21 +2047,21 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy, basechain =nft_base_chain (chain);if (basechain->type != hook.type) {nft_chain_release_hook (&hook); -return -EBUSY ; +return -EEXIST ; }if (ctx->family ==NFPROTO_NETDEV ) {if (!nft_hook_list_equal (&basechain->hook_list, &hook.list)) {nft_chain_release_hook (&hook); -return -EBUSY ; +return -EEXIST ; } }else { ops = &basechain->ops;if (ops->hooknum != hook.num || ops->priority != hook.priority) {nft_chain_release_hook (&hook); -return -EBUSY ; +return -EEXIST ; } }nft_chain_release_hook (&hook);
@@ -5160,10 +5160,8 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,if (nft_set_ext_exists (ext,NFT_SET_EXT_DATA ) ^nft_set_ext_exists (ext2,NFT_SET_EXT_DATA ) ||nft_set_ext_exists (ext,NFT_SET_EXT_OBJREF ) ^ -nft_set_ext_exists (ext2,NFT_SET_EXT_OBJREF )) { - err = -EBUSY ; +nft_set_ext_exists (ext2,NFT_SET_EXT_OBJREF )) goto err_element_clash; - } if ((nft_set_ext_exists(ext, NFT_SET_EXT_DATA) && nft_set_ext_exists(ext2, NFT_SET_EXT_DATA) && memcmp(nft_set_ext_data(ext),
@@ -5171,7 +5169,7 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, (nft_set_ext_exists (ext,NFT_SET_EXT_OBJREF ) &&nft_set_ext_exists (ext2,NFT_SET_EXT_OBJREF ) && *nft_set_ext_obj(ext) != *nft_set_ext_obj(ext2))) - err = -EBUSY; + goto err_element_clash; else if (!(nlmsg_flags & NLM_F_EXCL)) err =0 ; }else if (err == -ENOTEMPTY ) {
@@ -6308,7 +6306,7 @@ static int nft_register_flowtable_net_hooks(struct net *net,list_for_each_entry (hook2, &ft->hook_list, list) {if (hook->ops.dev == hook2->ops.dev && hook->ops.pf == hook2->ops.pf) { - err = -EBUSY ; + err = -EEXIST ; goto err_unregister_net_hooks; } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 139/255 s390/cio: add cond_resched() in the slow_eval_known_fn() loop
In reply to Greg Kroah-HartmanFrom: Vineeth Vijayan <[email protected]>
[ Upstream commit 0b8eb2ee9da1e8c9b8082f404f3948aa82a057b2 ]
The scanning through subchannels during the time of an event could take significant amount of time in case of platforms with lots of known subchannels. This might result in higher scheduling latencies for other tasks especially on systems with a single CPU. Add cond_resched() call, as the loop in slow_eval_known_fn() can be executed for a longer duration.
--- drivers/s390/cio/css.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/s390/cio/css.c +5 -0
@@ -677,6 +677,11 @@ static int slow_eval_known_fn(struct subchannel *sch, void *data) rc =css_evaluate_known_subchannel (sch,1 );if (rc == -EAGAIN )css_schedule_eval (sch->schid); +/* +* The loop might take long time for platforms with lots of +* known devices. Allow scheduling here. +*/ +cond_resched (); }return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 142/255 selftests: disable rp_filter for icmp_redirect.sh
In reply to Greg Kroah-HartmanFrom: David Ahern <[email protected]>
[ Upstream commit bcf7ddb0186d366f761f86196b480ea6dd2dc18c ]
h1 is initially configured to reach h2 via r1 rather than the more direct path through r2. If rp_filter is set and inherited for r2, forwarding fails since the source address of h1 is reachable from eth0 vs the packet coming to it via r1 and eth1. Since rp_filter setting affects the test, explicitly reset it.
--- tools/testing/selftests/net/icmp_redirect.sh | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/net/icmp_redirect.sh +2 -0
@@ -180,6 +180,8 @@ setup() ;; r[12]) ip netns exec $ns sysctl -q -w net.ipv4.ip_forward=1 ip netns exec $ns sysctl -q -w net.ipv4.conf.all.send_redirects=1 + ip netns exec $ns sysctl -q -w net.ipv4.conf.default.rp_filter=0 + ip netns exec $ns sysctl -q -w net.ipv4.conf.all.rp_filter=0 ip netns exec $ns sysctl -q -w net.ipv6.conf.all.forwarding=1 ip netns exec $ns sysctl -q -w net.ipv6.route.mtu_expires=10
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 143/255 scsi: fcoe: Fix I/O path allocation
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit fa39ab5184d64563cd36f2fb5f0d3fbad83a432c ]
ixgbe_fcoe_ddp_setup() can be called from the main I/O path and is called with a spin_lock held, so we have to use GFP_ATOMIC allocation instead of GFP_KERNEL.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +1 -1
@@ -192,7 +192,7 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, }/* alloc the udl from per cpu ddp pool */ - ddp->udl =dma_pool_alloc (ddp_pool->pool,GFP_KERNEL , &ddp->udp); + ddp->udl =dma_pool_alloc (ddp_pool->pool,GFP_ATOMIC , &ddp->udp);if (!ddp->udl) {e_err (drv,"failed allocated ddp context\n" ); goto out_noddp_unmap;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 145/255 scsi: ufs: Improve interrupt handling for shared interrupts
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit 127d5f7c4b653b8be5eb3b2c7bbe13728f9003ff ]
For shared interrupts, the interrupt status might be zero, so check that first.
--- drivers/scsi/ufs/ufshcd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufshcd.c +3 -3
@@ -5991,7 +5991,7 @@ static irqreturn_t ufshcd_sl_intr(struct ufs_hba *hba, u32 intr_status)*/ static irqreturn_t ufshcd_intr (int irq,void *__hba) { -u32 intr_status, enabled_intr_status; +u32 intr_status, enabled_intr_status =0 ;irqreturn_t retval =IRQ_NONE ;struct ufs_hba *hba = __hba;int retries = hba->nutrs;
@@ -6005,7 +6005,7 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba)* read, make sure we handle them by checking the interrupt status * again in a loop until we process all of the reqs before returning. */ - do { +while (intr_status && retries--) { enabled_intr_status = intr_status &ufshcd_readl (hba,REG_INTERRUPT_ENABLE );if (intr_status)
@@ -6014,7 +6014,7 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba) retval |=ufshcd_sl_intr (hba, enabled_intr_status); intr_status =ufshcd_readl (hba,REG_INTERRUPT_STATUS ); - }while (intr_status && --retries); + }if (enabled_intr_status && retval ==IRQ_NONE ) { dev_err(hba->dev, "%s: Unhandled interrupt 0x%08x\n",
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 119/255 spi: stm32: fix fifo threshold level in case of short transfer
In reply to Greg Kroah-HartmanFrom: Amelie Delaunay <[email protected]>
[ Upstream commit 3373e9004acc0603242622b4378c64bc01d21b5f ]
When transfer is shorter than half of the fifo, set the data packet size up to transfer size instead of up to half of the fifo.
Check also that threshold is set at least to 1 data frame.
--- drivers/spi/spi-stm32.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/spi/spi-stm32.c +18 -8
@@ -468,20 +468,27 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz,/** * stm32h7_spi_prepare_fthlv - Determine FIFO threshold level * @spi: pointer to the spi controller data structure +* @xfer_len: length of the message to be transferred */ -static u32 stm32h7_spi_prepare_fthlv (struct stm32_spi *spi) +static u32 stm32h7_spi_prepare_fthlv (struct stm32_spi *spi,u32 xfer_len) { -u32 fthlv, half_fifo; +u32 fthlv, half_fifo, packet;/* data packet should not exceed 1/2 of fifo space */ half_fifo = (spi->fifo_size /2 ); +/* data_packet should not exceed transfer length */ +if (half_fifo > xfer_len) + packet = xfer_len; +else + packet = half_fifo; +if (spi->cur_bpw <=8 ) - fthlv = half_fifo; + fthlv = packet;else if (spi->cur_bpw <=16 ) - fthlv = half_fifo /2 ; + fthlv = packet /2 ;else - fthlv = half_fifo /4 ; + fthlv = packet /4 ;/* align packet size with data registers access */ if (spi->cur_bpw >8 )
@@ -489,6 +496,9 @@ static u32 stm32h7_spi_prepare_fthlv(struct stm32_spi *spi)else fthlv -= (fthlv %4 );/* multiple of 4 */ +if (!fthlv) + fthlv =1 ; +return fthlv; }
@@ -1394,7 +1404,7 @@ static void stm32h7_spi_set_bpw(struct stm32_spi *spi) cfg1_setb |= (bpw <<STM32H7_SPI_CFG1_DSIZE_SHIFT ) &STM32H7_SPI_CFG1_DSIZE ; - spi->cur_fthlv =stm32h7_spi_prepare_fthlv (spi); + spi->cur_fthlv =stm32h7_spi_prepare_fthlv (spi, spi->cur_xferlen); fthlv = spi->cur_fthlv -1 ; cfg1_clrb |=STM32H7_SPI_CFG1_FTHLV ;
@@ -1589,6 +1599,8 @@ static int stm32_spi_transfer_one_setup(struct stm32_spi *spi,spin_lock_irqsave (&spi->lock, flags); + spi->cur_xferlen = transfer->len; +if (spi->cur_bpw != transfer->bits_per_word) { spi->cur_bpw = transfer->bits_per_word; spi->cfg->set_bpw (spi);
@@ -1636,8 +1648,6 @@ static int stm32_spi_transfer_one_setup(struct stm32_spi *spi, goto out; } - spi->cur_xferlen = transfer->len; -dev_dbg (spi->dev,"transfer communication mode set to %d\n" , spi->cur_comm); dev_dbg(spi->dev,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 123/255 drm/amd/powerplay: correct UVD/VCE PG state on custom pptable uploading
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
[ Upstream commit 2c5b8080d810d98e3e59617680218499b17c84a1 ]
The UVD/VCE PG state is managed by UVD and VCE IP. It's error-prone to assume the bootup state in SMU based on the dpm status.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0 -6
@@ -1640,12 +1640,6 @@ static void vega20_init_powergate_state(struct pp_hwmgr *hwmgr) data->uvd_power_gated = true; data->vce_power_gated = true; - -if (data->smu_features[GNLD_DPM_UVD ].enabled) - data->uvd_power_gated = false; - -if (data->smu_features[GNLD_DPM_VCE ].enabled) - data->vce_power_gated = false; }static int vega20_enable_dpm_tasks (struct pp_hwmgr *hwmgr)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 115/255 ext4: handle error of ext4_setup_system_zone() on remount
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit d176b1f62f242ab259ff665a26fbac69db1aecba ]
ext4_setup_system_zone() can fail. Handle the failure in ext4_remount().
--- fs/ext4/super.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/ext4/super.c +4 -1
@@ -5716,7 +5716,10 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)ext4_register_li_request (sb, first_not_zeroed); } -ext4_setup_system_zone (sb); + err =ext4_setup_system_zone (sb); +if (err) + goto restore_opts; +if (sbi->s_journal ==NULL && !(old_sb_flags &SB_RDONLY )) { err =ext4_commit_super (sb,1 );if (err)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 159/255 bpf: Fix a rcu_sched stall issue with bpf task/task_file iterator
In reply to Greg Kroah-HartmanFrom: Yonghong Song <[email protected]>
[ Upstream commit e679654a704e5bd676ea6446fa7b764cbabf168a ]
In our production system, we observed rcu stalls when 'bpftool prog` is running.
rcu: INFO: rcu_sched self-detected stall on CPU rcu: \x097-....: (20999 ticks this GP) idle=302/1/0x4000000000000000 softirq=1508852/1508852 fqs=4913 \x09(t=21031 jiffies g=2534773 q=179750) NMI backtrace for cpu 7 CPU: 7 PID: 184195 Comm: bpftool Kdump: loaded Tainted: G W 5.8.0-00004-g68bfc7f8c1b4 #6 Hardware name: Quanta Twin Lakes MP/Twin Lakes Passive MP, BIOS F09_3A17 05/03/2019 Call Trace: <IRQ> dump_stack+0x57/0x70 nmi_cpu_backtrace.cold+0x14/0x53 ? lapic_can_unplug_cpu.cold+0x39/0x39 nmi_trigger_cpumask_backtrace+0xb7/0xc7 rcu_dump_cpu_stacks+0xa2/0xd0 rcu_sched_clock_irq.cold+0x1ff/0x3d9 ? tick_nohz_handler+0x100/0x100 update_process_times+0x5b/0x90 tick_sched_timer+0x5e/0xf0 __hrtimer_run_queues+0x12a/0x2a0 hrtimer_interrupt+0x10e/0x280 __sysvec_apic_timer_interrupt+0x51/0xe0 asm_call_on_stack+0xf/0x20 </IRQ> sysvec_apic_timer_interrupt+0x6f/0x80 asm_sysvec_apic_timer_interrupt+0x12/0x20 RIP: 0010:task_file_seq_get_next+0x71/0x220 Code: 00 00 8b 53 1c 49 8b 7d 00 89 d6 48 8b 47 20 44 8b 18 41 39 d3 76 75 48 8b 4f 20 8b 01 39 d0 76 61 41 89 d1 49 39 c1 48 19 c0 <48> 8b 49 08 21 d0 48 8d 04 c1 4c 8b 08 4d 85 c9 74 46 49 8b 41 38 RSP: 0018:ffffc90006223e10 EFLAGS: 00000297 RAX: ffffffffffffffff RBX: ffff888f0d172388 RCX: ffff888c8c07c1c0 RDX: 00000000000f017b RSI: 00000000000f017b RDI: ffff888c254702c0 RBP: ffffc90006223e68 R08: ffff888be2a1c140 R09: 00000000000f017b R10: 0000000000000002 R11: 0000000000100000 R12: ffff888f23c24118 R13: ffffc90006223e60 R14: ffffffff828509a0 R15: 00000000ffffffff task_file_seq_next+0x52/0xa0 bpf_seq_read+0xb9/0x320 vfs_read+0x9d/0x180 ksys_read+0x5f/0xe0 do_syscall_64+0x38/0x60 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7f8815f4f76e Code: c0 e9 f6 fe ff ff 55 48 8d 3d 76 70 0a 00 48 89 e5 e8 36 06 02 00 66 0f 1f 44 00 00 64 8b 04 25 18 00 00 00 85 c0 75 14 0f 05 <48> 3d 00 f0 ff ff 77 52 c3 66 0f 1f 84 00 00 00 00 00 55 48 89 e5 RSP: 002b:00007fff8f9df578 EFLAGS: 00000246 ORIG_RAX: 0000000000000000 RAX: ffffffffffffffda RBX: 000000000170b9c0 RCX: 00007f8815f4f76e RDX: 0000000000001000 RSI: 00007fff8f9df5b0 RDI: 0000000000000007 RBP: 00007fff8f9e05f0 R08: 0000000000000049 R09: 0000000000000010 R10: 00007f881601fa40 R11: 0000000000000246 R12: 00007fff8f9e05a8 R13: 00007fff8f9e05a8 R14: 0000000001917f90 R15: 000000000000e22e
Note that bpftool prog actually calls a task_file bpf iterator program to establish an association between prog/map/link/btf anon files and processes.
In the case where the above rcu stall occured, we had a process having 1587 tasks and each task having roughly 81305 files. This implied 129 million bpf prog invocations. Unfortunwtely none of these files are prog/map/link/btf files so bpf iterator/prog needs to traverse all these files and not able to return to user space since there are no seq_file buffer overflow.
This patch fixed the issue in bpf_seq_read() to limit the number of visited objects. If the maximum number of visited objects is reached, no more objects will be visited in the current syscall. If there is nothing written in the seq_file buffer, -EAGAIN will return to the user so user can try again.
The maximum number of visited objects is set at 1 million. In our Intel Xeon D-2191 2.3GHZ 18-core server, bpf_seq_read() visiting 1 million files takes around 0.18 seconds.
We did not use cond_resched() since for some iterators, e.g., netlink iterator, where rcu read_lock critical section spans between consecutive seq_ops->next(), which makes impossible to do cond_resched() in the key while loop of function bpf_seq_read().
--- kernel/bpf/bpf_iter.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
kernel/bpf/bpf_iter.c +14 -1
@@ -64,6 +64,9 @@ static void bpf_iter_done_stop(struct seq_file *seq) iter_priv->done_stop = true; } +/* maximum visited objects before bailing out */ +#define MAX_ITER_OBJECTS 1000000 +/* bpf_seq_read, a customized and simpler version for bpf iterator. * no_llseek is assumed for this file. * The following are differences from seq_read():
@@ -76,7 +79,7 @@ static ssize_t bpf_seq_read(struct file *file, char __user *buf, size_t size, {struct seq_file *seq = file->private_data;size_t n, offs, copied =0 ; -int err =0 ; +int err =0 , num_objs =0 ;void *p;mutex_lock (&seq->lock);
@@ -132,6 +135,7 @@ static ssize_t bpf_seq_read(struct file *file, char __user *buf, size_t size,while (1 ) {loff_t pos = seq->index; + num_objs++; offs = seq->count; p = seq->op->next (seq, p, &seq->index);if (pos == seq->index) {
@@ -150,6 +154,15 @@ static ssize_t bpf_seq_read(struct file *file, char __user *buf, size_t size,if (seq->count >= size)break ; +if (num_objs >=MAX_ITER_OBJECTS ) { +if (offs ==0 ) { + err = -EAGAIN ; + seq->op->stop (seq, p); + goto done; + } +break ; + } + err = seq->op->show (seq, p);if (err >0 ) {bpf_iter_dec_seq_num (seq);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 160/255 bpf: Avoid visit same object multiple times
In reply to Greg Kroah-HartmanFrom: Yonghong Song <[email protected]>
[ Upstream commit e60572b8d4c39572be6857d1ec91fdf979f8775f ]
Currently when traversing all tasks, the next tid is always increased by one. This may result in visiting the same task multiple times in a pid namespace.
This patch fixed the issue by seting the next tid as pid_nr_ns(pid, ns) + 1, similar to funciton next_tgid().
--- kernel/bpf/task_iter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/task_iter.c +2 -1
@@ -28,8 +28,9 @@ static struct task_struct *task_seq_get_next(struct pid_namespace *ns,rcu_read_lock (); retry: - pid =idr_get_next (&ns->idr, tid); + pid =find_ge_pid (*tid, ns);if (pid) { + *tid =pid_nr_ns (pid, ns); task =get_pid_task (pid,PIDTYPE_PID );if (!task) { ++*tid;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 107/255 jbd2: make sure jh have b_transaction set in refile/unfile_buffer
In reply to Greg Kroah-HartmanFrom: Lukas Czerner <[email protected]>
[ Upstream commit 24dc9864914eb5813173cfa53313fcd02e4aea7d ]
Callers of __jbd2_journal_unfile_buffer() and __jbd2_journal_refile_buffer() assume that the b_transaction is set. In fact if it's not, we can end up with journal_head refcounting errors leading to crash much later that might be very hard to track down. Add asserts to make sure that is the case.
We also make sure that b_next_transaction is NULL in __jbd2_journal_unfile_buffer() since the callers expect that as well and we should not get into that stage in this state anyway, leading to problems later on if we do.
Tested with fstests.
--- fs/jbd2/transaction.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/jbd2/transaction.c +10 -0
@@ -2026,6 +2026,9 @@ static void __jbd2_journal_temp_unlink_buffer(struct journal_head *jh)*/ static void __jbd2_journal_unfile_buffer (struct journal_head *jh) { +J_ASSERT_JH (jh, jh->b_transaction !=NULL ); +J_ASSERT_JH (jh, jh->b_next_transaction ==NULL ); +__jbd2_journal_temp_unlink_buffer (jh); jh->b_transaction =NULL ; }
@@ -2572,6 +2575,13 @@ bool __jbd2_journal_refile_buffer(struct journal_head *jh) was_dirty =test_clear_buffer_jbddirty (bh);__jbd2_journal_temp_unlink_buffer (jh); + +/* +* b_transaction must be set, otherwise the new b_transaction won't +* be holding jh reference +*/ +J_ASSERT_JH (jh, jh->b_transaction !=NULL ); +/* * We set b_transaction here because b_next_transaction will inherit * our jh reference and thus __jbd2_journal_file_buffer() must not
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 161/255 ext4: limit the length of per-inode prealloc list
In reply to Greg Kroah-HartmanFrom: brookxu <[email protected]>
[ Upstream commit 27bc446e2def38db3244a6eb4bb1d6312936610a ]
In the scenario of writing sparse files, the per-inode prealloc list may be very long, resulting in high overhead for ext4_mb_use_preallocated(). To circumvent this problem, we limit the maximum length of per-inode prealloc list to 512 and allow users to modify it.
After patching, we observed that the sys ratio of cpu has dropped, and the system throughput has increased significantly. We created a process to write the sparse file, and the running time of the process on the fixed kernel was significantly reduced, as follows:
Running time on unfixed kernel:
[root@TENCENT64 ~]# time taskset 0x01 ./sparse /data1/sparce.dat
real 0m2.051s user 0m0.008s sys 0m2.026s
Running time on fixed kernel:
[root@TENCENT64 ~]# time taskset 0x01 ./sparse /data1/sparce.dat
real 0m0.471s user 0m0.004s sys 0m0.395s
--- Documentation/admin-guide/ext4.rst | 3 ++ fs/ext4/ext4.h | 4 +- fs/ext4/extents.c | 10 ++-- fs/ext4/file.c | 2 +- fs/ext4/indirect.c | 2 +- fs/ext4/inode.c | 6 +-- fs/ext4/ioctl.c | 2 +- fs/ext4/mballoc.c | 74 ++++++++++++++++++++++++++---- fs/ext4/mballoc.h | 4 ++ fs/ext4/move_extent.c | 4 +- fs/ext4/super.c | 3 +- fs/ext4/sysfs.c | 2 + include/trace/events/ext4.h | 17 ++++--- 13 files changed, 104 insertions(+), 29 deletions(-)
Documentation/admin-guide/ext4.rst +3 -0
@@ -482,6 +482,9 @@ Files in /sys/fs/ext4/<devname>: multiple of this tuning parameter if the stripe size is not set in the ext4 superblock + mb_max_inode_prealloc + The maximum length of per-inode ext4_prealloc_space list. + mb_max_to_scan The maximum number of extents the multiblock allocator will search to find the best extent.
fs/ext4/ext4.h +3 -1
@@ -1054,6 +1054,7 @@ struct ext4_inode_info {struct timespec64 i_crtime;/* mballoc */ +atomic_t i_prealloc_active;struct list_head i_prealloc_list;spinlock_t i_prealloc_lock;
@@ -1501,6 +1502,7 @@ struct ext4_sb_info {unsigned int s_mb_stats;unsigned int s_mb_order2_reqs;unsigned int s_mb_group_prealloc; +unsigned int s_mb_max_inode_prealloc;unsigned int s_max_dir_size_kb;/* where last allocation was done - for stream allocation */ unsigned long s_mb_last_group;
@@ -2654,7 +2656,7 @@ extern int ext4_mb_release(struct super_block *);extern ext4_fsblk_t ext4_mb_new_blocks (handle_t *,struct ext4_allocation_request *,int *);extern int ext4_mb_reserve_blocks (struct super_block *,int ); -extern void ext4_discard_preallocations (struct inode *); +extern void ext4_discard_preallocations (struct inode *,unsigned int );extern int __init ext4_init_mballoc (void );extern void ext4_exit_mballoc (void ); extern void ext4_free_blocks(handle_t *handle, struct inode *inode,
fs/ext4/extents.c +5 -5
@@ -100,7 +100,7 @@ static int ext4_ext_trunc_restart_fn(struct inode *inode, int *dropped)* i_mutex. So we can safely drop the i_data_sem here. */ BUG_ON (EXT4_JOURNAL (inode) ==NULL ); -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 );up_write (&EXT4_I (inode)->i_data_sem); *dropped =1 ;return 0 ;
@@ -4268,7 +4268,7 @@ got_allocated_blocks:* not a good idea to call discard here directly, * but otherwise we'd need to call it every free(). */ -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 );if (flags &EXT4_GET_BLOCKS_DELALLOC_RESERVE ) fb_flags =EXT4_FREE_BLOCKS_NO_QUOT_UPDATE ; ext4_free_blocks(handle, inode, NULL, newblock,
@@ -5295,7 +5295,7 @@ static int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) }down_write (&EXT4_I (inode)->i_data_sem); -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 ); ret =ext4_es_remove_extent (inode, punch_start,EXT_MAX_BLOCKS - punch_start);
@@ -5309,7 +5309,7 @@ static int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len)up_write (&EXT4_I (inode)->i_data_sem); goto out_stop; } -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 ); ret =ext4_ext_shift_extents (inode, handle, punch_stop, punch_stop - punch_start,SHIFT_LEFT );
@@ -5441,7 +5441,7 @@ static int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len) goto out_stop;down_write (&EXT4_I (inode)->i_data_sem); -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 ); path =ext4_find_extent (inode, offset_lblk,NULL ,0 );if (IS_ERR (path)) {
fs/ext4/file.c +1 -1
@@ -148,7 +148,7 @@ static int ext4_release_file(struct inode *inode, struct file *filp) !EXT4_I(inode)->i_reserved_data_blocks) {down_write (&EXT4_I (inode)->i_data_sem); -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 );up_write (&EXT4_I (inode)->i_data_sem); }if (is_dx (inode) && filp->private_data)
fs/ext4/indirect.c +1 -1
@@ -696,7 +696,7 @@ static int ext4_ind_trunc_restart_fn(handle_t *handle, struct inode *inode,* i_mutex. So we can safely drop the i_data_sem here. */ BUG_ON (EXT4_JOURNAL (inode) ==NULL ); -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 );up_write (&EXT4_I (inode)->i_data_sem); *dropped =1 ;return 0 ;
fs/ext4/inode.c +3 -3
@@ -383,7 +383,7 @@ void ext4_da_update_reserve_space(struct inode *inode,*/ if ((ei->i_reserved_data_blocks ==0 ) && !inode_is_open_for_write (inode)) -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 ); } static int __check_block_validity(struct inode *inode, const char *func,
@@ -4055,7 +4055,7 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length)if (stop_block > first_block) {down_write (&EXT4_I (inode)->i_data_sem); -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 ); ret =ext4_es_remove_extent (inode, first_block, stop_block - first_block);
@@ -4210,7 +4210,7 @@ int ext4_truncate(struct inode *inode)down_write (&EXT4_I (inode)->i_data_sem); -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 );if (ext4_test_inode_flag (inode,EXT4_INODE_EXTENTS )) err =ext4_ext_truncate (handle, inode);
fs/ext4/ioctl.c +1 -1
@@ -202,7 +202,7 @@ static long swap_inode_boot_loader(struct super_block *sb,reset_inode_seed (inode);reset_inode_seed (inode_bl); -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 ); err =ext4_mark_inode_dirty (handle, inode);if (err <0 ) {
fs/ext4/mballoc.c +66 -8
160 lines not on this page · raw message
fs/ext4/mballoc.h +4 -0
@@ -73,6 +73,10 @@*/ #define MB_DEFAULT_GROUP_PREALLOC 512 +/* +* maximum length of inode prealloc list +*/ +#define MB_DEFAULT_MAX_INODE_PREALLOC 512struct ext4_free_data {/* this links the free block information from sb_info */
fs/ext4/move_extent.c +2 -2
@@ -686,8 +686,8 @@ ext4_move_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk, out:if (*moved_len) { -ext4_discard_preallocations (orig_inode); -ext4_discard_preallocations (donor_inode); +ext4_discard_preallocations (orig_inode,0 ); +ext4_discard_preallocations (donor_inode,0 ); }ext4_ext_drop_refs (path);
fs/ext4/super.c +2 -1
@@ -1123,6 +1123,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)inode_set_iversion (&ei->vfs_inode,1 );spin_lock_init (&ei->i_raw_lock);INIT_LIST_HEAD (&ei->i_prealloc_list); +atomic_set (&ei->i_prealloc_active,0 );spin_lock_init (&ei->i_prealloc_lock);ext4_es_init_tree (&ei->i_es_tree);rwlock_init (&ei->i_es_lock);
@@ -1216,7 +1217,7 @@ void ext4_clear_inode(struct inode *inode) {invalidate_inode_buffers (inode);clear_inode (inode); -ext4_discard_preallocations (inode); +ext4_discard_preallocations (inode,0 );ext4_es_remove_extent (inode,0 ,EXT_MAX_BLOCKS );dquot_drop (inode);if (EXT4_I (inode)->jinode) {
fs/ext4/sysfs.c +2 -0
@@ -215,6 +215,7 @@ EXT4_RW_ATTR_SBI_UI(mb_min_to_scan, s_mb_min_to_scan);EXT4_RW_ATTR_SBI_UI (mb_order2_req, s_mb_order2_reqs);EXT4_RW_ATTR_SBI_UI (mb_stream_req, s_mb_stream_request);EXT4_RW_ATTR_SBI_UI (mb_group_prealloc, s_mb_group_prealloc); +EXT4_RW_ATTR_SBI_UI (mb_max_inode_prealloc, s_mb_max_inode_prealloc);EXT4_RW_ATTR_SBI_UI (extent_max_zeroout_kb, s_extent_max_zeroout_kb);EXT4_ATTR (trigger_fs_error,0200 , trigger_test_error);EXT4_RW_ATTR_SBI_UI (err_ratelimit_interval_ms, s_err_ratelimit_state.interval);
@@ -257,6 +258,7 @@ static struct attribute *ext4_attrs[] = {ATTR_LIST (mb_order2_req),ATTR_LIST (mb_stream_req),ATTR_LIST (mb_group_prealloc), +ATTR_LIST (mb_max_inode_prealloc),ATTR_LIST (max_writeback_mb_bump),ATTR_LIST (extent_max_zeroout_kb), ATTR_LIST(trigger_fs_error),
include/trace/events/ext4.h +11 -6
@@ -746,24 +746,29 @@ TRACE_EVENT(ext4_mb_release_group_pa, );TRACE_EVENT (ext4_discard_preallocations, - TP_PROTO(struct inode *inode), + TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed), -TP_ARGS (inode), +TP_ARGS (inode, len, needed),TP_STRUCT__entry ( - __field( dev_t, dev ) -__field ( ino_t, ino ) + __field( dev_t, dev ) + __field( ino_t, ino ) + __field( unsigned int, len ) + __field( unsigned int, needed ) ),TP_fast_assign ( __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; + __entry->len = len; + __entry->needed = needed; ), -TP_printk ("dev %d,%d ino %lu" , +TP_printk ("dev %d,%d ino %lu len: %u needed %u" ,MAJOR (__entry->dev),MINOR (__entry->dev), - (unsigned long ) __entry->ino) + (unsigned long ) __entry->ino, __entry->len, + __entry->needed) ); TRACE_EVENT(ext4_mb_discard_preallocations,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 162/255 powerpc/perf: Fix soft lockups due to missed interrupt accounting
In reply to Greg Kroah-HartmanFrom: Athira Rajeev <[email protected]>
[ Upstream commit 17899eaf88d689529b866371344c8f269ba79b5f ]
Performance monitor interrupt handler checks if any counter has overflown and calls record_and_restart() in core-book3s which invokes perf_event_overflow() to record the sample information. Apart from creating sample, perf_event_overflow() also does the interrupt and period checks via perf_event_account_interrupt().
Currently we record information only if the SIAR (Sampled Instruction Address Register) valid bit is set (using siar_valid() check) and hence the interrupt check.
But it is possible that we do sampling for some events that are not generating valid SIAR, and hence there is no chance to disable the event if interrupts are more than max_samples_per_tick. This leads to soft lockup.
Fix this by adding perf_event_account_interrupt() in the invalid SIAR code path for a sampling event. ie if SIAR is invalid, just do interrupt check and don't record the sample information.
--- arch/powerpc/perf/core-book3s.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/perf/core-book3s.c +4 -0
@@ -2101,6 +2101,10 @@ static void record_and_restart(struct perf_event *event, unsigned long val,if (perf_event_overflow (event, &data, regs))power_pmu_stop (event,0 ); + }else if (period) { +/* Account for interrupt in case of invalid SIAR */ +if (perf_event_account_interrupt (event)) +power_pmu_stop (event,0 ); } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 165/255 arm64: Move handling of erratum 1418040 into C code
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit d49f7d7376d0c0daf8680984a37bd07581ac7d38 ]
Instead of dealing with erratum 1418040 on each entry and exit, let's move the handling to __switch_to() instead, which has several advantages:
- It can be applied when it matters (switching between 32 and 64 bit tasks).
- It is written in C (yay!)
- It can rely on static keys rather than alternatives
--- arch/arm64/kernel/entry.S | 21 --------------------- arch/arm64/kernel/process.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 21 deletions(-)
arch/arm64/kernel/entry.S +0 -21
@@ -169,19 +169,6 @@ alternative_cb_end stp x28, x29, [sp, #16 * 14] .if \el == 0 - .if \regsize == 32 - /* - * If we're returning from a 32-bit task on a system affected by - * 1418040 then re-enable userspace access to the virtual counter. - */ -#ifdef CONFIG_ARM64_ERRATUM_1418040 -alternative_if ARM64_WORKAROUND_1418040 - mrs x0, cntkctl_el1 - orr x0, x0, #2 // ARCH_TIMER_USR_VCT_ACCESS_EN - msr cntkctl_el1, x0 -alternative_else_nop_endif -#endif - .endif clear_gp_regs mrs x21, sp_el0 ldr_this_cpu tsk, __entry_task, x20
@@ -337,14 +324,6 @@ alternative_else_nop_endif tst x22, #PSR_MODE32_BIT // native task? b.eq 3f -#ifdef CONFIG_ARM64_ERRATUM_1418040 -alternative_if ARM64_WORKAROUND_1418040 - mrs x0, cntkctl_el1 - bic x0, x0, #2 // ARCH_TIMER_USR_VCT_ACCESS_EN - msr cntkctl_el1, x0 -alternative_else_nop_endif -#endif - #ifdef CONFIG_ARM64_ERRATUM_845719 alternative_if ARM64_WORKAROUND_845719 #ifdef CONFIG_PID_IN_CONTEXTIDR
arch/arm64/kernel/process.c +34 -0
@@ -515,6 +515,39 @@ static void entry_task_switch(struct task_struct *next)__this_cpu_write (__entry_task, next); } +/* +* ARM erratum 1418040 handling, affecting the 32bit view of CNTVCT. +* Assuming the virtual counter is enabled at the beginning of times: +* +* - disable access when switching from a 64bit task to a 32bit task +* - enable access when switching from a 32bit task to a 64bit task +*/ +static void erratum_1418040_thread_switch (struct task_struct *prev, +struct task_struct *next) +{ +bool prev32, next32; +u64 val; + +if (!(IS_ENABLED (CONFIG_ARM64_ERRATUM_1418040 ) && +cpus_have_const_cap (ARM64_WORKAROUND_1418040 ))) +return ; + + prev32 =is_compat_thread (task_thread_info (prev)); + next32 =is_compat_thread (task_thread_info (next)); + +if (prev32 == next32) +return ; + + val =read_sysreg (cntkctl_el1); + +if (!next32) + val |=ARCH_TIMER_USR_VCT_ACCESS_EN ; +else + val &= ~ARCH_TIMER_USR_VCT_ACCESS_EN ; + +write_sysreg (val, cntkctl_el1); +} +/* * Thread switching. */
@@ -530,6 +563,7 @@ __notrace_funcgraph struct task_struct *__switch_to(struct task_struct *prev,entry_task_switch (next);uao_thread_switch (next);ssbs_thread_switch (next); +erratum_1418040_thread_switch (prev, next);/* * Complete any pending TLB or cache maintenance on this CPU in case
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 168/255 block: fix get_max_io_size()
In reply to Greg Kroah-HartmanFrom: Keith Busch <[email protected]>
commit e4b469c66f3cbb81c2e94d31123d7bcdf3c1dabd upstream.
A previous commit aligning splits to physical block sizes inadvertently modified one return case such that that it now returns 0 length splits when the number of sectors doesn't exceed the physical offset. This later hits a BUG in bio_split(). Restore the previous working behavior.
--- block/blk-merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/blk-merge.c +1 -1
@@ -154,7 +154,7 @@ static inline unsigned get_max_io_size(sif (max_sectors > start_offset)return max_sectors - start_offset; -return sectors & (lbs -1 ); +return sectors & ~(lbs -1 ); } static inline unsigned get_max_segment_size(const struct request_queue *q,
Greg Kroah-Hartman
maintainerPATCH 170/255 HID: i2c-hid: Always sleep 60ms after I2C_HID_PWR_ON commands
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit eef4016243e94c438f177ca8226876eb873b9c75 upstream.
Before this commit i2c_hid_parse() consists of the following steps:
1. Send power on cmd
2. usleep_range(1000, 5000)
3. Send reset cmd
4. Wait for reset to complete (device interrupt, or msleep(100))
5. Send power on cmd
6. Try to read HID descriptor
Notice how there is an usleep_range(1000, 5000) after the first power-on command, but not after the second power-on command.
Testing has shown that at least on the BMAX Y13 laptop's i2c-hid touchpad, not having a delay after the second power-on command causes the HID descriptor to read as all zeros.
In case we hit this on other devices too, the descriptor being all zeros can be recognized by the following message being logged many, many times:
hid-generic 0018:0911:5288.0002: unknown main item tag 0x0
At the same time as the BMAX Y13's touchpad issue was debugged, Kai-Heng was working on debugging some issues with Goodix i2c-hid touchpads. It turns out that these need a delay after a PWR_ON command too, otherwise they stop working after a suspend/resume cycle. According to Goodix a delay of minimal 60ms is needed.
Having multiple cases where we need a delay after sending the power-on command, seems to indicate that we should always sleep after the power-on command.
This commit fixes the mentioned issues by moving the existing 1ms sleep to the i2c_hid_set_power() function and changing it to a 60ms sleep.
--- drivers/hid/i2c-hid/i2c-hid-core.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/hid/i2c-hid/i2c-hid-core.c +13 -9
@@ -420,6 +420,19 @@ static int i2c_hid_set_power(struct i2c_dev_err (&client->dev,"failed to change power setting.\n" ); set_pwr_exit: + +/* +* The HID over I2C specification states that if a DEVICE needs time +* after the PWR_ON request, it should utilise CLOCK stretching. +* However, it has been observered that the Windows driver provides a +* 1ms sleep between the PWR_ON and RESET requests. +* According to Goodix Windows even waits 60 ms after (other?) +* PWR_ON requests. Testing has confirmed that several devices +* will not work properly without a delay after a PWR_ON request. +*/ +if (!ret && power_state ==I2C_HID_PWR_ON ) +msleep (60 ); +return ret; }
@@ -441,15 +454,6 @@ static int i2c_hid_hwreset(struct i2c_clif (ret) goto out_unlock; -/* -* The HID over I2C specification states that if a DEVICE needs time -* after the PWR_ON request, it should utilise CLOCK stretching. -* However, it has been observered that the Windows driver provides a -* 1ms sleep between the PWR_ON and RESET requests and that some devices -* rely on this. -*/ -usleep_range (1000 ,5000 ); -i2c_hid_dbg (ihid,"resetting...\n" ); ret =i2c_hid_command (client, &hid_reset_cmd,NULL ,0 );
Greg Kroah-Hartman
maintainerPATCH 171/255 blk-mq: order adding requests to hctx->dispatch and checking SCHED_RESTART
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
commit d7d8535f377e9ba87edbf7fbbd634ac942f3f54f upstream.
SCHED_RESTART code path is relied to re-run queue for dispatch requests in hctx->dispatch. Meantime the SCHED_RSTART flag is checked when adding requests to hctx->dispatch.
memory barriers have to be used for ordering the following two pair of OPs:
1) adding requests to hctx->dispatch and checking SCHED_RESTART in blk_mq_dispatch_rq_list()
2) clearing SCHED_RESTART and checking if there is request in hctx->dispatch in blk_mq_sched_restart().
Without the added memory barrier, either:
1) blk_mq_sched_restart() may miss requests added to hctx->dispatch meantime blk_mq_dispatch_rq_list() observes SCHED_RESTART, and not run queue in dispatch side
or
2) blk_mq_dispatch_rq_list still sees SCHED_RESTART, and not run queue in dispatch side, meantime checking if there is request in hctx->dispatch from blk_mq_sched_restart() is missed.
IO hang in ltp/fs_fill test is reported by kernel test robot:
https://lkml.org/lkml/2020/7/26/77
Turns out it is caused by the above out-of-order OPs. And the IO hang can't be observed any more after applying this patch.
--- block/blk-mq-sched.c | 9 +++++++++ block/blk-mq.c | 9 +++++++++ 2 files changed, 18 insertions(+)
block/blk-mq-sched.c +9 -0
@@ -77,6 +77,15 @@ void blk_mq_sched_restart(struct blk_mq_return ;clear_bit (BLK_MQ_S_SCHED_RESTART , &hctx->state); +/* +* Order clearing SCHED_RESTART and list_empty_careful(&hctx->dispatch) +* in blk_mq_run_hw_queue(). Its pair is the barrier in +* blk_mq_dispatch_rq_list(). So dispatch code won't see SCHED_RESTART, +* meantime new request added to hctx->dispatch is missed to check in +* blk_mq_run_hw_queue(). +*/ +smp_mb (); +blk_mq_run_hw_queue (hctx, true); }
block/blk-mq.c +9 -0
@@ -1324,6 +1324,15 @@ bool blk_mq_dispatch_rq_list(struct requspin_unlock (&hctx->lock);/* +* Order adding requests to hctx->dispatch and checking +* SCHED_RESTART flag. The pair of this smp_mb() is the one +* in blk_mq_sched_restart(). Avoid restart code path to +* miss the new added requests to hctx->dispatch, meantime +* SCHED_RESTART is observed here. +*/ +smp_mb (); + +/* * If SCHED_RESTART was set by the caller of this function and * it is no longer set that means that it was cleared by another * thread and hence that a queue rerun is needed.
Greg Kroah-Hartman
maintainerPATCH 172/255 btrfs: reset compression level for lzo on remount
In reply to Greg Kroah-HartmanFrom: Marcos Paulo de Souza <[email protected]>
commit 282dd7d7718444679b046b769d872b188818ca35 upstream.
Currently a user can set mount "-o compress" which will set the compression algorithm to zlib, and use the default compress level for zlib (3):
relatime,compress=zlib:3,space_cache
If the user remounts the fs using "-o compress=lzo", then the old compress_level is used:
relatime,compress=lzo:3,space_cache
But lzo does not expose any tunable compression level. The same happens if we set any compress argument with different level, also with zstd.
Fix this by resetting the compress_level when compress=lzo is specified. With the fix applied, lzo is shown without compress level:
relatime,compress=lzo,space_cache
--- fs/btrfs/super.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/super.c +1 -0
@@ -558,6 +558,7 @@ int btrfs_parse_options(struct btrfs_fs_ }else if (strncmp (args[0 ].from,"lzo" ,3 ) ==0 ) { compress_type ="lzo" ; info->compress_type =BTRFS_COMPRESS_LZO ; + info->compress_level =0 ;btrfs_set_opt (info->mount_opt,COMPRESS );btrfs_clear_opt (info->mount_opt,NODATACOW );btrfs_clear_opt (info->mount_opt,NODATASUM );
Greg Kroah-Hartman
maintainerPATCH 174/255 btrfs: fix space cache memory leak after transaction abort
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit bbc37d6e475eee8ffa2156ec813efc6bbb43c06d upstream.
If a transaction aborts it can cause a memory leak of the pages array of a block group's io_ctl structure. The following steps explain how that can happen:
1) Transaction N is committing, currently in state TRANS_STATE_UNBLOCKED and it's about to start writing out dirty extent buffers;
2) Transaction N + 1 already started and another task, task A, just called btrfs_commit_transaction() on it;
3) Block group B was dirtied (extents allocated from it) by transaction N + 1, so when task A calls btrfs_start_dirty_block_groups(), at the very beginning of the transaction commit, it starts writeback for the block group's space cache by calling btrfs_write_out_cache(), which allocates the pages array for the block group's io_ctl with a call to io_ctl_init(). Block group A is added to the io_list of transaction N + 1 by btrfs_start_dirty_block_groups();
4) While transaction N's commit is writing out the extent buffers, it gets an IO error and aborts transaction N, also setting the file system to RO mode;
5) Task A has already returned from btrfs_start_dirty_block_groups(), is at btrfs_commit_transaction() and has set transaction N + 1 state to TRANS_STATE_COMMIT_START. Immediately after that it checks that the filesystem was turned to RO mode, due to transaction N's abort, and jumps to the "cleanup_transaction" label. After that we end up at btrfs_cleanup_one_transaction() which calls btrfs_cleanup_dirty_bgs(). That helper finds block group B in the transaction's io_list but it never releases the pages array of the block group's io_ctl, resulting in a memory leak.
In fact at the point when we are at btrfs_cleanup_dirty_bgs(), the pages array points to pages that were already released by us at __btrfs_write_out_cache() through the call to io_ctl_drop_pages(). We end up freeing the pages array only after waiting for the ordered extent to complete through btrfs_wait_cache_io(), which calls io_ctl_free() to do that. But in the transaction abort case we don't wait for the space cache's ordered extent to complete through a call to btrfs_wait_cache_io(), so that's why we end up with a memory leak - we wait for the ordered extent to complete indirectly by shutting down the work queues and waiting for any jobs in them to complete before returning from close_ctree().
We can solve the leak simply by freeing the pages array right after releasing the pages (with the call to io_ctl_drop_pages()) at __btrfs_write_out_cache(), since we will never use it anymore after that and the pages array points to already released pages at that point, which is currently not a problem since no one will use it after that, but not a good practice anyway since it can easily lead to use-after-free issues.
So fix this by freeing the pages array right after releasing the pages at __btrfs_write_out_cache().
This issue can often be reproduced with test case generic/475 from fstests and kmemleak can detect it and reports it with the following trace:
unreferenced object 0xffff9bbf009fa600 (size 512):
comm "fsstress", pid 38807, jiffies 4298504428 (age 22.028s) hex dump (first 32 bytes):
00 a0 7c 4d 3d ed ff ff 40 a0 7c 4d 3d ed ff ff ..|M=...@.|M=...
80 a0 7c 4d 3d ed ff ff c0 a0 7c 4d 3d ed ff ff ..|M=.....|M=...
backtrace:
[<00000000f4b5cfe2>] __kmalloc+0x1a8/0x3e0
[<0000000028665e7f>] io_ctl_init+0xa7/0x120 [btrfs]
[<00000000a1f95b2d>] __btrfs_write_out_cache+0x86/0x4a0 [btrfs]
[<00000000207ea1b0>] btrfs_write_out_cache+0x7f/0xf0 [btrfs]
[<00000000af21f534>] btrfs_start_dirty_block_groups+0x27b/0x580 [btrfs]
[<00000000c3c23d44>] btrfs_commit_transaction+0xa6f/0xe70 [btrfs]
[<000000009588930c>] create_subvol+0x581/0x9a0 [btrfs]
[<000000009ef2fd7f>] btrfs_mksubvol+0x3fb/0x4a0 [btrfs]
[<00000000474e5187>] __btrfs_ioctl_snap_create+0x119/0x1a0 [btrfs]
[<00000000708ee349>] btrfs_ioctl_snap_create_v2+0xb0/0xf0 [btrfs]
[<00000000ea60106f>] btrfs_ioctl+0x12c/0x3130 [btrfs]
[<000000005c923d6d>] __x64_sys_ioctl+0x83/0xb0
[<0000000043ace2c9>] do_syscall_64+0x33/0x80
[<00000000904efbce>] entry_SYSCALL_64_after_hwframe+0x44/0xa9--- fs/btrfs/disk-io.c | 1 + fs/btrfs/free-space-cache.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/disk-io.c +1 -0
@@ -4574,6 +4574,7 @@ static void btrfs_cleanup_bg_io(struct b cache->io_ctl.inode =NULL ;iput (inode); } +ASSERT (cache->io_ctl.pages ==NULL );btrfs_put_block_group (cache); }
fs/btrfs/free-space-cache.c +1 -1
@@ -1186,7 +1186,6 @@ static int __btrfs_wait_cache_io(struct ret =update_cache_item (trans, root, inode, path, offset, io_ctl->entries, io_ctl->bitmaps); out: -io_ctl_free (io_ctl);if (ret) {invalidate_inode_pages2 (inode->i_mapping);BTRFS_I (inode)->generation =0 ;
@@ -1346,6 +1345,7 @@ static int __btrfs_write_out_cache(struc* them out later */ io_ctl_drop_pages (io_ctl); +io_ctl_free (io_ctl);unlock_extent_cached (&BTRFS_I (inode)->io_tree,0 ,i_size_read (inode) -1 , &cached_state);
Greg Kroah-Hartman
maintainerPATCH 175/255 btrfs: detect nocow for swap after snapshot delete
In reply to Greg Kroah-HartmanFrom: Boris Burkov <[email protected]>
commit a84d5d429f9eb56f81b388609841ed993f0ddfca upstream.
can_nocow_extent and btrfs_cross_ref_exist both rely on a heuristic for detecting a must cow condition which is not exactly accurate, but saves unnecessary tree traversal. The incorrect assumption is that if the extent was created in a generation smaller than the last snapshot generation, it must be referenced by that snapshot. That is true, except the snapshot could have since been deleted, without affecting the last snapshot generation.
The original patch claimed a performance win from this check, but it also leads to a bug where you are unable to use a swapfile if you ever snapshotted the subvolume it's in. Make the check slower and more strict for the swapon case, without modifying the general cow checks as a compromise. Turning swap on does not seem to be a particularly performance sensitive operation, so incurring a possibly unnecessary btrfs_search_slot seems worthwhile for the added usability.
Note: Until the snapshot is competely cleaned after deletion, check_committed_refs will still cause the logic to think that cow is necessary, so the user must until 'btrfs subvolu sync' finished before activating the swapfile swapon.
--- fs/btrfs/ctree.h | 4 ++-- fs/btrfs/extent-tree.c | 17 +++++++++++------ fs/btrfs/file.c | 2 +- fs/btrfs/inode.c | 16 +++++++++------- 4 files changed, 23 insertions(+), 16 deletions(-)
fs/btrfs/ctree.h +2 -2
@@ -2468,7 +2468,7 @@ int btrfs_pin_extent_for_log_replay(stru u64 bytenr, u64 num_bytes);int btrfs_exclude_logged_extents (struct extent_buffer *eb);int btrfs_cross_ref_exist (struct btrfs_root *root, -u64 objectid,u64 offset,u64 bytenr); +u64 objectid,u64 offset,u64 bytenr,bool strict); struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 parent, u64 root_objectid,
@@ -2854,7 +2854,7 @@ struct extent_map *btrfs_get_extent_fiem u64 start, u64 len); noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,u64 *orig_start,u64 *orig_block_len, -u64 *ram_bytes); +u64 *ram_bytes,bool strict);void __btrfs_del_delalloc_inode (struct btrfs_root *root,struct btrfs_inode *inode);
fs/btrfs/extent-tree.c +11 -6
@@ -2306,7 +2306,8 @@ static noinline int check_delayed_ref(st static noinline int check_committed_ref(struct btrfs_root *root,struct btrfs_path *path, -u64 objectid,u64 offset,u64 bytenr) +u64 objectid,u64 offset,u64 bytenr, +bool strict) {struct btrfs_fs_info *fs_info = root->fs_info;struct btrfs_root *extent_root = fs_info->extent_root;
@@ -2348,9 +2349,13 @@ static noinline int check_committed_ref( btrfs_extent_inline_ref_size(BTRFS_EXTENT_DATA_REF_KEY)) goto out; -/* If extent created before last snapshot => it's definitely shared */ -if (btrfs_extent_generation (leaf, ei) <= -btrfs_root_last_snapshot (&root->root_item)) +/* +* If extent created before last snapshot => it's shared unless the +* snapshot has been deleted. Use the heuristic if strict is false. +*/ +if (!strict && + (btrfs_extent_generation (leaf, ei) <= +btrfs_root_last_snapshot (&root->root_item))) goto out; iref = (struct btrfs_extent_inline_ref *)(ei +1 );
@@ -2375,7 +2380,7 @@ out: }int btrfs_cross_ref_exist (struct btrfs_root *root,u64 objectid,u64 offset, -u64 bytenr) +u64 bytenr,bool strict) {struct btrfs_path *path;int ret;
@@ -2386,7 +2391,7 @@ int btrfs_cross_ref_exist(struct btrfs_r do { ret = check_committed_ref(root, path, objectid, - offset, bytenr); + offset, bytenr, strict); if (ret && ret != -ENOENT) goto out;
fs/btrfs/file.c +1 -1
@@ -1568,7 +1568,7 @@ int btrfs_check_can_nocow(struct btrfs_i } ret =can_nocow_extent (&inode->vfs_inode, lockstart, &num_bytes, -NULL ,NULL ,NULL ); +NULL ,NULL ,NULL , false);if (ret <=0 ) { ret =0 ;if (!nowait)
fs/btrfs/inode.c +9 -7
@@ -1611,7 +1611,7 @@ next_slot: goto out_check; ret =btrfs_cross_ref_exist (root, ino, found_key.offset - - extent_offset, disk_bytenr); + extent_offset, disk_bytenr, false);if (ret) {/* * ret could be -EIO if the above fails to read
@@ -6957,7 +6957,7 @@ static struct extent_map *btrfs_new_exte*/ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,u64 *orig_start,u64 *orig_block_len, -u64 *ram_bytes) +u64 *ram_bytes,bool strict) {struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_path *path;
@@ -7035,8 +7035,9 @@ noinline int can_nocow_extent(struct ino* Do the same check as in btrfs_cross_ref_exist but without the * unnecessary search. */ -if (btrfs_file_extent_generation (leaf, fi) <= -btrfs_root_last_snapshot (&root->root_item)) +if (!strict && + (btrfs_file_extent_generation (leaf, fi) <= +btrfs_root_last_snapshot (&root->root_item))) goto out; backref_offset =btrfs_file_extent_offset (leaf, fi);
@@ -7072,7 +7073,8 @@ noinline int can_nocow_extent(struct ino*/ ret =btrfs_cross_ref_exist (root,btrfs_ino (BTRFS_I (inode)), - key.offset - backref_offset, disk_bytenr); + key.offset - backref_offset, disk_bytenr, + strict);if (ret) { ret =0 ; goto out;
@@ -7293,7 +7295,7 @@ static int btrfs_get_blocks_direct_write block_start = em->block_start + (start - em->start);if (can_nocow_extent (inode, start, &len, &orig_start, - &orig_block_len, &ram_bytes) ==1 && + &orig_block_len, &ram_bytes, false) ==1 &&btrfs_inc_nocow_writers (fs_info, block_start)) {struct extent_map *em2;
@@ -10103,7 +10105,7 @@ static int btrfs_swap_activate(struct swfree_extent_map (em); em =NULL ; - ret =can_nocow_extent (inode, start, &len,NULL ,NULL ,NULL ); + ret =can_nocow_extent (inode, start, &len,NULL ,NULL ,NULL , true);if (ret <0 ) { goto out; }else if (ret) {
Greg Kroah-Hartman
maintainerPATCH 176/255 fbcon: prevent user font height or width change from causing potential out-of-bounds access
In reply to Greg Kroah-HartmanFrom: George Kennedy <[email protected]>
commit 39b3cffb8cf3111738ea993e2757ab382253d86a upstream.
Add a check to fbcon_resize() to ensure that a possible change to user font height or user font width will not allow a font data out-of-bounds access.
NOTE: must use original charcount in calculation as font charcount can change and cannot be used to determine the font data allocated size.
--- drivers/video/fbdev/core/fbcon.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
drivers/video/fbdev/core/fbcon.c +23 -2
@@ -2191,6 +2191,9 @@ static void updatescrollmode(struct fbco } } +#define PITCH (w) (((w) + 7) >> 3) +#define CALC_FONTSZ (h, p, c) ((h) * (p) * (c))/* size = height * pitch * charcount */ +static int fbcon_resize (struct vc_data *vc,unsigned int width,unsigned int height,unsigned int user) {
@@ -2200,6 +2203,24 @@ static int fbcon_resize(struct vc_data *struct fb_var_screeninfo var = info->var;int x_diff, y_diff, virt_w, virt_h, virt_fw, virt_fh; +if (ops->p && ops->p->userfont &&FNTSIZE (vc->vc_font.data)) { +int size; +int pitch =PITCH (vc->vc_font.width); + +/* +* If user font, ensure that a possible change to user font +* height or width will not allow a font data out-of-bounds access. +* NOTE: must use original charcount in calculation as font +* charcount can change and cannot be used to determine the +* font data allocated size. +*/ +if (pitch <=0 ) +return -EINVAL ; + size =CALC_FONTSZ (vc->vc_font.height, pitch,FNTCHARCNT (vc->vc_font.data)); +if (size >FNTSIZE (vc->vc_font.data)) +return -EINVAL ; + } + virt_w =FBCON_SWAP (ops->rotate, width, height); virt_h =FBCON_SWAP (ops->rotate, height, width); virt_fw = FBCON_SWAP(ops->rotate, vc->vc_font.width,
@@ -2652,7 +2673,7 @@ static int fbcon_set_font(struct vc_dataint size;int i, csum;u8 *new_data, *data = font->data; -int pitch = (font->width+7 ) >>3 ; +int pitch =PITCH (font->width);/* Is there a reason why fbconsole couldn't handle any charcount >256? * If not this check should be changed to charcount < 256 */
@@ -2668,7 +2689,7 @@ static int fbcon_set_font(struct vc_dataif (fbcon_invalid_charcount (info, charcount))return -EINVAL ; - size = h * pitch * charcount; + size =CALC_FONTSZ (h, pitch, charcount); new_data =kmalloc (FONT_EXTRA_WORDS *sizeof (int ) + size,GFP_USER );
Greg Kroah-Hartman
maintainerPATCH 150/255 scsi: qla2xxx: Indicate correct supported speeds for Mezz card
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 4709272f6327cc4a8ee1dc55771bcf9718346980 ]
Correct the supported speeds for 16G Mezz card.
--- drivers/scsi/qla2xxx/qla_gs.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/scsi/qla2xxx/qla_gs.c +12 -5
@@ -1505,11 +1505,11 @@ qla2x00_prep_ct_fdmi_req(struct ct_sns_pkt *p, uint16_t cmd,static uint qla25xx_fdmi_port_speed_capability (struct qla_hw_data *ha) { +uint speeds =0 ; +if (IS_CNA_CAPABLE (ha))return FDMI_PORT_SPEED_10GB ;if (IS_QLA28XX (ha) ||IS_QLA27XX (ha)) { -uint speeds =0 ; -if (ha->max_supported_speed ==2 ) {if (ha->min_supported_speed <=6 ) speeds |=FDMI_PORT_SPEED_64GB ;
@@ -1536,9 +1536,16 @@ qla25xx_fdmi_port_speed_capability(struct qla_hw_data *ha) }return speeds; } -if (IS_QLA2031 (ha)) -return FDMI_PORT_SPEED_16GB |FDMI_PORT_SPEED_8GB | -FDMI_PORT_SPEED_4GB ; +if (IS_QLA2031 (ha)) { +if ((ha->pdev->subsystem_vendor ==0x103C ) && + (ha->pdev->subsystem_device ==0x8002 )) { + speeds =FDMI_PORT_SPEED_16GB ; + }else { + speeds =FDMI_PORT_SPEED_16GB |FDMI_PORT_SPEED_8GB | +FDMI_PORT_SPEED_4GB ; + } +return speeds; + }if (IS_QLA25XX (ha))return FDMI_PORT_SPEED_8GB |FDMI_PORT_SPEED_4GB |FDMI_PORT_SPEED_2GB |FDMI_PORT_SPEED_1GB ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 177/255 USB: lvtest: return proper error code in probe
In reply to Greg Kroah-HartmanFrom: Evgeny Novikov <[email protected]>
commit 531412492ce93ea29b9ca3b4eb5e3ed771f851dd upstream.
lvs_rh_probe() can return some nonnegative value from usb_control_msg() when it is less than "USB_DT_HUB_NONVAR_SIZE + 2" that is considered as a failure. Make lvs_rh_probe() return -EINVAL in this case.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/usb/misc/lvstest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/lvstest.c +1 -1
@@ -426,7 +426,7 @@ static int lvs_rh_probe(struct usb_inter USB_DT_SS_HUB_SIZE, USB_CTRL_GET_TIMEOUT);if (ret < (USB_DT_HUB_NONVAR_SIZE +2 )) {dev_err (&hdev->dev,"wrong root hub descriptor read %d\n" , ret); -return ret; +return ret <0 ? ret : -EINVAL ; }/* submit urb to poll interrupt endpoint */
Greg Kroah-Hartman
maintainerPATCH 178/255 vt: defer kfree() of vc_screenbuf in vc_do_resize()
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit f8d1653daec02315e06d30246cff4af72e76e54e upstream.
syzbot is reporting UAF bug in set_origin() from vc_do_resize() [1], for vc_do_resize() calls kfree(vc->vc_screenbuf) before calling set_origin().
Unfortunately, in set_origin(), vc->vc_sw->con_set_origin() might access vc->vc_pos when scroll is involved in order to manipulate cursor, but vc->vc_pos refers already released vc->vc_screenbuf until vc->vc_pos gets updated based on the result of vc->vc_sw->con_set_origin().
Preserving old buffer and tolerating outdated vc members until set_origin() completes would be easier than preventing vc->vc_sw->con_set_origin() from accessing outdated vc members.
[1] https://syzkaller.appspot.com/bug?id=6649da2081e2ebdc65c0642c214b27fe91099db3
--- drivers/tty/vt/vt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/tty/vt/vt.c +3 -2
@@ -1196,7 +1196,7 @@ static int vc_do_resize(struct tty_strucunsigned int old_rows, old_row_size, first_copied_row;unsigned int new_cols, new_rows, new_row_size, new_screen_size;unsigned int user; -unsigned short *newscreen; +unsigned short *oldscreen, *newscreen;struct uni_screen *new_uniscr =NULL ;WARN_CONSOLE_UNLOCKED ();
@@ -1294,10 +1294,11 @@ static int vc_do_resize(struct tty_strucif (new_scr_end > new_origin)scr_memsetw ((void *)new_origin, vc->vc_video_erase_char, new_scr_end - new_origin); -kfree (vc->vc_screenbuf); + oldscreen = vc->vc_screenbuf; vc->vc_screenbuf = newscreen; vc->vc_screenbuf_size = new_screen_size;set_origin (vc); +kfree (oldscreen);/* do part of a reset_terminal() */ vc->vc_top =0 ;
Greg Kroah-Hartman
maintainerPATCH 179/255 vt_ioctl: change VT_RESIZEX ioctl to check for error return from vc_resize()
In reply to Greg Kroah-HartmanFrom: George Kennedy <[email protected]>
commit bc5269ca765057a1b762e79a1cfd267cd7bf1c46 upstream.
vc_resize() can return with an error after failure. Change VT_RESIZEX ioctl to save struct vc_data values that are modified and restore the original values in case of error.
--- drivers/tty/vt/vt_ioctl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/tty/vt/vt_ioctl.c +11 -1
@@ -893,12 +893,22 @@ int vt_ioctl(struct tty_struct *tty,console_lock (); vcp = vc_cons[i].d;if (vcp) { +int ret; +int save_scan_lines = vcp->vc_scan_lines; +int save_font_height = vcp->vc_font.height; +if (v.v_vlin) vcp->vc_scan_lines = v.v_vlin;if (v.v_clin) vcp->vc_font.height = v.v_clin; vcp->vc_resize_user =1 ; -vc_resize (vcp, v.v_cols, v.v_rows); + ret =vc_resize (vcp, v.v_cols, v.v_rows); +if (ret) { + vcp->vc_scan_lines = save_scan_lines; + vcp->vc_font.height = save_font_height; +console_unlock (); +return ret; + } }console_unlock (); }
Greg Kroah-Hartman
maintainerPATCH 156/255 net: gianfar: Add of_node_put() before goto statement
In reply to Greg Kroah-HartmanFrom: Sumera Priyadarsini <[email protected]>
[ Upstream commit 989e4da042ca4a56bbaca9223d1a93639ad11e17 ]
Every iteration of for_each_available_child_of_node() decrements reference count of the previous node, however when control is transferred from the middle of the loop, as in the case of a return or break or goto, there is no decrement thus ultimately resulting in a memory leak.
Fix a potential memory leak in gianfar.c by inserting of_node_put() before the goto statement.
Issue found with Coccinelle.
--- drivers/net/ethernet/freescale/gianfar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/gianfar.c +3 -1
@@ -750,8 +750,10 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)continue ; err =gfar_parse_group (child, priv, model); -if (err) +if (err) { +of_node_put (child); goto err_grp_init; + } } }else {/* SQ_SG_MODE */ err =gfar_parse_group (np, priv, model);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 155/255 macvlan: validate setting of multiple remote source MAC addresses
In reply to Greg Kroah-HartmanFrom: Alvin Šipraga <[email protected]>
[ Upstream commit 8b61fba503904acae24aeb2bd5569b4d6544d48f ]
Remote source MAC addresses can be set on a 'source mode' macvlan interface via the IFLA_MACVLAN_MACADDR_DATA attribute. This commit tightens the validation of these MAC addresses to match the validation already performed when setting or adding a single MAC address via the IFLA_MACVLAN_MACADDR attribute.
iproute2 uses IFLA_MACVLAN_MACADDR_DATA for its 'macvlan macaddr set' command, and IFLA_MACVLAN_MACADDR for its 'macvlan macaddr add' command, which demonstrates the inconsistent behaviour that this commit addresses:
# ip link add link eth0 name macvlan0 type macvlan mode source
# ip link set link dev macvlan0 type macvlan macaddr add 01:00:00:00:00:00
RTNETLINK answers: Cannot assign requested address
# ip link set link dev macvlan0 type macvlan macaddr set 01:00:00:00:00:00
# ip -d link show macvlan0
5: macvlan0@eth0: <BROADCAST,MULTICAST,DYNAMIC,UP,LOWER_UP> mtu 1500 ...
link/ether 2e:ac:fd:2d:69:f8 brd ff:ff:ff:ff:ff:ff promiscuity 0
macvlan mode source remotes (1) 01:00:00:00:00:00 numtxqueues 1 ...With this change, the 'set' command will (rightly) fail in the same way as the 'add' command.
--- drivers/net/macvlan.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/net/macvlan.c +17 -4
@@ -1269,6 +1269,9 @@ static void macvlan_port_destroy(struct net_device *dev)static int macvlan_validate (struct nlattr *tb[],struct nlattr *data[],struct netlink_ext_ack *extack) { +struct nlattr *nla, *head; +int rem, len; +if (tb[IFLA_ADDRESS ]) {if (nla_len (tb[IFLA_ADDRESS ]) !=ETH_ALEN )return -EINVAL ;
@@ -1316,6 +1319,20 @@ static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[],return -EADDRNOTAVAIL ; } +if (data[IFLA_MACVLAN_MACADDR_DATA ]) { + head =nla_data (data[IFLA_MACVLAN_MACADDR_DATA ]); + len =nla_len (data[IFLA_MACVLAN_MACADDR_DATA ]); + +nla_for_each_attr (nla, head, len, rem) { +if (nla_type (nla) !=IFLA_MACVLAN_MACADDR || +nla_len (nla) !=ETH_ALEN ) +return -EINVAL ; + +if (!is_valid_ether_addr (nla_data (nla))) +return -EADDRNOTAVAIL ; + } + } +if (data[IFLA_MACVLAN_MACADDR_COUNT ])return -EINVAL ;
@@ -1372,10 +1389,6 @@ static int macvlan_changelink_sources(struct macvlan_dev *vlan, u32 mode, len =nla_len (data[IFLA_MACVLAN_MACADDR_DATA ]);nla_for_each_attr (nla, head, len, rem) { -if (nla_type (nla) !=IFLA_MACVLAN_MACADDR || -nla_len (nla) !=ETH_ALEN ) -continue ; - addr =nla_data (nla); ret =macvlan_hash_add_source (vlan, addr);if (ret)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 181/255 serial: pl011: Fix oops on -EPROBE_DEFER
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit 27afac93e3bd7fa89749cf11da5d86ac9cde4dba upstream.
If probing of a pl011 gets deferred until after free_initmem(), an oops ensues because pl011_console_match() is called which has been freed.
Fix by removing the __init attribute from the function and those it calls.
Commit 10879ae5f12e ("serial: pl011: add console matching function") introduced pl011_console_match() not just for early consoles but regular preferred consoles, such as those added by acpi_parse_spcr(). Regular consoles may be registered after free_initmem() for various reasons, one being deferred probing, another being dynamic enablement of serial ports using a DeviceTree overlay.
Thus, pl011_console_match() must not be declared __init and the functions it calls mustn't either.
Stack trace for posterity:
Unable to handle kernel paging request at virtual address 80c38b58 Internal error: Oops: 8000000d [#1] PREEMPT SMP ARM PC is at pl011_console_match+0x0/0xfc LR is at register_console+0x150/0x468
[<80187004>] (register_console)
[<805a8184>] (uart_add_one_port)
[<805b2b68>] (pl011_register_port)
[<805b3ce4>] (pl011_probe)
[<80569214>] (amba_probe)
[<805ca088>] (really_probe)
[<805ca2ec>] (driver_probe_device)
[<805ca5b0>] (__device_attach_driver)
[<805c8060>] (bus_for_each_drv)
[<805c9dfc>] (__device_attach)
[<805ca630>] (device_initial_probe)
[<805c90a8>] (bus_probe_device)
[<805c95a8>] (deferred_probe_work_func)
--- drivers/tty/serial/amba-pl011.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/tty/serial/amba-pl011.c +5 -6
@@ -2241,9 +2241,8 @@ pl011_console_write(struct console *co,clk_disable (uap->clk); } -static void __init -pl011_console_get_options (struct uart_amba_port *uap,int *baud, -int *parity,int *bits) +static void pl011_console_get_options (struct uart_amba_port *uap,int *baud, +int *parity,int *bits) {if (pl011_read (uap,REG_CR ) & UART01x_CR_UARTEN) {unsigned int lcr_h, ibrd, fbrd;
@@ -2276,7 +2275,7 @@ pl011_console_get_options(struct uart_am } } -static int __init pl011_console_setup (struct console *co,char *options) +static int pl011_console_setup (struct console *co,char *options) {struct uart_amba_port *uap;int baud =38400 ;
@@ -2344,8 +2343,8 @@ static int __init pl011_console_setup(st* * Returns 0 if console matches; otherwise non-zero to use default matching */ -static int __init pl011_console_match (struct console *co,char *name,int idx, -char *options) +static int pl011_console_match (struct console *co,char *name,int idx, +char *options) {unsigned char iotype;resource_size_t addr;
Greg Kroah-Hartman
maintainerPATCH 191/255 usb: renesas-xhci: remove version check
In reply to Greg Kroah-HartmanFrom: Vinod Koul <[email protected]>
commit d66a57be2f9a315fc10d0f524f670fec903e0fb4 upstream.
Some devices in wild are reporting bunch of firmware versions, so remove the check for versions in driver
Reported by: Anastasios Vacharakis <[email protected]> Reported by: Glen Journeay <[email protected]>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=208911
--- drivers/usb/host/xhci-pci-renesas.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
drivers/usb/host/xhci-pci-renesas.c +1 -18
@@ -50,20 +50,6 @@#define RENESAS_RETRY 10000#define RENESAS_DELAY 10 -#define ROM_VALID_01 0x2013 -#define ROM_VALID_02 0x2026 - -static int renesas_verify_fw_version (struct pci_dev *pdev,u32 version) -{ -switch (version) { -case ROM_VALID_01 : -case ROM_VALID_02 : -return 0 ; - } -dev_err (&pdev->dev,"FW has invalid version :%d\n" , version); -return -EINVAL ; -} -static int renesas_fw_download_image (struct pci_dev *dev,const u32 *fw,size_t step,bool rom) {
@@ -202,10 +188,7 @@ static int renesas_check_rom_state(struc version &=RENESAS_FW_VERSION_FIELD ; version = version >>RENESAS_FW_VERSION_OFFSET ; - - err =renesas_verify_fw_version (pdev, version); -if (err) -return err; +dev_dbg (&pdev->dev,"Found ROM version: %x\n" , version);/* * Test if ROM is present and loaded, if so we can skip everything
Greg Kroah-Hartman
maintainerPATCH 190/255 XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information.
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit c330fb1ddc0a922f044989492b7fcca77ee1db46 upstream.
handler data is meant for interrupt handlers and not for storing irq chip specific information as some devices require handler data to store internal per interrupt information, e.g. pinctrl/GPIO chained interrupt handlers.
This obviously creates a conflict of interests and crashes the machine because the XEN pointer is overwritten by the driver pointer.
As the XEN data is not handler specific it should be stored in irqdesc::irq_data::chip_data instead.
A simple sed s/irq_[sg]et_handler_data/irq_[sg]et_chip_data/ cures that.
--- drivers/xen/events/events_base.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/xen/events/events_base.c +8 -8
@@ -156,7 +156,7 @@ int get_evtchn_to_irq(evtchn_port_t evtc/* Get info for IRQ */ struct irq_info *info_for_irq (unsigned irq) { -return irq_get_handler_data (irq); +return irq_get_chip_data (irq); }/* Constructors for packed IRQ information. */
@@ -377,7 +377,7 @@ static void xen_irq_init(unsigned irq) info->type =IRQT_UNBOUND ; info->refcnt =-1 ; -irq_set_handler_data (irq, info); +irq_set_chip_data (irq, info);list_add_tail (&info->list, &xen_irq_list_head); }
@@ -426,14 +426,14 @@ static int __must_check xen_allocate_irqstatic void xen_free_irq (unsigned irq) { -struct irq_info *info =irq_get_handler_data (irq); +struct irq_info *info =irq_get_chip_data (irq);if (WARN_ON (!info))return ;list_del (&info->list); -irq_set_handler_data (irq,NULL ); +irq_set_chip_data (irq,NULL );WARN_ON (info->refcnt >0 );
@@ -603,7 +603,7 @@ EXPORT_SYMBOL_GPL(xen_irq_from_gsi);static void __unbind_from_irq (unsigned int irq) {evtchn_port_t evtchn =evtchn_from_irq (irq); -struct irq_info *info =irq_get_handler_data (irq); +struct irq_info *info =irq_get_chip_data (irq);if (info->refcnt >0 ) { info->refcnt--;
@@ -1108,7 +1108,7 @@ int bind_ipi_to_irqhandler(enum ipi_vectvoid unbind_from_irqhandler (unsigned int irq,void *dev_id) { -struct irq_info *info =irq_get_handler_data (irq); +struct irq_info *info =irq_get_chip_data (irq);if (WARN_ON (!info))return ;
@@ -1142,7 +1142,7 @@ int evtchn_make_refcounted(evtchn_port_tif (irq ==-1 )return -ENOENT ; - info =irq_get_handler_data (irq); + info =irq_get_chip_data (irq);if (!info)return -ENOENT ;
@@ -1170,7 +1170,7 @@ int evtchn_get(evtchn_port_t evtchn)if (irq ==-1 ) goto done; - info =irq_get_handler_data (irq); + info =irq_get_chip_data (irq);if (!info) goto done;
Greg Kroah-Hartman
maintainerPATCH 195/255 xhci: Do warm-reset when both CAS and XDEV_RESUME are set
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 904df64a5f4d5ebd670801d869ca0a6d6a6e8df6 upstream.
Sometimes re-plugging a USB device during system sleep renders the device useless:
[ 173.418345] xhci_hcd 0000:00:14.0: Get port status 2-4 read: 0x14203e2, return 0x10262 ... [ 176.496485] usb 2-4: Waited 2000ms for CONNECT [ 176.496781] usb usb2-port4: status 0000.0262 after resume, -19 [ 176.497103] usb 2-4: can't resume, status -19 [ 176.497438] usb usb2-port4: logical disconnect
Because PLS equals to XDEV_RESUME, xHCI driver reports U3 to usbcore, despite of CAS bit is flagged.
So proritize CAS over XDEV_RESUME to let usbcore handle warm-reset for the port.
--- drivers/usb/host/xhci-hub.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/usb/host/xhci-hub.c +10 -9
@@ -740,15 +740,6 @@ static void xhci_hub_report_usb3_link_st {u32 pls = status_reg &PORT_PLS_MASK ; -/* resume state is a xHCI internal state. -* Do not report it to usb core, instead, pretend to be U3, -* thus usb core knows it's not ready for transfer -*/ -if (pls ==XDEV_RESUME ) { - *status |=USB_SS_PORT_LS_U3 ; -return ; - } -/* When the CAS bit is set then warm reset * should be performed on port */
@@ -771,6 +762,16 @@ static void xhci_hub_report_usb3_link_st pls |=USB_PORT_STAT_CONNECTION ; }else {/* +* Resume state is an xHCI internal state. Do not report it to +* usb core, instead, pretend to be U3, thus usb core knows +* it's not ready for transfer. +*/ +if (pls ==XDEV_RESUME ) { + *status |=USB_SS_PORT_LS_U3 ; +return ; + } + +/* * If CAS bit isn't set but the Port is already at * Compliance Mode, fake a connection so the USB core * notices the Compliance state and resets the port.
Greg Kroah-Hartman
maintainerPATCH 196/255 xhci: Always restore EP_SOFT_CLEAR_TOGGLE even if ep reset failed
In reply to Greg Kroah-HartmanFrom: Ding Hui <[email protected]>
commit f1ec7ae6c9f8c016db320e204cb519a1da1581b8 upstream.
Some device drivers call libusb_clear_halt when target ep queue is not empty. (eg. spice client connected to qemu for usb redir)
Before commit f5249461b504 ("xhci: Clear the host side toggle manually when endpoint is soft reset"), that works well. But now, we got the error log:
EP not empty, refuse reset
xhci_endpoint_reset failed and left ep_state's EP_SOFT_CLEAR_TOGGLE bit still set
So all the subsequent urb sumbits to the ep will fail with the warn log:
Can't enqueue URB while manually clearing toggle
We need to clear ep_state EP_SOFT_CLEAR_TOGGLE bit after xhci_endpoint_reset, even if it failed.
--- drivers/usb/host/xhci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/host/xhci.c +2 -1
@@ -3236,10 +3236,11 @@ static void xhci_endpoint_reset(struct uwait_for_completion (cfg_cmd->completion); - ep->ep_state &= ~EP_SOFT_CLEAR_TOGGLE ;xhci_free_command (xhci, cfg_cmd); cleanup:xhci_free_command (xhci, stop_cmd); +if (ep->ep_state &EP_SOFT_CLEAR_TOGGLE ) + ep->ep_state &= ~EP_SOFT_CLEAR_TOGGLE ; } static int xhci_check_streams_endpoint(struct xhci_hcd *xhci,
Greg Kroah-Hartman
maintainerPATCH 197/255 io-wq: fix hang after cancelling pending hashed work
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 204361a77f4018627addd4a06877448f088ddfc0 upstream.
Don't forget to update wqe->hash_tail after cancelling a pending work item, if it was hashed.
--- fs/io-wq.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
fs/io-wq.c +19 -2
@@ -929,6 +929,24 @@ static bool io_wq_worker_cancel(struct ireturn match->nr_running && !match->cancel_all; } +static inline void io_wqe_remove_pending (struct io_wqe *wqe, +struct io_wq_work *work, +struct io_wq_work_node *prev) +{ +unsigned int hash =io_get_work_hash (work); +struct io_wq_work *prev_work =NULL ; + +if (io_wq_is_hashed (work) && work == wqe->hash_tail[hash]) { +if (prev) + prev_work = container_of(prev, struct io_wq_work, list); +if (prev_work &&io_get_work_hash (prev_work) == hash) + wqe->hash_tail[hash] = prev_work; +else + wqe->hash_tail[hash] =NULL ; + } +wq_list_del (&wqe->work_list, &work->list, prev); +} +static void io_wqe_cancel_pending_work (struct io_wqe *wqe,struct io_cb_cancel_data *match) {
@@ -942,8 +960,7 @@ retry: work = container_of(node, struct io_wq_work, list);if (!match->fn (work, match->data))continue ; - -wq_list_del (&wqe->work_list, node, prev); +io_wqe_remove_pending (wqe, work, prev);spin_unlock_irqrestore (&wqe->lock, flags);io_run_cancel (work, wqe); match->nr_pending++;
Greg Kroah-Hartman
maintainerPATCH 199/255 arm64: vdso32: make vdso32 install conditional
In reply to Greg Kroah-HartmanFrom: Frank van der Linden <[email protected]>
commit 5d28ba5f8a0cfa3a874fa96c33731b8fcd141b3a upstream.
vdso32 should only be installed if CONFIG_COMPAT_VDSO is enabled, since it's not even supposed to be compiled otherwise, and arm64 builds without a 32bit crosscompiler will fail.
--- arch/arm64/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/Makefile +2 -1
@@ -158,7 +158,8 @@ zinstall install: PHONY += vdso_install vdso_install: $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@ - $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@ + $(if $(CONFIG_COMPAT_VDSO), \ + $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@) # We use MRPROPER_FILES and CLEAN_FILES now archclean:
Greg Kroah-Hartman
maintainerPATCH 182/255 serial: pl011: Dont leak amba_ports entry on driver register error
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit 89efbe70b27dd325d8a8c177743a26b885f7faec upstream.
pl011_probe() calls pl011_setup_port() to reserve an amba_ports[] entry, then calls pl011_register_port() to register the uart driver with the tty layer.
If registration of the uart driver fails, the amba_ports[] entry is not released. If this happens 14 times (value of UART_NR macro), then all amba_ports[] entries will have been leaked and driver probing is no longer possible. (To be fair, that can only happen if the DeviceTree doesn't contain alias IDs since they cause the same entry to be used for
a given port.) Fix it.
--- drivers/tty/serial/amba-pl011.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/tty/serial/amba-pl011.c +4 -1
@@ -2615,7 +2615,7 @@ static int pl011_setup_port(struct devicstatic int pl011_register_port (struct uart_amba_port *uap) { -int ret; +int ret, i;/* Ensure interrupts from this UART are masked and cleared */ pl011_write (0 , uap,REG_IMSC );
@@ -2626,6 +2626,9 @@ static int pl011_register_port(struct uaif (ret <0 ) {dev_err (uap->port.dev,"Failed to register AMBA-PL011 driver\n" ); +for (i =0 ; i <ARRAY_SIZE (amba_ports); i++) +if (amba_ports[i] == uap) + amba_ports[i] =NULL ;return ret; } }
Greg Kroah-Hartman
maintainerPATCH 200/255 PM: sleep: core: Fix the handling of pending runtime resume requests
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit e3eb6e8fba65094328b8dca635d00de74ba75b45 upstream.
It has been reported that system-wide suspend may be aborted in the absence of any wakeup events due to unforseen interactions of it with the runtume PM framework.
One failing scenario is when there are multiple devices sharing an ACPI power resource and runtime-resume needs to be carried out for one of them during system-wide suspend (for example, because it needs to be reconfigured before the whole system goes to sleep). In that case, the runtime-resume of that device involves turning the ACPI power resource "on" which in turn causes runtime-resume requests to be queued up for all of the other devices sharing it. Those requests go to the runtime PM workqueue which is frozen during system-wide suspend, so they are not actually taken care of until the resume of the whole system, but the pm_runtime_barrier() call in __device_suspend() sees them and triggers system wakeup events for them which then cause the system-wide suspend to be aborted if wakeup source objects are in active use.
Of course, the logic that leads to triggering those wakeup events is questionable in the first place, because clearly there are cases in which a pending runtime resume request for a device is not connected to any real wakeup events in any way (like the one above). Moreover, it is racy, because the device may be resuming already by the time the pm_runtime_barrier() runs and so if the driver doesn't take care of signaling the wakeup event as appropriate, it will be lost. However, if the driver does take care of that, the extra pm_wakeup_event() call in the core is redundant.
Accordingly, drop the conditional pm_wakeup_event() call fron __device_suspend() and make the latter call pm_runtime_barrier() alone. Also modify the comment next to that call to reflect the new code and extend it to mention the need to avoid unwanted interactions between runtime PM and system-wide device suspend callbacks.
--- drivers/base/power/main.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/base/power/main.c +10 -6
@@ -1606,13 +1606,17 @@ static int __device_suspend(struct devic }/* -* If a device configured to wake up the system from sleep states -* has been suspended at run time and there's a resume request pending -* for it, this is equivalent to the device signaling wakeup, so the -* system suspend operation should be aborted. +* Wait for possible runtime PM transitions of the device in progress +* to complete and if there's a runtime resume request pending for it, +* resume it before proceeding with invoking the system-wide suspend +* callbacks for it. +* +* If the system-wide suspend callbacks below change the configuration +* of the device, they must disable runtime PM for it or otherwise +* ensure that its runtime-resume callbacks will not be confused by that +* change in case they are invoked going forward. */ -if (pm_runtime_barrier (dev) &&device_may_wakeup (dev)) -pm_wakeup_event (dev,0 ); +pm_runtime_barrier (dev);if (pm_wakeup_pending ()) { dev->power.direct_complete = false;
Greg Kroah-Hartman
maintainerPATCH 201/255 powerpc/32s: Disable VMAP stack which CONFIG_ADB_PMU
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
commit 4a133eb351ccc275683ad49305d0b04dde903733 upstream.
low_sleep_handler() can't restore the context from virtual stack because the stack can hardly be accessed with MMU OFF.
For now, disable VMAP stack when CONFIG_ADB_PMU is selected.
--- arch/powerpc/platforms/Kconfig.cputype | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/Kconfig.cputype +1 -1
@@ -36,7 +36,7 @@ config PPC_BOOK3S_6xx select PPC_HAVE_PMU_SUPPORT select PPC_HAVE_KUEP select PPC_HAVE_KUAP - select HAVE_ARCH_VMAP_STACK + select HAVE_ARCH_VMAP_STACK if !ADB_PMU config PPC_BOOK3S_601 bool "PowerPC 601"
Greg Kroah-Hartman
maintainerPATCH 206/255 genirq/matrix: Deal with the sillyness of for_each_cpu() on UP
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit 784a0830377d0761834e385975bc46861fea9fa0 upstream.
Most of the CPU mask operations behave the same way, but for_each_cpu() and it's variants ignore the cpumask argument and claim that CPU0 is always in the mask. This is historical, inconsistent and annoying behaviour.
The matrix allocator uses for_each_cpu() and can be called on UP with an empty cpumask. The calling code does not expect that this succeeds but until commit e027fffff799 ("x86/irq: Unbreak interrupt affinity setting") this went unnoticed. That commit added a WARN_ON() to catch cases which move an interrupt from one vector to another on the same CPU. The warning triggers on UP.
Add a check for the cpumask being empty to prevent this.
--- kernel/irq/matrix.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/irq/matrix.c +7 -0
@@ -380,6 +380,13 @@ int irq_matrix_alloc(struct irq_matrix *unsigned int cpu, bit;struct cpumap *cm; +/* +* Not required in theory, but matrix_find_best_cpu() uses +* for_each_cpu() which ignores the cpumask on UP . +*/ +if (cpumask_empty (msk)) +return -EINVAL ; + cpu =matrix_find_best_cpu (m, msk);if (cpu ==UINT_MAX )return -ENOSPC ;
Greg Kroah-Hartman
maintainerPATCH 207/255 irqchip/stm32-exti: Avoid losing interrupts due to clearing pending bits by mistake
In reply to Greg Kroah-HartmanFrom: qiuguorui1 <[email protected]>
commit e579076ac0a3bebb440fab101aef3c42c9f4c709 upstream.
In the current code, when the eoi callback of the exti clears the pending bit of the current interrupt, it will first read the values of fpr and rpr, then logically OR the corresponding bit of the interrupt number, and finally write back to fpr and rpr.
We found through experiments that if two exti interrupts,
we call them int1/int2, arrive almost at the same time. in our scenario, the time difference is 30 microseconds, assuming int1 is triggered first.
there will be an extreme scenario: both int's pending bit are set to 1, the irq handle of int1 is executed first, and eoi handle is then executed, at this moment, all pending bits are cleared, but the int 2 has not finally been reported to the cpu yet, which eventually lost int2.
According to stm32's TRM description about rpr and fpr: Writing a 1 to this bit will trigger a rising edge event on event x, Writing 0 has no effect.
Therefore, when clearing the pending bit, we only need to clear the pending bit of the irq.
--- drivers/irqchip/irq-stm32-exti.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/irqchip/irq-stm32-exti.c +12 -2
@@ -431,6 +431,16 @@ static void stm32_irq_ack(struct irq_datirq_gc_unlock (gc); } +/* directly set the target bit without reading first. */ +static inline void stm32_exti_write_bit (struct irq_data *d,u32 reg) +{ +struct stm32_exti_chip_data *chip_data =irq_data_get_irq_chip_data (d); +void __iomem *base = chip_data->host_data->base; +u32 val =BIT (d->hwirq %IRQS_PER_BANK ); + +writel_relaxed (val, base + reg); +} +static inline u32 stm32_exti_set_bit (struct irq_data *d,u32 reg) {struct stm32_exti_chip_data *chip_data =irq_data_get_irq_chip_data (d);
@@ -464,9 +474,9 @@ static void stm32_exti_h_eoi(struct irq_raw_spin_lock (&chip_data->rlock); -stm32_exti_set_bit (d, stm32_bank->rpr_ofst); +stm32_exti_write_bit (d, stm32_bank->rpr_ofst);if (stm32_bank->fpr_ofst !=UNDEF_REG ) -stm32_exti_set_bit (d, stm32_bank->fpr_ofst); +stm32_exti_write_bit (d, stm32_bank->fpr_ofst);raw_spin_unlock (&chip_data->rlock);
Greg Kroah-Hartman
maintainerPATCH 208/255 x86/irq: Unbreak interrupt affinity setting
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit e027fffff799cdd70400c5485b1a54f482255985 upstream.
Several people reported that 5.8 broke the interrupt affinity setting mechanism.
The consolidation of the entry code reused the regular exception entry code for device interrupts and changed the way how the vector number is conveyed from ptregs->orig_ax to a function argument.
The low level entry uses the hardware error code slot to push the vector number onto the stack which is retrieved from there into a function argument and the slot on stack is set to -1.
The reason for setting it to -1 is that the error code slot is at the position where pt_regs::orig_ax is. A positive value in pt_regs::orig_ax indicates that the entry came via a syscall. If it's not set to a negative value then a signal delivery on return to userspace would try to restart a syscall. But there are other places which rely on pt_regs::orig_ax being a valid indicator for syscall entry.
But setting pt_regs::orig_ax to -1 has a nasty side effect vs. the interrupt affinity setting mechanism, which was overlooked when this change was made.
Moving interrupts on x86 happens in several steps. A new vector on a different CPU is allocated and the relevant interrupt source is reprogrammed to that. But that's racy and there might be an interrupt already in flight to the old vector. So the old vector is preserved until the first interrupt arrives on the new vector and the new target CPU. Once that happens the old vector is cleaned up, but this cleanup still depends on the vector number being stored in pt_regs::orig_ax, which is now -1.
That -1 makes the check for cleanup: pt_regs::orig_ax == new_vector always false. As a consequence the interrupt is moved once, but then it cannot be moved anymore because the cleanup of the old vector never happens.
There would be several ways to convey the vector information to that place in the guts of the interrupt handling, but on deeper inspection it turned out that this check is pointless and a leftover from the old affinity model of X86 which supported multi-CPU affinities. Under this model it was possible that an interrupt had an old and a new vector on the same CPU, so the vector match was required.
Under the new model the effective affinity of an interrupt is always a single CPU from the requested affinity mask. If the affinity mask changes then either the interrupt stays on the CPU and on the same vector when that CPU is still in the new affinity mask or it is moved to a different CPU, but it is never moved to a different vector on the same CPU.
Ergo the cleanup check for the matching vector number is not required and can be removed which makes the dependency on pt_regs:orig_ax go away.
The remaining check for new_cpu == smp_processsor_id() is completely sufficient. If it matches then the interrupt was successfully migrated and the cleanup can proceed.
For paranoia sake add a warning into the vector assignment code to validate that the assumption of never moving to a different vector on the same CPU holds.
--- arch/x86/kernel/apic/vector.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
arch/x86/kernel/apic/vector.c +9 -7
@@ -161,6 +161,7 @@ static void apic_update_vector(struct ir apicd->move_in_progress = true; apicd->prev_vector = apicd->vector; apicd->prev_cpu = apicd->cpu; +WARN_ON_ONCE (apicd->cpu == newcpu); }else {irq_matrix_free (vector_matrix, apicd->cpu, apicd->vector, managed);
@@ -910,7 +911,7 @@ void send_cleanup_vector(struct irq_cfg__send_cleanup_vector (apicd); } -static void __irq_complete_move (struct irq_cfg *cfg,unsigned vector) +void irq_complete_move (struct irq_cfg *cfg) {struct apic_chip_data *apicd;
@@ -918,15 +919,16 @@ static void __irq_complete_move(struct iif (likely (!apicd->move_in_progress))return ; -if (vector == apicd->vector && apicd->cpu ==smp_processor_id ()) +/* +* If the interrupt arrived on the new target CPU, cleanup the +* vector on the old target CPU. A vector check is not required +* because an interrupt can never move from one vector to another +* on the same CPU. +*/ +if (apicd->cpu ==smp_processor_id ())__send_cleanup_vector (apicd); } -void irq_complete_move (struct irq_cfg *cfg) -{ -__irq_complete_move (cfg, ~get_irq_regs ()->orig_ax); -} -/* * Called from fixup_irqs() with @desc->lock held and interrupts disabled. */
Greg Kroah-Hartman
maintainerPATCH 183/255 serial: stm32: avoid kernel warning on absence of optional IRQ
In reply to Greg Kroah-HartmanFrom: Holger Assmann <[email protected]>
commit fdf16d78941b4f380753053d229955baddd00712 upstream.
stm32_init_port() of the stm32-usart may trigger a warning in platform_get_irq() when the device tree specifies no wakeup interrupt.
The wakeup interrupt is usually a board-specific GPIO and the driver functions correctly in its absence. The mainline stm32mp151.dtsi does not specify it, so all mainline device trees trigger an unnecessary kernel warning. Use of platform_get_irq_optional() avoids this.
--- drivers/tty/serial/stm32-usart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/stm32-usart.c +1 -1
@@ -962,7 +962,7 @@ static int stm32_init_port(struct stm32_return ret;if (stm32port->info->cfg.has_wakeup) { - stm32port->wakeirq =platform_get_irq (pdev,1 ); + stm32port->wakeirq =platform_get_irq_optional (pdev,1 );if (stm32port->wakeirq <=0 && stm32port->wakeirq != -ENXIO )return stm32port->wakeirq ? : -ENODEV ; }
Greg Kroah-Hartman
maintainerPATCH 186/255 io_uring: clear req->result on IOPOLL re-issue
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
commit 56450c20fe10d4d93f58019109aa4e06fc0b9206 upstream.
Make sure we clear req->result, which was set to -EAGAIN for retry purposes, when moving it to the reissue list. Otherwise we can end up retrying a request more than once, which leads to weird results in the io-wq handling (and other spots).
--- fs/io_uring.c | 1 + 1 file changed, 1 insertion(+)
fs/io_uring.c +1 -0
@@ -1810,6 +1810,7 @@ static void io_iopoll_complete(struct io req = list_first_entry(done, struct io_kiocb, list);if (READ_ONCE (req->result) == -EAGAIN ) { + req->result =0 ; req->iopoll_completed =0 ;list_move_tail (&req->list, &again);continue ;
Greg Kroah-Hartman
maintainerPATCH 211/255 drm/etnaviv: fix external abort seen on GC600 rev 0x19
In reply to Greg Kroah-HartmanFrom: Christian Gmeiner <[email protected]>
commit 2c5bf028ef34745e7b3fe768f9c9355ecc7df101 upstream.
It looks like that this GPU core triggers an abort when reading VIVS_HI_CHIP_PRODUCT_ID and/or VIVS_HI_CHIP_ECO_ID.
I looked at different versions of Vivante's kernel driver and did not found anything about this issue or what feature flag can be used. So go the simplest route and do not read these two registers on the affected GPU core.
--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +9 -2
@@ -337,9 +337,16 @@ static void etnaviv_hw_identify(struct e gpu->identity.model =gpu_read (gpu,VIVS_HI_CHIP_MODEL ); gpu->identity.revision =gpu_read (gpu,VIVS_HI_CHIP_REV ); - gpu->identity.product_id =gpu_read (gpu,VIVS_HI_CHIP_PRODUCT_ID ); gpu->identity.customer_id =gpu_read (gpu,VIVS_HI_CHIP_CUSTOMER_ID ); - gpu->identity.eco_id =gpu_read (gpu,VIVS_HI_CHIP_ECO_ID ); + +/* +* Reading these two registers on GC600 rev 0x19 result in a +* unhandled fault: external abort on non-linefetch +*/ +if (!etnaviv_is_model_rev (gpu,GC600 ,0x19 )) { + gpu->identity.product_id =gpu_read (gpu,VIVS_HI_CHIP_PRODUCT_ID ); + gpu->identity.eco_id =gpu_read (gpu,VIVS_HI_CHIP_ECO_ID ); + }/* * !!!! HACK ALERT !!!!
Greg Kroah-Hartman
maintainerPATCH 158/255 drm/amdkfd: fix the wrong sdma instance query for renoir
In reply to Greg Kroah-HartmanFrom: Huang Rui <[email protected]>
[ Upstream commit 34174b89bfa495bed9cddcc504fb38feca90fab7 ]
Renoir only has one sdma instance, it will get failed once query the sdma1 registers. So use switch-case instead of static register array.
--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +22 -9
@@ -195,19 +195,32 @@ static uint32_t get_sdma_rlc_reg_offset(struct amdgpu_device *adev,unsigned int engine_id, unsigned int queue_id) { - uint32_t sdma_engine_reg_base[2] = { -SOC15_REG_OFFSET (SDMA0 ,0 , - mmSDMA0_RLC0_RB_CNTL) - mmSDMA0_RLC0_RB_CNTL, -SOC15_REG_OFFSET (SDMA1 ,0 , - mmSDMA1_RLC0_RB_CNTL) - mmSDMA1_RLC0_RB_CNTL - }; -uint32_t retval = sdma_engine_reg_base[engine_id] + uint32_t sdma_engine_reg_base = 0; +uint32_t sdma_rlc_reg_offset; + +switch (engine_id) { +default : +dev_warn (adev->dev, +"Invalid sdma engine id (%d), using engine id 0\n" , + engine_id); + fallthrough; +case 0 : + sdma_engine_reg_base =SOC15_REG_OFFSET (SDMA0 ,0 , + mmSDMA0_RLC0_RB_CNTL) - mmSDMA0_RLC0_RB_CNTL; +break ; +case 1 : + sdma_engine_reg_base =SOC15_REG_OFFSET (SDMA1 ,0 , + mmSDMA1_RLC0_RB_CNTL) - mmSDMA0_RLC0_RB_CNTL; +break ; + } + + sdma_rlc_reg_offset = sdma_engine_reg_base + queue_id * (mmSDMA0_RLC1_RB_CNTL - mmSDMA0_RLC0_RB_CNTL);pr_debug ("RLC register offset for SDMA%d RLC%d: 0x%x\n" , engine_id, - queue_id, retval); + queue_id, sdma_rlc_reg_offset); -return retval; +return sdma_rlc_reg_offset; }static inline struct v9_mqd *get_mqd (void *mqd)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 224/255 USB: quirks: Add no-lpm quirk for another Raydium touchscreen
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 5967116e8358899ebaa22702d09b0af57fef23e1 upstream.
There's another Raydium touchscreen needs the no-lpm quirk:
[ 1.339149] usb 1-9: New USB device found, idVendor=2386, idProduct=350e, bcdDevice= 0.00 [ 1.339150] usb 1-9: New USB device strings: Mfr=1, Product=2, SerialNumber=0 [ 1.339151] usb 1-9: Product: Raydium Touch System [ 1.339152] usb 1-9: Manufacturer: Raydium Corporation ... [ 6.450497] usb 1-9: can't set config #1, error -110
--- drivers/usb/core/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/core/quirks.c +2 -0
@@ -465,6 +465,8 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x2386, 0x3119), .driver_info = USB_QUIRK_NO_LPM }, + { USB_DEVICE(0x2386, 0x350e), .driver_info = USB_QUIRK_NO_LPM }, + /* DJI CineSSD */ { USB_DEVICE(0x2ca3, 0x0031), .driver_info = USB_QUIRK_NO_LPM },
Greg Kroah-Hartman
maintainerPATCH 226/255 USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge
In reply to Greg Kroah-HartmanFrom: Cyril Roelandt <[email protected]>
commit 9aa37788e7ebb3f489fb4b71ce07adadd444264a upstream.
This device does not support UAS properly and a similar entry already exists in drivers/usb/storage/unusual_uas.h. Without this patch, storage_probe() defers the handling of this device to UAS, which cannot handle it either.
--- drivers/usb/storage/unusual_devs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/storage/unusual_devs.h +1 -1
@@ -2328,7 +2328,7 @@ UNUSUAL_DEV( 0x357d, 0x7788, 0x0114, 0x "JMicron", "USB to ATA/ATAPI Bridge", USB_SC_DEVICE, USB_PR_DEVICE, NULL, - US_FL_BROKEN_FUA ), + US_FL_BROKEN_FUA | US_FL_IGNORE_UAS ),/* Reported by Andrey Rahmatullin <[email protected]> */ UNUSUAL_DEV( 0x4102, 0x1020, 0x0100, 0x0100,
Greg Kroah-Hartman
maintainerPATCH 166/255 arm64: Allow booting of late CPUs affected by erratum 1418040
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit bf87bb0881d0f59181fe3bbcf29c609f36483ff8 ]
As we can now switch from a system that isn't affected by 1418040 to a system that globally is affected, let's allow affected CPUs to come in at a later time.
--- arch/arm64/kernel/cpu_errata.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/kernel/cpu_errata.c +2 -0
@@ -910,6 +910,8 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .desc = "ARM erratum 1418040", .capability =ARM64_WORKAROUND_1418040 ,ERRATA_MIDR_RANGE_LIST (erratum_1418040_list), + .type = (ARM64_CPUCAP_SCOPE_LOCAL_CPU | +ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU ), }, #endif #ifdef CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 232/255 usb: dwc3: gadget: Fix handling ZLP
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit d2ee3ff79e6a3d4105e684021017d100524dc560 upstream.
The usb_request->zero doesn't apply for isoc. Also, if we prepare a 0-length (ZLP) TRB for the OUT direction, we need to prepare an extra TRB to pad up to the MPS alignment. Use the same bounce buffer for the ZLP TRB and the extra pad TRB.
--- drivers/usb/dwc3/gadget.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
drivers/usb/dwc3/gadget.c +23 -2
@@ -1199,6 +1199,7 @@ static void dwc3_prepare_one_trb_linear( req->request.no_interrupt, req->request.is_last); }else if (req->request.zero && req->request.length && + !usb_endpoint_xfer_isoc (dep->endpoint.desc) && (IS_ALIGNED (req->request.length, maxp))) {struct dwc3 *dwc = dep->dwc;struct dwc3_trb *trb;
@@ -1208,14 +1209,25 @@ static void dwc3_prepare_one_trb_linear(/* prepare normal TRB */ dwc3_prepare_one_trb (dep, req, length, true,0 ); -/* Now prepare one extra TRB to handle ZLP */ +/* Prepare one extra TRB to handle ZLP */ trb = &dep->trb_pool[dep->trb_enqueue]; req->num_trbs++;__dwc3_prepare_one_trb (dep, trb, dwc->bounce_addr,0 , - false,1 , req->request.stream_id, + !req->direction,1 , req->request.stream_id, req->request.short_not_ok, req->request.no_interrupt, req->request.is_last); + +/* Prepare one more TRB to handle MPS alignment for OUT */ +if (!req->direction) { + trb = &dep->trb_pool[dep->trb_enqueue]; + req->num_trbs++; +__dwc3_prepare_one_trb (dep, trb, dwc->bounce_addr, maxp, + false,1 , req->request.stream_id, + req->request.short_not_ok, + req->request.no_interrupt, + req->request.is_last); + } }else {dwc3_prepare_one_trb (dep, req, length, false,0 ); }
@@ -2668,8 +2680,17 @@ static int dwc3_gadget_ep_cleanup_comple status);if (req->needs_extra_trb) { +unsigned int maxp =usb_endpoint_maxp (dep->endpoint.desc); + ret =dwc3_gadget_ep_reclaim_trb_linear (dep, req, event, status); + +/* Reclaim MPS padding TRB for ZLP */ +if (!req->direction && req->request.zero && req->request.length && + !usb_endpoint_xfer_isoc (dep->endpoint.desc) && + (IS_ALIGNED (req->request.length, maxp))) + ret =dwc3_gadget_ep_reclaim_trb_linear (dep, req, event, status); + req->needs_extra_trb = false; }
Greg Kroah-Hartman
maintainerPATCH 231/255 usb: dwc3: gadget: Dont setup more than requested
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 5d187c0454ef4c5e046a81af36882d4d515922ec upstream.
The SG list may be set up with entry size more than the requested length. Check the usb_request->length and make sure that we don't setup the TRBs to send/receive more than requested. This case may occur when the SG entry is allocated up to a certain minimum size, but the request length is less than that. It can also occur when the request is reused for a different request length.
--- drivers/usb/dwc3/gadget.c | 51 +++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 16 deletions(-)
drivers/usb/dwc3/gadget.c +35 -16
@@ -1054,27 +1054,25 @@ static void __dwc3_prepare_one_trb(struc* dwc3_prepare_one_trb - setup one TRB from one request * @dep: endpoint for which this request is prepared * @req: dwc3_request pointer +* @trb_length: buffer size of the TRB * @chain: should this TRB be chained to the next? * @node: only for isochronous endpoints. First TRB needs different type. */ static void dwc3_prepare_one_trb (struct dwc3_ep *dep, -struct dwc3_request *req,unsigned chain,unsigned node) +struct dwc3_request *req,unsigned int trb_length, +unsigned chain,unsigned node) {struct dwc3_trb *trb; -unsigned int length;dma_addr_t dma;unsigned stream_id = req->request.stream_id;unsigned short_not_ok = req->request.short_not_ok;unsigned no_interrupt = req->request.no_interrupt;unsigned is_last = req->request.is_last; -if (req->request.num_sgs >0 ) { - length =sg_dma_len (req->start_sg); +if (req->request.num_sgs >0 ) dma =sg_dma_address (req->start_sg); - }else { - length = req->request.length; +else dma = req->request.dma; - } trb = &dep->trb_pool[dep->trb_enqueue];
@@ -1086,7 +1084,7 @@ static void dwc3_prepare_one_trb(struct req->num_trbs++; -__dwc3_prepare_one_trb (dep, trb, dma, length, chain, node, +__dwc3_prepare_one_trb (dep, trb, dma, trb_length, chain, node, stream_id, short_not_ok, no_interrupt, is_last); }
@@ -1096,16 +1094,27 @@ static void dwc3_prepare_one_trb_sg(strustruct scatterlist *sg = req->start_sg;struct scatterlist *s;int i; - +unsigned int length = req->request.length;unsigned int remaining = req->request.num_mapped_sgs - req->num_queued_sgs; +/* +* If we resume preparing the request, then get the remaining length of +* the request and resume where we left off. +*/ +for_each_sg (req->request.sg, s, req->num_queued_sgs, i) + length -=sg_dma_len (s); +for_each_sg (sg, s, remaining, i) { -unsigned int length = req->request.length;unsigned int maxp =usb_endpoint_maxp (dep->endpoint.desc);unsigned int rem = length % maxp; +unsigned int trb_length;unsigned chain = true; + trb_length = min_t(unsigned int, length, sg_dma_len(s)); + + length -= trb_length; +/* * IOMMU driver is coalescing the list of sgs which shares a * page boundary into one and giving it to USB driver. With
@@ -1113,7 +1122,7 @@ static void dwc3_prepare_one_trb_sg(stru* sgs passed. So mark the chain bit to false if it isthe last * mapped sg. */ -if (i == remaining -1 ) +if ((i == remaining -1 ) || !length) chain = false;if (rem &&usb_endpoint_dir_out (dep->endpoint.desc) && !chain) {
@@ -1123,7 +1132,7 @@ static void dwc3_prepare_one_trb_sg(stru req->needs_extra_trb = true;/* prepare normal TRB */ -dwc3_prepare_one_trb (dep, req, true, i); +dwc3_prepare_one_trb (dep, req, trb_length, true, i);/* Now prepare one extra TRB to align transfer size */ trb = &dep->trb_pool[dep->trb_enqueue];
@@ -1135,7 +1144,7 @@ static void dwc3_prepare_one_trb_sg(stru req->request.no_interrupt, req->request.is_last); }else { -dwc3_prepare_one_trb (dep, req, chain, i); +dwc3_prepare_one_trb (dep, req, trb_length, chain, i); }/*
@@ -1150,6 +1159,16 @@ static void dwc3_prepare_one_trb_sg(stru req->num_queued_sgs++; +/* +* The number of pending SG entries may not correspond to the +* number of mapped SG entries. If all the data are queued, then +* don't include unused SG entries. +*/ +if (length ==0 ) { + req->num_pending_sgs -= req->request.num_mapped_sgs - req->num_queued_sgs; +break ; + } +if (!dwc3_calc_trbs_left (dep))break ; }
@@ -1169,7 +1188,7 @@ static void dwc3_prepare_one_trb_linear( req->needs_extra_trb = true;/* prepare normal TRB */ -dwc3_prepare_one_trb (dep, req, true,0 ); +dwc3_prepare_one_trb (dep, req, length, true,0 );/* Now prepare one extra TRB to align transfer size */ trb = &dep->trb_pool[dep->trb_enqueue];
@@ -1187,7 +1206,7 @@ static void dwc3_prepare_one_trb_linear( req->needs_extra_trb = true;/* prepare normal TRB */ -dwc3_prepare_one_trb (dep, req, true,0 ); +dwc3_prepare_one_trb (dep, req, length, true,0 );/* Now prepare one extra TRB to handle ZLP */ trb = &dep->trb_pool[dep->trb_enqueue];
@@ -1198,7 +1217,7 @@ static void dwc3_prepare_one_trb_linear( req->request.no_interrupt, req->request.is_last); }else { -dwc3_prepare_one_trb (dep, req, false,0 ); +dwc3_prepare_one_trb (dep, req, length, false,0 ); } }
Greg Kroah-Hartman
maintainerPATCH 215/255 drm/amd/display: use correct scale for actual_brightness
In reply to Greg Kroah-HartmanFrom: Alexander Monakov <[email protected]>
commit 69d9f4278d0f9d24607645f10e5ac5c59c77a4ac upstream.
Documentation for sysfs backlight level interface requires that values in both 'brightness' and 'actual_brightness' files are interpreted to be in range from 0 to the value given in the 'max_brightness' file.
With amdgpu, max_brightness gives 255, and values written by the user into 'brightness' are internally rescaled to a wider range. However, reading from 'actual_brightness' gives the raw register value without inverse rescaling. This causes issues for various userspace tools such as PowerTop and systemd that expect the value to be in the correct range.
Introduce a helper to retrieve internal backlight range. Use it to reimplement 'convert_brightness' as 'convert_brightness_from_user' and introduce 'convert_brightness_to_user'.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 81 ++++++++++------------ 1 file changed, 40 insertions(+), 41 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +40 -41
@@ -2882,51 +2882,50 @@ static int set_backlight_via_aux(structreturn rc ?0 :1 ; } -static u32 convert_brightness (const struct amdgpu_dm_backlight_caps *caps, -const uint32_t user_brightness) +static int get_brightness_range (const struct amdgpu_dm_backlight_caps *caps, +unsigned *min,unsigned *max) { -u32 min, max, conversion_pace; -u32 brightness = user_brightness; -if (!caps) - goto out; +return 0 ; -if (!caps->aux_support) { - max = caps->max_input_signal; - min = caps->min_input_signal; -/* -* The brightness input is in the range 0-255 -* It needs to be rescaled to be between the -* requested min and max input signal -* It also needs to be scaled up by 0x101 to -* match the DC interface which has a range of -* 0 to 0xffff -*/ - conversion_pace =0x101 ; - brightness = - user_brightness - * conversion_pace - * (max - min) - /AMDGPU_MAX_BL_LEVEL - + min * conversion_pace; +if (caps->aux_support) { +// Firmware limits are in nits, DC API wants millinits. + *max =1000 * caps->aux_max_input_signal; + *min =1000 * caps->aux_min_input_signal; }else { -/* TODO -* We are doing a linear interpolation here, which is OK but -* does not provide the optimal result. We probably want -* something close to the Perceptual Quantizer (PQ) curve. -*/ - max = caps->aux_max_input_signal; - min = caps->aux_min_input_signal; - - brightness = (AMDGPU_MAX_BL_LEVEL - user_brightness) * min - + user_brightness * max; -// Multiple the value by 1000 since we use millinits - brightness *=1000 ; - brightness =DIV_ROUND_CLOSEST (brightness,AMDGPU_MAX_BL_LEVEL ); +// Firmware limits are 8-bit, PWM control is 16-bit. + *max =0x101 * caps->max_input_signal; + *min =0x101 * caps->min_input_signal; } +return 1 ; +} + +static u32 convert_brightness_from_user (const struct amdgpu_dm_backlight_caps *caps, +uint32_t brightness) +{ +unsigned min, max; + +if (!get_brightness_range (caps, &min, &max)) +return brightness; + +// Rescale 0..255 to min..max +return min +DIV_ROUND_CLOSEST ((max - min) * brightness, +AMDGPU_MAX_BL_LEVEL ); +} + +static u32 convert_brightness_to_user (const struct amdgpu_dm_backlight_caps *caps, +uint32_t brightness) +{ +unsigned min, max; + +if (!get_brightness_range (caps, &min, &max)) +return brightness; -out: -return brightness; +if (brightness < min) +return 0 ; +// Rescale min..max to 0..255 +return DIV_ROUND_CLOSEST (AMDGPU_MAX_BL_LEVEL * (brightness - min), + max - min); }static int amdgpu_dm_backlight_update_status (struct backlight_device *bd)
@@ -2942,7 +2941,7 @@ static int amdgpu_dm_backlight_update_st link = (struct dc_link *)dm->backlight_link; - brightness =convert_brightness (&caps, bd->props.brightness); + brightness =convert_brightness_from_user (&caps, bd->props.brightness);// Change brightness based on AUX property if (caps.aux_support)return set_backlight_via_aux (link, brightness);
@@ -2959,7 +2958,7 @@ static int amdgpu_dm_backlight_get_brighif (ret ==DC_ERROR_UNEXPECTED )return bd->props.brightness; -return ret; +return convert_brightness_to_user (&dm->backlight_caps, ret); }static const struct backlight_ops amdgpu_dm_backlight_ops = {
Greg Kroah-Hartman
maintainerPATCH 149/255 scsi: qla2xxx: Flush I/O on zone disable
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit a117579d0205b5a0592a3a98493e2b875e4da236 ]
Perform implicit logout to flush I/O on zone disable.
--- drivers/scsi/qla2xxx/qla_gs.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/qla2xxx/qla_gs.c +0 -1
@@ -3436,7 +3436,6 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)list_for_each_entry (fcport, &vha->vp_fcports, list) {if ((fcport->flags &FCF_FABRIC_DEVICE ) !=0 ) { fcport->scan_state =QLA_FCPORT_SCAN ; - fcport->logout_on_delete =0 ; } } goto login_logout;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 233/255 usb: dwc3: gadget: Handle ZLP for sg requests
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit bc9a2e226ea95e1699f7590845554de095308b75 upstream.
Currently dwc3 doesn't handle usb_request->zero for SG requests. This change checks and prepares extra TRBs for the ZLP for SG requests.
--- drivers/usb/dwc3/gadget.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/usb/dwc3/gadget.c +31 -0
@@ -1143,6 +1143,37 @@ static void dwc3_prepare_one_trb_sg(stru req->request.short_not_ok, req->request.no_interrupt, req->request.is_last); + }else if (req->request.zero && req->request.length && + !usb_endpoint_xfer_isoc (dep->endpoint.desc) && + !rem && !chain) { +struct dwc3 *dwc = dep->dwc; +struct dwc3_trb *trb; + + req->needs_extra_trb = true; + +/* Prepare normal TRB */ +dwc3_prepare_one_trb (dep, req, trb_length, true, i); + +/* Prepare one extra TRB to handle ZLP */ + trb = &dep->trb_pool[dep->trb_enqueue]; + req->num_trbs++; +__dwc3_prepare_one_trb (dep, trb, dwc->bounce_addr,0 , + !req->direction,1 , + req->request.stream_id, + req->request.short_not_ok, + req->request.no_interrupt, + req->request.is_last); + +/* Prepare one more TRB to handle MPS alignment */ +if (!req->direction) { + trb = &dep->trb_pool[dep->trb_enqueue]; + req->num_trbs++; +__dwc3_prepare_one_trb (dep, trb, dwc->bounce_addr, maxp, + false,1 , req->request.stream_id, + req->request.short_not_ok, + req->request.no_interrupt, + req->request.is_last); + } }else {dwc3_prepare_one_trb (dep, req, trb_length, chain, i); }
Greg Kroah-Hartman
maintainerPATCH 234/255 USB: cdc-acm: rework notification_buffer resizing
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
commit f4b9d8a582f738c24ebeabce5cc15f4b8159d74e upstream.
Clang static analysis reports this error
cdc-acm.c:409:3: warning: Use of memory after it is freed
acm_process_notification(acm, (unsigned char *)dr);
There are three problems, the first one is that dr is not reset
The variable dr is set with
if (acm->nb_index)
dr = (struct usb_cdc_notification *)acm->notification_buffer;
But if the notification_buffer is too small it is resized with
if (acm->nb_size) {
kfree(acm->notification_buffer);
acm->nb_size = 0;
}
alloc_size = roundup_pow_of_two(expected_size);
/*
* kmalloc ensures a valid notification_buffer after a
* use of kfree in case the previous allocation was too
* small. Final freeing is done on disconnect.
*/
acm->notification_buffer =
kmalloc(alloc_size, GFP_ATOMIC);dr should point to the new acm->notification_buffer.
The second problem is any data in the notification_buffer is lost when the pointer is freed. In the normal case, the current data is accumulated in the notification_buffer here.
memcpy(&acm->notification_buffer[acm->nb_index], urb->transfer_buffer, copy_size);
When a resize happens, anything before
notification_buffer[acm->nb_index] is garbage.
The third problem is the acm->nb_index is not reset on a resizing buffer error.
So switch resizing to using krealloc and reassign dr and reset nb_index.
--- drivers/usb/class/cdc-acm.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/usb/class/cdc-acm.c +10 -12
@@ -378,21 +378,19 @@ static void acm_ctrl_irq(struct urb *urbif (current_size < expected_size) {/* notification is transmitted fragmented, reassemble */ if (acm->nb_size < expected_size) { -if (acm->nb_size) { -kfree (acm->notification_buffer); - acm->nb_size =0 ; - } +u8 *new_buffer; alloc_size =roundup_pow_of_two (expected_size); -/* -* kmalloc ensures a valid notification_buffer after a -* use of kfree in case the previous allocation was too -* small. Final freeing is done on disconnect. -*/ - acm->notification_buffer = -kmalloc (alloc_size,GFP_ATOMIC ); -if (!acm->notification_buffer) +/* Final freeing is done on disconnect. */ + new_buffer =krealloc (acm->notification_buffer, + alloc_size,GFP_ATOMIC ); +if (!new_buffer) { + acm->nb_index =0 ; goto exit; + } + + acm->notification_buffer = new_buffer; acm->nb_size = alloc_size; + dr = (struct usb_cdc_notification *)acm->notification_buffer; } copy_size = min(current_size,
Greg Kroah-Hartman
maintainerPATCH 235/255 usb: storage: Add unusual_uas entry for Sony PSZ drives
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 20934c0de13b49a072fb1e0ca79fe0fe0e40eae5 upstream.
The PSZ-HA* family of USB disk drives from Sony can't handle the REPORT OPCODES command when using the UAS protocol. This patch adds an appropriate quirks entry.
--- drivers/usb/storage/unusual_uas.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_uas.h +7 -0
@@ -28,6 +28,13 @@* and don't forget to CC: the USB development list <[email protected]> */ +/* Reported-by: Till Dörges <[email protected]> */ +UNUSUAL_DEV (0x054c ,0x087d ,0x0000 ,0x9999 , +"Sony" , +"PSZ-HA*" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_NO_REPORT_OPCODES ), +/* Reported-by: Julian Groß <[email protected]> */ UNUSUAL_DEV(0x059f, 0x105f, 0x0000, 0x9999, "LaCie",
Greg Kroah-Hartman
maintainerPATCH 238/255 usb: typec: ucsi: Fix AB BA lock inversion
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 0ff0705a2ef2929e9326c95df48bdbebb0dafaad upstream.
Lockdep reports an AB BA lock inversion between ucsi_init() and ucsi_handle_connector_change():
AB order:
1. ucsi_init takes ucsi->ppm_lock (it runs with that locked for the duration of the function)
2. usci_init eventually end up calling ucsi_register_displayport, which takes ucsi_connector->lock
BA order:
1. ucsi_handle_connector_change work is started, takes ucsi_connector->lock
2. ucsi_handle_connector_change calls ucsi_send_command which takes ucsi->ppm_lock
The ppm_lock really only needs to be hold during 2 functions:ucsi_reset_ppm() and ucsi_run_command().
This commit fixes the AB BA lock inversion by making ucsi_init drop the ucsi->ppm_lock before it starts registering ports; and replacing any ucsi_run_command() calls after this point with ucsi_send_command() (which is a wrapper around run_command taking the lock while handling the command).
Some of the replacing of ucsi_run_command with ucsi_send_command in the helpers used during port registration also fixes a number of code paths after registration which call ucsi_run_command() without holding the ppm_lock:
1. ucsi_altmode_update_active() call in ucsi/displayport.c
2. ucsi_register_altmodes() call from ucsi_handle_connector_change() (through ucsi_partner_change())
--- drivers/usb/typec/ucsi/ucsi.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/usb/typec/ucsi/ucsi.c +9 -9
@@ -205,7 +205,7 @@ void ucsi_altmode_update_active(struct uint i; command =UCSI_GET_CURRENT_CAM |UCSI_CONNECTOR_NUMBER (con->num); - ret =ucsi_run_command (con->ucsi, command, &cur,sizeof (cur)); + ret =ucsi_send_command (con->ucsi, command, &cur,sizeof (cur));if (ret <0 ) {if (con->ucsi->version >0x0100 ) { dev_err(con->ucsi->dev,
@@ -354,7 +354,7 @@ ucsi_register_altmodes_nvidia(struct ucs command |=UCSI_GET_ALTMODE_RECIPIENT (recipient); command |=UCSI_GET_ALTMODE_CONNECTOR_NUMBER (con->num); command |=UCSI_GET_ALTMODE_OFFSET (i); - len =ucsi_run_command (con->ucsi, command, &alt,sizeof (alt)); + len =ucsi_send_command (con->ucsi, command, &alt,sizeof (alt));/* * We are collecting all altmodes first and then registering. * Some type-C device will return zero length data beyond last
@@ -431,7 +431,7 @@ static int ucsi_register_altmodes(struct command |=UCSI_GET_ALTMODE_RECIPIENT (recipient); command |=UCSI_GET_ALTMODE_CONNECTOR_NUMBER (con->num); command |=UCSI_GET_ALTMODE_OFFSET (i); - len =ucsi_run_command (con->ucsi, command, alt,sizeof (alt)); + len =ucsi_send_command (con->ucsi, command, alt,sizeof (alt));if (len <=0 )return len;
@@ -904,7 +904,7 @@ static int ucsi_register_port(struct ucs/* Get connector capability */ command =UCSI_GET_CONNECTOR_CAPABILITY ; command |=UCSI_CONNECTOR_NUMBER (con->num); - ret =ucsi_run_command (ucsi, command, &con->cap,sizeof (con->cap)); + ret =ucsi_send_command (ucsi, command, &con->cap,sizeof (con->cap));if (ret <0 )return ret;
@@ -953,8 +953,7 @@ static int ucsi_register_port(struct ucs/* Get the status */ command =UCSI_GET_CONNECTOR_STATUS |UCSI_CONNECTOR_NUMBER (con->num); - ret =ucsi_run_command (ucsi, command, &con->status, -sizeof (con->status)); + ret =ucsi_send_command (ucsi, command, &con->status,sizeof (con->status));if (ret <0 ) {dev_err (ucsi->dev,"con%d: failed to get status\n" , con->num);return 0 ;
@@ -1044,6 +1043,8 @@ int ucsi_init(struct ucsi *ucsi) goto err_reset; } +mutex_unlock (&ucsi->ppm_lock); +/* Register all connectors */ for (i =0 ; i < ucsi->cap.num_connectors; i++) { ret =ucsi_register_port (ucsi, i);
@@ -1054,12 +1055,10 @@ int ucsi_init(struct ucsi *ucsi)/* Enable all notifications */ ucsi->ntfy =UCSI_ENABLE_NTFY_ALL ; command =UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy; - ret =ucsi_run_command (ucsi, command,NULL ,0 ); + ret =ucsi_send_command (ucsi, command,NULL ,0 );if (ret <0 ) goto err_unregister; -mutex_unlock (&ucsi->ppm_lock); -return 0 ; err_unregister:
@@ -1071,6 +1070,7 @@ err_unregister: con->port =NULL ; } +mutex_lock (&ucsi->ppm_lock); err_reset:ucsi_reset_ppm (ucsi); err:
Greg Kroah-Hartman
maintainerPATCH 239/255 usb: typec: ucsi: Fix 2 unlocked ucsi_run_command calls
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 7e90057f125c8c852940b848e06e7a72f050fc6f upstream.
Fix 2 unlocked ucsi_run_command calls:
1. ucsi_handle_connector_change() contains one ucsi_send_command() call, which takes the ppm_lock for it; and one ucsi_run_command() call which relies on the caller have taking the ppm_lock. ucsi_handle_connector_change() does not take the lock, so the second (ucsi_run_command) calls should also be ucsi_send_command().
2. ucsi_get_pdos() gets called from ucsi_handle_connector_change() which does not hold the ppm_lock, so it also must use ucsi_send_command().
This commit also adds a WARN_ON(!mutex_is_locked(&ucsi->ppm_lock)); to ucsi_run_command() to avoid similar problems getting re-introduced in the future.
--- drivers/usb/typec/ucsi/ucsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/typec/ucsi/ucsi.c +4 -2
@@ -152,6 +152,8 @@ static int ucsi_run_command(struct ucsiu8 length;int ret; +WARN_ON (!mutex_is_locked (&ucsi->ppm_lock)); + ret =ucsi_exec_command (ucsi, command);if (ret <0 )return ret;
@@ -502,7 +504,7 @@ static void ucsi_get_pdos(struct ucsi_co command |=UCSI_GET_PDOS_PARTNER_PDO (is_partner); command |=UCSI_GET_PDOS_NUM_PDOS (UCSI_MAX_PDOS -1 ); command |=UCSI_GET_PDOS_SRC_PDOS ; - ret =ucsi_run_command (ucsi, command, con->src_pdos, + ret =ucsi_send_command (ucsi, command, con->src_pdos,sizeof (con->src_pdos));if (ret <0 ) {dev_err (ucsi->dev,"UCSI_GET_PDOS failed (%d)\n" , ret);
@@ -681,7 +683,7 @@ static void ucsi_handle_connector_change*/ command =UCSI_GET_CAM_SUPPORTED ; command |=UCSI_CONNECTOR_NUMBER (con->num); -ucsi_run_command (con->ucsi, command,NULL ,0 ); +ucsi_send_command (con->ucsi, command,NULL ,0 ); }if (con->status.change &UCSI_CONSTAT_PARTNER_CHANGE )
Greg Kroah-Hartman
maintainerPATCH 240/255 usb: typec: ucsi: Rework ppm_lock handling
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 25794e3079d2a98547b6bf5764ef0240aa89b798 upstream.
The ppm_lock really only needs to be hold during 2 functions:ucsi_reset_ppm() and ucsi_run_command().
Push the taking of the lock down into these 2 functions, renaming ucsi_run_command() to ucsi_send_command() which was an existing wrapper already taking the lock for its callers.
This simplifies things for the callers and removes the difference between ucsi_send_command() and ucsi_run_command() which has led to various locking bugs in the past.
--- drivers/usb/typec/ucsi/ucsi.c | 56 ++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 34 deletions(-)
drivers/usb/typec/ucsi/ucsi.c +22 -34
@@ -146,42 +146,33 @@ static int ucsi_exec_command(struct ucsireturn UCSI_CCI_LENGTH (cci); } -static int ucsi_run_command (struct ucsi *ucsi,u64 command, -void *data,size_t size) +int ucsi_send_command (struct ucsi *ucsi,u64 command, +void *data,size_t size) {u8 length;int ret; -WARN_ON (!mutex_is_locked (&ucsi->ppm_lock)); +mutex_lock (&ucsi->ppm_lock); ret =ucsi_exec_command (ucsi, command);if (ret <0 ) -return ret; + goto out; length = ret;if (data) { ret = ucsi->ops->read (ucsi,UCSI_MESSAGE_IN , data, size);if (ret) -return ret; + goto out; } ret =ucsi_acknowledge_command (ucsi);if (ret) -return ret; - -return length; -} + goto out; -int ucsi_send_command (struct ucsi *ucsi,u64 command, -void *retval,size_t size) -{ -int ret; - -mutex_lock (&ucsi->ppm_lock); - ret =ucsi_run_command (ucsi, command, retval, size); + ret = length; +out:mutex_unlock (&ucsi->ppm_lock); -return ret; }EXPORT_SYMBOL_GPL (ucsi_send_command);
@@ -738,20 +729,24 @@ static int ucsi_reset_ppm(struct ucsi *uu32 cci;int ret; +mutex_lock (&ucsi->ppm_lock); + ret = ucsi->ops->async_write (ucsi,UCSI_CONTROL , &command,sizeof (command));if (ret <0 ) -return ret; + goto out; tmo = jiffies +msecs_to_jiffies (UCSI_TIMEOUT_MS ); do { - if (time_is_before_jiffies(tmo)) - return -ETIMEDOUT; + if (time_is_before_jiffies(tmo)) { + ret = -ETIMEDOUT; + goto out; + } ret = ucsi->ops->read(ucsi, UCSI_CCI, &cci, sizeof(cci)); if (ret) - return ret; + goto out; /* If the PPM is still doing something else, reset it again. */ if (cci & ~UCSI_CCI_RESET_COMPLETE) {
@@ -759,13 +754,15 @@ static int ucsi_reset_ppm(struct ucsi *u &command, sizeof(command));if (ret <0 ) -return ret; + goto out; }msleep (20 ); }while (!(cci &UCSI_CCI_RESET_COMPLETE )); -return 0 ; +out: +mutex_unlock (&ucsi->ppm_lock); +return ret; }static int ucsi_role_cmd (struct ucsi_connector *con,u64 command)
@@ -777,9 +774,7 @@ static int ucsi_role_cmd(struct ucsi_conu64 c;/* PPM most likely stopped responding. Resetting everything. */ -mutex_lock (&con->ucsi->ppm_lock);ucsi_reset_ppm (con->ucsi); -mutex_unlock (&con->ucsi->ppm_lock); c =UCSI_SET_NOTIFICATION_ENABLE | con->ucsi->ntfy;ucsi_send_command (con->ucsi, c,NULL ,0 );
@@ -1010,8 +1005,6 @@ int ucsi_init(struct ucsi *ucsi)int ret;int i; -mutex_lock (&ucsi->ppm_lock); -/* Reset the PPM */ ret =ucsi_reset_ppm (ucsi);if (ret) {
@@ -1022,13 +1015,13 @@ int ucsi_init(struct ucsi *ucsi)/* Enable basic notifications */ ucsi->ntfy =UCSI_ENABLE_NTFY_CMD_COMPLETE |UCSI_ENABLE_NTFY_ERROR ; command =UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy; - ret =ucsi_run_command (ucsi, command,NULL ,0 ); + ret =ucsi_send_command (ucsi, command,NULL ,0 );if (ret <0 ) goto err_reset;/* Get PPM capabilities */ command =UCSI_GET_CAPABILITY ; - ret =ucsi_run_command (ucsi, command, &ucsi->cap,sizeof (ucsi->cap)); + ret =ucsi_send_command (ucsi, command, &ucsi->cap,sizeof (ucsi->cap));if (ret <0 ) goto err_reset;
@@ -1045,8 +1038,6 @@ int ucsi_init(struct ucsi *ucsi) goto err_reset; } -mutex_unlock (&ucsi->ppm_lock); -/* Register all connectors */ for (i =0 ; i < ucsi->cap.num_connectors; i++) { ret =ucsi_register_port (ucsi, i);
@@ -1072,12 +1063,9 @@ err_unregister: con->port =NULL ; } -mutex_lock (&ucsi->ppm_lock); err_reset:ucsi_reset_ppm (ucsi); err: -mutex_unlock (&ucsi->ppm_lock); -return ret; }EXPORT_SYMBOL_GPL (ucsi_init);
Greg Kroah-Hartman
maintainerPATCH 241/255 usb: typec: ucsi: Hold con->lock for the entire duration of ucsi_register_port()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit bed97b30968ba354035a020989df0623e52b5536 upstream.
Commit 081da1325d35 ("usb: typec: ucsi: displayport: Fix a potential race during registration") made the ucsi code hold con->lock in ucsi_register_displayport(). But we really don't want any interactions with the connector to run before the port-registration process is fully complete.
This commit moves the taking of con->lock from ucsi_register_displayport() into ucsi_register_port() to achieve this.
--- drivers/usb/typec/ucsi/displayport.c | 9 +-------- drivers/usb/typec/ucsi/ucsi.c | 31 ++++++++++++++++++++++--------- 2 files changed, 23 insertions(+), 17 deletions(-)
drivers/usb/typec/ucsi/displayport.c +1 -8
@@ -288,8 +288,6 @@ struct typec_altmode *ucsi_register_dispstruct typec_altmode *alt;struct ucsi_dp *dp; -mutex_lock (&con->lock); -/* We can't rely on the firmware with the capabilities. */ desc->vdo |=DP_CAP_DP_SIGNALING |DP_CAP_RECEPTACLE ;
@@ -298,15 +296,12 @@ struct typec_altmode *ucsi_register_disp desc->vdo |= all_assignments <<16 ; alt =typec_port_register_altmode (con->port, desc); -if (IS_ERR (alt)) { -mutex_unlock (&con->lock); +if (IS_ERR (alt))return alt; - } dp =devm_kzalloc (&alt->dev,sizeof (*dp),GFP_KERNEL );if (!dp) {typec_unregister_altmode (alt); -mutex_unlock (&con->lock);return ERR_PTR (-ENOMEM ); }
@@ -319,7 +314,5 @@ struct typec_altmode *ucsi_register_disp alt->ops = &ucsi_displayport_ops;typec_altmode_set_drvdata (alt, dp); -mutex_unlock (&con->lock); -return alt; }
drivers/usb/typec/ucsi/ucsi.c +22 -9
@@ -898,12 +898,15 @@ static int ucsi_register_port(struct ucs con->num = index +1 ; con->ucsi = ucsi; +/* Delay other interactions with the con until registration is complete */ +mutex_lock (&con->lock); +/* Get connector capability */ command =UCSI_GET_CONNECTOR_CAPABILITY ; command |=UCSI_CONNECTOR_NUMBER (con->num); ret =ucsi_send_command (ucsi, command, &con->cap,sizeof (con->cap));if (ret <0 ) -return ret; + goto out;if (con->cap.op_mode &UCSI_CONCAP_OPMODE_DRP ) cap->data =TYPEC_PORT_DRD ;
@@ -935,26 +938,32 @@ static int ucsi_register_port(struct ucs ret =ucsi_register_port_psy (con);if (ret) -return ret; + goto out;/* Register the connector */ con->port =typec_register_port (ucsi->dev, cap); -if (IS_ERR (con->port)) -return PTR_ERR (con->port); +if (IS_ERR (con->port)) { + ret =PTR_ERR (con->port); + goto out; + }/* Alternate modes */ ret =ucsi_register_altmodes (con,UCSI_RECIPIENT_CON ); -if (ret) +if (ret) {dev_err (ucsi->dev,"con%d: failed to register alt modes\n" , con->num); + goto out; + }/* Get the status */ command =UCSI_GET_CONNECTOR_STATUS |UCSI_CONNECTOR_NUMBER (con->num); ret =ucsi_send_command (ucsi, command, &con->status,sizeof (con->status));if (ret <0 ) {dev_err (ucsi->dev,"con%d: failed to get status\n" , con->num); -return 0 ; + ret =0 ; + goto out; } + ret =0 ;/* ucsi_send_command() returns length on success */ switch (UCSI_CONSTAT_PARTNER_TYPE (con->status.flags)) {case UCSI_CONSTAT_PARTNER_TYPE_UFP :
@@ -979,17 +988,21 @@ static int ucsi_register_port(struct ucsif (con->partner) { ret =ucsi_register_altmodes (con,UCSI_RECIPIENT_SOP ); -if (ret) +if (ret) {dev_err (ucsi->dev,"con%d: failed to register alternate modes\n" , con->num); -else + ret =0 ; + }else {ucsi_altmode_update_active (con); + } }trace_ucsi_register_port (con->num, &con->status); -return 0 ; +out: +mutex_unlock (&con->lock); +return ret; }/**
Greg Kroah-Hartman
maintainerPATCH 244/255 io_uring: dont use poll handler if file cant be nonblocking read/written
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
[ Upstream commit 9dab14b81807a40dab8e464ec87043935c562c2c ]
There's no point in using the poll handler if we can't do a nonblocking IO attempt of the operation, since we'll need to go async anyway. In fact this is actively harmful, as reading from eg pipes won't return 0 to indicate EOF.
--- fs/io_uring.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
fs/io_uring.c +9 -1
@@ -4503,12 +4503,20 @@ static bool io_arm_poll_handler(struct io_kiocb *req)struct async_poll *apoll;struct io_poll_table ipt;__poll_t mask, ret; +int rw;if (!req->file || !file_can_poll (req->file))return false;if (req->flags & (REQ_F_MUST_PUNT |REQ_F_POLLED ))return false; -if (!def->pollin && !def->pollout) +if (def->pollin) + rw =READ ; +else if (def->pollout) + rw =WRITE ; +else +return false; +/* if we can't nonblock try, then no point in arming a poll handler */ +if (!io_file_supports_async (req->file, rw))return false; apoll =kmalloc (sizeof (*apoll),GFP_ATOMIC );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 218/255 drm/amd/pm: correct Vega10 swctf limit setting
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
commit b05d71b51078fc428c6b72582126d9d75d3c1f4c upstream.
Correct the Vega10 thermal swctf limit.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +5 -2
@@ -363,6 +363,9 @@ int vega10_thermal_get_temperature(strucstatic int vega10_thermal_set_temperature_range (struct pp_hwmgr *hwmgr,struct PP_TemperatureRange *range) { +struct phm_ppt_v2_information *pp_table_info = + (struct phm_ppt_v2_information *)(hwmgr->pptable); +struct phm_tdp_table *tdp_table = pp_table_info->tdp_table;struct amdgpu_device *adev = hwmgr->adev;int low =VEGA10_THERMAL_MINIMUM_ALERT_TEMP *PP_TEMPERATURE_UNITS_PER_CENTIGRADES ;
@@ -372,8 +375,8 @@ static int vega10_thermal_set_temperaturif (low < range->min) low = range->min; -if (high > range->max) - high = range->max; +if (high > tdp_table->usSoftwareShutdownTemp) + high = tdp_table->usSoftwareShutdownTemp;if (low > high)return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 220/255 drm/amd/pm: correct Vega20 swctf limit setting
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
commit 9b51c4b2ba31396f3894ccc7df8bdf067243e9f5 upstream.
Correct the Vega20 thermal swctf limit.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c +4 -2
@@ -240,6 +240,8 @@ int vega20_thermal_get_temperature(strucstatic int vega20_thermal_set_temperature_range (struct pp_hwmgr *hwmgr,struct PP_TemperatureRange *range) { +struct phm_ppt_v3_information *pptable_information = + (struct phm_ppt_v3_information *)hwmgr->pptable;struct amdgpu_device *adev = hwmgr->adev;int low =VEGA20_THERMAL_MINIMUM_ALERT_TEMP *PP_TEMPERATURE_UNITS_PER_CENTIGRADES ;
@@ -249,8 +251,8 @@ static int vega20_thermal_set_temperaturif (low < range->min) low = range->min; -if (high > range->max) - high = range->max; +if (high > pptable_information->us_software_shutdown_temp) + high = pptable_information->us_software_shutdown_temp;if (low > high)return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 213/255 drm/modeset-lock: Take the modeset BKL for legacy drivers
In reply to Greg Kroah-HartmanFrom: Daniel Vetter <[email protected]>
commit 77ef38574beb3e0b414db48e9c0f04633df68ba6 upstream.
This fell off in the conversion in
commit 9bcaa3fe58ab7559e71df798bcff6e0795158695
Author: Michal Orzel <[email protected]> Date: Tue Apr 28 19:10:04 2020 +0200
drm: Replace drm_modeset_lock/unlock_all with DRM_MODESET_LOCK_ALL_* helpers
but it's caught by the drm_warn_on_modeset_not_all_locked() that the legacy modeset code uses. Since this is the bkl and it's unclear what's all protected, play it safe and grab it again for legacy drivers.
Unfortunately this means we need to sprinkle a few more #includes around.
Also we need to add the drm_device as a parameter to the _END macro.
Finally remove the mute_lock() from setcrtc, since that's now done by the macro.
--- drivers/gpu/drm/drm_atomic_helper.c | 7 ++++--- drivers/gpu/drm/drm_color_mgmt.c | 2 +- drivers/gpu/drm/drm_crtc.c | 4 +--- drivers/gpu/drm/drm_mode_object.c | 4 ++-- drivers/gpu/drm/drm_plane.c | 2 +- include/drm/drm_modeset_lock.h | 9 +++++++-- 6 files changed, 16 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +4 -3
@@ -34,6 +34,7 @@#include <drm/drm_bridge.h> #include <drm/drm_damage_helper.h> #include <drm/drm_device.h> +#include <drm/drm_drv.h> #include <drm/drm_plane_helper.h> #include <drm/drm_print.h> #include <drm/drm_self_refresh_helper.h>
@@ -3105,7 +3106,7 @@ void drm_atomic_helper_shutdown(struct dif (ret)DRM_ERROR ("Disabling all crtc's during unload failed with %i\n" , ret); -DRM_MODESET_LOCK_ALL_END (ctx, ret); +DRM_MODESET_LOCK_ALL_END (dev, ctx, ret); }EXPORT_SYMBOL (drm_atomic_helper_shutdown);
@@ -3245,7 +3246,7 @@ struct drm_atomic_state *drm_atomic_help } unlock: -DRM_MODESET_LOCK_ALL_END (ctx, err); +DRM_MODESET_LOCK_ALL_END (dev, ctx, err);if (err)return ERR_PTR (err);
@@ -3326,7 +3327,7 @@ int drm_atomic_helper_resume(struct drm_ err =drm_atomic_helper_commit_duplicated_state (state, &ctx); -DRM_MODESET_LOCK_ALL_END (ctx, err); +DRM_MODESET_LOCK_ALL_END (dev, ctx, err);drm_atomic_state_put (state);return err;
drivers/gpu/drm/drm_color_mgmt.c +1 -1
@@ -294,7 +294,7 @@ int drm_mode_gamma_set_ioctl(struct drm_ crtc->gamma_size, &ctx); out: -DRM_MODESET_LOCK_ALL_END (ctx, ret); +DRM_MODESET_LOCK_ALL_END (dev, ctx, ret);return ret; }
drivers/gpu/drm/drm_crtc.c +1 -3
@@ -561,7 +561,6 @@ int drm_mode_setcrtc(struct drm_device *if (crtc_req->mode_valid && !drm_lease_held (file_priv, plane->base.id))return -EACCES ; -mutex_lock (&crtc->dev->mode_config.mutex);DRM_MODESET_LOCK_ALL_BEGIN (dev, ctx,DRM_MODESET_ACQUIRE_INTERRUPTIBLE , ret);
@@ -728,8 +727,7 @@ out: fb =NULL ; mode =NULL ; -DRM_MODESET_LOCK_ALL_END (ctx, ret); -mutex_unlock (&crtc->dev->mode_config.mutex); +DRM_MODESET_LOCK_ALL_END (dev, ctx, ret);return ret; }
drivers/gpu/drm/drm_mode_object.c +2 -2
@@ -428,7 +428,7 @@ int drm_mode_obj_get_properties_ioctl(st out_unref:drm_mode_object_put (obj); out: -DRM_MODESET_LOCK_ALL_END (ctx, ret); +DRM_MODESET_LOCK_ALL_END (dev, ctx, ret);return ret; }
@@ -470,7 +470,7 @@ static int set_property_legacy(struct drbreak ; }drm_property_change_valid_put (prop, ref); -DRM_MODESET_LOCK_ALL_END (ctx, ret); +DRM_MODESET_LOCK_ALL_END (dev, ctx, ret);return ret; }
drivers/gpu/drm/drm_plane.c +1 -1
@@ -791,7 +791,7 @@ static int setplane_internal(struct drm_ crtc_x, crtc_y, crtc_w, crtc_h, src_x, src_y, src_w, src_h, &ctx); -DRM_MODESET_LOCK_ALL_END (ctx, ret); +DRM_MODESET_LOCK_ALL_END (plane->dev, ctx, ret);return ret; }
include/drm/drm_modeset_lock.h +7 -2
@@ -164,6 +164,8 @@ int drm_modeset_lock_all_ctx(struct drm_* is 0, so no error checking is necessary */ #define DRM_MODESET_LOCK_ALL_BEGIN (dev, ctx, flags, ret) \ + if (!drm_drv_uses_atomic_modeset(dev)) \ + mutex_lock(&dev->mode_config.mutex); \ drm_modeset_acquire_init(&ctx, flags); \ modeset_lock_retry: \ ret = drm_modeset_lock_all_ctx(dev, &ctx); \
@@ -172,6 +174,7 @@ modeset_lock_retry: \/** * DRM_MODESET_LOCK_ALL_END - Helper to release and cleanup modeset locks +* @dev: drm device * @ctx: local modeset acquire context, will be dereferenced * @ret: local ret/err/etc variable to track error status *
@@ -188,7 +191,7 @@ modeset_lock_retry: \* to that failure. In both of these cases the code between BEGIN/END will not * be run, so the failure will reflect the inability to grab the locks. */ -#define DRM_MODESET_LOCK_ALL_END (ctx, ret) \ +#define DRM_MODESET_LOCK_ALL_END (dev, ctx, ret) \ modeset_lock_fail: \ if (ret == -EDEADLK) { \ ret = drm_modeset_backoff(&ctx); \
@@ -196,6 +199,8 @@ modeset_lock_fail: \ goto modeset_lock_retry; \ } \drm_modeset_drop_locks (&ctx); \ -drm_modeset_acquire_fini (&ctx); +drm_modeset_acquire_fini (&ctx); \ +if (!drm_drv_uses_atomic_modeset (dev)) \ +mutex_unlock (&dev->mode_config.mutex);#endif /* DRM_MODESET_LOCK_H_ */
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Greg Kroah-Hartman
maintainerPATCH 221/255 drm/amd/pm: correct the thermal alert temperature limit settings
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
commit 28e628645333b7e581c4a7b04d958e4804ea10fe upstream.
Do the maths in celsius degree. This can fix the issues caused by the changes below:
drm/amd/pm: correct Vega20 swctf limit setting drm/amd/pm: correct Vega12 swctf limit setting drm/amd/pm: correct Vega10 swctf limit setting
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 15 +++++++-------- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 15 +++++++-------- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 15 +++++++-------- 3 files changed, 21 insertions(+), 24 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +7 -8
@@ -367,14 +367,13 @@ static int vega10_thermal_set_temperatur (struct phm_ppt_v2_information *)(hwmgr->pptable);struct phm_tdp_table *tdp_table = pp_table_info->tdp_table;struct amdgpu_device *adev = hwmgr->adev; -int low =VEGA10_THERMAL_MINIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; -int high =VEGA10_THERMAL_MAXIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; +int low =VEGA10_THERMAL_MINIMUM_ALERT_TEMP ; +int high =VEGA10_THERMAL_MAXIMUM_ALERT_TEMP ;uint32_t val; -if (low < range->min) - low = range->min; +/* compare them in unit celsius degree */ +if (low < range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ) + low = range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ;if (high > tdp_table->usSoftwareShutdownTemp) high = tdp_table->usSoftwareShutdownTemp;
@@ -385,8 +384,8 @@ static int vega10_thermal_set_temperatur val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,MAX_IH_CREDIT ,5 ); val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_IH_HW_ENA ,1 ); - val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , (high /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); - val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , (low /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , high); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , low); val &= (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK ) & (~THM_THERMAL_INT_CTRL__THERM_INTH_MASK_MASK ) & (~THM_THERMAL_INT_CTRL__THERM_INTL_MASK_MASK );
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c +7 -8
@@ -173,14 +173,13 @@ static int vega12_thermal_set_temperaturstruct phm_ppt_v3_information *pptable_information = (struct phm_ppt_v3_information *)hwmgr->pptable;struct amdgpu_device *adev = hwmgr->adev; -int low =VEGA12_THERMAL_MINIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; -int high =VEGA12_THERMAL_MAXIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; +int low =VEGA12_THERMAL_MINIMUM_ALERT_TEMP ; +int high =VEGA12_THERMAL_MAXIMUM_ALERT_TEMP ;uint32_t val; -if (low < range->min) - low = range->min; +/* compare them in unit celsius degree */ +if (low < range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ) + low = range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ;if (high > pptable_information->us_software_shutdown_temp) high = pptable_information->us_software_shutdown_temp;
@@ -191,8 +190,8 @@ static int vega12_thermal_set_temperatur val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,MAX_IH_CREDIT ,5 ); val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_IH_HW_ENA ,1 ); - val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , (high /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); - val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , (low /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , high); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , low); val = val & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK );WREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_CTRL, val);
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c +7 -8
@@ -243,14 +243,13 @@ static int vega20_thermal_set_temperaturstruct phm_ppt_v3_information *pptable_information = (struct phm_ppt_v3_information *)hwmgr->pptable;struct amdgpu_device *adev = hwmgr->adev; -int low =VEGA20_THERMAL_MINIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; -int high =VEGA20_THERMAL_MAXIMUM_ALERT_TEMP * -PP_TEMPERATURE_UNITS_PER_CENTIGRADES ; +int low =VEGA20_THERMAL_MINIMUM_ALERT_TEMP ; +int high =VEGA20_THERMAL_MAXIMUM_ALERT_TEMP ;uint32_t val; -if (low < range->min) - low = range->min; +/* compare them in unit celsius degree */ +if (low < range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ) + low = range->min /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ;if (high > pptable_information->us_software_shutdown_temp) high = pptable_information->us_software_shutdown_temp;
@@ -261,8 +260,8 @@ static int vega20_thermal_set_temperatur val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,MAX_IH_CREDIT ,5 ); val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_IH_HW_ENA ,1 ); - val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , (high /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); - val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , (low /PP_TEMPERATURE_UNITS_PER_CENTIGRADES )); + val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , high); + val =CGS_REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , low); val = val & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK );WREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_CTRL, val);
Greg Kroah-Hartman
maintainerPATCH 192/255 usb: host: xhci-tegra: otg usb2/usb3 port init
In reply to Greg Kroah-HartmanFrom: JC Kuo <[email protected]>
commit 316a2868bc269be8c6e69ccc3a1f902a3f518eb9 upstream.
tegra_xusb_init_usb_phy() should initialize "otg_usb2_port" and "otg_usb3_port" with -EINVAL because "0" is a valid value represents usb2 port 0 or usb3 port 0.
--- drivers/usb/host/xhci-tegra.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/host/xhci-tegra.c +2 -0
@@ -1258,6 +1258,8 @@ static int tegra_xusb_init_usb_phy(strucINIT_WORK (&tegra->id_work, tegra_xhci_id_work); tegra->id_nb.notifier_call = tegra_xhci_id_notify; + tegra->otg_usb2_port = -EINVAL ; + tegra->otg_usb3_port = -EINVAL ;for (i =0 ; i < tegra->num_usb_phys; i++) {struct phy *phy =tegra_xusb_get_phy (tegra,"usb2" , i);
Greg Kroah-Hartman
maintainerPATCH 210/255 drm/i915: Fix cmd parser desc matching with masks
In reply to Greg Kroah-HartmanFrom: Mika Kuoppala <[email protected]>
commit e5f10d6385cda083037915c12b130887c8831d2b upstream.
Our variety of defined gpu commands have the actual command id field and possibly length and flags applied.
We did start to apply the mask during initialization of the cmd descriptors but forgot to also apply it on comparisons.
Fix comparisons in order to properly deny access with associated commands.
v2: fix lri with correct mask (Chris)
--- drivers/gpu/drm/i915/i915_cmd_parser.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_cmd_parser.c +10 -4
@@ -1204,6 +1204,12 @@ static u32 *copy_batch(struct drm_i915_greturn dst; } +static inline bool cmd_desc_is (const struct drm_i915_cmd_descriptor *const desc, +const u32 cmd) +{ +return desc->cmd.value == (cmd & desc->cmd.mask); +} +static bool check_cmd (const struct intel_engine_cs *engine,const struct drm_i915_cmd_descriptor *desc,const u32 *cmd,u32 length)
@@ -1242,19 +1248,19 @@ static bool check_cmd(const struct intel* allowed mask/value pair given in the whitelist entry. */ if (reg->mask) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) { +if (cmd_desc_is (desc,MI_LOAD_REGISTER_MEM )) {DRM_DEBUG ("CMD: Rejected LRM to masked register 0x%08X\n" , reg_addr);return false; } -if (desc->cmd.value ==MI_LOAD_REGISTER_REG ) { +if (cmd_desc_is (desc,MI_LOAD_REGISTER_REG )) {DRM_DEBUG ("CMD: Rejected LRR to masked register 0x%08X\n" , reg_addr);return false; } -if (desc->cmd.value ==MI_LOAD_REGISTER_IMM (1 ) && +if (cmd_desc_is (desc,MI_LOAD_REGISTER_IMM (1 )) && (offset +2 > length || (cmd[offset +1 ] & reg->mask) != reg->value)) { DRM_DEBUG("CMD: Rejected LRI to masked register 0x%08X\n",
@@ -1478,7 +1484,7 @@ int intel_engine_cmd_parser(struct intelbreak ; } -if (desc->cmd.value ==MI_BATCH_BUFFER_START ) { +if (cmd_desc_is (desc,MI_BATCH_BUFFER_START )) { ret =check_bbstart (cmd, offset, length, batch_length, batch_addr, shadow_addr, jump_whitelist);
Greg Kroah-Hartman
maintainerPATCH 246/255 drm/atomic-helper: reset vblank on crtc reset
In reply to Greg Kroah-HartmanFrom: Daniel Vetter <[email protected]>
[ Upstream commit 51f644b40b4b794b28b982fdd5d0dd8ee63f9272 ]
Only when vblanks are supported ofc.
Some drivers do this already, but most unfortunately missed it. This opens up bugs after driver load, before the crtc is enabled for the first time. syzbot spotted this when loading vkms as a secondary output. Given how many drivers are buggy it's best to solve this once and for all in shared helper code.
Aside from moving the few existing calls to drm_crtc_vblank_reset into helpers (i915 doesn't use helpers, so keeps its own) I think the regression risk is minimal: atomic helpers already rely on drivers calling drm_crtc_vblank_on/off correctly in their hooks when they support vblanks. And driver that's failing to handle vblanks after this is missing those calls already, and vblanks could only work by accident when enabling a CRTC for the first time right after boot.
Big thanks to Tetsuo for helping track down what's going wrong here.
There's only a few drivers which already had the necessary call and needed some updating:
- komeda, atmel and tidss also needed to be changed to call __drm_atomic_helper_crtc_reset() intead of open coding it
- tegra and msm even had it in the same place already, just code motion, and malidp already uses __drm_atomic_helper_crtc_reset().
- Laurent noticed that rcar-du and omap open-code their crtc reset and hence would actually be broken by this patch now. So fix them up by reusing the helpers, which brings the drm_crtc_vblank_reset() back.
Only call left is in i915, which doesn't use drm_mode_config_reset, but has its own fastboot infrastructure. So that's the only case where we actually want this in the driver still.
I've also reviewed all other drivers which set up vblank support with drm_vblank_init. After the previous patch fixing mxsfb all atomic drivers do call drm_crtc_vblank_on/off as they should, the remaining drivers are either legacy kms or legacy dri1 drivers, so not affected by this change to atomic helpers.
v2: Use the drm_dev_has_vblank() helper.
v3: Laurent pointed out that omap and rcar-du used drm_crtc_vblank_off instead of drm_crtc_vblank_reset. Adjust them too.
v4: Laurent noticed that rcar-du and omap open-code their crtc reset and hence would actually be broken by this patch now. So fix them up by reusing the helpers, which brings the drm_crtc_vblank_reset() back.
v5: also mention rcar-du and ompadrm in the proper commit message above (Laurent).
--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 7 ++----- drivers/gpu/drm/arm/malidp_drv.c | 1 - drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 7 ++----- drivers/gpu/drm/drm_atomic_state_helper.c | 4 ++++ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 2 -- drivers/gpu/drm/omapdrm/omap_crtc.c | 8 +++++--- drivers/gpu/drm/omapdrm/omap_drv.c | 4 ---- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +----- drivers/gpu/drm/tegra/dc.c | 1 - drivers/gpu/drm/tidss/tidss_crtc.c | 3 +-- drivers/gpu/drm/tidss/tidss_kms.c | 5 ----- 11 files changed, 15 insertions(+), 33 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +2 -5
@@ -492,10 +492,8 @@ static void komeda_crtc_reset(struct drm_crtc *crtc) crtc->state =NULL ; state =kzalloc (sizeof (*state),GFP_KERNEL ); -if (state) { - crtc->state = &state->base; - crtc->state->crtc = crtc; - } +if (state) +__drm_atomic_helper_crtc_reset (crtc, &state->base); } static struct drm_crtc_state *
@@ -616,7 +614,6 @@ static int komeda_crtc_add(struct komeda_kms_dev *kms,return err;drm_crtc_helper_add (crtc, &komeda_crtc_helper_funcs); -drm_crtc_vblank_reset (crtc); crtc->port = kcrtc->master->of_output_port;
drivers/gpu/drm/arm/malidp_drv.c +0 -1
@@ -870,7 +870,6 @@ static int malidp_bind(struct device *dev) drm->irq_enabled = true; ret =drm_vblank_init (drm, drm->mode_config.num_crtc); -drm_crtc_vblank_reset (&malidp->crtc);if (ret <0 ) {DRM_ERROR ("failed to initialise vblank\n" ); goto vblank_fail;
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +2 -5
@@ -411,10 +411,8 @@ static void atmel_hlcdc_crtc_reset(struct drm_crtc *crtc) } state =kzalloc (sizeof (*state),GFP_KERNEL ); -if (state) { - crtc->state = &state->base; - crtc->state->crtc = crtc; - } +if (state) +__drm_atomic_helper_crtc_reset (crtc, &state->base); } static struct drm_crtc_state *
@@ -528,7 +526,6 @@ int atmel_hlcdc_crtc_create(struct drm_device *dev) }drm_crtc_helper_add (&crtc->base, &lcdc_crtc_helper_funcs); -drm_crtc_vblank_reset (&crtc->base);drm_mode_crtc_set_gamma_size (&crtc->base,ATMEL_HLCDC_CLUT_SIZE ); drm_crtc_enable_color_mgmt(&crtc->base, 0, false,
drivers/gpu/drm/drm_atomic_state_helper.c +4 -0
@@ -32,6 +32,7 @@#include <drm/drm_device.h> #include <drm/drm_plane.h> #include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include <drm/drm_writeback.h> #include <linux/slab.h>
@@ -93,6 +94,9 @@ __drm_atomic_helper_crtc_reset(struct drm_crtc *crtc,if (crtc_state)__drm_atomic_helper_crtc_state_reset (crtc_state, crtc); +if (drm_dev_has_vblank (crtc->dev)) +drm_crtc_vblank_reset (crtc); + crtc->state = crtc_state; }EXPORT_SYMBOL (__drm_atomic_helper_crtc_reset);
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +0 -2
@@ -1117,8 +1117,6 @@ static void mdp5_crtc_reset(struct drm_crtc *crtc)mdp5_crtc_destroy_state (crtc, crtc->state);__drm_atomic_helper_crtc_reset (crtc, &mdp5_cstate->base); - -drm_crtc_vblank_reset (crtc); }static const struct drm_crtc_funcs mdp5_crtc_funcs = {
drivers/gpu/drm/omapdrm/omap_crtc.c +5 -3
@@ -697,14 +697,16 @@ static int omap_crtc_atomic_get_property(struct drm_crtc *crtc,static void omap_crtc_reset (struct drm_crtc *crtc) { +struct omap_crtc_state *state; +if (crtc->state)__drm_atomic_helper_crtc_destroy_state (crtc->state);kfree (crtc->state); - crtc->state =kzalloc (sizeof (struct omap_crtc_state ),GFP_KERNEL ); -if (crtc->state) - crtc->state->crtc = crtc; + state =kzalloc (sizeof (*state),GFP_KERNEL ); +if (state) +__drm_atomic_helper_crtc_reset (crtc, &state->base); } static struct drm_crtc_state *
drivers/gpu/drm/omapdrm/omap_drv.c +0 -4
@@ -595,7 +595,6 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) {const struct soc_device_attribute *soc;struct drm_device *ddev; -unsigned int i;int ret;DBG ("%s" ,dev_name (dev));
@@ -642,9 +641,6 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) goto err_cleanup_modeset; } -for (i =0 ; i < priv->num_pipes; i++) -drm_crtc_vblank_off (priv->pipes[i].crtc); -omap_fbdev_init (ddev);drm_kms_helper_poll_init (ddev);
drivers/gpu/drm/rcar-du/rcar_du_crtc.c +1 -5
@@ -975,8 +975,7 @@ static void rcar_du_crtc_reset(struct drm_crtc *crtc) state->crc.source =VSP1_DU_CRC_NONE ; state->crc.index =0 ; - crtc->state = &state->state; - crtc->state->crtc = crtc; +__drm_atomic_helper_crtc_reset (crtc, &state->state); }static int rcar_du_crtc_enable_vblank (struct drm_crtc *crtc)
@@ -1271,9 +1270,6 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int swindex,drm_crtc_helper_add (crtc, &crtc_helper_funcs); -/* Start with vertical blanking interrupt reporting disabled. */ -drm_crtc_vblank_off (crtc); -/* Register the interrupt handler. */ if (rcar_du_has (rcdu,RCAR_DU_FEATURE_CRTC_IRQ_CLOCK )) {/* The IRQ's are associated with the CRTC (sw)index. */
drivers/gpu/drm/tegra/dc.c +0 -1
@@ -1169,7 +1169,6 @@ static void tegra_crtc_reset(struct drm_crtc *crtc)tegra_crtc_atomic_destroy_state (crtc, crtc->state);__drm_atomic_helper_crtc_reset (crtc, &state->base); -drm_crtc_vblank_reset (crtc); } static struct drm_crtc_state *
drivers/gpu/drm/tidss/tidss_crtc.c +1 -2
@@ -352,8 +352,7 @@ static void tidss_crtc_reset(struct drm_crtc *crtc)return ; } - crtc->state = &tcrtc->base; - crtc->state->crtc = crtc; +__drm_atomic_helper_crtc_reset (crtc, &tcrtc->base); }static struct drm_crtc_state *tidss_crtc_duplicate_state (struct drm_crtc *crtc)
drivers/gpu/drm/tidss/tidss_kms.c +0 -5
@@ -253,7 +253,6 @@ static int tidss_dispc_modeset_init(struct tidss_device *tidss)int tidss_modeset_init (struct tidss_device *tidss) {struct drm_device *ddev = &tidss->ddev; -unsigned int i;int ret;dev_dbg (tidss->dev,"%s\n" , __func__);
@@ -278,10 +277,6 @@ int tidss_modeset_init(struct tidss_device *tidss)if (ret)return ret; -/* Start with vertical blanking interrupt reporting disabled. */ -for (i =0 ; i < tidss->num_crtcs; ++i) -drm_crtc_vblank_reset (tidss->crtcs[i]); -drm_mode_config_reset (ddev);dev_dbg (tidss->dev,"%s done\n" , __func__);
Signature · 9 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 187/255 writeback: Protect inode->i_io_list with inode->i_lock
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit b35250c0816c7cf7d0a8de92f5fafb6a7508a708 upstream.
Currently, operations on inode->i_io_list are protected by wb->list_lock. In the following patches we'll need to maintain consistency between inode->i_state and inode->i_io_list so change the code so that inode->i_lock protects also all inode's i_io_list handling.
--- fs/fs-writeback.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
fs/fs-writeback.c +17 -5
@@ -144,6 +144,7 @@ static void inode_io_list_del_locked(str struct bdi_writeback *wb) {assert_spin_locked (&wb->list_lock); +assert_spin_locked (&inode->i_lock);list_del_init (&inode->i_io_list);wb_io_lists_depopulated (wb);
@@ -1122,7 +1123,9 @@ void inode_io_list_del(struct inode *inostruct bdi_writeback *wb; wb =inode_to_wb_and_lock_list (inode); +spin_lock (&inode->i_lock);inode_io_list_del_locked (inode, wb); +spin_unlock (&inode->i_lock);spin_unlock (&wb->list_lock); }EXPORT_SYMBOL (inode_io_list_del);
@@ -1172,8 +1175,10 @@ void sb_clear_inode_writeback(struct ino* the case then the inode must have been redirtied while it was being written * out and we don't reset its dirtied_when. */ -static void redirty_tail (struct inode *inode,struct bdi_writeback *wb) +static void redirty_tail_locked (struct inode *inode,struct bdi_writeback *wb) { +assert_spin_locked (&inode->i_lock); +if (!list_empty (&wb->b_dirty)) {struct inode *tail;
@@ -1184,6 +1189,13 @@ static void redirty_tail(struct inode *iinode_io_list_move_locked (inode, wb, &wb->b_dirty); } +static void redirty_tail (struct inode *inode,struct bdi_writeback *wb) +{ +spin_lock (&inode->i_lock); +redirty_tail_locked (inode, wb); +spin_unlock (&inode->i_lock); +} +/* * requeue inode for re-scanning after bdi->b_io list is exhausted. */
@@ -1394,7 +1406,7 @@ static void requeue_inode(struct inode ** writeback is not making progress due to locked * buffers. Skip this inode for now. */ -redirty_tail (inode, wb); +redirty_tail_locked (inode, wb);return ; }
@@ -1414,7 +1426,7 @@ static void requeue_inode(struct inode ** retrying writeback of the dirty page/inode * that cannot be performed immediately. */ -redirty_tail (inode, wb); +redirty_tail_locked (inode, wb); } }else if (inode->i_state &I_DIRTY ) {/*
@@ -1422,7 +1434,7 @@ static void requeue_inode(struct inode ** such as delayed allocation during submission or metadata * updates after data IO completion. */ -redirty_tail (inode, wb); +redirty_tail_locked (inode, wb); }else if (inode->i_state &I_DIRTY_TIME ) { inode->dirtied_when = jiffies;inode_io_list_move_locked (inode, wb, &wb->b_dirty_time);
@@ -1669,8 +1681,8 @@ static long writeback_sb_inodes(struct s*/ spin_lock (&inode->i_lock);if (inode->i_state & (I_NEW |I_FREEING |I_WILL_FREE )) { +redirty_tail_locked (inode, wb);spin_unlock (&inode->i_lock); -redirty_tail (inode, wb);continue ; }if ((inode->i_state &I_SYNC ) && wbc.sync_mode !=WB_SYNC_ALL ) {
Greg Kroah-Hartman
maintainerPATCH 229/255 USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb()
In reply to Greg Kroah-HartmanFrom: Brooke Basile <[email protected]>
commit 2b74b0a04d3e9f9f08ff026e5663dce88ff94e52 upstream.
Some values extracted by ncm_unwrap_ntb() could possibly lead to several different out of bounds reads of memory. Specifically the values passed to netdev_alloc_skb_ip_align() need to be checked so that memory is not overflowed.
Resolve this by applying bounds checking to a number of different indexes and lengths of the structure parsing logic.
--- drivers/usb/gadget/function/f_ncm.c | 81 ++++++++++++++++++++++++++++++------ 1 file changed, 69 insertions(+), 12 deletions(-)
drivers/usb/gadget/function/f_ncm.c +69 -12
@@ -1181,12 +1181,15 @@ static int ncm_unwrap_ntb(struct getherint ndp_index;unsigned dg_len, dg_len2;unsigned ndp_len; +unsigned block_len;struct sk_buff *skb2;int ret = -EINVAL ; -unsigned max_size =le32_to_cpu (ntb_parameters.dwNtbOutMaxSize); +unsigned ntb_max =le32_to_cpu (ntb_parameters.dwNtbOutMaxSize); +unsigned frame_max =le16_to_cpu (ecm_desc.wMaxSegmentSize);const struct ndp_parser_opts *opts = ncm->parser_opts;unsigned crc_len = ncm->is_crc ?sizeof (uint32_t ) :0 ;int dgram_counter; +bool ndp_after_header;/* dwSignature */ if (get_unaligned_le32 (tmp) != opts->nth_sign) {
@@ -1205,25 +1208,37 @@ static int ncm_unwrap_ntb(struct gether } tmp++;/* skip wSequence */ + block_len =get_ncm (&tmp, opts->block_length);/* (d)wBlockLength */ -if (get_ncm (&tmp, opts->block_length) > max_size) { +if (block_len > ntb_max) {INFO (port->func.config->cdev,"OUT size exceeded\n" ); goto err; } ndp_index =get_ncm (&tmp, opts->ndp_index); + ndp_after_header = false;/* Run through all the NDP's in the NTB */ do { - /* NCM 3.2 */ - if (((ndp_index % 4) != 0) && - (ndp_index < opts->nth_size)) { + /* + * NCM 3.2 + * dwNdpIndex + */ + if (((ndp_index % 4) != 0) || + (ndp_index < opts->nth_size) || + (ndp_index > (block_len - + opts->ndp_size))) { INFO(port->func.config->cdev, "Bad index: %#X\n", ndp_index); goto err; } + if (ndp_index == opts->nth_size) + ndp_after_header = true; - /* walk through NDP */ + /* + * walk through NDP + * dwSignature + */ tmp = (void *)(skb->data + ndp_index); if (get_unaligned_le32(tmp) != ncm->ndp_sign) { INFO(port->func.config->cdev, "Wrong NDP SIGN\n");
@@ -1234,14 +1249,15 @@ static int ncm_unwrap_ntb(struct gether ndp_len =get_unaligned_le16 (tmp++);/* * NCM 3.3.1 +* wLength * entry is 2 items * item size is 16/32 bits, opts->dgram_item_len * 2 bytes * minimal: struct usb_cdc_ncm_ndpX + normal entry + zero entry * Each entry is a dgram index and a dgram length. */ if ((ndp_len < opts->ndp_size - +2 *2 * (opts->dgram_item_len *2 )) - || (ndp_len % opts->ndplen_align !=0 )) { + +2 *2 * (opts->dgram_item_len *2 )) || + (ndp_len % opts->ndplen_align !=0 )) {INFO (port->func.config->cdev,"Bad NDP length: %#X\n" , ndp_len); goto err;
@@ -1258,8 +1274,21 @@ static int ncm_unwrap_ntb(struct gether do { index = index2; + /* wDatagramIndex[0] */ + if ((index < opts->nth_size) || + (index > block_len - opts->dpe_size)) { + INFO(port->func.config->cdev, + "Bad index: %#X\n", index); + goto err; + } + dg_len = dg_len2; - if (dg_len < 14 + crc_len) { /* ethernet hdr + crc */ + /* + * wDatagramLength[0] + * ethernet hdr + crc or larger than max frame size + */ + if ((dg_len < 14 + crc_len) || + (dg_len > frame_max)) { INFO(port->func.config->cdev, "Bad dgram length: %#X\n", dg_len); goto err;
@@ -1283,6 +1312,37 @@ static int ncm_unwrap_ntb(struct gether index2 =get_ncm (&tmp, opts->dgram_item_len); dg_len2 =get_ncm (&tmp, opts->dgram_item_len); +if (index2 ==0 || dg_len2 ==0 ) +break ; + +/* wDatagramIndex[1] */ +if (ndp_after_header) { +if (index2 < opts->nth_size + opts->ndp_size) { +INFO (port->func.config->cdev, +"Bad index: %#X\n" , index2); + goto err; + } + }else { +if (index2 < opts->nth_size + opts->dpe_size) { +INFO (port->func.config->cdev, +"Bad index: %#X\n" , index2); + goto err; + } + } +if (index2 > block_len - opts->dpe_size) { +INFO (port->func.config->cdev, +"Bad index: %#X\n" , index2); + goto err; + } + +/* wDatagramLength[1] */ +if ((dg_len2 <14 + crc_len) || + (dg_len2 > frame_max)) { +INFO (port->func.config->cdev, +"Bad dgram length: %#X\n" , dg_len); + goto err; + } +/* * Copy the data into a new skb. * This ensures the truesize is correct
@@ -1299,9 +1359,6 @@ static int ncm_unwrap_ntb(struct gether ndp_len -=2 * (opts->dgram_item_len *2 ); dgram_counter++; - -if (index2 ==0 || dg_len2 ==0 ) -break ; }while (ndp_len >2 * (opts->dgram_item_len *2 )); }while (ndp_index);
Greg Kroah-Hartman
maintainerPATCH 243/255 io_uring: dont recurse on tsk->sighand->siglock with signalfd
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
[ Upstream commit fd7d6de2241453fc7d042336d366a939a25bc5a9 ]
If an application is doing reads on signalfd, and we arm the poll handler because there's no data available, then the wakeup can recurse on the tasks sighand->siglock as the signal delivery from task_work_add() will use TWA_SIGNAL and that attempts to lock it again.
We can detect the signalfd case pretty easily by comparing the poll->head wait_queue_head_t with the target task signalfd wait queue. Just use normal task wakeup for this case.
--- fs/io_uring.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
fs/io_uring.c +13 -3
@@ -4114,7 +4114,8 @@ struct io_poll_table {int error; }; -static int io_req_task_work_add (struct io_kiocb *req,struct callback_head *cb) +static int io_req_task_work_add (struct io_kiocb *req,struct callback_head *cb, +bool twa_signal_ok) {struct task_struct *tsk = req->task;struct io_ring_ctx *ctx = req->ctx;
@@ -4127,7 +4128,7 @@ static int io_req_task_work_add(struct io_kiocb *req, struct callback_head *cb)* will do the job. */ notify =0 ; -if (!(ctx->flags &IORING_SETUP_SQPOLL )) +if (!(ctx->flags &IORING_SETUP_SQPOLL ) && twa_signal_ok) notify =TWA_SIGNAL ; ret =task_work_add (tsk, cb, notify);
@@ -4141,6 +4142,7 @@ static int __io_async_wake(struct io_kiocb *req, struct io_poll_iocb *poll, __poll_t mask, task_work_func_t func) {struct task_struct *tsk; +bool twa_signal_ok;int ret;/* for instances that support it check for an event match first: */
@@ -4156,13 +4158,21 @@ static int __io_async_wake(struct io_kiocb *req, struct io_poll_iocb *poll,init_task_work (&req->task_work, func);percpu_ref_get (&req->ctx->refs); +/* +* If we using the signalfd wait_queue_head for this wakeup, then +* it's not safe to use TWA_SIGNAL as we could be recursing on the +* tsk->sighand->siglock on doing the wakeup. Should not be needed +* either, as the normal wakeup will suffice. +*/ + twa_signal_ok = (poll->head != &req->task->sighand->signalfd_wqh); +/* * If this fails, then the task is exiting. When a task exits, the * work gets canceled, so just cancel this request as well instead * of executing it. We can't safely execute it anyway, as we may not * have the needed state needed for it anyway. */ - ret =io_req_task_work_add (req, &req->task_work); + ret =io_req_task_work_add (req, &req->task_work, twa_signal_ok);if (unlikely (ret)) {WRITE_ONCE (poll->canceled, true); tsk =io_wq_get_task (req->ctx->io_wq);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 249/255 HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage()
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
commit 25a097f5204675550afb879ee18238ca917cba7a upstream.
uref->usage_index is not always being properly checked, causing hiddev_ioctl_usage() to go out of bounds under some cases. Fix it.
--- drivers/hid/usbhid/hiddev.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/hid/usbhid/hiddev.c +4 -0
@@ -519,12 +519,16 @@ static noinline int hiddev_ioctl_usage(sswitch (cmd) {case HIDIOCGUSAGE : +if (uref->usage_index >= field->report_count) + goto inval; uref->value = field->value[uref->usage_index];if (copy_to_user (user_arg, uref,sizeof (*uref))) goto fault; goto goodreturn;case HIDIOCSUSAGE : +if (uref->usage_index >= field->report_count) + goto inval; field->value[uref->usage_index] = uref->value; goto goodreturn;