From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on archive.lwn.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by archive.lwn.net (Postfix) with ESMTP id 1A4117D089 for ; Mon, 12 Nov 2018 00:17:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730098AbeKLKHu (ORCPT ); Mon, 12 Nov 2018 05:07:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:59152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730039AbeKLIRB (ORCPT ); Mon, 12 Nov 2018 03:17:01 -0500 Received: from localhost (unknown [206.108.79.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 10E8921104; Sun, 11 Nov 2018 22:27:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541975226; bh=IKP7ZDEvpA/E7zt2b+tyD2cfnFd19HNOMrd6yqGlCHs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CNLxJVo5XdYdkRGtFEYMJv/gJfDQm3DV44+ujby6sXBdJuNxiWPaXyxm4XEMYAW80 3bI94wK/FvG+SEeGjDS9RCU8E/2qHz2dsDxojkWZndecpxfYaHaIw3CUww3HNlB30u j94c+fUgFLMibcHVfv8X5FvETyHd5Jr3cbdkM7Mw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Juergen Gross , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , boris.ostrovsky@oracle.com, bp@alien8.de, corbet@lwn.net, linux-doc@vger.kernel.org, xen-devel@lists.xenproject.org, Ingo Molnar Subject: [PATCH 4.19 042/361] x86/xen: Fix boot loader version reported for PVH guests Date: Sun, 11 Nov 2018 14:16:29 -0800 Message-Id: <20181111221625.728414024@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111221619.915519183@linuxfoundation.org> References: <20181111221619.915519183@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Juergen Gross commit 357d291ce035d1b757568058f3c9898c60d125b1 upstream. The boot loader version reported via sysfs is wrong in case of the kernel being booted via the Xen PVH boot entry. it should be 2.12 (0x020c), but it is reported to be 2.18 (0x0212). As the current way to set the version is error prone use the more readable variant (2 << 8) | 12. Signed-off-by: Juergen Gross Cc: # 4.12 Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: boris.ostrovsky@oracle.com Cc: bp@alien8.de Cc: corbet@lwn.net Cc: linux-doc@vger.kernel.org Cc: xen-devel@lists.xenproject.org Link: http://lkml.kernel.org/r/20181010061456.22238-2-jgross@suse.com Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/xen/enlighten_pvh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -75,7 +75,7 @@ static void __init init_pvh_bootparams(v * Version 2.12 supports Xen entry point but we will use default x86/PC * environment (i.e. hardware_subarch 0). */ - pvh_bootparams.hdr.version = 0x212; + pvh_bootparams.hdr.version = (2 << 8) | 12; pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */ x86_init.acpi.get_root_pointer = pvh_get_root_pointer; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.19 042/361] x86/xen: Fix boot loader version reported for PVH guests Date: Sun, 11 Nov 2018 14:16:29 -0800 Message-ID: <20181111221625.728414024@linuxfoundation.org> References: <20181111221619.915519183@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gLyCC-00018G-NZ for xen-devel@lists.xenproject.org; Sun, 11 Nov 2018 22:27:08 +0000 In-Reply-To: <20181111221619.915519183@linuxfoundation.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org Cc: Juergen Gross , corbet@lwn.net, Peter Zijlstra , Greg Kroah-Hartman , linux-doc@vger.kernel.org, stable@vger.kernel.org, Ingo Molnar , bp@alien8.de, xen-devel@lists.xenproject.org, Thomas Gleixner , Linus Torvalds , boris.ostrovsky@oracle.com List-Id: xen-devel@lists.xenproject.org NC4xOS1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBKdWVyZ2VuIEdy b3NzIDxqZ3Jvc3NAc3VzZS5jb20+Cgpjb21taXQgMzU3ZDI5MWNlMDM1ZDFiNzU3NTY4MDU4ZjNj OTg5OGM2MGQxMjViMSB1cHN0cmVhbS4KClRoZSBib290IGxvYWRlciB2ZXJzaW9uIHJlcG9ydGVk IHZpYSBzeXNmcyBpcyB3cm9uZyBpbiBjYXNlIG9mIHRoZQprZXJuZWwgYmVpbmcgYm9vdGVkIHZp YSB0aGUgWGVuIFBWSCBib290IGVudHJ5LiBpdCBzaG91bGQgYmUgMi4xMgooMHgwMjBjKSwgYnV0 IGl0IGlzIHJlcG9ydGVkIHRvIGJlIDIuMTggKDB4MDIxMikuCgpBcyB0aGUgY3VycmVudCB3YXkg dG8gc2V0IHRoZSB2ZXJzaW9uIGlzIGVycm9yIHByb25lIHVzZSB0aGUgbW9yZQpyZWFkYWJsZSB2 YXJpYW50ICgyIDw8IDgpIHwgMTIuCgpTaWduZWQtb2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jv c3NAc3VzZS5jb20+CkNjOiA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4gIyA0LjEyCkNjOiBMaW51 cyBUb3J2YWxkcyA8dG9ydmFsZHNAbGludXgtZm91bmRhdGlvbi5vcmc+CkNjOiBQZXRlciBaaWps c3RyYSA8cGV0ZXJ6QGluZnJhZGVhZC5vcmc+CkNjOiBUaG9tYXMgR2xlaXhuZXIgPHRnbHhAbGlu dXRyb25peC5kZT4KQ2M6IGJvcmlzLm9zdHJvdnNreUBvcmFjbGUuY29tCkNjOiBicEBhbGllbjgu ZGUKQ2M6IGNvcmJldEBsd24ubmV0CkNjOiBsaW51eC1kb2NAdmdlci5rZXJuZWwub3JnCkNjOiB4 ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKTGluazogaHR0cDovL2xrbWwua2VybmVsLm9y Zy9yLzIwMTgxMDEwMDYxNDU2LjIyMjM4LTItamdyb3NzQHN1c2UuY29tClNpZ25lZC1vZmYtYnk6 IEluZ28gTW9sbmFyIDxtaW5nb0BrZXJuZWwub3JnPgpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2Fo LUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgoKLS0tCiBhcmNoL3g4Ni94ZW4v ZW5saWdodGVuX3B2aC5jIHwgICAgMiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCsp LCAxIGRlbGV0aW9uKC0pCgotLS0gYS9hcmNoL3g4Ni94ZW4vZW5saWdodGVuX3B2aC5jCisrKyBi L2FyY2gveDg2L3hlbi9lbmxpZ2h0ZW5fcHZoLmMKQEAgLTc1LDcgKzc1LDcgQEAgc3RhdGljIHZv aWQgX19pbml0IGluaXRfcHZoX2Jvb3RwYXJhbXModgogCSAqIFZlcnNpb24gMi4xMiBzdXBwb3J0 cyBYZW4gZW50cnkgcG9pbnQgYnV0IHdlIHdpbGwgdXNlIGRlZmF1bHQgeDg2L1BDCiAJICogZW52 aXJvbm1lbnQgKGkuZS4gaGFyZHdhcmVfc3ViYXJjaCAwKS4KIAkgKi8KLQlwdmhfYm9vdHBhcmFt cy5oZHIudmVyc2lvbiA9IDB4MjEyOworCXB2aF9ib290cGFyYW1zLmhkci52ZXJzaW9uID0gKDIg PDwgOCkgfCAxMjsKIAlwdmhfYm9vdHBhcmFtcy5oZHIudHlwZV9vZl9sb2FkZXIgPSAoOSA8PCA0 KSB8IDA7IC8qIFhlbiBsb2FkZXIgKi8KIAogCXg4Nl9pbml0LmFjcGkuZ2V0X3Jvb3RfcG9pbnRl ciA9IHB2aF9nZXRfcm9vdF9wb2ludGVyOwoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0 cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlz dGluZm8veGVuLWRldmVs