On Mon, Dec 7, 2015 at 5:21 PM, <kernel@xxxxxxxxxxxxxxxx> wrote: > From: Martin Sperl <kernel@xxxxxxxxxxxxxxxx> > > SPI resource management framework used while processing a spi_message > via the spi-core. > > The basic idea is taken from dev_res, but as the allocation may happen > fairly frequently, some provisioning (in the form of an unused spi_device > pointer argument to spi_res_alloc) has been made so that at a later stage > we may implement reuse objects allocated earlier avoiding the repeated > allocation by keeping a cache of objects that we can reuse. > > This framework can get used for: > * rewriting spi_messages > * to fullfill alignment requirements of the spi_master HW > there are at least 2 variants of this: > * a dma transfer does not have to be aligned, but it is always > a multiple of 4/8/16, which poses issues at the end of the first page > where the length of the first DMA transfer would not be a multiple of > * a dma transfer ALWAYS has to be aligned on spi_transfer.rx/tx_buf > * to fullfill transfer length requirements > (e.g: transfers need to be less than 64k) > * consolidate spi_messages with multiple transfers into a single transfer > when the total transfer length is below a threshold. > * reimplement spi_unmap_buf without explicitly needing to check for it. I have no thoughts (*) about the whole idea, but below some comments regarding implementation. (*) [Yet] For a fist glance looked a bit complicated. > > Signed-off-by: Martin Sperl <kernel@xxxxxxxxxxxxxxxx> > --- > drivers/spi/spi.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/spi/spi.h | 36 ++++++++++++++++++ > 2 files changed, 129 insertions(+) > > diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c > index 2b0a8ec..fb39d23 100644 > --- a/drivers/spi/spi.c > +++ b/drivers/spi/spi.c > @@ -1007,6 +1007,8 @@ out: > if (msg->status && master->handle_err) > master->handle_err(master, msg); > > + spi_res_release(master, msg); > + Why it's in this patch and not later? > spi_finalize_current_message(master); > > return ret; > @@ -1991,6 +1993,97 @@ struct spi_master *spi_busnum_to_master(u16 bus_num) > } > EXPORT_SYMBOL_GPL(spi_busnum_to_master); > > +/*-------------------------------------------------------------------------*/ > + > +/* Core methods for SPI resource management */ > + > +/** > + * spi_res_alloc - allocate a spi resource that is life-cycle managed > + * during the processing of a spi_message while using > + * spi_transfer_one > + * @spi: the spi device for which we allocate memory > + * @release: the release code to execute for this resource > + * @size: size to alloc and return > + * @gfp: GFP allocation flags > + * > + * Return: the pointer to the allocated data > + * > + * This may get enhanced in the future to allocate from a memory pool > + * of the @spi_device or @spi_master to avoid repeated allocations. > + */ > +void *spi_res_alloc(struct spi_device *spi, > + spi_res_release_t release, > + size_t size, gfp_t gfp) > +{ > + struct spi_res *sres; > + size_t tot_size = sizeof(struct spi_res) + size; Looks like you create a variable for one use. And I'm pretty sure the 80 character limit is not a case here. > + > + sres = kzalloc(tot_size, gfp); > + if (!sres) > + return NULL; > + > + INIT_LIST_HEAD(&sres->entry); > + sres->release = release; > + > + return sres->data; > +} > +EXPORT_SYMBOL_GPL(spi_res_alloc); > + > +/** > + * spi_res_free - free an spi resource > + * @res: pointer to the custom data of a resource > + * > + */ > +void spi_res_free(void *res) > +{ > + struct spi_res *sres; > + > + if (res) { if (!res) return; ? > + sres = container_of(res, struct spi_res, data); This might be at the definition block even if res == NULL. > + > + WARN_ON(!list_empty(&sres->entry)); > + kfree(sres); > + } > +} > +EXPORT_SYMBOL_GPL(spi_res_free); > + > +/** > + * spi_res_add - add a spi_res to the spi_message > + * @message: the spi message > + * @res: the spi_resource > + */ > +void spi_res_add(struct spi_message *message, void *res) > +{ > + struct spi_res *sres = container_of(res, struct spi_res, data); > + > + WARN_ON(!list_empty(&sres->entry)); > + list_add_tail(&sres->entry, &message->resources); > +} > +EXPORT_SYMBOL_GPL(spi_res_add); > + > +/** > + * spi_res_release - release all spi resources for this message > + * @master: the @spi_master > + * @message: the @spi_message > + */ > +void spi_res_release(struct spi_master *master, > + struct spi_message *message) > +{ > + struct spi_res *res; > + > + while (!list_empty(&message->resources)) { > + res = list_last_entry(&message->resources, > + struct spi_res, entry); Isn't the list_for_each_entry_safe_reverse() ? > + > + if (res->release) > + res->release(master, message, res->data); > + > + list_del(&res->entry); > + > + kfree(res); > + } > +} > +EXPORT_SYMBOL_GPL(spi_res_release); > > /*-------------------------------------------------------------------------*/ > > diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h > index 4c54d47..7e74e0e 100644 > --- a/include/linux/spi/spi.h > +++ b/include/linux/spi/spi.h > @@ -576,6 +576,37 @@ extern void spi_unregister_master(struct spi_master *master); > > extern struct spi_master *spi_busnum_to_master(u16 busnum); > > +/* > + * SPI resource management while processing a SPI message > + */ > + > +/** > + * struct spi_res - spi resource management structure > + * @entry: list entry > + * @release: release code called prior to freeing this resource > + * @data: extra data allocated for the specific use-case > + * > + * this is based on ideas from devres, but focused on life-cycle > + * management during spi_message processing > + */ > +typedef void (*spi_res_release_t)(struct spi_master *master, > + struct spi_message *msg, > + void *res); > +struct spi_res { > + struct list_head entry; > + spi_res_release_t release; > + unsigned long long data[]; /* guarantee ull alignment */ Isn't better to use __aligned(8)? And why not simple void *? > +}; > + > +extern void *spi_res_alloc(struct spi_device *spi, > + spi_res_release_t release, > + size_t size, gfp_t gfp); > +extern void spi_res_add(struct spi_message *message, void *res); > +extern void spi_res_free(void *res); > + > +extern void spi_res_release(struct spi_master *master, > + struct spi_message *message); > + > /*---------------------------------------------------------------------------*/ > > /* > @@ -714,6 +745,7 @@ struct spi_transfer { > * @status: zero for success, else negative errno > * @queue: for use by whichever driver currently owns the message > * @state: for use by whichever driver currently owns the message > + * @resources: for resource management when the spi message is processed > * > * A @spi_message is used to execute an atomic sequence of data transfers, > * each represented by a struct spi_transfer. The sequence is "atomic" > @@ -760,11 +792,15 @@ struct spi_message { > */ > struct list_head queue; > void *state; > + > + /* list of spi_res reources when the spi message is processed */ > + struct list_head resources; > }; > > static inline void spi_message_init_no_memset(struct spi_message *m) > { > INIT_LIST_HEAD(&m->transfers); > + INIT_LIST_HEAD(&m->resources); > } > > static inline void spi_message_init(struct spi_message *m) > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-spi" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- With Best Regards, Andy Shevchenko -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html