From: Chao Fan <fanc.fnst@cn.fujitsu.com>
To: Masayoshi Mizuma <msys.mizuma@gmail.com>
Cc: <linux-kernel@vger.kernel.org>, <x86@kernel.org>,
<linux-efi@vger.kernel.org>, <linux-acpi@vger.kernel.org>,
<tglx@linutronix.de>, <mingo@redhat.com>, <hpa@zytor.com>,
<keescook@chromium.org>, <bhe@redhat.com>, <rjw@rjwysocki.net>,
<lenb@kernel.org>, <ard.biesheuvel@linaro.org>,
<indou.takao@jp.fujitsu.com>, <caoj.fnst@cn.fujitsu.com>
Subject: Re: [PATCH v8 1/3] x86/boot: Add acpitb.c to parse acpi tables
Date: Tue, 16 Oct 2018 09:50:51 +0800 [thread overview]
Message-ID: <20181016015050.GA2075@localhost.localdomain> (raw)
In-Reply-To: <20181015202609.gs6jownxbevs4vzr@gabell>
On Mon, Oct 15, 2018 at 04:26:09PM -0400, Masayoshi Mizuma wrote:
>Hi Chao,
>
>Let me add some suggestions.
Thanks for your review and suggestion.
I will change them in next version.
Thanks,
Chao Fan
>
>On Wed, Oct 10, 2018 at 04:41:17PM +0800, Chao Fan wrote:
>> There is a bug that kaslr may randomly chooses some positions
>> which are located in movable memory regions. This will break memory
>> hotplug feature and make the movable memory chosen by KASLR can't be
>> removed. So dig SRAT table from ACPI tables to get memory information.
>>
>> Imitate the ACPI code of parsing ACPI tables to dig and read ACPI
>> tables. Since some operations are not needed here, functions are
>> simplified. Functions will be used to dig only SRAT tables to get
>> information of memory, so that KASLR can the memory in immovable node.
>>
>> And also, these functions won't influence the initialization of
>> ACPI after start_kernel().
>>
>> Since use physical address directely, so acpi_os_map_memory()
>> and acpi_os_unmap_memory() are not needed.
>>
>> Signed-off-by: Chao Fan <fanc.fnst@cn.fujitsu.com>
>> ---
>> arch/x86/boot/compressed/Makefile | 2 +
>> arch/x86/boot/compressed/acpitb.c | 405 ++++++++++++++++++++++++++++++
>> arch/x86/boot/compressed/misc.h | 8 +
>> 3 files changed, 415 insertions(+)
>> create mode 100644 arch/x86/boot/compressed/acpitb.c
>>
>...cut...
>> +static struct acpi_table_header *get_acpi_srat_table(void)
>> +{
>> + char *args = (char *)get_cmd_line_ptr();
>> + acpi_physical_address acpi_table;
>> + acpi_physical_address root_table;
>> + struct acpi_table_header *header;
>> + struct acpi_table_rsdp *rsdp;
>> + char *signature;
>> + u8 *entry;
>> + u32 count;
>> + u32 size;
>> + int i, j;
>> + u32 len;
>> +
>> + rsdp = (struct acpi_table_rsdp *)get_rsdp_addr();
>> + if (!rsdp)
>> + return NULL;
>> +
>> + /* Get rsdt or xsdt from rsdp. */
>> + if (!strstr(args, "acpi=rsdt") &&
>> + rsdp->xsdt_physical_address && rsdp->revision > 1) {
>> + root_table = rsdp->xsdt_physical_address;
>> + size = ACPI_XSDT_ENTRY_SIZE;
>> + } else {
>> + root_table = rsdp->rsdt_physical_address;
>> + size = ACPI_RSDT_ENTRY_SIZE;
>> + }
>> +
>> + /* Get ACPI root table from rsdt or xsdt.*/
>> + header = (struct acpi_table_header *)root_table;
>> + len = header->length;
>> + count = (u32)((len - sizeof(struct acpi_table_header)) / size);
>> + entry = ACPI_ADD_PTR(u8, header, sizeof(struct acpi_table_header));
>> +
>> + for (i = 0; i < count; i++) {
>> + u64 address64;
>> +
>> + if (size == ACPI_RSDT_ENTRY_SIZE)
>> + acpi_table = ((acpi_physical_address)
>> + (*ACPI_CAST_PTR(u32, entry)));
>> + else {
>> + *(u64 *)(void *)&address64 = *(u64 *)(void *)entry;
>> + acpi_table = (acpi_physical_address) address64;
>> + }
>> +
>> + if (acpi_table) {
>> + header = (struct acpi_table_header *)acpi_table;
>
>> + signature = header->signature;
>> +
>> + if (!strncmp(signature, "SRAT", 4))
>
> if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_SRAT))
>
>> + return header;
>> + }
>> + entry += size;
>> + }
>> + return NULL;
>> +}
>> +
>> +#ifdef CONFIG_MEMORY_HOTREMOVE
>> +/*
>> + * According to ACPI table, filter the immvoable memory regions
>> + * and store them in immovable_mem[].
>> + */
>> +void get_immovable_mem(void)
>> +{
>> + char *args = (char *)get_cmd_line_ptr();
>> + struct acpi_table_header *table_header;
>> + struct acpi_subtable_header *table;
>> + struct acpi_srat_mem_affinity *ma;
>> + unsigned long table_end;
>> + int i = 0;
>> +
>> + if (!strstr(args, "movable_node") || strstr(args, "acpi=off"))
>> + return;
>> +
>> + table_header = get_acpi_srat_table();
>> + if (!table_header)
>> + return;
>> +
>> + table_end = (unsigned long)table_header + table_header->length;
>> +
>> + table = (struct acpi_subtable_header *)
>> + ((unsigned long)table_header + sizeof(struct acpi_table_srat));
>> +
>
>> + while (((unsigned long)table) + table->length < table_end) {
>
> while (((unsigned long)table) +
> sizeof(struct acpi_subtable_header) < table_end) {
>
>> + if (table->type == 1) {
>
> if (table->type == ACPI_SRAT_TYPE_MEMORY_AFFINITY) {
>
>> + ma = (struct acpi_srat_mem_affinity *)table;
>> + if (!(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)) {
>> + immovable_mem[i].start = ma->base_address;
>> + immovable_mem[i].size = ma->length;
>> + i++;
>> + }
>> +
>> + if (i >= MAX_NUMNODES*2)
>> + break;
>> + }
>> + table = (struct acpi_subtable_header *)
>> + ((unsigned long)table + table->length);
>> + }
>> + num_immovable_mem = i;
>> +}
>
>Thanks,
>Masa
>
>
next prev parent reply other threads:[~2018-10-16 1:51 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 8:41 [PATCH v8 0/3] x86/boot/KASLR: Parse ACPI table and limit kaslr in immovable memory Chao Fan
2018-10-10 8:41 ` [PATCH v8 1/3] x86/boot: Add acpitb.c to parse acpi tables Chao Fan
2018-10-11 10:57 ` Borislav Petkov
2018-10-12 1:56 ` Chao Fan
2018-10-12 9:36 ` Chao Fan
2018-10-12 9:46 ` Borislav Petkov
2018-10-12 10:03 ` Chao Fan
2018-10-16 2:48 ` Chao Fan
2018-10-16 12:40 ` Borislav Petkov
2018-10-17 1:10 ` Chao Fan
2018-10-15 20:26 ` Masayoshi Mizuma
2018-10-16 1:50 ` Chao Fan [this message]
2018-10-10 8:41 ` [PATCH v8 2/3] x86/boot/KASLR: Walk srat tables to filter immovable memory Chao Fan
2018-10-10 8:41 ` [PATCH v8 3/3] x86/boot/KASLR: Limit kaslr to choosing the " Chao Fan
2018-10-10 8:59 ` [PATCH v8 0/3] x86/boot/KASLR: Parse ACPI table and limit kaslr in " Borislav Petkov
2018-10-10 9:06 ` Baoquan He
2018-10-10 9:12 ` Chao Fan
2018-10-10 9:21 ` Baoquan He
2018-10-10 9:14 ` Thomas Gleixner
2018-10-10 9:19 ` Borislav Petkov
2018-10-10 9:30 ` Baoquan He
2018-10-10 19:44 ` Masayoshi Mizuma
2018-10-11 0:29 ` Baoquan He
2018-10-11 5:51 ` Chao Fan
2018-10-13 20:19 ` Masayoshi Mizuma
2018-10-13 20:34 ` Borislav Petkov
2018-10-13 21:45 ` Masayoshi Mizuma
2018-10-13 22:05 ` Borislav Petkov
2018-10-15 0:50 ` Masayoshi Mizuma
2018-10-16 15:13 ` Masayoshi Mizuma
2018-10-16 19:11 ` Borislav Petkov
2018-10-16 19:54 ` Masayoshi Mizuma
2018-10-16 19:59 ` Borislav Petkov
2018-10-22 15:42 ` Masayoshi Mizuma
2018-10-23 2:48 ` Chao Fan
2018-10-24 19:21 ` Masayoshi Mizuma
2018-10-25 1:22 ` Chao Fan
2018-10-25 10:33 ` Borislav Petkov
2018-10-25 13:40 ` Masayoshi Mizuma
2018-11-06 12:10 ` Borislav Petkov
2018-11-06 14:07 ` Baoquan He
2018-11-07 1:21 ` Chao Fan
2018-11-06 18:45 ` Borislav Petkov
2018-11-06 19:36 ` Masayoshi Mizuma
2018-11-06 20:45 ` Borislav Petkov
2018-11-06 22:21 ` Masayoshi Mizuma
2018-11-08 10:51 ` Borislav Petkov
2018-11-10 10:54 ` Borislav Petkov
2018-11-11 13:45 ` Masayoshi Mizuma
2019-02-05 15:05 ` Masayoshi Mizuma
2019-02-08 18:26 ` Borislav Petkov
2019-02-09 0:24 ` Masayoshi Mizuma
2019-02-11 1:46 ` Chao Fan
2019-02-11 20:11 ` Masayoshi Mizuma
2018-10-10 17:16 ` Borislav Petkov
2018-10-11 1:30 ` Chao Fan
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=20181016015050.GA2075@localhost.localdomain \
--to=fanc.fnst@cn.fujitsu.com \
--cc=ard.biesheuvel@linaro.org \
--cc=bhe@redhat.com \
--cc=caoj.fnst@cn.fujitsu.com \
--cc=hpa@zytor.com \
--cc=indou.takao@jp.fujitsu.com \
--cc=keescook@chromium.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=msys.mizuma@gmail.com \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).