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 322324326F for ; Thu, 2 Nov 2023 14:13:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2BCF9427E3; Thu, 2 Nov 2023 14:13:38 +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 7CC29402D5 for ; Thu, 2 Nov 2023 14:13:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930816; 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=U31p37aXZtSHxzvAgPvoZcFWM7adRRBB7lZtheIZGW4=; b=QdF3U21MoMuYwfnSZ3M7HijRKmgi4QFJ965huGdqoWFLAqtA2T5gRr7AX1auoxXJifvn5u RY2st2t53xhZS0sXUnDWEVA4Ef2fM+RWTmCBS7B8sUttY17AdH5qrxHfW8mavaXe9tNho4 TW7EcG6oMxNduA/vpoU+humNuGlFQdk= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-663-ISnkhYmyPSS62W6T1J7CVQ-1; Thu, 02 Nov 2023 09:13:32 -0400 X-MC-Unique: ISnkhYmyPSS62W6T1J7CVQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 800013816D91; Thu, 2 Nov 2023 13:13:32 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43CE4492BFA; Thu, 2 Nov 2023 13:13:31 +0000 (UTC) From: Kevin Traynor To: Gagandeep Singh Cc: Hemant Agrawal , Jerin Jacob , dpdk stable Subject: patch 'bus/dpaa: fix build with asserts for GCC 13' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:19 +0000 Message-ID: <20231102131254.315947-13-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.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.6 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/08/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/171c6bf70d375dbceecb9507496baaaeff85d7e5 Thanks. Kevin --- >From 171c6bf70d375dbceecb9507496baaaeff85d7e5 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Fri, 21 Jul 2023 10:58:10 +0530 Subject: [PATCH] bus/dpaa: fix build with asserts for GCC 13 [ upstream commit 3bcd5b3198d4a31176b1ac73fc7236a12186fffe ] when RTE_ENABLE_ASSERT is enable, DPAA driver is doing wrong NULL check on frame queue which allows the code to have access to NULL address. GCC v13 is giving array bounds error if code is accessing any memory region less than 4KB. This patch fixes this issue by adding proper NULL checks on frame queue. Bugzilla ID: 1233 Fixes: c47ff048b99a ("bus/dpaa: add QMAN driver core routines") Signed-off-by: Gagandeep Singh Acked-by: Hemant Agrawal Acked-by: Jerin Jacob --- drivers/bus/dpaa/base/qbman/qman.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c index 447c091770..aa8da96627 100644 --- a/drivers/bus/dpaa/base/qbman/qman.c +++ b/drivers/bus/dpaa/base/qbman/qman.c @@ -2,5 +2,5 @@ * * Copyright 2008-2016 Freescale Semiconductor Inc. - * Copyright 2017,2019 NXP + * Copyright 2017,2019-2023 NXP * */ @@ -898,5 +898,5 @@ mr_loop: fq = table_find_fq(p, be32_to_cpu(msg->fq.fqid)); - DPAA_BUG_ON(!fq); + DPAA_BUG_ON(fq != NULL); fq_state_change(p, fq, &swapped_msg, verb); if (fq->cb.fqs) @@ -910,4 +910,5 @@ mr_loop: fq = (void *)(uintptr_t)msg->fq.contextB; #endif + DPAA_BUG_ON(fq != NULL); fq_state_change(p, fq, msg, verb); if (fq->cb.fqs) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.208344145 +0000 +++ 0013-bus-dpaa-fix-build-with-asserts-for-GCC-13.patch 2023-11-02 13:09:40.784163242 +0000 @@ -1 +1 @@ -From 3bcd5b3198d4a31176b1ac73fc7236a12186fffe Mon Sep 17 00:00:00 2001 +From 171c6bf70d375dbceecb9507496baaaeff85d7e5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3bcd5b3198d4a31176b1ac73fc7236a12186fffe ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 3949bf8712..83db0a534e 100644 +index 447c091770..aa8da96627 100644