Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

net: ethernet: Only try ARP for IP packets #84158

Merged
merged 7 commits into from
Jan 21, 2025
Merged

net: ethernet: Only try ARP for IP packets #84158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a072cf1
net: ethernet: Only try ARP for IP packets
jukkar Jan 17, 2025
0e1f085
net: arp: Enhance debug messages
jukkar Jan 17, 2025
7d807d5
tests: net: arp: Remove the ARP cache clear from the tests
jukkar Jan 17, 2025
86048ad
net: ipv4: Do not change the protocol type when sending
jukkar Jan 20, 2025
636ec62
net: ipv6: Do not set ptype when preparing for sending
jukkar Jan 20, 2025
521879b
net: Set the protocol type of fragmented packet
jukkar Jan 21, 2025
9980af2
net: Build assert issue with llvm
jukkar Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions include/zephyr/net/net_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,7 @@ struct net_l3_register {
.handler = _handler, \
.name = STRINGIFY(_name), \
.l2 = _l2_type, \
}; \
BUILD_ASSERT((_handler) != NULL, "Handler is not defined")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you intentionally remove this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, there was a compile error with llvm. I replaced it with runtime check.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kind of surprised this isn't an issue for other instances of BUILD_ASSERT?

};

/* @endcond */

Expand Down
2 changes: 0 additions & 2 deletions subsys/net/ip/ipv4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,6 @@ enum net_verdict net_ipv4_input(struct net_pkt *pkt, bool is_loopback)

enum net_verdict net_ipv4_prepare_for_send(struct net_pkt *pkt)
{
net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_IP);

if (IS_ENABLED(CONFIG_NET_IPV4_PMTU)) {
struct net_pmtu_entry *entry;
struct sockaddr_in dst = {
Expand Down
2 changes: 2 additions & 0 deletions subsys/net/ip/ipv4_fragment.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,8 @@ static int send_ipv4_fragment(struct net_pkt *pkt, uint16_t rand_id, uint16_t fi
net_pkt_cursor_backup(pkt, &cur_pkt);
net_pkt_cursor_backup(frag_pkt, &cur);

net_pkt_set_ll_proto_type(frag_pkt, net_pkt_ll_proto_type(pkt));

/* Copy the original IPv4 headers back to the fragment packet */
if (net_pkt_copy(frag_pkt, pkt, net_pkt_ip_hdr_len(pkt))) {
goto fail;
Expand Down
2 changes: 2 additions & 0 deletions subsys/net/ip/ipv6_fragment.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,8 @@ static int send_ipv6_fragment(struct net_pkt *pkt,

net_pkt_cursor_init(pkt);

net_pkt_set_ll_proto_type(frag_pkt, net_pkt_ll_proto_type(pkt));

/* We copy original headers back to the fragment packet
* Note that we insert the right next header to point to fragment header
*/
Expand Down
2 changes: 0 additions & 2 deletions subsys/net/ip/ipv6_nbr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,8 +806,6 @@ enum net_verdict net_ipv6_prepare_for_send(struct net_pkt *pkt)
return NET_DROP;
}

net_pkt_set_ll_proto_type(pkt, NET_ETH_PTYPE_IPV6);

#if defined(CONFIG_NET_IPV6_FRAGMENT)
/* If we have already fragmented the packet, the fragment id will
* contain a proper value and we can skip other checks.
Expand Down
9 changes: 6 additions & 3 deletions subsys/net/l2/ethernet/arp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ static struct arp_entry *arp_entry_find(sys_slist_t *list,

if (entry->iface == iface &&
net_ipv4_addr_cmp(&entry->ip, dst)) {
NET_DBG("found dst %s",
net_sprint_ipv4_addr(dst));

return entry;
}

Expand Down Expand Up @@ -463,7 +466,7 @@ struct net_pkt *net_arp_prepare(struct net_pkt *pkt,
NET_DBG("ARP using ll %s for IP %s",
net_sprint_ll_addr(net_pkt_lladdr_dst(pkt)->addr,
sizeof(struct net_eth_addr)),
net_sprint_ipv4_addr(&NET_IPV4_HDR(pkt)->dst));
net_sprint_ipv4_addr(NET_IPV4_HDR(pkt)->dst));

return pkt;
}
Expand Down Expand Up @@ -691,10 +694,10 @@ void net_arp_update(struct net_if *iface,
net_pkt_lladdr_dst(pkt)->addr =
(uint8_t *) &NET_ETH_HDR(pkt)->dst.addr;

NET_DBG("iface %d (%p) dst %s pending %p frag %p",
NET_DBG("iface %d (%p) dst %s pending %p frag %p ptype 0x%04x",
net_if_get_by_iface(iface), iface,
net_sprint_ipv4_addr(&entry->ip),
pkt, pkt->frags);
pkt, pkt->frags, net_pkt_ll_proto_type(pkt));

/* We directly send the packet without first queueing it.
* The pkt has already been queued for sending, once by
Expand Down
6 changes: 4 additions & 2 deletions subsys/net/l2/ethernet/ethernet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,8 @@ static enum net_verdict ethernet_recv(struct net_if *iface,
net_buf_pull(pkt->frags, hdr_len);

STRUCT_SECTION_FOREACH(net_l3_register, l3) {
if (l3->ptype != type || l3->l2 != &NET_L2_GET_NAME(ETHERNET)) {
if (l3->ptype != type || l3->l2 != &NET_L2_GET_NAME(ETHERNET) ||
l3->handler == NULL) {
continue;
}

Expand Down Expand Up @@ -711,7 +712,8 @@ static int ethernet_send(struct net_if *iface, struct net_pkt *pkt)
goto send;
}

if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET) {
if (IS_ENABLED(CONFIG_NET_IPV4) && net_pkt_family(pkt) == AF_INET &&
net_pkt_ll_proto_type(pkt) == NET_ETH_PTYPE_IP) {
if (!net_pkt_ipv4_acd(pkt)) {
struct net_pkt *tmp;

Expand Down
3 changes: 0 additions & 3 deletions tests/net/arp/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,9 +565,6 @@ ZTEST(arp_fn_tests, test_arp)

net_pkt_unref(pkt);

/* Clear the ARP cache so that old entries do not confuse the tests */
net_arp_clear_cache(iface);

/* Then feed in ARP request */
pkt = net_pkt_alloc_with_buffer(iface, sizeof(struct net_eth_hdr) +
sizeof(struct net_arp_hdr),
Expand Down
Loading