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 78026A0032 for ; Fri, 24 Jun 2022 18:10:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74251415D7; Fri, 24 Jun 2022 18:10:31 +0200 (CEST) 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 505B140A87 for ; Fri, 24 Jun 2022 18:10:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656087029; 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=3ZuBg8px8c48XhPXJ6ZH44pU4tTM208QfHdMFtvvwfI=; b=Ni0Kw6QKP9OZE6ouZXDXjfMwFRumVkEvm4fsutsg5HYKLHptL5UGlYrvFWCrh5sM4bdix0 9TTvN0Yi7S6j9No45ofeHqIq/dTezxBSw6LL0UmJlW3XrdvcJ1rv25Hg9AfZuT5d0lBUWK CxoBQyyP83RSrcpvjYkyO2IgP4nbMG8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-9-fV8TMhkeNcydHhh4KIJD1g-1; Fri, 24 Jun 2022 12:10:28 -0400 X-MC-Unique: fV8TMhkeNcydHhh4KIJD1g-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 4CBC5811E80; Fri, 24 Jun 2022 16:10:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 430D3416171; Fri, 24 Jun 2022 16:10:27 +0000 (UTC) From: Kevin Traynor To: Hanumanth Pothula Cc: dpdk stable Subject: patch 'common/cnxk: handle ROC model init failure' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 17:10:06 +0100 Message-Id: <20220624161016.1881349-4-ktraynor@redhat.com> In-Reply-To: <20220624161016.1881349-1-ktraynor@redhat.com> References: <20220624161016.1881349-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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/760f94b15a5d168f6dfee1d841ad276d9c47f224 Thanks. Kevin --- >From 760f94b15a5d168f6dfee1d841ad276d9c47f224 Mon Sep 17 00:00:00 2001 From: Hanumanth Pothula Date: Fri, 10 Jun 2022 13:44:14 +0530 Subject: [PATCH] common/cnxk: handle ROC model init failure [ upstream commit 5f27618bea73240ac4e71e9ed9bb14b25c95505d ] Return with error on fail to initialize ROC model. Fixes: 014a9e222bac ("common/cnxk: add model init and IO handling API") Signed-off-by: Hanumanth Pothula --- drivers/common/cnxk/roc_platform.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/common/cnxk/roc_platform.c b/drivers/common/cnxk/roc_platform.c index 74dbdeceb9..6cf0c4113e 100644 --- a/drivers/common/cnxk/roc_platform.c +++ b/drivers/common/cnxk/roc_platform.c @@ -38,5 +38,9 @@ roc_plt_init(void) return -ENOMEM; } - roc_model_init(mz->addr); + if (roc_model_init(mz->addr)) { + plt_err("Failed to init roc_model"); + rte_memzone_free(mz); + return -EINVAL; + } } } else { -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 16:54:05.689762833 +0100 +++ 0004-common-cnxk-handle-ROC-model-init-failure.patch 2022-06-24 16:54:05.521164995 +0100 @@ -1 +1 @@ -From 5f27618bea73240ac4e71e9ed9bb14b25c95505d Mon Sep 17 00:00:00 2001 +From 760f94b15a5d168f6dfee1d841ad276d9c47f224 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5f27618bea73240ac4e71e9ed9bb14b25c95505d ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index ebb6225f4d..ce0f9b870c 100644 +index 74dbdeceb9..6cf0c4113e 100644