diff --git a/test/integration/common/multiple.template b/test/integration/common/multiple.template index 678279c45..169d69636 100755 --- a/test/integration/common/multiple.template +++ b/test/integration/common/multiple.template @@ -1,6 +1,5 @@ SCRIPTDIR="$(readlink -f $(dirname $(type -p $0)))" ROOTDIR="$(readlink -f $SCRIPTDIR/../../..)" -KPATCH="sudo $ROOTDIR/kpatch/kpatch" MODULE_PREFIX="test-" MODULE_POSTFIX=".ko" diff --git a/test/integration/kpatch-test b/test/integration/kpatch-test index 688ab1dea..c2a51664d 100755 --- a/test/integration/kpatch-test +++ b/test/integration/kpatch-test @@ -119,6 +119,9 @@ else done fi +# export envs for test progs +export KPATCH + error() { echo "ERROR: $*" |tee -a $LOG >&2 ERROR=$((ERROR + 1)) @@ -383,7 +386,7 @@ if [ "${DYNDEBUG_ENABLED}" == "1" ]; then sudo sh -c "echo \"func klp_try_switch_task ${prev_dyndebug}\" > ${DYNDEBUG_CONTROL} 2>/dev/null" fi -if new_dmesg | grep -q "Call Trace"; then +if new_dmesg | grep -q -i "Call Trace"; then new_dmesg > dmesg.log error "kernel error detected in printk buffer" fi diff --git a/test/integration/linux-5.10.11/data-reloc.patch b/test/integration/linux-5.10.11/data-reloc.patch new file mode 100644 index 000000000..c7bbd0f78 --- /dev/null +++ b/test/integration/linux-5.10.11/data-reloc.patch @@ -0,0 +1,20 @@ +diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c +index 172261a908d8..4fdd666cc75a 100644 +--- a/drivers/usb/serial/ir-usb.c ++++ b/drivers/usb/serial/ir-usb.c +@@ -194,10 +194,15 @@ static u8 ir_xbof_change(u8 xbof) + return(result); + } + ++#include "usb-wwan.h" + static int ir_startup(struct usb_serial *serial) + { + struct usb_irda_cs_descriptor *irda_desc; + int rates; ++ volatile int i = 0; ++ static volatile void *funcs[] = {usb_wwan_open, usb_wwan_close}; ++ ++ printk("kpatch: usb_wwan_open=%p\n", funcs[i]); + + irda_desc = irda_usb_find_class_desc(serial, 0); + if (!irda_desc) { diff --git a/test/integration/linux-5.10.11/data-reloc.test b/test/integration/linux-5.10.11/data-reloc.test new file mode 100755 index 000000000..540e37370 --- /dev/null +++ b/test/integration/linux-5.10.11/data-reloc.test @@ -0,0 +1,5 @@ +sudo modprobe usb_wwan +sudo modprobe ir-usb +sleep 5 + +$KPATCH load test-data-reloc.ko