From: Jakob Koschel <jakobkoschel@gmail.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: Andrew Lunn <andrew@lunn.ch>, Song Liu <songliubraving@fb.com>,
Alexei Starovoitov <ast@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Paul Mackerras <paulus@samba.org>,
Ariel Elior <aelior@marvell.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Steen Hegelund <Steen.Hegelund@microchip.com>,
John Fastabend <john.fastabend@gmail.com>,
Andrii Nakryiko <andrii@kernel.org>, "Bos, H.J." <h.j.bos@vu.nl>,
Jason Gunthorpe <jgg@ziepe.ca>,
linux-arm-kernel@lists.infradead.org,
Martin Habets <habetsm.xilinx@gmail.com>,
Paolo Abeni <pabeni@redhat.com>,
Vivien Didelot <vivien.didelot@gmail.com>,
Jiri Pirko <jiri@resnulli.us>, Arnd Bergmann <arnd@arndb.de>,
KP Singh <kpsingh@kernel.org>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Jakob Koschel <jakobkoschel@gmail.com>,
Jakub Kicinski <kuba@kernel.org>,
Brian Johannesmeyer <bjohannesmeyer@gmail.com>,
Lars Povlsen <lars.povlsen@microchip.com>,
Colin Ian King <colin.king@intel.com>,
Manish Chopra <manishc@marvell.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
UNGLinuxDriver@microchip.com, Yonghong Song <yhs@fb.com>,
Edward Cree <ecree.xilinx@gmail.com>,
Casper Andersson <casper.casan@gmail.com>,
Xu Wang <vulab@iscas.ac.cn>,
Cristiano Giuffrida <c.giuffrida@vu.nl>,
bpf@vger.kernel.org, Vladimir Oltean <olteanv@gmail.com>,
linuxppc-dev@lists.ozlabs.org, Martin KaFai Lau <kafai@fb.com>,
Mike Rapoport <rppt@kernel.org>
Subject: [PATCH net-next v5 15/18] net: netcp: Remove usage of list iterator for list_add() after loop body
Date: Wed, 27 Apr 2022 18:06:32 +0200 [thread overview]
Message-ID: <20220427160635.420492-16-jakobkoschel@gmail.com> (raw)
In-Reply-To: <20220427160635.420492-1-jakobkoschel@gmail.com>
In preparation to limit the scope of a list iterator to the list
traversal loop, use a dedicated pointer pointing to the location
where the element should be inserted [1].
Before, the code implicitly used the head when no element was found
when using &next->list. The new 'pos' variable is set to the list head
by default and overwritten if the list exits early, marking the
insertion point for list_add().
Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/ [1]
Signed-off-by: Jakob Koschel <jakobkoschel@gmail.com>
---
drivers/net/ethernet/ti/netcp_core.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index 16507bff652a..f25104b5a31b 100644
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -471,6 +471,7 @@ struct netcp_hook_list {
int netcp_register_txhook(struct netcp_intf *netcp_priv, int order,
netcp_hook_rtn *hook_rtn, void *hook_data)
{
+ struct list_head *pos = &netcp_priv->txhook_list_head;
struct netcp_hook_list *entry;
struct netcp_hook_list *next;
unsigned long flags;
@@ -485,10 +486,12 @@ int netcp_register_txhook(struct netcp_intf *netcp_priv, int order,
spin_lock_irqsave(&netcp_priv->lock, flags);
list_for_each_entry(next, &netcp_priv->txhook_list_head, list) {
- if (next->order > order)
+ if (next->order > order) {
+ pos = &next->list;
break;
+ }
}
- __list_add(&entry->list, next->list.prev, &next->list);
+ list_add_tail(&entry->list, pos);
spin_unlock_irqrestore(&netcp_priv->lock, flags);
return 0;
@@ -520,6 +523,7 @@ EXPORT_SYMBOL_GPL(netcp_unregister_txhook);
int netcp_register_rxhook(struct netcp_intf *netcp_priv, int order,
netcp_hook_rtn *hook_rtn, void *hook_data)
{
+ struct list_head *pos = &netcp_priv->rxhook_list_head;
struct netcp_hook_list *entry;
struct netcp_hook_list *next;
unsigned long flags;
@@ -534,10 +538,12 @@ int netcp_register_rxhook(struct netcp_intf *netcp_priv, int order,
spin_lock_irqsave(&netcp_priv->lock, flags);
list_for_each_entry(next, &netcp_priv->rxhook_list_head, list) {
- if (next->order > order)
+ if (next->order > order) {
+ pos = &next->list;
break;
+ }
}
- __list_add(&entry->list, next->list.prev, &next->list);
+ list_add_tail(&entry->list, pos);
spin_unlock_irqrestore(&netcp_priv->lock, flags);
return 0;
--
2.25.1
next prev parent reply other threads:[~2022-04-27 16:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-27 16:06 [PATCH net-next v5 00/18] Remove use of list iterator after loop body Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 01/18] connector: Replace usage of found with dedicated list iterator variable Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 02/18] net: dsa: sja1105: remove use of iterator after list_for_each_entry() loop Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 03/18] net: dsa: sja1105: reorder sja1105_first_entry_longer_than with memory allocation Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 04/18] net: dsa: sja1105: use list_add_tail(pos) instead of list_add(pos->prev) Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 05/18] net: dsa: mv88e6xxx: remove redundant check in mv88e6xxx_port_vlan() Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 06/18] net: dsa: mv88e6xxx: refactor mv88e6xxx_port_vlan() Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 07/18] net: dsa: Replace usage of found with dedicated list iterator variable Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 08/18] net: sparx5: " Jakob Koschel
2022-04-28 9:32 ` Paolo Abeni
2022-04-27 16:06 ` [PATCH net-next v5 09/18] qed: Use " Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 10/18] qed: Replace usage of found with " Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 11/18] qed: Remove usage of list iterator variable after the loop Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 12/18] net: qede: Replace usage of found with dedicated list iterator variable Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 13/18] net: qede: Remove check of list iterator against head past the loop body Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 14/18] sfc: Remove usage of list iterator for list_add() after " Jakob Koschel
2022-04-27 16:06 ` Jakob Koschel [this message]
2022-04-27 16:06 ` [PATCH net-next v5 16/18] ps3_gelic: Replace usage of found with dedicated list iterator variable Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 17/18] ipvlan: Remove usage of list iterator variable for the loop body Jakob Koschel
2022-04-27 16:06 ` [PATCH net-next v5 18/18] team: Remove use of list iterator variable for list_for_each_entry_from() Jakob Koschel
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=20220427160635.420492-16-jakobkoschel@gmail.com \
--to=jakobkoschel@gmail.com \
--cc=Steen.Hegelund@microchip.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=aelior@marvell.com \
--cc=andrew@lunn.ch \
--cc=andrii@kernel.org \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=bjohannesmeyer@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=c.giuffrida@vu.nl \
--cc=casper.casan@gmail.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=colin.king@intel.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=ecree.xilinx@gmail.com \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=h.j.bos@vu.nl \
--cc=habetsm.xilinx@gmail.com \
--cc=jgg@ziepe.ca \
--cc=jiri@resnulli.us \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=lars.povlsen@microchip.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=manishc@marvell.com \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=paulus@samba.org \
--cc=rppt@kernel.org \
--cc=songliubraving@fb.com \
--cc=vivien.didelot@gmail.com \
--cc=vulab@iscas.ac.cn \
--cc=yhs@fb.com \
/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).