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 94A1BA00C2 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 8DF9442DB4; 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.133.124]) by mails.dpdk.org (Postfix) with ESMTP id EDF4B40E5A 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=GF2Ko8LCRnxoycgWfqcA5DzsvdFw+Xn2eotjp/4HW4Y=; b=NCzlXn8Xkp48tnpy1Ayw8WOsFjYwnPhPmtwRjJ5ifltASQ0ciaPxvsX3L8Dpnc/7gyCxGU Cl6ifCpcMcLxyKD3B3mAY9Z0uJF4V6flGXNCOaqfRSje2WtkC8feFX2Xep5ClwrAGyAhEa t+WUQKP50BvVNl1Oy4kLT0f0locb7Mk= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-70-FAHReudzNgip4u-Ts3qRKg-1; Wed, 23 Nov 2022 13:05:00 -0500 X-MC-Unique: FAHReudzNgip4u-Ts3qRKg-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 AB75A1C0A587; Wed, 23 Nov 2022 18:04:59 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28E3F492B07; Wed, 23 Nov 2022 18:04:59 +0000 (UTC) From: Kevin Traynor To: Pavan Nikhilesh Cc: dpdk stable Subject: patch 'event/cnxk: fix missing mempool cookie marking' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:03:44 +0000 Message-Id: <20221123180413.733554-31-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/c8812bd8ec21b091690e521eceb6da45c01e700a Thanks. Kevin --- >From c8812bd8ec21b091690e521eceb6da45c01e700a Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Thu, 3 Nov 2022 21:46:31 +0530 Subject: [PATCH] event/cnxk: fix missing mempool cookie marking [ upstream commit b33d79af2ecaf284c0502c72093a2d2bb9034fd2 ] Mark chunks mempool objects as "put" as they are freed to NPA automatically when they are parsed by TIM HW. Fixes: 300b796262a1 ("event/cnxk: add timer arm routine") Signed-off-by: Pavan Nikhilesh --- drivers/event/cnxk/cnxk_tim_worker.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/event/cnxk/cnxk_tim_worker.h b/drivers/event/cnxk/cnxk_tim_worker.h index 0c9f29cfbe..2a6aa9eab2 100644 --- a/drivers/event/cnxk/cnxk_tim_worker.h +++ b/drivers/event/cnxk/cnxk_tim_worker.h @@ -217,4 +217,5 @@ cnxk_tim_insert_chunk(struct cnxk_tim_bkt *const bkt, return NULL; + RTE_MEMPOOL_CHECK_COOKIES(tim_ring->chunk_pool, (void **)&chunk, 1, 0); *(uint64_t *)(chunk + tim_ring->nb_chunk_slots) = 0; if (bkt->nb_entry) { -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:57.819101154 +0000 +++ 0031-event-cnxk-fix-missing-mempool-cookie-marking.patch 2022-11-23 09:55:57.070149309 +0000 @@ -1 +1 @@ -From b33d79af2ecaf284c0502c72093a2d2bb9034fd2 Mon Sep 17 00:00:00 2001 +From c8812bd8ec21b091690e521eceb6da45c01e700a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b33d79af2ecaf284c0502c72093a2d2bb9034fd2 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 8d8ed1d3a1..eda84c6f31 100644 +index 0c9f29cfbe..2a6aa9eab2 100644 @@ -21 +22 @@ -@@ -218,4 +218,5 @@ cnxk_tim_insert_chunk(struct cnxk_tim_bkt *const bkt, +@@ -217,4 +217,5 @@ cnxk_tim_insert_chunk(struct cnxk_tim_bkt *const bkt,