Commit b555cb66 authored by Tiwei Bie's avatar Tiwei Bie Committed by Johannes Berg
Browse files

um: vector: Eliminate the dependency on uml_net 



The only dependency on uml_net (i.e., the legacy network transport
infrastructure) is the call to uml_net_setup_etheraddr(). Implement
it inside vector to eliminate the uml_net dependency completely. It
will allow us to remove uml_net in the next step.

Signed-off-by: default avatarTiwei Bie <tiwei.btw@antgroup.com>
Acked-By: default avatarAnton Ivanov <anton.ivanov@cambridgegreys.com>
Link: https://patch.msgid.link/20250503051710.3286595-3-tiwei.btw@antgroup.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 65eaac59

arch/um/drivers/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ config UML_NET 


config UML_NET_VECTOR

	bool "Vector I/O high performance network devices"

	depends on UML_NET

	select MAY_HAVE_RUNTIME_DEPS

	help

	  This User-Mode Linux network driver uses multi-message send

arch/um/drivers/vector_kern.c

+50 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <init.h>

#include <irq_kern.h>

#include <irq_user.h>

#include <net_kern.h>

#include <os.h>

#include "mconsole_kern.h"

#include "vector_user.h"
@@ -1539,7 +1538,56 @@ static void vector_timer_expire(struct timer_list *t) 
	napi_schedule(&vp->napi);

}



static void vector_setup_etheraddr(struct net_device *dev, char *str)

{

	u8 addr[ETH_ALEN];

	char *end;

	int i;



	if (str == NULL)

		goto random;



	for (i = 0; i < 6; i++) {

		addr[i] = simple_strtoul(str, &end, 16);

		if ((end == str) ||

		   ((*end != ':') && (*end != ',') && (*end != '\0'))) {

			printk(KERN_ERR

			       "setup_etheraddr: failed to parse '%s' "

			       "as an ethernet address\n", str);

			goto random;

		}

		str = end + 1;

	}

	if (is_multicast_ether_addr(addr)) {

		printk(KERN_ERR

		       "Attempt to assign a multicast ethernet address to a "

		       "device disallowed\n");

		goto random;

	}

	if (!is_valid_ether_addr(addr)) {

		printk(KERN_ERR

		       "Attempt to assign an invalid ethernet address to a "

		       "device disallowed\n");

		goto random;

	}

	if (!is_local_ether_addr(addr)) {

		printk(KERN_WARNING

		       "Warning: Assigning a globally valid ethernet "

		       "address to a device\n");

		printk(KERN_WARNING "You should set the 2nd rightmost bit in "

		       "the first byte of the MAC,\n");

		printk(KERN_WARNING "i.e. %02x:%02x:%02x:%02x:%02x:%02x\n",

		       addr[0] | 0x02, addr[1], addr[2], addr[3], addr[4],

		       addr[5]);

	}

	eth_hw_addr_set(dev, addr);

	return;



random:

	printk(KERN_INFO

	       "Choosing a random ethernet address for device %s\n", dev->name);

	eth_hw_addr_random(dev);

}



static void vector_eth_configure(

		int n,
@@ -1574,7 +1622,7 @@ static void vector_eth_configure( 
	 * and fail.

	 */

	snprintf(dev->name, sizeof(dev->name), "vec%d", n);

	uml_net_setup_etheraddr(dev, uml_vector_fetch_arg(def, "mac"));

	vector_setup_etheraddr(dev, uml_vector_fetch_arg(def, "mac"));

	vp = netdev_priv(dev);



	/* sysfs register */