* [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation
@ 2012-08-13 15:46 Wei Wang
2012-08-13 15:46 ` [PATCH 1 of 3] amd iommu: Add 2 helper functions: iommu_is_pte_present and iommu_next_level Wei Wang
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Wei Wang @ 2012-08-13 15:46 UTC (permalink / raw)
To: JBeulich, xen-devel
Hi Jan, this patch cleans up deallocate_next_page_table() function. Please take a look.
Thanks
Wei
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1 of 3] amd iommu: Add 2 helper functions: iommu_is_pte_present and iommu_next_level 2012-08-13 15:46 [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation Wei Wang @ 2012-08-13 15:46 ` Wei Wang 2012-08-13 15:46 ` [PATCH 2 of 3] amd iommu: Use next_level instead of recalculating it Wei Wang ` (2 subsequent siblings) 3 siblings, 0 replies; 6+ messages in thread From: Wei Wang @ 2012-08-13 15:46 UTC (permalink / raw) To: JBeulich, xen-devel # HG changeset patch # User Wei Wang <wei.wang2@amd.com> # Date 1344872310 -7200 # Node ID b6ca536658ac712c5f03b5ffedce3bb61d55adaf # Parent 47080c96593702acd4145c5a1175b7d7f8f0679d amd iommu: Add 2 helper functions: iommu_is_pte_present and iommu_next_level. Signed-off-by: Wei Wang <wei.wang2@amd.com> diff -r 47080c965937 -r b6ca536658ac xen/drivers/passthrough/amd/iommu_map.c --- a/xen/drivers/passthrough/amd/iommu_map.c Fri Aug 10 09:51:01 2012 +0200 +++ b/xen/drivers/passthrough/amd/iommu_map.c Mon Aug 13 17:38:30 2012 +0200 @@ -306,20 +306,6 @@ u64 amd_iommu_get_next_table_from_pte(u3 return ptr; } -static unsigned int iommu_next_level(u32 *entry) -{ - return get_field_from_reg_u32(entry[0], - IOMMU_PDE_NEXT_LEVEL_MASK, - IOMMU_PDE_NEXT_LEVEL_SHIFT); -} - -static int amd_iommu_is_pte_present(u32 *entry) -{ - return get_field_from_reg_u32(entry[0], - IOMMU_PDE_PRESENT_MASK, - IOMMU_PDE_PRESENT_SHIFT); -} - /* For each pde, We use ignored bits (bit 1 - bit 8 and bit 63) * to save pde count, pde count = 511 is a candidate of page coalescing. */ @@ -489,7 +475,7 @@ static int iommu_pde_from_gfn(struct dom >> PAGE_SHIFT; /* Split super page frame into smaller pieces.*/ - if ( amd_iommu_is_pte_present((u32*)pde) && + if ( iommu_is_pte_present((u32*)pde) && (iommu_next_level((u32*)pde) == 0) && next_table_mfn != 0 ) { @@ -526,7 +512,7 @@ static int iommu_pde_from_gfn(struct dom } /* Install lower level page table for non-present entries */ - else if ( !amd_iommu_is_pte_present((u32*)pde) ) + else if ( !iommu_is_pte_present((u32*)pde) ) { if ( next_table_mfn == 0 ) { diff -r 47080c965937 -r b6ca536658ac xen/drivers/passthrough/amd/pci_amd_iommu.c --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c Fri Aug 10 09:51:01 2012 +0200 +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c Mon Aug 13 17:38:30 2012 +0200 @@ -392,8 +392,7 @@ static void deallocate_next_page_table(s { void *table_vaddr, *pde; u64 next_table_maddr; - int index, next_level, present; - u32 *entry; + int index, next_level; table_vaddr = __map_domain_page(pg); @@ -403,18 +402,11 @@ static void deallocate_next_page_table(s { pde = table_vaddr + (index * IOMMU_PAGE_TABLE_ENTRY_SIZE); next_table_maddr = amd_iommu_get_next_table_from_pte(pde); - entry = (u32*)pde; - next_level = get_field_from_reg_u32(entry[0], - IOMMU_PDE_NEXT_LEVEL_MASK, - IOMMU_PDE_NEXT_LEVEL_SHIFT); - - present = get_field_from_reg_u32(entry[0], - IOMMU_PDE_PRESENT_MASK, - IOMMU_PDE_PRESENT_SHIFT); + next_level = iommu_next_level((u32*)pde); if ( (next_table_maddr != 0) && (next_level != 0) - && present ) + && iommu_is_pte_present((u32*)pde) ) { deallocate_next_page_table( maddr_to_page(next_table_maddr), level - 1); diff -r 47080c965937 -r b6ca536658ac xen/include/asm-x86/hvm/svm/amd-iommu-proto.h --- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h Fri Aug 10 09:51:01 2012 +0200 +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h Mon Aug 13 17:38:30 2012 +0200 @@ -257,4 +257,18 @@ static inline void iommu_set_addr_hi_to_ IOMMU_REG_BASE_ADDR_HIGH_SHIFT, reg); } +static inline int iommu_is_pte_present(u32 *entry) +{ + return get_field_from_reg_u32(entry[0], + IOMMU_PDE_PRESENT_MASK, + IOMMU_PDE_PRESENT_SHIFT); +} + +static inline unsigned int iommu_next_level(u32 *entry) +{ + return get_field_from_reg_u32(entry[0], + IOMMU_PDE_NEXT_LEVEL_MASK, + IOMMU_PDE_NEXT_LEVEL_SHIFT); +} + #endif /* _ASM_X86_64_AMD_IOMMU_PROTO_H */ ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2 of 3] amd iommu: Use next_level instead of recalculating it 2012-08-13 15:46 [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation Wei Wang 2012-08-13 15:46 ` [PATCH 1 of 3] amd iommu: Add 2 helper functions: iommu_is_pte_present and iommu_next_level Wei Wang @ 2012-08-13 15:46 ` Wei Wang 2012-08-13 15:46 ` [PATCH 3 of 3] amd iommu: Remove unnecessary map/unmap for l1 page tables Wei Wang 2012-08-13 16:09 ` [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation Jan Beulich 3 siblings, 0 replies; 6+ messages in thread From: Wei Wang @ 2012-08-13 15:46 UTC (permalink / raw) To: JBeulich, xen-devel # HG changeset patch # User Wei Wang <wei.wang2@amd.com> # Date 1344872313 -7200 # Node ID 273471c6dedd1e66caab7e4eede72130e4e0c00f # Parent b6ca536658ac712c5f03b5ffedce3bb61d55adaf amd iommu: Use next_level instead of recalculating it. Signed-off-by: Wei Wang <wei.wang2@amd.com> diff -r b6ca536658ac -r 273471c6dedd xen/drivers/passthrough/amd/pci_amd_iommu.c --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c Mon Aug 13 17:38:30 2012 +0200 +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c Mon Aug 13 17:38:33 2012 +0200 @@ -408,8 +408,10 @@ static void deallocate_next_page_table(s if ( (next_table_maddr != 0) && (next_level != 0) && iommu_is_pte_present((u32*)pde) ) { + /* We do not support skip level yet */ + ASSERT( next_level == level - 1 ); deallocate_next_page_table( - maddr_to_page(next_table_maddr), level - 1); + maddr_to_page(next_table_maddr), next_level); } } } ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3 of 3] amd iommu: Remove unnecessary map/unmap for l1 page tables 2012-08-13 15:46 [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation Wei Wang 2012-08-13 15:46 ` [PATCH 1 of 3] amd iommu: Add 2 helper functions: iommu_is_pte_present and iommu_next_level Wei Wang 2012-08-13 15:46 ` [PATCH 2 of 3] amd iommu: Use next_level instead of recalculating it Wei Wang @ 2012-08-13 15:46 ` Wei Wang 2012-08-13 16:09 ` [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation Jan Beulich 3 siblings, 0 replies; 6+ messages in thread From: Wei Wang @ 2012-08-13 15:46 UTC (permalink / raw) To: JBeulich, xen-devel # HG changeset patch # User Wei Wang <wei.wang2@amd.com> # Date 1344872316 -7200 # Node ID 076df9db4c273e9786ea373bda092716015d9403 # Parent 273471c6dedd1e66caab7e4eede72130e4e0c00f amd iommu: Remove unnecessary map/unmap for l1 page tables Signed-off-by: Wei Wang <wei.wang2@amd.com> diff -r 273471c6dedd -r 076df9db4c27 xen/drivers/passthrough/amd/pci_amd_iommu.c --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c Mon Aug 13 17:38:33 2012 +0200 +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c Mon Aug 13 17:38:36 2012 +0200 @@ -394,25 +394,27 @@ static void deallocate_next_page_table(s u64 next_table_maddr; int index, next_level; + if ( level <= 1 ) + { + free_amd_iommu_pgtable(pg); + return; + } + table_vaddr = __map_domain_page(pg); - if ( level > 1 ) + for ( index = 0; index < PTE_PER_TABLE_SIZE; index++ ) { - for ( index = 0; index < PTE_PER_TABLE_SIZE; index++ ) + pde = table_vaddr + (index * IOMMU_PAGE_TABLE_ENTRY_SIZE); + next_table_maddr = amd_iommu_get_next_table_from_pte(pde); + next_level = iommu_next_level((u32*)pde); + + if ( (next_table_maddr != 0) && (next_level != 0) + && iommu_is_pte_present((u32*)pde) ) { - pde = table_vaddr + (index * IOMMU_PAGE_TABLE_ENTRY_SIZE); - next_table_maddr = amd_iommu_get_next_table_from_pte(pde); - - next_level = iommu_next_level((u32*)pde); - - if ( (next_table_maddr != 0) && (next_level != 0) - && iommu_is_pte_present((u32*)pde) ) - { - /* We do not support skip level yet */ - ASSERT( next_level == level - 1 ); - deallocate_next_page_table( - maddr_to_page(next_table_maddr), next_level); - } + /* We do not support skip levels yet */ + ASSERT( next_level == level - 1 ); + deallocate_next_page_table(maddr_to_page(next_table_maddr), + next_level); } } ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation 2012-08-13 15:46 [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation Wei Wang ` (2 preceding siblings ...) 2012-08-13 15:46 ` [PATCH 3 of 3] amd iommu: Remove unnecessary map/unmap for l1 page tables Wei Wang @ 2012-08-13 16:09 ` Jan Beulich 2012-08-14 9:08 ` Wei Wang 3 siblings, 1 reply; 6+ messages in thread From: Jan Beulich @ 2012-08-13 16:09 UTC (permalink / raw) To: Wei Wang; +Cc: xen-devel >>> On 13.08.12 at 17:46, Wei Wang <wei.wang2@amd.com> wrote: > Hi Jan, this patch cleans up deallocate_next_page_table() function. Please > take a look. Hi Wei, looks okay, but unless I'm mistaken this is only cleanup, so I'd like to postpone this until after 4.2 unless you have a rather strong opinion towards getting it in now. Jan ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation 2012-08-13 16:09 ` [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation Jan Beulich @ 2012-08-14 9:08 ` Wei Wang 0 siblings, 0 replies; 6+ messages in thread From: Wei Wang @ 2012-08-14 9:08 UTC (permalink / raw) To: Jan Beulich; +Cc: xen-devel On 08/13/2012 06:09 PM, Jan Beulich wrote: >>>> On 13.08.12 at 17:46, Wei Wang<wei.wang2@amd.com> wrote: >> Hi Jan, this patch cleans up deallocate_next_page_table() function. Please >> take a look. > > Hi Wei, > > looks okay, but unless I'm mistaken this is only cleanup, so I'd > like to postpone this until after 4.2 unless you have a rather > strong opinion towards getting it in now. > > Jan > > Yes, just clean up. After 4.2 is ok to me. Thanks Wei ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-08-14 9:08 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-08-13 15:46 [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation Wei Wang 2012-08-13 15:46 ` [PATCH 1 of 3] amd iommu: Add 2 helper functions: iommu_is_pte_present and iommu_next_level Wei Wang 2012-08-13 15:46 ` [PATCH 2 of 3] amd iommu: Use next_level instead of recalculating it Wei Wang 2012-08-13 15:46 ` [PATCH 3 of 3] amd iommu: Remove unnecessary map/unmap for l1 page tables Wei Wang 2012-08-13 16:09 ` [PATCH 0 of 3] amd iommu: Clean up iommu page table deallocation Jan Beulich 2012-08-14 9:08 ` Wei Wang
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).