[ndctl PATCH] ndctl: limit clear poison test to 4.6+ kernels
by Dan Williams
Prior kernels do not export a clear poison facility.
Signed-off-by: Dan Williams <dan.j.williams(a)intel.com>
---
test/clear.sh | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/test/clear.sh b/test/clear.sh
index e74522201231..16b0cbf3a71c 100755
--- a/test/clear.sh
+++ b/test/clear.sh
@@ -13,6 +13,15 @@ err() {
exit $rc
}
+eval $(uname -r | awk -F. '{print "maj="$1 ";" "min="$2}')
+if [ $maj -lt 4 ]; then
+ echo "kernel $maj.$min lacks clear poison support"
+ exit $rc
+elif [ $maj -eq 4 -a $min -lt 6 ]; then
+ echo "kernel $maj.$min lacks clear poison support"
+ exit $rc
+fi
+
set -e
trap 'err $LINENO' ERR
4 years, 9 months
[ndctl PATCH] ndctl: update minimum kernel for ARS tests
by Dan Williams
In 4.6 the kernel is updated to the new ACPI 6.1 definition of the ARS
command set. The unit test for ARS commands expects these latest
definitions, so disable this test by default on older kernels.
Signed-off-by: Dan Williams <dan.j.williams(a)intel.com>
---
test/libndctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/libndctl.c b/test/libndctl.c
index 2dd1eb6fcb0a..0cab89208867 100644
--- a/test/libndctl.c
+++ b/test/libndctl.c
@@ -1847,7 +1847,7 @@ static int check_commands(struct ndctl_bus *bus, struct ndctl_dimm *dimm,
if (rc)
goto out;
- if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 3, 0)))
+ if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 6, 0)))
goto out;
/* Check Bus commands */
4 years, 9 months
[PATCH 3.2 23/62] x86/uaccess/64: Make the __copy_user_nocache() assembly code more readable
by Ben Hutchings
3.2.79-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Toshi Kani <toshi.kani(a)hpe.com>
commit ee9737c924706aaa72c2ead93e3ad5644681dc1c upstream.
Add comments to __copy_user_nocache() to clarify its procedures
and alignment requirements.
Also change numeric branch target labels to named local labels.
No code changed:
arch/x86/lib/copy_user_64.o:
text data bss dec hex filename
1239 0 0 1239 4d7 copy_user_64.o.before
1239 0 0 1239 4d7 copy_user_64.o.after
md5:
58bed94c2db98c1ca9a2d46d0680aaae copy_user_64.o.before.asm
58bed94c2db98c1ca9a2d46d0680aaae copy_user_64.o.after.asm
Signed-off-by: Toshi Kani <toshi.kani(a)hpe.com>
Cc: Andrew Morton <akpm(a)linux-foundation.org>
Cc: Andy Lutomirski <luto(a)amacapital.net>
Cc: Borislav Petkov <bp(a)alien8.de>
Cc: Borislav Petkov <bp(a)suse.de>
Cc: Brian Gerst <brgerst(a)gmail.com>
Cc: Denys Vlasenko <dvlasenk(a)redhat.com>
Cc: H. Peter Anvin <hpa(a)zytor.com>
Cc: Linus Torvalds <torvalds(a)linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof(a)suse.com>
Cc: Peter Zijlstra <peterz(a)infradead.org>
Cc: Thomas Gleixner <tglx(a)linutronix.de>
Cc: Toshi Kani <toshi.kani(a)hp.com>
Cc: brian.boylston(a)hpe.com
Cc: dan.j.williams(a)intel.com
Cc: linux-nvdimm(a)lists.01.org
Cc: micah.parrish(a)hpe.com
Cc: ross.zwisler(a)linux.intel.com
Cc: vishal.l.verma(a)intel.com
Link: http://lkml.kernel.org/r/1455225857-12039-2-git-send-email-toshi.kani@hpe...
[ Small readability edits and added object file comparison. ]
Signed-off-by: Ingo Molnar <mingo(a)kernel.org>
[bwh: Backported to 3.2: aadjust filename, context]
Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk>
---
arch/x86/lib/copy_user_nocache_64.S | 114 ++++++++++++++++++++++++++++----------------
1 file changed, 73 insertions(+), 41 deletions(-)
--- a/arch/x86/lib/copy_user_nocache_64.S
+++ b/arch/x86/lib/copy_user_nocache_64.S
@@ -44,17 +44,30 @@
/*
* copy_user_nocache - Uncached memory copy with exception handling
- * This will force destination/source out of cache for more performance.
+ * This will force destination out of cache for more performance.
+ *
+ * Note: Cached memory copy is used when destination or size is not
+ * naturally aligned. That is:
+ * - Require 8-byte alignment when size is 8 bytes or larger.
*/
ENTRY(__copy_user_nocache)
CFI_STARTPROC
+
+ /* If size is less than 8 bytes, go to byte copy */
cmpl $8,%edx
- jb 20f /* less then 8 bytes, go to byte copy loop */
+ jb .L_1b_cache_copy_entry
+
+ /* If destination is not 8-byte aligned, "cache" copy to align it */
ALIGN_DESTINATION
+
+ /* Set 4x8-byte copy count and remainder */
movl %edx,%ecx
andl $63,%edx
shrl $6,%ecx
- jz 17f
+ jz .L_8b_nocache_copy_entry /* jump if count is 0 */
+
+ /* Perform 4x8-byte nocache loop-copy */
+.L_4x8b_nocache_copy_loop:
1: movq (%rsi),%r8
2: movq 1*8(%rsi),%r9
3: movq 2*8(%rsi),%r10
@@ -74,60 +87,79 @@ ENTRY(__copy_user_nocache)
leaq 64(%rsi),%rsi
leaq 64(%rdi),%rdi
decl %ecx
- jnz 1b
-17: movl %edx,%ecx
+ jnz .L_4x8b_nocache_copy_loop
+
+ /* Set 8-byte copy count and remainder */
+.L_8b_nocache_copy_entry:
+ movl %edx,%ecx
andl $7,%edx
shrl $3,%ecx
- jz 20f
-18: movq (%rsi),%r8
-19: movnti %r8,(%rdi)
+ jz .L_1b_cache_copy_entry /* jump if count is 0 */
+
+ /* Perform 8-byte nocache loop-copy */
+.L_8b_nocache_copy_loop:
+20: movq (%rsi),%r8
+21: movnti %r8,(%rdi)
leaq 8(%rsi),%rsi
leaq 8(%rdi),%rdi
decl %ecx
- jnz 18b
-20: andl %edx,%edx
- jz 23f
+ jnz .L_8b_nocache_copy_loop
+
+ /* If no byte left, we're done */
+.L_1b_cache_copy_entry:
+ andl %edx,%edx
+ jz .L_finish_copy
+
+ /* Perform byte "cache" loop-copy for the remainder */
movl %edx,%ecx
-21: movb (%rsi),%al
-22: movb %al,(%rdi)
+.L_1b_cache_copy_loop:
+40: movb (%rsi),%al
+41: movb %al,(%rdi)
incq %rsi
incq %rdi
decl %ecx
- jnz 21b
-23: xorl %eax,%eax
+ jnz .L_1b_cache_copy_loop
+
+ /* Finished copying; fence the prior stores */
+.L_finish_copy:
+ xorl %eax,%eax
sfence
ret
.section .fixup,"ax"
-30: shll $6,%ecx
+.L_fixup_4x8b_copy:
+ shll $6,%ecx
addl %ecx,%edx
- jmp 60f
-40: lea (%rdx,%rcx,8),%rdx
- jmp 60f
-50: movl %ecx,%edx
-60: sfence
+ jmp .L_fixup_handle_tail
+.L_fixup_8b_copy:
+ lea (%rdx,%rcx,8),%rdx
+ jmp .L_fixup_handle_tail
+.L_fixup_1b_copy:
+ movl %ecx,%edx
+.L_fixup_handle_tail:
+ sfence
jmp copy_user_handle_tail
.previous
- _ASM_EXTABLE(1b,30b)
- _ASM_EXTABLE(2b,30b)
- _ASM_EXTABLE(3b,30b)
- _ASM_EXTABLE(4b,30b)
- _ASM_EXTABLE(5b,30b)
- _ASM_EXTABLE(6b,30b)
- _ASM_EXTABLE(7b,30b)
- _ASM_EXTABLE(8b,30b)
- _ASM_EXTABLE(9b,30b)
- _ASM_EXTABLE(10b,30b)
- _ASM_EXTABLE(11b,30b)
- _ASM_EXTABLE(12b,30b)
- _ASM_EXTABLE(13b,30b)
- _ASM_EXTABLE(14b,30b)
- _ASM_EXTABLE(15b,30b)
- _ASM_EXTABLE(16b,30b)
- _ASM_EXTABLE(18b,40b)
- _ASM_EXTABLE(19b,40b)
- _ASM_EXTABLE(21b,50b)
- _ASM_EXTABLE(22b,50b)
+ _ASM_EXTABLE(1b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(2b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(3b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(4b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(5b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(6b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(7b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(8b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(9b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(10b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(11b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(12b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(13b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(14b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(15b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(16b,.L_fixup_4x8b_copy)
+ _ASM_EXTABLE(20b,.L_fixup_8b_copy)
+ _ASM_EXTABLE(21b,.L_fixup_8b_copy)
+ _ASM_EXTABLE(40b,.L_fixup_1b_copy)
+ _ASM_EXTABLE(41b,.L_fixup_1b_copy)
CFI_ENDPROC
ENDPROC(__copy_user_nocache)
4 years, 9 months
[PATCH 3.2 24/62] x86/uaccess/64: Handle the caching of 4-byte nocache copies properly in __copy_user_nocache()
by Ben Hutchings
3.2.79-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Toshi Kani <toshi.kani(a)hpe.com>
commit a82eee7424525e34e98d821dd059ce14560a1e35 upstream.
Data corruption issues were observed in tests which initiated
a system crash/reset while accessing BTT devices. This problem
is reproducible.
The BTT driver calls pmem_rw_bytes() to update data in pmem
devices. This interface calls __copy_user_nocache(), which
uses non-temporal stores so that the stores to pmem are
persistent.
__copy_user_nocache() uses non-temporal stores when a request
size is 8 bytes or larger (and is aligned by 8 bytes). The
BTT driver updates the BTT map table, which entry size is
4 bytes. Therefore, updates to the map table entries remain
cached, and are not written to pmem after a crash.
Change __copy_user_nocache() to use non-temporal store when
a request size is 4 bytes. The change extends the current
byte-copy path for a less-than-8-bytes request, and does not
add any overhead to the regular path.
Reported-and-tested-by: Micah Parrish <micah.parrish(a)hpe.com>
Reported-and-tested-by: Brian Boylston <brian.boylston(a)hpe.com>
Signed-off-by: Toshi Kani <toshi.kani(a)hpe.com>
Cc: Andrew Morton <akpm(a)linux-foundation.org>
Cc: Andy Lutomirski <luto(a)amacapital.net>
Cc: Borislav Petkov <bp(a)alien8.de>
Cc: Borislav Petkov <bp(a)suse.de>
Cc: Brian Gerst <brgerst(a)gmail.com>
Cc: Dan Williams <dan.j.williams(a)intel.com>
Cc: Denys Vlasenko <dvlasenk(a)redhat.com>
Cc: H. Peter Anvin <hpa(a)zytor.com>
Cc: Linus Torvalds <torvalds(a)linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof(a)suse.com>
Cc: Peter Zijlstra <peterz(a)infradead.org>
Cc: Ross Zwisler <ross.zwisler(a)linux.intel.com>
Cc: Thomas Gleixner <tglx(a)linutronix.de>
Cc: Toshi Kani <toshi.kani(a)hp.com>
Cc: Vishal Verma <vishal.l.verma(a)intel.com>
Cc: linux-nvdimm(a)lists.01.org
Link: http://lkml.kernel.org/r/1455225857-12039-3-git-send-email-toshi.kani@hpe...
[ Small readability edits. ]
Signed-off-by: Ingo Molnar <mingo(a)kernel.org>
[bwh: Backported to 3.2: aadjust filename, context]
Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk>
---
arch/x86/lib/copy_user_nocache_64.S | 36 ++++++++++++++++++++++++++++++++----
1 file changed, 32 insertions(+), 4 deletions(-)
--- a/arch/x86/lib/copy_user_nocache_64.S
+++ b/arch/x86/lib/copy_user_nocache_64.S
@@ -49,13 +49,14 @@
* Note: Cached memory copy is used when destination or size is not
* naturally aligned. That is:
* - Require 8-byte alignment when size is 8 bytes or larger.
+ * - Require 4-byte alignment when size is 4 bytes.
*/
ENTRY(__copy_user_nocache)
CFI_STARTPROC
- /* If size is less than 8 bytes, go to byte copy */
+ /* If size is less than 8 bytes, go to 4-byte copy */
cmpl $8,%edx
- jb .L_1b_cache_copy_entry
+ jb .L_4b_nocache_copy_entry
/* If destination is not 8-byte aligned, "cache" copy to align it */
ALIGN_DESTINATION
@@ -94,7 +95,7 @@ ENTRY(__copy_user_nocache)
movl %edx,%ecx
andl $7,%edx
shrl $3,%ecx
- jz .L_1b_cache_copy_entry /* jump if count is 0 */
+ jz .L_4b_nocache_copy_entry /* jump if count is 0 */
/* Perform 8-byte nocache loop-copy */
.L_8b_nocache_copy_loop:
@@ -106,11 +107,33 @@ ENTRY(__copy_user_nocache)
jnz .L_8b_nocache_copy_loop
/* If no byte left, we're done */
-.L_1b_cache_copy_entry:
+.L_4b_nocache_copy_entry:
+ andl %edx,%edx
+ jz .L_finish_copy
+
+ /* If destination is not 4-byte aligned, go to byte copy: */
+ movl %edi,%ecx
+ andl $3,%ecx
+ jnz .L_1b_cache_copy_entry
+
+ /* Set 4-byte copy count (1 or 0) and remainder */
+ movl %edx,%ecx
+ andl $3,%edx
+ shrl $2,%ecx
+ jz .L_1b_cache_copy_entry /* jump if count is 0 */
+
+ /* Perform 4-byte nocache copy: */
+30: movl (%rsi),%r8d
+31: movnti %r8d,(%rdi)
+ leaq 4(%rsi),%rsi
+ leaq 4(%rdi),%rdi
+
+ /* If no bytes left, we're done: */
andl %edx,%edx
jz .L_finish_copy
/* Perform byte "cache" loop-copy for the remainder */
+.L_1b_cache_copy_entry:
movl %edx,%ecx
.L_1b_cache_copy_loop:
40: movb (%rsi),%al
@@ -134,6 +157,9 @@ ENTRY(__copy_user_nocache)
.L_fixup_8b_copy:
lea (%rdx,%rcx,8),%rdx
jmp .L_fixup_handle_tail
+.L_fixup_4b_copy:
+ lea (%rdx,%rcx,4),%rdx
+ jmp .L_fixup_handle_tail
.L_fixup_1b_copy:
movl %ecx,%edx
.L_fixup_handle_tail:
@@ -159,6 +185,8 @@ ENTRY(__copy_user_nocache)
_ASM_EXTABLE(16b,.L_fixup_4x8b_copy)
_ASM_EXTABLE(20b,.L_fixup_8b_copy)
_ASM_EXTABLE(21b,.L_fixup_8b_copy)
+ _ASM_EXTABLE(30b,.L_fixup_4b_copy)
+ _ASM_EXTABLE(31b,.L_fixup_4b_copy)
_ASM_EXTABLE(40b,.L_fixup_1b_copy)
_ASM_EXTABLE(41b,.L_fixup_1b_copy)
CFI_ENDPROC
4 years, 9 months
[PATCH] libnvdimm, pfn: fix uuid validation
by Dan Williams
If we detect a namespace has a stale info block in the init path, we
should overwrite with the latest configuration. In fact, we already
return -ENODEV when the parent uuid is invalid, the same should be done
for the 'self' uuid. Otherwise we can get into a condition where
userspace is unable to reconfigure the pfn-device without directly /
manually invalidating the info block.
Cc: <stable(a)vger.kernel.org>
Reported-by: Jeff Moyer <jmoyer(a)redhat.com>
Signed-off-by: Dan Williams <dan.j.williams(a)intel.com>
---
drivers/nvdimm/pfn_devs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
index 254d3bc13f70..e071e214feba 100644
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@ -376,7 +376,7 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn)
} else {
/* from init we validate */
if (memcmp(nd_pfn->uuid, pfn_sb->uuid, 16) != 0)
- return -EINVAL;
+ return -ENODEV;
}
if (nd_pfn->align > nvdimm_namespace_capacity(ndns)) {
4 years, 9 months
鸿运当头
by 骆分依
项目管理实战操作（2天实践型）
【时间地点】 2016年O4月26-27 上海 O5月19-2O 苏州 O7月28-29 上海
【参加对象】项目总监、部门经理、高级项目经理、项目团队成员等，特别适合正在从事项目管理的人员
【授课方式】 讲师讲授+ 案例研讨 +角色扮演 + 讲师点评
【学习费用】 5200元/两天（含两天中餐、指定教材、茶点）
【垂询热线】 0512-687OO653 （O）18O15596327
课程背景
随着市场竞争的日益加剧，企业只靠维持现状的执行系统越来越不能满足不断变化的市场需求，因而项目管理也越来越受到企业的重视。本课程通过讲师讲解、案例分析、小组讨论、学员练习等授课方式，给你带来全新的思维视角，让深陷项目困扰的你蓦然回首、茅塞顿开。整个课程远离理论上的说教，而是强调如何把项目管理的工具和技巧应用到实际的项目中去，去解决项目管理过程中经常出现的范围不清、质量缺陷、进度拖期等具体问题。
课程收益
对企业而言，我们确保学员在培训完成后，大家能用同一种理念，同一种方法，同一种图解，同一种表格来完成项目。
参训的每一位学员培训后都将培养成具有以下，项目经理必备的三种能力：
A、确定范围
B、在范围内完成任务的可置信度
C、分析趋势的能力
课程宗旨
“今天培训结束，明天开始动手。”——培训就是为了改变理念，把所学到的管理工具运用到平时的工作中去。
“没有图表就是没有管理，没有数字就是没有控制”。
第一天
一、项目及项目管理（9:00—10:30）
讲师：
什么叫项目
项目的特点
什么叫管理
什么叫项目管理
课堂练习
回答参加者问题
学员：
做练习题
讨论
学员提问
10:30—10:45 休息
二、项目及其所处的环境分析（10:45—12:00）
讲师：
项目中投资人与项目经理的关系
项目经理的职责
项目中利害关系人分析
项目早期估算的一般工具
项目阶段图和资源图的制作方法
学员：
讨论
提问
12:00—13:00 午餐
三、项目沟通管理（13:00—14:30）
讲师：
项目的横向沟通
项目中跨部门协调的问题解决方法
项目的归属和项目目标SMART分析方法
项目管理的发展历史
项目工作陈述表的制作方法
学员：
提问
做跨部门协调表格练习
14:30—14:45休息
课堂作业：（14:45—17:00）
完成项目启动阶段的“二图一表”
完成案例中的“阶段图”、“资源图”和“工作陈述表”
第二天
四、项目范围管理（WBS 和RAM 的制作方法和规定）（9:00—10:30）
讲师：
项目的工作分解结构（WBS）
WBS的评估方法
WBS中的注意事项
一个完整的WBS系统应该达到什么目的
项目的责任矩阵表(RAM)
布置课堂作业（学员案例中的WBS和RAM ）
学员：
提问
交流
每人做案例模拟的开头3个模块
10:30—10:45 休息
课堂作业：（10:45—12:00）
讲师：完成项目范围阶段的“一图一表”
学员：课堂完成案例中的WBS和RAM
12:00—13:00 午餐
五、项目时间管理（网络图的基本制作方法）（13:00—14:30）
讲师：
制作任务与任务之间的逻辑网络图（PDM，ADM，GERT，Network Board）的四种方法
学员：
讨论所做的案例
发表对项目时间管理的看法
根据项目时间管理的规定，各自发表个人的意见
六、项目时间管理（带有CPM网络图的制作方法）
讲师：
课堂练习
初级网络图制作
高级网络图内容及制作方法
小组练习
学员：
课堂练习---初级网络图制作
小组练习---以小组形式完成高级网络图等练习
14:30—14:45休息
七、项目时间管理（9大工具及CPM网络图的10大用途）（14:45—16:30）
讲师：
带有CPM的网络图的特点及十大功能
甘特图的作用
做阿尔法案例
总结项目时间管理的九大工具
解答学员问题
学员：
做阿尔法案例练习
学员提问
掌握项目经理必备的4个工具（WBS，RAM，CPM图，甘特图）
课程结束总结：（16:30—17:00）
讲师：
学员问题与答疑
项目“五图二表”的总结
布置课后作业
学员：
学员积极提问
收集完成回家作业的基本方法
pfyujqxucafafgqy1qvggkfrwvqwwjy4k0imfajgtst2mvrpv6vd0vbgpced
4 years, 9 months
[PATCH v3] x86, pmem: use memcpy_mcsafe() for memcpy_from_pmem()
by Dan Williams
Update the definition of memcpy_from_pmem() to return 0 or a negative
error code. Implement x86/arch_memcpy_from_pmem() with memcpy_mcsafe().
Cc: Borislav Petkov <bp(a)alien8.de>
Cc: Ingo Molnar <mingo(a)kernel.org>
Cc: Tony Luck <tony.luck(a)intel.com>
Cc: Thomas Gleixner <tglx(a)linutronix.de>
Cc: Andy Lutomirski <luto(a)amacapital.net>
Cc: Peter Zijlstra <peterz(a)infradead.org>
Cc: Andrew Morton <akpm(a)linux-foundation.org>
Cc: Linus Torvalds <torvalds(a)linux-foundation.org>
Reviewed-by: Ross Zwisler <ross.zwisler(a)linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams(a)intel.com>
---
arch/x86/include/asm/pmem.h | 9 +++++++++
drivers/nvdimm/pmem.c | 4 ++--
include/linux/pmem.h | 21 +++++++++++++++------
3 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/arch/x86/include/asm/pmem.h b/arch/x86/include/asm/pmem.h
index bf8b35d2035a..fbc5e92e1ecc 100644
--- a/arch/x86/include/asm/pmem.h
+++ b/arch/x86/include/asm/pmem.h
@@ -47,6 +47,15 @@ static inline void arch_memcpy_to_pmem(void __pmem *dst, const void *src,
BUG();
}
+static inline int arch_memcpy_from_pmem(void *dst, const void __pmem *src,
+ size_t n)
+{
+ if (static_cpu_has(X86_FEATURE_MCE_RECOVERY))
+ return memcpy_mcsafe(dst, (void __force *) src, n);
+ memcpy(dst, (void __force *) src, n);
+ return 0;
+}
+
/**
* arch_wmb_pmem - synchronize writes to persistent memory
*
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index ca5721c306bb..cc31c6f1f88e 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -99,7 +99,7 @@ static int pmem_do_bvec(struct pmem_device *pmem, struct page *page,
if (unlikely(bad_pmem))
rc = -EIO;
else {
- memcpy_from_pmem(mem + off, pmem_addr, len);
+ rc = memcpy_from_pmem(mem + off, pmem_addr, len);
flush_dcache_page(page);
}
} else {
@@ -295,7 +295,7 @@ static int pmem_rw_bytes(struct nd_namespace_common *ndns,
if (unlikely(is_bad_pmem(&pmem->bb, offset / 512, sz_align)))
return -EIO;
- memcpy_from_pmem(buf, pmem->virt_addr + offset, size);
+ return memcpy_from_pmem(buf, pmem->virt_addr + offset, size);
} else {
memcpy_to_pmem(pmem->virt_addr + offset, buf, size);
wmb_pmem();
diff --git a/include/linux/pmem.h b/include/linux/pmem.h
index 3ec5309e29f3..cc948191a653 100644
--- a/include/linux/pmem.h
+++ b/include/linux/pmem.h
@@ -42,6 +42,12 @@ static inline void arch_memcpy_to_pmem(void __pmem *dst, const void *src,
BUG();
}
+static inline int arch_memcpy_from_pmem(void *dst, const void __pmem *src,
+ size_t n)
+{
+ BUG();
+}
+
static inline size_t arch_copy_from_iter_pmem(void __pmem *addr, size_t bytes,
struct iov_iter *i)
{
@@ -66,14 +72,17 @@ static inline void arch_invalidate_pmem(void __pmem *addr, size_t size)
#endif
/*
- * Architectures that define ARCH_HAS_PMEM_API must provide
- * implementations for arch_memcpy_to_pmem(), arch_wmb_pmem(),
- * arch_copy_from_iter_pmem(), arch_clear_pmem(), arch_wb_cache_pmem()
- * and arch_has_wmb_pmem().
+ * memcpy_from_pmem - read from persistent memory with error handling
+ * @dst: destination buffer
+ * @src: source buffer
+ * @size: transfer length
+ *
+ * Returns 0 on success negative error code on failure.
*/
-static inline void memcpy_from_pmem(void *dst, void __pmem const *src, size_t size)
+static inline int memcpy_from_pmem(void *dst, void __pmem const *src,
+ size_t size)
{
- memcpy(dst, (void __force const *) src, size);
+ return arch_memcpy_from_pmem(dst, src, size);
}
static inline bool arch_has_pmem_api(void)
4 years, 9 months
[PATCH 00/13] prep for device-dax, untangle pfn-device setup
by Dan Williams
The infrastructure for setting up a pfn-device (struct page memmap array
allocation for reserved memory) is generally useful. Untangle it from
the pmem driver and make it available as core libnvdimm functionality.
The motivation for this work is an investigation into a standalone
device-dax facility, but the changes stand on their own.
Outside of exporting nvdimm_setup_pfn() as a generic facility this also
includes the following benefits:
1/ fix a section alignment vs badblocks tracking bug
2/ struct pmem_device sheds 24 bytes
3/ struct blk_device is replaced with some (smaller in total) extensions
to struct nd_namespace_blk.
4/ Reduce pointer chasing by retrieving driver private data from
->queuedata rather than bio->bi_bdev->bd_disk->private_data.
---
Dan Williams (13):
libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment
libnvdimm, pmem: kill pmem->ndns
libnvdimm, pfn, convert nd_pfn_probe() to devm
libnvdimm, btt, convert nd_btt_probe() to devm
libnvdimm, blk: use devm_add_action to release bdev resources
libnvdimm, blk: use ->queuedata for driver private data
libnvdimm, pmem: use ->queuedata for driver private data
libnvdimm, blk: move i/o infrastructure to nd_namespace_blk
libnvdimm, pmem: use devm_add_action to release bdev resources
libnvdimm, pmem: clean up resource print / request
libnvdimm, pmem, pfn: make pmem_rw_bytes generic and refactor pfn setup
libnvdimm, pmem, pfn: move pfn setup to the core
libnvdimm, pmem: kill ->pmem_queue and ->pmem_disk
drivers/nvdimm/blk.c | 208 ++++++++--------
drivers/nvdimm/btt.c | 20 +-
drivers/nvdimm/btt_devs.c | 24 +-
drivers/nvdimm/claim.c | 61 +++++
drivers/nvdimm/core.c | 41 ++-
drivers/nvdimm/nd.h | 50 +++-
drivers/nvdimm/pfn_devs.c | 208 +++++++++++++++-
drivers/nvdimm/pmem.c | 475 +++++++++----------------------------
include/linux/nd.h | 11 +
tools/testing/nvdimm/Kbuild | 1
tools/testing/nvdimm/test/iomap.c | 27 ++
11 files changed, 579 insertions(+), 547 deletions(-)
4 years, 9 months
[PATCH] libnvdimm, blk: quiet i/o error reporting
by Dan Williams
I/O errors events have the potential to be a high frequency and a log
message for each event can swamp the system. This message is also
redundant with upper layer error reporting.
Cc: Ross Zwisler <ross.zwisler(a)linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams(a)intel.com>
---
Previously this was folded into "[PATCH 08/13] libnvdimm, blk: move i/o
infrastructure to nd_namespace_blk", but it deserves to be its own
change.
drivers/nvdimm/blk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c
index c8635b3d88a8..26d039879ba2 100644
--- a/drivers/nvdimm/blk.c
+++ b/drivers/nvdimm/blk.c
@@ -189,7 +189,7 @@ static blk_qc_t nd_blk_make_request(struct request_queue *q, struct bio *bio)
err = nd_blk_do_bvec(blk_dev, bip, bvec.bv_page, len,
bvec.bv_offset, rw, iter.bi_sector);
if (err) {
- dev_info(&blk_dev->nsblk->common.dev,
+ dev_dbg(&blk_dev->nsblk->common.dev,
"io error in %s sector %lld, len %d,\n",
(rw == READ) ? "READ" : "WRITE",
(unsigned long long) iter.bi_sector, len);
4 years, 9 months
