From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8501FC43331 for ; Fri, 6 Sep 2019 13:15:13 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 488CE2178F for ; Fri, 6 Sep 2019 13:15:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="XkKh5q5A" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 488CE2178F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i6E4A-0000sK-2C; Fri, 06 Sep 2019 13:14:18 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i6E48-0000rz-Il for xen-devel@lists.xenproject.org; Fri, 06 Sep 2019 13:14:16 +0000 X-Inumbo-ID: 39c615b8-d0a8-11e9-b299-bc764e2007e4 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 39c615b8-d0a8-11e9-b299-bc764e2007e4; Fri, 06 Sep 2019 13:14:16 +0000 (UTC) Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4A55A207FC; Fri, 6 Sep 2019 13:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567775655; bh=YxdWojc5fQhCsI3MCFNUb/S38/XJllDgwfcUjCixi7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XkKh5q5Aus2YgqR1dKqCz2etHrZWowX7W3djWGR1gL3U8RvdvMP18XVzrLm0PVhvq //NYVg8iMWghQpO3BWms/dSwsIM70WgaKZlAfM2MP0Ky5XqqK7Fgu+pZ8LCj27jCCE +I0vJVlcHcRe7KlsdYNQ1IBm+oyj6BNlkGQaS2bI= From: Masami Hiramatsu To: Ingo Molnar Date: Fri, 6 Sep 2019 22:14:10 +0900 Message-Id: <156777564986.25081.4964537658500952557.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <156777561745.25081.1205321122446165328.stgit@devnote2> References: <156777561745.25081.1205321122446165328.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [Xen-devel] [PATCH -tip v4 3/4] x86: xen: insn: Decode Xen and KVM emulate-prefix signature X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Peter Zijlstra , Andrew Cooper , Randy Dunlap , x86@kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , Josh Poimboeuf , xen-devel@lists.xenproject.org, Boris Ostrovsky Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RGVjb2RlIFhlbiBhbmQgS1ZNJ3MgZW11bGF0ZS1wcmVmaXggc2lnbmF0dXJlIGJ5IHg4NiBpbnNu IGRlY29kZXIuCkl0IGlzIGNhbGxlZCAicHJlZml4IiBidXQgYWN0dWFsbHkgbm90IHg4NiBpbnN0 cnVjdGlvbiBwcmVmaXgsIHNvCnRoaXMgYWRkcyBpbnNuLmVtdWxhdGVfcHJlZml4X3NpemUgZmll bGQgaW5zdGVhZCBvZiByZXVzaW5nCmluc24ucHJlZml4ZXMuCgpJZiB4ODYgZGVjb2RlciBmaW5k cyBhIHNwZWNpYWwgc2VxdWVuY2Ugb2YgaW5zdHJ1Y3Rpb25zIG9mClhFTl9FTVVMQVRFX1BSRUZJ WCBhbmQgJ3VkMmE7IC5hc2NpaSAia3ZtIicsIGl0IGp1c3QgY291bnRzIHRoZQpsZW5ndGgsIHNl dCBpbnNuLmVtdWxhdGVfcHJlZml4X3NpemUgYW5kIGZvbGQgaXQgd2l0aCB0aGUgbmV4dAppbnN0 cnVjdGlvbi4gSW4gb3RoZXIgd29yZHMsIHRoZSBzaWduYXR1cmUgYW5kIHRoZSBuZXh0IGluc3Ry dWN0aW9uCmlzIHRyZWF0ZWQgYXMgYSBzaW5nbGUgaW5zdHJ1Y3Rpb24uCgpSZXBvcnRlZC1ieTog Sm9zaCBQb2ltYm9ldWYgPGpwb2ltYm9lQHJlZGhhdC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hc2Ft aSBIaXJhbWF0c3UgPG1oaXJhbWF0QGtlcm5lbC5vcmc+CkFja2VkLWJ5OiBKb3NoIFBvaW1ib2V1 ZiA8anBvaW1ib2VAcmVkaGF0LmNvbT4KLS0tCiBDaGFuZ2VzIGluIHY0OgogIC0gVXNlIGFzbS9l bXVsYXRlX3ByZWZpeC5oIGluc3RlYWQgb2YgeGVuL3ByZWZpeC5oCiAgLSBGaXggdG8gYWRkIGVt dWxhdGVfcHJlZml4LmggdG8gdGhlIGNoZWNraXN0IG9mIHBlcmYuCi0tLQogYXJjaC94ODYvaW5j bHVkZS9hc20vaW5zbi5oICAgICAgICAgICAgICAgICB8ICAgIDYgKysrKysKIGFyY2gveDg2L2xp Yi9pbnNuLmMgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDM0ICsrKysrKysrKysrKysrKysr KysrKysrKysrKwogdG9vbHMvYXJjaC94ODYvaW5jbHVkZS9hc20vZW11bGF0ZV9wcmVmaXguaCB8 ICAgMTQgKysrKysrKysrKysKIHRvb2xzL2FyY2gveDg2L2luY2x1ZGUvYXNtL2luc24uaCAgICAg ICAgICAgfCAgICA2ICsrKysrCiB0b29scy9hcmNoL3g4Ni9saWIvaW5zbi5jICAgICAgICAgICAg ICAgICAgIHwgICAzNCArKysrKysrKysrKysrKysrKysrKysrKysrKysKIHRvb2xzL29ianRvb2wv c3luYy1jaGVjay5zaCAgICAgICAgICAgICAgICAgfCAgICAzICsrCiB0b29scy9wZXJmL2NoZWNr LWhlYWRlcnMuc2ggICAgICAgICAgICAgICAgIHwgICAgMyArKwogNyBmaWxlcyBjaGFuZ2VkLCA5 OCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IHRvb2xz L2FyY2gveDg2L2luY2x1ZGUvYXNtL2VtdWxhdGVfcHJlZml4LmgKCmRpZmYgLS1naXQgYS9hcmNo L3g4Ni9pbmNsdWRlL2FzbS9pbnNuLmggYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9pbnNuLmgKaW5k ZXggMTU0ZjI3YmU4YmZjLi41YzFhZTNlZmY5ZDQgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2luY2x1 ZGUvYXNtL2luc24uaAorKysgYi9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9pbnNuLmgKQEAgLTQ1LDYg KzQ1LDcgQEAgc3RydWN0IGluc24gewogCQlzdHJ1Y3QgaW5zbl9maWVsZCBpbW1lZGlhdGUyOwkv KiBmb3IgNjRiaXQgaW1tIG9yIHNlZzE2ICovCiAJfTsKIAorCWludAllbXVsYXRlX3ByZWZpeF9z aXplOwogCWluc25fYXR0cl90IGF0dHI7CiAJdW5zaWduZWQgY2hhciBvcG5kX2J5dGVzOwogCXVu c2lnbmVkIGNoYXIgYWRkcl9ieXRlczsKQEAgLTEyOCw2ICsxMjksMTEgQEAgc3RhdGljIGlubGlu ZSBpbnQgaW5zbl9pc19ldmV4KHN0cnVjdCBpbnNuICppbnNuKQogCXJldHVybiAoaW5zbi0+dmV4 X3ByZWZpeC5uYnl0ZXMgPT0gNCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgaW50IGluc25faGFzX2Vt dWxhdGVfcHJlZml4KHN0cnVjdCBpbnNuICppbnNuKQoreworCXJldHVybiAhIWluc24tPmVtdWxh dGVfcHJlZml4X3NpemU7Cit9CisKIC8qIEVuc3VyZSB0aGlzIGluc3RydWN0aW9uIGlzIGRlY29k ZWQgY29tcGxldGVseSAqLwogc3RhdGljIGlubGluZSBpbnQgaW5zbl9jb21wbGV0ZShzdHJ1Y3Qg aW5zbiAqaW5zbikKIHsKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2xpYi9pbnNuLmMgYi9hcmNoL3g4 Ni9saWIvaW5zbi5jCmluZGV4IDBiNTg2MmJhNmE3NS4uNDA0Mjc5NTYzODkxIDEwMDY0NAotLS0g YS9hcmNoL3g4Ni9saWIvaW5zbi5jCisrKyBiL2FyY2gveDg2L2xpYi9pbnNuLmMKQEAgLTEzLDYg KzEzLDggQEAKICNpbmNsdWRlIDxhc20vaW5hdC5oPgogI2luY2x1ZGUgPGFzbS9pbnNuLmg+CiAK KyNpbmNsdWRlIDxhc20vZW11bGF0ZV9wcmVmaXguaD4KKwogLyogVmVyaWZ5IG5leHQgc2l6ZW9m KHQpIGJ5dGVzIGNhbiBiZSBvbiB0aGUgc2FtZSBpbnN0cnVjdGlvbiAqLwogI2RlZmluZSB2YWxp ZGF0ZV9uZXh0KHQsIGluc24sIG4pCVwKIAkoKGluc24pLT5uZXh0X2J5dGUgKyBzaXplb2YodCkg KyBuIDw9IChpbnNuKS0+ZW5kX2thZGRyKQpAQCAtNTgsNiArNjAsMzYgQEAgdm9pZCBpbnNuX2lu aXQoc3RydWN0IGluc24gKmluc24sIGNvbnN0IHZvaWQgKmthZGRyLCBpbnQgYnVmX2xlbiwgaW50 IHg4Nl82NCkKIAkJaW5zbi0+YWRkcl9ieXRlcyA9IDQ7CiB9CiAKK3N0YXRpYyBjb25zdCBpbnNu X2J5dGVfdCB4ZW5fcHJlZml4W10gPSB7IF9fWEVOX0VNVUxBVEVfUFJFRklYIH07CitzdGF0aWMg Y29uc3QgaW5zbl9ieXRlX3Qga3ZtX3ByZWZpeFtdID0geyBfX0tWTV9FTVVMQVRFX1BSRUZJWCB9 OworCitzdGF0aWMgaW50IF9faW5zbl9nZXRfZW11bGF0ZV9wcmVmaXgoc3RydWN0IGluc24gKmlu c24sCisJCQkJICAgICBjb25zdCBpbnNuX2J5dGVfdCAqcHJlZml4LCBzaXplX3QgbGVuKQorewor CXNpemVfdCBpOworCisJZm9yIChpID0gMDsgaSA8IGxlbjsgaSsrKSB7CisJCWlmIChwZWVrX25i eXRlX25leHQoaW5zbl9ieXRlX3QsIGluc24sIGkpICE9IHByZWZpeFtpXSkKKwkJCWdvdG8gZXJy X291dDsKKwl9CisKKwlpbnNuLT5lbXVsYXRlX3ByZWZpeF9zaXplID0gbGVuOworCWluc24tPm5l eHRfYnl0ZSArPSBsZW47CisKKwlyZXR1cm4gMTsKKworZXJyX291dDoKKwlyZXR1cm4gMDsKK30K Kworc3RhdGljIHZvaWQgaW5zbl9nZXRfZW11bGF0ZV9wcmVmaXgoc3RydWN0IGluc24gKmluc24p Cit7CisJaWYgKF9faW5zbl9nZXRfZW11bGF0ZV9wcmVmaXgoaW5zbiwgeGVuX3ByZWZpeCwgc2l6 ZW9mKHhlbl9wcmVmaXgpKSkKKwkJcmV0dXJuOworCisJX19pbnNuX2dldF9lbXVsYXRlX3ByZWZp eChpbnNuLCBrdm1fcHJlZml4LCBzaXplb2Yoa3ZtX3ByZWZpeCkpOworfQorCiAvKioKICAqIGlu c25fZ2V0X3ByZWZpeGVzIC0gc2NhbiB4ODYgaW5zdHJ1Y3Rpb24gcHJlZml4IGJ5dGVzCiAgKiBA aW5zbjoJJnN0cnVjdCBpbnNuIGNvbnRhaW5pbmcgaW5zdHJ1Y3Rpb24KQEAgLTc2LDYgKzEwOCw4 IEBAIHZvaWQgaW5zbl9nZXRfcHJlZml4ZXMoc3RydWN0IGluc24gKmluc24pCiAJaWYgKHByZWZp eGVzLT5nb3QpCiAJCXJldHVybjsKIAorCWluc25fZ2V0X2VtdWxhdGVfcHJlZml4KGluc24pOwor CiAJbmIgPSAwOwogCWxiID0gMDsKIAliID0gcGVla19uZXh0KGluc25fYnl0ZV90LCBpbnNuKTsK ZGlmZiAtLWdpdCBhL3Rvb2xzL2FyY2gveDg2L2luY2x1ZGUvYXNtL2VtdWxhdGVfcHJlZml4Lmgg Yi90b29scy9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9lbXVsYXRlX3ByZWZpeC5oCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uNzBmNWI5OGE1Mjg2Ci0tLSAvZGV2L251bGwK KysrIGIvdG9vbHMvYXJjaC94ODYvaW5jbHVkZS9hc20vZW11bGF0ZV9wcmVmaXguaApAQCAtMCww ICsxLDE0IEBACisvKiBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogR1BMLTIuMCAqLworI2lmbmRl ZiBfQVNNX1g4Nl9FTVVMQVRFX1BSRUZJWF9ICisjZGVmaW5lIF9BU01fWDg2X0VNVUxBVEVfUFJF RklYX0gKKworLyoKKyAqIFZpcnQgZXNjYXBlIHNlcXVlbmNlcyB0byB0cmlnZ2VyIGluc3RydWN0 aW9uIGVtdWxhdGlvbjsKKyAqIGlkZWFsbHkgdGhlc2Ugd291bGQgZGVjb2RlIHRvICd3aG9sZScg aW5zdHJ1Y3Rpb24gYW5kIG5vdCBkZXN0cm95CisgKiB0aGUgaW5zdHJ1Y3Rpb24gc3RyZWFtOyBz YWRseSB0aGlzIGlzIG5vdCB0cnVlIGZvciB0aGUgJ2t2bScgb25lIDovCisgKi8KKworI2RlZmlu ZSBfX1hFTl9FTVVMQVRFX1BSRUZJWCAgMHgwZiwweDBiLDB4NzgsMHg2NSwweDZlICAvKiB1ZDIg OyAuYXNjaWkgInhlbiIgKi8KKyNkZWZpbmUgX19LVk1fRU1VTEFURV9QUkVGSVggIDB4MGYsMHgw YiwweDZiLDB4NzYsMHg2ZAkvKiB1ZDIgOyAuYXNjaWkgImt2bSIgKi8KKworI2VuZGlmCmRpZmYg LS1naXQgYS90b29scy9hcmNoL3g4Ni9pbmNsdWRlL2FzbS9pbnNuLmggYi90b29scy9hcmNoL3g4 Ni9pbmNsdWRlL2FzbS9pbnNuLmgKaW5kZXggMzdhNGMzOTA3NTBiLi41Njg4NTRiMTRkMGEgMTAw NjQ0Ci0tLSBhL3Rvb2xzL2FyY2gveDg2L2luY2x1ZGUvYXNtL2luc24uaAorKysgYi90b29scy9h cmNoL3g4Ni9pbmNsdWRlL2FzbS9pbnNuLmgKQEAgLTQ1LDYgKzQ1LDcgQEAgc3RydWN0IGluc24g ewogCQlzdHJ1Y3QgaW5zbl9maWVsZCBpbW1lZGlhdGUyOwkvKiBmb3IgNjRiaXQgaW1tIG9yIHNl ZzE2ICovCiAJfTsKIAorCWludAllbXVsYXRlX3ByZWZpeF9zaXplOwogCWluc25fYXR0cl90IGF0 dHI7CiAJdW5zaWduZWQgY2hhciBvcG5kX2J5dGVzOwogCXVuc2lnbmVkIGNoYXIgYWRkcl9ieXRl czsKQEAgLTEyOCw2ICsxMjksMTEgQEAgc3RhdGljIGlubGluZSBpbnQgaW5zbl9pc19ldmV4KHN0 cnVjdCBpbnNuICppbnNuKQogCXJldHVybiAoaW5zbi0+dmV4X3ByZWZpeC5uYnl0ZXMgPT0gNCk7 CiB9CiAKK3N0YXRpYyBpbmxpbmUgaW50IGluc25faGFzX2VtdWxhdGVfcHJlZml4KHN0cnVjdCBp bnNuICppbnNuKQoreworCXJldHVybiAhIWluc24tPmVtdWxhdGVfcHJlZml4X3NpemU7Cit9CisK IC8qIEVuc3VyZSB0aGlzIGluc3RydWN0aW9uIGlzIGRlY29kZWQgY29tcGxldGVseSAqLwogc3Rh dGljIGlubGluZSBpbnQgaW5zbl9jb21wbGV0ZShzdHJ1Y3QgaW5zbiAqaW5zbikKIHsKZGlmZiAt LWdpdCBhL3Rvb2xzL2FyY2gveDg2L2xpYi9pbnNuLmMgYi90b29scy9hcmNoL3g4Ni9saWIvaW5z bi5jCmluZGV4IDc5ZTA0OGYxZDkwMi4uMDE1MWRmYzZkYTYxIDEwMDY0NAotLS0gYS90b29scy9h cmNoL3g4Ni9saWIvaW5zbi5jCisrKyBiL3Rvb2xzL2FyY2gveDg2L2xpYi9pbnNuLmMKQEAgLTEz LDYgKzEzLDggQEAKICNpbmNsdWRlICIuLi9pbmNsdWRlL2FzbS9pbmF0LmgiCiAjaW5jbHVkZSAi Li4vaW5jbHVkZS9hc20vaW5zbi5oIgogCisjaW5jbHVkZSAiLi4vaW5jbHVkZS9hc20vZW11bGF0 ZV9wcmVmaXguaCIKKwogLyogVmVyaWZ5IG5leHQgc2l6ZW9mKHQpIGJ5dGVzIGNhbiBiZSBvbiB0 aGUgc2FtZSBpbnN0cnVjdGlvbiAqLwogI2RlZmluZSB2YWxpZGF0ZV9uZXh0KHQsIGluc24sIG4p CVwKIAkoKGluc24pLT5uZXh0X2J5dGUgKyBzaXplb2YodCkgKyBuIDw9IChpbnNuKS0+ZW5kX2th ZGRyKQpAQCAtNTgsNiArNjAsMzYgQEAgdm9pZCBpbnNuX2luaXQoc3RydWN0IGluc24gKmluc24s IGNvbnN0IHZvaWQgKmthZGRyLCBpbnQgYnVmX2xlbiwgaW50IHg4Nl82NCkKIAkJaW5zbi0+YWRk cl9ieXRlcyA9IDQ7CiB9CiAKK3N0YXRpYyBjb25zdCBpbnNuX2J5dGVfdCB4ZW5fcHJlZml4W10g PSB7IF9fWEVOX0VNVUxBVEVfUFJFRklYIH07CitzdGF0aWMgY29uc3QgaW5zbl9ieXRlX3Qga3Zt X3ByZWZpeFtdID0geyBfX0tWTV9FTVVMQVRFX1BSRUZJWCB9OworCitzdGF0aWMgaW50IF9faW5z bl9nZXRfZW11bGF0ZV9wcmVmaXgoc3RydWN0IGluc24gKmluc24sCisJCQkJICAgICBjb25zdCBp bnNuX2J5dGVfdCAqcHJlZml4LCBzaXplX3QgbGVuKQoreworCXNpemVfdCBpOworCisJZm9yIChp ID0gMDsgaSA8IGxlbjsgaSsrKSB7CisJCWlmIChwZWVrX25ieXRlX25leHQoaW5zbl9ieXRlX3Qs IGluc24sIGkpICE9IHByZWZpeFtpXSkKKwkJCWdvdG8gZXJyX291dDsKKwl9CisKKwlpbnNuLT5l bXVsYXRlX3ByZWZpeF9zaXplID0gbGVuOworCWluc24tPm5leHRfYnl0ZSArPSBsZW47CisKKwly ZXR1cm4gMTsKKworZXJyX291dDoKKwlyZXR1cm4gMDsKK30KKworc3RhdGljIHZvaWQgaW5zbl9n ZXRfZW11bGF0ZV9wcmVmaXgoc3RydWN0IGluc24gKmluc24pCit7CisJaWYgKF9faW5zbl9nZXRf ZW11bGF0ZV9wcmVmaXgoaW5zbiwgeGVuX3ByZWZpeCwgc2l6ZW9mKHhlbl9wcmVmaXgpKSkKKwkJ cmV0dXJuOworCisJX19pbnNuX2dldF9lbXVsYXRlX3ByZWZpeChpbnNuLCBrdm1fcHJlZml4LCBz aXplb2Yoa3ZtX3ByZWZpeCkpOworfQorCiAvKioKICAqIGluc25fZ2V0X3ByZWZpeGVzIC0gc2Nh biB4ODYgaW5zdHJ1Y3Rpb24gcHJlZml4IGJ5dGVzCiAgKiBAaW5zbjoJJnN0cnVjdCBpbnNuIGNv bnRhaW5pbmcgaW5zdHJ1Y3Rpb24KQEAgLTc2LDYgKzEwOCw4IEBAIHZvaWQgaW5zbl9nZXRfcHJl Zml4ZXMoc3RydWN0IGluc24gKmluc24pCiAJaWYgKHByZWZpeGVzLT5nb3QpCiAJCXJldHVybjsK IAorCWluc25fZ2V0X2VtdWxhdGVfcHJlZml4KGluc24pOworCiAJbmIgPSAwOwogCWxiID0gMDsK IAliID0gcGVla19uZXh0KGluc25fYnl0ZV90LCBpbnNuKTsKZGlmZiAtLWdpdCBhL3Rvb2xzL29i anRvb2wvc3luYy1jaGVjay5zaCBiL3Rvb2xzL29ianRvb2wvc3luYy1jaGVjay5zaAppbmRleCAw YTgzMmUyNjVhNTAuLjliZDA0YmJlZDAxZSAxMDA3NTUKLS0tIGEvdG9vbHMvb2JqdG9vbC9zeW5j LWNoZWNrLnNoCisrKyBiL3Rvb2xzL29ianRvb2wvc3luYy1jaGVjay5zaApAQCAtNCw2ICs0LDcg QEAKIEZJTEVTPScKIGFyY2gveDg2L2luY2x1ZGUvYXNtL2luYXRfdHlwZXMuaAogYXJjaC94ODYv aW5jbHVkZS9hc20vb3JjX3R5cGVzLmgKK2FyY2gveDg2L2luY2x1ZGUvYXNtL2VtdWxhdGVfcHJl Zml4LmgKIGFyY2gveDg2L2xpYi94ODYtb3Bjb2RlLW1hcC50eHQKIGFyY2gveDg2L3Rvb2xzL2dl bi1pbnNuLWF0dHIteDg2LmF3awogJwpAQCAtNDYsNiArNDcsNiBAQCBkb25lCiBjaGVjayBhcmNo L3g4Ni9pbmNsdWRlL2FzbS9pbmF0LmggICAgICctSSAiXiNpbmNsdWRlIFtcIjxdXChhc20vXCkq aW5hdF90eXBlcy5oW1wiPl0iJwogY2hlY2sgYXJjaC94ODYvaW5jbHVkZS9hc20vaW5zbi5oICAg ICAnLUkgIl4jaW5jbHVkZSBbXCI8XVwoYXNtL1wpKmluYXQuaFtcIj5dIicKIGNoZWNrIGFyY2gv eDg2L2xpYi9pbmF0LmMgICAgICAgICAgICAgJy1JICJeI2luY2x1ZGUgW1wiPF1cKC4uL2luY2x1 ZGUvXCkqYXNtL2luc24uaFtcIj5dIicKLWNoZWNrIGFyY2gveDg2L2xpYi9pbnNuLmMgICAgICAg ICAgICAgJy1JICJeI2luY2x1ZGUgW1wiPF1cKC4uL2luY2x1ZGUvXCkqYXNtL2luXChhdFx8c25c KS5oW1wiPl0iJworY2hlY2sgYXJjaC94ODYvbGliL2luc24uYyAgICAgICAgICAgICAnLUkgIl4j aW5jbHVkZSBbXCI8XVwoLi4vaW5jbHVkZS9cKSphc20vaW5cKGF0XHxzblwpLmhbXCI+XSIgLUkg Il4jaW5jbHVkZSBbXCI8XVwoLi4vaW5jbHVkZS9cKSphc20vZW11bGF0ZV9wcmVmaXguaFtcIj5d IicKIAogY2QgLQpkaWZmIC0tZ2l0IGEvdG9vbHMvcGVyZi9jaGVjay1oZWFkZXJzLnNoIGIvdG9v bHMvcGVyZi9jaGVjay1oZWFkZXJzLnNoCmluZGV4IGUyZTBmMDZjOTdkMC4uOTg4YjE4NzllYzk4 IDEwMDc1NQotLS0gYS90b29scy9wZXJmL2NoZWNrLWhlYWRlcnMuc2gKKysrIGIvdG9vbHMvcGVy Zi9jaGVjay1oZWFkZXJzLnNoCkBAIC0yNyw2ICsyNyw3IEBAIGFyY2gveDg2L2luY2x1ZGUvYXNt L2Rpc2FibGVkLWZlYXR1cmVzLmgKIGFyY2gveDg2L2luY2x1ZGUvYXNtL3JlcXVpcmVkLWZlYXR1 cmVzLmgKIGFyY2gveDg2L2luY2x1ZGUvYXNtL2NwdWZlYXR1cmVzLmgKIGFyY2gveDg2L2luY2x1 ZGUvYXNtL2luYXRfdHlwZXMuaAorYXJjaC94ODYvaW5jbHVkZS9hc20vZW11bGF0ZV9wcmVmaXgu aAogYXJjaC94ODYvaW5jbHVkZS91YXBpL2FzbS9wcmN0bC5oCiBhcmNoL3g4Ni9saWIveDg2LW9w Y29kZS1tYXAudHh0CiBhcmNoL3g4Ni90b29scy9nZW4taW5zbi1hdHRyLXg4Ni5hd2sKQEAgLTEx NSw3ICsxMTYsNyBAQCBjaGVjayBsaWIvY3R5cGUuYwkJICAgICAgJy1JICJeRVhQT1JUX1NZTUJP TCIgLUkgIl4jaW5jbHVkZSA8bGludXgvZXhwb3J0Lmg+IiAtQgogY2hlY2sgYXJjaC94ODYvaW5j bHVkZS9hc20vaW5hdC5oICAgICAnLUkgIl4jaW5jbHVkZSBbXCI8XVwoYXNtL1wpKmluYXRfdHlw ZXMuaFtcIj5dIicKIGNoZWNrIGFyY2gveDg2L2luY2x1ZGUvYXNtL2luc24uaCAgICAgJy1JICJe I2luY2x1ZGUgW1wiPF1cKGFzbS9cKSppbmF0LmhbXCI+XSInCiBjaGVjayBhcmNoL3g4Ni9saWIv aW5hdC5jCSAgICAgICctSSAiXiNpbmNsdWRlIFtcIjxdXCguLi9pbmNsdWRlL1wpKmFzbS9pbnNu LmhbXCI+XSInCi1jaGVjayBhcmNoL3g4Ni9saWIvaW5zbi5jCSAgICAgICctSSAiXiNpbmNsdWRl IFtcIjxdXCguLi9pbmNsdWRlL1wpKmFzbS9pblwoYXRcfHNuXCkuaFtcIj5dIicKK2NoZWNrIGFy Y2gveDg2L2xpYi9pbnNuLmMgICAgICAgICAgICAgJy1JICJeI2luY2x1ZGUgW1wiPF1cKC4uL2lu Y2x1ZGUvXCkqYXNtL2luXChhdFx8c25cKS5oW1wiPl0iIC1JICJeI2luY2x1ZGUgW1wiPF1cKC4u L2luY2x1ZGUvXCkqYXNtL2VtdWxhdGVfcHJlZml4LmhbXCI+XSInCiAKICMgZGlmZiBub24tc3lt bWV0cmljIGZpbGVzCiBjaGVja18yIHRvb2xzL3BlcmYvYXJjaC94ODYvZW50cnkvc3lzY2FsbHMv c3lzY2FsbF82NC50YmwgYXJjaC94ODYvZW50cnkvc3lzY2FsbHMvc3lzY2FsbF82NC50YmwKCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwg bWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3Rz LnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F02BEC00307 for ; Fri, 6 Sep 2019 13:14:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE08C214DE for ; Fri, 6 Sep 2019 13:14:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567775657; bh=YxdWojc5fQhCsI3MCFNUb/S38/XJllDgwfcUjCixi7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uUb7mCTqNtIv/dyqtts/zJV2vIF0KnXkq9MlB/1QvIUL7F+Qbp2lv/ZTPUR4+70xk lnTbCpp9lSwCsCKfnRSSRoiSisWjP+0+1TByQN0gLwXi6Ie5D+5XuaAhWHkfFgfuyI zfJt8YL4u7VVEDaUOeJPZLi5TBaNmzG0R+fk41mA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393051AbfIFNOR (ORCPT ); Fri, 6 Sep 2019 09:14:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:35558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388106AbfIFNOQ (ORCPT ); Fri, 6 Sep 2019 09:14:16 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4A55A207FC; Fri, 6 Sep 2019 13:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567775655; bh=YxdWojc5fQhCsI3MCFNUb/S38/XJllDgwfcUjCixi7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XkKh5q5Aus2YgqR1dKqCz2etHrZWowX7W3djWGR1gL3U8RvdvMP18XVzrLm0PVhvq //NYVg8iMWghQpO3BWms/dSwsIM70WgaKZlAfM2MP0Ky5XqqK7Fgu+pZ8LCj27jCCE +I0vJVlcHcRe7KlsdYNQ1IBm+oyj6BNlkGQaS2bI= From: Masami Hiramatsu To: Ingo Molnar Cc: Josh Poimboeuf , Andrew Cooper , Peter Zijlstra , Randy Dunlap , Borislav Petkov , Juergen Gross , Boris Ostrovsky , Stefano Stabellini , x86@kernel.org, linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Subject: [PATCH -tip v4 3/4] x86: xen: insn: Decode Xen and KVM emulate-prefix signature Date: Fri, 6 Sep 2019 22:14:10 +0900 Message-Id: <156777564986.25081.4964537658500952557.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <156777561745.25081.1205321122446165328.stgit@devnote2> References: <156777561745.25081.1205321122446165328.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Decode Xen and KVM's emulate-prefix signature by x86 insn decoder. It is called "prefix" but actually not x86 instruction prefix, so this adds insn.emulate_prefix_size field instead of reusing insn.prefixes. If x86 decoder finds a special sequence of instructions of XEN_EMULATE_PREFIX and 'ud2a; .ascii "kvm"', it just counts the length, set insn.emulate_prefix_size and fold it with the next instruction. In other words, the signature and the next instruction is treated as a single instruction. Reported-by: Josh Poimboeuf Signed-off-by: Masami Hiramatsu Acked-by: Josh Poimboeuf --- Changes in v4: - Use asm/emulate_prefix.h instead of xen/prefix.h - Fix to add emulate_prefix.h to the checkist of perf. --- arch/x86/include/asm/insn.h | 6 +++++ arch/x86/lib/insn.c | 34 +++++++++++++++++++++++++++ tools/arch/x86/include/asm/emulate_prefix.h | 14 +++++++++++ tools/arch/x86/include/asm/insn.h | 6 +++++ tools/arch/x86/lib/insn.c | 34 +++++++++++++++++++++++++++ tools/objtool/sync-check.sh | 3 ++ tools/perf/check-headers.sh | 3 ++ 7 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 tools/arch/x86/include/asm/emulate_prefix.h diff --git a/arch/x86/include/asm/insn.h b/arch/x86/include/asm/insn.h index 154f27be8bfc..5c1ae3eff9d4 100644 --- a/arch/x86/include/asm/insn.h +++ b/arch/x86/include/asm/insn.h @@ -45,6 +45,7 @@ struct insn { struct insn_field immediate2; /* for 64bit imm or seg16 */ }; + int emulate_prefix_size; insn_attr_t attr; unsigned char opnd_bytes; unsigned char addr_bytes; @@ -128,6 +129,11 @@ static inline int insn_is_evex(struct insn *insn) return (insn->vex_prefix.nbytes == 4); } +static inline int insn_has_emulate_prefix(struct insn *insn) +{ + return !!insn->emulate_prefix_size; +} + /* Ensure this instruction is decoded completely */ static inline int insn_complete(struct insn *insn) { diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c index 0b5862ba6a75..404279563891 100644 --- a/arch/x86/lib/insn.c +++ b/arch/x86/lib/insn.c @@ -13,6 +13,8 @@ #include #include +#include + /* Verify next sizeof(t) bytes can be on the same instruction */ #define validate_next(t, insn, n) \ ((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr) @@ -58,6 +60,36 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64) insn->addr_bytes = 4; } +static const insn_byte_t xen_prefix[] = { __XEN_EMULATE_PREFIX }; +static const insn_byte_t kvm_prefix[] = { __KVM_EMULATE_PREFIX }; + +static int __insn_get_emulate_prefix(struct insn *insn, + const insn_byte_t *prefix, size_t len) +{ + size_t i; + + for (i = 0; i < len; i++) { + if (peek_nbyte_next(insn_byte_t, insn, i) != prefix[i]) + goto err_out; + } + + insn->emulate_prefix_size = len; + insn->next_byte += len; + + return 1; + +err_out: + return 0; +} + +static void insn_get_emulate_prefix(struct insn *insn) +{ + if (__insn_get_emulate_prefix(insn, xen_prefix, sizeof(xen_prefix))) + return; + + __insn_get_emulate_prefix(insn, kvm_prefix, sizeof(kvm_prefix)); +} + /** * insn_get_prefixes - scan x86 instruction prefix bytes * @insn: &struct insn containing instruction @@ -76,6 +108,8 @@ void insn_get_prefixes(struct insn *insn) if (prefixes->got) return; + insn_get_emulate_prefix(insn); + nb = 0; lb = 0; b = peek_next(insn_byte_t, insn); diff --git a/tools/arch/x86/include/asm/emulate_prefix.h b/tools/arch/x86/include/asm/emulate_prefix.h new file mode 100644 index 000000000000..70f5b98a5286 --- /dev/null +++ b/tools/arch/x86/include/asm/emulate_prefix.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_EMULATE_PREFIX_H +#define _ASM_X86_EMULATE_PREFIX_H + +/* + * Virt escape sequences to trigger instruction emulation; + * ideally these would decode to 'whole' instruction and not destroy + * the instruction stream; sadly this is not true for the 'kvm' one :/ + */ + +#define __XEN_EMULATE_PREFIX 0x0f,0x0b,0x78,0x65,0x6e /* ud2 ; .ascii "xen" */ +#define __KVM_EMULATE_PREFIX 0x0f,0x0b,0x6b,0x76,0x6d /* ud2 ; .ascii "kvm" */ + +#endif diff --git a/tools/arch/x86/include/asm/insn.h b/tools/arch/x86/include/asm/insn.h index 37a4c390750b..568854b14d0a 100644 --- a/tools/arch/x86/include/asm/insn.h +++ b/tools/arch/x86/include/asm/insn.h @@ -45,6 +45,7 @@ struct insn { struct insn_field immediate2; /* for 64bit imm or seg16 */ }; + int emulate_prefix_size; insn_attr_t attr; unsigned char opnd_bytes; unsigned char addr_bytes; @@ -128,6 +129,11 @@ static inline int insn_is_evex(struct insn *insn) return (insn->vex_prefix.nbytes == 4); } +static inline int insn_has_emulate_prefix(struct insn *insn) +{ + return !!insn->emulate_prefix_size; +} + /* Ensure this instruction is decoded completely */ static inline int insn_complete(struct insn *insn) { diff --git a/tools/arch/x86/lib/insn.c b/tools/arch/x86/lib/insn.c index 79e048f1d902..0151dfc6da61 100644 --- a/tools/arch/x86/lib/insn.c +++ b/tools/arch/x86/lib/insn.c @@ -13,6 +13,8 @@ #include "../include/asm/inat.h" #include "../include/asm/insn.h" +#include "../include/asm/emulate_prefix.h" + /* Verify next sizeof(t) bytes can be on the same instruction */ #define validate_next(t, insn, n) \ ((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr) @@ -58,6 +60,36 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64) insn->addr_bytes = 4; } +static const insn_byte_t xen_prefix[] = { __XEN_EMULATE_PREFIX }; +static const insn_byte_t kvm_prefix[] = { __KVM_EMULATE_PREFIX }; + +static int __insn_get_emulate_prefix(struct insn *insn, + const insn_byte_t *prefix, size_t len) +{ + size_t i; + + for (i = 0; i < len; i++) { + if (peek_nbyte_next(insn_byte_t, insn, i) != prefix[i]) + goto err_out; + } + + insn->emulate_prefix_size = len; + insn->next_byte += len; + + return 1; + +err_out: + return 0; +} + +static void insn_get_emulate_prefix(struct insn *insn) +{ + if (__insn_get_emulate_prefix(insn, xen_prefix, sizeof(xen_prefix))) + return; + + __insn_get_emulate_prefix(insn, kvm_prefix, sizeof(kvm_prefix)); +} + /** * insn_get_prefixes - scan x86 instruction prefix bytes * @insn: &struct insn containing instruction @@ -76,6 +108,8 @@ void insn_get_prefixes(struct insn *insn) if (prefixes->got) return; + insn_get_emulate_prefix(insn); + nb = 0; lb = 0; b = peek_next(insn_byte_t, insn); diff --git a/tools/objtool/sync-check.sh b/tools/objtool/sync-check.sh index 0a832e265a50..9bd04bbed01e 100755 --- a/tools/objtool/sync-check.sh +++ b/tools/objtool/sync-check.sh @@ -4,6 +4,7 @@ FILES=' arch/x86/include/asm/inat_types.h arch/x86/include/asm/orc_types.h +arch/x86/include/asm/emulate_prefix.h arch/x86/lib/x86-opcode-map.txt arch/x86/tools/gen-insn-attr-x86.awk ' @@ -46,6 +47,6 @@ done check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[\">]"' check arch/x86/include/asm/insn.h '-I "^#include [\"<]\(asm/\)*inat.h[\">]"' check arch/x86/lib/inat.c '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"' -check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]"' +check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"' cd - diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh index e2e0f06c97d0..988b1879ec98 100755 --- a/tools/perf/check-headers.sh +++ b/tools/perf/check-headers.sh @@ -27,6 +27,7 @@ arch/x86/include/asm/disabled-features.h arch/x86/include/asm/required-features.h arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/inat_types.h +arch/x86/include/asm/emulate_prefix.h arch/x86/include/uapi/asm/prctl.h arch/x86/lib/x86-opcode-map.txt arch/x86/tools/gen-insn-attr-x86.awk @@ -115,7 +116,7 @@ check lib/ctype.c '-I "^EXPORT_SYMBOL" -I "^#include " -B check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[\">]"' check arch/x86/include/asm/insn.h '-I "^#include [\"<]\(asm/\)*inat.h[\">]"' check arch/x86/lib/inat.c '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"' -check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]"' +check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"' # diff non-symmetric files check_2 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl