From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 82615 invoked by alias); 20 Mar 2018 14:28:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 82605 invoked by uid 89); 20 Mar 2018 14:28:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_ASCII_DIVIDERS,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=Alves, alves, HTo:U*palves X-HELO: smtp.eu.adacore.com Received: from mel.act-europe.fr (HELO smtp.eu.adacore.com) (194.98.77.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 20 Mar 2018 14:28:29 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 5D04081386; Tue, 20 Mar 2018 15:28:26 +0100 (CET) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F_s_T03nVJRJ; Tue, 20 Mar 2018 15:28:26 +0100 (CET) Received: from Xaviers-MacBook-Pro.local (unknown [10.10.8.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id 813DF8138F; Tue, 20 Mar 2018 15:28:25 +0100 (CET) Subject: [RFA v2] (x86) Fix watchpoint using hardware breakpoint for some distro To: Pedro Alves , gdb-patches@sourceware.org Cc: brobecker@adacore.com References: <1521209212-11264-1-git-send-email-roirand@adacore.com> From: Xavier Roirand Message-ID: <9c7c8586-2940-bea9-d3fb-a13b0d38a32e@adacore.com> Date: Tue, 20 Mar 2018 14:28:00 -0000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------A60F7FB32075F4E3135482DB" X-IsSubscribed: yes X-SW-Source: 2018-03/txt/msg00377.txt.bz2 This is a multi-part message in MIME format. --------------A60F7FB32075F4E3135482DB Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-length: 1663 Hello Pedro, I've replied to your comments and attached a v2 patch. Le 3/19/18 à 3:28 PM, Pedro Alves a écrit : > A few things are missing here: > > #1 - kernel versions where this was observed. > CentOS: 2.6.18-419.el5 Suse: 2.6.27.19-5-pae > #2 - If it's not equal to TRAP_HWBKPT, then what's it equal to? > I assume zero? No, it's equal to 1. > Take a look at the big comment and table in nat/linux-ptrace.h -- is > this is the only case that is different on these kernels? > AFAIK, yes. > I think that we should update the table a bit here, at least > something like: > > - | hardware breakpoints/watchpoints | TRAP_HWBKPT | > + | hardware breakpoints/watchpoints | TRAP_HWBKPT (*) | > > (*) - Kernels x.y.z (CentOS 5, Suse 11) leave this as zero > If other cases are different, then that might affect how to best > address this. > Agree. > This comment only makes complete sense with the context in the > git log in mind: > > - This code is run by all architectures, so the comment should mention x86. > - The comment reads a bit backwards to me -- talks about what it should > be before talking about watchpoints. > > I'd suggest something like this: > > /* On some kernels (such as x86-64 x.y.z/CentOS 5, x.y.z/Suse 11), > when we continue into a watchpoint, si_code indicates 0 instead of > TRAP_HWBKPT so we need to check debug registers separately. */ > Agree. > Does the step-into-watchpoint case result in TRAP_TRACE, or does > that result in 0 too? That affects the "continue" in the comment above. This results to a value of 1 too. > Thanks, > Pedro Alves > Regards --------------A60F7FB32075F4E3135482DB Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="0001-x86-Fix-watchpoint-using-hardware-breakpoint-for-som.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-x86-Fix-watchpoint-using-hardware-breakpoint-for-som.pa"; filename*1="tch" Content-length: 7422 RnJvbSA5OTU2NjJhNGZmZDU5MDE1MTEwNTNjMjI4ZTRhZDZiMzk2ZGU5MTk3 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBYYXZpZXIgUm9pcmFu ZCA8cm9pcmFuZEBhZGFjb3JlLmNvbT4KRGF0ZTogVHVlLCAxMyBNYXIgMjAx OCAwMzo1MjoxNCArMDEwMApTdWJqZWN0OiBbUEFUQ0hdICh4ODYpIEZpeCB3 YXRjaHBvaW50IHVzaW5nIGhhcmR3YXJlIGJyZWFrcG9pbnQgZm9yIHNvbWUK IGRpc3RybwoKUnVubmluZyB3YXRjaCouZXhwIHRlc3RzIGluIGdkYi5iYXNl IHNob3dzIHRoaXM6CgpvbiB4ODZfNjQvVWJ1bnR1IDE2LjA0OgoKICMgb2Yg ZXhwZWN0ZWQgcGFzc2VzICAgICAgICAgICAgMjYzMQogIyBvZiB1bmV4cGVj dGVkIGZhaWx1cmVzICAgICAgICAwCgpvbiB4ODZfNjQvVWJ1bnR1IENlbnRP UyA1LjExOgoKICMgb2YgZXhwZWN0ZWQgcGFzc2VzICAgICAgICAgICAgMjUz NQogIyBvZiB1bmV4cGVjdGVkIGZhaWx1cmVzICAgICAgICA5NgoKVGhlIHBy b2JsZW0gY2FuIGJlIGVhc2lseSBzaG93biBpbiBhIGRlYnVnIHNlc3Npb246 CgooZ2RiKSB3YXRjaCB2YWwKSGFyZHdhcmUgd2F0Y2hwb2ludCAyOiB2YWwK KGdkYikgYwpDb250aW51aW5nLgpQcm9ncmFtIHJlY2VpdmVkIHNpZ25hbCBT SUdUUkFQLCBUcmFjZS9icmVha3BvaW50IHRyYXAuCi4uLgoKV2hlcmVhcyBp dCBzaG91bGQgYmU6CgooZ2RiKSB3YXRjaCB2YWwKSGFyZHdhcmUgd2F0Y2hw b2ludCAyOiB2YWwKKGdkYikgYwpDb250aW51aW5nLgp2YWwgYmVmb3JlIGNo YW5nZSA9IDAKCkhhcmR3YXJlIHdhdGNocG9pbnQgMjogdmFsCgpPbGQgdmFs dWUgPSAuLi4KTmV3IHZhbHVlID0gLi4uCgpUaGUgTGludXggdGFyZ2V0IGFu ZCBnZGJzZXJ2ZXIgbm93IGNoZWNrIHRoZSBzaWdpbmZvIHNpX2NvZGUKcmVw b3J0ZWQgb24gYSBTSUdUUkFQIHRvIGRldGVjdCB3aGV0aGVyIHRoZSB0cmFw IGluZGljYXRlcwphIGhhcmR3YXJlIGJyZWFrcG9pbnQgd2FzIGhpdC4KClVu Zm9ydHVuYXRlbHksIG9uIHNvbWUgZGlzdHJvIChDZW50T1MgNSwgU3VzZSAx MSkgdGhlIHJldHVybmVkCnNpX2NvZGUgdmFsdWUgaXMgbm90IGVxdWFsIHRv IFRSQVBfSFdCS1BUIHdoZW4gYSBoYXJkd2FyZSBicmVha3BvaW50CmlzIGhp dCB0aHVzIHRoZSBoYXJkd2FyZSBicmVha3BvaW50IGlzIG5vdCBoYW5kbGVk IGFzIGl0IHNob3VsZApiZSwgd2hpY2ggaXMgYWxzbyB0aGUgY2FzZSBmb3Ig d2F0Y2hwb2ludCB3aGVuIGJhc2VkIG9uIGhhcmR3YXJlCmJyZWFrcG9pbnQu CgpUaGlzIHBhdGNoIGFkZHMgYW4gYWRkaXRpb25hbCBjaGVjayB3aGVuIHRo ZSBpbmZlcmlvciByZXBvcnRlZAphIFNJR1RSQVAgaW4gb3JkZXIgdG8gZGV0 ZWN0IHRoaXMgY2FzZS4KCk5vIHRlc3QgaGF2ZSBiZWVuIGNyZWF0ZWQgc2lu Y2UgYWxsIHRoZSBleGlzdGluZyBvbmVzIGFyZSBlbm91Z2gKdG8gdmFsaWRh dGUgdGhlIGZpeC4gQlRXLCB3aXRoIHRoaXMgZml4LCB0aGUgdGVzdHMgcmVz dWx0cyBmb3IKdGhlIHdhdGNocG9pbnQgdGVzdHMgYXJlIChmb3IgQ2VudE9T IDUuMTEpOgoKICMgb2YgZXhwZWN0ZWQgcGFzc2VzICAgICAgICAgICAgMjYz MAogIyBvZiB1bmV4cGVjdGVkIGZhaWx1cmVzICAgICAgICAxCgpUaGUgcmVt YWluaW5nIGZhaWx1cmUgaXMgbG9jYXRlZCBpbiB3YXRjaC12Zm9yayB0ZXN0 IHdoaWNoIGV4cGxpY2l0bHkKZGlzYWJsZSB0aGUgdXNlIG9mIGhhcmR3YXJl IGJyZWFrcG9pbnQgd2hpY2ggaXMgb3V0IG9mIHNjb3BlIGhlcmUuCgpnZGIv Q2hhbmdlTG9nOgoKICAgICAgICAqIGxpbnV4LW5hdC5jIChzYXZlX3N0b3Bf cmVhc29uKTogQWRkIGFuIGFkZGl0aW9uYWwgY2hlY2sKICAgICAgICB0byBk ZXRlY3QgaGFyZHdhcmUgd2F0Y2hwb2ludC4KCm5hdC9DaGFuZ2VMb2c6CiAg ICAgICAgKiBsaW51eC1wdHJhY2UuaDogVXBkYXRlIGNvbW1lbnQgYmVmb3Jl IEdEQl9BUkNIX0lTX1RSQVBfWFgKICAgICAgICBtYWNyb3MgdG8gcmVmbGVj dCBDZW50T1MgNSAmIFN1c2UgMTEgc3BlY2lmaWMgY2FzZS4KCmdkYnNlcnZl ci9DaGFuZ2VMb2c6CgogICAgICAgICogbGludXgtbG93LmMgKHNhdmVfc3Rv cF9yZWFzb24pOiBBZGQgYW4gYWRkaXRpb25hbCBjaGVjawogICAgICAgIHRv IGRldGVjdCBoYXJkd2FyZSB3YXRjaHBvaW50LgoKRm9yIFIzMDktMDA0CgpU ZXN0OiB4ODZfNjQvZ2RiICAgICAgL3VidW50dSAxNi4wNAogICAgICB4ODZf NjQvZ2Ric2VydmVyL3VidW50dSAxNi4wNAogICAgICB4ODYgICAvZ2RicyAg ICAgL3VidW50dSAxNi4wNAogICAgICB4ODYgICAvZ2Ric2VydmVyL3VidW50 dSAxNi4wNAogICAgICB4ODZfNjQvZ2RiICAgICAgL2NlbnRvcyA1LjExCiAg ICAgIHg4Nl82NC9nZGJzZXJ2ZXIvY2VudG9zIDUuMTEKICAgICAgeDg2ICAg L2dkYiAgICAgIC9jZW50b3MgNS4xMQogICAgICB4ODYgICAvZ2Ric2VydmVy L2NlbnRvcyA1LjExCgpDaGFuZ2UtSWQ6IEkyNTQ2YWNhOTgyN2Q5YWUxMmFi ODZkZWI3YWE0YWNjNjBjODJiNGI0Ci0tLQogZ2RiL2dkYnNlcnZlci9saW51 eC1sb3cuYyB8ICA4ICsrKysrKysrCiBnZGIvbGludXgtbmF0LmMgICAgICAg ICAgIHwgIDggKysrKysrKysKIGdkYi9uYXQvbGludXgtcHRyYWNlLmggICAg fCAxOCArKysrKysrKysrLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjYg aW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9n ZGIvZ2Ric2VydmVyL2xpbnV4LWxvdy5jIGIvZ2RiL2dkYnNlcnZlci9saW51 eC1sb3cuYwppbmRleCAyZTVlMTlkLi4zZmVlOTlhIDEwMDY0NAotLS0gYS9n ZGIvZ2Ric2VydmVyL2xpbnV4LWxvdy5jCisrKyBiL2dkYi9nZGJzZXJ2ZXIv bGludXgtbG93LmMKQEAgLTg2Niw2ICs4NjYsMTQgQEAgc2F2ZV9zdG9wX3Jl YXNvbiAoc3RydWN0IGx3cF9pbmZvICpsd3ApCiAJICAgICAgaWYgKCFjaGVj a19zdG9wcGVkX2J5X3dhdGNocG9pbnQgKGx3cCkpCiAJCWx3cC0+c3RvcF9y ZWFzb24gPSBUQVJHRVRfU1RPUFBFRF9CWV9TSU5HTEVfU1RFUDsKIAkgICAg fQorCSAgZWxzZQorCSAgICB7CisJICAgICAgLyogT24gc29tZSBrZXJuZWxz IChzdWNoIGFzIHg4Ni02NCAyLjYuMTgvQ2VudE9TIDUsCisJICAgICAgICAg Mi42LjI3L1N1c2UgMTEpLCB3aGVuIHdlIGNvbnRpbnVlIGludG8gYSB3YXRj aHBvaW50LAorCSAgICAgICAgIHNpX2NvZGUgaW5kaWNhdGVzIDEgaW5zdGVh ZCBvZiBUUkFQX0hXQktQVCBzbyB3ZQorCSAgICAgICAgIG5lZWQgdG8gY2hl Y2sgZGVidWcgcmVnaXN0ZXJzIHNlcGFyYXRlbHkuICAqLworCSAgICAgIGNo ZWNrX3N0b3BwZWRfYnlfd2F0Y2hwb2ludCAobHdwKTsKKwkgICAgfQogCX0K ICAgICB9CiAjZWxzZQpkaWZmIC0tZ2l0IGEvZ2RiL2xpbnV4LW5hdC5jIGIv Z2RiL2xpbnV4LW5hdC5jCmluZGV4IDFiYmFkN2IuLjJlM2ZhMjkgMTAwNjQ0 Ci0tLSBhL2dkYi9saW51eC1uYXQuYworKysgYi9nZGIvbGludXgtbmF0LmMK QEAgLTI3OTgsNiArMjc5OCwxNCBAQCBzYXZlX3N0b3BfcmVhc29uIChzdHJ1 Y3QgbHdwX2luZm8gKmxwKQogCQkgdGhlIGRlYnVnIHJlZ2lzdGVycyBzZXBh cmF0ZWx5LiAgKi8KIAkgICAgICBjaGVja19zdG9wcGVkX2J5X3dhdGNocG9p bnQgKGxwKTsKIAkgICAgfQorCSAgZWxzZQorCSAgICB7CisJICAgICAgLyog T24gc29tZSBrZXJuZWxzIChzdWNoIGFzIHg4Ni02NCAyLjYuMTgvQ2VudE9T IDUsCisJICAgICAgICAgMi42LjI3L1N1c2UgMTEpLCB3aGVuIHdlIGNvbnRp bnVlIGludG8gYSB3YXRjaHBvaW50LAorCSAgICAgICAgIHNpX2NvZGUgaW5k aWNhdGVzIDEgaW5zdGVhZCBvZiBUUkFQX0hXQktQVCBzbyB3ZQorCSAgICAg ICAgIG5lZWQgdG8gY2hlY2sgZGVidWcgcmVnaXN0ZXJzIHNlcGFyYXRlbHku ICAqLworCSAgICAgIGNoZWNrX3N0b3BwZWRfYnlfd2F0Y2hwb2ludCAobHAp OworCSAgICB9CiAJfQogICAgIH0KICNlbHNlCmRpZmYgLS1naXQgYS9nZGIv bmF0L2xpbnV4LXB0cmFjZS5oIGIvZ2RiL25hdC9saW51eC1wdHJhY2UuaApp bmRleCBkYzE4MGZiLi43ZTEwZmIzIDEwMDY0NAotLS0gYS9nZGIvbmF0L2xp bnV4LXB0cmFjZS5oCisrKyBiL2dkYi9uYXQvbGludXgtcHRyYWNlLmgKQEAg LTEyMCwxNCArMTIwLDE2IEBAIHN0cnVjdCBidWZmZXI7CiAvKiBUaGUgeDg2 IGtlcm5lbCBnZXRzIHNvbWUgb2YgdGhlIHNpX2NvZGUgdmFsdWVzIGJhY2t3 YXJkcywgbGlrZQogICAgdGhpczoKIAotICAgfCB3aGF0ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHwgc2lfY29kZSAgICAgfAotICAg fC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSst LS0tLS0tLS0tLS0tfAotICAgfCBzb2Z0d2FyZSBicmVha3BvaW50cyAoaW50 MykgICAgICAgICAgICAgIHwgU0lfS0VSTkVMICAgfAotICAgfCBzaW5nbGUt c3RlcHMgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgVFJBUF9UUkFD RSAgfAotICAgfCBzaW5nbGUtc3RlcHBpbmcgYSBzeXNjYWxsICAgICAgICAg ICAgICAgIHwgVFJBUF9CUktQVCAgfAotICAgfCB1c2VyIHNlbnQgU0lHVFJB UCAgICAgICAgICAgICAgICAgICAgICAgIHwgMCAgICAgICAgICAgfAotICAg fCBleGVjIFNJR1RSQVAgKHdoZW4gbm8gUFRSQUNFX0VWRU5UX0VYRUMpIHwg MCAgICAgICAgICAgfAotICAgfCBoYXJkd2FyZSBicmVha3BvaW50cy93YXRj aHBvaW50cyAgICAgICAgIHwgVFJBUF9IV0JLUFQgfAorICAgfCB3aGF0ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgc2lfY29kZSAg ICAgICAgIHwKKyAgIHwtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0rLS0tLS0tLS0tLS0tLS0tLS18CisgICB8IHNvZnR3YXJl IGJyZWFrcG9pbnRzIChpbnQzKSAgICAgICAgICAgICAgfCBTSV9LRVJORUwg ICAgICAgfAorICAgfCBzaW5nbGUtc3RlcHMgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgVFJBUF9UUkFDRSAgICAgIHwKKyAgIHwgc2luZ2xlLXN0 ZXBwaW5nIGEgc3lzY2FsbCAgICAgICAgICAgICAgICB8IFRSQVBfQlJLUFQg ICAgICB8CisgICB8IHVzZXIgc2VudCBTSUdUUkFQICAgICAgICAgICAgICAg ICAgICAgICAgfCAwICAgICAgICAgICAgICAgfAorICAgfCBleGVjIFNJR1RS QVAgKHdoZW4gbm8gUFRSQUNFX0VWRU5UX0VYRUMpIHwgMCAgICAgICAgICAg ICAgIHwKKyAgIHwgaGFyZHdhcmUgYnJlYWtwb2ludHMvd2F0Y2hwb2ludHMg ICAgICAgICB8IFRSQVBfSFdCS1BUICgqKSB8CisKKyAgICgqKSAtIEtlcm5l bHMgMi42LjE4IChDZW50T1MgNSksIDIuNi4yNyAoU3VzZSAxMSkgc2V0IHRo aXMgdG8gMS4KIAogICAgVGhhdCBpcywgaXQgcmVwb3J0cyBTSV9LRVJORUwg Zm9yIHNvZnR3YXJlIGJyZWFrcG9pbnRzIChhbmQgb25seQogICAgZm9yIHRo b3NlKSwgYW5kIFRSQVBfQlJLUFQgZm9yIHNpbmdsZS1zdGVwcGluZyBhIHN5 c2NhbGwuLi4gIElmIHRoZQotLSAKMi45LjUKCg== --------------A60F7FB32075F4E3135482DB--