September 2022 - Linux-stable-mirror

[PATCH 4.9/4.14/4.19] kbuild: Fix include path in scripts/Makefile.modpost

by Nicolas Schier

From: Jing Leng <jleng(a)ambarella.com> commit 23a0cb8e3225122496bfa79172005c587c2d64bf upstream. When building an external module, if users don't need to separate the compilation output and source code, they run the following command: "make -C $(LINUX_SRC_DIR) M=$(PWD)". At this point, "$(KBUILD_EXTMOD)" and "$(src)" are the same. If they need to separate them, they run "make -C $(KERNEL_SRC_DIR) O=$(KERNEL_OUT_DIR) M=$(OUT_DIR) src=$(PWD)". Before running the command, they need to copy "Kbuild" or "Makefile" to "$(OUT_DIR)" to prevent compilation failure. So the kernel should change the included path to avoid the copy operation. Signed-off-by: Jing Leng <jleng(a)ambarella.com> [masahiro: I do not think "M=$(OUT_DIR) src=$(PWD)" is the official way, but this patch is a nice clean up anyway.] Signed-off-by: Masahiro Yamada <masahiroy(a)kernel.org> [nsc: updated context for v4.19] Signed-off-by: Nicolas Schier <n.schier(a)avm.de> --- scripts/Makefile.modpost | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 51884c7b8069..4eac2ecb35fb 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -51,8 +51,7 @@ obj := $(KBUILD_EXTMOD) src := $(obj) # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS -include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \ - $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile) +include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, $(src)/Makefile) endif include scripts/Makefile.lib -- 2.37.2

1 year, 7 months

2
1
0 0

[PATCH 5.10/5.15] kbuild: Fix include path in scripts/Makefile.modpost

by Nicolas Schier

From: Jing Leng <jleng(a)ambarella.com> commit 23a0cb8e3225122496bfa79172005c587c2d64bf upstream. When building an external module, if users don't need to separate the compilation output and source code, they run the following command: "make -C $(LINUX_SRC_DIR) M=$(PWD)". At this point, "$(KBUILD_EXTMOD)" and "$(src)" are the same. If they need to separate them, they run "make -C $(KERNEL_SRC_DIR) O=$(KERNEL_OUT_DIR) M=$(OUT_DIR) src=$(PWD)". Before running the command, they need to copy "Kbuild" or "Makefile" to "$(OUT_DIR)" to prevent compilation failure. So the kernel should change the included path to avoid the copy operation. Signed-off-by: Jing Leng <jleng(a)ambarella.com> [masahiro: I do not think "M=$(OUT_DIR) src=$(PWD)" is the official way, but this patch is a nice clean up anyway.] Signed-off-by: Masahiro Yamada <masahiroy(a)kernel.org> Signed-off-by: Nicolas Schier <n.schier(a)avm.de> --- scripts/Makefile.modpost | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 12a87be0fb44..42154b6df652 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -87,8 +87,7 @@ obj := $(KBUILD_EXTMOD) src := $(obj) # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS -include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \ - $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile) +include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, $(src)/Makefile) # modpost option for external modules MODPOST += -e -- 2.37.2

1 year, 7 months

2
1
0 0

[PATCH 4.9 1/2] x86/cpu: Add Tiger Lake to Intel family

by Pawan Gupta

From: Gayatri Kammela <gayatri.kammela(a)intel.com> [ Upstream commit 6e1c32c5dbb4b90eea8f964c2869d0bde050dbe0 ] Add the model numbers/CPUIDs of Tiger Lake mobile and desktop to the Intel family. Suggested-by: Tony Luck <tony.luck(a)intel.com> Signed-off-by: Gayatri Kammela <gayatri.kammela(a)intel.com> Signed-off-by: Tony Luck <tony.luck(a)intel.com> Reviewed-by: Tony Luck <tony.luck(a)intel.com> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Rahul Tanwar <rahul.tanwar(a)linux.intel.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Link: https://lkml.kernel.org/r/20190905193020.14707-2-tony.luck@intel.com Signed-off-by: Ingo Molnar <mingo(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Pawan Gupta <pawan.kumar.gupta(a)linux.intel.com> --- arch/x86/include/asm/intel-family.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 8b6c01774ca2..aadb91d43eef 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -70,6 +70,9 @@ #define INTEL_FAM6_ALDERLAKE 0x97 #define INTEL_FAM6_ALDERLAKE_L 0x9A +#define INTEL_FAM6_TIGERLAKE_L 0x8C +#define INTEL_FAM6_TIGERLAKE 0x8D + /* "Small Core" Processors (Atom) */ #define INTEL_FAM6_ATOM_BONNELL 0x1C /* Diamondville, Pineview */ base-commit: c97531caf70f2b533fa1944bf64dd06ac20edad6 -- 2.37.2

1 year, 7 months

2
2
0 0

[PATCH 4.14 1/2] x86/cpu: Add Tiger Lake to Intel family

by Pawan Gupta

From: Gayatri Kammela <gayatri.kammela(a)intel.com> [ Upstream commit 6e1c32c5dbb4b90eea8f964c2869d0bde050dbe0 ] Add the model numbers/CPUIDs of Tiger Lake mobile and desktop to the Intel family. Suggested-by: Tony Luck <tony.luck(a)intel.com> Signed-off-by: Gayatri Kammela <gayatri.kammela(a)intel.com> Signed-off-by: Tony Luck <tony.luck(a)intel.com> Reviewed-by: Tony Luck <tony.luck(a)intel.com> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Rahul Tanwar <rahul.tanwar(a)linux.intel.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Link: https://lkml.kernel.org/r/20190905193020.14707-2-tony.luck@intel.com Signed-off-by: Ingo Molnar <mingo(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- Patch 2/2 (x86/bugs: Add "unknown" reporting for MMIO Stale) depends on this patch. arch/x86/include/asm/intel-family.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index 98823250a521..05d2d7169ab8 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h @@ -71,6 +71,9 @@ #define INTEL_FAM6_ALDERLAKE 0x97 #define INTEL_FAM6_ALDERLAKE_L 0x9A +#define INTEL_FAM6_TIGERLAKE_L 0x8C +#define INTEL_FAM6_TIGERLAKE 0x8D + /* "Small Core" Processors (Atom) */ #define INTEL_FAM6_ATOM_BONNELL 0x1C /* Diamondville, Pineview */ base-commit: e548869f356fead9fdcb3562f52d2226574f4f41 -- 2.37.2

1 year, 7 months

2
3
0 0

FAILED: patch "[PATCH] s390/mm: do not trigger write fault when vma does not allow" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 41ac42f137080bc230b5882e3c88c392ab7f2d32 Mon Sep 17 00:00:00 2001 From: Gerald Schaefer <gerald.schaefer(a)linux.ibm.com> Date: Wed, 17 Aug 2022 15:26:03 +0200 Subject: [PATCH] s390/mm: do not trigger write fault when vma does not allow VM_WRITE For non-protection pXd_none() page faults in do_dat_exception(), we call do_exception() with access == (VM_READ | VM_WRITE | VM_EXEC). In do_exception(), vma->vm_flags is checked against that before calling handle_mm_fault(). Since commit 92f842eac7ee3 ("[S390] store indication fault optimization"), we call handle_mm_fault() with FAULT_FLAG_WRITE, when recognizing that it was a write access. However, the vma flags check is still only checking against (VM_READ | VM_WRITE | VM_EXEC), and therefore also calling handle_mm_fault() with FAULT_FLAG_WRITE in cases where the vma does not allow VM_WRITE. Fix this by changing access check in do_exception() to VM_WRITE only, when recognizing write access. Link: https://lkml.kernel.org/r/20220811103435.188481-3-david@redhat.com Fixes: 92f842eac7ee3 ("[S390] store indication fault optimization") Cc: <stable(a)vger.kernel.org> Reported-by: David Hildenbrand <david(a)redhat.com> Reviewed-by: Heiko Carstens <hca(a)linux.ibm.com> Signed-off-by: Gerald Schaefer <gerald.schaefer(a)linux.ibm.com> Signed-off-by: Vasily Gorbik <gor(a)linux.ibm.com> diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 13449941516c..09b6e756d521 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -379,7 +379,9 @@ static inline vm_fault_t do_exception(struct pt_regs *regs, int access) flags = FAULT_FLAG_DEFAULT; if (user_mode(regs)) flags |= FAULT_FLAG_USER; - if (access == VM_WRITE || is_write) + if (is_write) + access = VM_WRITE; + if (access == VM_WRITE) flags |= FAULT_FLAG_WRITE; mmap_read_lock(mm);

1 year, 7 months

3
2
0 0

[PATCH 4.19 0/2] bpf: fix test_verifier, test_align selftests

by Ovidiu Panait

Backport of upstream commits [1] and [2] to 4.19-stable broke test_verifier and test_align bpf selftests. [1] 2fa7d94afc1a ("bpf: Fix the off-by-two error in range markings") [2] 294f2fc6da27 ("bpf: Verifer, adjust_scalar_min_max_vals to always call update_reg_bounds()") This series fixes all failing test_verifier/test_align testcases for 4.19: root@intel-x86-64:~/bpf# ./test_verifier ... #664/p mov64 src == dst OK #665/p mov64 src != dst OK #666/u calls: ctx read at start of subprog OK #666/p calls: ctx read at start of subprog OK Summary: 932 PASSED, 0 SKIPPED, 0 FAILED root@intel-x86-64:~/bpf# ./test_align Test 0: mov ... PASS Test 1: shift ... PASS Test 2: addsub ... PASS Test 3: mul ... PASS Test 4: unknown shift ... PASS Test 5: unknown mul ... PASS Test 6: packet const offset ... PASS Test 7: packet variable offset ... PASS Test 8: packet variable offset 2 ... PASS Test 9: dubious pointer arithmetic ... PASS Test 10: variable subtraction ... PASS Test 11: pointer variable subtraction ... PASS Results: 12 pass 0 fail Maxim Mikityanskiy (1): bpf: Fix the off-by-two error in range markings Stanislav Fomichev (1): selftests/bpf: Fix test_align verifier log patterns tools/testing/selftests/bpf/test_align.c | 27 ++++++++--------- tools/testing/selftests/bpf/test_verifier.c | 32 ++++++++++----------- 2 files changed, 30 insertions(+), 29 deletions(-) -- 2.37.2

1 year, 7 months

2
3
0 0

[PATCH stable-5.15 00/13] io_uring pollfree

by Pavel Begunkov

5.15 backport of io_uring pollfree patches. Jens Axboe (2): io_uring: remove poll entry from list when canceling all io_uring: bump poll refs to full 31-bits Jiapeng Chong (1): io_uring: Remove unused function req_ref_put Pavel Begunkov (10): io_uring: correct fill events helpers types io_uring: clean cqe filling functions io_uring: refactor poll update io_uring: move common poll bits io_uring: kill poll linking optimisation io_uring: inline io_poll_complete io_uring: poll rework io_uring: fail links when poll fails io_uring: fix wrong arm_poll error handling io_uring: fix UAF due to missing POLLFREE handling fs/io_uring.c | 746 +++++++++++++++++++++++--------------------------- 1 file changed, 347 insertions(+), 399 deletions(-) -- 2.37.2

1 year, 7 months

2
14
0 0

[PATCH] arm64: errata: Add Cortex-A510 to the repeat tlbi list

by Lucas Wei

From: James Morse <james.morse(a)arm.com> commit 39fdb65f52e9a53d32a6ba719f96669fd300ae78 upstream. Cortex-A510 is affected by an erratum where in rare circumstances the CPUs may not handle a race between a break-before-make sequence on one CPU, and another CPU accessing the same page. This could allow a store to a page that has been unmapped. Work around this by adding the affected CPUs to the list that needs TLB sequences to be done twice. Cc: stable(a)vger.kernel.org # 5.15.x Signed-off-by: James Morse <james.morse(a)arm.com> Link: https://lore.kernel.org/r/20220704155732.21216-1-james.morse@arm.com Signed-off-by: Will Deacon <will(a)kernel.org> Signed-off-by: Lucas Wei <lucaswei(a)google.com> --- Documentation/arm64/silicon-errata.rst | 2 ++ arch/arm64/Kconfig | 17 +++++++++++++++++ arch/arm64/kernel/cpu_errata.c | 8 +++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst index 7c1750bcc5bd..46644736e583 100644 --- a/Documentation/arm64/silicon-errata.rst +++ b/Documentation/arm64/silicon-errata.rst @@ -92,6 +92,8 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A77 | #1508412 | ARM64_ERRATUM_1508412 | +----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A510 | #2441009 | ARM64_ERRATUM_2441009 | ++----------------+-----------------+-----------------+-----------------------------+ | ARM | Neoverse-N1 | #1188873,1418040| ARM64_ERRATUM_1418040 | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Neoverse-N1 | #1349291 | N/A | diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 69e7e293f72e..9d80c783142f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -666,6 +666,23 @@ config ARM64_ERRATUM_1508412 If unsure, say Y. +config ARM64_ERRATUM_2441009 + bool "Cortex-A510: Completion of affected memory accesses might not be guaranteed by completion of a TLBI" + default y + select ARM64_WORKAROUND_REPEAT_TLBI + help + This option adds a workaround for ARM Cortex-A510 erratum #2441009. + + Under very rare circumstances, affected Cortex-A510 CPUs + may not handle a race between a break-before-make sequence on one + CPU, and another CPU accessing the same page. This could allow a + store to a page that has been unmapped. + + Work around this by adding the affected CPUs to the list that needs + TLB sequences to be done twice. + + If unsure, say Y. + config CAVIUM_ERRATUM_22375 bool "Cavium erratum 22375, 24313" default y diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index c67c19d70159..e1be45fc7f5b 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -211,6 +211,12 @@ static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = { /* Kryo4xx Gold (rcpe to rfpe) => (r0p0 to r3p0) */ ERRATA_MIDR_RANGE(MIDR_QCOM_KRYO_4XX_GOLD, 0xc, 0xe, 0xf, 0xe), }, +#endif +#ifdef CONFIG_ARM64_ERRATUM_2441009 + { + /* Cortex-A510 r0p0 -> r1p1. Fixed in r1p2 */ + ERRATA_MIDR_RANGE(MIDR_CORTEX_A510, 0, 0, 1, 1), + }, #endif {}, }; @@ -427,7 +433,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { #endif #ifdef CONFIG_ARM64_WORKAROUND_REPEAT_TLBI { - .desc = "Qualcomm erratum 1009, or ARM erratum 1286807", + .desc = "Qualcomm erratum 1009, or ARM erratum 1286807, 2441009", .capability = ARM64_WORKAROUND_REPEAT_TLBI, .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, .matches = cpucap_multi_entry_cap_matches, base-commit: addc9003c2e895fe8a068a66de1de6fdb4c6ac60 -- 2.37.2.672.g94769d06f0-goog

1 year, 7 months

2
1
0 0

Re: [PATCH v2 1/2] Drivers: hv: balloon: Support status report for larger page sizes

by Boqun Feng

Hi, I think we also want this patch in the 5.15 stable. Without this patch, hv_balloon() will report incorrect memory usage to hypervisor when running on ARM64 with PAGE_SIZE > 4k. Only 5.15 needs this because ARM64 support of HyperV guests arrived in 5.15. Upstream id b3d6dd09ff00fdcf4f7c0cb54700ffd5dd343502 Cc: <stable(a)vger.kernel.org> # 5.15.x Thanks! Regards, Boqun On Fri, Mar 25, 2022 at 10:32:11AM +0800, Boqun Feng wrote: > DM_STATUS_REPORT expects the numbers of pages in the unit of 4k pages > (HV_HYP_PAGE) instead of guest pages, so to make it work when guest page > sizes are larger than 4k, convert the numbers of guest pages into the > numbers of HV_HYP_PAGEs. > > Note that the numbers of guest pages are still used for tracing because > tracing is internal to the guest kernel. > > Reported-by: Vitaly Kuznetsov <vkuznets(a)redhat.com> > Signed-off-by: Boqun Feng <boqun.feng(a)gmail.com> > Reviewed-by: Michael Kelley <mikelley(a)microsoft.com> > --- > drivers/hv/hv_balloon.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c > index f2d05bff4245..062156b88a87 100644 > --- a/drivers/hv/hv_balloon.c > +++ b/drivers/hv/hv_balloon.c > @@ -17,6 +17,7 @@ > #include <linux/slab.h> > #include <linux/kthread.h> > #include <linux/completion.h> > +#include <linux/count_zeros.h> > #include <linux/memory_hotplug.h> > #include <linux/memory.h> > #include <linux/notifier.h> > @@ -1130,6 +1131,7 @@ static void post_status(struct hv_dynmem_device *dm) > struct dm_status status; > unsigned long now = jiffies; > unsigned long last_post = last_post_time; > + unsigned long num_pages_avail, num_pages_committed; > > if (pressure_report_delay > 0) { > --pressure_report_delay; > @@ -1154,16 +1156,21 @@ static void post_status(struct hv_dynmem_device *dm) > * num_pages_onlined) as committed to the host, otherwise it can try > * asking us to balloon them out. > */ > - status.num_avail = si_mem_available(); > - status.num_committed = vm_memory_committed() + > + num_pages_avail = si_mem_available(); > + num_pages_committed = vm_memory_committed() + > dm->num_pages_ballooned + > (dm->num_pages_added > dm->num_pages_onlined ? > dm->num_pages_added - dm->num_pages_onlined : 0) + > compute_balloon_floor(); > > - trace_balloon_status(status.num_avail, status.num_committed, > + trace_balloon_status(num_pages_avail, num_pages_committed, > vm_memory_committed(), dm->num_pages_ballooned, > dm->num_pages_added, dm->num_pages_onlined); > + > + /* Convert numbers of pages into numbers of HV_HYP_PAGEs. */ > + status.num_avail = num_pages_avail * NR_HV_HYP_PAGES_IN_PAGE; > + status.num_committed = num_pages_committed * NR_HV_HYP_PAGES_IN_PAGE; > + > /* > * If our transaction ID is no longer current, just don't > * send the status. This can happen if we were interrupted > -- > 2.35.1 >

1 year, 7 months

2
1
0 0

[PATCH] scsi: mpt3sas: Fix NULL pointer crash due to missing check device hostdata

by huhai

From: huhai <huhai(a)kylinos.cn> If _scsih_io_done() is called with scmd->device->hostdata=NULL, it can lead to the following panic: BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 PGD 4547a4067 P4D 4547a4067 PUD 0 Oops: 0002 [#1] SMP NOPTI CPU: 62 PID: 0 Comm: swapper/62 Kdump: loaded Not tainted 4.19.90-24.4.v2101.ky10.x86_64 #1 Hardware name: Storage Server/65N32-US, BIOS SQL1041217 05/30/2022 RIP: 0010:_scsih_set_satl_pending+0x2d/0x50 [mpt3sas] Code: 00 00 48 8b 87 60 01 00 00 0f b6 10 80 fa a1 74 09 31 c0 80 fa 85 74 02 f3 c3 48 8b 47 38 40 84 f6 48 8b 80 98 00 00 00 75 08 <f0> 80 60 18 fe 31 c0 c3 f0 48 0f ba 68 18 00 0f 92 c0 0f b6 c0 c3 RSP: 0018:ffff8ec22fc03e00 EFLAGS: 00010046 RAX: 0000000000000000 RBX: ffff8eba1b072518 RCX: 0000000000000001 RDX: 0000000000000085 RSI: 0000000000000000 RDI: ffff8eba1b072518 RBP: 0000000000000dbd R08: 0000000000000000 R09: 0000000000029700 R10: ffff8ec22fc03f80 R11: 0000000000000000 R12: ffff8ebe2d3609e8 R13: ffff8ebe2a72b600 R14: ffff8eca472707e0 R15: 0000000000000020 FS: 0000000000000000(0000) GS:ffff8ec22fc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000018 CR3: 000000046e5f6000 CR4: 00000000003406e0 Call Trace: <IRQ> _scsih_io_done+0x4a/0x9f0 [mpt3sas] _base_interrupt+0x23f/0xe10 [mpt3sas] __handle_irq_event_percpu+0x40/0x190 handle_irq_event_percpu+0x30/0x70 handle_irq_event+0x36/0x60 handle_edge_irq+0x7e/0x190 handle_irq+0xa8/0x110 do_IRQ+0x49/0xe0 Fix it by move scmd->device->hostdata check before _scsih_set_satl_pending called. Other changes: - It looks clear to move get mpi_reply to near its check. Fixes: ffb584565894 ("scsi: mpt3sas: fix hang on ata passthrough commands") Cc: <stable(a)vger.kernel.org> # v4.9+ Co-developed-by: Jackie Liu <liuyun01(a)kylinos.cn> Signed-off-by: Jackie Liu <liuyun01(a)kylinos.cn> Signed-off-by: huhai <huhai(a)kylinos.cn> --- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index def37a7e5980..85f5749a0421 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -5704,27 +5704,26 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply) struct MPT3SAS_DEVICE *sas_device_priv_data; u32 response_code = 0; - mpi_reply = mpt3sas_base_get_reply_virt_addr(ioc, reply); - scmd = mpt3sas_scsih_scsi_lookup_get(ioc, smid); if (scmd == NULL) return 1; + sas_device_priv_data = scmd->device->hostdata; + if (!sas_device_priv_data || !sas_device_priv_data->sas_target || + sas_device_priv_data->sas_target->deleted) { + scmd->result = DID_NO_CONNECT << 16; + goto out; + } _scsih_set_satl_pending(scmd, false); mpi_request = mpt3sas_base_get_msg_frame(ioc, smid); + mpi_reply = mpt3sas_base_get_reply_virt_addr(ioc, reply); if (mpi_reply == NULL) { scmd->result = DID_OK << 16; goto out; } - sas_device_priv_data = scmd->device->hostdata; - if (!sas_device_priv_data || !sas_device_priv_data->sas_target || - sas_device_priv_data->sas_target->deleted) { - scmd->result = DID_NO_CONNECT << 16; - goto out; - } ioc_status = le16_to_cpu(mpi_reply->IOCStatus); /* -- 2.27.0 No virus found Checked by Hillstone Network AntiVirus

1 year, 7 months

3
4
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror September 2022