From patchwork Sat Mar 18 00:54:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9631837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EE8D960249 for ; Sat, 18 Mar 2017 00:56:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E108A283FB for ; Sat, 18 Mar 2017 00:56:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D55BE284A5; Sat, 18 Mar 2017 00:56:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 69067283FB for ; Sat, 18 Mar 2017 00:56:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=qS7eex2WO+A/VAFIhg09y+eXdts3xkeeydZx8fcyd74=; b=RChQGtPIZ8lg4RhJQzQ+lPgOuu cAcCyHJiQlBlZaR/xwFThKANWepYGc6C8frqTTs5TV0CjHVFamBOHEfVI0snjBflgsMQuU/f/gZ2T QcDQ9iQ/nBM9D8Uq/0hyURT+KwWrB3y3R/IirviI011xy3KQby7Gznpx1sqacuhmCUSX0g+hnanot hAcX6Ts+dp4E9p+PuQa+44rMjzDCDHxPPD6s5wUw9he8mJY1KazPAUz+X+4HnK7+kKdhyq83RLJFX 1Y+e4QQgJa7vZOUXUfccMh7DI2ITPmLWDOZzvLFbh6r0Mw3klXuvNfi4NyXWQLYOuxriNdEIPkBqh 2ctGP4Dw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cp2fi-0004hh-6G; Sat, 18 Mar 2017 00:56:42 +0000 Received: from mail-qt0-f175.google.com ([209.85.216.175]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cp2eg-0003QB-Ki for linux-arm-kernel@lists.infradead.org; Sat, 18 Mar 2017 00:55:42 +0000 Received: by mail-qt0-f175.google.com with SMTP id n21so75239785qta.1 for ; Fri, 17 Mar 2017 17:55:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dLiB7q2yhRy4difv2YB/02v4aQ5KWQA1v0xWLOhkRfI=; b=fQl7iwlrIZlp3VK1SHC6k7yPWuzd3AZ3QczIdSFRVefzVpHx/NzF3B0bb/2EU6yrtH M6ykkcFY7/Ta6o4wHquVrjMheIxlaji11iYd2+ub9VvmfHGzBewSj5MckUYqeypXe+hn ifEuSu3mxpi5VW8hZXE2g3BYrJaeLVl+A5pV4kHY8O+84PLg6YWeyqEXyVoqeeQanGLU YnK4PUpqdpdKdKxGhQ3AYjfiowR+5KfKbp4Y91X+M3ZpFXv+NslucGIS9Ban3ExdKjTh Wp7nx0OdKAy6/fOR7P8cz9W5rl2c2UJNXJj9mDloZgvFSi60HuduWpui7Q687SRGrXKK N9UA== X-Gm-Message-State: AFeK/H19j9liCaNz/I4SusOGPxy1NJ+6AHQ41S18CXnnsLFW8nKWJIF18Lq4zQhnmv9M1sNr X-Received: by 10.200.48.54 with SMTP id f51mr16193131qte.164.1489798516305; Fri, 17 Mar 2017 17:55:16 -0700 (PDT) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc:1722:8a6b:a66c:79eb]) by smtp.gmail.com with ESMTPSA id e55sm7118568qte.52.2017.03.17.17.55.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2017 17:55:15 -0700 (PDT) From: Laura Abbott To: Sumit Semwal , Riley Andrews , arve@android.com Subject: [RFC PATCHv2 05/21] staging: android: ion: Duplicate sg_table Date: Fri, 17 Mar 2017 17:54:37 -0700 Message-Id: <1489798493-16600-6-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489798493-16600-1-git-send-email-labbott@redhat.com> References: <1489798493-16600-1-git-send-email-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170317_175538_811140_1864B29F X-CRM114-Status: GOOD ( 11.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, romlem@google.com, Greg Kroah-Hartman , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, Mark Brown , Laurent Pinchart , Benjamin Gaignard , Daniel Vetter , Laura Abbott , Brian Starkey , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Ion currently returns a single sg_table on each dma_map call. This is incorrect for later usage. Signed-off-by: Laura Abbott --- drivers/staging/android/ion/ion.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index c2adfe1..7dcb8a9 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -800,6 +800,32 @@ static void ion_buffer_sync_for_device(struct ion_buffer *buffer, struct device *dev, enum dma_data_direction direction); +static struct sg_table *dup_sg_table(struct sg_table *table) +{ + struct sg_table *new_table; + int ret, i; + struct scatterlist *sg, *new_sg; + + new_table = kzalloc(sizeof(*new_table), GFP_KERNEL); + if (!new_table) + return ERR_PTR(-ENOMEM); + + ret = sg_alloc_table(new_table, table->nents, GFP_KERNEL); + if (ret) { + kfree(new_table); + return ERR_PTR(-ENOMEM); + } + + new_sg = new_table->sgl; + for_each_sg(table->sgl, sg, table->nents, i) { + memcpy(new_sg, sg, sizeof(*sg)); + sg->dma_address = 0; + new_sg = sg_next(new_sg); + } + + return new_table; +} + static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment *attachment, enum dma_data_direction direction) { @@ -807,13 +833,15 @@ static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment *attachment, struct ion_buffer *buffer = dmabuf->priv; ion_buffer_sync_for_device(buffer, attachment->dev, direction); - return buffer->sg_table; + return dup_sg_table(buffer->sg_table); } static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, struct sg_table *table, enum dma_data_direction direction) { + sg_free_table(table); + kfree(table); } void ion_pages_sync_for_device(struct device *dev, struct page *page,