mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jessica Yu <jeyu@redhat.com>
To: Miroslav Benes <mbenes@suse.cz>
Cc: Torsten Duwe <duwe@lst.de>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	takahiro.akashi@linaro.org,
	Jungseok Lee <jungseoklee85@gmail.com>,
	Arnd Bergmann <arnd@arndb.de>, Li Bin <huawei.libin@huawei.com>,
	Steven Rostedt <rostedt@goodmis.org>,
	Ingo Molnar <mingo@redhat.com>,
	Christopher Li <sparse@chrisli.org>,
	Jiri Kosina <jikos@kernel.org>,
	andrew.wafaa@arm.com, linux-arm-kernel@lists.infradead.org,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	live-patching@vger.kernel.org, linux-arch@vger.kernel.org,
	linux-sparse@vger.kernel.org
Subject: [PATCH] arm64: take SHN_LIVEPATCH syms into account when calculating plt_max_entries
Date: Tue, 12 Jul 2016 20:11:14 -0400	[thread overview]
Message-ID: <20160713001113.GA30925@packer-debian-8-amd64.digitalocean.com> (raw)
In-Reply-To: <alpine.LNX.2.00.1607121141480.16277@pobox.suse.cz>

SHN_LIVEPATCH symbols are technically a subset of SHN_UNDEF/undefined
symbols, except that their addresses are resolved by livepatch at runtime.
Therefore, when calculating the upper-bound for the number of plt entries
to allocate, make sure to take livepatch symbols into account as well.

Signed-off-by: Jessica Yu <jeyu@redhat.com>
---
 arch/arm64/kernel/module-plts.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/module-plts.c b/arch/arm64/kernel/module-plts.c
index 1ce90d8..1e95dc1 100644
--- a/arch/arm64/kernel/module-plts.c
+++ b/arch/arm64/kernel/module-plts.c
@@ -122,7 +122,8 @@ static unsigned int count_plts(Elf64_Sym *syms, Elf64_Rela *rela, int num)
                         * as well, so modules can never grow beyond that limit.
                         */
                        s = syms + ELF64_R_SYM(rela[i].r_info);
-                       if (s->st_shndx != SHN_UNDEF)
+                       if (s->st_shndx != SHN_UNDEF &&
+                           s->st_shndx != SHN_LIVEPATCH)
                                break;

                        /*
-- 
2.5.5

  reply	other threads:[~2016-07-13  0:11 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-27 15:15 [PATCH v2 0/2] arm64 live patching Torsten Duwe
2016-06-27 15:17 ` [PATCH v2 1/2] arm64: implement FTRACE_WITH_REGS Torsten Duwe
2016-07-01 12:53   ` Josh Poimboeuf
2016-07-04  9:18     ` Torsten Duwe
2016-07-03  5:17   ` kbuild test robot
2016-07-08 14:58   ` Petr Mladek
2016-07-08 15:07     ` Torsten Duwe
2016-07-08 15:24       ` Petr Mladek
2016-07-08 15:48         ` Josh Poimboeuf
2016-07-08 15:57           ` Steven Rostedt
2016-07-08 20:24             ` Torsten Duwe
2016-07-08 21:08               ` Steven Rostedt
2016-07-09  9:06                 ` Torsten Duwe
2016-07-15 18:36                   ` Steven Rostedt
2016-07-08 15:49         ` Steven Rostedt
2016-06-27 15:17 ` [PATCH v2 2/2] arm64: implement live patching Torsten Duwe
2016-07-11 14:03   ` Miroslav Benes
2016-07-11 21:58     ` Jessica Yu
2016-07-12  9:47       ` Miroslav Benes
2016-07-13  0:11         ` Jessica Yu [this message]
2016-08-17  9:38           ` [PATCH] arm64: take SHN_LIVEPATCH syms into account when calculating plt_max_entries Miroslav Benes
2016-08-11 16:46     ` [PATCH v2 2/2] arm64: implement live patching Torsten Duwe
2016-07-15 16:03   ` Paul Gortmaker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160713001113.GA30925@packer-debian-8-amd64.digitalocean.com \
    --to=jeyu@redhat.com \
    --cc=andrew.wafaa@arm.com \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=duwe@lst.de \
    --cc=huawei.libin@huawei.com \
    --cc=jikos@kernel.org \
    --cc=jungseoklee85@gmail.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sparse@vger.kernel.org \
    --cc=live-patching@vger.kernel.org \
    --cc=mbenes@suse.cz \
    --cc=mingo@redhat.com \
    --cc=rostedt@goodmis.org \
    --cc=sparse@chrisli.org \
    --cc=takahiro.akashi@linaro.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®