netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Safonov <dima@arista.com>
To: Eric Dumazet <edumazet@google.com>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	David Ahern <dsahern@kernel.org>, Shuah Khan <shuah@kernel.org>,
	Steven Rostedt <rostedt@goodmis.org>,
	Masami Hiramatsu <mhiramat@kernel.org>,
	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Dmitry Safonov <dima@arista.com>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-kselftest@vger.kernel.org,
	linux-trace-kernel@vger.kernel.org,
	Dmitry Safonov <0x7f454c46@gmail.com>
Subject: [PATCH net-next 02/10] net/tcp: Add a helper tcp_ao_hdr_maclen()
Date: Sat, 24 Feb 2024 09:04:10 +0000	[thread overview]
Message-ID: <20240224-tcp-ao-tracepoints-v1-2-15f31b7f30a7@arista.com> (raw)
In-Reply-To: <20240224-tcp-ao-tracepoints-v1-0-15f31b7f30a7@arista.com>

It's going to be used more in TCP-AO tracepoints.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 include/net/tcp_ao.h | 5 +++++
 net/ipv4/tcp_ao.c    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/net/tcp_ao.h b/include/net/tcp_ao.h
index 471e177362b4..6501ed1dfa1e 100644
--- a/include/net/tcp_ao.h
+++ b/include/net/tcp_ao.h
@@ -19,6 +19,11 @@ struct tcp_ao_hdr {
 	u8	rnext_keyid;
 };
 
+static inline u8 tcp_ao_hdr_maclen(const struct tcp_ao_hdr *aoh)
+{
+	return aoh->length - sizeof(struct tcp_ao_hdr);
+}
+
 struct tcp_ao_counters {
 	atomic64_t	pkt_good;
 	atomic64_t	pkt_bad;
diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c
index 3afeeb68e8a7..8726aa58e8b6 100644
--- a/net/ipv4/tcp_ao.c
+++ b/net/ipv4/tcp_ao.c
@@ -884,8 +884,8 @@ tcp_ao_verify_hash(const struct sock *sk, const struct sk_buff *skb,
 		   const struct tcp_ao_hdr *aoh, struct tcp_ao_key *key,
 		   u8 *traffic_key, u8 *phash, u32 sne, int l3index)
 {
-	u8 maclen = aoh->length - sizeof(struct tcp_ao_hdr);
 	const struct tcphdr *th = tcp_hdr(skb);
+	u8 maclen = tcp_ao_hdr_maclen(aoh);
 	void *hash_buf = NULL;
 
 	if (maclen != tcp_ao_maclen(key)) {

-- 
2.43.0


  parent reply	other threads:[~2024-02-24  9:04 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-24  9:04 [PATCH net-next 00/10] net/tcp: TCP-AO and TCP-MD5 tracepoints Dmitry Safonov
2024-02-24  9:04 ` [PATCH net-next 01/10] net/tcp: Use static_branch_tcp_{md5,ao} to drop ifdefs Dmitry Safonov
2024-02-24  9:04 ` Dmitry Safonov [this message]
2024-02-24  9:04 ` [PATCH net-next 03/10] net/tcp: Move tcp_inbound_hash() from headers Dmitry Safonov
2024-02-24  9:30   ` Eric Dumazet
2024-02-24  9:40     ` Dmitry Safonov
2024-02-26 20:41   ` Simon Horman
2024-02-26 23:51     ` Dmitry Safonov
2024-02-24  9:04 ` [PATCH net-next 04/10] net/tcp: Add tcp-md5 and tcp-ao tracepoints Dmitry Safonov
2024-02-24  9:04 ` [PATCH net-next 05/10] net/tcp: Remove tcp_hash_fail() Dmitry Safonov
2024-02-24  9:04 ` [PATCH net-next 06/10] selftests/net: Clean-up double assignment Dmitry Safonov
2024-02-24  9:04 ` [PATCH net-next 07/10] selftests/net: Provide test_snprintf() helper Dmitry Safonov
2024-02-24  9:04 ` [PATCH net-next 08/10] selftests/net: Be consistnat in kconfig checks Dmitry Safonov
2024-02-24  9:04 ` [PATCH net-next 09/10] selftests/net: Don't forget to close nsfd after switch_save_ns() Dmitry Safonov
2024-02-24  9:04 ` [PATCH net-next 10/10] selftest/net: Add trace events matching to tcp_ao Dmitry Safonov

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=20240224-tcp-ao-tracepoints-v1-2-15f31b7f30a7@arista.com \
    --to=dima@arista.com \
    --cc=0x7f454c46@gmail.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-trace-kernel@vger.kernel.org \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=mhiramat@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=rostedt@goodmis.org \
    --cc=shuah@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).