Commit 47f218d1 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Joerg Roedel
Browse files

iommu/amd: Store the nid in io_pgtable_cfg instead of the domain 



We already have memory in the union here that is being wasted in AMD's
case, use it to store the nid.

Putting the nid here further isolates the io_pgtable code from the struct
protection_domain.

Fixup protection_domain_alloc so that the NID from the device is provided,
at this point dev is never NULL for AMD so this will now allocate the
first table pointer on the correct NUMA node.

Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Link: https://lore.kernel.org/r/8-v2-831cdc4d00f3+1a315-amd_iopgtbl_jgg@nvidia.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 977fc27c

drivers/iommu/amd/amd_iommu.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ extern enum io_pgtable_fmt amd_iommu_pgtable; 
extern int amd_iommu_gpt_level;



/* Protection domain ops */

struct protection_domain *protection_domain_alloc(unsigned int type);

struct protection_domain *protection_domain_alloc(unsigned int type, int nid);

void protection_domain_free(struct protection_domain *domain);

struct iommu_domain *amd_iommu_domain_alloc_sva(struct device *dev,

						struct mm_struct *mm);

drivers/iommu/amd/amd_iommu_types.h

+0 −1
Original line number Diff line number Diff line
@@ -571,7 +571,6 @@ struct protection_domain { 
	struct amd_io_pgtable iop;

	spinlock_t lock;	/* mostly used to lock the page table*/

	u16 id;			/* the domain id written to the device table */

	int nid;		/* Node ID */

	enum protection_domain_mode pd_mode; /* Track page table type */

	bool dirty_tracking;	/* dirty tracking is enabled in the domain */

	unsigned dev_cnt;	/* devices assigned to this domain */

drivers/iommu/amd/io_pgtable.c

+5 −3
Original line number Diff line number Diff line
@@ -141,11 +141,12 @@ static bool increase_address_space(struct protection_domain *domain, 
				   unsigned long address,

				   gfp_t gfp)

{

	struct io_pgtable_cfg *cfg = &domain->iop.pgtbl.cfg;

	unsigned long flags;

	bool ret = true;

	u64 *pte;



	pte = iommu_alloc_page_node(domain->nid, gfp);

	pte = iommu_alloc_page_node(cfg->amd.nid, gfp);

	if (!pte)

		return false;
@@ -181,6 +182,7 @@ static u64 *alloc_pte(struct protection_domain *domain, 
		      gfp_t gfp,

		      bool *updated)

{

	struct io_pgtable_cfg *cfg = &domain->iop.pgtbl.cfg;

	int level, end_lvl;

	u64 *pte, *page;
@@ -232,7 +234,7 @@ static u64 *alloc_pte(struct protection_domain *domain, 


		if (!IOMMU_PTE_PRESENT(__pte) ||

		    pte_level == PAGE_MODE_NONE) {

			page = iommu_alloc_page_node(domain->nid, gfp);

			page = iommu_alloc_page_node(cfg->amd.nid, gfp);



			if (!page)

				return NULL;
@@ -559,7 +561,7 @@ static struct io_pgtable *v1_alloc_pgtable(struct io_pgtable_cfg *cfg, void *coo 
{

	struct amd_io_pgtable *pgtable = io_pgtable_cfg_to_data(cfg);



	pgtable->root = iommu_alloc_page(GFP_KERNEL);

	pgtable->root = iommu_alloc_page_node(cfg->amd.nid, GFP_KERNEL);

	if (!pgtable->root)

		return NULL;

	pgtable->mode = PAGE_MODE_3_LEVEL;

drivers/iommu/amd/io_pgtable_v2.c

+2 −3
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static int iommu_v2_map_pages(struct io_pgtable_ops *ops, unsigned long iova, 


	while (mapped_size < size) {

		map_size = get_alloc_page_size(pgsize);

		pte = v2_alloc_pte(pdom->nid, pdom->iop.pgd,

		pte = v2_alloc_pte(cfg->amd.nid, pdom->iop.pgd,

				   iova, map_size, gfp, &updated);

		if (!pte) {

			ret = -EINVAL;
@@ -359,10 +359,9 @@ static void v2_free_pgtable(struct io_pgtable *iop) 
static struct io_pgtable *v2_alloc_pgtable(struct io_pgtable_cfg *cfg, void *cookie)

{

	struct amd_io_pgtable *pgtable = io_pgtable_cfg_to_data(cfg);

	struct protection_domain *pdom = (struct protection_domain *)cookie;

	int ias = IOMMU_IN_ADDR_BIT_SIZE;



	pgtable->pgd = iommu_alloc_page_node(pdom->nid, GFP_KERNEL);

	pgtable->pgd = iommu_alloc_page_node(cfg->amd.nid, GFP_KERNEL);

	if (!pgtable->pgd)

		return NULL;

drivers/iommu/amd/iommu.c

+7 −5
Original line number Diff line number Diff line
@@ -2023,6 +2023,7 @@ static int do_attach(struct iommu_dev_data *dev_data, 
		     struct protection_domain *domain)

{

	struct amd_iommu *iommu = get_amd_iommu_from_dev_data(dev_data);

	struct io_pgtable_cfg *cfg = &domain->iop.pgtbl.cfg;

	int ret = 0;



	/* Update data structures */
@@ -2030,8 +2031,8 @@ static int do_attach(struct iommu_dev_data *dev_data, 
	list_add(&dev_data->list, &domain->dev_list);



	/* Update NUMA Node ID */

	if (domain->nid == NUMA_NO_NODE)

		domain->nid = dev_to_node(dev_data->dev);

	if (cfg->amd.nid == NUMA_NO_NODE)

		cfg->amd.nid = dev_to_node(dev_data->dev);



	/* Do reference counting */

	domain->dev_iommu[iommu->index] += 1;
@@ -2266,7 +2267,7 @@ void protection_domain_free(struct protection_domain *domain) 
	kfree(domain);

}



struct protection_domain *protection_domain_alloc(unsigned int type)

struct protection_domain *protection_domain_alloc(unsigned int type, int nid)

{

	struct io_pgtable_ops *pgtbl_ops;

	struct protection_domain *domain;
@@ -2283,7 +2284,7 @@ struct protection_domain *protection_domain_alloc(unsigned int type) 
	spin_lock_init(&domain->lock);

	INIT_LIST_HEAD(&domain->dev_list);

	INIT_LIST_HEAD(&domain->dev_data_list);

	domain->nid = NUMA_NO_NODE;

	domain->iop.pgtbl.cfg.amd.nid = nid;



	switch (type) {

	/* No need to allocate io pgtable ops in passthrough mode */
@@ -2360,7 +2361,8 @@ static struct iommu_domain *do_iommu_domain_alloc(unsigned int type, 
	if (dirty_tracking && !amd_iommu_hd_support(iommu))

		return ERR_PTR(-EOPNOTSUPP);



	domain = protection_domain_alloc(type);

	domain = protection_domain_alloc(type,

					 dev ? dev_to_node(dev) : NUMA_NO_NODE);

	if (!domain)

		return ERR_PTR(-ENOMEM);