From: "Wasim, Bilal" <Bilal_Wasim@mentor.com>
To: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: "peter.maydell@linaro.org" <peter.maydell@linaro.org>,
"alistair@alistair23.me" <alistair@alistair23.me>,
"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>,
"qemu-arm@nongnu.org" <qemu-arm@nongnu.org>
Subject: RE: [PATCH] Updating the GEM MAC IP to properly filter out the multicast addresses
Date: Fri, 29 Nov 2019 08:54:29 +0000 [thread overview]
Message-ID: <103588e5aa0c43858123d77131ff136f@SVR-IES-MBX-03.mgc.mentorg.com> (raw)
In-Reply-To: <ef4adfa40b5543fba4b8e673e36cbd9e@SVR-IES-MBX-03.mgc.mentorg.com>
git "send-email" doesn't really work well with my work account because the server considers it "less secure" and does NOT provide a way around it.. I've had to re-submit the patch from my secondary email...
-----Original Message-----
From: Qemu-arm [mailto:qemu-arm-bounces+bilal_wasim=mentor.com@nongnu.org] On Behalf Of Wasim, Bilal
Sent: Thursday, November 28, 2019 10:35 PM
To: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Cc: peter.maydell@linaro.org; alistair@alistair23.me; qemu-devel@nongnu.org; qemu-arm@nongnu.org
Subject: RE: [PATCH] Updating the GEM MAC IP to properly filter out the multicast addresses
Thanks for the pointers.. I will incorporate all these changes and post an updated thread asap..
-----Original Message-----
From: Edgar E. Iglesias [mailto:edgar.iglesias@gmail.com]
Sent: Thursday, November 28, 2019 10:32 PM
To: Wasim, Bilal <Bilal_Wasim@mentor.com>
Cc: qemu-devel@nongnu.org; alistair@alistair23.me; peter.maydell@linaro.org; qemu-arm@nongnu.org
Subject: Re: [PATCH] Updating the GEM MAC IP to properly filter out the multicast addresses
On Thu, Nov 28, 2019 at 05:02:00PM +0000, Wasim, Bilal wrote:
> This was one of my first attempts, and so I was sure to miss something.. I've incorporated all the updates in this patch.. Let me know what you think about this..
>
> net/cadence_gem: 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..
Thanks Bilal,
This looks better but not quite there yet.
* You don't seem to be using git-send-email to post patches, try it, it will make life easier wrt to formatting. The patch should be in a separate email. The subject line should be the subject of the email.
git-format-patch and git-send-email will take care of that for you.
* You don't need to define IS_MULTICAST, you can directly use is_multicast_ether_addr() and friends.
* The patch still has long lines (longer than 80 chars) You can run scripts/checkpatch.pl on your commit before posting the patch.
Cheers,
Edgar
>
> Signed-off-by: Bilal Wasim <bilal_wasim@mentor.com>
> ---
> hw/net/cadence_gem.c | 21 ++++++++++++++-------
> 1 file changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index
> b8be73dc55..98efb93f8a 100644
> --- a/hw/net/cadence_gem.c
> +++ b/hw/net/cadence_gem.c
> @@ -34,6 +34,7 @@
> #include "qemu/module.h"
> #include "sysemu/dma.h"
> #include "net/checksum.h"
> +#include "net/eth.h"
>
> #ifdef CADENCE_GEM_ERR_DEBUG
> #define DB_PRINT(...) do { \
> @@ -315,6 +316,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) is_multicast_ether_addr(address)
> +#define IS_UNICAST(address) is_unicast_ether_addr(address)
> +
> static inline uint64_t tx_desc_get_buffer(CadenceGEMState *s,
> uint32_t *desc) {
> uint64_t ret = desc[0];
> @@ -601,7 +608,7 @@ static void gem_receive_updatestats(CadenceGEMState *s, const uint8_t *packet,
> }
>
> /* Error-free Multicast Frames counter */
> - if (packet[0] == 0x01) {
> + if (IS_MULTICAST(packet)) {
> s->regs[GEM_RXMULTICNT]++;
> }
>
> @@ -690,21 +697,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.19.1.windows.1
>
> ----------------------------------------------------------------------
> --------------------------------------------------------
> -----Original Message-----
> From: Edgar E. Iglesias [mailto:edgar.iglesias@gmail.com]
> Sent: Thursday, November 28, 2019 9:00 PM
> To: Wasim, Bilal <Bilal_Wasim@mentor.com>
> Cc: qemu-devel@nongnu.org; alistair@alistair23.me;
> peter.maydell@linaro.org; qemu-arm@nongnu.org
> Subject: Re: [PATCH] Updating the GEM MAC IP to properly filter out
> the multicast addresses
>
> On Thu, Nov 28, 2019 at 03:10:16PM +0000, Wasim, Bilal wrote:
> > [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..
>
> Hi Bilal,
>
> The fix looks right to me but I have a few comments.
>
> * Your patch seems a little wrongly formated.
> [PATCH] goes into the Subject line for example and you're missing path prefixes.
>
> Do a git log -- hw/net/cadence_gem.c to see examples on how it should look.
>
> * The patch will probably not pass checkpatch since you seem to have long lines.
>
> * We also need to update gem_receive_updatestats() to use the corrected macros.
>
> More inline:
>
> >
> > 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)
>
>
>
> This can be simplified:
> #define IS_MULTICAST(address) (address[0] & 1)
>
> Actually, looking closer, we already have functions to do these checks in:
> include/net/eth.h
>
> static inline int is_multicast_ether_addr(const uint8_t *addr) static
> inline int is_broadcast_ether_addr(const uint8_t *addr) static inline
> int is_unicast_ether_addr(const uint8_t *addr)
>
>
>
> > +#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
> >
next prev parent reply other threads:[~2019-11-29 9:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-28 15:10 [PATCH] Updating the GEM MAC IP to properly filter out the multicast addresses Wasim, Bilal
2019-11-28 15:59 ` 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 [this message]
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=103588e5aa0c43858123d77131ff136f@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).