linux-kernel - Re: [PATCH v11 18/20] x86: Handle TDX erratum to reset TDX private memory during kexec() and reboot

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <58f34b4b81b6d6b37d3386dec0f073e6eb7a97ff.camel@intel.com>
Date:   Mon, 12 Jun 2023 03:06:48 +0000
From:   "Huang, Kai" <kai.huang@...el.com>
To:     "kirill.shutemov@...ux.intel.com" <kirill.shutemov@...ux.intel.com>
CC:     "kvm@...r.kernel.org" <kvm@...r.kernel.org>,
        "Hansen, Dave" <dave.hansen@...el.com>,
        "david@...hat.com" <david@...hat.com>,
        "bagasdotme@...il.com" <bagasdotme@...il.com>,
        "ak@...ux.intel.com" <ak@...ux.intel.com>,
        "Wysocki, Rafael J" <rafael.j.wysocki@...el.com>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "Chatre, Reinette" <reinette.chatre@...el.com>,
        "Christopherson,, Sean" <seanjc@...gle.com>,
        "pbonzini@...hat.com" <pbonzini@...hat.com>,
        "tglx@...utronix.de" <tglx@...utronix.de>,
        "linux-mm@...ck.org" <linux-mm@...ck.org>,
        "Yamahata, Isaku" <isaku.yamahata@...el.com>,
        "Luck, Tony" <tony.luck@...el.com>,
        "peterz@...radead.org" <peterz@...radead.org>,
        "Shahar, Sagi" <sagis@...gle.com>,
        "imammedo@...hat.com" <imammedo@...hat.com>,
        "Gao, Chao" <chao.gao@...el.com>,
        "Brown, Len" <len.brown@...el.com>,
        "sathyanarayanan.kuppuswamy@...ux.intel.com" 
        <sathyanarayanan.kuppuswamy@...ux.intel.com>,
        "Huang, Ying" <ying.huang@...el.com>,
        "Williams, Dan J" <dan.j.williams@...el.com>
Subject: Re: [PATCH v11 18/20] x86: Handle TDX erratum to reset TDX private
 memory during kexec() and reboot

On Fri, 2023-06-09 at 16:23 +0300, kirill.shutemov@...ux.intel.com wrote:
> On Mon, Jun 05, 2023 at 02:27:31AM +1200, Kai Huang wrote:
> > diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c
> > index 8ff07256a515..0aa413b712e8 100644
> > --- a/arch/x86/virt/vmx/tdx/tdx.c
> > +++ b/arch/x86/virt/vmx/tdx/tdx.c
> > @@ -587,6 +587,14 @@ static int tdmr_set_up_pamt(struct tdmr_info *tdmr,
> >  		tdmr_pamt_base += pamt_size[pgsz];
> >  	}
> >  
> > +	/*
> > +	 * tdx_memory_shutdown() also reads TDMR's PAMT during
> > +	 * kexec() or reboot, which could happen at anytime, even
> > +	 * during this particular code.  Make sure pamt_4k_base
> > +	 * is firstly set otherwise tdx_memory_shutdown() may
> > +	 * get an invalid PAMT base when it sees a valid number
> > +	 * of PAMT pages.
> > +	 */
> 
> Hmm? What prevents compiler from messing this up. It can reorder as it
> wishes, no?

Hmm.. Right. Sorry I missed.

> 
> Maybe add a proper locking? Anything that prevent preemption would do,
> right?
> 
> >  	tdmr->pamt_4k_base = pamt_base[TDX_PS_4K];
> >  	tdmr->pamt_4k_size = pamt_size[TDX_PS_4K];
> >  	tdmr->pamt_2m_base = pamt_base[TDX_PS_2M];
> 

I think a simple memory barrier will do.  How does below look?

--- a/arch/x86/virt/vmx/tdx/tdx.c
+++ b/arch/x86/virt/vmx/tdx/tdx.c
@@ -591,11 +591,12 @@ static int tdmr_set_up_pamt(struct tdmr_info *tdmr,
         * tdx_memory_shutdown() also reads TDMR's PAMT during
         * kexec() or reboot, which could happen at anytime, even
         * during this particular code.  Make sure pamt_4k_base
-        * is firstly set otherwise tdx_memory_shutdown() may
-        * get an invalid PAMT base when it sees a valid number
-        * of PAMT pages.
+        * is firstly set and place a __mb() after it otherwise
+        * tdx_memory_shutdown() may get an invalid PAMT base
+        * when it sees a valid number of PAMT pages.
         */
        tdmr->pamt_4k_base = pamt_base[TDX_PS_4K];
+       __mb();