From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
To: Shuah Khan <shuah@kernel.org>, Alexei Starovoitov <ast@kernel.org>
Cc: Stanislav Fomichev <sdf@google.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
linux-kselftest@vger.kernel.org, netdev@vger.kernel.org,
bpf@vger.kernel.org,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Subject: [PATCHv2 bpf-next 3/3] bpf, tests: don't use __bpf_constant_htons()
Date: Wed, 20 Mar 2019 21:53:35 +0900 [thread overview]
Message-ID: <20190320125335.19621-3-sergey.senozhatsky@gmail.com> (raw)
In-Reply-To: <20190320125335.19621-1-sergey.senozhatsky@gmail.com>
Prefer bpf_htons() instead.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 4 ++--
tools/testing/selftests/bpf/test_progs.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
index bcbd928c96ab..a194305f98d1 100644
--- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
+++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
@@ -28,7 +28,7 @@ static struct bpf_flow_keys pkt_v4_flow_keys = {
.thoff = sizeof(struct iphdr),
.addr_proto = ETH_P_IP,
.ip_proto = IPPROTO_TCP,
- .n_proto = __bpf_constant_htons(ETH_P_IP),
+ .n_proto = bpf_htons(ETH_P_IP),
};
static struct bpf_flow_keys pkt_v6_flow_keys = {
@@ -36,7 +36,7 @@ static struct bpf_flow_keys pkt_v6_flow_keys = {
.thoff = sizeof(struct ipv6hdr),
.addr_proto = ETH_P_IPV6,
.ip_proto = IPPROTO_TCP,
- .n_proto = __bpf_constant_htons(ETH_P_IPV6),
+ .n_proto = bpf_htons(ETH_P_IPV6),
};
void test_flow_dissector(void)
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 5d10aee9e277..909b339f97f4 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -11,18 +11,18 @@ int error_cnt, pass_cnt;
bool jit_enabled;
struct ipv4_packet pkt_v4 = {
- .eth.h_proto = __bpf_constant_htons(ETH_P_IP),
+ .eth.h_proto = bpf_htons(ETH_P_IP),
.iph.ihl = 5,
.iph.protocol = IPPROTO_TCP,
- .iph.tot_len = __bpf_constant_htons(MAGIC_BYTES),
+ .iph.tot_len = bpf_htons(MAGIC_BYTES),
.tcp.urg_ptr = 123,
.tcp.doff = 5,
};
struct ipv6_packet pkt_v6 = {
- .eth.h_proto = __bpf_constant_htons(ETH_P_IPV6),
+ .eth.h_proto = bpf_htons(ETH_P_IPV6),
.iph.nexthdr = IPPROTO_TCP,
- .iph.payload_len = __bpf_constant_htons(MAGIC_BYTES),
+ .iph.payload_len = bpf_htons(MAGIC_BYTES),
.tcp.urg_ptr = 123,
.tcp.doff = 5,
};
--
2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: sergey.senozhatsky at gmail.com (Sergey Senozhatsky)
Subject: [PATCHv2 bpf-next 3/3] bpf, tests: don't use __bpf_constant_htons()
Date: Wed, 20 Mar 2019 21:53:35 +0900 [thread overview]
Message-ID: <20190320125335.19621-3-sergey.senozhatsky@gmail.com> (raw)
In-Reply-To: <20190320125335.19621-1-sergey.senozhatsky@gmail.com>
Prefer bpf_htons() instead.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky at gmail.com>
---
tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 4 ++--
tools/testing/selftests/bpf/test_progs.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
index bcbd928c96ab..a194305f98d1 100644
--- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
+++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
@@ -28,7 +28,7 @@ static struct bpf_flow_keys pkt_v4_flow_keys = {
.thoff = sizeof(struct iphdr),
.addr_proto = ETH_P_IP,
.ip_proto = IPPROTO_TCP,
- .n_proto = __bpf_constant_htons(ETH_P_IP),
+ .n_proto = bpf_htons(ETH_P_IP),
};
static struct bpf_flow_keys pkt_v6_flow_keys = {
@@ -36,7 +36,7 @@ static struct bpf_flow_keys pkt_v6_flow_keys = {
.thoff = sizeof(struct ipv6hdr),
.addr_proto = ETH_P_IPV6,
.ip_proto = IPPROTO_TCP,
- .n_proto = __bpf_constant_htons(ETH_P_IPV6),
+ .n_proto = bpf_htons(ETH_P_IPV6),
};
void test_flow_dissector(void)
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 5d10aee9e277..909b339f97f4 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -11,18 +11,18 @@ int error_cnt, pass_cnt;
bool jit_enabled;
struct ipv4_packet pkt_v4 = {
- .eth.h_proto = __bpf_constant_htons(ETH_P_IP),
+ .eth.h_proto = bpf_htons(ETH_P_IP),
.iph.ihl = 5,
.iph.protocol = IPPROTO_TCP,
- .iph.tot_len = __bpf_constant_htons(MAGIC_BYTES),
+ .iph.tot_len = bpf_htons(MAGIC_BYTES),
.tcp.urg_ptr = 123,
.tcp.doff = 5,
};
struct ipv6_packet pkt_v6 = {
- .eth.h_proto = __bpf_constant_htons(ETH_P_IPV6),
+ .eth.h_proto = bpf_htons(ETH_P_IPV6),
.iph.nexthdr = IPPROTO_TCP,
- .iph.payload_len = __bpf_constant_htons(MAGIC_BYTES),
+ .iph.payload_len = bpf_htons(MAGIC_BYTES),
.tcp.urg_ptr = 123,
.tcp.doff = 5,
};
--
2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: sergey.senozhatsky@gmail.com (Sergey Senozhatsky)
Subject: [PATCHv2 bpf-next 3/3] bpf, tests: don't use __bpf_constant_htons()
Date: Wed, 20 Mar 2019 21:53:35 +0900 [thread overview]
Message-ID: <20190320125335.19621-3-sergey.senozhatsky@gmail.com> (raw)
Message-ID: <20190320125335.C0-S3keHTWnuKnaVI1cgjDmShLtv6hnMwbz4B0Sgq-8@z> (raw)
In-Reply-To: <20190320125335.19621-1-sergey.senozhatsky@gmail.com>
Prefer bpf_htons() instead.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky at gmail.com>
---
tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 4 ++--
tools/testing/selftests/bpf/test_progs.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
index bcbd928c96ab..a194305f98d1 100644
--- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
+++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c
@@ -28,7 +28,7 @@ static struct bpf_flow_keys pkt_v4_flow_keys = {
.thoff = sizeof(struct iphdr),
.addr_proto = ETH_P_IP,
.ip_proto = IPPROTO_TCP,
- .n_proto = __bpf_constant_htons(ETH_P_IP),
+ .n_proto = bpf_htons(ETH_P_IP),
};
static struct bpf_flow_keys pkt_v6_flow_keys = {
@@ -36,7 +36,7 @@ static struct bpf_flow_keys pkt_v6_flow_keys = {
.thoff = sizeof(struct ipv6hdr),
.addr_proto = ETH_P_IPV6,
.ip_proto = IPPROTO_TCP,
- .n_proto = __bpf_constant_htons(ETH_P_IPV6),
+ .n_proto = bpf_htons(ETH_P_IPV6),
};
void test_flow_dissector(void)
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 5d10aee9e277..909b339f97f4 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -11,18 +11,18 @@ int error_cnt, pass_cnt;
bool jit_enabled;
struct ipv4_packet pkt_v4 = {
- .eth.h_proto = __bpf_constant_htons(ETH_P_IP),
+ .eth.h_proto = bpf_htons(ETH_P_IP),
.iph.ihl = 5,
.iph.protocol = IPPROTO_TCP,
- .iph.tot_len = __bpf_constant_htons(MAGIC_BYTES),
+ .iph.tot_len = bpf_htons(MAGIC_BYTES),
.tcp.urg_ptr = 123,
.tcp.doff = 5,
};
struct ipv6_packet pkt_v6 = {
- .eth.h_proto = __bpf_constant_htons(ETH_P_IPV6),
+ .eth.h_proto = bpf_htons(ETH_P_IPV6),
.iph.nexthdr = IPPROTO_TCP,
- .iph.payload_len = __bpf_constant_htons(MAGIC_BYTES),
+ .iph.payload_len = bpf_htons(MAGIC_BYTES),
.tcp.urg_ptr = 123,
.tcp.doff = 5,
};
--
2.21.0
next prev parent reply other threads:[~2019-03-20 12:54 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-20 12:53 [PATCHv2 bpf-next 1/3] bpf, tests: tweak endianness selection Sergey Senozhatsky
2019-03-20 12:53 ` Sergey Senozhatsky
2019-03-20 12:53 ` sergey.senozhatsky
2019-03-20 12:53 ` [PATCHv2 bpf-next 2/3] bpf, tests: drop unused __bpf_constant_foo defines Sergey Senozhatsky
2019-03-20 12:53 ` Sergey Senozhatsky
2019-03-20 12:53 ` sergey.senozhatsky
2019-03-20 12:56 ` Sergey Senozhatsky
2019-03-20 12:56 ` Sergey Senozhatsky
2019-03-20 12:56 ` sergey.senozhatsky
2019-03-20 12:53 ` Sergey Senozhatsky [this message]
2019-03-20 12:53 ` [PATCHv2 bpf-next 3/3] bpf, tests: don't use __bpf_constant_htons() Sergey Senozhatsky
2019-03-20 12:53 ` sergey.senozhatsky
2019-03-20 12:55 ` Sergey Senozhatsky
2019-03-20 12:55 ` Sergey Senozhatsky
2019-03-20 12:55 ` sergey.senozhatsky
2019-03-20 17:13 ` [PATCHv2 bpf-next 1/3] bpf, tests: tweak endianness selection Stanislav Fomichev
2019-03-20 17:13 ` Stanislav Fomichev
2019-03-20 17:13 ` sdf
2019-03-20 22:20 ` Yonghong Song
2019-03-20 22:20 ` Yonghong Song
2019-03-20 22:20 ` yhs
2019-03-20 22:27 ` Stanislav Fomichev
2019-03-20 22:27 ` Stanislav Fomichev
2019-03-20 22:27 ` sdf
2019-03-20 22:45 ` Yonghong Song
2019-03-20 22:45 ` Yonghong Song
2019-03-20 22:45 ` yhs
2019-03-20 23:08 ` Daniel Borkmann
2019-03-20 23:08 ` Daniel Borkmann
2019-03-20 23:08 ` daniel
2019-03-21 0:03 ` Stanislav Fomichev
2019-03-21 0:03 ` Stanislav Fomichev
2019-03-21 0:03 ` sdf
2019-03-21 0:23 ` Yonghong Song
2019-03-21 0:23 ` Yonghong Song
2019-03-21 0:23 ` yhs
2019-03-21 0:34 ` Sergey Senozhatsky
2019-03-21 0:34 ` Sergey Senozhatsky
2019-03-21 0:34 ` sergey.senozhatsky.work
2019-03-21 0:22 ` Sergey Senozhatsky
2019-03-21 0:22 ` Sergey Senozhatsky
2019-03-21 0:22 ` sergey.senozhatsky.work
2019-03-21 3:24 ` Alexei Starovoitov
2019-03-21 3:24 ` Alexei Starovoitov
2019-03-21 3:24 ` alexei.starovoitov
2019-03-21 5:08 ` Sergey Senozhatsky
2019-03-21 5:08 ` Sergey Senozhatsky
2019-03-21 5:08 ` sergey.senozhatsky.work
2019-03-21 15:49 ` Stanislav Fomichev
2019-03-21 15:49 ` Stanislav Fomichev
2019-03-21 15:49 ` sdf
2019-03-22 2:46 ` Sergey Senozhatsky
2019-03-22 2:46 ` Sergey Senozhatsky
2019-03-22 2:46 ` sergey.senozhatsky.work
2019-03-22 3:12 ` Alexei Starovoitov
2019-03-22 3:12 ` Alexei Starovoitov
2019-03-22 3:12 ` alexei.starovoitov
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=20190320125335.19621-3-sergey.senozhatsky@gmail.com \
--to=sergey.senozhatsky@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sdf@google.com \
--cc=shuah@kernel.org \
--cc=songliubraving@fb.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.