[v9,1/3] uacce: supports device isolation feature
Commit Message
UACCE adds the hardware error isolation API. Users can configure
the isolation frequency by this sysfs node. UACCE reports the device
isolate state to the user space. If the AER error frequency exceeds
the set value in one hour, the device will be isolated.
Signed-off-by: Kai Ye <yekai13@huawei.com>
---
drivers/misc/uacce/uacce.c | 145 +++++++++++++++++++++++++++++++++++++
include/linux/uacce.h | 43 ++++++++++-
2 files changed, 187 insertions(+), 1 deletion(-)
Comments
On Tue, Oct 25, 2022 at 12:39:29PM +0000, Kai Ye wrote:
> UACCE adds the hardware error isolation API. Users can configure
> the isolation frequency by this sysfs node. UACCE reports the device
> isolate state to the user space. If the AER error frequency exceeds
> the set value in one hour, the device will be isolated.
>
You are trying to "reach across" to different types of devices here,
why? That feels backwards. Why isn't the device that needs to use this
api just create a child class device of this type?
> Signed-off-by: Kai Ye <yekai13@huawei.com>
> ---
> drivers/misc/uacce/uacce.c | 145 +++++++++++++++++++++++++++++++++++++
> include/linux/uacce.h | 43 ++++++++++-
> 2 files changed, 187 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/misc/uacce/uacce.c b/drivers/misc/uacce/uacce.c
> index b70a013139c7..f293fcdcf44f 100644
> --- a/drivers/misc/uacce/uacce.c
> +++ b/drivers/misc/uacce/uacce.c
> @@ -7,10 +7,100 @@
> #include <linux/slab.h>
> #include <linux/uacce.h>
>
> +#define MAX_ERR_ISOLATE_COUNT 65535
> +
> static struct class *uacce_class;
> static dev_t uacce_devt;
> static DEFINE_XARRAY_ALLOC(uacce_xa);
>
> +static int cdev_get(struct device *dev, void *data)
That's a very odd function, considering it does not "get" anything.
And it does not work on cdev structures.
> +{
> + struct uacce_device *uacce;
> + struct device **t_dev = data;
Why are you having to cast this? Why not make it a real pointer?
> +
> + uacce = container_of(dev, struct uacce_device, dev);
> + if (uacce->parent == *t_dev) {
> + *t_dev = dev;
> + return 1;
bool?
And what happened to the reference count here?
> + }
> +
> + return 0;
> +}
> +
> +/**
> + * dev_to_uacce - Get structure uacce device from its parent device
> + * @dev the device
> + */
> +struct uacce_device *dev_to_uacce(struct device *dev)
> +{
> + struct device **tdev = &dev;
> + int ret;
> +
> + ret = class_for_each_device(uacce_class, NULL, tdev, cdev_get);
Ah, you use it here.
No, sorry, you can not just walk all devices in the tree and assume this
will work.
Why do you not already know the device already?
> + if (ret) {
> + dev = *tdev;
> + return container_of(dev, struct uacce_device, dev);
> + }
> + return NULL;
> +}
> +EXPORT_SYMBOL_GPL(dev_to_uacce);
Where is the reference counting here?
And again, horrible global function name :(
> +
> +/**
> + * uacce_hw_err_isolate - Try to set the isolation status of the uacce device
> + * according to user's configuration of isolation strategy.
> + * @uacce the uacce device
> + */
> +int uacce_hw_err_isolate(struct uacce_device *uacce)
> +{
> + struct uacce_hw_err *err, *tmp, *hw_err;
> + struct uacce_err_isolate *isolate_ctx;
> + u32 count = 0;
> +
> + if (!uacce)
> + return -EINVAL;
How can this happen?
> +
> + isolate_ctx = uacce->isolate_ctx;
> +
> +#define SECONDS_PER_HOUR 3600
We don't already have this in a header file?
> +
> + /* All the hw errs are processed by PF driver */
> + if (uacce->is_vf || isolate_ctx->is_isolate ||
> + !isolate_ctx->hw_err_isolate_hz)
> + return 0;
> +
> + hw_err = kzalloc(sizeof(*hw_err), GFP_KERNEL);
> + if (!hw_err)
> + return -ENOMEM;
> +
> + hw_err->timestamp = jiffies;
> + list_for_each_entry_safe(err, tmp, &isolate_ctx->hw_errs, list) {
> + if ((hw_err->timestamp - err->timestamp) / HZ >
> + SECONDS_PER_HOUR) {
> + list_del(&err->list);
> + kfree(err);
> + } else {
> + count++;
> + }
> + }
> + list_add(&hw_err->list, &isolate_ctx->hw_errs);
> +
> + if (count >= isolate_ctx->hw_err_isolate_hz)
> + isolate_ctx->is_isolate = true;
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(uacce_hw_err_isolate);
> +
> +static void uacce_hw_err_destroy(struct uacce_device *uacce)
> +{
> + struct uacce_hw_err *err, *tmp;
> +
> + list_for_each_entry_safe(err, tmp, &uacce->isolate_data.hw_errs, list) {
> + list_del(&err->list);
> + kfree(err);
No reference counting at all?
> + }
> +}
> +
> /*
> * If the parent driver or the device disappears, the queue state is invalid and
> * ops are not usable anymore.
> @@ -363,12 +453,59 @@ static ssize_t region_dus_size_show(struct device *dev,
> uacce->qf_pg_num[UACCE_QFRT_DUS] << PAGE_SHIFT);
> }
>
> +static ssize_t isolate_show(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + struct uacce_device *uacce = to_uacce_device(dev);
> + int ret = UACCE_DEV_NORMAL;
> +
> + if (uacce->isolate_ctx->is_isolate)
> + ret = UACCE_DEV_ISOLATE;
> +
> + return sysfs_emit(buf, "%d\n", ret);
> +}
> +
> +static ssize_t isolate_strategy_show(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + struct uacce_device *uacce = to_uacce_device(dev);
> +
> + return sysfs_emit(buf, "%u\n", uacce->isolate_ctx->hw_err_isolate_hz);
> +}
> +
> +static ssize_t isolate_strategy_store(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct uacce_device *uacce = to_uacce_device(dev);
> + unsigned long val;
> +
> + /* must be set by PF */
> + if (uacce->is_vf)
> + return -EPERM;
> +
> + if (kstrtoul(buf, 0, &val) < 0)
> + return -EINVAL;
> +
> + if (val > MAX_ERR_ISOLATE_COUNT)
> + return -EINVAL;
> +
> + uacce->isolate_ctx->hw_err_isolate_hz = val;
> +
> + /* After the policy is updated, need to reset the hardware err list */
> + uacce_hw_err_destroy(uacce);
> +
> + return count;
> +}
> +
> static DEVICE_ATTR_RO(api);
> static DEVICE_ATTR_RO(flags);
> static DEVICE_ATTR_RO(available_instances);
> static DEVICE_ATTR_RO(algorithms);
> static DEVICE_ATTR_RO(region_mmio_size);
> static DEVICE_ATTR_RO(region_dus_size);
> +static DEVICE_ATTR_RO(isolate);
> +static DEVICE_ATTR_RW(isolate_strategy);
No documentation for these new sysfs files?
thanks,
greg k-h
Hi Kai,
I love your patch! Yet something to improve:
[auto build test ERROR on char-misc/char-misc-testing]
[also build test ERROR on herbert-cryptodev-2.6/master herbert-crypto-2.6/master linus/master v6.1-rc2 next-20221025]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Kai-Ye/crypto-hisilicon-supports-device-isolation-feature/20221025-204846
patch link: https://lore.kernel.org/r/20221025123931.42161-2-yekai13%40huawei.com
patch subject: [PATCH v9 1/3] uacce: supports device isolation feature
config: ia64-randconfig-r032-20221023 (attached as .config)
compiler: ia64-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/61d411000cbcdf78e2d97d993858680e173e9d6b
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Kai-Ye/crypto-hisilicon-supports-device-isolation-feature/20221025-204846
git checkout 61d411000cbcdf78e2d97d993858680e173e9d6b
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=ia64 SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
All error/warnings (new ones prefixed by >>):
In file included from drivers/crypto/hisilicon/sec2/sec_main.c:17:
>> include/linux/uacce.h:184:5: warning: no previous prototype for 'uacce_hw_err_isolate' [-Wmissing-prototypes]
184 | int uacce_hw_err_isolate(struct uacce_device *uacce)
| ^~~~~~~~~~~~~~~~~~~~
--
ia64-linux-ld: drivers/crypto/hisilicon/qm.o: in function `uacce_hw_err_isolate':
>> include/linux/uacce.h:187: multiple definition of `uacce_hw_err_isolate'; drivers/crypto/hisilicon/sec2/sec_main.o:include/linux/uacce.h:187: first defined here
vim +187 include/linux/uacce.h
183
> 184 int uacce_hw_err_isolate(struct uacce_device *uacce)
185 {
186 return -EINVAL;
> 187 }
188 #endif /* CONFIG_UACCE */
189
@@ -7,10 +7,100 @@
#include <linux/slab.h>
#include <linux/uacce.h>
+#define MAX_ERR_ISOLATE_COUNT 65535
+
static struct class *uacce_class;
static dev_t uacce_devt;
static DEFINE_XARRAY_ALLOC(uacce_xa);
+static int cdev_get(struct device *dev, void *data)
+{
+ struct uacce_device *uacce;
+ struct device **t_dev = data;
+
+ uacce = container_of(dev, struct uacce_device, dev);
+ if (uacce->parent == *t_dev) {
+ *t_dev = dev;
+ return 1;
+ }
+
+ return 0;
+}
+
+/**
+ * dev_to_uacce - Get structure uacce device from its parent device
+ * @dev the device
+ */
+struct uacce_device *dev_to_uacce(struct device *dev)
+{
+ struct device **tdev = &dev;
+ int ret;
+
+ ret = class_for_each_device(uacce_class, NULL, tdev, cdev_get);
+ if (ret) {
+ dev = *tdev;
+ return container_of(dev, struct uacce_device, dev);
+ }
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(dev_to_uacce);
+
+/**
+ * uacce_hw_err_isolate - Try to set the isolation status of the uacce device
+ * according to user's configuration of isolation strategy.
+ * @uacce the uacce device
+ */
+int uacce_hw_err_isolate(struct uacce_device *uacce)
+{
+ struct uacce_hw_err *err, *tmp, *hw_err;
+ struct uacce_err_isolate *isolate_ctx;
+ u32 count = 0;
+
+ if (!uacce)
+ return -EINVAL;
+
+ isolate_ctx = uacce->isolate_ctx;
+
+#define SECONDS_PER_HOUR 3600
+
+ /* All the hw errs are processed by PF driver */
+ if (uacce->is_vf || isolate_ctx->is_isolate ||
+ !isolate_ctx->hw_err_isolate_hz)
+ return 0;
+
+ hw_err = kzalloc(sizeof(*hw_err), GFP_KERNEL);
+ if (!hw_err)
+ return -ENOMEM;
+
+ hw_err->timestamp = jiffies;
+ list_for_each_entry_safe(err, tmp, &isolate_ctx->hw_errs, list) {
+ if ((hw_err->timestamp - err->timestamp) / HZ >
+ SECONDS_PER_HOUR) {
+ list_del(&err->list);
+ kfree(err);
+ } else {
+ count++;
+ }
+ }
+ list_add(&hw_err->list, &isolate_ctx->hw_errs);
+
+ if (count >= isolate_ctx->hw_err_isolate_hz)
+ isolate_ctx->is_isolate = true;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(uacce_hw_err_isolate);
+
+static void uacce_hw_err_destroy(struct uacce_device *uacce)
+{
+ struct uacce_hw_err *err, *tmp;
+
+ list_for_each_entry_safe(err, tmp, &uacce->isolate_data.hw_errs, list) {
+ list_del(&err->list);
+ kfree(err);
+ }
+}
+
/*
* If the parent driver or the device disappears, the queue state is invalid and
* ops are not usable anymore.
@@ -363,12 +453,59 @@ static ssize_t region_dus_size_show(struct device *dev,
uacce->qf_pg_num[UACCE_QFRT_DUS] << PAGE_SHIFT);
}
+static ssize_t isolate_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct uacce_device *uacce = to_uacce_device(dev);
+ int ret = UACCE_DEV_NORMAL;
+
+ if (uacce->isolate_ctx->is_isolate)
+ ret = UACCE_DEV_ISOLATE;
+
+ return sysfs_emit(buf, "%d\n", ret);
+}
+
+static ssize_t isolate_strategy_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct uacce_device *uacce = to_uacce_device(dev);
+
+ return sysfs_emit(buf, "%u\n", uacce->isolate_ctx->hw_err_isolate_hz);
+}
+
+static ssize_t isolate_strategy_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct uacce_device *uacce = to_uacce_device(dev);
+ unsigned long val;
+
+ /* must be set by PF */
+ if (uacce->is_vf)
+ return -EPERM;
+
+ if (kstrtoul(buf, 0, &val) < 0)
+ return -EINVAL;
+
+ if (val > MAX_ERR_ISOLATE_COUNT)
+ return -EINVAL;
+
+ uacce->isolate_ctx->hw_err_isolate_hz = val;
+
+ /* After the policy is updated, need to reset the hardware err list */
+ uacce_hw_err_destroy(uacce);
+
+ return count;
+}
+
static DEVICE_ATTR_RO(api);
static DEVICE_ATTR_RO(flags);
static DEVICE_ATTR_RO(available_instances);
static DEVICE_ATTR_RO(algorithms);
static DEVICE_ATTR_RO(region_mmio_size);
static DEVICE_ATTR_RO(region_dus_size);
+static DEVICE_ATTR_RO(isolate);
+static DEVICE_ATTR_RW(isolate_strategy);
static struct attribute *uacce_dev_attrs[] = {
&dev_attr_api.attr,
@@ -377,6 +514,8 @@ static struct attribute *uacce_dev_attrs[] = {
&dev_attr_algorithms.attr,
&dev_attr_region_mmio_size.attr,
&dev_attr_region_dus_size.attr,
+ &dev_attr_isolate.attr,
+ &dev_attr_isolate_strategy.attr,
NULL,
};
@@ -392,6 +531,9 @@ static umode_t uacce_dev_is_visible(struct kobject *kobj,
(!uacce->qf_pg_num[UACCE_QFRT_DUS])))
return 0;
+ if (attr == &dev_attr_isolate_strategy.attr && !uacce->isolate_ctx)
+ return 0;
+
return attr->mode;
}
@@ -474,6 +616,7 @@ struct uacce_device *uacce_alloc(struct device *parent,
goto err_with_uacce;
INIT_LIST_HEAD(&uacce->queues);
+ INIT_LIST_HEAD(&uacce->isolate_data.hw_errs);
mutex_init(&uacce->mutex);
device_initialize(&uacce->dev);
uacce->dev.devt = MKDEV(MAJOR(uacce_devt), uacce->dev_id);
@@ -555,6 +698,8 @@ void uacce_remove(struct uacce_device *uacce)
if (uacce->cdev)
cdev_device_del(uacce->cdev, &uacce->dev);
xa_erase(&uacce_xa, uacce->dev_id);
+
+ uacce_hw_err_destroy(uacce);
/*
* uacce exists as long as there are open fds, but ops will be freed
* now. Ensure that bugs cause NULL deref rather than use-after-free.
@@ -12,6 +12,28 @@
struct uacce_queue;
struct uacce_device;
+/**
+ * struct uacce_hw_err - Structure describing the device errors
+ * @list: hardware error log node
+ * @timestamp: timestamp when the error occurred
+ */
+struct uacce_hw_err {
+ struct list_head list;
+ unsigned long long timestamp;
+};
+
+/**
+ * struct uacce_err_isolate - Structure describing the isolation data
+ * @hw_err_isolate_hz: user cfg freq which triggers isolation
+ * @is_isolate: device isolate state
+ * @hw_errs: uacce hardware error list
+ */
+struct uacce_err_isolate {
+ u32 hw_err_isolate_hz;
+ bool is_isolate;
+ struct list_head hw_errs;
+};
+
/**
* struct uacce_qfile_region - structure of queue file region
* @type: type of the region
@@ -57,6 +79,11 @@ struct uacce_interface {
const struct uacce_ops *ops;
};
+enum uacce_dev_state {
+ UACCE_DEV_NORMAL,
+ UACCE_DEV_ISOLATE,
+};
+
enum uacce_q_state {
UACCE_Q_ZOMBIE = 0,
UACCE_Q_INIT,
@@ -101,6 +128,8 @@ struct uacce_queue {
* @dev: dev of the uacce
* @mutex: protects uacce operation
* @priv: private pointer of the uacce
+ * @isolate_data: device isolation data about pf and vf device
+ * @isolate_ctx: isolation ctx about current char device
* @queues: list of queues
* @inode: core vfs
*/
@@ -117,6 +146,8 @@ struct uacce_device {
struct device dev;
struct mutex mutex;
void *priv;
+ struct uacce_err_isolate isolate_data;
+ struct uacce_err_isolate *isolate_ctx;
struct list_head queues;
struct inode *inode;
};
@@ -127,7 +158,8 @@ struct uacce_device *uacce_alloc(struct device *parent,
struct uacce_interface *interface);
int uacce_register(struct uacce_device *uacce);
void uacce_remove(struct uacce_device *uacce);
-
+struct uacce_device *dev_to_uacce(struct device *dev);
+int uacce_hw_err_isolate(struct uacce_device *uacce);
#else /* CONFIG_UACCE */
static inline
@@ -144,6 +176,15 @@ static inline int uacce_register(struct uacce_device *uacce)
static inline void uacce_remove(struct uacce_device *uacce) {}
+static inline struct uacce_device *dev_to_uacce(struct device *dev)
+{
+ return NULL;
+}
+
+int uacce_hw_err_isolate(struct uacce_device *uacce)
+{
+ return -EINVAL;
+}
#endif /* CONFIG_UACCE */
#endif /* _LINUX_UACCE_H */