Acpica tables2 #265
Closed
Acpica tables2 #265
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
zetalog
force-pushed
the
acpica-tables2
branch
4 times, most recently
from
23f8ae4
to
9bc7b04
Compare
added 13 commits
June 14, 2017 17:23
ACPI_HMAT_STRUCTURE is missing from identifier table, causing linuxize failures. Lv Zheng. Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Adds conversion identifiers for the following missing structures: ACPI_RESOURCE_PIN_FUNCTION/AML_RESOURCE_PIN_FUNCTION ACPI_RESOURCE_PIN_CONFIG/AML_RESOURCE_PIN_CONFIG ACPI_RESOURCE_PIN_GROUP/AML_RESOURCE_PIN_GROUP ACPI_RESOURCE_PIN_GROUP_FUNCTION/AML_RESOURCE_PIN_GROUP_FUNCTION ACPI_RESOURCE_PIN_GROUP_CONFIG/AML_RESOURCE_PIN_GROUP_CONFIG ACPI_RESOURCE_LABEL Signed-off-by: Lv Zheng <lv.zheng@intel.com>
In the Linux kernel, AcpiGetTable() "clones" haven't been fully balanced by AcpiPutTable() invocations. In upstream ACPICA, due to the design change, there are also unbalanced AcpiGetTableByIndex() invocations requiring special care. AcpiGetable() reference counting mismatches may occor due to that and printing error messages related to them is not useful at this point. The strict balanced validation count check should only be enabled after confirming that all invocations are safe and aligned with their designed purposes. Thus this patch removes the error value returned by AcpiTbGetTable() in that case along with the accompanying error message to fix the issue. Reported-by: Anush Seetharaman <anush.seetharaman@intel.com> Reported-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> [ rjw: Changelog ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
acpisrc now has capability to convert both the followings:
1. Form 1:
typedef struct/union foo { struct/union foo {
.... --> ...
} FOO; }
2. Form 2:
typedef struct/union foo FOO; --> typedef struct/union foo foo;
It becomes unable to handle the following:
3. Form3:
typedef struct/union foo { /* comment */
...
} FOO;
-->
strut/union foo { /* comment */
...
};
As:
1. The purpose of acpisrc is to convert formatted code (ACPICA coding
style) into linux coding style,
2. acpisrc is a very simple tool that doesn't fully handle C language.
This commit changes the definitions side in order not to regress and we
shall make "no comments in struct/union line" as a new ACPICA coding style
rule. Lv Zheng.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Considering this case:
1. A program opens a sysfs table file 65535 times, it can increase
ValidationCount and first increment cause the table to be mapped:
ValidationCount = 65535
2. AML execution causes "Load" to be executed on the same
table, this time it cannot increase ValidationCount, so
ValidationCount remains:
ValidationCount = 65535
3. The program closes sysfs table file 65535 times, it can decrease
ValidationCount and the last decrement cause the table to be
unmapped:
ValidationCount = 0
4. AML code still accessing the loaded table, kernel crash can be
observed.
To prevent that from happening, add a ValidationCount threashold.
When it is reached, the ValidationCount can no longer be
incremented/decremented to invalidate the table descriptor (means
preventing table unmappings)
Note that code added in AcpiTbPutTable() is actually a no-op but
changes the warning message into a "warn once" one. Lv Zheng.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
[ rjw: Changelog, comments ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
There is a hidden logic for AcpiTbInstallStandardTable():
1. When it is invoked from the OS boot stage, ACPICA mutex may not be
available, and thus no AcpiUtAcquireMutex()/AcpiUtReleaseMutex() are
invoked in these code paths:
AcpiInitializeTables
AcpiTbParseRootTable
AcpiTbInstallStandardTable (4 invocations)
AcpiInstallTable
AcpiTbInstallStandardTable
2. When it is invoked during the runtime, ACPICA mutex is correctly used:
AcpiExLoadOp
AcpiTbInstallAndLoadTable
Lock(TABLES)
AcpiTbInstallStandardTable
UnLock(TABLES)
AcpiLoadTable
AcpiTbInstallAndLoadTable
Lock(TABLES)
AcpiTbInstallStandardTable
UnLock(TABLES)
So the hidden logic is: AcpiTbInstallStandardTable() tries not to hold
mutexes to handle the difference of the boot stage and the runtime, but
leaves the mutexes held from some calling runtime APIs.
This introduces another problem in AcpiTbInstallStandardTable() where
AcpiGbl_TableHandler is invoked from and the lock contexts are thus not
consistent for the table handlers. Linux registers such a handler to track
the table installation and the handler is actually invoked from both
contexts. Since the handler also invokes AcpiGetTable(), when the following
commit corrected AcpiGetTable() to make it start to hold the table lock,
a regression is then triggered.
Commit: cac6790
Subject: Tables: Back port acpi_get_table_with_size() and early_acpi_os_unmap_memory() from Linux kernel
The regression is noticed by LKP as new errors reported by ACPICA mutex
debugging facility.
[ 2.043693] ACPI Error: Mutex [ACPI_MTX_Tables] already acquired by this thread [497483776] (20160930/utmutex-254)
[ 2.054084] ACPI Error: Mutex [0x2] is not acquired, cannot release (20160930/utmutex-326)
And it triggers a dead lock:
[ 247.066214] INFO: task swapper/0:1 blocked for more than 120 seconds.
...
[ 247.091271] Call Trace:
...
[ 247.121523] down_timeout+0x47/0x50
[ 247.125065] acpi_os_wait_semaphore+0x47/0x62
[ 247.129475] acpi_ut_acquire_mutex+0x43/0x81
[ 247.133798] acpi_get_table+0x2d/0x84
[ 247.137513] acpi_table_attr_init+0xcd/0x100
[ 247.146590] acpi_sysfs_table_handler+0x5d/0xb8
[ 247.151174] acpi_bus_table_handler+0x23/0x2a
[ 247.155583] acpi_tb_install_standard_table+0xe0/0x213
[ 247.164489] acpi_tb_install_and_load_table+0x3a/0x82
[ 247.169592] acpi_ex_load_op+0x194/0x201
...
[ 247.200108] acpi_ns_evaluate+0x1bb/0x247
[ 247.204170] acpi_evaluate_object+0x178/0x274
[ 247.213249] acpi_processor_set_pdc+0x154/0x17b
...
The table mutex held in AcpiTbInstallAndLoadTable() is re-visited by
AcpiGetTable().
Noticing that the early mutex requirement actually belongs to the OSL layer
and has already been handled in Linux
acpi_os_wait_semaphore()/acpi_os_signal_semaphore(). This patch then can
fix the regression by removing this hidden logic from ACPICA core and
leaving it to OSPMs.
Tested-by: Tomi Sarvela <tomi.p.sarvela@intel.com>
Tested-by: Ye Xiaolong <xiaolong.ye@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Recently, we allows the table mutex to be held in both early and late stage APIs. This patch further cleans up the related code to reduce redundant code related to AcpiGbl_TableHandler. Lv Zheng. Tested-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com>
To avoid caller to trigger unexpected warning messages (Link #1): ACPI Warning: Table ffffffffbb461d20, Validation count is zero before decrement Which is reported from AcpiTbPutTable(). When the table is validated, the pointer must be non-zero. Thus the message is not suitable for invalidated tables. This patch fixes the callee side based on this fact. Reported by Cristian Aravena Romero, Fixed by Lv Zheng. Link: https://bugzilla.kernel.org/show_bug.cgi?id=191221 [#1] Reported-by: Cristian Aravena Romero <caravena@gmail.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Windows seems to allow arbitrary table signatures for Load/LoadTable opcodes: ACPI BIOS Error (bug): Table has invalid signature [PRAD] (0x44415250) So this patch removes dynamic load signature checks. However we need to find a way to avoid table loading against tables like MADT. This is not covered by this commit. This Windows behavior has been validated on link #1. An end user bug report can also be found on link #2. This patch also includes simple cleanup for static load signature check code. Reported by Ye Xiaolong, Fixed by Lv Zheng. Link: acpica#121 [#1] Link: https://bugzilla.kernel.org/show_bug.cgi?id=118601 [#2] Reported-by: Ye Xiaolong <xiaolong.ye@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Validated windows behavior shows it allows to load tables via Load and LoadTable opcode without putting any limitations to the table signature. This patch corrects exc_tbl:TLD1 cases to reflect this validated Windows behavior. Lv Zheng. Signed-off-by: Lv Zheng <lv.zheng@intel.com>
…yTableChecksum AcpiGbl_VerifyTableChecksum is used to avoid validating (mapping) an entire table in OS boot stage. 2nd "Reload" check in AcpiTbInstallStandardTable() is prepared for the same purpose. So this patch combines them together using a renamed AcpiGbl_EnableTableValidation flag. Lv Zheng. Signed-off-by: Lv Zheng <lv.zheng@intel.com>
They are all mechanisms used to verify if a table is qualified to be installed and controlled by AcpiGbl_EnableTableValidation, so combine them together. By doing so, table duplication check is applied to the statically loaded tables (however whether it is actually enabled is still determined by AcpiGbl_EnableTableValidation). Lv Zheng. Signed-off-by: Lv Zheng <lv.zheng@intel.com>
This patch allows tables not verified in early stage verfied in AcpiReallocateRootTable(). This is useful for OSPMs like linux where tables cannot be verified in early stage due to early ioremp limitations on some architectures. Reported by Hans de Geode, fixed by Lv Zheng. Reported-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com>
|
Close as merged to #121 per upstream request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Support deferred table verification, useful for Linux.