| Message ID | 1357907893-3885-1-git-send-email-johan.mossberg@stericsson.com |
|---|---|
| State | New |
| Headers | show |
Hi Rebecca, Is this patch going to be merged to the ion mainline? We (ST-Ericsson) are going to include it in our ion either way as we need it but if you're not planning on including it in mainline ion I'll use the previous version that did not change the api. Don't want to diverge from the standard api unless absolutely necessary. Johan On 01/11/2013 12:38 PM, Johan Mossberg wrote: > Currently ion can only share buffers with dma buf fd:s. Fd:s can not be > used inside the kernel as they are process specific so support for > sharing buffers with dma buf kernel handles is needed to support kernel > only use cases. An example use case could be a GPU driver using ion > that wants to share its output buffers with a 3d party display > controller driver supporting dma buf. > > Signed-off-by: Johan Mossberg<johan.mossberg@stericsson.com> > --- > drivers/gpu/ion/ion.c | 26 ++++++++++++++++++++------ > include/linux/ion.h | 12 ++++++++++-- > 2 files changed, 30 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/ion/ion.c b/drivers/gpu/ion/ion.c > index 0fc02fd..8fd61b3 100644 > --- a/drivers/gpu/ion/ion.c > +++ b/drivers/gpu/ion/ion.c > @@ -949,19 +949,19 @@ struct dma_buf_ops dma_buf_ops = { > .kunmap = ion_dma_buf_kunmap, > }; > > -int ion_share_dma_buf(struct ion_client *client, struct ion_handle *handle) > +struct dma_buf *ion_share_dma_buf(struct ion_client *client, > + struct ion_handle *handle) > { > struct ion_buffer *buffer; > struct dma_buf *dmabuf; > bool valid_handle; > - int fd; > > mutex_lock(&client->lock); > valid_handle = ion_handle_validate(client, handle); > mutex_unlock(&client->lock); > if (!valid_handle) { > WARN(1, "%s: invalid handle passed to share.\n", __func__); > - return -EINVAL; > + return ERR_PTR(-EINVAL); > } > > buffer = handle->buffer; > @@ -969,15 +969,29 @@ int ion_share_dma_buf(struct ion_client *client, struct ion_handle *handle) > dmabuf = dma_buf_export(buffer, &dma_buf_ops, buffer->size, O_RDWR); > if (IS_ERR(dmabuf)) { > ion_buffer_put(buffer); > - return PTR_ERR(dmabuf); > + return dmabuf; > } > + > + return dmabuf; > +} > +EXPORT_SYMBOL(ion_share_dma_buf); > + > +int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle *handle) > +{ > + struct dma_buf *dmabuf; > + int fd; > + > + dmabuf = ion_share_dma_buf(client, handle); > + if (IS_ERR(dmabuf)) > + return PTR_ERR(dmabuf); > + > fd = dma_buf_fd(dmabuf, O_CLOEXEC); > if (fd < 0) > dma_buf_put(dmabuf); > > return fd; > } > -EXPORT_SYMBOL(ion_share_dma_buf); > +EXPORT_SYMBOL(ion_share_dma_buf_fd); > > struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd) > { > @@ -1086,7 +1100,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) > > if (copy_from_user(&data, (void __user *)arg, sizeof(data))) > return -EFAULT; > - data.fd = ion_share_dma_buf(client, data.handle); > + data.fd = ion_share_dma_buf_fd(client, data.handle); > if (copy_to_user((void __user *)arg, &data, sizeof(data))) > return -EFAULT; > if (data.fd < 0) > diff --git a/include/linux/ion.h b/include/linux/ion.h > index a55d11f..e2503e9 100644 > --- a/include/linux/ion.h > +++ b/include/linux/ion.h > @@ -214,11 +214,19 @@ void *ion_map_kernel(struct ion_client *client, struct ion_handle *handle); > void ion_unmap_kernel(struct ion_client *client, struct ion_handle *handle); > > /** > - * ion_share_dma_buf() - given an ion client, create a dma-buf fd > + * ion_share_dma_buf() - share buffer as dma-buf > * @client: the client > * @handle: the handle > */ > -int ion_share_dma_buf(struct ion_client *client, struct ion_handle *handle); > +struct dma_buf *ion_share_dma_buf(struct ion_client *client, > + struct ion_handle *handle); > + > +/** > + * ion_share_dma_buf_fd() - given an ion client, create a dma-buf fd > + * @client: the client > + * @handle: the handle > + */ > +int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle *handle); > > /** > * ion_import_dma_buf() - given an dma-buf fd from the ion exporter get handle > -- > 1.8.0 > > > _______________________________________________ > Linaro-mm-sig mailing list > Linaro-mm-sig@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/linaro-mm-sig > >
I'll merge it today. Rebecca On Tue, Feb 12, 2013 at 1:29 AM, Johan Mossberg < johan.mossberg@stericsson.com> wrote: > Hi Rebecca, > > Is this patch going to be merged to the ion mainline? We (ST-Ericsson) are > going to include it in our ion either way as we need it but if you're not > planning on including it in mainline ion I'll use the previous version that > did not change the api. Don't want to diverge from the standard api unless > absolutely necessary. > > Johan > > > On 01/11/2013 12:38 PM, Johan Mossberg wrote: > >> Currently ion can only share buffers with dma buf fd:s. Fd:s can not be >> used inside the kernel as they are process specific so support for >> sharing buffers with dma buf kernel handles is needed to support kernel >> only use cases. An example use case could be a GPU driver using ion >> that wants to share its output buffers with a 3d party display >> controller driver supporting dma buf. >> >> Signed-off-by: Johan Mossberg<johan.mossberg@**stericsson.com<johan.mossberg@stericsson.com> >> > >> --- >> drivers/gpu/ion/ion.c | 26 ++++++++++++++++++++------ >> include/linux/ion.h | 12 ++++++++++-- >> 2 files changed, 30 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/gpu/ion/ion.c b/drivers/gpu/ion/ion.c >> index 0fc02fd..8fd61b3 100644 >> --- a/drivers/gpu/ion/ion.c >> +++ b/drivers/gpu/ion/ion.c >> @@ -949,19 +949,19 @@ struct dma_buf_ops dma_buf_ops = { >> .kunmap = ion_dma_buf_kunmap, >> }; >> >> -int ion_share_dma_buf(struct ion_client *client, struct ion_handle >> *handle) >> +struct dma_buf *ion_share_dma_buf(struct ion_client *client, >> + struct ion_handle *handle) >> { >> struct ion_buffer *buffer; >> struct dma_buf *dmabuf; >> bool valid_handle; >> - int fd; >> >> mutex_lock(&client->lock); >> valid_handle = ion_handle_validate(client, handle); >> mutex_unlock(&client->lock); >> if (!valid_handle) { >> WARN(1, "%s: invalid handle passed to share.\n", >> __func__); >> - return -EINVAL; >> + return ERR_PTR(-EINVAL); >> } >> >> buffer = handle->buffer; >> @@ -969,15 +969,29 @@ int ion_share_dma_buf(struct ion_client *client, >> struct ion_handle *handle) >> dmabuf = dma_buf_export(buffer, &dma_buf_ops, buffer->size, >> O_RDWR); >> if (IS_ERR(dmabuf)) { >> ion_buffer_put(buffer); >> - return PTR_ERR(dmabuf); >> + return dmabuf; >> } >> + >> + return dmabuf; >> +} >> +EXPORT_SYMBOL(ion_share_dma_**buf); >> + >> +int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle >> *handle) >> +{ >> + struct dma_buf *dmabuf; >> + int fd; >> + >> + dmabuf = ion_share_dma_buf(client, handle); >> + if (IS_ERR(dmabuf)) >> + return PTR_ERR(dmabuf); >> + >> fd = dma_buf_fd(dmabuf, O_CLOEXEC); >> if (fd < 0) >> dma_buf_put(dmabuf); >> >> return fd; >> } >> -EXPORT_SYMBOL(ion_share_dma_**buf); >> +EXPORT_SYMBOL(ion_share_dma_**buf_fd); >> >> struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd) >> { >> @@ -1086,7 +1100,7 @@ static long ion_ioctl(struct file *filp, unsigned >> int cmd, unsigned long arg) >> >> if (copy_from_user(&data, (void __user *)arg, >> sizeof(data))) >> return -EFAULT; >> - data.fd = ion_share_dma_buf(client, data.handle); >> + data.fd = ion_share_dma_buf_fd(client, data.handle); >> if (copy_to_user((void __user *)arg, &data, sizeof(data))) >> return -EFAULT; >> if (data.fd < 0) >> diff --git a/include/linux/ion.h b/include/linux/ion.h >> index a55d11f..e2503e9 100644 >> --- a/include/linux/ion.h >> +++ b/include/linux/ion.h >> @@ -214,11 +214,19 @@ void *ion_map_kernel(struct ion_client *client, >> struct ion_handle *handle); >> void ion_unmap_kernel(struct ion_client *client, struct ion_handle >> *handle); >> >> /** >> - * ion_share_dma_buf() - given an ion client, create a dma-buf fd >> + * ion_share_dma_buf() - share buffer as dma-buf >> * @client: the client >> * @handle: the handle >> */ >> -int ion_share_dma_buf(struct ion_client *client, struct ion_handle >> *handle); >> +struct dma_buf *ion_share_dma_buf(struct ion_client *client, >> + struct ion_handle >> *handle); >> + >> +/** >> + * ion_share_dma_buf_fd() - given an ion client, create a dma-buf fd >> + * @client: the client >> + * @handle: the handle >> + */ >> +int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle >> *handle); >> >> /** >> * ion_import_dma_buf() - given an dma-buf fd from the ion exporter get >> handle >> -- >> 1.8.0 >> >> >> ______________________________**_________________ >> Linaro-mm-sig mailing list >> Linaro-mm-sig@lists.linaro.org >> http://lists.linaro.org/**mailman/listinfo/linaro-mm-sig<http://lists.linaro.org/mailman/listinfo/linaro-mm-sig> >> >> >> >
diff --git a/drivers/gpu/ion/ion.c b/drivers/gpu/ion/ion.c index 0fc02fd..8fd61b3 100644 --- a/drivers/gpu/ion/ion.c +++ b/drivers/gpu/ion/ion.c @@ -949,19 +949,19 @@ struct dma_buf_ops dma_buf_ops = { .kunmap = ion_dma_buf_kunmap, }; -int ion_share_dma_buf(struct ion_client *client, struct ion_handle *handle) +struct dma_buf *ion_share_dma_buf(struct ion_client *client, + struct ion_handle *handle) { struct ion_buffer *buffer; struct dma_buf *dmabuf; bool valid_handle; - int fd; mutex_lock(&client->lock); valid_handle = ion_handle_validate(client, handle); mutex_unlock(&client->lock); if (!valid_handle) { WARN(1, "%s: invalid handle passed to share.\n", __func__); - return -EINVAL; + return ERR_PTR(-EINVAL); } buffer = handle->buffer; @@ -969,15 +969,29 @@ int ion_share_dma_buf(struct ion_client *client, struct ion_handle *handle) dmabuf = dma_buf_export(buffer, &dma_buf_ops, buffer->size, O_RDWR); if (IS_ERR(dmabuf)) { ion_buffer_put(buffer); - return PTR_ERR(dmabuf); + return dmabuf; } + + return dmabuf; +} +EXPORT_SYMBOL(ion_share_dma_buf); + +int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle *handle) +{ + struct dma_buf *dmabuf; + int fd; + + dmabuf = ion_share_dma_buf(client, handle); + if (IS_ERR(dmabuf)) + return PTR_ERR(dmabuf); + fd = dma_buf_fd(dmabuf, O_CLOEXEC); if (fd < 0) dma_buf_put(dmabuf); return fd; } -EXPORT_SYMBOL(ion_share_dma_buf); +EXPORT_SYMBOL(ion_share_dma_buf_fd); struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd) { @@ -1086,7 +1100,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) if (copy_from_user(&data, (void __user *)arg, sizeof(data))) return -EFAULT; - data.fd = ion_share_dma_buf(client, data.handle); + data.fd = ion_share_dma_buf_fd(client, data.handle); if (copy_to_user((void __user *)arg, &data, sizeof(data))) return -EFAULT; if (data.fd < 0) diff --git a/include/linux/ion.h b/include/linux/ion.h index a55d11f..e2503e9 100644 --- a/include/linux/ion.h +++ b/include/linux/ion.h @@ -214,11 +214,19 @@ void *ion_map_kernel(struct ion_client *client, struct ion_handle *handle); void ion_unmap_kernel(struct ion_client *client, struct ion_handle *handle); /** - * ion_share_dma_buf() - given an ion client, create a dma-buf fd + * ion_share_dma_buf() - share buffer as dma-buf * @client: the client * @handle: the handle */ -int ion_share_dma_buf(struct ion_client *client, struct ion_handle *handle); +struct dma_buf *ion_share_dma_buf(struct ion_client *client, + struct ion_handle *handle); + +/** + * ion_share_dma_buf_fd() - given an ion client, create a dma-buf fd + * @client: the client + * @handle: the handle + */ +int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle *handle); /** * ion_import_dma_buf() - given an dma-buf fd from the ion exporter get handle
Currently ion can only share buffers with dma buf fd:s. Fd:s can not be used inside the kernel as they are process specific so support for sharing buffers with dma buf kernel handles is needed to support kernel only use cases. An example use case could be a GPU driver using ion that wants to share its output buffers with a 3d party display controller driver supporting dma buf. Signed-off-by: Johan Mossberg <johan.mossberg@stericsson.com> --- drivers/gpu/ion/ion.c | 26 ++++++++++++++++++++------ include/linux/ion.h | 12 ++++++++++-- 2 files changed, 30 insertions(+), 8 deletions(-)