[GIT,PULL] percpu changes for v5.6-rc1

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git for-5.6

Commit Message

Dennis Zhou Feb. 3, 2020, 9:04 p.m. UTC

Hi Linus,

This pull request separates out variables that can be decrypted into
their own page anytime encryption can be enabled and fixes __percpu
annotations in asm-generic for sparse.

Thanks,
Dennis

The following changes since commit aedc0650f9135f3b92b39cbed1a8fe98d8088825:

  Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2019-12-04 11:08:30 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git for-5.6

for you to fetch changes up to 264b0d2bee148073c117e7bbbde5be7125a53be1:

  percpu: Separate decrypted varaibles anytime encryption can be enabled (2020-01-31 11:15:59 -0800)

----------------------------------------------------------------
Erdem Aktas (1):
      percpu: Separate decrypted varaibles anytime encryption can be enabled

Luc Van Oostenryck (1):
      percpu: fix __percpu annotation in asm-generic

 include/asm-generic/percpu.h | 10 +++++-----
 include/linux/percpu-defs.h  |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

Comments

[e-mail] Feb. 3, 2020, 10:35 p.m. UTC | #1

The pull request you sent on Mon, 3 Feb 2020 13:04:50 -0800:

> git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git for-5.6

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/322bf2d3446aabdaf5e8887775bd9ced80dbc0f0

Thank you!

Patch

diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h
index c2de013b2cf4..35e4a53b83e6 100644
--- a/include/asm-generic/percpu.h
+++ b/include/asm-generic/percpu.h
@@ -74,7 +74,7 @@  do {									\
 
 #define raw_cpu_generic_add_return(pcp, val)				\
 ({									\
-	typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp));			\
+	typeof(pcp) *__p = raw_cpu_ptr(&(pcp));				\
 									\
 	*__p += val;							\
 	*__p;								\
@@ -82,7 +82,7 @@  do {									\
 
 #define raw_cpu_generic_xchg(pcp, nval)					\
 ({									\
-	typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp));			\
+	typeof(pcp) *__p = raw_cpu_ptr(&(pcp));				\
 	typeof(pcp) __ret;						\
 	__ret = *__p;							\
 	*__p = nval;							\
@@ -91,7 +91,7 @@  do {									\
 
 #define raw_cpu_generic_cmpxchg(pcp, oval, nval)			\
 ({									\
-	typeof(&(pcp)) __p = raw_cpu_ptr(&(pcp));			\
+	typeof(pcp) *__p = raw_cpu_ptr(&(pcp));				\
 	typeof(pcp) __ret;						\
 	__ret = *__p;							\
 	if (__ret == (oval))						\
@@ -101,8 +101,8 @@  do {									\
 
 #define raw_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2) \
 ({									\
-	typeof(&(pcp1)) __p1 = raw_cpu_ptr(&(pcp1));			\
-	typeof(&(pcp2)) __p2 = raw_cpu_ptr(&(pcp2));			\
+	typeof(pcp1) *__p1 = raw_cpu_ptr(&(pcp1));			\
+	typeof(pcp2) *__p2 = raw_cpu_ptr(&(pcp2));			\
 	int __ret = 0;							\
 	if (*__p1 == (oval1) && *__p2  == (oval2)) {			\
 		*__p1 = nval1;						\
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h
index a6fabd865211..176bfbd52d97 100644
--- a/include/linux/percpu-defs.h
+++ b/include/linux/percpu-defs.h
@@ -175,8 +175,7 @@ 
  * Declaration/definition used for per-CPU variables that should be accessed
  * as decrypted when memory encryption is enabled in the guest.
  */
-#if defined(CONFIG_VIRTUALIZATION) && defined(CONFIG_AMD_MEM_ENCRYPT)
-
+#ifdef CONFIG_AMD_MEM_ENCRYPT
 #define DECLARE_PER_CPU_DECRYPTED(type, name)				\
 	DECLARE_PER_CPU_SECTION(type, name, "..decrypted")