From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH] x86/spec-ctrl: Yet more fixes for xpti= parsing Date: Thu, 9 Aug 2018 17:38:00 +0100 Message-ID: <1533832680-15159-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Xen-devel Cc: Juergen Gross , Andrew Cooper , Jan Beulich List-Id: xen-devel@lists.xenproject.org QXMgaXQgY3VycmVudGx5IHN0YW5kcywgJ3hwdGk9ZG9tMCcgaXMgaW5kaXN0aW5ndWlzaGFibGUg ZnJvbSB0aGUgZGVmYXVsdAp2YWx1ZSwgd2hpY2ggbWVhbnMgaXQgd2lsbCBiZSBvdmVycmlkZGVu IGJ5IEFSQ0hfQ0FQQUJJTElUSUVTX1JEQ0xfTk8gb24gZml4ZWQKaGFyZHdhcmUuCgpTd2l0Y2gg b3B0X3hwdGkgdG8gdXNlIC0xIGFzIGEgZGVmYXVsdCBsaWtlIGFsbCBvdXIgb3RoZXIgcmVsYXRl ZCBvcHRpb25zLCBhbmQKY2xvYmJlciBpdCBhcyBzb29uIGFzIHdlIGhhdmUgYSBzdHJpbmcgdG8g cGFyc2UuCgpJbiBhZGRpdGlvbiwgJ3hwdGknIGFsb25lIHNob3VsZCBiZSBpbnRlcnByZXRlZCBp biBpdHMgcG9zaXRpdmUgYm9vbGVhbiBmb3JtLApyYXRoZXIgdGhhbiByZXN1bHRpbmcgaW4gYSBw YXJzZSBlcnJvci4KCiAgKFhFTikgcGFyYW1ldGVyICJ4cHRpIiBoYXMgaW52YWxpZCB2YWx1ZSAi IiwgcmM9LTIyIQoKU2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNA Y2l0cml4LmNvbT4KLS0tCkNDOiBKYW4gQmV1bGljaCA8SkJldWxpY2hAc3VzZS5jb20+CkNDOiBK dWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+Ci0tLQogeGVuL2FyY2gveDg2L3NwZWNfY3Ry bC5jICAgICAgICB8IDE2ICsrKysrKysrKysrLS0tLS0KIHhlbi9pbmNsdWRlL2FzbS14ODYvc3Bl Y19jdHJsLmggfCAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCA2IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9zcGVjX2N0cmwuYyBiL3hlbi9h cmNoL3g4Ni9zcGVjX2N0cmwuYwppbmRleCAzMmE0ZWE2Li40YWFjOGFkIDEwMDY0NAotLS0gYS94 ZW4vYXJjaC94ODYvc3BlY19jdHJsLmMKKysrIGIveGVuL2FyY2gveDg2L3NwZWNfY3RybC5jCkBA IC00MjAsOCArNDIwLDcgQEAgc3RhdGljIGJvb2wgX19pbml0IHNob3VsZF91c2VfZWFnZXJfZnB1 KHZvaWQpCiAgICAgfQogfQogCi0jZGVmaW5lIE9QVF9YUFRJX0RFRkFVTFQgIDB4ZmYKLXVpbnQ4 X3QgX19yZWFkX21vc3RseSBvcHRfeHB0aSA9IE9QVF9YUFRJX0RFRkFVTFQ7CitpbnQ4X3QgX19y ZWFkX21vc3RseSBvcHRfeHB0aSA9IC0xOwogCiBzdGF0aWMgX19pbml0IHZvaWQgeHB0aV9pbml0 X2RlZmF1bHQodWludDY0X3QgY2FwcykKIHsKQEAgLTQzOSw2ICs0MzgsMTAgQEAgc3RhdGljIF9f aW5pdCBpbnQgcGFyc2VfeHB0aShjb25zdCBjaGFyICpzKQogICAgIGNvbnN0IGNoYXIgKnNzOwog ICAgIGludCB2YWwsIHJjID0gMDsKIAorICAgIC8qIEluaGliaXQgdGhlIGRlZmF1bHRzIGFzIGFu IGV4cGxpY2l0IGNob2ljZSBoYXMgYmVlbiBnaXZlbi4gKi8KKyAgICBpZiAoIG9wdF94cHRpID09 IC0xICkKKyAgICAgICAgb3B0X3hwdGkgPSAwOworCiAgICAgZG8gewogICAgICAgICBzcyA9IHN0 cmNocihzLCAnLCcpOwogICAgICAgICBpZiAoICFzcyApCkBAIC00NTEsMTIgKzQ1NCwxNSBAQCBz dGF0aWMgX19pbml0IGludCBwYXJzZV94cHRpKGNvbnN0IGNoYXIgKnMpCiAgICAgICAgICAgICBi cmVhazsKIAogICAgICAgICBjYXNlIDE6CisgICAgICAgIGRlZl90cnVlOgogICAgICAgICAgICAg b3B0X3hwdGkgPSBPUFRfWFBUSV9ET00wIHwgT1BUX1hQVElfRE9NVTsKICAgICAgICAgICAgIGJy ZWFrOwogCiAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBpZiAoICFzdHJjbXAocywgImRl ZmF1bHQiKSApCi0gICAgICAgICAgICAgICAgb3B0X3hwdGkgPSBPUFRfWFBUSV9ERUZBVUxUOwor ICAgICAgICAgICAgaWYgKCBzID09IHNzICkKKyAgICAgICAgICAgICAgICBnb3RvIGRlZl90cnVl OworICAgICAgICAgICAgZWxzZSBpZiAoICFzdHJjbXAocywgImRlZmF1bHQiKSApCisgICAgICAg ICAgICAgICAgb3B0X3hwdGkgPSAtMTsKICAgICAgICAgICAgIGVsc2UgaWYgKCAodmFsID0gcGFy c2VfYm9vbGVhbigiZG9tMCIsIHMsIHNzKSkgPj0gMCApCiAgICAgICAgICAgICAgICAgb3B0X3hw dGkgPSAob3B0X3hwdGkgJiB+T1BUX1hQVElfRE9NMCkgfAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgKHZhbCA/IE9QVF9YUFRJX0RPTTAgOiAwKTsKQEAgLTYxOCw3ICs2MjQsNyBAQCB2b2lk IF9faW5pdCBpbml0X3NwZWN1bGF0aW9uX21pdGlnYXRpb25zKHZvaWQpCiAgICAgaWYgKCBkZWZh dWx0X3hlbl9zcGVjX2N0cmwgKQogICAgICAgICBzZXR1cF9mb3JjZV9jcHVfY2FwKFg4Nl9GRUFU VVJFX1NDX01TUl9JRExFKTsKIAotICAgIGlmICggb3B0X3hwdGkgPT0gT1BUX1hQVElfREVGQVVM VCApCisgICAgaWYgKCBvcHRfeHB0aSA9PSAtMSApCiAgICAgICAgIHhwdGlfaW5pdF9kZWZhdWx0 KGNhcHMpOwogCiAgICAgaWYgKCBvcHRfeHB0aSA9PSAwICkKZGlmZiAtLWdpdCBhL3hlbi9pbmNs dWRlL2FzbS14ODYvc3BlY19jdHJsLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L3NwZWNfY3RybC5o CmluZGV4IDViNDBhZmIuLmZlYTgyNjAgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYv c3BlY19jdHJsLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9zcGVjX2N0cmwuaApAQCAtMzQs NyArMzQsNyBAQCBleHRlcm4gYm9vbCBic3BfZGVsYXlfc3BlY19jdHJsOwogZXh0ZXJuIHVpbnQ4 X3QgZGVmYXVsdF94ZW5fc3BlY19jdHJsOwogZXh0ZXJuIHVpbnQ4X3QgZGVmYXVsdF9zcGVjX2N0 cmxfZmxhZ3M7CiAKLWV4dGVybiB1aW50OF90IG9wdF94cHRpOworZXh0ZXJuIGludDhfdCBvcHRf eHB0aTsKICNkZWZpbmUgT1BUX1hQVElfRE9NMCAgMHgwMQogI2RlZmluZSBPUFRfWFBUSV9ET01V ICAweDAyCiAKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJv amVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hl bi1kZXZlbA==