From patchwork Mon Aug 21 08:34:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Balogh X-Patchwork-Id: 803889 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="jir5+5u+"; 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 3xbRp91Js2z9s82 for ; Mon, 21 Aug 2017 18:35:13 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id CFB3F92F; Mon, 21 Aug 2017 08:35:09 +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 6615C901 for ; Mon, 21 Aug 2017 08:35:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from sesbmg22.ericsson.net (sesbmg22.ericsson.net [193.180.251.48]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 002F0A6 for ; Mon, 21 Aug 2017 08:35:07 +0000 (UTC) X-AuditID: c1b4fb30-96f7a9c000005897-a7-599a9b3a57fb Received: from ESESSHC018.ericsson.se (Unknown_Domain [153.88.183.72]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id 70.F8.22679.A3B9A995; Mon, 21 Aug 2017 10:35:06 +0200 (CEST) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.72) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 21 Aug 2017 10:34:43 +0200 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=F6e4zfiGOmPzptF1Mx47f8uwVqq9jRaqV52axcuDC0c=; b=jir5+5u+qy0nBNQkKu0W61sVnOnEuTlD8ELsBzGH6xhJkdijq7NEAjYuF0QeYLTCkF1zkZu9SBIUPug9ZqF6MzXvq4+7msQxixJUmnuHxVdXOXuHUYEMsi7J/9F+Li8nVC/4TxEhFX8OUuQm7aeOruyPa36fZDRXTM6YvwnnLZQ= Received: from AM2PR07MB1042.eurprd07.prod.outlook.com (10.162.37.27) by AM2PR07MB0691.eurprd07.prod.outlook.com (10.160.56.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.4; Mon, 21 Aug 2017 08:34:42 +0000 Received: from AM2PR07MB1042.eurprd07.prod.outlook.com ([fe80::7e:2b4e:3774:4ef3]) by AM2PR07MB1042.eurprd07.prod.outlook.com ([fe80::7e:2b4e:3774:4ef3%13]) with mapi id 15.01.1385.005; Mon, 21 Aug 2017 08:34:41 +0000 From: =?iso-8859-1?Q?Zolt=E1n_Balogh?= To: "'dev@openvswitch.org'" Thread-Topic: [PATCH] ofproto-dpif-xlate: use xlate error enum for unsupported packet type Thread-Index: AdMaWAwYE8O+CyLxTIOBT77IspHzKQ== Date: Mon, 21 Aug 2017 08:34:41 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [91.82.100.59] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM2PR07MB0691; 6:61mu1jkg7LKOdJltqm0JvJPV0yAoVsC+NJ+NFRyMIN4tBBb1SD9QanOYDYRWTac+fYkP41zwE5wMO1Nv5HvelL3u2Voc4WXPX5hbI4EgwLeDdJcZ3Jq7EWpx8L1TAN/fmOpl44sFScroyo9JiOpMYPD8KAUu1NQtohTXwBsNdY8QDeS17Uwt3yCkHcKqcDLlkbYufAnGgeQ5v6yp4wIJnAFAX24GJsUk/2qds/o7Bp5OLqyYdXe04P1cMLbYaP+pZ723uzvD09hhSQbb6VKb+GKEAxPvMWzuPjgWN4i8+UK302Qt0kjilGt3hxKjJhLeU35wp5YvzFQBEzAt/K63Mw==; 5:tlb36pc6SPSLHmW/2m1md204s1giYxhLykNMERef27m88CBnH53p/s8f8eGQwPWnMafOULyTVvWIR/az4K6NOchT51mm6Mj6pUJFgGNWC7Eue+vil4EKk7AMrD7rDjreoJQ0IFkKUSgJOToLor/q5Q==; 24:plfrnJE7G/s/Cr2LELSKzPEuJyXttb9O5TCrPh370lfgR14sokhl0WHmRj2yySDyx2p+J6RO/QvEyMCQTydNDYd7YAl2g7Cq15lYr8H0tdw=; 7:VqRYZfAd+NB+3Kis6TXWGrUe+xFI39ASoDrIF8ZWOgosg4UkGyi5+w/RdAQMMaLITvsb49Vuy9iXXj98RH3NvMRLiXQIhFffOfdDgYfkUit7Vm44V2ty0PgIvQTy/JBMARcCtTmEjy5B9Q3mtieAehxkgR57RQAAF47zq1FulWJdCbSa8KUh7C4L25trRSx5XU0KeJbA+dvTk577ZlRpvinVAZ3kkZSI+axlp6gduq8= x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ld-processed: 92e84ceb-fbfd-47ab-be52-080c6b87953f,ExtAddr x-ms-office365-filtering-correlation-id: bf941d2f-40a6-472a-9f37-08d4e86f7803 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603157)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:AM2PR07MB0691; x-ms-traffictypediagnostic: AM2PR07MB0691: authentication-results: spf=none (sender IP is ) smtp.mailfrom=zoltan.balogh@ericsson.com; x-exchange-antispam-report-test: UriScan:(37575265505322); x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(6041248)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM2PR07MB0691; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM2PR07MB0691; x-forefront-prvs: 040655413E x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(189002)(199003)(3846002)(86362001)(7696004)(478600001)(66066001)(6116002)(5660300001)(54906002)(55016002)(9686003)(99286003)(102836003)(6916009)(68736007)(33656002)(6436002)(25786009)(6506006)(3660700001)(4326008)(3280700002)(54356999)(2906002)(105586002)(5250100002)(106356001)(7736002)(14454004)(53936002)(110136004)(81156014)(305945005)(8676002)(189998001)(2900100001)(81166006)(74316002)(8936002)(97736004)(50986999)(230783001)(101416001)(491001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR07MB0691; H:AM2PR07MB1042.eurprd07.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Aug 2017 08:34:41.7088 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR07MB0691 X-OriginatorOrg: ericsson.com X-Brightmail-Tracker: H4sIAAAAAAAAA02SfUhTYRTGe++9267DyXW6PMuMnElguVSCZEgk/ZFJhYGURmIzbzrc5rhX RYNCSM0PAhVtutA5NAMdIWt+QEtpajkdJVOojIimWaMkTUrKsna9C/rvd97znIfnHF4Sl1YJ dpEafQnN6NVahVBMtGcNp8Wr7piyEwaXQ5MnZxx48ua3IewYltbt8GFpy6/+oAzsgjgln9Zq ymjm0NFL4sKvD2INY1Hlg+tvhJXIHV6PgkigDoPLYxfVIzEppSYQ3Ls7IOCLKQQ26xrBFQR1 C4eamT6c77Ri0OyaEfLFWwSPejmDIFJIHYcXD31CjsOpRPA0uwQc41QmOLbqEcdh1Hm4Ye73 a0i/5iJY3il5uRJGnL8JjgkqFmZtSzjHEr/E3f1jmxG1EzamrRhvGQELS2aM34GCHsdznGcZ +Ba3BDzvBVvXFxHPUeAxNyAuM1A1IrhZPRoQKWGwaQXxnAJtDcaA0WnomV8X8QNeDOqeNm+H BioO7O4rfKAcMFY3BJ5V0OnO4UeLoHO9luBH5wRgt3sD/ruhv2MaC4QQgMXUIWpEB03/LcSz El62tgh5PgC9lk+4afsYoeBqXyK6ENGHZCzN5ukKkpKUNKO5zLLFeqWeLrEh/994bN9MGEG+ D6lORJFIESyJrzVlSwXqMrZC50RA4opwSUhLe7ZUkq+uuEozxblMqZZmnSiSJBQRktTR2Swp VaAuoYto2kAz/7oYGbSrEp17faRxKne4v/VZbox3NHKzKWYtZPWX4cxtmSdJLHPuSU85GWX9 md9b5B2Kd2uyygdG932M9vgWo8syVZMaybjRc1+5KG8aM362Dnf0nAoL3rDULKzM582pKomM 7nGt/Kyc0dE7vhfYDSdWzaUTOvm1uv3X29JLk3OevC+vqFIQbKE6MQ5nWPVfRQ7AhBcDAAA= Subject: [ovs-dev] [PATCH] ofproto-dpif-xlate: use xlate error enum for unsupported packet type 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 Instead of using the value 1 a new enum should be used for indicating translation error which occurs because of unsupported packet type. Signed-off-by: Zoltan Balogh Signed-off-by: Jan Scheurich Co-authored-by: Jan Scheurich Fixes: f839892a206a ("OF support and translation of generic encap and decap") CC: Jan Scheurich --- ofproto/ofproto-dpif-xlate.c | 12 +++++++----- ofproto/ofproto-dpif-xlate.h | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index 973e76054..d56a5de3a 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -424,6 +424,8 @@ const char *xlate_strerror(enum xlate_error error) return "Too many MPLS labels"; case XLATE_INVALID_TUNNEL_METADATA: return "Invalid tunnel metadata"; + case XLATE_UNSUPPORTED_PACKET_TYPE: + return "Unsupported packet type"; } return "Unknown error"; } @@ -5798,7 +5800,7 @@ rewrite_flow_encap_ethernet(struct xlate_ctx *ctx, xlate_report_debug(ctx, OFT_ACTION, "Dropping packet as encap(ethernet) is not " "supported for packet type ethernet."); - ctx->error = 1; + ctx->error = XLATE_UNSUPPORTED_PACKET_TYPE; } } @@ -5879,7 +5881,7 @@ rewrite_flow_encap_nsh(struct xlate_ctx *ctx, "Dropping packet as encap(nsh) is not " "supported for packet type (%d,0x%x)", pt_ns(packet_type), pt_ns_type(packet_type)); - ctx->error = 1; + ctx->error = XLATE_UNSUPPORTED_PACKET_TYPE; return buf; } /* Note that we have matched on packet_type! */ @@ -5963,7 +5965,7 @@ xlate_generic_decap_action(struct xlate_ctx *ctx, /* Error handling: drop packet. */ xlate_report_debug(ctx, OFT_ACTION, "Dropping packet, cannot " "decap Ethernet if VLAN is present."); - ctx->error = 1; + ctx->error = XLATE_UNSUPPORTED_PACKET_TYPE; } else { /* Just change the packet_type. * Delay generating pop_eth to the next commit. */ @@ -5994,7 +5996,7 @@ xlate_generic_decap_action(struct xlate_ctx *ctx, xlate_report_debug(ctx, OFT_ACTION, "Dropping packet as NSH next protocol %d " "is not supported", flow->nsh.np); - ctx->error = 1; + ctx->error = XLATE_UNSUPPORTED_PACKET_TYPE; return false; break; } @@ -6008,7 +6010,7 @@ xlate_generic_decap_action(struct xlate_ctx *ctx, "Dropping packet as the decap() does not support " "packet type (%d,0x%x)", pt_ns(flow->packet_type), pt_ns_type(flow->packet_type)); - ctx->error = 1; + ctx->error = XLATE_UNSUPPORTED_PACKET_TYPE; return false; } } diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h index a299d109f..39542de2b 100644 --- a/ofproto/ofproto-dpif-xlate.h +++ b/ofproto/ofproto-dpif-xlate.h @@ -211,6 +211,7 @@ enum xlate_error { XLATE_RECIRCULATION_CONFLICT, XLATE_TOO_MANY_MPLS_LABELS, XLATE_INVALID_TUNNEL_METADATA, + XLATE_UNSUPPORTED_PACKET_TYPE, }; const char *xlate_strerror(enum xlate_error error);