From patchwork Mon Apr 3 18:57:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9660463 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 B89C96032D for ; Mon, 3 Apr 2017 19:44:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7F86284D9 for ; Mon, 3 Apr 2017 19:44:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B208284EE; Mon, 3 Apr 2017 19:44:06 +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 3CF83284D9 for ; Mon, 3 Apr 2017 19:44:06 +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=1ESEwwnOa8OBFvpFvQRPCromLAmYBcfGFXUkQVqE4cU=; b=M0BLuFx/piUSSfvoWF/DwNNjGD zBuxthc81+7kZPhuBIFggvUHcPszhzz17EYRfWNGYNB4p6pxWUuSsqfuwLdLJysDqlrqM+IHChvjO uXLe3rv7ykiqhrJEUJfUlyJKsjEYhYKdvE27qEv5LofVj3oGFtC2R997SO2i3Gi7y9zRdzjUppCLE u6Z74CEa2Wt/j6F8Z1DhQul4j3261HAGj5mHcCcnnZ9HhZjJgcUVJvNiEfUB2jNinBupPA29V581A rCE1sc7luCOBeWmonkubwkghpt+UEa+1fIz3TdVWwzfgLZi2w84ag1A4kjB7EE7qGSMDHofc1jIgn x+ECbCTA==; 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 1cv7tV-0005Wg-Pi; Mon, 03 Apr 2017 19:44:05 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cv7tT-0005WJ-5v for linux-arm-kernel@bombadil.infradead.org; Mon, 03 Apr 2017 19:44:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=sG85jRNubKlCdSPRPHT4FBNHeU+CooShFt2cv/1vzzc=; b=VDJpJRfjZiZkVNpcHCGSRxFKz Dn4btobb98IQNbIdlNWxoBAAx5BgXUvLgYSmMYUrXdmE5tFq5l/aeBORx1nTbE7tBzI38yVrXwXXJ F8Hi5sChonLBprzBuIfAzq/J2II0B1kVftSoJ/Uevo/ACp5oVVL5wemcXrk59Ti3hwOjdGowmnkp1 GCoqiCe4Fm7xTyqvb59uZedUVNPwd0KtnE/MbZZNTPHAMP2wTjuXZQm6dicGBBGFupuXchL6kRADV Hg4C053WE7S115NvrKOHNG5UhhZF5qVJT5ZbJBxN7wn8gm5np3nfqv6BUWMY0VvJXeWbuv24+lp4v pW5vvCT7g==; Received: from mail-qk0-f169.google.com ([209.85.220.169]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cv7Bh-0006ah-Lk for linux-arm-kernel@lists.infradead.org; Mon, 03 Apr 2017 18:58:50 +0000 Received: by mail-qk0-f169.google.com with SMTP id d10so123465636qke.1 for ; Mon, 03 Apr 2017 11:58:27 -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=sG85jRNubKlCdSPRPHT4FBNHeU+CooShFt2cv/1vzzc=; b=axm6z4ta6v7rFPezWF6+EZt8rlSi0jqHyZHTfwOyiVuaEU+78ow3w9e5/Ky0/2E+4P 3T1FLmc3YCXbpTOhdf0BhjJC7x44Y3Z2z+fjr1UMcXL8S9N6zeTH4xo4vrySGb5cnnfY ELGs2dFSvzQU7myoLyjj+pDyBry7wz3v5kGwPwnRi2NkVwqJd/TsxoX7RN81OMiQbbJp VEdGSqT/63oo1qZMz6oYBGdoluyLgsgat6VUU1GmaldhEuTypqJk70EUxAOk6hD3CGxp BK2tjOSCz5BQzHG81Eg0s/uugJETH44D9iVsOexTSISqdxs/978VTyseFlJO3Vo4tCCM qnNA== X-Gm-Message-State: AFeK/H1+xA2YhPuNIo691Eu/oJ5z4eVR7lXrsrspuig3NPLN9m+uPrgNNHD4ExdPhDuH4qWF X-Received: by 10.55.92.3 with SMTP id q3mr17796670qkb.164.1491245906658; Mon, 03 Apr 2017 11:58:26 -0700 (PDT) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc:1722:8a6b:a66c:79eb]) by smtp.gmail.com with ESMTPSA id e5sm10173689qtc.6.2017.04.03.11.58.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 11:58:25 -0700 (PDT) From: Laura Abbott To: Sumit Semwal , Riley Andrews , arve@android.com Subject: [PATCHv3 05/22] staging: android: ion: Duplicate sg_table Date: Mon, 3 Apr 2017 11:57:47 -0700 Message-Id: <1491245884-15852-6-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491245884-15852-1-git-send-email-labbott@redhat.com> References: <1491245884-15852-1-git-send-email-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170403_145849_754086_64A7F74C X-CRM114-Status: GOOD ( 12.04 ) 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,