Skip to content

Commit

Permalink
Merge pull request #762 from joe-lawrence/fedora-27-rebase
Browse files Browse the repository at this point in the history 
testing fedora 27: rebase integration test patches
  • Loading branch information
@joe-lawrence
joe-lawrence committed Mar 22, 2018
2 parents 4a0b354 + 1d942eb commit 7e1b495
Show file tree
Hide file tree
Showing 46 changed files with 176 additions and 175 deletions.
1 change: 0 additions & 1 deletion test/integration/fedora-25/README
View file

This file was deleted.

11 changes: 0 additions & 11 deletions test/integration/fedora-25/data-read-mostly.patch
View file

This file was deleted.

11 changes: 0 additions & 11 deletions test/integration/fedora-25/parainstructions-section.patch
View file

This file was deleted.

1 change: 1 addition & 0 deletions test/integration/fedora-27/README
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.13.9-300.fc27.x86_64
6 changes: 3 additions & 3 deletions ...gration/fedora-25/bug-table-section.patch → ...gration/fedora-27/bug-table-section.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -Nupr src.orig/fs/proc/proc_sysctl.c src/fs/proc/proc_sysctl.c
--- src.orig/fs/proc/proc_sysctl.c 2016-11-30 19:39:49.316737234 +0000
+++ src/fs/proc/proc_sysctl.c 2016-11-30 19:39:49.441737234 +0000
@@ -301,6 +301,8 @@ void sysctl_head_put(struct ctl_table_he
--- src.orig/fs/proc/proc_sysctl.c 2017-11-17 15:58:41.115211972 -0500
+++ src/fs/proc/proc_sysctl.c 2017-11-17 15:58:51.725211972 -0500
@@ -332,6 +332,8 @@ static void start_unregistering(struct c

static struct ctl_table_header *sysctl_head_grab(struct ctl_table_header *head)
{
Expand Down
0 ...tion/fedora-25/cmdline-string-LOADED.test → ...tion/fedora-27/cmdline-string-LOADED.test
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ntegration/fedora-25/cmdline-string.patch → ...ntegration/fedora-27/cmdline-string.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -Nupr src.orig/fs/proc/cmdline.c src/fs/proc/cmdline.c
--- src.orig/fs/proc/cmdline.c 2016-11-30 19:39:49.317737234 +0000
+++ src/fs/proc/cmdline.c 2016-11-30 19:39:52.696737234 +0000
--- src.orig/fs/proc/cmdline.c 2017-11-17 15:58:41.126211972 -0500
+++ src/fs/proc/cmdline.c 2017-11-17 15:58:54.891211972 -0500
@@ -5,7 +5,7 @@

static int cmdline_proc_show(struct seq_file *m, void *v)
Expand Down
6 changes: 3 additions & 3 deletions ...tion/fedora-25/convert-global-local.patch → ...tion/fedora-27/convert-global-local.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ This is a test for #658: a kernel panic seen when patching an exported
function (e.g., kmalloc) which is used by patch_init().
---
diff -Nupr src.orig/mm/slub.c src/mm/slub.c
--- src.orig/mm/slub.c 2016-12-11 14:17:54.000000000 -0500
+++ src/mm/slub.c 2017-02-08 21:02:17.946870598 -0500
@@ -3719,6 +3719,9 @@ void *__kmalloc(size_t size, gfp_t flags
--- src.orig/mm/slub.c 2017-11-17 15:58:51.157211972 -0500
+++ src/mm/slub.c 2017-11-17 15:58:56.808211972 -0500
@@ -3731,6 +3731,9 @@ void *__kmalloc(size_t size, gfp_t flags
struct kmem_cache *s;
void *ret;

Expand Down
0 ...ntegration/fedora-25/data-new-LOADED.test → ...ntegration/fedora-27/data-new-LOADED.test
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions test/integration/fedora-25/data-new.patch → test/integration/fedora-27/data-new.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
--- src.orig/fs/proc/meminfo.c 2017-02-08 21:06:25.943876606 -0500
+++ src/fs/proc/meminfo.c 2017-02-08 21:08:07.154879058 -0500
--- src.orig/fs/proc/meminfo.c 2017-11-17 15:58:41.113211972 -0500
+++ src/fs/proc/meminfo.c 2017-11-17 15:58:58.554211972 -0500
@@ -42,6 +42,8 @@ static void show_val_kb(struct seq_file
seq_write(m, " kB\n", 4);
}
Expand Down
11 changes: 11 additions & 0 deletions test/integration/fedora-27/data-read-mostly.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff -Nupr src.orig/net/core/dev.c src/net/core/dev.c
--- src.orig/net/core/dev.c 2017-11-17 15:58:50.569211972 -0500
+++ src/net/core/dev.c 2017-11-17 15:59:00.286211972 -0500
@@ -4260,6 +4260,7 @@ skip_classify:
case RX_HANDLER_PASS:
break;
default:
+ printk("BUG!\n");
BUG();
}
}
6 changes: 3 additions & 3 deletions ...integration/fedora-25/fixup-section.patch → ...integration/fedora-27/fixup-section.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -Nupr src.orig/fs/readdir.c src/fs/readdir.c
--- src.orig/fs/readdir.c 2016-11-30 19:39:49.237737234 +0000
+++ src/fs/readdir.c 2016-11-30 19:40:05.186737234 +0000
@@ -188,6 +188,8 @@ static int filldir(struct dir_context *c
--- src.orig/fs/readdir.c 2017-11-17 15:58:39.457211972 -0500
+++ src/fs/readdir.c 2017-11-17 15:59:02.078211972 -0500
@@ -189,6 +189,8 @@ static int filldir(struct dir_context *c
goto efault;
}
dirent = buf->current_dir;
Expand Down
6 changes: 3 additions & 3 deletions ...integration/fedora-25/gcc-constprop.patch → ...integration/fedora-27/gcc-constprop.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ ensure timekeeping_forward_now.constprop.8 and
timekeeping_forward_now.constprop.9 are correlated.

diff -Nupr src.orig/kernel/time/timekeeping.c src/kernel/time/timekeeping.c
--- src.orig/kernel/time/timekeeping.c 2016-11-30 19:39:45.151737234 +0000
+++ src/kernel/time/timekeeping.c 2016-11-30 19:40:08.035737234 +0000
@@ -1150,6 +1150,9 @@ void do_gettimeofday(struct timeval *tv)
--- src.orig/kernel/time/timekeeping.c 2017-11-17 15:58:51.500211972 -0500
+++ src/kernel/time/timekeeping.c 2017-11-17 15:59:03.810211972 -0500
@@ -1206,6 +1206,9 @@ void do_gettimeofday(struct timeval *tv)
{
struct timespec64 now;

Expand Down
6 changes: 3 additions & 3 deletions test/integration/fedora-25/gcc-isra.patch → test/integration/fedora-27/gcc-isra.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -Nupr src.orig/fs/proc/proc_sysctl.c src/fs/proc/proc_sysctl.c
--- src.orig/fs/proc/proc_sysctl.c 2016-11-30 19:39:49.316737234 +0000
+++ src/fs/proc/proc_sysctl.c 2016-11-30 19:40:10.918737234 +0000
@@ -46,6 +46,7 @@ void proc_sys_poll_notify(struct ctl_tab
--- src.orig/fs/proc/proc_sysctl.c 2017-11-17 15:58:41.115211972 -0500
+++ src/fs/proc/proc_sysctl.c 2017-11-17 15:59:05.548211972 -0500
@@ -47,6 +47,7 @@ void proc_sys_poll_notify(struct ctl_tab
if (!poll)
return;

Expand Down
6 changes: 3 additions & 3 deletions ...integration/fedora-25/gcc-mangled-3.patch → ...integration/fedora-27/gcc-mangled-3.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ ensure that __cmpxchg_double_slab.isra.45 and
__cmpxchg_double_slab.isra.45.part.46 aren't correlated.

diff -Nupr src.orig/mm/slub.c src/mm/slub.c
--- src.orig/mm/slub.c 2016-11-30 19:39:45.200737234 +0000
+++ src/mm/slub.c 2016-11-30 19:40:13.997737234 +0000
@@ -5758,6 +5758,9 @@ void get_slabinfo(struct kmem_cache *s,
--- src.orig/mm/slub.c 2017-11-17 15:58:51.157211972 -0500
+++ src/mm/slub.c 2017-11-17 15:59:07.361211972 -0500
@@ -5824,6 +5824,9 @@ void get_slabinfo(struct kmem_cache *s,
int node;
struct kmem_cache_node *n;

Expand Down
12 changes: 6 additions & 6 deletions ...on/fedora-25/gcc-static-local-var-2.patch → ...on/fedora-27/gcc-static-local-var-2.patch
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
diff -Nupr src.orig/mm/mmap.c src/mm/mmap.c
--- src.orig/mm/mmap.c 2017-02-08 20:48:33.821850633 -0500
+++ src/mm/mmap.c 2017-02-08 20:48:56.682851187 -0500
@@ -1582,6 +1582,7 @@ static inline int accountable_mapping(st
--- src.orig/mm/mmap.c 2017-11-17 15:58:51.131211972 -0500
+++ src/mm/mmap.c 2017-11-17 15:59:09.094211972 -0500
@@ -1599,6 +1599,7 @@ static inline int accountable_mapping(st
return (vm_flags & (VM_NORESERVE | VM_SHARED | VM_WRITE)) == VM_WRITE;
}

+#include "kpatch-macros.h"
unsigned long mmap_region(struct file *file, unsigned long addr,
unsigned long len, vm_flags_t vm_flags, unsigned long pgoff)
{
@@ -1591,6 +1592,9 @@ unsigned long mmap_region(struct file *f
unsigned long len, vm_flags_t vm_flags, unsigned long pgoff,
struct list_head *uf)
@@ -1609,6 +1610,9 @@ unsigned long mmap_region(struct file *f
struct rb_node **rb_link, *rb_parent;
unsigned long charged = 0;

Expand Down
4 changes: 2 additions & 2 deletions ...on/fedora-25/gcc-static-local-var-3.patch → ...on/fedora-27/gcc-static-local-var-3.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -Nupr src.orig/kernel/reboot.c src/kernel/reboot.c
--- src.orig/kernel/reboot.c 2016-11-30 19:39:45.165737234 +0000
+++ src/kernel/reboot.c 2016-11-30 19:40:19.850737234 +0000
--- src.orig/kernel/reboot.c 2017-11-17 15:58:51.558211972 -0500
+++ src/kernel/reboot.c 2017-11-17 15:59:10.774211972 -0500
@@ -366,8 +366,15 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
return ret;
}
Expand Down
6 changes: 3 additions & 3 deletions ...on/fedora-25/gcc-static-local-var-4.patch → ...on/fedora-27/gcc-static-local-var-4.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -Nupr src.orig/fs/aio.c src/fs/aio.c
--- src.orig/fs/aio.c.orig 2017-02-08 21:10:29.963882517 -0500
+++ src/fs/aio.c 2017-02-08 21:10:51.501883039 -0500
--- src.orig/fs/aio.c 2017-11-17 15:58:38.111211972 -0500
+++ src/fs/aio.c 2017-11-17 15:59:12.467211972 -0500
@@ -271,10 +271,17 @@ static int __init aio_setup(void)
}
__initcall(aio_setup);
Expand All @@ -18,4 +18,4 @@ diff -Nupr src.orig/fs/aio.c src/fs/aio.c
+ kpatch_aio_foo();

if (aio_ring_file) {
truncate_setsize(aio_ring_file->f_inode, 0);
truncate_setsize(file_inode(aio_ring_file), 0);
0 ...ion/fedora-25/gcc-static-local-var-4.test → ...ion/fedora-27/gcc-static-local-var-4.test
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions ...on/fedora-25/gcc-static-local-var-5.patch → ...on/fedora-27/gcc-static-local-var-5.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -Nupr src.orig/kernel/audit.c src/kernel/audit.c
--- src.orig/kernel/audit.c 2016-11-30 19:39:45.165737234 +0000
+++ src/kernel/audit.c 2016-11-30 19:40:25.802737234 +0000
@@ -211,6 +211,12 @@ void audit_panic(const char *message)
--- src.orig/kernel/audit.c 2017-11-17 15:58:51.516211972 -0500
+++ src/kernel/audit.c 2017-11-17 15:59:14.324211972 -0500
@@ -282,6 +282,12 @@ void audit_panic(const char *message)
}
}

Expand All @@ -14,15 +14,15 @@ diff -Nupr src.orig/kernel/audit.c src/kernel/audit.c
static inline int audit_rate_check(void)
{
static unsigned long last_check = 0;
@@ -221,6 +227,7 @@ static inline int audit_rate_check(void)
@@ -292,6 +298,7 @@ static inline int audit_rate_check(void)
unsigned long elapsed;
int retval = 0;

+ kpatch_audit_foo();
if (!audit_rate_limit) return 1;

spin_lock_irqsave(&lock, flags);
@@ -240,6 +247,11 @@ static inline int audit_rate_check(void)
@@ -311,6 +318,11 @@ static inline int audit_rate_check(void)
return retval;
}

Expand All @@ -34,7 +34,7 @@ diff -Nupr src.orig/kernel/audit.c src/kernel/audit.c
/**
* audit_log_lost - conditionally log lost audit message event
* @message: the message stating reason for lost audit message
@@ -286,6 +298,8 @@ static int audit_log_config_change(char
@@ -357,6 +369,8 @@ static int audit_log_config_change(char
struct audit_buffer *ab;
int rc = 0;

Expand Down
8 changes: 4 additions & 4 deletions ...tion/fedora-25/gcc-static-local-var.patch → ...tion/fedora-27/gcc-static-local-var.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -Nupr src.orig/arch/x86/kernel/ldt.c src/arch/x86/kernel/ldt.c
--- src.orig/arch/x86/kernel/ldt.c 2016-11-30 19:39:46.579737234 +0000
+++ src/arch/x86/kernel/ldt.c 2016-11-30 19:40:28.658737234 +0000
@@ -99,6 +99,12 @@ static void free_ldt_struct(struct ldt_s
--- src.orig/arch/x86/kernel/ldt.c 2017-11-17 15:58:09.662211972 -0500
+++ src/arch/x86/kernel/ldt.c 2017-11-17 15:59:16.084211972 -0500
@@ -100,6 +100,12 @@ static void free_ldt_struct(struct ldt_s
kfree(ldt);
}

Expand All @@ -14,7 +14,7 @@ diff -Nupr src.orig/arch/x86/kernel/ldt.c src/arch/x86/kernel/ldt.c
/*
* we do not have to muck with descriptors here, that is
* done in switch_mm() as needed.
@@ -109,6 +115,8 @@ int init_new_context_ldt(struct task_str
@@ -110,6 +116,8 @@ int init_new_context_ldt(struct task_str
struct mm_struct *old_mm;
int retval = 0;

Expand Down
0 ...gration/fedora-25/macro-hooks-LOADED.test → ...gration/fedora-27/macro-hooks-LOADED.test
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions test/integration/fedora-25/macro-hooks.patch → test/integration/fedora-27/macro-hooks.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -Nupr src.orig/fs/aio.c src/fs/aio.c
--- src.orig/fs/aio.c 2016-11-30 19:39:49.237737234 +0000
+++ src/fs/aio.c 2016-11-30 19:40:31.570737234 +0000
@@ -1719,6 +1719,20 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t
--- src.orig/fs/aio.c 2017-11-17 15:58:38.111211972 -0500
+++ src/fs/aio.c 2017-11-17 15:59:17.699211972 -0500
@@ -1819,6 +1819,20 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t
return ret;
}

Expand Down

0 comments on commit 7e1b495

Please sign in to comment.