netdev - [PATCH] mvneta driver XDP fixes armhf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <C39F91BD-26BA-4373-A056-CE2E6B9D750E@voleatech.de>
Date:   Wed, 22 Jan 2020 10:05:21 +0000
From:   Sven Auhagen <sven.auhagen@...eatech.de>
To:     "netdev@...r.kernel.org" <netdev@...r.kernel.org>
CC:     "lorenzo.bianconi@...hat.com" <lorenzo.bianconi@...hat.com>,
        "davem@...emloft.net" <davem@...emloft.net>,
        "thomas.petazzoni@...tlin.com" <thomas.petazzoni@...tlin.com>,
        "brouer@...hat.com" <brouer@...hat.com>,
        "ilias.apalodimas@...aro.org" <ilias.apalodimas@...aro.org>,
        "matteo.croce@...hat.com" <matteo.croce@...hat.com>,
        "mw@...ihalf.com" <mw@...ihalf.com>,
        "jakub.kicinski@...ronome.com" <jakub.kicinski@...ronome.com>
Subject: [PATCH] mvneta driver XDP fixes armhf

Recently XDP Support was added to the mvneta driver for software buffer management.
I tested XDP with my armada 388 board. It has hardware buffer management defined in the device tree file.
I disabled the mvneta_bm module to test XDP.

I found multiple problems.

1. With hardware buffer management enabled and mvneta_bm disabled the rx_offset was set to 0 with armhf (32 bit) which leads to no headroom in XDP and therefore the XDP Redirect did not work.
2. Removing the hardware buffer management from the device tree file completely made the mvneta driver unusable as it did not work anymore.

After some debugging I found out that xdp->data = data + pp->rx_offset_correction + MVNETA_MH_SIZE;  has to be xdp->data = data + pp->rx_offset_correction; if pp->rx_offset_correction > 0.
I am not sure why and I am looking for help if someone is seeing the same on an arm64 board.

Attached is a patch that fixes the problem on my armhf platform, as said I am not sure if this is a universal fix or armhf only.

Any feedback is appreciated.

Signed-off-by: Sven Auhagen <sven.auhagen@...eatech.de>

--- a/drivers/net/ethernet/marvell/mvneta.c2020-01-22 08:44:05.611395960 +0000
+++ b/drivers/net/ethernet/marvell/mvneta.c2020-01-22 08:59:27.053739433 +0000
@@ -2158,7 +2158,7 @@ mvneta_swbm_rx_frame(struct mvneta_port
 prefetch(data);

 xdp->data_hard_start = data;
-xdp->data = data + pp->rx_offset_correction + MVNETA_MH_SIZE;
+xdp->data = data + pp->rx_offset_correction;
 xdp->data_end = xdp->data + data_len;
 xdp_set_data_meta_invalid(xdp);

@@ -4960,7 +4960,8 @@ static int mvneta_probe(struct platform_
  * NET_SKB_PAD, exceeds 64B. It should be 64B for 64-bit
  * platforms and 0B for 32-bit ones.
  */
-pp->rx_offset_correction = max(0,
+if (pp->bm_priv)
+pp->rx_offset_correction = max(0,
        NET_SKB_PAD -
        MVNETA_RX_PKT_OFFSET_CORRECTION);
 }

+++ Voleatech auf der E-World, 11. bis 13. Februar 2020, Halle 5, Stand 521 +++

Beste Grüße/Best regards

Sven Auhagen
Dipl. Math. oec., M.Sc.
Voleatech GmbH
HRB: B 754643
USTID: DE303643180
Grathwohlstr. 5
72762 Reutlingen
Tel: +49 7121539550
Fax: +49 7121539551
E-Mail: sven.auhagen@...eatech.de
www.voleatech.de<https://www.voleatech.de>
Diese Information ist ausschließlich für den Adressaten bestimmt und kann vertraulich oder gesetzlich geschützte Informationen enthalten. Wenn Sie nicht der bestimmungsgemäße Adressat sind, unterrichten Sie bitte den Absender und vernichten Sie diese Mail. Anderen als dem bestimmungsgemäßen Adressaten ist es untersagt, diese E-Mail zu lesen, zu speichern, weiterzuleiten oder ihren Inhalt auf welche Weise auch immer zu verwenden. Für den Adressaten sind die Informationen in dieser Mail nur zum persönlichen Gebrauch. Eine Weiterleitung darf nur nach Rücksprache mit dem Absender erfolgen. Wir verwenden aktuelle Virenschutzprogramme. Für Schäden, die dem Empfänger gleichwohl durch von uns zugesandte mit Viren befallene E-Mails entstehen, schließen wir jede Haftung aus.