| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20211203023728.3699610-2-suichen@google.com>
Date: Thu, 2 Dec 2021 18:37:26 -0800
From: Sui Chen <suichen@...gle.com>
To: linux-kernel@...r.kernel.org
Cc: openbmc@...ts.ozlabs.org, linux-i2c@...r.kernel.org,
joel@....id.au, andrew@...id.au, tali.perry1@...il.com,
benjaminfair@...gle.com, krellan@...gle.com, joe@...ches.com,
Sui Chen <suichen@...gle.com>
Subject: [RFC Patch v2 1/3] i2c debug counters as sysfs attributes
This change adds a few example I2C debug counters as sysfs attributes:
- ber_cnt (bus error count)
- nack_cnt (NACK count)
- rec_fail_cnt, rec_succ_cnt (recovery failure/success count)
- timeout_cnt (timeout count)
- i2c_speed (bus frequency)
- tx_complete_cnt (transaction completed, including both as an initiator
and as a target)
The function i2c_adapter_create_stats_folder creates a stats directory
in the device's sysfs directory to hold the debug counters. The platform
drivers are responsible for instantiating the counters in the stats
directory if applicable.
Signed-off-by: Sui Chen <suichen@...gle.com>
---
drivers/i2c/i2c-core-base.c | 2 +
drivers/i2c/i2c-dev.c | 103 ++++++++++++++++++++++++++++++++++++
include/linux/i2c.h | 27 ++++++++++
3 files changed, 132 insertions(+)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 84f12bf90644a..c42113daf32a7 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -1610,6 +1610,8 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
bus_for_each_drv(&i2c_bus_type, NULL, adap, __process_new_adapter);
mutex_unlock(&core_lock);
+ i2c_adapter_create_stats_folder(adap);
+
return 0;
out_reg:
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 77f576e516522..75f5e25400fdb 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -767,6 +767,109 @@ static void __exit i2c_dev_exit(void)
unregister_chrdev_region(MKDEV(I2C_MAJOR, 0), I2C_MINORS);
}
+
+static struct i2c_adapter* kobj_to_adapter(struct device* pdev) {
+ struct kobject* dev_kobj = ((struct kobject*)pdev)->parent;
+ struct device* dev = container_of(dev_kobj, struct device, kobj);
+ return to_i2c_adapter(dev);
+}
+
+static ssize_t ber_cnt_show(struct device* pdev,
+ struct device_attribute* attr, char* buf) {
+ u64* ber_cnt = kobj_to_adapter(pdev)->stats->ber_cnt;
+ if (ber_cnt == NULL) return 0;
+ return sysfs_emit(buf, "%llu\n", *ber_cnt);
+}
+DEVICE_ATTR_RO(ber_cnt);
+
+ssize_t nack_cnt_show(struct device* pdev,
+ struct device_attribute* attr, char* buf) {
+ u64* nack_cnt = kobj_to_adapter(pdev)->stats->nack_cnt;
+ if (nack_cnt == NULL) return 0;
+ return sysfs_emit(buf, "%llu\n", *nack_cnt);
+}
+DEVICE_ATTR_RO(nack_cnt);
+
+ssize_t rec_succ_cnt_show(struct device* pdev,
+ struct device_attribute* attr, char* buf) {
+ u64* rec_succ_cnt = kobj_to_adapter(pdev)->stats->rec_succ_cnt;
+ if (rec_succ_cnt == NULL) return 0;
+ return sysfs_emit(buf, "%llu\n", *rec_succ_cnt);
+}
+DEVICE_ATTR_RO(rec_succ_cnt);
+
+ssize_t rec_fail_cnt_show(struct device* pdev,
+ struct device_attribute* attr, char* buf) {
+ u64* rec_fail_cnt = kobj_to_adapter(pdev)->stats->rec_fail_cnt;
+ if (rec_fail_cnt == NULL) return 0;
+ return sysfs_emit(buf, "%llu\n", *rec_fail_cnt);
+}
+DEVICE_ATTR_RO(rec_fail_cnt);
+
+ssize_t timeout_cnt_show(struct device* pdev,
+ struct device_attribute* attr, char* buf) {
+ u64* timeout_cnt = kobj_to_adapter(pdev)->stats->timeout_cnt;
+ if (timeout_cnt == NULL) return 0;
+ return sysfs_emit(buf, "%llu\n", *timeout_cnt);
+}
+DEVICE_ATTR_RO(timeout_cnt);
+
+ssize_t i2c_speed_show(struct device* pdev,
+ struct device_attribute* attr, char* buf) {
+ u64* i2c_speed = kobj_to_adapter(pdev)->stats->i2c_speed;
+ if (i2c_speed == NULL) return 0;
+ return sysfs_emit(buf, "%llu\n", *i2c_speed);
+}
+DEVICE_ATTR_RO(i2c_speed);
+
+ssize_t tx_complete_cnt_show(struct device* pdev,
+ struct device_attribute* attr, char* buf) {
+ u64* tx_complete_cnt = kobj_to_adapter(pdev)->stats->tx_complete_cnt;
+ if (tx_complete_cnt == NULL) return 0;
+ return sysfs_emit(buf, "%llu\n", *tx_complete_cnt);
+}
+DEVICE_ATTR_RO(tx_complete_cnt);
+
+void i2c_adapter_create_stats_folder(struct i2c_adapter* adapter) {
+ adapter->stats = kzalloc(sizeof(struct i2c_adapter_stats), GFP_KERNEL);
+ adapter->stats->kobj = kobject_create_and_add("stats", &adapter->dev.kobj);;
+}
+
+void i2c_adapter_stats_register_counter(struct i2c_adapter* adapter,
+ const char* counter_name, void* data_source) {
+ int ret;
+ if (adapter->stats == NULL) {
+ i2c_adapter_create_stats_folder(adapter);
+ }
+
+ if (!strcmp(counter_name, "ber_cnt")) {
+ adapter->stats->ber_cnt = data_source;
+ ret = sysfs_create_file(adapter->stats->kobj, &dev_attr_ber_cnt.attr);
+ } else if (!strcmp(counter_name, "nack_cnt")) {
+ adapter->stats->nack_cnt = data_source;
+ ret = sysfs_create_file(adapter->stats->kobj, &dev_attr_nack_cnt.attr);
+ } else if (!strcmp(counter_name, "rec_succ_cnt")) {
+ adapter->stats->rec_succ_cnt = data_source;
+ ret = sysfs_create_file(adapter->stats->kobj, &dev_attr_rec_succ_cnt.attr);
+ } else if (!strcmp(counter_name, "rec_fail_cnt")) {
+ adapter->stats->rec_fail_cnt = data_source;
+ ret = sysfs_create_file(adapter->stats->kobj, &dev_attr_rec_fail_cnt.attr);
+ } else if (!strcmp(counter_name, "timeout_cnt")) {
+ adapter->stats->timeout_cnt = data_source;
+ ret = sysfs_create_file(adapter->stats->kobj, &dev_attr_timeout_cnt.attr);
+ } else if (!strcmp(counter_name, "i2c_speed")) {
+ adapter->stats->i2c_speed = data_source;
+ ret = sysfs_create_file(adapter->stats->kobj, &dev_attr_i2c_speed.attr);
+ } else if (!strcmp(counter_name, "tx_complete_cnt")) {
+ adapter->stats->tx_complete_cnt = data_source;
+ ret = sysfs_create_file(adapter->stats->kobj, &dev_attr_tx_complete_cnt.attr);
+ }
+
+ if (ret) {
+ printk("Failed to create sysfs file for %s", counter_name);
+ }
+}
+
MODULE_AUTHOR("Frodo Looijaard <frodol@....nl>");
MODULE_AUTHOR("Simon G. Vogl <simon@...uni-linz.ac.at>");
MODULE_DESCRIPTION("I2C /dev entries driver");
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 3eb60a2e9e618..448249eb6ca2e 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -21,6 +21,7 @@
#include <linux/of.h> /* for struct device_node */
#include <linux/swab.h> /* for swab16 */
#include <uapi/linux/i2c.h>
+#include <linux/slab.h> /* for kzalloc */
extern struct bus_type i2c_bus_type;
extern struct device_type i2c_adapter_type;
@@ -684,6 +685,27 @@ struct i2c_adapter_quirks {
u16 max_comb_2nd_msg_len;
};
+/**
+ * I2C statistics
+ * The list of statistics are currently copied from npcm7xx.
+ * Perhaps a more universal set of statistics can be used.
+ *
+ * The stats are currently modeled as pointers to members in the bus drivers.
+ * A null pointer indicates the counter is not supported by the bus driver.
+ */
+struct i2c_adapter_stats {
+ struct kobject* kobj;
+
+ /* a NULL value means the counter is not available */
+ u64* tx_complete_cnt;
+ u64* ber_cnt;
+ u64* nack_cnt;
+ u64* rec_succ_cnt;
+ u64* rec_fail_cnt;
+ u64* timeout_cnt;
+ u64* i2c_speed;
+};
+
/* enforce max_num_msgs = 2 and use max_comb_*_len for length checks */
#define I2C_AQ_COMB BIT(0)
/* first combined message must be write */
@@ -735,12 +757,17 @@ struct i2c_adapter {
struct i2c_bus_recovery_info *bus_recovery_info;
const struct i2c_adapter_quirks *quirks;
+ struct i2c_adapter_stats* stats;
struct irq_domain *host_notify_domain;
struct regulator *bus_regulator;
};
#define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
+void i2c_adapter_create_stats_folder(struct i2c_adapter* adapter);
+void i2c_adapter_stats_register_counter(struct i2c_adapter* adapter,
+ const char* counter_name, void* data_source);
+
static inline void *i2c_get_adapdata(const struct i2c_adapter *adap)
{
return dev_get_drvdata(&adap->dev);
--
2.34.0.384.gca35af8252-goog
Powered by blists - more mailing lists