From:   Louis Amas <louis.amas@eho.link>
To:     Marcin Wojtas <mw@semihalf.com>,
        Russell King <linux@armlinux.org.uk>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>,
        Matteo Croce <mcroce@microsoft.com>
Cc:     Louis Amas <louis.amas@eho.link>,
        Emmanuel Deloget <emmanuel.deloget@eho.link>,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        bpf@vger.kernel.org
Subject: [PATCH RESEND 1/1] net: mvpp2: fix XDP rx queues registering
Date:   Mon,  6 Dec 2021 17:20:50 +0100
Message-Id: <20211206162051.565724-1-louis.amas@eho.link>
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7wzaIPYcOuTuSNOTVeCMwiN27LXlYGP2CO52UhcrGSHEW991stsluHaJkVjU?=
 =?us-ascii?Q?z7Dp6m30NXHDRpvtdu44xmLBezLDTbYBWkdM6BNHubPXR07OTPj3o+WXFcYY?=
 =?us-ascii?Q?CTzEL9QaBsGPz3C6cjo+z9fVJd+aAfpcxu7yTKy4ZVOsSoGklfrMn1bC4kPD?=
 =?us-ascii?Q?Dlak+9xy0l//2TfUphIYyUeLPgP4z6z7/bLIyOc17/1V5kqPw+uc7NXqEVK2?=
 =?us-ascii?Q?oYE/c9nyrVOMVOQcUt9wHgQpfiq46zgNGrI8Z0vQPirhWSf5hYKdBK8diTTc?=
 =?us-ascii?Q?RgK55p8d+GpB/6FsYmuEBj6en18DNlFq828tEchXhGenSSVhWzgDNohpf1Tg?=
 =?us-ascii?Q?Tx5gpO1n6T4yfASYjinnAwloF7H6ThFAmTlUoH62U2WcTJOoetBj04JdYklH?=
 =?us-ascii?Q?NCj7eHPbfGuiKbfXr7yRJzCa/ME63y8mvsbQDWF1BHkFej+4DRUiTc8UdwYb?=
 =?us-ascii?Q?MD2qFCNwvyyYgCKcQwyXMpwxDXzr3wyWTDkBlKTw5e98WTGoYSDJh+JbAJi/?=
 =?us-ascii?Q?axXx2/YBmAv6c1CkurX2gcDp5hbHj4jxj9yhuxa1u6tt4fk+gezh3JLQTjmF?=
 =?us-ascii?Q?2txHsBrTRWmMdN9Phomm9IxcfVUcqulahQz5cJdO6ckEaaDS1iP7NFWioJG9?=
 =?us-ascii?Q?xZrAyImwJte6XRGW13uH5WM+d5Je431hPU093NdR0U6vcuxgLXh3ORjHnC3+?=
 =?us-ascii?Q?nPDVHcptLa6wu/MzEXXoNbc4/iPqCb9dkBBUCojm9EhYX8+CUn2dqYp1g+zI?=
 =?us-ascii?Q?PkGg8+HPpIUUipYLGFKC4yADlxn0y3QkcGC2RDRhLSFTsRkXsM6P9tc/mJ1R?=
 =?us-ascii?Q?Br9HUH8MIegukJMO2gx7s4+ZqK+YB4ocY8ajp2Km3LveylWdW7CP4HLDPMKh?=
 =?us-ascii?Q?ypbVDi2OlKJtUraoGca12/ChOzRzVtK3NwgCm2ZK0ebBANesOkNOyu82BHbI?=
 =?us-ascii?Q?gw9jTEYqetWXEb4sVbRTuZ/j1zPYE6C263akY72CVaT7DZIIbVjZJqNJQ2DJ?=
 =?us-ascii?Q?fVSeh7oN/jYiWZYbbLytqV7FJmUjc1vLWPQ/RpMdy2/9T/4x6gTidxyJFLnq?=
 =?us-ascii?Q?OIF1M+BqDX58JKt/h2v/qOv4my9kph/FtV7qFQuJ8/7ZNCtAFQ46sUmOoO12?=
 =?us-ascii?Q?0nrDy5h3laXPE62WHXPOKY1/wiREitbYYf4aFrcePaJg3lEepmoF6pwW/44h?=
 =?us-ascii?Q?4vsztlVFMklSqzaJYCSdb63GChcvqErTdESYjJhnM6GinZa7ZrChjcHoBOfz?=
 =?us-ascii?Q?m/Qg5N3jJD/iAA2quKM9CV0SLrXYkPd6lAgMWSe5qvZefUh6Z5xT7aPzXz1D?=
 =?us-ascii?Q?ydBA913QtXiXvR+doqn1YhvLo7ryAKZuFD+svAR8wXQ2/gB1FIhzdPCBcmLt?=
 =?us-ascii?Q?syTvXT82JgZ09WMQeU28w2b8aVEHt+wo7atA8m8/6l35UGEBEdPtWrehJWj2?=
 =?us-ascii?Q?BTYKKqV7CqE5zgBIJ6HUrzX++o8HX7Ru+HDveb3bXEIMSwOb/cZk26WnHlfq?=
 =?us-ascii?Q?6HIeaHjUZEMBTQ8O0mneBfGafIVCxs07X7SZOOkPFHBCWucjC3N4lGaMqssu?=
 =?us-ascii?Q?4lY8xFXGaTqeS2aAXNm3ohisniceFo+AXgkCq7dnejAjGzOSUNS3ZsfoSTWi?=
 =?us-ascii?Q?+cIMULg2AHKbJsNs5pmeCVk=3D?=
X-OriginatorOrg: eho.link
X-MS-Exchange-CrossTenant-Network-Message-Id: 5a252f34-4457-4c8d-328a-08d9b8d4635b
X-MS-Exchange-CrossTenant-AuthSource: PAXPR06MB7517.eurprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2021 16:20:59.0329
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 924d502f-ff7e-4272-8fa5-f920518a3f4c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hqzP2mXziM0X2CA9tp80vMQodUU0GEyungBWKZPO+D1Y2iftMhEzU0U8QEWww9zdZ/BJjWP7pOskeYsSpM7iiw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR06MB7422
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The registration of XDP queue information is incorrect because the
RX queue id we use is invalid. When port->id =3D=3D 0 it appears to works
as expected yet it's no longer the case when port->id !=3D 0.

When we register the XDP rx queue information (using
xdp_rxq_info_reg() in function mvpp2_rxq_init()) we tell them to use
rxq->id as the queue id. This value iscomputed as:
rxq->id =3D port->id * max_rxq_count + queue_id

where max_rxq_count depends on the device version. In the MB case,
this value is 32, meaning that rx queues on eth2 are numbered from
32 to 35 - there are four of them.

Clearly, this is not the per-port queue id that XDP is expecting:
it wants a value in the range [0..3]. It shall directly use queue_id
which is stored in rxq->logic_rxq -- so let's use that value instead.

This is consistent with the remaining part of the code in
mvpp2_rxq_init().

Fixes: b27db2274ba8 ("mvpp2: use page_pool allocator")
Signed-off-by: Louis Amas <louis.amas@eho.link>
Signed-off-by: Emmanuel Deloget <emmanuel.deloget@eho.link>
Reviewed-by: Marcin Wojtas <mw@semihalf.com>
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/=
ethernet/marvell/mvpp2/mvpp2_main.c
index 6480696c979b..6da8a595026b 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -2960,11 +2960,11 @@ static int mvpp2_rxq_init(struct mvpp2_port *port,
        mvpp2_rxq_status_update(port, rxq->id, 0, rxq->size);

        if (priv->percpu_pools) {
-               err =3D xdp_rxq_info_reg(&rxq->xdp_rxq_short, port->dev, rx=
q->id, 0);
+               err =3D xdp_rxq_info_reg(&rxq->xdp_rxq_short, port->dev, rx=
q->logic_rxq, 0);
                if (err < 0)
                        goto err_free_dma;

-               err =3D xdp_rxq_info_reg(&rxq->xdp_rxq_long, port->dev, rxq=
->id, 0);
+               err =3D xdp_rxq_info_reg(&rxq->xdp_rxq_long, port->dev, rxq=
->logic_rxq, 0);
                if (err < 0)
                        goto err_unregister_rxq_short;

--
2.25.1


[eho.link event] <https://www.linkedin.com/company/eho.link/>