Hi,
I ran Smatch on 5.4.116 and I found that we were missing commit
bb14dd1564c9 ("scsi: ufs: Unlock on a couple error paths").
The problem was caused because somehow my Fixes tag did not match the
upstream commit that stable used. I have both hashes in my git tree and
the patches are identical except for the hash. I don't know git well
enough to say what went wrong. I don't think the SCSI tree rebases?
My fixes tag:
Fixes: a276c19e3e98 ("scsi: ufs: Avoid busy-waiting by eliminating tag conflicts")
^^^^^^^^^^^^
Stable hash:
commit a8d2d45c70c7391386baf7863674f156da56a3d5
Author: Bart Van Assche <bvanassche(a)acm.org>
Date: Mon Dec 9 10:13:08 2019 -0800
scsi: ufs: Avoid busy-waiting by eliminating tag conflicts
[ Upstream commit 7252a3603015f1fd04363956f4b72a537c9f9c42 ]
^^^^^^^^^^^^
regards,
dan carpenter
This is the start of the stable review cycle for the 5.11.19 release.
There are 31 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 Fri, 07 May 2021 11:23:16 +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.11.19-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.11.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.11.19-rc1
Ondrej Mosnacek <omosnace(a)redhat.com>
perf/core: Fix unconditional security_locked_down() call
Mark Pearson <markpearson(a)lenovo.com>
platform/x86: thinkpad_acpi: Correct thermal sensor allocation
Shengjiu Wang <shengjiu.wang(a)nxp.com>
ASoC: ak5558: Add MODULE_DEVICE_TABLE
Shengjiu Wang <shengjiu.wang(a)nxp.com>
ASoC: ak4458: Add MODULE_DEVICE_TABLE
Chris Chiu <chris.chiu(a)canonical.com>
USB: Add reset-resume quirk for WD19's Realtek Hub
Kai-Heng Feng <kai.heng.feng(a)canonical.com>
USB: Add LPM quirk for Lenovo ThinkPad USB-C Dock Gen2 Ethernet
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Fix implicit sync clearance at stopping stream
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Add MIDI quirk for Vox ToneLab EX
Miklos Szeredi <mszeredi(a)redhat.com>
ovl: allow upperdir inside lowerdir
Mickaël Salaün <mic(a)linux.microsoft.com>
ovl: fix leaked dentry
Jianxiong Gao <jxgao(a)google.com>
nvme-pci: set min_align_mask
Jianxiong Gao <jxgao(a)google.com>
swiotlb: respect min_align_mask
Jianxiong Gao <jxgao(a)google.com>
swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single
Jianxiong Gao <jxgao(a)google.com>
swiotlb: refactor swiotlb_tbl_map_single
Jianxiong Gao <jxgao(a)google.com>
swiotlb: clean up swiotlb_tbl_unmap_single
Jianxiong Gao <jxgao(a)google.com>
swiotlb: factor out a nr_slots helper
Jianxiong Gao <jxgao(a)google.com>
swiotlb: factor out an io_tlb_offset helper
Jianxiong Gao <jxgao(a)google.com>
swiotlb: add a IO_TLB_SIZE define
Jianxiong Gao <jxgao(a)google.com>
driver core: add a min_align_mask field to struct device_dma_parameters
Vasily Averin <vvs(a)virtuozzo.com>
tools/cgroup/slabinfo.py: updated to work on current kernel
Thomas Richter <tmricht(a)linux.ibm.com>
perf ftrace: Fix access to pid in array when setting a pid filter
Serge E. Hallyn <serge(a)hallyn.com>
capabilities: require CAP_SETFCAP to map uid 0
Zhen Lei <thunder.leizhen(a)huawei.com>
perf data: Fix error return code in perf_data__create_dir()
Bjorn Andersson <bjorn.andersson(a)linaro.org>
net: qrtr: Avoid potential use after free in MHI send
Daniel Borkmann <daniel(a)iogearbox.net>
bpf: Fix leakage of uninitialized bpf stack under speculation
Daniel Borkmann <daniel(a)iogearbox.net>
bpf: Fix masking negation logic upon negative dst register
Nick Lowe <nick.lowe(a)gmail.com>
igb: Enable RSS for Intel I211 Ethernet Controller
Imre Deak <imre.deak(a)intel.com>
drm/i915: Disable runtime power management during shutdown
Phillip Potter <phil(a)philpotter.co.uk>
net: usb: ax88179_178a: initialize local variables before use
Jonathon Reinhart <jonathon.reinhart(a)gmail.com>
netfilter: conntrack: Make global sysctls readonly in non-init netns
Romain Naour <romain.naour(a)gmail.com>
mips: Do not include hi and lo in clobber list for R6
-------------
Diffstat:
Makefile | 4 +-
arch/mips/include/asm/vdso/gettimeofday.h | 26 ++-
drivers/gpu/drm/i915/i915_drv.c | 10 ++
drivers/net/ethernet/intel/igb/igb_main.c | 3 +-
drivers/net/usb/ax88179_178a.c | 6 +-
drivers/nvme/host/pci.c | 1 +
drivers/platform/x86/thinkpad_acpi.c | 31 ++--
drivers/usb/core/quirks.c | 4 +
fs/overlayfs/namei.c | 1 +
fs/overlayfs/super.c | 12 +-
include/linux/bpf_verifier.h | 5 +-
include/linux/device.h | 1 +
include/linux/dma-mapping.h | 16 ++
include/linux/swiotlb.h | 1 +
include/linux/user_namespace.h | 3 +
include/uapi/linux/capability.h | 3 +-
kernel/bpf/verifier.c | 33 ++--
kernel/dma/swiotlb.c | 259 +++++++++++++++++-------------
kernel/events/core.c | 12 +-
kernel/user_namespace.c | 65 +++++++-
net/netfilter/nf_conntrack_standalone.c | 10 +-
net/qrtr/mhi.c | 8 +-
sound/soc/codecs/ak4458.c | 1 +
sound/soc/codecs/ak5558.c | 1 +
sound/usb/endpoint.c | 8 +-
sound/usb/quirks-table.h | 10 ++
tools/cgroup/memcg_slabinfo.py | 8 +-
tools/perf/builtin-ftrace.c | 2 +-
tools/perf/util/data.c | 5 +-
29 files changed, 361 insertions(+), 188 deletions(-)
The NVME device pluged in some AMD PCIE root port will resume timeout
from s2idle which caused by NVME power CFG lost in the SMU FW restore.
This issue can be workaround by using PCIe power set with simple
suspend/resume process path instead of APST. In the onwards ASIC will
try do the NVME shutdown save and restore in the BIOS and still need PCIe
power setting to resume from RTD3 for s2idle.
In this preparation patch add a PCIe quirk for the AMD.
Cc: <stable(a)vger.kernel.org> # 5.11+
Signed-off-by: Prike Liang <Prike.Liang(a)amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com>
[ck: split patches for nvme and pcie]
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com>
---
Changes in v2:
Fix the patch format and check chip root complex DID instead of PCIe RP
to avoid the storage device plugged in internal PCIe RP by USB adaptor.
Changes in v3:
According to Christoph Hellwig do NVME PCIe related identify opt better
in PCIe quirk driver rather than in NVME module.
Changes in v4:
Split the fix to PCIe and NVMe part and then call the pci_dev_put() put
the device reference count and finally refine the commit info.
---
drivers/pci/quirks.c | 10 ++++++++++
include/linux/pci.h | 2 ++
2 files changed, 12 insertions(+)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 653660e3..f95c8b2 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -312,6 +312,16 @@ static void quirk_nopciamd(struct pci_dev *dev)
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8151_0, quirk_nopciamd);
+static void quirk_amd_nvme_fixup(struct pci_dev *dev)
+{
+ struct pci_dev *rdev;
+
+ dev->dev_flags |= PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND;
+ pci_info(dev, "AMD simple suspend opt enabled\n");
+
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1630, quirk_amd_nvme_fixup);
+
/* Triton requires workarounds to be used by the drivers */
static void quirk_triton(struct pci_dev *dev)
{
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 53f4904..a6e1b1b 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -227,6 +227,8 @@ enum pci_dev_flags {
PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10),
/* Don't use Relaxed Ordering for TLPs directed at this device */
PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11),
+ /* AMD simple suspend opt quirk */
+ PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND = (__force pci_dev_flags_t) (1 << 12),
};
enum pci_irq_reroute_variant {
--
2.7.4
This is the start of the stable review cycle for the 5.12.2 release.
There are 17 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 Fri, 07 May 2021 11:23:16 +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.12.2-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.12.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.12.2-rc1
Ondrej Mosnacek <omosnace(a)redhat.com>
perf/core: Fix unconditional security_locked_down() call
Mark Pearson <markpearson(a)lenovo.com>
platform/x86: thinkpad_acpi: Correct thermal sensor allocation
Shengjiu Wang <shengjiu.wang(a)nxp.com>
ASoC: ak5558: Add MODULE_DEVICE_TABLE
Shengjiu Wang <shengjiu.wang(a)nxp.com>
ASoC: ak4458: Add MODULE_DEVICE_TABLE
Chris Chiu <chris.chiu(a)canonical.com>
USB: Add reset-resume quirk for WD19's Realtek Hub
Kai-Heng Feng <kai.heng.feng(a)canonical.com>
USB: Add LPM quirk for Lenovo ThinkPad USB-C Dock Gen2 Ethernet
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Fix implicit sync clearance at stopping stream
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Add MIDI quirk for Vox ToneLab EX
Miklos Szeredi <mszeredi(a)redhat.com>
ovl: allow upperdir inside lowerdir
Mickaël Salaün <mic(a)linux.microsoft.com>
ovl: fix leaked dentry
Bjorn Andersson <bjorn.andersson(a)linaro.org>
net: qrtr: Avoid potential use after free in MHI send
Daniel Borkmann <daniel(a)iogearbox.net>
bpf: Fix leakage of uninitialized bpf stack under speculation
Daniel Borkmann <daniel(a)iogearbox.net>
bpf: Fix masking negation logic upon negative dst register
Imre Deak <imre.deak(a)intel.com>
drm/i915: Disable runtime power management during shutdown
Phillip Potter <phil(a)philpotter.co.uk>
net: usb: ax88179_178a: initialize local variables before use
Jonathon Reinhart <jonathon.reinhart(a)gmail.com>
netfilter: conntrack: Make global sysctls readonly in non-init netns
Romain Naour <romain.naour(a)gmail.com>
mips: Do not include hi and lo in clobber list for R6
-------------
Diffstat:
Makefile | 4 ++--
arch/mips/include/asm/vdso/gettimeofday.h | 26 +++++++++++++++++++-----
drivers/gpu/drm/i915/i915_drv.c | 10 ++++++++++
drivers/net/usb/ax88179_178a.c | 6 ++++--
drivers/platform/x86/thinkpad_acpi.c | 31 ++++++++++++++++++++---------
drivers/usb/core/quirks.c | 4 ++++
fs/overlayfs/namei.c | 1 +
fs/overlayfs/super.c | 12 ++++++-----
include/linux/bpf_verifier.h | 5 +++--
kernel/bpf/verifier.c | 33 +++++++++++++++++--------------
kernel/events/core.c | 12 +++++------
net/netfilter/nf_conntrack_standalone.c | 10 ++--------
net/qrtr/mhi.c | 8 +++++---
sound/soc/codecs/ak4458.c | 1 +
sound/soc/codecs/ak5558.c | 1 +
sound/usb/endpoint.c | 8 ++++----
sound/usb/quirks-table.h | 10 ++++++++++
17 files changed, 121 insertions(+), 61 deletions(-)