On Fri, Mar 23, 2018 at 09:49:51AM -0700, Steve Wise wrote:
> Provide a cxgb4-specific function to fill in qp state details.
> This allows dumping important c4iw_qp state useful for debugging.
>
> Included in the dump are the t4_sq, t4_rq structs, plus a dump
> of the t4_swsqe and t4swrqe descriptors for the first and last
> pending entries.
>
> Signed-off-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/infiniband/hw/cxgb4/Makefile | 3 +-
> drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 6 +
> drivers/infiniband/hw/cxgb4/provider.c | 9 +
> drivers/infiniband/hw/cxgb4/restrack.c | 363 +++++++++++++++++++++++++++++++++
> 4 files changed, 380 insertions(+), 1 deletion(-)
> create mode 100644 drivers/infiniband/hw/cxgb4/restrack.c
>
> diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile
> index fa40b68..9edd920 100644
> --- a/drivers/infiniband/hw/cxgb4/Makefile
> +++ b/drivers/infiniband/hw/cxgb4/Makefile
> @@ -3,4 +3,5 @@ ccflags-y += -Idrivers/net/ethernet/chelsio/libcxgb
>
> obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o
>
> -iw_cxgb4-y := device.o cm.o provider.o mem.o cq.o qp.o resource.o ev.o id_table.o
> +iw_cxgb4-y := device.o cm.o provider.o mem.o cq.o qp.o resource.o ev.o id_table.o \
> + restrack.o
> diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
> index cc92900..bbdc8dd 100644
> --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
> +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
> @@ -55,6 +55,7 @@
> #include <rdma/iw_cm.h>
> #include <rdma/rdma_netlink.h>
> #include <rdma/iw_portmap.h>
> +#include <rdma/restrack.h>
>
> #include "cxgb4.h"
> #include "cxgb4_uld.h"
> @@ -1078,4 +1079,9 @@ void __iomem *c4iw_bar2_addrs(struct c4iw_rdev *rdev, unsigned int qid,
> void c4iw_invalidate_mr(struct c4iw_dev *rhp, u32 rkey);
> struct c4iw_wr_wait *c4iw_alloc_wr_wait(gfp_t gfp);
>
> +typedef int c4iw_restrack_func(struct sk_buff *msg,
> + struct netlink_callback *cb,
> + struct rdma_restrack_entry *res);
> +extern c4iw_restrack_func *c4iw_restrack_funcs[RDMA_RESTRACK_MAX];
> +
> #endif
> diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
> index 0b9cc73..1dda32b 100644
> --- a/drivers/infiniband/hw/cxgb4/provider.c
> +++ b/drivers/infiniband/hw/cxgb4/provider.c
> @@ -551,6 +551,14 @@ static struct net_device *get_netdev(struct ib_device *dev, u8 port)
> return ndev;
> }
>
> +static int fill_res_entry(struct sk_buff *msg, struct netlink_callback *cb,
> + struct rdma_restrack_entry *res)
> +{
> + return (res->type < ARRAY_SIZE(c4iw_restrack_funcs) &&
> + c4iw_restrack_funcs[res->type]) ?
> + c4iw_restrack_funcs[res->type](msg, cb, res) : 0;
> +}
> +
> void c4iw_register_device(struct work_struct *work)
> {
> int ret;
> @@ -645,6 +653,7 @@ void c4iw_register_device(struct work_struct *work)
> dev->ibdev.iwcm->add_ref = c4iw_qp_add_ref;
> dev->ibdev.iwcm->rem_ref = c4iw_qp_rem_ref;
> dev->ibdev.iwcm->get_qp = c4iw_get_qp;
> + dev->ibdev.res.fill_res_entry = fill_res_entry;
> memcpy(dev->ibdev.iwcm->ifname, dev->rdev.lldi.ports[0]->name,
> sizeof(dev->ibdev.iwcm->ifname));
>
> diff --git a/drivers/infiniband/hw/cxgb4/restrack.c b/drivers/infiniband/hw/cxgb4/restrack.c
> new file mode 100644
> index 0000000..a67f509
> --- /dev/null
> +++ b/drivers/infiniband/hw/cxgb4/restrack.c
> @@ -0,0 +1,363 @@
> +/*
> + * Copyright (c) 2018 Chelsio, Inc. 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
> + * General Public License (GPL) Version 2, available from the file
> + * COPYING in the main directory of this source tree, or the
> + * OpenIB.org BSD license below:
> + *
> + * Redistribution and use in source and binary forms, with or
> + * without modification, are permitted provided that the following
> + * conditions are met:
> + *
> + * - Redistributions of source code must retain the above
> + * copyright notice, this list of conditions and the following
> + * disclaimer.
> + *
> + * - Redistributions in binary form must reproduce the above
> + * copyright notice, this list of conditions and the following
> + * disclaimer in the documentation and/or other materials
> + * provided with the distribution.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
> + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
> + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
> + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> + * SOFTWARE.
> + */
> +
> +#include "iw_cxgb4.h"
> +
> +static int fill_sq(struct sk_buff *msg, struct t4_wq *wq)
> +{
> + struct nlattr *entry_attr;
> +
> + /* WQ+SQ */
> + entry_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_PROVIDER_ENTRY);
> + if (!entry_attr)
> + goto err;
> +
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "sqid"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->sq.qid))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "flushed"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->flushed))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "memsize"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->sq.memsize))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "cidx"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->sq.cidx))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "pidx"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->sq.pidx))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "wq_pidx"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->sq.wq_pidx))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING,
> + "flush_cidx"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32,
> + wq->sq.flush_cidx))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "in_use"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->sq.in_use))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "size"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->sq.size))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "flags"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_X32, wq->sq.flags))
> + goto err_cancel_entry;
> +
> + nla_nest_end(msg, entry_attr);
> + return 0;
> +
> +err_cancel_entry:
> + nla_nest_cancel(msg, entry_attr);
> +err:
> + return -EMSGSIZE;
> +}
> +
> +static int fill_rq(struct sk_buff *msg, struct t4_wq *wq)
> +{
> + struct nlattr *entry_attr;
> +
> + /* RQ */
> + entry_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_PROVIDER_ENTRY);
> + if (!entry_attr)
> + goto err;
> +
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "rqid"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->rq.qid))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "memsize"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->rq.memsize))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "cidx"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->rq.cidx))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "pidx"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->rq.pidx))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "wq_pidx"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->rq.wq_pidx))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "msn"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->rq.msn))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING,
> + "rqt_hwaddr"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_X32,
> + wq->rq.rqt_hwaddr))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "rqt_size"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->rq.rqt_size))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "in_use"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->rq.in_use))
> + goto err_cancel_entry;
> + if (nla_put_string(msg, RDMA_NLDEV_ATTR_PROVIDER_STRING, "size"))
> + goto err_cancel_entry;
> + if (nla_put_u32(msg, RDMA_NLDEV_ATTR_PROVIDER_U32, wq->rq.size))
> + goto err_cancel_entry;
> +
> + nla_nest_end(msg, entry_attr);
> + return 0;
> +
> +err_cancel_entry:
> + nla_nest_cancel(msg, entry_attr);
> +err:
> + return -EMSGSIZE;
> +}
The above is perfect example of my claim that most of the date will be
simple u32 which is default in netlink. In such case, you won't need to
provide type identification at all.
Thanks
Attachment:
signature.asc
Description: PGP signature
