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 AFB714319F for ; Thu, 19 Oct 2023 02:00:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA7A540A7A; Thu, 19 Oct 2023 02:00:01 +0200 (CEST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 8244B40DCA for ; Thu, 19 Oct 2023 01:59:59 +0200 (CEST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4083ac51d8aso11828935e9.2 for ; Wed, 18 Oct 2023 16:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697673599; x=1698278399; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r27DtOjSnCmcveMDThMP3p6b1X37jFUQJn5eKOBXbVU=; b=NhJ99qAA6O2hg/alPRqjvVWRgkQZrZWpdT3grIEyCTG7iQ/BSEZA2lTxcrTQ8sKcNg BrELHh4ERNqgqxmB471nHEZV6rRARqCQCGQhUSqwj4zYzQwa0m3maduVIRxiDpyOQxjg qHnWnGzBOe2PIXGHjK40kDG+iF24uCLEFUiWfKc231hl0lRkMoYqaIzt2bP0ar6Bmdu1 nxkQ4Xqq4Yy3KMHusWpuYop3Z0vl1W4abu1Wdf6zeJ1fPRb3fOXOTasZ13nQK7t0vUAm Itk7VJURvbTc9ATDEYmB7f8M7qdEmrGayrezGDNqvhQEOsFw1a2uF6jI864pQnvnODAx zkgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697673599; x=1698278399; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r27DtOjSnCmcveMDThMP3p6b1X37jFUQJn5eKOBXbVU=; b=HTKu0Eoj5c80jVgk12X6f4bLBTU51QpAYY5OcI1BxWHomqJo3Q2/fpwUX2NHB0rTR9 JC7FTas5WDyHHpDgSc1qcg3oqg+bT/yjvuMTO/I/7NaqnDq7GTYDGloS23wogl8o/klU OLRsfk3V2gVhp18qEwNtuPvrHtNet1+2UthN4vSl1sHODEAvOs6+XVhU/9j2bSGfYlMl k5UznXn8oLzAtLnh8/e5DljukHFMXYpFaePihPQgXxIzrdovFl0wLTKYE7kohrs562UM sLXtl7ucmOOmyIPxwczg5tJRUpMpZIhuSicK9Ex3QBxziwtbkhtvo5ugrp54idO3eV9T a9ew== X-Gm-Message-State: AOJu0YwEx2aKL0nwbkySQ8Gf2S5fe02kfJhoWnkNNgNHLbTKDq9T/zX4 LuEZ6k8VhEWpurqd4BIFbleibFbbV+Vo4w== X-Google-Smtp-Source: AGHT+IGOH7gJ13OwC1xD0H1t3RtI3iz/EOjUG87Ldb48pGbcSpBr/j3A+jpQJQJ5nOmI0Zi2iCA/uQ== X-Received: by 2002:a05:600c:19c9:b0:401:b2c7:34a4 with SMTP id u9-20020a05600c19c900b00401b2c734a4mr606406wmq.11.1697673599149; Wed, 18 Oct 2023 16:59:59 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id w13-20020a05600c474d00b004067e905f44sm3008734wmo.9.2023.10.18.16.59.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 16:59:58 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.10 Date: Thu, 19 Oct 2023 00:58:59 +0100 Message-Id: <20231018235930.3144-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018235930.3144-1-luca.boccassi@gmail.com> References: <20231018235930.3144-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/21/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/23419b75a0a6798aa054c8b675a50a6a5d2e06a2 Thanks. Luca Boccassi --- >From 23419b75a0a6798aa054c8b675a50a6a5d2e06a2 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 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * * Copyright 2008-2016 Freescale Semiconductor Inc. - * Copyright 2017,2019 NXP + * Copyright 2017,2019-2023 NXP * */ @@ -897,7 +897,7 @@ mr_loop: /* Lookup in the retirement table */ 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) fq->cb.fqs(p, fq, &swapped_msg); @@ -909,6 +909,7 @@ mr_loop: #else fq = (void *)(uintptr_t)msg->fq.contextB; #endif + DPAA_BUG_ON(fq != NULL); fq_state_change(p, fq, msg, verb); if (fq->cb.fqs) fq->cb.fqs(p, fq, &swapped_msg); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-19 00:28:56.745322779 +0100 +++ 0010-bus-dpaa-fix-build-with-asserts-for-GCC-13.patch 2023-10-19 00:28:56.205804204 +0100 @@ -1 +1 @@ -From 3bcd5b3198d4a31176b1ac73fc7236a12186fffe Mon Sep 17 00:00:00 2001 +From 23419b75a0a6798aa054c8b675a50a6a5d2e06a2 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