- Kernel - mailweb.openeuler.org

[PATCH] ACPI: GED: implement powerkey evged freeze function
by huangjun 24 Aug '20

24 Aug '20

From: Jun Huang <huangjun63(a)huawei.com> The acpi_execute_simple_method function uses a mutex, so it cannot be called in the timer. We replace timer with delayed work. Signed-off-by: Jun Huang <huangjun63(a)huawei.com> --- drivers/acpi/evged.c | 60 ++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/drivers/acpi/evged.c b/drivers/acpi/evged.c index 7354d8d..5bf65b1 100644 --- a/drivers/acpi/evged.c +++ b/drivers/acpi/evged.c @@ -34,7 +34,7 @@ * Method (_EVT, 1) { * if (Lequal(123, Arg0)) * { - * } + * }# * } * } * @@ -46,20 +46,23 @@ #include <linux/list.h> #include <linux/platform_device.h> #include <linux/acpi.h> -#include <linux/timer.h> #include <linux/jiffies.h> +#include <linux/workqueue.h> #define MODULE_NAME "acpi-ged" +static void gpp_enable_pwr_btn(struct work_struct *private_); + +static DECLARE_DELAYED_WORK(gpp_work, gpp_enable_pwr_btn); + struct acpi_ged_handle { - struct timer_list timer; /* For 4s anti-shake of power button */ acpi_handle gpp_handle; /* ACPI Handle: enable shutdown */ acpi_handle gpo_handle; /* ACPI Handle: set sleep flag */ }; struct acpi_ged_device { struct device *dev; - struct acpi_ged_handle *wakeup_handle; + struct acpi_ged_handle *ged_handle; struct list_head event_list; }; @@ -71,6 +74,8 @@ struct acpi_ged_event { acpi_handle handle; }; +static struct acpi_ged_handle *wakeup_handle; + static irqreturn_t acpi_ged_irq_handler(int irq, void *data) { struct acpi_ged_event *event = data; @@ -142,7 +147,6 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares, #ifdef CONFIG_PM_SLEEP static void init_ged_handle(struct acpi_ged_device *geddev) { - struct acpi_ged_handle *wakeup_handle; acpi_handle gpo_handle = NULL; acpi_handle gpp_handle = NULL; acpi_status acpi_ret; @@ -151,10 +155,7 @@ static void init_ged_handle(struct acpi_ged_device *geddev) { if (!wakeup_handle) return; - geddev->wakeup_handle = wakeup_handle; - - /* Initialize wakeup_handle, prepare for ged suspend and resume */ - timer_setup(&wakeup_handle->timer, NULL, 0); + geddev->ged_handle = wakeup_handle; acpi_ret = acpi_get_handle(ACPI_HANDLE(geddev->dev), "_GPO", &gpo_handle); if (ACPI_FAILURE(acpi_ret)) @@ -204,8 +205,6 @@ static void ged_shutdown(struct platform_device *pdev) dev_dbg(geddev->dev, "GED releasing GSI %u @ IRQ %u\n", event->gsi, event->irq); } - if (geddev->wakeup_handle) - del_timer(&geddev->wakeup_handle->timer); } static int ged_remove(struct platform_device *pdev) @@ -220,23 +219,10 @@ static const struct acpi_device_id ged_acpi_ids[] = { }; #ifdef CONFIG_PM_SLEEP -static void ged_timer_callback(struct timer_list *t) -{ - struct acpi_ged_handle *wakeup_handle = from_timer(wakeup_handle, t, timer); - acpi_status acpi_ret; - - /* _GPP method enable power button */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); - if (ACPI_FAILURE(acpi_ret)) - pr_warn("_GPP method execution failed\n"); - } -} - static int ged_suspend(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; + //struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; acpi_status acpi_ret; @@ -255,18 +241,26 @@ static int ged_suspend(struct device *dev) return 0; } +static void gpp_enable_pwr_btn(struct work_struct *private_) +{ + acpi_status acpi_ret; + + /* _GPP method enable power button */ + if (wakeup_handle && wakeup_handle->gpp_handle) { + acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); + if (ACPI_FAILURE(acpi_ret)) + pr_warn("_GPP method execution failed\n"); + } + +} + static int ged_resume(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; - - /* use timer to complete 4s anti-shake */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - wakeup_handle->timer.expires = jiffies + (4 * HZ); - wakeup_handle->timer.function = ged_timer_callback; - add_timer(&wakeup_handle->timer); - } + + /* use delayed_work to complete 4s anti-shake */ + schedule_delayed_work(&gpp_work, 4 * HZ); list_for_each_entry_safe(event, next, &geddev->event_list, node) disable_irq_wake(event->irq); -- 2.23.0.windows.1

1 0

[PATCH] scripts: add helper script to generate backport patch changelog
by Xie XiuQi 23 Aug '20

23 Aug '20

hulk inclusion category: doc bugzilla: NA CVE: NA Link: https://gitee.com/openeuler/kernel/issues/I1SF7H ------------------------------------------------- provide a simple script to help generate mainline patch info. It is useful when backport many patches from mainline or stable tree. usage: 1) backport a patch from mainline ./scripts/pick -c <commit> --issue I1SF7H 2) insert patch info to exsit patch file ./scripts/pick -c <commit> --issue I1SF7H -i test.patch 3) backport a patch from stable branch ./scripts/pick -c <commit> -s --issue I1SF7H 4) insert patch info to a out-of-tree patch ./scripts/pick --from driver --issue I1SF7H -i 0001-driver.patch ./scripts/pick --from driver --cate feature --feat "xxx feature" --issue I1SF7H -i 0001-driver.patch 5) if the commit information is not provided in the argument, try to identify it from the input file. The following formats can be recognized: (cherry picked from commit 587a87b9d7e94927edcdea018565bc1939381eb1) commit 65caafd0d2145d1dd02072c4ced540624daeab40 upstream. ./scripts/pick --issue I1SF7H -i 0001-input.patch Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> --- scripts/pick | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100755 scripts/pick diff --git a/scripts/pick b/scripts/pick new file mode 100755 index 000000000000..1166a300f508 --- /dev/null +++ b/scripts/pick @@ -0,0 +1,205 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# pick - helpers for pick a patch from upstream +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# (C) Copyright 2015-2020 Huawei Technologies Co., Ltd +# +# Authors: Xie XiuQi <xiexiuqi(a)huawei.com> + +# +# usage: +# 1) backport a patch from mainline +# ./scripts/pick -c <commit> --issue I1SF7H +# +# 2) insert patch info to exsit patch file +# ./scripts/pick -c <commit> --issue I1SF7H -i test.patch +# +# 3) backport a patch from stable branch +# ./scripts/pick -c <commit> -s --issue I1SF7H +# +# 4) insert patch info to a out-of-tree patch +# ./scripts/pick --from driver --issue I1SF7H -i 0001-driver.patch +# ./scripts/pick --from driver --cate feature --feat "xxx feature" --issue I1SF7H -i 0001-driver.patch +# +# 5) if the commit information is not provided in the argument, +# try to identify it from the input file. +# The following formats can be recognized: +# (cherry picked from commit 587a87b9d7e94927edcdea018565bc1939381eb1) +# commit 65caafd0d2145d1dd02072c4ced540624daeab40 upstream. +# +# ./scripts/pick --issue I1SF7H -i 0001-input.patch +# + +# set -x + +COMMIT= +CVE=NA +BUG=NA +ISSUE=NA +WITH_ISSUE=0 +ISSUE_PREFIX=https://gitee.com/openeuler/kernel/issues +OUTPUT_PREFIX= +OUTPUT= +FROM=mainline # default +CATEGORY=bugfix # default +FEATURE="" +SUBJECT_PREFIX= +WITH_SOB= +INSERT_LINE=0 + +usage() +{ + echo "usage: $(basename $0) [options]" >&2 + echo " -h|--help show this help message" >&2 + echo " -s|--stable from stable (default mainline)" >&2 + echo " -f|--from where does the patch from (default mainline)" >&2 + echo " -C|--cve ID of CVE (without CVE prefix)" >&2 + echo " --cate category(feature/bugfix/...)" >&2 + echo " --feat feature" >&2 + echo " --subject-prefix " >&2 + echo " -b|--bugzilla ID of BUGZILLA" >&2 + echo " --issue issue id of gitee" >&2 + echo " -o|--output output filename, use input filename if no specific" >&2 + echo " -i|--input input patch filename" >&2 + echo " --output-prefix output filename" >&2 + echo " --with-sob with signed-off-by" >&2 + echo " -c|--commit <commit id>" >&2 +} + +options=$(getopt -o hr:u:c: "help,pick,stable,from:bugzilla:cate:feat:cve:commit" -- "$@") || die "getopt failed" + +eval set -- "$options" +while [[ $# -gt 0 ]]; do + case "$1" in + -h|--help) + usage + exit 0 + ;; + -f|--from) + FROM="$2" + shift + ;; + -s|--stable) + FROM="stable" + ;; + -C|--cve) + CVE="$2" + shift + ;; + --cate) + CATEGORY="$2" + shift + ;; + --feat) + FEATURE="$2" + shift + ;; + --subject-prefix) + SUBJECT_PREFIX=" $2" + shift + ;; + --with-sob) + WITH_SOB="-s" + ;; + -b|--bugzilla) + BUG="$2" + shift + ;; + --issue) + ISSUE=$2 + WITH_ISSUE=1 + shift + ;; + -i|--input) + INPUT=$2 + shift + ;; + -u|--utf8) + UTF8=1 + ;; + -c|--commit) + COMMIT=$2 + shift + ;; + esac + shift +done + +if [ -z "$COMMIT" ] && [ -z "$INPUT" ]; then + echo 'Your must specific at least commit or input filename' + exit 1 +fi + +if [ "$INPUT" != "" ] && [ "$COMMIT" == "" ]; then + COMMIT=$(grep "^(cherry picked from commit" $INPUT | sed 's/^(cherry picked from commit $[a-f0-9]*$.*/\1/g') + + if [ "$COMMIT" == "" ]; then + COMMIT=$(grep "^commit [a-f0-9]* upstream" $INPUT | sed 's/^commit $[a-f0-9]*$.*/\1/g') + fi +fi + +if [ "$PREFIX" != "" ]; then + PREFIX="[$PREFIX] " +fi + +if [ $(echo $CVE |grep CVE -c) -eq 0 ] && [ "$CVE" != "NA" ]; then + CVE=CVE-$CVE +fi + +TAG=$(git name-rev --tags $COMMIT |sed 's/^[a-f0-9]* tags\/v//g' | sed 's/~.*//' | sed 's/-.*//') + +trap 'rm -f "$TMPFILE"' EXIT +TMPFILE=$(mktemp) || exit 1 + +printf "%s\n" "$FROM inclusion" >> $TMPFILE +if [ $FROM == "mainline" ] || [ "$FROM" == "stable" ]; then + printf "%s\n" "from $FROM-$TAG" >> $TMPFILE + printf "%s\n" "commit $COMMIT" >> $TMPFILE +fi +printf "%s\n" "category: $CATEGORY" >> $TMPFILE + +if [ "$CATEGORY" == "feature" ]; then + if [ "$FEATURE" == "" ]; then + echo "please describe this feature" + exit 1 + else + printf "%s\n" "feature: $FEATURE" >> $TMPFILE + fi +fi + +printf "%s\n" "bugzilla: $BUG" >> $TMPFILE +printf "%s\n" "CVE: $CVE" >> $TMPFILE + +if [ "$BUG" == "NA" ] && [ "$ISSUE" == "NA" ]; +then + echo please set bugzilla id or issue id + exit 1 +fi + +if [ $WITH_ISSUE -eq 1 ] && [ "$ISSUE" != "" ]; then + printf "%s\n" "Link: $ISSUE_PREFIX/$ISSUE" >> $TMPFILE +fi + +printf "\n%s\n\n" "-------------------------------------------------" >> $TMPFILE + +if [ -z $INPUT ]; then + INPUT=$(git format-patch -1 $WITH_SOB --subject-prefix="PATCH$SUBJECT_PREFIX" $COMMIT) +fi + +if [ -z $OUTPUT ]; then + OUTPUT=$INPUT +fi + +INSERT_LINE=$(sed -n -e '/^$/=' $INPUT |head -n1) +sed -i "$INSERT_LINE"r" $TMPFILE" $OUTPUT -- 2.20.1

1 0

[PATCH 00/20] KVM: arm64 support vCPU preempted check and PV qspinlock
by Yang Yingliang 20 Aug '20

20 Aug '20

This patch set aims to support the vCPU preempted check and PV qspinlock under KVM/arm64. Christoffer Dall (1): KVM: arm/arm64: Factor out hypercall handling from PSCI code Qian Cai (1): arm64/spinlock: fix a -Wunused-function warning Steven Price (3): KVM: Implement kvm_put_guest() arm/arm64: Provide a wrapper for SMCCC 1.1 calls arm/arm64: Make use of the SMCCC 1.1 wrapper Waiman Long (1): locking/osq: Use optimized spinning loop for arm64 Wanpeng Li (2): KVM: Boost vCPUs that are delivering interrupts KVM: Check preempted_in_kernel for involuntary preemption Zengruan Ye (12): arm/paravirt: Use a single ops structure KVM: arm64: Document PV-sched interface KVM: arm64: Implement PV_SCHED_FEATURES call KVM: arm64: Support pvsched preempted via shared structure KVM: arm64: Add interface to support vCPU preempted check KVM: arm64: Support the vCPU preemption check KVM: arm64: Add SMCCC PV-sched to kick cpu KVM: arm64: Implement PV_SCHED_KICK_CPU call KVM: arm64: Add interface to support PV qspinlock KVM: arm64: Enable PV qspinlock KVM: arm64: Add tracepoints for PV qspinlock arm64: defconfig: add CONFIG_PARAVIRT_SPINLOCKS in default Documentation/virtual/kvm/arm/pvsched.txt | 72 ++++++++ arch/arm/include/asm/kvm_host.h | 25 +++ arch/arm/include/asm/paravirt.h | 9 +- arch/arm/kernel/paravirt.c | 4 +- arch/arm/kvm/Makefile | 2 +- arch/arm/kvm/handle_exit.c | 2 +- arch/arm/mm/proc-v7-bugs.c | 13 +- arch/arm64/Kconfig | 14 ++ arch/arm64/configs/euleros_defconfig | 1 + arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/openeuler_defconfig | 1 + arch/arm64/include/asm/kvm_host.h | 20 +++ arch/arm64/include/asm/paravirt.h | 63 ++++++- arch/arm64/include/asm/pvsched-abi.h | 16 ++ arch/arm64/include/asm/qspinlock.h | 15 +- arch/arm64/include/asm/qspinlock_paravirt.h | 12 ++ arch/arm64/include/asm/spinlock.h | 26 +++ arch/arm64/kernel/Makefile | 3 +- arch/arm64/kernel/alternative.c | 5 +- arch/arm64/kernel/cpu_errata.c | 82 +++------ arch/arm64/kernel/paravirt-spinlocks.c | 18 ++ arch/arm64/kernel/paravirt.c | 188 +++++++++++++++++++- arch/arm64/kernel/setup.c | 2 + arch/arm64/kernel/trace-paravirt.h | 66 +++++++ arch/arm64/kvm/Makefile | 2 + arch/arm64/kvm/handle_exit.c | 5 +- arch/s390/kvm/interrupt.c | 2 +- drivers/xen/time.c | 4 + include/kvm/arm_hypercalls.h | 43 +++++ include/kvm/arm_psci.h | 2 +- include/linux/arm-smccc.h | 71 ++++++++ include/linux/cpuhotplug.h | 1 + include/linux/kvm_host.h | 23 +++ include/linux/kvm_types.h | 2 + kernel/locking/osq_lock.c | 23 ++- virt/kvm/arm/arm.c | 12 +- virt/kvm/arm/hypercalls.c | 72 ++++++++ virt/kvm/arm/psci.c | 76 +------- virt/kvm/arm/pvsched.c | 83 +++++++++ virt/kvm/arm/trace.h | 18 ++ virt/kvm/kvm_main.c | 17 +- 41 files changed, 939 insertions(+), 177 deletions(-) create mode 100644 Documentation/virtual/kvm/arm/pvsched.txt create mode 100644 arch/arm64/include/asm/pvsched-abi.h create mode 100644 arch/arm64/include/asm/qspinlock_paravirt.h create mode 100644 arch/arm64/kernel/paravirt-spinlocks.c create mode 100644 arch/arm64/kernel/trace-paravirt.h create mode 100644 include/kvm/arm_hypercalls.h create mode 100644 virt/kvm/arm/hypercalls.c create mode 100644 virt/kvm/arm/pvsched.c -- 2.25.1

1 20

[PATCH] printk: Export a symbol.
by Yang Yingliang 19 Aug '20

19 Aug '20

From: Xu Qiang <xuqiang36(a)huawei.com> ascend inclusion category: feature Bugzilla: N/A CVE: N/A ------------------------------------------- Signed-off-by: Xu Qiang <xuqiang36(a)huawei.com> Acked-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- kernel/printk/printk_safe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c index af5f4e42ca54..63ba880a6df0 100644 --- a/kernel/printk/printk_safe.c +++ b/kernel/printk/printk_safe.c @@ -290,6 +290,7 @@ void printk_safe_flush_on_panic(void) printk_safe_flush(); } +EXPORT_SYMBOL_GPL(printk_safe_flush_on_panic); #ifdef CONFIG_PRINTK_NMI /* -- 2.25.1

1 0

[PATCH 1/7] serial: amba-pl011: Fix serial port discard interrupt when interrupt signal line of serial port is connected to mbigen.
by Yang Yingliang 19 Aug '20

19 Aug '20

From: Xu Qiang <xuqiang36(a)huawei.com> ascend inclusion category: bugfix Bugzilla: N/A CVE: N/A --------------------------------------- Hisi when designing ascend chip, connect the serial port interrupt signal lines to mbigen equipment, mbigen write GICD_SETSPI_NSR register trigger the SPI interrupt. This can result in serial port drop interrupts. Signed-off-by: Xu Qiang <xuqiang36(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/tty/serial/Kconfig | 18 ++++++++++ drivers/tty/serial/amba-pl011.c | 64 +++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index df8bd0c7b97d..66e69c7d10a3 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -73,6 +73,24 @@ config SERIAL_AMBA_PL011_CONSOLE your boot loader (lilo or loadlin) about how to pass options to the kernel at boot time.) +if ASCEND_FEATURES + +config SERIAL_ATTACHED_MBIGEN + bool "Serial port interrupt signal lines connected to the mbigen" + depends on SERIAL_AMBA_PL011=y + default n + help + Say Y here when the interrupt signal line of the serial port is + connected to the mbigne. The mbigen device has the function of + clearing interrupts automatically. However, the interrupt processing + function of the serial port driver may process multiple interrupts + at a time. The mbigen device cannot adapt to this scenario. + As a result, interrupts are lost.Because it maybe discard interrupt. + + If unsure, say N. + +endif + config SERIAL_EARLYCON_ARM_SEMIHOST bool "Early console using ARM semihosting" depends on ARM64 || ARM diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 1d501154e9f7..781a27eebf0b 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1473,6 +1473,63 @@ static void check_apply_cts_event_workaround(struct uart_amba_port *uap) dummy_read = pl011_read(uap, REG_ICR); } +#ifdef CONFIG_SERIAL_ATTACHED_MBIGEN +struct workaround_oem_info { + char oem_id[ACPI_OEM_ID_SIZE + 1]; + char oem_table_id[ACPI_OEM_TABLE_ID_SIZE + 1]; + u32 oem_revision; +}; + +static bool pl011_enable_hisi_wkrd; +static struct workaround_oem_info pl011_wkrd_info[] = { + { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x300, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x301, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x400, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x401, + }, { + .oem_id = "HISI ", + .oem_table_id = "HIP08 ", + .oem_revision = 0x402, + } +}; + +static void pl011_check_hisi_workaround(void) +{ + struct acpi_table_header *tbl; + acpi_status status = AE_OK; + int i; + + status = acpi_get_table(ACPI_SIG_MADT, 0, &tbl); + if (ACPI_FAILURE(status) || !tbl) + return; + + for (i = 0; i < ARRAY_SIZE(pl011_wkrd_info); i++) { + if (!memcmp(pl011_wkrd_info[i].oem_id, tbl->oem_id, ACPI_OEM_ID_SIZE) && + !memcmp(pl011_wkrd_info[i].oem_table_id, tbl->oem_table_id, ACPI_OEM_TABLE_ID_SIZE) && + pl011_wkrd_info[i].oem_revision == tbl->oem_revision) { + pl011_enable_hisi_wkrd = true; + break; + } + } +} + +#else +#define pl011_enable_hisi_wkrd 0 +static inline void pl011_check_hisi_workaround(void){ } +#endif + static irqreturn_t pl011_int(int irq, void *dev_id) { struct uart_amba_port *uap = dev_id; @@ -1510,6 +1567,11 @@ static irqreturn_t pl011_int(int irq, void *dev_id) handled = 1; } + if (pl011_enable_hisi_wkrd) { + pl011_write(0, uap, REG_IMSC); + pl011_write(uap->im, uap, REG_IMSC); + } + spin_unlock_irqrestore(&uap->port.lock, flags); return IRQ_RETVAL(handled); @@ -1687,6 +1749,8 @@ static int pl011_hwinit(struct uart_port *port) if (plat->init) plat->init(); } + + pl011_check_hisi_workaround(); return 0; } -- 2.25.1

1 6

[PATCH] iommu: fix a mistake for iommu_unregister_device_fault_handler
by Yang Yingliang 19 Aug '20

19 Aug '20

From: Bixuan Cui <cuibixuan(a)huawei.com> ascend inclusion category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- Fix a mistake check for commit bd6c06e0917d ("iommu: introduce device fault report API") Fixes: bd6c06e0917d ("iommu: introduce device fault report API") Signed-off-by: Bixuan Cui <cuibixuan(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/iommu/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 831c5065f7f8..bee6b8fcfe0e 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -982,7 +982,7 @@ int iommu_unregister_device_fault_handler(struct device *dev) mutex_lock(&param->lock); /* we cannot unregister handler if there are pending faults */ - if (list_empty(&param->fault_param->faults)) { + if (!list_empty(&param->fault_param->faults)) { ret = -EBUSY; goto unlock; } -- 2.25.1

1 0

[PATCH] x86/config: enable CONFIG_HINIC by default
by Yang Yingliang 19 Aug '20

19 Aug '20

From: Xie XiuQi <xiexiuqi(a)huawei.com> hulk inclusion cagegory: feature feature: support 1822 on x86 platform After patch "5d57d1e24808 net/hinic: Add support for X86 Arch", hinic driver could support x86 platform, so enable this config by default. Link: https://gitee.com/openeuler/kernel/issues/I1DC1F Signed-off-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/x86/configs/hulk_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + arch/x86/configs/syzkaller_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/arch/x86/configs/hulk_defconfig b/arch/x86/configs/hulk_defconfig index ddd209c39445..6a1d3307e34e 100644 --- a/arch/x86/configs/hulk_defconfig +++ b/arch/x86/configs/hulk_defconfig @@ -2526,6 +2526,7 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=m CONFIG_E1000E=m CONFIG_E1000E_HWTS=y +CONFIG_HINIC=m CONFIG_IGB=m CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 4c9de1198798..747c6bd5967f 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -2523,6 +2523,7 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=m CONFIG_E1000E=m CONFIG_E1000E_HWTS=y +CONFIG_HINIC=m CONFIG_IGB=m CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y diff --git a/arch/x86/configs/syzkaller_defconfig b/arch/x86/configs/syzkaller_defconfig index 061f2fe87382..ff5f843e09c4 100644 --- a/arch/x86/configs/syzkaller_defconfig +++ b/arch/x86/configs/syzkaller_defconfig @@ -1716,6 +1716,7 @@ CONFIG_E1000=y CONFIG_E1000E=y CONFIG_E1000E_HWTS=y # CONFIG_IGB is not set +CONFIG_HINIC=m # CONFIG_IGBVF is not set # CONFIG_IXGB is not set # CONFIG_IXGBE is not set -- 2.25.1

1 0

[PATCH 00/30] KVM RISC-V Support
by Xie XiuQi 19 Aug '20

19 Aug '20

This series adds initial KVM RISC-V support. Currently, we are able to boot RISC-V 64bit Linux Guests with multiple VCPUs. This series can be found in riscv_kvm_v13 branch at: https//github.com/avpatel/linux.git Link: https://gitee.com/openeuler/kernel/issues/I1RR1Y This is backported by Mingwang Li <limingwang(a)huawei.com>. Alistair Francis (1): Revert "riscv: Use latest system call ABI" Anup Patel (19): RISC-V: Add bitmap reprensenting ISA features common across CPUs RISC-V: Add fragmented config for debug options RISC-V: Enable CPU Hotplug in defconfigs RISC-V: Add hypervisor extension related CSR defines RISC-V: Add initial skeletal KVM support RISC-V: KVM: Implement VCPU create, init and destroy functions RISC-V: KVM: Implement VCPU interrupts and requests handling RISC-V: KVM: Implement KVM_GET_ONE_REG/KVM_SET_ONE_REG ioctls RISC-V: KVM: Implement VCPU world-switch RISC-V: KVM: Handle MMIO exits for VCPU RISC-V: KVM: Handle WFI exits for VCPU RISC-V: KVM: Implement VMID allocator RISC-V: KVM: Implement stage2 page table programming RISC-V: KVM: Implement MMU notifiers RISC-V: KVM: Document RISC-V specific parts of KVM API. RISC-V: KVM: Add MAINTAINERS entry RISC-V: Enable KVM for RV64 and RV32 RISC-V: KVM: Fix stage2_map_page() and kvm_riscv_vcpu_unpriv_read() RISC-V: KVM: Determine instruction correctly from HTINST CSR Atish Patra (9): RISC-V: Mark existing SBI as 0.1 SBI. RISC-V: Add basic support for SBI v0.2 RISC-V: Add SBI v0.2 extension definitions RISC-V: Introduce a new config for SBI v0.1 RISC-V: Implement new SBI v0.2 extensions RISC-V: KVM: Add timer functionality RISC-V: KVM: FP lazy save/restore RISC-V: KVM: Implement ONE REG interface for FP registers RISC-V: KVM: Add SBI v0.1 support limingwang (1): RISC-V: KVM: fix some interfaces problems Documentation/virt/kvm/api.txt | 169 +++- MAINTAINERS | 11 + arch/riscv/Kconfig | 9 + arch/riscv/Makefile | 2 + arch/riscv/configs/defconfig | 24 +- arch/riscv/configs/extra_debug.config | 21 + arch/riscv/configs/rv32_defconfig | 24 +- arch/riscv/include/asm/csr.h | 90 +- arch/riscv/include/asm/hwcap.h | 22 + arch/riscv/include/asm/kvm_host.h | 274 ++++++ arch/riscv/include/asm/kvm_vcpu_timer.h | 44 + arch/riscv/include/asm/pgtable-bits.h | 1 + arch/riscv/include/asm/sbi.h | 178 ++-- arch/riscv/include/uapi/asm/kvm.h | 127 +++ arch/riscv/include/uapi/asm/unistd.h | 5 +- arch/riscv/kernel/asm-offsets.c | 154 ++++ arch/riscv/kernel/cpufeature.c | 83 +- arch/riscv/kernel/sbi.c | 522 +++++++++++- arch/riscv/kernel/setup.c | 2 + arch/riscv/kvm/Kconfig | 34 + arch/riscv/kvm/Makefile | 14 + arch/riscv/kvm/main.c | 99 +++ arch/riscv/kvm/mmu.c | 804 ++++++++++++++++++ arch/riscv/kvm/tlb.S | 74 ++ arch/riscv/kvm/vcpu.c | 1037 +++++++++++++++++++++++ arch/riscv/kvm/vcpu_exit.c | 678 +++++++++++++++ arch/riscv/kvm/vcpu_sbi.c | 173 ++++ arch/riscv/kvm/vcpu_switch.S | 391 +++++++++ arch/riscv/kvm/vcpu_timer.c | 225 +++++ arch/riscv/kvm/vm.c | 86 ++ arch/riscv/kvm/vmid.c | 120 +++ drivers/clocksource/timer-riscv.c | 8 + include/clocksource/timer-riscv.h | 16 + include/uapi/linux/kvm.h | 8 + 34 files changed, 5402 insertions(+), 127 deletions(-) create mode 100644 arch/riscv/configs/extra_debug.config create mode 100644 arch/riscv/include/asm/kvm_host.h create mode 100644 arch/riscv/include/asm/kvm_vcpu_timer.h create mode 100644 arch/riscv/include/uapi/asm/kvm.h create mode 100644 arch/riscv/kvm/Kconfig create mode 100644 arch/riscv/kvm/Makefile create mode 100644 arch/riscv/kvm/main.c create mode 100644 arch/riscv/kvm/mmu.c create mode 100644 arch/riscv/kvm/tlb.S create mode 100644 arch/riscv/kvm/vcpu.c create mode 100644 arch/riscv/kvm/vcpu_exit.c create mode 100644 arch/riscv/kvm/vcpu_sbi.c create mode 100644 arch/riscv/kvm/vcpu_switch.S create mode 100644 arch/riscv/kvm/vcpu_timer.c create mode 100644 arch/riscv/kvm/vm.c create mode 100644 arch/riscv/kvm/vmid.c create mode 100644 include/clocksource/timer-riscv.h -- 2.20.1

2 32

[PATCH,V2,kernel-4.19 1/2] kexec: Add quick kexec support for kernel
by Sang Yan 18 Aug '20

18 Aug '20

euleros inclusion category: feature bugzilla: NA issues: #I1RC8Z CVE: NA In normal kexec, relocating kernel may cost 5 ~ 10 seconds, to copy all segments from vmalloced memory to kernel boot memory, because of disabled mmu. We introduce quick kexec to save time of copying memory as above, just like kdump(kexec on crash), by using reserved memory "Quick Kexec". Constructing quick kimage as the same as crash kernel, then simply copy all segments of kimage to reserved memroy. We also add this support in syscall kexec_load using flags of KEXEC_QUICK. Signed-off-by: Sang Yan <sangyan(a)huawei.com> --- arch/Kconfig | 9 +++++++++ include/linux/ioport.h | 1 + include/linux/kexec.h | 11 ++++++++++- include/uapi/linux/kexec.h | 1 + kernel/kexec.c | 10 ++++++++++ kernel/kexec_core.c | 41 ++++++++++++++++++++++++++++++++--------- 6 files changed, 63 insertions(+), 10 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index d3d70369..11580292 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -18,6 +18,15 @@ config KEXEC_CORE select CRASH_CORE bool +config QUICK_KEXEC + bool "Support for quick kexec" + depends on KEXEC_CORE + help + It uses pre-reserved memory to accelerate kexec, just like + crash kexec, loads new kernel and initrd to reserved memory, + and boots new kernel on that memory. It will save the time + of relocating kernel. + config HAVE_IMA_KEXEC bool diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 5330288..1a438ec 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -139,6 +139,7 @@ enum { IORES_DESC_PERSISTENT_MEMORY_LEGACY = 5, IORES_DESC_DEVICE_PRIVATE_MEMORY = 6, IORES_DESC_DEVICE_PUBLIC_MEMORY = 7, + IORES_DESC_QUICK_KEXEC = 8, }; /* helpers to define resources */ diff --git a/include/linux/kexec.h b/include/linux/kexec.h index d6b8d0a..98cf0fb 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -233,9 +233,10 @@ struct kimage { unsigned long control_page; /* Flags to indicate special processing */ - unsigned int type : 1; + unsigned int type : 2; #define KEXEC_TYPE_DEFAULT 0 #define KEXEC_TYPE_CRASH 1 +#define KEXEC_TYPE_QUICK 2 unsigned int preserve_context : 1; /* If set, we are using file mode kexec syscall */ unsigned int file_mode:1; @@ -296,6 +297,11 @@ extern int kexec_load_disabled; #define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT) #endif +#ifdef CONFIG_QUICK_KEXEC +#undef KEXEC_FLAGS +#define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_QUICK) +#endif + /* List of defined/legal kexec file flags */ #define KEXEC_FILE_FLAGS (KEXEC_FILE_UNLOAD | KEXEC_FILE_ON_CRASH | \ KEXEC_FILE_NO_INITRAMFS) @@ -305,6 +311,9 @@ extern int kexec_load_disabled; extern struct resource crashk_res; extern struct resource crashk_low_res; extern note_buf_t __percpu *crash_notes; +#ifdef CONFIG_QUICK_KEXEC +extern struct resource quick_kexec_res; +#endif /* flag to track if kexec reboot is in progress */ extern bool kexec_in_progress; diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h index 6d11286..ca3cebe 100644 --- a/include/uapi/linux/kexec.h +++ b/include/uapi/linux/kexec.h @@ -12,6 +12,7 @@ /* kexec flags for different usage scenarios */ #define KEXEC_ON_CRASH 0x00000001 #define KEXEC_PRESERVE_CONTEXT 0x00000002 +#define KEXEC_QUICK 0x00000004 #define KEXEC_ARCH_MASK 0xffff0000 /* diff --git a/kernel/kexec.c b/kernel/kexec.c index 6855980..47dfad7 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -46,6 +46,9 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, int ret; struct kimage *image; bool kexec_on_panic = flags & KEXEC_ON_CRASH; +#ifdef CONFIG_QUICK_KEXEC + bool kexec_on_quick = flags & KEXEC_QUICK; +#endif if (kexec_on_panic) { /* Verify we have a valid entry point */ @@ -71,6 +74,13 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, image->type = KEXEC_TYPE_CRASH; } +#ifdef CONFIG_QUICK_KEXEC + if (kexec_on_quick) { + image->control_page = quick_kexec_res.start; + image->type = KEXEC_TYPE_QUICK; + } +#endif + ret = sanity_check_segment_list(image); if (ret) goto out_free_image; diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index b36c9c4..595a757 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -74,6 +74,16 @@ struct resource crashk_low_res = { .desc = IORES_DESC_CRASH_KERNEL }; +#ifdef CONFIG_QUICK_KEXEC +struct resource quick_kexec_res = { + .name = "Quick kexec", + .start = 0, + .end = 0, + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_QUICK_KEXEC +}; +#endif + int kexec_should_crash(struct task_struct *p) { /* @@ -470,8 +480,10 @@ static struct page *kimage_alloc_normal_control_pages(struct kimage *image, return pages; } -static struct page *kimage_alloc_crash_control_pages(struct kimage *image, - unsigned int order) + +static struct page *kimage_alloc_special_control_pages(struct kimage *image, + unsigned int order, + unsigned long end) { /* Control pages are special, they are the intermediaries * that are needed while we copy the rest of the pages @@ -501,7 +513,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, size = (1 << order) << PAGE_SHIFT; hole_start = (image->control_page + (size - 1)) & ~(size - 1); hole_end = hole_start + size - 1; - while (hole_end <= crashk_res.end) { + while (hole_end <= end) { unsigned long i; cond_resched(); @@ -536,7 +548,6 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, return pages; } - struct page *kimage_alloc_control_pages(struct kimage *image, unsigned int order) { @@ -547,8 +558,15 @@ struct page *kimage_alloc_control_pages(struct kimage *image, pages = kimage_alloc_normal_control_pages(image, order); break; case KEXEC_TYPE_CRASH: - pages = kimage_alloc_crash_control_pages(image, order); + pages = kimage_alloc_special_control_pages(image, order, + crashk_res.end); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + pages = kimage_alloc_special_control_pages(image, order, + quick_kexec_res.end); break; +#endif } return pages; @@ -898,11 +916,11 @@ static int kimage_load_normal_segment(struct kimage *image, return result; } -static int kimage_load_crash_segment(struct kimage *image, +static int kimage_load_special_segment(struct kimage *image, struct kexec_segment *segment) { - /* For crash dumps kernels we simply copy the data from - * user space to it's destination. + /* For crash dumps kernels and quick kexec kernels + * we simply copy the data from user space to it's destination. * We do things a page at a time for the sake of kmap. */ unsigned long maddr; @@ -976,8 +994,13 @@ int kimage_load_segment(struct kimage *image, result = kimage_load_normal_segment(image, segment); break; case KEXEC_TYPE_CRASH: - result = kimage_load_crash_segment(image, segment); + result = kimage_load_special_segment(image, segment); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + result = kimage_load_special_segment(image, segment); break; +#endif } return result; -- 2.9.5

1 1

[PATCH,V2,kernel-4.19 1/2] kexec: Add quick kexec support for kernel
by Sang Yan 18 Aug '20

18 Aug '20

euleros inclusion category: feature bugzilla: NA issues: #I1RC8Z CVE: NA In normal kexec, relocating kernel may cost 5 ~ 10 seconds, to copy all segments from vmalloced memory to kernel boot memory, because of disabled mmu. We introduce quick kexec to save time of copying memory as above, just like kdump(kexec on crash), by using reserved memory "Quick Kexec". Constructing quick kimage as the same as crash kernel, then simply copy all segments of kimage to reserved memroy. We also add this support in syscall kexec_load using flags of KEXEC_QUICK. Signed-off-by: Sang Yan <sangyan(a)huawei.com> --- arch/Kconfig | 9 +++++++++ include/linux/ioport.h | 1 + include/linux/kexec.h | 11 ++++++++++- include/uapi/linux/kexec.h | 1 + kernel/kexec.c | 10 ++++++++++ kernel/kexec_core.c | 41 ++++++++++++++++++++++++++++++++--------- 6 files changed, 63 insertions(+), 10 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index d3d70369..11580292 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -18,6 +18,15 @@ config KEXEC_CORE select CRASH_CORE bool +config QUICK_KEXEC + bool "Support for quick kexec" + depends on KEXEC_CORE + help + It uses pre-reserved memory to accelerate kexec, just like + crash kexec, loads new kernel and initrd to reserved memory, + and boots new kernel on that memory. It will save the time + of relocating kernel. + config HAVE_IMA_KEXEC bool diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 5330288..1a438ec 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -139,6 +139,7 @@ enum { IORES_DESC_PERSISTENT_MEMORY_LEGACY = 5, IORES_DESC_DEVICE_PRIVATE_MEMORY = 6, IORES_DESC_DEVICE_PUBLIC_MEMORY = 7, + IORES_DESC_QUICK_KEXEC = 8, }; /* helpers to define resources */ diff --git a/include/linux/kexec.h b/include/linux/kexec.h index d6b8d0a..98cf0fb 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -233,9 +233,10 @@ struct kimage { unsigned long control_page; /* Flags to indicate special processing */ - unsigned int type : 1; + unsigned int type : 2; #define KEXEC_TYPE_DEFAULT 0 #define KEXEC_TYPE_CRASH 1 +#define KEXEC_TYPE_QUICK 2 unsigned int preserve_context : 1; /* If set, we are using file mode kexec syscall */ unsigned int file_mode:1; @@ -296,6 +297,11 @@ extern int kexec_load_disabled; #define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT) #endif +#ifdef CONFIG_QUICK_KEXEC +#undef KEXEC_FLAGS +#define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_QUICK) +#endif + /* List of defined/legal kexec file flags */ #define KEXEC_FILE_FLAGS (KEXEC_FILE_UNLOAD | KEXEC_FILE_ON_CRASH | \ KEXEC_FILE_NO_INITRAMFS) @@ -305,6 +311,9 @@ extern int kexec_load_disabled; extern struct resource crashk_res; extern struct resource crashk_low_res; extern note_buf_t __percpu *crash_notes; +#ifdef CONFIG_QUICK_KEXEC +extern struct resource quick_kexec_res; +#endif /* flag to track if kexec reboot is in progress */ extern bool kexec_in_progress; diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h index 6d11286..ca3cebe 100644 --- a/include/uapi/linux/kexec.h +++ b/include/uapi/linux/kexec.h @@ -12,6 +12,7 @@ /* kexec flags for different usage scenarios */ #define KEXEC_ON_CRASH 0x00000001 #define KEXEC_PRESERVE_CONTEXT 0x00000002 +#define KEXEC_QUICK 0x00000004 #define KEXEC_ARCH_MASK 0xffff0000 /* diff --git a/kernel/kexec.c b/kernel/kexec.c index 6855980..47dfad7 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -46,6 +46,9 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, int ret; struct kimage *image; bool kexec_on_panic = flags & KEXEC_ON_CRASH; +#ifdef CONFIG_QUICK_KEXEC + bool kexec_on_quick = flags & KEXEC_QUICK; +#endif if (kexec_on_panic) { /* Verify we have a valid entry point */ @@ -71,6 +74,13 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry, image->type = KEXEC_TYPE_CRASH; } +#ifdef CONFIG_QUICK_KEXEC + if (kexec_on_quick) { + image->control_page = quick_kexec_res.start; + image->type = KEXEC_TYPE_QUICK; + } +#endif + ret = sanity_check_segment_list(image); if (ret) goto out_free_image; diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index b36c9c4..595a757 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -74,6 +74,16 @@ struct resource crashk_low_res = { .desc = IORES_DESC_CRASH_KERNEL }; +#ifdef CONFIG_QUICK_KEXEC +struct resource quick_kexec_res = { + .name = "Quick kexec", + .start = 0, + .end = 0, + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_QUICK_KEXEC +}; +#endif + int kexec_should_crash(struct task_struct *p) { /* @@ -470,8 +480,10 @@ static struct page *kimage_alloc_normal_control_pages(struct kimage *image, return pages; } -static struct page *kimage_alloc_crash_control_pages(struct kimage *image, - unsigned int order) + +static struct page *kimage_alloc_special_control_pages(struct kimage *image, + unsigned int order, + unsigned long end) { /* Control pages are special, they are the intermediaries * that are needed while we copy the rest of the pages @@ -501,7 +513,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, size = (1 << order) << PAGE_SHIFT; hole_start = (image->control_page + (size - 1)) & ~(size - 1); hole_end = hole_start + size - 1; - while (hole_end <= crashk_res.end) { + while (hole_end <= end) { unsigned long i; cond_resched(); @@ -536,7 +548,6 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, return pages; } - struct page *kimage_alloc_control_pages(struct kimage *image, unsigned int order) { @@ -547,8 +558,15 @@ struct page *kimage_alloc_control_pages(struct kimage *image, pages = kimage_alloc_normal_control_pages(image, order); break; case KEXEC_TYPE_CRASH: - pages = kimage_alloc_crash_control_pages(image, order); + pages = kimage_alloc_special_control_pages(image, order, + crashk_res.end); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + pages = kimage_alloc_special_control_pages(image, order, + quick_kexec_res.end); break; +#endif } return pages; @@ -898,11 +916,11 @@ static int kimage_load_normal_segment(struct kimage *image, return result; } -static int kimage_load_crash_segment(struct kimage *image, +static int kimage_load_special_segment(struct kimage *image, struct kexec_segment *segment) { - /* For crash dumps kernels we simply copy the data from - * user space to it's destination. + /* For crash dumps kernels and quick kexec kernels + * we simply copy the data from user space to it's destination. * We do things a page at a time for the sake of kmap. */ unsigned long maddr; @@ -976,8 +994,13 @@ int kimage_load_segment(struct kimage *image, result = kimage_load_normal_segment(image, segment); break; case KEXEC_TYPE_CRASH: - result = kimage_load_crash_segment(image, segment); + result = kimage_load_special_segment(image, segment); + break; +#ifdef CONFIG_QUICK_KEXEC + case KEXEC_TYPE_QUICK: + result = kimage_load_special_segment(image, segment); break; +#endif } return result; -- 2.9.5

1 1

2024

2023

2022

2021

2020

2019

Kernel