| 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: <1288958986-26511-1-git-send-email-samu.p.onkalo@nokia.com>
Date: Fri, 5 Nov 2010 14:09:46 +0200
From: Samu Onkalo <samu.p.onkalo@...ia.com>
To: hmh@....eng.br, alan@...ux.intel.com, akpm@...ux-foundation.org,
gregkh@...e.de
Cc: samu.p.onkalo@...ia.com, linux-kernel@...r.kernel.org
Subject: [PATCH v2] sysfs: device-core: open - close notifier
Device drivers have no idea when somebody in userspace keeps some sysfs entry
open. The driver just receives read or write calls. The driver may want to
control HW state based on activity so it either have to turn HW on and off
for each sysfs access or it needs separate enable disable entry which controls
the HW state. In cases where sysfs is used to pass some events under interrupt
control (like proximity events from the proximity sensors) it is not enough to
just keep sysfs entry open in userspace.
This patch adds a possibility for driver to know when some sysfs entry is
open.
Device driver structure is enhanced with sysfs_open_close method.
With the help from sysfs file control, device core calls that function
when ever a sysfs attribute is opened or closed.
Driver just have to provide function pointer to by setting up sysfs_open_close
in device_driver struct. Otherwise sysfs file creation or removal is not
affected.
In my test compilation in 32 bit system total impact to memory consumption
is about 500 bytes.
Signed-off-by: Samu Onkalo <samu.p.onkalo@...ia.com>
---
drivers/base/core.c | 14 ++++++++++++++
fs/sysfs/file.c | 17 ++++++++++++++++-
include/linux/device.h | 2 ++
include/linux/sysfs.h | 4 ++++
4 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 6ed6454..879404b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -112,9 +112,23 @@ static ssize_t dev_attr_store(struct kobject *kobj, struct attribute *attr,
return ret;
}
+static int dev_attr_open_close(struct kobject *kobj, struct attribute *attr,
+ int mode)
+{
+ struct device *dev = to_dev(kobj);
+ int ret = 0;
+ if (dev->driver && unlikely(dev->driver->sysfs_open_close)) {
+ ret = dev->driver->sysfs_open_close(dev, attr, mode);
+ if (unlikely(ret > 0))
+ ret = 0; /* Caller expects error code or zero */
+ }
+ return ret;
+}
+
static const struct sysfs_ops dev_sysfs_ops = {
.show = dev_attr_show,
.store = dev_attr_store,
+ .open_close = dev_attr_open_close,
};
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index da3fefe..0a1cc2f 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -392,10 +392,19 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
if (error)
goto err_free;
+ /* Notify about open dirent */
+ if (ops->open_close) {
+ error = ops->open_close(kobj, attr_sd->s_attr.attr,
+ SYSFS_OPEN_NOTIFY);
+ if (error)
+ goto err_open;
+ }
+
/* open succeeded, put active references */
sysfs_put_active(attr_sd);
return 0;
-
+err_open:
+ sysfs_put_open_dirent(attr_sd, buffer);
err_free:
kfree(buffer);
err_out:
@@ -407,6 +416,12 @@ static int sysfs_release(struct inode *inode, struct file *filp)
{
struct sysfs_dirent *sd = filp->f_path.dentry->d_fsdata;
struct sysfs_buffer *buffer = filp->private_data;
+ struct kobject *kobj = sd->s_parent->s_dir.kobj;
+ const struct sysfs_ops *ops = kobj->ktype->sysfs_ops;
+
+ /* Notify about dirent release */
+ if (ops->open_close)
+ ops->open_close(kobj, sd->s_attr.attr, SYSFS_CLOSE_NOTIFY);
sysfs_put_open_dirent(sd, buffer);
diff --git a/include/linux/device.h b/include/linux/device.h
index dd48953..599ff9f 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -138,6 +138,8 @@ struct device_driver {
void (*shutdown) (struct device *dev);
int (*suspend) (struct device *dev, pm_message_t state);
int (*resume) (struct device *dev);
+ int (*sysfs_open_close) (struct device *dev, struct attribute *,
+ int mode);
const struct attribute_group **groups;
const struct dev_pm_ops *pm;
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 30b8815..a8fe118 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -112,8 +112,12 @@ struct bin_attribute {
struct sysfs_ops {
ssize_t (*show)(struct kobject *, struct attribute *,char *);
ssize_t (*store)(struct kobject *,struct attribute *,const char *, size_t);
+ int (*open_close)(struct kobject *, struct attribute *, int mode);
};
+#define SYSFS_CLOSE_NOTIFY 0
+#define SYSFS_OPEN_NOTIFY 1
+
struct sysfs_dirent;
#ifdef CONFIG_SYSFS
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists