From: Paul Durrant Subject: [PATCH 1/3] xen-bus: use a separate fd for each event channel Date: Mon, 8 Apr 2019 16:16:15 +0100 Message-ID: <20190408151617.13025-2-paul.durrant@citrix.com> References: <20190408151617.13025-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hDW0r-0008GK-DS for xen-devel@lists.xenproject.org; Mon, 08 Apr 2019 15:16:45 +0000 In-Reply-To: <20190408151617.13025-1-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org, qemu-block@nongnu.org, xen-devel@lists.xenproject.org Cc: Anthony Perard , Paul Durrant , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org VG8gYmV0dGVyIHN1cHBvcnQgdXNlIG9mIElPVGhyZWFkLXMgaXQgd2lsbCBiZSBuZWNlc3Nhcnkg dG8gYmUgYWJsZSB0byBzZXQKdGhlIEFpb0NvbnRleHQgZm9yIGVhY2ggWGVuRXZlbnRDaGFubmVs IGFuZCBoZW5jZSBpdCBpcyBuZWNlc3NhcnkgdG8gb3BlbiBhCnNlcGFyYXRlIGhhbmRsZSB0byBs aWJ4ZW5ldnRjaGFuIGZvciBlYWNoIGNoYW5uZWwuCgpUaGlzIHBhdGNoIHN0b3BzIHVzaW5nIE5v dGlmaWVyTGlzdCBmb3IgZXZlbnQgY2hhbm5lbCBjYWxsYmFja3MsIHJlcGxhY2luZwp0aGF0IGNv bnN0cnVjdCBieSBhIGxpc3Qgb2YgY29tcGxldGUgWGVuRXZlbnRDaGFubmVsIHN0cnVjdHVyZXMu IEVhY2ggb2YKdGhlc2Ugbm93IGhhcyBhIHhlbmV2dGNobl9oYW5kbGUgcG9pbnRlciBpbiBwbGFj ZSBvZiB0aGUgc2luZ2xlIHBvaW50ZXIKcHJldmlvdXNseSBoZWxkIGluIHRoZSBYZW5EZXZpY2Ug c3RydWN0dXJlLiBUaGUgaW5kaXZpZHVhbCBoYW5kbGVzIGFyZQpvcGVuZWQvY2xvc2VkIGluIHhl bl9kZXZpY2VfYmluZC91bmJpbmRfZXZlbnRfY2hhbm5lbCgpLCByZXBsYWNpbmcgdGhlCnNpbmds ZSBvcGVuL2Nsb3NlIGluIHhlbl9kZXZpY2VfcmVhbGl6ZS91bnJlYWxpemUoKS4KCk5PVEU6IFRo aXMgcGF0Y2ggZG9lcyBub3QgYWRkIGFuIEFpb0NvbnRleHQgcGFyYW1ldGVyIHRvCiAgICAgIHhl bl9kZXZpY2VfYmluZF9ldmVudF9jaGFubmVsKCkuIFRoYXQgd2lsbCBiZSBkb25lIGluIGEgc3Vi c2VxdWVudAogICAgICBwYXRjaC4KClNpZ25lZC1vZmYtYnk6IFBhdWwgRHVycmFudCA8cGF1bC5k dXJyYW50QGNpdHJpeC5jb20+Ci0tLQpDYzogU3RlZmFubyBTdGFiZWxsaW5pIDxzc3RhYmVsbGlu aUBrZXJuZWwub3JnPgpDYzogQW50aG9ueSBQZXJhcmQgPGFudGhvbnkucGVyYXJkQGNpdHJpeC5j b20+Ci0tLQogaHcveGVuL3hlbi1idXMuYyAgICAgICAgIHwgNzkgKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9ody94ZW4veGVuLWJ1cy5oIHwgIDYgKy0t CiAyIGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDQzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2h3L3hlbi94ZW4tYnVzLmMgYi9ody94ZW4veGVuLWJ1cy5jCmluZGV4IDQ5YTcy NWU4YzcuLjllMzkxNDkyYWMgMTAwNjQ0Ci0tLSBhL2h3L3hlbi94ZW4tYnVzLmMKKysrIGIvaHcv eGVuL3hlbi1idXMuYwpAQCAtOTIzLDE5ICs5MjMsMjIgQEAgZG9uZToKIH0KIAogc3RydWN0IFhl bkV2ZW50Q2hhbm5lbCB7CisgICAgUUxJU1RfRU5UUlkoWGVuRXZlbnRDaGFubmVsKSBsaXN0Owor ICAgIHhlbmV2dGNobl9oYW5kbGUgKnhlaDsKICAgICBldnRjaG5fcG9ydF90IGxvY2FsX3BvcnQ7 CiAgICAgWGVuRXZlbnRIYW5kbGVyIGhhbmRsZXI7CiAgICAgdm9pZCAqb3BhcXVlOwotICAgIE5v dGlmaWVyIG5vdGlmaWVyOwogfTsKIAotc3RhdGljIHZvaWQgZXZlbnRfbm90aWZ5KE5vdGlmaWVy ICpuLCB2b2lkICpkYXRhKQorc3RhdGljIHZvaWQgeGVuX2RldmljZV9ldmVudCh2b2lkICpvcGFx dWUpCiB7Ci0gICAgWGVuRXZlbnRDaGFubmVsICpjaGFubmVsID0gY29udGFpbmVyX29mKG4sIFhl bkV2ZW50Q2hhbm5lbCwgbm90aWZpZXIpOwotICAgIHVuc2lnbmVkIGxvbmcgcG9ydCA9ICh1bnNp Z25lZCBsb25nKWRhdGE7CisgICAgWGVuRXZlbnRDaGFubmVsICpjaGFubmVsID0gb3BhcXVlOwor ICAgIHVuc2lnbmVkIGxvbmcgcG9ydCA9IHhlbmV2dGNobl9wZW5kaW5nKGNoYW5uZWwtPnhlaCk7 CiAKICAgICBpZiAocG9ydCA9PSBjaGFubmVsLT5sb2NhbF9wb3J0KSB7CiAgICAgICAgIGNoYW5u ZWwtPmhhbmRsZXIoY2hhbm5lbC0+b3BhcXVlKTsKKworICAgICAgICB4ZW5ldnRjaG5fdW5tYXNr KGNoYW5uZWwtPnhlaCwgcG9ydCk7CiAgICAgfQogfQogCkBAIC05NDcsMjQgKzk1MCwzOSBAQCBY ZW5FdmVudENoYW5uZWwgKnhlbl9kZXZpY2VfYmluZF9ldmVudF9jaGFubmVsKFhlbkRldmljZSAq eGVuZGV2LAogICAgIFhlbkV2ZW50Q2hhbm5lbCAqY2hhbm5lbCA9IGdfbmV3MChYZW5FdmVudENo YW5uZWwsIDEpOwogICAgIHhlbmV2dGNobl9wb3J0X29yX2Vycm9yX3QgbG9jYWxfcG9ydDsKIAot ICAgIGxvY2FsX3BvcnQgPSB4ZW5ldnRjaG5fYmluZF9pbnRlcmRvbWFpbih4ZW5kZXYtPnhlaCwK KyAgICBjaGFubmVsLT54ZWggPSB4ZW5ldnRjaG5fb3BlbihOVUxMLCAwKTsKKyAgICBpZiAoIWNo YW5uZWwtPnhlaCkgeworICAgICAgICBlcnJvcl9zZXRnX2Vycm5vKGVycnAsIGVycm5vLCAiZmFp bGVkIHhlbmV2dGNobl9vcGVuIik7CisgICAgICAgIGdvdG8gZmFpbDsKKyAgICB9CisKKyAgICBs b2NhbF9wb3J0ID0geGVuZXZ0Y2huX2JpbmRfaW50ZXJkb21haW4oY2hhbm5lbC0+eGVoLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4ZW5kZXYtPmZyb250ZW5k X2lkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwb3J0KTsK ICAgICBpZiAobG9jYWxfcG9ydCA8IDApIHsKICAgICAgICAgZXJyb3Jfc2V0Z19lcnJubyhlcnJw LCBlcnJubywgInhlbmV2dGNobl9iaW5kX2ludGVyZG9tYWluIGZhaWxlZCIpOwotCi0gICAgICAg IGdfZnJlZShjaGFubmVsKTsKLSAgICAgICAgcmV0dXJuIE5VTEw7CisgICAgICAgIGdvdG8gZmFp bDsKICAgICB9CiAKICAgICBjaGFubmVsLT5sb2NhbF9wb3J0ID0gbG9jYWxfcG9ydDsKICAgICBj aGFubmVsLT5oYW5kbGVyID0gaGFuZGxlcjsKICAgICBjaGFubmVsLT5vcGFxdWUgPSBvcGFxdWU7 Ci0gICAgY2hhbm5lbC0+bm90aWZpZXIubm90aWZ5ID0gZXZlbnRfbm90aWZ5OwogCi0gICAgbm90 aWZpZXJfbGlzdF9hZGQoJnhlbmRldi0+ZXZlbnRfbm90aWZpZXJzLCAmY2hhbm5lbC0+bm90aWZp ZXIpOworICAgIHFlbXVfc2V0X2ZkX2hhbmRsZXIoeGVuZXZ0Y2huX2ZkKGNoYW5uZWwtPnhlaCks IHhlbl9kZXZpY2VfZXZlbnQsIE5VTEwsCisgICAgICAgICAgICAgICAgICAgICAgICBjaGFubmVs KTsKKworICAgIFFMSVNUX0lOU0VSVF9IRUFEKCZ4ZW5kZXYtPmV2ZW50X2NoYW5uZWxzLCBjaGFu bmVsLCBsaXN0KTsKIAogICAgIHJldHVybiBjaGFubmVsOworCitmYWlsOgorICAgIGlmIChjaGFu bmVsLT54ZWgpIHsKKyAgICAgICAgeGVuZXZ0Y2huX2Nsb3NlKGNoYW5uZWwtPnhlaCk7CisgICAg fQorCisgICAgZ19mcmVlKGNoYW5uZWwpOworCisgICAgcmV0dXJuIE5VTEw7CiB9CiAKIHZvaWQg eGVuX2RldmljZV9ub3RpZnlfZXZlbnRfY2hhbm5lbChYZW5EZXZpY2UgKnhlbmRldiwKQEAgLTk3 Niw3ICs5OTQsNyBAQCB2b2lkIHhlbl9kZXZpY2Vfbm90aWZ5X2V2ZW50X2NoYW5uZWwoWGVuRGV2 aWNlICp4ZW5kZXYsCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoeGVuZXZ0Y2hu X25vdGlmeSh4ZW5kZXYtPnhlaCwgY2hhbm5lbC0+bG9jYWxfcG9ydCkgPCAwKSB7CisgICAgaWYg KHhlbmV2dGNobl9ub3RpZnkoY2hhbm5lbC0+eGVoLCBjaGFubmVsLT5sb2NhbF9wb3J0KSA8IDAp IHsKICAgICAgICAgZXJyb3Jfc2V0Z19lcnJubyhlcnJwLCBlcnJubywgInhlbmV2dGNobl9ub3Rp ZnkgZmFpbGVkIik7CiAgICAgfQogfQpAQCAtOTkwLDEyICsxMDA4LDE1IEBAIHZvaWQgeGVuX2Rl dmljZV91bmJpbmRfZXZlbnRfY2hhbm5lbChYZW5EZXZpY2UgKnhlbmRldiwKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIAotICAgIG5vdGlmaWVyX3JlbW92ZSgmY2hhbm5lbC0+bm90aWZpZXIpOwor ICAgIFFMSVNUX1JFTU9WRShjaGFubmVsLCBsaXN0KTsKIAotICAgIGlmICh4ZW5ldnRjaG5fdW5i aW5kKHhlbmRldi0+eGVoLCBjaGFubmVsLT5sb2NhbF9wb3J0KSA8IDApIHsKKyAgICBxZW11X3Nl dF9mZF9oYW5kbGVyKHhlbmV2dGNobl9mZChjaGFubmVsLT54ZWgpLCBOVUxMLCBOVUxMLCBOVUxM KTsKKworICAgIGlmICh4ZW5ldnRjaG5fdW5iaW5kKGNoYW5uZWwtPnhlaCwgY2hhbm5lbC0+bG9j YWxfcG9ydCkgPCAwKSB7CiAgICAgICAgIGVycm9yX3NldGdfZXJybm8oZXJycCwgZXJybm8sICJ4 ZW5ldnRjaG5fdW5iaW5kIGZhaWxlZCIpOwogICAgIH0KIAorICAgIHhlbmV2dGNobl9jbG9zZShj aGFubmVsLT54ZWgpOwogICAgIGdfZnJlZShjaGFubmVsKTsKIH0KIApAQCAtMTAwNCw2ICsxMDI1 LDcgQEAgc3RhdGljIHZvaWQgeGVuX2RldmljZV91bnJlYWxpemUoRGV2aWNlU3RhdGUgKmRldiwg RXJyb3IgKiplcnJwKQogICAgIFhlbkRldmljZSAqeGVuZGV2ID0gWEVOX0RFVklDRShkZXYpOwog ICAgIFhlbkRldmljZUNsYXNzICp4ZW5kZXZfY2xhc3MgPSBYRU5fREVWSUNFX0dFVF9DTEFTUyh4 ZW5kZXYpOwogICAgIGNvbnN0IGNoYXIgKnR5cGUgPSBvYmplY3RfZ2V0X3R5cGVuYW1lKE9CSkVD VCh4ZW5kZXYpKTsKKyAgICBYZW5FdmVudENoYW5uZWwgKmNoYW5uZWwsICpuZXh0OwogCiAgICAg aWYgKCF4ZW5kZXYtPm5hbWUpIHsKICAgICAgICAgcmV0dXJuOwpAQCAtMTAyMCwxNSArMTA0Miwx NCBAQCBzdGF0aWMgdm9pZCB4ZW5fZGV2aWNlX3VucmVhbGl6ZShEZXZpY2VTdGF0ZSAqZGV2LCBF cnJvciAqKmVycnApCiAgICAgICAgIHhlbmRldl9jbGFzcy0+dW5yZWFsaXplKHhlbmRldiwgZXJy cCk7CiAgICAgfQogCisgICAgLyogTWFrZSBzdXJlIGFsbCBldmVudCBjaGFubmVscyBhcmUgY2xl YW5lZCB1cCAqLworICAgIFFMSVNUX0ZPUkVBQ0hfU0FGRShjaGFubmVsLCAmeGVuZGV2LT5ldmVu dF9jaGFubmVscywgbGlzdCwgbmV4dCkgeworICAgICAgICB4ZW5fZGV2aWNlX3VuYmluZF9ldmVu dF9jaGFubmVsKHhlbmRldiwgY2hhbm5lbCwgTlVMTCk7CisgICAgfQorCiAgICAgeGVuX2Rldmlj ZV9mcm9udGVuZF9kZXN0cm95KHhlbmRldik7CiAgICAgeGVuX2RldmljZV9iYWNrZW5kX2Rlc3Ry b3koeGVuZGV2KTsKIAotICAgIGlmICh4ZW5kZXYtPnhlaCkgewotICAgICAgICBxZW11X3NldF9m ZF9oYW5kbGVyKHhlbmV2dGNobl9mZCh4ZW5kZXYtPnhlaCksIE5VTEwsIE5VTEwsIE5VTEwpOwot ICAgICAgICB4ZW5ldnRjaG5fY2xvc2UoeGVuZGV2LT54ZWgpOwotICAgICAgICB4ZW5kZXYtPnhl aCA9IE5VTEw7Ci0gICAgfQotCiAgICAgaWYgKHhlbmRldi0+eGd0aCkgewogICAgICAgICB4ZW5n bnR0YWJfY2xvc2UoeGVuZGV2LT54Z3RoKTsKICAgICAgICAgeGVuZGV2LT54Z3RoID0gTlVMTDsK QEAgLTEwNDUsMTYgKzEwNjYsNiBAQCBzdGF0aWMgdm9pZCB4ZW5fZGV2aWNlX2V4aXQoTm90aWZp ZXIgKm4sIHZvaWQgKmRhdGEpCiAgICAgeGVuX2RldmljZV91bnJlYWxpemUoREVWSUNFKHhlbmRl diksICZlcnJvcl9hYm9ydCk7CiB9CiAKLXN0YXRpYyB2b2lkIHhlbl9kZXZpY2VfZXZlbnQodm9p ZCAqb3BhcXVlKQotewotICAgIFhlbkRldmljZSAqeGVuZGV2ID0gb3BhcXVlOwotICAgIHVuc2ln bmVkIGxvbmcgcG9ydCA9IHhlbmV2dGNobl9wZW5kaW5nKHhlbmRldi0+eGVoKTsKLQotICAgIG5v dGlmaWVyX2xpc3Rfbm90aWZ5KCZ4ZW5kZXYtPmV2ZW50X25vdGlmaWVycywgKHZvaWQgKilwb3J0 KTsKLQotICAgIHhlbmV2dGNobl91bm1hc2soeGVuZGV2LT54ZWgsIHBvcnQpOwotfQotCiBzdGF0 aWMgdm9pZCB4ZW5fZGV2aWNlX3JlYWxpemUoRGV2aWNlU3RhdGUgKmRldiwgRXJyb3IgKiplcnJw KQogewogICAgIFhlbkRldmljZSAqeGVuZGV2ID0gWEVOX0RFVklDRShkZXYpOwpAQCAtMTA5NSwx NiArMTEwNiw2IEBAIHN0YXRpYyB2b2lkIHhlbl9kZXZpY2VfcmVhbGl6ZShEZXZpY2VTdGF0ZSAq ZGV2LCBFcnJvciAqKmVycnApCiAgICAgeGVuZGV2LT5mZWF0dXJlX2dyYW50X2NvcHkgPQogICAg ICAgICAoeGVuZ250dGFiX2dyYW50X2NvcHkoeGVuZGV2LT54Z3RoLCAwLCBOVUxMKSA9PSAwKTsK IAotICAgIHhlbmRldi0+eGVoID0geGVuZXZ0Y2huX29wZW4oTlVMTCwgMCk7Ci0gICAgaWYgKCF4 ZW5kZXYtPnhlaCkgewotICAgICAgICBlcnJvcl9zZXRnX2Vycm5vKGVycnAsIGVycm5vLCAiZmFp bGVkIHhlbmV2dGNobl9vcGVuIik7Ci0gICAgICAgIGdvdG8gdW5yZWFsaXplOwotICAgIH0KLQot ICAgIG5vdGlmaWVyX2xpc3RfaW5pdCgmeGVuZGV2LT5ldmVudF9ub3RpZmllcnMpOwotICAgIHFl bXVfc2V0X2ZkX2hhbmRsZXIoeGVuZXZ0Y2huX2ZkKHhlbmRldi0+eGVoKSwgeGVuX2RldmljZV9l dmVudCwgTlVMTCwKLSAgICAgICAgICAgICAgICAgICAgICAgIHhlbmRldik7Ci0KICAgICB4ZW5f ZGV2aWNlX2JhY2tlbmRfY3JlYXRlKHhlbmRldiwgJmxvY2FsX2Vycik7CiAgICAgaWYgKGxvY2Fs X2VycikgewogICAgICAgICBlcnJvcl9wcm9wYWdhdGUoZXJycCwgbG9jYWxfZXJyKTsKZGlmZiAt LWdpdCBhL2luY2x1ZGUvaHcveGVuL3hlbi1idXMuaCBiL2luY2x1ZGUvaHcveGVuL3hlbi1idXMu aAppbmRleCAzMTgzZjEwZTNjLi4zMzE1ZjBkZTIwIDEwMDY0NAotLS0gYS9pbmNsdWRlL2h3L3hl bi94ZW4tYnVzLmgKKysrIGIvaW5jbHVkZS9ody94ZW4veGVuLWJ1cy5oCkBAIC0xNSw2ICsxNSw3 IEBACiB0eXBlZGVmIHZvaWQgKCpYZW5XYXRjaEhhbmRsZXIpKHZvaWQgKm9wYXF1ZSk7CiAKIHR5 cGVkZWYgc3RydWN0IFhlbldhdGNoIFhlbldhdGNoOwordHlwZWRlZiBzdHJ1Y3QgWGVuRXZlbnRD aGFubmVsIFhlbkV2ZW50Q2hhbm5lbDsKIAogdHlwZWRlZiBzdHJ1Y3QgWGVuRGV2aWNlIHsKICAg ICBEZXZpY2VTdGF0ZSBxZGV2OwpAQCAtMjgsOCArMjksNyBAQCB0eXBlZGVmIHN0cnVjdCBYZW5E ZXZpY2UgewogICAgIFhlbldhdGNoICpiYWNrZW5kX29ubGluZV93YXRjaDsKICAgICB4ZW5nbnR0 YWJfaGFuZGxlICp4Z3RoOwogICAgIGJvb2wgZmVhdHVyZV9ncmFudF9jb3B5OwotICAgIHhlbmV2 dGNobl9oYW5kbGUgKnhlaDsKLSAgICBOb3RpZmllckxpc3QgZXZlbnRfbm90aWZpZXJzOworICAg IFFMSVNUX0hFQUQoLCBYZW5FdmVudENoYW5uZWwpIGV2ZW50X2NoYW5uZWxzOwogfSBYZW5EZXZp Y2U7CiAKIHR5cGVkZWYgY2hhciAqKCpYZW5EZXZpY2VHZXROYW1lKShYZW5EZXZpY2UgKnhlbmRl diwgRXJyb3IgKiplcnJwKTsKQEAgLTExOSw4ICsxMTksNiBAQCB2b2lkIHhlbl9kZXZpY2VfY29w eV9ncmFudF9yZWZzKFhlbkRldmljZSAqeGVuZGV2LCBib29sIHRvX2RvbWFpbiwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgWGVuRGV2aWNlR3JhbnRDb3B5U2VnbWVudCBzZWdzW10s CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBucl9zZWdzLCBF cnJvciAqKmVycnApOwogCi10eXBlZGVmIHN0cnVjdCBYZW5FdmVudENoYW5uZWwgWGVuRXZlbnRD aGFubmVsOwotCiB0eXBlZGVmIHZvaWQgKCpYZW5FdmVudEhhbmRsZXIpKHZvaWQgKm9wYXF1ZSk7 CiAKIFhlbkV2ZW50Q2hhbm5lbCAqeGVuX2RldmljZV9iaW5kX2V2ZW50X2NoYW5uZWwoWGVuRGV2 aWNlICp4ZW5kZXYsCi0tIAoyLjIwLjEuMi5nYjIxZWJiNgoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRl dmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFp bG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=