Index: kernel/generic/src/console/kconsole.c =================================================================== --- kernel/generic/src/console/kconsole.c (revision 6eaed07c879e185ee39859affa8f93a1e8155f41) +++ kernel/generic/src/console/kconsole.c (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -43,4 +43,5 @@ #include #include +#include #include #include @@ -202,12 +203,23 @@ * */ -NO_TRACE static int cmdtab_compl(char *input, size_t size) +NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev) { const char *name = input; size_t found = 0; + + /* + * Maximum Match Length: Length of longest matching common + * substring in case more than one match is found. + */ + size_t max_match_len = size; + size_t max_match_len_tmp = size; + size_t input_len = str_length(input); link_t *pos = NULL; const char *hint; char *output = malloc(MAX_CMDLINE, 0); + size_t hints_to_show = MAX_TAB_HINTS - 1; + size_t total_hints_shown = 0; + bool continue_showing_hints = true; output[0] = 0; @@ -219,4 +231,14 @@ pos = pos->next; found++; + } + + /* + * If the number of possible completions is more than MAX_TAB_HINTS, + * ask the user whether to display them or not. + */ + if (found > MAX_TAB_HINTS) { + printf("\n"); + continue_showing_hints = + console_prompt_display_all_hints(indev, found); } @@ -226,7 +248,29 @@ while (cmdtab_search_one(name, &pos)) { cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link); - printf("%s (%s)\n", hlp->name, hlp->description); + + if (continue_showing_hints) { + printf("%s (%s)\n", hlp->name, hlp->description); + --hints_to_show; + ++total_hints_shown; + + if ((hints_to_show == 0) && (total_hints_shown != found)) { + /* Ask user to continue */ + continue_showing_hints = + console_prompt_more_hints(indev, &hints_to_show); + } + } + pos = pos->next; - } + + for (max_match_len_tmp = 0; + (output[max_match_len_tmp] == + hlp->name[input_len + max_match_len_tmp]) && + (max_match_len_tmp < max_match_len); ++max_match_len_tmp); + + max_match_len = max_match_len_tmp; + } + + /* Keep only the characters common in all completions */ + output[max_match_len] = 0; } @@ -281,6 +325,8 @@ continue; - /* Find the beginning of the word - and copy it to tmp */ + /* + * Find the beginning of the word + * and copy it to tmp + */ size_t beg; for (beg = position - 1; (beg > 0) && (!isspace(current[beg])); @@ -295,23 +341,17 @@ if (beg == 0) { /* Command completion */ - found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE)); + found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev); } else { /* Symbol completion */ - found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE)); + found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev); } if (found == 0) continue; - - if (found > 1) { - /* No unique hint, list was printed */ - printf("%s> ", prompt); - printf("%ls", current); - print_cc('\b', wstr_length(current) - position); - continue; - } - - /* We have a hint */ - + + /* + * We have hints, possibly many. In case of more than one hint, + * tmp will contain the common prefix. + */ size_t off = 0; size_t i = 0; @@ -319,6 +359,18 @@ if (!wstr_linsert(current, ch, position + i, MAX_CMDLINE)) break; + i++; } + + if (found > 1) { + /* No unique hint, list was printed */ + printf("%s> ", prompt); + printf("%ls", current); + position += str_length(tmp); + print_cc('\b', wstr_length(current) - position); + continue; + } + + /* We have a hint */ printf("%ls", current + position); @@ -541,5 +593,5 @@ /** Parse command line. * - * @param cmdline Command line as read from input device. + * @param cmdline Command line as read from input device. * @param size Size (in bytes) of the string. * Index: kernel/generic/src/console/prompt.c =================================================================== --- kernel/generic/src/console/prompt.c (revision da68871a1ca8b07736e941032a954a3f19eadccc) +++ kernel/generic/src/console/prompt.c (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2012 Sandeep Kumar + * Copyright (c) 2012 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup genericconsole + * @{ + */ + +/** + * @file + * @brief Kernel console special prompts. + */ + +#include + +/** Display the display all possibilities prompt and wait for answer. + * + * @param indev Where to read characters from. + * @param hints Number of hints that would be displayed. + * + * @return Whether to print all hints. + * + */ +bool console_prompt_display_all_hints(indev_t *indev, size_t hints) +{ + ASSERT(indev); + ASSERT(hints > 0); + + printf("Display all %zu possibilities? (y or n) ", hints); + + while (true) { + wchar_t answer = indev_pop_character(indev); + + if ((answer == 'y') || (answer == 'Y')) { + printf("y"); + return true; + } + + if ((answer == 'n') || (answer == 'N')) { + printf("n"); + return false; + } + } +} + +/** Display the --more-- prompt and wait for answer. + * + * When the function returns false, @p display_hints is set to zero. + * + * @param[in] indev Where to read characters from. + * @param[out] display_hints How many hints to display. + * + * @return Whether to display more hints. + * + */ +bool console_prompt_more_hints(indev_t *indev, size_t *display_hints) +{ + ASSERT(indev); + ASSERT(display_hints != NULL); + + printf("--More--"); + while (true) { + wchar_t continue_showing_hints = indev_pop_character(indev); + /* Display a full page again? */ + if ((continue_showing_hints == 'y') || + (continue_showing_hints == 'Y') || + (continue_showing_hints == ' ')) { + *display_hints = MAX_TAB_HINTS - 1; + break; + } + + /* Stop displaying hints? */ + if ((continue_showing_hints == 'n') || + (continue_showing_hints == 'N') || + (continue_showing_hints == 'q') || + (continue_showing_hints == 'Q')) { + *display_hints = 0; + break; + } + + /* Show one more hint? */ + if (continue_showing_hints == '\n') { + *display_hints = 1; + break; + } + } + + /* Delete the --More-- option */ + printf("\r \r"); + + return *display_hints > 0; +} + +/** @} + */ Index: kernel/generic/src/debug/symtab.c =================================================================== --- kernel/generic/src/debug/symtab.c (revision 6eaed07c879e185ee39859affa8f93a1e8155f41) +++ kernel/generic/src/debug/symtab.c (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -43,4 +43,5 @@ #include #include +#include /** Get name of a symbol that seems most likely to correspond to address. @@ -209,5 +210,5 @@ * */ -int symtab_compl(char *input, size_t size) +int symtab_compl(char *input, size_t size, indev_t *indev) { #ifdef CONFIG_SYMTAB @@ -227,5 +228,22 @@ char output[MAX_SYMBOL_NAME]; + /* + * Maximum Match Length: Length of longest matching common substring in + * case more than one match is found. + */ + size_t max_match_len = size; + size_t max_match_len_tmp = size; + size_t input_len = str_length(input); + char *sym_name; + size_t hints_to_show = MAX_TAB_HINTS - 1; + size_t total_hints_shown = 0; + bool continue_showing_hints = true; + output[0] = 0; + + while ((hint = symtab_search_one(name, &pos))) + pos++; + + pos = 0; while ((hint = symtab_search_one(name, &pos))) { @@ -235,4 +253,14 @@ pos++; found++; + } + + /* + * If the number of possible completions is more than MAX_TAB_HINTS, + * ask the user whether to display them or not. + */ + if (found > MAX_TAB_HINTS) { + printf("\n"); + continue_showing_hints = + console_prompt_display_all_hints(indev, found); } @@ -241,7 +269,30 @@ pos = 0; while (symtab_search_one(name, &pos)) { - printf("%s\n", symbol_table[pos].symbol_name); + sym_name = symbol_table[pos].symbol_name; pos++; + + if (continue_showing_hints) { + /* We are still showing hints */ + printf("%s\n", sym_name); + --hints_to_show; + ++total_hints_shown; + + if ((hints_to_show == 0) && (total_hints_shown != found)) { + /* Ask the user to continue */ + continue_showing_hints = + console_prompt_more_hints(indev, &hints_to_show); + } + } + + for (max_match_len_tmp = 0; + (output[max_match_len_tmp] == + sym_name[input_len + max_match_len_tmp]) && + (max_match_len_tmp < max_match_len); ++max_match_len_tmp); + + max_match_len = max_match_len_tmp; } + + /* Keep only the characters common in all completions */ + output[max_match_len] = 0; } Index: kernel/generic/src/interrupt/interrupt.c =================================================================== --- kernel/generic/src/interrupt/interrupt.c (revision 6eaed07c879e185ee39859affa8f93a1e8155f41) +++ kernel/generic/src/interrupt/interrupt.c (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -50,4 +50,5 @@ #include #include +#include #include #include @@ -163,12 +164,6 @@ } -/** Terminate thread and task if exception came from userspace. - * - */ -NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...) -{ - if (!istate_from_uspace(istate)) - return; - +static NO_TRACE void fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args) +{ printf("Task %s (%" PRIu64 ") killed due to an exception at " "program counter %p.\n", TASK->name, TASK->taskid, @@ -179,12 +174,34 @@ printf("Kill message: "); + vprintf(fmt, args); + printf("\n"); + + task_kill_self(true); +} + +/** Terminate thread and task after the exception came from userspace. + * + */ +NO_TRACE void fault_from_uspace(istate_t *istate, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + fault_from_uspace_core(istate, fmt, args); + va_end(args); +} + +/** Terminate thread and task if exception came from userspace. + * + */ +NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...) +{ + if (!istate_from_uspace(istate)) + return; va_list args; va_start(args, fmt); - vprintf(fmt, args); + fault_from_uspace_core(istate, fmt, args); va_end(args); - printf("\n"); - - task_kill_self(true); } Index: kernel/generic/src/ipc/irq.c =================================================================== --- kernel/generic/src/ipc/irq.c (revision 6eaed07c879e185ee39859affa8f93a1e8155f41) +++ kernel/generic/src/ipc/irq.c (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -39,14 +39,14 @@ * when interrupt is detected. The application may provide a simple 'top-half' * handler as part of its registration, which can perform simple operations - * (read/write port/memory, add information to notification ipc message). + * (read/write port/memory, add information to notification IPC message). * * The structure of a notification message is as follows: * - IMETHOD: interface and method as registered by * the SYS_IRQ_REGISTER syscall - * - ARG1: payload modified by a 'top-half' handler - * - ARG2: payload modified by a 'top-half' handler - * - ARG3: payload modified by a 'top-half' handler - * - ARG4: payload modified by a 'top-half' handler - * - ARG5: payload modified by a 'top-half' handler + * - ARG1: payload modified by a 'top-half' handler (scratch[1]) + * - ARG2: payload modified by a 'top-half' handler (scratch[2]) + * - ARG3: payload modified by a 'top-half' handler (scratch[3]) + * - ARG4: payload modified by a 'top-half' handler (scratch[4]) + * - ARG5: payload modified by a 'top-half' handler (scratch[5]) * - in_phone_hash: interrupt counter (may be needed to assure correct order * in multithreaded drivers) @@ -87,7 +87,5 @@ static void ranges_unmap(irq_pio_range_t *ranges, size_t rangecount) { - size_t i; - - for (i = 0; i < rangecount; i++) { + for (size_t i = 0; i < rangecount; i++) { #ifdef IO_SPACE_BOUNDARY if ((void *) ranges[i].base >= IO_SPACE_BOUNDARY) @@ -100,14 +98,11 @@ irq_cmd_t *cmds, size_t cmdcount) { - uintptr_t *pbase; - size_t i, j; - /* Copy the physical base addresses aside. */ - pbase = malloc(rangecount * sizeof(uintptr_t), 0); - for (i = 0; i < rangecount; i++) + uintptr_t *pbase = malloc(rangecount * sizeof(uintptr_t), 0); + for (size_t i = 0; i < rangecount; i++) pbase[i] = ranges[i].base; - + /* Map the PIO ranges into the kernel virtual address space. */ - for (i = 0; i < rangecount; i++) { + for (size_t i = 0; i < rangecount; i++) { #ifdef IO_SPACE_BOUNDARY if ((void *) ranges[i].base < IO_SPACE_BOUNDARY) @@ -122,25 +117,25 @@ } } - + /* Rewrite the pseudocode addresses from physical to kernel virtual. */ - for (i = 0; i < cmdcount; i++) { + for (size_t i = 0; i < cmdcount; i++) { uintptr_t addr; size_t size; - + /* Process only commands that use an address. */ switch (cmds[i].cmd) { case CMD_PIO_READ_8: - case CMD_PIO_WRITE_8: - case CMD_PIO_WRITE_A_8: + case CMD_PIO_WRITE_8: + case CMD_PIO_WRITE_A_8: size = 1; break; - case CMD_PIO_READ_16: - case CMD_PIO_WRITE_16: - case CMD_PIO_WRITE_A_16: + case CMD_PIO_READ_16: + case CMD_PIO_WRITE_16: + case CMD_PIO_WRITE_A_16: size = 2; break; - case CMD_PIO_READ_32: - case CMD_PIO_WRITE_32: - case CMD_PIO_WRITE_A_32: + case CMD_PIO_READ_32: + case CMD_PIO_WRITE_32: + case CMD_PIO_WRITE_A_32: size = 4; break; @@ -149,21 +144,21 @@ continue; } - + addr = (uintptr_t) cmds[i].addr; + size_t j; for (j = 0; j < rangecount; j++) { - /* Find the matching range. */ if (!iswithin(pbase[j], ranges[j].size, addr, size)) continue; - + /* Switch the command to a kernel virtual address. */ addr -= pbase[j]; addr += ranges[j].base; - + cmds[i].addr = (void *) addr; break; } - + if (j == rangecount) { /* @@ -176,6 +171,46 @@ } } - + free(pbase); + return EOK; +} + +/** Statically check the top-half pseudocode + * + * Check the top-half pseudocode for invalid or unsafe + * constructs. + * + */ +static int code_check(irq_cmd_t *cmds, size_t cmdcount) +{ + for (size_t i = 0; i < cmdcount; i++) { + /* + * Check for accepted ranges. + */ + if (cmds[i].cmd >= CMD_LAST) + return EINVAL; + + if (cmds[i].srcarg >= IPC_CALL_LEN) + return EINVAL; + + if (cmds[i].dstarg >= IPC_CALL_LEN) + return EINVAL; + + switch (cmds[i].cmd) { + case CMD_PREDICATE: + /* + * Check for control flow overflow. + * Note that jumping just beyond the last + * command is a correct behaviour. + */ + if (i + cmds[i].value > cmdcount) + return EINVAL; + + break; + default: + break; + } + } + return EOK; } @@ -207,5 +242,5 @@ irq_pio_range_t *ranges = NULL; irq_cmd_t *cmds = NULL; - + irq_code_t *code = malloc(sizeof(*code), 0); int rc = copy_from_uspace(code, ucode, sizeof(*code)); @@ -222,5 +257,5 @@ if (rc != EOK) goto error; - + cmds = malloc(sizeof(code->cmds[0]) * code->cmdcount, 0); rc = copy_from_uspace(cmds, code->cmds, @@ -228,20 +263,26 @@ if (rc != EOK) goto error; - + + rc = code_check(cmds, code->cmdcount); + if (rc != EOK) + goto error; + rc = ranges_map_and_apply(ranges, code->rangecount, cmds, code->cmdcount); if (rc != EOK) goto error; - + code->ranges = ranges; code->cmds = cmds; - + return code; - + error: if (cmds) free(cmds); + if (ranges) free(ranges); + free(code); return NULL; @@ -250,11 +291,12 @@ /** Register an answerbox as a receiving end for IRQ notifications. * - * @param box Receiving answerbox. - * @param inr IRQ number. - * @param devno Device number. - * @param imethod Interface and method to be associated with the - * notification. - * @param ucode Uspace pointer to top-half pseudocode. - * @return EOK on success or a negative error code. + * @param box Receiving answerbox. + * @param inr IRQ number. + * @param devno Device number. + * @param imethod Interface and method to be associated with the + * notification. + * @param ucode Uspace pointer to top-half pseudocode. + * + * @return EOK on success or a negative error code. * */ @@ -266,5 +308,5 @@ (sysarg_t) devno }; - + if ((inr < 0) || (inr > last_inr)) return ELIMIT; @@ -329,8 +371,10 @@ /** Unregister task from IRQ notification. * - * @param box Answerbox associated with the notification. - * @param inr IRQ number. - * @param devno Device number. - * @return EOK on success or a negative error code. + * @param box Answerbox associated with the notification. + * @param inr IRQ number. + * @param devno Device number. + * + * @return EOK on success or a negative error code. + * */ int ipc_irq_unregister(answerbox_t *box, inr_t inr, devno_t devno) @@ -340,5 +384,5 @@ (sysarg_t) devno }; - + if ((inr < 0) || (inr > last_inr)) return ELIMIT; @@ -436,5 +480,5 @@ /* Remove from the hash table. */ hash_table_remove(&irq_uspace_hash_table, key, 2); - + /* * Release both locks so that we can free the pseudo code. @@ -442,5 +486,5 @@ irq_spinlock_unlock(&box->irq_lock, false); irq_spinlock_unlock(&irq_uspace_hash_table_lock, true); - + code_free(irq->notif_cfg.code); free(irq); @@ -492,30 +536,19 @@ for (size_t i = 0; i < code->cmdcount; i++) { - uint32_t dstval; - uintptr_t srcarg = code->cmds[i].srcarg; uintptr_t dstarg = code->cmds[i].dstarg; - if (srcarg >= IPC_CALL_LEN) - break; - - if (dstarg >= IPC_CALL_LEN) - break; - switch (code->cmds[i].cmd) { case CMD_PIO_READ_8: - dstval = pio_read_8((ioport8_t *) code->cmds[i].addr); - if (dstarg) - scratch[dstarg] = dstval; + scratch[dstarg] = + pio_read_8((ioport8_t *) code->cmds[i].addr); break; case CMD_PIO_READ_16: - dstval = pio_read_16((ioport16_t *) code->cmds[i].addr); - if (dstarg) - scratch[dstarg] = dstval; + scratch[dstarg] = + pio_read_16((ioport16_t *) code->cmds[i].addr); break; case CMD_PIO_READ_32: - dstval = pio_read_32((ioport32_t *) code->cmds[i].addr); - if (dstarg) - scratch[dstarg] = dstval; + scratch[dstarg] = + pio_read_32((ioport32_t *) code->cmds[i].addr); break; case CMD_PIO_WRITE_8: @@ -532,32 +565,26 @@ break; case CMD_PIO_WRITE_A_8: - if (srcarg) { - pio_write_8((ioport8_t *) code->cmds[i].addr, - (uint8_t) scratch[srcarg]); - } + pio_write_8((ioport8_t *) code->cmds[i].addr, + (uint8_t) scratch[srcarg]); break; case CMD_PIO_WRITE_A_16: - if (srcarg) { - pio_write_16((ioport16_t *) code->cmds[i].addr, - (uint16_t) scratch[srcarg]); - } + pio_write_16((ioport16_t *) code->cmds[i].addr, + (uint16_t) scratch[srcarg]); break; case CMD_PIO_WRITE_A_32: - if (srcarg) { - pio_write_32((ioport32_t *) code->cmds[i].addr, - (uint32_t) scratch[srcarg]); - } - break; - case CMD_BTEST: - if ((srcarg) && (dstarg)) { - dstval = scratch[srcarg] & code->cmds[i].value; - scratch[dstarg] = dstval; - } + pio_write_32((ioport32_t *) code->cmds[i].addr, + (uint32_t) scratch[srcarg]); + break; + case CMD_LOAD: + scratch[dstarg] = code->cmds[i].value; + break; + case CMD_AND: + scratch[dstarg] = scratch[srcarg] & + code->cmds[i].value; break; case CMD_PREDICATE: - if ((srcarg) && (!scratch[srcarg])) { + if (scratch[srcarg] == 0) i += code->cmds[i].value; - continue; - } + break; case CMD_ACCEPT: @@ -582,5 +609,5 @@ { ASSERT(irq); - + ASSERT(interrupts_disabled()); ASSERT(irq_spinlock_locked(&irq->lock)); Index: kernel/generic/src/lib/str.c =================================================================== --- kernel/generic/src/lib/str.c (revision 6eaed07c879e185ee39859affa8f93a1e8155f41) +++ kernel/generic/src/lib/str.c (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -457,12 +457,17 @@ * * Do a char-by-char comparison of two NULL-terminated strings. - * The strings are considered equal iff they consist of the same - * characters on the minimum of their lengths. + * The strings are considered equal iff their length is equal + * and both strings consist of the same sequence of characters. + * + * A string S1 is less than another string S2 if it has a character with + * lower value at the first character position where the strings differ. + * If the strings differ in length, the shorter one is treated as if + * padded by characters with a value of zero. * * @param s1 First string to compare. * @param s2 Second string to compare. * - * @return 0 if the strings are equal, -1 if first is smaller, - * 1 if second smaller. + * @return 0 if the strings are equal, -1 if the first is less than the second, + * 1 if the second is less than the first. * */ @@ -495,6 +500,14 @@ * * Do a char-by-char comparison of two NULL-terminated strings. - * The strings are considered equal iff they consist of the same - * characters on the minimum of their lengths and the length limit. + * The strings are considered equal iff + * min(str_length(s1), max_len) == min(str_length(s2), max_len) + * and both strings consist of the same sequence of characters, + * up to max_len characters. + * + * A string S1 is less than another string S2 if it has a character with + * lower value at the first character position where the strings differ. + * If the strings differ in length, the shorter one is treated as if + * padded by characters with a value of zero. Only the first max_len + * characters are considered. * * @param s1 First string to compare. @@ -502,6 +515,6 @@ * @param max_len Maximum number of characters to consider. * - * @return 0 if the strings are equal, -1 if first is smaller, - * 1 if second smaller. + * @return 0 if the strings are equal, -1 if the first is less than the second, + * 1 if the second is less than the first. * */ Index: kernel/generic/src/mm/as.c =================================================================== --- kernel/generic/src/mm/as.c (revision 6eaed07c879e185ee39859affa8f93a1e8155f41) +++ kernel/generic/src/mm/as.c (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -665,10 +665,4 @@ page_table_lock(as, false); - - /* - * Start TLB shootdown sequence. - */ - ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid, - area->base + P2SZ(pages), area->pages - pages); /* @@ -726,4 +720,20 @@ } + /* + * Start TLB shootdown sequence. + * + * The sequence is rather short and can be + * repeated multiple times. The reason is that + * we don't want to have used_space_remove() + * inside the sequence as it may use a blocking + * memory allocation for its B+tree. Blocking + * while holding the tlblock spinlock is + * forbidden and would hit a kernel assertion. + */ + + ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, + as->asid, area->base + P2SZ(pages), + area->pages - pages); + for (; i < size; i++) { pte_t *pte = page_mapping_find(as, @@ -743,22 +753,23 @@ page_mapping_remove(as, ptr + P2SZ(i)); } + + /* + * Finish TLB shootdown sequence. + */ + + tlb_invalidate_pages(as->asid, + area->base + P2SZ(pages), + area->pages - pages); + + /* + * Invalidate software translation caches + * (e.g. TSB on sparc64, PHT on ppc32). + */ + as_invalidate_translation_cache(as, + area->base + P2SZ(pages), + area->pages - pages); + tlb_shootdown_finalize(ipl); } } - - /* - * Finish TLB shootdown sequence. - */ - - tlb_invalidate_pages(as->asid, area->base + P2SZ(pages), - area->pages - pages); - - /* - * Invalidate software translation caches - * (e.g. TSB on sparc64, PHT on ppc32). - */ - as_invalidate_translation_cache(as, area->base + P2SZ(pages), - area->pages - pages); - tlb_shootdown_finalize(ipl); - page_table_unlock(as, false); } else { Index: kernel/generic/src/mm/tlb.c =================================================================== --- kernel/generic/src/mm/tlb.c (revision 6eaed07c879e185ee39859affa8f93a1e8155f41) +++ kernel/generic/src/mm/tlb.c (revision da68871a1ca8b07736e941032a954a3f19eadccc) @@ -162,5 +162,5 @@ size_t i; - for (i = 0; i < CPU->tlb_messages_count; CPU->tlb_messages_count--) { + for (i = 0; i < CPU->tlb_messages_count; i++) { tlb_invalidate_type_t type = CPU->tlb_messages[i].type; asid_t asid = CPU->tlb_messages[i].asid; @@ -188,4 +188,5 @@ } + CPU->tlb_messages_count = 0; irq_spinlock_unlock(&CPU->lock, false); CPU->tlb_active = true;