From patchwork Wed Jul 29 08:47:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Feng" X-Patchwork-Id: 51620 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id 8C74922DB5 for ; Wed, 29 Jul 2015 08:59:42 +0000 (UTC) Received: by wicmv11 with SMTP id mv11sf4577517wic.1 for ; Wed, 29 Jul 2015 01:59:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=xVyASbOOaE3nH4ye0qUGpezAwYQ8+IlSQ5whqRyc5/c=; b=KHHF2+IBuwqFDLS1mUqx8remWkFT9OyVupyjCC4Z3sxka6D5YX5VVLwEniUCHMAu2D yuIu20JYi08N6wyl+JVGDwmGh2ILI+UPPEekDd2RaBr+8q2jH1UDnyPWH7aj4BUwHj4N InXjCAHvaRz5WqVIwPPfi5bbauyYMRc00qCvssc21JQlj/zGYJu8nDqGBHaafe9n2vvo n48xN/gZAibP2Pwr6BAX/g+dGlaMH//VggqIx8MRGAEfo/ymaEX/Xe+m88JA0b96Ln4+ /PIQkq7Of6EzNOV2eALKd9Xa72sIUXKIfIUVJGhweALtgpHzC3fateWNMxtqciY3h9B5 p9Nw== X-Gm-Message-State: ALoCoQnVWMYWy/FMkqYBQ9+f9sH04nRQRG1pAqfbl1JMjfSJriKfxSGs544rLBG3AyHnJzZXAiYM X-Received: by 10.180.205.198 with SMTP id li6mr2799491wic.5.1438160381912; Wed, 29 Jul 2015 01:59:41 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.73 with SMTP id y9ls13375lay.18.gmail; Wed, 29 Jul 2015 01:59:41 -0700 (PDT) X-Received: by 10.153.7.166 with SMTP id dd6mr37400756lad.42.1438160381594; Wed, 29 Jul 2015 01:59:41 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id jg8si20212307lbc.29.2015.07.29.01.59.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jul 2015 01:59:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbbst4 with SMTP id st4so2203210lbb.1 for ; Wed, 29 Jul 2015 01:59:41 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr36836414lbc.41.1438160381472; Wed, 29 Jul 2015 01:59:41 -0700 (PDT) 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.7.198 with SMTP id l6csp2616338lba; Wed, 29 Jul 2015 01:59:40 -0700 (PDT) X-Received: by 10.70.140.173 with SMTP id rh13mr92566894pdb.24.1438160379496; Wed, 29 Jul 2015 01:59:39 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 6si60288999pdh.108.2015.07.29.01.59.38; Wed, 29 Jul 2015 01:59:39 -0700 (PDT) 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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752212AbbG2I7f (ORCPT + 26 others); Wed, 29 Jul 2015 04:59:35 -0400 Received: from mga14.intel.com ([192.55.52.115]:40747 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751262AbbG2I7X (ORCPT ); Wed, 29 Jul 2015 04:59:23 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP; 29 Jul 2015 01:59:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,569,1432623600"; d="scan'208";a="615065356" Received: from feng-bdw-de-pi.bj.intel.com ([10.238.154.67]) by orsmga003.jf.intel.com with ESMTP; 29 Jul 2015 01:59:20 -0700 From: Feng Wu To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: pbonzini@redhat.com, alex.williamson@redhat.com, joro@8bytes.org, eric.auger@linaro.org, feng.wu@intel.com Subject: [v3 5/5] KVM: eventfd: add irq bypass consumer management Date: Wed, 29 Jul 2015 16:47:03 +0800 Message-Id: <1438159623-4227-6-git-send-email-feng.wu@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1438159623-4227-1-git-send-email-feng.wu@intel.com> References: <1438159623-4227-1-git-send-email-feng.wu@intel.com> 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: feng.wu@intel.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 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: , From: Eric Auger This patch adds the registration/unregistration of an irq_bypass_consumer on irqfd assignment/deassignment. v2 -> v3: - Use kvm_arch_irq_bypass_start - Remove kvm_arch_irq_bypass_update - Add member 'struct irq_bypass_producer *producer' in 'struct kvm_kernel_irqfd', it is needed by posted interrupt. - Remove 'irq_bypass_unregister_consumer' in kvm_irqfd_deassign() v1 -> v2: - populate of kvm and gsi removed - unregister the consumer on irqfd_shutdown Signed-off-by: Eric Auger Signed-off-by: Feng Wu --- include/linux/kvm_irqfd.h | 2 ++ virt/kvm/eventfd.c | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/linux/kvm_irqfd.h b/include/linux/kvm_irqfd.h index f926b39..0c1de05 100644 --- a/include/linux/kvm_irqfd.h +++ b/include/linux/kvm_irqfd.h @@ -64,6 +64,8 @@ struct kvm_kernel_irqfd { struct list_head list; poll_table pt; struct work_struct shutdown; + struct irq_bypass_consumer consumer; + struct irq_bypass_producer *producer; }; #endif /* __LINUX_KVM_IRQFD_H */ diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 647ffb8..08855de 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -140,6 +141,7 @@ irqfd_shutdown(struct work_struct *work) /* * It is now safe to release the object's resources */ + irq_bypass_unregister_consumer(&irqfd->consumer); eventfd_ctx_put(irqfd->eventfd); kfree(irqfd); } @@ -380,6 +382,14 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args) */ fdput(f); + irqfd->consumer.token = (void *)irqfd->eventfd; + irqfd->consumer.add_producer = kvm_arch_irq_bypass_add_producer; + irqfd->consumer.del_producer = kvm_arch_irq_bypass_del_producer; + irqfd->consumer.stop = kvm_arch_irq_bypass_stop; + irqfd->consumer.start = kvm_arch_irq_bypass_start; + ret = irq_bypass_register_consumer(&irqfd->consumer); + WARN_ON(ret); + return 0; fail: