From: Ratheesh Kannoth <rkannoth@marvell.com>
To: Mark Cilissen <mark@yotsuba.nl>
Cc: <netdev@vger.kernel.org>, Hans de Goede <hdegoede@redhat.com>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Breno Leitao <leitao@debian.org>, Ingo Molnar <mingo@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Paolo Abeni <pabeni@redhat.com>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] netpoll: support sending over raw IP interfaces
Date: Wed, 13 Mar 2024 19:06:02 +0530 [thread overview]
Message-ID: <20240313133602.GA1263314@maili.marvell.com> (raw)
In-Reply-To: <20240313124613.51399-1-mark@yotsuba.nl>
On 2024-03-13 at 18:16:13, Mark Cilissen (mark@yotsuba.nl) wrote:
> Currently, netpoll only supports interfaces with an ethernet-compatible
> link layer. Certain interfaces like SLIP do not have a link layer
> on the network interface level at all and expect raw IP packets,
> and could benefit from being supported by netpoll.
>
> This commit adds support for such interfaces by using the network device's
> `hard_header_len` field as an indication that no link layer is present.
> If that is the case we simply skip adding the ethernet header, causing
> a raw IP packet to be sent over the interface. This has been confirmed
> to add netconsole support to at least SLIP and WireGuard interfaces.
>
> Signed-off-by: Mark Cilissen <mark@yotsuba.nl>
> ---
> Documentation/networking/netconsole.rst | 3 ++-
> net/core/netpoll.c | 30 ++++++++++++++++---------
> 2 files changed, 22 insertions(+), 11 deletions(-)
>
> diff --git a/Documentation/networking/netconsole.rst b/Documentation/networking/netconsole.rst
> index d55c2a22ec7a..434ce0366027 100644
> --- a/Documentation/networking/netconsole.rst
> +++ b/Documentation/networking/netconsole.rst
> @@ -327,4 +327,5 @@ enable the logging of even the most critical kernel bugs. It works
> from IRQ contexts as well, and does not enable interrupts while
> sending packets. Due to these unique needs, configuration cannot
> be more automatic, and some fundamental limitations will remain:
> -only IP networks, UDP packets and ethernet devices are supported.
> +only UDP packets over IP networks, over ethernet links if a
> +hardware layer is required, are supported.
> diff --git a/net/core/netpoll.c b/net/core/netpoll.c
> index 543007f159f9..0299fb71b456 100644
> --- a/net/core/netpoll.c
> +++ b/net/core/netpoll.c
> @@ -399,7 +399,7 @@ EXPORT_SYMBOL(netpoll_send_skb);
>
> void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
> {
> - int total_len, ip_len, udp_len;
> + int total_len, ip_len, udp_len, link_len;
> struct sk_buff *skb;
> struct udphdr *udph;
> struct iphdr *iph;
> @@ -416,7 +416,10 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
> else
> ip_len = udp_len + sizeof(*iph);
>
> - total_len = ip_len + LL_RESERVED_SPACE(np->dev);
> + /* if there's a hardware header assume ethernet, else raw IP */
Taking an assumption based on dev's lower layer does not look to be good.
why not transmit packet from skb_network_header() in your driver (by making
changes in your driver)
> + eth = NULL;
> + link_len = np->dev->hard_header_len ? LL_RESERVED_SPACE(np->dev) : 0;
> + total_len = ip_len + link_len;
>
> skb = find_skb(np, total_len + np->dev->needed_tailroom,
> total_len - len);
> @@ -458,9 +461,11 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
> ip6h->saddr = np->local_ip.in6;
> ip6h->daddr = np->remote_ip.in6;
>
> - eth = skb_push(skb, ETH_HLEN);
> - skb_reset_mac_header(skb);
> - skb->protocol = eth->h_proto = htons(ETH_P_IPV6);
> + skb->protocol = htons(ETH_P_IPV6);
> + if (link_len) {
> + eth = skb_push(skb, ETH_HLEN);
> + skb_reset_mac_header(skb);
> + }
> } else {
> udph->check = 0;
> udph->check = csum_tcpudp_magic(np->local_ip.ip,
> @@ -487,13 +492,18 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
> put_unaligned(np->remote_ip.ip, &(iph->daddr));
> iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
>
> - eth = skb_push(skb, ETH_HLEN);
> - skb_reset_mac_header(skb);
> - skb->protocol = eth->h_proto = htons(ETH_P_IP);
> + skb->protocol = htons(ETH_P_IP);
> + if (link_len) {
> + eth = skb_push(skb, ETH_HLEN);
> + skb_reset_mac_header(skb);
> + }
> }
>
> - ether_addr_copy(eth->h_source, np->dev->dev_addr);
> - ether_addr_copy(eth->h_dest, np->remote_mac);
> + if (eth) {
> + eth->h_proto = skb->protocol;
> + ether_addr_copy(eth->h_source, np->dev->dev_addr);
> + ether_addr_copy(eth->h_dest, np->remote_mac);
> + }
>
> skb->dev = np->dev;
>
> --
> 2.43.0
>
next prev parent reply other threads:[~2024-03-13 13:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-13 12:46 [PATCH] netpoll: support sending over raw IP interfaces Mark Cilissen
2024-03-13 13:36 ` Ratheesh Kannoth [this message]
2024-03-13 13:53 ` Mark
2024-03-14 2:46 ` [EXTERNAL] " Ratheesh Kannoth
2024-03-18 11:43 ` [EXTERNAL] " Mark
2024-03-18 14:06 ` Ratheesh Kannoth
2024-03-21 12:33 ` Mark
2024-03-22 3:33 ` Ratheesh Kannoth
2024-03-14 12:48 ` Paolo Abeni
2024-03-14 18:34 ` Jakub Kicinski
2024-03-18 11:47 ` Mark
2024-03-19 17:10 ` Jakub Kicinski
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=20240313133602.GA1263314@maili.marvell.com \
--to=rkannoth@marvell.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hdegoede@redhat.com \
--cc=kuba@kernel.org \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark@yotsuba.nl \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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).