From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97A24C3A589 for ; Thu, 15 Aug 2019 16:30:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F24720578 for ; Thu, 15 Aug 2019 16:30:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="Hu85KiG7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731792AbfHOQap (ORCPT ); Thu, 15 Aug 2019 12:30:45 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:44367 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730132AbfHOQao (ORCPT ); Thu, 15 Aug 2019 12:30:44 -0400 Received: by mail-pg1-f194.google.com with SMTP id i18so1497856pgl.11 for ; Thu, 15 Aug 2019 09:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=YXtKn6tSCQy3NpA9rMW2UTi1pemQ0emlmM8VnUNaMb4=; b=Hu85KiG7Ok++jxRYVDbjomkFeYLFzXGOLI4c+CF1GFmLn15HbUeRCf1KF/2FQ+hpfp 9jA7urHEkeMnGRuF2CVBM3zZ/CCBzG0dB1kQ/uY+kYpL2ReZlk7XP9554UdsgjN34dl5 RCtc6YTXLk3L8BT8MzvPpjMFMFnRKOHE8yES0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=YXtKn6tSCQy3NpA9rMW2UTi1pemQ0emlmM8VnUNaMb4=; b=FkJfY7oI28AoT443AeWIzsw3hW4xsQ1TRI0QwU6IbodW9K/zFpHgKw/+hhId4Q1G7+ ohhqDxN8W0jtpTnO3NUOmQ0yX1xA0y7JETC4IBZ8dK3j/CTSsrmYt1zcTvj67rRkx/7K oTjGFbuJSyA0Oj7UBFyhdZx5Q9YJ08aKg8S/DKkq6OQGuM8VqfXehR8vPKIpQV9BER+Y Zlb5aIuzzO4iOslXRvjfPbPDLips9SmEcm4oCx/T52oNh8r3s6T5ZM8CQiJZtPK+g+B6 pSiPXzJEdUi3XVqPZ9vrTqJ7iLy4yC/Q7HtO6rnBfnts2hIlyRJ9JfWL46grhTADfHZX /rYg== X-Gm-Message-State: APjAAAVwnUma8n1BLbYVt+espAvgN2hkOvtVc4XG35TGyvtwP2TFHmdY Q7CqroJNkg/FJy2wsDHegJq7TljLA38= X-Google-Smtp-Source: APXvYqwUsPXLcmLHAxB2tRsW34D41FmV40ffddklYTLPs1CB9bmhuB11dBR/dzlVYi+AjkqgOw7N6g== X-Received: by 2002:a65:5a8c:: with SMTP id c12mr4055445pgt.73.1565886643402; Thu, 15 Aug 2019 09:30:43 -0700 (PDT) Received: from localhost ([172.19.216.18]) by smtp.gmail.com with ESMTPSA id f205sm3924774pfa.161.2019.08.15.09.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 09:30:42 -0700 (PDT) Date: Thu, 15 Aug 2019 12:30:25 -0400 From: Joel Fernandes To: Hridya Valsaraju Cc: Greg Kroah-Hartman , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , Todd Kjos , Martijn Coenen , Christian Brauner , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Christian Brauner Subject: Re: [PATCH v3 1/2] binder: Add default binder devices through binderfs when configured Message-ID: <20190815163025.GB75595@google.com> References: <20190808222727.132744-1-hridya@google.com> <20190808222727.132744-2-hridya@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190808222727.132744-2-hridya@google.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 08, 2019 at 03:27:25PM -0700, Hridya Valsaraju wrote: > Currently, since each binderfs instance needs its own > private binder devices, every time a binderfs instance is > mounted, all the default binder devices need to be created > via the BINDER_CTL_ADD IOCTL. This patch aims to > add a solution to automatically create the default binder > devices for each binderfs instance that gets mounted. > To achieve this goal, when CONFIG_ANDROID_BINDERFS is set, > the default binder devices specified by CONFIG_ANDROID_BINDER_DEVICES > are created in each binderfs instance instead of global devices > being created by the binder driver. > > Co-developed-by: Christian Brauner > Signed-off-by: Christian Brauner > Signed-off-by: Hridya Valsaraju > --- Reviewed-by: Joel Fernandes (Google) thanks, - Joel > > Changes in v2: > - Updated commit message as per Greg Kroah-Hartman. > - Removed new module parameter creation as per Greg > Kroah-Hartman/Christian Brauner. > - Refactored device name length check into a new patch as per Greg Kroah-Hartman. > > Changes in v3: > -Removed unnecessary empty lines as per Dan Carpenter. > > drivers/android/binder.c | 5 +++-- > drivers/android/binder_internal.h | 2 ++ > drivers/android/binderfs.c | 23 ++++++++++++++++++++--- > 3 files changed, 25 insertions(+), 5 deletions(-) > > diff --git a/drivers/android/binder.c b/drivers/android/binder.c > index 466b6a7f8ab7..ca6b21a53321 100644 > --- a/drivers/android/binder.c > +++ b/drivers/android/binder.c > @@ -123,7 +123,7 @@ static uint32_t binder_debug_mask = BINDER_DEBUG_USER_ERROR | > BINDER_DEBUG_FAILED_TRANSACTION | BINDER_DEBUG_DEAD_TRANSACTION; > module_param_named(debug_mask, binder_debug_mask, uint, 0644); > > -static char *binder_devices_param = CONFIG_ANDROID_BINDER_DEVICES; > +char *binder_devices_param = CONFIG_ANDROID_BINDER_DEVICES; > module_param_named(devices, binder_devices_param, charp, 0444); > > static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait); > @@ -6279,7 +6279,8 @@ static int __init binder_init(void) > &transaction_log_fops); > } > > - if (strcmp(binder_devices_param, "") != 0) { > + if (!IS_ENABLED(CONFIG_ANDROID_BINDERFS) && > + strcmp(binder_devices_param, "") != 0) { > /* > * Copy the module_parameter string, because we don't want to > * tokenize it in-place. > diff --git a/drivers/android/binder_internal.h b/drivers/android/binder_internal.h > index 045b3e42d98b..fe8c745dc8e0 100644 > --- a/drivers/android/binder_internal.h > +++ b/drivers/android/binder_internal.h > @@ -37,6 +37,8 @@ struct binder_device { > > extern const struct file_operations binder_fops; > > +extern char *binder_devices_param; > + > #ifdef CONFIG_ANDROID_BINDERFS > extern bool is_binderfs_device(const struct inode *inode); > #else > diff --git a/drivers/android/binderfs.c b/drivers/android/binderfs.c > index e773f45d19d9..aee46dd1be91 100644 > --- a/drivers/android/binderfs.c > +++ b/drivers/android/binderfs.c > @@ -186,8 +186,7 @@ static int binderfs_binder_device_create(struct inode *ref_inode, > req->major = MAJOR(binderfs_dev); > req->minor = minor; > > - ret = copy_to_user(userp, req, sizeof(*req)); > - if (ret) { > + if (userp && copy_to_user(userp, req, sizeof(*req))) { > ret = -EFAULT; > goto err; > } > @@ -467,6 +466,9 @@ static int binderfs_fill_super(struct super_block *sb, void *data, int silent) > int ret; > struct binderfs_info *info; > struct inode *inode = NULL; > + struct binderfs_device device_info = { 0 }; > + const char *name; > + size_t len; > > sb->s_blocksize = PAGE_SIZE; > sb->s_blocksize_bits = PAGE_SHIFT; > @@ -521,7 +523,22 @@ static int binderfs_fill_super(struct super_block *sb, void *data, int silent) > if (!sb->s_root) > return -ENOMEM; > > - return binderfs_binder_ctl_create(sb); > + ret = binderfs_binder_ctl_create(sb); > + if (ret) > + return ret; > + > + name = binder_devices_param; > + for (len = strcspn(name, ","); len > 0; len = strcspn(name, ",")) { > + strscpy(device_info.name, name, len + 1); > + ret = binderfs_binder_device_create(inode, NULL, &device_info); > + if (ret) > + return ret; > + name += len; > + if (*name == ',') > + name++; > + } > + > + return 0; > } > > static struct dentry *binderfs_mount(struct file_system_type *fs_type, > -- > 2.22.0.770.g0f2c4a37fd-goog > From mboxrd@z Thu Jan 1 00:00:00 1970 From: joel@joelfernandes.org (Joel Fernandes) Date: Thu, 15 Aug 2019 12:30:25 -0400 Subject: [PATCH v3 1/2] binder: Add default binder devices through binderfs when configured In-Reply-To: <20190808222727.132744-2-hridya@google.com> References: <20190808222727.132744-1-hridya@google.com> <20190808222727.132744-2-hridya@google.com> Message-ID: <20190815163025.GB75595@google.com> List-Id: Linux Driver Project Developer List On Thu, Aug 08, 2019@03:27:25PM -0700, Hridya Valsaraju wrote: > Currently, since each binderfs instance needs its own > private binder devices, every time a binderfs instance is > mounted, all the default binder devices need to be created > via the BINDER_CTL_ADD IOCTL. This patch aims to > add a solution to automatically create the default binder > devices for each binderfs instance that gets mounted. > To achieve this goal, when CONFIG_ANDROID_BINDERFS is set, > the default binder devices specified by CONFIG_ANDROID_BINDER_DEVICES > are created in each binderfs instance instead of global devices > being created by the binder driver. > > Co-developed-by: Christian Brauner > Signed-off-by: Christian Brauner > Signed-off-by: Hridya Valsaraju > --- Reviewed-by: Joel Fernandes (Google) thanks, - Joel > > Changes in v2: > - Updated commit message as per Greg Kroah-Hartman. > - Removed new module parameter creation as per Greg > Kroah-Hartman/Christian Brauner. > - Refactored device name length check into a new patch as per Greg Kroah-Hartman. > > Changes in v3: > -Removed unnecessary empty lines as per Dan Carpenter. > > drivers/android/binder.c | 5 +++-- > drivers/android/binder_internal.h | 2 ++ > drivers/android/binderfs.c | 23 ++++++++++++++++++++--- > 3 files changed, 25 insertions(+), 5 deletions(-) > > diff --git a/drivers/android/binder.c b/drivers/android/binder.c > index 466b6a7f8ab7..ca6b21a53321 100644 > --- a/drivers/android/binder.c > +++ b/drivers/android/binder.c > @@ -123,7 +123,7 @@ static uint32_t binder_debug_mask = BINDER_DEBUG_USER_ERROR | > BINDER_DEBUG_FAILED_TRANSACTION | BINDER_DEBUG_DEAD_TRANSACTION; > module_param_named(debug_mask, binder_debug_mask, uint, 0644); > > -static char *binder_devices_param = CONFIG_ANDROID_BINDER_DEVICES; > +char *binder_devices_param = CONFIG_ANDROID_BINDER_DEVICES; > module_param_named(devices, binder_devices_param, charp, 0444); > > static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait); > @@ -6279,7 +6279,8 @@ static int __init binder_init(void) > &transaction_log_fops); > } > > - if (strcmp(binder_devices_param, "") != 0) { > + if (!IS_ENABLED(CONFIG_ANDROID_BINDERFS) && > + strcmp(binder_devices_param, "") != 0) { > /* > * Copy the module_parameter string, because we don't want to > * tokenize it in-place. > diff --git a/drivers/android/binder_internal.h b/drivers/android/binder_internal.h > index 045b3e42d98b..fe8c745dc8e0 100644 > --- a/drivers/android/binder_internal.h > +++ b/drivers/android/binder_internal.h > @@ -37,6 +37,8 @@ struct binder_device { > > extern const struct file_operations binder_fops; > > +extern char *binder_devices_param; > + > #ifdef CONFIG_ANDROID_BINDERFS > extern bool is_binderfs_device(const struct inode *inode); > #else > diff --git a/drivers/android/binderfs.c b/drivers/android/binderfs.c > index e773f45d19d9..aee46dd1be91 100644 > --- a/drivers/android/binderfs.c > +++ b/drivers/android/binderfs.c > @@ -186,8 +186,7 @@ static int binderfs_binder_device_create(struct inode *ref_inode, > req->major = MAJOR(binderfs_dev); > req->minor = minor; > > - ret = copy_to_user(userp, req, sizeof(*req)); > - if (ret) { > + if (userp && copy_to_user(userp, req, sizeof(*req))) { > ret = -EFAULT; > goto err; > } > @@ -467,6 +466,9 @@ static int binderfs_fill_super(struct super_block *sb, void *data, int silent) > int ret; > struct binderfs_info *info; > struct inode *inode = NULL; > + struct binderfs_device device_info = { 0 }; > + const char *name; > + size_t len; > > sb->s_blocksize = PAGE_SIZE; > sb->s_blocksize_bits = PAGE_SHIFT; > @@ -521,7 +523,22 @@ static int binderfs_fill_super(struct super_block *sb, void *data, int silent) > if (!sb->s_root) > return -ENOMEM; > > - return binderfs_binder_ctl_create(sb); > + ret = binderfs_binder_ctl_create(sb); > + if (ret) > + return ret; > + > + name = binder_devices_param; > + for (len = strcspn(name, ","); len > 0; len = strcspn(name, ",")) { > + strscpy(device_info.name, name, len + 1); > + ret = binderfs_binder_device_create(inode, NULL, &device_info); > + if (ret) > + return ret; > + name += len; > + if (*name == ',') > + name++; > + } > + > + return 0; > } > > static struct dentry *binderfs_mount(struct file_system_type *fs_type, > -- > 2.22.0.770.g0f2c4a37fd-goog >