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 E2A1441D52 for ; Thu, 23 Feb 2023 16:08:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DDE38432BA; Thu, 23 Feb 2023 16:08:42 +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 41FCC4316C for ; Thu, 23 Feb 2023 16:08:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164920; 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=3n1gYsBGAELREptK+ExwbF9RW3FL+IHIjiefg4+6Q5k=; b=WQw7YnwHrs0cfoEad3l0iN0Wf/0qKchN80olfdd5m79zUEQYTgdcBgMHnISEEegpbX5dLn KD8SvLrLanpOptxL37YmyVa6vNzqX/2qIqJKkz/KiqfFBjMJQWl0w0nLwA0neCfnS5sGXo U/wwZ3A28ldfQcY/057I0inTyOTwxi4= 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-549-3plPl2H1O-yuVeiDr6xx6g-1; Thu, 23 Feb 2023 10:08:37 -0500 X-MC-Unique: 3plPl2H1O-yuVeiDr6xx6g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 16EEC3C0E45C; Thu, 23 Feb 2023 15:08:37 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63DB72166B29; Thu, 23 Feb 2023 15:08:36 +0000 (UTC) From: Kevin Traynor To: Megha Ajmera Cc: Cristian Dumitrescu , dpdk stable Subject: patch 'sched: fix alignment of structs in subport' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:06:20 +0000 Message-Id: <20230223150631.723699-89-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.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 02/28/23. 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/818b598bfdc8e8885280c6825fcb29b09c5c63b0 Thanks. Kevin --- >From 818b598bfdc8e8885280c6825fcb29b09c5c63b0 Mon Sep 17 00:00:00 2001 From: Megha Ajmera Date: Tue, 7 Feb 2023 06:10:08 +0000 Subject: [PATCH] sched: fix alignment of structs in subport [ upstream commit bc3b950d80941420873b40d56ee387867fc34dad ] Big structures like bitmap, pipes and queues in subport are addressed using offset of 'memory' field in subport structures. This means no other variable should be added after 'memory' variable or else addressing of such structs like bitmap etc. become incorrect. Realigned tc_ov_enabled variable in subport structure. Fixes: f5e60154ade ("sched: enable traffic class oversubscription conditionally") Signed-off-by: Megha Ajmera Acked-by: Cristian Dumitrescu --- lib/sched/rte_sched.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c index f9924d5f2f..b9494ec31e 100644 --- a/lib/sched/rte_sched.c +++ b/lib/sched/rte_sched.c @@ -215,4 +215,7 @@ struct rte_sched_subport { uint32_t qsize_sum; + /* TC oversubscription activation */ + int tc_ov_enabled; + struct rte_sched_pipe *pipe; struct rte_sched_queue *queue; -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:25.954074854 +0000 +++ 0089-sched-fix-alignment-of-structs-in-subport.patch 2023-02-23 14:46:23.883236360 +0000 @@ -1 +1 @@ -From bc3b950d80941420873b40d56ee387867fc34dad Mon Sep 17 00:00:00 2001 +From 818b598bfdc8e8885280c6825fcb29b09c5c63b0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bc3b950d80941420873b40d56ee387867fc34dad ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19,2 +20,2 @@ - lib/sched/rte_sched.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + lib/sched/rte_sched.c | 3 +++ + 1 file changed, 3 insertions(+) @@ -23 +24 @@ -index c91697131d..19768d8c38 100644 +index f9924d5f2f..b9494ec31e 100644 @@ -26 +27 @@ -@@ -203,4 +203,7 @@ struct rte_sched_subport { +@@ -215,4 +215,7 @@ struct rte_sched_subport { @@ -34,8 +34,0 @@ -@@ -210,7 +213,4 @@ struct rte_sched_subport { - struct rte_mbuf **queue_array; - uint8_t memory[0] __rte_cache_aligned; -- -- /* TC oversubscription activation */ -- int tc_ov_enabled; - } __rte_cache_aligned; -