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 35E1E48A44 for ; Fri, 31 Oct 2025 15:37:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2EA6040150; Fri, 31 Oct 2025 15:37:37 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 12E2D40677 for ; Fri, 31 Oct 2025 15:37:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921455; 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=473l5xdrg5Dji2rkhjwHria8yzxPzCf+yhyp7KaIodg=; b=d12zW4/PwR0DGl7X+SGf54MmCT9h46OkNjEXHQg7brhEGQWvKdtlXbmjCKt34RL6EQeoqv 7Ih4Z63DjUk6RVoUJ5tM5Atc1KTKkb/vf+nAWiMm5OFhAuVckOwPmq+4Cwd+RDSM8wRKnx reW5U+2O750gwYkqpvFHhqpVdx/sCWI= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-336-jL-_z9mnOv6nlOSuSNIsIQ-1; Fri, 31 Oct 2025 10:37:32 -0400 X-MC-Unique: jL-_z9mnOv6nlOSuSNIsIQ-1 X-Mimecast-MFC-AGG-ID: jL-_z9mnOv6nlOSuSNIsIQ_1761921451 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 700A118009C0; Fri, 31 Oct 2025 14:37:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1609A18004D4; Fri, 31 Oct 2025 14:37:29 +0000 (UTC) From: Kevin Traynor To: Vamsi Attunuru Cc: dpdk stable Subject: patch 'net/octeon_ep: fix mbuf data offset update' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:32:59 +0000 Message-ID: <20251031143421.324432-57-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: fNP-yo2Q5sDpDLgE3mKjFlDgmx5oDrsTT3JLdwL2fuY_1761921451 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 24.11.4 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/05/25. 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/db478b91a5783a00567f4d5d876dad64eff2330b Thanks. Kevin --- >From db478b91a5783a00567f4d5d876dad64eff2330b Mon Sep 17 00:00:00 2001 From: Vamsi Attunuru Date: Mon, 14 Jul 2025 11:10:41 +0530 Subject: [PATCH] net/octeon_ep: fix mbuf data offset update [ upstream commit 74348d7ad2503960611e979677acad4b4641e7dd ] Buffer refill routine uses mempool API instead of pktmbuf alloc to avoid mbuf reset. Patch uses rearm to update the mbuf fields. Also it removes redundant refill count update. Fixes: 35dee56cee00 ("net/octeon_ep: add new fastpath routines") Signed-off-by: Vamsi Attunuru --- drivers/net/octeon_ep/cnxk_ep_rx.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/octeon_ep/cnxk_ep_rx.c b/drivers/net/octeon_ep/cnxk_ep_rx.c index 7465e0a017..a10e9c536e 100644 --- a/drivers/net/octeon_ep/cnxk_ep_rx.c +++ b/drivers/net/octeon_ep/cnxk_ep_rx.c @@ -11,5 +11,4 @@ cnxk_ep_process_pkts_scalar_mseg(struct rte_mbuf **rx_pkts, struct otx_ep_droq * struct rte_mbuf **recv_buf_list = droq->recv_buf_list; uint32_t total_pkt_len, bytes_rsvd = 0; - uint16_t port_id = droq->otx_ep_dev->port_id; uint16_t nb_desc = droq->nb_desc; uint16_t pkts; @@ -23,5 +22,5 @@ cnxk_ep_process_pkts_scalar_mseg(struct rte_mbuf **rx_pkts, struct otx_ep_droq * mbuf = recv_buf_list[droq->read_idx]; - info = rte_pktmbuf_mtod(mbuf, struct otx_ep_droq_info *); + info = cnxk_pktmbuf_mtod(mbuf, struct otx_ep_droq_info *); total_pkt_len = rte_bswap16(info->length >> 48) + OTX_EP_INFO_SIZE; @@ -38,5 +37,5 @@ cnxk_ep_process_pkts_scalar_mseg(struct rte_mbuf **rx_pkts, struct otx_ep_droq * /* Note the first seg */ first_buf = mbuf; - mbuf->data_off += OTX_EP_INFO_SIZE; + *(uint64_t *)&mbuf->rearm_data = droq->rearm_data; mbuf->pkt_len = cpy_len - OTX_EP_INFO_SIZE; mbuf->data_len = cpy_len - OTX_EP_INFO_SIZE; @@ -58,10 +57,8 @@ cnxk_ep_process_pkts_scalar_mseg(struct rte_mbuf **rx_pkts, struct otx_ep_droq * } mbuf = first_buf; - mbuf->port = port_id; rx_pkts[pkts] = mbuf; bytes_rsvd += pkt_len; } - droq->refill_count += new_pkts; droq->pkts_pending -= pkts; /* Stats */ -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-31 13:53:54.027832087 +0000 +++ 0057-net-octeon_ep-fix-mbuf-data-offset-update.patch 2025-10-31 13:53:52.166181562 +0000 @@ -1 +1 @@ -From 74348d7ad2503960611e979677acad4b4641e7dd Mon Sep 17 00:00:00 2001 +From db478b91a5783a00567f4d5d876dad64eff2330b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 74348d7ad2503960611e979677acad4b4641e7dd ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org