From: Todd Poynor <toddpoynor@gmail.com>
To: Rob Springer <rspringer@google.com>,
Ben Chan <benchan@chromium.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Nick Ewalt <nicholasewalt@google.com>,
Todd Poynor <toddpoynor@google.com>
Subject: [PATCH 07/10] staging: gasket: fix gasket_free_coherent_memory metadata frees
Date: Mon, 17 Sep 2018 05:39:02 -0700 [thread overview]
Message-ID: <20180917123905.213639-8-toddpoynor@gmail.com> (raw)
In-Reply-To: <20180917123905.213639-1-toddpoynor@gmail.com>
From: Nick Ewalt <nicholasewalt@google.com>
Free gasket_coherent_page_entries metadata memory, update data
structures accordingly.
Signed-off-by: Nick Ewalt <nicholasewalt@google.com>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
---
drivers/staging/gasket/gasket_page_table.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c
index 33d98043953a5..c1ce8f984f8e0 100644
--- a/drivers/staging/gasket/gasket_page_table.c
+++ b/drivers/staging/gasket/gasket_page_table.c
@@ -1353,6 +1353,11 @@ int gasket_free_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
gasket_dev->coherent_buffer.virt_base = NULL;
gasket_dev->coherent_buffer.phys_base = 0;
}
+
+ kfree(gasket_dev->page_table[index]->coherent_pages);
+ gasket_dev->page_table[index]->coherent_pages = NULL;
+ gasket_dev->page_table[index]->num_coherent_pages = 0;
+
return 0;
}
--
2.19.0.397.gdd90340f6a-goog
next prev parent reply other threads:[~2018-09-17 12:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-17 12:38 [PATCH 00/10] staging: gasket: Apex uncloaks, plus fixes Todd Poynor
2018-09-17 12:38 ` [PATCH 01/10] staging: gasket: Kconfig: describe Apex as an Edge TPU device Todd Poynor
2018-09-17 12:38 ` [PATCH 02/10] staging: gasket: interrupt: remove PCI-MSIX-specific status check Todd Poynor
2018-09-17 12:38 ` [PATCH 03/10] staging: gasket: page table: use GFP_KERNEL for dma_alloc_coherent Todd Poynor
2018-09-17 12:38 ` [PATCH 04/10] staging: gasket: fix DMA direction for extended page tables Todd Poynor
2018-09-17 12:39 ` [PATCH 05/10] staging: gasket: fix data page unmap DMA direction Todd Poynor
2018-09-17 12:39 ` [PATCH 06/10] staging: gasket: page_table: don't unmap coherent pages Todd Poynor
2018-09-17 12:39 ` Todd Poynor [this message]
2018-09-17 12:39 ` [PATCH 08/10] staging: gasket: cleanup if dma_map_page fails in gasket_perform_mapping Todd Poynor
2018-09-17 12:39 ` [PATCH 09/10] staging: gasket: page_table: use total_entries for max ext lvl0 page idx Todd Poynor
2018-09-17 12:39 ` [PATCH 10/10] staging: gasket: page_table: handle failed dma_map_page Todd Poynor
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=20180917123905.213639-8-toddpoynor@gmail.com \
--to=toddpoynor@gmail.com \
--cc=benchan@chromium.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicholasewalt@google.com \
--cc=rspringer@google.com \
--cc=toddpoynor@google.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).