summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Epler <jepler@gmail.com>2018-07-30 20:49:20 -0500
committerJeff Epler <jepler@gmail.com>2018-08-08 19:21:57 -0500
commite1b4e9b7c7cdd7a022a5ab113b68c8fa6be2c74d (patch)
tree1d6ec2c59f935da153f3d42622392879c0dd6cba
parent2e80f37709c9fd7b168b684452ec436c24651973 (diff)
UART: Always allocate UART objects in the long-lived pool
Particularly when they have buffers that are written via IRQ or DMA, UART objects do not relocate gracefully. If such an object is relocated to the long-lived pool after its original creation, the IRQ or DMA will write to an unexpected location within the Python heap, leading to a variety of symptoms. The most frequent symptom is inability to read from the UART. Consider the particular case of atmel-samd: usart_uart_obj_t contains a usart_async_descriptor contains a _usart_async_device. In _sercom_init_irq_param the address of this contained _usart_async_device is assigned to a global array sercom_to_sercom_dev which is later used from the interrupt context _sercom_usart_interrupt_handler to store the received data in the right ring buffer. When the UART object is relocated to the long-lived heap, there's no mechanism to re-point these internal pointers, so instead take the cowardly way and allocate the UART object as long-lived. Happily, almost all UART objects are likely to be long-lived, so this is unlikely to have a negative effect on memory usage or heap fragmentation. Closes: #1056
-rw-r--r--shared-bindings/busio/UART.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index 1b63d8d0e..9bad2468e 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -66,7 +66,11 @@ extern const busio_uart_parity_obj_t busio_uart_parity_odd_obj;
STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *pos_args) {
mp_arg_check_num(n_args, n_kw, 0, MP_OBJ_FUN_ARGS_MAX, true);
- busio_uart_obj_t *self = m_new_obj(busio_uart_obj_t);
+ // Always initially allocate the UART object within the long-lived heap.
+ // This is needed to avoid crashes with certain UART implementations which
+ // cannot accomodate being moved after creation. (See
+ // https://github.com/adafruit/circuitpython/issues/1056)
+ busio_uart_obj_t *self = m_new_ll_obj(busio_uart_obj_t);
self->base.type = &busio_uart_type;
mp_map_t kw_args;
mp_map_init_fixed_table(&kw_args, n_kw, pos_args + n_args);