Skip to content

Commit

Permalink
tests: Rename PAGE_SIZE definitions
Browse files Browse the repository at this point in the history 
As per POSIX specification of limits.h [1], OS libc may define
PAGE_SIZE in limits.h.

Self defined PAGE_SIZE is frequently used in tests, to prevent
collosion of definition, we give PAGE_SIZE definitons reasonable
prefixs.

[1]: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210118063808.12471-7-jiaxun.yang@flygoat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
@FlyGoat @huth
FlyGoat authored and huth committed Jan 20, 2021
1 parent 2d0fc79 commit d2c4f38
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 74 deletions.
10 changes: 5 additions & 5 deletions tests/migration/stress.c
View file
Expand Up @@ -27,7 +27,7 @@

const char *argv0;

#define PAGE_SIZE 4096
#define RAM_PAGE_SIZE 4096

#ifndef CONFIG_GETTID
static int gettid(void)
Expand Down Expand Up @@ -158,11 +158,11 @@ static unsigned long long now(void)

static void stressone(unsigned long long ramsizeMB)
{
size_t pagesPerMB = 1024 * 1024 / PAGE_SIZE;
size_t pagesPerMB = 1024 * 1024 / RAM_PAGE_SIZE;
g_autofree char *ram = g_malloc(ramsizeMB * 1024 * 1024);
char *ramptr;
size_t i, j, k;
g_autofree char *data = g_malloc(PAGE_SIZE);
g_autofree char *data = g_malloc(RAM_PAGE_SIZE);
char *dataptr;
size_t nMB = 0;
unsigned long long before, after;
Expand All @@ -174,7 +174,7 @@ static void stressone(unsigned long long ramsizeMB)
* calloc instead :-) */
memset(ram, 0xfe, ramsizeMB * 1024 * 1024);

if (random_bytes(data, PAGE_SIZE) < 0) {
if (random_bytes(data, RAM_PAGE_SIZE) < 0) {
return;
}

Expand All @@ -186,7 +186,7 @@ static void stressone(unsigned long long ramsizeMB)
for (i = 0; i < ramsizeMB; i++, nMB++) {
for (j = 0; j < pagesPerMB; j++) {
dataptr = data;
for (k = 0; k < PAGE_SIZE; k += sizeof(long long)) {
for (k = 0; k < RAM_PAGE_SIZE; k += sizeof(long long)) {
ramptr += sizeof(long long);
dataptr += sizeof(long long);
*(unsigned long long *)ramptr ^= *(unsigned long long *)dataptr;
Expand Down
4 changes: 2 additions & 2 deletions tests/qtest/libqos/malloc-pc.c
View file
Expand Up @@ -18,15 +18,15 @@

#include "qemu-common.h"

#define PAGE_SIZE (4096)
#define ALLOC_PAGE_SIZE (4096)

void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags)
{
uint64_t ram_size;
QFWCFG *fw_cfg = pc_fw_cfg_init(qts);

ram_size = qfw_cfg_get_u64(fw_cfg, FW_CFG_RAM_SIZE);
alloc_init(s, flags, 1 << 20, MIN(ram_size, 0xE0000000), PAGE_SIZE);
alloc_init(s, flags, 1 << 20, MIN(ram_size, 0xE0000000), ALLOC_PAGE_SIZE);

/* clean-up */
pc_fw_cfg_uninit(fw_cfg);
Expand Down
4 changes: 2 additions & 2 deletions tests/qtest/libqos/malloc-spapr.c
View file
Expand Up @@ -10,7 +10,7 @@

#include "qemu-common.h"

#define PAGE_SIZE 4096
#define SPAPR_PAGE_SIZE 4096

/* Memory must be a multiple of 256 MB,
* so we have at least 256MB
Expand All @@ -19,5 +19,5 @@

void spapr_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags)
{
alloc_init(s, flags, 1 << 20, SPAPR_MIN_SIZE, PAGE_SIZE);
alloc_init(s, flags, 1 << 20, SPAPR_MIN_SIZE, SPAPR_PAGE_SIZE);
}
54 changes: 27 additions & 27 deletions tests/qtest/m25p80-test.c
View file
Expand Up @@ -62,7 +62,7 @@ enum {
#define FLASH_JEDEC 0x20ba19 /* n25q256a */
#define FLASH_SIZE (32 * 1024 * 1024)

#define PAGE_SIZE 256
#define FLASH_PAGE_SIZE 256

/*
* Use an explicit bswap for the values read/wrote to the flash region
Expand Down Expand Up @@ -165,7 +165,7 @@ static void read_page(uint32_t addr, uint32_t *page)
writel(ASPEED_FLASH_BASE, make_be32(addr));

/* Continuous read are supported */
for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
page[i] = make_be32(readl(ASPEED_FLASH_BASE));
}
spi_ctrl_stop_user();
Expand All @@ -178,15 +178,15 @@ static void read_page_mem(uint32_t addr, uint32_t *page)
/* move out USER mode to use direct reads from the AHB bus */
spi_ctrl_setmode(CTRL_READMODE, READ);

for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
page[i] = make_be32(readl(ASPEED_FLASH_BASE + addr + i * 4));
}
}

static void test_erase_sector(void)
{
uint32_t some_page_addr = 0x600 * PAGE_SIZE;
uint32_t page[PAGE_SIZE / 4];
uint32_t some_page_addr = 0x600 * FLASH_PAGE_SIZE;
uint32_t page[FLASH_PAGE_SIZE / 4];
int i;

spi_conf(CONF_ENABLE_W0);
Expand All @@ -200,14 +200,14 @@ static void test_erase_sector(void)

/* Previous page should be full of zeroes as backend is not
* initialized */
read_page(some_page_addr - PAGE_SIZE, page);
for (i = 0; i < PAGE_SIZE / 4; i++) {
read_page(some_page_addr - FLASH_PAGE_SIZE, page);
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
g_assert_cmphex(page[i], ==, 0x0);
}

/* But this one was erased */
read_page(some_page_addr, page);
for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
g_assert_cmphex(page[i], ==, 0xffffffff);
}

Expand All @@ -216,16 +216,16 @@ static void test_erase_sector(void)

static void test_erase_all(void)
{
uint32_t some_page_addr = 0x15000 * PAGE_SIZE;
uint32_t page[PAGE_SIZE / 4];
uint32_t some_page_addr = 0x15000 * FLASH_PAGE_SIZE;
uint32_t page[FLASH_PAGE_SIZE / 4];
int i;

spi_conf(CONF_ENABLE_W0);

/* Check some random page. Should be full of zeroes as backend is
* not initialized */
read_page(some_page_addr, page);
for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
g_assert_cmphex(page[i], ==, 0x0);
}

Expand All @@ -236,7 +236,7 @@ static void test_erase_all(void)

/* Recheck that some random page */
read_page(some_page_addr, page);
for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
g_assert_cmphex(page[i], ==, 0xffffffff);
}

Expand All @@ -245,9 +245,9 @@ static void test_erase_all(void)

static void test_write_page(void)
{
uint32_t my_page_addr = 0x14000 * PAGE_SIZE; /* beyond 16MB */
uint32_t some_page_addr = 0x15000 * PAGE_SIZE;
uint32_t page[PAGE_SIZE / 4];
uint32_t my_page_addr = 0x14000 * FLASH_PAGE_SIZE; /* beyond 16MB */
uint32_t some_page_addr = 0x15000 * FLASH_PAGE_SIZE;
uint32_t page[FLASH_PAGE_SIZE / 4];
int i;

spi_conf(CONF_ENABLE_W0);
Expand All @@ -259,20 +259,20 @@ static void test_write_page(void)
writel(ASPEED_FLASH_BASE, make_be32(my_page_addr));

/* Fill the page with its own addresses */
for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
writel(ASPEED_FLASH_BASE, make_be32(my_page_addr + i * 4));
}
spi_ctrl_stop_user();

/* Check what was written */
read_page(my_page_addr, page);
for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
g_assert_cmphex(page[i], ==, my_page_addr + i * 4);
}

/* Check some other page. It should be full of 0xff */
read_page(some_page_addr, page);
for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
g_assert_cmphex(page[i], ==, 0xffffffff);
}

Expand All @@ -281,9 +281,9 @@ static void test_write_page(void)

static void test_read_page_mem(void)
{
uint32_t my_page_addr = 0x14000 * PAGE_SIZE; /* beyond 16MB */
uint32_t some_page_addr = 0x15000 * PAGE_SIZE;
uint32_t page[PAGE_SIZE / 4];
uint32_t my_page_addr = 0x14000 * FLASH_PAGE_SIZE; /* beyond 16MB */
uint32_t some_page_addr = 0x15000 * FLASH_PAGE_SIZE;
uint32_t page[FLASH_PAGE_SIZE / 4];
int i;

/* Enable 4BYTE mode for controller. This is should be strapped by
Expand All @@ -300,13 +300,13 @@ static void test_read_page_mem(void)

/* Check what was written */
read_page_mem(my_page_addr, page);
for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
g_assert_cmphex(page[i], ==, my_page_addr + i * 4);
}

/* Check some other page. It should be full of 0xff */
read_page_mem(some_page_addr, page);
for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
g_assert_cmphex(page[i], ==, 0xffffffff);
}

Expand All @@ -315,8 +315,8 @@ static void test_read_page_mem(void)

static void test_write_page_mem(void)
{
uint32_t my_page_addr = 0x15000 * PAGE_SIZE;
uint32_t page[PAGE_SIZE / 4];
uint32_t my_page_addr = 0x15000 * FLASH_PAGE_SIZE;
uint32_t page[FLASH_PAGE_SIZE / 4];
int i;

/* Enable 4BYTE mode for controller. This is should be strapped by
Expand All @@ -334,14 +334,14 @@ static void test_write_page_mem(void)
/* move out USER mode to use direct writes to the AHB bus */
spi_ctrl_setmode(CTRL_WRITEMODE, PP);

for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
writel(ASPEED_FLASH_BASE + my_page_addr + i * 4,
make_be32(my_page_addr + i * 4));
}

/* Check what was written */
read_page_mem(my_page_addr, page);
for (i = 0; i < PAGE_SIZE / 4; i++) {
for (i = 0; i < FLASH_PAGE_SIZE / 4; i++) {
g_assert_cmphex(page[i], ==, my_page_addr + i * 4);
}

Expand Down
6 changes: 3 additions & 3 deletions tests/tcg/multiarch/system/memory.c
View file
Expand Up @@ -20,12 +20,12 @@
# error "Target does not specify CHECK_UNALIGNED"
#endif

#define PAGE_SIZE 4096 /* nominal 4k "pages" */
#define TEST_SIZE (PAGE_SIZE * 4) /* 4 pages */
#define MEM_PAGE_SIZE 4096 /* nominal 4k "pages" */
#define TEST_SIZE (MEM_PAGE_SIZE * 4) /* 4 pages */

#define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0])))

__attribute__((aligned(PAGE_SIZE)))
__attribute__((aligned(MEM_PAGE_SIZE)))
static uint8_t test_data[TEST_SIZE];

typedef void (*init_ufn) (int offset);
Expand Down

0 comments on commit d2c4f38

Please sign in to comment.