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

Get rid of old alignment code and use posix_memalign.

Browse Source 
We require posix_memalign already for some time so it makes
no sense to keep old workarounds.
This commit is contained in:
Milan Broz
2017-04-30 13:13:46 +02:00
parent 5d1b6f9af3
commit 3f9346836e
1 changed files with 30 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
lib/utils.c
View File

@@ -36,36 +36,16 @@ unsigned crypt_getpagesize(void)
return r < 0 ? DEFAULT_MEM_ALIGNMENT : r; return r < 0 ? DEFAULT_MEM_ALIGNMENT : r;
} }
static int get_alignment(int fd) static size_t get_alignment(int fd)
{ {
int alignment = DEFAULT_MEM_ALIGNMENT; long alignment = DEFAULT_MEM_ALIGNMENT;
#ifdef _PC_REC_XFER_ALIGN #ifdef _PC_REC_XFER_ALIGN
alignment = fpathconf(fd, _PC_REC_XFER_ALIGN); alignment = fpathconf(fd, _PC_REC_XFER_ALIGN);
if (alignment < 0) if (alignment < 0)
alignment = DEFAULT_MEM_ALIGNMENT; alignment = DEFAULT_MEM_ALIGNMENT;
#endif #endif
return alignment; return (size_t)alignment;
}
static void *aligned_malloc(void **base, int size, int alignment)
{
#ifdef HAVE_POSIX_MEMALIGN
return posix_memalign(base, alignment, size) ? NULL : *base;
#else
/* Credits go to Michal's padlock patches for this alignment code */
char *ptr;
ptr = malloc(size + alignment);
if (!ptr)
return NULL;
*base = ptr;
if (alignment > 1 && ((long)ptr & (alignment - 1)))
ptr += alignment - ((long)(ptr) & (alignment - 1));
return ptr;
#endif
} }
ssize_t read_buffer(int fd, void *buf, size_t count) ssize_t read_buffer(int fd, void *buf, size_t count)
@@ -116,10 +96,9 @@ ssize_t write_buffer(int fd, const void *buf, size_t count)
ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count) ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
{ {
void *hangover_buf, *hangover_buf_base = NULL; void *hangover_buf = NULL, *buf = NULL;
void *buf, *buf_base = NULL; int r;
int r, alignment; size_t alignment, hangover, solid;
size_t hangover, solid;
ssize_t ret = -1; ssize_t ret = -1;
if (fd == -1 || !orig_buf || bsize <= 0) if (fd == -1 || !orig_buf || bsize <= 0)
@@ -129,10 +108,9 @@ ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
solid = count - hangover; solid = count - hangover;
alignment = get_alignment(fd); alignment = get_alignment(fd);
if ((long)orig_buf & (alignment - 1)) { if ((size_t)orig_buf & (alignment - 1)) {
buf = aligned_malloc(&buf_base, count, alignment); if (posix_memalign(&buf, alignment, count))
if (!buf) return -1;
goto out;
memcpy(buf, orig_buf, count); memcpy(buf, orig_buf, count);
} else } else
buf = orig_buf; buf = orig_buf;
@@ -144,8 +122,7 @@ ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
} }
if (hangover) { if (hangover) {
hangover_buf = aligned_malloc(&hangover_buf_base, bsize, alignment); if (posix_memalign(&hangover_buf, alignment, bsize))
if (!hangover_buf)
goto out; goto out;
r = read_buffer(fd, hangover_buf, bsize); r = read_buffer(fd, hangover_buf, bsize);
@@ -166,18 +143,17 @@ ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
} }
ret = count; ret = count;
out: out:
free(hangover_buf_base); free(hangover_buf);
if (buf != orig_buf) if (buf != orig_buf)
free(buf_base); free(buf);
return ret; return ret;
} }
ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count) ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count)
{ {
void *hangover_buf, *hangover_buf_base = NULL; void *hangover_buf = NULL, *buf = NULL;
void *buf, *buf_base = NULL; int r;
int r, alignment; size_t alignment, hangover, solid;
size_t hangover, solid;
ssize_t ret = -1; ssize_t ret = -1;
if (fd == -1 || !orig_buf || bsize <= 0) if (fd == -1 || !orig_buf || bsize <= 0)
@@ -187,9 +163,8 @@ ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count)
solid = count - hangover; solid = count - hangover;
alignment = get_alignment(fd); alignment = get_alignment(fd);
if ((long)orig_buf & (alignment - 1)) { if ((size_t)orig_buf & (alignment - 1)) {
buf = aligned_malloc(&buf_base, count, alignment); if (posix_memalign(&buf, alignment, count))
if (!buf)
return -1; return -1;
} else } else
buf = orig_buf; buf = orig_buf;
@@ -199,8 +174,7 @@ ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count)
goto out; goto out;
if (hangover) { if (hangover) {
hangover_buf = aligned_malloc(&hangover_buf_base, bsize, alignment); if (posix_memalign(&hangover_buf, alignment, bsize))
if (!hangover_buf)
goto out; goto out;
r = read_buffer(fd, hangover_buf, bsize); r = read_buffer(fd, hangover_buf, bsize);
if (r < 0 || r < (ssize_t)hangover) if (r < 0 || r < (ssize_t)hangover)
@@ -210,10 +184,10 @@ ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count)
} }
ret = count; ret = count;
out: out:
free(hangover_buf_base); free(hangover_buf);
if (buf != orig_buf) { if (buf != orig_buf) {
memcpy(orig_buf, buf, count); memcpy(orig_buf, buf, count);
free(buf_base); free(buf);
} }
return ret; return ret;
} }
@@ -226,8 +200,7 @@ out:
*/ */
ssize_t write_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t offset) ssize_t write_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t offset)
{ {
char *frontPadBuf; void *frontPadBuf = NULL;
void *frontPadBuf_base = NULL;
int r, frontHang; int r, frontHang;
size_t innerCount = 0; size_t innerCount = 0;
ssize_t ret = -1; ssize_t ret = -1;
@@ -244,13 +217,11 @@ ssize_t write_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t
frontHang = offset % bsize; frontHang = offset % bsize;
if (lseek(fd, offset - frontHang, SEEK_SET) < 0) if (lseek(fd, offset - frontHang, SEEK_SET) < 0)
goto out; return -1;
if (frontHang) { if (frontHang) {
frontPadBuf = aligned_malloc(&frontPadBuf_base, if (posix_memalign(&frontPadBuf, get_alignment(fd), bsize))
bsize, get_alignment(fd)); return -1;
if (!frontPadBuf)
goto out;
r = read_buffer(fd, frontPadBuf, bsize); r = read_buffer(fd, frontPadBuf, bsize);
if (r < 0 || r != bsize) if (r < 0 || r != bsize)
@@ -277,15 +248,13 @@ ssize_t write_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t
if (ret >= 0) if (ret >= 0)
ret += innerCount; ret += innerCount;
out: out:
free(frontPadBuf_base); free(frontPadBuf);
return ret; return ret;
} }
ssize_t read_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t offset) ssize_t read_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t offset)
{ {
char *frontPadBuf; void *frontPadBuf = NULL;
void *frontPadBuf_base = NULL;
int r, frontHang; int r, frontHang;
size_t innerCount = 0; size_t innerCount = 0;
ssize_t ret = -1; ssize_t ret = -1;
@@ -302,14 +271,11 @@ ssize_t read_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t o
frontHang = offset % bsize; frontHang = offset % bsize;
if (lseek(fd, offset - frontHang, SEEK_SET) < 0) if (lseek(fd, offset - frontHang, SEEK_SET) < 0)
return ret; return -1;
if (frontHang) { if (frontHang) {
frontPadBuf = aligned_malloc(&frontPadBuf_base, if (posix_memalign(&frontPadBuf, get_alignment(fd), bsize))
bsize, get_alignment(fd)); return -1;
if (!frontPadBuf)
return ret;
r = read_buffer(fd, frontPadBuf, bsize); r = read_buffer(fd, frontPadBuf, bsize);
if (r < 0 || r != bsize) if (r < 0 || r != bsize)
@@ -329,8 +295,7 @@ ssize_t read_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t o
if (ret >= 0) if (ret >= 0)
ret += innerCount; ret += innerCount;
out: out:
free(frontPadBuf_base); free(frontPadBuf);
return ret; return ret;
} }