From 41b5b5471b010ad8b6ef24125b20eab2260278de Mon Sep 17 00:00:00 2001 From: Evgeniy Naydanov Date: Fri, 26 Jan 2024 11:44:39 +0300 Subject: [PATCH] Revert "break from long loops on shutdown request" This reverts commits 2e920a212fbe2de705811d547c169c1ae1611a02 and 8dbb1250f587484774752e8610f04a98157ca10a. The reason is, after `openocd_is_shutdown_pending()` becomes true, arbitrary command may be executed: * In `target_destroy()` and the corresponding `target->type->deinit_target()`. * In user-specifyed `pre_shutdown_commands` list. Change-Id: Icd00d1d954cd45e255880a6f76c3a74c098d6a17 Signed-off-by: Evgeniy Naydanov --- src/server/server.h | 1 - src/target/image.c | 3 --- src/target/riscv/batch.c | 3 --- src/target/riscv/program.c | 3 --- src/target/riscv/riscv-013.c | 6 ------ src/target/riscv/riscv.c | 6 ------ src/target/target.c | 20 +------------------- 7 files changed, 1 insertion(+), 41 deletions(-) diff --git a/src/server/server.h b/src/server/server.h index ea1e94ec5f..c9d4698af8 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -118,6 +118,5 @@ COMMAND_HELPER(server_port_command, unsigned short *out); #define ERROR_SERVER_REMOTE_CLOSED (-400) #define ERROR_CONNECTION_REJECTED (-401) -#define ERROR_SERVER_INTERRUPTED (-402) #endif /* OPENOCD_SERVER_SERVER_H */ diff --git a/src/target/image.c b/src/target/image.c index 440fe17d18..9175c200af 100644 --- a/src/target/image.c +++ b/src/target/image.c @@ -24,7 +24,6 @@ #include "image.h" #include "target.h" #include -#include /* convert ELF header field to host endianness */ #define field16(elf, field) \ @@ -1296,8 +1295,6 @@ int image_calculate_checksum(const uint8_t *buffer, uint32_t nbytes, uint32_t *c crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buffer++) & 255]; } keep_alive(); - if (openocd_is_shutdown_pending()) - return ERROR_SERVER_INTERRUPTED; } LOG_DEBUG("Calculating checksum done; checksum=0x%" PRIx32, crc); diff --git a/src/target/riscv/batch.c b/src/target/riscv/batch.c index 7abe8ade3f..290ce371be 100644 --- a/src/target/riscv/batch.c +++ b/src/target/riscv/batch.c @@ -111,9 +111,6 @@ int riscv_batch_run(struct riscv_batch *batch) keep_alive(); - if (openocd_is_shutdown_pending()) - return ERROR_SERVER_INTERRUPTED; - if (bscan_tunnel_ir_width != 0) { /* need to right-shift "in" by one bit, because of clock skew between BSCAN TAP and DM TAP */ for (size_t i = 0; i < batch->used_scans; ++i) { diff --git a/src/target/riscv/program.c b/src/target/riscv/program.c index 4543495192..22962fab4e 100644 --- a/src/target/riscv/program.c +++ b/src/target/riscv/program.c @@ -47,9 +47,6 @@ int riscv_program_exec(struct riscv_program *p, struct target *t) { keep_alive(); - if (openocd_is_shutdown_pending()) - return ERROR_SERVER_INTERRUPTED; - p->execution_result = RISCV_PROGBUF_EXEC_RESULT_UNKNOWN; riscv_reg_t saved_registers[GDB_REGNO_XPR31 + 1]; for (size_t i = GDB_REGNO_ZERO + 1; i <= GDB_REGNO_XPR31; ++i) { diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index 8b3260ce72..0a68bfe98a 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -599,9 +599,6 @@ static int dmi_op_timeout(struct target *target, uint32_t *data_in, keep_alive(); - if (openocd_is_shutdown_pending()) - return ERROR_SERVER_INTERRUPTED; - time_t start = time(NULL); /* This first loop performs the request. Note that if for some reason this * stays busy, it is actually due to the previous access. */ @@ -3248,9 +3245,6 @@ static int read_memory_bus_v1(struct target *target, target_addr_t address, return ERROR_FAIL; } keep_alive(); - if (openocd_is_shutdown_pending()) - return ERROR_SERVER_INTERRUPTED; - dmi_status_t status = dmi_scan(target, NULL, &sbvalue[next_read_j], DMI_OP_READ, sbdata[j], 0, false); /* By reading from sbdata0, we have just initiated another system bus read. diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c index c476e7e35f..97de01703c 100644 --- a/src/target/riscv/riscv.c +++ b/src/target/riscv/riscv.c @@ -5137,9 +5137,6 @@ static int riscv_set_or_write_register(struct target *target, keep_alive(); - if (openocd_is_shutdown_pending()) - return ERROR_SERVER_INTERRUPTED; - if (regid == GDB_REGNO_PC) { return riscv_set_or_write_register(target, GDB_REGNO_DPC, value, write_through); } else if (regid == GDB_REGNO_PRIV) { @@ -5237,9 +5234,6 @@ int riscv_get_register(struct target *target, riscv_reg_t *value, keep_alive(); - if (openocd_is_shutdown_pending()) - return ERROR_SERVER_INTERRUPTED; - if (regid == GDB_REGNO_PC) return riscv_get_register(target, value, GDB_REGNO_DPC); diff --git a/src/target/target.c b/src/target/target.c index 8fddce7e2c..ef7199dee1 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -1214,10 +1214,6 @@ int target_run_read_async_algorithm(struct target *target, /* Avoid GDB timeouts */ keep_alive(); - if (openocd_is_shutdown_pending()) { - retval = ERROR_SERVER_INTERRUPTED; - break; - } } if (retval != ERROR_OK) { @@ -3229,11 +3225,8 @@ int target_wait_state(struct target *target, enum target_state state, unsigned i nvp_value2name(nvp_target_state, state)->name); } - if (cur - then > 500) { + if (cur - then > 500) keep_alive(); - if (openocd_is_shutdown_pending()) - return ERROR_SERVER_INTERRUPTED; - } if ((cur-then) > ms) { LOG_ERROR("timed out while waiting for target %s", @@ -3516,11 +3509,6 @@ static int target_fill_mem(struct target *target, break; /* avoid GDB timeouts */ keep_alive(); - - if (openocd_is_shutdown_pending()) { - retval = ERROR_SERVER_INTERRUPTED; - break; - } } free(target_buf); @@ -3863,12 +3851,6 @@ static COMMAND_HELPER(handle_verify_image_command_internal, enum verify_mode ver } } keep_alive(); - if (openocd_is_shutdown_pending()) { - retval = ERROR_SERVER_INTERRUPTED; - free(data); - free(buffer); - goto done; - } } } free(data);