Skip to content

storage_mon : fix handling of 4k block devices #2097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 10, 2025
Merged

storage_mon : fix handling of 4k block devices #2097

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48455cb
storage_mon: refactor removing basically duplicate code
wenningerk Nov 7, 2025
310f224
storage_mon.c: refactor moving up getting blocksize
wenningerk Nov 7, 2025
ac19911
storage_mon.c: fix block-seek mask deriving it from the block-size
wenningerk Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 28 additions & 41 deletions tools/storage_mon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ static void *test_device(const char *device, int verbose, int inject_error_perce
int device_fd;
int res;
off_t seek_spot;
int sec_size = 512;
void *buffer;

if (verbose) {
printf("Testing device %s\n", device);
Expand Down Expand Up @@ -150,23 +152,7 @@ static void *test_device(const char *device, int verbose, int inject_error_perce
PRINT_STORAGE_MON_INFO("%s: opened %s O_DIRECT, size=%zu", device, (flags & O_DIRECT)?"with":"without", devsize);
}

/* Don't fret about real randomness */
srand(time(NULL) + getpid());
/* Pick a random place on the device - sector aligned */
seek_spot = (rand() % (devsize-1024)) & 0xFFFFFFFFFFFFFE00;
res = lseek(device_fd, seek_spot, SEEK_SET);
if (res < 0) {
PRINT_STORAGE_MON_ERR("Failed to seek %s: %s", device, strerror(errno));
goto error;
}
if (verbose) {
PRINT_STORAGE_MON_INFO("%s: reading from pos %ld", device, seek_spot);
}

if (flags & O_DIRECT) {
int sec_size = 0;
void *buffer;

#ifdef __FreeBSD__
res = ioctl(device_fd, DIOCGSECTORSIZE, &sec_size);
#else
Expand All @@ -176,33 +162,34 @@ static void *test_device(const char *device, int verbose, int inject_error_perce
PRINT_STORAGE_MON_ERR("Failed to get block device sector size for %s: %s", device, strerror(errno));
goto error;
}
}

if (posix_memalign(&buffer, sysconf(_SC_PAGESIZE), sec_size) != 0) {
PRINT_STORAGE_MON_ERR("Failed to allocate aligned memory: %s", strerror(errno));
goto error;
}
res = read(device_fd, buffer, sec_size);
free(buffer);
if (res < 0) {
PRINT_STORAGE_MON_ERR("Failed to read %s: %s", device, strerror(errno));
goto error;
}
if (res < sec_size) {
PRINT_STORAGE_MON_ERR("Failed to read %d bytes from %s, got %d", sec_size, device, res);
goto error;
}
} else {
char buffer[512];
/* Don't fret about real randomness */
srand(time(NULL) + getpid());
/* Pick a random place on the device - sector aligned */
seek_spot = (rand() % (devsize-sec_size)) & ~(((off_t) sec_size)-1);
res = lseek(device_fd, seek_spot, SEEK_SET);
if (res < 0) {
PRINT_STORAGE_MON_ERR("Failed to seek %s: %s", device, strerror(errno));
goto error;
}
if (verbose) {
PRINT_STORAGE_MON_INFO("%s: reading from pos %ld", device, seek_spot);
}

res = read(device_fd, buffer, sizeof(buffer));
if (res < 0) {
PRINT_STORAGE_MON_ERR("Failed to read %s: %s", device, strerror(errno));
goto error;
}
if (res < (int)sizeof(buffer)) {
PRINT_STORAGE_MON_ERR("Failed to read %ld bytes from %s, got %d", sizeof(buffer), device, res);
goto error;
}
if (posix_memalign(&buffer, sysconf(_SC_PAGESIZE), sec_size) != 0) {
PRINT_STORAGE_MON_ERR("Failed to allocate aligned memory: %s", strerror(errno));
goto error;
}
res = read(device_fd, buffer, sec_size);
free(buffer);
if (res < 0) {
PRINT_STORAGE_MON_ERR("Failed to read %s: %s", device, strerror(errno));
goto error;
}
if (res < sec_size) {
PRINT_STORAGE_MON_ERR("Failed to read %d bytes from %s, got %d", sec_size, device, res);
goto error;
}

/* Fake an error */
Expand Down