summaryrefslogtreecommitdiff
path: root/util/nvmutil/nvmutil.c
diff options
context:
space:
mode:
Diffstat (limited to 'util/nvmutil/nvmutil.c')
-rw-r--r--util/nvmutil/nvmutil.c97
1 files changed, 55 insertions, 42 deletions
diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c
index 99900878..54a79c9e 100644
--- a/util/nvmutil/nvmutil.c
+++ b/util/nvmutil/nvmutil.c
@@ -18,7 +18,8 @@ void cmd_setchecksum(void), cmd_brick(void), swap(int partnum), writeGbe(void),
cmd_dump(void), cmd_setmac(void), nvmalloc(void), readGbe(void),
checkdir(const char *path), macf(int partnum), hexdump(int partnum),
parseMacString(const char *strMac, uint16_t *mac), cmd_swap(void),
- openFiles(const char *path), cmd_copy(void);
+ openFiles(const char *path), cmd_copy(void), writeGbe_part(int),
+ readGbe_part(int);
int goodChecksum(int partnum);
uint8_t hextonum(char chs), rhex(void);
@@ -40,7 +41,7 @@ size_t partsize, gbe[2];
uint8_t nvmPartChanged[2] = {0, 0}, do_read[2] = {1, 1};
int flags, rfd, fd, part, e = 1;
-const char *strMac = NULL, *strRMac = "xx:xx:xx:xx:xx:xx", *filename = NULL;
+const char *strMac = NULL, *strRMac = "xx:xx:xx:xx:xx:xx", *fname = NULL;
typedef struct op {
char *str;
@@ -57,11 +58,13 @@ op_t op[] = {
};
void (*cmd)(void) = NULL;
-#define ERR() errno = errno ? errno : ECANCELED
-#define err_if(x) if (x) err(ERR(), "%s", filename)
+#define SET_ERR(x) errno = errno ? errno : x
+#define err_if(x) if (x) err(SET_ERR(ECANCELED), "%s", fname)
-#define xopen(f,l,p) if ((f = open(l, p)) == -1) err(ERR(), "%s", l); \
- if (fstat(f, &st) == -1) err(ERR(), "%s", l)
+#define xopen(f,l,p) \
+ if ((f = open(l, p)) == -1) \
+ err(SET_ERR(ECANCELED), "%s", l); \
+ if (fstat(f, &st) == -1) err(SET_ERR(ECANCELED), "%s", l)
#define word(pos16, partnum) ((uint16_t *) gbe[partnum])[pos16]
#define setWord(pos16, p, val16) if (word(pos16, p) != val16) \
@@ -88,10 +91,10 @@ main(int argc, char *argv[])
fprintf(stderr, " %s FILE copy 0|1\n", argv[0]);
fprintf(stderr, " %s FILE brick 0|1\n", argv[0]);
fprintf(stderr, " %s FILE setchecksum 0|1\n", argv[0]);
- err(errno = ECANCELED, "Too few arguments");
+ err(SET_ERR(ECANCELED), "Too few arguments");
}
- filename = argv[1];
+ fname = argv[1];
flags = O_RDWR;
@@ -105,23 +108,23 @@ main(int argc, char *argv[])
}
checkdir("/dev/urandom");
- checkdir(filename);
+ checkdir(fname);
#ifdef __OpenBSD__
err_if(unveil("/dev/urandom", "r") == -1);
if (flags == O_RDONLY) {
- err_if(unveil(filename, "r") == -1);
+ err_if(unveil(fname, "r") == -1);
err_if(unveil(NULL, NULL) == -1);
err_if(pledge("stdio rpath", NULL) == -1);
} else {
- err_if(unveil(filename, "rw") == -1);
+ err_if(unveil(fname, "rw") == -1);
err_if(unveil(NULL, NULL) == -1);
err_if(pledge("stdio rpath wpath", NULL) == -1);
}
#endif
- openFiles(filename);
+ openFiles(fname);
#ifdef __OpenBSD__
err_if(pledge("stdio", NULL) == -1);
#endif
@@ -134,7 +137,7 @@ main(int argc, char *argv[])
cmd = op[i].cmd;
break;
}
- err(errno = EINVAL, "Too few args on command '%s'",
+ err(SET_ERR(EINVAL), "Too few args on command '%s'",
op[i].str);
}
} else {
@@ -167,7 +170,7 @@ void
checkdir(const char *path)
{
if (opendir(path) != NULL)
- err(errno = EISDIR, "%s", path);
+ err(SET_ERR(EISDIR), "%s", path);
if (errno == ENOTDIR)
errno = 0;
err_if(errno);
@@ -187,7 +190,7 @@ openFiles(const char *path)
partsize = st.st_size >> 1;
break;
default:
- err(errno = ECANCELED, "Invalid file size (not 8/16/128KiB)");
+ err(SET_ERR(ECANCELED), "Invalid file size (not 8/16/128KiB)");
break;
}
@@ -197,33 +200,41 @@ openFiles(const char *path)
void
nvmalloc(void)
{
+ /* same operations need the full block, others only 128 bytes */
+ nf = NVM_SIZE;
if ((cmd == cmd_swap) || (cmd == cmd_copy))
nf = SIZE_4KB;
- else
- nf = NVM_SIZE;
+ /* only read the part specified, for copy/setchecksum/brick */
if ((cmd == cmd_copy) || (cmd == cmd_setchecksum) || (cmd == cmd_brick))
do_read[part ^ 1] = 0;
+ /* only allocate one block if only one part being read */
char *buf = malloc(nf << (do_read[0] & do_read[1]));
if (buf == NULL)
err(errno, NULL);
gbe[0] = (size_t) buf;
+
+ /* speedhack: for cmd copy, both pointers are set the same */
gbe[1] = gbe[0] + (nf * (do_read[0] & do_read[1]));
}
void
readGbe(void)
{
- for (int p = 0; p < 2; p++) {
- if (!do_read[p])
- continue;
- if (pread(fd, (uint8_t *) gbe[p], nf, p * partsize) != nf)
- err(ERR(), "Couldn't read %ld bytes from '%s' part %d",
- nf, filename, p);
- swap(p); /* handle big-endian host CPU */
- }
+ for (int p = 0; p < 2; p++)
+ if (do_read[p])
+ readGbe_part(p);
+}
+
+void
+readGbe_part(int p)
+{
+ if (pread(fd, (uint8_t *) gbe[p], nf, p * partsize) != nf)
+ err(SET_ERR(ECANCELED),
+ "Can't read %ld b from '%s' p%d", nf, fname, p);
+ swap(p); /* handle big-endian host CPU */
}
void
@@ -257,12 +268,12 @@ parseMacString(const char *strMac, uint16_t *mac)
{
uint64_t total = 0;
if (strnlen(strMac, 20) != 17)
- err(errno = EINVAL, "Invalid MAC address string length");
+ err(SET_ERR(EINVAL), "Invalid MAC address string length");
for (uint8_t h, i = 0; i < 16; i += 3) {
if (i != 15)
if (strMac[i + 2] != ':')
- err(errno = EINVAL,
+ err(SET_ERR(EINVAL),
"Invalid MAC address separator '%c'",
strMac[i + 2]);
@@ -270,7 +281,7 @@ parseMacString(const char *strMac, uint16_t *mac)
for (int nib = 0; nib < 2; nib++, total += h) {
if ((h = hextonum(strMac[i + nib])) > 15)
- err(errno = EINVAL, "Invalid character '%c'",
+ err(SET_ERR(EINVAL), "Invalid character '%c'",
strMac[i + nib]);
/* If random, ensure that local/unicast bits are set */
@@ -286,9 +297,9 @@ parseMacString(const char *strMac, uint16_t *mac)
}
if (total == 0)
- err(errno = EINVAL, "Invalid MAC (all-zero MAC address)");
+ err(SET_ERR(EINVAL), "Invalid MAC (all-zero MAC address)");
if (mac[0] & 1)
- err(errno = EINVAL, "Invalid MAC (multicast bit set)");
+ err(SET_ERR(EINVAL), "Invalid MAC (multicast bit set)");
}
uint8_t
@@ -302,8 +313,7 @@ hextonum(char ch)
return ch - 'a' + 10;
else if ((ch == '?') || (ch == 'x') || (ch == 'X'))
return rhex(); /* random hex value */
- else
- return 16; /* error: invalid character */
+ return 16; /* error: invalid character */
}
uint8_t
@@ -410,24 +420,27 @@ goodChecksum(int partnum)
return 1;
fprintf(stderr, "WARNING: BAD checksum in part %d\n", partnum);
- errno = ECANCELED;
+ SET_ERR(ECANCELED);
return 0;
}
void
writeGbe(void)
{
- for (int p = 0; p < 2; p++) {
- if ((!nvmPartChanged[p]) || (flags == O_RDONLY))
- continue;
+ for (int p = 0; p < 2; p++)
+ if ((nvmPartChanged[p]) && (flags != O_RDONLY))
+ writeGbe_part(p);
+ err_if(close(fd) == -1);
+}
- swap(p); /* swap bytes on big-endian host CPUs */
- if(pwrite(fd, (uint8_t *) gbe[p], nf, p * partsize) != nf)
- err(ERR(), "Couldn't write %ld bytes to '%s' part '%d'",
- nf, filename, p);
- }
+void
+writeGbe_part(int p)
+{
+ swap(p); /* swap bytes on big-endian host CPUs */
+ if(pwrite(fd, (uint8_t *) gbe[p], nf, p * partsize) != nf)
+ err(SET_ERR(ECANCELED),
+ "Can't write %ld b to '%s' p%d", nf, fname, p);
- err_if(close(fd) == -1);
}
void
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-23 20:54:26 +0000