From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 94204 invoked by alias); 23 Jun 2015 08:22: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 39737 invoked by uid 89); 23 Jun 2015 08:17:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mga09.intel.com Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 23 Jun 2015 08:17:05 +0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 23 Jun 2015 01:17:03 -0700 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 23 Jun 2015 01:17:02 -0700 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t5N8H1F5010241; Tue, 23 Jun 2015 09:17:01 +0100 Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id t5N8H09m021903; Tue, 23 Jun 2015 10:17:00 +0200 Received: (from mmetzger@localhost) by ulvlx001.iul.intel.com with œ id t5N8GxIZ021899; Tue, 23 Jun 2015 10:17:00 +0200 From: Markus Metzger To: palves@redhat.com Cc: gdb-patches@sourceware.org Subject: [PATCH 3/5] btrace, linux: use data_size and data_offset Date: Tue, 23 Jun 2015 08:22:00 -0000 Message-Id: <1435047418-21611-4-git-send-email-markus.t.metzger@intel.com> In-Reply-To: <1435047418-21611-1-git-send-email-markus.t.metzger@intel.com> References: <1435047418-21611-1-git-send-email-markus.t.metzger@intel.com> X-IsSubscribed: yes X-SW-Source: 2015-06/txt/msg00454.txt.bz2 In struct perf_event_mmap_page there are new fields data_size and data_offset that give the location of the perf_event data buffer relative to the mmap page. Use them if they are present. 2015-06-23 Markus Metzger nat/linux-btrace.c (linux_enable_bts): Check for PERF_ATTR_SIZE_VER5. Check for data_offset and data_size fields. Use them. --- gdb/nat/linux-btrace.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c index 40915da..2ed167a 100644 --- a/gdb/nat/linux-btrace.c +++ b/gdb/nat/linux-btrace.c @@ -644,7 +644,7 @@ linux_enable_bts (ptid_t ptid, const struct btrace_config_bts *conf) struct perf_event_mmap_page *header; struct btrace_target_info *tinfo; struct btrace_tinfo_bts *bts; - unsigned long long size, pages; + unsigned long long size, pages, data_offset, data_size; int pid, pg; tinfo = xzalloc (sizeof (*tinfo)); @@ -706,16 +706,27 @@ linux_enable_bts (ptid_t ptid, const struct btrace_config_bts *conf) break; } - if (header == MAP_FAILED) + if (pages == 0) goto err_file; + data_offset = PAGE_SIZE; + data_size = size; + +#if defined(PERF_ATTR_SIZE_VER5) + if (offsetof(struct perf_event_mmap_page, data_size) <= header->size) + { + data_offset = header->data_offset; + data_size = header->data_size; + } +#endif /* defined(PERF_ATTR_SIZE_VER5) */ + bts->header = header; - bts->bts.mem = ((const uint8_t *) header) + PAGE_SIZE; - bts->bts.size = size; + bts->bts.mem = ((const uint8_t *) header) + data_offset; + bts->bts.size = data_size; bts->bts.data_head = &header->data_head; bts->bts.last_head = 0; - tinfo->conf.bts.size = size; + tinfo->conf.bts.size = data_size; return tinfo; err_file: -- 1.8.3.1