- flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: tests/linux_mtd: Allow for checking open() calls
by Edward O'Callaghan (Code Review) 24 Feb '22

24 Feb '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/62318 ) Change subject: tests/linux_mtd: Allow for checking open() calls ...................................................................... tests/linux_mtd: Allow for checking open() calls BUG=b:217629892,b:215255210 TEST=`ninja test`. Change-Id: I06e54c0bdc4f5320904e2ab6542345721f1ca370 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M tests/init_shutdown.c 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/18/62318/1 diff --git a/tests/init_shutdown.c b/tests/init_shutdown.c index 2a8d6f5..5221a16 100644 --- a/tests/init_shutdown.c +++ b/tests/init_shutdown.c @@ -193,6 +193,8 @@ struct linux_mtd_io_state { char *fopen_path; + unsigned int noc; + const char *paths[2]; // no. of subsequent paths to check. }; FILE *linux_mtd_fopen(void *state, const char *pathname, const char *mode) @@ -247,15 +249,29 @@ return 0; } +static int linux_mtd_open(void *state, const char *pathname, int flags) +{ + struct linux_mtd_io_state *io_state = state; + const char *path = io_state->paths[io_state->noc]; + io_state->noc++; // proceed to the next path upon next call. + assert_string_equal(pathname, path); + return 0x1EA; +} + void linux_mtd_init_and_shutdown_test_success(void **state) { #if CONFIG_LINUX_MTD == 1 - struct linux_mtd_io_state linux_mtd_io_state = { NULL }; + struct linux_mtd_io_state linux_mtd_io_state = { + .fopen_path = NULL, + .paths = {}, + .noc = 0, + }; const struct io_mock linux_mtd_io = { .state = &linux_mtd_io_state, .fopen = linux_mtd_fopen, .fread = linux_mtd_fread, .fclose = linux_mtd_fclose, + .open = linux_mtd_open, }; io_mock_register(&linux_mtd_io); -- To view, visit https://review.coreboot.org/c/flashrom/+/62318 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I06e54c0bdc4f5320904e2ab6542345721f1ca370 Gerrit-Change-Number: 62318 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests/linux_spi: Validate param file path
by Edward O'Callaghan (Code Review) 24 Feb '22

24 Feb '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/62319 ) Change subject: tests/linux_spi: Validate param file path ...................................................................... tests/linux_spi: Validate param file path BUG=b:217629892,b:215255210 TEST=`ninja test`. Change-Id: If5d24c65f291c53a35509fea5d2f5b3fdb51c306 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M tests/init_shutdown.c 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/19/62319/1 diff --git a/tests/init_shutdown.c b/tests/init_shutdown.c index 5221a16..4fb93b2 100644 --- a/tests/init_shutdown.c +++ b/tests/init_shutdown.c @@ -36,6 +36,23 @@ free(param_dup); } +struct default_io_mock_state { + unsigned int noc; + const char *paths[2]; // no. of subsequent paths to check. + int flags; + int fd; +}; + +static int default_open(void *state, const char *pathname, int flags) +{ + struct default_io_mock_state * io_state = state; + const char *path = io_state->paths[io_state->noc]; + io_state->noc++; // proceed to the next path upon next call. + assert_string_equal(pathname, path); + assert_int_equal(flags & io_state->flags, io_state->flags); + return io_state->fd; +} + void dummy_init_and_shutdown_test_success(void **state) { #if CONFIG_DUMMY == 1 @@ -299,8 +316,14 @@ * Specifically, it is reading the buffer size from sysfs. */ #if CONFIG_LINUX_SPI == 1 + static struct default_io_mock_state data = { + .paths = {"/dev/null"}, + .noc = 0, + }; const struct io_mock linux_spi_io = { .fgets = linux_spi_fgets, + .open = default_open, + .state = &data, }; io_mock_register(&linux_spi_io); -- To view, visit https://review.coreboot.org/c/flashrom/+/62319 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If5d24c65f291c53a35509fea5d2f5b3fdb51c306 Gerrit-Change-Number: 62319 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests/: Allow realtek_mst test to check multiple paths
by Edward O'Callaghan (Code Review) 24 Feb '22

24 Feb '22

Attention is currently required from: Anastasia Klimchuk. Hello build bot (Jenkins), Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/62311 to look at the new patch set (#4). Change subject: tests/: Allow realtek_mst test to check multiple paths ...................................................................... tests/: Allow realtek_mst test to check multiple paths While working on writing file-based locking for flashrom it was observed that the realtek_mst unit-test does not check subsequent paths from the io_mock state tracker. Add infrasture into the realtek_mst unit-test to allow for subsequent path validation. BUG=b:217629892,b:215255210 TEST=`ninja test`. Change-Id: I80d5e1fc26ad9caf49a98a7671d069bbd8428045 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M tests/init_shutdown.c 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/11/62311/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/62311 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I80d5e1fc26ad9caf49a98a7671d069bbd8428045 Gerrit-Change-Number: 62311 Gerrit-PatchSet: 4 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: flashrom.c: Implement file-based locking semantics
by Edward O'Callaghan (Code Review) 24 Feb '22

24 Feb '22

Attention is currently required from: Hung-Te Lin, Nico Huber, Subrata Banik, Edward O'Callaghan. Hello Hung-Te Lin, build bot (Jenkins), Nico Huber, Subrata Banik, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/62213 to look at the new patch set (#8). Change subject: flashrom.c: Implement file-based locking semantics ...................................................................... flashrom.c: Implement file-based locking semantics This upstreams the ChromiumOS implementation of file-based locking for multiple instances of flashrom that could be spawned either from libflashrom (perhaps by fwupd for example) and user cli as another example. Since flashrom is programming singleton state of hardware from userspace there is no way to exclusively own the address space and therefore a file-based locking semantic is considered here. BUG=b:217629892,b:215255210 BRANCH=none TEST=nm -gD /build/brya/usr/lib64/libflashrom.so | grep "flock" Test futility update with multiple instances of flashrom running. Change-Id: I19cb4e3bf14caeb67c3e8100a20395b264c5113a Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M Makefile A big_lock.c A big_lock.h A file_lock.c M flashrom.c A ipc_lock.h M meson.build M tests/init_shutdown.c 8 files changed, 452 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/13/62213/8 -- To view, visit https://review.coreboot.org/c/flashrom/+/62213 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I19cb4e3bf14caeb67c3e8100a20395b264c5113a Gerrit-Change-Number: 62213 Gerrit-PatchSet: 8 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: file_lock.c: fails unit tests HACK [NOT-FOR-MERGE]
by Edward O'Callaghan (Code Review) 24 Feb '22

24 Feb '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/62313 ) Change subject: file_lock.c: fails unit tests HACK [NOT-FOR-MERGE] ...................................................................... file_lock.c: fails unit tests HACK [NOT-FOR-MERGE] Change-Id: I83caf28ca6528b4e0e7f21539c5019160ba6404e Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M file_lock.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/13/62313/1 diff --git a/file_lock.c b/file_lock.c index 4bcfeb2..72bce24 100644 --- a/file_lock.c +++ b/file_lock.c @@ -106,6 +106,7 @@ return -1; lock->fd = open(path, O_RDWR | O_CREAT, 0600); + return 0; // XXX open fails !!! if (lock->fd < 0) { msg_gerr("Cannot open lockfile %s", path); return -1; @@ -127,6 +128,7 @@ msecs_to_timespec(SLEEP_INTERVAL_MS, &sleep_interval); while ((ret = flock(lock->fd, LOCK_EX | LOCK_NB)) != 0) { + return 0; // XXX next block fails !!! if (errno != EWOULDBLOCK) { msg_gerr("Error obtaining lock"); return -1; -- To view, visit https://review.coreboot.org/c/flashrom/+/62313 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I83caf28ca6528b4e0e7f21539c5019160ba6404e Gerrit-Change-Number: 62313 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests/: wrap flock() and ftruncate()
by Edward O'Callaghan (Code Review) 24 Feb '22

24 Feb '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/62312 ) Change subject: tests/: wrap flock() and ftruncate() ...................................................................... tests/: wrap flock() and ftruncate() Change-Id: I57e7843a4d94c0a7200690d4c1d9e4194b9f83c5 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M tests/tests.c 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/12/62312/1 diff --git a/tests/tests.c b/tests/tests.c index 1dda467..e3b9604 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -36,6 +36,15 @@ return (char *)memcpy(new, s, len); } +int __wrap_flock(int fd, int operation) +{ + LOG_ME; +} +int __wrap_ftruncate(int fd, off_t length) +{ + LOG_ME; +} + void __wrap_physunmap(void *virt_addr, size_t len) { LOG_ME; -- To view, visit https://review.coreboot.org/c/flashrom/+/62312 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I57e7843a4d94c0a7200690d4c1d9e4194b9f83c5 Gerrit-Change-Number: 62312 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests/: Allow realtek_mst test to check multiple paths
by Edward O'Callaghan (Code Review) 24 Feb '22

24 Feb '22

Attention is currently required from: Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62311 ) Change subject: tests/: Allow realtek_mst test to check multiple paths ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://review.coreboot.org/c/flashrom/+/62311 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I80d5e1fc26ad9caf49a98a7671d069bbd8428045 Gerrit-Change-Number: 62311 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Thu, 24 Feb 2022 01:48:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: flashrom.c: Implement file-based locking semantics
by Edward O'Callaghan (Code Review) 24 Feb '22

24 Feb '22

Attention is currently required from: Hung-Te Lin, Nico Huber, Subrata Banik, Edward O'Callaghan. Hello Hung-Te Lin, build bot (Jenkins), Nico Huber, Subrata Banik, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/62213 to look at the new patch set (#7). Change subject: flashrom.c: Implement file-based locking semantics ...................................................................... flashrom.c: Implement file-based locking semantics This upstreams the ChromiumOS implementation of file-based locking for multiple instances of flashrom that could be spawned either from libflashrom (perhaps by fwupd for example) and user cli as another example. Since flashrom is programming singleton state of hardware from userspace there is no way to exclusively own the address space and therefore a file-based locking semantic is considered here. BUG=b:217629892,b:215255210 BRANCH=none TEST=nm -gD /build/brya/usr/lib64/libflashrom.so | grep "flock" Test futility update with multiple instances of flashrom running. Change-Id: I19cb4e3bf14caeb67c3e8100a20395b264c5113a Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M Makefile A big_lock.c A big_lock.h A file_lock.c M flashrom.c A ipc_lock.h M meson.build M tests/init_shutdown.c 8 files changed, 446 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/13/62213/7 -- To view, visit https://review.coreboot.org/c/flashrom/+/62213 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I19cb4e3bf14caeb67c3e8100a20395b264c5113a Gerrit-Change-Number: 62213 Gerrit-PatchSet: 7 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: flashrom.c: Implement file-based locking semantics
by Edward O'Callaghan (Code Review) 24 Feb '22

24 Feb '22

Attention is currently required from: Hung-Te Lin, Nico Huber, Subrata Banik, Edward O'Callaghan. Hello Hung-Te Lin, build bot (Jenkins), Nico Huber, Subrata Banik, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/62213 to look at the new patch set (#6). Change subject: flashrom.c: Implement file-based locking semantics ...................................................................... flashrom.c: Implement file-based locking semantics This upstreams the ChromiumOS implementation of file-based locking for multiple instances of flashrom that could be spawned either from libflashrom (perhaps by fwupd for example) and user cli as another example. Since flashrom is programming singleton state of hardware from userspace there is no way to exclusively own the address space and therefore a file-based locking semantic is considered here. BUG=b:217629892,b:215255210 BRANCH=none TEST=nm -gD /build/brya/usr/lib64/libflashrom.so | grep "flock" Test futility update with multiple instances of flashrom running. Change-Id: I19cb4e3bf14caeb67c3e8100a20395b264c5113a Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M Makefile A big_lock.c A big_lock.h A file_lock.c M flashrom.c A ipc_lock.h M meson.build M tests/init_shutdown.c 8 files changed, 446 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/13/62213/6 -- To view, visit https://review.coreboot.org/c/flashrom/+/62213 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I19cb4e3bf14caeb67c3e8100a20395b264c5113a Gerrit-Change-Number: 62213 Gerrit-PatchSet: 6 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: tests/: Allow realtek_mst test to check multiple paths
by Edward O'Callaghan (Code Review) 24 Feb '22

24 Feb '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/62311 ) Change subject: tests/: Allow realtek_mst test to check multiple paths ...................................................................... tests/: Allow realtek_mst test to check multiple paths [WIP] Change-Id: I80d5e1fc26ad9caf49a98a7671d069bbd8428045 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M tests/init_shutdown.c 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/11/62311/1 diff --git a/tests/init_shutdown.c b/tests/init_shutdown.c index 2a8d6f5..c0e404c 100644 --- a/tests/init_shutdown.c +++ b/tests/init_shutdown.c @@ -299,9 +299,21 @@ #define REALTEK_MST_MOCK_FD 0x10ec +struct realtek_mst_io_mock_state { + unsigned int noc; + const char *paths[2]; // no. of subsequent paths to check. +}; +static const char * get_realtek_mst_path(struct realtek_mst_io_mock_state * state) +{ + const char *path = state->paths[state->noc]; + state->noc++; // proceed to the next path upon next call. + return path; +} + static int realtek_mst_open(void *state, const char *pathname, int flags) { - assert_string_equal(pathname, "/dev/i2c-254"); + const char *path = get_realtek_mst_path(state); + assert_string_equal(pathname, path); assert_int_equal(flags & O_RDWR, O_RDWR); return REALTEK_MST_MOCK_FD; } @@ -335,11 +347,16 @@ void realtek_mst_init_and_shutdown_test_success(void **state) { #if CONFIG_REALTEK_MST_I2C_SPI == 1 + static struct realtek_mst_io_mock_state data = { + .paths = {"/run/lock/flashrom_lock", "/dev/i2c-254"}, + .noc = 0, + }; const struct io_mock realtek_mst_io = { .open = realtek_mst_open, .ioctl = realtek_mst_ioctl, .read = realtek_mst_read, .write = realtek_mst_write, + .state = &data, }; io_mock_register(&realtek_mst_io); -- To view, visit https://review.coreboot.org/c/flashrom/+/62311 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I80d5e1fc26ad9caf49a98a7671d069bbd8428045 Gerrit-Change-Number: 62311 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit