From:   "Bae, Chang Seok" <chang.seok.bae@intel.com>
To:     Eric Biggers <ebiggers@kernel.org>
CC:     Thomas Gleixner <tglx@linutronix.de>, Borislav Petkov <bp@suse.de>,
        "Dave Hansen" <dave.hansen@linux.intel.com>,
        "mingo@kernel.org" <mingo@kernel.org>,
        "Lutomirski, Andy" <luto@kernel.org>,
        "x86@kernel.org" <x86@kernel.org>,
        "herbert@gondor.apana.org.au" <herbert@gondor.apana.org.au>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-crypto@vger.kernel.org" <linux-crypto@vger.kernel.org>,
        "Williams, Dan J" <dan.j.williams@intel.com>,
        "Gairuboyina, Charishma1" <charishma1.gairuboyina@intel.com>,
        "Dwarakanath, Kumar N" <kumar.n.dwarakanath@intel.com>,
        "Krishnakumar, Lalithambika" <lalithambika.krishnakumar@intel.com>,
        "Shankar, Ravi V" <ravi.v.shankar@intel.com>,
        "linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>
Subject: Re: [PATCH v3 08/15] x86/power/keylocker: Restore internal wrapping
 key from the ACPI S3/4 sleep states
Thread-Topic: [PATCH v3 08/15] x86/power/keylocker: Restore internal wrapping
 key from the ACPI S3/4 sleep states
Thread-Index: AQHX4XAEJFOJQ1w1J0ysoCyRSv0seKwbcmWAgAA5ioA=
Date:   Tue, 30 Nov 2021 06:56:31 +0000
Message-ID: <157E75DE-4567-42FB-B4F7-BE2A401045B8@intel.com>
References: <20211124200700.15888-1-chang.seok.bae@intel.com>
 <20211124200700.15888-9-chang.seok.bae@intel.com>
 <YaWa2+2eVSFXY1U3@sol.localdomain>
In-Reply-To: <YaWa2+2eVSFXY1U3@sol.localdomain>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?J6IVPHrgocliEyniTpIsR7WzEoPEqDb5BEGBlMnfJxNRYppftscVc7denLf0?=
 =?us-ascii?Q?5xp16R/tePXbsszBt69yWKI4jY2scLzL5iBxMT/VQNn7V2wu3KvWx9FCGWcb?=
 =?us-ascii?Q?DY1ufGQjvF7HAw2W2qKJGG0aZ1toVFQpAGpMND6LtuzlYNipvbotEeHf7Avl?=
 =?us-ascii?Q?GgK5B+Ou3eU0s71USUXqNRT9FFgM8+5tKvfzGharyRBAE9JoHqwXLl5/6niy?=
 =?us-ascii?Q?qT8gEzhbbsWyjGTGogO1DDu8U4hASXJsRj59jxsyZMbS/NqTK87Ok5btKVTc?=
 =?us-ascii?Q?ursqfBvlppEqWyiCNcAM1ZgBu6JPqSYV4sf4cD4SBfHE9CizLz6bGlx4DVbE?=
 =?us-ascii?Q?FlUE0Ycs4uqO6/7LAiZ3GZg/9h+R8g6nnK0PQjDg74wAEQ39DdGu2vP42iYa?=
 =?us-ascii?Q?WRmdO9JVNhzwWuaM1TG7ol7ukP6eStYglXqs5J6Sw4SKSdeauScasfWYcsuL?=
 =?us-ascii?Q?tLu6pjzlNQ0WO68Ryb/51NBS9xVgBWEboqjqrvFZCJbaXwFwSwSq6t0j1BTR?=
 =?us-ascii?Q?SlAcQg4z7f4FCZgsGMe6TYh22hCdE0/bF5vkbRgZSFSiNB1vr/CaDUMyo923?=
 =?us-ascii?Q?6CUAwwMh9ff0PZPogwcdKPEIN3kD71AsXseMZ/4psDDCRzip+h1ypKOf3Nim?=
 =?us-ascii?Q?ulFOn03N4iQCBX9s7Qwo/ctrZ+Jx6ygfx5mKPl6OY2Gws/fcMca+mRGmDRKO?=
 =?us-ascii?Q?QgPobN5B3yW4YMjsXwZXZxjFt1Owx4k7XHR5NyN3bxP0Q7K4hl1BGtiYFiNu?=
 =?us-ascii?Q?JqWlb/JUYhZL8KBPdiIyP//dnCaV1A6ghFZ0IpHCOrEAo2jH29myIVu4NwuL?=
 =?us-ascii?Q?0Qy25US2LocCicvUHyGXD3f1bHlEGgjbaPcyTG+711lZrx1Iwwvf5Y3XaVG0?=
 =?us-ascii?Q?kOD40uQ2NsadFxchJk2wgy5PSKql0XC1nqo/9U623YrO0R+vHJkCzYEC11CS?=
 =?us-ascii?Q?Url7up3TaIH/ZBs3OBM6eV2XlWPrviZfZuQ8zbAoFYFwjKuis3/Jt1THoTNV?=
 =?us-ascii?Q?OiKout/STfBaKYiBVX44EmjgxxDE3jlZiMygNUOLtGs4ZyqLt6c6X/d9b1nF?=
 =?us-ascii?Q?SP8V0mmn7THXv5HuNPZKR2jXYCcHiFAPrHO2R3joJfhT1k/fXQ7b1NEAk0MA?=
 =?us-ascii?Q?RoiQjYVBAkI7Xvhg0UPwlG/A06fz8gF+W5XldJPJQIU3ZyGqewpy6pkM0Xj5?=
 =?us-ascii?Q?AkBdK87JDzcY0ViMV/8x3MFDrx+lOfpgKifoj9AbTQCfiTGO3M1pknYRYOHt?=
 =?us-ascii?Q?q39EmcHdGrCceKuni1T7OnnfA5FDP9yBdQxB1mcRFwzqNTiPMdqilwAEwBzB?=
 =?us-ascii?Q?RwREZnaWnkQc33V0GGs3Ul/niua7zSomY+GcKDaxZzA8zSC5Kk8aRo1E03+B?=
 =?us-ascii?Q?5rzQVupiw7RF5rsywa1n5IBmiJNL6lASxnf/3j3MD+KdW2PCNzKsdAoboCyL?=
 =?us-ascii?Q?7C49XSFJqTzsgfJHqNVqywcrSb+YtSPwpttgFY2HOeLj1OFbi3ThnPMUieWv?=
 =?us-ascii?Q?pfTZ4wSlbjAC4jn8j4BIpjOUR7X04712HuDC+fE82f19rgGJj1NyTkcQ7EtX?=
 =?us-ascii?Q?cMWSZFz02rEMHO16Z+kaktsf43mmiNyJA2rGndEuMgxeYVw+sIppgpHQthlD?=
 =?us-ascii?Q?ppcgaDOk9t5Z7tEOuiJy8mKt0TH19GZ9M6w6JIOPbDGhId1nqN7DFc7TRg3J?=
 =?us-ascii?Q?jUYHEuG8n9mxK4uXENXe/kXfvtg=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <F95ABDCC035C8045B323BD4418A57E0D@namprd11.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB4855.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d68d1f98-065f-43db-1331-08d9b3ce8a8e
X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Nov 2021 06:56:31.7652
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: IIFWvYsXrG7dZ6UgcGznZk6CLKPx3ExH54eoBBcU1KXLAdkhXdtZ1Nbh/MONQnF8PSzD2mgpU3iZ+eYcKKtIpY31xKsO997GJH1BGypgbJI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5158
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Nov 29, 2021, at 19:30, Eric Biggers <ebiggers@kernel.org> wrote:
> On Wed, Nov 24, 2021 at 12:06:53PM -0800, Chang S. Bae wrote:
>> diff --git a/arch/x86/include/asm/keylocker.h b/arch/x86/include/asm/key=
locker.h
>> index 820ac29c06d9..4000a5eed2c2 100644
>> --- a/arch/x86/include/asm/keylocker.h
>> +++ b/arch/x86/include/asm/keylocker.h
>> @@ -32,9 +32,13 @@ struct iwkey {
>> #ifdef CONFIG_X86_KEYLOCKER
>> void setup_keylocker(struct cpuinfo_x86 *c);
>> void destroy_keylocker_data(void);
>> +void restore_keylocker(void);
>> +extern bool valid_keylocker(void);
>> #else
>> #define setup_keylocker(c) do { } while (0)
>> #define destroy_keylocker_data() do { } while (0)
>> +#define restore_keylocker() do { } while (0)
>> +static inline bool valid_keylocker { return false; }
>> #endif
>=20
> This breaks the build when !CONFIG_X86_KEYLOCKER.

Ah, sorry. My bad on the last-minute change.

Thanks,
Chang=