From: Tom Lendacky <thomas.lendacky@amd.com> To: Christoph Hellwig <hch@lst.de>, x86@kernel.org Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, David Woodhouse <dwmw2@infradead.org>, Muli Ben-Yehuda <mulix@mulix.org>, Jon Mason <jdmason@kudzu.us>, Joerg Roedel <joro@8bytes.org>, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 11/14] swiotlb: remove swiotlb_set_mem_attributes Date: Mon, 19 Mar 2018 09:41:03 -0500 [thread overview] Message-ID: <7fe2c163-c659-c27f-b54b-23b38e4b0149@amd.com> (raw) In-Reply-To: <20180319103826.12853-12-hch@lst.de> On 3/19/2018 5:38 AM, Christoph Hellwig wrote: > Now that set_memory_decrypted is always available we can just call it > directly. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com> > --- > arch/x86/include/asm/mem_encrypt.h | 2 -- > arch/x86/mm/mem_encrypt.c | 9 --------- > lib/swiotlb.c | 12 ++++++------ > 3 files changed, 6 insertions(+), 17 deletions(-) > > diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h > index 22c5f3e6f820..9da0b63c8fc7 100644 > --- a/arch/x86/include/asm/mem_encrypt.h > +++ b/arch/x86/include/asm/mem_encrypt.h > @@ -48,8 +48,6 @@ int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size); > /* Architecture __weak replacement functions */ > void __init mem_encrypt_init(void); > > -void swiotlb_set_mem_attributes(void *vaddr, unsigned long size); > - > bool sme_active(void); > bool sev_active(void); > > diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c > index 66beedc8fe3d..d3b80d5f9828 100644 > --- a/arch/x86/mm/mem_encrypt.c > +++ b/arch/x86/mm/mem_encrypt.c > @@ -446,15 +446,6 @@ void __init mem_encrypt_init(void) > : "Secure Memory Encryption (SME)"); > } > > -void swiotlb_set_mem_attributes(void *vaddr, unsigned long size) > -{ > - WARN(PAGE_ALIGN(size) != size, > - "size is not page-aligned (%#lx)\n", size); > - > - /* Make the SWIOTLB buffer area decrypted */ > - set_memory_decrypted((unsigned long)vaddr, size >> PAGE_SHIFT); > -} > - > struct sme_populate_pgd_data { > void *pgtable_area; > pgd_t *pgd; > diff --git a/lib/swiotlb.c b/lib/swiotlb.c > index c43ec2271469..005d1d87bb2e 100644 > --- a/lib/swiotlb.c > +++ b/lib/swiotlb.c > @@ -31,6 +31,7 @@ > #include <linux/gfp.h> > #include <linux/scatterlist.h> > #include <linux/mem_encrypt.h> > +#include <linux/set_memory.h> > > #include <asm/io.h> > #include <asm/dma.h> > @@ -156,8 +157,6 @@ unsigned long swiotlb_size_or_default(void) > return size ? size : (IO_TLB_DEFAULT_SIZE); > } > > -void __weak swiotlb_set_mem_attributes(void *vaddr, unsigned long size) { } > - > /* For swiotlb, clear memory encryption mask from dma addresses */ > static dma_addr_t swiotlb_phys_to_dma(struct device *hwdev, > phys_addr_t address) > @@ -209,12 +208,12 @@ void __init swiotlb_update_mem_attributes(void) > > vaddr = phys_to_virt(io_tlb_start); > bytes = PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT); > - swiotlb_set_mem_attributes(vaddr, bytes); > + set_memory_decrypted((unsigned long)vaddr, bytes >> PAGE_SHIFT); > memset(vaddr, 0, bytes); > > vaddr = phys_to_virt(io_tlb_overflow_buffer); > bytes = PAGE_ALIGN(io_tlb_overflow); > - swiotlb_set_mem_attributes(vaddr, bytes); > + set_memory_decrypted((unsigned long)vaddr, bytes >> PAGE_SHIFT); > memset(vaddr, 0, bytes); > } > > @@ -355,7 +354,7 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs) > io_tlb_start = virt_to_phys(tlb); > io_tlb_end = io_tlb_start + bytes; > > - swiotlb_set_mem_attributes(tlb, bytes); > + set_memory_decrypted((unsigned long)tlb, bytes >> PAGE_SHIFT); > memset(tlb, 0, bytes); > > /* > @@ -366,7 +365,8 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs) > if (!v_overflow_buffer) > goto cleanup2; > > - swiotlb_set_mem_attributes(v_overflow_buffer, io_tlb_overflow); > + set_memory_decrypted((unsigned long)v_overflow_buffer, > + io_tlb_overflow >> PAGE_SHIFT); > memset(v_overflow_buffer, 0, io_tlb_overflow); > io_tlb_overflow_buffer = virt_to_phys(v_overflow_buffer); > >
WARNING: multiple messages have this Message-ID (diff)
From: Tom Lendacky <thomas.lendacky-5C7GfCeVMHo@public.gmane.org> To: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>, x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org Cc: Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Muli Ben-Yehuda <mulix-BzGcCpaT2IbYtjvyW6yDsg@public.gmane.org>, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> Subject: Re: [PATCH 11/14] swiotlb: remove swiotlb_set_mem_attributes Date: Mon, 19 Mar 2018 09:41:03 -0500 [thread overview] Message-ID: <7fe2c163-c659-c27f-b54b-23b38e4b0149@amd.com> (raw) In-Reply-To: <20180319103826.12853-12-hch-jcswGhMUV9g@public.gmane.org> On 3/19/2018 5:38 AM, Christoph Hellwig wrote: > Now that set_memory_decrypted is always available we can just call it > directly. > > Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> Reviewed-by: Tom Lendacky <thomas.lendacky-5C7GfCeVMHo@public.gmane.org> > --- > arch/x86/include/asm/mem_encrypt.h | 2 -- > arch/x86/mm/mem_encrypt.c | 9 --------- > lib/swiotlb.c | 12 ++++++------ > 3 files changed, 6 insertions(+), 17 deletions(-) > > diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h > index 22c5f3e6f820..9da0b63c8fc7 100644 > --- a/arch/x86/include/asm/mem_encrypt.h > +++ b/arch/x86/include/asm/mem_encrypt.h > @@ -48,8 +48,6 @@ int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size); > /* Architecture __weak replacement functions */ > void __init mem_encrypt_init(void); > > -void swiotlb_set_mem_attributes(void *vaddr, unsigned long size); > - > bool sme_active(void); > bool sev_active(void); > > diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c > index 66beedc8fe3d..d3b80d5f9828 100644 > --- a/arch/x86/mm/mem_encrypt.c > +++ b/arch/x86/mm/mem_encrypt.c > @@ -446,15 +446,6 @@ void __init mem_encrypt_init(void) > : "Secure Memory Encryption (SME)"); > } > > -void swiotlb_set_mem_attributes(void *vaddr, unsigned long size) > -{ > - WARN(PAGE_ALIGN(size) != size, > - "size is not page-aligned (%#lx)\n", size); > - > - /* Make the SWIOTLB buffer area decrypted */ > - set_memory_decrypted((unsigned long)vaddr, size >> PAGE_SHIFT); > -} > - > struct sme_populate_pgd_data { > void *pgtable_area; > pgd_t *pgd; > diff --git a/lib/swiotlb.c b/lib/swiotlb.c > index c43ec2271469..005d1d87bb2e 100644 > --- a/lib/swiotlb.c > +++ b/lib/swiotlb.c > @@ -31,6 +31,7 @@ > #include <linux/gfp.h> > #include <linux/scatterlist.h> > #include <linux/mem_encrypt.h> > +#include <linux/set_memory.h> > > #include <asm/io.h> > #include <asm/dma.h> > @@ -156,8 +157,6 @@ unsigned long swiotlb_size_or_default(void) > return size ? size : (IO_TLB_DEFAULT_SIZE); > } > > -void __weak swiotlb_set_mem_attributes(void *vaddr, unsigned long size) { } > - > /* For swiotlb, clear memory encryption mask from dma addresses */ > static dma_addr_t swiotlb_phys_to_dma(struct device *hwdev, > phys_addr_t address) > @@ -209,12 +208,12 @@ void __init swiotlb_update_mem_attributes(void) > > vaddr = phys_to_virt(io_tlb_start); > bytes = PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT); > - swiotlb_set_mem_attributes(vaddr, bytes); > + set_memory_decrypted((unsigned long)vaddr, bytes >> PAGE_SHIFT); > memset(vaddr, 0, bytes); > > vaddr = phys_to_virt(io_tlb_overflow_buffer); > bytes = PAGE_ALIGN(io_tlb_overflow); > - swiotlb_set_mem_attributes(vaddr, bytes); > + set_memory_decrypted((unsigned long)vaddr, bytes >> PAGE_SHIFT); > memset(vaddr, 0, bytes); > } > > @@ -355,7 +354,7 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs) > io_tlb_start = virt_to_phys(tlb); > io_tlb_end = io_tlb_start + bytes; > > - swiotlb_set_mem_attributes(tlb, bytes); > + set_memory_decrypted((unsigned long)tlb, bytes >> PAGE_SHIFT); > memset(tlb, 0, bytes); > > /* > @@ -366,7 +365,8 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs) > if (!v_overflow_buffer) > goto cleanup2; > > - swiotlb_set_mem_attributes(v_overflow_buffer, io_tlb_overflow); > + set_memory_decrypted((unsigned long)v_overflow_buffer, > + io_tlb_overflow >> PAGE_SHIFT); > memset(v_overflow_buffer, 0, io_tlb_overflow); > io_tlb_overflow_buffer = virt_to_phys(v_overflow_buffer); > >
next prev parent reply other threads:[~2018-03-19 14:41 UTC|newest] Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-19 10:38 use generic dma-direct and swiotlb code for x86 V3 Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-19 10:38 ` [PATCH 01/14] x86: remove X86_PPRO_FENCE Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-20 11:04 ` [tip:x86/pti] x86/cpu: Remove the CONFIG_X86_PPRO_FENCE=y quirk tip-bot for Christoph Hellwig 2018-03-20 12:51 ` Peter Zijlstra 2018-03-19 10:38 ` [PATCH 02/14] x86: remove dma_alloc_coherent_mask Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-23 19:48 ` [tip:x86/dma] x86/dma: Remove dma_alloc_coherent_mask() tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 03/14] x86: use dma-direct Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-23 19:49 ` [tip:x86/dma] x86/dma: Use DMA-direct (CONFIG_DMA_DIRECT_OPS=y) tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 04/14] x86: use generic swiotlb_ops Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-23 19:49 ` [tip:x86/dma] x86/dma: Use " tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 05/14] x86/amd_gart: look at coherent_dma_mask instead of GFP_DMA Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-23 19:50 ` [tip:x86/dma] x86/dma/amd_gart: Look at dev->coherent_dma_mask " tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 06/14] x86/amd_gart: use dma_direct_{alloc,free} Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-23 19:50 ` [tip:x86/dma] x86/dma/amd_gart: Use dma_direct_{alloc,free}() tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 07/14] iommu/amd_iommu: use dma_direct_{alloc,free} Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-23 19:51 ` [tip:x86/dma] iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}() tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 08/14] iommu/intel-iommu: cleanup intel_{alloc,free}_coherent Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-23 19:51 ` [tip:x86/dma] iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent() tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 09/14] x86: remove dma_alloc_coherent_gfp_flags Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-23 19:52 ` [tip:x86/dma] x86/dma: Remove dma_alloc_coherent_gfp_flags() tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 10/14] set_memory.h: provide set_memory_{en,de}crypted stubs Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-19 14:21 ` Tom Lendacky 2018-03-19 14:21 ` Tom Lendacky 2018-03-23 19:52 ` [tip:x86/dma] set_memory.h: Provide set_memory_{en,de}crypted() stubs tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 11/14] swiotlb: remove swiotlb_set_mem_attributes Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-19 14:41 ` Tom Lendacky [this message] 2018-03-19 14:41 ` Tom Lendacky 2018-03-23 19:52 ` [tip:x86/dma] dma/swiotlb: Remove swiotlb_set_mem_attributes() tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 12/14] dma-direct: handle the memory encryption bit in common code Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-19 14:50 ` Tom Lendacky 2018-03-19 14:50 ` Tom Lendacky 2018-03-19 15:19 ` Robin Murphy 2018-03-19 15:19 ` Robin Murphy 2018-03-19 15:24 ` Christoph Hellwig 2018-03-19 15:24 ` Christoph Hellwig 2018-03-19 15:37 ` Robin Murphy 2018-03-19 15:37 ` Robin Murphy 2018-03-19 15:48 ` Will Deacon 2018-03-19 15:48 ` Will Deacon 2018-03-19 16:03 ` Christoph Hellwig 2018-03-19 16:03 ` Christoph Hellwig 2018-03-19 16:55 ` Will Deacon 2018-03-19 16:55 ` Will Deacon 2018-03-19 18:01 ` Catalin Marinas 2018-03-19 18:01 ` Catalin Marinas 2018-03-19 19:49 ` Christoph Hellwig 2018-03-19 19:49 ` Christoph Hellwig 2018-03-20 16:23 ` Catalin Marinas 2018-03-20 16:23 ` Catalin Marinas 2018-03-23 19:53 ` [tip:x86/dma] dma/direct: Handle " tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 13/14] dma-direct: handle force decryption for dma coherent buffers " Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-19 14:51 ` Tom Lendacky 2018-03-19 14:51 ` Tom Lendacky 2018-03-23 19:53 ` [tip:x86/dma] dma/direct: Handle force decryption for DMA " tip-bot for Christoph Hellwig 2018-03-19 10:38 ` [PATCH 14/14] swiotlb: remove swiotlb_{alloc,free}_coherent Christoph Hellwig 2018-03-19 10:38 ` Christoph Hellwig 2018-03-23 19:54 ` [tip:x86/dma] dma/swiotlb: Remove swiotlb_{alloc,free}_coherent() tip-bot for Christoph Hellwig 2018-03-19 14:00 ` use generic dma-direct and swiotlb code for x86 V3 Tom Lendacky 2018-03-19 14:00 ` Tom Lendacky 2018-03-19 14:56 ` Thomas Gleixner 2018-03-19 14:56 ` Thomas Gleixner 2018-03-19 15:27 ` Konrad Rzeszutek Wilk 2018-03-19 15:27 ` Konrad Rzeszutek Wilk 2018-03-19 15:28 ` Christoph Hellwig 2018-03-20 8:37 ` Ingo Molnar 2018-03-20 8:37 ` Ingo Molnar 2018-03-20 8:44 ` Christoph Hellwig 2018-03-20 8:44 ` Christoph Hellwig 2018-03-20 9:03 ` Ingo Molnar 2018-03-20 9:03 ` Ingo Molnar [not found] ` <20180320090351.2qnwcsauhodrqxdj-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2018-03-20 11:25 ` Konrad Rzeszutek Wilk 2018-03-20 15:16 ` Christoph Hellwig 2018-03-20 15:16 ` Christoph Hellwig 2018-03-21 14:32 ` Konrad Rzeszutek Wilk 2018-03-21 14:32 ` Konrad Rzeszutek Wilk -- strict thread matches above, loose matches on Subject: below -- 2018-03-14 17:51 use generic dma-direct and swiotlb code for x86 V2 Christoph Hellwig 2018-03-14 17:52 ` [PATCH 11/14] swiotlb: remove swiotlb_set_mem_attributes Christoph Hellwig 2018-03-14 17:52 ` Christoph Hellwig 2018-03-15 17:51 ` Konrad Rzeszutek Wilk 2018-03-15 17:51 ` Konrad Rzeszutek Wilk 2018-03-15 17:54 ` Konrad Rzeszutek Wilk 2018-03-15 17:54 ` Konrad Rzeszutek Wilk
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=7fe2c163-c659-c27f-b54b-23b38e4b0149@amd.com \ --to=thomas.lendacky@amd.com \ --cc=dwmw2@infradead.org \ --cc=hch@lst.de \ --cc=iommu@lists.linux-foundation.org \ --cc=jdmason@kudzu.us \ --cc=joro@8bytes.org \ --cc=konrad.wilk@oracle.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mulix@mulix.org \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.