linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ia64: fix module loading for gcc-5.4
@ 2017-05-01 18:51 Luck, Tony
  0 siblings, 0 replies; 3+ messages in thread
From: Luck, Tony @ 2017-05-01 18:51 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Sergei Trofimovich, Markus Elfring, H . J . Lu, Fenghua Yu,
	linux-ia64, linux-kernel, Andrew Morton, Tony Luck

From: Sergei Trofimovich <slyfox@gentoo.org>

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

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 9c184a073bfd ("[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
linux 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: linux-ia64@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Bug: https://bugs.gentoo.org/601014
Tested-by: Émeric MASCHINO <emeric.maschino@gmail.com>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
 arch/ia64/kernel/module.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index 6ab0ae7d6535..d1d945c6bd05 100644
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
@@ -153,7 +153,7 @@ slot (const struct insn *insn)
 static int
 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",
 		       mod->name, slot(insn));
 		return 0;
@@ -165,7 +165,7 @@ apply_imm64 (struct module *mod, struct insn *insn, uint64_t val)
 static int
 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",
 		       mod->name, slot(insn));
 		return 0;
-- 
2.7.4

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ia64: fix module loading for gcc-5.4
  2017-03-19 16:20 Sergei Trofimovich
@ 2017-03-21  8:31 ` Émeric MASCHINO
  0 siblings, 0 replies; 3+ messages in thread
From: Émeric MASCHINO @ 2017-03-21  8:31 UTC (permalink / raw)
  To: Sergei Trofimovich
  Cc: Tony Luck, H . J . Lu, Fenghua Yu, linux-ia64, linux-kernel

Hi,

Backported and successfully tested on currently stable Gentoo kernel 4.9.6-r1.

>From [1], gcc 4.9.4 was first problematic release.

[1] http://marc.info/?l=linux-ia64&m=147993347915422

     Émeric

2017-03-19 17:20 GMT+01:00 Sergei Trofimovich <slyfox@gentoo.org>:
> Starting from gcc-5.4+ gcc geperates MLX
> instructions in more cases to refer local
> symbols:
>     https://gcc.gnu.org/bugzilla/60465
>
> That caused ia64 module loader to choke
> on such instructions:
>     fuse: invalid slot number 1 for IMM64
>
> Linux kernel used to handle only case where
> relocation pointed to slot=2 instruction in
> the bundle. That limitation was fixed in linux
> by 9c184a073bfd650cc791956d6ca79725bb682716 commit.
> See http://sources.redhat.com/bugzilla/show_bug.cgi?id=1433
>
> This change lifts the slot=2 restriction from
> linux kernel module loader.
>
> Tested on 'fuse' and 'btrfs' kernel modules.
>
> Cc: H. J. Lu <hjl.tools@gmail.com>
> Cc: Tony Luck <tony.luck@intel.com>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: linux-ia64@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Bug: https://bugs.gentoo.org/601014
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
> ---
>  arch/ia64/kernel/module.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
> index 6ab0ae7d6535..d1d945c6bd05 100644
> --- a/arch/ia64/kernel/module.c
> +++ b/arch/ia64/kernel/module.c
> @@ -153,7 +153,7 @@ slot (const struct insn *insn)
>  static int
>  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",
>                        mod->name, slot(insn));
>                 return 0;
> @@ -165,7 +165,7 @@ apply_imm64 (struct module *mod, struct insn *insn, uint64_t val)
>  static int
>  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",
>                        mod->name, slot(insn));
>                 return 0;
> --
> 2.12.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] ia64: fix module loading for gcc-5.4
@ 2017-03-19 16:20 Sergei Trofimovich
  2017-03-21  8:31 ` Émeric MASCHINO
  0 siblings, 1 reply; 3+ messages in thread
From: Sergei Trofimovich @ 2017-03-19 16:20 UTC (permalink / raw)
  To: Tony Luck
  Cc: Sergei Trofimovich, H . J . Lu, Fenghua Yu, linux-ia64, linux-kernel

Starting from gcc-5.4+ gcc geperates MLX
instructions in more cases to refer local
symbols:
    https://gcc.gnu.org/bugzilla/60465

That caused ia64 module loader to choke
on such instructions:
    fuse: invalid slot number 1 for IMM64

Linux kernel used to handle only case where
relocation pointed to slot=2 instruction in
the bundle. That limitation was fixed in linux
by 9c184a073bfd650cc791956d6ca79725bb682716 commit.
See http://sources.redhat.com/bugzilla/show_bug.cgi?id=1433

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

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

Cc: H. J. Lu <hjl.tools@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Bug: https://bugs.gentoo.org/601014
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 arch/ia64/kernel/module.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index 6ab0ae7d6535..d1d945c6bd05 100644
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
@@ -153,7 +153,7 @@ slot (const struct insn *insn)
 static int
 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",
 		       mod->name, slot(insn));
 		return 0;
@@ -165,7 +165,7 @@ apply_imm64 (struct module *mod, struct insn *insn, uint64_t val)
 static int
 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",
 		       mod->name, slot(insn));
 		return 0;
-- 
2.12.0

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-05-01 18:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-01 18:51 [PATCH] ia64: fix module loading for gcc-5.4 Luck, Tony
  -- strict thread matches above, loose matches on Subject: below --
2017-03-19 16:20 Sergei Trofimovich
2017-03-21  8:31 ` Émeric MASCHINO

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).