From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D9D78A00C2 for ; Wed, 23 Nov 2022 19:05:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B4EE942DB8; Wed, 23 Nov 2022 19:05:03 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0CA8A42DAA for ; Wed, 23 Nov 2022 19:05:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HGPmJg6Q0Th4IqavuVzMEZuRrxRudzeXQ54IR8kgbOc=; b=CRSbKknb63VyJAY61r1u8nBFvJE/xIlmqzYCcIoNqHRrGBnPnTwh2/FfKzfOKWm9bTvV7Z C9G1DDsiMNZ35U7YIlxnMG7u5S4Dyuc1MTLXpXh9Ouq9t4njOZOgvg8K7bUvb/keOBPaq2 dMUIB3KJsdhQ+eZDGL4mVsTxsUn9lEY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-509-v34XOVnwPluHAV1Q2wG4Pg-1; Wed, 23 Nov 2022 13:04:58 -0500 X-MC-Unique: v34XOVnwPluHAV1Q2wG4Pg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E0FA685A59D; Wed, 23 Nov 2022 18:04:57 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DF8A492B07; Wed, 23 Nov 2022 18:04:57 +0000 (UTC) From: Kevin Traynor To: Pavan Nikhilesh Cc: dpdk stable Subject: patch 'event/cnxk: fix mbuf offset calculation' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:03:42 +0000 Message-Id: <20221123180413.733554-29-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/28/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/80dfbebe4faa049758725e23d347ef1c9821018b Thanks. Kevin --- >From 80dfbebe4faa049758725e23d347ef1c9821018b Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Tue, 25 Oct 2022 21:41:29 +0530 Subject: [PATCH] event/cnxk: fix mbuf offset calculation [ upstream commit 9b70a944b4d10ebb1afab6228fe14365a11e56ad ] Fix incorrect mbuf offset calculation when HEADROOM exceeds 128B while processing event vectors. Fixes: 7fbbc981d54f ("event/cnxk: support vectorized Rx event fast path") Signed-off-by: Pavan Nikhilesh --- drivers/net/cnxk/cn10k_rx.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h index 034e95186b..058221034a 100644 --- a/drivers/net/cnxk/cn10k_rx.h +++ b/drivers/net/cnxk/cn10k_rx.h @@ -637,7 +637,9 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts, } else { mbuf01 = - vsubq_u64(vld1q_u64((uint64_t *)cq0), data_off); - mbuf23 = vsubq_u64(vld1q_u64((uint64_t *)(cq0 + 16)), - data_off); + vsubq_u64(vld1q_u64((uint64_t *)cq0), + vdupq_n_u64(sizeof(struct rte_mbuf))); + mbuf23 = + vsubq_u64(vld1q_u64((uint64_t *)(cq0 + 16)), + vdupq_n_u64(sizeof(struct rte_mbuf))); } -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:57.777790592 +0000 +++ 0029-event-cnxk-fix-mbuf-offset-calculation.patch 2022-11-23 09:55:57.068149304 +0000 @@ -1 +1 @@ -From 9b70a944b4d10ebb1afab6228fe14365a11e56ad Mon Sep 17 00:00:00 2001 +From 80dfbebe4faa049758725e23d347ef1c9821018b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9b70a944b4d10ebb1afab6228fe14365a11e56ad ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 4e22ceda02..721127dddd 100644 +index 034e95186b..058221034a 100644 @@ -21 +22 @@ -@@ -1204,7 +1204,9 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts, +@@ -637,7 +637,9 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,