From patchwork Thu Mar 1 01:43:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 879520 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; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="T3F2ruFc"; 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 3zsFbD70fVz9s1q for ; Thu, 1 Mar 2018 12:44:08 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E370011C0; Thu, 1 Mar 2018 01:44:05 +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 293AD11BE for ; Thu, 1 Mar 2018 01:44:05 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 37BE7110 for ; Thu, 1 Mar 2018 01:44:04 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id y26so1700187pgv.4 for ; Wed, 28 Feb 2018 17:44:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=1CrJOty17w4vaoB7ruyliBVdeDNZbJtRGXLSfsK9mtY=; b=T3F2ruFc/GXbPqXoYrVDvxdXUs3U33+GaiYUB91tIQph+67SpWCVfOBcHEAL3U9a4K gGE8kldq0maQbamNToxqx3H5dQWkF9KHibINS3D5uG+/9ZFY3j9iU5iBRJDdIqGgkMbY A+NAO/ZHaaEvpWmMlIMj6Y//tOl99zCN2WZJHe41o78T49+bdo69RQU/YGJzB5yfQJPc swzrLpci5C0Vc4h6SUdYAMpc15fNfUbp+8RAX+QRLShY0mJ0qwapN6tFRj+wxd1wtO8X ve+pFGRYDmB9IYKJVue7ivpNB9kYNkyq/9dEwQECDUOeV4uKM6MORJCd2k7aRES5Mj9r OjUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=1CrJOty17w4vaoB7ruyliBVdeDNZbJtRGXLSfsK9mtY=; b=tPZa1SYmBcF+1yujV3QXvVdQYXfsBrTzn06i4qKyw9YWsx887J+ned0HaB6iqnV6Wj FD/OkXA5936oPm3yhms903fV+9M6VYLajOwQjozeAaZGx/6OchU+dVdq6/edejcBEWJ7 1lYtF7cDgx2MWuKDHwApMeeCb/a1WiRukKcJH3adydWGkVcFAkUFRTkknx+jl8cpvKW1 WCybEonSXJYFZLQmJK7xC/qQTQOP3bTk010RzhqJtB03SngGlHBXp8Urw0KL4zpoQ1RW ZBFWcaMIO4VvV5n47FEQV7NqkcXqVmMaL3aZ/lnpETNOE+JN5weylZfXIblqpksAtSD3 ylzg== X-Gm-Message-State: APf1xPCwTg9oz++fr9TMZ2sqoI7mGIRkKWizYJLlMETW6OSjnns+ky3s kvHJG6X8G46V+IglL6Psc8F+WENj X-Google-Smtp-Source: AG47ELs/smzlmA/MniQu2x8Q5+Cl0Ddrmgz63Dg8y2JIFK7kJJyI15PSYzRn00jzXXO2/nv+LWa+Jw== X-Received: by 10.99.168.8 with SMTP id o8mr143310pgf.246.1519868643501; Wed, 28 Feb 2018 17:44:03 -0800 (PST) Received: from sc9-mailhost2.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id v12sm6579547pfd.141.2018.02.28.17.44.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Feb 2018 17:44:02 -0800 (PST) From: William Tu To: dev@openvswitch.org Date: Wed, 28 Feb 2018 17:43:35 -0800 Message-Id: <1519868616-82421-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 1/2] netdev-native-tnl: refactor the tunnel push header. 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: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org The patch adds additional 'struct netdev *' to the native tunnel's push_header() interface. This is used for later GRE sequence number support. Signed-off-by: William Tu --- lib/netdev-native-tnl.c | 6 ++++-- lib/netdev-native-tnl.h | 6 ++++-- lib/netdev-provider.h | 3 ++- lib/netdev.c | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index fb5eab033758..805b12bf4a16 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -215,7 +215,8 @@ udp_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl, void -netdev_tnl_push_udp_header(struct dp_packet *packet, +netdev_tnl_push_udp_header(const struct netdev *netdev OVS_UNUSED, + struct dp_packet *packet, const struct ovs_action_push_tnl *data) { struct udp_header *udp; @@ -435,7 +436,8 @@ err: } void -netdev_gre_push_header(struct dp_packet *packet, +netdev_gre_push_header(const struct netdev *netdev OVS_UNUSED, + struct dp_packet *packet, const struct ovs_action_push_tnl *data) { struct gre_base_hdr *greh; diff --git a/lib/netdev-native-tnl.h b/lib/netdev-native-tnl.h index a912ce916dfc..5012b2dbac9a 100644 --- a/lib/netdev-native-tnl.h +++ b/lib/netdev-native-tnl.h @@ -34,13 +34,15 @@ netdev_gre_build_header(const struct netdev *netdev, const struct netdev_tnl_build_header_params *params); void -netdev_gre_push_header(struct dp_packet *packet, +netdev_gre_push_header(const struct netdev *netdev, + struct dp_packet *packet, const struct ovs_action_push_tnl *data); struct dp_packet * netdev_gre_pop_header(struct dp_packet *packet); void -netdev_tnl_push_udp_header(struct dp_packet *packet, +netdev_tnl_push_udp_header(const struct netdev *netdev, + struct dp_packet *packet, const struct ovs_action_push_tnl *data); int netdev_geneve_build_header(const struct netdev *netdev, diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h index 25bd671c1382..e63257107ff4 100644 --- a/lib/netdev-provider.h +++ b/lib/netdev-provider.h @@ -314,7 +314,8 @@ struct netdev_class { * flow. Push header is called for packet to build header specific to * a packet on actual transmit. It uses partial header build by * build_header() which is passed as data. */ - void (*push_header)(struct dp_packet *packet, + void (*push_header)(const struct netdev *, + struct dp_packet *packet, const struct ovs_action_push_tnl *data); /* Pop tunnel header from packet, build tunnel metadata and resize packet diff --git a/lib/netdev.c b/lib/netdev.c index 5a97ce53eb7a..1a23a170dcd5 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -855,7 +855,7 @@ netdev_push_header(const struct netdev *netdev, { struct dp_packet *packet; DP_PACKET_BATCH_FOR_EACH (i, packet, batch) { - netdev->netdev_class->push_header(packet, data); + netdev->netdev_class->push_header(netdev, packet, data); pkt_metadata_init(&packet->md, data->out_port); }