RDMA/qib: Use attributes for the port sysfs
qib should not be creating a mess of kobjects to attach to the port kobject - this is all attributes. The proper API is to create an attribute_group list and create it against the port's kobject. Link: https://lore.kernel.org/r/911e0031e1ed495b0006e8a6efec7b67a702cd5e.1623427137.git.leonro@nvidia.com Tested-by: Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com> Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
This commit is contained in:
Jason Gunthorpe
parent
526a12c8c5
commit
4a7aaf88c8
|
|
@ -521,10 +521,6 @@ struct qib_pportdata {
|
|||
|
||||
struct qib_devdata *dd;
|
||||
struct qib_chippport_specific *cpspec; /* chip-specific per-port */
|
||||
struct kobject pport_kobj;
|
||||
struct kobject pport_cc_kobj;
|
||||
struct kobject sl2vl_kobj;
|
||||
struct kobject diagc_kobj;
|
||||
|
||||
/* GUID for this interface, in network order */
|
||||
__be64 guid;
|
||||
|
|
|
|||
|
|
@ -32,25 +32,38 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
#include <linux/ctype.h>
|
||||
#include <rdma/ib_sysfs.h>
|
||||
|
||||
#include "qib.h"
|
||||
#include "qib_mad.h"
|
||||
|
||||
/* start of per-port functions */
|
||||
static struct qib_pportdata *qib_get_pportdata_kobj(struct kobject *kobj)
|
||||
{
|
||||
u32 port_num;
|
||||
struct ib_device *ibdev = ib_port_sysfs_get_ibdev_kobj(kobj, &port_num);
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
|
||||
return &dd->pport[port_num - 1];
|
||||
}
|
||||
|
||||
/*
|
||||
* Get/Set heartbeat enable. OR of 1=enabled, 2=auto
|
||||
*/
|
||||
static ssize_t show_hrtbt_enb(struct qib_pportdata *ppd, char *buf)
|
||||
static ssize_t hrtbt_enable_show(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, char *buf)
|
||||
{
|
||||
struct qib_devdata *dd = ppd->dd;
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_pportdata *ppd = &dd->pport[port_num - 1];
|
||||
|
||||
return sysfs_emit(buf, "%d\n", dd->f_get_ib_cfg(ppd, QIB_IB_CFG_HRTBT));
|
||||
}
|
||||
|
||||
static ssize_t store_hrtbt_enb(struct qib_pportdata *ppd, const char *buf,
|
||||
size_t count)
|
||||
static ssize_t hrtbt_enable_store(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct qib_devdata *dd = ppd->dd;
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_pportdata *ppd = &dd->pport[port_num - 1];
|
||||
int ret;
|
||||
u16 val;
|
||||
|
||||
|
|
@ -70,11 +83,14 @@ static ssize_t store_hrtbt_enb(struct qib_pportdata *ppd, const char *buf,
|
|||
ret = dd->f_set_ib_cfg(ppd, QIB_IB_CFG_HRTBT, val);
|
||||
return ret < 0 ? ret : count;
|
||||
}
|
||||
static IB_PORT_ATTR_RW(hrtbt_enable);
|
||||
|
||||
static ssize_t store_loopback(struct qib_pportdata *ppd, const char *buf,
|
||||
static ssize_t loopback_store(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct qib_devdata *dd = ppd->dd;
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_pportdata *ppd = &dd->pport[port_num - 1];
|
||||
int ret = count, r;
|
||||
|
||||
r = dd->f_set_ib_loopback(ppd, buf);
|
||||
|
|
@ -83,11 +99,14 @@ static ssize_t store_loopback(struct qib_pportdata *ppd, const char *buf,
|
|||
|
||||
return ret;
|
||||
}
|
||||
static IB_PORT_ATTR_WO(loopback);
|
||||
|
||||
static ssize_t store_led_override(struct qib_pportdata *ppd, const char *buf,
|
||||
size_t count)
|
||||
static ssize_t led_override_store(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct qib_devdata *dd = ppd->dd;
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_pportdata *ppd = &dd->pport[port_num - 1];
|
||||
int ret;
|
||||
u16 val;
|
||||
|
||||
|
|
@ -100,14 +119,20 @@ static ssize_t store_led_override(struct qib_pportdata *ppd, const char *buf,
|
|||
qib_set_led_override(ppd, val);
|
||||
return count;
|
||||
}
|
||||
static IB_PORT_ATTR_WO(led_override);
|
||||
|
||||
static ssize_t show_status(struct qib_pportdata *ppd, char *buf)
|
||||
static ssize_t status_show(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, char *buf)
|
||||
{
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_pportdata *ppd = &dd->pport[port_num - 1];
|
||||
|
||||
if (!ppd->statusp)
|
||||
return -EINVAL;
|
||||
|
||||
return sysfs_emit(buf, "0x%llx\n", (unsigned long long)*(ppd->statusp));
|
||||
}
|
||||
static IB_PORT_ATTR_RO(status);
|
||||
|
||||
/*
|
||||
* For userland compatibility, these offsets must remain fixed.
|
||||
|
|
@ -127,8 +152,11 @@ static const char * const qib_status_str[] = {
|
|||
NULL,
|
||||
};
|
||||
|
||||
static ssize_t show_status_str(struct qib_pportdata *ppd, char *buf)
|
||||
static ssize_t status_str_show(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, char *buf)
|
||||
{
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_pportdata *ppd = &dd->pport[port_num - 1];
|
||||
int i, any;
|
||||
u64 s;
|
||||
ssize_t ret;
|
||||
|
|
@ -160,38 +188,22 @@ static ssize_t show_status_str(struct qib_pportdata *ppd, char *buf)
|
|||
bail:
|
||||
return ret;
|
||||
}
|
||||
static IB_PORT_ATTR_RO(status_str);
|
||||
|
||||
/* end of per-port functions */
|
||||
|
||||
/*
|
||||
* Start of per-port file structures and support code
|
||||
* Because we are fitting into other infrastructure, we have to supply the
|
||||
* full set of kobject/sysfs_ops structures and routines.
|
||||
*/
|
||||
#define QIB_PORT_ATTR(name, mode, show, store) \
|
||||
static struct qib_port_attr qib_port_attr_##name = \
|
||||
__ATTR(name, mode, show, store)
|
||||
|
||||
struct qib_port_attr {
|
||||
struct attribute attr;
|
||||
ssize_t (*show)(struct qib_pportdata *, char *);
|
||||
ssize_t (*store)(struct qib_pportdata *, const char *, size_t);
|
||||
static struct attribute *port_linkcontrol_attributes[] = {
|
||||
&ib_port_attr_loopback.attr,
|
||||
&ib_port_attr_led_override.attr,
|
||||
&ib_port_attr_hrtbt_enable.attr,
|
||||
&ib_port_attr_status.attr,
|
||||
&ib_port_attr_status_str.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
QIB_PORT_ATTR(loopback, S_IWUSR, NULL, store_loopback);
|
||||
QIB_PORT_ATTR(led_override, S_IWUSR, NULL, store_led_override);
|
||||
QIB_PORT_ATTR(hrtbt_enable, S_IWUSR | S_IRUGO, show_hrtbt_enb,
|
||||
store_hrtbt_enb);
|
||||
QIB_PORT_ATTR(status, S_IRUGO, show_status, NULL);
|
||||
QIB_PORT_ATTR(status_str, S_IRUGO, show_status_str, NULL);
|
||||
|
||||
static struct attribute *port_default_attributes[] = {
|
||||
&qib_port_attr_loopback.attr,
|
||||
&qib_port_attr_led_override.attr,
|
||||
&qib_port_attr_hrtbt_enable.attr,
|
||||
&qib_port_attr_status.attr,
|
||||
&qib_port_attr_status_str.attr,
|
||||
NULL
|
||||
static const struct attribute_group port_linkcontrol_group = {
|
||||
.name = "linkcontrol",
|
||||
.attrs = port_linkcontrol_attributes,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -201,13 +213,12 @@ static struct attribute *port_default_attributes[] = {
|
|||
/*
|
||||
* Congestion control table size followed by table entries
|
||||
*/
|
||||
static ssize_t read_cc_table_bin(struct file *filp, struct kobject *kobj,
|
||||
struct bin_attribute *bin_attr,
|
||||
char *buf, loff_t pos, size_t count)
|
||||
static ssize_t cc_table_bin_read(struct file *filp, struct kobject *kobj,
|
||||
struct bin_attribute *bin_attr, char *buf,
|
||||
loff_t pos, size_t count)
|
||||
{
|
||||
struct qib_pportdata *ppd = qib_get_pportdata_kobj(kobj);
|
||||
int ret;
|
||||
struct qib_pportdata *ppd =
|
||||
container_of(kobj, struct qib_pportdata, pport_cc_kobj);
|
||||
|
||||
if (!qib_cc_table_size || !ppd->ccti_entries_shadow)
|
||||
return -EINVAL;
|
||||
|
|
@ -230,34 +241,19 @@ static ssize_t read_cc_table_bin(struct file *filp, struct kobject *kobj,
|
|||
|
||||
return count;
|
||||
}
|
||||
|
||||
static void qib_port_release(struct kobject *kobj)
|
||||
{
|
||||
/* nothing to do since memory is freed by qib_free_devdata() */
|
||||
}
|
||||
|
||||
static struct kobj_type qib_port_cc_ktype = {
|
||||
.release = qib_port_release,
|
||||
};
|
||||
|
||||
static const struct bin_attribute cc_table_bin_attr = {
|
||||
.attr = {.name = "cc_table_bin", .mode = 0444},
|
||||
.read = read_cc_table_bin,
|
||||
.size = PAGE_SIZE,
|
||||
};
|
||||
static BIN_ATTR_RO(cc_table_bin, PAGE_SIZE);
|
||||
|
||||
/*
|
||||
* Congestion settings: port control, control map and an array of 16
|
||||
* entries for the congestion entries - increase, timer, event log
|
||||
* trigger threshold and the minimum injection rate delay.
|
||||
*/
|
||||
static ssize_t read_cc_setting_bin(struct file *filp, struct kobject *kobj,
|
||||
struct bin_attribute *bin_attr,
|
||||
char *buf, loff_t pos, size_t count)
|
||||
static ssize_t cc_setting_bin_read(struct file *filp, struct kobject *kobj,
|
||||
struct bin_attribute *bin_attr, char *buf,
|
||||
loff_t pos, size_t count)
|
||||
{
|
||||
struct qib_pportdata *ppd = qib_get_pportdata_kobj(kobj);
|
||||
int ret;
|
||||
struct qib_pportdata *ppd =
|
||||
container_of(kobj, struct qib_pportdata, pport_cc_kobj);
|
||||
|
||||
if (!qib_cc_table_size || !ppd->congestion_entries_shadow)
|
||||
return -EINVAL;
|
||||
|
|
@ -278,67 +274,54 @@ static ssize_t read_cc_setting_bin(struct file *filp, struct kobject *kobj,
|
|||
|
||||
return count;
|
||||
}
|
||||
static BIN_ATTR_RO(cc_setting_bin, PAGE_SIZE);
|
||||
|
||||
static const struct bin_attribute cc_setting_bin_attr = {
|
||||
.attr = {.name = "cc_settings_bin", .mode = 0444},
|
||||
.read = read_cc_setting_bin,
|
||||
.size = PAGE_SIZE,
|
||||
static struct bin_attribute *port_ccmgta_attributes[] = {
|
||||
&bin_attr_cc_setting_bin,
|
||||
&bin_attr_cc_table_bin,
|
||||
NULL,
|
||||
};
|
||||
|
||||
|
||||
static ssize_t qib_portattr_show(struct kobject *kobj,
|
||||
struct attribute *attr, char *buf)
|
||||
static umode_t qib_ccmgta_is_bin_visible(struct kobject *kobj,
|
||||
struct bin_attribute *attr, int n)
|
||||
{
|
||||
struct qib_port_attr *pattr =
|
||||
container_of(attr, struct qib_port_attr, attr);
|
||||
struct qib_pportdata *ppd =
|
||||
container_of(kobj, struct qib_pportdata, pport_kobj);
|
||||
struct qib_pportdata *ppd = qib_get_pportdata_kobj(kobj);
|
||||
|
||||
if (!pattr->show)
|
||||
return -EIO;
|
||||
|
||||
return pattr->show(ppd, buf);
|
||||
if (!qib_cc_table_size || !ppd->congestion_entries_shadow)
|
||||
return 0;
|
||||
return attr->attr.mode;
|
||||
}
|
||||
|
||||
static ssize_t qib_portattr_store(struct kobject *kobj,
|
||||
struct attribute *attr, const char *buf, size_t len)
|
||||
{
|
||||
struct qib_port_attr *pattr =
|
||||
container_of(attr, struct qib_port_attr, attr);
|
||||
struct qib_pportdata *ppd =
|
||||
container_of(kobj, struct qib_pportdata, pport_kobj);
|
||||
|
||||
if (!pattr->store)
|
||||
return -EIO;
|
||||
|
||||
return pattr->store(ppd, buf, len);
|
||||
}
|
||||
|
||||
|
||||
static const struct sysfs_ops qib_port_ops = {
|
||||
.show = qib_portattr_show,
|
||||
.store = qib_portattr_store,
|
||||
};
|
||||
|
||||
static struct kobj_type qib_port_ktype = {
|
||||
.release = qib_port_release,
|
||||
.sysfs_ops = &qib_port_ops,
|
||||
.default_attrs = port_default_attributes
|
||||
static const struct attribute_group port_ccmgta_attribute_group = {
|
||||
.name = "CCMgtA",
|
||||
.is_bin_visible = qib_ccmgta_is_bin_visible,
|
||||
.bin_attrs = port_ccmgta_attributes,
|
||||
};
|
||||
|
||||
/* Start sl2vl */
|
||||
|
||||
#define QIB_SL2VL_ATTR(N) \
|
||||
static struct qib_sl2vl_attr qib_sl2vl_attr_##N = { \
|
||||
.attr = { .name = __stringify(N), .mode = 0444 }, \
|
||||
.sl = N \
|
||||
}
|
||||
|
||||
struct qib_sl2vl_attr {
|
||||
struct attribute attr;
|
||||
struct ib_port_attribute attr;
|
||||
int sl;
|
||||
};
|
||||
|
||||
static ssize_t sl2vl_attr_show(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, char *buf)
|
||||
{
|
||||
struct qib_sl2vl_attr *sattr =
|
||||
container_of(attr, struct qib_sl2vl_attr, attr);
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_ibport *qibp = &dd->pport[port_num - 1].ibport_data;
|
||||
|
||||
return sysfs_emit(buf, "%u\n", qibp->sl_to_vl[sattr->sl]);
|
||||
}
|
||||
|
||||
#define QIB_SL2VL_ATTR(N) \
|
||||
static struct qib_sl2vl_attr qib_sl2vl_attr_##N = { \
|
||||
.attr = __ATTR(N, 0444, sl2vl_attr_show, NULL), \
|
||||
.sl = N, \
|
||||
}
|
||||
|
||||
QIB_SL2VL_ATTR(0);
|
||||
QIB_SL2VL_ATTR(1);
|
||||
QIB_SL2VL_ATTR(2);
|
||||
|
|
@ -356,72 +339,74 @@ QIB_SL2VL_ATTR(13);
|
|||
QIB_SL2VL_ATTR(14);
|
||||
QIB_SL2VL_ATTR(15);
|
||||
|
||||
static struct attribute *sl2vl_default_attributes[] = {
|
||||
&qib_sl2vl_attr_0.attr,
|
||||
&qib_sl2vl_attr_1.attr,
|
||||
&qib_sl2vl_attr_2.attr,
|
||||
&qib_sl2vl_attr_3.attr,
|
||||
&qib_sl2vl_attr_4.attr,
|
||||
&qib_sl2vl_attr_5.attr,
|
||||
&qib_sl2vl_attr_6.attr,
|
||||
&qib_sl2vl_attr_7.attr,
|
||||
&qib_sl2vl_attr_8.attr,
|
||||
&qib_sl2vl_attr_9.attr,
|
||||
&qib_sl2vl_attr_10.attr,
|
||||
&qib_sl2vl_attr_11.attr,
|
||||
&qib_sl2vl_attr_12.attr,
|
||||
&qib_sl2vl_attr_13.attr,
|
||||
&qib_sl2vl_attr_14.attr,
|
||||
&qib_sl2vl_attr_15.attr,
|
||||
static struct attribute *port_sl2vl_attributes[] = {
|
||||
&qib_sl2vl_attr_0.attr.attr,
|
||||
&qib_sl2vl_attr_1.attr.attr,
|
||||
&qib_sl2vl_attr_2.attr.attr,
|
||||
&qib_sl2vl_attr_3.attr.attr,
|
||||
&qib_sl2vl_attr_4.attr.attr,
|
||||
&qib_sl2vl_attr_5.attr.attr,
|
||||
&qib_sl2vl_attr_6.attr.attr,
|
||||
&qib_sl2vl_attr_7.attr.attr,
|
||||
&qib_sl2vl_attr_8.attr.attr,
|
||||
&qib_sl2vl_attr_9.attr.attr,
|
||||
&qib_sl2vl_attr_10.attr.attr,
|
||||
&qib_sl2vl_attr_11.attr.attr,
|
||||
&qib_sl2vl_attr_12.attr.attr,
|
||||
&qib_sl2vl_attr_13.attr.attr,
|
||||
&qib_sl2vl_attr_14.attr.attr,
|
||||
&qib_sl2vl_attr_15.attr.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static ssize_t sl2vl_attr_show(struct kobject *kobj, struct attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct qib_sl2vl_attr *sattr =
|
||||
container_of(attr, struct qib_sl2vl_attr, attr);
|
||||
struct qib_pportdata *ppd =
|
||||
container_of(kobj, struct qib_pportdata, sl2vl_kobj);
|
||||
struct qib_ibport *qibp = &ppd->ibport_data;
|
||||
|
||||
return sysfs_emit(buf, "%u\n", qibp->sl_to_vl[sattr->sl]);
|
||||
}
|
||||
|
||||
static const struct sysfs_ops qib_sl2vl_ops = {
|
||||
.show = sl2vl_attr_show,
|
||||
};
|
||||
|
||||
static struct kobj_type qib_sl2vl_ktype = {
|
||||
.release = qib_port_release,
|
||||
.sysfs_ops = &qib_sl2vl_ops,
|
||||
.default_attrs = sl2vl_default_attributes
|
||||
static const struct attribute_group port_sl2vl_group = {
|
||||
.name = "sl2vl",
|
||||
.attrs = port_sl2vl_attributes,
|
||||
};
|
||||
|
||||
/* End sl2vl */
|
||||
|
||||
/* Start diag_counters */
|
||||
|
||||
#define QIB_DIAGC_ATTR(N) \
|
||||
static struct qib_diagc_attr qib_diagc_attr_##N = { \
|
||||
.attr = { .name = __stringify(N), .mode = 0664 }, \
|
||||
.counter = offsetof(struct qib_ibport, rvp.n_##N) \
|
||||
}
|
||||
|
||||
#define QIB_DIAGC_ATTR_PER_CPU(N) \
|
||||
static struct qib_diagc_attr qib_diagc_attr_##N = { \
|
||||
.attr = { .name = __stringify(N), .mode = 0664 }, \
|
||||
.counter = offsetof(struct qib_ibport, rvp.z_##N) \
|
||||
}
|
||||
|
||||
struct qib_diagc_attr {
|
||||
struct attribute attr;
|
||||
struct ib_port_attribute attr;
|
||||
size_t counter;
|
||||
};
|
||||
|
||||
QIB_DIAGC_ATTR_PER_CPU(rc_acks);
|
||||
QIB_DIAGC_ATTR_PER_CPU(rc_qacks);
|
||||
QIB_DIAGC_ATTR_PER_CPU(rc_delayed_comp);
|
||||
static ssize_t diagc_attr_show(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, char *buf)
|
||||
{
|
||||
struct qib_diagc_attr *dattr =
|
||||
container_of(attr, struct qib_diagc_attr, attr);
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_ibport *qibp = &dd->pport[port_num - 1].ibport_data;
|
||||
|
||||
return sysfs_emit(buf, "%llu\n", *((u64 *)qibp + dattr->counter));
|
||||
}
|
||||
|
||||
static ssize_t diagc_attr_store(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct qib_diagc_attr *dattr =
|
||||
container_of(attr, struct qib_diagc_attr, attr);
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_ibport *qibp = &dd->pport[port_num - 1].ibport_data;
|
||||
u64 val;
|
||||
int ret;
|
||||
|
||||
ret = kstrtou64(buf, 0, &val);
|
||||
if (ret)
|
||||
return ret;
|
||||
*((u64 *)qibp + dattr->counter) = val;
|
||||
return count;
|
||||
}
|
||||
|
||||
#define QIB_DIAGC_ATTR(N) \
|
||||
static struct qib_diagc_attr qib_diagc_attr_##N = { \
|
||||
.attr = __ATTR(N, 0664, diagc_attr_show, diagc_attr_store), \
|
||||
.counter = &((struct qib_ibport *)0)->rvp.n_##N - (u64 *)0, \
|
||||
}
|
||||
|
||||
QIB_DIAGC_ATTR(rc_resends);
|
||||
QIB_DIAGC_ATTR(seq_naks);
|
||||
|
|
@ -437,26 +422,6 @@ QIB_DIAGC_ATTR(rc_dupreq);
|
|||
QIB_DIAGC_ATTR(rc_seqnak);
|
||||
QIB_DIAGC_ATTR(rc_crwaits);
|
||||
|
||||
static struct attribute *diagc_default_attributes[] = {
|
||||
&qib_diagc_attr_rc_resends.attr,
|
||||
&qib_diagc_attr_rc_acks.attr,
|
||||
&qib_diagc_attr_rc_qacks.attr,
|
||||
&qib_diagc_attr_rc_delayed_comp.attr,
|
||||
&qib_diagc_attr_seq_naks.attr,
|
||||
&qib_diagc_attr_rdma_seq.attr,
|
||||
&qib_diagc_attr_rnr_naks.attr,
|
||||
&qib_diagc_attr_other_naks.attr,
|
||||
&qib_diagc_attr_rc_timeouts.attr,
|
||||
&qib_diagc_attr_loop_pkts.attr,
|
||||
&qib_diagc_attr_pkt_drops.attr,
|
||||
&qib_diagc_attr_dmawait.attr,
|
||||
&qib_diagc_attr_unaligned.attr,
|
||||
&qib_diagc_attr_rc_dupreq.attr,
|
||||
&qib_diagc_attr_rc_seqnak.attr,
|
||||
&qib_diagc_attr_rc_crwaits.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static u64 get_all_cpu_total(u64 __percpu *cntr)
|
||||
{
|
||||
int cpu;
|
||||
|
|
@ -467,86 +432,127 @@ static u64 get_all_cpu_total(u64 __percpu *cntr)
|
|||
return counter;
|
||||
}
|
||||
|
||||
#define def_write_per_cpu(cntr) \
|
||||
static void write_per_cpu_##cntr(struct qib_pportdata *ppd, u32 data) \
|
||||
{ \
|
||||
struct qib_devdata *dd = ppd->dd; \
|
||||
struct qib_ibport *qibp = &ppd->ibport_data; \
|
||||
/* A write can only zero the counter */ \
|
||||
if (data == 0) \
|
||||
qibp->rvp.z_##cntr = get_all_cpu_total(qibp->rvp.cntr); \
|
||||
else \
|
||||
qib_dev_err(dd, "Per CPU cntrs can only be zeroed"); \
|
||||
}
|
||||
|
||||
def_write_per_cpu(rc_acks)
|
||||
def_write_per_cpu(rc_qacks)
|
||||
def_write_per_cpu(rc_delayed_comp)
|
||||
|
||||
#define READ_PER_CPU_CNTR(cntr) (get_all_cpu_total(qibp->rvp.cntr) - \
|
||||
qibp->rvp.z_##cntr)
|
||||
|
||||
static ssize_t diagc_attr_show(struct kobject *kobj, struct attribute *attr,
|
||||
char *buf)
|
||||
static ssize_t qib_store_per_cpu(struct qib_devdata *dd, const char *buf,
|
||||
size_t count, u64 *zero, u64 cur)
|
||||
{
|
||||
struct qib_diagc_attr *dattr =
|
||||
container_of(attr, struct qib_diagc_attr, attr);
|
||||
struct qib_pportdata *ppd =
|
||||
container_of(kobj, struct qib_pportdata, diagc_kobj);
|
||||
struct qib_ibport *qibp = &ppd->ibport_data;
|
||||
u64 val;
|
||||
|
||||
if (!strncmp(dattr->attr.name, "rc_acks", 7))
|
||||
val = READ_PER_CPU_CNTR(rc_acks);
|
||||
else if (!strncmp(dattr->attr.name, "rc_qacks", 8))
|
||||
val = READ_PER_CPU_CNTR(rc_qacks);
|
||||
else if (!strncmp(dattr->attr.name, "rc_delayed_comp", 15))
|
||||
val = READ_PER_CPU_CNTR(rc_delayed_comp);
|
||||
else
|
||||
val = *(u32 *)((char *)qibp + dattr->counter);
|
||||
|
||||
return sysfs_emit(buf, "%llu\n", val);
|
||||
}
|
||||
|
||||
static ssize_t diagc_attr_store(struct kobject *kobj, struct attribute *attr,
|
||||
const char *buf, size_t size)
|
||||
{
|
||||
struct qib_diagc_attr *dattr =
|
||||
container_of(attr, struct qib_diagc_attr, attr);
|
||||
struct qib_pportdata *ppd =
|
||||
container_of(kobj, struct qib_pportdata, diagc_kobj);
|
||||
struct qib_ibport *qibp = &ppd->ibport_data;
|
||||
u32 val;
|
||||
int ret;
|
||||
|
||||
ret = kstrtou32(buf, 0, &val);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (!strncmp(dattr->attr.name, "rc_acks", 7))
|
||||
write_per_cpu_rc_acks(ppd, val);
|
||||
else if (!strncmp(dattr->attr.name, "rc_qacks", 8))
|
||||
write_per_cpu_rc_qacks(ppd, val);
|
||||
else if (!strncmp(dattr->attr.name, "rc_delayed_comp", 15))
|
||||
write_per_cpu_rc_delayed_comp(ppd, val);
|
||||
else
|
||||
*(u32 *)((char *)qibp + dattr->counter) = val;
|
||||
return size;
|
||||
if (val != 0) {
|
||||
qib_dev_err(dd, "Per CPU cntrs can only be zeroed");
|
||||
return count;
|
||||
}
|
||||
*zero = cur;
|
||||
return count;
|
||||
}
|
||||
|
||||
static const struct sysfs_ops qib_diagc_ops = {
|
||||
.show = diagc_attr_show,
|
||||
.store = diagc_attr_store,
|
||||
static ssize_t rc_acks_show(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, char *buf)
|
||||
{
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_ibport *qibp = &dd->pport[port_num - 1].ibport_data;
|
||||
|
||||
return sysfs_emit(buf, "%llu\n",
|
||||
get_all_cpu_total(qibp->rvp.rc_acks) -
|
||||
qibp->rvp.z_rc_acks);
|
||||
}
|
||||
|
||||
static ssize_t rc_acks_store(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_ibport *qibp = &dd->pport[port_num - 1].ibport_data;
|
||||
|
||||
return qib_store_per_cpu(dd, buf, count, &qibp->rvp.z_rc_acks,
|
||||
get_all_cpu_total(qibp->rvp.rc_acks));
|
||||
}
|
||||
static IB_PORT_ATTR_RW(rc_acks);
|
||||
|
||||
static ssize_t rc_qacks_show(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, char *buf)
|
||||
{
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_ibport *qibp = &dd->pport[port_num - 1].ibport_data;
|
||||
|
||||
return sysfs_emit(buf, "%llu\n",
|
||||
get_all_cpu_total(qibp->rvp.rc_qacks) -
|
||||
qibp->rvp.z_rc_qacks);
|
||||
}
|
||||
|
||||
static ssize_t rc_qacks_store(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_ibport *qibp = &dd->pport[port_num - 1].ibport_data;
|
||||
|
||||
return qib_store_per_cpu(dd, buf, count, &qibp->rvp.z_rc_qacks,
|
||||
get_all_cpu_total(qibp->rvp.rc_qacks));
|
||||
}
|
||||
static IB_PORT_ATTR_RW(rc_qacks);
|
||||
|
||||
static ssize_t rc_delayed_comp_show(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr, char *buf)
|
||||
{
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_ibport *qibp = &dd->pport[port_num - 1].ibport_data;
|
||||
|
||||
return sysfs_emit(buf, "%llu\n",
|
||||
get_all_cpu_total(qibp->rvp.rc_delayed_comp) -
|
||||
qibp->rvp.z_rc_delayed_comp);
|
||||
}
|
||||
|
||||
static ssize_t rc_delayed_comp_store(struct ib_device *ibdev, u32 port_num,
|
||||
struct ib_port_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
struct qib_ibport *qibp = &dd->pport[port_num - 1].ibport_data;
|
||||
|
||||
return qib_store_per_cpu(dd, buf, count, &qibp->rvp.z_rc_delayed_comp,
|
||||
get_all_cpu_total(qibp->rvp.rc_delayed_comp));
|
||||
}
|
||||
static IB_PORT_ATTR_RW(rc_delayed_comp);
|
||||
|
||||
static struct attribute *port_diagc_attributes[] = {
|
||||
&qib_diagc_attr_rc_resends.attr.attr,
|
||||
&qib_diagc_attr_seq_naks.attr.attr,
|
||||
&qib_diagc_attr_rdma_seq.attr.attr,
|
||||
&qib_diagc_attr_rnr_naks.attr.attr,
|
||||
&qib_diagc_attr_other_naks.attr.attr,
|
||||
&qib_diagc_attr_rc_timeouts.attr.attr,
|
||||
&qib_diagc_attr_loop_pkts.attr.attr,
|
||||
&qib_diagc_attr_pkt_drops.attr.attr,
|
||||
&qib_diagc_attr_dmawait.attr.attr,
|
||||
&qib_diagc_attr_unaligned.attr.attr,
|
||||
&qib_diagc_attr_rc_dupreq.attr.attr,
|
||||
&qib_diagc_attr_rc_seqnak.attr.attr,
|
||||
&qib_diagc_attr_rc_crwaits.attr.attr,
|
||||
&ib_port_attr_rc_acks.attr,
|
||||
&ib_port_attr_rc_qacks.attr,
|
||||
&ib_port_attr_rc_delayed_comp.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static struct kobj_type qib_diagc_ktype = {
|
||||
.release = qib_port_release,
|
||||
.sysfs_ops = &qib_diagc_ops,
|
||||
.default_attrs = diagc_default_attributes
|
||||
static const struct attribute_group port_diagc_group = {
|
||||
.name = "linkcontrol",
|
||||
.attrs = port_diagc_attributes,
|
||||
};
|
||||
|
||||
/* End diag_counters */
|
||||
|
||||
static const struct attribute_group *qib_port_groups[] = {
|
||||
&port_linkcontrol_group,
|
||||
&port_ccmgta_attribute_group,
|
||||
&port_sl2vl_group,
|
||||
&port_diagc_group,
|
||||
NULL,
|
||||
};
|
||||
|
||||
/* end of per-port file structures and support code */
|
||||
|
||||
/*
|
||||
|
|
@ -731,99 +737,7 @@ const struct attribute_group qib_attr_group = {
|
|||
int qib_create_port_files(struct ib_device *ibdev, u32 port_num,
|
||||
struct kobject *kobj)
|
||||
{
|
||||
struct qib_pportdata *ppd;
|
||||
struct qib_devdata *dd = dd_from_ibdev(ibdev);
|
||||
int ret;
|
||||
|
||||
if (!port_num || port_num > dd->num_pports) {
|
||||
qib_dev_err(dd,
|
||||
"Skipping infiniband class with invalid port %u\n",
|
||||
port_num);
|
||||
ret = -ENODEV;
|
||||
goto bail;
|
||||
}
|
||||
ppd = &dd->pport[port_num - 1];
|
||||
|
||||
ret = kobject_init_and_add(&ppd->pport_kobj, &qib_port_ktype, kobj,
|
||||
"linkcontrol");
|
||||
if (ret) {
|
||||
qib_dev_err(dd,
|
||||
"Skipping linkcontrol sysfs info, (err %d) port %u\n",
|
||||
ret, port_num);
|
||||
goto bail_link;
|
||||
}
|
||||
kobject_uevent(&ppd->pport_kobj, KOBJ_ADD);
|
||||
|
||||
ret = kobject_init_and_add(&ppd->sl2vl_kobj, &qib_sl2vl_ktype, kobj,
|
||||
"sl2vl");
|
||||
if (ret) {
|
||||
qib_dev_err(dd,
|
||||
"Skipping sl2vl sysfs info, (err %d) port %u\n",
|
||||
ret, port_num);
|
||||
goto bail_sl;
|
||||
}
|
||||
kobject_uevent(&ppd->sl2vl_kobj, KOBJ_ADD);
|
||||
|
||||
ret = kobject_init_and_add(&ppd->diagc_kobj, &qib_diagc_ktype, kobj,
|
||||
"diag_counters");
|
||||
if (ret) {
|
||||
qib_dev_err(dd,
|
||||
"Skipping diag_counters sysfs info, (err %d) port %u\n",
|
||||
ret, port_num);
|
||||
goto bail_diagc;
|
||||
}
|
||||
kobject_uevent(&ppd->diagc_kobj, KOBJ_ADD);
|
||||
|
||||
if (!qib_cc_table_size || !ppd->congestion_entries_shadow)
|
||||
return 0;
|
||||
|
||||
ret = kobject_init_and_add(&ppd->pport_cc_kobj, &qib_port_cc_ktype,
|
||||
kobj, "CCMgtA");
|
||||
if (ret) {
|
||||
qib_dev_err(dd,
|
||||
"Skipping Congestion Control sysfs info, (err %d) port %u\n",
|
||||
ret, port_num);
|
||||
goto bail_cc;
|
||||
}
|
||||
|
||||
kobject_uevent(&ppd->pport_cc_kobj, KOBJ_ADD);
|
||||
|
||||
ret = sysfs_create_bin_file(&ppd->pport_cc_kobj,
|
||||
&cc_setting_bin_attr);
|
||||
if (ret) {
|
||||
qib_dev_err(dd,
|
||||
"Skipping Congestion Control setting sysfs info, (err %d) port %u\n",
|
||||
ret, port_num);
|
||||
goto bail_cc;
|
||||
}
|
||||
|
||||
ret = sysfs_create_bin_file(&ppd->pport_cc_kobj,
|
||||
&cc_table_bin_attr);
|
||||
if (ret) {
|
||||
qib_dev_err(dd,
|
||||
"Skipping Congestion Control table sysfs info, (err %d) port %u\n",
|
||||
ret, port_num);
|
||||
goto bail_cc_entry_bin;
|
||||
}
|
||||
|
||||
qib_devinfo(dd->pcidev,
|
||||
"IB%u: Congestion Control Agent enabled for port %d\n",
|
||||
dd->unit, port_num);
|
||||
|
||||
return 0;
|
||||
|
||||
bail_cc_entry_bin:
|
||||
sysfs_remove_bin_file(&ppd->pport_cc_kobj, &cc_setting_bin_attr);
|
||||
bail_cc:
|
||||
kobject_put(&ppd->pport_cc_kobj);
|
||||
bail_diagc:
|
||||
kobject_put(&ppd->diagc_kobj);
|
||||
bail_sl:
|
||||
kobject_put(&ppd->sl2vl_kobj);
|
||||
bail_link:
|
||||
kobject_put(&ppd->pport_kobj);
|
||||
bail:
|
||||
return ret;
|
||||
return ib_port_sysfs_create_groups(ibdev, port_num, qib_port_groups);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -831,21 +745,9 @@ bail:
|
|||
*/
|
||||
void qib_verbs_unregister_sysfs(struct qib_devdata *dd)
|
||||
{
|
||||
struct qib_pportdata *ppd;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < dd->num_pports; i++) {
|
||||
ppd = &dd->pport[i];
|
||||
if (qib_cc_table_size &&
|
||||
ppd->congestion_entries_shadow) {
|
||||
sysfs_remove_bin_file(&ppd->pport_cc_kobj,
|
||||
&cc_setting_bin_attr);
|
||||
sysfs_remove_bin_file(&ppd->pport_cc_kobj,
|
||||
&cc_table_bin_attr);
|
||||
kobject_put(&ppd->pport_cc_kobj);
|
||||
}
|
||||
kobject_put(&ppd->diagc_kobj);
|
||||
kobject_put(&ppd->sl2vl_kobj);
|
||||
kobject_put(&ppd->pport_kobj);
|
||||
}
|
||||
for (i = 0; i < dd->num_pports; i++)
|
||||
ib_port_sysfs_remove_groups(&dd->verbs_dev.rdi.ibdev, i,
|
||||
qib_port_groups);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue