From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753160AbdI0POG (ORCPT ); Wed, 27 Sep 2017 11:14:06 -0400 Received: from mail-by2nam03on0084.outbound.protection.outlook.com ([104.47.42.84]:59616 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752828AbdI0PN6 (ORCPT ); Wed, 27 Sep 2017 11:13:58 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org Cc: Tom Lendacky , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Andy Lutomirski , John Ogness , Matt Fleming , Laura Abbott , Dan Williams , "Kirill A. Shutemov" , Brijesh Singh Subject: [Part1 PATCH v5 06/17] x86/mm: Include SEV for encryption memory attribute changes Date: Wed, 27 Sep 2017 10:13:18 -0500 Message-Id: <20170927151329.70011-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170927151329.70011-1-brijesh.singh@amd.com> References: <20170927151329.70011-1-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR04CA0033.namprd04.prod.outlook.com (10.174.93.150) To CY1PR12MB0152.namprd12.prod.outlook.com (10.161.173.22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 345a80c6-4603-42d3-a290-08d505ba5f47 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:CY1PR12MB0152; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;3:cDrFycqX0ZLOFMnkZ3/MtSOpImZVC97rtmxMTcvhKS7E9kBI9TGPhG2eQGJ2Q5zNphu8Sq+ddUvz3POrUzE2txvQ2h6XpuGIC5U3Y+spt92V6UWnLYvHatsF8XRJLZmNSZJJET3F1ClXQm5DfB0xRul5H0zaubp90qf+3Bwsi8Z1nOQzSMC0BT8g6Vw4noBReOf13XqSiHetQF4jcdbstHb4u1LGZ9zFhVMeYsR6FfBh5GRal48RoQXTJT62d1/Y;25:mngXzyj3xGmvi4JuQdfktvAncMj0eLGpGjGor86py6mJ7tNNvg81R1KOiuzx3Lz27sOAMO4MQv1OlOx4zDVOV4NgAgeWBkzbfbvlwa1adV5rIDr++XZ/HcvVyceXmnlCjl1AWvHeVUaGbLz5uEohWJPfj/jdxRjWVKY+FcfDvQowKO/871rLUDdmD+PRQTsAo8Y3CCu02WN3zxfZz/7oEcdD0oK9bonamZN27I5Yy0c/2sqACTWCK8loeD7BczDPP+cFzffd4dDt93mbuUvMO9V3xMImPNcsQ5PTZvPc92mj2Y/XpbG6kWsBRoPhBkkeTmJQOLrxC03Bllhha8N5yw==;31:8kISw6ACLa4C9BwXHZCb+JqZgZV2uWFr/C/5b0RV95X8Z0UThCD3AHCA7o+W2f+knW180ztRJoeCB+gTkxoglqOWkYDTnrLzH//llG16/WE0MH0WI351aR3XXpuCKE57DhHB16Wq72HsvCkB0d9rLce5ocacZvMh2AjZY87qJcF9MUmBaU4Tuiyk3HRca3qQaRPDYDKpWLjT2/heowZNWrkZSZZ41KY3xIp7jr/Uhoo= X-MS-TrafficTypeDiagnostic: CY1PR12MB0152: X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;20:y45ZjKkJdPo4VvhSekTlN7YWxs6BcJpP0h0tWfFtFRxuWPdQYANRyMqjMXRqGFuOg9kWmce52gE/Qk+qBhwmtAI57TVwFBp9ygVk521TfIuEm4G3Xe2g4I8+kXcH4kjNwtTL761sfM5q8rqXTjnZnM1jtxZUTbFztlrnKQgFDI3uMJCg/sQWI7C2DOdnw5dzqYdyC7ZQ00c4Z/5fHpNGUMcVgiIfQjY1O7C4yw4cFrgpFdnq8sl1cM4NQdH8wm4nKzX8Xtw9AZkczwhDGoGI2F79GlbOorUACSr5janxk4/xk4x6mKDeHg8CpP/sguuzufbCggLhpDZXaxUNbeNPb/P2XRMtVNPpsY77j/HpaELJjSW21MUii8titdKvnX3CjGhAMM3CYAux+x62Hb6I/x1ns3Va8UHSdUP6QhceBSsst5RvQhi0der+s567N6PI/Ou7skk38tYkeBG7ny1J4a8G+DDBlNhp33vxczBl6CAcd8UdyJfAXnvX9SMhqSfX;4:E4mTtxdywHmnP37VlQhLkSK8QANYMqwFVdKgAd/ihfN4pmJ6A6TLR//7ZgTVDH/wqWiRsj1X0w23sQcomZnNMTwTAGQN5+VouwLJPAxYpkT9UlKIb4wtZMUATPlqk4DWDadqgK+3l9PRjbfJDHvHgCeysvERB5FVNH8gb+rjIAJt77IV3o2q9sLpRkqD4lk/GsSpw/pR/0ROHuktem5eyCmmuHr+4xCER7WB4BDh3+MAlzHzKWvlEQ1TCk3ojuC9upoCK/tyyQ2qfpn7Ve9uUDhXZEk0pYoTQx3CWA0VbzDIBK/t4OyaU/Hp2sG0uw5iAj1+hoeTRZb6+v4rVj5sURaTYyQoqQylLdbueuoUadk= 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)(10201501046)(3002001)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123562025)(20161123564025)(20161123558100)(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: 04433051BF X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(39860400002)(199003)(189002)(3846002)(25786009)(6116002)(53416004)(106356001)(8936002)(4326008)(54906003)(1076002)(6486002)(50226002)(8676002)(305945005)(50466002)(5003940100001)(81156014)(48376002)(81166006)(6666003)(68736007)(36756003)(189998001)(7736002)(105586002)(97736004)(53936002)(7416002)(2950100002)(101416001)(478600001)(16526017)(16586007)(76176999)(50986999)(316002)(47776003)(66066001)(86362001)(33646002)(5660300001)(2906002);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:BKZrAD7KTo8zLwA3WyCXPQWD3l6wecNaVu2bRtEsj?= =?us-ascii?Q?DuUK5V0CV8QmVat5pwmqu8ccWMZcb4AQIR8rdWvNMdpVb6em8wxZ2WIgv1dI?= =?us-ascii?Q?gQHSOrmcEIc9UXCboxBHnEQo/C+nQNFEtweVFCkzNez1mG8BwjxVJqI3unRP?= =?us-ascii?Q?KSvVZf8sW9MFKGLqDFcydcEItnZjZZHWIcfppiuXtS6E1PeYWSwXUuQfeb3l?= =?us-ascii?Q?vQ72LLQ7wthTeGDObNIeELPp7bJQoyaHDSiicYqIvt6jpZmBBQQTN2U3wxPU?= =?us-ascii?Q?mEPh5ZyNgU7aRMYpKN8RkV8egHCG/RwR+WB5d0PAV4EXUVUj9gMP0B//9UuK?= =?us-ascii?Q?vRVlpV2mc22U6t37Yd4NUo9ODqRXuVepIK+tetNLb83bMeK1MixxGdmhyYOc?= =?us-ascii?Q?E7xNxi//Qe0wiWPerjLYH20Vawkt+MLEvYW38tiN/aDX4C9rg0tSBFORA/+H?= =?us-ascii?Q?sBDhy/WJjG2Q9Et+s6uZkODmJLuPK1L11BCKS90LPDgPRFJdu0a9ZqQ1TWES?= =?us-ascii?Q?AMEZrnPFvIEgUH971ZoVFypkQJO6Kgy6sBC+FWBB2p683Eld/WN6cZUvLJy0?= =?us-ascii?Q?YmI1afg49C9+uEIicqqnpv1mcDOvjvOW0wfF+s6A9ZuvJkZfxV6qEkor1vIK?= =?us-ascii?Q?25JD0zWt19pbLCN3EwypHLwnlfnuNsTjlYudx9PvqICD4yXz+maWg8w5RHRx?= =?us-ascii?Q?1XG/07FITqw3rrmwaVPA7SDYjNbcGXm1XSQPq7y4cLk15BY2PIWEMNzMKSjR?= =?us-ascii?Q?LGBGg+K6CSXguP/Ymb+N1/bwseUwn9STmMhcBktLeTz5SnKfdq+/iGsSARIY?= =?us-ascii?Q?eqF+gIphApmZ4t+ZidJ961Il+FX3gCybJ7trJJtm5ZOosta1crX4Gave6ZBB?= =?us-ascii?Q?iilEbecifwgB5dmQswDYWWG/80p6rkRxT1/nSs5WQ3RzFs19fQnow/gg6rf3?= =?us-ascii?Q?P62XhvAEqf2I50s6x0wXY+xi9jSSnX8fqZpymMnmHMpsda1vSMHgGDawl7dN?= =?us-ascii?Q?IadC2g7akLf20x771y9fHg0t2vY9uyHF8aOTE2ECH5/UZApGFazgFa+JGoNZ?= =?us-ascii?Q?+rGrBcrhNxisHUD6Ouu+66fpvpqhuJqgHrjGN7xg9kpwYI/Qbe32Wq8jtrJz?= =?us-ascii?Q?cP6zeQ8qCs=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;6:NLdtgG0mhGngmLIgkxsfvAc9y+UldYc7srHkhw4zJ7SdhbbTSNvGjuI4RIwK+/17yUI6lxoTB+1dPi0ncxvpUhqtJm/Yj3AcYQIY59KY493fEGRVuCCN6QW4CPOkJbY2GHyNYiuTeM9iTtMU1cojvk/NQaASbFB4iGbD8Y5ai6oAWK0TUqS1zOc3YnD3cFjnq0bz3Uic120Wn6ivsnNzkCVLU96pBjAq/YzRj3y9WZQauhqbe8p1PxrzxnUkIHNH/qeU5+PoIMJYzqMgmvGt5jQLzimXteAkG7VN2V7K2I6gkck5qTS/K/J+hKRNkCz/vyqEwMyR75zMrrksriXKkA==;5:gTJ2AEuZHXkkKEZZFv1Uo3+p3FcHf5cKL04oG2wDHsc2HmT0O3GgA3qn7kqh+1lm4HjawkUtXAQ3lqJozEN+JaInL19KA8y3+o34/Aqb++Tht22qdtRRuhk8o3nk4HYVRkZU9sa5AH/2UJEFmD8CrA==;24:D9Y6b1aEe8pxMIQjs/S50WoW/vm+Sa5kqRNbnB3oi9rOItG7R12yFGNa9loQiD/F3mbG7dKfaplXy+bgckJ2mZj9Mzkwh1POBwWCU0P+600=;7:Umel2zKTnMvu/cevpv0OCj0rk8ID5yUDRyk6T68CNAiHx302gR2ZPOjMEvOuWeItt2A+hv3ccGMfUdzSDchFdJCKB2SmGuVZ9a1fg1QTiXY84SvXyzS7yQP6lXhzDWkpsZBBowxWMC4NbejEe1y/iOiWmVm6UYcfJkSabo+Fs2J7qaiQaaXcOcvwVTuo9lts6h3gSKoZhx0tGH/nNAJYDKlG87U2gxwyfZV0lYfpybE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0152;20:lqO7emPujACZ+OwLosvWeBHmSqeM6o1bxZXXJkXsNBm5o3qGNlQLfwGeNzDudmtUhHURKgcR2mdyNI0lZR4sBAwIUdsD32kQbTkK1w76kkBTZGUaHFTfb4M+dz+WowOD5VehaHo+2BbjZ8/qSflmG66la2iuBV4ciRKNF9lx91Do93Eu6VtMO/wNLkZC1WwreFC6zKctZKWfNwwc7Jnp0yBFSIqy7YCvVqFnd5K96fcRO6ZLhcoW3mngDi1ffvy4 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2017 15:13:54.7441 (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