Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 13 Dec 2019 15:37:07 -0800
From:   Dennis Zhou <dennis@kernel.org>
To:     David Rientjes <rientjes@google.com>
Cc:     Dennis Zhou <dennis@kernel.org>, Tejun Heo <tj@kernel.org>,
        Christoph Lameter <cl@linux.com>,
        Erdem Aktas <erdemaktas@google.com>,
        Borislav Petkov <bp@suse.de>,
        Brijesh Singh <brijesh.singh@amd.com>,
        linux-kernel@vger.kernel.org
Subject: Re: [patch] percpu: Separate decrypted varaibles anytime encryption
 can be enabled
Message-ID: <20191213233707.GA89837@dennisz-mbp.dhcp.thefacebook.com>
References: <alpine.DEB.2.21.1912131330150.51759@chino.kir.corp.google.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.21.1912131330150.51759@chino.kir.corp.google.com>
User-Agent: Mutt/1.12.2 (2019-09-21)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi David,

On Fri, Dec 13, 2019 at 01:31:46PM -0800, David Rientjes wrote:
> From: Erdem Aktas <erdemaktas@google.com>
> 
> CONFIG_VIRTUALIZATION may not be enabled for memory encrypted guests.  If
> disabled, decrypted per-CPU variables may end up sharing the same page
> with variables that should be left encrypted.
> 
> Always separate per-CPU variables that should be decrypted into their own
> page anytime memory encryption can be enabled in the guest rather than
> rely on any other config option that may not be enabled.
> 
> Fixes: ac26963a1175 ("percpu: Introduce DEFINE_PER_CPU_DECRYPTED")
> Cc: stable@vger.kernel.org # 4.15+
> Signed-off-by: Erdem Aktas <erdemaktas@google.com>
> Signed-off-by: David Rientjes <rientjes@google.com>
> ---
>  include/linux/percpu-defs.h | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h
> --- 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")
>  

Applied to for-5.6.

Thanks,
Dennis