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

Commit 4139032b authored by Hal Rosenstock's avatar Hal Rosenstock Committed by Doug Ledford
Browse files

IB: Add rdma_cap_ib_switch helper and use where appropriate 



Persuant to Liran's comments on node_type on linux-rdma
mailing list:

In an effort to reform the RDMA core and ULPs to minimize use of
node_type in struct ib_device, an additional bit is added to
struct ib_device for is_switch (IB switch). This is needed
to be initialized by any IB switch device driver. This is a
NEW requirement on such device drivers which are all
"out of tree".

In addition, an ib_switch helper was added to ib_verbs.h
based on the is_switch device bit rather than node_type
(although those should be consistent).

The RDMA core (MAD, SMI, agent, sa_query, multicast, sysfs)
as well as (IPoIB and SRP) ULPs are updated where
appropriate to use this new helper. In some cases,
the helper is now used under the covers of using
rdma_[start end]_port rather than the open coding
previously used.

Reviewed-by: default avatarSean Hefty <sean.hefty@intel.com>
Reviewed-By: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Tested-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarHal Rosenstock <hal@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent bc0195aa

drivers/infiniband/core/agent.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void agent_send_response(const struct ib_mad_hdr *mad_hdr, const struct ib_grh * 
	struct ib_ah *ah;

	struct ib_mad_send_wr_private *mad_send_wr;



	if (device->node_type == RDMA_NODE_IB_SWITCH)

	if (rdma_cap_ib_switch(device))

		port_priv = ib_get_agent_port(device, 0);

	else

		port_priv = ib_get_agent_port(device, port_num);
@@ -122,7 +122,7 @@ void agent_send_response(const struct ib_mad_hdr *mad_hdr, const struct ib_grh * 
	memcpy(send_buf->mad, mad_hdr, resp_mad_len);

	send_buf->ah = ah;



	if (device->node_type == RDMA_NODE_IB_SWITCH) {

	if (rdma_cap_ib_switch(device)) {

		mad_send_wr = container_of(send_buf,

					   struct ib_mad_send_wr_private,

					   send_buf);

drivers/infiniband/core/mad.c

+16 −29
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, 
	bool opa = rdma_cap_opa_mad(mad_agent_priv->qp_info->port_priv->device,

				    mad_agent_priv->qp_info->port_priv->port_num);



	if (device->node_type == RDMA_NODE_IB_SWITCH &&

	if (rdma_cap_ib_switch(device) &&

	    smp->mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)

		port_num = send_wr->wr.ud.port_num;

	else
@@ -787,7 +787,8 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, 
		if ((opa_get_smp_direction(opa_smp)

		     ? opa_smp->route.dr.dr_dlid : opa_smp->route.dr.dr_slid) ==

		     OPA_LID_PERMISSIVE &&

		     opa_smi_handle_dr_smp_send(opa_smp, device->node_type,

		     opa_smi_handle_dr_smp_send(opa_smp,

						rdma_cap_ib_switch(device),

						port_num) == IB_SMI_DISCARD) {

			ret = -EINVAL;

			dev_err(&device->dev, "OPA Invalid directed route\n");
@@ -810,7 +811,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, 
	} else {

		if ((ib_get_smp_direction(smp) ? smp->dr_dlid : smp->dr_slid) ==

		     IB_LID_PERMISSIVE &&

		     smi_handle_dr_smp_send(smp, device->node_type, port_num) ==

		     smi_handle_dr_smp_send(smp, rdma_cap_ib_switch(device), port_num) ==

		     IB_SMI_DISCARD) {

			ret = -EINVAL;

			dev_err(&device->dev, "Invalid directed route\n");
@@ -2030,7 +2031,7 @@ static enum smi_action handle_ib_smi(const struct ib_mad_port_private *port_priv 
	struct ib_smp *smp = (struct ib_smp *)recv->mad;



	if (smi_handle_dr_smp_recv(smp,

				   port_priv->device->node_type,

				   rdma_cap_ib_switch(port_priv->device),

				   port_num,

				   port_priv->device->phys_port_cnt) ==

				   IB_SMI_DISCARD)
@@ -2042,13 +2043,13 @@ static enum smi_action handle_ib_smi(const struct ib_mad_port_private *port_priv 


	if (retsmi == IB_SMI_SEND) { /* don't forward */

		if (smi_handle_dr_smp_send(smp,

					   port_priv->device->node_type,

					   rdma_cap_ib_switch(port_priv->device),

					   port_num) == IB_SMI_DISCARD)

			return IB_SMI_DISCARD;



		if (smi_check_local_smp(smp, port_priv->device) == IB_SMI_DISCARD)

			return IB_SMI_DISCARD;

	} else if (port_priv->device->node_type == RDMA_NODE_IB_SWITCH) {

	} else if (rdma_cap_ib_switch(port_priv->device)) {

		/* forward case for switches */

		memcpy(response, recv, mad_priv_size(response));

		response->header.recv_wc.wc = &response->header.wc;
@@ -2115,7 +2116,7 @@ handle_opa_smi(struct ib_mad_port_private *port_priv, 
	struct opa_smp *smp = (struct opa_smp *)recv->mad;



	if (opa_smi_handle_dr_smp_recv(smp,

				   port_priv->device->node_type,

				   rdma_cap_ib_switch(port_priv->device),

				   port_num,

				   port_priv->device->phys_port_cnt) ==

				   IB_SMI_DISCARD)
@@ -2127,7 +2128,7 @@ handle_opa_smi(struct ib_mad_port_private *port_priv, 


	if (retsmi == IB_SMI_SEND) { /* don't forward */

		if (opa_smi_handle_dr_smp_send(smp,

					   port_priv->device->node_type,

					   rdma_cap_ib_switch(port_priv->device),

					   port_num) == IB_SMI_DISCARD)

			return IB_SMI_DISCARD;
@@ -2135,7 +2136,7 @@ handle_opa_smi(struct ib_mad_port_private *port_priv, 
		    IB_SMI_DISCARD)

			return IB_SMI_DISCARD;



	} else if (port_priv->device->node_type == RDMA_NODE_IB_SWITCH) {

	} else if (rdma_cap_ib_switch(port_priv->device)) {

		/* forward case for switches */

		memcpy(response, recv, mad_priv_size(response));

		response->header.recv_wc.wc = &response->header.wc;
@@ -2235,7 +2236,7 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv, 
		goto out;

	}



	if (port_priv->device->node_type == RDMA_NODE_IB_SWITCH)

	if (rdma_cap_ib_switch(port_priv->device))

		port_num = wc->port_num;

	else

		port_num = port_priv->port_num;
@@ -3297,17 +3298,11 @@ static int ib_mad_port_close(struct ib_device *device, int port_num) 


static void ib_mad_init_device(struct ib_device *device)

{

	int start, end, i;

	int start, i;



	if (device->node_type == RDMA_NODE_IB_SWITCH) {

		start = 0;

		end   = 0;

	} else {

		start = 1;

		end   = device->phys_port_cnt;

	}

	start = rdma_start_port(device);



	for (i = start; i <= end; i++) {

	for (i = start; i <= rdma_end_port(device); i++) {

		if (!rdma_cap_ib_mad(device, i))

			continue;
@@ -3342,17 +3337,9 @@ static void ib_mad_init_device(struct ib_device *device) 


static void ib_mad_remove_device(struct ib_device *device)

{

	int start, end, i;



	if (device->node_type == RDMA_NODE_IB_SWITCH) {

		start = 0;

		end   = 0;

	} else {

		start = 1;

		end   = device->phys_port_cnt;

	}

	int i;



	for (i = start; i <= end; i++) {

	for (i = rdma_start_port(device); i <= rdma_end_port(device); i++) {

		if (!rdma_cap_ib_mad(device, i))

			continue;

drivers/infiniband/core/multicast.c

+2 −6
Original line number Diff line number Diff line
@@ -812,12 +812,8 @@ static void mcast_add_one(struct ib_device *device) 
	if (!dev)

		return;



	if (device->node_type == RDMA_NODE_IB_SWITCH)

		dev->start_port = dev->end_port = 0;

	else {

		dev->start_port = 1;

		dev->end_port = device->phys_port_cnt;

	}

	dev->start_port = rdma_start_port(device);

	dev->end_port = rdma_end_port(device);



	for (i = 0; i <= dev->end_port - dev->start_port; i++) {

		if (!rdma_cap_ib_mcast(device, dev->start_port + i))

drivers/infiniband/core/opa_smi.h

+2 −2
Original line number Diff line number Diff line
@@ -39,12 +39,12 @@ 


#include "smi.h"



enum smi_action opa_smi_handle_dr_smp_recv(struct opa_smp *smp, u8 node_type,

enum smi_action opa_smi_handle_dr_smp_recv(struct opa_smp *smp, bool is_switch,

				       int port_num, int phys_port_cnt);

int opa_smi_get_fwd_port(struct opa_smp *smp);

extern enum smi_forward_action opa_smi_check_forward_dr_smp(struct opa_smp *smp);

extern enum smi_action opa_smi_handle_dr_smp_send(struct opa_smp *smp,

					      u8 node_type, int port_num);

					      bool is_switch, int port_num);



/*

 * Return IB_SMI_HANDLE if the SMP should be handled by the local SMA/SM

drivers/infiniband/core/sa_query.c

+2 −6
Original line number Diff line number Diff line
@@ -1156,12 +1156,8 @@ static void ib_sa_add_one(struct ib_device *device) 
	int s, e, i;

	int count = 0;



	if (device->node_type == RDMA_NODE_IB_SWITCH)

		s = e = 0;

	else {

		s = 1;

		e = device->phys_port_cnt;

	}

	s = rdma_start_port(device);

	e = rdma_end_port(device);



	sa_dev = kzalloc(sizeof *sa_dev +

			 (e - s + 1) * sizeof (struct ib_sa_port),