Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3491447imu; Sun, 11 Nov 2018 16:18:19 -0800 (PST) X-Google-Smtp-Source: AJdET5eJQ6Qi3uc5nTSFgGbzkuQpwd67jEi/FHkWx/TP0/LHQPIdyIdahhb8tGcyyFdCBQEZUMFL X-Received: by 2002:a63:4f5e:: with SMTP id p30mr15527888pgl.71.1541981898922; Sun, 11 Nov 2018 16:18:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541981898; cv=none; d=google.com; s=arc-20160816; b=vOxs5O4vAPuYVkeKw82sog1eQYCtR/ctxMquZwO9/yB/7q7Z4LU6Q8JXwlsiD8FAMj cT6mKP9y7VJbpqfuxnCMHpduxkkcaUjR1lVi0f+oxsAod+ujFIbAirhC0oJBbTAzkaz2 vxheL/oAv8TBY/OWaB1InWefa+zaSfr84yNAuaARg7FgWGRZpmhxRE38vMnQy0kbYnCW zCDxmGnm9xwUJGR461LW0yRtPtLd8pRiSq8ASRzNhSm3GMZrKSrHmlvQZMGKj/0s6hRk FsnrUGJ6qa+viv8XFT4MhW1J+zccDY27EoATNWtpWCutCeLgaZZN9OOrr4HyTjmNgUta g7eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YagSPeM1tC3tJjZ+hNmON3oU3hBv28NyNbdFZTB3kT4=; b=yLAUBrOd6r5Aok54htxowEfXqsV8fpcyoEoLhKMvC89ecv7Vqhr6ImFSjLxo9HJnzH mAKvCwDzJzmecWL9/sYHkqEw45Ebfo6E8dYY/fEk0myJtrjZe/bLwJeLgr1t52HjKyd/ k84Y+NXNK3LuPsS1UFZLkp6nmXLCOAScAiKJ8feBanK/eM/47vRu3QhVZ8b1b1HqvBq+ kaCQgnDvSvibGgDSEcoATTbwyAOqJzu05NMnvn/557OuNo6S5GturloD5B2RCa4IyxYI kIrWRGsv0J8KJPoTVFFaNB0j+uh80yk3nF6jWOHIVFpDc8cgRdzo5wG4FeDcw5aAXzEC TJVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CNLxJVo5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 69si15132501pgd.290.2018.11.11.16.18.03; Sun, 11 Nov 2018 16:18:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CNLxJVo5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730350AbeKLKHv (ORCPT + 99 others); Mon, 12 Nov 2018 05:07:51 -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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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;