Skip to contentSkip to conversation

binderfs: reserve devices for initial mount

PATCH RESEND In review Christian Brauner 2 participants 3 messages Jan 11, 2019 Android drivers

lore
Share & tools
lore

Christian Brauner

author maintainer
#0 lore raw

PATCH RESEND 1/1 binderfs: reserve devices for initial mount

The binderfs instance in the initial ipc namespace will always have a reserve of 4 binder devices unless explicitly capped by specifying a lower value via the "max" mount option.
This ensures when binder devices are removed (on accident or on purpose) they can always be recreated without risking that all minor numbers have already been used up.

Cc Todd Kjos <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>

---
v2:
- patch unchanged
v1:
- patch introduced
v0:
- patch not present

---
 drivers/android/binderfs.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/android/binderfs.c +6 -1
index f6341893b5ba..ad3ad2f7f9f4 100644
@@ -40,6 +40,8 @@
 #define INODE_OFFSET 3
 #define INTSTRLEN 21
 #define BINDERFS_MAX_MINOR (1U << MINORBITS)
+/* Ensure that the initial ipc namespace always has devices available. */
+#define BINDERFS_MAX_MINOR_CAPPED (BINDERFS_MAX_MINOR - 4)
 
 static dev_t binderfs_dev;
 static DEFINE_MUTEX(binderfs_minors_mutex);
@@ -127,11 +129,14 @@ static int binderfs_binder_device_create(struct inode *ref_inode,
 	struct inode *inode = NULL;
 	struct super_block *sb = ref_inode->i_sb;
 	struct binderfs_info *info = sb->s_fs_info;
+	bool use_reserve = (info->ipc_ns == &init_ipc_ns);
 
 	/* Reserve new minor number for the new device. */
 	mutex_lock(&binderfs_minors_mutex);
 	if (++info->device_count <= info->mount_opts.max)
-		minor = ida_alloc_max(&binderfs_minors, BINDERFS_MAX_MINOR,
+		minor = ida_alloc_max(&binderfs_minors,
+				      use_reserve ? BINDERFS_MAX_MINOR :
+						    BINDERFS_MAX_MINOR_CAPPED,
 				      GFP_KERNEL);
 	else
 		minor = -ENOSPC;
Signature · 1 line
2.19.1
author maintainer
#1 lore raw
Quoted 10 lines · Christian Brauner

The binderfs instance in the initial ipc namespace will always have a reserve of 4 binder devices unless explicitly capped by specifying a lower value via the "max" mount option.
This ensures when binder devices are removed (on accident or on purpose) they can always be recreated without risking that all minor numbers have already been used up.

Cc Todd Kjos <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>

Cherry-picked this commit on top of char-misc-linus and it applied cleanly. I hope I took the right branch?

Thanks!
Christian

maintainer
#2 lore raw
Quoted 8 lines · Christian Brauner
Quoted 7 lines · Christian Brauner

The binderfs instance in the initial ipc namespace will always have a reserve of 4 binder devices unless explicitly capped by specifying a lower value via the "max" mount option.
This ensures when binder devices are removed (on accident or on purpose) they can always be recreated without risking that all minor numbers have already been used up.

Quoted 6 lines
Quoted 3 lines
Cc Todd Kjos <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>

Cherry-picked this commit on top of char-misc-linus and it applied cleanly. I hope I took the right branch?

Yes, that was the right one, and the patch worked just fine, thanks.

greg k-h