From patchwork Wed Jun 21 17:52:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Orlov X-Patchwork-Id: 13287828 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2910FEB64D7 for ; Wed, 21 Jun 2023 17:55:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230515AbjFURzW (ORCPT ); Wed, 21 Jun 2023 13:55:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231994AbjFURzH (ORCPT ); Wed, 21 Jun 2023 13:55:07 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B01862723 for ; Wed, 21 Jun 2023 10:54:08 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f9085f97a4so12314535e9.1 for ; Wed, 21 Jun 2023 10:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687369988; x=1689961988; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=aHSu7HzG78jZSjS+/2PQndOYJUKXILQcjLsg3p1YpyY=; b=lLgneEIAOvJ3EQga5h/bcdpeUtOmxm/ou89ISYuJjSDgnQkWhm0I/WD1YuAWYysMbb w8WFQ0U7uTSbP4Us9wcppk6J5hM1FrE9Z2X6/n8cmYwifvbdWb07IJwDuUcjsuzLW0Tk +HRrYW78L4jU3fmNZpv7i2X+wj2jePu2R8SfF6Fc2jSePL9GbW6dHUSC4BV8gaYi28mG mGbKZ3u0FHPdjYTNOfZ2ylus3+ALiTBJ0pYNB1AVk7UgRPR2zgAVGvJqbD/anHuCsqSg IFCiHhLcfLKA0m12CmsoDMg2K49u3YFN+QeXOtK4N/i4PIH1Xg7/oAeR2eGtnKU4XB68 wdag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687369988; x=1689961988; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=aHSu7HzG78jZSjS+/2PQndOYJUKXILQcjLsg3p1YpyY=; b=B1hW0caaHfW6m9OMUzYrGpVv/TdUoGt94LXBjwZphBX9S6BYL6H94YvCyzhrsqzyf4 rqKYHAd9KITnIO3XVRg0iMrQ8umZ+P2KWLcBY2Bjyxd7RG2IvQgpIhllNHzkA0+SCrEU jUlZ2i87wMZm2lmmnQdUhkPpAqrOk68nxqgs2xE3L9r2PFFEAHTxK+s+Oq+MKMnAinZI i1YjmUG9AOTM29silpAArnZUMRB1w9xfgVgpETLDs3vuRjO4KBQRqlW9V47eJ7akMGqw ObRCehQ4IIArAQvpos4SHHW3mCrMxrzX4i9OcV/XXp6U178P9xXB5LpMujZBMZcN5Uey G3cQ== X-Gm-Message-State: AC+VfDy1LmMORtCNL8gEJ3jIRInTkqV73iIeA3RqUkVxXZfxnMSth/oR /49n0IK1TPuuRvo9NNqDeY4= X-Google-Smtp-Source: ACHHUZ4GlX+JEBgUKY+BHjThieEPVOetxymlfV+nN6q9KwFsFUVUNrvCKWFIxPSKFWIJ+PgPcA+peA== X-Received: by 2002:a05:600c:1e12:b0:3f9:92e:4d99 with SMTP id ay18-20020a05600c1e1200b003f9092e4d99mr9923395wmb.0.1687369987515; Wed, 21 Jun 2023 10:53:07 -0700 (PDT) Received: from ivan-B550MH.. ([141.136.95.75]) by smtp.gmail.com with ESMTPSA id l20-20020a7bc354000000b003f4248dcfcbsm16808553wmj.30.2023.06.21.10.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 10:53:07 -0700 (PDT) From: Ivan Orlov To: gregkh@linuxfoundation.org Cc: Ivan Orlov , linux-usb@vger.kernel.org Subject: [PATCH v3] USB: make usb class a const structure Date: Wed, 21 Jun 2023 21:52:59 +0400 Message-Id: <20230621175259.1221852-1-ivan.orlov0322@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Now that the driver core allows for struct class to be in read-only memory, remove the usb_class structure and create the usbmisc_class const class structure declared at build time which places it into read-only memory, instead of having it to be dynamically allocated at load time. Additionally, now we register usb class at startup and unregister it when shutting down, so we don't have to count uses of the class. Therefore we don't need the 'usb_class' structure anymore. Due to this fact, remove all static functions related to class initialization and deinitialization. We can't use them in 'usb.c' since they are static and we don't really need them anymore. Since we have to register the class in usb_init function in 'usb.c' and use it in 'file.c' as well, declare the usbmisc_class structure as 'export' in the 'usb.h' file. Debatable moment: the class registration and unregistration functions could be extracted to the 'file.c'. I think we don't want to do this since it would be one-line functions. They would make the code paths more confusing and add calling overhead. Suggested-by: Greg Kroah-Hartman Signed-off-by: Ivan Orlov --- V1 -> V2: - Remove kref field of usb_class structure - Remove usb_class structure - Remove class initialization and cleaning functions - Add usbmisc_class declaration to usb.h file - Move class registration to usb init function - Move class unregistration to usb exit function V2 -> V3: - Remove redundant retval comparison found by 0-day bot drivers/usb/core/file.c | 66 ++++------------------------------------- drivers/usb/core/usb.c | 6 ++++ drivers/usb/core/usb.h | 1 + 3 files changed, 13 insertions(+), 60 deletions(-) diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index c4ed3310e069..f7627cd3f647 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c @@ -29,7 +29,6 @@ #define MAX_USB_MINORS 256 static const struct file_operations *usb_minors[MAX_USB_MINORS]; static DECLARE_RWSEM(minor_rwsem); -static DEFINE_MUTEX(init_usb_class_mutex); static int usb_open(struct inode *inode, struct file *file) { @@ -57,11 +56,6 @@ static const struct file_operations usb_fops = { .llseek = noop_llseek, }; -static struct usb_class { - struct kref kref; - struct class *class; -} *usb_class; - static char *usb_devnode(const struct device *dev, umode_t *mode) { struct usb_class_driver *drv; @@ -72,50 +66,10 @@ static char *usb_devnode(const struct device *dev, umode_t *mode) return drv->devnode(dev, mode); } -static int init_usb_class(void) -{ - int result = 0; - - if (usb_class != NULL) { - kref_get(&usb_class->kref); - goto exit; - } - - usb_class = kmalloc(sizeof(*usb_class), GFP_KERNEL); - if (!usb_class) { - result = -ENOMEM; - goto exit; - } - - kref_init(&usb_class->kref); - usb_class->class = class_create("usbmisc"); - if (IS_ERR(usb_class->class)) { - result = PTR_ERR(usb_class->class); - printk(KERN_ERR "class_create failed for usb devices\n"); - kfree(usb_class); - usb_class = NULL; - goto exit; - } - usb_class->class->devnode = usb_devnode; - -exit: - return result; -} - -static void release_usb_class(struct kref *kref) -{ - /* Ok, we cheat as we know we only have one usb_class */ - class_destroy(usb_class->class); - kfree(usb_class); - usb_class = NULL; -} - -static void destroy_usb_class(void) -{ - mutex_lock(&init_usb_class_mutex); - kref_put(&usb_class->kref, release_usb_class); - mutex_unlock(&init_usb_class_mutex); -} +const struct class usbmisc_class = { + .name = "usbmisc", + .devnode = usb_devnode, +}; int usb_major_init(void) { @@ -175,13 +129,6 @@ int usb_register_dev(struct usb_interface *intf, if (intf->minor >= 0) return -EADDRINUSE; - mutex_lock(&init_usb_class_mutex); - retval = init_usb_class(); - mutex_unlock(&init_usb_class_mutex); - - if (retval) - return retval; - dev_dbg(&intf->dev, "looking for a minor, starting at %d\n", minor_base); down_write(&minor_rwsem); @@ -200,7 +147,7 @@ int usb_register_dev(struct usb_interface *intf, /* create a usb class device for this usb interface */ snprintf(name, sizeof(name), class_driver->name, minor - minor_base); - intf->usb_dev = device_create(usb_class->class, &intf->dev, + intf->usb_dev = device_create(&usbmisc_class, &intf->dev, MKDEV(USB_MAJOR, minor), class_driver, "%s", kbasename(name)); if (IS_ERR(intf->usb_dev)) { @@ -234,7 +181,7 @@ void usb_deregister_dev(struct usb_interface *intf, return; dev_dbg(&intf->dev, "removing %d minor\n", intf->minor); - device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor)); + device_destroy(&usbmisc_class, MKDEV(USB_MAJOR, intf->minor)); down_write(&minor_rwsem); usb_minors[intf->minor] = NULL; @@ -242,6 +189,5 @@ void usb_deregister_dev(struct usb_interface *intf, intf->usb_dev = NULL; intf->minor = -1; - destroy_usb_class(); } EXPORT_SYMBOL_GPL(usb_deregister_dev); diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 901ec732321c..39bdf9589b06 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -1101,6 +1101,9 @@ static int __init usb_init(void) retval = usb_major_init(); if (retval) goto major_init_failed; + retval = class_register(&usbmisc_class); + if (retval) + goto class_register_failed; retval = usb_register(&usbfs_driver); if (retval) goto driver_register_failed; @@ -1120,6 +1123,8 @@ static int __init usb_init(void) usb_devio_init_failed: usb_deregister(&usbfs_driver); driver_register_failed: + class_unregister(&usbmisc_class); +class_register_failed: usb_major_cleanup(); major_init_failed: bus_unregister_notifier(&usb_bus_type, &usb_bus_nb); @@ -1147,6 +1152,7 @@ static void __exit usb_exit(void) usb_deregister(&usbfs_driver); usb_devio_cleanup(); usb_hub_cleanup(); + class_unregister(&usbmisc_class); bus_unregister_notifier(&usb_bus_type, &usb_bus_nb); bus_unregister(&usb_bus_type); usb_acpi_unregister(); diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index ffe3f6818e9c..69ca59841083 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -141,6 +141,7 @@ static inline int usb_disable_usb2_hardware_lpm(struct usb_device *udev) #endif +extern const struct class usbmisc_class; extern const struct bus_type usb_bus_type; extern struct mutex usb_port_peer_mutex; extern struct device_type usb_device_type;