From: Toshi Kani <toshi.kani@hp.com> To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, akpm@linux-foundation.org, arnd@arndb.de Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-nvdimm@lists.01.org, jgross@suse.com, stefan.bader@canonical.com, luto@amacapital.net, hmh@hmh.eng.br, yigal@plexistor.com, konrad.wilk@oracle.com, Elliott@hp.com, mcgrof@suse.com, hch@lst.de, Toshi Kani <toshi.kani@hp.com> Subject: [PATCH v9 6/10] x86, mm, pat: Add pgprot_writethrough() for WT Date: Wed, 13 May 2015 15:05:47 -0600 [thread overview] Message-ID: <1431551151-19124-7-git-send-email-toshi.kani@hp.com> (raw) In-Reply-To: <1431551151-19124-1-git-send-email-toshi.kani@hp.com> This patch adds pgprot_writethrough() for setting WT to a given pgprot_t. Signed-off-by: Toshi Kani <toshi.kani@hp.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- arch/x86/include/asm/pgtable_types.h | 3 +++ arch/x86/mm/pat.c | 10 ++++++++++ include/asm-generic/pgtable.h | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index 78f0c8c..13f310b 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -367,6 +367,9 @@ extern int nx_enabled; #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); +#define pgprot_writethrough pgprot_writethrough +extern pgprot_t pgprot_writethrough(pgprot_t prot); + /* Indicate that x86 has its own track and untrack pfn vma functions */ #define __HAVE_PFNMAP_TRACKING diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index d932b43..aee5cdf 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -972,6 +972,16 @@ pgprot_t pgprot_writecombine(pgprot_t prot) } EXPORT_SYMBOL_GPL(pgprot_writecombine); +pgprot_t pgprot_writethrough(pgprot_t prot) +{ + if (pat_enabled) + return __pgprot(pgprot_val(prot) | + cachemode2protval(_PAGE_CACHE_MODE_WT)); + else + return pgprot_noncached(prot); +} +EXPORT_SYMBOL_GPL(pgprot_writethrough); + #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT) static struct memtype *memtype_get_idx(loff_t pos) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 39f1d6a..bd910ce 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -262,6 +262,10 @@ static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b) #define pgprot_writecombine pgprot_noncached #endif +#ifndef pgprot_writethrough +#define pgprot_writethrough pgprot_noncached +#endif + #ifndef pgprot_device #define pgprot_device pgprot_noncached #endif -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Toshi Kani <toshi.kani@hp.com> To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, akpm@linux-foundation.org, arnd@arndb.de Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-nvdimm@ml01.01.org, jgross@suse.com, stefan.bader@canonical.com, luto@amacapital.net, hmh@hmh.eng.br, yigal@plexistor.com, konrad.wilk@oracle.com, Elliott@hp.com, mcgrof@suse.com, hch@lst.de, Toshi Kani <toshi.kani@hp.com> Subject: [PATCH v9 6/10] x86, mm, pat: Add pgprot_writethrough() for WT Date: Wed, 13 May 2015 15:05:47 -0600 [thread overview] Message-ID: <1431551151-19124-7-git-send-email-toshi.kani@hp.com> (raw) In-Reply-To: <1431551151-19124-1-git-send-email-toshi.kani@hp.com> This patch adds pgprot_writethrough() for setting WT to a given pgprot_t. Signed-off-by: Toshi Kani <toshi.kani@hp.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- arch/x86/include/asm/pgtable_types.h | 3 +++ arch/x86/mm/pat.c | 10 ++++++++++ include/asm-generic/pgtable.h | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index 78f0c8c..13f310b 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -367,6 +367,9 @@ extern int nx_enabled; #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); +#define pgprot_writethrough pgprot_writethrough +extern pgprot_t pgprot_writethrough(pgprot_t prot); + /* Indicate that x86 has its own track and untrack pfn vma functions */ #define __HAVE_PFNMAP_TRACKING diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index d932b43..aee5cdf 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -972,6 +972,16 @@ pgprot_t pgprot_writecombine(pgprot_t prot) } EXPORT_SYMBOL_GPL(pgprot_writecombine); +pgprot_t pgprot_writethrough(pgprot_t prot) +{ + if (pat_enabled) + return __pgprot(pgprot_val(prot) | + cachemode2protval(_PAGE_CACHE_MODE_WT)); + else + return pgprot_noncached(prot); +} +EXPORT_SYMBOL_GPL(pgprot_writethrough); + #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT) static struct memtype *memtype_get_idx(loff_t pos) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 39f1d6a..bd910ce 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -262,6 +262,10 @@ static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b) #define pgprot_writecombine pgprot_noncached #endif +#ifndef pgprot_writethrough +#define pgprot_writethrough pgprot_noncached +#endif + #ifndef pgprot_device #define pgprot_device pgprot_noncached #endif
next prev parent reply other threads:[~2015-05-13 21:05 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-13 21:05 [PATCH v9 0/10] Support Write-Through mapping on x86 Toshi Kani 2015-05-13 21:05 ` Toshi Kani 2015-05-13 21:05 ` [PATCH v9 1/10] x86, mm, pat: Set WT to PA7 slot of PAT MSR Toshi Kani 2015-05-13 21:05 ` Toshi Kani 2015-05-22 6:55 ` Thomas Gleixner 2015-05-22 6:55 ` Thomas Gleixner 2015-05-13 21:05 ` [PATCH v9 2/10] x86, mm, pat: Change reserve_memtype() for WT Toshi Kani 2015-05-13 21:05 ` Toshi Kani 2015-05-22 7:01 ` Thomas Gleixner 2015-05-22 7:01 ` Thomas Gleixner 2015-05-13 21:05 ` [PATCH v9 3/10] x86, asm: Change is_new_memtype_allowed() " Toshi Kani 2015-05-13 21:05 ` Toshi Kani 2015-05-22 7:02 ` Thomas Gleixner 2015-05-22 7:02 ` Thomas Gleixner 2015-05-13 21:05 ` [PATCH v9 4/10] x86, mm, asm-gen: Add ioremap_wt() " Toshi Kani 2015-05-13 21:05 ` Toshi Kani 2015-05-22 7:08 ` Thomas Gleixner 2015-05-22 7:08 ` Thomas Gleixner 2015-05-13 21:05 ` [PATCH v9 5/10] arch/*/asm/io.h: Add ioremap_wt() to all architectures Toshi Kani 2015-05-13 21:05 ` Toshi Kani 2015-05-22 7:15 ` Thomas Gleixner 2015-05-22 7:15 ` Thomas Gleixner 2015-05-22 14:08 ` Toshi Kani 2015-05-22 14:08 ` Toshi Kani 2015-05-13 21:05 ` Toshi Kani [this message] 2015-05-13 21:05 ` [PATCH v9 6/10] x86, mm, pat: Add pgprot_writethrough() for WT Toshi Kani 2015-05-22 7:16 ` Thomas Gleixner 2015-05-22 7:16 ` Thomas Gleixner 2015-05-13 21:05 ` [PATCH v9 7/10] x86, mm, asm: Add WT support to set_page_memtype() Toshi Kani 2015-05-13 21:05 ` Toshi Kani 2015-05-22 7:35 ` Thomas Gleixner 2015-05-22 7:35 ` Thomas Gleixner 2015-05-22 15:04 ` Toshi Kani 2015-05-22 15:04 ` Toshi Kani 2015-05-13 21:05 ` [PATCH v9 8/10] x86, mm: Add set_memory_wt() for WT Toshi Kani 2015-05-13 21:05 ` Toshi Kani 2015-05-22 7:48 ` Thomas Gleixner 2015-05-22 7:48 ` Thomas Gleixner 2015-05-22 15:30 ` Toshi Kani 2015-05-22 15:30 ` Toshi Kani 2015-05-13 21:05 ` [PATCH v9 9/10] x86, mm, pat: Refactor !pat_enabled handling Toshi Kani 2015-05-13 21:05 ` Toshi Kani 2015-05-22 8:34 ` Thomas Gleixner 2015-05-22 8:34 ` Thomas Gleixner 2015-05-22 16:27 ` Toshi Kani 2015-05-22 16:27 ` Toshi Kani 2015-05-13 21:05 ` [PATCH v9 10/10] drivers/block/pmem: Map NVDIMM with ioremap_wt() Toshi Kani 2015-05-13 21:05 ` Toshi Kani 2015-05-14 21:52 ` Dan Williams 2015-05-14 21:52 ` Dan Williams 2015-05-14 22:20 ` Toshi Kani 2015-05-14 22:20 ` Toshi Kani
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=1431551151-19124-7-git-send-email-toshi.kani@hp.com \ --to=toshi.kani@hp.com \ --cc=Elliott@hp.com \ --cc=akpm@linux-foundation.org \ --cc=arnd@arndb.de \ --cc=hch@lst.de \ --cc=hmh@hmh.eng.br \ --cc=hpa@zytor.com \ --cc=jgross@suse.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.org \ --cc=luto@amacapital.net \ --cc=mcgrof@suse.com \ --cc=mingo@redhat.com \ --cc=stefan.bader@canonical.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ --cc=yigal@plexistor.com \ /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.