From: Zied Guermazi <zied.guermazi@trande.de>
To: gdb-patches@sourceware.org
Cc: Zied Guermazi <zied.guermazi@trande.de>
Subject: [PATCH v2 1/1] get page size using sysconf (_SC_PAGESIZE) instead of PAGE_SIZE
Date: Mon, 25 Apr 2022 12:23:33 +0200 [thread overview]
Message-ID: <20220425102333.155142-2-zied.guermazi@trande.de> (raw)
In-Reply-To: <20220425102333.155142-1-zied.guermazi@trande.de>
PAGE_SIZE is not defined in all build configurations, e.g cross compiling
for aarch64 GNU/Linux machine. This patch gets the value at runtime using
posix call sysconf (_SC_PAGESIZE)
---
gdb/nat/linux-btrace.c | 44 ++++++++++++++++++++++++++++--------------
1 file changed, 30 insertions(+), 14 deletions(-)
diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index b0d6dcd7cf1..18b81f7e750 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -486,9 +486,13 @@ linux_enable_bts (ptid_t ptid, const struct btrace_config_bts *conf)
if (fd.get () < 0)
diagnose_perf_event_open_fail ();
+ long page_size = sysconf (_SC_PAGESIZE);
+ if (page_size == -1)
+ error (_("Failed to get system page size: %s"), safe_strerror (errno));
+
/* Convert the requested size in bytes to pages (rounding up). */
- pages = ((size_t) conf->size / PAGE_SIZE
- + ((conf->size % PAGE_SIZE) == 0 ? 0 : 1));
+ pages = ((size_t) conf->size / page_size
+ + ((conf->size % page_size) == 0 ? 0 : 1));
/* We need at least one page. */
if (pages == 0)
pages = 1;
@@ -507,17 +511,17 @@ linux_enable_bts (ptid_t ptid, const struct btrace_config_bts *conf)
size_t length;
__u64 data_size;
- data_size = (__u64) pages * PAGE_SIZE;
+ data_size = (__u64) pages * (__u64) page_size;
/* Don't ask for more than we can represent in the configuration. */
if ((__u64) UINT_MAX < data_size)
continue;
size = (size_t) data_size;
- length = size + PAGE_SIZE;
+ length = size + (size_t) page_size;
/* Check for overflows. */
- if ((__u64) length != data_size + PAGE_SIZE)
+ if ((__u64) length != data_size + (__u64) page_size)
continue;
errno = 0;
@@ -532,7 +536,7 @@ linux_enable_bts (ptid_t ptid, const struct btrace_config_bts *conf)
struct perf_event_mmap_page *header = (struct perf_event_mmap_page *)
data.get ();
- data_offset = PAGE_SIZE;
+ data_offset = (__u64) page_size;
#if defined (PERF_ATTR_SIZE_VER5)
if (offsetof (struct perf_event_mmap_page, data_size) <= header->size)
@@ -630,8 +634,12 @@ linux_enable_pt (ptid_t ptid, const struct btrace_config_pt *conf)
diagnose_perf_event_open_fail ();
/* Allocate the configuration page. */
- scoped_mmap data (nullptr, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED,
- fd.get (), 0);
+ long page_size = sysconf (_SC_PAGESIZE);
+ if (page_size == -1)
+ error (_("Failed to get system page size: %s"), safe_strerror (errno));
+
+ scoped_mmap data (nullptr, (size_t) page_size, PROT_READ | PROT_WRITE,
+ MAP_SHARED, fd.get (), 0);
if (data.get () == MAP_FAILED)
error (_("Failed to map trace user page: %s."), safe_strerror (errno));
@@ -641,8 +649,8 @@ linux_enable_pt (ptid_t ptid, const struct btrace_config_pt *conf)
header->aux_offset = header->data_offset + header->data_size;
/* Convert the requested size in bytes to pages (rounding up). */
- pages = ((size_t) conf->size / PAGE_SIZE
- + ((conf->size % PAGE_SIZE) == 0 ? 0 : 1));
+ pages = ((size_t) conf->size / page_size
+ + ((conf->size % page_size) == 0 ? 0 : 1));
/* We need at least one page. */
if (pages == 0)
pages = 1;
@@ -661,7 +669,7 @@ linux_enable_pt (ptid_t ptid, const struct btrace_config_pt *conf)
size_t length;
__u64 data_size;
- data_size = (__u64) pages * PAGE_SIZE;
+ data_size = (__u64) pages * (__u64) page_size;
/* Don't ask for more than we can represent in the configuration. */
if ((__u64) UINT_MAX < data_size)
@@ -732,7 +740,11 @@ linux_enable_btrace (ptid_t ptid, const struct btrace_config *conf)
static enum btrace_error
linux_disable_bts (struct btrace_tinfo_bts *tinfo)
{
- munmap((void *) tinfo->header, tinfo->bts.size + PAGE_SIZE);
+ long page_size = sysconf (_SC_PAGESIZE);
+ if (page_size == -1)
+ error (_("Failed to get system page size: %s"), safe_strerror (errno));
+
+ munmap ((void *) tinfo->header, (size_t) (tinfo->bts.size + page_size));
close (tinfo->file);
return BTRACE_ERR_NONE;
@@ -743,8 +755,12 @@ linux_disable_bts (struct btrace_tinfo_bts *tinfo)
static enum btrace_error
linux_disable_pt (struct btrace_tinfo_pt *tinfo)
{
- munmap((void *) tinfo->pt.mem, tinfo->pt.size);
- munmap((void *) tinfo->header, PAGE_SIZE);
+ long page_size = sysconf (_SC_PAGESIZE);
+ if (page_size == -1)
+ error (_("Failed to get system page size: %s"), safe_strerror (errno));
+
+ munmap ((void *) tinfo->pt.mem, tinfo->pt.size);
+ munmap ((void *) tinfo->header, (size_t) page_size);
close (tinfo->file);
return BTRACE_ERR_NONE;
--
2.25.1
next prev parent reply other threads:[~2022-04-25 10:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-25 10:23 [PATCH v2 0/1] " Zied Guermazi
2022-04-25 10:23 ` Zied Guermazi [this message]
2022-04-26 18:13 ` [PATCH v2 1/1] " Tom Tromey
2022-04-26 22:06 ` Zied Guermazi
2022-04-26 19:05 ` Pedro Alves
2022-04-26 21:51 ` Zied Guermazi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220425102333.155142-2-zied.guermazi@trande.de \
--to=zied.guermazi@trande.de \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).