eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-11 10:50:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use device alignment wrapper.

Browse Source 
And cache the value to not call ioctl on every block read/write.
This commit is contained in:
Milan Broz
2017-06-08 09:30:53 +02:00
parent fd6fc16001
commit 34bf809e51
9 changed files with 103 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/utils_device.c
View File

@@ -43,6 +43,9 @@ struct device {
int o_direct:1;
int init_done:1;
/* cached values */
size_t alignment;
};
static int device_block_size_fd(int fd, size_t *min_size)
@@ -79,15 +82,28 @@ static int device_block_size_fd(int fd, size_t *min_size)
return bsize;
}
static size_t device_alignment_fd(int devfd)
{
long alignment = DEFAULT_MEM_ALIGNMENT;
#ifdef _PC_REC_XFER_ALIGN
alignment = fpathconf(devfd, _PC_REC_XFER_ALIGN);
if (alignment < 0)
alignment = DEFAULT_MEM_ALIGNMENT;
#endif
return (size_t)alignment;
}
static int device_read_test(int devfd)
{
char buffer[512];
int blocksize, r = -EIO;
size_t minsize = 0;
size_t minsize = 0, alignment;
blocksize = device_block_size_fd(devfd, &minsize);
alignment = device_alignment_fd(devfd);
if (blocksize < 0)
if (blocksize <= 0 || !alignment)
return -EINVAL;
if (minsize == 0)
@@ -96,7 +112,7 @@ static int device_read_test(int devfd)
if (minsize > sizeof(buffer))
minsize = sizeof(buffer);
if (read_blockwise(devfd, blocksize, buffer, minsize) == (ssize_t)minsize)
if (read_blockwise(devfd, blocksize, alignment, buffer, minsize) == (ssize_t)minsize)
r = 0;
crypt_memzero(buffer, sizeof(buffer));
@@ -148,6 +164,8 @@ static int device_ready(struct device *device, int check_directio)
else if (!S_ISBLK(st.st_mode))
r = S_ISREG(st.st_mode) ? -ENOTBLK : -EINVAL;
device->alignment = device_alignment_fd(devfd);
close(devfd);
return r;
}
@@ -566,3 +584,18 @@ int device_is_rotational(struct device *device)
return crypt_dev_is_rotational(major(st.st_rdev), minor(st.st_rdev));
}
size_t device_alignment(struct device *device)
{
int devfd;
if (!device->alignment) {
devfd = open(device_path(device), O_RDONLY);
if (devfd != -1) {
device->alignment = device_alignment_fd(devfd);
close(devfd);
}
}
return device->alignment;
}