fix a bunch of build issues...

diff --git a/queue-4.14/scsi-scsi_transport_sas-fix-memory-leak-when-removing-devices.patch b/queue-4.14/scsi-scsi_transport_sas-fix-memory-leak-when-removing-devices.patch
deleted file mode 100644 (file)
index b06be9a..0000000
--- a/queue-4.14/scsi-scsi_transport_sas-fix-memory-leak-when-removing-devices.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 82ea3e0e129e2ab913dd6684bab7a6e5e9896dee Mon Sep 17 00:00:00 2001
-From: John Garry <john.garry@huawei.com>
-Date: Wed, 20 Nov 2019 17:39:15 +0800
-Subject: scsi: scsi_transport_sas: Fix memory leak when removing devices
-
-From: John Garry <john.garry@huawei.com>
-
-commit 82ea3e0e129e2ab913dd6684bab7a6e5e9896dee upstream.
-
-Removing a non-host rphy causes a memory leak:
-
-root@(none)$ echo 0 > /sys/devices/platform/HISI0162:01/host0/port-0:0/expander-0:0/port-0:0:10/phy-0:0:10/sas_phy/phy-0:0:10/enable
-[   79.857888] hisi_sas_v2_hw HISI0162:01: dev[7:1] is gone
-root@(none)$ echo scan > /sys/kernel/debug/kmemleak
-[  131.656603] kmemleak: 3 new suspected memory leaks (see /sys/kernel/debug/kmemleak)
-root@(none)$ more /sys/kernel/debug/kmemleak
-unreferenced object 0xffff041da5c66000 (size 256):
-  comm "kworker/u128:1", pid 549, jiffies 4294898543 (age 113.728s)
-  hex dump (first 32 bytes):
-    00 5e c6 a5 1d 04 ff ff 01 00 00 00 00 00 00 00  .^..............
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  backtrace:
-    [<(____ptrval____)>] kmem_cache_alloc+0x188/0x260
-    [<(____ptrval____)>] bsg_setup_queue+0x48/0x1a8
-    [<(____ptrval____)>] sas_rphy_add+0x108/0x2d0
-    [<(____ptrval____)>] sas_probe_devices+0x168/0x208
-    [<(____ptrval____)>] sas_discover_domain+0x660/0x9c8
-    [<(____ptrval____)>] process_one_work+0x3f8/0x690
-    [<(____ptrval____)>] worker_thread+0x70/0x6a0
-    [<(____ptrval____)>] kthread+0x1b8/0x1c0
-    [<(____ptrval____)>] ret_from_fork+0x10/0x18
-unreferenced object 0xffff041d8c075400 (size 128):
-  comm "kworker/u128:1", pid 549, jiffies 4294898543 (age 113.728s)
-  hex dump (first 32 bytes):
-    00 40 25 97 1d 00 ff ff 00 00 00 00 00 00 00 00  .@%.............
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  backtrace:
-    [<(____ptrval____)>] __kmalloc_node+0x1a8/0x2c8
-    [<(____ptrval____)>] blk_mq_realloc_tag_set_tags.part.70+0x48/0xd8
-    [<(____ptrval____)>] blk_mq_alloc_tag_set+0x1dc/0x530
-    [<(____ptrval____)>] bsg_setup_queue+0xe8/0x1a8
-    [<(____ptrval____)>] sas_rphy_add+0x108/0x2d0
-    [<(____ptrval____)>] sas_probe_devices+0x168/0x208
-    [<(____ptrval____)>] sas_discover_domain+0x660/0x9c8
-    [<(____ptrval____)>] process_one_work+0x3f8/0x690
-    [<(____ptrval____)>] worker_thread+0x70/0x6a0
-    [<(____ptrval____)>] kthread+0x1b8/0x1c0
-    [<(____ptrval____)>] ret_from_fork+0x10/0x18
-unreferenced object 0xffff041da5c65e00 (size 256):
-  comm "kworker/u128:1", pid 549, jiffies 4294898543 (age 113.728s)
-  hex dump (first 32 bytes):
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  backtrace:
-    [<(____ptrval____)>] __kmalloc_node+0x1a8/0x2c8
-    [<(____ptrval____)>] blk_mq_alloc_tag_set+0x254/0x530
-    [<(____ptrval____)>] bsg_setup_queue+0xe8/0x1a8
-    [<(____ptrval____)>] sas_rphy_add+0x108/0x2d0
-    [<(____ptrval____)>] sas_probe_devices+0x168/0x208
-    [<(____ptrval____)>] sas_discover_domain+0x660/0x9c8
-    [<(____ptrval____)>] process_one_work+0x3f8/0x690
-    [<(____ptrval____)>] worker_thread+0x70/0x6a0
-    [<(____ptrval____)>] kthread+0x1b8/0x1c0
-    [<(____ptrval____)>] ret_from_fork+0x10/0x18
-root@(none)$
-
-It turns out that we don't clean up the request queue fully for bsg
-devices, as the blk mq tags for the request queue are not freed.
-
-Fix by doing the queue removal in one place - in sas_rphy_remove() -
-instead of unregistering the queue in sas_rphy_remove() and finally
-cleaning up the queue in calling blk_cleanup_queue() from
-sas_end_device_release() or sas_expander_release().
-
-Function bsg_remove_queue() can handle a NULL pointer q, so remove the
-precheck in sas_rphy_remove().
-
-Fixes: 651a013649943 ("scsi: scsi_transport_sas: switch to bsg-lib for SMP passthrough")
-Link: https://lore.kernel.org/r/1574242755-94156-1-git-send-email-john.garry@huawei.com
-Signed-off-by: John Garry <john.garry@huawei.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/scsi/scsi_transport_sas.c |    9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
---- a/drivers/scsi/scsi_transport_sas.c
-+++ b/drivers/scsi/scsi_transport_sas.c
-@@ -1409,9 +1409,6 @@ static void sas_expander_release(struct
-       struct sas_rphy *rphy = dev_to_rphy(dev);
-       struct sas_expander_device *edev = rphy_to_expander_device(rphy);
- 
--      if (rphy->q)
--              blk_cleanup_queue(rphy->q);
--
-       put_device(dev->parent);
-       kfree(edev);
- }
-@@ -1421,9 +1418,6 @@ static void sas_end_device_release(struc
-       struct sas_rphy *rphy = dev_to_rphy(dev);
-       struct sas_end_device *edev = rphy_to_end_device(rphy);
- 
--      if (rphy->q)
--              blk_cleanup_queue(rphy->q);
--
-       put_device(dev->parent);
-       kfree(edev);
- }
-@@ -1652,8 +1646,7 @@ sas_rphy_remove(struct sas_rphy *rphy)
-       }
- 
-       sas_rphy_unlink(rphy);
--      if (rphy->q)
--              bsg_unregister_queue(rphy->q);
-+      bsg_remove_queue(rphy->q);
-       transport_remove_device(dev);
-       device_del(dev);
- }

diff --git a/queue-4.14/series b/queue-4.14/series
index 2ad21a391830cd3af1a5e3aad6f279112715bd33..3a7b65cf6e45a5d8d2c1b662c29b0cf0b01d7454 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -58,7 +58,6 @@ scsi-esas2r-unlock-on-error-in-esas2r_nvram_read_direct.patch
 scsi-qla4xxx-fix-double-free-bug.patch
 scsi-bnx2i-fix-potential-use-after-free.patch
 scsi-target-core-fix-a-pr_debug-argument.patch
-scsi-scsi_transport_sas-fix-memory-leak-when-removing-devices.patch
 scsi-qla2xxx-fix-qla2x00_request_irqs-for-msi.patch
 scsi-qla2xxx-fix-rports-not-being-mark-as-lost-in-sync-fabric-scan.patch
 scsi-core-scsi_trace-use-get_unaligned_be.patch

diff --git a/queue-4.19/scsi-scsi_transport_sas-fix-memory-leak-when-removing-devices.patch b/queue-4.19/scsi-scsi_transport_sas-fix-memory-leak-when-removing-devices.patch
deleted file mode 100644 (file)
index 1e892a6..0000000
--- a/queue-4.19/scsi-scsi_transport_sas-fix-memory-leak-when-removing-devices.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 82ea3e0e129e2ab913dd6684bab7a6e5e9896dee Mon Sep 17 00:00:00 2001
-From: John Garry <john.garry@huawei.com>
-Date: Wed, 20 Nov 2019 17:39:15 +0800
-Subject: scsi: scsi_transport_sas: Fix memory leak when removing devices
-
-From: John Garry <john.garry@huawei.com>
-
-commit 82ea3e0e129e2ab913dd6684bab7a6e5e9896dee upstream.
-
-Removing a non-host rphy causes a memory leak:
-
-root@(none)$ echo 0 > /sys/devices/platform/HISI0162:01/host0/port-0:0/expander-0:0/port-0:0:10/phy-0:0:10/sas_phy/phy-0:0:10/enable
-[   79.857888] hisi_sas_v2_hw HISI0162:01: dev[7:1] is gone
-root@(none)$ echo scan > /sys/kernel/debug/kmemleak
-[  131.656603] kmemleak: 3 new suspected memory leaks (see /sys/kernel/debug/kmemleak)
-root@(none)$ more /sys/kernel/debug/kmemleak
-unreferenced object 0xffff041da5c66000 (size 256):
-  comm "kworker/u128:1", pid 549, jiffies 4294898543 (age 113.728s)
-  hex dump (first 32 bytes):
-    00 5e c6 a5 1d 04 ff ff 01 00 00 00 00 00 00 00  .^..............
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  backtrace:
-    [<(____ptrval____)>] kmem_cache_alloc+0x188/0x260
-    [<(____ptrval____)>] bsg_setup_queue+0x48/0x1a8
-    [<(____ptrval____)>] sas_rphy_add+0x108/0x2d0
-    [<(____ptrval____)>] sas_probe_devices+0x168/0x208
-    [<(____ptrval____)>] sas_discover_domain+0x660/0x9c8
-    [<(____ptrval____)>] process_one_work+0x3f8/0x690
-    [<(____ptrval____)>] worker_thread+0x70/0x6a0
-    [<(____ptrval____)>] kthread+0x1b8/0x1c0
-    [<(____ptrval____)>] ret_from_fork+0x10/0x18
-unreferenced object 0xffff041d8c075400 (size 128):
-  comm "kworker/u128:1", pid 549, jiffies 4294898543 (age 113.728s)
-  hex dump (first 32 bytes):
-    00 40 25 97 1d 00 ff ff 00 00 00 00 00 00 00 00  .@%.............
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  backtrace:
-    [<(____ptrval____)>] __kmalloc_node+0x1a8/0x2c8
-    [<(____ptrval____)>] blk_mq_realloc_tag_set_tags.part.70+0x48/0xd8
-    [<(____ptrval____)>] blk_mq_alloc_tag_set+0x1dc/0x530
-    [<(____ptrval____)>] bsg_setup_queue+0xe8/0x1a8
-    [<(____ptrval____)>] sas_rphy_add+0x108/0x2d0
-    [<(____ptrval____)>] sas_probe_devices+0x168/0x208
-    [<(____ptrval____)>] sas_discover_domain+0x660/0x9c8
-    [<(____ptrval____)>] process_one_work+0x3f8/0x690
-    [<(____ptrval____)>] worker_thread+0x70/0x6a0
-    [<(____ptrval____)>] kthread+0x1b8/0x1c0
-    [<(____ptrval____)>] ret_from_fork+0x10/0x18
-unreferenced object 0xffff041da5c65e00 (size 256):
-  comm "kworker/u128:1", pid 549, jiffies 4294898543 (age 113.728s)
-  hex dump (first 32 bytes):
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  backtrace:
-    [<(____ptrval____)>] __kmalloc_node+0x1a8/0x2c8
-    [<(____ptrval____)>] blk_mq_alloc_tag_set+0x254/0x530
-    [<(____ptrval____)>] bsg_setup_queue+0xe8/0x1a8
-    [<(____ptrval____)>] sas_rphy_add+0x108/0x2d0
-    [<(____ptrval____)>] sas_probe_devices+0x168/0x208
-    [<(____ptrval____)>] sas_discover_domain+0x660/0x9c8
-    [<(____ptrval____)>] process_one_work+0x3f8/0x690
-    [<(____ptrval____)>] worker_thread+0x70/0x6a0
-    [<(____ptrval____)>] kthread+0x1b8/0x1c0
-    [<(____ptrval____)>] ret_from_fork+0x10/0x18
-root@(none)$
-
-It turns out that we don't clean up the request queue fully for bsg
-devices, as the blk mq tags for the request queue are not freed.
-
-Fix by doing the queue removal in one place - in sas_rphy_remove() -
-instead of unregistering the queue in sas_rphy_remove() and finally
-cleaning up the queue in calling blk_cleanup_queue() from
-sas_end_device_release() or sas_expander_release().
-
-Function bsg_remove_queue() can handle a NULL pointer q, so remove the
-precheck in sas_rphy_remove().
-
-Fixes: 651a013649943 ("scsi: scsi_transport_sas: switch to bsg-lib for SMP passthrough")
-Link: https://lore.kernel.org/r/1574242755-94156-1-git-send-email-john.garry@huawei.com
-Signed-off-by: John Garry <john.garry@huawei.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/scsi/scsi_transport_sas.c |    9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
---- a/drivers/scsi/scsi_transport_sas.c
-+++ b/drivers/scsi/scsi_transport_sas.c
-@@ -1397,9 +1397,6 @@ static void sas_expander_release(struct
-       struct sas_rphy *rphy = dev_to_rphy(dev);
-       struct sas_expander_device *edev = rphy_to_expander_device(rphy);
- 
--      if (rphy->q)
--              blk_cleanup_queue(rphy->q);
--
-       put_device(dev->parent);
-       kfree(edev);
- }
-@@ -1409,9 +1406,6 @@ static void sas_end_device_release(struc
-       struct sas_rphy *rphy = dev_to_rphy(dev);
-       struct sas_end_device *edev = rphy_to_end_device(rphy);
- 
--      if (rphy->q)
--              blk_cleanup_queue(rphy->q);
--
-       put_device(dev->parent);
-       kfree(edev);
- }
-@@ -1640,8 +1634,7 @@ sas_rphy_remove(struct sas_rphy *rphy)
-       }
- 
-       sas_rphy_unlink(rphy);
--      if (rphy->q)
--              bsg_unregister_queue(rphy->q);
-+      bsg_remove_queue(rphy->q);
-       transport_remove_device(dev);
-       device_del(dev);
- }

diff --git a/queue-4.19/series b/queue-4.19/series
index 9bb7624b8bd4c0d49a5083badf3bb1572791e6af..fdc79108d388658e2f0be33a3bf28be4a9f09c65 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -94,7 +94,6 @@ scsi-esas2r-unlock-on-error-in-esas2r_nvram_read_direct.patch
 scsi-qla4xxx-fix-double-free-bug.patch
 scsi-bnx2i-fix-potential-use-after-free.patch
 scsi-target-core-fix-a-pr_debug-argument.patch
-scsi-scsi_transport_sas-fix-memory-leak-when-removing-devices.patch
 scsi-qla2xxx-fix-qla2x00_request_irqs-for-msi.patch
 scsi-qla2xxx-fix-rports-not-being-mark-as-lost-in-sync-fabric-scan.patch
 scsi-core-scsi_trace-use-get_unaligned_be.patch

diff --git a/queue-4.4/scsi-core-scsi_trace-use-get_unaligned_be.patch b/queue-4.4/scsi-core-scsi_trace-use-get_unaligned_be.patch
index 7f3782454f4a5f27171801789bd21cb90eba31d0..4f5cbc3d80453cc5b32220697a8ab16fa613a718 100644 (file)
--- a/queue-4.4/scsi-core-scsi_trace-use-get_unaligned_be.patch
+++ b/queue-4.4/scsi-core-scsi_trace-use-get_unaligned_be.patch
@@ -26,12 +26,16 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- drivers/scsi/scsi_trace.c |  103 ++++++++++++----------------------------------
- 1 file changed, 28 insertions(+), 75 deletions(-)
+ drivers/scsi/scsi_trace.c |  104 ++++++++++++----------------------------------
+ 1 file changed, 29 insertions(+), 75 deletions(-)
 
 --- a/drivers/scsi/scsi_trace.c
 +++ b/drivers/scsi/scsi_trace.c
-@@ -20,7 +20,7 @@
+@@ -17,10 +17,11 @@
+  */
+ #include <linux/kernel.h>
+ #include <linux/trace_seq.h>
++#include <asm/unaligned.h>
  #include <trace/events/scsi.h>
  
  #define SERVICE_ACTION16(cdb) (cdb[1] & 0x1f)
@@ -40,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  static const char *
  scsi_trace_misc(struct trace_seq *, unsigned char *, int);
-@@ -50,17 +50,12 @@ static const char *
+@@ -50,17 +51,12 @@ static const char *
  scsi_trace_rw10(struct trace_seq *p, unsigned char *cdb, int len)
  {
        const char *ret = trace_seq_buffer_ptr(p);
@@ -62,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                         cdb[1] >> 5);
  
        if (cdb[0] == WRITE_SAME)
-@@ -75,19 +70,12 @@ static const char *
+@@ -75,19 +71,12 @@ static const char *
  scsi_trace_rw12(struct trace_seq *p, unsigned char *cdb, int len)
  {
        const char *ret = trace_seq_buffer_ptr(p);
@@ -86,7 +90,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                         cdb[1] >> 5);
        trace_seq_putc(p, 0);
  
-@@ -98,23 +86,13 @@ static const char *
+@@ -98,23 +87,13 @@ static const char *
  scsi_trace_rw16(struct trace_seq *p, unsigned char *cdb, int len)
  {
        const char *ret = trace_seq_buffer_ptr(p);
@@ -115,7 +119,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                         cdb[1] >> 5);
  
        if (cdb[0] == WRITE_SAME_16)
-@@ -129,8 +107,8 @@ static const char *
+@@ -129,8 +108,8 @@ static const char *
  scsi_trace_rw32(struct trace_seq *p, unsigned char *cdb, int len)
  {
        const char *ret = trace_seq_buffer_ptr(p), *cmd;
@@ -126,7 +130,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        switch (SERVICE_ACTION32(cdb)) {
        case READ_32:
-@@ -150,26 +128,12 @@ scsi_trace_rw32(struct trace_seq *p, uns
+@@ -150,26 +129,12 @@ scsi_trace_rw32(struct trace_seq *p, uns
                goto out;
        }
  
@@ -159,7 +163,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        if (SERVICE_ACTION32(cdb) == WRITE_SAME_32)
                trace_seq_printf(p, " unmap=%u", cdb[10] >> 3 & 1);
-@@ -184,7 +148,7 @@ static const char *
+@@ -184,7 +149,7 @@ static const char *
  scsi_trace_unmap(struct trace_seq *p, unsigned char *cdb, int len)
  {
        const char *ret = trace_seq_buffer_ptr(p);
@@ -168,7 +172,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        trace_seq_printf(p, "regions=%u", (regions - 8) / 16);
        trace_seq_putc(p, 0);
-@@ -196,8 +160,8 @@ static const char *
+@@ -196,8 +161,8 @@ static const char *
  scsi_trace_service_action_in(struct trace_seq *p, unsigned char *cdb, int len)
  {
        const char *ret = trace_seq_buffer_ptr(p), *cmd;
@@ -179,7 +183,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        switch (SERVICE_ACTION16(cdb)) {
        case SAI_READ_CAPACITY_16:
-@@ -211,21 +175,10 @@ scsi_trace_service_action_in(struct trac
+@@ -211,21 +176,10 @@ scsi_trace_service_action_in(struct trac
                goto out;
        }