Skip to content

Commit 2140935

Browse files
ubizjakcmaiolino
authored andcommitted
xfs: Use xchg() in xlog_cil_insert_pcp_aggregate()
try_cmpxchg() loop with constant "new" value can be substituted with just xchg() to atomically get and clear the location. The code on x86_64 improves from: 1e7f: 48 89 4c 24 10 mov %rcx,0x10(%rsp) 1e84: 48 03 14 c5 00 00 00 add 0x0(,%rax,8),%rdx 1e8b: 00 1e88: R_X86_64_32S __per_cpu_offset 1e8c: 8b 02 mov (%rdx),%eax 1e8e: 41 89 c5 mov %eax,%r13d 1e91: 31 c9 xor %ecx,%ecx 1e93: f0 0f b1 0a lock cmpxchg %ecx,(%rdx) 1e97: 75 f5 jne 1e8e <xlog_cil_commit+0x84e> 1e99: 48 8b 4c 24 10 mov 0x10(%rsp),%rcx 1e9e: 45 01 e9 add %r13d,%r9d to just: 1e7f: 48 03 14 cd 00 00 00 add 0x0(,%rcx,8),%rdx 1e86: 00 1e83: R_X86_64_32S __per_cpu_offset 1e87: 31 c9 xor %ecx,%ecx 1e89: 87 0a xchg %ecx,(%rdx) 1e8b: 41 01 cb add %ecx,%r11d No functional change intended. Signed-off-by: Uros Bizjak <[email protected]> Cc: Chandan Babu R <[email protected]> Cc: Darrick J. Wong <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Dave Chinner <[email protected]> Reviewed-by: Alex Elder <[email protected]> Reviewed-by: Dave Chinner <[email protected]> Signed-off-by: Carlos Maiolino <[email protected]>
1 parent a858109 commit 2140935

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

fs/xfs/xfs_log_cil.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,8 @@ xlog_cil_insert_pcp_aggregate(
171171
*/
172172
for_each_cpu(cpu, &ctx->cil_pcpmask) {
173173
struct xlog_cil_pcp *cilpcp = per_cpu_ptr(cil->xc_pcp, cpu);
174-
int old = READ_ONCE(cilpcp->space_used);
175174

176-
while (!try_cmpxchg(&cilpcp->space_used, &old, 0))
177-
;
178-
count += old;
175+
count += xchg(&cilpcp->space_used, 0);
179176
}
180177
atomic_add(count, &ctx->space_used);
181178
}

0 commit comments

Comments
 (0)