mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-14 16:46:15 -04:00
qcacmn: Use qdf_flex_mem for nbuf map metadata
nbuf map tracking requires a bit of metadata which is currently allocated dynamically for each mapping request. Change these allocations to use a qdf_flex_mem pool instead, amortizing each physical allocation over many mapping requests. This reduces the runtime overhead of the nbuf map tracking feature, and provides significant memory savings when MEMORY_DEBUG is also enabled. Change-Id: Ieef9b996edab135cc2e0252c3a59cb6876f36371 CRs-Fixed: 2232113
This commit is contained in:
parent
03a7ac6e19
commit
8c268a0f54
1 changed files with 13 additions and 6 deletions
|
|
@ -39,6 +39,7 @@
|
|||
#include <qdf_atomic.h>
|
||||
#include <qdf_types.h>
|
||||
#include <qdf_nbuf.h>
|
||||
#include "qdf_flex_mem.h"
|
||||
#include <qdf_mem.h>
|
||||
#include <qdf_status.h>
|
||||
#include <qdf_lock.h>
|
||||
|
|
@ -586,10 +587,6 @@ qdf_nbuf_history_add(qdf_nbuf_t nbuf, const char *file, uint32_t line,
|
|||
event->timestamp = qdf_get_log_timestamp();
|
||||
}
|
||||
|
||||
#define QDF_NBUF_MAP_HT_BITS 10 /* 1024 buckets */
|
||||
static DECLARE_HASHTABLE(qdf_nbuf_map_ht, QDF_NBUF_MAP_HT_BITS);
|
||||
static qdf_spinlock_t qdf_nbuf_map_lock;
|
||||
|
||||
struct qdf_nbuf_map_metadata {
|
||||
struct hlist_node node;
|
||||
qdf_nbuf_t nbuf;
|
||||
|
|
@ -597,8 +594,15 @@ struct qdf_nbuf_map_metadata {
|
|||
uint32_t line;
|
||||
};
|
||||
|
||||
DEFINE_QDF_FLEX_MEM_POOL(qdf_nbuf_map_pool,
|
||||
sizeof(struct qdf_nbuf_map_metadata), 0);
|
||||
#define QDF_NBUF_MAP_HT_BITS 10 /* 1024 buckets */
|
||||
static DECLARE_HASHTABLE(qdf_nbuf_map_ht, QDF_NBUF_MAP_HT_BITS);
|
||||
static qdf_spinlock_t qdf_nbuf_map_lock;
|
||||
|
||||
static void qdf_nbuf_map_tracking_init(void)
|
||||
{
|
||||
qdf_flex_mem_init(&qdf_nbuf_map_pool);
|
||||
hash_init(qdf_nbuf_map_ht);
|
||||
qdf_spinlock_create(&qdf_nbuf_map_lock);
|
||||
}
|
||||
|
|
@ -610,6 +614,8 @@ void qdf_nbuf_map_check_for_leaks(void)
|
|||
uint32_t count = 0;
|
||||
bool is_empty;
|
||||
|
||||
qdf_flex_mem_release(&qdf_nbuf_map_pool);
|
||||
|
||||
qdf_spin_lock_irqsave(&qdf_nbuf_map_lock);
|
||||
is_empty = hash_empty(qdf_nbuf_map_ht);
|
||||
qdf_spin_unlock_irqrestore(&qdf_nbuf_map_lock);
|
||||
|
|
@ -641,6 +647,7 @@ static void qdf_nbuf_map_tracking_deinit(void)
|
|||
{
|
||||
qdf_nbuf_map_check_for_leaks();
|
||||
qdf_spinlock_destroy(&qdf_nbuf_map_lock);
|
||||
qdf_flex_mem_deinit(&qdf_nbuf_map_pool);
|
||||
}
|
||||
|
||||
static struct qdf_nbuf_map_metadata *qdf_nbuf_meta_get(qdf_nbuf_t nbuf)
|
||||
|
|
@ -673,7 +680,7 @@ qdf_nbuf_track_map(qdf_nbuf_t nbuf, const char *file, uint32_t line)
|
|||
panic("Double nbuf map detected @ %s:%u",
|
||||
kbasename(file), line);
|
||||
|
||||
meta = qdf_mem_malloc(sizeof(*meta));
|
||||
meta = qdf_flex_mem_alloc(&qdf_nbuf_map_pool);
|
||||
if (!meta) {
|
||||
qdf_err("Failed to allocate nbuf map tracking metadata");
|
||||
return QDF_STATUS_E_NOMEM;
|
||||
|
|
@ -713,7 +720,7 @@ qdf_nbuf_untrack_map(qdf_nbuf_t nbuf, const char *file, uint32_t line)
|
|||
hash_del(&meta->node);
|
||||
qdf_spin_unlock_irqrestore(&qdf_nbuf_map_lock);
|
||||
|
||||
qdf_mem_free(meta);
|
||||
qdf_flex_mem_free(&qdf_nbuf_map_pool, meta);
|
||||
|
||||
qdf_nbuf_history_add(nbuf, file, line, QDF_NBUF_UNMAP);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue