Commit 5a34c9a8 authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

netpoll: relocate netconsole-specific functions to netconsole module 



Move netpoll_parse_ip_addr() and netpoll_parse_options() from the generic
netpoll module to the netconsole module where they are actually used.

These functions were originally placed in netpoll but are only consumed by
netconsole. This refactoring improves code organization by:

 - Removing unnecessary exported symbols from netpoll
 - Making netpoll_parse_options() static (no longer needs global visibility)
 - Reducing coupling between netpoll and netconsole modules

The functions remain functionally identical - this is purely a code
reorganization to better reflect their actual usage patterns. Here are
the changes:

 1) Move both functions from netpoll to netconsole
 2) Add static to netpoll_parse_options()
 3) Removed the EXPORT_SYMBOL()

PS: This diff does not change the function format, so, it is easy to
review, but, checkpatch will not be happy. A follow-up patch will
address the current issues reported by checkpatch.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Link: https://patch.msgid.link/20250613-rework-v3-3-0752bf2e6912@debian.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent afb02332

drivers/net/netconsole.c

+108 −0
Original line number Diff line number Diff line
@@ -1659,6 +1659,114 @@ static void write_msg(struct console *con, const char *msg, unsigned int len) 
	spin_unlock_irqrestore(&target_list_lock, flags);

}



static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr)

{

	const char *end;



	if (!strchr(str, ':') &&

	    in4_pton(str, -1, (void *)addr, -1, &end) > 0) {

		if (!*end)

			return 0;

	}

	if (in6_pton(str, -1, addr->in6.s6_addr, -1, &end) > 0) {

#if IS_ENABLED(CONFIG_IPV6)

		if (!*end)

			return 1;

#else

		return -1;

#endif

	}

	return -1;

}



static int netpoll_parse_options(struct netpoll *np, char *opt)

{

	char *cur=opt, *delim;

	int ipv6;

	bool ipversion_set = false;



	if (*cur != '@') {

		if ((delim = strchr(cur, '@')) == NULL)

			goto parse_failed;

		*delim = 0;

		if (kstrtou16(cur, 10, &np->local_port))

			goto parse_failed;

		cur = delim;

	}

	cur++;



	if (*cur != '/') {

		ipversion_set = true;

		if ((delim = strchr(cur, '/')) == NULL)

			goto parse_failed;

		*delim = 0;

		ipv6 = netpoll_parse_ip_addr(cur, &np->local_ip);

		if (ipv6 < 0)

			goto parse_failed;

		else

			np->ipv6 = (bool)ipv6;

		cur = delim;

	}

	cur++;



	if (*cur != ',') {

		/* parse out dev_name or dev_mac */

		if ((delim = strchr(cur, ',')) == NULL)

			goto parse_failed;

		*delim = 0;



		np->dev_name[0] = '\0';

		eth_broadcast_addr(np->dev_mac);

		if (!strchr(cur, ':'))

			strscpy(np->dev_name, cur, sizeof(np->dev_name));

		else if (!mac_pton(cur, np->dev_mac))

			goto parse_failed;



		cur = delim;

	}

	cur++;



	if (*cur != '@') {

		/* dst port */

		if ((delim = strchr(cur, '@')) == NULL)

			goto parse_failed;

		*delim = 0;

		if (*cur == ' ' || *cur == '\t')

			np_info(np, "warning: whitespace is not allowed\n");

		if (kstrtou16(cur, 10, &np->remote_port))

			goto parse_failed;

		cur = delim;

	}

	cur++;



	/* dst ip */

	if ((delim = strchr(cur, '/')) == NULL)

		goto parse_failed;

	*delim = 0;

	ipv6 = netpoll_parse_ip_addr(cur, &np->remote_ip);

	if (ipv6 < 0)

		goto parse_failed;

	else if (ipversion_set && np->ipv6 != (bool)ipv6)

		goto parse_failed;

	else

		np->ipv6 = (bool)ipv6;

	cur = delim + 1;



	if (*cur != 0) {

		/* MAC address */

		if (!mac_pton(cur, np->remote_mac))

			goto parse_failed;

	}



	netpoll_print_options(np);



	return 0;



 parse_failed:

	np_info(np, "couldn't parse config at '%s'!\n", cur);

	return -1;

}



/* Allocate new target (from boot/module param) and setup netpoll for it */

static struct netconsole_target *alloc_param_target(char *target_config,

						    int cmdline_count)

include/linux/netpoll.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ static inline void netpoll_poll_enable(struct net_device *dev) { return; } 


int netpoll_send_udp(struct netpoll *np, const char *msg, int len);

void netpoll_print_options(struct netpoll *np);

int netpoll_parse_options(struct netpoll *np, char *opt);

int __netpoll_setup(struct netpoll *np, struct net_device *ndev);

int netpoll_setup(struct netpoll *np);

void __netpoll_free(struct netpoll *np);

net/core/netpoll.c

+0 −109
Original line number Diff line number Diff line
@@ -510,26 +510,6 @@ void netpoll_print_options(struct netpoll *np) 
}

EXPORT_SYMBOL(netpoll_print_options);



static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr)

{

	const char *end;



	if (!strchr(str, ':') &&

	    in4_pton(str, -1, (void *)addr, -1, &end) > 0) {

		if (!*end)

			return 0;

	}

	if (in6_pton(str, -1, addr->in6.s6_addr, -1, &end) > 0) {

#if IS_ENABLED(CONFIG_IPV6)

		if (!*end)

			return 1;

#else

		return -1;

#endif

	}

	return -1;

}



static void skb_pool_flush(struct netpoll *np)

{

	struct sk_buff_head *skb_pool;
@@ -539,95 +519,6 @@ static void skb_pool_flush(struct netpoll *np) 
	skb_queue_purge_reason(skb_pool, SKB_CONSUMED);

}



int netpoll_parse_options(struct netpoll *np, char *opt)

{

	char *cur=opt, *delim;

	int ipv6;

	bool ipversion_set = false;



	if (*cur != '@') {

		if ((delim = strchr(cur, '@')) == NULL)

			goto parse_failed;

		*delim = 0;

		if (kstrtou16(cur, 10, &np->local_port))

			goto parse_failed;

		cur = delim;

	}

	cur++;



	if (*cur != '/') {

		ipversion_set = true;

		if ((delim = strchr(cur, '/')) == NULL)

			goto parse_failed;

		*delim = 0;

		ipv6 = netpoll_parse_ip_addr(cur, &np->local_ip);

		if (ipv6 < 0)

			goto parse_failed;

		else

			np->ipv6 = (bool)ipv6;

		cur = delim;

	}

	cur++;



	if (*cur != ',') {

		/* parse out dev_name or dev_mac */

		if ((delim = strchr(cur, ',')) == NULL)

			goto parse_failed;

		*delim = 0;



		np->dev_name[0] = '\0';

		eth_broadcast_addr(np->dev_mac);

		if (!strchr(cur, ':'))

			strscpy(np->dev_name, cur, sizeof(np->dev_name));

		else if (!mac_pton(cur, np->dev_mac))

			goto parse_failed;



		cur = delim;

	}

	cur++;



	if (*cur != '@') {

		/* dst port */

		if ((delim = strchr(cur, '@')) == NULL)

			goto parse_failed;

		*delim = 0;

		if (*cur == ' ' || *cur == '\t')

			np_info(np, "warning: whitespace is not allowed\n");

		if (kstrtou16(cur, 10, &np->remote_port))

			goto parse_failed;

		cur = delim;

	}

	cur++;



	/* dst ip */

	if ((delim = strchr(cur, '/')) == NULL)

		goto parse_failed;

	*delim = 0;

	ipv6 = netpoll_parse_ip_addr(cur, &np->remote_ip);

	if (ipv6 < 0)

		goto parse_failed;

	else if (ipversion_set && np->ipv6 != (bool)ipv6)

		goto parse_failed;

	else

		np->ipv6 = (bool)ipv6;

	cur = delim + 1;



	if (*cur != 0) {

		/* MAC address */

		if (!mac_pton(cur, np->remote_mac))

			goto parse_failed;

	}



	netpoll_print_options(np);



	return 0;



 parse_failed:

	np_info(np, "couldn't parse config at '%s'!\n", cur);

	return -1;

}

EXPORT_SYMBOL(netpoll_parse_options);



static void refill_skbs_work_handler(struct work_struct *work)

{

	struct netpoll *np =