Re: [PATCH V2 2/3] t_mmap_collision: fix hard-coded page size

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Feb 20, 2020 at 03:06:31PM -0500, Jeff Moyer wrote:
> Fix the test to run on non-4k page size systems.
> 
> Signed-off-by: Jeff Moyer <jmoyer@xxxxxxxxxx>
> ---

This patch looks good to me, and it's really helpful.

Thanks,
Zorro

Before patched:

FSTYP         -- xfs (non-debug)
PLATFORM      -- Linux/aarch64
MKFS_OPTIONS  -- -f -b size=65536 -m crc=1,finobt=1,reflink=1,rmapbt=1 -i sparse=1 /dev/sda5
MOUNT_OPTIONS -- -o context=system_u:object_r:nfs_t:s0 /dev/sda5 /mnt/xfstests/mnt2

generic/503 14s ... - output mismatch (see /root/xfstests-dev/results//generic/503.out.bad)
    --- tests/generic/503.out   2020-02-21 05:41:37.992675071 -0500
    +++ /root/xfstests-dev/results//generic/503.out.bad 2020-02-21 08:20:19.736550319 -0500
    @@ -1,2 +1,4 @@
     QA output created by 503
    +collapse_range_fn fallocate 2: Invalid argument
    +collapse_range_fn fallocate 2: Invalid argument
...

After patched:

FSTYP         -- xfs (non-debug)
PLATFORM      -- Linux/aarch64
MKFS_OPTIONS  -- -f -b size=65536 -m crc=1,finobt=1,reflink=1,rmapbt=1 -i sparse=1 /dev/sda5
MOUNT_OPTIONS -- -o context=system_u:object_r:nfs_t:s0 /dev/sda5 /mnt/xfstests/mnt2

generic/503 16s ...  16s
Ran: generic/503
Passed all 1 tests

>  src/t_mmap_collision.c | 40 +++++++++++++++++++++-------------------
>  1 file changed, 21 insertions(+), 19 deletions(-)
> 
> diff --git a/src/t_mmap_collision.c b/src/t_mmap_collision.c
> index d547bc05..c872f4e2 100644
> --- a/src/t_mmap_collision.c
> +++ b/src/t_mmap_collision.c
> @@ -25,13 +25,12 @@
>  #include <sys/types.h>
>  #include <unistd.h>
>  
> -#define PAGE(a) ((a)*0x1000)
> -#define FILE_SIZE PAGE(4)
> -
>  void *dax_data;
>  int nodax_fd;
>  int dax_fd;
>  bool done;
> +static int pagesize;
> +static int file_size;
>  
>  #define err_exit(op)                                                          \
>  {                                                                             \
> @@ -49,18 +48,18 @@ void punch_hole_fn(void *ptr)
>  		read = 0;
>  
>  		do {
> -			rc = pread(nodax_fd, dax_data + read, FILE_SIZE - read,
> +			rc = pread(nodax_fd, dax_data + read, file_size - read,
>  					read);
>  			if (rc > 0)
>  				read += rc;
>  		} while (rc > 0);
>  
> -		if (read != FILE_SIZE || rc != 0)
> +		if (read != file_size || rc != 0)
>  			err_exit("pread");
>  
>  		rc = fallocate(dax_fd,
>  				FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
> -				0, FILE_SIZE);
> +				0, file_size);
>  		if (rc < 0)
>  			err_exit("fallocate");
>  
> @@ -81,18 +80,18 @@ void zero_range_fn(void *ptr)
>  		read = 0;
>  
>  		do {
> -			rc = pread(nodax_fd, dax_data + read, FILE_SIZE - read,
> +			rc = pread(nodax_fd, dax_data + read, file_size - read,
>  					read);
>  			if (rc > 0)
>  				read += rc;
>  		} while (rc > 0);
>  
> -		if (read != FILE_SIZE || rc != 0)
> +		if (read != file_size || rc != 0)
>  			err_exit("pread");
>  
>  		rc = fallocate(dax_fd,
>  				FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE,
> -				0, FILE_SIZE);
> +				0, file_size);
>  		if (rc < 0)
>  			err_exit("fallocate");
>  
> @@ -113,11 +112,11 @@ void truncate_down_fn(void *ptr)
>  
>  		if (ftruncate(dax_fd, 0) < 0)
>  			err_exit("ftruncate");
> -		if (fallocate(dax_fd, 0, 0, FILE_SIZE) < 0)
> +		if (fallocate(dax_fd, 0, 0, file_size) < 0)
>  			err_exit("fallocate");
>  
>  		do {
> -			rc = pread(nodax_fd, dax_data + read, FILE_SIZE - read,
> +			rc = pread(nodax_fd, dax_data + read, file_size - read,
>  					read);
>  			if (rc > 0)
>  				read += rc;
> @@ -142,15 +141,15 @@ void collapse_range_fn(void *ptr)
>  	while (!done) {
>  		read = 0;
>  
> -		if (fallocate(dax_fd, 0, 0, FILE_SIZE) < 0)
> +		if (fallocate(dax_fd, 0, 0, file_size) < 0)
>  			err_exit("fallocate 1");
> -		if (fallocate(dax_fd, FALLOC_FL_COLLAPSE_RANGE, 0, PAGE(1)) < 0)
> +		if (fallocate(dax_fd, FALLOC_FL_COLLAPSE_RANGE, 0, pagesize) < 0)
>  			err_exit("fallocate 2");
> -		if (fallocate(dax_fd, 0, 0, FILE_SIZE) < 0)
> +		if (fallocate(dax_fd, 0, 0, file_size) < 0)
>  			err_exit("fallocate 3");
>  
>  		do {
> -			rc = pread(nodax_fd, dax_data + read, FILE_SIZE - read,
> +			rc = pread(nodax_fd, dax_data + read, file_size - read,
>  					read);
>  			if (rc > 0)
>  				read += rc;
> @@ -192,6 +191,9 @@ int main(int argc, char *argv[])
>  		exit(0);
>  	}
>  
> +	pagesize = getpagesize();
> +	file_size = 4 * pagesize;
> +
>  	dax_fd = open(argv[1], O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
>  	if (dax_fd < 0)
>  		err_exit("dax_fd open");
> @@ -202,15 +204,15 @@ int main(int argc, char *argv[])
>  
>  	if (ftruncate(dax_fd, 0) < 0)
>  		err_exit("dax_fd ftruncate");
> -	if (fallocate(dax_fd, 0, 0, FILE_SIZE) < 0)
> +	if (fallocate(dax_fd, 0, 0, file_size) < 0)
>  		err_exit("dax_fd fallocate");
>  
>  	if (ftruncate(nodax_fd, 0) < 0)
>  		err_exit("nodax_fd ftruncate");
> -	if (fallocate(nodax_fd, 0, 0, FILE_SIZE) < 0)
> +	if (fallocate(nodax_fd, 0, 0, file_size) < 0)
>  		err_exit("nodax_fd fallocate");
>  
> -	dax_data = mmap(NULL, FILE_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED,
> +	dax_data = mmap(NULL, file_size, PROT_READ|PROT_WRITE, MAP_SHARED,
>  			dax_fd, 0);
>  	if (dax_data == MAP_FAILED)
>  		err_exit("mmap");
> @@ -220,7 +222,7 @@ int main(int argc, char *argv[])
>  	run_test(&truncate_down_fn);
>  	run_test(&collapse_range_fn);
>  
> -	if (munmap(dax_data, FILE_SIZE) != 0)
> +	if (munmap(dax_data, file_size) != 0)
>  		err_exit("munmap");
>  
>  	err = close(dax_fd);
> -- 
> 2.19.1
> 




[Index of Archives]     [Linux Ext4 Filesystem]     [Union Filesystem]     [Filesystem Testing]     [Ceph Users]     [Ecryptfs]     [AutoFS]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux Cachefs]     [Reiser Filesystem]     [Linux RAID]     [Samba]     [Device Mapper]     [CEPH Development]

  Powered by Linux