RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test/integration/linux-5.10.11: fix patches to build on ppc64le 

module-call-external.patch and new-function.patch fail to build on
ppc64le with "Found an unsupported sibling call". Add
fno-optimize-sibling-calls attributes to functions in question.

Signed-off-by: Artem Savkov <asavkov@redhat.com>
This commit is contained in:
Artem Savkov 2021-11-19 10:12:12 +01:00
parent 4975ae8b97
commit 6fa8e4fd43
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/integration/linux-5.10.11/module-call-external.patch
View File

@ -1,16 +1,18 @@
diff -Nupr src.orig/fs/nfsd/export.c src/fs/nfsd/export.c diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
--- src.orig/fs/nfsd/export.c 2021-01-28 04:47:10.905473196 -0500 index 21e404e7cb68..3a282338d6d9 100644
+++ src/fs/nfsd/export.c 2021-01-28 04:55:55.117394790 -0500 --- a/fs/nfsd/export.c
@@ -1234,6 +1234,8 @@ static void exp_flags(struct seq_file *m +++ b/fs/nfsd/export.c
@@ -1234,6 +1234,9 @@ static void exp_flags(struct seq_file *m, int flag, int fsid,
} }
} }
+extern char *kpatch_string(void); +extern char *kpatch_string(void);
+ +
+__attribute__((optimize("-fno-optimize-sibling-calls")))
static int e_show(struct seq_file *m, void *p) static int e_show(struct seq_file *m, void *p)
{ {
struct cache_head *cp = p; struct cache_head *cp = p;
@@ -1243,6 +1245,7 @@ static int e_show(struct seq_file *m, vo @@ -1243,6 +1246,7 @@ static int e_show(struct seq_file *m, void *p)
if (p == SEQ_START_TOKEN) { if (p == SEQ_START_TOKEN) {
seq_puts(m, "# Version 1.1\n"); seq_puts(m, "# Version 1.1\n");
seq_puts(m, "# Path Client(Flags) # IPs\n"); seq_puts(m, "# Path Client(Flags) # IPs\n");
@ -18,10 +20,11 @@ diff -Nupr src.orig/fs/nfsd/export.c src/fs/nfsd/export.c
return 0; return 0;
} }
diff -Nupr src.orig/net/netlink/af_netlink.c src/net/netlink/af_netlink.c diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
--- src.orig/net/netlink/af_netlink.c 2021-01-28 04:45:47.818280959 -0500 index daca50d6bb12..a657a0e073f8 100644
+++ src/net/netlink/af_netlink.c 2021-01-28 04:55:55.134394639 -0500 --- a/net/netlink/af_netlink.c
@@ -2898,4 +2898,9 @@ panic: +++ b/net/netlink/af_netlink.c
@@ -2898,4 +2898,9 @@ static int __init netlink_proto_init(void)
panic("netlink_init: Cannot allocate nl_table\n"); panic("netlink_init: Cannot allocate nl_table\n");
} }

12
test/integration/linux-5.10.11/new-function.patch
View File

@ -1,7 +1,8 @@
diff -Nupr src.orig/drivers/tty/n_tty.c src/drivers/tty/n_tty.c diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
--- src.orig/drivers/tty/n_tty.c 2021-01-28 04:45:56.804193597 -0500 index c2869489ba68..7a46fc7a88f1 100644
+++ src/drivers/tty/n_tty.c 2021-01-28 04:59:56.004262703 -0500 --- a/drivers/tty/n_tty.c
@@ -2295,7 +2295,7 @@ static ssize_t n_tty_read(struct tty_str +++ b/drivers/tty/n_tty.c
@@ -2295,7 +2295,7 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
* lock themselves) * lock themselves)
*/ */
@ -10,10 +11,11 @@ diff -Nupr src.orig/drivers/tty/n_tty.c src/drivers/tty/n_tty.c
const unsigned char *buf, size_t nr) const unsigned char *buf, size_t nr)
{ {
const unsigned char *b = buf; const unsigned char *b = buf;
@@ -2382,6 +2382,12 @@ break_out: @@ -2382,6 +2382,13 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
return (b - buf) ? b - buf : retval; return (b - buf) ? b - buf : retval;
} }
+__attribute__((optimize("-fno-optimize-sibling-calls")))
+static ssize_t n_tty_write(struct tty_struct *tty, struct file *file, +static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
+ const unsigned char *buf, size_t nr) + const unsigned char *buf, size_t nr)
+{ +{