From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Zhang, Jerry (Junwei)" Subject: Re: [PATCH 1/4] dma-buf: add dma_buf_(un)map_attachment_locked variants v2 Date: Thu, 28 Jun 2018 17:53:00 +0800 Message-ID: <5B34AFFC.6080805@amd.com> References: <20180622141103.1787-1-christian.koenig@amd.com> <20180622141103.1787-2-christian.koenig@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180622141103.1787-2-christian.koenig@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: =?UTF-8?B?Q2hyaXN0aWFuIEvDtm5pZw==?= , daniel@ffwll.ch, sumit.semwal@linaro.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gMDYvMjIvMjAxOCAxMDoxMSBQTSwgQ2hyaXN0aWFuIEvDtm5pZyB3cm90ZToKPiBBZGQgZnVu Y3Rpb24gdmFyaWFudHMgd2hpY2ggY2FuIGJlIGNhbGxlZCB3aXRoIHRoZSByZXNlcnZhdGlvbiBs b2NrCj4gYWxyZWFkeSBoZWxkLgo+Cj4gdjI6IHJlb3JkZXJlZCwgYWRkIGxvY2tkZXAgYXNzZXJ0 cywgZml4IGtlcm5lbGRvYwo+Cj4gU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hy aXN0aWFuLmtvZW5pZ0BhbWQuY29tPgo+IC0tLQo+ICAgZHJpdmVycy9kbWEtYnVmL2RtYS1idWYu YyB8IDU3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCj4g ICBpbmNsdWRlL2xpbnV4L2RtYS1idWYuaCAgIHwgIDUgKysrKysKPiAgIDIgZmlsZXMgY2hhbmdl ZCwgNjIgaW5zZXJ0aW9ucygrKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZG1hLWJ1Zi9kbWEt YnVmLmMgYi9kcml2ZXJzL2RtYS1idWYvZG1hLWJ1Zi5jCj4gaW5kZXggODUyYTM5MjhlZTcxLi5k Yzk0ZTc2ZTJlMmEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9kbWEtYnVmL2RtYS1idWYuYwo+ICsr KyBiL2RyaXZlcnMvZG1hLWJ1Zi9kbWEtYnVmLmMKPiBAQCAtNjA2LDYgKzYwNiw0MCBAQCB2b2lk IGRtYV9idWZfZGV0YWNoKHN0cnVjdCBkbWFfYnVmICpkbWFidWYsIHN0cnVjdCBkbWFfYnVmX2F0 dGFjaG1lbnQgKmF0dGFjaCkKPiAgIH0KPiAgIEVYUE9SVF9TWU1CT0xfR1BMKGRtYV9idWZfZGV0 YWNoKTsKPgo+ICsvKioKPiArICogZG1hX2J1Zl9tYXBfYXR0YWNobWVudF9sb2NrZWQgLSBNYXBz IHRoZSBidWZmZXIgaW50byBfZGV2aWNlXyBhZGRyZXNzIHNwYWNlCj4gKyAqIHdpdGggdGhlIHJl c2VydmF0aW9uIGxvY2sgaGVsZC4gSXMgYSB3cmFwcGVyIGZvciBtYXBfZG1hX2J1ZigpIG9mIHRo ZQo+ICsgKgo+ICsgKiBSZXR1cm5zIHRoZSBzY2F0dGVybGlzdCB0YWJsZSBvZiB0aGUgYXR0YWNo bWVudDsKPiArICogZG1hX2J1Zl9vcHMuCj4gKyAqIEBhdHRhY2g6CVtpbl0JYXR0YWNobWVudCB3 aG9zZSBzY2F0dGVybGlzdCBpcyB0byBiZSByZXR1cm5lZAo+ICsgKiBAZGlyZWN0aW9uOglbaW5d CWRpcmVjdGlvbiBvZiBETUEgdHJhbnNmZXIKPiArICoKPiArICogUmV0dXJucyBzZ190YWJsZSBj b250YWluaW5nIHRoZSBzY2F0dGVybGlzdCB0byBiZSByZXR1cm5lZDsgcmV0dXJucyBFUlJfUFRS Cj4gKyAqIG9uIGVycm9yLiBNYXkgcmV0dXJuIC1FSU5UUiBpZiBpdCBpcyBpbnRlcnJ1cHRlZCBi eSBhIHNpZ25hbC4KPiArICoKPiArICogQSBtYXBwaW5nIG11c3QgYmUgdW5tYXBwZWQgYnkgdXNp bmcgZG1hX2J1Zl91bm1hcF9hdHRhY2htZW50X2xvY2tlZCgpLiBOb3RlCj4gKyAqIHRoYXQgdGhl IHVuZGVybHlpbmcgYmFja2luZyBzdG9yYWdlIGlzIHBpbm5lZCBmb3IgYXMgbG9uZyBhcyBhIG1h cHBpbmcKPiArICogZXhpc3RzLCB0aGVyZWZvcmUgdXNlcnMvaW1wb3J0ZXJzIHNob3VsZCBub3Qg aG9sZCBvbnRvIGEgbWFwcGluZyBmb3IgdW5kdWUKPiArICogYW1vdW50cyBvZiB0aW1lLgo+ICsg Ki8KPiArc3RydWN0IHNnX3RhYmxlICoKPiArZG1hX2J1Zl9tYXBfYXR0YWNobWVudF9sb2NrZWQo c3RydWN0IGRtYV9idWZfYXR0YWNobWVudCAqYXR0YWNoLAo+ICsJCQkgICAgICBlbnVtIGRtYV9k YXRhX2RpcmVjdGlvbiBkaXJlY3Rpb24pCj4gK3sKPiArCXN0cnVjdCBzZ190YWJsZSAqc2dfdGFi bGU7Cj4gKwoKUGVyaGFwcyBiZXR0ZXIgdG8gYWRkIHNvbWUgZXJyb3IgY2hlY2ssIGxpa2UgZG1h X2J1Zl9tYXBfYXR0YWNobWVudCgpCgpXQVJOX09OKCFhdHRhY2ggfHwgIWF0dGFjaC0+ZG1hYnVm KQoKQXBhcnQgZnJvbSB0aGF0LCBpdCdzClJldmlld2VkLWJ5OiBKdW53ZWkgWmhhbmcgPEplcnJ5 LlpoYW5nQGFtZC5jb20+CgpKZXJyeQoKPiArCW1pZ2h0X3NsZWVwKCk7Cj4gKwlyZXNlcnZhdGlv bl9vYmplY3RfYXNzZXJ0X2hlbGQoYXR0YWNoLT5kbWFidWYtPnJlc3YpOwo+ICsKPiArCXNnX3Rh YmxlID0gYXR0YWNoLT5kbWFidWYtPm9wcy0+bWFwX2RtYV9idWYoYXR0YWNoLCBkaXJlY3Rpb24p Owo+ICsJaWYgKCFzZ190YWJsZSkKPiArCQlzZ190YWJsZSA9IEVSUl9QVFIoLUVOT01FTSk7Cj4g Kwo+ICsJcmV0dXJuIHNnX3RhYmxlOwo+ICt9Cj4gK0VYUE9SVF9TWU1CT0xfR1BMKGRtYV9idWZf bWFwX2F0dGFjaG1lbnRfbG9ja2VkKTsKPiArCj4gICAvKioKPiAgICAqIGRtYV9idWZfbWFwX2F0 dGFjaG1lbnQgLSBSZXR1cm5zIHRoZSBzY2F0dGVybGlzdCB0YWJsZSBvZiB0aGUgYXR0YWNobWVu dDsKPiAgICAqIG1hcHBlZCBpbnRvIF9kZXZpY2VfIGFkZHJlc3Mgc3BhY2UuIElzIGEgd3JhcHBl ciBmb3IgbWFwX2RtYV9idWYoKSBvZiB0aGUKPiBAQCAtNjM5LDYgKzY3MywyOSBAQCBzdHJ1Y3Qg c2dfdGFibGUgKmRtYV9idWZfbWFwX2F0dGFjaG1lbnQoc3RydWN0IGRtYV9idWZfYXR0YWNobWVu dCAqYXR0YWNoLAo+ICAgfQo+ICAgRVhQT1JUX1NZTUJPTF9HUEwoZG1hX2J1Zl9tYXBfYXR0YWNo bWVudCk7Cj4KPiArLyoqCj4gKyAqIGRtYV9idWZfdW5tYXBfYXR0YWNobWVudF9sb2NrZWQgLSB1 bm1hcHMgdGhlIGJ1ZmZlciB3aXRoIHJlc2VydmF0aW9uIGxvY2sKPiArICogaGVsZCwgc2hvdWxk IGRlYWxsb2NhdGUgdGhlIGFzc29jaWF0ZWQgc2NhdHRlcmxpc3QuIElzIGEgd3JhcHBlciBmb3IK PiArICogdW5tYXBfZG1hX2J1ZigpIG9mIGRtYV9idWZfb3BzLgo+ICsgKiBAYXR0YWNoOglbaW5d CWF0dGFjaG1lbnQgdG8gdW5tYXAgYnVmZmVyIGZyb20KPiArICogQHNnX3RhYmxlOglbaW5dCXNj YXR0ZXJsaXN0IGluZm8gb2YgdGhlIGJ1ZmZlciB0byB1bm1hcAo+ICsgKiBAZGlyZWN0aW9uOiAg W2luXSAgICBkaXJlY3Rpb24gb2YgRE1BIHRyYW5zZmVyCj4gKyAqCj4gKyAqIFRoaXMgdW5tYXBz IGEgRE1BIG1hcHBpbmcgZm9yIEBhdHRhY2hlZCBvYnRhaW5lZCBieQo+ICsgKiBkbWFfYnVmX21h cF9hdHRhY2htZW50X2xvY2tlZCgpLgo+ICsgKi8KPiArdm9pZCBkbWFfYnVmX3VubWFwX2F0dGFj aG1lbnRfbG9ja2VkKHN0cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQgKmF0dGFjaCwKPiArCQkJCSAg ICAgc3RydWN0IHNnX3RhYmxlICpzZ190YWJsZSwKPiArCQkJCSAgICAgZW51bSBkbWFfZGF0YV9k aXJlY3Rpb24gZGlyZWN0aW9uKQo+ICt7Cj4gKwltaWdodF9zbGVlcCgpOwo+ICsJcmVzZXJ2YXRp b25fb2JqZWN0X2Fzc2VydF9oZWxkKGF0dGFjaC0+ZG1hYnVmLT5yZXN2KTsKPiArCj4gKwlhdHRh Y2gtPmRtYWJ1Zi0+b3BzLT51bm1hcF9kbWFfYnVmKGF0dGFjaCwgc2dfdGFibGUsCj4gKwkJCQkJ CWRpcmVjdGlvbik7Cj4gK30KPiArRVhQT1JUX1NZTUJPTF9HUEwoZG1hX2J1Zl91bm1hcF9hdHRh Y2htZW50X2xvY2tlZCk7Cj4gKwo+ICAgLyoqCj4gICAgKiBkbWFfYnVmX3VubWFwX2F0dGFjaG1l bnQgLSB1bm1hcHMgYW5kIGRlY3JlYXNlcyB1c2Vjb3VudCBvZiB0aGUgYnVmZmVyO21pZ2h0Cj4g ICAgKiBkZWFsbG9jYXRlIHRoZSBzY2F0dGVybGlzdCBhc3NvY2lhdGVkLiBJcyBhIHdyYXBwZXIg Zm9yIHVubWFwX2RtYV9idWYoKSBvZgo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L2RtYS1i dWYuaCBiL2luY2x1ZGUvbGludXgvZG1hLWJ1Zi5oCj4gaW5kZXggOTkxNzg3YTAzMTk5Li5hMjVl NzU0YWUyZjcgMTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9saW51eC9kbWEtYnVmLmgKPiArKysgYi9p bmNsdWRlL2xpbnV4L2RtYS1idWYuaAo+IEBAIC0zODQsOCArMzg0LDEzIEBAIGludCBkbWFfYnVm X2ZkKHN0cnVjdCBkbWFfYnVmICpkbWFidWYsIGludCBmbGFncyk7Cj4gICBzdHJ1Y3QgZG1hX2J1 ZiAqZG1hX2J1Zl9nZXQoaW50IGZkKTsKPiAgIHZvaWQgZG1hX2J1Zl9wdXQoc3RydWN0IGRtYV9i dWYgKmRtYWJ1Zik7Cj4KPiArc3RydWN0IHNnX3RhYmxlICpkbWFfYnVmX21hcF9hdHRhY2htZW50 X2xvY2tlZChzdHJ1Y3QgZG1hX2J1Zl9hdHRhY2htZW50ICosCj4gKwkJCQkJICAgICAgIGVudW0g ZG1hX2RhdGFfZGlyZWN0aW9uKTsKPiAgIHN0cnVjdCBzZ190YWJsZSAqZG1hX2J1Zl9tYXBfYXR0 YWNobWVudChzdHJ1Y3QgZG1hX2J1Zl9hdHRhY2htZW50ICosCj4gICAJCQkJCWVudW0gZG1hX2Rh dGFfZGlyZWN0aW9uKTsKPiArdm9pZCBkbWFfYnVmX3VubWFwX2F0dGFjaG1lbnRfbG9ja2VkKHN0 cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQgKiwKPiArCQkJCSAgICAgc3RydWN0IHNnX3RhYmxlICos Cj4gKwkJCQkgICAgIGVudW0gZG1hX2RhdGFfZGlyZWN0aW9uKTsKPiAgIHZvaWQgZG1hX2J1Zl91 bm1hcF9hdHRhY2htZW50KHN0cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQgKiwgc3RydWN0IHNnX3Rh YmxlICosCj4gICAJCQkJZW51bSBkbWFfZGF0YV9kaXJlY3Rpb24pOwo+ICAgaW50IGRtYV9idWZf YmVnaW5fY3B1X2FjY2VzcyhzdHJ1Y3QgZG1hX2J1ZiAqZG1hX2J1ZiwKPgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-by2nam03on0058.outbound.protection.outlook.com ([104.47.42.58]:51424 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932809AbeF1JxG (ORCPT ); Thu, 28 Jun 2018 05:53:06 -0400 Message-ID: <5B34AFFC.6080805@amd.com> Date: Thu, 28 Jun 2018 17:53:00 +0800 From: "Zhang, Jerry (Junwei)" MIME-Version: 1.0 To: =?UTF-8?B?Q2hyaXN0aWFuIEvDtm5pZw==?= , , , , , , Subject: Re: [PATCH 1/4] dma-buf: add dma_buf_(un)map_attachment_locked variants v2 References: <20180622141103.1787-1-christian.koenig@amd.com> <20180622141103.1787-2-christian.koenig@amd.com> In-Reply-To: <20180622141103.1787-2-christian.koenig@amd.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org List-ID: On 06/22/2018 10:11 PM, Christian König wrote: > Add function variants which can be called with the reservation lock > already held. > > v2: reordered, add lockdep asserts, fix kerneldoc > > Signed-off-by: Christian König > --- > drivers/dma-buf/dma-buf.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/dma-buf.h | 5 +++++ > 2 files changed, 62 insertions(+) > > diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c > index 852a3928ee71..dc94e76e2e2a 100644 > --- a/drivers/dma-buf/dma-buf.c > +++ b/drivers/dma-buf/dma-buf.c > @@ -606,6 +606,40 @@ void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *attach) > } > EXPORT_SYMBOL_GPL(dma_buf_detach); > > +/** > + * dma_buf_map_attachment_locked - Maps the buffer into _device_ address space > + * with the reservation lock held. Is a wrapper for map_dma_buf() of the > + * > + * Returns the scatterlist table of the attachment; > + * dma_buf_ops. > + * @attach: [in] attachment whose scatterlist is to be returned > + * @direction: [in] direction of DMA transfer > + * > + * Returns sg_table containing the scatterlist to be returned; returns ERR_PTR > + * on error. May return -EINTR if it is interrupted by a signal. > + * > + * A mapping must be unmapped by using dma_buf_unmap_attachment_locked(). Note > + * that the underlying backing storage is pinned for as long as a mapping > + * exists, therefore users/importers should not hold onto a mapping for undue > + * amounts of time. > + */ > +struct sg_table * > +dma_buf_map_attachment_locked(struct dma_buf_attachment *attach, > + enum dma_data_direction direction) > +{ > + struct sg_table *sg_table; > + Perhaps better to add some error check, like dma_buf_map_attachment() WARN_ON(!attach || !attach->dmabuf) Apart from that, it's Reviewed-by: Junwei Zhang Jerry > + might_sleep(); > + reservation_object_assert_held(attach->dmabuf->resv); > + > + sg_table = attach->dmabuf->ops->map_dma_buf(attach, direction); > + if (!sg_table) > + sg_table = ERR_PTR(-ENOMEM); > + > + return sg_table; > +} > +EXPORT_SYMBOL_GPL(dma_buf_map_attachment_locked); > + > /** > * dma_buf_map_attachment - Returns the scatterlist table of the attachment; > * mapped into _device_ address space. Is a wrapper for map_dma_buf() of the > @@ -639,6 +673,29 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach, > } > EXPORT_SYMBOL_GPL(dma_buf_map_attachment); > > +/** > + * dma_buf_unmap_attachment_locked - unmaps the buffer with reservation lock > + * held, should deallocate the associated scatterlist. Is a wrapper for > + * unmap_dma_buf() of dma_buf_ops. > + * @attach: [in] attachment to unmap buffer from > + * @sg_table: [in] scatterlist info of the buffer to unmap > + * @direction: [in] direction of DMA transfer > + * > + * This unmaps a DMA mapping for @attached obtained by > + * dma_buf_map_attachment_locked(). > + */ > +void dma_buf_unmap_attachment_locked(struct dma_buf_attachment *attach, > + struct sg_table *sg_table, > + enum dma_data_direction direction) > +{ > + might_sleep(); > + reservation_object_assert_held(attach->dmabuf->resv); > + > + attach->dmabuf->ops->unmap_dma_buf(attach, sg_table, > + direction); > +} > +EXPORT_SYMBOL_GPL(dma_buf_unmap_attachment_locked); > + > /** > * dma_buf_unmap_attachment - unmaps and decreases usecount of the buffer;might > * deallocate the scatterlist associated. Is a wrapper for unmap_dma_buf() of > diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h > index 991787a03199..a25e754ae2f7 100644 > --- a/include/linux/dma-buf.h > +++ b/include/linux/dma-buf.h > @@ -384,8 +384,13 @@ int dma_buf_fd(struct dma_buf *dmabuf, int flags); > struct dma_buf *dma_buf_get(int fd); > void dma_buf_put(struct dma_buf *dmabuf); > > +struct sg_table *dma_buf_map_attachment_locked(struct dma_buf_attachment *, > + enum dma_data_direction); > struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *, > enum dma_data_direction); > +void dma_buf_unmap_attachment_locked(struct dma_buf_attachment *, > + struct sg_table *, > + enum dma_data_direction); > void dma_buf_unmap_attachment(struct dma_buf_attachment *, struct sg_table *, > enum dma_data_direction); > int dma_buf_begin_cpu_access(struct dma_buf *dma_buf, >