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 5FE5542ECF for ; Thu, 20 Jul 2023 17:39:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5A54940685; Thu, 20 Jul 2023 17:39:07 +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 EE9BF40685 for ; Thu, 20 Jul 2023 17:39:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867545; 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=OJQEeqSWEgQBh8bOcVQLOF+jUwvXyOhJoTA2lbSK4ww=; b=U/ysAwQcL3chH526xnorwUcQoFU0i+BYhS5tnsheQjznWkDwWJKiDdP7q45giIUG9pnvGC zppcrrcEYthtgbEo6EjZzHZhGSq1xLn7itUuVQasJ+kgDO35kwd7VFWy/m7hg/kolZQ4Y6 FeHtfxWEZu5Mh8tLb4t9y0MX3SS28/4= Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-617-Mkw3EeI6MK-2Ny7Fh1XZsw-1; Thu, 20 Jul 2023 11:23:37 -0400 X-MC-Unique: Mkw3EeI6MK-2Ny7Fh1XZsw-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 5081528237F1; Thu, 20 Jul 2023 15:23:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A85C4A9004; Thu, 20 Jul 2023 15:23:10 +0000 (UTC) From: Kevin Traynor To: Qiming Yang Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix VLAN mode parser' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:19 +0100 Message-ID: <20230720151942.262154-128-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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/d127ef307794fd89bf40bbfce84c244c6b27fc68 Thanks. Kevin --- >From d127ef307794fd89bf40bbfce84c244c6b27fc68 Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Sun, 25 Jun 2023 08:23:08 +0000 Subject: [PATCH] net/ice: fix VLAN mode parser [ upstream commit ac1926f641812d4033e320157d0c458f8fbee372 ] Parser will not be created if raw packet filter is not support. This patch add NULL pointer check for parser structure when VLAN mode configure. Fixes: 6e753d777ffc ("net/ice: initialize parser for double VLAN") Signed-off-by: Qiming Yang Acked-by: Qi Zhang --- drivers/net/ice/ice_generic_flow.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index 705c3bee4c..4bd0dce0ac 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -1830,8 +1830,10 @@ ice_flow_init(struct ice_adapter *ad) PMD_INIT_LOG(WARNING, "Failed to initialize DDP parser, raw packet filter will not be supported"); - if (ice_is_dvm_ena(&ad->hw)) - ice_parser_dvm_set(ad->psr, true); - else - ice_parser_dvm_set(ad->psr, false); + if (ad->psr) { + if (ice_is_dvm_ena(&ad->hw)) + ice_parser_dvm_set(ad->psr, true); + else + ice_parser_dvm_set(ad->psr, false); + } RTE_TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:10.348294215 +0100 +++ 0128-net-ice-fix-VLAN-mode-parser.patch 2023-07-20 16:17:55.186752652 +0100 @@ -1 +1 @@ -From ac1926f641812d4033e320157d0c458f8fbee372 Mon Sep 17 00:00:00 2001 +From d127ef307794fd89bf40bbfce84c244c6b27fc68 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ac1926f641812d4033e320157d0c458f8fbee372 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index ed3075d555..91bf1d6fcb 100644 +index 705c3bee4c..4bd0dce0ac 100644 @@ -23 +24 @@ -@@ -1837,8 +1837,10 @@ ice_flow_init(struct ice_adapter *ad) +@@ -1830,8 +1830,10 @@ ice_flow_init(struct ice_adapter *ad)