mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: cadence_gem: Fix RX address filtering

Browse Source 
Two defects are fixed:

1/ Detection of multicast frames
2/ Treating drop of mis-addressed frames as non-error

Signed-off-by: Tong Ho <tong.ho@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Tong Ho 2020-05-12 20:24:54 +05:30 committed by Jason Wang
parent fdd35195c5
commit fbc14a098d
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/net/cadence_gem.c
View File

@ -34,6 +34,7 @@
#include "qemu/module.h" #include "qemu/module.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include "net/checksum.h" #include "net/checksum.h"
#include "net/eth.h"
#define CADENCE_GEM_ERR_DEBUG 0 #define CADENCE_GEM_ERR_DEBUG 0
#define DB_PRINT(...) do {\ #define DB_PRINT(...) do {\
@ -702,7 +703,7 @@ static unsigned calc_mac_hash(const uint8_t *mac)
static int gem_mac_address_filter(CadenceGEMState *s, const uint8_t *packet) static int gem_mac_address_filter(CadenceGEMState *s, const uint8_t *packet)
{ {
uint8_t *gem_spaddr; uint8_t *gem_spaddr;
int i; int i, is_mc;
/* Promiscuous mode? */ /* Promiscuous mode? */
if (s->regs[GEM_NWCFG] & GEM_NWCFG_PROMISC) { if (s->regs[GEM_NWCFG] & GEM_NWCFG_PROMISC) {
@ -718,22 +719,17 @@ static int gem_mac_address_filter(CadenceGEMState *s, const uint8_t *packet)
} }
/* Accept packets -w- hash match? */ /* Accept packets -w- hash match? */
if ((packet[0] == 0x01 && (s->regs[GEM_NWCFG] & GEM_NWCFG_MCAST_HASH)) || is_mc = is_multicast_ether_addr(packet);
(packet[0] != 0x01 && (s->regs[GEM_NWCFG] & GEM_NWCFG_UCAST_HASH))) { if ((is_mc && (s->regs[GEM_NWCFG] & GEM_NWCFG_MCAST_HASH)) ||
(!is_mc && (s->regs[GEM_NWCFG] & GEM_NWCFG_UCAST_HASH))) {
uint64_t buckets;
unsigned hash_index; unsigned hash_index;
hash_index = calc_mac_hash(packet); hash_index = calc_mac_hash(packet);
if (hash_index < 32) { buckets = ((uint64_t)s->regs[GEM_HASHHI] << 32) | s->regs[GEM_HASHLO];
if (s->regs[GEM_HASHLO] & (1<<hash_index)) { if ((buckets >> hash_index) & 1) {
return packet[0] == 0x01 ? GEM_RX_MULTICAST_HASH_ACCEPT : return is_mc ? GEM_RX_MULTICAST_HASH_ACCEPT
GEM_RX_UNICAST_HASH_ACCEPT; : GEM_RX_UNICAST_HASH_ACCEPT;
}
} else {
hash_index -= 32;
if (s->regs[GEM_HASHHI] & (1<<hash_index)) {
return packet[0] == 0x01 ? GEM_RX_MULTICAST_HASH_ACCEPT :
GEM_RX_UNICAST_HASH_ACCEPT;
}
} }
} }
@ -958,7 +954,7 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
/* Is this destination MAC address "for us" ? */ /* Is this destination MAC address "for us" ? */
maf = gem_mac_address_filter(s, buf); maf = gem_mac_address_filter(s, buf);
if (maf == GEM_RX_REJECT) { if (maf == GEM_RX_REJECT) {
return -1; return size; /* no, drop siliently b/c it's not an error */
} }
/* Discard packets with receive length error enabled ? */ /* Discard packets with receive length error enabled ? */