From: James Simmons <jsimmons@infradead.org>
To: lustre-devel@lists.lustre.org
Subject: [lustre-devel] [PATCH 06/37] lustre: obd_type: discard obd_types linked list.
Date: Sun, 24 Feb 2019 17:00:58 +0000 (GMT) [thread overview]
Message-ID: <alpine.LFD.2.21.1902241659080.22752@casper.infradead.org> (raw)
In-Reply-To: <155053494516.24125.10480743535229018309.stgit@noble.brown>
> As all obd_types are kobjects in the lustre_kset kset,
> they are linked together in that kset and don't
> need any extra linkage.
>
> As kset_find_obj() returns a counted reference, we need
> to put that reference when done.
>
> Signed-off-by: NeilBrown <neilb@suse.com>
> ---
> drivers/staging/lustre/lustre/include/obd.h | 1 -
> drivers/staging/lustre/lustre/obdclass/genops.c | 41 +++++++++++------------
> 2 files changed, 19 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
> index 3aa9cc889949..50f33f400075 100644
> --- a/drivers/staging/lustre/lustre/include/obd.h
> +++ b/drivers/staging/lustre/lustre/include/obd.h
> @@ -99,7 +99,6 @@ struct obd_info {
> };
>
> struct obd_type {
> - struct list_head typ_chain;
> struct obd_ops *typ_dt_ops;
> struct md_ops *typ_md_ops;
> struct dentry *typ_debugfs_entry;
> diff --git a/drivers/staging/lustre/lustre/obdclass/genops.c b/drivers/staging/lustre/lustre/obdclass/genops.c
> index 32581f1a92ac..775e4fa4f6a8 100644
> --- a/drivers/staging/lustre/lustre/obdclass/genops.c
> +++ b/drivers/staging/lustre/lustre/obdclass/genops.c
> @@ -42,8 +42,6 @@
> #include <lprocfs_status.h>
> #include <lustre_kernelcomm.h>
>
> -static DEFINE_SPINLOCK(obd_types_lock);
> -static LIST_HEAD(obd_types);
> DEFINE_RWLOCK(obd_dev_lock);
> static struct obd_device *obd_devs[MAX_OBD_DEVICES];
>
> @@ -88,22 +86,19 @@ static void obd_device_free(struct obd_device *obd)
>
> static struct obd_type *class_search_type(const char *name)
> {
> - struct obd_type *type;
> + struct kobject *kobj = kset_find_obj(lustre_kset, name);
> +
> + if (kobj)
> + return container_of(kobj, struct obd_type, typ_kobj);
>
> - spin_lock(&obd_types_lock);
> - list_for_each_entry(type, &obd_types, typ_chain) {
> - if (strcmp(type->typ_name, name) == 0) {
> - spin_unlock(&obd_types_lock);
> - return type;
> - }
> - }
> - spin_unlock(&obd_types_lock);
> return NULL;
> }
>
> static struct obd_type *class_get_type(const char *name)
> {
> - struct obd_type *type = class_search_type(name);
> + struct obd_type *type;
> +
> + type = class_search_type(name);
>
> if (!type) {
> const char *modname = name;
> @@ -121,6 +116,11 @@ static struct obd_type *class_get_type(const char *name)
> type->typ_refcnt++;
> try_module_get(type->typ_dt_ops->owner);
> spin_unlock(&type->obd_type_lock);
> + /* class_search_type() returned a counted reference,
> + * but we don't need that count any more as
> + * we have one through typ_refcnt.
> + */
> + kobject_put(&type->typ_kobj);
> }
> return type;
> }
> @@ -143,10 +143,6 @@ static void class_sysfs_release(struct kobject *kobj)
> if (type->typ_lu)
> lu_device_type_fini(type->typ_lu);
>
> - spin_lock(&obd_types_lock);
> - list_del(&type->typ_chain);
> - spin_unlock(&obd_types_lock);
> -
> kfree(type->typ_md_ops);
> kfree(type->typ_dt_ops);
> kfree(type);
> @@ -169,8 +165,10 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops,
> /* sanity check */
> LASSERT(strnlen(name, CLASS_MAX_NAME) < CLASS_MAX_NAME);
>
> - if (class_search_type(name)) {
> + type = class_search_type(name);
> + if (type) {
> CDEBUG(D_IOCTL, "Type %s already registered\n", name);
> + kobject_put(&type->typ_kobj);
> return -EEXIST;
> }
>
> @@ -181,7 +179,6 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops,
>
> type->typ_kobj.kset = lustre_kset;
> kobject_init(&type->typ_kobj, &class_ktype);
> - INIT_LIST_HEAD(&type->typ_chain);
>
> type->typ_dt_ops = kzalloc(sizeof(*type->typ_dt_ops), GFP_NOFS);
> type->typ_md_ops = kzalloc(sizeof(*type->typ_md_ops), GFP_NOFS);
> @@ -210,10 +207,6 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops,
> goto failed;
> }
>
> - spin_lock(&obd_types_lock);
> - list_add(&type->typ_chain, &obd_types);
> - spin_unlock(&obd_types_lock);
> -
> return 0;
>
> failed:
> @@ -238,9 +231,13 @@ int class_unregister_type(const char *name)
> /* Remove ops, but leave the name for debugging */
> kfree(type->typ_dt_ops);
> kfree(type->typ_md_ops);
> + kobject_put(&type->typ_kobj);
> return -EBUSY;
> }
>
> + /* Put the ref returned by class_search_type() */
> + kobject_put(&type->typ_kobj);
> + /* Put the final ref */
> kobject_put(&type->typ_kobj);
This last part needs to be kobject_del(&type->typ_kobj); but that
will be handled in the early patch.
> return 0;
>
>
>
next prev parent reply other threads:[~2019-02-24 17:00 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-19 0:09 [lustre-devel] [PATCH 00/37] More lustre patches from obdclass NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 01/37] lustre: obdclass: char obd_ioctl_getdata type NeilBrown
2019-02-24 18:35 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 02/37] lustre: llite: don't use class_setup_tunables() NeilBrown
2019-02-24 16:35 ` James Simmons
2019-02-25 22:27 ` NeilBrown
2019-02-26 22:18 ` James Simmons
2019-02-24 16:52 ` [lustre-devel] [PATCH 03/37] lustre: embed typ_kobj if obd_type James Simmons
2019-02-25 22:38 ` NeilBrown
2019-02-26 20:41 ` Simmons, James A.
2019-02-19 0:09 ` [lustre-devel] [PATCH 14/37] lustre: llog: change lgh_refcount to struct kref NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 13/37] lustre: llog: remove lgh_hdr_lock NeilBrown
2019-02-24 20:29 ` James Simmons
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 07/37] lustre: obd_type: discard obd_type_lock NeilBrown
2019-02-24 17:02 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 08/37] lustre: obdclass: don't copy ops structures in to new type NeilBrown
2019-02-24 17:03 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 16/37] lustre: obdclass: typo: Banlance -> Balance NeilBrown
2019-02-24 17:39 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 05/37] lustre: obd_type: use typ_kobj.name as typ_name NeilBrown
2019-02-24 16:56 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 03/37] lustre: embed typ_kobj if obd_type NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 09/37] lustre: obdclass: fix module load locking NeilBrown
2019-02-24 17:04 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 17/37] lustre: simplify lprocfs_read_frac_helper NeilBrown
2019-02-24 17:52 ` James Simmons
2019-02-26 23:59 ` NeilBrown
2019-02-27 1:06 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 18/37] lustre: obdclass: discard lprocfs_single/seq_release NeilBrown
2019-02-24 17:53 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 12/37] lustre: remove unused function in linkea NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 10/37] lustre: kernelcomm: pass correct gfp_t to kmalloc NeilBrown
2019-02-24 17:05 ` James Simmons
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 21/37] lustre: remove several MAX_STRING_SIZE defines NeilBrown
2019-02-24 19:07 ` James Simmons
2019-02-27 0:41 ` NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 19/37] lustre: discard lprocfs_strnstr() NeilBrown
2019-02-24 17:53 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 15/37] lustre: llog_obd: Convert loc_refcount to refcount_t NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 11/37] lustre: kernelcomm: make libcfs_kkuc_msg_put static NeilBrown
2019-02-24 17:15 ` James Simmons
2019-02-26 23:45 ` NeilBrown
2019-02-27 22:36 ` James Simmons
2019-02-27 22:37 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 04/37] lustre: collect all resource releasing for obj_type NeilBrown
2019-02-24 16:54 ` James Simmons
2019-02-19 0:09 ` [lustre-devel] [PATCH 06/37] lustre: obd_type: discard obd_types linked list NeilBrown
2019-02-24 17:00 ` James Simmons [this message]
2019-02-19 0:09 ` [lustre-devel] [PATCH 20/37] lustre: convert rsi_sem to a spinlock NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-27 0:22 ` NeilBrown
2019-02-27 1:00 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 32/37] lustre: portals_handle: rename ops to owner NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 22/37] lustre: lprocfs: use log2.h macros instead of shift loop NeilBrown
2019-02-24 18:09 ` James Simmons
2019-02-26 20:55 ` James Simmons
2019-02-27 0:51 ` NeilBrown
2019-02-27 0:54 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 25/37] lustre: deprecate libcfs_debug_vmsg2 NeilBrown
2019-02-24 20:02 ` James Simmons
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 30/37] lustre: handle: move refcount into the lustre_handle NeilBrown
2019-02-27 6:32 ` Andreas Dilger
2019-02-27 21:48 ` NeilBrown
2019-02-27 22:14 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 28/37] lustre: remove scope and source from class_incref and class_decref NeilBrown
2019-02-27 6:52 ` Andreas Dilger
2019-02-28 0:39 ` NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 26/37] lustre: remove libcfs_debug_vmsg2 NeilBrown
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 23/37] lustre: prefer to use tabs for alignment NeilBrown
2019-02-24 18:51 ` James Simmons
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 27/37] lustre: discard lu_ref NeilBrown
2019-02-24 20:28 ` James Simmons
2019-02-27 1:17 ` NeilBrown
2019-02-27 5:35 ` Andreas Dilger
2019-03-01 6:45 ` Mike Pershin
2019-02-19 0:09 ` [lustre-devel] [PATCH 29/37] lustre: handles: discard h_owner in favour of h_ops NeilBrown
2019-02-27 6:37 ` Andreas Dilger
2019-02-27 21:41 ` NeilBrown
2019-02-28 6:41 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 33/37] lustre: portals_handle: remove locking from class_handle2object() NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 34/37] lustre: portals_handle: use hlist for hash lists NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 31/37] lustre: discard OBD_FREE_RCU NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 24/37] lustre: lu_object: remove extra newline from debug printing NeilBrown
2019-02-24 19:08 ` James Simmons
2019-02-25 18:16 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 35/37] lustre: portals_handle: discard h_lock NeilBrown
2019-02-19 0:09 ` [lustre-devel] [PATCH 37/37] lustre: obd_sysfs: error-check value stored in jobid_var NeilBrown
2019-02-27 6:17 ` Andreas Dilger
2019-03-01 2:35 ` NeilBrown
2019-03-01 8:32 ` Andreas Dilger
2019-03-01 14:30 ` Patrick Farrell
2019-03-14 0:34 ` NeilBrown
2019-03-14 14:12 ` Patrick Farrell
2019-03-14 22:56 ` NeilBrown
2019-03-14 23:05 ` Andreas Dilger
2019-02-19 0:09 ` [lustre-devel] [PATCH 36/37] lustre: remove unused fields from struct obd_device NeilBrown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.21.1902241659080.22752@casper.infradead.org \
--to=jsimmons@infradead.org \
--cc=lustre-devel@lists.lustre.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).