mirror of
https://github.com/amadvance/snapraid.git
synced 2026-11-19 22:46:36 -05:00
Log devices mapping
This commit is contained in:
parent
fa13703a7f
commit
c153898c9a
7 changed files with 327 additions and 15 deletions
4
HISTORY
4
HISTORY
|
|
@ -1,6 +1,10 @@
|
|||
SnapRAID HISTORY
|
||||
================
|
||||
|
||||
14.0rc3c 16/03/2026
|
||||
===================
|
||||
* Log additional information to allow to handle dynamic devices associations
|
||||
|
||||
14.0rc3 15/03/2026
|
||||
==================
|
||||
* New 'extra' config option to define additional disks to monitor with the
|
||||
|
|
|
|||
|
|
@ -1016,6 +1016,12 @@ void state_device(struct snapraid_state* state, int operation, tommy_list* filte
|
|||
int ret;
|
||||
time_t now = time(0);
|
||||
|
||||
/* map device if not already done */
|
||||
if (!state->mapped_device) {
|
||||
devmap();
|
||||
state->mapped_device = 1;
|
||||
}
|
||||
|
||||
switch (operation) {
|
||||
case DEVICE_UP : msg_progress("Spinup...\n"); break;
|
||||
case DEVICE_DOWN : msg_progress("Spindown...\n"); break;
|
||||
|
|
|
|||
|
|
@ -2534,7 +2534,6 @@ retry:
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void devattr_property(HANDLE h, char* serial, char* model, char* inter)
|
||||
{
|
||||
STORAGE_PROPERTY_QUERY query = { 0 };
|
||||
|
|
@ -2561,12 +2560,12 @@ static void devattr_property(HANDLE h, char* serial, char* model, char* inter)
|
|||
STORAGE_DEVICE_DESCRIPTOR* desc = (STORAGE_DEVICE_DESCRIPTOR*)buffer;
|
||||
|
||||
/* extract strings (offsets are from start of descriptor) */
|
||||
if (*model == 0 && desc->ProductIdOffset) {
|
||||
if (model && *model == 0 && desc->ProductIdOffset) {
|
||||
snprintf(model, SMART_MAX, "%s", (char*)(buffer + desc->ProductIdOffset));
|
||||
strtrim(model);
|
||||
}
|
||||
|
||||
if (*serial == 0 && desc->SerialNumberOffset) {
|
||||
if (serial && *serial == 0 && desc->SerialNumberOffset) {
|
||||
snprintf(serial, SMART_MAX, "%s", (char*)(buffer + desc->SerialNumberOffset));
|
||||
strtrim(serial);
|
||||
}
|
||||
|
|
@ -2604,7 +2603,7 @@ static void devattr_property(HANDLE h, char* serial, char* model, char* inter)
|
|||
case BusTypeNvmeof : type = "NVMe"; break;
|
||||
default :
|
||||
}
|
||||
if (type)
|
||||
if (inter && type)
|
||||
snprintf(inter, SMART_MAX, "%s", type);
|
||||
|
||||
free(buffer);
|
||||
|
|
@ -3149,6 +3148,33 @@ int devquery(tommy_list* high, tommy_list* low, int operation)
|
|||
return device_thread(low, func);
|
||||
}
|
||||
|
||||
int devmap(void)
|
||||
{
|
||||
for (int i = 0; i < 32; i++) {
|
||||
char wfile[PATH_MAX];
|
||||
wchar_t conv_buf[CONV_MAX];
|
||||
pathprint(wfile, sizeof(wfile), "\\\\.\\PhysicalDrive%d", i);
|
||||
HANDLE h;
|
||||
|
||||
/* open the volume */
|
||||
h = CreateFileW(convert(conv_buf, wfile), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_WRITE_THROUGH, 0);
|
||||
if (h == INVALID_HANDLE_VALUE)
|
||||
continue;
|
||||
|
||||
char esc_buffer[ESC_MAX];
|
||||
char serial[SMART_MAX];
|
||||
serial[0] = 0;
|
||||
devattr_property(h, serial, 0, 0);
|
||||
if (serial[0]) {
|
||||
log_tag("map:/dev/pd%d:%s\n", i, esc_tag(serial, esc_buffer));
|
||||
}
|
||||
|
||||
CloseHandle(h);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/****************************************************************************/
|
||||
/* pthread like interface */
|
||||
|
||||
|
|
|
|||
|
|
@ -577,6 +577,11 @@ int devquery(tommy_list* high, tommy_list* low, int operation);
|
|||
*/
|
||||
int devtest(tommy_list* high, tommy_list* low, int operation);
|
||||
|
||||
/**
|
||||
* Query all the "low" devices and log their unique identifiers
|
||||
*/
|
||||
int devmap(void);
|
||||
|
||||
/**
|
||||
* Get the ambient temperature in degree
|
||||
*
|
||||
|
|
|
|||
|
|
@ -138,6 +138,7 @@ void state_init(struct snapraid_state* state)
|
|||
unsigned l, s, i;
|
||||
|
||||
memset(&state->opt, 0, sizeof(state->opt));
|
||||
state->mapped_device = 0;
|
||||
state->filter_hidden = 0;
|
||||
state->autosave = 0;
|
||||
state->need_write = 0;
|
||||
|
|
|
|||
|
|
@ -125,6 +125,7 @@ struct snapraid_option {
|
|||
|
||||
struct snapraid_state {
|
||||
struct snapraid_option opt; /**< Setup options. */
|
||||
int mapped_device; /**< Devices were already mapped */
|
||||
int filter_hidden; /**< Filter out hidden files. */
|
||||
uint64_t autosave; /**< Autosave after the specified amount of data. 0 to disable. */
|
||||
int need_write; /**< If the state is changed. */
|
||||
|
|
|
|||
291
cmdline/unix.c
291
cmdline/unix.c
|
|
@ -130,6 +130,204 @@ static int sysread(const char* path, char* buf, size_t buf_size)
|
|||
}
|
||||
#endif
|
||||
|
||||
#if HAVE_LINUX_DEVICE
|
||||
/*
|
||||
* sysread_vpd_pg83 — parse raw binary VPD page 0x83 (Device Identification)
|
||||
* from a sysfs vpd_pg83 file and extract the first NAA (Network Address
|
||||
* Authority) designator for the Logical Unit (ASSOCIATION == 0x00).
|
||||
*/
|
||||
static int sysattr_vpd_pg80(const char* path, char* dst, size_t dst_size)
|
||||
{
|
||||
unsigned char buf[512];
|
||||
int ret = sysread(path, (char*)buf, sizeof(buf));
|
||||
|
||||
/* need at least the header */
|
||||
if (ret < 4)
|
||||
return -1;
|
||||
|
||||
/* validate page code */
|
||||
if (buf[1] != 0x80)
|
||||
return -1;
|
||||
|
||||
/* clamp to what was actually read */
|
||||
size_t page_len = buf[3];
|
||||
size_t available = (size_t)ret - 4;
|
||||
if (available < page_len)
|
||||
page_len = available;
|
||||
|
||||
/* if empty */
|
||||
if (page_len == 0)
|
||||
return -1;
|
||||
|
||||
/* if too bit to store the 0 termination */
|
||||
if (4 + page_len + 1 > sizeof(buf))
|
||||
return -1;
|
||||
|
||||
char* attr = (char*)buf + 4;
|
||||
attr[page_len] = 0;
|
||||
strtrim(attr);
|
||||
|
||||
/* if empty */
|
||||
if (!*attr)
|
||||
return -1;
|
||||
|
||||
pathcpy(dst, dst_size, attr);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* sysread_vpd_pg83 — parse raw binary VPD page 0x83 (Device Identification)
|
||||
* from a sysfs vpd_pg83 file and extract the first NAA (Network Address
|
||||
* Authority) designator for the Logical Unit (ASSOCIATION == 0x00).
|
||||
*
|
||||
* The result is written into dst as a lowercase hex string,
|
||||
* e.g.: "5000c500abcdef01" (8-byte / NAA type 1,2,3,5)
|
||||
* "6000c500abcdef010000000000000000" (16-byte / NAA type 6)
|
||||
*
|
||||
* VPD page 0x83 wire format (SPC-4 §7.7.2)
|
||||
*
|
||||
* Page header — 4 bytes:
|
||||
* [0] peripheral qualifier (7:5) | device type (4:0)
|
||||
* [1] page code = 0x83
|
||||
* [2] PAGE LENGTH MSB } 16-bit big-endian: number of bytes that follow
|
||||
* [3] PAGE LENGTH LSB } the header (i.e. total descriptor bytes)
|
||||
*
|
||||
* Then a sequence of Designation Descriptors:
|
||||
* [+0] PROTOCOL ID (7:4) | CODE SET (3:0)
|
||||
* 0x1 = binary, 0x2 = ASCII, 0x3 = UTF-8
|
||||
* [+1] PIV (7) | reserved (6) | ASSOCIATION (5:4) | DESIGNATOR TYPE (3:0)
|
||||
* ASSOCIATION: 0x0 = logical unit ← we want only this
|
||||
* 0x1 = target port
|
||||
* 0x2 = target device
|
||||
* DESIGNATOR TYPE: 0x3 = NAA ← we want only this
|
||||
* [+2] reserved
|
||||
* [+3] DESIGNATOR LENGTH = N (bytes that follow in this descriptor)
|
||||
* [+4 … +4+N-1] DESIGNATOR (binary for NAA)
|
||||
*
|
||||
* ── NAA subtypes (top nibble of designator byte 0) ───────────────────────
|
||||
*
|
||||
* 0x1 NAA IEEE Extended → 8 bytes
|
||||
* 0x2 NAA Locally Assigned → 8 bytes
|
||||
* 0x3 NAA IEEE Registered → 8 bytes (most common on SATA/SAS)
|
||||
* 0x5 NAA IEEE Registered → 8 bytes
|
||||
* 0x6 NAA IEEE Registered Ext. → 16 bytes
|
||||
* others: reserved
|
||||
*
|
||||
* The DESIGNATOR LENGTH from the descriptor header must agree with the
|
||||
* expected length for the NAA subtype. If they disagree, the descriptor
|
||||
* is malformed and must be skipped.
|
||||
*
|
||||
* Returns 0 and fills dst on success, -1 if no valid NAA LU descriptor found.
|
||||
*/
|
||||
#if HAVE_LINUX_DEVICE
|
||||
static int sysattr_vpd_pg83(const char* path, char* dst, size_t dst_size)
|
||||
{
|
||||
unsigned char buf[4096];
|
||||
|
||||
int ret = sysread(path, (char*)buf, sizeof(buf));
|
||||
if (ret < 4)
|
||||
return -1;
|
||||
|
||||
/* validate page code */
|
||||
if (buf[1] != 0x83)
|
||||
return -1;
|
||||
|
||||
size_t page_len = ((size_t)buf[2] << 8) | buf[3];
|
||||
|
||||
/* clamp to what was actually read */
|
||||
size_t available = (size_t)ret - 4;
|
||||
if (page_len > available)
|
||||
page_len = available;
|
||||
|
||||
/* if empty */
|
||||
if (page_len == 0)
|
||||
return -1;
|
||||
|
||||
/*
|
||||
* Walk every Designation Descriptor looking for the first NAA descriptor
|
||||
* that is associated with the Logical Unit (ASSOCIATION == 0x00).
|
||||
*
|
||||
* We take the first one found rather than scoring: all NAA subtypes are
|
||||
* globally unique by construction; the first LU-associated NAA is the
|
||||
* canonical device WWN.
|
||||
*/
|
||||
size_t offset = 0;
|
||||
while (offset + 4 <= page_len) {
|
||||
const unsigned char* desc = buf + 4 + offset;
|
||||
|
||||
unsigned code_set = desc[0] & 0x0f;
|
||||
unsigned assoc = (desc[1] >> 4) & 0x03;
|
||||
unsigned dtype = desc[1] & 0x0f;
|
||||
size_t id_len = desc[3];
|
||||
|
||||
/* bounds check: the full descriptor must lie within page_len */
|
||||
if (offset + 4 + id_len > page_len)
|
||||
break; /* malformed page — stop iterating */
|
||||
|
||||
/* skip anything that is not an LU-associated NAA descriptor */
|
||||
if (assoc != 0x00 || dtype != 0x03)
|
||||
goto next;
|
||||
|
||||
/*
|
||||
* NAA is always binary (CODE SET == 0x01).
|
||||
* Reject if the device mis-advertises it as ASCII (defensive).
|
||||
*/
|
||||
if (code_set != 0x01)
|
||||
goto next;
|
||||
|
||||
/* if empty */
|
||||
if (id_len == 0)
|
||||
goto next;
|
||||
|
||||
/*
|
||||
* Validate NAA subtype vs. expected byte length.
|
||||
* The NAA value is the top nibble of the first byte of the
|
||||
* designator (NOT the descriptor header byte).
|
||||
*/
|
||||
unsigned naa = (desc[4] >> 4) & 0x0f;
|
||||
size_t expected = 0;
|
||||
|
||||
switch (naa) {
|
||||
case 0x1 : /* IEEE Extended */
|
||||
case 0x2 : /* lLocally Assigned */
|
||||
case 0x3 : /* IEEE Registered */
|
||||
case 0x5 : /* IEEE Registered */
|
||||
expected = 8;
|
||||
break;
|
||||
case 0x6 : /* IEEE Registered Extended */
|
||||
expected = 16;
|
||||
break;
|
||||
default :
|
||||
goto next;
|
||||
}
|
||||
|
||||
/* DESIGNATOR LENGTH must match the NAA subtype exactly */
|
||||
if (id_len != expected)
|
||||
goto next;
|
||||
|
||||
/*
|
||||
* Format as "naa:<hex>".
|
||||
* Each byte → 2 hex digits; prefix "naa:" is 4 chars; +1 for NUL.
|
||||
* Maximum: "naa:" + 32 hex digits (16 bytes) + NUL = 37 bytes.
|
||||
*/
|
||||
if (dst_size < 4 + id_len * 2 + 1)
|
||||
return -1; /* caller's buffer too small */
|
||||
|
||||
for (size_t i = 0; i < id_len; i++)
|
||||
snprintf(dst + i * 2, 3, "%02x", desc[4 + i]);
|
||||
dst[4 + id_len * 2] = '\0';
|
||||
|
||||
return 0;
|
||||
|
||||
next:
|
||||
offset += 4 + id_len;
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Read a file from sys.
|
||||
* Trim spaces.
|
||||
|
|
@ -1604,18 +1802,10 @@ static void devattr(dev_t device, uint64_t* info, char* serial, char* family, ch
|
|||
}
|
||||
|
||||
if (*serial == 0) {
|
||||
// --- Page 0x80: Unit Serial Number ---
|
||||
pathprint(path, sizeof(path), "/sys/dev/block/%u:%u/device/vpd_pg80", major(device), minor(device));
|
||||
ret = sysread(path, buf, sizeof(buf));
|
||||
if (ret > 4) {
|
||||
unsigned len = (unsigned char)buf[3];
|
||||
if (4 + len <= (size_t)ret && 4 + len + 1 <= sizeof(buf)) {
|
||||
char* attr = buf + 4;
|
||||
attr[len] = 0;
|
||||
strtrim(attr);
|
||||
if (*attr)
|
||||
pathcpy(serial, SMART_MAX, attr);
|
||||
}
|
||||
if (sysattr_vpd_pg80(path, buf, sizeof(buf)) == 0) {
|
||||
if (buf[0] != 0)
|
||||
pathcpy(serial, SMART_MAX, buf);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2439,5 +2629,84 @@ int ambient_temperature(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
int devmap(void)
|
||||
{
|
||||
#if HAVE_LINUX_DEVICE
|
||||
char esc_buffer[ESC_MAX];
|
||||
char path[PATH_MAX];
|
||||
DIR* d = opendir("/sys/block");
|
||||
if (!d)
|
||||
return -1;
|
||||
|
||||
struct dirent* dd;
|
||||
while (1) {
|
||||
char buf[256];
|
||||
|
||||
dd = readdir(d);
|
||||
if (dd == 0)
|
||||
break;
|
||||
|
||||
if (dd->d_name[0] == '.')
|
||||
continue;
|
||||
|
||||
/* verify it has a hardware device link (excludes virtual disks) */
|
||||
pathprint(path, sizeof(path), "/sys/block/%s/device", dd->d_name);
|
||||
if (access(path, F_OK) != 0)
|
||||
continue;
|
||||
|
||||
/* device/serial */
|
||||
pathprint(path, sizeof(path), "/sys/block/%s/device/serial", dd->d_name);
|
||||
if (sysattr(path, buf, sizeof(buf)) == 0 && buf[0] != 0) {
|
||||
log_tag("map:/dev/%s:%s\n", dd->d_name, esc_tag(buf, esc_buffer));
|
||||
}
|
||||
|
||||
/* device/vpd_pg80 */
|
||||
pathprint(path, sizeof(path), "/sys/block/%s/device/vpd_pg80", dd->d_name);
|
||||
if (sysattr_vpd_pg80(path, buf, sizeof(buf)) == 0 && buf[0] != 0) {
|
||||
log_tag("map:/dev/%s:%s\n", dd->d_name, esc_tag(buf, esc_buffer));
|
||||
}
|
||||
|
||||
/* device/vpd_pg83 */
|
||||
pathprint(path, sizeof(path), "/sys/block/%s/device/vpd_pg83", dd->d_name);
|
||||
if (sysattr_vpd_pg83(path, buf, sizeof(buf)) == 0 && buf[0] != 0) {
|
||||
log_tag("map:/dev/%s:naa.%s\n", dd->d_name, esc_tag(buf, esc_buffer));
|
||||
}
|
||||
|
||||
/* device/WWN */
|
||||
pathprint(path, sizeof(path), "/sys/block/%s/device/wwn", dd->d_name);
|
||||
if (sysattr(path, buf, sizeof(buf)) == 0 && buf[0] != 0) {
|
||||
log_tag("map:/dev/%s:%s\n", dd->d_name, esc_tag(buf, esc_buffer));
|
||||
}
|
||||
|
||||
/* device/WWID */
|
||||
pathprint(path, sizeof(path), "/sys/block/%s/device/wwid", dd->d_name);
|
||||
if (sysattr(path, buf, sizeof(buf)) == 0 && buf[0] != 0) {
|
||||
log_tag("map:/dev/%s:%s\n", dd->d_name, esc_tag(buf, esc_buffer));
|
||||
}
|
||||
|
||||
/* WWN */
|
||||
pathprint(path, sizeof(path), "/sys/block/%s/wwn", dd->d_name);
|
||||
if (sysattr(path, buf, sizeof(buf)) == 0 && buf[0] != 0) {
|
||||
log_tag("map:/dev/%s:%s\n", dd->d_name, esc_tag(buf, esc_buffer));
|
||||
}
|
||||
|
||||
/* WWID */
|
||||
pathprint(path, sizeof(path), "/sys/block/%s/wwid", dd->d_name);
|
||||
if (sysattr(path, buf, sizeof(buf)) == 0 && buf[0] != 0) {
|
||||
log_tag("map:/dev/%s:%s\n", dd->d_name, esc_tag(buf, esc_buffer));
|
||||
}
|
||||
|
||||
/* uuid */
|
||||
pathprint(path, sizeof(path), "/sys/block/%s/uuid", dd->d_name);
|
||||
if (sysattr(path, buf, sizeof(buf)) == 0 && buf[0] != 0) {
|
||||
log_tag("map:/dev/%s:%s\n", dd->d_name, esc_tag(buf, esc_buffer));
|
||||
}
|
||||
}
|
||||
|
||||
closedir(d);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue