ANDROID: GKI: Update .stg file based on io_ring_ctx internal change

In commit 9aeb68337a ("io_uring: get rid of remap_pfn_range() for
mapping rings/sqes") struct io_ring_ctx had some new fields added to fix
some security issues.  This is an internal-to-the-io_uring-core
structure, but happens to have a pointer to this structure in other
structures that we track for ABI compliance.  Because this is not an
"anonymous" pointer, it breaks the ABI checking.  But as this is an
internal structure it is safe to change as no external module ever
accesses this structure at all.

The .stg update is:

type 'struct io_ring_ctx' changed
  byte size changed from 1344 to 1408
  member 'unsigned short n_ring_pages' was added
  member 'unsigned short n_sqe_pages' was added
  member 'struct page** ring_pages' was added
  member 'struct page** sqe_pages' was added

Change-Id: I8029a8028271d85a19770702c024a4bac0746851
Fixes: 9aeb68337a ("io_uring: get rid of remap_pfn_range() for mapping rings/sqes")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-04-11 08:32:24 +00:00
parent 4076744180
commit abd5ee4e51
3 changed files with 38 additions and 1 deletions

View File

@@ -133583,6 +133583,12 @@ member {
type_id: 0x6720d32f
offset: 128
}
member {
id: 0xffaa3920
name: "n_ring_pages"
type_id: 0xc93e017b
offset: 10624
}
member {
id: 0xeebfc981
name: "n_rules"
@@ -133606,6 +133612,12 @@ member {
type_id: 0x295c7202
offset: 304
}
member {
id: 0x3543ba34
name: "n_sqe_pages"
type_id: 0xc93e017b
offset: 10640
}
member {
id: 0x998218ab
name: "n_ssids"
@@ -170562,6 +170574,12 @@ member {
name: "ring_mask"
type_id: 0xc9082b19
}
member {
id: 0x44db695c
name: "ring_pages"
type_id: 0x0b30ee00
offset: 10688
}
member {
id: 0x44db6fdd
name: "ring_pages"
@@ -185142,6 +185160,12 @@ member {
type_id: 0xb914bfab
offset: 64
}
member {
id: 0xce17811e
name: "sqe_pages"
type_id: 0x0b30ee00
offset: 10752
}
member {
id: 0xe005d64f
name: "sqo_sq_wait"
@@ -241492,7 +241516,7 @@ struct_union {
kind: STRUCT
name: "io_ring_ctx"
definition {
bytesize: 1344
bytesize: 1408
member_id: 0x2c717118
member_id: 0x246f2632
member_id: 0x7adfc058
@@ -241534,6 +241558,10 @@ struct_union {
member_id: 0x31444ba6
member_id: 0x1d068fc6
member_id: 0xd2c00a64
member_id: 0xffaa3920
member_id: 0x3543ba34
member_id: 0x44db695c
member_id: 0xce17811e
}
}
struct_union {

View File

@@ -137,3 +137,10 @@ type 'struct geni_wrapper' changed
member 'struct clk_bulk_data clks[2]' was added
member 'unsigned int num_clks' was added
type 'struct io_ring_ctx' changed
byte size changed from 1344 to 1408
member 'unsigned short n_ring_pages' was added
member 'unsigned short n_sqe_pages' was added
member 'struct page** ring_pages' was added
member 'struct page** sqe_pages' was added

View File

@@ -361,10 +361,12 @@ struct io_ring_ctx {
/* protected by ->completion_lock */
unsigned evfd_last_cq_tail;
#ifndef __GENKSYMS__
unsigned short n_ring_pages;
unsigned short n_sqe_pages;
struct page **ring_pages;
struct page **sqe_pages;
#endif
};
enum {