From: Juergen Gross Subject: [PATCH 5/6] xen/cpupool: simplify suspend/resume handling Date: Mon, 18 Mar 2019 14:11:54 +0100 Message-ID: <20190318131155.29450-6-jgross@suse.com> References: <20190318131155.29450-1-jgross@suse.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 1h5s3e-0006Zc-AK for xen-devel@lists.xenproject.org; Mon, 18 Mar 2019 13:12:02 +0000 In-Reply-To: <20190318131155.29450-1-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Tim Deegan , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Dario Faggioli , Julien Grall , Jan Beulich List-Id: xen-devel@lists.xenproject.org SW5zdGVhZCBvZiByZW1vdmluZyBjcHVzIHRlbXBvcmFyaWx5IGZyb20gY3B1cG9vbHMgZHVyaW5n CnN1c3BlbmQvcmVzdW1lIG9ubHkgcmVtb3ZlIGNwdXMgZmluYWxseSB3aGljaCBkaWRuJ3QgY29t ZSB1cCB3aGVuCnJlc3VtaW5nLgoKU2lnbmVkLW9mZi1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3Nz QHN1c2UuY29tPgotLS0KIHhlbi9jb21tb24vY3B1cG9vbC5jICAgICAgIHwgMTMwICsrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogeGVuL2luY2x1ZGUveGVuL3Nj aGVkLWlmLmggfCAgIDEgLQogMiBmaWxlcyBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCA4MCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vY29tbW9uL2NwdXBvb2wuYyBiL3hlbi9jb21t b24vY3B1cG9vbC5jCmluZGV4IGU4OWJiNjdlNzEuLmVkNjg5ZmQyOTAgMTAwNjQ0Ci0tLSBhL3hl bi9jb21tb24vY3B1cG9vbC5jCisrKyBiL3hlbi9jb21tb24vY3B1cG9vbC5jCkBAIC00NywxMiAr NDcsNiBAQCBzdGF0aWMgc3RydWN0IGNwdXBvb2wgKmFsbG9jX2NwdXBvb2xfc3RydWN0KHZvaWQp CiAgICAgICAgIHhmcmVlKGMpOwogICAgICAgICBjID0gTlVMTDsKICAgICB9Ci0gICAgZWxzZSBp ZiAoICF6YWxsb2NfY3B1bWFza192YXIoJmMtPmNwdV9zdXNwZW5kZWQpICkKLSAgICB7Ci0gICAg ICAgIGZyZWVfY3B1bWFza192YXIoYy0+Y3B1X3ZhbGlkKTsKLSAgICAgICAgeGZyZWUoYyk7Ci0g ICAgICAgIGMgPSBOVUxMOwotICAgIH0KIAogICAgIHJldHVybiBjOwogfQpAQCAtNjAsMTAgKzU0 LDcgQEAgc3RhdGljIHN0cnVjdCBjcHVwb29sICphbGxvY19jcHVwb29sX3N0cnVjdCh2b2lkKQog c3RhdGljIHZvaWQgZnJlZV9jcHVwb29sX3N0cnVjdChzdHJ1Y3QgY3B1cG9vbCAqYykKIHsKICAg ICBpZiAoIGMgKQotICAgIHsKLSAgICAgICAgZnJlZV9jcHVtYXNrX3ZhcihjLT5jcHVfc3VzcGVu ZGVkKTsKICAgICAgICAgZnJlZV9jcHVtYXNrX3ZhcihjLT5jcHVfdmFsaWQpOwotICAgIH0KICAg ICB4ZnJlZShjKTsKIH0KIApAQCAtNDc3LDEwICs0NjgsNiBAQCB2b2lkIGNwdXBvb2xfcm1fZG9t YWluKHN0cnVjdCBkb21haW4gKmQpCiAvKgogICogQ2FsbGVkIHRvIGFkZCBhIGNwdSB0byBhIHBv b2wuIENQVXMgYmVpbmcgaG90LXBsdWdnZWQgYXJlIGFkZGVkIHRvIHBvb2wwLAogICogYXMgdGhl eSBtdXN0IGhhdmUgYmVlbiBpbiB0aGVyZSB3aGVuIHVucGx1Z2dlZC4KLSAqCi0gKiBJZiwgb24g dGhlIG90aGVyIGhhbmQsIHdlIGFyZSBhZGRpbmcgQ1BVcyBiZWNhdXNlIHdlIGFyZSByZXN1bWlu ZyAoZS5nLiwKLSAqIGFmdGVyIEFDUEkgUzMpIHdlIHB1dCB0aGUgY3B1IGJhY2sgaW4gdGhlIHBv b2wgd2hlcmUgaXQgd2FzIGluIHByaW9yIHdoZW4KLSAqIHdlIHN1c3BlbmRlZC4KICAqLwogc3Rh dGljIGludCBjcHVwb29sX2NwdV9hZGQodW5zaWduZWQgaW50IGNwdSkKIHsKQEAgLTQ5MCw0MiAr NDc3LDE1IEBAIHN0YXRpYyBpbnQgY3B1cG9vbF9jcHVfYWRkKHVuc2lnbmVkIGludCBjcHUpCiAg ICAgY3B1bWFza19jbGVhcl9jcHUoY3B1LCAmY3B1cG9vbF9sb2NrZWRfY3B1cyk7CiAgICAgY3B1 bWFza19zZXRfY3B1KGNwdSwgJmNwdXBvb2xfZnJlZV9jcHVzKTsKIAotICAgIGlmICggc3lzdGVt X3N0YXRlID09IFNZU19TVEFURV9zdXNwZW5kIHx8IHN5c3RlbV9zdGF0ZSA9PSBTWVNfU1RBVEVf cmVzdW1lICkKLSAgICB7Ci0gICAgICAgIHN0cnVjdCBjcHVwb29sICoqYzsKLQotICAgICAgICBm b3JfZWFjaF9jcHVwb29sKGMpCi0gICAgICAgIHsKLSAgICAgICAgICAgIGlmICggY3B1bWFza190 ZXN0X2NwdShjcHUsICgqYyktPmNwdV9zdXNwZW5kZWQgKSApCi0gICAgICAgICAgICB7Ci0gICAg ICAgICAgICAgICAgcmV0ID0gY3B1cG9vbF9hc3NpZ25fY3B1X2xvY2tlZCgqYywgY3B1KTsKLSAg ICAgICAgICAgICAgICBpZiAoIHJldCApCi0gICAgICAgICAgICAgICAgICAgIGdvdG8gb3V0Owot ICAgICAgICAgICAgICAgIGNwdW1hc2tfY2xlYXJfY3B1KGNwdSwgKCpjKS0+Y3B1X3N1c3BlbmRl ZCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KKyAg ICAvKgorICAgICAqIElmIHdlIGFyZSBub3QgcmVzdW1pbmcsIHdlIGFyZSBob3QtcGx1Z2dpbmcg Y3B1LCBhbmQgaW4gd2hpY2ggY2FzZQorICAgICAqIHdlIGFkZCBpdCB0byBwb29sMCwgYXMgaXQg Y2VydGFpbmx5IHdhcyB0aGVyZSB3aGVuIGhvdC11bnBsYWdnZWQKKyAgICAgKiAob3IgdW5wbHVn Z2luZyB3b3VsZCBoYXZlIGZhaWxlZCkgYW5kIHRoYXQgaXMgdGhlIGRlZmF1bHQgYmVoYXZpb3IK KyAgICAgKiBhbnl3YXkuCisgICAgICovCisgICAgcGVyX2NwdShjcHVwb29sLCBjcHUpID0gTlVM TDsKKyAgICByZXQgPSBjcHVwb29sX2Fzc2lnbl9jcHVfbG9ja2VkKGNwdXBvb2wwLCBjcHUpOwog Ci0gICAgICAgIC8qCi0gICAgICAgICAqIEVpdGhlciBjcHUgaGFzIGJlZW4gZm91bmQgYXMgc3Vz cGVuZGVkIGluIGEgcG9vbCwgYW5kIGFkZGVkIGJhY2sKLSAgICAgICAgICogdGhlcmUsIG9yIGl0 IHN0YXllZCBmcmVlIChpZiBpdCBkaWQgbm90IGJlbG9uZyB0byBhbnkgcG9vbCB3aGVuCi0gICAg ICAgICAqIHN1c3BlbmRpbmcpLCBhbmQgd2UgZG9uJ3Qgd2FudCB0byBkbyBhbnl0aGluZy4KLSAg ICAgICAgICovCi0gICAgICAgIEFTU0VSVChjcHVtYXNrX3Rlc3RfY3B1KGNwdSwgJmNwdXBvb2xf ZnJlZV9jcHVzKSB8fAotICAgICAgICAgICAgICAgY3B1bWFza190ZXN0X2NwdShjcHUsICgqYykt PmNwdV92YWxpZCkpOwotICAgIH0KLSAgICBlbHNlCi0gICAgewotICAgICAgICAvKgotICAgICAg ICAgKiBJZiB3ZSBhcmUgbm90IHJlc3VtaW5nLCB3ZSBhcmUgaG90LXBsdWdnaW5nIGNwdSwgYW5k IGluIHdoaWNoIGNhc2UKLSAgICAgICAgICogd2UgYWRkIGl0IHRvIHBvb2wwLCBhcyBpdCBjZXJ0 YWlubHkgd2FzIHRoZXJlIHdoZW4gaG90LXVucGxhZ2dlZAotICAgICAgICAgKiAob3IgdW5wbHVn Z2luZyB3b3VsZCBoYXZlIGZhaWxlZCkgYW5kIHRoYXQgaXMgdGhlIGRlZmF1bHQgYmVoYXZpb3IK LSAgICAgICAgICogYW55d2F5LgotICAgICAgICAgKi8KLSAgICAgICAgcGVyX2NwdShjcHVwb29s LCBjcHUpID0gTlVMTDsKLSAgICAgICAgcmV0ID0gY3B1cG9vbF9hc3NpZ25fY3B1X2xvY2tlZChj cHVwb29sMCwgY3B1KTsKLSAgICB9Ci0gb3V0OgogICAgIHNwaW5fdW5sb2NrKCZjcHVwb29sX2xv Y2spOwogCiAgICAgcmV0dXJuIHJldDsKQEAgLTUzNSw0MiArNDk1LDE0IEBAIHN0YXRpYyBpbnQg Y3B1cG9vbF9jcHVfYWRkKHVuc2lnbmVkIGludCBjcHUpCiAgKiBDYWxsZWQgdG8gcmVtb3ZlIGEg Q1BVIGZyb20gYSBwb29sLiBUaGUgQ1BVIGlzIGxvY2tlZCwgdG8gZm9yYmlkIHJlbW92aW5nCiAg KiBpdCBmcm9tIHBvb2wwLiBJbiBmYWN0LCBpZiB3ZSB3YW50IHRvIGhvdC11bnBsdWcgYSBDUFUs IGl0IG11c3QgYmVsb25nIHRvCiAgKiBwb29sMCwgb3Igd2UgZmFpbC4KLSAqCi0gKiBIb3dldmVy LCBpZiB3ZSBhcmUgc3VzcGVuZGluZyAoZS5nLiwgdG8gQUNQSSBTMyksIHdlIG1hcmsgdGhlIENQ VSBpbiBzdWNoCi0gKiBhIHdheSB0aGF0IGl0IGNhbiBiZSBwdXQgYmFjayBpbiBpdHMgcG9vbCB3 aGVuIHJlc3VtaW5nLgogICovCiBzdGF0aWMgaW50IGNwdXBvb2xfY3B1X3JlbW92ZSh1bnNpZ25l ZCBpbnQgY3B1KQogewogICAgIGludCByZXQgPSAtRU5PREVWOwogCiAgICAgc3Bpbl9sb2NrKCZj cHVwb29sX2xvY2spOwotICAgIGlmICggc3lzdGVtX3N0YXRlID09IFNZU19TVEFURV9zdXNwZW5k ICkKLSAgICB7Ci0gICAgICAgIHN0cnVjdCBjcHVwb29sICoqYzsKLQotICAgICAgICBmb3JfZWFj aF9jcHVwb29sKGMpCi0gICAgICAgIHsKLSAgICAgICAgICAgIGlmICggY3B1bWFza190ZXN0X2Nw dShjcHUsICgqYyktPmNwdV92YWxpZCApICkKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAg ICBjcHVtYXNrX3NldF9jcHUoY3B1LCAoKmMpLT5jcHVfc3VzcGVuZGVkKTsKLSAgICAgICAgICAg ICAgICBjcHVtYXNrX2NsZWFyX2NwdShjcHUsICgqYyktPmNwdV92YWxpZCk7Ci0gICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KIAotICAgICAgICAvKgotICAg ICAgICAgKiBFaXRoZXIgd2UgZm91bmQgY3B1IGluIGEgcG9vbCwgb3IgaXQgbXVzdCBiZSBmcmVl IChpZiBpdCBoYXMgYmVlbgotICAgICAgICAgKiBob3QtdW5wbGFnZ2VkLCB0aGVuIHdlIG11c3Qg aGF2ZSBmb3VuZCBpdCBpbiBwb29sMCkuIEl0IGlzLCBvZgotICAgICAgICAgKiBjb3Vyc2UsIGZp bmUgdG8gc3VzcGVuZCBvciBzaHV0ZG93biB3aXRoIENQVXMgbm90IGFzc2lnbmVkIHRvIGEKLSAg ICAgICAgICogcG9vbCwgYW5kIChpbiBjYXNlIG9mIHN1c3BlbmQpIHRoZXkgd2lsbCBzdGF5IGZy ZWUgd2hlbiByZXN1bWluZy4KLSAgICAgICAgICovCi0gICAgICAgIEFTU0VSVChjcHVtYXNrX3Rl c3RfY3B1KGNwdSwgJmNwdXBvb2xfZnJlZV9jcHVzKSB8fAotICAgICAgICAgICAgICAgY3B1bWFz a190ZXN0X2NwdShjcHUsICgqYyktPmNwdV9zdXNwZW5kZWQpKTsKLSAgICAgICAgQVNTRVJUKGNw dW1hc2tfdGVzdF9jcHUoY3B1LCAmY3B1X29ubGluZV9tYXApIHx8Ci0gICAgICAgICAgICAgICBj cHVtYXNrX3Rlc3RfY3B1KGNwdSwgY3B1cG9vbDAtPmNwdV9zdXNwZW5kZWQpKTsKLSAgICAgICAg cmV0ID0gMDsKLSAgICB9Ci0gICAgZWxzZSBpZiAoIGNwdW1hc2tfdGVzdF9jcHUoY3B1LCBjcHVw b29sMC0+Y3B1X3ZhbGlkKSApCisgICAgaWYgKCBjcHVtYXNrX3Rlc3RfY3B1KGNwdSwgY3B1cG9v bDAtPmNwdV92YWxpZCkgKQogICAgIHsKICAgICAgICAgLyoKICAgICAgICAgICogSWYgd2UgYXJl IG5vdCBzdXNwZW5kaW5nLCB3ZSBhcmUgaG90LXVucGx1Z2dpbmcgY3B1LCBhbmQgdGhhdCBpcwpA QCAtNTg3LDYgKzUxOSw0MSBAQCBzdGF0aWMgaW50IGNwdXBvb2xfY3B1X3JlbW92ZSh1bnNpZ25l ZCBpbnQgY3B1KQogICAgIHJldHVybiByZXQ7CiB9CiAKKy8qCisgKiBDYWxsZWQgZHVyaW5nIHJl c3VtZSBmb3IgYWxsIGNwdXMgd2hpY2ggZGlkbid0IGNvbWUgdXAgYWdhaW4uIFRoZSBjcHUgbXVz dAorICogYmUgcmVtb3ZlZCBmcm9tIHRoZSBjcHVwb29sIGl0IGlzIGFzc2lnbmVkIHRvLiBJbiBj YXNlIGEgY3B1cG9vbCB3aWxsIGJlCisgKiBsZWZ0IHdpdGhvdXQgY3B1IHdlIG1vdmUgYWxsIGRv bWFpbnMgb2YgdGhhdCBjcHVwb29sIHRvIGNwdXBvb2wwLgorICovCitzdGF0aWMgdm9pZCBjcHVw b29sX2NwdV9yZW1vdmVfZm9yY2VkKHVuc2lnbmVkIGludCBjcHUpCit7CisgICAgc3RydWN0IGNw dXBvb2wgKipjOworICAgIHN0cnVjdCBkb21haW4gKmQ7CisKKyAgICBzcGluX2xvY2soJmNwdXBv b2xfbG9jayk7CisKKyAgICBpZiAoIGNwdW1hc2tfdGVzdF9jcHUoY3B1LCAmY3B1cG9vbF9mcmVl X2NwdXMpICkKKyAgICAgICAgY3B1bWFza19jbGVhcl9jcHUoY3B1LCAmY3B1cG9vbF9mcmVlX2Nw dXMpOworICAgIGVsc2UKKyAgICB7CisgICAgICAgIGZvcl9lYWNoX2NwdXBvb2woYykKKyAgICAg ICAgeworICAgICAgICAgICAgaWYgKCBjcHVtYXNrX3Rlc3RfY3B1KGNwdSwgKCpjKS0+Y3B1X3Zh bGlkKSApCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgY3B1bWFza19jbGVhcl9jcHUo Y3B1LCAoKmMpLT5jcHVfdmFsaWQpOworICAgICAgICAgICAgICAgIGlmICggY3B1bWFza193ZWln aHQoKCpjKS0+Y3B1X3ZhbGlkKSA9PSAwICkKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAg ICAgICAgICAgIGlmICggKmMgPT0gY3B1cG9vbDAgKQorICAgICAgICAgICAgICAgICAgICAgICAg cGFuaWMoIk5vIGNwdSBsZWZ0IGluIGNwdXBvb2wwXG4iKTsKKyAgICAgICAgICAgICAgICAgICAg Zm9yX2VhY2hfZG9tYWluX2luX2NwdXBvb2woZCwgKmMpCisgICAgICAgICAgICAgICAgICAgICAg ICBjcHVwb29sX21vdmVfZG9tYWluX2xvY2tlZChkLCBjcHVwb29sMCk7CisgICAgICAgICAgICAg ICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorCisgICAgc3Bpbl91bmxvY2so JmNwdXBvb2xfbG9jayk7Cit9CisKIC8qCiAgKiBkbyBjcHVwb29sIHJlbGF0ZWQgc3lzY3RsIG9w ZXJhdGlvbnMKICAqLwpAQCAtNzc0LDEwICs3NDEsMTUgQEAgc3RhdGljIGludCBjcHVfY2FsbGJh Y2soCiAgICAgewogICAgIGNhc2UgQ1BVX0RPV05fRkFJTEVEOgogICAgIGNhc2UgQ1BVX09OTElO RToKLSAgICAgICAgcmMgPSBjcHVwb29sX2NwdV9hZGQoY3B1KTsKKyAgICAgICAgaWYgKCBzeXN0 ZW1fc3RhdGUgPD0gU1lTX1NUQVRFX2FjdGl2ZSApCisgICAgICAgICAgICByYyA9IGNwdXBvb2xf Y3B1X2FkZChjcHUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIENQVV9ET1dOX1BSRVBBUkU6 Ci0gICAgICAgIHJjID0gY3B1cG9vbF9jcHVfcmVtb3ZlKGNwdSk7CisgICAgICAgIGlmICggc3lz dGVtX3N0YXRlIDw9IFNZU19TVEFURV9hY3RpdmUgKQorICAgICAgICAgICAgcmMgPSBjcHVwb29s X2NwdV9yZW1vdmUoY3B1KTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDUFVfUkVTVU1FX0ZB SUxFRDoKKyAgICAgICAgY3B1cG9vbF9jcHVfcmVtb3ZlX2ZvcmNlZChjcHUpOwogICAgICAgICBi cmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL3hlbi9pbmNs dWRlL3hlbi9zY2hlZC1pZi5oIGIveGVuL2luY2x1ZGUveGVuL3NjaGVkLWlmLmgKaW5kZXggOTU5 NmVhZTFlMi4uOTJiYzdhMDM2NSAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUveGVuL3NjaGVkLWlm LmgKKysrIGIveGVuL2luY2x1ZGUveGVuL3NjaGVkLWlmLmgKQEAgLTIxNCw3ICsyMTQsNiBAQCBz dHJ1Y3QgY3B1cG9vbAogewogICAgIGludCAgICAgICAgICAgICAgY3B1cG9vbF9pZDsKICAgICBj cHVtYXNrX3Zhcl90ICAgIGNwdV92YWxpZDsgICAgICAvKiBhbGwgY3B1cyBhc3NpZ25lZCB0byBw b29sICovCi0gICAgY3B1bWFza192YXJfdCAgICBjcHVfc3VzcGVuZGVkOyAgLyogY3B1cyBpbiBT MyB0aGF0IHNob3VsZCBiZSBpbiB0aGlzIHBvb2wgKi8KICAgICBzdHJ1Y3QgY3B1cG9vbCAgICpu ZXh0OwogICAgIHVuc2lnbmVkIGludCAgICAgbl9kb207CiAgICAgc3RydWN0IHNjaGVkdWxlciAq c2NoZWQ7Ci0tIAoyLjE2LjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9q ZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVu LWRldmVs