From patchwork Mon Apr 16 07:35:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wenxu X-Patchwork-Id: 898493 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=ucloud.cn 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 40PgLN0Mjnz9s0b for ; Mon, 16 Apr 2018 17:41:31 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 5A8FAD9C; Mon, 16 Apr 2018 07:41:29 +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 AAFE1D61 for ; Mon, 16 Apr 2018 07:41:27 +0000 (UTC) X-Greylist: delayed 00:05:23 by SQLgrey-1.7.6 Received: from m6561.mail.qiye.163.com (m6561.mail.qiye.163.com [123.126.65.61]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 8F041466 for ; Mon, 16 Apr 2018 07:41:24 +0000 (UTC) Received: from localhost.localdomain (unknown [123.59.132.129]) by smtp11 (Coremail) with SMTP id WdOowAC3DeheUtRad0mKAA--.127S2; Mon, 16 Apr 2018 15:35:58 +0800 (CST) From: wenxu@ucloud.cn To: dev@openvswitch.org Date: Mon, 16 Apr 2018 15:35:57 +0800 Message-Id: <1523864157-23094-1-git-send-email-wenxu@ucloud.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: WdOowAC3DeheUtRad0mKAA--.127S2 X-Coremail-Antispam: 1Uf129KBjvJXoW3GFykury3ZrW7ZFyUZr15twb_yoW3Gr48pF 4Dt343Jr4rtF1aqr17tw42v34aq3yvkanrKryxGw4ayFsrX34qqFWDKF109F1rtryrCw4a qFn8trWUCFs3uaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UvXd8UUUUU= X-Originating-IP: [123.59.132.129] X-CM-SenderInfo: xzhq53w6xfz0lxgou0/1tbidB4qKFn5diKH3gAAsF X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: frank.zeng@ucloud.cn Subject: [ovs-dev] [PATCH] ofproto-dpif-xlate: makes OVS native tunneling honor tunnel-specified source addresses 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 From: wenxu It makes OVS native tunneling honor tunnel-specified source addresses, in the same way that Linux kernel tunneling honors them. This patch made valid tun_src specified by flow-action can be used for tunnel_src of packet. add a "local" property for a route entry. Like the kernel space when lookup the route, if there are tun_src specified by flow-action or port options. Check the tun_src wheather is a local address, then lookup the route. Signed-off-by: wenxu --- lib/ovs-router.c | 40 +++++++++++++++++++++++++++++++++------- lib/ovs-router.h | 2 +- lib/route-table.c | 11 ++++++++++- ofproto/ofproto-dpif-sflow.c | 2 +- ofproto/ofproto-dpif-xlate.c | 4 ++++ 5 files changed, 49 insertions(+), 10 deletions(-) diff --git a/lib/ovs-router.c b/lib/ovs-router.c index ad8bd62..3129359 100644 --- a/lib/ovs-router.c +++ b/lib/ovs-router.c @@ -66,6 +66,7 @@ struct ovs_router_entry { struct in6_addr src_addr; uint8_t plen; uint8_t priority; + bool local; uint32_t mark; }; @@ -110,13 +111,28 @@ ovs_router_lookup(uint32_t mark, const struct in6_addr *ip6_dst, const struct cls_rule *cr; struct flow flow = {.ipv6_dst = *ip6_dst, .pkt_mark = mark}; + if (src && ipv6_addr_is_set(src)) { + const struct cls_rule *cr_src; + struct flow flow_src = {.ipv6_dst = *src, .pkt_mark = mark}; + + cr_src = classifier_lookup(&cls, OVS_VERSION_MAX, &flow_src, NULL); + if (cr_src) { + struct ovs_router_entry *p_src = ovs_router_entry_cast(cr_src); + if (p_src->local != true) { + return false; + } + } else { + return false; + } + } + cr = classifier_lookup(&cls, OVS_VERSION_MAX, &flow, NULL); if (cr) { struct ovs_router_entry *p = ovs_router_entry_cast(cr); ovs_strlcpy(output_bridge, p->output_bridge, IFNAMSIZ); *gw = p->gw; - if (src) { + if (src && !ipv6_addr_is_set(src)) { *src = p->src_addr; } return true; @@ -197,7 +213,7 @@ out: } static int -ovs_router_insert__(uint32_t mark, uint8_t priority, +ovs_router_insert__(uint32_t mark, uint8_t priority, bool local, const struct in6_addr *ip6_dst, uint8_t plen, const char output_bridge[], const struct in6_addr *gw) @@ -217,6 +233,7 @@ ovs_router_insert__(uint32_t mark, uint8_t priority, p->mark = mark; p->nw_addr = match.flow.ipv6_dst; p->plen = plen; + p->local = local; p->priority = priority; err = get_src_addr(ip6_dst, output_bridge, &p->src_addr); if (err && ipv6_addr_is_set(gw)) { @@ -249,10 +266,11 @@ ovs_router_insert__(uint32_t mark, uint8_t priority, void ovs_router_insert(uint32_t mark, const struct in6_addr *ip_dst, uint8_t plen, - const char output_bridge[], const struct in6_addr *gw) + bool local, const char output_bridge[], + const struct in6_addr *gw) { if (use_system_routing_table) { - ovs_router_insert__(mark, plen, ip_dst, plen, output_bridge, gw); + ovs_router_insert__(mark, plen, local, ip_dst, plen, output_bridge, gw); } } @@ -360,7 +378,7 @@ ovs_router_add(struct unixctl_conn *conn, int argc, } } - err = ovs_router_insert__(mark, plen + 32, &ip6, plen, argv[2], &gw6); + err = ovs_router_insert__(mark, plen + 32, false, &ip6, plen, argv[2], &gw6); if (err) { unixctl_command_reply_error(conn, "Error while inserting route."); } else { @@ -417,7 +435,12 @@ ovs_router_show(struct unixctl_conn *conn, int argc OVS_UNUSED, ipv6_format_mapped(&rt->nw_addr, &ds); plen = rt->plen; if (IN6_IS_ADDR_V4MAPPED(&rt->nw_addr)) { - plen -= 96; + uint8_t plen_off = 96; + + if (rt->local == true) { + plen_off += 64; + } + plen -= plen_off; } ds_put_format(&ds, "/%"PRIu8, plen); if (rt->mark) { @@ -431,6 +454,9 @@ ovs_router_show(struct unixctl_conn *conn, int argc OVS_UNUSED, } ds_put_format(&ds, " SRC "); ipv6_format_mapped(&rt->src_addr, &ds); + if (rt->local) { + ds_put_format(&ds, " local"); + } ds_put_format(&ds, "\n"); } unixctl_command_reply(conn, ds_cstr(&ds)); @@ -441,7 +467,7 @@ static void ovs_router_lookup_cmd(struct unixctl_conn *conn, int argc, const char *argv[], void *aux OVS_UNUSED) { - struct in6_addr gw, src; + struct in6_addr gw, src = in6addr_any; char iface[IFNAMSIZ]; struct in6_addr ip6; unsigned int plen; diff --git a/lib/ovs-router.h b/lib/ovs-router.h index f65d652..34ea163 100644 --- a/lib/ovs-router.h +++ b/lib/ovs-router.h @@ -31,7 +31,7 @@ bool ovs_router_lookup(uint32_t mark, const struct in6_addr *ip_dst, struct in6_addr *src, struct in6_addr *gw); void ovs_router_init(void); void ovs_router_insert(uint32_t mark, const struct in6_addr *ip_dst, - uint8_t plen, + uint8_t plen, bool local, const char output_bridge[], const struct in6_addr *gw); void ovs_router_flush(void); diff --git a/lib/route-table.c b/lib/route-table.c index 2ee45e5..5c789fd 100644 --- a/lib/route-table.c +++ b/lib/route-table.c @@ -47,6 +47,7 @@ VLOG_DEFINE_THIS_MODULE(route_table); struct route_data { /* Copied from struct rtmsg. */ unsigned char rtm_dst_len; + bool local; /* Extracted from Netlink attributes. */ struct in6_addr rta_dst; /* 0 if missing. */ @@ -229,6 +230,7 @@ route_table_parse(struct ofpbuf *buf, struct route_table_msg *change) if (parsed) { const struct nlmsghdr *nlmsg; int rta_oif; /* Output interface index. */ + uint8_t dst_len_off = 96; nlmsg = buf->data; @@ -245,6 +247,13 @@ route_table_parse(struct ofpbuf *buf, struct route_table_msg *change) } change->nlmsg_type = nlmsg->nlmsg_type; change->rd.rtm_dst_len = rtm->rtm_dst_len + (ipv4 ? 96 : 0); + if (rtm->rtm_type == RTN_LOCAL) { + dst_len_off += 64; + change->rd.local = true; + } else { + change->rd.local = false; + } + change->rd.rtm_dst_len = rtm->rtm_dst_len + (ipv4 ? dst_len_off : 0); if (attrs[RTA_OIF]) { rta_oif = nl_attr_get_u32(attrs[RTA_OIF]); @@ -307,7 +316,7 @@ route_table_handle_msg(const struct route_table_msg *change) const struct route_data *rd = &change->rd; ovs_router_insert(rd->mark, &rd->rta_dst, rd->rtm_dst_len, - rd->ifname, &rd->rta_gw); + rd->local, rd->ifname, &rd->rta_gw); } } diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c index 5d8c0e1..dbf2c02 100644 --- a/ofproto/ofproto-dpif-sflow.c +++ b/ofproto/ofproto-dpif-sflow.c @@ -468,7 +468,7 @@ sflow_choose_agent_address(const char *agent_device, if (inet_parse_active(target, SFL_DEFAULT_COLLECTOR_PORT, &sa.ss) && sa.ss.ss_family == AF_INET) { - struct in6_addr addr6, src, gw; + struct in6_addr addr6, gw, src = in6addr_any;; in6_addr_set_mapped_ipv4(&addr6, sa.sin.sin_addr.s_addr); /* sFlow only supports target in default routing table with diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index c8baba1..4f8ffbb 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -3320,6 +3320,10 @@ native_tunnel_output(struct xlate_ctx *ctx, const struct xport *xport, /* Backup flow & base_flow data. */ memcpy(&old_base_flow, &ctx->base_flow, sizeof old_base_flow); memcpy(&old_flow, &ctx->xin->flow, sizeof old_flow); + + if (flow->tunnel.ip_src) { + in6_addr_set_mapped_ipv4(&s_ip6, flow->tunnel.ip_src); + } err = tnl_route_lookup_flow(ctx, flow, &d_ip6, &s_ip6, &out_dev); if (err) {