Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934615AbcJZUrM (ORCPT ); Wed, 26 Oct 2016 16:47:12 -0400 Received: from ex13-edg-ou-001.vmware.com ([208.91.0.189]:20458 "EHLO EX13-EDG-OU-001.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932707AbcJZUrJ (ORCPT ); Wed, 26 Oct 2016 16:47:09 -0400 Date: Wed, 26 Oct 2016 13:47:07 -0700 From: Tim Mann To: Alexey Makhalov CC: , , , , , , , , , , , Subject: Re: [PATCH 2/3] x86/vmware: Add basic paravirt ops support Message-ID: <20161026134707.1e445c37@manzanita> In-Reply-To: <20161026052600.77535-1-amakhalov@vmware.com> References: <20161026052038.77042-1-amakhalov@vmware.com> <20161026052600.77535-1-amakhalov@vmware.com> Organization: VMware, Inc. X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1864 Lines: 57 I believe our trademark guidelines say we aren't supposed to use VMware as a noun to mean a product, only to mean the company. So we can say "running on VMware ESXi" or "running in a VMware virtual machine", but "running on VMware" is wrong. There is supposedly some good legal reason for this related to keeping our trademark. On Tue, 25 Oct 2016 22:26:00 -0700, Alexey Makhalov wrote: > Add basic paravirt support: > 1. set pv_info.name to "VMware" to have proper boot log message > Booting paravirtualized kernel on VMware > instead of "... on bare hardware" > 2. set pv_cpu_ops.io_delay() to empty function - paravirt_nop() to > avoid vm-exits on IO delays. > > Signed-off-by: Alexey Makhalov > Acked-by: Alok N Kataria > --- > arch/x86/kernel/cpu/vmware.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c > index 480790f..e3fb320 100644 > --- a/arch/x86/kernel/cpu/vmware.c > +++ b/arch/x86/kernel/cpu/vmware.c > @@ -61,6 +61,16 @@ static unsigned long vmware_get_tsc_khz(void) > return vmware_tsc_khz; > } > > +#ifdef CONFIG_PARAVIRT > +static void __init vmware_paravirt_ops_setup(void) > +{ > + pv_info.name = "VMware"; > + pv_cpu_ops.io_delay = paravirt_nop; > +} > +#else > +#define vmware_paravirt_ops_setup() do {} while (0) > +#endif > + > static void __init vmware_platform_setup(void) > { > uint32_t eax, ebx, ecx, edx; > @@ -94,6 +104,8 @@ static void __init vmware_platform_setup(void) > } else { > pr_warn("Failed to get TSC freq from the hypervisor\n"); > } > + > + vmware_paravirt_ops_setup(); > } > > /* -- Tim Mann | work: mann@vmware.com home: tim@tim-mann.org VMware Sr. Staff Engineer | http://www.vmware.com http://tim-mann.org