Chainsaw efivars.c
Subsystems (3)
cover Chainsaw efivars.c
From: Matt Fleming <[email protected]>
drivers/firmware/efivars.c has grown pretty large and is ~2K lines.
Inside efivars.c there's currently,
o code for handling EFI variables at the firmware-level
o sysfs code for exposing EFI variables
o a new EFI variable filesystem
o a persistent storage backend
all intertwined and smushed together. This situation is only going to get worse as new EFI support is added.
We need an interface that hides the EFI variable operations in use so code isn't tempted to access them directly, e.g. efivarfs currently uses '__efivars' which means it doesn't work for CONFIG_GOOGLE_SMI as that uses different variable ops. With this interface in place, we can start moving independent code out into separate files, allowing users to only turn on the functionality that they want.
This patch series introduces the new efivar_entry API, and splits out the major parts of efivars.c into new files. There's more work TODO, but this is at least a start.
The series is also available on the 'chainsaw' branch at,
git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/linux.git
Comments welcome.
Matt Fleming (7):
efivars: Keep a private global pointer to efivars
efi: Move utf16_strlen() to efi.h
efivars: New efivar_entry API drivers/firmware: Create a new EFI drivers directory
efivars: Move pstore code out of efivars.c
efi: Add generic variable operations
efivarfs: Move to fs/efivarfs
MAINTAINERS | 12 +- drivers/firmware/Kconfig | 18 +- drivers/firmware/Makefile | 1 + drivers/firmware/efi/Kconfig | 56 + drivers/firmware/efi/Makefile | 6 + drivers/firmware/efi/generic-ops.c | 52 + drivers/firmware/efi/pstore.c | 239 +++++ drivers/firmware/efi/sysfs.c | 549 ++++++++++ drivers/firmware/efivars.c | 2068 +++++++++--------------------------- drivers/firmware/google/Kconfig | 6 +- drivers/firmware/google/gsmi.c | 30 +- fs/Kconfig | 1 + fs/Makefile | 1 + fs/efivarfs/Kconfig | 12 + fs/efivarfs/Makefile | 7 + fs/efivarfs/file.c | 130 +++ fs/efivarfs/inode.c | 179 ++++ fs/efivarfs/internal.h | 18 + fs/efivarfs/super.c | 233 ++++ include/linux/efi.h | 120 ++- 20 files changed, 2120 insertions(+), 1618 deletions(-) create mode 100644 drivers/firmware/efi/Kconfig create mode 100644 drivers/firmware/efi/Makefile create mode 100644 drivers/firmware/efi/generic-ops.c create mode 100644 drivers/firmware/efi/pstore.c create mode 100644 drivers/firmware/efi/sysfs.c create mode 100644 fs/efivarfs/Kconfig create mode 100644 fs/efivarfs/Makefile create mode 100644 fs/efivarfs/file.c create mode 100644 fs/efivarfs/inode.c create mode 100644 fs/efivarfs/internal.h create mode 100644 fs/efivarfs/super.c
Signature · 1 line
1.7.11.7
A message that is not in the archive (sent off-list or not yet received): 1360357158-8168-1-git-send-email-matt-HNK1S37rvNbeXh+fF434Mdi2O/[email protected]
RFC PATCH 1/7 efivars: Keep a private global pointer to efivars
From: Matt Fleming <[email protected]>
This may seem like a step backwards in terms of modularity, but we don't need to track more than one 'struct efivars' at one time. There is no synchronisation done between multiple EFI variable operations, and according to Mike no one is using both the generic EFI var ops and CONFIG_GOOGLE_SMI.
Make this explicit by returning -EBUSY if someone has already called register_efivars().
--- drivers/firmware/efivars.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/firmware/efivars.c +20 -11
@@ -132,8 +132,11 @@ struct efivar_attribute {ssize_t (*store)(struct efivar_entry *entry,const char *buf,size_t count); }; -static struct efivars __efivars; -static struct efivar_operations ops; +static struct efivars generic_efivars; +static struct efivar_operations generic_ops; + +/* Private pointer to registered efivars */ +static struct efivars *__efivars;#define PSTORE_EFI_ATTRIBUTES \ (EFI_VARIABLE_NON_VOLATILE | \
@@ -974,7 +977,7 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl) {struct inode *inode; -struct efivars *efivars = &__efivars; +struct efivars *efivars = __efivars;struct efivar_entry *var;int namelen, i =0 , err =0 ;
@@ -1140,7 +1143,7 @@ static int efivarfs_fill_super(struct super_block *sb, void *data, int silent)struct inode *inode =NULL ;struct dentry *root;struct efivar_entry *entry, *n; -struct efivars *efivars = &__efivars; +struct efivars *efivars = __efivars;char *name; efivarfs_sb = sb;
@@ -1835,6 +1838,12 @@ int register_efivars(struct efivars *efivars,unsigned long variable_name_size =1024 ;int error =0 ; +if (__efivars) { +return -EBUSY ; + } + + __efivars = efivars; + variable_name =kzalloc (variable_name_size,GFP_KERNEL );if (!variable_name) {printk (KERN_ERR "efivars: Memory allocation failed.\n" );
@@ -1937,12 +1946,12 @@ efivars_init(void)return -ENOMEM ; } - ops.get_variable = efi.get_variable; - ops.set_variable = efi.set_variable; - ops.get_next_variable = efi.get_next_variable; - ops.query_variable_info = efi.query_variable_info; + generic_ops.get_variable = efi.get_variable; + generic_ops.set_variable = efi.set_variable; + generic_ops.get_next_variable = efi.get_next_variable; + generic_ops.query_variable_info = efi.query_variable_info; - error =register_efivars (&__efivars, &ops, efi_kobj); + error =register_efivars (&generic_efivars, &generic_ops, efi_kobj);if (error) goto err_put;
@@ -1958,7 +1967,7 @@ efivars_init(void)return 0 ; err_unregister: -unregister_efivars (&__efivars); +unregister_efivars (&generic_efivars); err_put:kobject_put (efi_kobj);return error;
@@ -1968,7 +1977,7 @@ static void __exitefivars_exit (void) {if (efi_enabled (EFI_RUNTIME_SERVICES )) { -unregister_efivars (&__efivars); +unregister_efivars (&generic_efivars);kobject_put (efi_kobj); } }
Signature · 1 line
1.7.11.7
RFC PATCH 2/7 efi: Move utf16_strlen() to efi.h
In reply to a message not in the archiveFrom: Matt Fleming <[email protected]>
There are two places where utf16_strlen() is used - we only need one implementation.
--- drivers/firmware/efivars.c | 17 ----------------- drivers/firmware/google/gsmi.c | 19 ++++--------------- include/linux/efi.h | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 32 deletions(-)
drivers/firmware/efivars.c +0 -17
@@ -162,23 +162,6 @@ efivar_create_sysfs_entry(struct efivars *efivars, efi_char16_t *variable_name, efi_guid_t *vendor_guid); -/* Return the number of unicode characters in data */ -static unsigned long -utf16_strnlen (efi_char16_t *s,size_t maxlength) -{ -unsigned long length =0 ; - -while (*s++ !=0 && length < maxlength) - length++; -return length; -} - -static inline unsigned long -utf16_strlen (efi_char16_t *s) -{ -return utf16_strnlen (s, ~0UL ); -} -/* * Return the number of bytes is the length of this string * Note: this is NOT the same as the number of unicode characters
drivers/firmware/google/gsmi.c +4 -15
@@ -288,17 +288,6 @@ static int gsmi_exec(u8 func, u8 sub)return rc; } -/* Return the number of unicode characters in data */ -static size_t -utf16_strlen (efi_char16_t *data,unsigned long maxlength) -{ -unsigned long length =0 ; - -while (*data++ !=0 && length < maxlength) - length++; -return length; -} - static efi_status_t gsmi_get_variable(efi_char16_t *name, efi_guid_t *vendor, u32 *attr, unsigned long *data_size,
@@ -311,7 +300,7 @@ static efi_status_t gsmi_get_variable(efi_char16_t *name, };efi_status_t ret =EFI_SUCCESS ;unsigned long flags; -size_t name_len =utf16_strlen (name,GSMI_BUF_SIZE /2 ); +size_t name_len =utf16_strnlen (name,GSMI_BUF_SIZE /2 );int rc;if (name_len >=GSMI_BUF_SIZE /2 )
@@ -380,7 +369,7 @@ static efi_status_t gsmi_get_next_variable(unsigned long *name_size,return EFI_BAD_BUFFER_SIZE ;/* Let's make sure the thing is at least null-terminated */ -if (utf16_strlen (name,GSMI_BUF_SIZE /2 ) ==GSMI_BUF_SIZE /2 ) +if (utf16_strnlen (name,GSMI_BUF_SIZE /2 ) ==GSMI_BUF_SIZE /2 )return EFI_INVALID_PARAMETER ;spin_lock_irqsave (&gsmi_dev.lock, flags);
@@ -408,7 +397,7 @@ static efi_status_t gsmi_get_next_variable(unsigned long *name_size,/* Copy the name back */ memcpy (name, gsmi_dev.name_buf->start,GSMI_BUF_SIZE ); - *name_size =utf16_strlen (name,GSMI_BUF_SIZE /2 ) *2 ; + *name_size =utf16_strnlen (name,GSMI_BUF_SIZE /2 ) *2 ;/* copy guid to return buffer */ memcpy (vendor, ¶m.guid,sizeof (param.guid));
@@ -434,7 +423,7 @@ static efi_status_t gsmi_set_variable(efi_char16_t *name,EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, }; -size_t name_len =utf16_strlen (name,GSMI_BUF_SIZE /2 ); +size_t name_len =utf16_strnlen (name,GSMI_BUF_SIZE /2 );efi_status_t ret =EFI_SUCCESS ;int rc;unsigned long flags;
include/linux/efi.h +17 -0
@@ -719,6 +719,23 @@ static inline void memrange_efi_to_native(u64 *addr, u64 *npages) *addr &=PAGE_MASK ; } +/* Return the number of unicode characters in data */ +static inline unsigned long +utf16_strnlen (efi_char16_t *s,size_t maxlength) +{ +unsigned long length =0 ; + +while (*s++ !=0 && length < maxlength) + length++; +return length; +} + +static inline unsigned long +utf16_strlen (efi_char16_t *s) +{ +return utf16_strnlen (s, ~0UL ); +} +#if defined(CONFIG_EFI_VARS ) || defined(CONFIG_EFI_VARS_MODULE )/* * EFI Variable support.
Signature · 1 line
1.7.11.7
RFC PATCH 3/7 efivars: New efivar_entry API
In reply to a message not in the archiveFrom: Matt Fleming <[email protected]>
There isn't really a formalised interface for dealing with EFI variables or struct efivar_entry. This has led to the efivarfs code directly accessing '__efivars'.
Encapsulate everything that needs to access '__efivars' inside an efivar_entry_* API and use the new API in the pstore, sysfs and efivarfs code.
Much of the efivars code had to be rewritten to use this new API. For instance, it's now up to the users of the API to build the initial list of EFI variables in their efivar_init() callback function. This greatly benefits the efivarfs code which needs to allocate inodes and dentries for every variable, which it previously did in a racy way because the code ran without holding the variable spinlock.
Now, the core EFI variable code creates /sys/firmware/efi/ and the separated sysfs code creates /sys/firmware/efi/vars (or whatever parent_obj points at for CONFIG_GOOGLE_SMI).
A nice side effect of this change is that efivarfs is now usable with CONFIG_GOOGLE_SMI, because it no longer accesses '__efivars' directly.
--- drivers/firmware/efivars.c | 1523 +++++++++++++++++++++++----------------- drivers/firmware/google/gsmi.c | 11 +- include/linux/efi.h | 71 +- 3 files changed, 958 insertions(+), 647 deletions(-)
drivers/firmware/efivars.c +885 -638
@@ -97,35 +97,6 @@ MODULE_VERSION(EFIVARS_VERSION);#define DUMP_NAME_LEN 52 -/* -* Length of a GUID string (strlen("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")) -* not including trailing NUL -*/ -#define GUID_LEN 36 - -/* -* The maximum size of VariableName + Data = 1024 -* Therefore, it's reasonable to save that much -* space in each part of the structure, -* and we use a page for reading/writing. -*/ - -struct efi_variable { -efi_char16_t VariableName[1024 /sizeof (efi_char16_t)]; -efi_guid_t VendorGuid; -unsigned long DataSize; -__u8 Data[1024 ]; -efi_status_t Status; -__u32 Attributes; -} __attribute__((packed)); - -struct efivar_entry { -struct efivars *efivars; -struct efi_variable var; -struct list_head list; -struct kobject kobj; -}; -struct efivar_attribute {struct attribute attr;ssize_t (*show) (struct efivar_entry *entry,char *buf);
@@ -143,6 +114,11 @@ static struct efivars *__efivars; EFI_VARIABLE_BOOTSERVICE_ACCESS | \ EFI_VARIABLE_RUNTIME_ACCESS) +static struct kset *efivars_kset; + +static struct bin_attribute *efivars_new_var; +static struct bin_attribute *efivars_del_var; +#define EFIVAR_ATTR (_name, _mode, _show, _store) \ struct efivar_attribute efivar_attr_##_name = { \ .attr = {.name = __stringify(_name), .mode = _mode}, \
@@ -154,15 +130,6 @@ struct efivar_attribute efivar_attr_##_name = { \#define to_efivar_entry (obj) container_of(obj, struct efivar_entry, kobj)/* -* Prototype for sysfs creation function -*/ -static int -efivar_create_sysfs_entry (struct efivars *efivars, -unsigned long variable_name_size, -efi_char16_t *variable_name, -efi_guid_t *vendor_guid); - -/* * Return the number of bytes is the length of this string * Note: this is NOT the same as the number of unicode characters */
@@ -337,8 +304,8 @@ static const struct variable_validate variable_validate[] = { { "", NULL }, }; -static bool -validate_var (struct efi_variable *var,u8 *data,unsigned long len) +bool +efivar_validate (struct efi_variable *var,u8 *data,unsigned long len) {int i;u16 *unicode_name = var->VariableName;
@@ -373,36 +340,7 @@ validate_var(struct efi_variable *var, u8 *data, unsigned long len)return true; } - -static efi_status_t -get_var_data_locked (struct efivars *efivars,struct efi_variable *var) -{ -efi_status_t status; - - var->DataSize =1024 ; - status = efivars->ops->get_variable (var->VariableName, - &var->VendorGuid, - &var->Attributes, - &var->DataSize, - var->Data); -return status; -} - -static efi_status_t -get_var_data (struct efivars *efivars,struct efi_variable *var) -{ -efi_status_t status; - -spin_lock (&efivars->lock); - status =get_var_data_locked (efivars, var); -spin_unlock (&efivars->lock); - -if (status !=EFI_SUCCESS ) { -printk (KERN_WARNING "efivars: get_variable() failed 0x%lx!\n" , - status); - } -return status; -} +EXPORT_SYMBOL_GPL (efivar_validate);static ssize_t efivar_guid_read (struct efivar_entry *entry,char *buf)
@@ -425,13 +363,12 @@ efivar_attr_read(struct efivar_entry *entry, char *buf) {struct efi_variable *var = &entry->var;char *str = buf; -efi_status_t status;if (!entry || !buf)return -EINVAL ; - status =get_var_data (entry->efivars, var); -if (status !=EFI_SUCCESS ) + var->DataSize =1024 ; +if (efivar_entry_get (entry, &var->Attributes, &var->DataSize, var->Data))return -EIO ;if (var->Attributes &EFI_VARIABLE_NON_VOLATILE )
@@ -459,13 +396,12 @@ efivar_size_read(struct efivar_entry *entry, char *buf) {struct efi_variable *var = &entry->var;char *str = buf; -efi_status_t status;if (!entry || !buf)return -EINVAL ; - status =get_var_data (entry->efivars, var); -if (status !=EFI_SUCCESS ) + var->DataSize =1024 ; +if (efivar_entry_get (entry, &var->Attributes, &var->DataSize, var->Data))return -EIO ; str +=sprintf (str,"0x%lx\n" , var->DataSize);
@@ -476,13 +412,12 @@ static ssize_t efivar_data_read(struct efivar_entry *entry, char *buf) { struct efi_variable *var = &entry->var; -efi_status_t status;if (!entry || !buf)return -EINVAL ; - status =get_var_data (entry->efivars, var); -if (status !=EFI_SUCCESS ) + var->DataSize =1024 ; +if (efivar_entry_get (entry, &var->Attributes, &var->DataSize, var->Data))return -EIO ;memcpy (buf, var->Data, var->DataSize);
@@ -496,8 +431,7 @@ static ssize_t efivar_store_raw(struct efivar_entry *entry, const char *buf, size_t count) { struct efi_variable *new_var, *var = &entry->var; -struct efivars *efivars = entry->efivars; -efi_status_t status =EFI_NOT_FOUND ; +int err;if (count !=sizeof (struct efi_variable ))return -EINVAL ;
@@ -519,27 +453,20 @@ efivar_store_raw(struct efivar_entry *entry, const char *buf, size_t count) }if ((new_var->Attributes & ~EFI_VARIABLE_MASK ) !=0 || -validate_var (new_var, new_var->Data, new_var->DataSize) == false) { +efivar_validate (new_var, new_var->Data, new_var->DataSize) == false) {printk (KERN_ERR "efivars: Malformed variable content\n" );return -EINVAL ; } -spin_lock (&efivars->lock); - status = efivars->ops->set_variable (new_var->VariableName, - &new_var->VendorGuid, - new_var->Attributes, - new_var->DataSize, - new_var->Data); - -spin_unlock (&efivars->lock); +memcpy (&entry->var, new_var, count); -if (status !=EFI_SUCCESS ) { -printk (KERN_WARNING "efivars: set_variable() failed: status=%lx\n" , - status); + err =efivar_entry_set (entry, new_var->Attributes, + new_var->DataSize, new_var->Data, false); +if (err) { +printk (KERN_WARNING "efivars: set_variable() failed: status=%d\n" , err);return -EIO ; } -memcpy (&entry->var, new_var, count);return count; }
@@ -547,16 +474,16 @@ static ssize_t efivar_show_raw(struct efivar_entry *entry, char *buf) { struct efi_variable *var = &entry->var; -efi_status_t status;if (!entry || !buf)return 0 ; - status =get_var_data (entry->efivars, var); -if (status !=EFI_SUCCESS ) +memcpy (buf, var,sizeof (*var)); + +if (efivar_entry_get (entry, &entry->var.Attributes, + &entry->var.DataSize, entry->var.Data))return -EIO ; -memcpy (buf, var,sizeof (*var));return sizeof (*var); }
@@ -645,6 +572,9 @@ static int efi_status_to_err(efi_status_t status)int err;switch (status) { +case EFI_SUCCESS : + err =0 ; +break ;case EFI_INVALID_PARAMETER : err = -EINVAL ;break ;
@@ -661,7 +591,7 @@ static int efi_status_to_err(efi_status_t status) err = -EACCES ;break ;case EFI_NOT_FOUND : - err = -EIO ; + err = -ENOENT ;break ;default : err = -EINVAL ;
@@ -674,15 +604,14 @@ static ssize_t efivarfs_file_write(struct file *file, const char __user *userbuf, size_t count, loff_t *ppos) { struct efivar_entry *var = file->private_data; -struct efivars *efivars; -efi_status_t status;void *data;u32 attributes;struct inode *inode = file->f_mapping->host;unsigned long datasize = count -sizeof (attributes); -unsigned long newdatasize;u64 storage_size, remaining_size, max_size;ssize_t bytes =0 ; +bool set = false; +int err;if (count <sizeof (attributes))return -EINVAL ;
@@ -693,28 +622,16 @@ static ssize_t efivarfs_file_write(struct file *file,if (attributes & ~(EFI_VARIABLE_MASK ))return -EINVAL ; - efivars = var->efivars; -/* * Ensure that the user can't allocate arbitrarily large * amounts of memory. Pick a default size of 64K if * QueryVariableInfo() isn't supported by the firmware. */ -spin_lock (&efivars->lock); - -if (!efivars->ops->query_variable_info) - status =EFI_UNSUPPORTED ; -else { -const struct efivar_operations *fops = efivars->ops; - status = fops->query_variable_info (attributes, &storage_size, - &remaining_size, &max_size); - } - -spin_unlock (&efivars->lock); - -if (status !=EFI_SUCCESS ) { -if (status !=EFI_UNSUPPORTED ) -return efi_status_to_err (status); + err =efivar_query_info (attributes, &storage_size, + &remaining_size, &max_size); +if (err) { +if (err != -ENOSYS ) +return err; remaining_size =65536 ; }
@@ -731,64 +648,23 @@ static ssize_t efivarfs_file_write(struct file *file, goto out; } -if (validate_var (&var->var, data, datasize) == false) { - bytes = -EINVAL ; + bytes =efivar_entry_set_get_size (var, attributes, &datasize, + data, &set); +if (!set && bytes) goto out; - } - -/* -* The lock here protects the get_variable call, the conditional -* set_variable call, and removal of the variable from the efivars -* list (in the case of an authenticated delete). -*/ -spin_lock (&efivars->lock); - - status = efivars->ops->set_variable (var->var.VariableName, - &var->var.VendorGuid, - attributes, datasize, - data); - -if (status !=EFI_SUCCESS ) { -spin_unlock (&efivars->lock); -kfree (data); - -return efi_status_to_err (status); - } - - bytes = count; - -/* -* Writing to the variable may have caused a change in size (which -* could either be an append or an overwrite), or the variable to be -* deleted. Perform a GetVariable() so we can tell what actually -* happened. -*/ - newdatasize =0 ; - status = efivars->ops->get_variable (var->var.VariableName, - &var->var.VendorGuid, -NULL , &newdatasize, -NULL ); - -if (status ==EFI_BUFFER_TOO_SMALL ) { -spin_unlock (&efivars->lock); -mutex_lock (&inode->i_mutex); -i_size_write (inode, newdatasize +sizeof (attributes)); -mutex_unlock (&inode->i_mutex); - }else if (status ==EFI_NOT_FOUND ) { -list_del (&var->list); -spin_unlock (&efivars->lock); -efivar_unregister (var); +if (bytes == -ENOENT ) {drop_nlink (inode);d_delete (file->f_dentry);dput (file->f_dentry); - }else { -spin_unlock (&efivars->lock); -pr_warn ("efivarfs: inconsistent EFI variable implementation? " -"status = %lx\n" , status); +mutex_lock (&inode->i_mutex); +i_size_write (inode, datasize +sizeof (attributes)); +mutex_unlock (&inode->i_mutex); } + bytes = count; + out:kfree (data);
@@ -799,38 +675,25 @@ static ssize_t efivarfs_file_read(struct file *file, char __user *userbuf, size_t count, loff_t *ppos) { struct efivar_entry *var = file->private_data; -struct efivars *efivars = var->efivars; -efi_status_t status;unsigned long datasize =0 ;u32 attributes;void *data;ssize_t size =0 ; +int err; -spin_lock (&efivars->lock); - status = efivars->ops->get_variable (var->var.VariableName, - &var->var.VendorGuid, - &attributes, &datasize,NULL ); -spin_unlock (&efivars->lock); - -if (status !=EFI_BUFFER_TOO_SMALL ) -return efi_status_to_err (status); + err =efivar_entry_size (var, &datasize); +if (err) +return err; data =kmalloc (datasize +sizeof (attributes),GFP_KERNEL );if (!data)return -ENOMEM ; -spin_lock (&efivars->lock); - status = efivars->ops->get_variable (var->var.VariableName, - &var->var.VendorGuid, - &attributes, &datasize, - (data +sizeof (attributes))); -spin_unlock (&efivars->lock); - -if (status !=EFI_SUCCESS ) { - size =efi_status_to_err (status); + size =efivar_entry_get (var, &attributes, &datasize, + data +sizeof (attributes)); +if (size) goto out_free; - }memcpy (data, &attributes,sizeof (attributes)); size = simple_read_from_buffer(userbuf, count, ppos,
@@ -905,7 +768,7 @@ static bool efivarfs_valid_name(const char *str, int len)* We need a GUID, plus at least one letter for the variable name, * plus the '-' separator */ -if (len <GUID_LEN +2 ) +if (len <EFI_VARIABLE_GUID_LEN +2 )return false; s =strchr (str,'-' );
@@ -915,7 +778,7 @@ static bool efivarfs_valid_name(const char *str, int len) s++;/* Skip '-' */ /* Ensure we have enough characters for a GUID */ -if (len - (s - str) !=GUID_LEN ) +if (len - (s - str) !=EFI_VARIABLE_GUID_LEN )return false;/*
@@ -929,7 +792,7 @@ static bool efivarfs_valid_name(const char *str, int len)return false; } -if (j <GUID_LEN && s[j] !='-' ) +if (j <EFI_VARIABLE_GUID_LEN && s[j] !='-' )return false; }
@@ -960,7 +823,6 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl) {struct inode *inode; -struct efivars *efivars = __efivars;struct efivar_entry *var;int namelen, i =0 , err =0 ;
@@ -978,7 +840,7 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry, }/* length of the variable name itself: remove GUID and separator */ - namelen = dentry->d_name.len -GUID_LEN -1 ; + namelen = dentry->d_name.len -EFI_VARIABLE_GUID_LEN -1 ;efivarfs_hex_to_guid (dentry->d_name.name + namelen +1 , &var->var.VendorGuid);
@@ -989,18 +851,8 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry, var->var.VariableName[i] ='\0' ; inode->i_private = var; - var->efivars = efivars; - var->kobj.kset = efivars->kset; - - err =kobject_init_and_add (&var->kobj, &efivar_ktype,NULL ,"%s" , - dentry->d_name.name); -if (err) - goto out; -kobject_uevent (&var->kobj,KOBJ_ADD ); -spin_lock (&efivars->lock); -list_add (&var->list, &efivars->list); -spin_unlock (&efivars->lock); +efivar_entry_add (var);d_instantiate (dentry, inode);dget (dentry); out:
@@ -1014,26 +866,13 @@ out:static int efivarfs_unlink (struct inode *dir,struct dentry *dentry) {struct efivar_entry *var = dentry->d_inode->i_private; -struct efivars *efivars = var->efivars; -efi_status_t status; - -spin_lock (&efivars->lock); - status = efivars->ops->set_variable (var->var.VariableName, - &var->var.VendorGuid, -0 ,0 ,NULL ); - -if (status ==EFI_SUCCESS || status ==EFI_NOT_FOUND ) { -list_del (&var->list); -spin_unlock (&efivars->lock); -efivar_unregister (var); -drop_nlink (dentry->d_inode); -dput (dentry); -return 0 ; - } +if (efivar_entry_delete (var)) +return -EINVAL ; -spin_unlock (&efivars->lock); -return -EINVAL ; +drop_nlink (dentry->d_inode); +dput (dentry); +return 0 ; };/*
@@ -1121,13 +960,65 @@ static struct dentry_operations efivarfs_d_ops = { .d_delete = efivarfs_delete_dentry, }; +static int efivarfs_callback (struct efivar_entry *entry,void *data) +{ +struct super_block *sb = (struct super_block *)data; +struct inode *inode =NULL ; +struct dentry *dentry, *root = sb->s_root; +unsigned long size =0 ; +char *name; +int len, i; + + len =utf16_strlen (entry->var.VariableName); + +/* name, plus '-', plus GUID, plus NUL*/ + name =kmalloc (len +1 +EFI_VARIABLE_GUID_LEN +1 ,GFP_KERNEL ); +if (!name) + goto fail; + +for (i =0 ; i < len; i++) + name[i] = entry->var.VariableName[i] &0xFF ; + + name[len] ='-' ; + +efi_guid_unparse (&entry->var.VendorGuid, name + len +1 ); + + name[len +EFI_VARIABLE_GUID_LEN +1 ] ='\0' ; + + inode =efivarfs_get_inode (sb, root->d_inode,S_IFREG |0644 ,0 ); +if (!inode) + goto fail_name; + + dentry =d_alloc_name (root, name); +if (!dentry) + goto fail_inode; + +/* copied by the above to local storage in the dentry. */ +kfree (name); + +efivar_entry_size (entry, &size); +efivar_entry_add (entry); + +mutex_lock (&inode->i_mutex); + inode->i_private = entry; +i_size_write (inode, size +sizeof (entry->var.Attributes)); +mutex_unlock (&inode->i_mutex); +d_add (dentry, inode); + +return 0 ; + +fail_inode: +iput (inode); +fail_name: +kfree (name); +fail: +return -ENOMEM ; +} +static int efivarfs_fill_super (struct super_block *sb,void *data,int silent) {struct inode *inode =NULL ;struct dentry *root; -struct efivar_entry *entry, *n; -struct efivars *efivars = __efivars; -char *name; efivarfs_sb = sb;
@@ -1149,64 +1040,7 @@ static int efivarfs_fill_super(struct super_block *sb, void *data, int silent)if (!root)return -ENOMEM ; -list_for_each_entry_safe (entry, n, &efivars->list, list) { -struct dentry *dentry, *root = efivarfs_sb->s_root; -unsigned long size =0 ; -int len, i; - - inode =NULL ; - - len =utf16_strlen (entry->var.VariableName); - -/* name, plus '-', plus GUID, plus NUL*/ - name =kmalloc (len +1 +GUID_LEN +1 ,GFP_ATOMIC ); -if (!name) - goto fail; - -for (i =0 ; i < len; i++) - name[i] = entry->var.VariableName[i] &0xFF ; - - name[len] ='-' ; - -efi_guid_unparse (&entry->var.VendorGuid, name + len +1 ); - - name[len+GUID_LEN +1 ] ='\0' ; - - inode =efivarfs_get_inode (efivarfs_sb, root->d_inode, -S_IFREG |0644 ,0 ); -if (!inode) - goto fail_name; - - dentry =d_alloc_name (root, name); -if (!dentry) - goto fail_inode; - -/* copied by the above to local storage in the dentry. */ -kfree (name); - -spin_lock (&efivars->lock); - efivars->ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - &entry->var.Attributes, - &size, -NULL ); -spin_unlock (&efivars->lock); - -mutex_lock (&inode->i_mutex); - inode->i_private = entry; -i_size_write (inode, size +sizeof (entry->var.Attributes)); -mutex_unlock (&inode->i_mutex); -d_add (dentry, inode); - } - -return 0 ; - -fail_inode: -iput (inode); -fail_name: -kfree (name); -fail: -return -ENOMEM ; +return efivar_init (efivarfs_callback, (void *)sb); } static struct dentry *efivarfs_mount(struct file_system_type *fs_type,
@@ -1251,80 +1085,84 @@ static struct pstore_info efi_pstore_info;static int efi_pstore_open (struct pstore_info *psi) { -struct efivars *efivars = psi->data; - -spin_lock (&efivars->lock); - efivars->walk_entry =list_first_entry (&efivars->list, - struct efivar_entry, list); +efivar_entry_iter_begin (); + psi->data =NULL ;return 0 ; }static int efi_pstore_close (struct pstore_info *psi) { -struct efivars *efivars = psi->data; - -spin_unlock (&efivars->lock); +efivar_entry_iter_end (); + psi->data =NULL ;return 0 ; } -static ssize_t efi_pstore_read (u64 *id,enum pstore_type_id *type, -int *count,struct timespec *timespec, -char **buf,struct pstore_info *psi) +struct pstore_read_data { +u64 *id; +enum pstore_type_id *type; +int *count; +struct timespec *timespec; +char **buf; +}; + +static int efi_pstore_read_func (struct efivar_entry *entry,void *data) { -efi_guid_t vendor =LINUX_EFI_CRASH_GUID ; -struct efivars *efivars = psi->data; +struct pstore_read_data *cb_data = data;char name[DUMP_NAME_LEN ];int i;int cnt; -unsigned int part, size; -unsigned long time; - -while (&efivars->walk_entry->list != &efivars->list) { -if (!efi_guidcmp (efivars->walk_entry->var.VendorGuid, - vendor)) { -for (i =0 ; i <DUMP_NAME_LEN ; i++) { - name[i] = efivars->walk_entry->var.VariableName[i]; - } -if (sscanf (name,"dump-type%u-%u-%d-%lu" , - type, &part, &cnt, &time) ==4 ) { - *id = part; - *count = cnt; - timespec->tv_sec = time; - timespec->tv_nsec =0 ; - }else if (sscanf (name,"dump-type%u-%u-%lu" , - type, &part, &time) ==3 ) { -/* -* Check if an old format, -* which doesn't support holding -* multiple logs, remains. -*/ - *id = part; - *count =0 ; - timespec->tv_sec = time; - timespec->tv_nsec =0 ; - }else { - efivars->walk_entry =list_entry ( - efivars->walk_entry->list.next, - struct efivar_entry, list); -continue ; - } - -get_var_data_locked (efivars, &efivars->walk_entry->var); - size = efivars->walk_entry->var.DataSize; - *buf =kmalloc (size,GFP_KERNEL ); -if (*buf ==NULL ) -return -ENOMEM ; -memcpy (*buf, efivars->walk_entry->var.Data, - size); - efivars->walk_entry =list_entry ( - efivars->walk_entry->list.next, - struct efivar_entry, list); -return size; - } - efivars->walk_entry =list_entry (efivars->walk_entry->list.next, - struct efivar_entry, list); - } -return 0 ; +unsigned int part; +unsigned long time, size; +efi_guid_t vendor =LINUX_EFI_CRASH_GUID ; + +if (efi_guidcmp (entry->var.VendorGuid, vendor)) +return 0 ; + +for (i =0 ; i <DUMP_NAME_LEN ; i++) + name[i] = entry->var.VariableName[i]; + +if (sscanf (name,"dump-type%u-%u-%d-%lu" , + cb_data->type, &part, &cnt, &time) ==4 ) { + *cb_data->id = part; + *cb_data->count = cnt; + cb_data->timespec->tv_sec = time; + cb_data->timespec->tv_nsec =0 ; + }else if (sscanf (name,"dump-type%u-%u-%lu" , + cb_data->type, &part, &time) ==3 ) { +/* +* Check if an old format, +* which doesn't support holding +* multiple logs, remains. +*/ + *cb_data->id = part; + *cb_data->count =0 ; + cb_data->timespec->tv_sec = time; + cb_data->timespec->tv_nsec =0 ; + }else +return 0 ; + +efivar_entry_size (entry, &size); + *cb_data->buf =kmalloc (size,GFP_KERNEL ); +if (*cb_data->buf ==NULL ) +return -ENOMEM ; +memcpy (*cb_data->buf, entry->var.Data, size); +return size; +} + +static ssize_t efi_pstore_read (u64 *id,enum pstore_type_id *type, +int *count,struct timespec *timespec, +char **buf,struct pstore_info *psi) +{ +struct pstore_read_data data; + + data.id = id; + data.type = type; + data.count = count; + data.timespec = timespec; + data.buf = buf; + +return __efivar_entry_iter (efi_pstore_read_func, &data, + (struct efivar_entry **)&psi->data); } static int efi_pstore_write(enum pstore_type_id type,
@@ -1332,27 +1170,21 @@ static int efi_pstore_write(enum pstore_type_id type, unsigned int part, int count, size_t size, struct pstore_info *psi) { + struct efivar_entry *entry;char name[DUMP_NAME_LEN ];efi_char16_t efi_name[DUMP_NAME_LEN ];efi_guid_t vendor =LINUX_EFI_CRASH_GUID ; -struct efivars *efivars = psi->data;int i, ret =0 ;u64 storage_space, remaining_space, max_variable_size; -efi_status_t status =EFI_NOT_FOUND ; - -spin_lock (&efivars->lock);/* * Check if there is a space enough to log. * size: a size of logging data * DUMP_NAME_LEN * 2: a maximum size of variable name */ - status = efivars->ops->query_variable_info (PSTORE_EFI_ATTRIBUTES , - &storage_space, - &remaining_space, - &max_variable_size); -if (status || remaining_space < size +DUMP_NAME_LEN *2 ) { -spin_unlock (&efivars->lock); + ret =efivar_query_info (PSTORE_EFI_ATTRIBUTES , &storage_space, + &remaining_space, &max_variable_size); +if (ret || remaining_space < size +DUMP_NAME_LEN *2 ) { *id = part;return -ENOSPC ; }
@@ -1363,86 +1195,90 @@ static int efi_pstore_write(enum pstore_type_id type,for (i =0 ; i <DUMP_NAME_LEN ; i++) efi_name[i] = name[i]; - efivars->ops->set_variable (efi_name, &vendor,PSTORE_EFI_ATTRIBUTES , - size, psi->buf); + entry =kzalloc (sizeof (*entry),GFP_KERNEL ); +if (!entry) +return -ENOMEM ; + +memcpy (entry->var.VariableName, efi_name, +utf16_strsize (efi_name,DUMP_NAME_LEN *2 )); +memcpy (&(entry->var.VendorGuid), &vendor,sizeof (vendor)); -spin_unlock (&efivars->lock); +efivar_entry_set (entry,PSTORE_EFI_ATTRIBUTES , size, psi->buf, false);if (size) - ret =efivar_create_sysfs_entry (efivars, -utf16_strsize (efi_name, -DUMP_NAME_LEN *2 ), - efi_name, &vendor); + ret =efivar_create_sysfs_entry (entry); *id = part;return ret; }; +struct pstore_erase_data { +u64 id; +enum pstore_type_id type; +int count; +struct timespec time; +efi_char16_t *name; +}; + +/* +* Clean up an entry with the same name +*/ +static int efi_pstore_erase_func (struct efivar_entry *entry,void *data) +{ +struct pstore_erase_data *ed = data; +efi_guid_t vendor =LINUX_EFI_CRASH_GUID ; +efi_char16_t efi_name_old[DUMP_NAME_LEN ]; +efi_char16_t *efi_name = ed->name; +unsigned long utf16_len =utf16_strlen (ed->name); +char name_old[DUMP_NAME_LEN ]; +int i; + +if (efi_guidcmp (entry->var.VendorGuid, vendor)) +return 0 ; + +if (utf16_strncmp (entry->var.VariableName, + efi_name, (size_t )utf16_len)) { +/* +* Check if an old format, which doesn't support +* holding multiple logs, remains. +*/ +sprintf (name_old,"dump-type%u-%u-%lu" , ed->type, + (unsigned int )ed->id, ed->time.tv_sec); + +for (i =0 ; i <DUMP_NAME_LEN ; i++) + efi_name_old[i] = name_old[i]; + +if (utf16_strncmp (entry->var.VariableName, efi_name_old, +utf16_strlen (efi_name_old))) +return 0 ; + } + +/* found */ +__efivar_entry_delete (entry); +return 1 ; +} +static int efi_pstore_erase (enum pstore_type_id type,u64 id,int count,struct timespec time,struct pstore_info *psi) { +struct pstore_erase_data edata;char name[DUMP_NAME_LEN ];efi_char16_t efi_name[DUMP_NAME_LEN ]; -char name_old[DUMP_NAME_LEN ]; -efi_char16_t efi_name_old[DUMP_NAME_LEN ]; -efi_guid_t vendor =LINUX_EFI_CRASH_GUID ; -struct efivars *efivars = psi->data; -struct efivar_entry *entry, *found =NULL ;int i;sprintf (name,"dump-type%u-%u-%d-%lu" , type, (unsigned int )id, count, time.tv_sec); -spin_lock (&efivars->lock); -for (i =0 ; i <DUMP_NAME_LEN ; i++) efi_name[i] = name[i]; -/* -* Clean up an entry with the same name -*/ - -list_for_each_entry (entry, &efivars->list, list) { -get_var_data_locked (efivars, &entry->var); - -if (efi_guidcmp (entry->var.VendorGuid, vendor)) -continue ; -if (utf16_strncmp (entry->var.VariableName, efi_name, -utf16_strlen (efi_name))) { -/* -* Check if an old format, -* which doesn't support holding -* multiple logs, remains. -*/ -sprintf (name_old,"dump-type%u-%u-%lu" , type, - (unsigned int )id, time.tv_sec); - -for (i =0 ; i <DUMP_NAME_LEN ; i++) - efi_name_old[i] = name_old[i]; - -if (utf16_strncmp (entry->var.VariableName, efi_name_old, -utf16_strlen (efi_name_old))) -continue ; - } - -/* found */ - found = entry; - efivars->ops->set_variable (entry->var.VariableName, - &entry->var.VendorGuid, -PSTORE_EFI_ATTRIBUTES , -0 ,NULL ); -break ; - } - -if (found) -list_del (&found->list); - -spin_unlock (&efivars->lock); + edata.id = id; + edata.type = type; + edata.count = count; + edata.time = time; + edata.name = efi_name; -if (found) -efivar_unregister (found); - -return 0 ; +return efivar_entry_iter (efi_pstore_erase_func, &edata); }#else static int efi_pstore_open (struct pstore_info *psi)
@@ -1455,8 +1291,8 @@ static int efi_pstore_close(struct pstore_info *psi)return 0 ; } -static ssize_t efi_pstore_read (u64 *id,enum pstore_type_id *type,int *count, -struct timespec *timespec, +static ssize_t efi_pstore_read (u64 *id,enum pstore_type_id *type, +int *count,struct timespec *timespec,char **buf,struct pstore_info *psi) {return -1 ;
@@ -1492,66 +1328,36 @@ static ssize_t efivar_create(struct file *filp, struct kobject *kobj, char *buf, loff_t pos, size_t count) {struct efi_variable *new_var = (struct efi_variable *)buf; -struct efivars *efivars = bin_attr->private; -struct efivar_entry *search_efivar, *n; -unsigned long strsize1, strsize2; +struct efivar_entry *new_entry;efi_status_t status =EFI_NOT_FOUND ; -int found =0 ;if (!capable (CAP_SYS_ADMIN ))return -EACCES ;if ((new_var->Attributes & ~EFI_VARIABLE_MASK ) !=0 || -validate_var (new_var, new_var->Data, new_var->DataSize) == false) { +efivar_validate (new_var, new_var->Data, new_var->DataSize) == false) {printk (KERN_ERR "efivars: Malformed variable content\n" );return -EINVAL ; } -spin_lock (&efivars->lock); + new_entry =kmalloc (sizeof (*new_entry),GFP_KERNEL ); +if (!new_entry) +return -ENOMEM ; -/* -* Does this variable already exist? -*/ -list_for_each_entry_safe (search_efivar, n, &efivars->list, list) { - strsize1 =utf16_strsize (search_efivar->var.VariableName,1024 ); - strsize2 =utf16_strsize (new_var->VariableName,1024 ); -if (strsize1 == strsize2 && - !memcmp (&(search_efivar->var.VariableName), - new_var->VariableName, strsize1) && - !efi_guidcmp (search_efivar->var.VendorGuid, - new_var->VendorGuid)) { - found =1 ; -break ; - } - } -if (found) { -spin_unlock (&efivars->lock); +memcpy (&new_entry->var, new_var,sizeof (*new_var)); + + status =efivar_entry_set (new_entry, new_var->Attributes, + new_var->DataSize, new_var->Data, true); +if (status == -EEXIST )return -EINVAL ; - } -/* now *really* create the variable via EFI */ - status = efivars->ops->set_variable (new_var->VariableName, - &new_var->VendorGuid, - new_var->Attributes, - new_var->DataSize, - new_var->Data); +if (status) +return status; -if (status !=EFI_SUCCESS ) { -printk (KERN_WARNING "efivars: set_variable() failed: status=%lx\n" , - status); -spin_unlock (&efivars->lock); -return -EIO ; - } -spin_unlock (&efivars->lock); - -/* Create the entry in sysfs. Locking is not required here */ - status =efivar_create_sysfs_entry (efivars, -utf16_strsize (new_var->VariableName, -1024 ), - new_var->VariableName, - &new_var->VendorGuid); + status =efivar_create_sysfs_entry (new_entry);if (status) { -printk (KERN_WARNING "efivars: variable created, but sysfs entry wasn't.\n" ); +kfree (new_entry); +printk (KERN_WARNING "efivars: failed to create sysfs entry.\n" ); }return count; }
@@ -1561,56 +1367,25 @@ static ssize_t efivar_delete(struct file *filp, struct kobject *kobj, char *buf, loff_t pos, size_t count) {struct efi_variable *del_var = (struct efi_variable *)buf; -struct efivars *efivars = bin_attr->private; -struct efivar_entry *search_efivar, *n; -unsigned long strsize1, strsize2; -efi_status_t status =EFI_NOT_FOUND ; -int found =0 ; +struct efivar_entry *entry; +int err;if (!capable (CAP_SYS_ADMIN ))return -EACCES ; -spin_lock (&efivars->lock); +efivar_entry_iter_begin (); + entry =efivar_entry_find (del_var->VariableName, + del_var->VendorGuid, true); +if (!entry) + err = -EINVAL ; +else + err =__efivar_entry_delete (entry); +efivar_entry_iter_end (); -/* -* Does this variable already exist? -*/ -list_for_each_entry_safe (search_efivar, n, &efivars->list, list) { - strsize1 =utf16_strsize (search_efivar->var.VariableName,1024 ); - strsize2 =utf16_strsize (del_var->VariableName,1024 ); -if (strsize1 == strsize2 && - !memcmp (&(search_efivar->var.VariableName), - del_var->VariableName, strsize1) && - !efi_guidcmp (search_efivar->var.VendorGuid, - del_var->VendorGuid)) { - found =1 ; -break ; - } - } -if (!found) { -spin_unlock (&efivars->lock); -return -EINVAL ; - } -/* force the Attributes/DataSize to 0 to ensure deletion */ - del_var->Attributes =0 ; - del_var->DataSize =0 ; +if (err) +return -EIO ; - status = efivars->ops->set_variable (del_var->VariableName, - &del_var->VendorGuid, - del_var->Attributes, - del_var->DataSize, - del_var->Data); - -if (status !=EFI_SUCCESS ) { -printk (KERN_WARNING "efivars: set_variable() failed: status=%lx\n" , - status); -spin_unlock (&efivars->lock); -return -EIO ; - } -list_del (&search_efivar->list); -/* We need to release this lock before unregistering. */ -spin_unlock (&efivars->lock); -efivar_unregister (search_efivar); +efivar_unregister (entry);/* It's dead Jim.... */ return count;
@@ -1666,40 +1441,33 @@ static struct kobject *efi_kobj;* variable_name_size = number of bytes required to hold * variable_name (not counting the NULL * character at the end. -* efivars->lock is not held on entry or exit. * Returns 1 on failure, 0 on success */ -static int -efivar_create_sysfs_entry (struct efivars *efivars, -unsigned long variable_name_size, -efi_char16_t *variable_name, -efi_guid_t *vendor_guid) +int +efivar_create_sysfs_entry (struct efivar_entry *new_var) {int i, short_name_size;char *short_name; -struct efivar_entry *new_efivar; +unsigned long variable_name_size; +efi_char16_t *variable_name; + + variable_name = new_var->var.VariableName; + variable_name_size =utf16_strlen (variable_name) *sizeof (efi_char16_t);/* * Length of the variable bytes in ASCII, plus the '-' separator, * plus the GUID, plus trailing NUL */ short_name_size = variable_name_size /sizeof (efi_char16_t) - +1 +GUID_LEN +1 ; + +1 +EFI_VARIABLE_GUID_LEN +1 ; short_name =kzalloc (short_name_size,GFP_KERNEL ); - new_efivar =kzalloc (sizeof (struct efivar_entry ),GFP_KERNEL ); -if (!short_name || !new_efivar) { +if (!short_name) {kfree (short_name); -kfree (new_efivar);return 1 ; } - new_efivar->efivars = efivars; -memcpy (new_efivar->var.VariableName, variable_name, - variable_name_size); -memcpy (&(new_efivar->var.VendorGuid), vendor_guid,sizeof (efi_guid_t)); -/* Convert Unicode to normal chars (assume top bits are 0), ala UTF-8 */ for (i=0 ; i < (int )(variable_name_size /sizeof (efi_char16_t)); i++) {
@@ -1709,30 +1477,25 @@ efivar_create_sysfs_entry(struct efivars *efivars,private variables from another's. */ *(short_name +strlen (short_name)) ='-' ; -efi_guid_unparse (vendor_guid, short_name +strlen (short_name)); +efi_guid_unparse (&new_var->var.VendorGuid, + short_name +strlen (short_name)); - new_efivar->kobj.kset = efivars->kset; - i =kobject_init_and_add (&new_efivar->kobj, &efivar_ktype,NULL , -"%s" , short_name); -if (i) { -kfree (short_name); -kfree (new_efivar); -return 1 ; - } + new_var->kobj.kset = efivars_kset; -kobject_uevent (&new_efivar->kobj,KOBJ_ADD ); + i =kobject_init_and_add (&new_var->kobj, &efivar_ktype, +NULL ,"%s" , short_name);kfree (short_name); - short_name =NULL ; - -spin_lock (&efivars->lock); -list_add (&new_efivar->list, &efivars->list); -spin_unlock (&efivars->lock); +if (i) +return 1 ; +kobject_uevent (&new_var->kobj,KOBJ_ADD ); +efivar_entry_add (new_var);return 0 ; } +EXPORT_SYMBOL_GPL (efivar_create_sysfs_entry);static int -create_efivars_bin_attributes (struct efivars *efivars) +create_efivars_bin_attributes (void ) {struct bin_attribute *attr;int error;
@@ -1745,8 +1508,7 @@ create_efivars_bin_attributes(struct efivars *efivars) attr->attr.name ="new_var" ; attr->attr.mode =0200 ; attr->write = efivar_create; - attr->private = efivars; - efivars->new_var = attr; + efivars_new_var = attr;/* del_var */ attr =kzalloc (sizeof (*attr),GFP_KERNEL );
@@ -1757,75 +1519,105 @@ create_efivars_bin_attributes(struct efivars *efivars) attr->attr.name ="del_var" ; attr->attr.mode =0200 ; attr->write = efivar_delete; - attr->private = efivars; - efivars->del_var = attr; + efivars_del_var = attr; -sysfs_bin_attr_init (efivars->new_var); -sysfs_bin_attr_init (efivars->del_var); +sysfs_bin_attr_init (efivars_new_var); +sysfs_bin_attr_init (efivars_del_var);/* Register */ - error =sysfs_create_bin_file (&efivars->kset->kobj, - efivars->new_var); + error =sysfs_create_bin_file (&efivars_kset->kobj, efivars_new_var);if (error) {printk (KERN_ERR "efivars: unable to create new_var sysfs file" " due to error %d\n" , error); goto out_free; } - error =sysfs_create_bin_file (&efivars->kset->kobj, - efivars->del_var); + + error =sysfs_create_bin_file (&efivars_kset->kobj, efivars_del_var);if (error) {printk (KERN_ERR "efivars: unable to create del_var sysfs file" " due to error %d\n" , error); -sysfs_remove_bin_file (&efivars->kset->kobj, - efivars->new_var); +sysfs_remove_bin_file (&efivars_kset->kobj, efivars_new_var); goto out_free; }return 0 ; out_free: -kfree (efivars->del_var); - efivars->del_var =NULL ; -kfree (efivars->new_var); - efivars->new_var =NULL ; +kfree (efivars_del_var); + efivars_del_var =NULL ; +kfree (efivars_new_var); + efivars_new_var =NULL ;return error; } -void unregister_efivars (struct efivars *efivars) +static int efivars_sysfs_callback (struct efivar_entry *entry,void *data) { -struct efivar_entry *entry, *n; +efivar_create_sysfs_entry (entry); +return 0 ; +} -list_for_each_entry_safe (entry, n, &efivars->list, list) { -spin_lock (&efivars->lock); -list_del (&entry->list); -spin_unlock (&efivars->lock); -efivar_unregister (entry); - } -if (efivars->new_var) -sysfs_remove_bin_file (&efivars->kset->kobj, efivars->new_var); -if (efivars->del_var) -sysfs_remove_bin_file (&efivars->kset->kobj, efivars->del_var); -kfree (efivars->new_var); -kfree (efivars->del_var); -kobject_put (efivars->kobject); -kset_unregister (efivars->kset); +static int efivar_sysfs_destroy (struct efivar_entry *entry,void *data) +{ +efivar_entry_remove (entry); +efivar_unregister (entry); +return 0 ; } -EXPORT_SYMBOL_GPL (unregister_efivars); -int register_efivars (struct efivars *efivars, -const struct efivar_operations *ops, -struct kobject *parent_kobj) +void efivars_sysfs_exit (void ) +{ +/* Remove all entries and destroy */ +__efivar_entry_iter (efivar_sysfs_destroy,NULL ,NULL ); + +if (efivars_new_var) +sysfs_remove_bin_file (&efivars_kset->kobj, efivars_new_var); +if (efivars_del_var) +sysfs_remove_bin_file (&efivars_kset->kobj, efivars_del_var); +kfree (efivars_new_var); +kfree (efivars_del_var); +kset_unregister (efivars_kset); +} + +int efivars_sysfs_init (struct kobject *parent_kobj) { -efi_status_t status =EFI_NOT_FOUND ; -efi_guid_t vendor_guid; -efi_char16_t *variable_name; -unsigned long variable_name_size =1024 ;int error =0 ; -if (__efivars) { -return -EBUSY ; +printk (KERN_INFO "EFI Variables Facility v%s %s\n" ,EFIVARS_VERSION , +EFIVARS_DATE ); + + efivars_kset =kset_create_and_add ("vars" ,NULL , parent_kobj); +if (!efivars_kset) { +printk (KERN_ERR "efivars: Subsystem registration failed.\n" ); +return -ENOMEM ; } - __efivars = efivars; +efivar_init (efivars_sysfs_callback,NULL ); + + error =create_efivars_bin_attributes (); +if (error) +efivars_sysfs_exit (); + +return error; +} +EXPORT_SYMBOL_GPL (efivars_sysfs_init); + +/** +* efivar_init - build the initial list of EFI variables +* @func: callback function to invoke for every variable +* @data: function-specific data to pass to @func +* +* Get every EFI variable from the firmware, construct a struct +* efivar_entry and invoke @func. @func should call efivar_entry_add() +* to build the list of variables. +* +* Returns 0 on success, or a kernel error code on failure. +*/ +int efivar_init (int (*func)(struct efivar_entry *,void *),void *data) +{ +const struct efivar_operations *ops = __efivars->ops; +struct efivar_entry *entry; +unsigned long variable_name_size =1024 ; +efi_char16_t *variable_name; +efi_status_t status; +efi_guid_t vendor_guid; variable_name =kzalloc (variable_name_size,GFP_KERNEL );if (!variable_name) {
@@ -1833,25 +1625,6 @@ int register_efivars(struct efivars *efivars,return -ENOMEM ; } -spin_lock_init (&efivars->lock); -INIT_LIST_HEAD (&efivars->list); - efivars->ops = ops; - - efivars->kset =kset_create_and_add ("vars" ,NULL , parent_kobj); -if (!efivars->kset) { -printk (KERN_ERR "efivars: Subsystem registration failed.\n" ); - error = -ENOMEM ; - goto out; - } - - efivars->kobject =kobject_create_and_add ("efivars" , parent_kobj); -if (!efivars->kobject) { -pr_err ("efivars: Subsystem registration failed.\n" ); - error = -ENOMEM ; -kset_unregister (efivars->kset); - goto out; - } -/* * Per EFI spec, the maximum storage allocated for both * the variable name and variable data is 1024 bytes.
@@ -1860,15 +1633,21 @@ int register_efivars(struct efivars *efivars, do { variable_name_size = 1024; + spin_lock(&__efivars->lock); status = ops->get_next_variable(&variable_name_size, variable_name, &vendor_guid); + spin_unlock(&__efivars->lock); switch (status) { case EFI_SUCCESS: - efivar_create_sysfs_entry(efivars, - variable_name_size, - variable_name, - &vendor_guid); + entry = kmalloc(sizeof(*entry), GFP_KERNEL); + if (!entry) + return -ENOMEM; + + memcpy(entry->var.VariableName, variable_name, variable_name_size); + memcpy(&(entry->var.VendorGuid), &vendor_guid, sizeof(efi_guid_t)); + func(entry, data); + break; case EFI_NOT_FOUND: break;
@@ -1880,49 +1659,505 @@ int register_efivars(struct efivars *efivars, } }while (status !=EFI_NOT_FOUND ); - error =create_efivars_bin_attributes (efivars); -if (error) -unregister_efivars (efivars); +return 0 ; +} +EXPORT_SYMBOL_GPL (efivar_init); + +/** +* efivar_entry_add - add entry to variable list +* @entry: entry to add to list +*/ +void efivar_entry_add (struct efivar_entry *entry) +{ +spin_lock (&__efivars->lock); +list_add (&entry->list, &__efivars->list); +spin_unlock (&__efivars->lock); +} +EXPORT_SYMBOL_GPL (efivar_entry_add); + +/** +* efivar_entry_remove - remove entry from variable list +* @entry: entry to remove from list +*/ +void efivar_entry_remove (struct efivar_entry *entry) +{ +spin_lock (&__efivars->lock); +list_del (&entry->list); +spin_unlock (&__efivars->lock); +} +EXPORT_SYMBOL_GPL (efivar_entry_remove); + +/* +* efivar_entry_list_del_unlock - remove entry from variable list +* @entry: entry to remove +* +* Remove @entry from the variable list and release the list lock. +* +* NOTE: slightly weird locking semantics here - we expect to be +* called with the efivars lock already held, and we release it before +* returning. This is because this function is usually called after +* set_variable() while the lock is still held. +*/ +static void efivar_entry_list_del_unlock (struct efivar_entry *entry) +{ +WARN_ON (!spin_is_locked (&__efivars->lock)); - efivars->efi_pstore_info = efi_pstore_info; +list_del (&entry->list); +spin_unlock (&__efivars->lock); +} - efivars->efi_pstore_info.buf =kmalloc (4096 ,GFP_KERNEL ); -if (efivars->efi_pstore_info.buf) { - efivars->efi_pstore_info.bufsize =1024 ; - efivars->efi_pstore_info.data = efivars; -spin_lock_init (&efivars->efi_pstore_info.buf_lock); -pstore_register (&efivars->efi_pstore_info); +/** +* __efivar_entry_delete - delete an EFI variable +* @entry: entry containing EFI variable to delete +* +* Delete the variable from the firmware but leave @entry on the +* variable list. +* +* This function differs from efivar_entry_delete() because it does +* not remove @entry from the variable list. Also, it is safe to be +* called from within a efivar_entry_iter_begin() and +* efivar_entry_iter_end() region, unlike efivar_entry_delete(). +* +* Returns 0 on success, or a converted EFI status code if +* set_variable() fails. +*/ +int __efivar_entry_delete (struct efivar_entry *entry) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + +WARN_ON (!spin_is_locked (&__efivars->lock)); + + status = ops->set_variable (entry->var.VariableName, + &entry->var.VendorGuid, +0 ,0 ,NULL ); + +return efi_status_to_err (status); +} +EXPORT_SYMBOL_GPL (__efivar_entry_delete); + +/** +* efivar_entry_delete - delete variable and remove entry from list +* @entry: entry containing variable to delete +* +* Delete the variable from the firmware and remove @entry from the +* variable list. It is the caller's responsibility to free @entry +* once we return. +* +* Returns 0 on success, or a converted EFI status code if +* set_variable() fails. +*/ +int efivar_entry_delete (struct efivar_entry *entry) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + +spin_lock (&__efivars->lock); + status = ops->set_variable (entry->var.VariableName, + &entry->var.VendorGuid, +0 ,0 ,NULL ); +if (!(status ==EFI_SUCCESS || status ==EFI_NOT_FOUND )) { +spin_unlock (&__efivars->lock); +return efi_status_to_err (status); } -register_filesystem (&efivarfs_type); +efivar_entry_list_del_unlock (entry); +return 0 ; +} +EXPORT_SYMBOL_GPL (efivar_entry_delete); + +/** +* efivar_entry_set - call set_variable() +* @entry: entry containing the EFI variable to write +* @attributes: variable attributes +* @size: size of @data buffer +* @data: buffer containing variable data +* @lookup: check to see if @entry is already on the list? +* +* Calls set_variable() for an EFI variable. If creating a new EFI +* variable, this function is usually followed by efivar_entry_add(). +* +* Returns 0 on success, -EEXIST if @lookup is true and the entry +* already exists on the list, or a converted EFI status code if +* set_variable() fails. +*/ +int efivar_entry_set (struct efivar_entry *entry,u32 attributes, +unsigned long size,void *data,bool lookup) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; +efi_char16_t *name = entry->var.VariableName; +efi_guid_t vendor = entry->var.VendorGuid; -out: -kfree (variable_name); +spin_lock (&__efivars->lock); -return error; +if (lookup &&efivar_entry_find (name, vendor, false)) { +spin_unlock (&__efivars->lock); +return -EEXIST ; + } + + status = ops->set_variable (name, &vendor, attributes, size, data); + +spin_unlock (&__efivars->lock); + +return efi_status_to_err (status); } -EXPORT_SYMBOL_GPL (register_efivars); +EXPORT_SYMBOL_GPL (efivar_entry_set); -/* -* For now we register the efi subsystem with the firmware subsystem -* and the vars subsystem with the efi subsystem. In the future, it -* might make sense to split off the efi subsystem into its own -* driver, but for now only efivars will register with it, so just -* include it here. +/** +* efivar_entry_find - search for an entry +* @name: the EFI variable name +* @guid: the EFI variable vendor's guid +* @remove: should we remove the entry from the list? +* +* Search for an entry on the variable list that has the EFI variable +* name @name and vendor guid @guid. If an entry is found on the list +* and @remove is true, the entry is removed from the list. +* +* The caller MUST call efivar_entry_iter_begin() and +* efivar_entry_iter_end() before and after the invocation of this +* function, respectively. +* +* Returns the entry if found on the list, %NULL otherwise. +*/ +struct efivar_entry *efivar_entry_find (efi_char16_t *name, +efi_guid_t guid,bool remove) +{ +struct efivar_entry *entry, *n; +int strsize1, strsize2; +bool found = false; + +WARN_ON (!spin_is_locked (&__efivars->lock)); + +list_for_each_entry_safe (entry, n, &__efivars->list, list) { + strsize1 =utf16_strsize (name,1024 ); + strsize2 =utf16_strsize (entry->var.VariableName,1024 ); +if (strsize1 == strsize2 && + !memcmp (name, &(entry->var.VariableName), strsize1) && + !efi_guidcmp (guid, entry->var.VendorGuid)) { + found = true; +break ; + } + } + +if (!found) +return NULL ; + +if (remove) +list_del (&entry->list); + +return entry; +} +EXPORT_SYMBOL_GPL (efivar_entry_find); + +/** +* efivar_query_info - call query_variable_info() +* @attributes: query for variables with these attributes +* @storage_size: maximum space for variables with @attributes +* @remaining_size: remaining space for variable with @attributes +* @max_size: maximum space for an individual variable with @attributes +* +* Query the amount of space available in the firmware for variables +* with @attributes. +* +* Returns 0 on success, -ENOSYS if the registered efivars ops do not +* support query_variable_info(), or a converted EFI status code if +* query_variable_info() fails. */ +int efivar_query_info (u32 attributes,u64 *storage_size, +u64 *remaining_size,u64 *max_size) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + +if (!ops->query_variable_info) +return -ENOSYS ; + +spin_lock (&__efivars->lock); + status = ops->query_variable_info (attributes, storage_size, + remaining_size, max_size); +spin_unlock (&__efivars->lock); + +return status; +} +EXPORT_SYMBOL_GPL (efivar_query_info); + +/** +* efivar_entry_size - obtain the size of a variable +* @entry: entry for this variable +* @size: location to store the variable's size +*/ +int efivar_entry_size (struct efivar_entry *entry,unsigned long *size) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + + *size =0 ; + +spin_lock (&__efivars->lock); + status = ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid,NULL , size,NULL ); +spin_unlock (&__efivars->lock); + +if (status !=EFI_BUFFER_TOO_SMALL ) +return efi_status_to_err (status); + +return 0 ; +} +EXPORT_SYMBOL_GPL (efivar_entry_size); + +/** +* efivar_entry_get - call get_variable() +* @entry: read data for this variable +* @attributes: variable attributes +* @size: size of @data buffer +* @data: buffer to store variable data +*/ +int efivar_entry_get (struct efivar_entry *entry,u32 *attributes, +unsigned long *size,void *data) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + +spin_lock (&__efivars->lock); + status = ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data); +spin_unlock (&__efivars->lock); + +return efi_status_to_err (status); +} +EXPORT_SYMBOL_GPL (efivar_entry_get); + +/** +* efivar_entry_set_get_size - call set_variable() and get new size (atomic) +* @entry: entry containing variable to set and get +* @attributes: attributes of variable to be written +* @size: size of data buffer +* @data: buffer containing data to write +* +* This is a pretty special (complex) function. See efivarfs_file_write(). +* +* Atomically call set_variable() for @entry and if the set is +* successful, return the new size of the variable from get_variable() +* in @size. The success of set_variable() is indicated by @set. +* +* Returns 0 on success, -EINVAL if the variable data is invalid, or a +* converted EFI status code if either of set_variable() or +* get_variable() fail. +* +* If the EFI variable does not exist when calling set_variable() +* (EFI_NOT_FOUND), @entry is removed from the variable list. +*/ +int efivar_entry_set_get_size (struct efivar_entry *entry,u32 attributes, +unsigned long *size,void *data,bool *set) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + + *set = false; + +if (efivar_validate (&entry->var, data, *size) == false) +return -EINVAL ; + +/* +* The lock here protects the get_variable call, the conditional +* set_variable call, and removal of the variable from the efivars +* list (in the case of an authenticated delete). +*/ +spin_lock (&__efivars->lock); + + status = ops->set_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, *size, data); + +if (status !=EFI_SUCCESS ) { +spin_unlock (&__efivars->lock); +return efi_status_to_err (status); + } + +/* +* Writing to the variable may have caused a change in size (which +* could either be an append or an overwrite), or the variable to be +* deleted. Perform a GetVariable() so we can tell what actually +* happened. +*/ + *size =0 ; + status = ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, +NULL , size,NULL ); + +if (status ==EFI_NOT_FOUND ) +efivar_entry_list_del_unlock (entry); +else +spin_unlock (&__efivars->lock); + +return efi_status_to_err (status); +} +EXPORT_SYMBOL_GPL (efivar_entry_set_get_size); + +/** +* efivar_entry_iter_begin - begin iterating the variable list +* +* Lock the variable list to prevent entry insertion and removal until +* efivar_entry_iter_end() is called. This function is usually used in +* conjunction with __efivar_entry_iter() or efivar_entry_iter(). +*/ +void efivar_entry_iter_begin (void ) +{ +spin_lock (&__efivars->lock); +} +EXPORT_SYMBOL_GPL (efivar_entry_iter_begin); + +/** +* efivar_entry_iter_end - finish iterating the variable list +* +* Unlock the variable list and allow modifications to the list again. +*/ +void efivar_entry_iter_end (void ) +{ +spin_unlock (&__efivars->lock); +} +EXPORT_SYMBOL_GPL (efivar_entry_iter_end); + +/** +* __efivar_entry_iter - iterate over variable list +* @func: callback function +* @data: function-specific data to pass to callback +* @prev: entry to begin iterating from +* +* Iterate over the list of EFI variables and call @func with every +* entry on the list. It is safe for @func to remove entries in the +* list via efivar_entry_delete(). +* +* You MUST call efivar_enter_iter_begin() before this function, and +* efivar_entry_iter_end() afterwards. +* +* It is possible to begin iteration from an arbitrary entry within +* the list by passing @prev. @prev is updated on return to point to +* the last entry passed to @func. To begin iterating from the +* beginning of the list @prev must be %NULL. +* +* The restrictions for @func are the same as documented for +* efivar_entry_iter(). +*/ +int __efivar_entry_iter (int (*func)(struct efivar_entry *,void *), +void *data,struct efivar_entry **prev) +{ +struct efivar_entry *entry, *n; +int err =0 ; + +if (!prev || !*prev) { +list_for_each_entry_safe (entry, n, &__efivars->list, list) { + err =func (entry, data); +if (err) +break ; + } + +if (prev) + *prev = entry; + +return err; + } + + +list_for_each_entry_safe_continue ((*prev), n, &__efivars->list, list) { + err =func (*prev, data); +if (err) +break ; + } + +return err; +} +EXPORT_SYMBOL_GPL (__efivar_entry_iter); + +/** +* efivar_entry_iter - iterate over variable list +* @func: callback function +* @data: function-specific data to pass to callback +* +* Iterate over the list of EFI variables and call @func with every +* entry on the list. It is safe for @func to remove entries in the +* list via efivar_entry_delete() while iterating. +* +* Some notes for the callback function: +* - a non-zero return value indicates an error and terminates the loop +* - @func is called from atomic context +*/ +int efivar_entry_iter (int (*func)(struct efivar_entry *,void *),void *data) +{ +int err =0 ; + +efivar_entry_iter_begin (); + err =__efivar_entry_iter (func, data,NULL ); +efivar_entry_iter_end (); + +return err; +} +EXPORT_SYMBOL_GPL (efivar_entry_iter); + +/** +* efivars_register - register an efivars +* @efivars: efivars to register +* @ops: efivars operations +* +* Only a single efivars can be registered at any time. +*/ +int efivars_register (struct efivars *efivars, +const struct efivar_operations *ops) +{ +if (__efivars) +return -EBUSY ; + +spin_lock_init (&efivars->lock); +INIT_LIST_HEAD (&efivars->list); + efivars->ops = ops; + + __efivars = efivars; + +return 0 ; +} +EXPORT_SYMBOL_GPL (efivars_register); + +/** +* efivars_unregister - unregister an efivars +* @efivars: efivars to unregister +* +* The caller must have already removed every entry from the list, +* failure to do so is an error. +*/ +int efivars_unregister (struct efivars *efivars) +{ +if (!__efivars) { +printk (KERN_ERR "efivars not registered\n" ); +return -EINVAL ; + } + +if (__efivars != efivars) +return -EINVAL ; + +if (!list_empty (&efivars->list)) { +printk (KERN_ERR "efivars list not empty\n" ); +return -EBUSY ; + } + + __efivars =NULL ; + +return 0 ; +} +EXPORT_SYMBOL_GPL (efivars_unregister); + +static struct kobject *efivars_kobject;static int __init efivars_init (void ) { -int error =0 ; - -printk (KERN_INFO "EFI Variables Facility v%s %s\n" ,EFIVARS_VERSION , -EFIVARS_DATE ); +int error;if (!efi_enabled (EFI_RUNTIME_SERVICES ))return 0 ; -/* For now we'll register the efi directory at /sys/firmware/efi */ +/* Register the efi directory at /sys/firmware/efi */ efi_kobj =kobject_create_and_add ("efi" , firmware_kobj);if (!efi_kobj) {printk (KERN_ERR "efivars: Firmware registration failed.\n" );
@@ -1934,9 +2169,18 @@ efivars_init(void) generic_ops.get_next_variable = efi.get_next_variable; generic_ops.query_variable_info = efi.query_variable_info; - error =register_efivars (&generic_efivars, &generic_ops, efi_kobj); + error =efivars_register (&generic_efivars, &generic_ops);if (error) - goto err_put; +return error; + +efivars_sysfs_init (efi_kobj); + + efivars_kobject =kobject_create_and_add ("efivars" , efi_kobj); +if (!efivars_kobject) { +pr_err ("efivars: Subsystem registration failed.\n" ); +kobject_put (efi_kobj); +return -ENOMEM ; + }/* Don't forget the systab entry */ error =sysfs_create_group (efi_kobj, &efi_subsys_attr_group);
@@ -1944,15 +2188,17 @@ efivars_init(void)printk (KERN_ERR "efivars: Sysfs attribute export failed with error %d.\n" , error); - goto err_unregister; } -return 0 ; + efi_pstore_info.buf =kmalloc (4096 ,GFP_KERNEL ); +if (efi_pstore_info.buf) { + efi_pstore_info.bufsize =4096 ; +spin_lock_init (&efi_pstore_info.buf_lock); +pstore_register (&efi_pstore_info); + } + +register_filesystem (&efivarfs_type); -err_unregister: -unregister_efivars (&generic_efivars); -err_put: -kobject_put (efi_kobj);return error; }
@@ -1960,7 +2206,8 @@ static void __exitefivars_exit (void) {if (efi_enabled (EFI_RUNTIME_SERVICES )) { -unregister_efivars (&generic_efivars); +efivars_unregister (&generic_efivars); +kobject_put (efivars_kobject);kobject_put (efi_kobj); } }
drivers/firmware/google/gsmi.c +9 -2
@@ -882,12 +882,19 @@ static __init int gsmi_init(void) goto out_remove_bin_file; } - ret =register_efivars (&efivars, &efivar_ops, gsmi_kobj); + ret =efivars_register (&efivars, &efivar_ops);if (ret) {printk (KERN_INFO "gsmi: Failed to register efivars\n" ); goto out_remove_sysfs_files; } + ret =efivars_sysfs_init (gsmi_kobj); +if (ret) { +printk (KERN_INFO "gsmi: Failed to create efivars files\n" ); +efivars_unregister (&efivars); + goto out_remove_sysfs_files; + } +register_reboot_notifier (&gsmi_reboot_notifier);register_die_notifier (&gsmi_die_notifier); atomic_notifier_chain_register(&panic_notifier_list,
@@ -919,7 +926,7 @@ static void __exit gsmi_exit(void)unregister_die_notifier (&gsmi_die_notifier);atomic_notifier_chain_unregister (&panic_notifier_list, &gsmi_panic_notifier); -unregister_efivars (&efivars); +efivars_unregister (&efivars);sysfs_remove_files (gsmi_kobj, gsmi_attrs);sysfs_remove_bin_file (gsmi_kobj, &eventlog_bin_attr);
include/linux/efi.h +64 -7
86 lines not on this page · raw message
Signature · 1 line
1.7.11.7
A message that is not in the archive (sent off-list or not yet received): 1360357158-8168-4-git-send-email-matt-HNK1S37rvNbeXh+fF434Mdi2O/[email protected]
RE: [RFC][PATCH 3/7] efivars: New efivar_entry API
Matt,
Quoted 3 lines
There isn't really a formalised interface for dealing with EFI variables or struct
efivar_entry. This has led to the efivarfs code directly accessing '__efivars'.
I agree with you.
I have some comment on a pstore part.
drivers/firmware/efivars.c static int efi_pstore_write(enum pstore_type_id type, · line 1200
Quoted 9 lines
drivers/firmware/efivars.c +3
-2@@ -1363,86 +1195,90 @@ static int efi_pstore_write(enum pstore_type_id type,for (i =0 ; i <DUMP_NAME_LEN ; i++) efi_name[i] = name[i]; - efivars->ops->set_variable (efi_name, &vendor,PSTORE_EFI_ATTRIBUTES , - size, psi->buf); + entry =kzalloc (sizeof (*entry),GFP_KERNEL ); +if (!entry) +return -ENOMEM ;
Please don't allocate memory dynamically in the efi_pstore_write() because efi_pstore_write() is called in an interrupt context like oops and panic.
Also, a whole process of query_info() + entry_set() should be protected by a single spin lock() Because if efi_pstore_write() runs concurrently, a result of query_info() may be meaningless...
So, how about introducing query_info_nolock and entry_set_nolock()?
spin_lock()query_info_nolock()entry_set_nolock()spin_unlock()
IMO, efivarfs_file_write() should be fixed as above.
As for efi_pstore_erase() and efi_pstore_read(), it will take some time to fully understand your change.
Seiji
A message that is not in the archive (sent off-list or not yet received): A5ED84D3BB3A384992CBB9C77DEDA4D414A88489-ohthHghroY0jroPwUH3sq+6wyyQG6/[email protected]
Re: [RFC][PATCH 3/7] efivars: New efivar_entry API
Quoted 3 lines · Seiji Aguchi
Please don't allocate memory dynamically in the
efi_pstore_write()becauseefi_pstore_write()is
called in an interrupt context like oops and panic.
efi_pstore_write() already calls efivar_create_sysfs_entry() which does kzalloc() anyway. Obviously this needs fixing, but it doesn't need to be done in this series. Unless there's some pstore patches that fix that somewhere? I know you sent some patches that moved things to a thread, unfortunately I haven't had chance to look at them.
Quoted 5 lines
Also, a whole process of
query_info()+entry_set()should be protected by a single spinlock()
Because ifefi_pstore_write()runs concurrently, a result ofquery_info()may be meaningless...
Quoted 8 lines
So, how about introducing
query_info_nolockandentry_set_nolock()?
spin_lock()query_info_nolock()entry_set_nolock()spin_unlock()IMO,
efivarfs_file_write()should be fixed as above.
Isn't the write() path protected by ->buf_lock? I didn't think it was possible to have two CPUs in the write() path simultaneously.
Signature · 1 line
Matt Fleming, Intel Open Source Technology Center
A message that is not in the archive (sent off-list or not yet received): 1360362300.7515.307.camel-ZqTwcBeJ+wsBof6jY8KHXm7IUlhRatedral2JQCrhuEAvxtiuMwx3w@public.gmane.org
RE: [RFC][PATCH 3/7] efivars: New efivar_entry API
Quoted 4 lines
efi_pstore_write()already callsefivar_create_sysfs_entry()which doeskzalloc()anyway. Obviously this needs fixing, but it doesn't need to be done in this series. Unless there's some pstore patches that fix that somewhere? I know you sent some patches that moved things to a thread, unfortunately I haven't had chance to look at them.
So, could you please take a look at my patch first? We don't need to introduce bug when we know about it.
Quoted 1 line
Isn't the
write()path protected by ->buf_lock? I didn't think it was possible to have two CPUs in thewrite()path simultaneously.
I see, actual problem will not happen.
Seiji
A message that is not in the archive (sent off-list or not yet received): A5ED84D3BB3A384992CBB9C77DEDA4D414A8853D-ohthHghroY0jroPwUH3sq+6wyyQG6/[email protected]
Re: [RFC][PATCH 3/7] efivars: New efivar_entry API
Quoted 10 lines · Seiji Aguchi
Quoted 3 lines
efi_pstore_write()already callsefivar_create_sysfs_entry()which doeskzalloc()anyway. Obviously this needs fixing, but it doesn't need to be done in this series. Unless there's some pstore patches that fix that somewhere? I know you sent some patches that moved things to a thread, unfortunately I haven't had chance to look at them.So, could you please take a look at my patch first? We don't need to introduce bug when we know about it.
Quoted 1 line
Isn't the
write()path protected by ->buf_lock? I didn't think it was possible to have two CPUs in thewrite()path simultaneously.I see, actual problem will not happen.
It's probably still possible to have a CPU creating an EFI variable via the sysfs files while another CPU is in the pstore write path, but I'm not convinced making the query_variable_info() and set_variable() atomic is something that we need to worry about.
Signature · 1 line
Matt Fleming, Intel Open Source Technology Center
A message that is not in the archive (sent off-list or not yet received): 1360364195.7515.314.camel-ZqTwcBeJ+wsBof6jY8KHXm7IUlhRatedral2JQCrhuEAvxtiuMwx3w@public.gmane.org
RE: [RFC][PATCH 3/7] efivars: New efivar_entry API
Quoted 3 lines
It's probably still possible to have a CPU creating an EFI variable via the sysfs files while another CPU is in the pstore write path, but I'm not convinced making the
query_variable_info()andset_variable()atomic is something that we need to worry about.
When I talked about query_variable_info() with Tony, Matthew commented as follows.
http://marc.info/?l=linux-kernel&m=134305325801789&w=2
<snip>
Running out of space in EFI isn't a well-tested scenario, and I wouldn't expect all firmware to handle it gracefully. This is made worse by EFI 1 not providing any information about available storage. <snip>
I'm just concerned that set_variable() may run in the out of space situation if query_variable_info() and set_variable() are not atomic.
Seiji
Quoted 3 lines
--
Matt Fleming, Intel Open Source Technology Center
A message that is not in the archive (sent off-list or not yet received): A5ED84D3BB3A384992CBB9C77DEDA4D414A885F3-ohthHghroY0jroPwUH3sq+6wyyQG6/[email protected]
Re: [RFC][PATCH 3/7] efivars: New efivar_entry API
Quoted 5 lines · Seiji Aguchi
When I talked about
query_variable_info()with Tony, Matthew commented as follows.
Quoted 8 lines
<snip>
Running out of space in EFI isn't a well-tested scenario, and I wouldn't expect all firmware to handle it gracefully. This is made worse by EFI 1 not providing any information about available storage. <snip>I'm just concerned that
set_variable()may run in the out of space situation ifquery_variable_info()andset_variable()are not atomic.
Hmm... OK, I see your point.
I'll add a new function that performs the query_variable_info() and set_variable() atomically.
Signature · 1 line
Matt Fleming, Intel Open Source Technology Center
RFC PATCH v2 3/7 efivars: New efivar_entry API
In reply to a message not in the archiveThere isn't really a formalised interface for dealing with EFI variables or struct efivar_entry. This has led to the efivarfs code directly accessing '__efivars'.
Encapsulate everything that needs to access '__efivars' inside an efivar_entry_* API and use the new API in the pstore, sysfs and efivarfs code.
Much of the efivars code had to be rewritten to use this new API. For instance, it's now up to the users of the API to build the initial list of EFI variables in their efivar_init() callback function. This greatly benefits the efivarfs code which needs to allocate inodes and dentries for every variable, which it previously did in a racy way because the code ran without holding the variable spinlock.
Now, the core EFI variable code creates /sys/firmware/efi/ and the separated sysfs code creates /sys/firmware/efi/vars (or whatever parent_obj points at for CONFIG_GOOGLE_SMI).
A nice side effect of this change is that efivarfs is now usable with CONFIG_GOOGLE_SMI, because it no longer accesses '__efivars' directly.
---
v2: Add efivar_entry_set_safe() which performs QueryVariableInfo() and
SetVariable() atomically under __efivars->lock, and is required for the pstore code.
drivers/firmware/efivars.c | 1586 ++++++++++++++++++++++++---------------- drivers/firmware/google/gsmi.c | 11 +- include/linux/efi.h | 74 +- 3 files changed, 1013 insertions(+), 658 deletions(-)
drivers/firmware/efivars.c +937 -649
@@ -97,35 +97,6 @@ MODULE_VERSION(EFIVARS_VERSION);#define DUMP_NAME_LEN 52 -/* -* Length of a GUID string (strlen("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")) -* not including trailing NUL -*/ -#define GUID_LEN 36 - -/* -* The maximum size of VariableName + Data = 1024 -* Therefore, it's reasonable to save that much -* space in each part of the structure, -* and we use a page for reading/writing. -*/ - -struct efi_variable { -efi_char16_t VariableName[1024 /sizeof (efi_char16_t)]; -efi_guid_t VendorGuid; -unsigned long DataSize; -__u8 Data[1024 ]; -efi_status_t Status; -__u32 Attributes; -} __attribute__((packed)); - -struct efivar_entry { -struct efivars *efivars; -struct efi_variable var; -struct list_head list; -struct kobject kobj; -}; -struct efivar_attribute {struct attribute attr;ssize_t (*show) (struct efivar_entry *entry,char *buf);
@@ -143,6 +114,11 @@ static struct efivars *__efivars; EFI_VARIABLE_BOOTSERVICE_ACCESS | \ EFI_VARIABLE_RUNTIME_ACCESS) +static struct kset *efivars_kset; + +static struct bin_attribute *efivars_new_var; +static struct bin_attribute *efivars_del_var; +#define EFIVAR_ATTR (_name, _mode, _show, _store) \ struct efivar_attribute efivar_attr_##_name = { \ .attr = {.name = __stringify(_name), .mode = _mode}, \
@@ -154,15 +130,6 @@ struct efivar_attribute efivar_attr_##_name = { \#define to_efivar_entry (obj) container_of(obj, struct efivar_entry, kobj)/* -* Prototype for sysfs creation function -*/ -static int -efivar_create_sysfs_entry (struct efivars *efivars, -unsigned long variable_name_size, -efi_char16_t *variable_name, -efi_guid_t *vendor_guid); - -/* * Return the number of bytes is the length of this string * Note: this is NOT the same as the number of unicode characters */
@@ -337,8 +304,8 @@ static const struct variable_validate variable_validate[] = { { "", NULL }, }; -static bool -validate_var (struct efi_variable *var,u8 *data,unsigned long len) +bool +efivar_validate (struct efi_variable *var,u8 *data,unsigned long len) {int i;u16 *unicode_name = var->VariableName;
@@ -373,36 +340,7 @@ validate_var(struct efi_variable *var, u8 *data, unsigned long len)return true; } - -static efi_status_t -get_var_data_locked (struct efivars *efivars,struct efi_variable *var) -{ -efi_status_t status; - - var->DataSize =1024 ; - status = efivars->ops->get_variable (var->VariableName, - &var->VendorGuid, - &var->Attributes, - &var->DataSize, - var->Data); -return status; -} - -static efi_status_t -get_var_data (struct efivars *efivars,struct efi_variable *var) -{ -efi_status_t status; - -spin_lock (&efivars->lock); - status =get_var_data_locked (efivars, var); -spin_unlock (&efivars->lock); - -if (status !=EFI_SUCCESS ) { -printk (KERN_WARNING "efivars: get_variable() failed 0x%lx!\n" , - status); - } -return status; -} +EXPORT_SYMBOL_GPL (efivar_validate);static ssize_t efivar_guid_read (struct efivar_entry *entry,char *buf)
@@ -425,13 +363,12 @@ efivar_attr_read(struct efivar_entry *entry, char *buf) {struct efi_variable *var = &entry->var;char *str = buf; -efi_status_t status;if (!entry || !buf)return -EINVAL ; - status =get_var_data (entry->efivars, var); -if (status !=EFI_SUCCESS ) + var->DataSize =1024 ; +if (efivar_entry_get (entry, &var->Attributes, &var->DataSize, var->Data))return -EIO ;if (var->Attributes &EFI_VARIABLE_NON_VOLATILE )
@@ -459,13 +396,12 @@ efivar_size_read(struct efivar_entry *entry, char *buf) {struct efi_variable *var = &entry->var;char *str = buf; -efi_status_t status;if (!entry || !buf)return -EINVAL ; - status =get_var_data (entry->efivars, var); -if (status !=EFI_SUCCESS ) + var->DataSize =1024 ; +if (efivar_entry_get (entry, &var->Attributes, &var->DataSize, var->Data))return -EIO ; str +=sprintf (str,"0x%lx\n" , var->DataSize);
@@ -476,13 +412,12 @@ static ssize_t efivar_data_read(struct efivar_entry *entry, char *buf) { struct efi_variable *var = &entry->var; -efi_status_t status;if (!entry || !buf)return -EINVAL ; - status =get_var_data (entry->efivars, var); -if (status !=EFI_SUCCESS ) + var->DataSize =1024 ; +if (efivar_entry_get (entry, &var->Attributes, &var->DataSize, var->Data))return -EIO ;memcpy (buf, var->Data, var->DataSize);
@@ -496,8 +431,7 @@ static ssize_t efivar_store_raw(struct efivar_entry *entry, const char *buf, size_t count) { struct efi_variable *new_var, *var = &entry->var; -struct efivars *efivars = entry->efivars; -efi_status_t status =EFI_NOT_FOUND ; +int err;if (count !=sizeof (struct efi_variable ))return -EINVAL ;
@@ -519,27 +453,20 @@ efivar_store_raw(struct efivar_entry *entry, const char *buf, size_t count) }if ((new_var->Attributes & ~EFI_VARIABLE_MASK ) !=0 || -validate_var (new_var, new_var->Data, new_var->DataSize) == false) { +efivar_validate (new_var, new_var->Data, new_var->DataSize) == false) {printk (KERN_ERR "efivars: Malformed variable content\n" );return -EINVAL ; } -spin_lock (&efivars->lock); - status = efivars->ops->set_variable (new_var->VariableName, - &new_var->VendorGuid, - new_var->Attributes, - new_var->DataSize, - new_var->Data); - -spin_unlock (&efivars->lock); +memcpy (&entry->var, new_var, count); -if (status !=EFI_SUCCESS ) { -printk (KERN_WARNING "efivars: set_variable() failed: status=%lx\n" , - status); + err =efivar_entry_set (entry, new_var->Attributes, + new_var->DataSize, new_var->Data, false); +if (err) { +printk (KERN_WARNING "efivars: set_variable() failed: status=%d\n" , err);return -EIO ; } -memcpy (&entry->var, new_var, count);return count; }
@@ -547,16 +474,16 @@ static ssize_t efivar_show_raw(struct efivar_entry *entry, char *buf) { struct efi_variable *var = &entry->var; -efi_status_t status;if (!entry || !buf)return 0 ; - status =get_var_data (entry->efivars, var); -if (status !=EFI_SUCCESS ) +memcpy (buf, var,sizeof (*var)); + +if (efivar_entry_get (entry, &entry->var.Attributes, + &entry->var.DataSize, entry->var.Data))return -EIO ; -memcpy (buf, var,sizeof (*var));return sizeof (*var); }
@@ -645,6 +572,9 @@ static int efi_status_to_err(efi_status_t status)int err;switch (status) { +case EFI_SUCCESS : + err =0 ; +break ;case EFI_INVALID_PARAMETER : err = -EINVAL ;break ;
@@ -661,7 +591,7 @@ static int efi_status_to_err(efi_status_t status) err = -EACCES ;break ;case EFI_NOT_FOUND : - err = -EIO ; + err = -ENOENT ;break ;default : err = -EINVAL ;
@@ -674,15 +604,14 @@ static ssize_t efivarfs_file_write(struct file *file, const char __user *userbuf, size_t count, loff_t *ppos) { struct efivar_entry *var = file->private_data; -struct efivars *efivars; -efi_status_t status;void *data;u32 attributes;struct inode *inode = file->f_mapping->host;unsigned long datasize = count -sizeof (attributes); -unsigned long newdatasize;u64 storage_size, remaining_size, max_size;ssize_t bytes =0 ; +bool set = false; +int err;if (count <sizeof (attributes))return -EINVAL ;
@@ -693,28 +622,16 @@ static ssize_t efivarfs_file_write(struct file *file,if (attributes & ~(EFI_VARIABLE_MASK ))return -EINVAL ; - efivars = var->efivars; -/* * Ensure that the user can't allocate arbitrarily large * amounts of memory. Pick a default size of 64K if * QueryVariableInfo() isn't supported by the firmware. */ -spin_lock (&efivars->lock); - -if (!efivars->ops->query_variable_info) - status =EFI_UNSUPPORTED ; -else { -const struct efivar_operations *fops = efivars->ops; - status = fops->query_variable_info (attributes, &storage_size, - &remaining_size, &max_size); - } - -spin_unlock (&efivars->lock); - -if (status !=EFI_SUCCESS ) { -if (status !=EFI_UNSUPPORTED ) -return efi_status_to_err (status); + err =efivar_query_info (attributes, &storage_size, + &remaining_size, &max_size); +if (err) { +if (err != -ENOSYS ) +return err; remaining_size =65536 ; }
@@ -731,64 +648,23 @@ static ssize_t efivarfs_file_write(struct file *file, goto out; } -if (validate_var (&var->var, data, datasize) == false) { - bytes = -EINVAL ; + bytes =efivar_entry_set_get_size (var, attributes, &datasize, + data, &set); +if (!set && bytes) goto out; - } - -/* -* The lock here protects the get_variable call, the conditional -* set_variable call, and removal of the variable from the efivars -* list (in the case of an authenticated delete). -*/ -spin_lock (&efivars->lock); - - status = efivars->ops->set_variable (var->var.VariableName, - &var->var.VendorGuid, - attributes, datasize, - data); - -if (status !=EFI_SUCCESS ) { -spin_unlock (&efivars->lock); -kfree (data); - -return efi_status_to_err (status); - } - - bytes = count; - -/* -* Writing to the variable may have caused a change in size (which -* could either be an append or an overwrite), or the variable to be -* deleted. Perform a GetVariable() so we can tell what actually -* happened. -*/ - newdatasize =0 ; - status = efivars->ops->get_variable (var->var.VariableName, - &var->var.VendorGuid, -NULL , &newdatasize, -NULL ); - -if (status ==EFI_BUFFER_TOO_SMALL ) { -spin_unlock (&efivars->lock); -mutex_lock (&inode->i_mutex); -i_size_write (inode, newdatasize +sizeof (attributes)); -mutex_unlock (&inode->i_mutex); - }else if (status ==EFI_NOT_FOUND ) { -list_del (&var->list); -spin_unlock (&efivars->lock); -efivar_unregister (var); +if (bytes == -ENOENT ) {drop_nlink (inode);d_delete (file->f_dentry);dput (file->f_dentry); - }else { -spin_unlock (&efivars->lock); -pr_warn ("efivarfs: inconsistent EFI variable implementation? " -"status = %lx\n" , status); +mutex_lock (&inode->i_mutex); +i_size_write (inode, datasize +sizeof (attributes)); +mutex_unlock (&inode->i_mutex); } + bytes = count; + out:kfree (data);
@@ -799,38 +675,25 @@ static ssize_t efivarfs_file_read(struct file *file, char __user *userbuf, size_t count, loff_t *ppos) { struct efivar_entry *var = file->private_data; -struct efivars *efivars = var->efivars; -efi_status_t status;unsigned long datasize =0 ;u32 attributes;void *data;ssize_t size =0 ; +int err; -spin_lock (&efivars->lock); - status = efivars->ops->get_variable (var->var.VariableName, - &var->var.VendorGuid, - &attributes, &datasize,NULL ); -spin_unlock (&efivars->lock); - -if (status !=EFI_BUFFER_TOO_SMALL ) -return efi_status_to_err (status); + err =efivar_entry_size (var, &datasize); +if (err) +return err; data =kmalloc (datasize +sizeof (attributes),GFP_KERNEL );if (!data)return -ENOMEM ; -spin_lock (&efivars->lock); - status = efivars->ops->get_variable (var->var.VariableName, - &var->var.VendorGuid, - &attributes, &datasize, - (data +sizeof (attributes))); -spin_unlock (&efivars->lock); - -if (status !=EFI_SUCCESS ) { - size =efi_status_to_err (status); + size =efivar_entry_get (var, &attributes, &datasize, + data +sizeof (attributes)); +if (size) goto out_free; - }memcpy (data, &attributes,sizeof (attributes)); size = simple_read_from_buffer(userbuf, count, ppos,
@@ -905,7 +768,7 @@ static bool efivarfs_valid_name(const char *str, int len)* We need a GUID, plus at least one letter for the variable name, * plus the '-' separator */ -if (len <GUID_LEN +2 ) +if (len <EFI_VARIABLE_GUID_LEN +2 )return false; s =strchr (str,'-' );
@@ -915,7 +778,7 @@ static bool efivarfs_valid_name(const char *str, int len) s++;/* Skip '-' */ /* Ensure we have enough characters for a GUID */ -if (len - (s - str) !=GUID_LEN ) +if (len - (s - str) !=EFI_VARIABLE_GUID_LEN )return false;/*
@@ -929,7 +792,7 @@ static bool efivarfs_valid_name(const char *str, int len)return false; } -if (j <GUID_LEN && s[j] !='-' ) +if (j <EFI_VARIABLE_GUID_LEN && s[j] !='-' )return false; }
@@ -960,7 +823,6 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl) {struct inode *inode; -struct efivars *efivars = __efivars;struct efivar_entry *var;int namelen, i =0 , err =0 ;
@@ -978,7 +840,7 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry, }/* length of the variable name itself: remove GUID and separator */ - namelen = dentry->d_name.len -GUID_LEN -1 ; + namelen = dentry->d_name.len -EFI_VARIABLE_GUID_LEN -1 ;efivarfs_hex_to_guid (dentry->d_name.name + namelen +1 , &var->var.VendorGuid);
@@ -989,18 +851,8 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry, var->var.VariableName[i] ='\0' ; inode->i_private = var; - var->efivars = efivars; - var->kobj.kset = efivars->kset; - - err =kobject_init_and_add (&var->kobj, &efivar_ktype,NULL ,"%s" , - dentry->d_name.name); -if (err) - goto out; -kobject_uevent (&var->kobj,KOBJ_ADD ); -spin_lock (&efivars->lock); -list_add (&var->list, &efivars->list); -spin_unlock (&efivars->lock); +efivar_entry_add (var);d_instantiate (dentry, inode);dget (dentry); out:
@@ -1014,26 +866,13 @@ out:static int efivarfs_unlink (struct inode *dir,struct dentry *dentry) {struct efivar_entry *var = dentry->d_inode->i_private; -struct efivars *efivars = var->efivars; -efi_status_t status; - -spin_lock (&efivars->lock); - status = efivars->ops->set_variable (var->var.VariableName, - &var->var.VendorGuid, -0 ,0 ,NULL ); - -if (status ==EFI_SUCCESS || status ==EFI_NOT_FOUND ) { -list_del (&var->list); -spin_unlock (&efivars->lock); -efivar_unregister (var); -drop_nlink (dentry->d_inode); -dput (dentry); -return 0 ; - } +if (efivar_entry_delete (var)) +return -EINVAL ; -spin_unlock (&efivars->lock); -return -EINVAL ; +drop_nlink (dentry->d_inode); +dput (dentry); +return 0 ; };/*
@@ -1121,13 +960,65 @@ static struct dentry_operations efivarfs_d_ops = { .d_delete = efivarfs_delete_dentry, }; +static int efivarfs_callback (struct efivar_entry *entry,void *data) +{ +struct super_block *sb = (struct super_block *)data; +struct inode *inode =NULL ; +struct dentry *dentry, *root = sb->s_root; +unsigned long size =0 ; +char *name; +int len, i; + + len =utf16_strlen (entry->var.VariableName); + +/* name, plus '-', plus GUID, plus NUL*/ + name =kmalloc (len +1 +EFI_VARIABLE_GUID_LEN +1 ,GFP_KERNEL ); +if (!name) + goto fail; + +for (i =0 ; i < len; i++) + name[i] = entry->var.VariableName[i] &0xFF ; + + name[len] ='-' ; + +efi_guid_unparse (&entry->var.VendorGuid, name + len +1 ); + + name[len +EFI_VARIABLE_GUID_LEN +1 ] ='\0' ; + + inode =efivarfs_get_inode (sb, root->d_inode,S_IFREG |0644 ,0 ); +if (!inode) + goto fail_name; + + dentry =d_alloc_name (root, name); +if (!dentry) + goto fail_inode; + +/* copied by the above to local storage in the dentry. */ +kfree (name); + +efivar_entry_size (entry, &size); +efivar_entry_add (entry); + +mutex_lock (&inode->i_mutex); + inode->i_private = entry; +i_size_write (inode, size +sizeof (entry->var.Attributes)); +mutex_unlock (&inode->i_mutex); +d_add (dentry, inode); + +return 0 ; + +fail_inode: +iput (inode); +fail_name: +kfree (name); +fail: +return -ENOMEM ; +} +static int efivarfs_fill_super (struct super_block *sb,void *data,int silent) {struct inode *inode =NULL ;struct dentry *root; -struct efivar_entry *entry, *n; -struct efivars *efivars = __efivars; -char *name; efivarfs_sb = sb;
@@ -1149,64 +1040,7 @@ static int efivarfs_fill_super(struct super_block *sb, void *data, int silent)if (!root)return -ENOMEM ; -list_for_each_entry_safe (entry, n, &efivars->list, list) { -struct dentry *dentry, *root = efivarfs_sb->s_root; -unsigned long size =0 ; -int len, i; - - inode =NULL ; - - len =utf16_strlen (entry->var.VariableName); - -/* name, plus '-', plus GUID, plus NUL*/ - name =kmalloc (len +1 +GUID_LEN +1 ,GFP_ATOMIC ); -if (!name) - goto fail; - -for (i =0 ; i < len; i++) - name[i] = entry->var.VariableName[i] &0xFF ; - - name[len] ='-' ; - -efi_guid_unparse (&entry->var.VendorGuid, name + len +1 ); - - name[len+GUID_LEN +1 ] ='\0' ; - - inode =efivarfs_get_inode (efivarfs_sb, root->d_inode, -S_IFREG |0644 ,0 ); -if (!inode) - goto fail_name; - - dentry =d_alloc_name (root, name); -if (!dentry) - goto fail_inode; - -/* copied by the above to local storage in the dentry. */ -kfree (name); - -spin_lock (&efivars->lock); - efivars->ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - &entry->var.Attributes, - &size, -NULL ); -spin_unlock (&efivars->lock); - -mutex_lock (&inode->i_mutex); - inode->i_private = entry; -i_size_write (inode, size +sizeof (entry->var.Attributes)); -mutex_unlock (&inode->i_mutex); -d_add (dentry, inode); - } - -return 0 ; - -fail_inode: -iput (inode); -fail_name: -kfree (name); -fail: -return -ENOMEM ; +return efivar_init (efivarfs_callback, (void *)sb); } static struct dentry *efivarfs_mount(struct file_system_type *fs_type,
@@ -1251,80 +1085,84 @@ static struct pstore_info efi_pstore_info;static int efi_pstore_open (struct pstore_info *psi) { -struct efivars *efivars = psi->data; - -spin_lock (&efivars->lock); - efivars->walk_entry =list_first_entry (&efivars->list, - struct efivar_entry, list); +efivar_entry_iter_begin (); + psi->data =NULL ;return 0 ; }static int efi_pstore_close (struct pstore_info *psi) { -struct efivars *efivars = psi->data; - -spin_unlock (&efivars->lock); +efivar_entry_iter_end (); + psi->data =NULL ;return 0 ; } -static ssize_t efi_pstore_read (u64 *id,enum pstore_type_id *type, -int *count,struct timespec *timespec, -char **buf,struct pstore_info *psi) +struct pstore_read_data { +u64 *id; +enum pstore_type_id *type; +int *count; +struct timespec *timespec; +char **buf; +}; + +static int efi_pstore_read_func (struct efivar_entry *entry,void *data) { -efi_guid_t vendor =LINUX_EFI_CRASH_GUID ; -struct efivars *efivars = psi->data; +struct pstore_read_data *cb_data = data;char name[DUMP_NAME_LEN ];int i;int cnt; -unsigned int part, size; -unsigned long time; - -while (&efivars->walk_entry->list != &efivars->list) { -if (!efi_guidcmp (efivars->walk_entry->var.VendorGuid, - vendor)) { -for (i =0 ; i <DUMP_NAME_LEN ; i++) { - name[i] = efivars->walk_entry->var.VariableName[i]; - } -if (sscanf (name,"dump-type%u-%u-%d-%lu" , - type, &part, &cnt, &time) ==4 ) { - *id = part; - *count = cnt; - timespec->tv_sec = time; - timespec->tv_nsec =0 ; - }else if (sscanf (name,"dump-type%u-%u-%lu" , - type, &part, &time) ==3 ) { -/* -* Check if an old format, -* which doesn't support holding -* multiple logs, remains. -*/ - *id = part; - *count =0 ; - timespec->tv_sec = time; - timespec->tv_nsec =0 ; - }else { - efivars->walk_entry =list_entry ( - efivars->walk_entry->list.next, - struct efivar_entry, list); -continue ; - } - -get_var_data_locked (efivars, &efivars->walk_entry->var); - size = efivars->walk_entry->var.DataSize; - *buf =kmalloc (size,GFP_KERNEL ); -if (*buf ==NULL ) -return -ENOMEM ; -memcpy (*buf, efivars->walk_entry->var.Data, - size); - efivars->walk_entry =list_entry ( - efivars->walk_entry->list.next, - struct efivar_entry, list); -return size; - } - efivars->walk_entry =list_entry (efivars->walk_entry->list.next, - struct efivar_entry, list); - } -return 0 ; +unsigned int part; +unsigned long time, size; +efi_guid_t vendor =LINUX_EFI_CRASH_GUID ; + +if (efi_guidcmp (entry->var.VendorGuid, vendor)) +return 0 ; + +for (i =0 ; i <DUMP_NAME_LEN ; i++) + name[i] = entry->var.VariableName[i]; + +if (sscanf (name,"dump-type%u-%u-%d-%lu" , + cb_data->type, &part, &cnt, &time) ==4 ) { + *cb_data->id = part; + *cb_data->count = cnt; + cb_data->timespec->tv_sec = time; + cb_data->timespec->tv_nsec =0 ; + }else if (sscanf (name,"dump-type%u-%u-%lu" , + cb_data->type, &part, &time) ==3 ) { +/* +* Check if an old format, +* which doesn't support holding +* multiple logs, remains. +*/ + *cb_data->id = part; + *cb_data->count =0 ; + cb_data->timespec->tv_sec = time; + cb_data->timespec->tv_nsec =0 ; + }else +return 0 ; + +efivar_entry_size (entry, &size); + *cb_data->buf =kmalloc (size,GFP_KERNEL ); +if (*cb_data->buf ==NULL ) +return -ENOMEM ; +memcpy (*cb_data->buf, entry->var.Data, size); +return size; +} + +static ssize_t efi_pstore_read (u64 *id,enum pstore_type_id *type, +int *count,struct timespec *timespec, +char **buf,struct pstore_info *psi) +{ +struct pstore_read_data data; + + data.id = id; + data.type = type; + data.count = count; + data.timespec = timespec; + data.buf = buf; + +return __efivar_entry_iter (efi_pstore_read_func, &data, + (struct efivar_entry **)&psi->data); } static int efi_pstore_write(enum pstore_type_id type,
@@ -1332,30 +1170,11 @@ static int efi_pstore_write(enum pstore_type_id type, unsigned int part, int count, size_t size, struct pstore_info *psi) { + struct efivar_entry *entry;char name[DUMP_NAME_LEN ];efi_char16_t efi_name[DUMP_NAME_LEN ];efi_guid_t vendor =LINUX_EFI_CRASH_GUID ; -struct efivars *efivars = psi->data;int i, ret =0 ; -u64 storage_space, remaining_space, max_variable_size; -efi_status_t status =EFI_NOT_FOUND ; - -spin_lock (&efivars->lock); - -/* -* Check if there is a space enough to log. -* size: a size of logging data -* DUMP_NAME_LEN * 2: a maximum size of variable name -*/ - status = efivars->ops->query_variable_info (PSTORE_EFI_ATTRIBUTES , - &storage_space, - &remaining_space, - &max_variable_size); -if (status || remaining_space < size +DUMP_NAME_LEN *2 ) { -spin_unlock (&efivars->lock); - *id = part; -return -ENOSPC ; - }sprintf (name,"dump-type%u-%u-%d-%lu" , type, part, count,get_seconds ());
@@ -1363,86 +1182,91 @@ static int efi_pstore_write(enum pstore_type_id type,for (i =0 ; i <DUMP_NAME_LEN ; i++) efi_name[i] = name[i]; - efivars->ops->set_variable (efi_name, &vendor,PSTORE_EFI_ATTRIBUTES , - size, psi->buf); + entry =kzalloc (sizeof (*entry),GFP_KERNEL ); +if (!entry) +return -ENOMEM ; -spin_unlock (&efivars->lock); +memcpy (entry->var.VariableName, efi_name, +utf16_strsize (efi_name,DUMP_NAME_LEN *2 )); +memcpy (&(entry->var.VendorGuid), &vendor,sizeof (vendor)); -if (size) - ret =efivar_create_sysfs_entry (efivars, -utf16_strsize (efi_name, -DUMP_NAME_LEN *2 ), - efi_name, &vendor); + ret =efivar_entry_set_safe (entry,PSTORE_EFI_ATTRIBUTES , + size, psi->buf); + +if (size && !ret) + ret =efivar_create_sysfs_entry (entry); *id = part;return ret; }; +struct pstore_erase_data { +u64 id; +enum pstore_type_id type; +int count; +struct timespec time; +efi_char16_t *name; +}; + +/* +* Clean up an entry with the same name +*/ +static int efi_pstore_erase_func (struct efivar_entry *entry,void *data) +{ +struct pstore_erase_data *ed = data; +efi_guid_t vendor =LINUX_EFI_CRASH_GUID ; +efi_char16_t efi_name_old[DUMP_NAME_LEN ]; +efi_char16_t *efi_name = ed->name; +unsigned long utf16_len =utf16_strlen (ed->name); +char name_old[DUMP_NAME_LEN ]; +int i; + +if (efi_guidcmp (entry->var.VendorGuid, vendor)) +return 0 ; + +if (utf16_strncmp (entry->var.VariableName, + efi_name, (size_t )utf16_len)) { +/* +* Check if an old format, which doesn't support +* holding multiple logs, remains. +*/ +sprintf (name_old,"dump-type%u-%u-%lu" , ed->type, + (unsigned int )ed->id, ed->time.tv_sec); + +for (i =0 ; i <DUMP_NAME_LEN ; i++) + efi_name_old[i] = name_old[i]; + +if (utf16_strncmp (entry->var.VariableName, efi_name_old, +utf16_strlen (efi_name_old))) +return 0 ; + } + +/* found */ +__efivar_entry_delete (entry); +return 1 ; +} +static int efi_pstore_erase (enum pstore_type_id type,u64 id,int count,struct timespec time,struct pstore_info *psi) { +struct pstore_erase_data edata;char name[DUMP_NAME_LEN ];efi_char16_t efi_name[DUMP_NAME_LEN ]; -char name_old[DUMP_NAME_LEN ]; -efi_char16_t efi_name_old[DUMP_NAME_LEN ]; -efi_guid_t vendor =LINUX_EFI_CRASH_GUID ; -struct efivars *efivars = psi->data; -struct efivar_entry *entry, *found =NULL ;int i;sprintf (name,"dump-type%u-%u-%d-%lu" , type, (unsigned int )id, count, time.tv_sec); -spin_lock (&efivars->lock); -for (i =0 ; i <DUMP_NAME_LEN ; i++) efi_name[i] = name[i]; -/* -* Clean up an entry with the same name -*/ - -list_for_each_entry (entry, &efivars->list, list) { -get_var_data_locked (efivars, &entry->var); - -if (efi_guidcmp (entry->var.VendorGuid, vendor)) -continue ; -if (utf16_strncmp (entry->var.VariableName, efi_name, -utf16_strlen (efi_name))) { -/* -* Check if an old format, -* which doesn't support holding -* multiple logs, remains. -*/ -sprintf (name_old,"dump-type%u-%u-%lu" , type, - (unsigned int )id, time.tv_sec); - -for (i =0 ; i <DUMP_NAME_LEN ; i++) - efi_name_old[i] = name_old[i]; - -if (utf16_strncmp (entry->var.VariableName, efi_name_old, -utf16_strlen (efi_name_old))) -continue ; - } - -/* found */ - found = entry; - efivars->ops->set_variable (entry->var.VariableName, - &entry->var.VendorGuid, -PSTORE_EFI_ATTRIBUTES , -0 ,NULL ); -break ; - } - -if (found) -list_del (&found->list); - -spin_unlock (&efivars->lock); + edata.id = id; + edata.type = type; + edata.count = count; + edata.time = time; + edata.name = efi_name; -if (found) -efivar_unregister (found); - -return 0 ; +return efivar_entry_iter (efi_pstore_erase_func, &edata); }#else static int efi_pstore_open (struct pstore_info *psi)
@@ -1455,8 +1279,8 @@ static int efi_pstore_close(struct pstore_info *psi)return 0 ; } -static ssize_t efi_pstore_read (u64 *id,enum pstore_type_id *type,int *count, -struct timespec *timespec, +static ssize_t efi_pstore_read (u64 *id,enum pstore_type_id *type, +int *count,struct timespec *timespec,char **buf,struct pstore_info *psi) {return -1 ;
@@ -1492,66 +1316,36 @@ static ssize_t efivar_create(struct file *filp, struct kobject *kobj, char *buf, loff_t pos, size_t count) {struct efi_variable *new_var = (struct efi_variable *)buf; -struct efivars *efivars = bin_attr->private; -struct efivar_entry *search_efivar, *n; -unsigned long strsize1, strsize2; +struct efivar_entry *new_entry;efi_status_t status =EFI_NOT_FOUND ; -int found =0 ;if (!capable (CAP_SYS_ADMIN ))return -EACCES ;if ((new_var->Attributes & ~EFI_VARIABLE_MASK ) !=0 || -validate_var (new_var, new_var->Data, new_var->DataSize) == false) { +efivar_validate (new_var, new_var->Data, new_var->DataSize) == false) {printk (KERN_ERR "efivars: Malformed variable content\n" );return -EINVAL ; } -spin_lock (&efivars->lock); + new_entry =kmalloc (sizeof (*new_entry),GFP_KERNEL ); +if (!new_entry) +return -ENOMEM ; -/* -* Does this variable already exist? -*/ -list_for_each_entry_safe (search_efivar, n, &efivars->list, list) { - strsize1 =utf16_strsize (search_efivar->var.VariableName,1024 ); - strsize2 =utf16_strsize (new_var->VariableName,1024 ); -if (strsize1 == strsize2 && - !memcmp (&(search_efivar->var.VariableName), - new_var->VariableName, strsize1) && - !efi_guidcmp (search_efivar->var.VendorGuid, - new_var->VendorGuid)) { - found =1 ; -break ; - } - } -if (found) { -spin_unlock (&efivars->lock); +memcpy (&new_entry->var, new_var,sizeof (*new_var)); + + status =efivar_entry_set (new_entry, new_var->Attributes, + new_var->DataSize, new_var->Data, true); +if (status == -EEXIST )return -EINVAL ; - } -/* now *really* create the variable via EFI */ - status = efivars->ops->set_variable (new_var->VariableName, - &new_var->VendorGuid, - new_var->Attributes, - new_var->DataSize, - new_var->Data); +if (status) +return status; -if (status !=EFI_SUCCESS ) { -printk (KERN_WARNING "efivars: set_variable() failed: status=%lx\n" , - status); -spin_unlock (&efivars->lock); -return -EIO ; - } -spin_unlock (&efivars->lock); - -/* Create the entry in sysfs. Locking is not required here */ - status =efivar_create_sysfs_entry (efivars, -utf16_strsize (new_var->VariableName, -1024 ), - new_var->VariableName, - &new_var->VendorGuid); + status =efivar_create_sysfs_entry (new_entry);if (status) { -printk (KERN_WARNING "efivars: variable created, but sysfs entry wasn't.\n" ); +kfree (new_entry); +printk (KERN_WARNING "efivars: failed to create sysfs entry.\n" ); }return count; }
@@ -1561,56 +1355,25 @@ static ssize_t efivar_delete(struct file *filp, struct kobject *kobj, char *buf, loff_t pos, size_t count) {struct efi_variable *del_var = (struct efi_variable *)buf; -struct efivars *efivars = bin_attr->private; -struct efivar_entry *search_efivar, *n; -unsigned long strsize1, strsize2; -efi_status_t status =EFI_NOT_FOUND ; -int found =0 ; +struct efivar_entry *entry; +int err;if (!capable (CAP_SYS_ADMIN ))return -EACCES ; -spin_lock (&efivars->lock); +efivar_entry_iter_begin (); + entry =efivar_entry_find (del_var->VariableName, + del_var->VendorGuid, true); +if (!entry) + err = -EINVAL ; +else + err =__efivar_entry_delete (entry); +efivar_entry_iter_end (); -/* -* Does this variable already exist? -*/ -list_for_each_entry_safe (search_efivar, n, &efivars->list, list) { - strsize1 =utf16_strsize (search_efivar->var.VariableName,1024 ); - strsize2 =utf16_strsize (del_var->VariableName,1024 ); -if (strsize1 == strsize2 && - !memcmp (&(search_efivar->var.VariableName), - del_var->VariableName, strsize1) && - !efi_guidcmp (search_efivar->var.VendorGuid, - del_var->VendorGuid)) { - found =1 ; -break ; - } - } -if (!found) { -spin_unlock (&efivars->lock); -return -EINVAL ; - } -/* force the Attributes/DataSize to 0 to ensure deletion */ - del_var->Attributes =0 ; - del_var->DataSize =0 ; - - status = efivars->ops->set_variable (del_var->VariableName, - &del_var->VendorGuid, - del_var->Attributes, - del_var->DataSize, - del_var->Data); - -if (status !=EFI_SUCCESS ) { -printk (KERN_WARNING "efivars: set_variable() failed: status=%lx\n" , - status); -spin_unlock (&efivars->lock); +if (err)return -EIO ; - } -list_del (&search_efivar->list); -/* We need to release this lock before unregistering. */ -spin_unlock (&efivars->lock); -efivar_unregister (search_efivar); + +efivar_unregister (entry);/* It's dead Jim.... */ return count;
@@ -1666,40 +1429,33 @@ static struct kobject *efi_kobj;* variable_name_size = number of bytes required to hold * variable_name (not counting the NULL * character at the end. -* efivars->lock is not held on entry or exit. * Returns 1 on failure, 0 on success */ -static int -efivar_create_sysfs_entry (struct efivars *efivars, -unsigned long variable_name_size, -efi_char16_t *variable_name, -efi_guid_t *vendor_guid) +int +efivar_create_sysfs_entry (struct efivar_entry *new_var) {int i, short_name_size;char *short_name; -struct efivar_entry *new_efivar; +unsigned long variable_name_size; +efi_char16_t *variable_name; + + variable_name = new_var->var.VariableName; + variable_name_size =utf16_strlen (variable_name) *sizeof (efi_char16_t);/* * Length of the variable bytes in ASCII, plus the '-' separator, * plus the GUID, plus trailing NUL */ short_name_size = variable_name_size /sizeof (efi_char16_t) - +1 +GUID_LEN +1 ; + +1 +EFI_VARIABLE_GUID_LEN +1 ; short_name =kzalloc (short_name_size,GFP_KERNEL ); - new_efivar =kzalloc (sizeof (struct efivar_entry ),GFP_KERNEL ); -if (!short_name || !new_efivar) { +if (!short_name) {kfree (short_name); -kfree (new_efivar);return 1 ; } - new_efivar->efivars = efivars; -memcpy (new_efivar->var.VariableName, variable_name, - variable_name_size); -memcpy (&(new_efivar->var.VendorGuid), vendor_guid,sizeof (efi_guid_t)); -/* Convert Unicode to normal chars (assume top bits are 0), ala UTF-8 */ for (i=0 ; i < (int )(variable_name_size /sizeof (efi_char16_t)); i++) {
@@ -1709,30 +1465,25 @@ efivar_create_sysfs_entry(struct efivars *efivars,private variables from another's. */ *(short_name +strlen (short_name)) ='-' ; -efi_guid_unparse (vendor_guid, short_name +strlen (short_name)); +efi_guid_unparse (&new_var->var.VendorGuid, + short_name +strlen (short_name)); - new_efivar->kobj.kset = efivars->kset; - i =kobject_init_and_add (&new_efivar->kobj, &efivar_ktype,NULL , -"%s" , short_name); -if (i) { -kfree (short_name); -kfree (new_efivar); -return 1 ; - } + new_var->kobj.kset = efivars_kset; -kobject_uevent (&new_efivar->kobj,KOBJ_ADD ); + i =kobject_init_and_add (&new_var->kobj, &efivar_ktype, +NULL ,"%s" , short_name);kfree (short_name); - short_name =NULL ; - -spin_lock (&efivars->lock); -list_add (&new_efivar->list, &efivars->list); -spin_unlock (&efivars->lock); +if (i) +return 1 ; +kobject_uevent (&new_var->kobj,KOBJ_ADD ); +efivar_entry_add (new_var);return 0 ; } +EXPORT_SYMBOL_GPL (efivar_create_sysfs_entry);static int -create_efivars_bin_attributes (struct efivars *efivars) +create_efivars_bin_attributes (void ) {struct bin_attribute *attr;int error;
@@ -1745,8 +1496,7 @@ create_efivars_bin_attributes(struct efivars *efivars) attr->attr.name ="new_var" ; attr->attr.mode =0200 ; attr->write = efivar_create; - attr->private = efivars; - efivars->new_var = attr; + efivars_new_var = attr;/* del_var */ attr =kzalloc (sizeof (*attr),GFP_KERNEL );
@@ -1757,75 +1507,105 @@ create_efivars_bin_attributes(struct efivars *efivars) attr->attr.name ="del_var" ; attr->attr.mode =0200 ; attr->write = efivar_delete; - attr->private = efivars; - efivars->del_var = attr; + efivars_del_var = attr; -sysfs_bin_attr_init (efivars->new_var); -sysfs_bin_attr_init (efivars->del_var); +sysfs_bin_attr_init (efivars_new_var); +sysfs_bin_attr_init (efivars_del_var);/* Register */ - error =sysfs_create_bin_file (&efivars->kset->kobj, - efivars->new_var); + error =sysfs_create_bin_file (&efivars_kset->kobj, efivars_new_var);if (error) {printk (KERN_ERR "efivars: unable to create new_var sysfs file" " due to error %d\n" , error); goto out_free; } - error =sysfs_create_bin_file (&efivars->kset->kobj, - efivars->del_var); + + error =sysfs_create_bin_file (&efivars_kset->kobj, efivars_del_var);if (error) {printk (KERN_ERR "efivars: unable to create del_var sysfs file" " due to error %d\n" , error); -sysfs_remove_bin_file (&efivars->kset->kobj, - efivars->new_var); +sysfs_remove_bin_file (&efivars_kset->kobj, efivars_new_var); goto out_free; }return 0 ; out_free: -kfree (efivars->del_var); - efivars->del_var =NULL ; -kfree (efivars->new_var); - efivars->new_var =NULL ; +kfree (efivars_del_var); + efivars_del_var =NULL ; +kfree (efivars_new_var); + efivars_new_var =NULL ;return error; } -void unregister_efivars (struct efivars *efivars) +static int efivars_sysfs_callback (struct efivar_entry *entry,void *data) { -struct efivar_entry *entry, *n; +efivar_create_sysfs_entry (entry); +return 0 ; +} -list_for_each_entry_safe (entry, n, &efivars->list, list) { -spin_lock (&efivars->lock); -list_del (&entry->list); -spin_unlock (&efivars->lock); -efivar_unregister (entry); - } -if (efivars->new_var) -sysfs_remove_bin_file (&efivars->kset->kobj, efivars->new_var); -if (efivars->del_var) -sysfs_remove_bin_file (&efivars->kset->kobj, efivars->del_var); -kfree (efivars->new_var); -kfree (efivars->del_var); -kobject_put (efivars->kobject); -kset_unregister (efivars->kset); +static int efivar_sysfs_destroy (struct efivar_entry *entry,void *data) +{ +efivar_entry_remove (entry); +efivar_unregister (entry); +return 0 ; } -EXPORT_SYMBOL_GPL (unregister_efivars); -int register_efivars (struct efivars *efivars, -const struct efivar_operations *ops, -struct kobject *parent_kobj) +void efivars_sysfs_exit (void ) +{ +/* Remove all entries and destroy */ +__efivar_entry_iter (efivar_sysfs_destroy,NULL ,NULL ); + +if (efivars_new_var) +sysfs_remove_bin_file (&efivars_kset->kobj, efivars_new_var); +if (efivars_del_var) +sysfs_remove_bin_file (&efivars_kset->kobj, efivars_del_var); +kfree (efivars_new_var); +kfree (efivars_del_var); +kset_unregister (efivars_kset); +} + +int efivars_sysfs_init (struct kobject *parent_kobj) { -efi_status_t status =EFI_NOT_FOUND ; -efi_guid_t vendor_guid; -efi_char16_t *variable_name; -unsigned long variable_name_size =1024 ;int error =0 ; -if (__efivars) { -return -EBUSY ; +printk (KERN_INFO "EFI Variables Facility v%s %s\n" ,EFIVARS_VERSION , +EFIVARS_DATE ); + + efivars_kset =kset_create_and_add ("vars" ,NULL , parent_kobj); +if (!efivars_kset) { +printk (KERN_ERR "efivars: Subsystem registration failed.\n" ); +return -ENOMEM ; } - __efivars = efivars; +efivar_init (efivars_sysfs_callback,NULL ); + + error =create_efivars_bin_attributes (); +if (error) +efivars_sysfs_exit (); + +return error; +} +EXPORT_SYMBOL_GPL (efivars_sysfs_init); + +/** +* efivar_init - build the initial list of EFI variables +* @func: callback function to invoke for every variable +* @data: function-specific data to pass to @func +* +* Get every EFI variable from the firmware, construct a struct +* efivar_entry and invoke @func. @func should call efivar_entry_add() +* to build the list of variables. +* +* Returns 0 on success, or a kernel error code on failure. +*/ +int efivar_init (int (*func)(struct efivar_entry *,void *),void *data) +{ +const struct efivar_operations *ops = __efivars->ops; +struct efivar_entry *entry; +unsigned long variable_name_size =1024 ; +efi_char16_t *variable_name; +efi_status_t status; +efi_guid_t vendor_guid; variable_name =kzalloc (variable_name_size,GFP_KERNEL );if (!variable_name) {
@@ -1833,25 +1613,6 @@ int register_efivars(struct efivars *efivars,return -ENOMEM ; } -spin_lock_init (&efivars->lock); -INIT_LIST_HEAD (&efivars->list); - efivars->ops = ops; - - efivars->kset =kset_create_and_add ("vars" ,NULL , parent_kobj); -if (!efivars->kset) { -printk (KERN_ERR "efivars: Subsystem registration failed.\n" ); - error = -ENOMEM ; - goto out; - } - - efivars->kobject =kobject_create_and_add ("efivars" , parent_kobj); -if (!efivars->kobject) { -pr_err ("efivars: Subsystem registration failed.\n" ); - error = -ENOMEM ; -kset_unregister (efivars->kset); - goto out; - } -/* * Per EFI spec, the maximum storage allocated for both * the variable name and variable data is 1024 bytes.
@@ -1860,15 +1621,21 @@ int register_efivars(struct efivars *efivars, do { variable_name_size = 1024; + spin_lock(&__efivars->lock); status = ops->get_next_variable(&variable_name_size, variable_name, &vendor_guid); + spin_unlock(&__efivars->lock); switch (status) { case EFI_SUCCESS: - efivar_create_sysfs_entry(efivars, - variable_name_size, - variable_name, - &vendor_guid); + entry = kmalloc(sizeof(*entry), GFP_KERNEL); + if (!entry) + return -ENOMEM; + + memcpy(entry->var.VariableName, variable_name, variable_name_size); + memcpy(&(entry->var.VendorGuid), &vendor_guid, sizeof(efi_guid_t)); + func(entry, data); + break; case EFI_NOT_FOUND: break;
@@ -1880,49 +1647,558 @@ int register_efivars(struct efivars *efivars, } }while (status !=EFI_NOT_FOUND ); - error =create_efivars_bin_attributes (efivars); -if (error) -unregister_efivars (efivars); +return 0 ; +} +EXPORT_SYMBOL_GPL (efivar_init); - efivars->efi_pstore_info = efi_pstore_info; +/** +* efivar_entry_add - add entry to variable list +* @entry: entry to add to list +*/ +void efivar_entry_add (struct efivar_entry *entry) +{ +spin_lock (&__efivars->lock); +list_add (&entry->list, &__efivars->list); +spin_unlock (&__efivars->lock); +} +EXPORT_SYMBOL_GPL (efivar_entry_add); + +/** +* efivar_entry_remove - remove entry from variable list +* @entry: entry to remove from list +*/ +void efivar_entry_remove (struct efivar_entry *entry) +{ +spin_lock (&__efivars->lock); +list_del (&entry->list); +spin_unlock (&__efivars->lock); +} +EXPORT_SYMBOL_GPL (efivar_entry_remove); - efivars->efi_pstore_info.buf =kmalloc (4096 ,GFP_KERNEL ); -if (efivars->efi_pstore_info.buf) { - efivars->efi_pstore_info.bufsize =1024 ; - efivars->efi_pstore_info.data = efivars; -spin_lock_init (&efivars->efi_pstore_info.buf_lock); -pstore_register (&efivars->efi_pstore_info); +/* +* efivar_entry_list_del_unlock - remove entry from variable list +* @entry: entry to remove +* +* Remove @entry from the variable list and release the list lock. +* +* NOTE: slightly weird locking semantics here - we expect to be +* called with the efivars lock already held, and we release it before +* returning. This is because this function is usually called after +* set_variable() while the lock is still held. +*/ +static void efivar_entry_list_del_unlock (struct efivar_entry *entry) +{ +WARN_ON (!spin_is_locked (&__efivars->lock)); + +list_del (&entry->list); +spin_unlock (&__efivars->lock); +} + +/** +* __efivar_entry_delete - delete an EFI variable +* @entry: entry containing EFI variable to delete +* +* Delete the variable from the firmware but leave @entry on the +* variable list. +* +* This function differs from efivar_entry_delete() because it does +* not remove @entry from the variable list. Also, it is safe to be +* called from within a efivar_entry_iter_begin() and +* efivar_entry_iter_end() region, unlike efivar_entry_delete(). +* +* Returns 0 on success, or a converted EFI status code if +* set_variable() fails. +*/ +int __efivar_entry_delete (struct efivar_entry *entry) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + +WARN_ON (!spin_is_locked (&__efivars->lock)); + + status = ops->set_variable (entry->var.VariableName, + &entry->var.VendorGuid, +0 ,0 ,NULL ); + +return efi_status_to_err (status); +} +EXPORT_SYMBOL_GPL (__efivar_entry_delete); + +/** +* efivar_entry_delete - delete variable and remove entry from list +* @entry: entry containing variable to delete +* +* Delete the variable from the firmware and remove @entry from the +* variable list. It is the caller's responsibility to free @entry +* once we return. +* +* Returns 0 on success, or a converted EFI status code if +* set_variable() fails. +*/ +int efivar_entry_delete (struct efivar_entry *entry) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + +spin_lock (&__efivars->lock); + status = ops->set_variable (entry->var.VariableName, + &entry->var.VendorGuid, +0 ,0 ,NULL ); +if (!(status ==EFI_SUCCESS || status ==EFI_NOT_FOUND )) { +spin_unlock (&__efivars->lock); +return efi_status_to_err (status); } -register_filesystem (&efivarfs_type); +efivar_entry_list_del_unlock (entry); +return 0 ; +} +EXPORT_SYMBOL_GPL (efivar_entry_delete); + +/** +* efivar_entry_set - call set_variable() +* @entry: entry containing the EFI variable to write +* @attributes: variable attributes +* @size: size of @data buffer +* @data: buffer containing variable data +* @lookup: check to see if @entry is already on the list? +* +* Calls set_variable() for an EFI variable. If creating a new EFI +* variable, this function is usually followed by efivar_entry_add(). +* +* Returns 0 on success, -EEXIST if @lookup is true and the entry +* already exists on the list, or a converted EFI status code if +* set_variable() fails. +*/ +int efivar_entry_set (struct efivar_entry *entry,u32 attributes, +unsigned long size,void *data,bool lookup) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; +efi_char16_t *name = entry->var.VariableName; +efi_guid_t vendor = entry->var.VendorGuid; -out: -kfree (variable_name); +spin_lock (&__efivars->lock); -return error; +if (lookup &&efivar_entry_find (name, vendor, false)) { +spin_unlock (&__efivars->lock); +return -EEXIST ; + } + + status = ops->set_variable (name, &vendor, attributes, size, data); + +spin_unlock (&__efivars->lock); + +return efi_status_to_err (status); } -EXPORT_SYMBOL_GPL (register_efivars); +EXPORT_SYMBOL_GPL (efivar_entry_set); + +/** +* efivar_entry_set_safe - call set_variable() if enough space in firmware +* @entry: entry containing the EFI variable to write +* @attributes: variable attributes +* @size: size of @data buffer +* @data: buffer containing variable data +* @total: total variable size including variable name +* +* Calls query_variable_info() to ensure that there is enough free +* storage in the firmware for this variable, and if so, calls +* set_variable(). If creating a new EFI variable, this function is +* usually followed by efivar_entry_add(). +* +* Returns 0 on success, -ENOSPC if the firmware does not have enough +* space for set_variable() to succeed, or a converted EFI status code +* if set_variable() fails. +*/ +int efivar_entry_set_safe (struct efivar_entry *entry,u32 attributes, +unsigned long size,void *data) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; +efi_char16_t *name = entry->var.VariableName; +efi_guid_t vendor = entry->var.VendorGuid; +u64 storage_size, remaining_size, max_size; +u64 total; -/* -* For now we register the efi subsystem with the firmware subsystem -* and the vars subsystem with the efi subsystem. In the future, it -* might make sense to split off the efi subsystem into its own -* driver, but for now only efivars will register with it, so just -* include it here. +if (!ops->query_variable_info) +return -ENOSYS ; + +spin_lock (&__efivars->lock); + status = ops->query_variable_info (attributes, &storage_size, + &remaining_size, &max_size); + +if (status !=EFI_SUCCESS ) { +spin_unlock (&__efivars->lock); +return -ENOSPC ; + } + +/* +* Does the firmware have enough free space to successfully +* write this variable? +*/ + total =utf16_strsize (name,1024 ) + size; +if (remaining_size >= total) + status = ops->set_variable (name, &vendor, + attributes, size, data); + +spin_unlock (&__efivars->lock); + +return efi_status_to_err (status); +} +EXPORT_SYMBOL_GPL (efivar_entry_set_safe); +/** +* efivar_entry_find - search for an entry +* @name: the EFI variable name +* @guid: the EFI variable vendor's guid +* @remove: should we remove the entry from the list? +* +* Search for an entry on the variable list that has the EFI variable +* name @name and vendor guid @guid. If an entry is found on the list +* and @remove is true, the entry is removed from the list. +* +* The caller MUST call efivar_entry_iter_begin() and +* efivar_entry_iter_end() before and after the invocation of this +* function, respectively. +* +* Returns the entry if found on the list, %NULL otherwise. +*/ +struct efivar_entry *efivar_entry_find (efi_char16_t *name, +efi_guid_t guid,bool remove) +{ +struct efivar_entry *entry, *n; +int strsize1, strsize2; +bool found = false; + +WARN_ON (!spin_is_locked (&__efivars->lock)); + +list_for_each_entry_safe (entry, n, &__efivars->list, list) { + strsize1 =utf16_strsize (name,1024 ); + strsize2 =utf16_strsize (entry->var.VariableName,1024 ); +if (strsize1 == strsize2 && + !memcmp (name, &(entry->var.VariableName), strsize1) && + !efi_guidcmp (guid, entry->var.VendorGuid)) { + found = true; +break ; + } + } + +if (!found) +return NULL ; + +if (remove) +list_del (&entry->list); + +return entry; +} +EXPORT_SYMBOL_GPL (efivar_entry_find); + +/** +* efivar_query_info - call query_variable_info() +* @attributes: query for variables with these attributes +* @storage_size: maximum space for variables with @attributes +* @remaining_size: remaining space for variable with @attributes +* @max_size: maximum space for an individual variable with @attributes +* +* Query the amount of space available in the firmware for variables +* with @attributes. +* +* Returns 0 on success, -ENOSYS if the registered efivars ops do not +* support query_variable_info(), or a converted EFI status code if +* query_variable_info() fails. +*/ +int efivar_query_info (u32 attributes,u64 *storage_size, +u64 *remaining_size,u64 *max_size) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + +if (!ops->query_variable_info) +return -ENOSYS ; + +spin_lock (&__efivars->lock); + status = ops->query_variable_info (attributes, storage_size, + remaining_size, max_size); +spin_unlock (&__efivars->lock); + +return status; +} +EXPORT_SYMBOL_GPL (efivar_query_info); + +/** +* efivar_entry_size - obtain the size of a variable +* @entry: entry for this variable +* @size: location to store the variable's size +*/ +int efivar_entry_size (struct efivar_entry *entry,unsigned long *size) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + + *size =0 ; + +spin_lock (&__efivars->lock); + status = ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid,NULL , size,NULL ); +spin_unlock (&__efivars->lock); + +if (status !=EFI_BUFFER_TOO_SMALL ) +return efi_status_to_err (status); + +return 0 ; +} +EXPORT_SYMBOL_GPL (efivar_entry_size); + +/** +* efivar_entry_get - call get_variable() +* @entry: read data for this variable +* @attributes: variable attributes +* @size: size of @data buffer +* @data: buffer to store variable data */ +int efivar_entry_get (struct efivar_entry *entry,u32 *attributes, +unsigned long *size,void *data) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + +spin_lock (&__efivars->lock); + status = ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data); +spin_unlock (&__efivars->lock); + +return efi_status_to_err (status); +} +EXPORT_SYMBOL_GPL (efivar_entry_get); + +/** +* efivar_entry_set_get_size - call set_variable() and get new size (atomic) +* @entry: entry containing variable to set and get +* @attributes: attributes of variable to be written +* @size: size of data buffer +* @data: buffer containing data to write +* +* This is a pretty special (complex) function. See efivarfs_file_write(). +* +* Atomically call set_variable() for @entry and if the set is +* successful, return the new size of the variable from get_variable() +* in @size. The success of set_variable() is indicated by @set. +* +* Returns 0 on success, -EINVAL if the variable data is invalid, or a +* converted EFI status code if either of set_variable() or +* get_variable() fail. +* +* If the EFI variable does not exist when calling set_variable() +* (EFI_NOT_FOUND), @entry is removed from the variable list. +*/ +int efivar_entry_set_get_size (struct efivar_entry *entry,u32 attributes, +unsigned long *size,void *data,bool *set) +{ +const struct efivar_operations *ops = __efivars->ops; +efi_status_t status; + + *set = false; + +if (efivar_validate (&entry->var, data, *size) == false) +return -EINVAL ; + +/* +* The lock here protects the get_variable call, the conditional +* set_variable call, and removal of the variable from the efivars +* list (in the case of an authenticated delete). +*/ +spin_lock (&__efivars->lock); + + status = ops->set_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, *size, data); + +if (status !=EFI_SUCCESS ) { +spin_unlock (&__efivars->lock); +return efi_status_to_err (status); + } + +/* +* Writing to the variable may have caused a change in size (which +* could either be an append or an overwrite), or the variable to be +* deleted. Perform a GetVariable() so we can tell what actually +* happened. +*/ + *size =0 ; + status = ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, +NULL , size,NULL ); + +if (status ==EFI_NOT_FOUND ) +efivar_entry_list_del_unlock (entry); +else +spin_unlock (&__efivars->lock); + +return efi_status_to_err (status); +} +EXPORT_SYMBOL_GPL (efivar_entry_set_get_size); + +/** +* efivar_entry_iter_begin - begin iterating the variable list +* +* Lock the variable list to prevent entry insertion and removal until +* efivar_entry_iter_end() is called. This function is usually used in +* conjunction with __efivar_entry_iter() or efivar_entry_iter(). +*/ +void efivar_entry_iter_begin (void ) +{ +spin_lock (&__efivars->lock); +} +EXPORT_SYMBOL_GPL (efivar_entry_iter_begin); + +/** +* efivar_entry_iter_end - finish iterating the variable list +* +* Unlock the variable list and allow modifications to the list again. +*/ +void efivar_entry_iter_end (void ) +{ +spin_unlock (&__efivars->lock); +} +EXPORT_SYMBOL_GPL (efivar_entry_iter_end); + +/** +* __efivar_entry_iter - iterate over variable list +* @func: callback function +* @data: function-specific data to pass to callback +* @prev: entry to begin iterating from +* +* Iterate over the list of EFI variables and call @func with every +* entry on the list. It is safe for @func to remove entries in the +* list via efivar_entry_delete(). +* +* You MUST call efivar_enter_iter_begin() before this function, and +* efivar_entry_iter_end() afterwards. +* +* It is possible to begin iteration from an arbitrary entry within +* the list by passing @prev. @prev is updated on return to point to +* the last entry passed to @func. To begin iterating from the +* beginning of the list @prev must be %NULL. +* +* The restrictions for @func are the same as documented for +* efivar_entry_iter(). +*/ +int __efivar_entry_iter (int (*func)(struct efivar_entry *,void *), +void *data,struct efivar_entry **prev) +{ +struct efivar_entry *entry, *n; +int err =0 ; + +if (!prev || !*prev) { +list_for_each_entry_safe (entry, n, &__efivars->list, list) { + err =func (entry, data); +if (err) +break ; + } + +if (prev) + *prev = entry; + +return err; + } + + +list_for_each_entry_safe_continue ((*prev), n, &__efivars->list, list) { + err =func (*prev, data); +if (err) +break ; + } + +return err; +} +EXPORT_SYMBOL_GPL (__efivar_entry_iter); + +/** +* efivar_entry_iter - iterate over variable list +* @func: callback function +* @data: function-specific data to pass to callback +* +* Iterate over the list of EFI variables and call @func with every +* entry on the list. It is safe for @func to remove entries in the +* list via efivar_entry_delete() while iterating. +* +* Some notes for the callback function: +* - a non-zero return value indicates an error and terminates the loop +* - @func is called from atomic context +*/ +int efivar_entry_iter (int (*func)(struct efivar_entry *,void *),void *data) +{ +int err =0 ; + +efivar_entry_iter_begin (); + err =__efivar_entry_iter (func, data,NULL ); +efivar_entry_iter_end (); + +return err; +} +EXPORT_SYMBOL_GPL (efivar_entry_iter); + +/** +* efivars_register - register an efivars +* @efivars: efivars to register +* @ops: efivars operations +* +* Only a single efivars can be registered at any time. +*/ +int efivars_register (struct efivars *efivars, +const struct efivar_operations *ops) +{ +if (__efivars) +return -EBUSY ; + +spin_lock_init (&efivars->lock); +INIT_LIST_HEAD (&efivars->list); + efivars->ops = ops; + + __efivars = efivars; + +return 0 ; +} +EXPORT_SYMBOL_GPL (efivars_register); + +/** +* efivars_unregister - unregister an efivars +* @efivars: efivars to unregister +* +* The caller must have already removed every entry from the list, +* failure to do so is an error. +*/ +int efivars_unregister (struct efivars *efivars) +{ +if (!__efivars) { +printk (KERN_ERR "efivars not registered\n" ); +return -EINVAL ; + } + +if (__efivars != efivars) +return -EINVAL ; + +if (!list_empty (&efivars->list)) { +printk (KERN_ERR "efivars list not empty\n" ); +return -EBUSY ; + } + + __efivars =NULL ; + +return 0 ; +} +EXPORT_SYMBOL_GPL (efivars_unregister); + +static struct kobject *efivars_kobject;static int __init efivars_init (void ) { -int error =0 ; - -printk (KERN_INFO "EFI Variables Facility v%s %s\n" ,EFIVARS_VERSION , -EFIVARS_DATE ); +int error;if (!efi_enabled (EFI_RUNTIME_SERVICES ))return 0 ; -/* For now we'll register the efi directory at /sys/firmware/efi */ +/* Register the efi directory at /sys/firmware/efi */ efi_kobj =kobject_create_and_add ("efi" , firmware_kobj);if (!efi_kobj) {printk (KERN_ERR "efivars: Firmware registration failed.\n" );
@@ -1934,9 +2210,18 @@ efivars_init(void) generic_ops.get_next_variable = efi.get_next_variable; generic_ops.query_variable_info = efi.query_variable_info; - error =register_efivars (&generic_efivars, &generic_ops, efi_kobj); + error =efivars_register (&generic_efivars, &generic_ops);if (error) - goto err_put; +return error; + +efivars_sysfs_init (efi_kobj); + + efivars_kobject =kobject_create_and_add ("efivars" , efi_kobj); +if (!efivars_kobject) { +pr_err ("efivars: Subsystem registration failed.\n" ); +kobject_put (efi_kobj); +return -ENOMEM ; + }/* Don't forget the systab entry */ error =sysfs_create_group (efi_kobj, &efi_subsys_attr_group);
@@ -1944,15 +2229,17 @@ efivars_init(void)printk (KERN_ERR "efivars: Sysfs attribute export failed with error %d.\n" , error); - goto err_unregister; } -return 0 ; + efi_pstore_info.buf =kmalloc (4096 ,GFP_KERNEL ); +if (efi_pstore_info.buf) { + efi_pstore_info.bufsize =4096 ; +spin_lock_init (&efi_pstore_info.buf_lock); +pstore_register (&efi_pstore_info); + } + +register_filesystem (&efivarfs_type); -err_unregister: -unregister_efivars (&generic_efivars); -err_put: -kobject_put (efi_kobj);return error; }
@@ -1960,7 +2247,8 @@ static void __exitefivars_exit (void) {if (efi_enabled (EFI_RUNTIME_SERVICES )) { -unregister_efivars (&generic_efivars); +efivars_unregister (&generic_efivars); +kobject_put (efivars_kobject);kobject_put (efi_kobj); } }
drivers/firmware/google/gsmi.c +9 -2
@@ -882,12 +882,19 @@ static __init int gsmi_init(void) goto out_remove_bin_file; } - ret =register_efivars (&efivars, &efivar_ops, gsmi_kobj); + ret =efivars_register (&efivars, &efivar_ops);if (ret) {printk (KERN_INFO "gsmi: Failed to register efivars\n" ); goto out_remove_sysfs_files; } + ret =efivars_sysfs_init (gsmi_kobj); +if (ret) { +printk (KERN_INFO "gsmi: Failed to create efivars files\n" ); +efivars_unregister (&efivars); + goto out_remove_sysfs_files; + } +register_reboot_notifier (&gsmi_reboot_notifier);register_die_notifier (&gsmi_die_notifier); atomic_notifier_chain_register(&panic_notifier_list,
@@ -919,7 +926,7 @@ static void __exit gsmi_exit(void)unregister_die_notifier (&gsmi_die_notifier);atomic_notifier_chain_unregister (&panic_notifier_list, &gsmi_panic_notifier); -unregister_efivars (&efivars); +efivars_unregister (&efivars);sysfs_remove_files (gsmi_kobj, gsmi_attrs);sysfs_remove_bin_file (gsmi_kobj, &eventlog_bin_attr);
include/linux/efi.h +67 -7
89 lines not on this page · raw message
Signature · 1 line
1.7.11.7
RFC PATCH 4/7 drivers/firmware: Create a new EFI drivers directory
In reply to a message not in the archiveFrom: Matt Fleming <[email protected]>
efivars.c has grown far too large and needs to be divided up.
Move the sysfs support code for EFI variables into efi/ so that it is more self-contained. This also allows enabling the efivarfs code without requiring that the sysfs code be enabled. Having EFI variables accessible to userland via two different methods is just confusing, especially given that no synchronisation is done between them.
--- MAINTAINERS | 1 + drivers/firmware/Kconfig | 18 +- drivers/firmware/Makefile | 1 + drivers/firmware/efi/Kconfig | 32 +++ drivers/firmware/efi/Makefile | 4 + drivers/firmware/efi/sysfs.c | 549 ++++++++++++++++++++++++++++++++++++++++++ drivers/firmware/efivars.c | 530 +--------------------------------------- include/linux/efi.h | 4 +- 8 files changed, 594 insertions(+), 545 deletions(-) create mode 100644 drivers/firmware/efi/Kconfig create mode 100644 drivers/firmware/efi/Makefile create mode 100644 drivers/firmware/efi/sysfs.c
MAINTAINERS +1 -0
@@ -2892,6 +2892,7 @@ F: arch/x86/boot/compressed/eboot.[ch] F: arch/x86/include/asm/efi.h F: arch/x86/platform/efi/* F: drivers/firmware/efivars.c +F: drivers/firmware/efi/* F: include/linux/efi*.h EFIFB FRAMEBUFFER DRIVER
drivers/firmware/Kconfig +1 -17
@@ -36,23 +36,6 @@ config FIRMWARE_MEMMAP See also Documentation/ABI/testing/sysfs-firmware-memmap. -config EFI_VARS - tristate "EFI Variable Support via sysfs" - depends on EFI - default n - help - If you say Y here, you are able to get EFI (Extensible Firmware - Interface) variable information via sysfs. You may read, - write, create, and destroy EFI variables through this interface. - - Note that using this driver in concert with efibootmgr requires - at least test release version 0.5.0-test3 or later, which is - available from Matt Domsch's website located at: - <http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz> - - Subsequent efibootmgr releases may be found at: - <http://linux.dell.com/efibootmgr> - config EFI_PCDP bool "Console device selection via EFI PCDP or HCDP table" depends on ACPI && EFI && IA64
@@ -146,5 +129,6 @@ config ISCSI_IBFT Otherwise, say N. source "drivers/firmware/google/Kconfig" +source "drivers/firmware/efi/Kconfig" endmenu
drivers/firmware/Makefile +1 -0
@@ -14,3 +14,4 @@ obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ +obj-$(CONFIG_EFI) += efi/
drivers/firmware/efi/Kconfig new file +32 -0
@@ -0,0 +1,32 @@ +menu "EFI (Extensible Firmware Interface) Support" + depends on EFI + +config EFI_VARS + bool "EFI Variable Support" + depends on EFI + default n + help + This option enables the EFI variable support code. + + This is required for all EFI variable drivers. + + If unsure, say N. + +config EFI_VARS_SYSFS + tristate "EFI Variable Support via sysfs" + depends on EFI_VARS + default n + help + If you say Y here, you are able to get EFI (Extensible Firmware + Interface) variable information via sysfs. You may read, + write, create, and destroy EFI variables through this interface. + + Note that using this driver in concert with efibootmgr requires + at least test release version 0.5.0-test3 or later, which is + available from Matt Domsch's website located at: + <http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz> + + Subsequent efibootmgr releases may be found at: + <http://linux.dell.com/efibootmgr> + +endmenu
drivers/firmware/efi/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# +# Makefile for linux kernel +# +obj-$(CONFIG_EFI_VARS_SYSFS) += sysfs.o
drivers/firmware/efi/sysfs.c new file +549 -0
549 lines not on this page · raw message
drivers/firmware/efivars.c +3 -527
587 lines not on this page · raw message
include/linux/efi.h +3 -1
@@ -742,7 +742,7 @@ utf16_strlen(efi_char16_t *s)return utf16_strnlen (s, ~0UL ); } -#if defined(CONFIG_EFI_VARS ) || defined(CONFIG_EFI_VARS_MODULE ) +#ifdef CONFIG_EFI_VARS /* * EFI Variable support. *
@@ -829,8 +829,10 @@ bool efivar_validate(struct efi_variable *var, u8 *data, unsigned long len);int efivar_query_info (u32 attributes,u64 *storage_size,u64 *remaining_size,u64 *max_size); +#if defined(CONFIG_EFI_VARS_SYSFS ) || defined(CONFIG_EFI_VARS_SYSFS_MODULE )int efivars_sysfs_init (struct kobject *parent);int efivar_create_sysfs_entry (struct efivar_entry *new_var); +#endif #endif /* CONFIG_EFI_VARS */
Signature · 1 line
1.7.11.7
A message that is not in the archive (sent off-list or not yet received): 1360357158-8168-5-git-send-email-matt-HNK1S37rvNbeXh+fF434Mdi2O/[email protected]
RFC PATCH v2 4/7 drivers/firmware: Create a new EFI drivers directory
efivars.c has grown far too large and needs to be divided up.
Move the sysfs support code for EFI variables into efi/ so that it is more self-contained. This also allows enabling the efivarfs code without requiring that the sysfs code be enabled. Having EFI variables accessible to userland via two different methods is just confusing, especially given that no synchronisation is done between them.
---
v2: Update google/Kconfig to use new CONFIG_EFI_VARS_SYSFS symbol,
otherwise we break the build. Credit goes to the kbuild bot.
MAINTAINERS | 1 + drivers/firmware/Kconfig | 18 +- drivers/firmware/Makefile | 1 + drivers/firmware/efi/Kconfig | 32 +++ drivers/firmware/efi/Makefile | 4 + drivers/firmware/efi/sysfs.c | 549 ++++++++++++++++++++++++++++++++++++++++ drivers/firmware/efivars.c | 530 +------------------------------------- drivers/firmware/google/Kconfig | 2 +- include/linux/efi.h | 4 +- 9 files changed, 595 insertions(+), 546 deletions(-) create mode 100644 drivers/firmware/efi/Kconfig create mode 100644 drivers/firmware/efi/Makefile create mode 100644 drivers/firmware/efi/sysfs.c
MAINTAINERS +1 -0
@@ -2892,6 +2892,7 @@ F: arch/x86/boot/compressed/eboot.[ch] F: arch/x86/include/asm/efi.h F: arch/x86/platform/efi/* F: drivers/firmware/efivars.c +F: drivers/firmware/efi/* F: include/linux/efi*.h EFIFB FRAMEBUFFER DRIVER
drivers/firmware/Kconfig +1 -17
@@ -36,23 +36,6 @@ config FIRMWARE_MEMMAP See also Documentation/ABI/testing/sysfs-firmware-memmap. -config EFI_VARS - tristate "EFI Variable Support via sysfs" - depends on EFI - default n - help - If you say Y here, you are able to get EFI (Extensible Firmware - Interface) variable information via sysfs. You may read, - write, create, and destroy EFI variables through this interface. - - Note that using this driver in concert with efibootmgr requires - at least test release version 0.5.0-test3 or later, which is - available from Matt Domsch's website located at: - <http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz> - - Subsequent efibootmgr releases may be found at: - <http://linux.dell.com/efibootmgr> - config EFI_PCDP bool "Console device selection via EFI PCDP or HCDP table" depends on ACPI && EFI && IA64
@@ -146,5 +129,6 @@ config ISCSI_IBFT Otherwise, say N. source "drivers/firmware/google/Kconfig" +source "drivers/firmware/efi/Kconfig" endmenu
drivers/firmware/Makefile +1 -0
@@ -14,3 +14,4 @@ obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ +obj-$(CONFIG_EFI) += efi/
drivers/firmware/efi/Kconfig new file +32 -0
@@ -0,0 +1,32 @@ +menu "EFI (Extensible Firmware Interface) Support" + depends on EFI + +config EFI_VARS + bool "EFI Variable Support" + depends on EFI + default n + help + This option enables the EFI variable support code. + + This is required for all EFI variable drivers. + + If unsure, say N. + +config EFI_VARS_SYSFS + tristate "EFI Variable Support via sysfs" + depends on EFI_VARS + default n + help + If you say Y here, you are able to get EFI (Extensible Firmware + Interface) variable information via sysfs. You may read, + write, create, and destroy EFI variables through this interface. + + Note that using this driver in concert with efibootmgr requires + at least test release version 0.5.0-test3 or later, which is + available from Matt Domsch's website located at: + <http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz> + + Subsequent efibootmgr releases may be found at: + <http://linux.dell.com/efibootmgr> + +endmenu
drivers/firmware/efi/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# +# Makefile for linux kernel +# +obj-$(CONFIG_EFI_VARS_SYSFS) += sysfs.o
drivers/firmware/efi/sysfs.c new file +549 -0
549 lines not on this page · raw message
drivers/firmware/efivars.c +3 -527
587 lines not on this page · raw message
drivers/firmware/google/Kconfig +1 -1
@@ -14,7 +14,7 @@ config GOOGLE_SMI tristate "SMI interface for Google platforms" depends on ACPI && DMI select EFI - select EFI_VARS + select EFI_VARS_SYSFS help Say Y here if you want to enable SMI callbacks for Google platforms. This provides an interface for writing to and
include/linux/efi.h +3 -1
@@ -742,7 +742,7 @@ utf16_strlen(efi_char16_t *s)return utf16_strnlen (s, ~0UL ); } -#if defined(CONFIG_EFI_VARS ) || defined(CONFIG_EFI_VARS_MODULE ) +#ifdef CONFIG_EFI_VARS /* * EFI Variable support. *
@@ -832,8 +832,10 @@ bool efivar_validate(struct efi_variable *var, u8 *data, unsigned long len);int efivar_query_info (u32 attributes,u64 *storage_size,u64 *remaining_size,u64 *max_size); +#if defined(CONFIG_EFI_VARS_SYSFS ) || defined(CONFIG_EFI_VARS_SYSFS_MODULE )int efivars_sysfs_init (struct kobject *parent);int efivar_create_sysfs_entry (struct efivar_entry *new_var); +#endif #endif /* CONFIG_EFI_VARS */
Signature · 1 line
1.7.11.7
RFC PATCH 5/7 efivars: Move pstore code out of efivars.c
In reply to a message not in the archiveFrom: Matt Fleming <[email protected]>
Move the persistence storage code to efi/pstore.c now that it uses the new efivar API, helping us to reduce the size of efivars.c. This move also allows us to delete the code that was previously necessary when CONFIG_PSTORE was disabled.
---
Folks, I haven't put a copyright notice at the top of pstore.c. Please suggest one and I'll incorporate it.
MAINTAINERS | 2 +- drivers/firmware/efi/Kconfig | 12 ++ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/pstore.c | 239 +++++++++++++++++++++++++++++++++++ drivers/firmware/efivars.c | 287 ------------------------------------------ include/linux/efi.h | 28 +++++ 6 files changed, 281 insertions(+), 288 deletions(-) create mode 100644 drivers/firmware/efi/pstore.c
MAINTAINERS +1 -1
@@ -6091,7 +6091,7 @@ S: Maintained T: git git://git.infradead.org/users/cbou/linux-pstore.git F: fs/pstore/ F: include/linux/pstore* -F: drivers/firmware/efivars.c +F: drivers/firmware/efi/pstore.c F: drivers/acpi/apei/erst.c PTP HARDWARE CLOCK SUPPORT
drivers/firmware/efi/Kconfig +12 -0
@@ -29,4 +29,16 @@ config EFI_VARS_SYSFS Subsequent efibootmgr releases may be found at: <http://linux.dell.com/efibootmgr> +config EFI_VARS_PSTORE + tristate "EFI Variable Persistent Storage" + depends on PSTORE + depends on EFI_VARS_SYSFS + default n + help + This option enables panic and oops messages to be stored in + EFI variables, which allows them to be examined after the + machine has been rebooted. + + If unsure, say N. + endmenu
drivers/firmware/efi/Makefile +1 -0
@@ -2,3 +2,4 @@ # Makefile for linux kernel # obj-$(CONFIG_EFI_VARS_SYSFS) += sysfs.o +obj-$(CONFIG_EFI_VARS_PSTORE) += pstore.o
drivers/firmware/efi/pstore.c new file +239 -0
239 lines not on this page · raw message
drivers/firmware/efivars.c +0 -287
317 lines not on this page · raw message
include/linux/efi.h +28 -0
@@ -744,6 +744,34 @@ utf16_strlen(efi_char16_t *s)#ifdef CONFIG_EFI_VARS /* +* Return the number of bytes is the length of this string +* Note: this is NOT the same as the number of unicode characters +*/ +static inline unsigned long +utf16_strsize (efi_char16_t *data,unsigned long maxlength) +{ +return utf16_strnlen (data, maxlength/sizeof (efi_char16_t)) *sizeof (efi_char16_t); +} + +static inline int +utf16_strncmp (const efi_char16_t *a,const efi_char16_t *b,size_t len) +{ +while (1 ) { +if (len ==0 ) +return 0 ; +if (*a < *b) +return -1 ; +if (*a > *b) +return 1 ; +if (*a ==0 )/* implies *b == 0 */ +return 0 ; + a++; + b++; + len--; + } +} + +/* * EFI Variable support. * * Different firmware drivers can expose their EFI-like variables using
Signature · 1 line
1.7.11.7
A message that is not in the archive (sent off-list or not yet received): 1360357158-8168-6-git-send-email-matt-HNK1S37rvNbeXh+fF434Mdi2O/[email protected]
RFC PATCH v2 5/7 efivars: Move pstore code out of efivars.c
Move the persistence storage code to efi/pstore.c now that it uses the new efivar API, helping us to reduce the size of efivars.c. This move also allows us to delete the code that was previously necessary when CONFIG_PSTORE was disabled.
---
v2: Use efivar_entry_set_safe() for QueryVariableInfo() +
SetVariable() atomicity.
MAINTAINERS | 2 +- drivers/firmware/efi/Kconfig | 12 ++ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/pstore.c | 227 ++++++++++++++++++++++++++++++++++ drivers/firmware/efivars.c | 275 ------------------------------------------ include/linux/efi.h | 28 +++++ 6 files changed, 269 insertions(+), 276 deletions(-) create mode 100644 drivers/firmware/efi/pstore.c
MAINTAINERS +1 -1
@@ -6091,7 +6091,7 @@ S: Maintained T: git git://git.infradead.org/users/cbou/linux-pstore.git F: fs/pstore/ F: include/linux/pstore* -F: drivers/firmware/efivars.c +F: drivers/firmware/efi/pstore.c F: drivers/acpi/apei/erst.c PTP HARDWARE CLOCK SUPPORT
drivers/firmware/efi/Kconfig +12 -0
@@ -29,4 +29,16 @@ config EFI_VARS_SYSFS Subsequent efibootmgr releases may be found at: <http://linux.dell.com/efibootmgr> +config EFI_VARS_PSTORE + tristate "EFI Variable Persistent Storage" + depends on PSTORE + depends on EFI_VARS_SYSFS + default n + help + This option enables panic and oops messages to be stored in + EFI variables, which allows them to be examined after the + machine has been rebooted. + + If unsure, say N. + endmenu
drivers/firmware/efi/Makefile +1 -0
@@ -2,3 +2,4 @@ # Makefile for linux kernel # obj-$(CONFIG_EFI_VARS_SYSFS) += sysfs.o +obj-$(CONFIG_EFI_VARS_PSTORE) += pstore.o
drivers/firmware/efi/pstore.c new file +227 -0
227 lines not on this page · raw message
drivers/firmware/efivars.c +0 -275
305 lines not on this page · raw message
include/linux/efi.h +28 -0
@@ -744,6 +744,34 @@ utf16_strlen(efi_char16_t *s)#ifdef CONFIG_EFI_VARS /* +* Return the number of bytes is the length of this string +* Note: this is NOT the same as the number of unicode characters +*/ +static inline unsigned long +utf16_strsize (efi_char16_t *data,unsigned long maxlength) +{ +return utf16_strnlen (data, maxlength/sizeof (efi_char16_t)) *sizeof (efi_char16_t); +} + +static inline int +utf16_strncmp (const efi_char16_t *a,const efi_char16_t *b,size_t len) +{ +while (1 ) { +if (len ==0 ) +return 0 ; +if (*a < *b) +return -1 ; +if (*a > *b) +return 1 ; +if (*a ==0 )/* implies *b == 0 */ +return 0 ; + a++; + b++; + len--; + } +} + +/* * EFI Variable support. * * Different firmware drivers can expose their EFI-like variables using
Signature · 1 line
1.7.11.7
RFC PATCH 6/7 efi: Add generic variable operations
In reply to a message not in the archiveFrom: Matt Fleming <[email protected]>
Some machines have an EFI variable interface that does not conform to the UEFI specification, e.g. CONFIG_GOOGLE_SMI. Add the necessary code and Kconfig glue so that it's only possible to choose one set of EFI variable operations.
--- drivers/firmware/efi/Kconfig | 12 +++++++++ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/generic-ops.c | 52 ++++++++++++++++++++++++++++++++++++++ drivers/firmware/efivars.c | 19 +------------- drivers/firmware/google/Kconfig | 6 ++--- 5 files changed, 69 insertions(+), 21 deletions(-) create mode 100644 drivers/firmware/efi/generic-ops.c
drivers/firmware/efi/Kconfig +12 -0
@@ -12,9 +12,21 @@ config EFI_VARS If unsure, say N. +config EFI_VARS_GENERIC_OPS + bool "Generic EFI Variable Operations" + depends on EFI_VARS + default y + help + This option enables the use of the generic EFI variable + operations, those that are compliant with the UEFI + specification. + + If unsure, say Y. + config EFI_VARS_SYSFS tristate "EFI Variable Support via sysfs" depends on EFI_VARS + depends on EFI_VARS_GENERIC_OPS || GOOGLE_SMI default n help If you say Y here, you are able to get EFI (Extensible Firmware
drivers/firmware/efi/Makefile +1 -0
@@ -3,3 +3,4 @@ # obj-$(CONFIG_EFI_VARS_SYSFS) += sysfs.o obj-$(CONFIG_EFI_VARS_PSTORE) += pstore.o +obj-$(CONFIG_EFI_VARS_GENERIC_OPS) += generic-ops.o
drivers/firmware/efi/generic-ops.c new file +52 -0
52 lines not on this page · raw message
drivers/firmware/efivars.c +1 -18
@@ -40,9 +40,6 @@#include <asm/uaccess.h> -static struct efivars generic_efivars; -static struct efivar_operations generic_ops; -/* Private pointer to registered efivars */ static struct efivars *__efivars;
@@ -791,7 +788,7 @@ static struct attribute_group efi_subsys_attr_group = { .attrs = efi_subsys_attrs, }; -static struct kobject *efi_kobj; +struct kobject *efi_kobj;/** * efivar_init - build the initial list of EFI variables
@@ -1358,19 +1355,6 @@ efivars_init(void)return -ENOMEM ; } - generic_ops.get_variable = efi.get_variable; - generic_ops.set_variable = efi.set_variable; - generic_ops.get_next_variable = efi.get_next_variable; - generic_ops.query_variable_info = efi.query_variable_info; - - error =efivars_register (&generic_efivars, &generic_ops); -if (error) -return error; - -#if defined(CONFIG_EFI_VARS_SYSFS ) || defined(CONFIG_EFI_VARS_SYSFS_MODULE ) -efivars_sysfs_init (efi_kobj); -#endif - efivars_kobject =kobject_create_and_add ("efivars" , efi_kobj);if (!efivars_kobject) {pr_err ("efivars: Subsystem registration failed.\n" );
@@ -1395,7 +1379,6 @@ static void __exitefivars_exit (void) {if (efi_enabled (EFI_RUNTIME_SERVICES )) { -efivars_unregister (&generic_efivars);kobject_put (efivars_kobject);kobject_put (efi_kobj); }
drivers/firmware/google/Kconfig +3 -3
@@ -12,9 +12,9 @@ menu "Google Firmware Drivers" config GOOGLE_SMI tristate "SMI interface for Google platforms" - depends on ACPI && DMI - select EFI - select EFI_VARS + depends on ACPI && DMI && EFI + depends on !EFI_VARS_GENERIC_OPS + select EFI_VARS_SYSFS help Say Y here if you want to enable SMI callbacks for Google platforms. This provides an interface for writing to and
Signature · 1 line
1.7.11.7
RFC PATCH 7/7 efivarfs: Move to fs/efivarfs
In reply to a message not in the archiveFrom: Matt Fleming <[email protected]>
Now that efivarfs uses the efivar API, move it out of efivars.c and into fs/efivarfs where it belongs. This move allows us to turn on other EFI varible code, like CONFIG_EFI_VARS_SYSFS without requiring that the efivarfs code also be built, and vice versa.
--- MAINTAINERS | 9 + drivers/firmware/efivars.c | 487 --------------------------------------------- fs/Kconfig | 1 + fs/Makefile | 1 + fs/efivarfs/Kconfig | 12 ++ fs/efivarfs/Makefile | 7 + fs/efivarfs/file.c | 130 ++++++++++++ fs/efivarfs/inode.c | 179 +++++++++++++++++ fs/efivarfs/internal.h | 18 ++ fs/efivarfs/super.c | 233 ++++++++++++++++++++++ 10 files changed, 590 insertions(+), 487 deletions(-) create mode 100644 fs/efivarfs/Kconfig create mode 100644 fs/efivarfs/Makefile create mode 100644 fs/efivarfs/file.c create mode 100644 fs/efivarfs/inode.c create mode 100644 fs/efivarfs/internal.h create mode 100644 fs/efivarfs/super.c
MAINTAINERS +9 -0
@@ -2895,6 +2895,15 @@ F: drivers/firmware/efivars.c F: drivers/firmware/efi/* F: include/linux/efi*.h +EFI VARIABLE FILESYSTEM +M: Matthew Garrett <matthew.garrett-05XSO3Yj/[email protected]> +M: Jeremy Kerr <[email protected]> +M: Matt Fleming <[email protected]> +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git +L: [email protected] +S: Maintained +F: fs/efivarfs/ + EFIFB FRAMEBUFFER DRIVER L: [email protected] M: Peter Jones <[email protected]>
drivers/firmware/efivars.c +0 -487
505 lines not on this page · raw message
fs/Kconfig +1 -0
@@ -211,6 +211,7 @@ source "fs/sysv/Kconfig" source "fs/ufs/Kconfig" source "fs/exofs/Kconfig" source "fs/f2fs/Kconfig" +source "fs/efivarfs/Kconfig" endif # MISC_FILESYSTEMS
fs/Makefile +1 -0
@@ -127,3 +127,4 @@ obj-$(CONFIG_F2FS_FS) += f2fs/ obj-y += exofs/ # Multiple modules obj-$(CONFIG_CEPH_FS) += ceph/ obj-$(CONFIG_PSTORE) += pstore/ +obj-$(CONFIG_EFIVAR_FS) += efivarfs/
fs/efivarfs/Kconfig new file +12 -0
@@ -0,0 +1,12 @@ +config EFIVAR_FS + tristate "EFI Variable filesystem" + depends on EFI_VARS + help + efivarfs is a replacement filesystem for the old EFI + variable support via sysfs, as it doesn't suffer from the + same 1024-byte variable size limit. + + To compile this file system support as a module, choose M + here. The module will be called efivarfs. + + If unsure, say N.
fs/efivarfs/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +# +# Makefile for the efivarfs filesystem +# + +obj-$(CONFIG_EFIVAR_FS) += efivarfs.o + +efivarfs-objs := inode.o file.o super.o
fs/efivarfs/file.c new file +130 -0
130 lines not on this page · raw message
fs/efivarfs/inode.c new file +179 -0
179 lines not on this page · raw message
fs/efivarfs/internal.h new file +18 -0
@@ -0,0 +1,18 @@ +/* +* Copyright (C) 2012 Red Hat, Inc. +* Copyright (C) 2012 Jeremy Kerr <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ +#ifndef EFIVAR_FS_INTERNAL_H +#define EFIVAR_FS_INTERNAL_H + +extern const struct file_operations efivarfs_file_operations; +extern const struct inode_operations efivarfs_dir_inode_operations; +extern bool efivarfs_valid_name (const char *str,int len); +extern struct inode *efivarfs_get_inode (struct super_block *sb, +const struct inode *dir,int mode,dev_t dev); + +#endif /* EFIVAR_FS_INTERNAL_H */
fs/efivarfs/super.c new file +233 -0
233 lines not on this page · raw message
Signature · 1 line
1.7.11.7
Quoted 8 lines · Matt Fleming
This patch series introduces the new
efivar_entryAPI, and splits out the major parts ofefivars.cinto new files. There's more work TODO, but this is at least a start.The series is also available on the 'chainsaw' branch at,
git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/linux.git
I posted some new version of these patches and updated the above branch based on feedback from Seiji. Thanks Seiji.
I hadn't realised that there were already some efivars pstore patches queued up in linux-next, so I'll respin this series once they've been merged into Linus' tree.
In the meantime, further feedback is welcome.
Signature · 1 line
Matt Fleming, Intel Open Source Technology Center