Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f565a7c2 authored by Alex Williamson's avatar Alex Williamson Committed by David S. Miller
Browse files

virtio_net: Add a MAC filter table 



Make use of the MAC control virtqueue class to support a MAC
filter table.  The filter table is managed by the hypervisor.
We consider the table to be available if the CTRL_RX feature
bit is set.  We leave it to the hypervisor to manage the table
and enable promiscuous or all-multi mode as necessary depending
on the resources available to it.

Signed-off-by: default avatarAlex Williamson <alex.williamson@hp.com>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2af7698e

drivers/net/virtio_net.c

+47 −8
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ module_param(gso, bool, 0444); 
#define MAX_PACKET_LEN (ETH_HLEN + VLAN_HLEN + ETH_DATA_LEN)

#define MAX_PACKET_LEN (ETH_HLEN + VLAN_HLEN + ETH_DATA_LEN)

#define GOOD_COPY_LEN	128

#define GOOD_COPY_LEN	128





#define VIRTNET_SEND_COMMAND_SG_MAX    1

#define VIRTNET_SEND_COMMAND_SG_MAX    2





struct virtnet_info

struct virtnet_info

{

{
@@ -661,31 +661,70 @@ static int virtnet_set_tx_csum(struct net_device *dev, u32 data) 
static void virtnet_set_rx_mode(struct net_device *dev)

static void virtnet_set_rx_mode(struct net_device *dev)

{

{

	struct virtnet_info *vi = netdev_priv(dev);

	struct virtnet_info *vi = netdev_priv(dev);

	struct scatterlist sg;

	struct scatterlist sg[2];

	u8 promisc, allmulti;

	u8 promisc, allmulti;

	struct virtio_net_ctrl_mac *mac_data;

	struct dev_addr_list *addr;

	void *buf;

	int i;





	/* We can't dynamicaly set ndo_set_rx_mode, so return gracefully */

	/* We can't dynamicaly set ndo_set_rx_mode, so return gracefully */

	if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_RX))

	if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_RX))

		return;

		return;





	promisc = ((dev->flags & IFF_PROMISC) != 0 || dev->uc_count > 0);

	promisc = ((dev->flags & IFF_PROMISC) != 0);

	allmulti = ((dev->flags & IFF_ALLMULTI) != 0 || dev->mc_count > 0);

	allmulti = ((dev->flags & IFF_ALLMULTI) != 0);





	sg_set_buf(&sg, &promisc, sizeof(promisc));

	sg_set_buf(sg, &promisc, sizeof(promisc));





	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,

	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,

				  VIRTIO_NET_CTRL_RX_PROMISC,

				  VIRTIO_NET_CTRL_RX_PROMISC,

				  &sg, 1, 0))

				  sg, 1, 0))

		dev_warn(&dev->dev, "Failed to %sable promisc mode.\n",

		dev_warn(&dev->dev, "Failed to %sable promisc mode.\n",

			 promisc ? "en" : "dis");

			 promisc ? "en" : "dis");





	sg_set_buf(&sg, &allmulti, sizeof(allmulti));

	sg_set_buf(sg, &allmulti, sizeof(allmulti));





	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,

	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX,

				  VIRTIO_NET_CTRL_RX_ALLMULTI,

				  VIRTIO_NET_CTRL_RX_ALLMULTI,

				  &sg, 1, 0))

				  sg, 1, 0))

		dev_warn(&dev->dev, "Failed to %sable allmulti mode.\n",

		dev_warn(&dev->dev, "Failed to %sable allmulti mode.\n",

			 allmulti ? "en" : "dis");

			 allmulti ? "en" : "dis");



	/* MAC filter - use one buffer for both lists */

	mac_data = buf = kzalloc(((dev->uc_count + dev->mc_count) * ETH_ALEN) +

				 (2 * sizeof(mac_data->entries)), GFP_ATOMIC);

	if (!buf) {

		dev_warn(&dev->dev, "No memory for MAC address buffer\n");

		return;

	}



	/* Store the unicast list and count in the front of the buffer */

	mac_data->entries = dev->uc_count;

	addr = dev->uc_list;

	for (i = 0; i < dev->uc_count; i++, addr = addr->next)

		memcpy(&mac_data->macs[i][0], addr->da_addr, ETH_ALEN);



	sg_set_buf(&sg[0], mac_data,

		   sizeof(mac_data->entries) + (dev->uc_count * ETH_ALEN));



	/* multicast list and count fill the end */

	mac_data = (void *)&mac_data->macs[dev->uc_count][0];



	mac_data->entries = dev->mc_count;

	addr = dev->mc_list;

	for (i = 0; i < dev->mc_count; i++, addr = addr->next)

		memcpy(&mac_data->macs[i][0], addr->da_addr, ETH_ALEN);



	sg_set_buf(&sg[1], mac_data,

		   sizeof(mac_data->entries) + (dev->mc_count * ETH_ALEN));



	if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MAC,

				  VIRTIO_NET_CTRL_MAC_TABLE_SET,

				  sg, 2, 0))

		dev_warn(&dev->dev, "Failed to set MAC fitler table.\n");



	kfree(buf);

}

}





static struct ethtool_ops virtnet_ethtool_ops = {

static struct ethtool_ops virtnet_ethtool_ops = {

include/linux/virtio_net.h

+23 −0
Original line number Original line Diff line number Diff line
@@ -88,4 +88,27 @@ typedef __u8 virtio_net_ctrl_ack; 
 #define VIRTIO_NET_CTRL_RX_PROMISC      0

 #define VIRTIO_NET_CTRL_RX_PROMISC      0

 #define VIRTIO_NET_CTRL_RX_ALLMULTI     1

 #define VIRTIO_NET_CTRL_RX_ALLMULTI     1





/*

 * Control the MAC filter table.

 *

 * The MAC filter table is managed by the hypervisor, the guest should

 * assume the size is infinite.  Filtering should be considered

 * non-perfect, ie. based on hypervisor resources, the guest may

 * received packets from sources not specified in the filter list.

 *

 * In addition to the class/cmd header, the TABLE_SET command requires

 * two out scatterlists.  Each contains a 4 byte count of entries followed

 * by a concatenated byte stream of the ETH_ALEN MAC addresses.  The

 * first sg list contains unicast addresses, the second is for multicast.

 * This functionality is present if the VIRTIO_NET_F_CTRL_RX feature

 * is available.

 */

struct virtio_net_ctrl_mac {

	__u32 entries;

	__u8 macs[][ETH_ALEN];

} __attribute__((packed));



#define VIRTIO_NET_CTRL_MAC    1

 #define VIRTIO_NET_CTRL_MAC_TABLE_SET        0



#endif /* _LINUX_VIRTIO_NET_H */
 
#endif /* _LINUX_VIRTIO_NET_H */