Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chanh Nguyen <chanh@os.amperecomputing.com>
To:     OpenBMC Maillist <openbmc@lists.ozlabs.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Frank Li <frank.li@nxp.com>,
        Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        Dan Vacura <w36195@motorola.com>,
        Jakob Koschel <jakobkoschel@gmail.com>,
        Alan Stern <stern@rowland.harvard.edu>,
        Vijayavardhan Vennapusa <vvreddy@codeaurora.org>,
        Rondreis <linhaoguo86@gmail.com>, linux-usb@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Open Source Submission <patches@amperecomputing.com>
Cc:     Chanh Nguyen <chanh@os.amperecomputing.com>
Subject: [PATCH v2] USB: gadget: Add ID numbers to configfs-gadget driver names
Date:   Wed, 21 Dec 2022 16:13:17 +0700
Message-Id: <20221221091317.19380-1-chanh@os.amperecomputing.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AeDX5soJfO6MvPUfeVamrhluIls1DSxMRbeSaYd4BGU8s42aCab7TO4SJQNt?=
 =?us-ascii?Q?hrOQW5sSrTFy5xd3t83YH30VxoOhpuQunAtKDg8rE/7DALR1qYeFpAvzr9TP?=
 =?us-ascii?Q?WN+BZSLIpGihdgj814anPUyqRkHvoCzrWfOxoMTFGPwwJ2T2tf+w6HFFUGAN?=
 =?us-ascii?Q?BBKeh92Xn7grOCRY02m6ka9D6b6TL+Ysha1lQpwWzFz0Y1npq7Y5jmoRAr6k?=
 =?us-ascii?Q?zNzLXG+3+Jyb/k+9KxRjWi7kbX/zLhDZHqJbpXoXQcA1KcFyt8KRWiX0o+hT?=
 =?us-ascii?Q?rHHOJdqlECKnokpfvxn6TiJLJlncmGp2JDlO6c9awgfq7AofCze+93kxeL+4?=
 =?us-ascii?Q?0pvvPChK0/pXFF0ud2IgDg33w6suYVi48NhGniiDFx4CCPyxoVVb7CCu78WE?=
 =?us-ascii?Q?nWaV13ISNDE8Q0aAWJ3A/4fhp63NkAUT9YcRDbnUXaQmJ2hD3f4ezSIEQY92?=
 =?us-ascii?Q?m7Q7CCksfJ5L2+9mAP2vcZTzM99QfzKmEufVREsNARRn85jf/KqRehkQuhqC?=
 =?us-ascii?Q?9JJpHzkHlhNAqLa3+3Kgl6hUneu6Eroj/CDKwEpUNZls9lFCNLxav2snRPHA?=
 =?us-ascii?Q?DD9RT7nKVFZDJC47fytYDC0RodCxVTEmnT6h20DPFBQQGY45MdUdFcWfqgUN?=
 =?us-ascii?Q?wq0VYMa5PhfUCwbohnFZiqmjv7B7O+zHKnYQiXB/dsbKI6oyRHZu/sTftPBy?=
 =?us-ascii?Q?5xuhIeX+m4lz33G7j67fCzTiGXn1mD4/nAsW8twfcqysMnOjyXqMFov6G8+L?=
 =?us-ascii?Q?+su9Z+hQRr+GL2phBalf4KiCVy9RVe7sWp3D0J4yXsf+PhtdFc+2JMDuJrb0?=
 =?us-ascii?Q?7zmKv1bd60wySPkyJ0uEB5GtdZz/E6y5+ATgrrqko5ERzxJX71oJq0cmJGzX?=
 =?us-ascii?Q?9mI1ukfa0nf/mMJ0uLTj0y32vUuzNq2f2oi1rafVSyzqV/K12qD27IgP+VsQ?=
 =?us-ascii?Q?eXsWje2uklVfx0OpuXf3HYeePp5LqY5FXx3NLyWNCMZYhZu41weyTyH22pX0?=
 =?us-ascii?Q?CJDqU23DdDscpwG7d0WGub2sQ9K2U/G/w4jX6+yknNUDOhJfuRsaG4KfN1ET?=
 =?us-ascii?Q?M6aEF9hk8jCNhHKP40LvMFIBREmxW3JTxFgeY8s8qMBf3/aw3kxP9M9lL5ED?=
 =?us-ascii?Q?iTMXFzAsufRt2JW+jJwq/McSj6p3MTm2RbUAPq6r+9g5NPvndDom7WK1yGsM?=
 =?us-ascii?Q?DldphmxBBkVkNUO4bSZ15bnI9xW6DE04xqsnHoatvuTez9dN3ngHgPJZRGO5?=
 =?us-ascii?Q?4oYvd0puF6dDJVpHsEmLLKVzR8Z5w7C/kn0sq5f0/EXDVBWhUli8vragv4LT?=
 =?us-ascii?Q?Plk8yq4cdqhojG3ITeZurZ+afoNMNcR9OkP4TqrK/ni24OZxjTgd0lRtHGsI?=
 =?us-ascii?Q?m5CwKQsz4CpBeFTCgL7fYUJa0fsc4CojPpXuwETWaqIQu66sNFzCDmzA8HFZ?=
 =?us-ascii?Q?qXG5G0SMDJx2/zm5e9mXseE7PCLaygye+kmSJmxtdzJodJcuKyw3G6NtuYIy?=
 =?us-ascii?Q?a2P3edsma9eOHX/XWQlmUANyAGyPoRr6lm2+Eibk5FDMz5T+94k5CDaMh+9H?=
 =?us-ascii?Q?ojD01kOy2Mi+2YKSRVPOYaxUWv1uABOHeHWwvJX4aBo/szIHG8s4QlZRkahS?=
 =?us-ascii?Q?V3xm/ZHS+CCIlrQOMBp2Xy8=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8fd0dbae-b99e-454f-aaba-08dae333ab1f
X-MS-Exchange-CrossTenant-AuthSource: SN6PR01MB4973.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2022 09:13:48.2975
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: nSRu83wmTOVQDrCdtgNHuD/aGjpdBAcx8vVxrjsVSBbHkaaSgNFKaFnayNiHRAsUtlUAyXKXuUQE7iHPsL/0PH06iNNo22dqQHjN0UIWBArULGpTwIFnZpo3epk90j2f
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR01MB6764
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It is unable to use configfs to attach more than one gadget. When
attaching the second gadget, it always fails and the kernel message
prints out:

Error: Driver 'configfs-gadget' is already registered, aborting...
UDC core: g1: driver registration failed: -16

This commit fixes the problem by a ".N" suffix added to each
configfs_gadget's driver name (where N is a unique ID number),
thus making the names distinct.

Fixes: fc274c1e9973 ("USB: gadget: Add a new bus for gadgets")
Signed-off-by: Chanh Nguyen <chanh@os.amperecomputing.com>

---
Changes in v2:
  - Replace scnprintf() by kasprintf() to simplify the code [CJ]
  - Move the clean up code from gadgets_drop() to
    gadget_info_attr_release()                        [Frank Li]
  - Correct the resource free up in gadges_make()   [Alan Stern]
  - Remove the unnecessary variable in gadgets_make()    [Chanh]
  - Fixes minor grammar issue in commit message          [Chanh]
---
 drivers/usb/gadget/configfs.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 96121d1c8df4..7faf68bfa716 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -3,6 +3,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/device.h>
+#include <linux/idr.h>
 #include <linux/kstrtox.h>
 #include <linux/nls.h>
 #include <linux/usb/composite.h>
@@ -11,6 +12,8 @@
 #include "u_f.h"
 #include "u_os_desc.h"
 
+static DEFINE_IDA(driver_id_numbers);
+
 int check_user_usb_string(const char *name,
 		struct usb_gadget_strings *stringtab_dev)
 {
@@ -52,6 +55,9 @@ struct gadget_info {
 	char qw_sign[OS_STRING_QW_SIGN_LEN];
 	spinlock_t spinlock;
 	bool unbind;
+
+	/* Make driver names unique */
+	int driver_id_number;
 };
 
 static inline struct gadget_info *to_gadget_info(struct config_item *item)
@@ -393,6 +399,8 @@ static void gadget_info_attr_release(struct config_item *item)
 	WARN_ON(!list_empty(&gi->string_list));
 	WARN_ON(!list_empty(&gi->available_func));
 	kfree(gi->composite.gadget_driver.function);
+	kfree(gi->composite.gadget_driver.driver.name);
+	ida_free(&driver_id_numbers, gi->driver_id_number);
 	kfree(gi);
 }
 
@@ -1623,13 +1631,28 @@ static struct config_group *gadgets_make(
 
 	gi->composite.gadget_driver = configfs_driver_template;
 
+	gi->driver_id_number = ida_alloc(&driver_id_numbers, GFP_KERNEL);
+	if (gi->driver_id_number < 0)
+		goto err;
+
+	gi->composite.gadget_driver.driver.name = kasprintf(GFP_KERNEL,
+							    "configfs-gadget.%d",
+							    gi->driver_id_number);
+	if (!gi->composite.gadget_driver.driver.name)
+		goto out_free_driver_id_number;
+
 	gi->composite.gadget_driver.function = kstrdup(name, GFP_KERNEL);
 	gi->composite.name = gi->composite.gadget_driver.function;
 
 	if (!gi->composite.gadget_driver.function)
-		goto err;
+		goto out_free_driver_name;
 
 	return &gi->group;
+
+out_free_driver_name:
+	kfree(gi->composite.gadget_driver.driver.name);
+out_free_driver_id_number:
+	ida_free(&driver_id_numbers, gi->driver_id_number);
 err:
 	kfree(gi);
 	return ERR_PTR(-ENOMEM);
-- 
2.17.1