From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOZQL-0003Bj-0B for qemu-devel@nongnu.org; Mon, 11 Dec 2017 20:31:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOZQG-0007zl-6k for qemu-devel@nongnu.org; Mon, 11 Dec 2017 20:31:57 -0500 Received: from mga17.intel.com ([192.55.52.151]:9498) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eOZQF-0007xW-SH for qemu-devel@nongnu.org; Mon, 11 Dec 2017 20:31:52 -0500 Date: Tue, 12 Dec 2017 02:28:57 +0800 From: Chao Gao Message-ID: <20171211182856.GA18476@op-computing> References: <1510899865-40323-1-git-send-email-chao.gao@intel.com> <1510899865-40323-3-git-send-email-chao.gao@intel.com> <20171211175908.GC2216@perard.uk.xensource.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171211175908.GC2216@perard.uk.xensource.com> Subject: Re: [Qemu-devel] [PATCH v3 2/3] xen/pt: Pass the whole msi addr/data to Xen List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony PERARD Cc: qemu-devel@nongnu.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Lan Tianyu On Mon, Dec 11, 2017 at 05:59:08PM +0000, Anthony PERARD wrote: >On Fri, Nov 17, 2017 at 02:24:24PM +0800, Chao Gao wrote: >> Previously, some fields (reserved or unalterable) are filtered by >> Qemu. This fields are useless for the legacy interrupt format. >> However, these fields are may meaningful (for intel platform) >> for the interrupt of remapping format. It is better to pass the whole >> msi addr/data to Xen without any filtering. >> >> The main reason why we want this is QEMU doesn't have the knowledge >> to decide the interrupt format after we introduce vIOMMU inside Xen. >> Passing the whole msi message down and let arch-specific vIOMMU to >> decide the interrupt format. >> >> Signed-off-by: Chao Gao >> Signed-off-by: Lan Tianyu >> --- >> v3: >> - new >> --- >> hw/xen/xen_pt_msi.c | 47 ++++++++++++----------------------------------- >> 1 file changed, 12 insertions(+), 35 deletions(-) >> >> diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c >> index 6d1e3bd..f7d6e76 100644 >> --- a/hw/xen/xen_pt_msi.c >> +++ b/hw/xen/xen_pt_msi.c >> @@ -47,25 +47,6 @@ static inline uint32_t msi_ext_dest_id(uint32_t addr_hi) >> return addr_hi & 0xffffff00; >> } >> >> -static uint32_t msi_gflags(uint32_t data, uint64_t addr) >> -{ >> - uint32_t result = 0; >> - int rh, dm, dest_id, deliv_mode, trig_mode; >> - >> - rh = (addr >> MSI_ADDR_REDIRECTION_SHIFT) & 0x1; >> - dm = (addr >> MSI_ADDR_DEST_MODE_SHIFT) & 0x1; >> - dest_id = msi_dest_id(addr); >> - deliv_mode = (data >> MSI_DATA_DELIVERY_MODE_SHIFT) & 0x7; >> - trig_mode = (data >> MSI_DATA_TRIGGER_SHIFT) & 0x1; >> - >> - result = dest_id | (rh << XEN_PT_GFLAGS_SHIFT_RH) >> - | (dm << XEN_PT_GFLAGS_SHIFT_DM) >> - | (deliv_mode << XEN_PT_GFLAGSSHIFT_DELIV_MODE) >> - | (trig_mode << XEN_PT_GFLAGSSHIFT_TRG_MODE); >> - >> - return result; >> -} >> - >> static inline uint64_t msi_addr64(XenPTMSI *msi) >> { >> return (uint64_t)msi->addr_hi << 32 | msi->addr_lo; >> @@ -160,23 +141,20 @@ static int msi_msix_update(XenPCIPassthroughState *s, >> bool masked) >> { >> PCIDevice *d = &s->dev; >> - uint8_t gvec = msi_vector(data); >> - uint32_t gflags = msi_gflags(data, addr); >> + uint32_t gflags = masked ? 0 : (1u << XEN_PT_GFLAGSSHIFT_UNMASKED); >> int rc = 0; >> uint64_t table_addr = 0; >> >> - XEN_PT_LOG(d, "Updating MSI%s with pirq %d gvec %#x gflags %#x" >> - " (entry: %#x)\n", >> - is_msix ? "-X" : "", pirq, gvec, gflags, msix_entry); >> + XEN_PT_LOG(d, "Updating MSI%s with pirq %d gvec %#x addr %"PRIx64 >> + " data %#x gflags %#x (entry: %#x)\n", >> + is_msix ? "-X" : "", pirq, addr, data, gflags, msix_entry); >> >> if (is_msix) { >> table_addr = s->msix->mmio_base_addr; >> } >> >> - gflags |= masked ? 0 : (1u << XEN_PT_GFLAGSSHIFT_UNMASKED); >> - >> - rc = xc_domain_update_msi_irq(xen_xc, xen_domid, gvec, >> - pirq, gflags, table_addr); >> + rc = xc_domain_update_msi_irq(xen_xc, xen_domid, pirq, addr, >> + data, gflags, table_addr); > >Are you trying to modifie an existing API? That is not going to work. We >want to be able to build QEMU against older version of Xen, and it >should work as well. Yes. I thought it didn't matter. And definitely, I was wrong. I will keep compatibility by introducing a new API. A wapper function, which calls the old or new API according to the Xen version, would be used here. Thanks Chao From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chao Gao Subject: Re: [PATCH v3 2/3] xen/pt: Pass the whole msi addr/data to Xen Date: Tue, 12 Dec 2017 02:28:57 +0800 Message-ID: <20171211182856.GA18476@op-computing> References: <1510899865-40323-1-git-send-email-chao.gao@intel.com> <1510899865-40323-3-git-send-email-chao.gao@intel.com> <20171211175908.GC2216@perard.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOZQL-0007FS-GF for xen-devel@lists.xenproject.org; Tue, 12 Dec 2017 01:31:57 +0000 Content-Disposition: inline In-Reply-To: <20171211175908.GC2216@perard.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Anthony PERARD Cc: Lan Tianyu , xen-devel@lists.xenproject.org, Stefano Stabellini , qemu-devel@nongnu.org List-Id: xen-devel@lists.xenproject.org T24gTW9uLCBEZWMgMTEsIDIwMTcgYXQgMDU6NTk6MDhQTSArMDAwMCwgQW50aG9ueSBQRVJBUkQg d3JvdGU6Cj5PbiBGcmksIE5vdiAxNywgMjAxNyBhdCAwMjoyNDoyNFBNICswODAwLCBDaGFvIEdh byB3cm90ZToKPj4gUHJldmlvdXNseSwgc29tZSBmaWVsZHMgKHJlc2VydmVkIG9yIHVuYWx0ZXJh YmxlKSBhcmUgZmlsdGVyZWQgYnkKPj4gUWVtdS4gVGhpcyBmaWVsZHMgYXJlIHVzZWxlc3MgZm9y IHRoZSBsZWdhY3kgaW50ZXJydXB0IGZvcm1hdC4KPj4gSG93ZXZlciwgdGhlc2UgZmllbGRzIGFy ZSBtYXkgbWVhbmluZ2Z1bCAoZm9yIGludGVsIHBsYXRmb3JtKQo+PiBmb3IgdGhlIGludGVycnVw dCBvZiByZW1hcHBpbmcgZm9ybWF0LiBJdCBpcyBiZXR0ZXIgdG8gcGFzcyB0aGUgd2hvbGUKPj4g bXNpIGFkZHIvZGF0YSB0byBYZW4gd2l0aG91dCBhbnkgZmlsdGVyaW5nLgo+PiAKPj4gVGhlIG1h aW4gcmVhc29uIHdoeSB3ZSB3YW50IHRoaXMgaXMgUUVNVSBkb2Vzbid0IGhhdmUgdGhlIGtub3ds ZWRnZQo+PiB0byBkZWNpZGUgdGhlIGludGVycnVwdCBmb3JtYXQgYWZ0ZXIgd2UgaW50cm9kdWNl IHZJT01NVSBpbnNpZGUgWGVuLgo+PiBQYXNzaW5nIHRoZSB3aG9sZSBtc2kgbWVzc2FnZSBkb3du IGFuZCBsZXQgYXJjaC1zcGVjaWZpYyB2SU9NTVUgdG8KPj4gZGVjaWRlIHRoZSBpbnRlcnJ1cHQg Zm9ybWF0Lgo+PiAKPj4gU2lnbmVkLW9mZi1ieTogQ2hhbyBHYW8gPGNoYW8uZ2FvQGludGVsLmNv bT4KPj4gU2lnbmVkLW9mZi1ieTogTGFuIFRpYW55dSA8dGlhbnl1LmxhbkBpbnRlbC5jb20+Cj4+ IC0tLQo+PiB2MzoKPj4gIC0gbmV3Cj4+IC0tLQo+PiAgaHcveGVuL3hlbl9wdF9tc2kuYyB8IDQ3 ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4+ICAxIGZp bGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCj4+IAo+PiBkaWZm IC0tZ2l0IGEvaHcveGVuL3hlbl9wdF9tc2kuYyBiL2h3L3hlbi94ZW5fcHRfbXNpLmMKPj4gaW5k ZXggNmQxZTNiZC4uZjdkNmU3NiAxMDA2NDQKPj4gLS0tIGEvaHcveGVuL3hlbl9wdF9tc2kuYwo+ PiArKysgYi9ody94ZW4veGVuX3B0X21zaS5jCj4+IEBAIC00NywyNSArNDcsNiBAQCBzdGF0aWMg aW5saW5lIHVpbnQzMl90IG1zaV9leHRfZGVzdF9pZCh1aW50MzJfdCBhZGRyX2hpKQo+PiAgICAg IHJldHVybiBhZGRyX2hpICYgMHhmZmZmZmYwMDsKPj4gIH0KPj4gIAo+PiAtc3RhdGljIHVpbnQz Ml90IG1zaV9nZmxhZ3ModWludDMyX3QgZGF0YSwgdWludDY0X3QgYWRkcikKPj4gLXsKPj4gLSAg ICB1aW50MzJfdCByZXN1bHQgPSAwOwo+PiAtICAgIGludCByaCwgZG0sIGRlc3RfaWQsIGRlbGl2 X21vZGUsIHRyaWdfbW9kZTsKPj4gLQo+PiAtICAgIHJoID0gKGFkZHIgPj4gTVNJX0FERFJfUkVE SVJFQ1RJT05fU0hJRlQpICYgMHgxOwo+PiAtICAgIGRtID0gKGFkZHIgPj4gTVNJX0FERFJfREVT VF9NT0RFX1NISUZUKSAmIDB4MTsKPj4gLSAgICBkZXN0X2lkID0gbXNpX2Rlc3RfaWQoYWRkcik7 Cj4+IC0gICAgZGVsaXZfbW9kZSA9IChkYXRhID4+IE1TSV9EQVRBX0RFTElWRVJZX01PREVfU0hJ RlQpICYgMHg3Owo+PiAtICAgIHRyaWdfbW9kZSA9IChkYXRhID4+IE1TSV9EQVRBX1RSSUdHRVJf U0hJRlQpICYgMHgxOwo+PiAtCj4+IC0gICAgcmVzdWx0ID0gZGVzdF9pZCB8IChyaCA8PCBYRU5f UFRfR0ZMQUdTX1NISUZUX1JIKQo+PiAtICAgICAgICB8IChkbSA8PCBYRU5fUFRfR0ZMQUdTX1NI SUZUX0RNKQo+PiAtICAgICAgICB8IChkZWxpdl9tb2RlIDw8IFhFTl9QVF9HRkxBR1NTSElGVF9E RUxJVl9NT0RFKQo+PiAtICAgICAgICB8ICh0cmlnX21vZGUgPDwgWEVOX1BUX0dGTEFHU1NISUZU X1RSR19NT0RFKTsKPj4gLQo+PiAtICAgIHJldHVybiByZXN1bHQ7Cj4+IC19Cj4+IC0KPj4gIHN0 YXRpYyBpbmxpbmUgdWludDY0X3QgbXNpX2FkZHI2NChYZW5QVE1TSSAqbXNpKQo+PiAgewo+PiAg ICAgIHJldHVybiAodWludDY0X3QpbXNpLT5hZGRyX2hpIDw8IDMyIHwgbXNpLT5hZGRyX2xvOwo+ PiBAQCAtMTYwLDIzICsxNDEsMjAgQEAgc3RhdGljIGludCBtc2lfbXNpeF91cGRhdGUoWGVuUENJ UGFzc3Rocm91Z2hTdGF0ZSAqcywKPj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wg bWFza2VkKQo+PiAgewo+PiAgICAgIFBDSURldmljZSAqZCA9ICZzLT5kZXY7Cj4+IC0gICAgdWlu dDhfdCBndmVjID0gbXNpX3ZlY3RvcihkYXRhKTsKPj4gLSAgICB1aW50MzJfdCBnZmxhZ3MgPSBt c2lfZ2ZsYWdzKGRhdGEsIGFkZHIpOwo+PiArICAgIHVpbnQzMl90IGdmbGFncyA9IG1hc2tlZCA/ IDAgOiAoMXUgPDwgWEVOX1BUX0dGTEFHU1NISUZUX1VOTUFTS0VEKTsKPj4gICAgICBpbnQgcmMg PSAwOwo+PiAgICAgIHVpbnQ2NF90IHRhYmxlX2FkZHIgPSAwOwo+PiAgCj4+IC0gICAgWEVOX1BU X0xPRyhkLCAiVXBkYXRpbmcgTVNJJXMgd2l0aCBwaXJxICVkIGd2ZWMgJSN4IGdmbGFncyAlI3gi Cj4+IC0gICAgICAgICAgICAgICAiIChlbnRyeTogJSN4KVxuIiwKPj4gLSAgICAgICAgICAgICAg IGlzX21zaXggPyAiLVgiIDogIiIsIHBpcnEsIGd2ZWMsIGdmbGFncywgbXNpeF9lbnRyeSk7Cj4+ ICsgICAgWEVOX1BUX0xPRyhkLCAiVXBkYXRpbmcgTVNJJXMgd2l0aCBwaXJxICVkIGd2ZWMgJSN4 IGFkZHIgJSJQUkl4NjQKPj4gKyAgICAgICAgICAgICAgICIgZGF0YSAlI3ggZ2ZsYWdzICUjeCAo ZW50cnk6ICUjeClcbiIsCj4+ICsgICAgICAgICAgICAgICBpc19tc2l4ID8gIi1YIiA6ICIiLCBw aXJxLCBhZGRyLCBkYXRhLCBnZmxhZ3MsIG1zaXhfZW50cnkpOwo+PiAgCj4+ICAgICAgaWYgKGlz X21zaXgpIHsKPj4gICAgICAgICAgdGFibGVfYWRkciA9IHMtPm1zaXgtPm1taW9fYmFzZV9hZGRy Owo+PiAgICAgIH0KPj4gIAo+PiAtICAgIGdmbGFncyB8PSBtYXNrZWQgPyAwIDogKDF1IDw8IFhF Tl9QVF9HRkxBR1NTSElGVF9VTk1BU0tFRCk7Cj4+IC0KPj4gLSAgICByYyA9IHhjX2RvbWFpbl91 cGRhdGVfbXNpX2lycSh4ZW5feGMsIHhlbl9kb21pZCwgZ3ZlYywKPj4gLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBwaXJxLCBnZmxhZ3MsIHRhYmxlX2FkZHIpOwo+PiArICAgIHJj ID0geGNfZG9tYWluX3VwZGF0ZV9tc2lfaXJxKHhlbl94YywgeGVuX2RvbWlkLCBwaXJxLCBhZGRy LAo+PiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGEsIGdmbGFncywgdGFi bGVfYWRkcik7Cj4KPkFyZSB5b3UgdHJ5aW5nIHRvIG1vZGlmaWUgYW4gZXhpc3RpbmcgQVBJPyBU aGF0IGlzIG5vdCBnb2luZyB0byB3b3JrLiBXZQo+d2FudCB0byBiZSBhYmxlIHRvIGJ1aWxkIFFF TVUgYWdhaW5zdCBvbGRlciB2ZXJzaW9uIG9mIFhlbiwgYW5kIGl0Cj5zaG91bGQgd29yayBhcyB3 ZWxsLgoKWWVzLiBJIHRob3VnaHQgaXQgZGlkbid0IG1hdHRlci4gQW5kIGRlZmluaXRlbHksIEkg d2FzIHdyb25nLiBJIHdpbGwga2VlcApjb21wYXRpYmlsaXR5IGJ5IGludHJvZHVjaW5nIGEgbmV3 IEFQSS4gQSB3YXBwZXIgZnVuY3Rpb24sIHdoaWNoIGNhbGxzCnRoZSBvbGQgb3IgbmV3IEFQSSBh Y2NvcmRpbmcgdG8gdGhlIFhlbiB2ZXJzaW9uLCB3b3VsZCBiZSB1c2VkIGhlcmUuCgpUaGFua3MK Q2hhbwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVu LWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6 Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==