iommu/amd: use page allocation function provided by iommu-pages.h

Convert iommu/amd/* files to use the new page allocation functions
provided in iommu-pages.h.

Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Acked-by: David Rientjes <rientjes@google.com>
Tested-by: Bagas Sanjaya <bagasdotme@gmail.com>
Link: https://lore.kernel.org/r/20240413002522.1101315-4-pasha.tatashin@soleen.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h
index f482aab420f7873bb12da67684c5cc23a0cda05a..e01409037206376859dc717a995106b6e5fc32d9 100644 (file)
--- a/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
@@ -134,14 +134,6 @@ static inline int get_pci_sbdf_id(struct pci_dev *pdev)
        return PCI_SEG_DEVID_TO_SBDF(seg, devid);
 }
 
-static inline void *alloc_pgtable_page(int nid, gfp_t gfp)
-{
-       struct page *page;
-
-       page = alloc_pages_node(nid, gfp | __GFP_ZERO, 0);
-       return page ? page_address(page) : NULL;
-}
-
 /*
  * This must be called after device probe completes. During probe
  * use rlookup_amd_iommu() get the iommu.

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index ac6754a85f3507ee88bd3847359a53292a14dc9f..40b3b9cffade3c467ac34d6067a92777dd1d792c 100644 (file)
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -36,6 +36,7 @@
 
 #include "amd_iommu.h"
 #include "../irq_remapping.h"
+#include "../iommu-pages.h"
 
 /*
  * definitions for the ACPI scanning code
@@ -649,8 +650,8 @@ static int __init find_last_devid_acpi(struct acpi_table_header *table, u16 pci_
 /* Allocate per PCI segment device table */
 static inline int __init alloc_dev_table(struct amd_iommu_pci_seg *pci_seg)
 {
-       pci_seg->dev_table = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO | GFP_DMA32,
-                                                     get_order(pci_seg->dev_table_size));
+       pci_seg->dev_table = iommu_alloc_pages(GFP_KERNEL | GFP_DMA32,
+                                              get_order(pci_seg->dev_table_size));
        if (!pci_seg->dev_table)
                return -ENOMEM;
 
@@ -659,17 +660,16 @@ static inline int __init alloc_dev_table(struct amd_iommu_pci_seg *pci_seg)
 
 static inline void free_dev_table(struct amd_iommu_pci_seg *pci_seg)
 {
-       free_pages((unsigned long)pci_seg->dev_table,
-                   get_order(pci_seg->dev_table_size));
+       iommu_free_pages(pci_seg->dev_table,
+                        get_order(pci_seg->dev_table_size));
        pci_seg->dev_table = NULL;
 }
 
 /* Allocate per PCI segment IOMMU rlookup table. */
 static inline int __init alloc_rlookup_table(struct amd_iommu_pci_seg *pci_seg)
 {
-       pci_seg->rlookup_table = (void *)__get_free_pages(
-                                               GFP_KERNEL | __GFP_ZERO,
-                                               get_order(pci_seg->rlookup_table_size));
+       pci_seg->rlookup_table = iommu_alloc_pages(GFP_KERNEL,
+                                                  get_order(pci_seg->rlookup_table_size));
        if (pci_seg->rlookup_table == NULL)
                return -ENOMEM;
 
@@ -678,16 +678,15 @@ static inline int __init alloc_rlookup_table(struct amd_iommu_pci_seg *pci_seg)
 
 static inline void free_rlookup_table(struct amd_iommu_pci_seg *pci_seg)
 {
-       free_pages((unsigned long)pci_seg->rlookup_table,
-                  get_order(pci_seg->rlookup_table_size));
+       iommu_free_pages(pci_seg->rlookup_table,
+                        get_order(pci_seg->rlookup_table_size));
        pci_seg->rlookup_table = NULL;
 }
 
 static inline int __init alloc_irq_lookup_table(struct amd_iommu_pci_seg *pci_seg)
 {
-       pci_seg->irq_lookup_table = (void *)__get_free_pages(
-                                            GFP_KERNEL | __GFP_ZERO,
-                                            get_order(pci_seg->rlookup_table_size));
+       pci_seg->irq_lookup_table = iommu_alloc_pages(GFP_KERNEL,
+                                                     get_order(pci_seg->rlookup_table_size));
        kmemleak_alloc(pci_seg->irq_lookup_table,
                       pci_seg->rlookup_table_size, 1, GFP_KERNEL);
        if (pci_seg->irq_lookup_table == NULL)
@@ -699,8 +698,8 @@ static inline int __init alloc_irq_lookup_table(struct amd_iommu_pci_seg *pci_se
 static inline void free_irq_lookup_table(struct amd_iommu_pci_seg *pci_seg)
 {
        kmemleak_free(pci_seg->irq_lookup_table);
-       free_pages((unsigned long)pci_seg->irq_lookup_table,
-                  get_order(pci_seg->rlookup_table_size));
+       iommu_free_pages(pci_seg->irq_lookup_table,
+                        get_order(pci_seg->rlookup_table_size));
        pci_seg->irq_lookup_table = NULL;
 }
 
@@ -708,8 +707,8 @@ static int __init alloc_alias_table(struct amd_iommu_pci_seg *pci_seg)
 {
        int i;
 
-       pci_seg->alias_table = (void *)__get_free_pages(GFP_KERNEL,
-                                       get_order(pci_seg->alias_table_size));
+       pci_seg->alias_table = iommu_alloc_pages(GFP_KERNEL,
+                                                get_order(pci_seg->alias_table_size));
        if (!pci_seg->alias_table)
                return -ENOMEM;
 
@@ -724,8 +723,8 @@ static int __init alloc_alias_table(struct amd_iommu_pci_seg *pci_seg)
 
 static void __init free_alias_table(struct amd_iommu_pci_seg *pci_seg)
 {
-       free_pages((unsigned long)pci_seg->alias_table,
-                  get_order(pci_seg->alias_table_size));
+       iommu_free_pages(pci_seg->alias_table,
+                        get_order(pci_seg->alias_table_size));
        pci_seg->alias_table = NULL;
 }
 
@@ -736,8 +735,8 @@ static void __init free_alias_table(struct amd_iommu_pci_seg *pci_seg)
  */
 static int __init alloc_command_buffer(struct amd_iommu *iommu)
 {
-       iommu->cmd_buf = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
-                                                 get_order(CMD_BUFFER_SIZE));
+       iommu->cmd_buf = iommu_alloc_pages(GFP_KERNEL,
+                                          get_order(CMD_BUFFER_SIZE));
 
        return iommu->cmd_buf ? 0 : -ENOMEM;
 }
@@ -845,19 +844,19 @@ static void iommu_disable_command_buffer(struct amd_iommu *iommu)
 
 static void __init free_command_buffer(struct amd_iommu *iommu)
 {
-       free_pages((unsigned long)iommu->cmd_buf, get_order(CMD_BUFFER_SIZE));
+       iommu_free_pages(iommu->cmd_buf, get_order(CMD_BUFFER_SIZE));
 }
 
 static void *__init iommu_alloc_4k_pages(struct amd_iommu *iommu,
                                         gfp_t gfp, size_t size)
 {
        int order = get_order(size);
-       void *buf = (void *)__get_free_pages(gfp, order);
+       void *buf = iommu_alloc_pages(gfp, order);
 
        if (buf &&
            check_feature(FEATURE_SNP) &&
            set_memory_4k((unsigned long)buf, (1 << order))) {
-               free_pages((unsigned long)buf, order);
+               iommu_free_pages(buf, order);
                buf = NULL;
        }
 
@@ -867,7 +866,7 @@ static void *__init iommu_alloc_4k_pages(struct amd_iommu *iommu,
 /* allocates the memory where the IOMMU will log its events to */
 static int __init alloc_event_buffer(struct amd_iommu *iommu)
 {
-       iommu->evt_buf = iommu_alloc_4k_pages(iommu, GFP_KERNEL | __GFP_ZERO,
+       iommu->evt_buf = iommu_alloc_4k_pages(iommu, GFP_KERNEL,
                                              EVT_BUFFER_SIZE);
 
        return iommu->evt_buf ? 0 : -ENOMEM;
@@ -901,14 +900,13 @@ static void iommu_disable_event_buffer(struct amd_iommu *iommu)
 
 static void __init free_event_buffer(struct amd_iommu *iommu)
 {
-       free_pages((unsigned long)iommu->evt_buf, get_order(EVT_BUFFER_SIZE));
+       iommu_free_pages(iommu->evt_buf, get_order(EVT_BUFFER_SIZE));
 }
 
 /* allocates the memory where the IOMMU will log its events to */
 static int __init alloc_ppr_log(struct amd_iommu *iommu)
 {
-       iommu->ppr_log = iommu_alloc_4k_pages(iommu, GFP_KERNEL | __GFP_ZERO,
-                                             PPR_LOG_SIZE);
+       iommu->ppr_log = iommu_alloc_4k_pages(iommu, GFP_KERNEL, PPR_LOG_SIZE);
 
        return iommu->ppr_log ? 0 : -ENOMEM;
 }
@@ -937,14 +935,14 @@ static void iommu_enable_ppr_log(struct amd_iommu *iommu)
 
 static void __init free_ppr_log(struct amd_iommu *iommu)
 {
-       free_pages((unsigned long)iommu->ppr_log, get_order(PPR_LOG_SIZE));
+       iommu_free_pages(iommu->ppr_log, get_order(PPR_LOG_SIZE));
 }
 
 static void free_ga_log(struct amd_iommu *iommu)
 {
 #ifdef CONFIG_IRQ_REMAP
-       free_pages((unsigned long)iommu->ga_log, get_order(GA_LOG_SIZE));
-       free_pages((unsigned long)iommu->ga_log_tail, get_order(8));
+       iommu_free_pages(iommu->ga_log, get_order(GA_LOG_SIZE));
+       iommu_free_pages(iommu->ga_log_tail, get_order(8));
 #endif
 }
 
@@ -989,13 +987,11 @@ static int iommu_init_ga_log(struct amd_iommu *iommu)
        if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir))
                return 0;
 
-       iommu->ga_log = (u8 *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
-                                       get_order(GA_LOG_SIZE));
+       iommu->ga_log = iommu_alloc_pages(GFP_KERNEL, get_order(GA_LOG_SIZE));
        if (!iommu->ga_log)
                goto err_out;
 
-       iommu->ga_log_tail = (u8 *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
-                                       get_order(8));
+       iommu->ga_log_tail = iommu_alloc_pages(GFP_KERNEL, get_order(8));
        if (!iommu->ga_log_tail)
                goto err_out;
 
@@ -1008,7 +1004,7 @@ err_out:
 
 static int __init alloc_cwwb_sem(struct amd_iommu *iommu)
 {
-       iommu->cmd_sem = iommu_alloc_4k_pages(iommu, GFP_KERNEL | __GFP_ZERO, 1);
+       iommu->cmd_sem = iommu_alloc_4k_pages(iommu, GFP_KERNEL, 1);
 
        return iommu->cmd_sem ? 0 : -ENOMEM;
 }
@@ -1016,7 +1012,7 @@ static int __init alloc_cwwb_sem(struct amd_iommu *iommu)
 static void __init free_cwwb_sem(struct amd_iommu *iommu)
 {
        if (iommu->cmd_sem)
-               free_page((unsigned long)iommu->cmd_sem);
+               iommu_free_page((void *)iommu->cmd_sem);
 }
 
 static void iommu_enable_xt(struct amd_iommu *iommu)
@@ -1081,7 +1077,6 @@ static bool __copy_device_table(struct amd_iommu *iommu)
        u32 lo, hi, devid, old_devtb_size;
        phys_addr_t old_devtb_phys;
        u16 dom_id, dte_v, irq_v;
-       gfp_t gfp_flag;
        u64 tmp;
 
        /* Each IOMMU use separate device table with the same size */
@@ -1115,9 +1110,8 @@ static bool __copy_device_table(struct amd_iommu *iommu)
        if (!old_devtb)
                return false;
 
-       gfp_flag = GFP_KERNEL | __GFP_ZERO | GFP_DMA32;
-       pci_seg->old_dev_tbl_cpy = (void *)__get_free_pages(gfp_flag,
-                                                   get_order(pci_seg->dev_table_size));
+       pci_seg->old_dev_tbl_cpy = iommu_alloc_pages(GFP_KERNEL | GFP_DMA32,
+                                                    get_order(pci_seg->dev_table_size));
        if (pci_seg->old_dev_tbl_cpy == NULL) {
                pr_err("Failed to allocate memory for copying old device table!\n");
                memunmap(old_devtb);
@@ -2805,8 +2799,8 @@ static void early_enable_iommus(void)
 
                for_each_pci_segment(pci_seg) {
                        if (pci_seg->old_dev_tbl_cpy != NULL) {
-                               free_pages((unsigned long)pci_seg->old_dev_tbl_cpy,
-                                               get_order(pci_seg->dev_table_size));
+                               iommu_free_pages(pci_seg->old_dev_tbl_cpy,
+                                                get_order(pci_seg->dev_table_size));
                                pci_seg->old_dev_tbl_cpy = NULL;
                        }
                }
@@ -2819,8 +2813,8 @@ static void early_enable_iommus(void)
                pr_info("Copied DEV table from previous kernel.\n");
 
                for_each_pci_segment(pci_seg) {
-                       free_pages((unsigned long)pci_seg->dev_table,
-                                  get_order(pci_seg->dev_table_size));
+                       iommu_free_pages(pci_seg->dev_table,
+                                        get_order(pci_seg->dev_table_size));
                        pci_seg->dev_table = pci_seg->old_dev_tbl_cpy;
                }
 
@@ -3022,8 +3016,8 @@ static bool __init check_ioapic_information(void)
 
 static void __init free_dma_resources(void)
 {
-       free_pages((unsigned long)amd_iommu_pd_alloc_bitmap,
-                  get_order(MAX_DOMAIN_ID/8));
+       iommu_free_pages(amd_iommu_pd_alloc_bitmap,
+                        get_order(MAX_DOMAIN_ID / 8));
        amd_iommu_pd_alloc_bitmap = NULL;
 
        free_unity_maps();
@@ -3095,9 +3089,8 @@ static int __init early_amd_iommu_init(void)
        /* Device table - directly used by all IOMMUs */
        ret = -ENOMEM;
 
-       amd_iommu_pd_alloc_bitmap = (void *)__get_free_pages(
-                                           GFP_KERNEL | __GFP_ZERO,
-                                           get_order(MAX_DOMAIN_ID/8));
+       amd_iommu_pd_alloc_bitmap = iommu_alloc_pages(GFP_KERNEL,
+                                                     get_order(MAX_DOMAIN_ID / 8));
        if (amd_iommu_pd_alloc_bitmap == NULL)
                goto out;
 

diff --git a/drivers/iommu/amd/io_pgtable.c b/drivers/iommu/amd/io_pgtable.c
index 2a0d1e97e52fdfe2375c3988c698260ae520cb9f..9d9a7fde59e75dcbdbff9fecd5cda23fc9c3faf7 100644 (file)
--- a/drivers/iommu/amd/io_pgtable.c
+++ b/drivers/iommu/amd/io_pgtable.c
@@ -22,6 +22,7 @@
 
 #include "amd_iommu_types.h"
 #include "amd_iommu.h"
+#include "../iommu-pages.h"
 
 static void v1_tlb_flush_all(void *cookie)
 {
@@ -156,7 +157,7 @@ static bool increase_address_space(struct protection_domain *domain,
        bool ret = true;
        u64 *pte;
 
-       pte = alloc_pgtable_page(domain->nid, gfp);
+       pte = iommu_alloc_page_node(domain->nid, gfp);
        if (!pte)
                return false;
 
@@ -187,7 +188,7 @@ static bool increase_address_space(struct protection_domain *domain,
 
 out:
        spin_unlock_irqrestore(&domain->lock, flags);
-       free_page((unsigned long)pte);
+       iommu_free_page(pte);
 
        return ret;
 }
@@ -250,7 +251,7 @@ static u64 *alloc_pte(struct protection_domain *domain,
 
                if (!IOMMU_PTE_PRESENT(__pte) ||
                    pte_level == PAGE_MODE_NONE) {
-                       page = alloc_pgtable_page(domain->nid, gfp);
+                       page = iommu_alloc_page_node(domain->nid, gfp);
 
                        if (!page)
                                return NULL;
@@ -259,7 +260,7 @@ static u64 *alloc_pte(struct protection_domain *domain,
 
                        /* pte could have been changed somewhere. */
                        if (!try_cmpxchg64(pte, &__pte, __npte))
-                               free_page((unsigned long)page);
+                               iommu_free_page(page);
                        else if (IOMMU_PTE_PRESENT(__pte))
                                *updated = true;
 
@@ -431,7 +432,7 @@ out:
        }
 
        /* Everything flushed out, free pages now */
-       put_pages_list(&freelist);
+       iommu_put_pages_list(&freelist);
 
        return ret;
 }
@@ -580,7 +581,7 @@ static void v1_free_pgtable(struct io_pgtable *iop)
        /* Make changes visible to IOMMUs */
        amd_iommu_domain_update(dom);
 
-       put_pages_list(&freelist);
+       iommu_put_pages_list(&freelist);
 }
 
 static struct io_pgtable *v1_alloc_pgtable(struct io_pgtable_cfg *cfg, void *cookie)

diff --git a/drivers/iommu/amd/io_pgtable_v2.c b/drivers/iommu/amd/io_pgtable_v2.c
index 93489d2db4e8d04359d0a5e9c1fbacd3da573f8d..78ac37c5ccc1e0ac59cbfede831ff80fc7addddb 100644 (file)
--- a/drivers/iommu/amd/io_pgtable_v2.c
+++ b/drivers/iommu/amd/io_pgtable_v2.c
@@ -18,6 +18,7 @@
 
 #include "amd_iommu_types.h"
 #include "amd_iommu.h"
+#include "../iommu-pages.h"
 
 #define IOMMU_PAGE_PRESENT     BIT_ULL(0)      /* Is present */
 #define IOMMU_PAGE_RW          BIT_ULL(1)      /* Writeable */
@@ -99,11 +100,6 @@ static inline int page_size_to_level(u64 pg_size)
        return PAGE_MODE_1_LEVEL;
 }
 
-static inline void free_pgtable_page(u64 *pt)
-{
-       free_page((unsigned long)pt);
-}
-
 static void free_pgtable(u64 *pt, int level)
 {
        u64 *p;
@@ -125,10 +121,10 @@ static void free_pgtable(u64 *pt, int level)
                if (level > 2)
                        free_pgtable(p, level - 1);
                else
-                       free_pgtable_page(p);
+                       iommu_free_page(p);
        }
 
-       free_pgtable_page(pt);
+       iommu_free_page(pt);
 }
 
 /* Allocate page table */
@@ -156,14 +152,14 @@ static u64 *v2_alloc_pte(int nid, u64 *pgd, unsigned long iova,
                }
 
                if (!IOMMU_PTE_PRESENT(__pte)) {
-                       page = alloc_pgtable_page(nid, gfp);
+                       page = iommu_alloc_page_node(nid, gfp);
                        if (!page)
                                return NULL;
 
                        __npte = set_pgtable_attr(page);
                        /* pte could have been changed somewhere. */
                        if (cmpxchg64(pte, __pte, __npte) != __pte)
-                               free_pgtable_page(page);
+                               iommu_free_page(page);
                        else if (IOMMU_PTE_PRESENT(__pte))
                                *updated = true;
 
@@ -185,7 +181,7 @@ static u64 *v2_alloc_pte(int nid, u64 *pgd, unsigned long iova,
                if (pg_size == IOMMU_PAGE_SIZE_1G)
                        free_pgtable(__pte, end_level - 1);
                else if (pg_size == IOMMU_PAGE_SIZE_2M)
-                       free_pgtable_page(__pte);
+                       iommu_free_page(__pte);
        }
 
        return pte;
@@ -366,7 +362,7 @@ static struct io_pgtable *v2_alloc_pgtable(struct io_pgtable_cfg *cfg, void *coo
        struct protection_domain *pdom = (struct protection_domain *)cookie;
        int ias = IOMMU_IN_ADDR_BIT_SIZE;
 
-       pgtable->pgd = alloc_pgtable_page(pdom->nid, GFP_ATOMIC);
+       pgtable->pgd = iommu_alloc_page_node(pdom->nid, GFP_ATOMIC);
        if (!pgtable->pgd)
                return NULL;
 

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index e692217fcb28011478139d7dc146d74dcd9456e8..922f5d42c18e2bd54e1d39ee7c218546d761ad41 100644 (file)
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -42,6 +42,7 @@
 #include "amd_iommu.h"
 #include "../dma-iommu.h"
 #include "../irq_remapping.h"
+#include "../iommu-pages.h"
 
 #define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))
 
@@ -1728,7 +1729,7 @@ static void free_gcr3_tbl_level1(u64 *tbl)
 
                ptr = iommu_phys_to_virt(tbl[i] & PAGE_MASK);
 
-               free_page((unsigned long)ptr);
+               iommu_free_page(ptr);
        }
 }
 
@@ -1761,7 +1762,7 @@ static void free_gcr3_table(struct gcr3_tbl_info *gcr3_info)
        /* Free per device domain ID */
        domain_id_free(gcr3_info->domid);
 
-       free_page((unsigned long)gcr3_info->gcr3_tbl);
+       iommu_free_page(gcr3_info->gcr3_tbl);
        gcr3_info->gcr3_tbl = NULL;
 }
 
@@ -1796,7 +1797,7 @@ static int setup_gcr3_table(struct gcr3_tbl_info *gcr3_info,
        /* Allocate per device domain ID */
        gcr3_info->domid = domain_id_alloc();
 
-       gcr3_info->gcr3_tbl = alloc_pgtable_page(nid, GFP_ATOMIC);
+       gcr3_info->gcr3_tbl = iommu_alloc_page_node(nid, GFP_ATOMIC);
        if (gcr3_info->gcr3_tbl == NULL) {
                domain_id_free(gcr3_info->domid);
                return -ENOMEM;
@@ -2245,7 +2246,7 @@ static void protection_domain_free(struct protection_domain *domain)
                free_io_pgtable_ops(&domain->iop.iop.ops);
 
        if (domain->iop.root)
-               free_page((unsigned long)domain->iop.root);
+               iommu_free_page(domain->iop.root);
 
        if (domain->id)
                domain_id_free(domain->id);
@@ -2260,7 +2261,7 @@ static int protection_domain_init_v1(struct protection_domain *domain, int mode)
        BUG_ON(mode < PAGE_MODE_NONE || mode > PAGE_MODE_6_LEVEL);
 
        if (mode != PAGE_MODE_NONE) {
-               pt_root = (void *)get_zeroed_page(GFP_KERNEL);
+               pt_root = iommu_alloc_page(GFP_KERNEL);
                if (!pt_root)
                        return -ENOMEM;
        }