| Message ID | 171140738438.1574931.15717256954707430472.stgit@dwillia2-xfh.jf.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] cleanup: Add usage and style documentation | expand |
… > +++ b/include/linux/cleanup.h > @@ -4,6 +4,157 @@ > > #include <linux/compiler.h> > > +/** > + * DOC: scope-based cleanup helpers > + * > + * The "goto error" pattern is notorious for introducing … Will any other label become more helpful for this description approach? > + * this tedium … Would an other wording be more appropriate here? > + * … maintaining FILO (first in last out) How does this text fit to your response from yesterday? https://lore.kernel.org/all/6601c7f7369d4_2690d29490@dwillia2-mobl3.amr.corp.intel.com.notmuch/ > + * … If a function > + * wants to invoke pci_dev_put() on error, but return @dev (i.e. without > + * freeing it) on success, it can do: > + * > + * :: > + * > + * return no_free_ptr(dev); > + * > + * ...or: > + * > + * :: > + * > + * return_ptr(dev); … Would this macro call be preferred as a succinct specification (so that only the shorter one should be mentioned here)? https://elixir.bootlin.com/linux/v6.8.1/source/include/linux/cleanup.h#L78 > + * Observe the lock is held for the remainder of the "if ()" block not > + * the remainder of "func()". I suggest to add a word in this sentence. * Observe the lock is held for the remainder of the "if ()" block * (and not the remainder of "func()"). > + * the top of the function poses this potential interdependency problem I suggest to add a comma at the end of this line. > + * the recommendation is to always define and assign variables in one > + * statement and not group variable definitions at the top of the > + * function when __free() is used. I became curious how code layout guidance will evolve further also according to such an advice. Would you like to increase the collaboration with the macros “DEFINE_CLASS” and “CLASS”? https://elixir.bootlin.com/linux/v6.8.1/source/include/linux/cleanup.h#L82 Regards, Markus
One little nit... Dan Williams <dan.j.williams@intel.com> writes: > + * The DEFINE_FREE() macro can arrange for PCI device references to be > + * dropped when the associated variable goes out of scope: > + * > + * :: > + * This can be written a bit more concisely as: ...goes out of scope:: without the separate "::" line, reducing the markup noise a bit more. Thanks, jon
Jonathan Corbet wrote: > One little nit... > > Dan Williams <dan.j.williams@intel.com> writes: > > > + * The DEFINE_FREE() macro can arrange for PCI device references to be > > + * dropped when the associated variable goes out of scope: > > + * > > + * :: > > + * > > This can be written a bit more concisely as: > > ...goes out of scope:: > > without the separate "::" line, reducing the markup noise a bit more. Oh, nice! Today I learned...
On Mon, 25 Mar 2024 15:57:42 -0700 Dan Williams <dan.j.williams@intel.com> wrote: > When proposing that PCI grow some new cleanup helpers for pci_dev_put() > and pci_dev_{lock,unlock} [1], Bjorn had some fundamental questions > about expectations and best practices. Upon reviewing an updated > changelog with those details he recommended adding them to documentation > in the header file itself. > > Add that documentation and link it into the rendering for > Documentation/core-api/. > > Link: http://lore.kernel.org/r/20240104183218.GA1820872@bhelgaas [1] > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: Ira Weiny <ira.weiny@intel.com> > Cc: Jonathan Cameron <jonathan.cameron@huawei.com> > Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> > Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > Cc: Lukas Wunner <lukas@wunner.de> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Jonathan Corbet <corbet@lwn.net> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Other than the formatting improvement Jon suggested, this looks good to me and corresponds to my understanding of how this stuff should be used. FWIW Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Dan Williams wrote: [..] > diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h > index c2d09bc4f976..8ef2d91c2cbf 100644 > --- a/include/linux/cleanup.h > +++ b/include/linux/cleanup.h [..] > + * When the unwind order matters it requires that variables be defined > + * mid-function scope rather than at the top of the file. Take the > + * following example and notice the bug highlighted by "!!": > + * > + * :: > + * > + * LIST_HEAD(list); > + * DEFINE_MUTEX(lock); > + * > + * struct object { > + * struct list_head node; > + * }; > + * > + * static struct object *alloc_add(void) > + * { > + * struct object *obj; > + * > + * lockdep_assert_held(&lock); > + * obj = kfree(sizeof(*obj), GFP_KERNEL); This should be kzalloc(), and I should note that this example is of the UNTESTED variety.
Dan Williams wrote: [..] > diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h > index c2d09bc4f976..8ef2d91c2cbf 100644 > --- a/include/linux/cleanup.h > +++ b/include/linux/cleanup.h > @@ -4,6 +4,157 @@ > > #include <linux/compiler.h> > > +/** > + * DOC: scope-based cleanup helpers > + * > + * The "goto error" pattern is notorious for introducing subtle resource > + * leaks. It is tedious and error prone to add new resource acquisition > + * constraints into code paths that already have several unwind > + * conditions. The "cleanup" helpers enable the compiler to help with > + * this tedium and can aid in maintaining FILO (first in last out) Missed this FILO => LIFO conversion per Bjorn.
diff --git a/Documentation/core-api/cleanup.rst b/Documentation/core-api/cleanup.rst new file mode 100644 index 000000000000..527eb2f8ec6e --- /dev/null +++ b/Documentation/core-api/cleanup.rst @@ -0,0 +1,8 @@ +.. SPDX-License-Identifier: GPL-2.0 + +=========================== +Scope-based Cleanup Helpers +=========================== + +.. kernel-doc:: include/linux/cleanup.h + :doc: scope-based cleanup helpers diff --git a/Documentation/core-api/index.rst b/Documentation/core-api/index.rst index 7a3a08d81f11..2d2b3719567e 100644 --- a/Documentation/core-api/index.rst +++ b/Documentation/core-api/index.rst @@ -35,6 +35,7 @@ Library functionality that is used throughout the kernel. kobject kref + cleanup assoc_array xarray maple_tree diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h index c2d09bc4f976..8ef2d91c2cbf 100644 --- a/include/linux/cleanup.h +++ b/include/linux/cleanup.h @@ -4,6 +4,157 @@ #include <linux/compiler.h> +/** + * DOC: scope-based cleanup helpers + * + * The "goto error" pattern is notorious for introducing subtle resource + * leaks. It is tedious and error prone to add new resource acquisition + * constraints into code paths that already have several unwind + * conditions. The "cleanup" helpers enable the compiler to help with + * this tedium and can aid in maintaining FILO (first in last out) + * unwind ordering to avoid unintentional leaks. + * + * As drivers make up the majority of the kernel code base, here is an + * example of using these helpers to clean up PCI drivers. The target of + * the cleanups are occasions where a goto is used to unwind a device + * reference (pci_dev_put()), or unlock the device (pci_dev_unlock()) + * before returning. + * + * The DEFINE_FREE() macro can arrange for PCI device references to be + * dropped when the associated variable goes out of scope: + * + * :: + * + * DEFINE_FREE(pci_dev_put, struct pci_dev *, if (_T) pci_dev_put(_T)) + * ... + * struct pci_dev *dev __free(pci_dev_put) = + * pci_get_slot(parent, PCI_DEVFN(0, 0)); + * + * The above will automatically call pci_dev_put() if @dev is non-NULL + * when @dev goes out of scope (automatic variable scope). If a function + * wants to invoke pci_dev_put() on error, but return @dev (i.e. without + * freeing it) on success, it can do: + * + * :: + * + * return no_free_ptr(dev); + * + * ...or: + * + * :: + * + * return_ptr(dev); + * + * The DEFINE_GUARD() macro can arrange for the PCI device lock to be + * dropped when the scope where guard() is invoked ends: + * + * :: + * + * DEFINE_GUARD(pci_dev, struct pci_dev *, pci_dev_lock(_T), pci_dev_unlock(_T)) + * ... + * guard(pci_dev)(dev); + * + * + * The lifetime of the lock obtained by the guard() helper follows the + * scope of automatic variable declaration. Take the following example: + * + * :: + * + * func(...) + * { + * if (...) { + * ... + * guard(pci_dev)(dev); // pci_dev_lock() invoked here + * ... + * } // <- implied pci_dev_unlock() triggered here + * } + * + * Observe the lock is held for the remainder of the "if ()" block not + * the remainder of "func()". + * + * Now, when a function uses both __free() and guard(), or multiple + * instances of __free(), the LIFO order of variable definition order + * matters. GCC documentation says: + * + * "When multiple variables in the same scope have cleanup attributes, + * at exit from the scope their associated cleanup functions are run in + * reverse order of definition (last defined, first cleanup)." + * + * When the unwind order matters it requires that variables be defined + * mid-function scope rather than at the top of the file. Take the + * following example and notice the bug highlighted by "!!": + * + * :: + * + * LIST_HEAD(list); + * DEFINE_MUTEX(lock); + * + * struct object { + * struct list_head node; + * }; + * + * static struct object *alloc_add(void) + * { + * struct object *obj; + * + * lockdep_assert_held(&lock); + * obj = kfree(sizeof(*obj), GFP_KERNEL); + * if (obj) { + * LIST_HEAD_INIT(&obj->node); + * list_add(obj->node, &list): + * } + * return obj; + * } + * + * static void remove_free(struct object *obj) + * { + * lockdep_assert_held(&lock); + * list_del(&obj->node); + * kfree(obj); + * } + * + * DEFINE_FREE(remove_free, struct object *, if (_T) remove_free(_T)) + * static int init(void) + * { + * struct object *obj __free(remove_free) = NULL; + * int err; + * + * guard(mutex)(&lock); + * obj = alloc_add(); + * + * if (!obj) + * return -ENOMEM; + * + * err = other_init(obj); + * if (err) + * return err; // remove_free() called without the lock!! + * + * no_free_ptr(obj); + * return 0; + * } + * + * That bug is fixed by changing init() to call guard() and define + + * initialize @obj in this order: + * + * :: + * + * guard(mutex)(&lock); + * struct object *obj __free(remove_free) = alloc_add(); + * + * Given that the "__free(...) = NULL" pattern for variables defined at + * the top of the function poses this potential interdependency problem + * the recommendation is to always define and assign variables in one + * statement and not group variable definitions at the top of the + * function when __free() is used. + * + * Lastly, given that the benefit of cleanup helpers is removal of + * "goto", and that the "goto" statement can jump between scopes, the + * expectation is that usage of "goto" and cleanup helpers is never + * mixed in the same function. I.e. for a given routine, convert all + * resources that need a "goto" cleanup to scope-based cleanup, or + * convert none of them. + */ + /* * DEFINE_FREE(name, type, free): * simple helper macro that defines the required wrapper for a __free()
When proposing that PCI grow some new cleanup helpers for pci_dev_put() and pci_dev_{lock,unlock} [1], Bjorn had some fundamental questions about expectations and best practices. Upon reviewing an updated changelog with those details he recommended adding them to documentation in the header file itself. Add that documentation and link it into the rendering for Documentation/core-api/. Link: http://lore.kernel.org/r/20240104183218.GA1820872@bhelgaas [1] Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Ira Weiny <ira.weiny@intel.com> Cc: Jonathan Cameron <jonathan.cameron@huawei.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Cc: Lukas Wunner <lukas@wunner.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- Changes since v1: * drop RST markup for C-syntax highlighting in examples, use the simpler "::" annotation (Peter, Lukas, Jon) * fixup ordering of core-api sections (Matthew) * describe ordering as LIFO (Bjorn) * wait to talk about DEFINE_GUARD() until after DEFINE_FREE() section (Bjorn) * clarify the "definition order matters" concern (Bjorn) * drop statistics for goto patterns in source, "TMI" (Bjorn) * include example of order dependent cleanups helpers (Kevin, Bjorn) Documentation/core-api/cleanup.rst | 8 ++ Documentation/core-api/index.rst | 1 include/linux/cleanup.h | 151 ++++++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+) create mode 100644 Documentation/core-api/cleanup.rst