From: "Wasim, Bilal" <Bilal_Wasim@mentor.com>
To: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Cc: "edgar.iglesias@gmail.com" <edgar.iglesias@gmail.com>,
"alistair@alistair23.me" <alistair@alistair23.me>,
"qemu-arm@nongnu.org" <qemu-arm@nongnu.org>,
"peter.maydell@linaro.org" <peter.maydell@linaro.org>
Subject: [PATCH] Updating the GEM MAC IP to properly filter out the multicast addresses
Date: Thu, 28 Nov 2019 15:10:16 +0000 [thread overview]
Message-ID: <2632212d4c8a40bead72ffdcf288e600@SVR-IES-MBX-03.mgc.mentorg.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 2696 bytes --]
[PATCH] Updating the GEM MAC IP to properly filter out the multicast
addresses. The current code makes a bad assumption that the most-significant
byte of the MAC address is used to determine if the address is multicast or
unicast, but in reality only a single bit is used to determine this. This
caused IPv6 to not work.. Fix is now in place and has been tested with
ZCU102-A53 / IPv6 on a TAP interface. Works well..
Signed-off-by: Bilal Wasim <bilal_wasim@mentor.com>
---
hw/net/cadence_gem.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index b8be73d..f8bcbb3 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -315,6 +315,12 @@
#define GEM_MODID_VALUE 0x00020118
+/* IEEE has specified that the most significant bit of the most significant byte be used for
+ * distinguishing between Unicast and Multicast addresses.
+ * If its a 1, that means multicast, 0 means unicast. */
+#define IS_MULTICAST(address) (((address[0] & 0x01) == 0x01) ? 1 : 0)
+#define IS_UNICAST(address) (!IS_MULTICAST(address))
+
static inline uint64_t tx_desc_get_buffer(CadenceGEMState *s, uint32_t *desc)
{
uint64_t ret = desc[0];
@@ -690,21 +696,21 @@ static int gem_mac_address_filter(CadenceGEMState *s, const uint8_t *packet)
}
/* Accept packets -w- hash match? */
- if ((packet[0] == 0x01 && (s->regs[GEM_NWCFG] & GEM_NWCFG_MCAST_HASH)) ||
- (packet[0] != 0x01 && (s->regs[GEM_NWCFG] & GEM_NWCFG_UCAST_HASH))) {
+ if ((IS_MULTICAST(packet) && (s->regs[GEM_NWCFG] & GEM_NWCFG_MCAST_HASH)) ||
+ (IS_UNICAST(packet) && (s->regs[GEM_NWCFG] & GEM_NWCFG_UCAST_HASH))) {
unsigned hash_index;
hash_index = calc_mac_hash(packet);
if (hash_index < 32) {
if (s->regs[GEM_HASHLO] & (1<<hash_index)) {
- return packet[0] == 0x01 ? GEM_RX_MULTICAST_HASH_ACCEPT :
- GEM_RX_UNICAST_HASH_ACCEPT;
+ return IS_MULTICAST(packet) ? GEM_RX_MULTICAST_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;
+ return IS_MULTICAST(packet) ? GEM_RX_MULTICAST_HASH_ACCEPT :
+ GEM_RX_UNICAST_HASH_ACCEPT;
}
}
}
--
2.9.3
[-- Attachment #2: Type: text/html, Size: 8711 bytes --]
next reply other threads:[~2019-11-28 16:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-28 15:10 Wasim, Bilal [this message]
2019-11-28 15:59 ` [PATCH] Updating the GEM MAC IP to properly filter out the multicast addresses Edgar E. Iglesias
2019-11-28 17:02 ` Wasim, Bilal
2019-11-28 17:31 ` Edgar E. Iglesias
2019-11-28 17:34 ` Wasim, Bilal
2019-11-29 8:54 ` Wasim, Bilal
2019-11-29 10:00 ` no-reply
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=2632212d4c8a40bead72ffdcf288e600@SVR-IES-MBX-03.mgc.mentorg.com \
--to=bilal_wasim@mentor.com \
--cc=alistair@alistair23.me \
--cc=edgar.iglesias@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).