Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55cbdaf6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull rdma fixes from Doug Ledford:
 "For the most part this is just a minor -rc cycle for the rdma
  subsystem. Even given that this is all of the -rc patches since the
  merge window closed, it's still only about 25 patches:

   - Multiple i40iw, nes, iw_cxgb4, hfi1, qib, mlx4, mlx5 fixes

   - A few upper layer protocol fixes (IPoIB, iSER, SRP)

   - A modest number of core fixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (26 commits)
  RDMA/SA: Fix kernel panic in CMA request handler flow
  RDMA/umem: Fix missing mmap_sem in get umem ODP call
  RDMA/core: not to set page dirty bit if it's already set.
  RDMA/uverbs: Declare local function static and add brackets to sizeof
  RDMA/netlink: Reduce exposure of RDMA netlink functions
  RDMA/srp: Fix NULL deref at srp_destroy_qp()
  RDMA/IPoIB: Limit the ipoib_dev_uninit_default scope
  RDMA/IPoIB: Replace netdev_priv with ipoib_priv for ipoib_get_link_ksettings
  RDMA/qedr: add null check before pointer dereference
  RDMA/mlx5: set UMR wqe fence according to HCA cap
  net/mlx5: Define interface bits for fencing UMR wqe
  RDMA/mlx4: Fix MAD tunneling when SRIOV is enabled
  RDMA/qib,hfi1: Fix MR reference count leak on write with immediate
  RDMA/hfi1: Defer setting VL15 credits to link-up interrupt
  RDMA/hfi1: change PCI bar addr assignments to Linux API functions
  RDMA/hfi1: fix array termination by appending NULL to attr array
  RDMA/iw_cxgb4: fix the calculation of ipv6 header size
  RDMA/iw_cxgb4: calculate t4_eq_status_entries properly
  RDMA/iw_cxgb4: Avoid touch after free error in ARP failure handlers
  RDMA/nes: ACK MPA Reply frame
  ...
parents ea094f3c d3957b86

drivers/infiniband/core/cm.c

+2 −2
Original line number Diff line number Diff line
@@ -1429,7 +1429,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg, 
	primary_path->packet_life_time =

		cm_req_get_primary_local_ack_timeout(req_msg);

	primary_path->packet_life_time -= (primary_path->packet_life_time > 0);

	sa_path_set_service_id(primary_path, req_msg->service_id);

	primary_path->service_id = req_msg->service_id;



	if (req_msg->alt_local_lid) {

		alt_path->dgid = req_msg->alt_local_gid;
@@ -1452,7 +1452,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg, 
		alt_path->packet_life_time =

			cm_req_get_alt_local_ack_timeout(req_msg);

		alt_path->packet_life_time -= (alt_path->packet_life_time > 0);

		sa_path_set_service_id(alt_path, req_msg->service_id);

		alt_path->service_id = req_msg->service_id;

	}

}

drivers/infiniband/core/cma.c

+6 −7
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ static void cma_save_ib_info(struct sockaddr *src_addr, 
			ib->sib_pkey = path->pkey;

			ib->sib_flowinfo = path->flow_label;

			memcpy(&ib->sib_addr, &path->sgid, 16);

			ib->sib_sid = sa_path_get_service_id(path);

			ib->sib_sid = path->service_id;

			ib->sib_scope_id = 0;

		} else {

			ib->sib_pkey = listen_ib->sib_pkey;
@@ -1274,8 +1274,7 @@ static int cma_save_req_info(const struct ib_cm_event *ib_event, 
		memcpy(&req->local_gid, &req_param->primary_path->sgid,

		       sizeof(req->local_gid));

		req->has_gid	= true;

		req->service_id	=

			sa_path_get_service_id(req_param->primary_path);

		req->service_id = req_param->primary_path->service_id;

		req->pkey	= be16_to_cpu(req_param->primary_path->pkey);

		if (req->pkey != req_param->bth_pkey)

			pr_warn_ratelimited("RDMA CMA: got different BTH P_Key (0x%x) and primary path P_Key (0x%x)\n"
@@ -1827,7 +1826,8 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id, 
	struct rdma_route *rt;

	const sa_family_t ss_family = listen_id->route.addr.src_addr.ss_family;

	struct sa_path_rec *path = ib_event->param.req_rcvd.primary_path;

	const __be64 service_id = sa_path_get_service_id(path);

	const __be64 service_id =

		ib_event->param.req_rcvd.primary_path->service_id;

	int ret;



	id = rdma_create_id(listen_id->route.addr.dev_addr.net,
@@ -2345,9 +2345,8 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms, 
	path_rec.pkey = cpu_to_be16(ib_addr_get_pkey(dev_addr));

	path_rec.numb_path = 1;

	path_rec.reversible = 1;

	sa_path_set_service_id(&path_rec,

			       rdma_get_service_id(&id_priv->id,

						   cma_dst_addr(id_priv)));

	path_rec.service_id = rdma_get_service_id(&id_priv->id,

						  cma_dst_addr(id_priv));



	comp_mask = IB_SA_PATH_REC_DGID | IB_SA_PATH_REC_SGID |

		    IB_SA_PATH_REC_PKEY | IB_SA_PATH_REC_NUMB_PATH |

drivers/infiniband/core/core_priv.h

+10 −0
Original line number Diff line number Diff line
@@ -169,6 +169,16 @@ void ib_mad_cleanup(void); 
int ib_sa_init(void);

void ib_sa_cleanup(void);



int ibnl_init(void);

void ibnl_cleanup(void);



/**

 * Check if there are any listeners to the netlink group

 * @group: the netlink group ID

 * Returns 0 on success or a negative for no listeners.

 */

int ibnl_chk_listeners(unsigned int group);



int ib_nl_handle_resolve_resp(struct sk_buff *skb,

			      struct netlink_callback *cb);

int ib_nl_handle_set_timeout(struct sk_buff *skb,

drivers/infiniband/core/netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <net/net_namespace.h>

#include <net/sock.h>

#include <rdma/rdma_netlink.h>

#include "core_priv.h"



struct ibnl_client {

	struct list_head		list;
@@ -55,7 +56,6 @@ int ibnl_chk_listeners(unsigned int group) 
		return -1;

	return 0;

}

EXPORT_SYMBOL(ibnl_chk_listeners);



int ibnl_add_client(int index, int nops,

		    const struct ibnl_client_cbs cb_table[])

drivers/infiniband/core/sa_query.c

+3 −3
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static u32 tid; 
	.field_name          = "sa_path_rec:" #field



static const struct ib_field path_rec_table[] = {

	{ PATH_REC_FIELD(ib.service_id),

	{ PATH_REC_FIELD(service_id),

	  .offset_words = 0,

	  .offset_bits  = 0,

	  .size_bits    = 64 },
@@ -296,7 +296,7 @@ static const struct ib_field path_rec_table[] = { 
	.field_name          = "sa_path_rec:" #field



static const struct ib_field opa_path_rec_table[] = {

	{ OPA_PATH_REC_FIELD(opa.service_id),

	{ OPA_PATH_REC_FIELD(service_id),

	  .offset_words = 0,

	  .offset_bits  = 0,

	  .size_bits    = 64 },
@@ -774,7 +774,7 @@ static void ib_nl_set_path_rec_attrs(struct sk_buff *skb, 


	/* Now build the attributes */

	if (comp_mask & IB_SA_PATH_REC_SERVICE_ID) {

		val64 = be64_to_cpu(sa_path_get_service_id(sa_rec));

		val64 = be64_to_cpu(sa_rec->service_id);

		nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_SERVICE_ID,

			sizeof(val64), &val64);

	}