From: Alexander Lobakin <alobakin@dlink.ru>
To: "David S. Miller" <davem@davemloft.net>
Cc: Edward Cree <ecree@solarflare.com>, Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Hauke Mehrtens <hauke@hauke-m.de>,
Sean Wang <sean.wang@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Jiri Pirko <jiri@mellanox.com>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
Alexander Lobakin <alobakin@dlink.ru>,
Taehee Yoo <ap420073@gmail.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Stanislav Fomichev <sdf@google.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Song Liu <songliubraving@fb.com>,
Matteo Croce <mcroce@redhat.com>,
Jakub Sitnicki <jakub@cloudflare.com>,
Paul Blakey <paulb@mellanox.com>,
Yoshiki Komachi <komachi.yoshiki@gmail.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Subject: [PATCH RFC net-next 04/19] net: dsa: tag_ar9331: split out common tag accessors
Date: Mon, 30 Dec 2019 17:30:12 +0300 [thread overview]
Message-ID: <20191230143028.27313-5-alobakin@dlink.ru> (raw)
In-Reply-To: <20191230143028.27313-1-alobakin@dlink.ru>
They will be reused in upcoming GRO callbacks.
(Almost) no functional changes except less informative error string.
Signed-off-by: Alexander Lobakin <alobakin@dlink.ru>
---
net/dsa/tag_ar9331.c | 46 +++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 18 deletions(-)
diff --git a/net/dsa/tag_ar9331.c b/net/dsa/tag_ar9331.c
index 399ca21ec03b..c22c1b515e02 100644
--- a/net/dsa/tag_ar9331.c
+++ b/net/dsa/tag_ar9331.c
@@ -24,6 +24,25 @@
#define AR9331_HDR_RESERVED_MASK GENMASK(5, 4)
#define AR9331_HDR_PORT_NUM_MASK GENMASK(3, 0)
+static inline bool ar9331_tag_sanity_check(const u8 *data)
+{
+ u16 hdr = le16_to_cpup((__le16 *)(data - ETH_HLEN));
+
+ return FIELD_GET(AR9331_HDR_VERSION_MASK, hdr) == AR9331_HDR_VERSION &&
+ !(hdr & AR9331_HDR_FROM_CPU);
+}
+
+static inline int ar9331_tag_source_port(const u8 *data)
+{
+ /* hdr comes in LE byte order, so srcport field is in the first byte */
+ return FIELD_GET(AR9331_HDR_PORT_NUM_MASK, *(data - ETH_HLEN));
+}
+
+static inline __be16 ar9331_tag_encap_proto(const u8 *data)
+{
+ return *(__be16 *)data;
+}
+
static struct sk_buff *ar9331_tag_xmit(struct sk_buff *skb,
struct net_device *dev)
{
@@ -50,36 +69,27 @@ static struct sk_buff *ar9331_tag_rcv(struct sk_buff *skb,
struct net_device *ndev,
struct packet_type *pt)
{
- u8 ver, port;
- u16 hdr;
+ int port;
if (unlikely(!pskb_may_pull(skb, AR9331_HDR_LEN)))
return NULL;
- hdr = le16_to_cpu(*(__le16 *)skb_mac_header(skb));
-
- ver = FIELD_GET(AR9331_HDR_VERSION_MASK, hdr);
- if (unlikely(ver != AR9331_HDR_VERSION)) {
- netdev_warn_once(ndev, "%s:%i wrong header version 0x%2x\n",
- __func__, __LINE__, hdr);
- return NULL;
- }
-
- if (unlikely(hdr & AR9331_HDR_FROM_CPU)) {
- netdev_warn_once(ndev, "%s:%i packet should not be from cpu 0x%2x\n",
- __func__, __LINE__, hdr);
+ if (unlikely(!ar9331_tag_sanity_check(skb->data))) {
+ netdev_warn_once(ndev,
+ "%s:%i wrong header version or source port\n",
+ __func__, __LINE__);
return NULL;
}
- skb_pull_rcsum(skb, AR9331_HDR_LEN);
-
/* Get source port information */
- port = FIELD_GET(AR9331_HDR_PORT_NUM_MASK, hdr);
+ port = ar9331_tag_source_port(skb->data);
skb->dev = dsa_master_find_slave(ndev, 0, port);
if (!skb->dev)
return NULL;
+ skb_pull_rcsum(skb, AR9331_HDR_LEN);
+
return skb;
}
@@ -87,7 +97,7 @@ static void ar9331_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
{
*offset = AR9331_HDR_LEN;
- *proto = *(__be16 *)skb->data;
+ *proto = ar9331_tag_encap_proto(skb->data);
}
static const struct dsa_device_ops ar9331_netdev_ops = {
--
2.24.1
next prev parent reply other threads:[~2019-12-30 14:32 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-30 14:30 [PATCH RFC net-next 00/20] net: dsa: add GRO support Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 01/19] net: dsa: make .flow_dissect() callback returning void Alexander Lobakin
2019-12-30 18:11 ` Florian Fainelli
2019-12-30 14:30 ` [PATCH RFC net-next 02/19] net: dsa: add GRO support infrastructure Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 03/19] net: dsa: tag_ar9331: add .flow_dissect() callback Alexander Lobakin
2019-12-30 18:22 ` Florian Fainelli
2019-12-30 14:30 ` Alexander Lobakin [this message]
2019-12-30 17:18 ` [PATCH RFC net-next 04/19] net: dsa: tag_ar9331: split out common tag accessors Andrew Lunn
2019-12-30 14:30 ` [PATCH RFC net-next 05/19] net: dsa: tag_ar9331: add GRO callbacks Alexander Lobakin
2019-12-30 18:20 ` Florian Fainelli
2019-12-30 20:36 ` Andrew Lunn
2020-01-13 9:21 ` Alexander Lobakin
2020-01-13 9:42 ` Vladimir Oltean
2020-01-13 9:46 ` Alexander Lobakin
2020-01-13 10:28 ` Vladimir Oltean
2020-01-14 21:56 ` Florian Fainelli
2020-01-15 7:38 ` Alexander Lobakin
2020-01-15 11:29 ` Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 06/19] net: dsa: tag_gswip: fix typo in tag name Alexander Lobakin
2019-12-30 17:22 ` Andrew Lunn
2020-01-14 21:57 ` Florian Fainelli
2020-01-15 7:24 ` Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 07/19] net: dsa: tag_gswip: switch to bitfield helpers Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 08/19] net: dsa: tag_gswip: add .flow_dissect() callback Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 09/19] net: dsa: tag_gswip: split out common tag accessors Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 10/19] net: dsa: tag_gswip: add GRO callbacks Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 11/19] net: dsa: tag_lan9303: add .flow_dissect() callback Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 12/19] net: dsa: tag_lan9303: split out common tag accessors Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 13/19] net: dsa: tag_lan9303: add GRO callbacks Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 14/19] net: dsa: tag_mtk: split out common tag accessors Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 15/19] net: dsa: tag_mtk: add GRO callbacks Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 16/19] net: dsa: tag_qca: fix doubled Tx statistics Alexander Lobakin
2019-12-30 17:23 ` Andrew Lunn
2020-01-14 21:57 ` Florian Fainelli
2019-12-30 14:30 ` [PATCH RFC net-next 17/19] net: dsa: tag_qca: switch to bitfield helpers Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 18/19] net: dsa: tag_qca: split out common tag accessors Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 19/19] net: dsa: tag_qca: add GRO callbacks Alexander Lobakin
2019-12-30 14:30 ` [PATCH RFC net-next 20/20] net: core: add (unlikely) DSA support in napi_gro_frags() Alexander Lobakin
2019-12-30 17:12 ` [PATCH RFC net-next 00/20] net: dsa: add GRO support Andrew Lunn
2020-01-13 9:25 ` Alexander Lobakin
2019-12-31 15:32 ` Vladimir Oltean
2020-01-13 9:30 ` Alexander Lobakin
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=20191230143028.27313-5-alobakin@dlink.ru \
--to=alobakin@dlink.ru \
--cc=andrew@lunn.ch \
--cc=ap420073@gmail.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=ecree@solarflare.com \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=hauke@hauke-m.de \
--cc=jakub.kicinski@netronome.com \
--cc=jakub@cloudflare.com \
--cc=jiri@mellanox.com \
--cc=komachi.yoshiki@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mcroce@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=paulb@mellanox.com \
--cc=sdf@google.com \
--cc=sean.wang@mediatek.com \
--cc=songliubraving@fb.com \
--cc=stephen@networkplumber.org \
--cc=vivien.didelot@gmail.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).