> diff --git a/drivers/infiniband/core/agent.c
> b/drivers/infiniband/core/agent.c
> index b6bd305..18275a5 100644
> --- a/drivers/infiniband/core/agent.c
> +++ b/drivers/infiniband/core/agent.c
> @@ -80,13 +80,17 @@ ib_get_agent_port(struct ib_device *device, int
> port_num)
>
> void agent_send_response(struct ib_mad *mad, struct ib_grh *grh,
> struct ib_wc *wc, struct ib_device *device,
> - int port_num, int qpn)
> + int port_num, int qpn, u32 resp_mad_len,
> + int opa)
Can't OPA support be determined by looking at the device structure?
> {
> struct ib_agent_port_private *port_priv;
> struct ib_mad_agent *agent;
> struct ib_mad_send_buf *send_buf;
> struct ib_ah *ah;
> + size_t data_len;
> + size_t hdr_len;
> struct ib_mad_send_wr_private *mad_send_wr;
> + u8 base_version;
>
> if (device->node_type == RDMA_NODE_IB_SWITCH)
> port_priv = ib_get_agent_port(device, 0);
> @@ -106,16 +110,29 @@ void agent_send_response(struct ib_mad *mad, struct
> ib_grh *grh,
> return;
> }
>
> + /* base version determines MAD size */
> + base_version = mad->mad_hdr.base_version;
> + if (opa && base_version == OPA_MGMT_BASE_VERSION) {
> + data_len = resp_mad_len - JUMBO_MGMT_MAD_HDR;
> + hdr_len = JUMBO_MGMT_MAD_HDR;
> + } else {
> + data_len = IB_MGMT_MAD_DATA;
> + hdr_len = IB_MGMT_MAD_HDR;
> + }
I _think_ this can be simplified to:
hdr_len = IB_MGMT_MAD_HDR;
data_len = resp_mad_len - hdr_len;
IB should set resp_mad_len = 256 in all cases.
> +
> send_buf = ib_create_send_mad(agent, wc->src_qp, wc->pkey_index, 0,
> - IB_MGMT_MAD_HDR, IB_MGMT_MAD_DATA,
> - GFP_KERNEL,
> - IB_MGMT_BASE_VERSION);
> + hdr_len, data_len, GFP_KERNEL,
> + base_version);
> if (IS_ERR(send_buf)) {
> dev_err(&device->dev, "ib_create_send_mad error\n");
> goto err1;
> }
>
> - memcpy(send_buf->mad, mad, sizeof *mad);
> + if (opa && base_version == OPA_MGMT_BASE_VERSION)
> + memcpy(send_buf->mad, mad, JUMBO_MGMT_MAD_HDR + data_len);
> + else
> + memcpy(send_buf->mad, mad, sizeof(*mad));
And this may be able to be simplified to:
memcpy(send_buf->mad, mad, resp_mad_len);
> +
> send_buf->ah = ah;
>
> if (device->node_type == RDMA_NODE_IB_SWITCH) {
> diff --git a/drivers/infiniband/core/agent.h
> b/drivers/infiniband/core/agent.h
> index 6669287..1dee837 100644
> --- a/drivers/infiniband/core/agent.h
> +++ b/drivers/infiniband/core/agent.h
> @@ -46,6 +46,7 @@ extern int ib_agent_port_close(struct ib_device *device,
> int port_num);
>
> extern void agent_send_response(struct ib_mad *mad, struct ib_grh *grh,
> struct ib_wc *wc, struct ib_device *device,
> - int port_num, int qpn);
> + int port_num, int qpn, u32 resp_mad_len,
> + int opa);
>
> #endif /* __AGENT_H_ */
> diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
> index 5aefe4c..9b7dc36 100644
> --- a/drivers/infiniband/core/mad.c
> +++ b/drivers/infiniband/core/mad.c
> @@ -3,6 +3,7 @@
> * Copyright (c) 2005 Intel Corporation. All rights reserved.
> * Copyright (c) 2005 Mellanox Technologies Ltd. All rights reserved.
> * Copyright (c) 2009 HNR Consulting. All rights reserved.
> + * Copyright (c) 2014 Intel Corporation. All rights reserved.
> *
> * This software is available to you under a choice of one of two
> * licenses. You may choose to be licensed under the terms of the GNU
> @@ -44,6 +45,7 @@
> #include "mad_priv.h"
> #include "mad_rmpp.h"
> #include "smi.h"
> +#include "opa_smi.h"
> #include "agent.h"
>
> MODULE_LICENSE("Dual BSD/GPL");
> @@ -733,6 +735,7 @@ static int handle_outgoing_dr_smp(struct
> ib_mad_agent_private *mad_agent_priv,
> {
> int ret = 0;
> struct ib_smp *smp = mad_send_wr->send_buf.mad;
> + struct opa_smp *opa_smp = (struct opa_smp *)smp;
> unsigned long flags;
> struct ib_mad_local_private *local;
> struct ib_mad_private *mad_priv;
> @@ -744,6 +747,9 @@ static int handle_outgoing_dr_smp(struct
> ib_mad_agent_private *mad_agent_priv,
> struct ib_send_wr *send_wr = &mad_send_wr->send_wr;
> size_t in_mad_size = mad_agent_priv->agent.device-
> >cached_dev_attrs.max_mad_size;
> size_t out_mad_size;
> + u16 drslid;
> + int opa = mad_agent_priv->qp_info->qp->device-
> >cached_dev_attrs.device_cap_flags2 &
> + IB_DEVICE_OPA_MAD_SUPPORT;
>
> if (device->node_type == RDMA_NODE_IB_SWITCH &&
> smp->mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)
> @@ -757,13 +763,36 @@ static int handle_outgoing_dr_smp(struct
> ib_mad_agent_private *mad_agent_priv,
> * If we are at the start of the LID routed part, don't update the
> * hop_ptr or hop_cnt. See section 14.2.2, Vol 1 IB spec.
> */
> - 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) ==
> - IB_SMI_DISCARD) {
> - ret = -EINVAL;
> - dev_err(&device->dev, "Invalid directed route\n");
> - goto out;
> + if (opa && smp->class_version == OPA_SMP_CLASS_VERSION) {
There are several places where this sort of check is made. IMO, this check should only require looking at the MAD, not the MAD + the device attributes that the MAD will be transferred on. I would actually prefer to see this as:
if (smp->class_version == OPA_SMP_CLASS_VERSION)
That check is sufficient. There is no conflict with IB MADs, and it's needlessly complicates the code to assume that the IBTA is going to someday define another 128 class versions in such a way that those versions will not require any other changes to the code.
> + u32 opa_drslid;
> + 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,
> + port_num) == IB_SMI_DISCARD) {
> + ret = -EINVAL;
> + dev_err(&device->dev, "OPA Invalid directed route\n");
> + goto out;
> + }
> + opa_drslid = be32_to_cpu(opa_smp->route.dr.dr_slid);
> + if (opa_drslid != OPA_LID_PERMISSIVE &&
> + opa_drslid & 0xffff0000) {
> + ret = -EINVAL;
> + dev_err(&device->dev, "OPA Invalid dr_slid 0x%x\n",
> + opa_drslid);
> + goto out;
> + }
> + drslid = (u16)(opa_drslid & 0x0000ffff);
> + } 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)
> ==
> + IB_SMI_DISCARD) {
> + ret = -EINVAL;
> + dev_err(&device->dev, "Invalid directed route\n");
> + goto out;
> + }
> + drslid = be16_to_cpu(smp->dr_slid);
> }
>
> /* Check to post send on QP or process locally */
> @@ -789,10 +818,16 @@ static int handle_outgoing_dr_smp(struct
> ib_mad_agent_private *mad_agent_priv,
> }
>
> build_smp_wc(mad_agent_priv->agent.qp,
> - send_wr->wr_id, be16_to_cpu(smp->dr_slid),
> + send_wr->wr_id, drslid,
> send_wr->wr.ud.pkey_index,
> send_wr->wr.ud.port_num, &mad_wc);
>
> + if (opa && smp->base_version == OPA_MGMT_BASE_VERSION) {
> + mad_wc.byte_len = mad_send_wr->send_buf.hdr_len
> + + mad_send_wr->send_buf.data_len
> + + sizeof(struct ib_grh);
> + }
> +
> /* No GRH for DR SMP */
> ret = device->process_mad(device, 0, port_num, &mad_wc, NULL,
> (struct ib_mad_hdr *)smp, in_mad_size,
> @@ -821,7 +856,10 @@ static int handle_outgoing_dr_smp(struct
> ib_mad_agent_private *mad_agent_priv,
> port_priv = ib_get_mad_port(mad_agent_priv->agent.device,
> mad_agent_priv->agent.port_num);
> if (port_priv) {
> - memcpy(&mad_priv->mad.mad, smp, sizeof(struct ib_mad));
> + if (opa && smp->base_version == OPA_MGMT_BASE_VERSION)
> + memcpy(&mad_priv->mad.mad, smp, sizeof(struct
> jumbo_mad));
> + else
> + memcpy(&mad_priv->mad.mad, smp, sizeof(struct
> ib_mad));
> recv_mad_agent = find_mad_agent(port_priv,
> &mad_priv->mad.mad);
> }
> @@ -844,6 +882,8 @@ static int handle_outgoing_dr_smp(struct
> ib_mad_agent_private *mad_agent_priv,
> }
>
> local->mad_send_wr = mad_send_wr;
> + local->mad_send_wr->send_wr.wr.ud.pkey_index = mad_wc.pkey_index;
> + local->return_wc_byte_len = out_mad_size;
> /* Reference MAD agent until send side of local completion handled
> */
> atomic_inc(&mad_agent_priv->refcount);
> /* Queue local completion to local list */
> @@ -1737,14 +1777,18 @@ out:
> return mad_agent;
> }
>
> -static int validate_mad(struct ib_mad_hdr *mad_hdr, u32 qp_num)
> +static int validate_mad(struct ib_mad_hdr *mad_hdr,
> + struct ib_mad_qp_info *qp_info,
> + int opa)
I'm not a fan of having an 'opa' integer passed around to a bunch of functions. This can be determined through the qp_info parameter.
> {
> int valid = 0;
> + u32 qp_num = qp_info->qp->qp_num;
Am I missing where this is used?
>
> /* Make sure MAD base version is understood */
> - if (mad_hdr->base_version != IB_MGMT_BASE_VERSION) {
> - pr_err("MAD received with unsupported base version %d\n",
> - mad_hdr->base_version);
> + if (mad_hdr->base_version != IB_MGMT_BASE_VERSION &&
> + (!opa || mad_hdr->base_version != OPA_MGMT_BASE_VERSION)) {
> + pr_err("MAD received with unsupported base version %d %s\n",
> + mad_hdr->base_version, opa ? "(opa)" : "");
> goto out;
> }
>
> @@ -1844,18 +1888,18 @@ ib_find_send_mad(struct ib_mad_agent_private
> *mad_agent_priv,
> struct ib_mad_recv_wc *wc)
> {
> struct ib_mad_send_wr_private *wr;
> - struct ib_mad *mad;
> + struct ib_mad_hdr *mad_hdr;
>
> - mad = (struct ib_mad *)wc->recv_buf.mad;
> + mad_hdr = (struct ib_mad_hdr *)wc->recv_buf.mad;
>
> list_for_each_entry(wr, &mad_agent_priv->wait_list, agent_list) {
> - if ((wr->tid == mad->mad_hdr.tid) &&
> + if ((wr->tid == mad_hdr->tid) &&
> rcv_has_same_class(wr, wc) &&
> /*
> * Don't check GID for direct routed MADs.
> * These might have permissive LIDs.
> */
> - (is_direct(wc->recv_buf.mad->mad_hdr.mgmt_class) ||
> + (is_direct(mad_hdr->mgmt_class) ||
> rcv_has_same_gid(mad_agent_priv, wr, wc)))
> return (wr->status == IB_WC_SUCCESS) ? wr : NULL;
> }
> @@ -1866,14 +1910,14 @@ ib_find_send_mad(struct ib_mad_agent_private
> *mad_agent_priv,
> */
> list_for_each_entry(wr, &mad_agent_priv->send_list, agent_list) {
> if (is_rmpp_data_mad(mad_agent_priv, wr->send_buf.mad) &&
> - wr->tid == mad->mad_hdr.tid &&
> + wr->tid == mad_hdr->tid &&
> wr->timeout &&
> rcv_has_same_class(wr, wc) &&
> /*
> * Don't check GID for direct routed MADs.
> * These might have permissive LIDs.
> */
> - (is_direct(wc->recv_buf.mad->mad_hdr.mgmt_class) ||
> + (is_direct(mad_hdr->mgmt_class) ||
> rcv_has_same_gid(mad_agent_priv, wr, wc)))
> /* Verify request has not been canceled */
> return (wr->status == IB_WC_SUCCESS) ? wr : NULL;
The updates to the two functions above can be pulled out into a separate commit.
> @@ -1889,7 +1933,7 @@ void ib_mark_mad_done(struct ib_mad_send_wr_private
> *mad_send_wr)
> &mad_send_wr->mad_agent_priv->done_list);
> }
>
> -static void ib_mad_complete_recv(struct ib_mad_agent_private
> *mad_agent_priv,
> +void ib_mad_complete_recv(struct ib_mad_agent_private *mad_agent_priv,
> struct ib_mad_recv_wc *mad_recv_wc)
> {
> struct ib_mad_send_wr_private *mad_send_wr;
> @@ -1992,7 +2036,9 @@ enum smi_action handle_ib_smi(struct
> ib_mad_port_private *port_priv,
> &response->grh, wc,
> port_priv->device,
> smi_get_fwd_port(&recv->mad.smp),
> - qp_info->qp->qp_num);
> + qp_info->qp->qp_num,
> + sizeof(struct ib_mad),
> + 0);
>
> return IB_SMI_DISCARD;
> }
> @@ -2005,7 +2051,9 @@ static size_t mad_recv_buf_size(struct ib_device
> *dev)
> }
>
> static bool generate_unmatched_resp(struct ib_mad_private *recv,
> - struct ib_mad_private *response)
> + struct ib_mad_private *response,
> + size_t *resp_len,
> + int opa)
> {
> if (recv->mad.mad.mad_hdr.method == IB_MGMT_METHOD_GET ||
> recv->mad.mad.mad_hdr.method == IB_MGMT_METHOD_SET) {
> @@ -2019,29 +2067,103 @@ static bool generate_unmatched_resp(struct
> ib_mad_private *recv,
> if (recv->mad.mad.mad_hdr.mgmt_class ==
> IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)
> response->mad.mad.mad_hdr.status |= IB_SMP_DIRECTION;
>
> + if (opa && recv->mad.mad.mad_hdr.base_version ==
> OPA_MGMT_BASE_VERSION) {
> + if (recv->mad.mad.mad_hdr.mgmt_class ==
> + IB_MGMT_CLASS_SUBN_LID_ROUTED ||
> + recv->mad.mad.mad_hdr.mgmt_class ==
> + IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)
> + *resp_len = opa_get_smp_header_size(
> + (struct opa_smp *)&recv-
> >mad.smp);
> + else
> + *resp_len = sizeof(struct ib_mad_hdr);
> + }
> +
A local variable mad_hdr = &recv->mad.mad.mad_hdr may help with the readability of this function.
> return true;
> } else {
> return false;
> }
> }
> +
> +static enum smi_action
> +handle_opa_smi(struct ib_mad_port_private *port_priv,
> + struct ib_mad_qp_info *qp_info,
> + struct ib_wc *wc,
> + int port_num,
> + struct ib_mad_private *recv,
> + struct ib_mad_private *response)
> +{
> + enum smi_forward_action retsmi;
> +
> + if (opa_smi_handle_dr_smp_recv(&recv->mad.opa_smp,
> + port_priv->device->node_type,
> + port_num,
> + port_priv->device->phys_port_cnt) ==
> + IB_SMI_DISCARD)
> + return IB_SMI_DISCARD;
> +
> + retsmi = opa_smi_check_forward_dr_smp(&recv->mad.opa_smp);
> + if (retsmi == IB_SMI_LOCAL)
> + return IB_SMI_HANDLE;
> +
> + if (retsmi == IB_SMI_SEND) { /* don't forward */
> + if (opa_smi_handle_dr_smp_send(&recv->mad.opa_smp,
> + port_priv->device->node_type,
> + port_num) == IB_SMI_DISCARD)
> + return IB_SMI_DISCARD;
> +
> + if (opa_smi_check_local_smp(&recv->mad.opa_smp, port_priv-
> >device) == IB_SMI_DISCARD)
> + return IB_SMI_DISCARD;
> +
> + } else if (port_priv->device->node_type == RDMA_NODE_IB_SWITCH) {
> + /* forward case for switches */
> + memcpy(response, recv, sizeof(*response));
> + response->header.recv_wc.wc = &response->header.wc;
> + response->header.recv_wc.recv_buf.jumbo_mad = &response-
> >mad.jumbo_mad;
> + response->header.recv_wc.recv_buf.grh = &response->grh;
> +
> + agent_send_response((struct ib_mad *)&response->mad.mad,
> + &response->grh, wc,
> + port_priv->device,
> + opa_smi_get_fwd_port(&recv->mad.opa_smp),
> + qp_info->qp->qp_num,
> + recv->header.wc.byte_len,
> + 1);
> +
> + return IB_SMI_DISCARD;
> + }
> +
> + return IB_SMI_HANDLE;
> +}
> +
> +static enum smi_action
> +handle_smi(struct ib_mad_port_private *port_priv,
> + struct ib_mad_qp_info *qp_info,
> + struct ib_wc *wc,
> + int port_num,
> + struct ib_mad_private *recv,
> + struct ib_mad_private *response,
> + int opa)
> +{
> + if (opa && recv->mad.mad.mad_hdr.base_version ==
> OPA_MGMT_BASE_VERSION &&
> + recv->mad.mad.mad_hdr.class_version == OPA_SMI_CLASS_VERSION)
> + return handle_opa_smi(port_priv, qp_info, wc, port_num, recv,
> response);
> +
> + return handle_ib_smi(port_priv, qp_info, wc, port_num, recv,
> response);
> +}
> +
> static void ib_mad_recv_done_handler(struct ib_mad_port_private
> *port_priv,
> - struct ib_wc *wc)
> + struct ib_wc *wc,
> + struct ib_mad_private_header *mad_priv_hdr,
> + struct ib_mad_qp_info *qp_info)
> {
> - struct ib_mad_qp_info *qp_info;
> - struct ib_mad_private_header *mad_priv_hdr;
> struct ib_mad_private *recv, *response = NULL;
> - struct ib_mad_list_head *mad_list;
> struct ib_mad_agent_private *mad_agent;
> int port_num;
> int ret = IB_MAD_RESULT_SUCCESS;
> size_t resp_mad_size;
> + int opa = qp_info->qp->device->cached_dev_attrs.device_cap_flags2 &
> + IB_DEVICE_OPA_MAD_SUPPORT;
>
> - mad_list = (struct ib_mad_list_head *)(unsigned long)wc->wr_id;
> - qp_info = mad_list->mad_queue->qp_info;
> - dequeue_mad(mad_list);
> -
> - mad_priv_hdr = container_of(mad_list, struct ib_mad_private_header,
> - mad_list);
> recv = container_of(mad_priv_hdr, struct ib_mad_private, header);
> ib_dma_unmap_single(port_priv->device,
> recv->header.mapping,
> @@ -2051,7 +2173,13 @@ static void ib_mad_recv_done_handler(struct
> ib_mad_port_private *port_priv,
> /* Setup MAD receive work completion from "normal" work completion
> */
> recv->header.wc = *wc;
> recv->header.recv_wc.wc = &recv->header.wc;
> - recv->header.recv_wc.mad_len = sizeof(struct ib_mad);
> + if (opa && recv->mad.mad.mad_hdr.base_version ==
> OPA_MGMT_BASE_VERSION) {
> + recv->header.recv_wc.mad_len = wc->byte_len - sizeof(struct
> ib_grh);
Can this logic to set mad_len be used for both OPA and IB?
> + recv->header.recv_wc.mad_seg_size = sizeof(struct jumbo_mad);
> + } else {
> + recv->header.recv_wc.mad_len = sizeof(struct ib_mad);
> + recv->header.recv_wc.mad_seg_size = sizeof(struct ib_mad);
> + }
> recv->header.recv_wc.recv_buf.mad = &recv->mad.mad;
> recv->header.recv_wc.recv_buf.grh = &recv->grh;
>
> @@ -2059,7 +2187,7 @@ static void ib_mad_recv_done_handler(struct
> ib_mad_port_private *port_priv,
> snoop_recv(qp_info, &recv->header.recv_wc,
> IB_MAD_SNOOP_RECVS);
>
> /* Validate MAD */
> - if (!validate_mad(&recv->mad.mad.mad_hdr, qp_info->qp->qp_num))
> + if (!validate_mad(&recv->mad.mad.mad_hdr, qp_info, opa))
> goto out;
>
> response = alloc_mad_priv(port_priv->device, &resp_mad_size);
> @@ -2076,8 +2204,7 @@ static void ib_mad_recv_done_handler(struct
> ib_mad_port_private *port_priv,
>
> if (recv->mad.mad.mad_hdr.mgmt_class ==
> IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) {
> - if (handle_ib_smi(port_priv, qp_info, wc, port_num, recv,
> - response)
> + if (handle_smi(port_priv, qp_info, wc, port_num, recv,
> response, opa)
> == IB_SMI_DISCARD)
> goto out;
> }
> @@ -2099,7 +2226,9 @@ static void ib_mad_recv_done_handler(struct
> ib_mad_port_private *port_priv,
> &recv->grh, wc,
> port_priv->device,
> port_num,
> - qp_info->qp->qp_num);
> + qp_info->qp->qp_num,
> + resp_mad_size,
> + opa);
> goto out;
> }
> }
> @@ -2114,9 +2243,12 @@ static void ib_mad_recv_done_handler(struct
> ib_mad_port_private *port_priv,
> */
> recv = NULL;
> } else if ((ret & IB_MAD_RESULT_SUCCESS) &&
> - generate_unmatched_resp(recv, response)) {
> + generate_unmatched_resp(recv, response, &resp_mad_size,
> opa)) {
> agent_send_response(&response->mad.mad, &recv->grh, wc,
> - port_priv->device, port_num, qp_info->qp-
> >qp_num);
> + port_priv->device, port_num,
> + qp_info->qp->qp_num,
> + resp_mad_size,
> + opa);
> }
>
> out:
> @@ -2381,6 +2513,23 @@ static void mad_error_handler(struct
> ib_mad_port_private *port_priv,
> }
> }
>
> +static void ib_mad_recv_mad(struct ib_mad_port_private *port_priv,
> + struct ib_wc *wc)
> +{
> + struct ib_mad_qp_info *qp_info;
> + struct ib_mad_list_head *mad_list;
> + struct ib_mad_private_header *mad_priv_hdr;
> +
> + mad_list = (struct ib_mad_list_head *)(unsigned long)wc->wr_id;
> + qp_info = mad_list->mad_queue->qp_info;
> + dequeue_mad(mad_list);
> +
> + mad_priv_hdr = container_of(mad_list, struct ib_mad_private_header,
> + mad_list);
> +
> + ib_mad_recv_done_handler(port_priv, wc, mad_priv_hdr, qp_info);
> +}
> +
> /*
> * IB MAD completion callback
> */
> @@ -2399,7 +2548,7 @@ static void ib_mad_completion_handler(struct
> work_struct *work)
> ib_mad_send_done_handler(port_priv, &wc);
> break;
> case IB_WC_RECV:
> - ib_mad_recv_done_handler(port_priv, &wc);
> + ib_mad_recv_mad(port_priv, &wc);
> break;
> default:
> BUG_ON(1);
> @@ -2518,10 +2667,14 @@ static void local_completions(struct work_struct
> *work)
> int free_mad;
> struct ib_wc wc;
> struct ib_mad_send_wc mad_send_wc;
> + int opa;
>
> mad_agent_priv =
> container_of(work, struct ib_mad_agent_private, local_work);
>
> + opa = mad_agent_priv->qp_info->qp->device-
> >cached_dev_attrs.device_cap_flags2 &
> + IB_DEVICE_OPA_MAD_SUPPORT;
> +
> spin_lock_irqsave(&mad_agent_priv->lock, flags);
> while (!list_empty(&mad_agent_priv->local_list)) {
> local = list_entry(mad_agent_priv->local_list.next,
> @@ -2531,6 +2684,7 @@ static void local_completions(struct work_struct
> *work)
> spin_unlock_irqrestore(&mad_agent_priv->lock, flags);
> free_mad = 0;
> if (local->mad_priv) {
> + u8 base_version;
> recv_mad_agent = local->recv_mad_agent;
> if (!recv_mad_agent) {
> dev_err(&mad_agent_priv->agent.device->dev,
> @@ -2546,11 +2700,20 @@ static void local_completions(struct work_struct
> *work)
> build_smp_wc(recv_mad_agent->agent.qp,
> (unsigned long) local->mad_send_wr,
> be16_to_cpu(IB_LID_PERMISSIVE),
> - 0, recv_mad_agent->agent.port_num, &wc);
> + local->mad_send_wr->send_wr.wr.ud.pkey_index,
> + recv_mad_agent->agent.port_num, &wc);
>
> local->mad_priv->header.recv_wc.wc = &wc;
> - local->mad_priv->header.recv_wc.mad_len =
> - sizeof(struct ib_mad);
> +
> + base_version = local->mad_priv-
> >mad.mad.mad_hdr.base_version;
> + if (opa && base_version == OPA_MGMT_BASE_VERSION) {
Okay, how about having something like this?
int is_opa_mad(struct ib_mad_private *mad_priv)
that returns true if the MAD is a new OPA MAD
> + local->mad_priv->header.recv_wc.mad_len = local-
> >return_wc_byte_len;
The mad_len calculation seems like it should be the same in all cases.
> + local->mad_priv->header.recv_wc.mad_seg_size =
> sizeof(struct jumbo_mad);
> + } else {
> + local->mad_priv->header.recv_wc.mad_len =
> sizeof(struct ib_mad);
> + local->mad_priv->header.recv_wc.mad_seg_size =
> sizeof(struct ib_mad);
> + }
> +
> INIT_LIST_HEAD(&local->mad_priv-
> >header.recv_wc.rmpp_list);
> list_add(&local->mad_priv->header.recv_wc.recv_buf.list,
> &local->mad_priv->header.recv_wc.rmpp_list);
> @@ -2699,7 +2862,7 @@ static int ib_mad_post_receive_mads(struct
> ib_mad_qp_info *qp_info,
> struct ib_mad_queue *recv_queue = &qp_info->recv_queue;
>
> /* Initialize common scatter list fields */
> - sg_list.length = sizeof *mad_priv - sizeof mad_priv->header;
> + sg_list.length = mad_recv_buf_size(qp_info->port_priv->device);
> sg_list.lkey = (*qp_info->port_priv->mr).lkey;
>
> /* Initialize common receive WR fields */
> diff --git a/drivers/infiniband/core/mad_priv.h
> b/drivers/infiniband/core/mad_priv.h
> index 141b05a..dd42ace 100644
> --- a/drivers/infiniband/core/mad_priv.h
> +++ b/drivers/infiniband/core/mad_priv.h
> @@ -154,6 +154,7 @@ struct ib_mad_local_private {
> struct ib_mad_private *mad_priv;
> struct ib_mad_agent_private *recv_mad_agent;
> struct ib_mad_send_wr_private *mad_send_wr;
> + size_t return_wc_byte_len;
> };
>
> struct ib_mad_mgmt_method_table {
> diff --git a/drivers/infiniband/core/mad_rmpp.c
> b/drivers/infiniband/core/mad_rmpp.c
> index 7184530..6f69d5a 100644
> --- a/drivers/infiniband/core/mad_rmpp.c
> +++ b/drivers/infiniband/core/mad_rmpp.c
> @@ -1,6 +1,7 @@
> /*
> * Copyright (c) 2005 Intel Inc. All rights reserved.
> * Copyright (c) 2005-2006 Voltaire, Inc. All rights reserved.
> + * Copyright (c) 2014 Intel Corporation. All rights reserved.
> *
> * This software is available to you under a choice of one of two
> * licenses. You may choose to be licensed under the terms of the GNU
> @@ -67,6 +68,7 @@ struct mad_rmpp_recv {
> u8 mgmt_class;
> u8 class_version;
> u8 method;
> + u8 base_version;
You're not really caring about the base version, right? You really just want to know if this is an OPA MAD.
> };
>
> static inline void deref_rmpp_recv(struct mad_rmpp_recv *rmpp_recv)
> @@ -318,6 +320,7 @@ create_rmpp_recv(struct ib_mad_agent_private *agent,
> rmpp_recv->mgmt_class = mad_hdr->mgmt_class;
> rmpp_recv->class_version = mad_hdr->class_version;
> rmpp_recv->method = mad_hdr->method;
> + rmpp_recv->base_version = mad_hdr->base_version;
> return rmpp_recv;
>
> error: kfree(rmpp_recv);
> @@ -431,16 +434,25 @@ static void update_seg_num(struct mad_rmpp_recv
> *rmpp_recv,
>
> static inline int get_mad_len(struct mad_rmpp_recv *rmpp_recv)
> {
> - struct ib_rmpp_mad *rmpp_mad;
> + struct ib_rmpp_base *rmpp_base;
> int hdr_size, data_size, pad;
> + int opa = rmpp_recv->agent->qp_info->qp->device-
> >cached_dev_attrs.device_cap_flags2 &
> + IB_DEVICE_OPA_MAD_SUPPORT;
>
> - rmpp_mad = (struct ib_rmpp_mad *)rmpp_recv->cur_seg_buf->mad;
> + rmpp_base = (struct ib_rmpp_base *)rmpp_recv->cur_seg_buf->mad;
>
> - hdr_size = ib_get_mad_data_offset(rmpp_mad-
> >base.mad_hdr.mgmt_class);
> - data_size = sizeof(struct ib_rmpp_mad) - hdr_size;
> - pad = IB_MGMT_RMPP_DATA - be32_to_cpu(rmpp_mad-
> >base.rmpp_hdr.paylen_newwin);
> - if (pad > IB_MGMT_RMPP_DATA || pad < 0)
> - pad = 0;
> + hdr_size = ib_get_mad_data_offset(rmpp_base->mad_hdr.mgmt_class);
> + if (opa && rmpp_recv->base_version == OPA_MGMT_BASE_VERSION) {
> + data_size = sizeof(struct jumbo_rmpp_mad) - hdr_size;
> + pad = JUMBO_MGMT_RMPP_DATA - be32_to_cpu(rmpp_base-
> >rmpp_hdr.paylen_newwin);
> + if (pad > JUMBO_MGMT_RMPP_DATA || pad < 0)
> + pad = 0;
> + } else {
> + data_size = sizeof(struct ib_rmpp_mad) - hdr_size;
> + pad = IB_MGMT_RMPP_DATA - be32_to_cpu(rmpp_base-
> >rmpp_hdr.paylen_newwin);
> + if (pad > IB_MGMT_RMPP_DATA || pad < 0)
> + pad = 0;
> + }
>
> return hdr_size + rmpp_recv->seg_num * data_size - pad;
> }
> @@ -933,11 +945,11 @@ int ib_process_rmpp_send_wc(struct
> ib_mad_send_wr_private *mad_send_wr,
>
> int ib_retry_rmpp(struct ib_mad_send_wr_private *mad_send_wr)
> {
> - struct ib_rmpp_base *rmpp_base;
> + struct ib_rmpp_mad *rmpp_mad;
> int ret;
>
> - rmpp_base = mad_send_wr->send_buf.mad;
> - if (!(ib_get_rmpp_flags(&rmpp_base->rmpp_hdr) &
> + rmpp_mad = mad_send_wr->send_buf.mad;
> + if (!(ib_get_rmpp_flags(&rmpp_mad->base.rmpp_hdr) &
> IB_MGMT_RMPP_FLAG_ACTIVE))
> return IB_RMPP_RESULT_UNHANDLED; /* RMPP not active */
>
> diff --git a/drivers/infiniband/core/user_mad.c
> b/drivers/infiniband/core/user_mad.c
> index ac33d34..1192f6c 100644
> --- a/drivers/infiniband/core/user_mad.c
> +++ b/drivers/infiniband/core/user_mad.c
> @@ -263,20 +263,23 @@ static ssize_t copy_recv_mad(struct ib_umad_file
> *file, char __user *buf,
> {
> struct ib_mad_recv_buf *recv_buf;
> int left, seg_payload, offset, max_seg_payload;
> + size_t seg_size;
>
> - /* We need enough room to copy the first (or only) MAD segment. */
> recv_buf = &packet->recv_wc->recv_buf;
> - if ((packet->length <= sizeof (*recv_buf->mad) &&
> + seg_size = packet->recv_wc->mad_seg_size;
> +
> + /* We need enough room to copy the first (or only) MAD segment. */
> + if ((packet->length <= seg_size &&
> count < hdr_size(file) + packet->length) ||
> - (packet->length > sizeof (*recv_buf->mad) &&
> - count < hdr_size(file) + sizeof (*recv_buf->mad)))
> + (packet->length > seg_size &&
> + count < hdr_size(file) + seg_size))
> return -EINVAL;
>
> if (copy_to_user(buf, &packet->mad, hdr_size(file)))
> return -EFAULT;
>
> buf += hdr_size(file);
> - seg_payload = min_t(int, packet->length, sizeof (*recv_buf->mad));
> + seg_payload = min_t(int, packet->length, seg_size);
> if (copy_to_user(buf, recv_buf->mad, seg_payload))
> return -EFAULT;
>
> @@ -293,7 +296,7 @@ static ssize_t copy_recv_mad(struct ib_umad_file
> *file, char __user *buf,
> return -ENOSPC;
> }
> offset = ib_get_mad_data_offset(recv_buf->mad-
> >mad_hdr.mgmt_class);
> - max_seg_payload = sizeof (struct ib_mad) - offset;
> + max_seg_payload = seg_size - offset;
>
> for (left = packet->length - seg_payload, buf += seg_payload;
> left; left -= seg_payload, buf += seg_payload) {
> @@ -448,9 +451,10 @@ static ssize_t ib_umad_write(struct file *filp, const
> char __user *buf,
> struct ib_mad_agent *agent;
> struct ib_ah_attr ah_attr;
> struct ib_ah *ah;
> - struct ib_rmpp_base *rmpp_base;
> + struct ib_rmpp_mad *rmpp_mad;
> __be64 *tid;
> int ret, data_len, hdr_len, copy_offset, rmpp_active;
> + u8 base_version;
>
> if (count < hdr_size(file) + IB_MGMT_RMPP_HDR)
> return -EINVAL;
> @@ -504,25 +508,26 @@ static ssize_t ib_umad_write(struct file *filp,
> const char __user *buf,
> goto err_up;
> }
>
> - rmpp_base = (struct ib_rmpp_base *) packet->mad.data;
> - hdr_len = ib_get_mad_data_offset(rmpp_base->mad_hdr.mgmt_class);
> + rmpp_mad = (struct ib_rmpp_mad *) packet->mad.data;
> + hdr_len = ib_get_mad_data_offset(rmpp_mad->base.mad_hdr.mgmt_class);
>
> - if (ib_is_mad_class_rmpp(rmpp_base->mad_hdr.mgmt_class)
> + if (ib_is_mad_class_rmpp(rmpp_mad->base.mad_hdr.mgmt_class)
> && ib_mad_kernel_rmpp_agent(agent)) {
> copy_offset = IB_MGMT_RMPP_HDR;
> - rmpp_active = ib_get_rmpp_flags(&rmpp_base->rmpp_hdr) &
> + rmpp_active = ib_get_rmpp_flags(&rmpp_mad->base.rmpp_hdr) &
> IB_MGMT_RMPP_FLAG_ACTIVE;
> } else {
> copy_offset = IB_MGMT_MAD_HDR;
> rmpp_active = 0;
> }
>
> + base_version = ((struct ib_mad_hdr *)&packet->mad.data)-
> >base_version;
> data_len = count - hdr_size(file) - hdr_len;
> packet->msg = ib_create_send_mad(agent,
> be32_to_cpu(packet->mad.hdr.qpn),
> packet->mad.hdr.pkey_index, rmpp_active,
> hdr_len, data_len, GFP_KERNEL,
> - IB_MGMT_BASE_VERSION);
> + base_version);
> if (IS_ERR(packet->msg)) {
> ret = PTR_ERR(packet->msg);
> goto err_ah;
> @@ -558,12 +563,12 @@ static ssize_t ib_umad_write(struct file *filp,
> const char __user *buf,
> tid = &((struct ib_mad_hdr *) packet->msg->mad)->tid;
> *tid = cpu_to_be64(((u64) agent->hi_tid) << 32 |
> (be64_to_cpup(tid) & 0xffffffff));
> - rmpp_base->mad_hdr.tid = *tid;
> + rmpp_mad->base.mad_hdr.tid = *tid;
> }
>
> if (!ib_mad_kernel_rmpp_agent(agent)
> - && ib_is_mad_class_rmpp(rmpp_base->mad_hdr.mgmt_class)
> - && (ib_get_rmpp_flags(&rmpp_base->rmpp_hdr) &
> IB_MGMT_RMPP_FLAG_ACTIVE)) {
> + && ib_is_mad_class_rmpp(rmpp_mad->base.mad_hdr.mgmt_class)
> + && (ib_get_rmpp_flags(&rmpp_mad->base.rmpp_hdr) &
> IB_MGMT_RMPP_FLAG_ACTIVE)) {
> spin_lock_irq(&file->send_lock);
> list_add_tail(&packet->list, &file->send_list);
> spin_unlock_irq(&file->send_lock);
> diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h
> index 8938f1e..f5b6a27 100644
> --- a/include/rdma/ib_mad.h
> +++ b/include/rdma/ib_mad.h
> @@ -436,6 +436,7 @@ struct ib_mad_recv_buf {
> * @recv_buf: Specifies the location of the received data buffer(s).
> * @rmpp_list: Specifies a list of RMPP reassembled received MAD buffers.
> * @mad_len: The length of the received MAD, without duplicated headers.
> + * @mad_seg_size: The size of individual MAD segments
> *
> * For received response, the wr_id contains a pointer to the
> ib_mad_send_buf
> * for the corresponding send request.
> @@ -445,6 +446,7 @@ struct ib_mad_recv_wc {
> struct ib_mad_recv_buf recv_buf;
> struct list_head rmpp_list;
> int mad_len;
> + size_t mad_seg_size;
> };
>
> /**
> --
> 1.8.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
