From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751480AbdIPMfD (ORCPT ); Sat, 16 Sep 2017 08:35:03 -0400 Received: from mail-dm3nam03on0057.outbound.protection.outlook.com ([104.47.41.57]:43351 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751440AbdIPMez (ORCPT ); Sat, 16 Sep 2017 08:34:55 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org Cc: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Borislav Petkov , Andy Lutomirski , Tom Lendacky , John Ogness , Matt Fleming , Laura Abbott , Dan Williams , "Kirill A. Shutemov" , Brijesh Singh Subject: [Part1 PATCH v4 06/17] x86/mm: Include SEV for encryption memory attribute changes Date: Sat, 16 Sep 2017 07:34:07 -0500 Message-Id: <20170916123418.37807-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170916123418.37807-1-brijesh.singh@amd.com> References: <20170916123418.37807-1-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: DM3PR12CA0051.namprd12.prod.outlook.com (10.161.151.19) To CY1PR12MB0152.namprd12.prod.outlook.com (10.161.173.22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f272cc7b-fc61-4069-dc32-08d4fcff5092 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(48565401081)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);SRVR:CY1PR12MB0152; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;3:jhKuXYtbsy/GwsmD5JF5fMnxzhRX5iIEvRAyMqnTKjjeouwEi+p25mtCeqWvZAt4DPtbSTbcJaqHoJQTVTIPh5XkQ8GEswvZV+5xEhG0LaGTdiSuxpGC2dDF2HMki2SYoJy0EGAIhbYvvRzyFreGm4+w1q5PyrcmsMpsidVRUet2W7tX1X3Avzq+MX5BBpNJNqXkQCgVrAH2sw+0APLcbNgXEV3QxbJHT2ptwMLakAbEdmcoBaLx/fv4mVC5yX27;25:lRlUBslUsKAcz1tYQIQ+NccL7IS5npW6TDtq2zmO9Kit9vWhE0XdNHmw8C03a0T0Di3TLtbq6vwfc46mMIAh8y8LPS5sJxeSAZjOfl0iVf5cEqwoyKHJmI41G7IGXqWI/ZL9PGtTdMqT4HEDRIBfONmXh31EAXHBt0TrjlTyLA5rKvKFY8Pr/cMh6Yl0GVR4Wv6lt5GRaUJWJBBQrKkM408j2VbSmHc/5VbhYl4C6DaNnt44gvDU4WO2lKp5j751bB9hM941+7FYD5febt7vwmgwNhibSYubR3QJNyvlB0s7djQYanUPY4Mpa95/RMMUcyGAvnMGx/9G62waPlah2Q==;31:sZw4798ydEVCQuPQX7NpJwvTPs9qTItlBiFTi7C3iC9paC84rHoJOsaB5diyLknxrmk7XkVsQir74kj5UPyWaWOO8KBV68et3WZG5GAKBYgrkUKurXoP3nUj9nW/CvKTAIXijK4vq+g2+JK9jqJQ/IA+YeypeKhQv8JVhgk0/SWzxBlObsP0kGhDs5fl2FgcJmJ/GpRsSIuPD8NjNZrRWAD2qNFG/mfQn1kjfBMR+lc= X-MS-TrafficTypeDiagnostic: CY1PR12MB0152: X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;20:WLZVWysVqIXmGu7NFT5++WjhcsKj2RUPUPRjAoCb1SgiiJqyYEBAGzAVCYfkosKFI1QeQIFKire3WQOGJkIYf6c2tv1HGMpPGBHPYYgV5JDJXOwzK7zTpxViOT/4NhDakw7nmbea+KeFSzBpezIGeEsDmzUa4wNHVHn6lmm5RQ56b0/AG7e1ijTQf0Z5kSv8cbwR22pFn57x/p6pTZRpgRsrL0+0s6CwFzjjhFYi64llkFJm7cME1faBPcp7b3Cl6XiAyZpaJsLrxZgAz078d9v7Q6fH/AULHf4CXn0tFVTQGc41mEz99hhU40xu/72Sj6J7pwVd66W2flvAhSG4qFeRKR6Wu14oj/xRnbDw0wExLVs1rJ4zdYg7OJ7w1WQs6vyTS/6skiE57Z+MZAc6TDaR8Dek8X7ASuEGmon1Ikcrr78+QWPp9GuGkhWmy74pL3npM61Avrbl/plukjv3/QNuET2VFsiSzGEzQ4l1WfiM0WSkWMd7xTLpE/deteWj;4:F8avYLFAUIKxMJqIy/UT3LFrMSHzGiy1CvEzpIQc48y5VivP2TmCSXk32qruTl3vm1YfaMppncQ5bjasm4G27vSyBmR+/86US7g8rgLI9jgbdQthKkx4MM7TFBUFPOtiWkPYjggYLdcdDKLEDyTIYCGPov/0Oz0sVJtSfTVvrYKk9AEmOP0c9QoZG0Cz0SPAT9r5dMGz8G2pAh8vEeMxKEiHNzyCzMWD5CaG5iHRbhLuZzm9aPNzQIb5Y2qX7Jk3/wRvXI2450Z0+wEdmCrOuGnlFdC8f2irxd8iffGDqxduVfLk9aF/ZU9dS3ILQekkAFPeAdPUM1YARMv59X6J0tiy268o/cq7FrTcob9FT7s= X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110)(228905959029699); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY1PR12MB0152;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY1PR12MB0152; X-Forefront-PRVS: 0432A04947 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(199003)(189002)(6486002)(53416004)(81156014)(7416002)(48376002)(81166006)(50466002)(6666003)(5003940100001)(7736002)(54906002)(316002)(16586007)(8676002)(97736004)(2906002)(305945005)(53936002)(5660300001)(86362001)(478600001)(16526017)(1076002)(106356001)(110136004)(3846002)(4326008)(50226002)(68736007)(25786009)(6116002)(33646002)(105586002)(101416001)(50986999)(47776003)(2950100002)(8936002)(66066001)(36756003)(189998001)(76176999);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR12MB0152;H:ubuntu-010236106000.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR12MB0152;23:Z16eFV+ByILv0DDVfOEm3xYCHzf/r813DzdEvl8ft?= =?us-ascii?Q?DFWE/pXXUVnPllA/xP1mmgQydMBPjNHAfr0LHyezGI+gEdw9MoOuTdieOpT3?= =?us-ascii?Q?+XxnIZJtwoES/3CA/ULcF1YFqjUcJF4Cop2VS7ZWF7bVz3tRDEN93FcdMz7K?= =?us-ascii?Q?1rMp9NFLgtqe0Dxjr/8HuBBEdxms6KlG7wrJPbp0UeRMv/JkkdUGyHnlZc6e?= =?us-ascii?Q?a3aY793AN50joEdhaED3NJovlEyfBsSHkUQKLWlzD67lbwcO31Xc9HzWuhQM?= =?us-ascii?Q?K7YGYjDJjIHtvH6JtLSLENdicXHgZxTleHzZ547GKshvRQagESZyOnyGrkAM?= =?us-ascii?Q?FBaY2+xFaLHj6TII9lXvpf4hgxWBapYVAWOJk70JPPTvLkmKWL5/GaLfgqET?= =?us-ascii?Q?NMvSkLhudQldJi1kTjVnwyHQ/+QfJYCBAzUJtDxarMy4MB7xUNz2l2tHwXri?= =?us-ascii?Q?rlTIbzh8qE/yf3VhY0eXkwlsj3TLK/feNPzvYoU2aG3LgixhxVjkfOVQ9OAR?= =?us-ascii?Q?rJ4KAoieDerOiZlJdhTuZX14JO+T/836OKkGLVAx/QQRAl6Ajm2fD+J0fuvI?= =?us-ascii?Q?8GHWCSB7s5NfoIIAuuNrypiFXtNucgqD5AIBdiWYM1YsDGD/m8fThVWk3pAC?= =?us-ascii?Q?AfvAKnVFtp5u1FRrZs+Edo9z/AEdD3gy/GAXSFzEzzHbb1K3gYZOeHxYxDf9?= =?us-ascii?Q?EwD1Wwew6k5+ikie1A0BigC/7jKyJIOXX9GyrOyg92JXAWDguB3f0pBEAkLF?= =?us-ascii?Q?L/WQX1cLYFjkwdxtKD7aMGdfBb0s/N+sv6HgzuwAjiAY0j9WIjXSY0uzhNT5?= =?us-ascii?Q?IWPO0ekTyz8YqOegQg6gnydsn5LYmlZZkPTYylErgbTGmh51f0ElL9VO15x9?= =?us-ascii?Q?hIA5Up1G7ZgHpkrY7somDHz2dwF6s4bonx3D6IgtoWmee6j+hnXurOfclTaD?= =?us-ascii?Q?vQcy3R4x4mq5gkQOzkP2vJtGcknzuTKSrI4dtNa9uaxPICYH3HT2NLXQQ95C?= =?us-ascii?Q?a1+9dTGrnHkX0yNle9uG6sgs5GE8ALgJCTL/zUWVZfoobN86vF4a7GJWy2lz?= =?us-ascii?Q?zihw/HAm57gkogkfSWgYTkRpvejsSy56bt4e3soTg/qP/rgcg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;6:KgzRbcJXxJpUS9R3ipYobcZDn2vkjd7mrIh1VmpElPCKKYA57K29ThcUbuz1QI7VUmylrHFFaa8SPRH2EDJmh5IMFnU622M9zYlVrS5w20yoZgP6aoAKZ9y5Hlkj2zVmetRvLOJoitIOTPDpwiEM6HlCCqwkL60gKxxE5wAlCAmL9fjr1v68VDrq8aSo+K4OHJVlvNjNVDkHE7t1wTpR+0fGHY0O9ue5Yhofh3StY7tA9eGa4GTZcEv7+XD7UqrCJb5q0DSzcBvPdA4eMpccSZguCi5/St7BroAY6HoiHRImIJAfnUBVKuX9yZFIsketHrvoMCkaBVhxsv9DY9S17g==;5:mu74DhfGHjoZp7lHeyyjQ+nVgdMTuNszmYnH2Ve4yp/bswlLCXXpqrp8PFFYnaVSg90qo8rnCdixGCHp+ZLPBo4Gq+pktspYwxBnqJwxuiyLp1PWcFAcIj/mSQndk6IX6dmFGKfpUQcZovfHvXK5Aw==;24:KzaPaKtlJk4jXDpwA9xADmBJ8sXNQnFCzbVHIAToe3a0NVqxS/ejzYNnsGBQLoTunTcT9tbDcneMB4YBUNh0kCzCR4IF77cLTFQ+DfHH58w=;7:ECGxW1Hg2w1A+OC1id/GhU4763GxHVwyZAm5J4HIFewszcoA91w7ebJ0Ke7YK6MEYBWV/T5Te61k/DMtDhcaFPlpODRaF1SBP+tA1sReqGkm+omgkn911W3fL9RKs5mDDtzKWV9OtFmmMSz+CUKsqLockU0rCC4gjufb8Xcmkx316RJJRiMNTQuOJjx9eimRp+W5U0EgNsdlZgoSox3/X085X6jcVaURrxRaInBdXK0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;20:R+v1awh2odb27fCDiyEvbaJ0zE/qyaLyAcIDB2Gpth6vRKUzv/sJlJU3pIALMLlZO2UTBTiMwILUfRusD0UMMkS/KfWXecj8fMQ6yuFXSt7fXxguz9owwU/Yet4/bNgLMJ/TsL0bDIgMq0nvk3+hNM5kQcRgTK+HHGBnFvtImvRTR1jUavYO2+jWXdFv/lBPXO7lZQfcdWYYiSocu56OToI7aaB1T/nmhOta2wOVj5YWUkKfLX894jPRqYUn0MNK X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2017 12:34:45.7869 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0152 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tom Lendacky The current code checks only for sme_active() when determining whether to perform the encryption attribute change. Include sev_active() in this check so that memory attribute changes can occur under SME and SEV. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Borislav Petkov Cc: Andy Lutomirski Cc: John Ogness Cc: Matt Fleming Cc: Laura Abbott Cc: Dan Williams Cc: "Kirill A. Shutemov" Cc: linux-kernel@vger.kernel.org Cc: x86@kernel.org Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh --- arch/x86/mm/pageattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index dfb7d657cf43..3fe68483463c 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -1781,8 +1781,8 @@ static int __set_memory_enc_dec(unsigned long addr, int numpages, bool enc) unsigned long start; int ret; - /* Nothing to do if the SME is not active */ - if (!sme_active()) + /* Nothing to do if memory encryption is not active */ + if (!mem_encrypt_active()) return 0; /* Should not be working on unaligned addresses */ -- 2.9.5