From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Dan Magenheimer" Subject: RE: [PATCH] clocksource=tsc Date: Tue, 15 Jul 2008 19:15:45 -0600 Message-ID: <20080715191545843.00000080236@djm-pc> References: <20080715100403015.00000080236@djm-pc> Reply-To: "dan.magenheimer@oracle.com" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=-------ec23105ec23105 Return-path: In-Reply-To: <20080715100403015.00000080236@djm-pc> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "dan.magenheimer@oracle.com" , Keir Fraser , "Xen-Devel (E-mail)" Cc: Dave Winchell List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format ---------ec23105ec23105 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable > > > Returning to 32-bit read_counter(), and having NULL = > > read_counter when > > > clocksource=3Dtsc would be another possibility... Well I hacked on 18055 for awhile and just couldn't get it to boot. I think local_time_calibration() (and thus init_percpu_time()) is necessary for boot, though I'm not really sure why. Possibly the "Weirdness can happen..." comment in that routine? Anyway, this patch (on top of 18055) DOES work, returns to the 32-bit read_counter, and re-enables local_time_calibration(). I'd suggest putting off more major surgery for another day. Thanks, Dan > -----Original Message----- > From: Dan Magenheimer [mailto:dan.magenheimer@oracle.com] > Sent: Tuesday, July 15, 2008 10:04 AM > To: dan.magenheimer@oracle.com; Keir Fraser; Xen-Devel (E-mail) > Cc: Dave Winchell > Subject: RE: [PATCH] clocksource=3Dtsc > = > = > Hmmm... 18055 also fails to boot on my machine. > = > Could we perhaps fall back to my original patch and do > cleanup later/separately? I also want to try implementing > an hpet64-based get_s_time() so will be working more > in this code later... but want to get clocksource=3Dtsc > working now with minimal code impact given the freeze. > = > > -----Original Message----- > > From: Dan Magenheimer [mailto:dan.magenheimer@oracle.com] > > Sent: Tuesday, July 15, 2008 9:46 AM > > To: 'Keir Fraser'; 'Xen-Devel (E-mail)' > > Cc: 'Dave Winchell' > > Subject: RE: [PATCH] clocksource=3Dtsc > > = > > > Actually in this mode of operation we hardly need a platform = > > > timer *at all*. > > > The idea is that we let the TSCs free-run, because we know = > > > they will behave. > > > Returning to 32-bit read_counter(), and having NULL = > > read_counter when > > > clocksource=3Dtsc would be another possibility... > > = > > That's essentially what the original tscstable.patch did, though > > I was perhaps much uglier in the miscellaneous parts. > > = > > Thanks, > > Dan > > > = > ---------ec23105ec23105 Content-Type: application/octet-stream; name="tscstable6.patch" Content-Disposition: attachment; filename="tscstable6.patch" Content-Transfer-Encoding: base64 ZGlmZiAtciA2NzVmYjAzMWRmODggeGVuL2FyY2gveDg2L3RpbWUuYwotLS0gYS94ZW4vYXJj aC94ODYvdGltZS5jCVR1ZSBKdWwgMTUgMTY6MTM6NDYgMjAwOCArMDEwMAorKysgYi94ZW4v YXJjaC94ODYvdGltZS5jCVR1ZSBKdWwgMTUgMTk6MTQ6MTYgMjAwOCAtMDYwMApAQCAtNTQs MTQgKzU0LDE0IEBAIHN0cnVjdCBjcHVfdGltZSB7CiAgICAgc190aW1lX3Qgc3RpbWVfbG9j YWxfc3RhbXA7CiAgICAgc190aW1lX3Qgc3RpbWVfbWFzdGVyX3N0YW1wOwogICAgIHN0cnVj dCB0aW1lX3NjYWxlIHRzY19zY2FsZTsKLSAgICB1NjQgY3N0YXRlX3BsdF9jb3VudF9zdGFt cDsKKyAgICB1MzIgY3N0YXRlX3BsdF9jb3VudF9zdGFtcDsKICAgICBzdHJ1Y3QgdGltZXIg Y2FsaWJyYXRpb25fdGltZXI7CiB9OwogCiBzdHJ1Y3QgcGxhdGZvcm1fdGltZXNvdXJjZSB7 CiAgICAgY2hhciAqbmFtZTsKICAgICB1NjQgZnJlcXVlbmN5OwotICAgIHU2NCAoKnJlYWRf Y291bnRlcikodm9pZCk7CisgICAgdTMyICgqcmVhZF9jb3VudGVyKSh2b2lkKTsKICAgICBp bnQgY291bnRlcl9iaXRzOwogfTsKIApAQCAtMzQwLDcgKzM0MCw3IEBAIHN0YXRpYyBjaGFy ICpmcmVxX3N0cmluZyh1NjQgZnJlcSkKICAqIFBMQVRGT1JNIFRJTUVSIDE6IFBST0dSQU1N QUJMRSBJTlRFUlZBTCBUSU1FUiAoTEVHQUNZIFBJVCkKICAqLwogCi1zdGF0aWMgdTY0IHJl YWRfcGl0X2NvdW50KHZvaWQpCitzdGF0aWMgdTMyIHJlYWRfcGl0X2NvdW50KHZvaWQpCiB7 CiAgICAgdTE2IGNvdW50MTY7CiAgICAgdTMyIGNvdW50MzI7CkBAIC0zNzIsNyArMzcyLDcg QEAgc3RhdGljIHZvaWQgaW5pdF9waXQoc3RydWN0IHBsYXRmb3JtX3RpbQogICogUExBVEZP Uk0gVElNRVIgMjogSElHSCBQUkVDSVNJT04gRVZFTlQgVElNRVIgKEhQRVQpCiAgKi8KIAot c3RhdGljIHU2NCByZWFkX2hwZXRfY291bnQodm9pZCkKK3N0YXRpYyB1MzIgcmVhZF9ocGV0 X2NvdW50KHZvaWQpCiB7CiAgICAgcmV0dXJuIGhwZXRfcmVhZDMyKEhQRVRfQ09VTlRFUik7 CiB9CkBAIC00MTIsNyArNDEyLDcgQEAgaW50IHVzZV9jeWNsb25lOwogLyogQ3ljbG9uZSBN UE1DMCByZWdpc3Rlci4gKi8KIHN0YXRpYyB2b2xhdGlsZSB1MzIgKmN5Y2xvbmVfdGltZXI7 CiAKLXN0YXRpYyB1NjQgcmVhZF9jeWNsb25lX2NvdW50KHZvaWQpCitzdGF0aWMgdTMyIHJl YWRfY3ljbG9uZV9jb3VudCh2b2lkKQogewogICAgIHJldHVybiAqY3ljbG9uZV90aW1lcjsK IH0KQEAgLTQ2Miw3ICs0NjIsNyBAQCB1MzIgcG10bXJfaW9wb3J0OwogLyogQUNQSSBQTSB0 aW1lciB0aWNrcyBhdCAzLjU3OTU0NSBNSHouICovCiAjZGVmaW5lIEFDUElfUE1fRlJFUVVF TkNZIDM1Nzk1NDUKIAotc3RhdGljIHU2NCByZWFkX3BtdGltZXJfY291bnQodm9pZCkKK3N0 YXRpYyB1MzIgcmVhZF9wbXRpbWVyX2NvdW50KHZvaWQpCiB7CiAgICAgcmV0dXJuIGlubChw bXRtcl9pb3BvcnQpOwogfQpAQCAtNDg0LDIyICs0ODQsMTUgQEAgc3RhdGljIGludCBpbml0 X3BtdGltZXIoc3RydWN0IHBsYXRmb3JtXwogICogUExBVEZPUk0gVElNRVIgNTogVFNDCiAg Ki8KIAotI2RlZmluZSBwbGF0Zm9ybV90aW1lcl9pc190c2MoKSAoIXN0cmNtcChwbHRfc3Jj Lm5hbWUsICJUU0MiKSkKKyNkZWZpbmUgcGxhdGZvcm1fdGltZXJfaXNfdHNjKCkgKHBsdF9z cmMuY291bnRlcl9iaXRzID09IDY0KQogc3RhdGljIHU2NCB0c2NfZnJlcTsKLQotc3RhdGlj IHU2NCByZWFkX3RzY19jb3VudCh2b2lkKQotewotICAgIHU2NCB0c2M7Ci0gICAgcmR0c2Ns bCh0c2MpOwotICAgIHJldHVybiB0c2M7Ci19CiAKIHN0YXRpYyBpbnQgaW5pdF90c2N0aW1l cihzdHJ1Y3QgcGxhdGZvcm1fdGltZXNvdXJjZSAqcHRzKQogewogICAgIC8qIFRPRE86IGV2 YWx1YXRlIHN0YWJpbGl0eSBvZiBUU0MgaGVyZSwgcmV0dXJuIDAgaWYgbm90IHN0YWJsZS4g Ki8KICAgICBwdHMtPm5hbWUgPSAiVFNDIjsKICAgICBwdHMtPmZyZXF1ZW5jeSA9IHRzY19m cmVxOwotICAgIHB0cy0+cmVhZF9jb3VudGVyID0gcmVhZF90c2NfY291bnQ7CisgICAgcHRz LT5yZWFkX2NvdW50ZXIgPSAwOyAgLyogdW51c2VkIGFzIG9mIG5vdyAqLwogICAgIHB0cy0+ Y291bnRlcl9iaXRzID0gNjQ7CiAgICAgcmV0dXJuIDE7CiB9CkBAIC01MTgsMTMgKzUxMSwx NCBAQCBzdGF0aWMgc190aW1lX3Qgc3RpbWVfcGxhdGZvcm1fc3RhbXA7IC8qCiBzdGF0aWMg c190aW1lX3Qgc3RpbWVfcGxhdGZvcm1fc3RhbXA7IC8qIFN5c3RlbSB0aW1lIGF0IGJlbG93 IHBsYXRmb3JtIHRpbWUgKi8KIHN0YXRpYyB1NjQgcGxhdGZvcm1fdGltZXJfc3RhbXA7ICAg ICAgLyogUGxhdGZvcm0gdGltZSBhdCBhYm92ZSBzeXN0ZW0gdGltZSAqLwogc3RhdGljIHU2 NCBwbHRfc3RhbXA2NDsgICAgICAgICAgLyogNjQtYml0IHBsYXRmb3JtIGNvdW50ZXIgc3Rh bXAgICAgICAgICAgICovCi1zdGF0aWMgdTY0IHBsdF9zdGFtcDsgICAgICAgICAgICAvKiBo YXJkd2FyZS13aWR0aCBwbGF0Zm9ybSBjb3VudGVyIHN0YW1wICAgKi8KK3N0YXRpYyB1MzIg cGx0X3N0YW1wOyAgICAgICAgICAgIC8qIGhhcmR3YXJlLXdpZHRoIHBsYXRmb3JtIGNvdW50 ZXIgc3RhbXAgICAqLwogc3RhdGljIHN0cnVjdCB0aW1lciBwbHRfb3ZlcmZsb3dfdGltZXI7 CiAKIHN0YXRpYyB2b2lkIHBsdF9vdmVyZmxvdyh2b2lkICp1bnVzZWQpCiB7Ci0gICAgdTY0 IGNvdW50OworICAgIHUzMiBjb3VudDsKIAorICAgIEFTU0VSVChwbHRfc3JjLmNvdW50ZXJf Yml0cyAhPSA2NCk7CiAgICAgc3Bpbl9sb2NrKCZwbGF0Zm9ybV90aW1lcl9sb2NrKTsKICAg ICBjb3VudCA9IHBsdF9zcmMucmVhZF9jb3VudGVyKCk7CiAgICAgcGx0X3N0YW1wNjQgKz0g KGNvdW50IC0gcGx0X3N0YW1wKSAmIHBsdF9tYXNrOwpAQCAtNTM2LDE2ICs1MzAsMjggQEAg c3RhdGljIHZvaWQgcGx0X292ZXJmbG93KHZvaWQgKnVudXNlZCkKIAogc3RhdGljIHNfdGlt ZV90IF9fcmVhZF9wbGF0Zm9ybV9zdGltZSh1NjQgcGxhdGZvcm1fdGltZSkKIHsKLSAgICB1 NjQgZGlmZiA9IHBsYXRmb3JtX3RpbWUgLSBwbGF0Zm9ybV90aW1lcl9zdGFtcDsKKyAgICB1 NjQgZGlmZiwgdHNjOworCisgICAgaWYgKCBwbGF0Zm9ybV90aW1lcl9pc190c2MoKSApCisg ICAgeworICAgICAgICByZHRzY2xsKHRzYyk7CisgICAgICAgIHJldHVybiBzY2FsZV9kZWx0 YSh0c2MsICZwbHRfc2NhbGUpOworICAgIH0KKyAgICBkaWZmID0gcGxhdGZvcm1fdGltZSAt IHBsYXRmb3JtX3RpbWVyX3N0YW1wOwogICAgIEFTU0VSVChzcGluX2lzX2xvY2tlZCgmcGxh dGZvcm1fdGltZXJfbG9jaykpOwogICAgIHJldHVybiAoc3RpbWVfcGxhdGZvcm1fc3RhbXAg KyBzY2FsZV9kZWx0YShkaWZmLCAmcGx0X3NjYWxlKSk7CiB9CiAKIHN0YXRpYyBzX3RpbWVf dCByZWFkX3BsYXRmb3JtX3N0aW1lKHZvaWQpCiB7Ci0gICAgdTY0IGNvdW50OworICAgIHU2 NCBjb3VudCwgdHNjOwogICAgIHNfdGltZV90IHN0aW1lOwogCisgICAgaWYgKCBwbGF0Zm9y bV90aW1lcl9pc190c2MoKSApCisgICAgeworICAgICAgICByZHRzY2xsKHRzYyk7CisgICAg ICAgIHJldHVybiBzY2FsZV9kZWx0YSh0c2MsICZwbHRfc2NhbGUpOworICAgIH0KICAgICBz cGluX2xvY2soJnBsYXRmb3JtX3RpbWVyX2xvY2spOwogICAgIGNvdW50ID0gcGx0X3N0YW1w NjQgKyAoKHBsdF9zcmMucmVhZF9jb3VudGVyKCkgLSBwbHRfc3RhbXApICYgcGx0X21hc2sp OwogICAgIHN0aW1lID0gX19yZWFkX3BsYXRmb3JtX3N0aW1lKGNvdW50KTsKQEAgLTU1OSw2 ICs1NjUsOCBAQCBzdGF0aWMgdm9pZCBwbGF0Zm9ybV90aW1lX2NhbGlicmF0aW9uKHZvCiAg ICAgdTY0IGNvdW50OwogICAgIHNfdGltZV90IHN0YW1wOwogCisgICAgaWYgKCBwbGF0Zm9y bV90aW1lcl9pc190c2MoKSApCisgICAgICAgIHJldHVybjsKICAgICBzcGluX2xvY2soJnBs YXRmb3JtX3RpbWVyX2xvY2spOwogICAgIGNvdW50ID0gcGx0X3N0YW1wNjQgKyAoKHBsdF9z cmMucmVhZF9jb3VudGVyKCkgLSBwbHRfc3RhbXApICYgcGx0X21hc2spOwogICAgIHN0YW1w ID0gX19yZWFkX3BsYXRmb3JtX3N0aW1lKGNvdW50KTsKQEAgLTU2OSw2ICs1NzcsOCBAQCBz dGF0aWMgdm9pZCBwbGF0Zm9ybV90aW1lX2NhbGlicmF0aW9uKHZvCiAKIHN0YXRpYyB2b2lk IHJlc3VtZV9wbGF0Zm9ybV90aW1lcih2b2lkKQogeworICAgIGlmICggcGxhdGZvcm1fdGlt ZXJfaXNfdHNjKCkgKQorICAgICAgICByZXR1cm47CiAgICAgLyogTm8gY2hhbmdlIGluIHBs YXRmb3JtX3N0aW1lIGFjcm9zcyBzdXNwZW5kL3Jlc3VtZS4gKi8KICAgICBwbGF0Zm9ybV90 aW1lcl9zdGFtcCA9IHBsdF9zdGFtcDY0OwogICAgIHBsdF9zdGFtcCA9IHBsdF9zcmMucmVh ZF9jb3VudGVyKCk7CkBAIC02MDQsMTYgKzYxNCwyMCBAQCBzdGF0aWMgdm9pZCBpbml0X3Bs YXRmb3JtX3RpbWVyKHZvaWQpCiAgICAgICAgICAhaW5pdF9wbXRpbWVyKHB0cykgKQogICAg ICAgICBpbml0X3BpdChwdHMpOwogCi0gICAgcGx0X21hc2sgPSAodTY0KX4wdWxsID4+ICg2 NCAtIHB0cy0+Y291bnRlcl9iaXRzKTsKLQogICAgIHNldF90aW1lX3NjYWxlKCZwbHRfc2Nh bGUsIHB0cy0+ZnJlcXVlbmN5KTsKIAotICAgIHBsdF9vdmVyZmxvd19wZXJpb2QgPSBzY2Fs ZV9kZWx0YSgKLSAgICAgICAgMXVsbCA8PCAocHRzLT5jb3VudGVyX2JpdHMtMSksICZwbHRf c2NhbGUpOwotICAgIGluaXRfdGltZXIoJnBsdF9vdmVyZmxvd190aW1lciwgcGx0X292ZXJm bG93LCBOVUxMLCAwKTsKLSAgICBwbHRfb3ZlcmZsb3coTlVMTCk7CisgICAgaWYgKCAhcGxh dGZvcm1fdGltZXJfaXNfdHNjKCkgKQorICAgIHsKKyAgICAgICAgcGx0X21hc2sgPSAodTMy KX4wdSA+PiAoMzIgLSBwdHMtPmNvdW50ZXJfYml0cyk7CiAKLSAgICBwbGF0Zm9ybV90aW1l cl9zdGFtcCA9IHBsdF9zdGFtcDY0OworICAgICAgICBwbHRfb3ZlcmZsb3dfcGVyaW9kID0g c2NhbGVfZGVsdGEoCisgICAgICAgICAgICAxdWxsIDw8IChwdHMtPmNvdW50ZXJfYml0cy0x KSwgJnBsdF9zY2FsZSk7CisgICAgICAgIGluaXRfdGltZXIoJnBsdF9vdmVyZmxvd190aW1l ciwgcGx0X292ZXJmbG93LCBOVUxMLCAwKTsKKyAgICAgICAgcGx0X292ZXJmbG93KE5VTEwp OworCisgICAgICAgIHBsYXRmb3JtX3RpbWVyX3N0YW1wID0gcGx0X3N0YW1wNjQ7CisgICAg fQorCiAKICAgICBwcmludGsoIlBsYXRmb3JtIHRpbWVyIGlzICVzICVzXG4iLAogICAgICAg ICAgICBmcmVxX3N0cmluZyhwdHMtPmZyZXF1ZW5jeSksIHB0cy0+bmFtZSk7CkBAIC02MzMs OSArNjQ3LDEwIEBAIHZvaWQgY3N0YXRlX3Jlc3RvcmVfdHNjKHZvaWQpCiB2b2lkIGNzdGF0 ZV9yZXN0b3JlX3RzYyh2b2lkKQogewogICAgIHN0cnVjdCBjcHVfdGltZSAqdCA9ICZ0aGlz X2NwdShjcHVfdGltZSk7Ci0gICAgdTY0IHBsdF9jb3VudF9kZWx0YSwgdHNjX2RlbHRhOwor ICAgIHUzMiAgICBwbHRfY291bnRfZGVsdGE7CisgICAgdTY0ICAgIHRzY19kZWx0YTsKIAot ICAgIGlmICggdHNjX2ludmFyaWFudCApCisgICAgaWYgKCB0c2NfaW52YXJpYW50IHx8IHBs YXRmb3JtX3RpbWVyX2lzX3RzYygpICkKICAgICAgICAgcmV0dXJuOwogCiAgICAgcGx0X2Nv dW50X2RlbHRhID0gKHBsdF9zcmMucmVhZF9jb3VudGVyKCkgLQpAQCAtNzM2LDE0ICs3NTEs MTggQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcgZ2V0X2Ntb3NfdGltZSh2b2lkKQogCiBzX3Rp bWVfdCBnZXRfc190aW1lKHZvaWQpCiB7Ci0gICAgc3RydWN0IGNwdV90aW1lICp0ID0gJnRo aXNfY3B1KGNwdV90aW1lKTsKKyAgICBzdHJ1Y3QgY3B1X3RpbWUgKnQ7CiAgICAgdTY0IHRz YywgZGVsdGE7CiAgICAgc190aW1lX3Qgbm93OwogCiAgICAgcmR0c2NsbCh0c2MpOwotICAg IGRlbHRhID0gdHNjIC0gdC0+bG9jYWxfdHNjX3N0YW1wOwotICAgIG5vdyA9IHQtPnN0aW1l X2xvY2FsX3N0YW1wICsgc2NhbGVfZGVsdGEoZGVsdGEsICZ0LT50c2Nfc2NhbGUpOwotCisg ICAgaWYgKCBwbGF0Zm9ybV90aW1lcl9pc190c2MoKSApCisgICAgICAgIG5vdyA9IHNjYWxl X2RlbHRhKHRzYywgJnBsdF9zY2FsZSk7CisgICAgZWxzZSB7CisgICAgICAgIHQgPSAmdGhp c19jcHUoY3B1X3RpbWUpOworICAgICAgICBkZWx0YSA9IHRzYyAtIHQtPmxvY2FsX3RzY19z dGFtcDsKKyAgICAgICAgbm93ID0gdC0+c3RpbWVfbG9jYWxfc3RhbXAgKyBzY2FsZV9kZWx0 YShkZWx0YSwgJnQtPnRzY19zY2FsZSk7CisgICAgfQogICAgIHJldHVybiBub3c7CiB9CiAK QEAgLTEwMDgsMTIgKzEwMjcsOSBAQCB2b2lkIGluaXRfcGVyY3B1X3RpbWUodm9pZCkKICAg ICB1bnNpZ25lZCBsb25nIGZsYWdzOwogICAgIHNfdGltZV90IG5vdzsKIAotICAgIGlmICgg cGxhdGZvcm1fdGltZXJfaXNfdHNjKCkgKQotICAgICAgICByZXR1cm47Ci0KICAgICBsb2Nh bF9pcnFfc2F2ZShmbGFncyk7CiAgICAgcmR0c2NsbCh0LT5sb2NhbF90c2Nfc3RhbXApOwot ICAgIG5vdyA9IHJlYWRfcGxhdGZvcm1fc3RpbWUoKTsKKyAgICBub3cgPSAhcGx0X3NyYy5y ZWFkX2NvdW50ZXIgPyAwIDogcmVhZF9wbGF0Zm9ybV9zdGltZSgpOwogICAgIGxvY2FsX2ly cV9yZXN0b3JlKGZsYWdzKTsKIAogICAgIHQtPnN0aW1lX21hc3Rlcl9zdGFtcCA9IG5vdzsK QEAgLTEwMzEsMTAgKzEwNDcsMTAgQEAgaW50IF9faW5pdCBpbml0X3hlbl90aW1lKHZvaWQp CiAKICAgICBsb2NhbF9pcnFfZGlzYWJsZSgpOwogCisgICAgaW5pdF9wZXJjcHVfdGltZSgp OworCiAgICAgc3RpbWVfcGxhdGZvcm1fc3RhbXAgPSAwOwogICAgIGluaXRfcGxhdGZvcm1f dGltZXIoKTsKLQotICAgIGluaXRfcGVyY3B1X3RpbWUoKTsKIAogICAgIC8qIGNoZWNrIGlm IFRTQyBpcyBpbnZhcmlhbnQgZHVyaW5nIGRlZXAgQyBzdGF0ZQogICAgICAgIHRoaXMgaXMg YSBuZXcgZmVhdHVyZSBpbnRyb2R1Y2VkIGJ5IE5laGFsZW0qLwo= ---------ec23105ec23105 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel ---------ec23105ec23105--