Skip to contentSkip to conversation

staging/ion: Add support to get ion handle from dma buf

PATCH Superseded Rohit kumar 8 participants 15 messages Jan 5, 2016 – Feb 1, 2016 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging/ion: Add support to get ion handle from dma buf

Currently we can only import dma buf fd's to get ion_handle. Adding support to import dma buf handles to support kernel specific use cases.

---
Currently, ION is the memory manager for graphics in android. However, in other linux platforms such as Tizen, DRM-GEM is used for buffer management for graphics. It has gem_handle corresponding to a buffer and uses gem_name for sharing the buffer with other processes. However, it also uses dma_buf fd for 3d operations. For wayland, there are multiple calls for gem_handle to dma_buf fd conversion. So, we store dma_buf associated with buffer. But, there is no api for getting ion_handle from dma_buf. This patch exposes api to retrieve the ion handle from dma_buf for similar use cases. With this patch, we can integrate ION within DRM-GEM for buffer management and dma_buf sharing.

 drivers/staging/android/ion/ion.c |   21 +++++++++++++++------
 drivers/staging/android/ion/ion.h |   20 ++++++++++++++++----
 2 files changed, 31 insertions(+), 10 deletions(-)
drivers/staging/android/ion/ion.c +15 -6
index e237e9f..5509716 100644
@@ -1151,16 +1151,13 @@ int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle *handle)
 }
 EXPORT_SYMBOL(ion_share_dma_buf_fd);
 
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd)
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf)
 {
-	struct dma_buf *dmabuf;
 	struct ion_buffer *buffer;
 	struct ion_handle *handle;
 	int ret;
 
-	dmabuf = dma_buf_get(fd);
-	if (IS_ERR(dmabuf))
-		return ERR_CAST(dmabuf);
 	/* if this memory came from ion */
 
 	if (dmabuf->ops != &dma_buf_ops) {
@@ -1199,6 +1196,18 @@ end:
 }
 EXPORT_SYMBOL(ion_import_dma_buf);
 
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd)
+{
+	struct dma_buf *dmabuf;
+
+	dmabuf = dma_buf_get(fd);
+	if (IS_ERR(dmabuf))
+		return ERR_CAST(dmabuf);
+
+	return ion_import_dma_buf(client, dmabuf);
+}
+EXPORT_SYMBOL(ion_import_dma_buf_fd);
+
 static int ion_sync_for_device(struct ion_client *client, int fd)
 {
 	struct dma_buf *dmabuf;
@@ -1306,7 +1315,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	{
 		struct ion_handle *handle;
 
-		handle = ion_import_dma_buf(client, data.fd.fd);
+		handle = ion_import_dma_buf_fd(client, data.fd.fd);
 		if (IS_ERR(handle))
 			ret = PTR_ERR(handle);
 		else
drivers/staging/android/ion/ion.h +16 -4
index b860c5f..a1331fc 100644
@@ -192,14 +192,26 @@ struct dma_buf *ion_share_dma_buf(struct ion_client *client,
 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
+ * ion_import_dma_buf() - get ion_handle from dma-buf
+ * @client:	the client
+ * @dmabuf:	the dma-buf
+ *
+ * Get the ion_buffer associated with the dma-buf and return the ion_handle.
+ * If no ion_handle exists for this buffer, return newly created ion_handle.
+ * If dma-buf from another exporter is passed, return ERR_PTR(-EINVAL)
+ */
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf);
+
+/**
+ * ion_import_dma_buf_fd() - given a dma-buf fd from the ion exporter get handle
  * @client:	the client
  * @fd:		the dma-buf fd
  *
- * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf,
- * import that fd and return a handle representing it.  If a dma-buf from
+ * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf_fd,
+ * import that fd and return a handle representing it. If a dma-buf from
  * another exporter is passed in this function will return ERR_PTR(-EINVAL)
  */
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd);
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd);
 
 #endif /* _LINUX_ION_H */
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 5 lines · Rohit kumar

Currently we can only import dma buf fd's to get ion_handle. Adding support to import dma buf handles to support kernel specific use cases.

Quoted 12 lines

---
Currently, ION is the memory manager for graphics in android. However, in other linux platforms such as Tizen, DRM-GEM is used for buffer management for graphics. It has gem_handle corresponding to a buffer and uses gem_name for sharing the buffer with other processes. However, it also uses dma_buf fd for 3d operations. For wayland, there are multiple calls for gem_handle to dma_buf fd conversion. So, we store dma_buf associated with buffer. But, there is no api for getting ion_handle from dma_buf. This patch exposes api to retrieve the ion handle from dma_buf for similar use cases. With this patch, we can integrate ION within DRM-GEM for buffer management and dma_buf sharing.

Is this the same patch that was sent on 12/29? In general it's best to wait a bit longer before resending, especially with lots of people being off for the holidays. Please also tag your patch with [RESEND] so it's easier to tell that this is the same patch being sent again.

This is also a good explanation that should be included in the commit text as well. It gives a much more thorough explanation why this API is needed. The substance of the patch looks okay to me.

Thanks,
Laura

Quoted 91 lines
  drivers/staging/android/ion/ion.c |   21 +++++++++++++++------
  drivers/staging/android/ion/ion.h |   20 ++++++++++++++++----
  2 files changed, 31 insertions(+), 10 deletions(-)
drivers/staging/android/ion/ion.c +15 -6
index e237e9f..5509716 100644
@@ -1151,16 +1151,13 @@ int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle *handle)
  }
  EXPORT_SYMBOL(ion_share_dma_buf_fd);
 
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd)
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf)
  {
-	struct dma_buf *dmabuf;
  	struct ion_buffer *buffer;
  	struct ion_handle *handle;
  	int ret;
 
-	dmabuf = dma_buf_get(fd);
-	if (IS_ERR(dmabuf))
-		return ERR_CAST(dmabuf);
  	/* if this memory came from ion */
 
  	if (dmabuf->ops != &dma_buf_ops) {
@@ -1199,6 +1196,18 @@ end:
  }
  EXPORT_SYMBOL(ion_import_dma_buf);
 
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd)
+{
+	struct dma_buf *dmabuf;
+
+	dmabuf = dma_buf_get(fd);
+	if (IS_ERR(dmabuf))
+		return ERR_CAST(dmabuf);
+
+	return ion_import_dma_buf(client, dmabuf);
+}
+EXPORT_SYMBOL(ion_import_dma_buf_fd);
+
  static int ion_sync_for_device(struct ion_client *client, int fd)
  {
  	struct dma_buf *dmabuf;
@@ -1306,7 +1315,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  	{
  		struct ion_handle *handle;
 
-		handle = ion_import_dma_buf(client, data.fd.fd);
+		handle = ion_import_dma_buf_fd(client, data.fd.fd);
  		if (IS_ERR(handle))
  			ret = PTR_ERR(handle);
  		else
drivers/staging/android/ion/ion.h +16 -4
index b860c5f..a1331fc 100644
@@ -192,14 +192,26 @@ struct dma_buf *ion_share_dma_buf(struct ion_client *client,
  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
+ * ion_import_dma_buf() - get ion_handle from dma-buf
+ * @client:	the client
+ * @dmabuf:	the dma-buf
+ *
+ * Get the ion_buffer associated with the dma-buf and return the ion_handle.
+ * If no ion_handle exists for this buffer, return newly created ion_handle.
+ * If dma-buf from another exporter is passed, return ERR_PTR(-EINVAL)
+ */
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf);
+
+/**
+ * ion_import_dma_buf_fd() - given a dma-buf fd from the ion exporter get handle
   * @client:	the client
   * @fd:		the dma-buf fd
   *
- * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf,
- * import that fd and return a handle representing it.  If a dma-buf from
+ * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf_fd,
+ * import that fd and return a handle representing it. If a dma-buf from
   * another exporter is passed in this function will return ERR_PTR(-EINVAL)
   */
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd);
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd);
 
  #endif /* _LINUX_ION_H */
author
#2 lore raw

Sorry to resend the patch without [RESEND] tag. Actually I had missed to add [email protected], [email protected] in mail last time.

I will update the commit message with the explanation and send the PATCHv2 soon.

Thanks,
Rohit

Quoted 137 lines · On Tue, 05 Jan 2016 10:12:39 -0800 Laura Abbott <[email protected]> wrote:
Quoted 5 lines · Rohit kumar

Currently we can only import dma buf fd's to get ion_handle. Adding support to import dma buf handles to support kernel specific use cases.

Quoted 13 lines

---
Currently, ION is the memory manager for graphics in android. However, in other linux platforms such as Tizen, DRM-GEM is used for buffer management for graphics. It has gem_handle corresponding to a buffer and uses gem_name for sharing the buffer with other processes. However, it also uses dma_buf fd for 3d operations. For wayland, there are multiple calls for gem_handle to dma_buf fd conversion. So, we store dma_buf associated with buffer. But, there is no api for getting ion_handle from dma_buf. This patch exposes api to retrieve the ion handle from dma_buf for similar use cases. With this patch, we can integrate ION within DRM-GEM for buffer management and dma_buf sharing.

Is this the same patch that was sent on 12/29? In general it's best to wait a bit longer before resending, especially with lots of people being off for the holidays. Please also tag your patch with [RESEND] so it's easier to tell that this is the same patch being sent again.

This is also a good explanation that should be included in the commit text as well. It gives a much more thorough explanation why this API is needed. The substance of the patch looks okay to me.

Thanks,
Laura

Quoted 103 lines
  drivers/staging/android/ion/ion.c |   21 +++++++++++++++------
  drivers/staging/android/ion/ion.h |   20 ++++++++++++++++----
  2 files changed, 31 insertions(+), 10 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/android/ion/ion.c index e237e9f..5509716 100644

drivers/staging/android/ion/ion.c +0 -1
@@ -1151,16 +1151,13 @@ int ion_share_dma_buf_fd(struct ion_client
 *client, struct ion_handle *handle) }
  EXPORT_SYMBOL(ion_share_dma_buf_fd);
 
-struct ion_handle *ion_import_dma_buf(struct ion_client *client,

int fd) +struct ion_handle *ion_import_dma_buf(struct ion_client *client,

drivers/staging/android/ion/ion.c +13 -5
+				      struct dma_buf *dmabuf)
  {
-	struct dma_buf *dmabuf;
  	struct ion_buffer *buffer;
  	struct ion_handle *handle;
  	int ret;
 
-	dmabuf = dma_buf_get(fd);
-	if (IS_ERR(dmabuf))
-		return ERR_CAST(dmabuf);
  	/* if this memory came from ion */
 
  	if (dmabuf->ops != &dma_buf_ops) {
@@ -1199,6 +1196,18 @@ end:
  }
  EXPORT_SYMBOL(ion_import_dma_buf);
 
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client
 *client, int fd) +{
+	struct dma_buf *dmabuf;
+
+	dmabuf = dma_buf_get(fd);
+	if (IS_ERR(dmabuf))
+		return ERR_CAST(dmabuf);
+
+	return ion_import_dma_buf(client, dmabuf);
+}
+EXPORT_SYMBOL(ion_import_dma_buf_fd);
+
  static int ion_sync_for_device(struct ion_client *client, int fd)
  {
  	struct dma_buf *dmabuf;
@@ -1306,7 +1315,7 @@ static long ion_ioctl(struct file *filp,
 unsigned int cmd, unsigned long arg) {
  		struct ion_handle *handle;
 
-		handle = ion_import_dma_buf(client, data.fd.fd);
+		handle = ion_import_dma_buf_fd(client, data.fd.fd);
  		if (IS_ERR(handle))
  			ret = PTR_ERR(handle);
  		else
(quoted diff) +0 -0

b/drivers/staging/android/ion/ion.h index b860c5f..a1331fc 100644

drivers/staging/android/ion/ion.h +0 -0
@@ -192,14 +192,26 @@ struct dma_buf *ion_share_dma_buf(struct

ion_client *client, 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
+ * ion_import_dma_buf() - get ion_handle from dma-buf
+ * @client: the client
+ * @dmabuf: the dma-buf
+ *
+ * Get the ion_buffer associated with the dma-buf and return the ion_handle.
+ * If no ion_handle exists for this buffer, return newly created ion_handle.
+ * If dma-buf from another exporter is passed, return ERR_PTR(-EINVAL)
+ */

drivers/staging/android/ion/ion.h +5 -0
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf);
+
+/**
+ * ion_import_dma_buf_fd() - given a dma-buf fd from the ion

exporter get handle
* @client: the client
* @fd: the dma-buf fd
*
- * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf,
- * import that fd and return a handle representing it. If a dma-buf from
+ * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf_fd,
+ * import that fd and return a handle representing it. If a dma-buf from
* another exporter is passed in this function will return
ERR_PTR(-EINVAL) */
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd); +struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd);

  #endif /* _LINUX_ION_H */
#3 lore raw

It's not really necessary to CC linux-kernel. No one reads it. I only send patches there when there isn't another public mailing list available.

regards,
dan carpenter

#4 lore raw
Quoted 3 lines · Dan Carpenter

It's not really necessary to CC linux-kernel. No one reads it. I only send patches there when there isn't another public mailing list available.

Actually, cc'ing lkml is still often a good idea, because it's a great archiving point.

I know lots o people (and I am one) who are *not* on random mailing lists that discuss particular subsystems, but that get lkml as an auto-archived thing. Then, when cc'd, you see the back story - in a way that you do *not* see with the random mailing list that was specific to a particular subsystem.

There are also tools like patchworks that follow mailing lists - and yes, it follows many different sublists, but not necessarily all.

Don't get me wrong: lkml is seldom - if ever - the _primary_ list. But I would violently disagree with some kind of blanket "not really necessary to CC linux-kernel" statement. It's still very useful indeed, and it doesn't hurt to cc it for valid patches.

Linus

#5 lore raw
Quoted 2 lines · Linus Torvalds
Quoted 1 line · Dan Carpenter

It's not really necessary to CC linux-kernel. No one reads it.

Some of us still do.

Quoted 5 lines
Quoted 2 lines

I only send patches there when there isn't another public mailing list available.

Actually, cc'ing lkml is still often a good idea, because it's a great archiving point.

*nod*

#6 lore raw
In reply to Dan Carpenter
Quoted 1 line · On Wed, 6 Jan 2016 12:06:22 +0300 Dan Carpenter <[email protected]>…

It's not really necessary to CC linux-kernel. No one reads it.

I have to take issue with this too; more of us read it than you might think. The fact that we're probably all crazy doesn't really figure into it. Think of linux-kernel as the blockchain of kernel development; it's a messy thing that takes a lot of resources to maintain (and keep up with), but when you need to see what happened (or is happening) it's invaluable.

jon

#7 lore raw

Hm... Perhaps I should be CC'ing LKML more often. What's the rule on this, should I just send bugfixes to LKML and whitespace changes to only subsystem list?

regards,
dan carpenter

#8 lore raw
Quoted 3 lines · Dan Carpenter

Hm... Perhaps I should be CC'ing LKML more often. What's the rule on this, should I just send bugfixes to LKML and whitespace changes to only subsystem list?

All my patches (whitespace, bugfix, build fail) always has CC to lkml. Infact, I have setup an alias for that so that i don't have to add lkml manually everytime.

sm = send-email [email protected]

regards
sudip

#9 lore raw

PATCH v2 1/1 staging/ion: Add support to get ion handle from dma buf

In reply to Rohit kumar

Currently we can only import dma buf fd's to get ion_handle. Adding support to import dma buf handles to support kernel specific use cases.

An example use case is in linux platforms such as Tizen, in which DRM-GEM is used for buffer management for graphics. It has gem_handle corresponding to a buffer and uses gem_name for sharing the buffer with other processes. However,it also uses dma_buf fd for 3d operations. For wayland, there are multiple calls for gem_handle to dma_buf fd conversion. So, we store dma_buf associated with buffer. But, there is no api for getting ion_handle from dma_buf. This patch exposes api to retrieve the ion handle from dma_buf for similar use cases. With this patch, we can integrate ION within DRM-GEM for buffer management and dma_buf sharing.

---
v2: Updated commit message with use case explanation, as suggested by
Laura Abbott<[email protected]>

 drivers/staging/android/ion/ion.c |   21 +++++++++++++++------
 drivers/staging/android/ion/ion.h |   20 ++++++++++++++++----
 2 files changed, 31 insertions(+), 10 deletions(-)
drivers/staging/android/ion/ion.c +15 -6
index e237e9f..5509716 100644
@@ -1151,16 +1151,13 @@ int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle *handle)
 }
 EXPORT_SYMBOL(ion_share_dma_buf_fd);
 
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd)
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf)
 {
-	struct dma_buf *dmabuf;
 	struct ion_buffer *buffer;
 	struct ion_handle *handle;
 	int ret;
 
-	dmabuf = dma_buf_get(fd);
-	if (IS_ERR(dmabuf))
-		return ERR_CAST(dmabuf);
 	/* if this memory came from ion */
 
 	if (dmabuf->ops != &dma_buf_ops) {
@@ -1199,6 +1196,18 @@ end:
 }
 EXPORT_SYMBOL(ion_import_dma_buf);
 
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd)
+{
+	struct dma_buf *dmabuf;
+
+	dmabuf = dma_buf_get(fd);
+	if (IS_ERR(dmabuf))
+		return ERR_CAST(dmabuf);
+
+	return ion_import_dma_buf(client, dmabuf);
+}
+EXPORT_SYMBOL(ion_import_dma_buf_fd);
+
 static int ion_sync_for_device(struct ion_client *client, int fd)
 {
 	struct dma_buf *dmabuf;
@@ -1306,7 +1315,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	{
 		struct ion_handle *handle;
 
-		handle = ion_import_dma_buf(client, data.fd.fd);
+		handle = ion_import_dma_buf_fd(client, data.fd.fd);
 		if (IS_ERR(handle))
 			ret = PTR_ERR(handle);
 		else
drivers/staging/android/ion/ion.h +16 -4
index b860c5f..a1331fc 100644
@@ -192,14 +192,26 @@ struct dma_buf *ion_share_dma_buf(struct ion_client *client,
 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
+ * ion_import_dma_buf() - get ion_handle from dma-buf
+ * @client:	the client
+ * @dmabuf:	the dma-buf
+ *
+ * Get the ion_buffer associated with the dma-buf and return the ion_handle.
+ * If no ion_handle exists for this buffer, return newly created ion_handle.
+ * If dma-buf from another exporter is passed, return ERR_PTR(-EINVAL)
+ */
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf);
+
+/**
+ * ion_import_dma_buf_fd() - given a dma-buf fd from the ion exporter get handle
  * @client:	the client
  * @fd:		the dma-buf fd
  *
- * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf,
- * import that fd and return a handle representing it.  If a dma-buf from
+ * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf_fd,
+ * import that fd and return a handle representing it. If a dma-buf from
  * another exporter is passed in this function will return ERR_PTR(-EINVAL)
  */
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd);
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd);
 
 #endif /* _LINUX_ION_H */
Signature · 1 line
1.7.9.5
Reviewed-by on v2 1/1
#10 lore raw
Quoted 15 lines · Rohit kumar

Currently we can only import dma buf fd's to get ion_handle. Adding support to import dma buf handles to support kernel specific use cases.

An example use case is in linux platforms such as Tizen, in which DRM-GEM is used for buffer management for graphics. It has gem_handle corresponding to a buffer and uses gem_name for sharing the buffer with other processes. However,it also uses dma_buf fd for 3d operations. For wayland, there are multiple calls for gem_handle to dma_buf fd conversion. So, we store dma_buf associated with buffer. But, there is no api for getting ion_handle from dma_buf. This patch exposes api to retrieve the ion handle from dma_buf for similar use cases. With this patch, we can integrate ION within DRM-GEM for buffer management and dma_buf sharing.

Quoted 1 line
Quoted 95 lines

---
v2: Updated commit message with use case explanation, as suggested by
Laura Abbott<[email protected]>

  drivers/staging/android/ion/ion.c |   21 +++++++++++++++------
  drivers/staging/android/ion/ion.h |   20 ++++++++++++++++----
  2 files changed, 31 insertions(+), 10 deletions(-)
drivers/staging/android/ion/ion.c +15 -6
index e237e9f..5509716 100644
@@ -1151,16 +1151,13 @@ int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle *handle)
  }
  EXPORT_SYMBOL(ion_share_dma_buf_fd);
 
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd)
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf)
  {
-	struct dma_buf *dmabuf;
  	struct ion_buffer *buffer;
  	struct ion_handle *handle;
  	int ret;
 
-	dmabuf = dma_buf_get(fd);
-	if (IS_ERR(dmabuf))
-		return ERR_CAST(dmabuf);
  	/* if this memory came from ion */
 
  	if (dmabuf->ops != &dma_buf_ops) {
@@ -1199,6 +1196,18 @@ end:
  }
  EXPORT_SYMBOL(ion_import_dma_buf);
 
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd)
+{
+	struct dma_buf *dmabuf;
+
+	dmabuf = dma_buf_get(fd);
+	if (IS_ERR(dmabuf))
+		return ERR_CAST(dmabuf);
+
+	return ion_import_dma_buf(client, dmabuf);
+}
+EXPORT_SYMBOL(ion_import_dma_buf_fd);
+
  static int ion_sync_for_device(struct ion_client *client, int fd)
  {
  	struct dma_buf *dmabuf;
@@ -1306,7 +1315,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  	{
  		struct ion_handle *handle;
 
-		handle = ion_import_dma_buf(client, data.fd.fd);
+		handle = ion_import_dma_buf_fd(client, data.fd.fd);
  		if (IS_ERR(handle))
  			ret = PTR_ERR(handle);
  		else
drivers/staging/android/ion/ion.h +16 -4
index b860c5f..a1331fc 100644
@@ -192,14 +192,26 @@ struct dma_buf *ion_share_dma_buf(struct ion_client *client,
  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
+ * ion_import_dma_buf() - get ion_handle from dma-buf
+ * @client:	the client
+ * @dmabuf:	the dma-buf
+ *
+ * Get the ion_buffer associated with the dma-buf and return the ion_handle.
+ * If no ion_handle exists for this buffer, return newly created ion_handle.
+ * If dma-buf from another exporter is passed, return ERR_PTR(-EINVAL)
+ */
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf);
+
+/**
+ * ion_import_dma_buf_fd() - given a dma-buf fd from the ion exporter get handle
   * @client:	the client
   * @fd:		the dma-buf fd
   *
- * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf,
- * import that fd and return a handle representing it.  If a dma-buf from
+ * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf_fd,
+ * import that fd and return a handle representing it. If a dma-buf from
   * another exporter is passed in this function will return ERR_PTR(-EINVAL)
   */
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd);
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd);
 
  #endif /* _LINUX_ION_H */
Reviewed-by on v2 1/1
#11 lore raw
In reply to Rohit kumar

Hi Rohit,

Quoted 15 lines · Rohit kumar

Currently we can only import dma buf fd's to get ion_handle. Adding support to import dma buf handles to support kernel specific use cases.

An example use case is in linux platforms such as Tizen, in which DRM-GEM is used for buffer management for graphics. It has gem_handle corresponding to a buffer and uses gem_name for sharing the buffer with other processes. However,it also uses dma_buf fd for 3d operations. For wayland, there are multiple calls for gem_handle to dma_buf fd conversion. So, we store dma_buf associated with buffer. But, there is no api for getting ion_handle from dma_buf. This patch exposes api to retrieve the ion handle from dma_buf for similar use cases. With this patch, we can integrate ION within DRM-GEM for buffer management and dma_buf sharing.

Quoted 5 lines

---
v2: Updated commit message with use case explanation, as suggested by
Laura Abbott<[email protected]>

Thanks for this patch.

In general it looks good to me, but perhaps you should add related ION tests for this as well? Once you add that and share for review, feel free to add

Quoted 93 lines
 drivers/staging/android/ion/ion.c |   21 +++++++++++++++------
 drivers/staging/android/ion/ion.h |   20 ++++++++++++++++----
 2 files changed, 31 insertions(+), 10 deletions(-)
drivers/staging/android/ion/ion.c +15 -6
index e237e9f..5509716 100644
@@ -1151,16 +1151,13 @@ int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle *handle)
 }
 EXPORT_SYMBOL(ion_share_dma_buf_fd);
 
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd)
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+                                     struct dma_buf *dmabuf)
 {
-       struct dma_buf *dmabuf;
        struct ion_buffer *buffer;
        struct ion_handle *handle;
        int ret;
 
-       dmabuf = dma_buf_get(fd);
-       if (IS_ERR(dmabuf))
-               return ERR_CAST(dmabuf);
        /* if this memory came from ion */
 
        if (dmabuf->ops != &dma_buf_ops) {
@@ -1199,6 +1196,18 @@ end:
 }
 EXPORT_SYMBOL(ion_import_dma_buf);
 
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd)
+{
+       struct dma_buf *dmabuf;
+
+       dmabuf = dma_buf_get(fd);
+       if (IS_ERR(dmabuf))
+               return ERR_CAST(dmabuf);
+
+       return ion_import_dma_buf(client, dmabuf);
+}
+EXPORT_SYMBOL(ion_import_dma_buf_fd);
+
 static int ion_sync_for_device(struct ion_client *client, int fd)
 {
        struct dma_buf *dmabuf;
@@ -1306,7 +1315,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
        {
                struct ion_handle *handle;
 
-               handle = ion_import_dma_buf(client, data.fd.fd);
+               handle = ion_import_dma_buf_fd(client, data.fd.fd);
                if (IS_ERR(handle))
                        ret = PTR_ERR(handle);
                else
drivers/staging/android/ion/ion.h +16 -5
index b860c5f..a1331fc 100644
@@ -192,14 +192,26 @@ struct dma_buf *ion_share_dma_buf(struct ion_client *client,
 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
+ * ion_import_dma_buf() - get ion_handle from dma-buf
+ * @client:    the client
+ * @dmabuf:    the dma-buf
+ *
+ * Get the ion_buffer associated with the dma-buf and return the ion_handle.
+ * If no ion_handle exists for this buffer, return newly created ion_handle.
+ * If dma-buf from another exporter is passed, return ERR_PTR(-EINVAL)
+ */
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+                                     struct dma_buf *dmabuf);
+
+/**
+ * ion_import_dma_buf_fd() - given a dma-buf fd from the ion exporter get handle
  * @client:    the client
  * @fd:                the dma-buf fd
  *
- * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf,
- * import that fd and return a handle representing it.  If a dma-buf from
+ * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf_fd,
+ * import that fd and return a handle representing it. If a dma-buf from
  * another exporter is passed in this function will return ERR_PTR(-EINVAL)
  */
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd);
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd);
 
 #endif /* _LINUX_ION_H */
--

1.7.9.5

Signature · 5 lines
Thanks and regards,

Sumit Semwal
Linaro Mobile Group - Kernel Team Lead
Linaro.org │ Open source software for ARM SoCs
author
#12 lore raw

Hi Sumit,

Quoted 24 lines · On Thu, 07 Jan 2016 19:43:09 +0530 Sumit Semwal <[email protected]> wrote:

Hi Rohit,

Quoted 16 lines · Rohit kumar

Currently we can only import dma buf fd's to get ion_handle. Adding support to import dma buf handles to support kernel specific use cases.

An example use case is in linux platforms such as Tizen, in which DRM-GEM is used for buffer management for graphics. It has gem_handle corresponding to a buffer and uses gem_name for sharing the buffer with other processes. However,it also uses dma_buf fd for 3d operations. For wayland, there are multiple calls for gem_handle to dma_buf fd conversion. So, we store dma_buf associated with buffer. But, there is no api for getting ion_handle from dma_buf. This patch exposes api to retrieve the ion handle from dma_buf for similar use cases. With this patch, we can integrate ION within DRM-GEM for buffer management and dma_buf sharing.

Quoted 5 lines

---
v2: Updated commit message with use case explanation, as suggested by Laura Abbott<[email protected]>

Quoted 5 lines

Thanks for this patch.

In general it looks good to me, but perhaps you should add related ION tests for this as well? Once you add that and share for review, feel free to add

Thanks for the suggestion. I would add related ION test and share for review sooner.

Quoted 110 lines
Quoted 105 lines
 drivers/staging/android/ion/ion.c |   21 +++++++++++++++------
 drivers/staging/android/ion/ion.h |   20 ++++++++++++++++----
 2 files changed, 31 insertions(+), 10 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/android/ion/ion.c index e237e9f..5509716 100644

drivers/staging/android/ion/ion.c +0 -1
@@ -1151,16 +1151,13 @@ int ion_share_dma_buf_fd(struct ion_client
 *client, struct ion_handle *handle) }
 EXPORT_SYMBOL(ion_share_dma_buf_fd);
 
-struct ion_handle *ion_import_dma_buf(struct ion_client *client,

int fd) +struct ion_handle *ion_import_dma_buf(struct ion_client *client,

drivers/staging/android/ion/ion.c +13 -5
+                                     struct dma_buf *dmabuf)
 {
-       struct dma_buf *dmabuf;
        struct ion_buffer *buffer;
        struct ion_handle *handle;
        int ret;
 
-       dmabuf = dma_buf_get(fd);
-       if (IS_ERR(dmabuf))
-               return ERR_CAST(dmabuf);
        /* if this memory came from ion */
 
        if (dmabuf->ops != &dma_buf_ops) {
@@ -1199,6 +1196,18 @@ end:
 }
 EXPORT_SYMBOL(ion_import_dma_buf);
 
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client
 *client, int fd) +{
+       struct dma_buf *dmabuf;
+
+       dmabuf = dma_buf_get(fd);
+       if (IS_ERR(dmabuf))
+               return ERR_CAST(dmabuf);
+
+       return ion_import_dma_buf(client, dmabuf);
+}
+EXPORT_SYMBOL(ion_import_dma_buf_fd);
+
 static int ion_sync_for_device(struct ion_client *client, int fd)
 {
        struct dma_buf *dmabuf;
@@ -1306,7 +1315,7 @@ static long ion_ioctl(struct file *filp,
 unsigned int cmd, unsigned long arg) {
                struct ion_handle *handle;
 
-               handle = ion_import_dma_buf(client, data.fd.fd);
+               handle = ion_import_dma_buf_fd(client, data.fd.fd);
                if (IS_ERR(handle))
                        ret = PTR_ERR(handle);
                else
(quoted diff) +0 -0

b/drivers/staging/android/ion/ion.h index b860c5f..a1331fc 100644

drivers/staging/android/ion/ion.h +0 -0
@@ -192,14 +192,26 @@ struct dma_buf *ion_share_dma_buf(struct

ion_client *client, 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
+ * ion_import_dma_buf() - get ion_handle from dma-buf
+ * @client: the client
+ * @dmabuf: the dma-buf
+ *
+ * Get the ion_buffer associated with the dma-buf and return the ion_handle.
+ * If no ion_handle exists for this buffer, return newly created ion_handle.
+ * If dma-buf from another exporter is passed, return ERR_PTR(-EINVAL)
+ */

drivers/staging/android/ion/ion.h +5 -0
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+                                     struct dma_buf *dmabuf);
+
+/**
+ * ion_import_dma_buf_fd() - given a dma-buf fd from the ion

exporter get handle
* @client: the client
* @fd: the dma-buf fd
*
- * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf,
- * import that fd and return a handle representing it. If a dma-buf from
+ * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf_fd,
+ * import that fd and return a handle representing it. If a dma-buf from
* another exporter is passed in this function will return
ERR_PTR(-EINVAL) */
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd); +struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd);

#endif /* _LINUX_ION_H */
--
1.7.9.5

#13 lore raw

PATCH v3 1/1 staging/ion: Add support to get ion handle from dma buf

In reply to Rohit kumar

Currently we can only import dma buf fd's to get ion_handle. Adding support to import dma buf handles to support kernel specific use cases.

An example use case is in linux platforms such as Tizen, in which DRM-GEM is used for buffer management for graphics. It has gem_handle corresponding to a buffer and uses gem_name for sharing the buffer with other processes. However,it also uses dma_buf fd for 3d operations. For wayland, there are multiple calls for gem_handle to dma_buf fd conversion. So, we store dma_buf associated with buffer. But, there is no api for getting ion_handle from dma_buf. This patch exposes api to retrieve the ion handle from dma_buf for similar use cases. With this patch, we can integrate ION within DRM-GEM for buffer management and dma_buf sharing.

---
v2: Updated commit message with use case explanation, as suggested by
Laura Abbott<[email protected]>
v3: Fixed dmabuf refcount issue in ion_import_dma_buf. dma_buf_put()
was being called without dma_buf_get(), so moving it to ion_import_dma_buf_fd().

 drivers/staging/android/ion/ion.c |   26 ++++++++++++++++++--------
 drivers/staging/android/ion/ion.h |   20 ++++++++++++++++----
 2 files changed, 34 insertions(+), 12 deletions(-)
drivers/staging/android/ion/ion.c +18 -8
index e237e9f..7e86e18 100644
@@ -1151,22 +1151,18 @@ int ion_share_dma_buf_fd(struct ion_client *client, struct ion_handle *handle)
 }
 EXPORT_SYMBOL(ion_share_dma_buf_fd);
 
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd)
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf)
 {
-	struct dma_buf *dmabuf;
 	struct ion_buffer *buffer;
 	struct ion_handle *handle;
 	int ret;
 
-	dmabuf = dma_buf_get(fd);
-	if (IS_ERR(dmabuf))
-		return ERR_CAST(dmabuf);
 	/* if this memory came from ion */
 
 	if (dmabuf->ops != &dma_buf_ops) {
 		pr_err("%s: can not import dmabuf from another exporter\n",
 		       __func__);
-		dma_buf_put(dmabuf);
 		return ERR_PTR(-EINVAL);
 	}
 	buffer = dmabuf->priv;
@@ -1194,11 +1190,25 @@ struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd)
 	}
 
 end:
-	dma_buf_put(dmabuf);
 	return handle;
 }
 EXPORT_SYMBOL(ion_import_dma_buf);
 
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd)
+{
+	struct dma_buf *dmabuf;
+	struct ion_handle *handle;
+
+	dmabuf = dma_buf_get(fd);
+	if (IS_ERR(dmabuf))
+		return ERR_CAST(dmabuf);
+
+	handle = ion_import_dma_buf(client, dmabuf);
+	dma_buf_put(dmabuf);
+	return handle;
+}
+EXPORT_SYMBOL(ion_import_dma_buf_fd);
+
 static int ion_sync_for_device(struct ion_client *client, int fd)
 {
 	struct dma_buf *dmabuf;
@@ -1306,7 +1316,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	{
 		struct ion_handle *handle;
 
-		handle = ion_import_dma_buf(client, data.fd.fd);
+		handle = ion_import_dma_buf_fd(client, data.fd.fd);
 		if (IS_ERR(handle))
 			ret = PTR_ERR(handle);
 		else
drivers/staging/android/ion/ion.h +16 -4
index b860c5f..a1331fc 100644
@@ -192,14 +192,26 @@ struct dma_buf *ion_share_dma_buf(struct ion_client *client,
 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
+ * ion_import_dma_buf() - get ion_handle from dma-buf
+ * @client:	the client
+ * @dmabuf:	the dma-buf
+ *
+ * Get the ion_buffer associated with the dma-buf and return the ion_handle.
+ * If no ion_handle exists for this buffer, return newly created ion_handle.
+ * If dma-buf from another exporter is passed, return ERR_PTR(-EINVAL)
+ */
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf);
+
+/**
+ * ion_import_dma_buf_fd() - given a dma-buf fd from the ion exporter get handle
  * @client:	the client
  * @fd:		the dma-buf fd
  *
- * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf,
- * import that fd and return a handle representing it.  If a dma-buf from
+ * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf_fd,
+ * import that fd and return a handle representing it. If a dma-buf from
  * another exporter is passed in this function will return ERR_PTR(-EINVAL)
  */
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd);
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd);
 
 #endif /* _LINUX_ION_H */
Signature · 1 line
1.7.9.5
author
#14 lore raw

Kindly review the patch. Patchv2 had refcount issue which is fixed here.

Quoted 136 lines · On Tue, 12 Jan 2016 09:31:46 +0530 Rohit kumar <[email protected]> wrote:

Currently we can only import dma buf fd's to get ion_handle. Adding support to import dma buf handles to support kernel specific use cases.

An example use case is in linux platforms such as Tizen, in which DRM-GEM is used for buffer management for graphics. It has gem_handle corresponding to a buffer and uses gem_name for sharing the buffer with other processes. However,it also uses dma_buf fd for 3d operations. For wayland, there are multiple calls for gem_handle to dma_buf fd conversion. So, we store dma_buf associated with buffer. But, there is no api for getting ion_handle from dma_buf. This patch exposes api to retrieve the ion handle from dma_buf for similar use cases. With this patch, we can integrate ION within DRM-GEM for buffer management and dma_buf sharing.

---
v2: Updated commit message with use case explanation, as suggested by
Laura Abbott<[email protected]>
v3: Fixed dmabuf refcount issue in ion_import_dma_buf. dma_buf_put()
was being called without dma_buf_get(), so moving it to ion_import_dma_buf_fd().

 drivers/staging/android/ion/ion.c |   26 ++++++++++++++++++--------
 drivers/staging/android/ion/ion.h |   20 ++++++++++++++++----
 2 files changed, 34 insertions(+), 12 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/android/ion/ion.c index e237e9f..7e86e18 100644

drivers/staging/android/ion/ion.c +16 -8
@@ -1151,22 +1151,18 @@ int ion_share_dma_buf_fd(struct ion_client
 *client, struct ion_handle *handle) }
 EXPORT_SYMBOL(ion_share_dma_buf_fd);
 
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int
 fd) +struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf)
 {
-	struct dma_buf *dmabuf;
 	struct ion_buffer *buffer;
 	struct ion_handle *handle;
 	int ret;
 
-	dmabuf = dma_buf_get(fd);
-	if (IS_ERR(dmabuf))
-		return ERR_CAST(dmabuf);
 	/* if this memory came from ion */
 
 	if (dmabuf->ops != &dma_buf_ops) {
 		pr_err("%s: can not import dmabuf from another
 exporter\n", __func__);
-		dma_buf_put(dmabuf);
 		return ERR_PTR(-EINVAL);
 	}
 	buffer = dmabuf->priv;
@@ -1194,11 +1190,25 @@ struct ion_handle *ion_import_dma_buf(struct
 ion_client *client, int fd) }
 
 end:
-	dma_buf_put(dmabuf);
 	return handle;
 }
 EXPORT_SYMBOL(ion_import_dma_buf);
 
+struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client,
 int fd) +{
+	struct dma_buf *dmabuf;
+	struct ion_handle *handle;
+
+	dmabuf = dma_buf_get(fd);
+	if (IS_ERR(dmabuf))
+		return ERR_CAST(dmabuf);
+
+	handle = ion_import_dma_buf(client, dmabuf);
+	dma_buf_put(dmabuf);
+	return handle;
+}
+EXPORT_SYMBOL(ion_import_dma_buf_fd);
+
 static int ion_sync_for_device(struct ion_client *client, int fd)
 {
 	struct dma_buf *dmabuf;
@@ -1306,7 +1316,7 @@ static long ion_ioctl(struct file *filp,
 unsigned int cmd, unsigned long arg) {
 		struct ion_handle *handle;
 
-		handle = ion_import_dma_buf(client, data.fd.fd);
+		handle = ion_import_dma_buf_fd(client, data.fd.fd);
 		if (IS_ERR(handle))
 			ret = PTR_ERR(handle);
 		else
(quoted diff) +0 -0

b/drivers/staging/android/ion/ion.h index b860c5f..a1331fc 100644

drivers/staging/android/ion/ion.h +0 -0
@@ -192,14 +192,26 @@ struct dma_buf *ion_share_dma_buf(struct

ion_client *client, 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
+ * ion_import_dma_buf() - get ion_handle from dma-buf
+ * @client: the client
+ * @dmabuf: the dma-buf
+ *
+ * Get the ion_buffer associated with the dma-buf and return the ion_handle.
+ * If no ion_handle exists for this buffer, return newly created ion_handle.
+ * If dma-buf from another exporter is passed, return ERR_PTR(-EINVAL)
+ */

drivers/staging/android/ion/ion.h +5 -0
+struct ion_handle *ion_import_dma_buf(struct ion_client *client,
+				      struct dma_buf *dmabuf);
+
+/**
+ * ion_import_dma_buf_fd() - given a dma-buf fd from the ion

exporter get handle
* @client: the client
* @fd: the dma-buf fd
*
- * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf,
- * import that fd and return a handle representing it. If a dma-buf from
+ * Given an dma-buf fd that was allocated through ion via ion_share_dma_buf_fd,
+ * import that fd and return a handle representing it. If a dma-buf from
* another exporter is passed in this function will return
ERR_PTR(-EINVAL) */
-struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd); +struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd);
#endif /* _LINUX_ION_H */