From patchwork Mon Apr 4 08:47:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 64972 Delivered-To: patches@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1064213lbc; Mon, 4 Apr 2016 01:48:57 -0700 (PDT) X-Received: by 10.112.170.68 with SMTP id ak4mr6004798lbc.94.1459759737180; Mon, 04 Apr 2016 01:48:57 -0700 (PDT) Return-Path: Received: from mail-lf0-x22e.google.com (mail-lf0-x22e.google.com. [2a00:1450:4010:c07::22e]) by mx.google.com with ESMTPS id h30si15332372lfi.53.2016.04.04.01.48.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Apr 2016 01:48:57 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:4010:c07::22e as permitted sender) client-ip=2a00:1450:4010:c07::22e; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:4010:c07::22e as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x22e.google.com with SMTP id c62so158932020lfc.1 for ; Mon, 04 Apr 2016 01:48:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NAraEN6erouHlI4owX8WSOIhHtOhE7DFq7bZ4pNObVw=; b=BVspVW2SxMtdT3cJRG7gZ6N6aUa1yeZl2ts9MtoGXZ2y8HndVVpQ3MJQy0UqjOEECE HmLZ23/p55NuVYJwP/ESMT6v9VTmst2dmqgKbv9gmSGl6wmyvQkO/NkP/zSUi9duyPfP BwS9+doazH1jVbbtELry7J+HFy/Vf/y68SaGM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NAraEN6erouHlI4owX8WSOIhHtOhE7DFq7bZ4pNObVw=; b=TxU7iAKizutfFBDhE3kPALPJRpqmk6+6JRnRnm+57dNNsz6meVe/GFDb5lCtMhFX4f W2bvgtPvXCuNjG+xd5aK1IHaeMFocBPMfKRKfDiLiGIT5RMTelpmKhIPGYljTVL41+4+ Fcc47N8wwGjwg32fi8H6IHf6CK4kb9S0Cd1WUU+zsgKvFB1OcAUgf87r4mapK5DR/Diw sHAYuBzuCdfa86zZnEMlWp36SM1gCAUwfy5kMdz4bbsu6bq3QiMf3N9DxJICSnpz3Uzp Qd45jAU1YIha7sOXg9MgOUNmotgmed2y4cQruIYvATwTZ+iA3R0LWYLbGOhq4pzrzprz Dhhw== X-Gm-Message-State: AD7BkJL723JQJQh8VK7TsDEuIbBcmaZqlDLq4bqmTbZw+bu+5fVDgO+J8hKB+zjpvNX7YGZ5QDY= X-Received: by 10.194.78.129 with SMTP id b1mr16699362wjx.60.1459759736988; Mon, 04 Apr 2016 01:48:56 -0700 (PDT) Return-Path: Received: from gnx2579.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id kj9sm27921384wjb.14.2016.04.04.01.48.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Apr 2016 01:48:55 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, christoffer.dall@linaro.org, marc.zyngier@arm.com, andre.przywara@arm.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: patches@linaro.org, pbonzini@redhat.com, p.fedin@samsung.com, Manish.Jaggi@caviumnetworks.com Subject: [PATCH v4 1/7] KVM: api: pass the devid in the msi routing entry Date: Mon, 4 Apr 2016 10:47:31 +0200 Message-Id: <1459759657-7402-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459759657-7402-1-git-send-email-eric.auger@linaro.org> References: <1459759657-7402-1-git-send-email-eric.auger@linaro.org> On ARM, the MSI msg (address and data) comes along with out-of-band device ID information. The device ID encodes the device that writes the MSI msg. Let's convey the device id in kvm_irq_routing_msi and use KVM_MSI_VALID_DEVID flag value in kvm_irq_routing_entry to indicate the msi devid is populated. Signed-off-by: Eric Auger --- v2 -> v3: - replace usage of KVM_IRQ_ROUTING_EXTENDED_MSI type by usage of KVM_MSI_VALID_DEVID flag - add note about KVM_CAP_MSI_DEVID capability v1 -> v2: - devid id passed in kvm_irq_routing_msi instead of in kvm_irq_routing_entry RFC -> PATCH - remove kvm_irq_routing_extended_msi and use union instead --- Documentation/virtual/kvm/api.txt | 18 ++++++++++++++++-- include/uapi/linux/kvm.h | 5 ++++- 2 files changed, 20 insertions(+), 3 deletions(-) -- 1.9.1 diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 536f19b..c436bb6 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt @@ -1462,7 +1462,10 @@ struct kvm_irq_routing_entry { #define KVM_IRQ_ROUTING_S390_ADAPTER 3 #define KVM_IRQ_ROUTING_HV_SINT 4 -No flags are specified so far, the corresponding field must be set to zero. +flags: +- KVM_MSI_VALID_DEVID: used along with KVM_IRQ_ROUTING_MSI + routing entry type, it tells the msi devid contains a valid value. +- zero otherwise struct kvm_irq_routing_irqchip { __u32 irqchip; @@ -1473,9 +1476,20 @@ struct kvm_irq_routing_msi { __u32 address_lo; __u32 address_hi; __u32 data; - __u32 pad; + union { + __u32 pad; + __u32 devid; + }; }; +devid: If KVM_MSI_VALID_DEVID is set, contains a unique device identifier + for the device that wrote the MSI message. + For PCI, this is usually a BFD identifier in the lower 16 bits. + +The per-VM KVM_CAP_MSI_DEVID capability advertises the need to provide +the device ID. If this capability is not set, userland cannot rely on +the kernel to allow the KVM_MSI_VALID_DEVID flag being set. + struct kvm_irq_routing_s390_adapter { __u64 ind_addr; __u64 summary_addr; diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 6a02871..52a973f 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -865,7 +865,10 @@ struct kvm_irq_routing_msi { __u32 address_lo; __u32 address_hi; __u32 data; - __u32 pad; + union { + __u32 pad; + __u32 devid; + }; }; struct kvm_irq_routing_s390_adapter {