Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752207Ab3EIS6y (ORCPT ); Thu, 9 May 2013 14:58:54 -0400 Received: from mail-qc0-f202.google.com ([209.85.216.202]:47755 "EHLO mail-qc0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751727Ab3EIS6w (ORCPT ); Thu, 9 May 2013 14:58:52 -0400 From: Greg Thelen To: Seth Jennings Cc: Andrew Morton , Greg Kroah-Hartman , Nitin Gupta , Minchan Kim , Konrad Rzeszutek Wilk , Dan Magenheimer , Robert Jennings , Jenifer Hopper , Mel Gorman , Johannes Weiner , Rik van Riel , Larry Woodman , Benjamin Herrenschmidt , Dave Hansen , Joe Perches , Joonsoo Kim , Cody P Schafer , Hugh Dickens , Paul Mackerras , Heesub Shin , linux-mm@kvack.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Subject: Re: [PATCHv10 1/4] debugfs: add get/set for atomic types References: <1368052661-27143-1-git-send-email-sjenning@linux.vnet.ibm.com> <1368052661-27143-2-git-send-email-sjenning@linux.vnet.ibm.com> Date: Thu, 09 May 2013 11:58:49 -0700 In-Reply-To: <1368052661-27143-2-git-send-email-sjenning@linux.vnet.ibm.com> (Seth Jennings's message of "Wed, 8 May 2013 17:37:38 -0500") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4219 Lines: 101 On Wed, May 08 2013, Seth Jennings wrote: > debugfs currently lack the ability to create attributes > that set/get atomic_t values. > > This patch adds support for this through a new > debugfs_create_atomic_t() function. > > Signed-off-by: Seth Jennings > Acked-by: Greg Kroah-Hartman > Acked-by: Mel Gorman > --- > fs/debugfs/file.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > include/linux/debugfs.h | 2 ++ > 2 files changed, 44 insertions(+) > > diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c > index c5ca6ae..fa26d5b 100644 > --- a/fs/debugfs/file.c > +++ b/fs/debugfs/file.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > > static ssize_t default_read_file(struct file *file, char __user *buf, > size_t count, loff_t *ppos) > @@ -403,6 +404,47 @@ struct dentry *debugfs_create_size_t(const char *name, umode_t mode, > } > EXPORT_SYMBOL_GPL(debugfs_create_size_t); > > +static int debugfs_atomic_t_set(void *data, u64 val) > +{ > + atomic_set((atomic_t *)data, val); > + return 0; > +} > +static int debugfs_atomic_t_get(void *data, u64 *val) > +{ > + *val = atomic_read((atomic_t *)data); > + return 0; > +} > +DEFINE_SIMPLE_ATTRIBUTE(fops_atomic_t, debugfs_atomic_t_get, > + debugfs_atomic_t_set, "%llu\n"); > +DEFINE_SIMPLE_ATTRIBUTE(fops_atomic_t_ro, debugfs_atomic_t_get, NULL, "%llu\n"); > +DEFINE_SIMPLE_ATTRIBUTE(fops_atomic_t_wo, NULL, debugfs_atomic_t_set, "%llu\n"); > + > +/** > + * debugfs_create_atomic_t - create a debugfs file that is used to read and > + * write an atomic_t value > + * @name: a pointer to a string containing the name of the file to create. > + * @mode: the permission that the file should have > + * @parent: a pointer to the parent dentry for this file. This should be a > + * directory dentry if set. If this parameter is %NULL, then the > + * file will be created in the root of the debugfs filesystem. > + * @value: a pointer to the variable that the file should read to and write > + * from. > + */ > +struct dentry *debugfs_create_atomic_t(const char *name, umode_t mode, > + struct dentry *parent, atomic_t *value) > +{ > + /* if there are no write bits set, make read only */ > + if (!(mode & S_IWUGO)) > + return debugfs_create_file(name, mode, parent, value, > + &fops_atomic_t_ro); > + /* if there are no read bits set, make write only */ > + if (!(mode & S_IRUGO)) > + return debugfs_create_file(name, mode, parent, value, > + &fops_atomic_t_wo); > + > + return debugfs_create_file(name, mode, parent, value, &fops_atomic_t); > +} > +EXPORT_SYMBOL_GPL(debugfs_create_atomic_t); > > static ssize_t read_file_bool(struct file *file, char __user *user_buf, > size_t count, loff_t *ppos) > diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h > index 63f2465..d68b4ea 100644 > --- a/include/linux/debugfs.h > +++ b/include/linux/debugfs.h > @@ -79,6 +79,8 @@ struct dentry *debugfs_create_x64(const char *name, umode_t mode, > struct dentry *parent, u64 *value); > struct dentry *debugfs_create_size_t(const char *name, umode_t mode, > struct dentry *parent, size_t *value); > +struct dentry *debugfs_create_atomic_t(const char *name, umode_t mode, > + struct dentry *parent, atomic_t *value); > struct dentry *debugfs_create_bool(const char *name, umode_t mode, > struct dentry *parent, u32 *value); Looking at v3.9 I see a conflicting definition of debugfs_create_atomic_t() in lib/fault-inject.c. A kernel with this patch and CONFIG_FAULT_INJECTION=y and CONFIG_FAULT_INJECTION_DEBUG_FS=y will not build: lib/fault-inject.c:196:23: error: static declaration of 'debugfs_create_atomic_t' follows non-static declaration include/linux/debugfs.h:87:16: note: previous declaration of 'debugfs_create_atomic_t' was here -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/