From patchwork Thu Dec 15 00:07:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9475149 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 702C2607EE for ; Thu, 15 Dec 2016 00:08:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60F262866D for ; Thu, 15 Dec 2016 00:08:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54F2428740; Thu, 15 Dec 2016 00:08:37 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 468F62866D for ; Thu, 15 Dec 2016 00:08:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933061AbcLOAIM (ORCPT ); Wed, 14 Dec 2016 19:08:12 -0500 Received: from mail-qk0-f180.google.com ([209.85.220.180]:34258 "EHLO mail-qk0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754805AbcLOAIK (ORCPT ); Wed, 14 Dec 2016 19:08:10 -0500 Received: by mail-qk0-f180.google.com with SMTP id q130so39747267qke.1 for ; Wed, 14 Dec 2016 16:07:55 -0800 (PST) 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=GbnAauOF03AyFmqytkix1QiOEDdVU+M+IEjKh+Dygsk=; b=smtLLyU3aq3cPUsWCa6c2+0yISf8pUinhvGlnlOyEOpXUfJZhIaaMX8hUSsVnXTpS9 lgxulh7SnztK7xuHTIs9JAgrThaDfgDVjN2iRAo0joQhBQY96Wr+t1D8Owblhc+xLpXX qALd9Qh1PooUtceEvvzUoijMMFRDtKJlapEcIdmF8pPKzTAazVVwXrxW65+lTK9OUtf3 4dx3CJQifSKN1MGrUpULKZVaEetGF561Jz/mlePqS0Zy7FU3gJ6h26U4ctx9SHS7FEdG H3K9Y4PpX0pd98ZEe1na/O1O74z571ZUo74vdNj7p7fEsEgAnUPDlEy/nGn3yexvMs7L GsiQ== X-Gm-Message-State: AKaTC03aq+o0wJUHBqxO2KmrIVq4tJgX5/GVLDrrHZ4+gGv3JZ+fBCD3j0cbe6/yn6nEuMbc X-Received: by 10.55.6.12 with SMTP id 12mr87621431qkg.182.1481760474881; Wed, 14 Dec 2016 16:07:54 -0800 (PST) Received: from labbott-redhat-machine.redhat.com ([2601:602:9800:177f::df9b]) by smtp.gmail.com with ESMTPSA id 21sm32935830qkf.17.2016.12.14.16.07.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Dec 2016 16:07:53 -0800 (PST) From: Laura Abbott To: Sumit Semwal , Riley Andrews , arve@android.com Cc: Laura Abbott , romlem@google.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, Bryan Huntsman , pratikp@codeaurora.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, Brian Starkey Subject: [RFC PATCH 2/4] staging: android: ion: Duplicate sg_table Date: Wed, 14 Dec 2016 16:07:41 -0800 Message-Id: <1481760463-3515-3-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481760463-3515-1-git-send-email-labbott@redhat.com> References: <1481760463-3515-1-git-send-email-labbott@redhat.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.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. Not-signed-off-by: Laura Abbott --- drivers/staging/android/ion/ion.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 8dd0932..76b874a0 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -795,19 +795,49 @@ void ion_client_destroy(struct ion_client *client) } EXPORT_SYMBOL(ion_client_destroy); +static struct sg_table *dup_sg_table(struct sg_table *table) +{ + struct sg_table *new_table; + int ret, i; + struct scatterlisg *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(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) { struct dma_buf *dmabuf = attachment->dmabuf; struct ion_buffer *buffer = dmabuf->priv; + struct sg_table *table; - 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); } struct ion_vma_list {