Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6fb1db0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (38 commits)
  net: Expose all network devices in a namespaces in sysfs
  hotplug: netns aware uevent_helper
  kobj: Send hotplug events in the proper namespace.
  netlink: Implment netlink_broadcast_filtered
  net/sysfs: Fix the bitrot in network device kobject namespace support
  netns: Teach network device kobjects which namespace they are in.
  kobject: Send hotplug events in all network namespaces
  driver-core: fix Typo in drivers/base/core.c for CONFIG_MODULE
  pci: check caps from sysfs file open to read device dependent config space
  sysfs: add struct file* to bin_attr callbacks
  sysfs: Remove usage of S_BIAS to avoid merge conflict with the vfs tree
  sysfs: Don't use enums in inline function declaration.
  sysfs-namespaces: add a high-level Documentation file
  sysfs: Comment sysfs directory tagging logic
  driver core: Implement ns directory support for device classes.
  sysfs: Implement sysfs_delete_link
  sysfs: Add support for tagged directories with untagged members.
  sysfs: Implement sysfs tagged directory support.
  kobj: Add basic infrastructure for dealing with namespaces.
  sysfs: Remove double free sysfs_get_sb
  ...
parents b4e6b097 a1b3f594

Documentation/filesystems/sysfs-tagging.txt

0 → 100644
+42 −0
Original line number Diff line number Diff line 
Sysfs tagging

-------------



(Taken almost verbatim from Eric Biederman's netns tagging patch

commit msg)



The problem.  Network devices show up in sysfs and with the network

namespace active multiple devices with the same name can show up in

the same directory, ouch!



To avoid that problem and allow existing applications in network

namespaces to see the same interface that is currently presented in

sysfs, sysfs now has tagging directory support.



By using the network namespace pointers as tags to separate out the

the sysfs directory entries we ensure that we don't have conflicts

in the directories and applications only see a limited set of

the network devices.



Each sysfs directory entry may be tagged with zero or one

namespaces.  A sysfs_dirent is augmented with a void *s_ns.  If a

directory entry is tagged, then sysfs_dirent->s_flags will have a

flag between KOBJ_NS_TYPE_NONE and KOBJ_NS_TYPES, and s_ns will

point to the namespace to which it belongs.



Each sysfs superblock's sysfs_super_info contains an array void

*ns[KOBJ_NS_TYPES].  When a a task in a tagging namespace

kobj_nstype first mounts sysfs, a new superblock is created.  It

will be differentiated from other sysfs mounts by having its

s_fs_info->ns[kobj_nstype] set to the new namespace.  Note that

through bind mounting and mounts propagation, a task can easily view

the contents of other namespaces' sysfs mounts.  Therefore, when a

namespace exits, it will call kobj_ns_exit() to invalidate any

sysfs_dirent->s_ns pointers pointing to it.



Users of this interface:

- define a type in the kobj_ns_type enumeration.

- call kobj_ns_type_register() with its kobj_ns_type_operations which has

  - current_ns() which returns current's namespace

  - netlink_ns() which returns a socket's namespace

  - initial_ns() which returns the initial namesapce

- call kobj_ns_exit() when an individual tag is no longer valid

arch/alpha/kernel/pci-sysfs.c

+5 −3
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static int __pci_mmap_fits(struct pci_dev *pdev, int num, 


/**

 * pci_mmap_resource - map a PCI resource into user memory space

 * @filp: open sysfs file

 * @kobj: kobject for mapping

 * @attr: struct bin_attribute for the file being mapped

 * @vma: struct vm_area_struct passed into the mmap
@@ -60,7 +61,8 @@ static int __pci_mmap_fits(struct pci_dev *pdev, int num, 
 *

 * Use the bus mapping routines to map a PCI resource into userspace.

 */

static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,

static int pci_mmap_resource(struct file *filp, struct kobject *kobj,

			     struct bin_attribute *attr,

			     struct vm_area_struct *vma, int sparse)

{

	struct pci_dev *pdev = to_pci_dev(container_of(kobj,
@@ -89,14 +91,14 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr, 
	return hose_mmap_page_range(pdev->sysdata, vma, mmap_type, sparse);

}



static int pci_mmap_resource_sparse(struct kobject *kobj,

static int pci_mmap_resource_sparse(struct file *filp, struct kobject *kobj,

				    struct bin_attribute *attr,

				    struct vm_area_struct *vma)

{

	return pci_mmap_resource(kobj, attr, vma, 1);

}



static int pci_mmap_resource_dense(struct kobject *kobj,

static int pci_mmap_resource_dense(struct file *filp, struct kobject *kobj,

				   struct bin_attribute *attr,

				   struct vm_area_struct *vma)

{

arch/mips/txx9/generic/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ struct txx9_sramc_sysdev { 
	void __iomem *base;

};



static ssize_t txx9_sram_read(struct kobject *kobj,

static ssize_t txx9_sram_read(struct file *filp, struct kobject *kobj,

			      struct bin_attribute *bin_attr,

			      char *buf, loff_t pos, size_t size)

{
@@ -920,7 +920,7 @@ static ssize_t txx9_sram_read(struct kobject *kobj, 
	return size;

}



static ssize_t txx9_sram_write(struct kobject *kobj,

static ssize_t txx9_sram_write(struct file *filp, struct kobject *kobj,

			       struct bin_attribute *bin_attr,

			       char *buf, loff_t pos, size_t size)

{

arch/powerpc/sysdev/mv64x60_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define MV64X60_VAL_LEN_MAX		11

#define MV64X60_PCICFG_CPCI_HOTSWAP	0x68



static ssize_t mv64x60_hs_reg_read(struct kobject *kobj,

static ssize_t mv64x60_hs_reg_read(struct file *filp, struct kobject *kobj,

				   struct bin_attribute *attr, char *buf,

				   loff_t off, size_t count)

{
@@ -45,7 +45,7 @@ static ssize_t mv64x60_hs_reg_read(struct kobject *kobj, 
	return sprintf(buf, "0x%08x\n", v);

}



static ssize_t mv64x60_hs_reg_write(struct kobject *kobj,

static ssize_t mv64x60_hs_reg_write(struct file *filp, struct kobject *kobj,

				    struct bin_attribute *attr, char *buf,

				    loff_t off, size_t count)

{

arch/s390/kernel/ipl.c

+8 −6
Original line number Diff line number Diff line
@@ -403,8 +403,9 @@ static ssize_t sys_ipl_device_show(struct kobject *kobj, 
static struct kobj_attribute sys_ipl_device_attr =

	__ATTR(device, S_IRUGO, sys_ipl_device_show, NULL);



static ssize_t ipl_parameter_read(struct kobject *kobj, struct bin_attribute *attr,

				  char *buf, loff_t off, size_t count)

static ssize_t ipl_parameter_read(struct file *filp, struct kobject *kobj,

				  struct bin_attribute *attr, char *buf,

				  loff_t off, size_t count)

{

	return memory_read_from_buffer(buf, count, &off, IPL_PARMBLOCK_START,

					IPL_PARMBLOCK_SIZE);
@@ -419,8 +420,9 @@ static struct bin_attribute ipl_parameter_attr = { 
	.read = &ipl_parameter_read,

};



static ssize_t ipl_scp_data_read(struct kobject *kobj, struct bin_attribute *attr,

				 char *buf, loff_t off, size_t count)

static ssize_t ipl_scp_data_read(struct file *filp, struct kobject *kobj,

				 struct bin_attribute *attr, char *buf,

				 loff_t off, size_t count)

{

	unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len;

	void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data;
@@ -694,7 +696,7 @@ static struct kobj_attribute sys_reipl_ccw_vmparm_attr = 


/* FCP reipl device attributes */



static ssize_t reipl_fcp_scpdata_read(struct kobject *kobj,

static ssize_t reipl_fcp_scpdata_read(struct file *filp, struct kobject *kobj,

				      struct bin_attribute *attr,

				      char *buf, loff_t off, size_t count)

{
@@ -704,7 +706,7 @@ static ssize_t reipl_fcp_scpdata_read(struct kobject *kobj, 
	return memory_read_from_buffer(buf, count, &off, scp_data, size);

}



static ssize_t reipl_fcp_scpdata_write(struct kobject *kobj,

static ssize_t reipl_fcp_scpdata_write(struct file *filp, struct kobject *kobj,

				       struct bin_attribute *attr,

				       char *buf, loff_t off, size_t count)

{