From: "tip-bot2 for Andrzej Hajda" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Andrzej Hajda <andrzej.hajda@intel.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Andi Shyti <andi.shyti@linux.intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: locking/core] qed: use __xchg if possible
Date: Sun, 12 Mar 2023 14:41:13 -0000 [thread overview]
Message-ID: <167863207321.5837.328011126625602425.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230118154450.73842-6-andrzej.hajda@intel.com>
The following commit has been merged into the locking/core branch of tip:
Commit-ID: 9b579a841f9032a231e9b14a23dc6699cbe6d311
Gitweb: https://git.kernel.org/tip/9b579a841f9032a231e9b14a23dc6699cbe6d311
Author: Andrzej Hajda <andrzej.hajda@intel.com>
AuthorDate: Wed, 18 Jan 2023 16:44:49 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Sat, 11 Mar 2023 14:03:59 +01:00
qed: use __xchg if possible
Recently introduced helper simplifies the code.
Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://lore.kernel.org/r/20230118154450.73842-6-andrzej.hajda@intel.com
---
include/linux/qed/qed_chain.h | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/include/linux/qed/qed_chain.h b/include/linux/qed/qed_chain.h
index a840634..6355d55 100644
--- a/include/linux/qed/qed_chain.h
+++ b/include/linux/qed/qed_chain.h
@@ -11,6 +11,7 @@
#include <asm/byteorder.h>
#include <linux/kernel.h>
#include <linux/list.h>
+#include <linux/non-atomic/xchg.h>
#include <linux/sizes.h>
#include <linux/slab.h>
#include <linux/qed/common_hsi.h>
@@ -368,7 +369,7 @@ static inline void qed_chain_return_produced(struct qed_chain *p_chain)
*/
static inline void *qed_chain_produce(struct qed_chain *p_chain)
{
- void *p_ret = NULL, *p_prod_idx, *p_prod_page_idx;
+ void *p_prod_idx, *p_prod_page_idx;
if (is_chain_u16(p_chain)) {
if ((p_chain->u.chain16.prod_idx &
@@ -390,11 +391,8 @@ static inline void *qed_chain_produce(struct qed_chain *p_chain)
p_chain->u.chain32.prod_idx++;
}
- p_ret = p_chain->p_prod_elem;
- p_chain->p_prod_elem = (void *)(((u8 *)p_chain->p_prod_elem) +
- p_chain->elem_size);
-
- return p_ret;
+ return __xchg(&p_chain->p_prod_elem,
+ (u8 *)p_chain->p_prod_elem + p_chain->elem_size);
}
/**
@@ -439,7 +437,7 @@ static inline void qed_chain_recycle_consumed(struct qed_chain *p_chain)
*/
static inline void *qed_chain_consume(struct qed_chain *p_chain)
{
- void *p_ret = NULL, *p_cons_idx, *p_cons_page_idx;
+ void *p_cons_idx, *p_cons_page_idx;
if (is_chain_u16(p_chain)) {
if ((p_chain->u.chain16.cons_idx &
@@ -461,11 +459,8 @@ static inline void *qed_chain_consume(struct qed_chain *p_chain)
p_chain->u.chain32.cons_idx++;
}
- p_ret = p_chain->p_cons_elem;
- p_chain->p_cons_elem = (void *)(((u8 *)p_chain->p_cons_elem) +
- p_chain->elem_size);
-
- return p_ret;
+ return __xchg(&p_chain->p_cons_elem,
+ (u8 *)p_chain->p_cons_elem + p_chain->elem_size);
}
/**
next prev parent reply other threads:[~2023-03-12 14:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 15:35 [PATCH v5 0/7] Introduce __xchg, non-atomic xchg Andrzej Hajda
2023-01-18 15:44 ` [PATCH v5 1/7] arch: rename all internal names __xchg to __arch_xchg Andrzej Hajda
2023-01-18 15:44 ` [PATCH v5 2/7] linux/include: add non-atomic version of xchg Andrzej Hajda
2023-02-27 9:53 ` [Intel-gfx] " Andi Shyti
2023-03-12 14:41 ` [tip: locking/core] " tip-bot2 for Andrzej Hajda
2023-01-18 15:44 ` [PATCH v5 3/7] arch/*/uprobes: simplify arch_uretprobe_hijack_return_addr Andrzej Hajda
2023-02-27 9:54 ` [Intel-gfx] " Andi Shyti
2023-03-12 14:41 ` [tip: locking/core] " tip-bot2 for Andrzej Hajda
2023-01-18 15:44 ` [PATCH v5 4/7] llist: simplify __llist_del_all Andrzej Hajda
2023-02-27 9:55 ` [Intel-gfx] " Andi Shyti
2023-03-12 14:41 ` [tip: locking/core] " tip-bot2 for Andrzej Hajda
2023-01-18 15:44 ` [PATCH v5 5/7] io_uring: use __xchg if possible Andrzej Hajda
2023-02-27 9:59 ` [Intel-gfx] " Andi Shyti
2023-03-12 14:41 ` [tip: locking/core] " tip-bot2 for Andrzej Hajda
2023-01-18 15:44 ` [PATCH v5 6/7] qed: " Andrzej Hajda
2023-02-27 9:56 ` [Intel-gfx] " Andi Shyti
2023-03-12 14:41 ` tip-bot2 for Andrzej Hajda [this message]
2023-01-18 15:44 ` [PATCH v5 7/7] drm/i915/gt: use __xchg instead of internal helper Andrzej Hajda
2023-02-27 9:58 ` [Intel-gfx] " Andi Shyti
2023-03-12 14:41 ` [tip: locking/core] " tip-bot2 for Andrzej Hajda
2023-03-14 9:58 ` tip-bot2 for Andrzej Hajda
2023-02-27 9:53 ` [Intel-gfx] [PATCH v5 1/7] arch: rename all internal names __xchg to __arch_xchg Andi Shyti
2023-03-12 14:41 ` [tip: locking/core] " tip-bot2 for Andrzej Hajda
2023-04-29 7:03 ` [tip: locking/core] locking/arch: Rename all internal __xchg() names to __arch_xchg() tip-bot2 for Andrzej Hajda
2023-04-29 7:18 ` tip-bot2 for Andrzej Hajda
2023-02-22 10:36 ` [Intel-gfx] [PATCH v5 0/7] Introduce __xchg, non-atomic xchg Andrzej Hajda
2023-02-22 17:04 ` Peter Zijlstra
2023-02-23 21:24 ` [Intel-gfx] " Andrzej Hajda
2023-02-27 13:49 ` Peter Zijlstra
2024-04-05 14:47 ` Jani Nikula
2024-04-05 16:20 ` Andrzej Hajda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=167863207321.5837.328011126625602425.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=andi.shyti@linux.intel.com \
--cc=andrzej.hajda@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).