From patchwork Thu Oct 1 12:58:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Laurentiu X-Patchwork-Id: 524971 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 E669C140D70 for ; Thu, 1 Oct 2015 22:58:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933102AbbJAM6W (ORCPT ); Thu, 1 Oct 2015 08:58:22 -0400 Received: from mail-bl2on0119.outbound.protection.outlook.com ([65.55.169.119]:43959 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752980AbbJAM6V (ORCPT ); Thu, 1 Oct 2015 08:58:21 -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 BLUPR03MB309.namprd03.prod.outlook.com (10.141.48.22) with Microsoft SMTP Server (TLS) id 15.1.280.20; Thu, 1 Oct 2015 12:58:17 +0000 Message-ID: <560D2DDB.4060203@freescale.com> Date: Thu, 1 Oct 2015 15:58:03 +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: Laurentiu Tudor , Scott Wood , Alexander Graf Subject: [PATCH] KVM: PPC: e500: fix couple of shift operations on 64 bits X-Originating-IP: [192.88.166.1] X-ClientProxiedBy: VI1PR07CA0055.eurprd07.prod.outlook.com (25.164.94.151) To BLUPR03MB309.namprd03.prod.outlook.com (10.141.48.22) X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB309; 2:4KtqashkvFdSBm7I8975Qvx63SXFfswrM6nuYDHxohlkjjNXM2fkhCu4Wg6syfDgadAwASlRqEio4/jXcGXEF2CvNg8O3K0MdPKKcYiVnyo1MPy9GBf+5oIPZugilZix+OqC0AipJL86DXBOrPjhwPFhsi/xD8kJdy0flvrwdpc=; 3:TBi3K99b3h1vmlsUmpzuVc8gyWRTyt96gRHyFriKw0NBPcyazULtc0trxeC40X4r3XbIGiN3t9U9/yq8vkKehS4Zgo+ZEMrJO/gCtBCRXGKf/njZkT+1u1M3pfzN74vSXpbOYMnCTa+lyxIaKLgF4A==; 25:T39SM9mWvRpERmmDjGwm1fzVqsrxQ37GxWcUOUMklBuAQFeusCoRDKWyFk5TmYm8xZAxP5IEaq036oIwgyExmakT20ifqs9mOXF0c+MAjrh1x4d8YIbU9ZVuFWiF0s4bMrzzK5nBXFBDAQI986roKQVdYG16wcu6h0kuKwUza0Ui7+nVIuaL28610YaocZS4Abe++hZ/n4n5J892ts7TaPM6a4XiokWAirnGSqTZpFA/XXzx75DNaLQaiK7u0KVFq0NA28BzVsvrRqgVYSohIg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB309; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB309; 20:U4ja+Wl9g63TMBcMW4t/Bys+Ri+NIdy9vjrPHXh8aWrt6OHKajVeA6BR9lE+XT6RyfJfjARefIPxdAJJIUpEkZFFKr+kCoi3plUxLvm5oajjBgI5SIHjdLMVdAXtYNkvRIEqkr/vAdbOa06Y85qTO10YNAOIfg646TBgS/nm1+ITMgfC/R22UFSjY/21euXXXFj9IShLYqrj7XS0oZNRcw0T+gW/2yYibybZTMX3w7E+o/0FxMJhpHkPWnl5GdUehADRbBG+x7U2/BnZLkFegembHX5ONDOxVCLqvDJX8NHwfZVh143uTPGiXSB4VfDDA5oSQ0n2CQywlHGggpI+a7fOj1Ak9LrttXb61v8X9phhM46KQ19fS0X+NRqG125YjDH9kI0PjWNwosg3FH7BU77cbwnZa9ANk5AVEo/csxFfZNEEHk7XUj0/twQPgpeXu3hFDAmM2iNnocCrb323lmal1QCfHmDuX2lwIbVhU16Il7cn50Y8FeeU2KYTMvcVvfh0gBL8byRDjOHZDgmb07bQYC6B1M5xONsSIIqvigTvXuzzXUi3K9TetnES+62nQ3bxaHFntUBovtzaFVtf+ElVrOHw5NI14dYcjxH3EP0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001); SRVR:BLUPR03MB309; BCL:0; PCL:0; RULEID:; SRVR:BLUPR03MB309; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB309; 4:oqhU6N21XR+9TRKnByJ99OdZNsqrvCTizSm2WAUe1UzPgzU53daj0O7r6HJfzlc3MZ8SIouzxjKLrT/2v9R+XFOsgxF7O0S02ahWHJhVmMbC5TH/aiKDhcREy+cYLTJ5h0ybDxsQEq2DaKuyoJQTTfZr/5A/80aD6TiyoNP8esPJvgaPRYzZHUfWZXesoqYdfRZPDyN9ZERQPNOXN7RtY62WMeU+gyXbznqHb78fxw6q1emM7QLAGdKJpec1xlYoc/9AN6okGrDua9B9UWtndGWOk+8cZ+pV+1NJ4PPHEeXlj7Tmw3IhH4AeKClWZGhYKPeafh5m7Ry5ci71oYoHlQeNwfs9l4AiCYQDcoya9bI= X-Forefront-PRVS: 0716E70AB6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(6049001)(199003)(189002)(64126003)(5004730100002)(87976001)(47776003)(122386002)(87266999)(92566002)(54356999)(5001830100001)(97736004)(4001540100001)(80316001)(101416001)(81156007)(4001350100001)(5001770100001)(5008740100001)(50986999)(36756003)(65816999)(229853001)(5007970100001)(5001860100001)(59896002)(42186005)(19580405001)(5001960100002)(64706001)(106356001)(77156002)(50466002)(40100003)(189998001)(46102003)(65956001)(66066001)(62966003)(23756003)(77096005)(33656002)(68736005)(19580395003)(83506001)(65806001)(105586002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR03MB309; 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; BLUPR03MB309; 23:0a6hzChfoKxy+wT0obS+Sl5NA9uQZq5IFgt3/h4W?= =?iso-8859-1?Q?/QktS28Tn17ZO+pNDzed3jTmt4n7Xv2YaEx/dTA8MQbXHzxn9zGO44Kwar?= =?iso-8859-1?Q?ke/u2sh6IhcHtZnqZ/IVw+I7KYGVQVtYtEZDPgm93OwBQeikomEBltDXwN?= =?iso-8859-1?Q?1pE0+H2H06O2265u1iBE4SvOrjrt64n0/Vr4oed9j7xEpOLYQSVT25M9Tq?= =?iso-8859-1?Q?E8wzSBXi4/X9FKw6iaoqA9JTn7oHh1XfKYhzC1We85NfWb0EgpBHa5VDbK?= =?iso-8859-1?Q?r+OyhHK+/3+EcfHlryNMo2xAIHvI3s80IdD8tRNriI1OrEWH5FpqtmGvk3?= =?iso-8859-1?Q?uIvYJHl91nv3HITtapXd6ls6Tn/hc+f7kA2LMHCdnFv8Us1RFByPxdt9ln?= =?iso-8859-1?Q?rk8UtPKa1jcVd50n5NS25Qc1r0NmJSDwPgUuyy3EBSLh6xT/s29mX7+nZ3?= =?iso-8859-1?Q?sfFYDZlyTHyuIV63wHw41WAuSNgS2TfBfekHedB9/jyRDb4L4QKqQOJp3E?= =?iso-8859-1?Q?m/fV/8TzTFwZjo/omPO9NRdHqY/+xGWz2R3E3Fx6NLroagZNxtHsJRCjfG?= =?iso-8859-1?Q?LabmjBLagvSA6qTgd0EMnA1/192uvR40Us+s0d901aV72KaAI2PbiT99nv?= =?iso-8859-1?Q?TX1qtPIcvXjgSV5UlLX6IHLzjXyYZ2PvQPwEEegH2fyWrPhwr1YkTFNiI1?= =?iso-8859-1?Q?MTHCBEgyzfZvy0lE+BgBaNYoEO6IE5JV5qXQY+mx07Jfb+GlFKg9VlEHEP?= =?iso-8859-1?Q?ts+DvtjyH46uJtaddFU0LfS8stPt8tA+Plrl3y6jAPacf2S4qsWaZ9G+j/?= =?iso-8859-1?Q?3HKIk3fVHoTzY8oRrScZgR66zhPp9d7WKGffpRTCM7vrG9HuEt5zx0FqZO?= =?iso-8859-1?Q?mP6KGtaJjckMFMPkSH3Tbg6PHpVQ+hBOIjoxtmBHDN7HVWsXBKFaEdwED9?= =?iso-8859-1?Q?npgS46ALsDGJU1plWQqUJMEM5JXD109QGeeNO1GM4I7UX69dKgMtec0hnc?= =?iso-8859-1?Q?CHz63pXL9pg8zKrqWTyJoClxRu3r4lzmIpRMDOz6OxvcQE+HZytba2GStu?= =?iso-8859-1?Q?/auwnuE07Ckb8EtKTVdTtCBJlaB5Crv7Mwqr/AHdN3HFvjKMFW+Nu1WxxQ?= =?iso-8859-1?Q?jhEGXcQMSkmSsnM4pGfD1soKRBmrVZ9joF0C9Tw9pKBRmaYw7Ep5Rnosij?= =?iso-8859-1?Q?pGXo+4zN/nlZU6KSGguWhyJWg5E1IB1aMQeDuVIwD9MnVL0d1SGSV++1RL?= =?iso-8859-1?Q?9ve+dSrSOclUCVJz9L8uRMJbNYpnxeoX4yrkudYU0k9kWy0LY0+a15VLHO?= =?iso-8859-1?Q?6/f40N/IGiol0M/crkH9etTJjrf8RKg7KAqdUSpmNktMDHaTtCmBNUOcLM?= =?iso-8859-1?Q?/Mv3GTo5xpbMwQnHza6UdZN4J03e?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB309; 5:wMPq0EdRjaCEY0iMcsWjf/sJ8Vb3pz7zQSqj/jXa5t0t9u1/GbTa+lZIOxMeHQoYBI6xUkvMC/fxpjIEdS1x2r75MN9oQATxv6mzPYrLeTqftlPPxxOc/Z98d/OQtQKPoRUpvLVr/6MEg+UIbiCm9A==; 24:FQVPoiDP7ZaQPrvPXkZhv48Be+j1UNwfK0fxzRcgG0qQp0jjuzCtk53OzrKLEguarWj4C7DNb5Tl1UBIFUfpSOGYIEftxk+noWx+dMz0iS4=; 20:eo+UvhDmxUEG02VHuJfXBaQ4a6sN6FLmxQZe5HqYxBEIFyRGot/50gNc9IMuNeuYcbXb6hBduXWphJ9ihoCvqA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2015 12:58:17.0870 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB309 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Fix couple of cases where we shift left a 32-bit value thus might get truncated results on 64-bit targets. Signed-off-by: Laurentiu Tudor Suggested-by: Scott Wood Acked-by: Scott Wood --- arch/powerpc/kvm/e500_mmu_host.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 008ab84..a096cf9 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -418,7 +418,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, for (; tsize > BOOK3E_PAGESZ_4K; tsize -= tsize_inc) { unsigned long gfn_start, gfn_end; - tsize_pages = 1 << (tsize - 2); + tsize_pages = 1UL << (tsize - 2); gfn_start = gfn & ~(tsize_pages - 1); gfn_end = gfn_start + tsize_pages; @@ -462,7 +462,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, } if (likely(!pfnmap)) { - tsize_pages = 1 << (tsize + 10 - PAGE_SHIFT); + tsize_pages = 1UL << (tsize + 10 - PAGE_SHIFT); pfn = gfn_to_pfn_memslot(slot, gfn); if (is_error_noslot_pfn(pfn)) { if (printk_ratelimit())