From patchwork Fri Jan 28 16:14:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 1585778 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZzyPicw2; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JljGY4Yxvz9t3b for ; Sat, 29 Jan 2022 03:15:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6E8B741C9C; Fri, 28 Jan 2022 16:14:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K-K-9iuZOFqs; Fri, 28 Jan 2022 16:14:58 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 4248941804; Fri, 28 Jan 2022 16:14:57 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 01508C0021; Fri, 28 Jan 2022 16:14:56 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 11178C001A for ; Fri, 28 Jan 2022 16:14:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DFC7C60BFC for ; Fri, 28 Jan 2022 16:14:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ivqsEm9yVHnh for ; Fri, 28 Jan 2022 16:14:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 4C29460A70 for ; Fri, 28 Jan 2022 16:14:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643386494; 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=H5wGdffCnpkLem9/qPDMWN5M0LwoXUVmXZKW0IUWxFg=; b=ZzyPicw2Knr51gA+T//rho5r0iWISD6tMIonPdk9iakL2w7xskcJ8oM4rqS2np81TzEc9+ m24vnbgWCSdsR8sMV3wVfpnpK7ftynTFggZm09wf+9tPEMVCcJayzJs2+8PJzXeVRcgPgu tQp7TIdW2wwjprPiaqi/TAG1tJ91x/8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-64-FVN_E9QQMz2RjYVTLjhaRQ-1; Fri, 28 Jan 2022 11:14:50 -0500 X-MC-Unique: FVN_E9QQMz2RjYVTLjhaRQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DC28284DA47; Fri, 28 Jan 2022 16:14:49 +0000 (UTC) Received: from RHTPC1VM0NT.redhat.com (unknown [10.22.17.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27EFD22E17; Fri, 28 Jan 2022 16:14:49 +0000 (UTC) From: Aaron Conole To: dev@openvswitch.org Date: Fri, 28 Jan 2022 11:14:43 -0500 Message-Id: <20220128161447.270575-2-aconole@redhat.com> In-Reply-To: <20220128161447.270575-1-aconole@redhat.com> References: <20220128161447.270575-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=aconole@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: Peng He Subject: [ovs-dev] [PATCH 1/5] ofproto-dpif: fix packet_execute_prepare X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Peng He In the commit 1df7f7aac8c976690167261fec9a50d832ef9e7e, the packet metadata's in_port has been changed from ofp port into odp port, however, the odp->flow->in_port is still ofp_port. This patch changes the odp->flow->in_port into odp_port. Fixes: 1df7f7aac8 ("ofproto-dpif: Restore packet metadata when a continuation is resumed.") Signed-off-by: Peng He Acked-by: Mike Pattrick Signed-off-by: Aaron Conole --- ofproto/ofproto-dpif.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 8143dd965f..fed037b8d9 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -5011,6 +5011,7 @@ packet_execute_prepare(struct ofproto *ofproto_, ofproto_dpif_set_packet_odp_port(ofproto, opo->flow->in_port.ofp_port, opo->packet); + opo->flow->in_port = opo->packet->md.in_port; ofproto_dpif_packet_out_delete(aux); opo->aux = execute; }