From 817f3d9614bd5de7a43c7cd7b36464b6ee928764 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 17 Jun 2018 21:28:55 +0200 Subject: [PATCH] drop 3.18.y ib patches --- ...ib-core-make-ib_mad_client_id-atomic.patch | 51 ------------------- ...e-infiniband_addr_trans-configurable.patch | 38 -------------- ..._srp-depend-on-infiniband_addr_trans.patch | 33 ------------ ...srpt-depend-on-infiniband_addr_trans.patch | 33 ------------ queue-3.18/series | 4 -- 5 files changed, 159 deletions(-) delete mode 100644 queue-3.18/ib-core-make-ib_mad_client_id-atomic.patch delete mode 100644 queue-3.18/ib-make-infiniband_addr_trans-configurable.patch delete mode 100644 queue-3.18/ib_srp-depend-on-infiniband_addr_trans.patch delete mode 100644 queue-3.18/ib_srpt-depend-on-infiniband_addr_trans.patch diff --git a/queue-3.18/ib-core-make-ib_mad_client_id-atomic.patch b/queue-3.18/ib-core-make-ib_mad_client_id-atomic.patch deleted file mode 100644 index b0779f9cadc..00000000000 --- a/queue-3.18/ib-core-make-ib_mad_client_id-atomic.patch +++ /dev/null @@ -1,51 +0,0 @@ -From foo@baz Sun Jun 17 13:19:44 CEST 2018 -From: "Håkon Bugge" -Date: Wed, 18 Apr 2018 16:24:50 +0200 -Subject: IB/core: Make ib_mad_client_id atomic - -From: "Håkon Bugge" - -[ Upstream commit db82476f37413eaeff5f836a9d8b022d6544accf ] - -Currently, the kernel protects access to the agent ID allocator on a per -port basis using a spinlock, so it is impossible for two apps/threads on -the same port to get the same TID, but it is entirely possible for two -threads on different ports to end up with the same TID. - -As this can be confusing (regardless of it being legal according to the -IB Spec 1.3, C13-18.1.1, in section 13.4.6.4 - TransactionID usage), -and as the rdma-core user space API for /dev/umad devices implies unique -TIDs even across ports, make the TID an atomic type so that no two -allocations, regardless of port number, will be the same. - -Signed-off-by: HÃ¥kon Bugge -Reviewed-by: Jack Morgenstein -Reviewed-by: Ira Weiny -Reviewed-by: Zhu Yanjun -Signed-off-by: Doug Ledford -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/infiniband/core/mad.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/infiniband/core/mad.c -+++ b/drivers/infiniband/core/mad.c -@@ -62,7 +62,7 @@ MODULE_PARM_DESC(recv_queue_size, "Size - static struct kmem_cache *ib_mad_cache; - - static struct list_head ib_mad_port_list; --static u32 ib_mad_client_id = 0; -+static atomic_t ib_mad_client_id = ATOMIC_INIT(0); - - /* Port list lock */ - static DEFINE_SPINLOCK(ib_mad_port_list_lock); -@@ -376,7 +376,7 @@ struct ib_mad_agent *ib_register_mad_age - init_completion(&mad_agent_priv->comp); - - spin_lock_irqsave(&port_priv->reg_lock, flags); -- mad_agent_priv->agent.hi_tid = ++ib_mad_client_id; -+ mad_agent_priv->agent.hi_tid = atomic_inc_return(&ib_mad_client_id); - - /* - * Make sure MAD registration (if supplied) diff --git a/queue-3.18/ib-make-infiniband_addr_trans-configurable.patch b/queue-3.18/ib-make-infiniband_addr_trans-configurable.patch deleted file mode 100644 index dfab60c32c0..00000000000 --- a/queue-3.18/ib-make-infiniband_addr_trans-configurable.patch +++ /dev/null @@ -1,38 +0,0 @@ -From foo@baz Sun Jun 17 13:19:44 CEST 2018 -From: Greg Thelen -Date: Thu, 26 Apr 2018 11:19:35 -0700 -Subject: IB: make INFINIBAND_ADDR_TRANS configurable - -From: Greg Thelen - -[ Upstream commit f7cb7b85be55a4906b4b4b30596db1043dae6335 ] - -Allow INFINIBAND without INFINIBAND_ADDR_TRANS because fuzzing has been -finding fair number of CM bugs. So provide option to disable it. - -Signed-off-by: Greg Thelen -Cc: Tarick Bedeir -Reviewed-by: Bart Van Assche -Signed-off-by: Doug Ledford -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/infiniband/Kconfig | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/infiniband/Kconfig -+++ b/drivers/infiniband/Kconfig -@@ -39,9 +39,12 @@ config INFINIBAND_USER_MEM - default y - - config INFINIBAND_ADDR_TRANS -- bool -+ bool "RDMA/CM" - depends on INFINIBAND - default y -+ ---help--- -+ Support for RDMA communication manager (CM). -+ This allows for a generic connection abstraction over RDMA. - - source "drivers/infiniband/hw/mthca/Kconfig" - source "drivers/infiniband/hw/ipath/Kconfig" diff --git a/queue-3.18/ib_srp-depend-on-infiniband_addr_trans.patch b/queue-3.18/ib_srp-depend-on-infiniband_addr_trans.patch deleted file mode 100644 index 4e6d611b848..00000000000 --- a/queue-3.18/ib_srp-depend-on-infiniband_addr_trans.patch +++ /dev/null @@ -1,33 +0,0 @@ -From foo@baz Sun Jun 17 13:19:44 CEST 2018 -From: Greg Thelen -Date: Thu, 26 Apr 2018 11:19:34 -0700 -Subject: ib_srp: depend on INFINIBAND_ADDR_TRANS - -From: Greg Thelen - -[ Upstream commit 5a3bc8a4abbd2d553430218d3a320400dce811b7 ] - -INFINIBAND_SRP code depends on INFINIBAND_ADDR_TRANS provided symbols. -So declare the kconfig dependency. This is necessary to allow for -enabling INFINIBAND without INFINIBAND_ADDR_TRANS. - -Signed-off-by: Greg Thelen -Cc: Tarick Bedeir -Reviewed-by: Bart Van Assche -Signed-off-by: Doug Ledford -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/infiniband/ulp/srp/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/infiniband/ulp/srp/Kconfig -+++ b/drivers/infiniband/ulp/srp/Kconfig -@@ -1,6 +1,6 @@ - config INFINIBAND_SRP - tristate "InfiniBand SCSI RDMA Protocol" -- depends on SCSI -+ depends on SCSI && INFINIBAND_ADDR_TRANS - select SCSI_SRP_ATTRS - ---help--- - Support for the SCSI RDMA Protocol over InfiniBand. This diff --git a/queue-3.18/ib_srpt-depend-on-infiniband_addr_trans.patch b/queue-3.18/ib_srpt-depend-on-infiniband_addr_trans.patch deleted file mode 100644 index d8bdef429ab..00000000000 --- a/queue-3.18/ib_srpt-depend-on-infiniband_addr_trans.patch +++ /dev/null @@ -1,33 +0,0 @@ -From foo@baz Sun Jun 17 13:19:44 CEST 2018 -From: Greg Thelen -Date: Thu, 26 Apr 2018 11:19:32 -0700 -Subject: ib_srpt: depend on INFINIBAND_ADDR_TRANS - -From: Greg Thelen - -[ Upstream commit 346a47b65d10e450778ec0d21e4a9409f25daaa8 ] - -INFINIBAND_SRPT code depends on INFINIBAND_ADDR_TRANS provided symbols. -So declare the kconfig dependency. This is necessary to allow for -enabling INFINIBAND without INFINIBAND_ADDR_TRANS. - -Signed-off-by: Greg Thelen -Cc: Tarick Bedeir -Reviewed-by: Bart Van Assche -Signed-off-by: Doug Ledford -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/infiniband/ulp/srpt/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/infiniband/ulp/srpt/Kconfig -+++ b/drivers/infiniband/ulp/srpt/Kconfig -@@ -1,6 +1,6 @@ - config INFINIBAND_SRPT - tristate "InfiniBand SCSI RDMA Protocol target support" -- depends on INFINIBAND && TARGET_CORE -+ depends on INFINIBAND && INFINIBAND_ADDR_TRANS && TARGET_CORE - ---help--- - - Support for the SCSI RDMA Protocol (SRP) Target driver. The diff --git a/queue-3.18/series b/queue-3.18/series index b5b85f40b82..841beaca217 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -15,10 +15,6 @@ selftests-ftrace-add-a-testcase-for-multiple-actions-on-trigger.patch rds-ib-fix-missing-call-to-rds_ib_dev_put-in-rds_ib_setup_qp.patch x86-cpu-intel-add-missing-tlb-cpuid-values.patch bpf-fix-uninitialized-variable-in-bpf-tools.patch -ib_srpt-depend-on-infiniband_addr_trans.patch -ib_srp-depend-on-infiniband_addr_trans.patch -ib-make-infiniband_addr_trans-configurable.patch -ib-core-make-ib_mad_client_id-atomic.patch arm-davinci-board-dm355-evm-fix-broken-networking.patch hexagon-add-memset_io-helper.patch hexagon-export-csum_partial_copy_nocheck.patch -- 2.47.3