From patchwork Thu Sep 24 12:57:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Laurentiu X-Patchwork-Id: 522300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CDB24140281 for ; Thu, 24 Sep 2015 22:58:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754103AbbIXM6P (ORCPT ); Thu, 24 Sep 2015 08:58:15 -0400 Received: from mail-bn1on0147.outbound.protection.outlook.com ([157.56.110.147]:53721 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753627AbbIXM6O (ORCPT ); Thu, 24 Sep 2015 08:58:14 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Laurentiu.Tudor@freescale.com; Received: from [10.171.72.55] (192.88.166.1) by DM2PR03MB317.namprd03.prod.outlook.com (10.141.54.15) with Microsoft SMTP Server (TLS) id 15.1.274.16; Thu, 24 Sep 2015 12:58:10 +0000 Message-ID: <5603F355.6070409@freescale.com> Date: Thu, 24 Sep 2015 15:57:57 +0300 From: Laurentiu Tudor User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.7.0 MIME-Version: 1.0 To: CC: Mihai Caraman , Laurentiu Tudor , Scott Wood , Alexander Graf Subject: [PATCH] KVM: PPC: e6500: support powers of 2K TLB1 sizes X-Originating-IP: [192.88.166.1] X-ClientProxiedBy: AM3PR02CA0076.eurprd02.prod.outlook.com (25.163.180.44) To DM2PR03MB317.namprd03.prod.outlook.com (10.141.54.15) X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB317; 2:VprpYMtmq0W7/oOwTmk+uHYWQrGXT+Yq9oV4n4ugBDkKf1b+wX8UCcyObOYpUIbwWFuK+dGEE6fi18/kZmPDIap1qtHhlSQu/5sQ7xpJG/qrnudsoIevD76tHJiEEtRV0Eugis/rCMoSem8+ZA3xJ3/Zw6mLCAIoMCjsBj0I+jY=; 3:Zv817j3NiJcsfGoBWOC+1jpGZZCLznPgYVZtfSt0y4Aggl7BayroNHcZglYOKNOeoZ3Zk0KU8p+pQeYoyyqAGKDUBI8lxZhS2T7RXmi0yKw/npZ+dgr+5LLZAcB1JM4+WW2msqgLUwLNG9l+M4zi3g==; 25:m0OhKBZ7871RadC45tI8Vaqnj4JJUgg3K6RBrANYLqrb5jdjpsM+Z7+vv601kiILxP9lI318Wkf2x9tD4NU+I5c9ETLo3k4jDcAWKI0IqAgsQd2MDT8eoRtYuikE8z5wdIPoSyJ2VRU0CXEDdCXwv+4WRn74VepGVI7YTqzta+OV/cLQBMrh2pv7gUGqLbTkqNKERagf1zotlZ5IP6CHS/IpJiQk6Ck6cWcbHbRTBI7OB/XlEbqGVG1HIoJZ0SBm5MJ2osMnXquBPZ6qRFm/jg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB317; X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB317; 20:Q+m9cr9qUNZItmjwVE9aIFXiSUX+40deOrR0aixF96g8mvPIRHAaGVsKH5Cql7pvQz6ECLz21k23Cf8fUWYyXm6Uu42NsbCwlmipBexP8wm5chrXA3trn83Yl6gfRlwk60j0EpQsnqo67wJd3tqNF2qq0GtHn3L0Hj06R3L1Y/NXdcMhqhJDdBibNRrgocaF6JPjMGbUVnfXD2/KqgkSBKb9iqEszx6ul72z/uhFB+IZjGEHALcpmk+trTSYcZZiqfIYuq/bnTPl17kn+nVfLDuWktVCFuPRZ224qb0Oc5sfF1n1FEjZB+ZGv/RaS2z0UpMYrCrmgUubbJj6WKi8heWB3P1DvzUSrKuJRIaz9Z9NEhGqWyfDZih+UP16pkdMnNO0A8TAlqPQyzU6fvs1asfPbapVtefnYBmKgqLX1RJf4+PvJ4AZniM2WjC/x6rVlFGw0czjUdfeiOEVfCgAe44QHP2vYhQIYmCToNl/IT4znN5KWtENJGXdM4j7zZOfvWVcf2v/uh41+CrQ9ep+YaqGPy93vCpfuPjeldLjWRy3XcoQIP+3/kS764FrcWaPmEZ1VSziWYXndZwabgfpZGue6Sbe80wCXzmaw66YwXk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(520078)(3002001); SRVR:DM2PR03MB317; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB317; X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB317; 4:siuxKCxbzVzlp0USIPOwUdsYfSXEPTI02L6qgSk1R+9lZT/ItHvwEtmNA2B1KuZy77648NyAk0Sz2z+5XuVGvKIn+DDvRd/byi9JZCifZZvSZLVpevPbKyYJwSjEc9bVIneMpxslwzBNs7Il/AKkc9qlicNdvJzTtieFlBnRZPknS36KpiIBFgzU3+psRwEHr9yVg4DpOI3F3mgVMhC5PJEaV37qFkMLtZJzNh9gW98l/pJVeK93v1aLgZKRGK/XrNHqLjGBYWI5xpnMfsUVq9Hu3P/fxfB8v8OFHIqd7JasKtFXFZ2zKxAuwE8/+GHHdy6ro25CYgQMAB40OQpgepqddgRNsmbc8FE7e21VztE= X-Forefront-PRVS: 070912876F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6049001)(6009001)(199003)(189002)(77096005)(97736004)(4001350100001)(64706001)(65956001)(5001830100001)(81156007)(5001860100001)(66066001)(65806001)(105586002)(59896002)(122386002)(80316001)(19580405001)(106356001)(40100003)(4001540100001)(19580395003)(36756003)(42186005)(229853001)(83506001)(110136002)(2351001)(23756003)(5001920100001)(189998001)(87976001)(50986999)(68736005)(5001960100002)(92566002)(101416001)(5007970100001)(50466002)(62966003)(77156002)(5004730100002)(54356999)(64126003)(65816999)(47776003)(87266999)(33656002)(46102003)(7940600001)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR03MB317; H:[10.171.72.55]; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: freescale.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?iso-8859-1?Q?1; DM2PR03MB317; 23:cOgU/7mbxZNjI4xTLJEM3dDQJtUg+6o4K/5fHC6b?= =?iso-8859-1?Q?VfjZlh4nI8t35gWBtmB6K3VQhPP+mnH97PObA6pSsoPDFEfgw3PcQKsE0B?= =?iso-8859-1?Q?RHttyyvQrHMm/ow1q/TAvWeEGrZWex6S9tuL6/Q9479hjQzu2QoN9Fyf/9?= =?iso-8859-1?Q?aSU/vs6Id2Oi2ItFZnT27gplqyoo6k4X3HX2ngav55B8OmQuypkU1bfBin?= =?iso-8859-1?Q?D53oO/00q1X9o9389MATp7pYE/1M+V43OEWi5xYGeM8bF/wGKf8WPE1hWj?= =?iso-8859-1?Q?FGeKOF3RD5OEpxtd+++wF6bcnVx9jIbyG/jeoK/S+GQu02byxExBA0D6JT?= =?iso-8859-1?Q?VXcghdJuBVmI2eK1eTT2xs5iuotYQ8F2W1x2bU9qdKNdBQuw7qmpdaiE25?= =?iso-8859-1?Q?w8YIpsWlmYZY+6tlWCyDaL4o4YcXgXwYA/+9hyl1aRSnsdQH4a8C4xhTTV?= =?iso-8859-1?Q?+saQ2URVHh9st7L+VpTMgDRnqa3et7BG/TK+UtBF24opSzT5yKGLhMKlR0?= =?iso-8859-1?Q?XAF0dTUqt6B7d2es1T3S2brHE2beKuADtSRkvKJbXXZzCvw7Go7mXPtLoc?= =?iso-8859-1?Q?/aeSo2jQq3kyHInb61p6Qu8tb8+k4i6VwwLrZeU8ZjWG806JRb4NDDh3c+?= =?iso-8859-1?Q?7RwFOzNWyw9YxJ+MSfBDL8R40SLxxvA0DKnKT3WtKLzRDcz9BUC/uwOIPA?= =?iso-8859-1?Q?bfUdG4zY9l7kpQCuSiF1hGTQpF5j3p1ZxDPO0zyEhhMFq8AC8H9X09M035?= =?iso-8859-1?Q?H2Uva2pFyjxiSbJtWLOmrLrZQBlHtFopGpow5uTYTSxK3yo4n95tx+xEQD?= =?iso-8859-1?Q?TCE8IQTAqiea/cdXLDAEo0i4sRbZAScVqc2bv3wnSWW0NCkZMdtug886eT?= =?iso-8859-1?Q?gx2ybXHGWLW2BLlLlybuTLhv+J6WsDjo278ldr0B/A5l3ejyRr1quDDtcx?= =?iso-8859-1?Q?A8ei4/oa6490XMLUm5il4xj6/mUNCYWU8PmZWBTo8IgSxaKAzgeeQ584lf?= =?iso-8859-1?Q?NY4XqHbPWp4dMPZDxGnR3vVBG1lk3yviUvhH2tZeuDQLtFuvlDMpYWS+SS?= =?iso-8859-1?Q?N5hJOI7GbtpHOTVKJgiUcWRf+LBK5yxYzrBVN0KJA/P4Og+R73qTJbmPmQ?= =?iso-8859-1?Q?1FxjfTDTVHYtlawD+VOCdD9YI40x4fXO1CDm8jlCognw1cNYrYBUwCOyxC?= =?iso-8859-1?Q?LbQi+v5lsln7X7TblyjzrnA5tqGDtT6nH2P6Yuv73bnRS2XGu9OgwxFLHE?= =?iso-8859-1?Q?LMHcH6U1L9ZKnO1B47pXph8AOV00Atroy/ktCQP71LUYLNIa1oMW8F/c/U?= =?iso-8859-1?Q?YkDgSvnVs6H2YQ7391CmG9ZAFjYUkO0px0TsrlR6KmZ+filSEXXJLS3ASq?= =?iso-8859-1?Q?hPlHf3MyYswjouYDz+k4BekCDbKiAkPXIjdcOrgzye/lsXAMns1gYl3OFc?= =?iso-8859-1?Q?X/RrlIi5Jk/YU=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB317; 5:JQ9sI0EzQ8UVcm2oBXRuXmenVQ58DSO9K6kXBOMDreTLkjYbJnwbSJC4FvlvIKu6kXwKQi5JUreHHE9KEjCsx9dpOpIsv3FqJunLu9uDm9feSq7LMXopQFwHzA+YOE7hTT0Xk0OecWz4RssDkfQ9/Q==; 24:0YLjKbCxFODGeSlBqMPZV40umOzVzd1mX5EHn+Nx6f/3lHz7IAvHhBQFY2rp1NoFpkux2zTWJ7ZLicMCAGJTF8hm6gLlAt9L7311Sefv65E=; 20:hvvIacvCIm63qMxjgkS5OOZq4sZm6ZA3rytisUeCO3kTaWK29uiO1Lqc9TJmQgkcIZUqvDLfsnRmnq2ZThdLpw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2015 12:58:10.0179 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR03MB317 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Book-E MMUv2 present in e6500 cores supports powers of 2K page sizes while older MMUv1 cores support only powers of 4K page sizes, or in other words the LSB of TSIZE on MMUv1 is always 0. Thus, on MMUv2 we must not strip the LSB. Signed-off-by: Mihai Caraman [Laurentiu.Tudor@freescale.com: addressed review feedback, split in distinct patch] Signed-off-by: Laurentiu Tudor --- arch/powerpc/kvm/e500_mmu_host.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 4d33e19..12d5c67 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -371,6 +371,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, unsigned long start, end; unsigned long slot_start, slot_end; + int tsize_inc; pfnmap = 1; @@ -392,10 +393,20 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, MAS1_TSIZE_SHIFT; /* - * e500 doesn't implement the lowest tsize bit, - * or 1K pages. + * MMUv1 doesn't implement the lowest tsize bit, + * or translations smaller than 4K. */ - tsize = max(BOOK3E_PAGESZ_4K, tsize & ~1); + if (!has_feature(&vcpu_e500->vcpu, VCPU_FTR_MMU_V2)) + tsize &= ~1; + tsize = max(BOOK3E_PAGESZ_4K, tsize); + + /* + * Calculate TSIZE increment. MMUv2 supports + * power of 2K translations while MMUv1 is limited + * to power of 4K sizes. + */ + tsize_inc = has_feature(&vcpu_e500->vcpu, + VCPU_FTR_MMU_V2) ? 1 : 2; /* * Now find the largest tsize (up to what the guest @@ -404,7 +415,8 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, * aligned. */ - for (; tsize > BOOK3E_PAGESZ_4K; tsize -= 2) { + for (; tsize > BOOK3E_PAGESZ_4K; + tsize -= tsize_inc) { unsigned long gfn_start, gfn_end; tsize_pages = 1 << (tsize - 2); @@ -437,10 +449,12 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, tsize = min(__ilog2(psize) - 10, tsize); /* - * e500 doesn't implement the lowest tsize bit, - * or 1K pages. + * MMUv1 doesn't implement the lowest tsize bit, + * or translations smaller than 4K. */ - tsize = max(BOOK3E_PAGESZ_4K, tsize & ~1); + if (!has_feature(&vcpu_e500->vcpu, VCPU_FTR_MMU_V2)) + tsize &= ~1; + tsize = max(BOOK3E_PAGESZ_4K, tsize); } up_read(¤t->mm->mmap_sem);