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 A4AA4A0542 for ; Fri, 11 Nov 2022 11:34:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A026642D0D; Fri, 11 Nov 2022 11:34:54 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 25C694014F for ; Fri, 11 Nov 2022 11:34:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162892; 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=+H/hrkC+3L15Ds8k3P3YUY9QW22sDE+CxPENKj21ldk=; b=AdhGTGbhtKH8iicpz69PdNVb/vpg468+rz7cbxnVQ2K460HRNpXARP1HeZ+ugEVkX206i2 VLx8ITYb4OOYSYQQkY+5eJjAGtoTDp4rqFYuyGm6/rSXyDCvwbBDfJh4rCPewxv2Oj0NDf qCFspo6vsMokRPdEmcNY0z+oafnnfjM= 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-284-rZjFkYA3O4eSxnya0kpUqw-1; Fri, 11 Nov 2022 05:34:51 -0500 X-MC-Unique: rZjFkYA3O4eSxnya0kpUqw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 18537185A792; Fri, 11 Nov 2022 10:34:51 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D5F22022EA2; Fri, 11 Nov 2022 10:34:49 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix handling of IPsec events' has been queued to stable release 21.11.3 Date: Fri, 11 Nov 2022 10:33:21 +0000 Message-Id: <20221111103337.307408-31-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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.3 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/14/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/af41fb34eb91687a733fb4edc216dc79e2284d29 Thanks. Kevin --- >From af41fb34eb91687a733fb4edc216dc79e2284d29 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Mon, 24 Oct 2022 12:34:47 +0100 Subject: [PATCH] net/iavf: fix handling of IPsec events [ upstream commit cc9317e2b0b245821180e858a904ceec33388fe1 ] Verify that the message length is non zero and keep processing virtual channel messages after the event is received. Fixes: 6bc987ecb860 ("net/iavf: support IPsec inline crypto") Signed-off-by: Radu Nicolau Acked-by: Qi Zhang --- drivers/net/iavf/iavf_vchnl.c | 42 ++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 54c6e39e16..d11b9fc8e3 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -489,20 +489,30 @@ iavf_handle_virtchnl_msg(struct rte_eth_dev *dev) info.msg_len); } else { - /* check for inline IPsec events */ - struct inline_ipsec_msg *imsg = - (struct inline_ipsec_msg *)info.msg_buf; - struct rte_eth_event_ipsec_desc desc; - if (msg_opc == - VIRTCHNL_OP_INLINE_IPSEC_CRYPTO && - imsg->ipsec_opcode == - INLINE_IPSEC_OP_EVENT) { - struct virtchnl_ipsec_event *ev = - imsg->ipsec_data.event; - desc.subtype = - RTE_ETH_EVENT_IPSEC_UNKNOWN; - desc.metadata = ev->ipsec_event_data; - iavf_dev_event_post(dev, RTE_ETH_EVENT_IPSEC, - &desc, sizeof(desc)); - return; + /* check for unsolicited messages i.e. events */ + if (info.msg_len > 0) { + switch (msg_opc) { + case VIRTCHNL_OP_INLINE_IPSEC_CRYPTO: { + struct inline_ipsec_msg *imsg = + (struct inline_ipsec_msg *)info.msg_buf; + if (imsg->ipsec_opcode + == INLINE_IPSEC_OP_EVENT) { + struct rte_eth_event_ipsec_desc desc; + struct virtchnl_ipsec_event *ev = + imsg->ipsec_data.event; + desc.subtype = + RTE_ETH_EVENT_IPSEC_UNKNOWN; + desc.metadata = + ev->ipsec_event_data; + iavf_dev_event_post(dev, + RTE_ETH_EVENT_IPSEC, + &desc, sizeof(desc)); + continue; + } + } + break; + default: + break; + } + } -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 10:32:17.815613133 +0000 +++ 0031-net-iavf-fix-handling-of-IPsec-events.patch 2022-11-11 10:32:17.091300837 +0000 @@ -1 +1 @@ -From cc9317e2b0b245821180e858a904ceec33388fe1 Mon Sep 17 00:00:00 2001 +From af41fb34eb91687a733fb4edc216dc79e2284d29 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cc9317e2b0b245821180e858a904ceec33388fe1 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 654bc7edb6..f92daf97f2 100644 +index 54c6e39e16..d11b9fc8e3 100644