From ddaf29fd9bb6a8192153bc097615765d202b0ab3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 20 May 2019 11:26:43 +0200 Subject: [PATCH] firmware: Free temporary page table after vmapping Once after performing vmap() to map the S/G pages, our own page table becomes superfluous since the pages can be released via vfree() automatically. Let's change the buffer release code and discard the page table array for saving some memory. Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- drivers/base/firmware_loader/fallback.c | 7 ++++++- drivers/base/firmware_loader/main.c | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c index f962488546b6..a0a1856aac84 100644 --- a/drivers/base/firmware_loader/fallback.c +++ b/drivers/base/firmware_loader/fallback.c @@ -222,7 +222,7 @@ static ssize_t firmware_loading_show(struct device *dev, /* one pages buffer should be mapped/unmapped only once */ static int map_fw_priv_pages(struct fw_priv *fw_priv) { - if (!fw_priv->is_paged_buf) + if (!fw_priv->pages) return 0; vunmap(fw_priv->data); @@ -230,6 +230,11 @@ static int map_fw_priv_pages(struct fw_priv *fw_priv) PAGE_KERNEL_RO); if (!fw_priv->data) return -ENOMEM; + + /* page table is no longer needed after mapping, let's free */ + vfree(fw_priv->pages); + fw_priv->pages = NULL; + return 0; } diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index 7eaaf5ee5ba6..aed1a7c56713 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -252,13 +252,13 @@ static void __free_fw_priv(struct kref *ref) spin_unlock(&fwc->lock); #ifdef CONFIG_FW_LOADER_USER_HELPER - if (fw_priv->is_paged_buf) { + if (fw_priv->pages) { + /* free leftover pages */ int i; - vunmap(fw_priv->data); for (i = 0; i < fw_priv->nr_pages; i++) __free_page(fw_priv->pages[i]); vfree(fw_priv->pages); - } else + } #endif if (!fw_priv->allocated_size) vfree(fw_priv->data);