From patchwork Thu Nov 14 11:38:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1194762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="BM/hxaGg"; 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 47DKJx1Rxhz9sNT for ; Thu, 14 Nov 2019 22:39:45 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E5D5FFB7; Thu, 14 Nov 2019 11:39:16 +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 03473F9C for ; Thu, 14 Nov 2019 11:39:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id D8A2482B for ; Thu, 14 Nov 2019 11:39:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573731551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kd2O2UoXy71QeMPVqB68yq1ZUKMzMlgVwsrnlBWyzOs=; b=BM/hxaGgcUEwt0jdfbo9p48+M8J87TciuDrw4Ao9GjyWBB7qgYZOpxev2uKtK1HuaI/ow8 b7XU4crqT27CYKuNCzfT+u0p+qIpC5bWXUDhSh3zytxGrtxDk3GLgau2s7T6pObaqkNPsc 0iPgZU94RerwRpAhwrOGrYRM925zthc= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-28-_9fMU3A3NfCUYAYMf5R0Cg-1; Thu, 14 Nov 2019 06:39:07 -0500 Received: by mail-wr1-f70.google.com with SMTP id y3so4221752wrm.12 for ; Thu, 14 Nov 2019 03:39:07 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=TwVbzt8Fd0xbEvTG8EzwvAm40YlrqYedWVQFb21zlcY=; b=OvZNlR7Sc7E/JKRPndAnuaa9EaPgFTtp7qa2cTEIVmtzZg4qMgwyKZ6nbLY0WuzvJX myScPcSybZk22v5RCuxg3zE4EB9EGjjdmfRS/ohRMLeC3xWEKcDeYkRqsEfRTE0qUYUe bGLENI7Bv6MGunydQ5rWDD5ssVNnbzMgmjtOf2Z3KIfYZvJOKTDDSOjszCPkERdHc4aY Ay3SQz2aada62hnojfG9MCMNLi71U9jUpSU+FAIwH2a3EqAWSeAXxYwAbE1haMobB9rM W1CkA8+EJzJ+OrzMGuXXkzIi5Bz96+6lotR5I/BrGM5nF11d3OtYSk7q6C3Czici3xfE OFNg== X-Gm-Message-State: APjAAAVWwBR2AJKPtD/sOo7k7PVln/22vkJ/te3XjLb0R4sfjcbyFiUn w2PG6Z7pjuHLMfKu6tWxv3fCT3u2oyWiqMSqahlerX0z3zavui2N15Td7jL8+ZrRn9fi195V68K y4/gOTgmZ/rLI X-Received: by 2002:a5d:5284:: with SMTP id c4mr7414617wrv.376.1573731546437; Thu, 14 Nov 2019 03:39:06 -0800 (PST) X-Google-Smtp-Source: APXvYqzulSMBk/+G/iSTqHSGw4/eimfaWIrYD2Cph0N1Uwxxm6XG67VNDquOMygYa/RHH3m4SDjyZQ== X-Received: by 2002:a5d:5284:: with SMTP id c4mr7414589wrv.376.1573731546103; Thu, 14 Nov 2019 03:39:06 -0800 (PST) Received: from localhost.localdomain.com ([77.139.212.74]) by smtp.gmail.com with ESMTPSA id x8sm6809342wrm.7.2019.11.14.03.39.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 03:39:05 -0800 (PST) From: Lorenzo Bianconi To: dev@openvswitch.org Date: Thu, 14 Nov 2019 13:38:48 +0200 Message-Id: <7f49dc40eaf25dcc35de5ee6208789eefb7f378a.1573731441.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 X-MC-Unique: _9fMU3A3NfCUYAYMf5R0Cg-1 X-Mimecast-Spam-Score: 0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 ovn 1/2] Add support to Default Router Preference (PRF) - RFC 4191 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 Introduce support for Default Router Preference (PRF) in IPv6 Router Advertisement according to RFC 4191 Signed-off-by: Lorenzo Bianconi --- controller/pinctrl.c | 20 +++++++++++++++++--- lib/ovn-l7.h | 4 ++++ northd/ovn-northd.c | 7 +++++++ ovn-nb.xml | 12 ++++++++++++ tests/ovn.at | 13 +++++++++---- 5 files changed, 49 insertions(+), 7 deletions(-) diff --git a/controller/pinctrl.c b/controller/pinctrl.c index a90ee73d6..b736b60ad 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -2263,10 +2263,10 @@ ipv6_ra_update_config(const struct sbrec_port_binding *pb) goto fail; } if (!strcmp(address_mode, "dhcpv6_stateless")) { - config->mo_flags = IPV6_ND_RA_FLAG_OTHER_ADDR_CONFIG; + config->mo_flags |= IPV6_ND_RA_FLAG_OTHER_ADDR_CONFIG; config->la_flags |= IPV6_ND_RA_OPT_PREFIX_AUTONOMOUS; } else if (!strcmp(address_mode, "dhcpv6_stateful")) { - config->mo_flags = IPV6_ND_RA_FLAG_MANAGED_ADDR_CONFIG; + config->mo_flags |= IPV6_ND_RA_FLAG_MANAGED_ADDR_CONFIG; } else if (!strcmp(address_mode, "slaac")) { config->la_flags |= IPV6_ND_RA_OPT_PREFIX_AUTONOMOUS; } else { @@ -2274,6 +2274,13 @@ ipv6_ra_update_config(const struct sbrec_port_binding *pb) goto fail; } + const char *prf = smap_get(&pb->options, "ipv6_ra_prf"); + if (!strcmp(prf, "HIGH")) { + config->mo_flags |= IPV6_ND_RA_OPT_PRF_HIGH; + } else if (!strcmp(prf, "LOW")) { + config->mo_flags |= IPV6_ND_RA_OPT_PRF_LOW; + } + const char *prefixes = smap_get(&pb->options, "ipv6_ra_prefixes"); if (prefixes && !extract_ip_addresses(prefixes, &config->prefixes)) { VLOG_WARN("Invalid IPv6 prefixes: %s", prefixes); @@ -2423,10 +2430,17 @@ ipv6_ra_send(struct rconn *swconn, struct ipv6_ra_state *ra) uint64_t packet_stub[128 / 8]; struct dp_packet packet; + uint16_t router_lt = IPV6_ND_RA_LIFETIME; + + if (!router_lt) { + /* Reset PRF to MEDIUM if router lifetime is not set */ + ra->config->mo_flags &= ~IPV6_ND_RA_OPT_PRF_LOW; + } + dp_packet_use_stub(&packet, packet_stub, sizeof packet_stub); compose_nd_ra(&packet, ra->config->eth_src, ra->config->eth_dst, &ra->config->ipv6_src, &ra->config->ipv6_dst, - 255, ra->config->mo_flags, htons(IPV6_ND_RA_LIFETIME), 0, 0, + 255, ra->config->mo_flags, htons(router_lt), 0, 0, ra->config->mtu); for (int i = 0; i < ra->config->prefixes.n_ipv6_addrs; i++) { diff --git a/lib/ovn-l7.h b/lib/ovn-l7.h index 5fc370bf5..fd898b0dc 100644 --- a/lib/ovn-l7.h +++ b/lib/ovn-l7.h @@ -287,6 +287,10 @@ nd_ra_opts_destroy(struct hmap *nd_ra_opts) #define IPV6_ND_RA_OPT_PREFIX_VALID_LIFETIME 0xffffffff #define IPV6_ND_RA_OPT_PREFIX_PREFERRED_LIFETIME 0xffffffff +#define IPV6_ND_RA_OPT_PRF_NORMAL 0x00 +#define IPV6_ND_RA_OPT_PRF_HIGH 0x08 +#define IPV6_ND_RA_OPT_PRF_LOW 0x18 + static inline void nd_ra_opts_init(struct hmap *nd_ra_opts) { diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index d6beb9768..a1eaa9071 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -6757,6 +6757,13 @@ copy_ra_to_sb(struct ovn_port *op, const char *address_mode) smap_add(&options, "ipv6_ra_src_eth", op->lrp_networks.ea_s); + const char *prf = smap_get(&op->nbrp->ipv6_ra_configs, "prf"); + if (!prf || (strcmp(prf, "HIGH") && strcmp(prf, "LOW"))) { + smap_add(&options, "ipv6_ra_prf", "MEDIUM"); + } else { + smap_add(&options, "ipv6_ra_prf", prf); + } + sbrec_port_binding_set_options(op->sb, &options); smap_destroy(&options); } diff --git a/ovn-nb.xml b/ovn-nb.xml index d8f3237fc..89d23ad7b 100644 --- a/ovn-nb.xml +++ b/ovn-nb.xml @@ -1859,6 +1859,18 @@ + + Default Router Preference (PRF) indicates whether to prefer this + router over other default routers (RFC 4191). + Possible values are: + +
    +
  • HIGH: mapped to 0x01 in RA PRF field
    • +
  • MEDIUM: mapped to 0x00 in RA PRF field
    • +
  • LOW: mapped to 0x11 in RA PRF field
    • +
+ + The recommended MTU for the link. Default is 0, which means no MTU Option will be included in RA packet replied by ovn-controller. diff --git a/tests/ovn.at b/tests/ovn.at index 4a10a11e9..85d539c78 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -11504,23 +11504,28 @@ ra_test 000005dc 00 0 0 c0 40 aef00000000000000000000000000000 ovn-nbctl --wait=hv set Logical_Router_port ro-sw networks='aef0\:\:1/64 fd0f\:\:1/48' ra_test 000005dc 00 0 0 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +# Test PRF for default gw +ovn-nbctl --wait=hv set Logical_Router_port ro-sw ipv6_ra_configs:prf="LOW" +ra_test 000005dc 18 0 0 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 + # Now test for RDNSS ovn-nbctl --wait=hv set Logical_Router_port ro-sw ipv6_ra_configs:rdnss='aef0::11' dns_addr=aef00000000000000000000000000011 -ra_test 000005dc 00 $dns_addr 0 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 18 $dns_addr 0 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 # Now test for DNSSL ovn-nbctl --wait=hv set Logical_Router_port ro-sw ipv6_ra_configs:dnssl="aa.bb.cc" +ovn-nbctl --wait=hv set Logical_Router_port ro-sw ipv6_ra_configs:prf="HIGH" dnssl=02616102626202636300000000000000 -ra_test 000005dc 00 $dns_addr $dnssl c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 08 $dns_addr $dnssl c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 ## Test a different address mode now ovn-nbctl --wait=hv set Logical_Router_Port ro-sw ipv6_ra_configs:address_mode=dhcpv6_stateful -ra_test 000005dc 80 $dns_addr $dnssl 80 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 88 $dns_addr $dnssl 80 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 # And the other address mode ovn-nbctl --wait=hv set Logical_Router_Port ro-sw ipv6_ra_configs:address_mode=dhcpv6_stateless -ra_test 000005dc 40 $dns_addr $dnssl c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 48 $dns_addr $dnssl c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 OVN_CLEANUP([hv1],[hv2]) AT_CLEANUP From patchwork Thu Nov 14 11:38:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1194763 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="dVi14dlg"; 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 47DKKx3xcZz9sNT for ; Thu, 14 Nov 2019 22:40:37 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 9F040FC1; Thu, 14 Nov 2019 11:39:18 +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 A3831F9C for ; Thu, 14 Nov 2019 11:39:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 1CC41712 for ; Thu, 14 Nov 2019 11:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573731553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2ze11ed3hLpb+iHcLP2kl+Bd0E94kZTq7v80FW1hllU=; b=dVi14dlg9hN8FbwNK44OcYoAjUNboo6mZHHFZ6e/XPhEtpu/kMCTBLO9y1mLnFlQPMth/R 0GABpMX5FdaS5ABLxfxOiN9FNfhD12Pw2b5PRsikCqhfAOdV57iqRg2/29ecI/Z+FMMDqV mki7yyz5c1yLbzwqVGLId3r03L/Bv5I= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-399-c0N75HxyN7KWgah_QW-wiQ-1; Thu, 14 Nov 2019 06:39:10 -0500 Received: by mail-wr1-f69.google.com with SMTP id m17so4208524wrb.20 for ; Thu, 14 Nov 2019 03:39:10 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z8dpgEDjHQrCmuXVae+J5WhSATK70r1AIe3E3apcveg=; b=CqLgRLGiKOpZ2jL8hZSBl+Dn6GHwn43cOIodmhoiX5aptYy8XmHlVleHQYiggx+PHX Fv+gWOsYsMd+jeHsWv46Mqh1SCRgsQhJKM+/aP9RJTnD1lSuJSxG9u/uh42ORN5ljnot 0KhLma/siy1o4pv4VGlk/QtZgGY6Lkw96kXXbemop03mYjSUacu9ViJ7KWZyUa40hKQ0 hinBXgI4awQ12f30/5UW6Wwfdn1E9nhMgU+XwaQISX7qVzzNF1zKCxZhoboKhEeObIlS arA/HG4fvMLImz9NEM2IiS9o7kZ2wivI7AeCFoXjEdt4CL7xhZIfIFAnFw+2+NsVEHlU NmEw== X-Gm-Message-State: APjAAAUI1y2Dz2hMsO3Rghn7QD9GsOTFi1cNVZNDRHUB2TVF1aIY0erK r82k05vAj/C+HxIoQ+6L6WrRnTDEX/Rpxz3S/YmrMHmjfLRkYW+hPqd/RW0heACV6b85L3o8oPu sxIOKJ0EX2/YQ X-Received: by 2002:adf:f80c:: with SMTP id s12mr7508962wrp.37.1573731549620; Thu, 14 Nov 2019 03:39:09 -0800 (PST) X-Google-Smtp-Source: APXvYqwCtLDOAALGTuG4CzmfQ4zVc458ad2VAEh/VJqL4cCu0n9qAUAxb0Sb6I75G77I/ofhuAZciw== X-Received: by 2002:adf:f80c:: with SMTP id s12mr7508900wrp.37.1573731548772; Thu, 14 Nov 2019 03:39:08 -0800 (PST) Received: from localhost.localdomain.com ([77.139.212.74]) by smtp.gmail.com with ESMTPSA id x8sm6809342wrm.7.2019.11.14.03.39.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 03:39:08 -0800 (PST) From: Lorenzo Bianconi To: dev@openvswitch.org Date: Thu, 14 Nov 2019 13:38:49 +0200 Message-Id: X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 X-MC-Unique: c0N75HxyN7KWgah_QW-wiQ-1 X-Mimecast-Spam-Score: 0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 ovn 2/2] Add support for Route Info Option in RA - RFC 4191 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 Introduce support for Route Info Option sent in Router Advertisement according to RFC 4191. Route Info Option are configured providing route_info in ipv6_ra_configs column of Logical_Router_Port table. route_info is a comma separated string where each field provides PRF and prefix for a given route (e.g: HIGH-aef1::11/48,LOW-aef2::11/96) Signed-off-by: Lorenzo Bianconi --- controller/pinctrl.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ lib/ovn-l7.h | 12 +++++++ northd/ovn-northd.c | 6 ++++ ovn-nb.xml | 14 ++++++++ tests/ovn.at | 32 ++++++++++++------ 5 files changed, 133 insertions(+), 11 deletions(-) diff --git a/controller/pinctrl.c b/controller/pinctrl.c index b736b60ad..51c7f8a36 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -2195,6 +2195,7 @@ struct ipv6_ra_config { struct in6_addr rdnss; bool has_rdnss; struct ds dnssl; + struct ds route_info; }; struct ipv6_ra_state { @@ -2217,6 +2218,7 @@ ipv6_ra_config_delete(struct ipv6_ra_config *config) if (config) { destroy_lport_addresses(&config->prefixes); ds_destroy(&config->dnssl); + ds_destroy(&config->route_info); free(config); } } @@ -2256,6 +2258,7 @@ ipv6_ra_update_config(const struct sbrec_port_binding *pb) config->mtu = smap_get_int(&pb->options, "ipv6_ra_mtu", ND_MTU_DEFAULT); config->la_flags = IPV6_ND_RA_OPT_PREFIX_ON_LINK; ds_init(&config->dnssl); + ds_init(&config->route_info); const char *address_mode = smap_get(&pb->options, "ipv6_ra_address_mode"); if (!address_mode) { @@ -2313,6 +2316,11 @@ ipv6_ra_update_config(const struct sbrec_port_binding *pb) ds_put_buffer(&config->dnssl, dnssl, strlen(dnssl)); } + const char *route_info = smap_get(&pb->options, "ipv6_ra_route_info"); + if (route_info) { + ds_put_buffer(&config->route_info, route_info, strlen(route_info)); + } + return config; fail: @@ -2420,6 +2428,74 @@ packet_put_ra_dnssl_opt(struct dp_packet *b, ovs_be32 lifetime, prev_l4_size + size)); } +static void +packet_put_ra_route_info_opt(struct dp_packet *b, ovs_be32 lifetime, + char *route_list) +{ + size_t prev_l4_size = dp_packet_l4_size(b); + struct ip6_hdr *nh = dp_packet_l3(b); + char *t0, *r0 = NULL; + size_t size = 0; + + for (t0 = strtok_r(route_list, ",", &r0); t0; + t0 = strtok_r(NULL, ",", &r0)) { + struct ovs_nd_route_info *nd_rinfo = + dp_packet_put_uninit(b, sizeof *nd_rinfo); + char *t1, *r1 = NULL; + int index; + + for (t1 = strtok_r(t0, "-", &r1), index = 0; t1; + t1 = strtok_r(NULL, "-", &r1), index++) { + + nd_rinfo->type = ND_OPT_ROUTE_INFO; + nd_rinfo->route_lifetime = lifetime; + + switch (index) { + case 0: + if (!strcmp(t1, "HIGH")) { + nd_rinfo->flags = IPV6_ND_RA_OPT_PRF_HIGH; + } else if (!strcmp(t1, "LOW")) { + nd_rinfo->flags = IPV6_ND_RA_OPT_PRF_LOW; + } else { + nd_rinfo->flags = IPV6_ND_RA_OPT_PRF_NORMAL; + } + break; + case 1: { + struct lport_addresses route; + uint8_t plen; + + if (!extract_ip_addresses(t1, &route)) { + return; + } + if (!route.n_ipv6_addrs) { + destroy_lport_addresses(&route); + return; + } + + nd_rinfo->prefix_len = route.ipv6_addrs->plen; + plen = DIV_ROUND_UP(nd_rinfo->prefix_len, 64); + nd_rinfo->len = 1 + plen; + dp_packet_put(b, &route.ipv6_addrs->network, plen * 8); + size += sizeof *nd_rinfo + plen * 8; + + destroy_lport_addresses(&route); + index = 0; + break; + } + default: + return; + } + } + } + + nh->ip6_plen = htons(prev_l4_size + size); + struct ovs_ra_msg *ra = dp_packet_l4(b); + ra->icmph.icmp6_cksum = 0; + uint32_t icmp_csum = packet_csum_pseudoheader6(dp_packet_l3(b)); + ra->icmph.icmp6_cksum = csum_finish(csum_continue(icmp_csum, ra, + prev_l4_size + size)); +} + /* Called with in the pinctrl_handler thread context. */ static long long int ipv6_ra_send(struct rconn *swconn, struct ipv6_ra_state *ra) @@ -2459,6 +2535,10 @@ ipv6_ra_send(struct rconn *swconn, struct ipv6_ra_state *ra) packet_put_ra_dnssl_opt(&packet, htonl(0xffffffff), ra->config->dnssl.string); } + if (ra->config->route_info.length) { + packet_put_ra_route_info_opt(&packet, htonl(0xffffffff), + ra->config->route_info.string); + } uint64_t ofpacts_stub[4096 / 8]; struct ofpbuf ofpacts = OFPBUF_STUB_INITIALIZER(ofpacts_stub); diff --git a/lib/ovn-l7.h b/lib/ovn-l7.h index fd898b0dc..ae6dbfdfb 100644 --- a/lib/ovn-l7.h +++ b/lib/ovn-l7.h @@ -242,6 +242,18 @@ struct ovs_nd_dnssl { }; BUILD_ASSERT_DECL(ND_DNSSL_OPT_LEN == sizeof(struct ovs_nd_dnssl)); +/* Route Information option RFC 4191 */ +#define ND_OPT_ROUTE_INFO 24 +#define ND_ROUTE_INFO_OPT_LEN 8 +struct ovs_nd_route_info { + u_int8_t type; /* ND_OPT_ROUTE_INFO */ + u_int8_t len; /* 1, 2 or 3 */ + u_int8_t prefix_len; + u_int8_t flags; + ovs_be32 route_lifetime; +}; +BUILD_ASSERT_DECL(ND_ROUTE_INFO_OPT_LEN == sizeof(struct ovs_nd_route_info)); + #define DHCPV6_DUID_LL 3 #define DHCPV6_HW_TYPE_ETH 1 diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index a1eaa9071..8785cbbf3 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -6764,6 +6764,12 @@ copy_ra_to_sb(struct ovn_port *op, const char *address_mode) smap_add(&options, "ipv6_ra_prf", prf); } + const char *route_info = smap_get(&op->nbrp->ipv6_ra_configs, + "route_info"); + if (route_info) { + smap_add(&options, "ipv6_ra_route_info", route_info); + } + sbrec_port_binding_set_options(op->sb, &options); smap_destroy(&options); } diff --git a/ovn-nb.xml b/ovn-nb.xml index 89d23ad7b..5f7ec76ee 100644 --- a/ovn-nb.xml +++ b/ovn-nb.xml @@ -1871,6 +1871,20 @@ + + Route Info is used to configure Route Info Option sent in Router + Advertisment according to RFC 4191. Route Info is a comma + separated string where each field provides PRF and prefix for a + given route (e.g: HIGH-aef1::11/48,LOW-aef2::11/96) + Possible PRF values are: + +
    +
  • HIGH: mapped to 0x01 in RA PRF field
    • +
  • MEDIUM: mapped to 0x00 in RA PRF field
    • +
  • LOW: mapped to 0x11 in RA PRF field
    • +
+ + The recommended MTU for the link. Default is 0, which means no MTU Option will be included in RA packet replied by ovn-controller. diff --git a/tests/ovn.at b/tests/ovn.at index 85d539c78..6c14a40b0 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -11433,14 +11433,15 @@ construct_expected_ra() { local ra_mo=$2 local rdnss=$3 local dnssl=$4 - local ra_prefix_la=$5 + local route_info=$5 + local ra_prefix_la=$6 local slla=0101${src_mac} local mtu_opt="" if test $mtu != 0; then mtu_opt=05010000${mtu} fi - shift 5 + shift 6 local prefix="" while [[ $# -gt 0 ]] ; do @@ -11458,8 +11459,12 @@ construct_expected_ra() { if test $dnssl != 0; then dnssl_opt=1f030000ffffffff${dnssl} fi + local route_info_opt="" + if test $route_info != 0; then + route_info_opt=${route_info} + fi - local ra=ff${ra_mo}ffff0000000000000000${slla}${mtu_opt}${prefix}${rdnss_opt}${dnssl_opt} + local ra=ff${ra_mo}ffff0000000000000000${slla}${mtu_opt}${prefix}${rdnss_opt}${dnssl_opt}${route_info_opt} local icmp=8600XXXX${ra} local ip_len=$(expr ${#icmp} / 2) @@ -11494,38 +11499,43 @@ ra_test() { } # Baseline test with no MTU -ra_test 0 00 0 0 c0 40 aef00000000000000000000000000000 +ra_test 0 00 0 0 0 c0 40 aef00000000000000000000000000000 # Now make sure an MTU option makes it ovn-nbctl --wait=hv set Logical_Router_Port ro-sw ipv6_ra_configs:mtu=1500 -ra_test 000005dc 00 0 0 c0 40 aef00000000000000000000000000000 +ra_test 000005dc 00 0 0 0 c0 40 aef00000000000000000000000000000 # Now test for multiple network prefixes ovn-nbctl --wait=hv set Logical_Router_port ro-sw networks='aef0\:\:1/64 fd0f\:\:1/48' -ra_test 000005dc 00 0 0 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 00 0 0 0 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 # Test PRF for default gw ovn-nbctl --wait=hv set Logical_Router_port ro-sw ipv6_ra_configs:prf="LOW" -ra_test 000005dc 18 0 0 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 18 0 0 0 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 # Now test for RDNSS ovn-nbctl --wait=hv set Logical_Router_port ro-sw ipv6_ra_configs:rdnss='aef0::11' dns_addr=aef00000000000000000000000000011 -ra_test 000005dc 18 $dns_addr 0 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 18 $dns_addr 0 0 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 # Now test for DNSSL ovn-nbctl --wait=hv set Logical_Router_port ro-sw ipv6_ra_configs:dnssl="aa.bb.cc" ovn-nbctl --wait=hv set Logical_Router_port ro-sw ipv6_ra_configs:prf="HIGH" dnssl=02616102626202636300000000000000 -ra_test 000005dc 08 $dns_addr $dnssl c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 08 $dns_addr $dnssl 0 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 + +# Now test Route Info option +ovn-nbctl --wait=hv set Logical_Router_port ro-sw ipv6_ra_configs:route_info="HIGH-aef1::11/48,LOW-aef2::11/96" +route_info=18023008ffffffffaef100000000000018036018ffffffffaef20000000000000000000000000000 +ra_test 000005dc 08 $dns_addr $dnssl $route_info c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 ## Test a different address mode now ovn-nbctl --wait=hv set Logical_Router_Port ro-sw ipv6_ra_configs:address_mode=dhcpv6_stateful -ra_test 000005dc 88 $dns_addr $dnssl 80 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 88 $dns_addr $dnssl $route_info 80 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 # And the other address mode ovn-nbctl --wait=hv set Logical_Router_Port ro-sw ipv6_ra_configs:address_mode=dhcpv6_stateless -ra_test 000005dc 48 $dns_addr $dnssl c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 48 $dns_addr $dnssl $route_info c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 OVN_CLEANUP([hv1],[hv2]) AT_CLEANUP