From patchwork Thu Jan 25 21:20:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 866028 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="e1uK7z6I"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zSFLd4GTbz9s7F for ; Fri, 26 Jan 2018 08:20:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751455AbeAYVUX (ORCPT ); Thu, 25 Jan 2018 16:20:23 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34765 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751204AbeAYVUW (ORCPT ); Thu, 25 Jan 2018 16:20:22 -0500 Received: by mail-pf0-f196.google.com with SMTP id e76so6735642pfk.1 for ; Thu, 25 Jan 2018 13:20:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=6jIN6yfLSz/jNipRVB/BTPKvn02kgCpZmvFrXysirsA=; b=e1uK7z6IOIKvK11DNWsYmBedE4EaY+kExZ1gxfHMgETwwkkeH0o1I+jZfylqJDtCgV pvY4G6ync1avktLM6NZdOvRRdIc2gwOjBxcyakBMbFyFBEV2Tn8xdmrQyuqE5Eu7oLPG hChas9269EzTPu4j4E6z5kQvkymh3j/18k1BaI5HZtth3+c+1NPYqZ6gL42oiL3eDvA4 OaOxVy3Z3pl6JsxHBt4mUUUkptvd1bWOl9KCY8cA5+gp+THhj4PY3XVrgx+Ih9OGk34i 4I64bTNyVoSJWM8Dyb+3jj1N5Vx9SKZ2Kl9UeL5cY43JwVYu9zspI9xqyWN5gOh01fCN TM1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6jIN6yfLSz/jNipRVB/BTPKvn02kgCpZmvFrXysirsA=; b=H2lTZYBwRlO5l3MIilXqzyZL2QZNaciRHaDzfoN8rjM8kOw7+OMIuB7bNrNgxpoMWh FwWG0E7Qc6NvY9xWL4YhzOJ6sT5uKJqMtpq6Jnkzf4qZ2yky6r3CGdQclwr5j+9tZHz/ AbEnqtNvkEFxhUuQIiLo0VVERUIu5FGCPrXIlzLmlkV6XkTLbQsFswqCtn/uuEzT6Yiq Nz6pNx8e//1HpdmEspEIX39qooqmfJzBQ9ho4R6aYwzg/khFXQ7IeacpFSMawTJ1QD/W Z8wbIIzDzExAwPfdnrNRqO+Q4/C9Ui+Yo7UJzG2A1diJm9y7lX8ZNfEYAeoMzHLC4r9+ mUSg== X-Gm-Message-State: AKwxytcnKhms9mpWLaVOlIXsp5coSypJ7/ezS1AVtd0ZrjstauD9BOjN JJDIUR240jhZMeqVLD4xz2dGvT/o X-Google-Smtp-Source: AH8x227akVRAR04Z0s0JRMwroagPbhrSBFgZoeT8iAfg4y1y1MJ9ZmE9ReAz7wlb9/MoXDAr3kefqg== X-Received: by 10.98.26.143 with SMTP id a137mr17519612pfa.100.1516915221508; Thu, 25 Jan 2018 13:20:21 -0800 (PST) Received: from sc9-mailhost2.vmware.com ([24.5.191.4]) by smtp.gmail.com with ESMTPSA id t8sm5881980pgr.21.2018.01.25.13.20.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 13:20:20 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Cc: pshelar@ovn.org Subject: [PATCHv6 net-next 0/3] net: erspan: add support for openvswitch Date: Thu, 25 Jan 2018 13:20:08 -0800 Message-Id: <1516915211-5869-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The first patch refactors the erspan header definitions. Originally, the erspan fields are defined as a group into a __be16 field, and use mask and offset to access each field. This is more costly due to calling ntohs/htons and error-prone. The first patch changes it to use bitfields. The second patch creates erspan.h in UAPI and move the definition 'struct erspan_metadata' to it for later openvswitch to use. The final patch introduces the new OVS tunnel key attribute, OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS, to program both v1 and v2 erspan tunnel for openvswitch. William Tu (3): net: erspan: use bitfield instead of mask and offset net: erspan: create erspan metadata uapi header openvswitch: add erspan version I and II support include/net/erspan.h | 123 +++++++++++++++++++++++++-------------- include/uapi/linux/erspan.h | 52 +++++++++++++++++ include/uapi/linux/openvswitch.h | 1 + net/ipv4/ip_gre.c | 38 +++++------- net/ipv6/ip6_gre.c | 36 +++++------- net/openvswitch/flow_netlink.c | 52 ++++++++++++++++- 6 files changed, 209 insertions(+), 93 deletions(-) create mode 100644 include/uapi/linux/erspan.h --- v5->v6 move field 'version' to the begining of the struct for easy expansion later. remove redundant erspan validation function create erspan.h in uapi v4->v5 rather than passing individual members of erspan_metadata, just pass the whole binary structure between kernel and userspace, suggested by Pravin. v3->v4 change from be32 to u32 for OVS_ERSPAN_OPT_IDX, suggested by Jiri Benc. v2->v3 revert the "openvswitch: Add erspan tunnel support." commit ceaa001a170e. redesign the OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS as nested attribute v1->v2 Fix compatibility issue suggested by Pravin.