From patchwork Thu Mar 2 21:44:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9601647 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 2A15F60453 for ; Thu, 2 Mar 2017 21:46:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 176E0285EF for ; Thu, 2 Mar 2017 21:46:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A8FA285FB; Thu, 2 Mar 2017 21:46:51 +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 ADBF3285EF for ; Thu, 2 Mar 2017 21:46: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=E9tnntugUhT1e4bCR/HH5tragvhAkMspeZ3dFfRhUj8=; b=aao/FK8MZghFZF9ytfEn4Cw25R cAy9sDQk1fLb4Cmn3IX22whB2EwtDNpC3UI1wgyeb9pFv1nj7v6BNQB2CUya4xe8BfgfT6Uzr7pnF 6IqsK0itHsYEh+FR72VXxH+3t9ZTGESpfyZpuaaQHf43Ln5DAMMpC44NuvKXNzDJBloSeCYIL0RCS 78SYwCW+zO5Hyyz6NrvvhUWV2P05ZVsE5qD2iSi93N0oFPkGCDyWjb5iwIBdPQf1Ofnb4eeL5xRDg PrEkfCmT1SrznClnWfjcrtuEWMKUoqEN5F5tZV5eLRkQ6Vs2RSapTD4Umvz6shXeiVuqAY7jIye9W UmmcSq2w==; 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 1cjYYh-0000T2-MA; Thu, 02 Mar 2017 21:46:47 +0000 Received: from mail-qk0-f172.google.com ([209.85.220.172]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cjYXJ-0006O7-1F for linux-arm-kernel@lists.infradead.org; Thu, 02 Mar 2017 21:45:23 +0000 Received: by mail-qk0-f172.google.com with SMTP id 1so27779289qkl.3 for ; Thu, 02 Mar 2017 13:45:00 -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=glc3SGOtpkpmSE6tHxOBYHibd9UhIwXQuLCPkd6+hJo=; b=OE6mbM9CFjwDdKiGASoVvrDxofplO4YVApFPaMfMUghOaY6MRHKSE/OyvnPGq1HbCf 1xxI2WBYpZxpTLACNZ1wWN/I0NHG7Up3/CDnl/j6TtKG+8WYWBKVMMW10tFcKs9u1JvI k0WQep3mFFjIbZAourWAHZQreR6vpMVs+jt00djyJ7tksq5xwg4gKSX3ziCmQ2Y7t3aB 06tGswOLEQa95GAYCyRs13uAphCu8Ziw17sXDYY88AeCzapj72B2j10jLD53D2rI4GJI axzdccTykU/VMFKCFdyZkYLxv5jFuKwRa1nOmcBSVtsnvXl+7BwbXyRDWvd4nZk2jS4A 118A== X-Gm-Message-State: AMke39lZlxV34hJK1Dm4ajHGdzAmXMJwXZ/qvRdkmbk2Ymxc4LsV+yAcfUPmSI5yt2KcXIKf X-Received: by 10.55.7.7 with SMTP id 7mr17780180qkh.228.1488491099878; Thu, 02 Mar 2017 13:44:59 -0800 (PST) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc::5ce7]) by smtp.gmail.com with ESMTPSA id r10sm6261671qte.1.2017.03.02.13.44.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Mar 2017 13:44:58 -0800 (PST) From: Laura Abbott To: Sumit Semwal , Riley Andrews , arve@android.com Subject: [RFC PATCH 03/12] staging: android: ion: Duplicate sg_table Date: Thu, 2 Mar 2017 13:44:35 -0800 Message-Id: <1488491084-17252-4-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488491084-17252-1-git-send-email-labbott@redhat.com> References: <1488491084-17252-1-git-send-email-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170302_134521_174426_26D8D58F X-CRM114-Status: GOOD ( 11.08 ) 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 , 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 94a498e..ce4adac 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -799,6 +799,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(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) { @@ -806,13 +832,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,