On Sun, Mar 25, 2018 at 08:53:49AM -0500, Steve Wise wrote:
> >
> > On Fri, Mar 23, 2018 at 09:49:39AM -0700, Steve Wise wrote:
> > > Each provider can register a "fill entry" function with the restrack
> core.
> > > This function will be called when filling out a resource, allowing the
> > > provider to add provider-specific details. The details consist of a
> > > table of nested attributes, that are in the form of "key, value" tuple.
> > > The key nlattr must be strings, and the value nlattr can be one of
> > > provider attributes that are generic, but typed, allowing the nlmessage
> > > to ve validated. Currently the types include string, s32, u32, x32,
> s64,
> > > u64, and x64. The inclusion of x, s, and u variants for numeric
> attributes
> > > allows the user tool to print the number in the desired format.
> > >
> > > More attrs can be defined as they become needed by providers.
> > >
> > > Signed-off-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
> > > ---
> > > drivers/infiniband/core/nldev.c | 39
> > +++++++++++++++++++++++++++++++++++++++
> > > include/rdma/restrack.h | 10 ++++++++++
> > > include/uapi/rdma/rdma_netlink.h | 16 ++++++++++++++++
> > > 3 files changed, 65 insertions(+)
> > >
> > > diff --git a/drivers/infiniband/core/nldev.c
> > b/drivers/infiniband/core/nldev.c
> > > index 884843e..8346ede 100644
> > > --- a/drivers/infiniband/core/nldev.c
> > > +++ b/drivers/infiniband/core/nldev.c
> > > @@ -95,8 +95,27 @@
> > > [RDMA_NLDEV_ATTR_RES_PD_ENTRY] = { .type =
> > NLA_NESTED },
> > > [RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY] = { .type = NLA_U32 },
> > > [RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY] = { .type =
> > NLA_U32 },
> > > + [RDMA_NLDEV_ATTR_PROVIDER] = { .type =
> > NLA_NESTED },
> > > + [RDMA_NLDEV_ATTR_PROVIDER_ENTRY] = { .type =
> > NLA_NESTED },
> > > + [RDMA_NLDEV_ATTR_PROVIDER_STRING] = { .type =
> > NLA_NUL_STRING,
> > > + .len =
> > RDMA_NLDEV_ATTR_PROVIDER_STRLEN },
> > > + [RDMA_NLDEV_ATTR_PROVIDER_D32] = { .type = NLA_S32 },
> > > + [RDMA_NLDEV_ATTR_PROVIDER_U32] = { .type = NLA_U32 },
> > > + [RDMA_NLDEV_ATTR_PROVIDER_X32] = { .type = NLA_U32 },
> > > + [RDMA_NLDEV_ATTR_PROVIDER_D64] = { .type = NLA_S64 },
> > > + [RDMA_NLDEV_ATTR_PROVIDER_U64] = { .type = NLA_U64 },
> > > + [RDMA_NLDEV_ATTR_PROVIDER_X64] = { .type = NLA_U64 },
> > > };
> > >
> > > +static int provider_fill_res_entry(struct rdma_restrack_root *resroot,
> > > + struct sk_buff *msg,
> > > + struct netlink_callback *cb,
> > > + struct rdma_restrack_entry *res)
> > > +{
> > > + return resroot->fill_res_entry ?
> > > + resroot->fill_res_entry(msg, cb, res) : 0;
> > > +}
> > > +
> > > static int fill_nldev_handle(struct sk_buff *msg, struct ib_device
> *device)
> > > {
> > > if (nla_put_u32(msg, RDMA_NLDEV_ATTR_DEV_INDEX, device-
> > >index))
> > > @@ -264,6 +283,7 @@ static int fill_res_qp_entry(struct sk_buff *msg,
> > struct netlink_callback *cb,
> > > struct rdma_restrack_entry *res, uint32_t port)
> > > {
> > > struct ib_qp *qp = container_of(res, struct ib_qp, res);
> > > + struct rdma_restrack_root *resroot = &qp->device->res;
> > > struct ib_qp_init_attr qp_init_attr;
> > > struct nlattr *entry_attr;
> > > struct ib_qp_attr qp_attr;
> > > @@ -313,6 +333,9 @@ static int fill_res_qp_entry(struct sk_buff *msg,
> > struct netlink_callback *cb,
> > > if (fill_res_name_pid(msg, res))
> > > goto err;
> > >
> > > + if (provider_fill_res_entry(resroot, msg, cb, res))
> > > + goto err;
> > > +
> > > nla_nest_end(msg, entry_attr);
> > > return 0;
> > >
> > > @@ -328,6 +351,7 @@ static int fill_res_cm_id_entry(struct sk_buff *msg,
> > > {
> > > struct rdma_id_private *id_priv =
> > > container_of(res, struct rdma_id_private,
> > res);
> > > + struct rdma_restrack_root *resroot = &id_priv->id.device->res;
> > > struct rdma_cm_id *cm_id = &id_priv->id;
> > > struct nlattr *entry_attr;
> > >
> > > @@ -369,6 +393,9 @@ static int fill_res_cm_id_entry(struct sk_buff *msg,
> > > if (fill_res_name_pid(msg, res))
> > > goto err;
> > >
> > > + if (provider_fill_res_entry(resroot, msg, cb, res))
> > > + goto err;
> > > +
> > > nla_nest_end(msg, entry_attr);
> > > return 0;
> > >
> > > @@ -382,6 +409,7 @@ static int fill_res_cq_entry(struct sk_buff *msg,
> > struct netlink_callback *cb,
> > > struct rdma_restrack_entry *res, uint32_t port)
> > > {
> > > struct ib_cq *cq = container_of(res, struct ib_cq, res);
> > > + struct rdma_restrack_root *resroot = &cq->device->res;
> > > struct nlattr *entry_attr;
> > >
> > > entry_attr = nla_nest_start(msg,
> > RDMA_NLDEV_ATTR_RES_CQ_ENTRY);
> > > @@ -402,6 +430,9 @@ static int fill_res_cq_entry(struct sk_buff *msg,
> > struct netlink_callback *cb,
> > > if (fill_res_name_pid(msg, res))
> > > goto err;
> > >
> > > + if (provider_fill_res_entry(resroot, msg, cb, res))
> > > + goto err;
> > > +
> > > nla_nest_end(msg, entry_attr);
> > > return 0;
> > >
> > > @@ -415,6 +446,7 @@ static int fill_res_mr_entry(struct sk_buff *msg,
> > struct netlink_callback *cb,
> > > struct rdma_restrack_entry *res, uint32_t port)
> > > {
> > > struct ib_mr *mr = container_of(res, struct ib_mr, res);
> > > + struct rdma_restrack_root *resroot = &mr->pd->device->res;
> > > struct nlattr *entry_attr;
> > >
> > > entry_attr = nla_nest_start(msg,
> > RDMA_NLDEV_ATTR_RES_MR_ENTRY);
> > > @@ -438,6 +470,9 @@ static int fill_res_mr_entry(struct sk_buff *msg,
> > struct netlink_callback *cb,
> > > if (fill_res_name_pid(msg, res))
> > > goto err;
> > >
> > > + if (provider_fill_res_entry(resroot, msg, cb, res))
> > > + goto err;
> > > +
> > > nla_nest_end(msg, entry_attr);
> > > return 0;
> > >
> > > @@ -451,6 +486,7 @@ static int fill_res_pd_entry(struct sk_buff *msg,
> > struct netlink_callback *cb,
> > > struct rdma_restrack_entry *res, uint32_t port)
> > > {
> > > struct ib_pd *pd = container_of(res, struct ib_pd, res);
> > > + struct rdma_restrack_root *resroot = &pd->device->res;
> > > struct nlattr *entry_attr;
> > >
> > > entry_attr = nla_nest_start(msg,
> > RDMA_NLDEV_ATTR_RES_PD_ENTRY);
> > > @@ -477,6 +513,9 @@ static int fill_res_pd_entry(struct sk_buff *msg,
> > struct netlink_callback *cb,
> > > if (fill_res_name_pid(msg, res))
> > > goto err;
> > >
> > > + if (provider_fill_res_entry(resroot, msg, cb, res))
> > > + goto err;
> > > +
> > > nla_nest_end(msg, entry_attr);
> > > return 0;
> > >
> > > diff --git a/include/rdma/restrack.h b/include/rdma/restrack.h
> > > index f3b3e35..bd3cd9a 100644
> > > --- a/include/rdma/restrack.h
> > > +++ b/include/rdma/restrack.h
> > > @@ -44,6 +44,8 @@ enum rdma_restrack_type {
> > > };
> > >
> > > #define RDMA_RESTRACK_HASH_BITS 8
> > > +struct rdma_restrack_entry;
> > > +
> > > /**
> > > * struct rdma_restrack_root - main resource tracking management
> > > * entity, per-device
> > > @@ -57,6 +59,14 @@ struct rdma_restrack_root {
> > > * @hash: global database for all resources per-device
> > > */
> > > DECLARE_HASHTABLE(hash, RDMA_RESTRACK_HASH_BITS);
> > > + /**
> > > + * @fill_res_entry: provider-specific fill function
> > > + *
> > > + * Allows rdma providers to add their own restrack attributes.
> > > + */
> > > + int (*fill_res_entry)(struct sk_buff *msg,
> > > + struct netlink_callback *cb,
> > > + struct rdma_restrack_entry *entry);
> > > };
> > >
> > > /**
> > > diff --git a/include/uapi/rdma/rdma_netlink.h
> > b/include/uapi/rdma/rdma_netlink.h
> > > index 84b3f63..70443d4 100644
> > > --- a/include/uapi/rdma/rdma_netlink.h
> > > +++ b/include/uapi/rdma/rdma_netlink.h
> > > @@ -249,6 +249,10 @@ enum rdma_nldev_command {
> > > RDMA_NLDEV_NUM_OPS
> > > };
> > >
> > > +enum {
> > > + RDMA_NLDEV_ATTR_PROVIDER_STRLEN = 16,
> > > +};
> >
> > Let's call it to be something more generic, because we used
> > hardcoded value for RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_NAME.
> >
> > What about RDMA_NLDEV_ATTR_ENTRY_STRLEN?
> >
>
> Ok. Is really 16 big enough?
I think so, let's save skb size.
16 is "abcdefghijklmno" (15 chars + NULL).
Thanks
Attachment:
signature.asc
Description: PGP signature
