From patchwork Thu Dec 21 14:24:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Balogh X-Patchwork-Id: 851950 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ericsson.onmicrosoft.com header.i=@ericsson.onmicrosoft.com header.b="QR8b+nz7"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z2Ymb741Pz9s7v for ; Fri, 22 Dec 2017 01:24:15 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 91448C06; Thu, 21 Dec 2017 14:24:14 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 173C5BC3 for ; Thu, 21 Dec 2017 14:24:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from sessmg23.ericsson.net (sessmg23.ericsson.net [193.180.251.45]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4C593456 for ; Thu, 21 Dec 2017 14:24:12 +0000 (UTC) X-AuditID: c1b4fb2d-b35ff70000007932-0e-5a3bc40a00f1 Received: from ESESSHC007.ericsson.se (Unknown_Domain [153.88.183.39]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id 33.28.31026.A04CB3A5; Thu, 21 Dec 2017 15:24:10 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.39) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 21 Dec 2017 15:24:09 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ericsson.onmicrosoft.com; s=selector1-ericsson-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=2YwwFGMdo/XAihdgx7PUNOl3uHRbMCSO95wTGjIYs+w=; b=QR8b+nz74i+hOcWI1pzpOMrTZX4ZppBz2VNYXYDQNhFuN+RbA/NbGFQ8602LOjQluV9Edsf3MhSkm3jkckdk/ITx0+NuIKn536UBEDDswpCjgoINf/xBIxf0jkvEtwbCaGxCfwPRg3tXeCvUMBTtnV2HOUDV1G13YicwHjH2EMQ= Received: from HE1PR07MB3082.eurprd07.prod.outlook.com (10.170.244.156) by AM0PR0702MB3826.eurprd07.prod.outlook.com (52.133.47.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.345.10; Thu, 21 Dec 2017 14:24:08 +0000 Received: from HE1PR07MB3082.eurprd07.prod.outlook.com ([fe80::ac54:19dd:a3ad:964f]) by HE1PR07MB3082.eurprd07.prod.outlook.com ([fe80::ac54:19dd:a3ad:964f%13]) with mapi id 15.20.0345.013; Thu, 21 Dec 2017 14:24:08 +0000 From: =?iso-8859-1?q?Zolt=E1n_Balogh?= To: "'dev@openvswitch.org'" Thread-Topic: [PATCH] xlate: don't add dummy eth header when doing recirc Thread-Index: AdN6ZpYLnIK0oNZvRBm0az7SQaJNBgAAJdtA Date: Thu, 21 Dec 2017 14:24:08 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [188.142.160.91] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR0702MB3826; 6:BfubafvtH70lwYrzq87ndWykSFCTg5BlGzRsjj2CmDXRpGQrRDLxwYjM/9k1ZBISDNPvTV3/yuacSJaHiwxFYpf7WtwBjQ6lE5NzZWYPml5e0ZLdstRXK2zBTtLFKBNriSkCVYqF96y9ZOxekdBAEG0vilTU+ybMvjDOta4oR/S2CzP5fTVgcEtLp63Xy3WYbZ5NpgR1QwwXDrSHqNkge+rGC53f8sbCWFz0u9IvEDda2E4VkSLbT3OBynvih6YD4NQ605H62ammBOuw8s+pIAgIXmEdfGaDN0mUw/I1xcYkWdcu60g8TW6K0ehDxkydI+yvabpDN8VbzKHJEQ5G4dL3iVu03x4Svm1sEeh0n2k=; 5:2B0NrsVCRfeGDJ//bA1qxJxtiJpZkp/j16OixzZy6u3z4MWOL/sCdzUHtmPPVLoTUuEhlHN+aEW/AnoG3ugj3HNVfSlwuIXnSzzqxC0dWI8JNsyrFCLrAuHn9mtNThuQ13cBALb0/gW1ygRF4qOB3ZE28XZPAfYnWvRqpHaecus=; 24:NI+kE72imou9wpO1XTOvNggiTETPvhXaPZX7OJ3j/7eVEgB9KVZkoxtQN3GFNfWJ8DMPbLFdQeUVdtWxwyWhPBjV6z4fEFjvQKtBR/snhkU=; 7:KrfIYNaXYM0eiG1CeSBSR3JJrOC4o0FGQ2K3Sbpzaz11jmKaESYqFenoukueaE6nJOqRBt3G+U8nea+qn60W9erBZvHenUAPAJJrGIh0Wm5LKg1PDHp+JvGhsIf9udj19alN+SDokPxsdZ9zrul05Ko33oD9PBskCVvdWWY4NtfLo07M6ox4/6n4XI+V558nl2dpZwneBQzrSG81a8jLlRg2K2UPEc2dl/hjwF8UOwwqdblx8tGVP3ytHSEC9u7s x-ms-exchange-antispam-srfa-diagnostics: SSOS;SSOR; x-forefront-antispam-report: SFV:SKI; SCL:-1; SFV:NSPM; SFS:(10009020)(366004)(376002)(39380400002)(39860400002)(396003)(346002)(199004)(189003)(68736007)(3280700002)(14454004)(478600001)(7736002)(6506007)(66066001)(76176011)(99286004)(7696005)(59450400001)(8936002)(33656002)(2906002)(5250100002)(4326008)(74316002)(305945005)(316002)(107886003)(102836004)(81156014)(3660700001)(106356001)(53936002)(25786009)(6436002)(2940100002)(105586002)(3846002)(55016002)(86362001)(6116002)(8676002)(81166006)(97736004)(6916009)(2950100002)(9686003)(5660300001)(2900100001)(491001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0702MB3826; H:HE1PR07MB3082.eurprd07.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; x-ms-office365-filtering-correlation-id: d7114eda-4a89-4a4a-08e7-08d5487e7f48 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(3008031)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603307)(7153060); SRVR:AM0PR0702MB3826; x-ms-traffictypediagnostic: AM0PR0702MB3826: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(37575265505322); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3002001)(3231023)(944501027)(10201501046)(93006095)(93001095)(6041268)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123560045)(6072148)(201708071742011); SRVR:AM0PR0702MB3826; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM0PR0702MB3826; x-forefront-prvs: 0528942FD8 received-spf: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=zoltan.balogh@ericsson.com; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: d7114eda-4a89-4a4a-08e7-08d5487e7f48 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Dec 2017 14:24:08.0518 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0702MB3826 X-OriginatorOrg: ericsson.com X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNIsWRmVeSWpSXmKPExsUyM2K7ui7XEesog461yhZHT+9hdmD0eHbz P2MAYxSXTUpqTmZZapG+XQJXxtlnE5kLtnBVPH98maWBcTFHFyMnh4SAicS9azeYuhi5OIQE DjNKvHm3hhXCOcEo8ftEPyOIwyLQyywxe/4KRojMLCaJjp+foXoeM0r8afnADDKMTcBZ4vru l2wgtoiAocSlSSdZQWxmAT2JQ+sbWEBsYQEXidtH17JC1HhKLH3VxQxhG0lcbYWYwyKgKjFr 50UmEJtXIEZi7+EjjCC2EJC9YtkVsDinQKzEwgNHwGxGATGJ76fWMEHsEpe49WQ+E8RzAhJL 9pxnhrBFJV4+/scKYStJ9M0/DFUjK3FpfjfYZxICR9gl7h1dzgaRMJbomrCHFSJxgFXicO9b qISvxK9LH9ggEjsYJdqPfwNawQHk6Ei8naIIUZMv8ev5ZHaIsJXEvDOxEOXrmSV2dZ9nhIjL SHQ+4J7AqDcLyd2zoOF1Y+oUNghbW2LZwtfMs8BhIShxcuYTlgWMLKsYRYtTi4tz042M9VKL MpOLi/Pz9PJSSzYxApPEwS2/dXcwrn7teIhRgINRiYc3e5d1lBBrYllxZe4hRgkOZiUR3sNL gEK8KYmVValF+fFFpTmpxYcYpTlYlMR5T3ryRgkJpCeWpGanphakFsFkmTg4pRoYWRZfqA0O Dp9jv+Fhw8MXgVz1ItXTN3Ey7djtxFGbWuezU22mtYzYsoOFOzf2f7SuvFMX6XHnx5HMntdh KvqxpydcuMB71u9M2sQp3yS+ifpXnrn4QrhV122FvOGHs6wb+1n/Nm8/2sl+WKPygmFohOBh gcsBho8UHv259rxnScPdm2m+017dUWIpzkg01GIuKk4EABhoGIQOAwAA X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] xlate: don't add dummy eth header when doing recirc X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org In xlate_actions(), when packet comes from a L3 port and its packet_type is not Ethernet, then a dummy Ethernet header is added to the packet by setting flow->packet_type to Ethernet and zero out flow->dl_src and flow->dl_dst. This process should be avoided if packet is recirculated, i.e. xin->frozen_state is set properly. Signed-off-by: Zoltan Balogh CC: Jan Scheurich --- ofproto/ofproto-dpif-xlate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index 9b3a2f28a..d85441cb4 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -7041,7 +7041,7 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout) struct xport *in_port = get_ofp_port(xbridge, ctx.base_flow.in_port.ofp_port); - if (flow->packet_type != htonl(PT_ETH) && in_port && + if (!xin->frozen_state && flow->packet_type != htonl(PT_ETH) && in_port && in_port->pt_mode == NETDEV_PT_LEGACY_L3 && ctx.table_id == 0) { /* Add dummy Ethernet header to non-L2 packet if it's coming from a * L3 port. So all packets will be L2 packets for lookup.