Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Zeroout whole ppl space during creation/force assemble 

PPL area should be cleared before creation/force assemble.
If the drive was used in other RAID array, it might contains PPL from it.
There is a risk that mdadm recognizes those PPLs and
refuses to assemble the RAID due to PPL conflict with created
array.

Signed-off-by: Pawel Baldysiak <pawel.baldysiak@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
Pawel Baldysiak 2017-09-28 14:41:11 +02:00 committed by Jes Sorensen
parent 44b6b87610
commit b251424242
4 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mdadm.h
View File

@ -687,6 +687,7 @@ extern int sysfs_unique_holder(char *devnm, long rdev);
extern int sysfs_freeze_array(struct mdinfo *sra);
extern int sysfs_wait(int fd, int *msec);
extern int load_sys(char *path, char *buf, int len);
extern int zero_disk_range(int fd, unsigned long long sector, size_t count);
extern int reshape_prepare_fdlist(char *devname,
struct mdinfo *sra,
int raid_disks,

7
super-intel.c
View File

@ -6065,7 +6065,12 @@ static int write_init_ppl_imsm(struct supertype *st, struct mdinfo *info, int fd
struct ppl_header *ppl_hdr;
int ret;
ret = posix_memalign(&buf, 4096, PPL_HEADER_SIZE);
/* first clear entire ppl space */
ret = zero_disk_range(fd, info->ppl_sector, info->ppl_size);
if (ret)
return ret;
ret = posix_memalign(&buf, MAX_SECTOR_SIZE, PPL_HEADER_SIZE);
if (ret) {
pr_err("Failed to allocate PPL header buffer\n");
return ret;

5
super1.c
View File

@ -1823,6 +1823,11 @@ static int write_init_ppl1(struct supertype *st, struct mdinfo *info, int fd)
struct ppl_header *ppl_hdr;
int ret;
/* first clear entire ppl space */
ret = zero_disk_range(fd, info->ppl_sector, info->ppl_size);
if (ret)
return ret;
ret = posix_memalign(&buf, 4096, PPL_HEADER_SIZE);
if (ret) {
pr_err("Failed to allocate PPL header buffer\n");

49
util.c
View File

@ -30,6 +30,7 @@
#include <sys/un.h>
#include <sys/resource.h>
#include <sys/vfs.h>
#include <sys/mman.h>
#include <linux/magic.h>
#include <poll.h>
#include <ctype.h>
@ -2334,3 +2335,51 @@ void set_hooks(void)
set_dlm_hooks();
set_cmap_hooks();
}
int zero_disk_range(int fd, unsigned long long sector, size_t count)
{
int ret = 0;
int fd_zero;
void *addr = NULL;
size_t written = 0;
size_t len = count * 512;
ssize_t n;
fd_zero = open("/dev/zero", O_RDONLY);
if (fd_zero < 0) {
pr_err("Cannot open /dev/zero\n");
return -1;
}
if (lseek64(fd, sector * 512, SEEK_SET) < 0) {
ret = -errno;
pr_err("Failed to seek offset for zeroing\n");
goto out;
}
addr = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd_zero, 0);
if (addr == MAP_FAILED) {
ret = -errno;
pr_err("Mapping /dev/zero failed\n");
goto out;
}
do {
n = write(fd, addr + written, len - written);
if (n < 0) {
if (errno == EINTR)
continue;
ret = -errno;
pr_err("Zeroing disk range failed\n");
break;
}
written += n;
} while (written != len);
munmap(addr, len);
out:
close(fd_zero);
return ret;
}