* [PATCH v1 0/1] get page size using sysconf (_SC_PAGESIZE) instead of PAGE_SIZE
@ 2022-04-25 9:48 Zied Guermazi
2022-04-25 9:48 ` [PATCH v1 1/1] " Zied Guermazi
0 siblings, 1 reply; 3+ messages in thread
From: Zied Guermazi @ 2022-04-25 9:48 UTC (permalink / raw)
To: gdb-patches; +Cc: Zied Guermazi
PAGE_SIZE is not defined in all build configurations, therefore,
use the posix call sysconf (_SC_PAGESIZE)
build system configured with --enable-build-warnings --enable-gdb-build-warnings --enable-werror
and the build was not raising any warning or error
build_intel/gdb$ make
CXX nat/linux-btrace.o
GEN init.c
CXXLD gdb
Zied Guermazi (1):
get page size using sysconf (_SC_PAGESIZE) instead of PAGE_SIZE
gdb/nat/linux-btrace.c | 43 +++++++++++++++++++++++++++++-------------
1 file changed, 30 insertions(+), 13 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v1 1/1] get page size using sysconf (_SC_PAGESIZE) instead of PAGE_SIZE
2022-04-25 9:48 [PATCH v1 0/1] get page size using sysconf (_SC_PAGESIZE) instead of PAGE_SIZE Zied Guermazi
@ 2022-04-25 9:48 ` Zied Guermazi
2022-04-25 10:08 ` Metzger, Markus T
0 siblings, 1 reply; 3+ messages in thread
From: Zied Guermazi @ 2022-04-25 9:48 UTC (permalink / raw)
To: gdb-patches; +Cc: Zied Guermazi
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 | 43 +++++++++++++++++++++++++++++-------------
1 file changed, 30 insertions(+), 13 deletions(-)
diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index b0d6dcd7cf1..1096416f452 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -455,6 +455,7 @@ linux_enable_bts (ptid_t ptid, const struct btrace_config_bts *conf)
__u64 data_offset;
int pid, pg;
+
if (!cpu_supports_bts ())
error (_("BTS support has been disabled for the target cpu."));
@@ -486,9 +487,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 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 +512,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 +537,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,7 +635,11 @@ 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,
+ long page_size = sysconf (_SC_PAGESIZE);
+ if (page_size == -1)
+ error (_("Failed 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 +650,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 +670,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 +741,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 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 +756,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 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH v1 1/1] get page size using sysconf (_SC_PAGESIZE) instead of PAGE_SIZE
2022-04-25 9:48 ` [PATCH v1 1/1] " Zied Guermazi
@ 2022-04-25 10:08 ` Metzger, Markus T
0 siblings, 0 replies; 3+ messages in thread
From: Metzger, Markus T @ 2022-04-25 10:08 UTC (permalink / raw)
To: Zied Guermazi, gdb-patches
Hello Zied,
>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 | 43 +++++++++++++++++++++++++++++-------------
> 1 file changed, 30 insertions(+), 13 deletions(-)
>
>diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
>index b0d6dcd7cf1..1096416f452 100644
>--- a/gdb/nat/linux-btrace.c
>+++ b/gdb/nat/linux-btrace.c
>@@ -455,6 +455,7 @@ linux_enable_bts (ptid_t ptid, const struct
>btrace_config_bts *conf)
> __u64 data_offset;
> int pid, pg;
>
>+
This new empty line seems unrelated. I don't think we need two empty lines.
> if (!cpu_supports_bts ())
> error (_("BTS support has been disabled for the target cpu."));
>
>@@ -486,9 +487,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 get system page size: %s"), safe_strerror (errno));
>+
I believe there's a 'to' missing. Adding Eli for error messages.
> /* Allocate the configuration page. */
>- scoped_mmap data (nullptr, PAGE_SIZE, PROT_READ | PROT_WRITE,
>MAP_SHARED,
>+ long page_size = sysconf (_SC_PAGESIZE);
>+ if (page_size == -1)
>+ error (_("Failed get system page size: %s"), safe_strerror (errno));
>+
Here, too. More instances below.
>+ scoped_mmap data (nullptr, (size_t) page_size, PROT_READ | PROT_WRITE,
>MAP_SHARED,
> fd.get (), 0);
Does the line still fit into 80 characters with the added cast?
Regards,
Markus.
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-25 10:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-25 9:48 [PATCH v1 0/1] get page size using sysconf (_SC_PAGESIZE) instead of PAGE_SIZE Zied Guermazi
2022-04-25 9:48 ` [PATCH v1 1/1] " Zied Guermazi
2022-04-25 10:08 ` Metzger, Markus T
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).