Merge branch 'android11-5.4' into 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

617c7432b5 ANDROID: GKI: Enable CONFIG_SERIAL_8250_RUNTIME_UARTS=0
813b12454e ANDROID: GKI: db845c: Update symbols list and ABI
15dd5a8bc0 ANDROID: Increase x86 cmdline size to 4k
4ec7ffac46 UPSTREAM: cgroup-v1: Require capabilities to set release_agent
fe0c18d0f0 ANDROID: incremental-fs: remove index and incomplete dir on umount
7aedba616c UPSTREAM: binder: fix async_free_space accounting for empty parcels
f1a1171f3c UPSTREAM: tee: handle lookup of shm with reference count 0
693158f765 UPSTREAM: bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc
b9d179c605 UPSTREAM: driver core: Fix possible memory leak in device_link_add()
3aeff14796 UPSTREAM: blk-mq: fix kernel panic during iterating over flush request
54e1868c8b UPSTREAM: net: xfrm: fix memory leak in xfrm_user_rcv_msg
a4e84758f0 UPSTREAM: binder: fix the missing BR_FROZEN_REPLY in binder_return_strings
013b7ed754 ANDROID: incremental-fs: fix mount_fs issue
ba4942c83d Merge tag 'android11-5.4.161_r00' into android11-5.4
202bc8432c UPSTREAM: vfs: fs_context: fix up param length parsing in legacy_parse_param

New symbols tracked due to them being added in the android11-5.4 branch:

Leaf changes summary: 1 artifact changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

1 Added function:

  [A] 'function void kill_anon_super(super_block*)'

Signed-off-by: Greg Kroah-Hartman <[email protected]>
Change-Id: I89df6d21c7c36bb6b2a9047b1f7e2988f48a5637
This commit is contained in:
Greg Kroah-Hartman 2022-02-11 15:19:46 +01:00
commit 82b6e1787f
12 changed files with 1291 additions and 1237 deletions

View file

@ -120,7 +120,6 @@ void blk_rq_init(struct request_queue *q, struct request *rq)
rq->internal_tag = -1;
rq->start_time_ns = ktime_get_ns();
rq->part = NULL;
refcount_set(&rq->ref, 1);
}
EXPORT_SYMBOL(blk_rq_init);

View file

@ -325,6 +325,14 @@ static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq,
flush_rq->rq_flags |= RQF_FLUSH_SEQ;
flush_rq->rq_disk = first_rq->rq_disk;
flush_rq->end_io = flush_end_io;
/*
* Order WRITE ->end_io and WRITE rq->ref, and its pair is the one
* implied in refcount_inc_not_zero() called from
* blk_mq_find_and_get_req(), which orders WRITE/READ flush_rq->ref
* and READ flush_rq->end_io
*/
smp_wmb();
refcount_set(&flush_rq->ref, 1);
blk_flush_queue_rq(flush_rq, false);
}