From patchwork Fri Jan 23 09:48:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 43569 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6732A218DB for ; Fri, 23 Jan 2015 09:54:17 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id eu11sf42525204pac.1 for ; Fri, 23 Jan 2015 01:54:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:cc:subject:message-id :references:mime-version:content-type:content-disposition :in-reply-to:user-agent:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=5mqKUBlDxxu3SGLOrPFfC/Ffdcmhv+TQmOCOfgaAI7M=; b=G1+ABpoPswMJVyLEOidO0eEMtPpKNJ/Cg18zT5FjN4TR3XinfBAnZ+67nabaRoz3nz nX8SJ91rcbD4kXZgXh7A+ciRi+Z4hJStgBaUGo6EK6dwuQWaqHts1cemsDwBbnvqk9tw n6XeM/8NQ/U/s2CY17DKAfbcaujLEMyD1x9lzHJsOHr/EKrAqOSJbpeXWTMaOqwvKJ7E s2o59kzDC9r6tQzMPDFBzAdAuPGdgChA12RBdC+1BdVmdb71SrNtVDgVQz3v/JSHN2tG /btFS+c3H0MTzbNVnOyhNgOqnw0wswHpcNvGSZGKr3wehnADos/ebZp06jp6CD75IkYF /8UA== X-Gm-Message-State: ALoCoQnfe7srTrI7es8GaTEF72LCJe6NuA0u/yqkOi9EB2rk3nil5JHx7VfmaYoNxo7lEk3Mgek5 X-Received: by 10.66.66.136 with SMTP id f8mr4750774pat.31.1422006856661; Fri, 23 Jan 2015 01:54:16 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.107.169.100 with SMTP id s97ls150421ioe.58.gmail; Fri, 23 Jan 2015 01:54:16 -0800 (PST) X-Received: by 10.68.195.234 with SMTP id ih10mr10045869pbc.66.1422006856525; Fri, 23 Jan 2015 01:54:16 -0800 (PST) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id ni2si1298549pdb.127.2015.01.23.01.54.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jan 2015 01:54:16 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id hs14so519lab.9 for ; Fri, 23 Jan 2015 01:49:12 -0800 (PST) X-Received: by 10.152.26.201 with SMTP id n9mr6399964lag.50.1422006552743; Fri, 23 Jan 2015 01:49:12 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp189551lbb; Fri, 23 Jan 2015 01:49:11 -0800 (PST) X-Received: by 10.68.233.232 with SMTP id tz8mr9694382pbc.166.1422006550729; Fri, 23 Jan 2015 01:49:10 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zs6si1306001pac.109.2015.01.23.01.49.08; Fri, 23 Jan 2015 01:49:10 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754894AbbAWJtF (ORCPT + 28 others); Fri, 23 Jan 2015 04:49:05 -0500 Received: from mail-la0-f49.google.com ([209.85.215.49]:64281 "EHLO mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753101AbbAWJs5 (ORCPT ); Fri, 23 Jan 2015 04:48:57 -0500 Received: by mail-la0-f49.google.com with SMTP id gf13so2173141lab.8 for ; Fri, 23 Jan 2015 01:48:56 -0800 (PST) X-Received: by 10.112.135.99 with SMTP id pr3mr6257386lbb.61.1422006536229; Fri, 23 Jan 2015 01:48:56 -0800 (PST) Received: from localhost (188-178-240-98-static.dk.customer.tdc.net. [188.178.240.98]) by mx.google.com with ESMTPSA id q9sm316134lbo.29.2015.01.23.01.48.54 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 23 Jan 2015 01:48:54 -0800 (PST) Date: Fri, 23 Jan 2015 10:48:58 +0100 From: Christoffer Dall To: Paolo Bonzini Cc: Paul Bolle , Mario Smarduch , Valentin Rothberg , Gleb Natapov , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: KVM: HAVE_KVM_ARCH_DIRTY_LOG_PROTECT? Message-ID: <20150123094858.GJ15076@cbox> References: <1421918381.13638.43.camel@x220> <54C101B9.1050804@redhat.com> <1421938175.13638.58.camel@x220> <54C11815.8070501@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <54C11815.8070501@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christoffer.dall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , On Thu, Jan 22, 2015 at 04:32:37PM +0100, Paolo Bonzini wrote: > > > On 22/01/2015 15:49, Paul Bolle wrote: > >> > Ah, there are two Kconfig symbols added by mistake. > >> > > >> > +config HAVE_KVM_ARCH_DIRTY_LOG_PROTECT > >> > + bool > >> > + > >> > +config KVM_GENERIC_DIRTYLOG_READ_PROTECT > >> > + bool > > This one is actually used (so my 800 line perl monster didn't bark): > > $ git grep -n KVM_GENERIC_DIRTYLOG_READ_PROTECT next-20150122 > > next-20150122:arch/arm/kvm/Kconfig:27: select KVM_GENERIC_DIRTYLOG_READ_PROTECT > > next-20150122:arch/arm64/kvm/Kconfig:30: select KVM_GENERIC_DIRTYLOG_READ_PROTECT > > next-20150122:arch/x86/kvm/Kconfig:42: select KVM_GENERIC_DIRTYLOG_READ_PROTECT > > next-20150122:virt/kvm/Kconfig:47:config KVM_GENERIC_DIRTYLOG_READ_PROTECT > > next-20150122:virt/kvm/kvm_main.c:998:#ifdef CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT > > > > Yes, the mistake is adding two symbols instead of one. :) > Yes, I'm fixing it up with this patch: Thanks, -Christoffer --- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index eb94597..74aeaba 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -1042,8 +1042,8 @@ static void stage2_wp_range(struct kvm *kvm, phys_addr_t addr, phys_addr_t end) /* * Release kvm_mmu_lock periodically if the memory region is * large. Otherwise, we may see kernel panics with - * CONFIG_DETECT_HUNG_TASK, CONFIG_LOCK_DETECTOR, - * CONFIG_LOCK_DEP. Additionally, holding the lock too long + * CONFIG_DETECT_HUNG_TASK, CONFIG_LOCKUP_DETECTOR, + * CONFIG_LOCKDEP. Additionally, holding the lock too long * will also starve other vCPUs. */ if (need_resched() || spin_needbreak(&kvm->mmu_lock)) diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig index 314950c..50d1106 100644 --- a/virt/kvm/Kconfig +++ b/virt/kvm/Kconfig @@ -41,8 +41,5 @@ config KVM_VFIO config HAVE_KVM_ARCH_TLB_FLUSH_ALL bool -config HAVE_KVM_ARCH_DIRTY_LOG_PROTECT - bool - config KVM_GENERIC_DIRTYLOG_READ_PROTECT bool