ACPICA release 20200717
Subsystems (2)
cover ACPICA release 20200717
This series contains patches relevant to linux kernel from ACPICA's 20200717 release. This ACPICA release contains a change in the ACPI object reference counting mechanism to allow firmware to declare a large amount of OperationRegion field units without overflowing the reference count.
Bob Moore (1):
ACPICA: Update version to 20200717 Version 20200717.
Erik Kaneda (1):
ACPICA: Do not increment operation_region reference counts for field
units
Gustavo A. R. Silva (1):
ACPICA: Replace one-element array with flexible-array
drivers/acpi/acpica/exprep.c | 4 ---- drivers/acpi/acpica/utdelete.c | 6 +----- drivers/acpi/acpica/utids.c | 3 +-- include/acpi/acpixf.h | 2 +- include/acpi/actypes.h | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/3 ACPICA: Replace one-element array with flexible-array
From: "Gustavo A. R. Silva" <[email protected]>
ACPICA commit 7ba2f3d91a32f104765961fda0ed78b884ae193d
The current codebase makes use of one-element arrays in the following form:
struct something {
int length;
u8 data[1];
};struct something *instance;
instance = kmalloc(sizeof(*instance) + size, GFP_KERNEL); instance->length = size;memcpy(instance->data, source, size);
but the preferred mechanism to declare variable-length types such as these ones is a flexible array member[1][2], introduced in C99:
struct foo {
int stuff;
struct boo array[];
};By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being inadvertently introduced[3] to the linux codebase from now on.
This issue was found with the help of Coccinelle and audited _manually_.
[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://github.com/KSPP/linux/issues/21
[3] commit 76497732932f ("cxgb3/l2t: Fix undefined behaviour")
--- drivers/acpi/acpica/utids.c | 3 +-- include/acpi/actypes.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/acpi/acpica/utids.c +1 -2
@@ -263,8 +263,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,* 3) Size of the actual CID strings */ cid_list_size =sizeof (struct acpi_pnp_device_id_list ) + - ((count -1 ) *sizeof (struct acpi_pnp_device_id )) + - string_area_size; + (count *sizeof (struct acpi_pnp_device_id )) + string_area_size; cid_list =ACPI_ALLOCATE_ZEROED (cid_list_size);if (!cid_list) {
include/acpi/actypes.h +1 -1
@@ -1146,7 +1146,7 @@ struct acpi_pnp_device_id {struct acpi_pnp_device_id_list {u32 count;/* Number of IDs in Ids array */ u32 list_size;/* Size of list, including ID strings */ -struct acpi_pnp_device_id ids[1 ];/* ID array */ +struct acpi_pnp_device_id ids[];/* ID array */ };/*
Signature · 1 line
2.25.1
PATCH 2/3 ACPICA: Do not increment operation_region reference counts for field units
In reply to Erik KanedaACPICA commit e17b28cfcc31918d0db9547b6b274b09c413eb70
Object reference counts are used as a part of ACPICA's garbage collection mechanism. This mechanism keeps track of references to heap-allocated structures such as the ACPI operand objects.
Recent server firmware has revealed that this reference count can overflow on large servers that declare many field units under the same operation_region. This occurs because each field unit declaration will add a reference count to the source operation_region.
This change solves the reference count overflow for operation_regions objects by preventing fieldunits from incrementing their operation_region's reference count. Each operation_region's reference count will not be changed by named objects declared under the Field operator. During namespace deletion, the operation_region namespace node will be deleted and each fieldunit will be deleted without touching the deleted operation_region object.
--- drivers/acpi/acpica/exprep.c | 4 ---- drivers/acpi/acpica/utdelete.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-)
drivers/acpi/acpica/exprep.c +0 -4
@@ -473,10 +473,6 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info) (u8 )access_byte_width; } } -/* An additional reference for the container */ - -acpi_ut_add_reference (obj_desc->field.region_obj); - ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, "RegionField: BitOff %X, Off %X, Gran %X, Region %p\n", obj_desc->field.start_field_bit_offset,
drivers/acpi/acpica/utdelete.c +1 -5
@@ -568,11 +568,6 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action) next_object = object->buffer_field.buffer_obj;break ; -case ACPI_TYPE_LOCAL_REGION_FIELD : - - next_object = object->field.region_obj; -break ; -case ACPI_TYPE_LOCAL_BANK_FIELD : next_object = object->bank_field.bank_obj;
@@ -613,6 +608,7 @@ acpi_ut_update_object_reference(union acpi_operand_object *object, u16 action) }break ; +case ACPI_TYPE_LOCAL_REGION_FIELD :case ACPI_TYPE_REGION :default :
Signature · 1 line
2.25.1
PATCH 3/3 ACPICA: Update version to 20200717 Version 20200717.
In reply to Erik KanedaFrom: Bob Moore <[email protected]>
ACPICA commit c1adb9a2a775df7a85df0103342ebf090e1b2016
--- include/acpi/acpixf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/acpi/acpixf.h +1 -1
@@ -12,7 +12,7 @@/* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20200528 +#define ACPI_CA_VERSION 0x20200717#include <acpi/acconfig.h> #include <acpi/actypes.h>
Signature · 1 line
2.25.1
Rafael J. Wysocki
maintainerQuoted 17 lines · Erik Kaneda
This series contains patches relevant to linux kernel from ACPICA's 20200717 release. This ACPICA release contains a change in the ACPI object reference counting mechanism to allow firmware to declare a large amount of OperationRegion field units without overflowing the reference count.
Bob Moore (1):
ACPICA: Update version to 20200717 Version 20200717.Erik Kaneda (1):
ACPICA: Do not incrementoperation_regionreference counts for field
unitsGustavo A. R. Silva (1):
ACPICA: Replace one-element array with flexible-array
Quoted 8 lines
drivers/acpi/acpica/exprep.c | 4 ---- drivers/acpi/acpica/utdelete.c | 6 +----- drivers/acpi/acpica/utids.c | 3 +-- include/acpi/acpixf.h | 2 +- include/acpi/actypes.h | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-)--
All three patches applied as 5.9 material, thanks!