Fix misleading use of bpf_ntohl #24483
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`local_port` in `struct bpf_sock_ops` and `struct sk_msg_md` is stored in host byte order. The use of `bpf_ntohl` is kind of misleading. Signed-off-by: Wang Zhen <lazybetrayer@gmail.com>
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
github-actions
bot
added
the
kind/community-contribution
joestringer
approved these changes
Mar 22, 2023
joestringer
added
the
release-note/misc
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
|
/test |
sahid
reviewed
Mar 22, 2023
| @@ -29,7 +29,7 @@ static __always_inline void sk_msg_extract4_key(const struct sk_msg_md *msg, | |||
| key->sip4 = msg->local_ip4; | |||
| key->family = ENDPOINT_KEY_IPV4; | |||
|
|
|||
| key->sport = (bpf_ntohl(msg->local_port) >> 16); | |||
| key->sport = (bpf_htonl(msg->local_port) >> 16); | |||
There was a problem hiding this comment.
sahid
reviewed
Mar 22, 2023
| @@ -30,7 +30,7 @@ static __always_inline void sk_extract4_key(const struct bpf_sock_ops *ops, | |||
| key->sip4 = ops->local_ip4; | |||
| key->family = ENDPOINT_KEY_IPV4; | |||
|
|
|||
| key->sport = (bpf_ntohl(ops->local_port) >> 16); | |||
| key->sport = (bpf_htonl(ops->local_port) >> 16); | |||
There was a problem hiding this comment.
sahid
approved these changes
Mar 22, 2023
|
I don't think this has any practical impact, the implementations would equally either byteswap or do nothing depending on the underlying architecture. However I agree that it's confusing to take a HBO field and "convert from network to host". |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
local_portinstruct bpf_sock_opsandstruct sk_msg_mdis stored in host byte order. The use ofbpf_ntohlis kind of misleading.Please ensure your pull request adheres to the following guidelines:
description and a
Fixes: #XXXline if the commit addresses a particularGitHub issue.
Fixes: <commit-id>tag, thenplease add the commit author[s] as reviewer[s] to this issue.