From: Gerd Hoffmann <kraxel@redhat.com> To: dri-devel@lists.freedesktop.org Cc: laurent.pinchart@ideasonboard.com, Gerd Hoffmann <kraxel@redhat.com>, Sumit Semwal <sumit.semwal@linaro.org>, linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 02/10] udmabuf: improve map_udmabuf error handling Date: Tue, 11 Sep 2018 08:59:13 +0200 [thread overview] Message-ID: <20180911065921.23818-3-kraxel@redhat.com> (raw) In-Reply-To: <20180911065921.23818-1-kraxel@redhat.com> Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- drivers/dma-buf/udmabuf.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index e63d301bcb..19bd918209 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -51,25 +51,24 @@ static struct sg_table *map_udmabuf(struct dma_buf_attachment *at, { struct udmabuf *ubuf = at->dmabuf->priv; struct sg_table *sg; + int ret; sg = kzalloc(sizeof(*sg), GFP_KERNEL); if (!sg) - goto err1; - if (sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->pagecount, - 0, ubuf->pagecount << PAGE_SHIFT, - GFP_KERNEL) < 0) - goto err2; + return ERR_PTR(-ENOMEM); + ret = sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->pagecount, + 0, ubuf->pagecount << PAGE_SHIFT, + GFP_KERNEL); + if (ret < 0) + goto err; if (!dma_map_sg(at->dev, sg->sgl, sg->nents, direction)) - goto err3; - + goto err; return sg; -err3: +err: sg_free_table(sg); -err2: kfree(sg); -err1: - return ERR_PTR(-ENOMEM); + return ERR_PTR(ret); } static void unmap_udmabuf(struct dma_buf_attachment *at, -- 2.9.3
WARNING: multiple messages have this Message-ID (diff)
From: Gerd Hoffmann <kraxel@redhat.com> To: dri-devel@lists.freedesktop.org Cc: Gerd Hoffmann <kraxel@redhat.com>, open list <linux-kernel@vger.kernel.org>, "moderated list:DMA BUFFER SHARING FRAMEWORK" <linaro-mm-sig@lists.linaro.org>, laurent.pinchart@ideasonboard.com, "open list:DMA BUFFER SHARING FRAMEWORK" <linux-media@vger.kernel.org> Subject: [PATCH 02/10] udmabuf: improve map_udmabuf error handling Date: Tue, 11 Sep 2018 08:59:13 +0200 [thread overview] Message-ID: <20180911065921.23818-3-kraxel@redhat.com> (raw) In-Reply-To: <20180911065921.23818-1-kraxel@redhat.com> Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- drivers/dma-buf/udmabuf.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index e63d301bcb..19bd918209 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -51,25 +51,24 @@ static struct sg_table *map_udmabuf(struct dma_buf_attachment *at, { struct udmabuf *ubuf = at->dmabuf->priv; struct sg_table *sg; + int ret; sg = kzalloc(sizeof(*sg), GFP_KERNEL); if (!sg) - goto err1; - if (sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->pagecount, - 0, ubuf->pagecount << PAGE_SHIFT, - GFP_KERNEL) < 0) - goto err2; + return ERR_PTR(-ENOMEM); + ret = sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->pagecount, + 0, ubuf->pagecount << PAGE_SHIFT, + GFP_KERNEL); + if (ret < 0) + goto err; if (!dma_map_sg(at->dev, sg->sgl, sg->nents, direction)) - goto err3; - + goto err; return sg; -err3: +err: sg_free_table(sg); -err2: kfree(sg); -err1: - return ERR_PTR(-ENOMEM); + return ERR_PTR(ret); } static void unmap_udmabuf(struct dma_buf_attachment *at, -- 2.9.3 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-09-11 7:00 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-11 6:59 [PATCH 00/10] udmabuf: misc fixes Gerd Hoffmann 2018-09-11 6:59 ` [PATCH 01/10] udmabuf: sort headers, drop uapi/ path prefix Gerd Hoffmann 2018-09-11 6:59 ` Gerd Hoffmann 2018-09-11 9:35 ` Laurent Pinchart 2018-09-11 9:35 ` Laurent Pinchart 2018-09-11 9:35 ` Laurent Pinchart 2018-09-11 6:59 ` Gerd Hoffmann [this message] 2018-09-11 6:59 ` [PATCH 02/10] udmabuf: improve map_udmabuf error handling Gerd Hoffmann 2018-09-11 9:37 ` Laurent Pinchart 2018-09-11 9:37 ` Laurent Pinchart 2018-09-11 9:37 ` Laurent Pinchart 2018-09-11 6:59 ` [PATCH 03/10] udmabuf: use pgoff_t for pagecount Gerd Hoffmann 2018-09-11 6:59 ` Gerd Hoffmann 2018-09-11 7:38 ` Daniel Vetter 2018-09-11 7:38 ` Daniel Vetter 2018-09-11 6:59 ` [PATCH 04/10] udmabuf: constify udmabuf_ops Gerd Hoffmann 2018-09-11 6:59 ` Gerd Hoffmann 2018-09-11 9:38 ` Laurent Pinchart 2018-09-11 9:38 ` Laurent Pinchart 2018-09-11 6:59 ` [PATCH 05/10] udmabuf: constify udmabuf_create args Gerd Hoffmann 2018-09-11 6:59 ` Gerd Hoffmann 2018-09-11 9:39 ` Laurent Pinchart 2018-09-11 9:39 ` Laurent Pinchart 2018-09-11 6:59 ` [PATCH 06/10] udmabuf: add MEMFD_CREATE dependency Gerd Hoffmann 2018-09-11 6:59 ` Gerd Hoffmann 2018-09-11 9:40 ` Laurent Pinchart 2018-09-11 9:40 ` Laurent Pinchart 2018-09-11 6:59 ` [PATCH 07/10] udmabuf: rework limits Gerd Hoffmann 2018-09-11 6:59 ` Gerd Hoffmann 2018-09-11 9:41 ` Laurent Pinchart 2018-09-11 9:41 ` Laurent Pinchart 2018-09-11 9:41 ` Laurent Pinchart 2018-09-11 6:59 ` [PATCH 08/10] udmabuf: improve udmabuf_create error handling Gerd Hoffmann 2018-09-11 6:59 ` Gerd Hoffmann 2018-09-11 9:42 ` Laurent Pinchart 2018-09-11 9:42 ` Laurent Pinchart 2018-09-11 6:59 ` [PATCH 09/10] udmabuf: use EBADFD in case we didn't got a memfd Gerd Hoffmann 2018-09-11 6:59 ` Gerd Hoffmann 2018-09-11 6:59 ` [PATCH 10/10] udmabuf: use ENOTTY for invalid ioctls Gerd Hoffmann 2018-09-11 6:59 ` Gerd Hoffmann 2018-09-11 9:43 ` Laurent Pinchart 2018-09-11 9:43 ` Laurent Pinchart 2018-09-11 9:43 ` Laurent Pinchart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180911065921.23818-3-kraxel@redhat.com \ --to=kraxel@redhat.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linaro-mm-sig@lists.linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=sumit.semwal@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.