Skip to content

Introduce __xchg, non-atomic xchg

Andrzej Hajda dri-devel intel-gfx linux-alpha linux-arm-kernel linux-hexagon linux-ia64 linux-m68k linux-mips linux-parisc linux-riscv linux-s390 linux-sh linux-snps-arc linuxppc-dev lkml loongarch sparclinux 5 versions – Applied

Status from this message: The following commit has been merged into the locking/core branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest7 patches 13 repliesApplied
  2. v41 patch 3 repliesSuperseded
  3. v31 patch 1 replySuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v21 patch1 replySuperseded
v119 patches10 repliesSuperseded

Changes from the cover letter

v2: squashed all __xchg -> __arch_xchg t one patch (Arnd)
v3: fixed alpha/xchg_local ([email protected])
v4: adjusted indentation (Heiko)
v5: added more __xchg conversions - patches 3-6, added tags

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/7arch: rename all internal names __xchg to __arch_xchgarch/alpha/include/asm/cmpxchg.h arch/arc/include/asm/cmpxchg.h arch/arm/include/asm/cmpxchg.h +17 more+54 -541 reply
2/7linux/include: add non-atomic version of xchginclude/linux/non-atomic/xchg.h+19 -01 reply
3/7arch/*/uprobes: simplify arch_uretprobe_hijack_return_addrarch/arm/probes/uprobes/core.c arch/arm64/kernel/probes/uprobes.c arch/csky/kernel/probes/uprobes.c +5 more+16 -531 reply
4/7llist: simplify __llist_del_allinclude/linux/llist.h+2 -41 reply
5/7io_uring: use __xchg if possibleio_uring/io_uring.c io_uring/slist.h+4 -91 reply
6/7qed: use __xchg if possibleinclude/linux/qed/qed_chain.h+7 -121 reply
7/7drm/i915/gt: use __xchg instead of internal helperdrivers/gpu/drm/i915/gt/intel_engine_cs.c drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c drivers/gpu/drm/i915/gt/intel_execlists_submission.c +15 more+24 -231 reply

Reviews trailers per patch

All 7 patches have a Reviewed-by or Acked-by.

PatchArnd BergmannGeert UytterhoevenPalmer DabbeltAndy ShevchenkoAndi Shyti
1/7R-b A-b A-b R-b
2/7R-b R-b
3/7R-b
4/7R-b
5/7R-b
6/7R-b
7/7R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v5 thread

Cover letter [PATCH v5 0/7] Introduce __xchg, non-atomic xchg

Hi all,

The helper is tiny and there are advices we can live without it, so I want to present few arguments why it would be good to have it:

1. Code readability/simplification/number of lines:
- decreases number of lines,
- it often eliminates local variables,
- for real examples see patches 3+.

2. Presence of similar helpers in other somehow related languages/libs:

a) Rust[1]: 'replace' from std::mem module, there is also 'take' helper (__xchg(&x, 0)), which is the same as private helper in i915 - fetch_and_zero, see latest patch.
b) C++ [2]: 'exchange' from utility header.

If the idea is OK there are still 2 questions to answer:

1. Name of the helper, __xchg follows kernel conventions, but for me Rust names are also OK.
2. Where to put the helper:
a) as in this patchset include/linux/non-atomic/xchg.h, proposed by Andy Shevchenko,
b) include/linux/utils.h ? any better name? Some kind of container for simple helpers.

All __xchg conversions were performed using cocci script, then manually adjusted if necessary.

There is lot of places it can be used in, I have just chosen some of them. I can provide cocci script to detect others (not all), if necessary.

Changes:
v2: squashed all __xchg -> __arch_xchg t one patch (Arnd)
v3: fixed alpha/xchg_local ([email protected])
v4: adjusted indentation (Heiko)
v5: added more __xchg conversions - patches 3-6, added tags

[1]: https://doc.rust-lang.org/std/mem/index.html
[2]: https://en.cppreference.com/w/cpp/header/utility

Regards
Andrzej

Andrzej Hajda (7):
arch: rename all internal names __xchg to __arch_xchg linux/include: add non-atomic version of xchg arch/*/uprobes: simplify arch_uretprobe_hijack_return_addr
llist: simplify __llist_del_all
io_uring: use __xchg if possible
qed: use __xchg if possible
drm/i915/gt: use __xchg instead of internal helper

 arch/alpha/include/asm/cmpxchg.h              | 10 +++++-----
 arch/arc/include/asm/cmpxchg.h                |  4 ++--
 arch/arm/include/asm/cmpxchg.h                |  7 ++++---
 arch/arm/probes/uprobes/core.c                |  8 ++------
 arch/arm64/include/asm/cmpxchg.h              |  7 +++----
 arch/arm64/kernel/probes/uprobes.c            |  9 ++-------
 arch/csky/kernel/probes/uprobes.c             |  9 ++-------
 arch/hexagon/include/asm/cmpxchg.h            | 10 +++++-----
 arch/ia64/include/asm/cmpxchg.h               |  2 +-
 arch/ia64/include/uapi/asm/cmpxchg.h          |  4 ++--
 arch/loongarch/include/asm/cmpxchg.h          |  4 ++--
 arch/m68k/include/asm/cmpxchg.h               |  6 +++---
 arch/mips/include/asm/cmpxchg.h               |  4 ++--
 arch/mips/kernel/uprobes.c                    | 10 ++--------
 arch/openrisc/include/asm/cmpxchg.h           | 10 +++++-----
 arch/parisc/include/asm/cmpxchg.h             |  4 ++--
 arch/powerpc/include/asm/cmpxchg.h            |  4 ++--
 arch/powerpc/kernel/uprobes.c                 | 10 ++--------
 arch/riscv/include/asm/atomic.h               |  2 +-
 arch/riscv/include/asm/cmpxchg.h              |  4 ++--
 arch/riscv/kernel/probes/uprobes.c            |  9 ++-------
 arch/s390/include/asm/cmpxchg.h               |  8 ++++----
 arch/s390/kernel/uprobes.c                    |  7 ++-----
 arch/sh/include/asm/cmpxchg.h                 |  4 ++--
 arch/sparc/include/asm/cmpxchg_32.h           |  4 ++--
 arch/sparc/include/asm/cmpxchg_64.h           |  6 +++---
 arch/sparc/kernel/uprobes.c                   |  7 ++-----
 arch/xtensa/include/asm/cmpxchg.h             |  4 ++--
 drivers/gpu/drm/i915/gt/intel_engine_cs.c     |  2 +-
 .../gpu/drm/i915/gt/intel_engine_heartbeat.c  |  4 ++--
 .../drm/i915/gt/intel_execlists_submission.c  |  4 ++--
 drivers/gpu/drm/i915/gt/intel_ggtt.c          |  4 ++--
 drivers/gpu/drm/i915/gt/intel_gsc.c           |  2 +-
 drivers/gpu/drm/i915/gt/intel_gt.c            |  4 ++--
 drivers/gpu/drm/i915/gt/intel_gt_pm.c         |  2 +-
 drivers/gpu/drm/i915/gt/intel_lrc.c           |  6 +++---
 drivers/gpu/drm/i915/gt/intel_migrate.c       |  2 +-
 drivers/gpu/drm/i915/gt/intel_rc6.c           |  2 +-
 drivers/gpu/drm/i915/gt/intel_rps.c           |  2 +-
 drivers/gpu/drm/i915/gt/selftest_context.c    |  2 +-
 .../drm/i915/gt/selftest_ring_submission.c    |  2 +-
 drivers/gpu/drm/i915/gt/selftest_timeline.c   |  2 +-
 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c     |  2 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc.c         |  2 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c      |  2 +-
 drivers/gpu/drm/i915/i915_utils.h             |  1 +
 include/linux/llist.h                         |  6 ++----
 include/linux/non-atomic/xchg.h               | 19 +++++++++++++++++++
 include/linux/qed/qed_chain.h                 | 19 +++++++------------
 io_uring/io_uring.c                           |  7 ++-----
 io_uring/slist.h                              |  6 ++----
 51 files changed, 126 insertions(+), 155 deletions(-)
 create mode 100644 include/linux/non-atomic/xchg.h
Signature · 1 line
2.34.1