Commit 1125637b authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by Greg Kroah-Hartman

ia64: fix module loading for gcc-5.4


[ Upstream commit a25fb850 ]

Starting from gcc-5.4+ gcc generates MLX instructions in more cases to
refer local symbols:

    https://gcc.gnu.org/PR60465

That caused ia64 module loader to choke on such instructions:

    fuse: invalid slot number 1 for IMM64

The Linux kernel used to handle only case where relocation pointed to
slot=2 instruction in the bundle.  That limitation was fixed in linux by
commit 9c184a07 ("[IA64] Fix 2.6 kernel for the new ia64 assembler")
See

    http://sources.redhat.com/bugzilla/show_bug.cgi?id=1433

This change lifts the slot=2 restriction from the kernel module loader.

Tested on 'fuse' and 'btrfs' kernel modules.

Cc: Markus Elfring <elfring@users.sourceforge.net>
Cc: H J Lu <hjl.tools@gmail.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Bug: https://bugs.gentoo.org/601014Tested-by: default avatarÉmeric MASCHINO <emeric.maschino@gmail.com>
Signed-off-by: default avatarSergei Trofimovich <slyfox@gentoo.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f4e3e9a
...@@ -153,7 +153,7 @@ slot (const struct insn *insn) ...@@ -153,7 +153,7 @@ slot (const struct insn *insn)
static int static int
apply_imm64 (struct module *mod, struct insn *insn, uint64_t val) apply_imm64 (struct module *mod, struct insn *insn, uint64_t val)
{ {
if (slot(insn) != 2) { if (slot(insn) != 1 && slot(insn) != 2) {
printk(KERN_ERR "%s: invalid slot number %d for IMM64\n", printk(KERN_ERR "%s: invalid slot number %d for IMM64\n",
mod->name, slot(insn)); mod->name, slot(insn));
return 0; return 0;
...@@ -165,7 +165,7 @@ apply_imm64 (struct module *mod, struct insn *insn, uint64_t val) ...@@ -165,7 +165,7 @@ apply_imm64 (struct module *mod, struct insn *insn, uint64_t val)
static int static int
apply_imm60 (struct module *mod, struct insn *insn, uint64_t val) apply_imm60 (struct module *mod, struct insn *insn, uint64_t val)
{ {
if (slot(insn) != 2) { if (slot(insn) != 1 && slot(insn) != 2) {
printk(KERN_ERR "%s: invalid slot number %d for IMM60\n", printk(KERN_ERR "%s: invalid slot number %d for IMM60\n",
mod->name, slot(insn)); mod->name, slot(insn));
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment