From: Robin Murphy <robin.murphy@arm.com>
To: hch@lst.de
Cc: m.szyprowski@samsung.com, iommu@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, cai@gmx.us, salil.mehta@huawei.com,
john.garry@huawei.com
Subject: [PATCH v2 7/8] dma/debug: Remove dma_debug_resize_entries()
Date: Wed, 5 Dec 2018 19:56:56 +0000 [thread overview]
Message-ID: <229557ee9d279393473997caa825617b6d0b19e3.1544037783.git.robin.murphy@arm.com> (raw)
In-Reply-To: <cover.1544037783.git.robin.murphy@arm.com>
With no callers left, we can clean up this part of dma-debug's exposed
internals, making way to tweak the allocation behaviour.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
v2: New
include/linux/dma-debug.h | 7 -------
kernel/dma/debug.c | 30 ------------------------------
2 files changed, 37 deletions(-)
diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h
index 30213adbb6b9..46e6131a72b6 100644
--- a/include/linux/dma-debug.h
+++ b/include/linux/dma-debug.h
@@ -30,8 +30,6 @@ struct bus_type;
extern void dma_debug_add_bus(struct bus_type *bus);
-extern int dma_debug_resize_entries(u32 num_entries);
-
extern void debug_dma_map_single(struct device *dev, const void *addr,
unsigned long len);
@@ -101,11 +99,6 @@ static inline void dma_debug_add_bus(struct bus_type *bus)
{
}
-static inline int dma_debug_resize_entries(u32 num_entries)
-{
- return 0;
-}
-
static inline void debug_dma_map_single(struct device *dev, const void *addr,
unsigned long len)
{
diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
index cd9a12bf6a3a..2202402afe9a 100644
--- a/kernel/dma/debug.c
+++ b/kernel/dma/debug.c
@@ -756,36 +756,6 @@ static void dma_entry_free(struct dma_debug_entry *entry)
spin_unlock_irqrestore(&free_entries_lock, flags);
}
-int dma_debug_resize_entries(u32 num_entries)
-{
- int i, delta, ret = 0;
- unsigned long flags;
- struct dma_debug_entry *entry;
-
- spin_lock_irqsave(&free_entries_lock, flags);
-
- if (nr_total_entries < num_entries) {
- delta = num_entries - nr_total_entries;
-
- ret = dma_debug_add_entries(delta, GFP_ATOMIC);
- } else {
- delta = nr_total_entries - num_entries;
-
- for (i = 0; i < delta && !list_empty(&free_entries); i++) {
- entry = __dma_entry_alloc();
- kfree(entry);
- }
-
- nr_total_entries -= i;
- if (nr_total_entries != num_entries)
- ret = -EBUSY;
- }
-
- spin_unlock_irqrestore(&free_entries_lock, flags);
-
- return ret;
-}
-
/*
* DMA-API debugging init code
*
--
2.19.1.dirty
next prev parent reply other threads:[~2018-12-05 19:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-05 19:56 [PATCH v2 0/8] dma-debug cleanup and dynamic allocation Robin Murphy
2018-12-05 19:56 ` [PATCH v2 1/8] dma-debug: Use pr_fmt() Robin Murphy
2018-12-05 19:56 ` [PATCH v2 2/8] dma-debug: Expose nr_total_entries in debugfs Robin Murphy
2018-12-06 14:14 ` Christoph Hellwig
2018-12-05 19:56 ` [PATCH v2 3/8] dma-debug: Refactor dma_debug_entry allocation Robin Murphy
2018-12-06 14:23 ` Christoph Hellwig
2018-12-06 18:10 ` Robin Murphy
2018-12-06 18:46 ` Christoph Hellwig
2018-12-05 19:56 ` [PATCH v2 4/8] dma-debug: Dynamically expand the dma_debug_entry pool Robin Murphy
2018-12-06 14:24 ` Christoph Hellwig
2018-12-06 18:31 ` Robin Murphy
2018-12-05 19:56 ` [PATCH v2 5/8] dma-debug: Make leak-like behaviour apparent Robin Murphy
2018-12-06 14:24 ` Christoph Hellwig
2018-12-05 19:56 ` [PATCH v2 6/8] x86/dma/amd-gart: Stop resizing dma_debug_entry pool Robin Murphy
2018-12-06 14:25 ` Christoph Hellwig
2018-12-05 19:56 ` Robin Murphy [this message]
2018-12-06 14:25 ` [PATCH v2 7/8] dma/debug: Remove dma_debug_resize_entries() Christoph Hellwig
2018-12-05 19:56 ` [PATCH v2 8/8] dma-debug: Batch dma_debug_entry allocation Robin Murphy
2018-12-06 14:27 ` Christoph Hellwig
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=229557ee9d279393473997caa825617b6d0b19e3.1544037783.git.robin.murphy@arm.com \
--to=robin.murphy@arm.com \
--cc=cai@gmx.us \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=john.garry@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=salil.mehta@huawei.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).