From patchwork Fri Mar 22 00:02:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2317671 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id DA76AE00E5 for ; Fri, 22 Mar 2013 00:02:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753272Ab3CVACU (ORCPT ); Thu, 21 Mar 2013 20:02:20 -0400 Received: from mail-da0-f46.google.com ([209.85.210.46]:62230 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752931Ab3CVACT (ORCPT ); Thu, 21 Mar 2013 20:02:19 -0400 Received: by mail-da0-f46.google.com with SMTP id y19so1932809dan.19 for ; Thu, 21 Mar 2013 17:02:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type:x-gm-message-state; bh=ltjQ2ujLgJM2C2Bviq3xRnUHyv/8L46bXToQgd8GHnE=; b=dJ5gWL70y6vfoYBz89VAQuhX/bNF5k46/Tt9yEMAnSw6EvyI02rx7dnY6O0lM3LTqH +9tXIw+z95iiWuk/O0M1IA+6xvQzGCSriNkYlwQ7hZqk4DPnC5ZrXUksTo82X3U1C1qo ErjVL44cU6u1/DDc4E9CSLsBhG/HuaEy0udOf/3Icure1wRUS2WtPZg7ZMPvIHS5UqWa XJ2gmtDmiJjOBjSPoAFILtqe6dadKQ5D4UXjwCf2tEHoU0/s7v2X1r2nJiQHZvNPwlOl Et7dBTUfnBUpYROp1bfyoVwof4J+kwbW7+B1RR8/44xKTN1aJieFS3s886Cwv+AsITK9 Xngg== X-Received: by 10.68.213.104 with SMTP id nr8mr17637450pbc.200.1363910538563; Thu, 21 Mar 2013 17:02:18 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id hp1sm514711pac.3.2013.03.21.17.02.16 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 21 Mar 2013 17:02:17 -0700 (PDT) From: Kevin Hilman To: Gleb Natapov Cc: Scott Wood , Frederic Weisbecker , linaro-kernel@lists.linaro.org, Marcelo Tosatti , "open list\:KERNEL VIRTUAL MA..." , open list Subject: Re: [PATCH] KVM: allow host header to be included even for !CONFIG_KVM References: <1363306426-27209-1-git-send-email-khilman@linaro.org> <1363823921.25034.35@snotra> <20130321072955.GO3889@redhat.com> <87ppyshlq5.fsf@linaro.org> <1363891354.31522.17@snotra> <20130321191600.GG9382@redhat.com> <1363894393.31522.20@snotra> <20130321211736.GI9382@redhat.com> Date: Thu, 21 Mar 2013 17:02:15 -0700 In-Reply-To: <20130321211736.GI9382@redhat.com> (Gleb Natapov's message of "Thu, 21 Mar 2013 23:17:36 +0200") Message-ID: <878v5ggv3s.fsf@linaro.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkvIvH2I83e+EcFlneU5Tv/3pg0Iz/cNfmCdFLNZBglSpAz0fkY9u2tf1Q80vQJSAhOv1mo Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Gleb Natapov writes: > On Thu, Mar 21, 2013 at 02:33:13PM -0500, Scott Wood wrote: >> On 03/21/2013 02:16:00 PM, Gleb Natapov wrote: >> >On Thu, Mar 21, 2013 at 01:42:34PM -0500, Scott Wood wrote: >> >> On 03/21/2013 09:27:14 AM, Kevin Hilman wrote: >> >> >Gleb Natapov writes: >> >> > >> >> >> On Wed, Mar 20, 2013 at 06:58:41PM -0500, Scott Wood wrote: >> >> >>> Why can't the entirety kvm_host.h be included regardless of >> >> >>> CONFIG_KVM, just like most other feature-specific headers? Why >> >> >>> can't the if/else just go around the functions that you want to >> >> >stub >> >> >>> out for non-KVM builds? >> >> >>> >> >> >> Kevin, >> >> >> >> >> >> What compilation failure this patch fixes? I presume >> >something ARM >> >> >> related. >> >> > >> >> >Not specficially ARM related, but more context tracking related >> >since >> >> >kernel/context_tracking.c pulls in kvm_host.h, which attempts to >> >> >pull in >> >> > which may not exist on some platforms. >> >> > >> >> >At least for ARM, KVM support was added in v3.9 so this patch can >> >> >probably be dropped since the non-KVM builds on ARM now work. >> >But any >> >> >platform without the will still be broken when >> >trying to >> >> >build the context tracker. >> >> >> >> Maybe other platforms should get empty asm/kvm*.h files. Is there >> >> anything from those files that the linux/kvm*.h headers need to >> >> build? >> >> >> >arch things. kvm_vcpu_arch, kvm_arch_memory_slot, kvm_arch etc. >> >> Could define them as empty structs. >> > Isn't is simpler for kernel/context_tracking.c to define empty > __guest_enter()/__guest_exit() if !CONFIG_KVM. I proposed something like that in an earlier version but Frederic asked me to propose a fix to the KVM headers instead. Just in case fixing the context tracking subsystem is preferred, the patch below fixes the problem also. Kevin From f22995a262144d0d61705fa72134694d911283eb Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 21 Mar 2013 16:57:14 -0700 Subject: [PATCH] context_tracking: fix !CONFIG_KVM compile: add stub guest enter/exit When KVM is not enabled, or not available on a platform, the KVM headers should not be included. Instead, just define stub __guest_[enter|exit] functions. Cc: Frederic Weisbecker Signed-off-by: Kevin Hilman --- kernel/context_tracking.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c index 65349f0..64b0f80 100644 --- a/kernel/context_tracking.c +++ b/kernel/context_tracking.c @@ -15,12 +15,18 @@ */ #include -#include #include #include #include #include +#if IS_ENABLED(CONFIG_KVM) +#include +#else +#define __guest_enter() +#define __guest_exit() +#endif + DEFINE_PER_CPU(struct context_tracking, context_tracking) = { #ifdef CONFIG_CONTEXT_TRACKING_FORCE .active = true,