From patchwork Mon Oct 21 17:19:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1180744 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="ceBdWpJo"; 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 46xk073yBsz9sNw for ; Tue, 22 Oct 2019 04:19:35 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B9472B79; Mon, 21 Oct 2019 17:19:32 +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 43CCCB6C for ; Mon, 21 Oct 2019 17:19:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 25C6F87E for ; Mon, 21 Oct 2019 17:19:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571678368; 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; bh=DShqNWdVIbgITzXF8ohdK0dAlZ0wUrBy1Ug9bNKhSYo=; b=ceBdWpJoLYgojJBRRISXLKhd6NhEPB/r6n5SkTpS4Yl3QCey+w/6o25G8OssMvuD8b3YRe 3g4hCS4BnyU4GdznKwDACOKB9qpU0S1SwSeTqsdNbW5OwT8KNTc5DzoowdwEAb+X6L3JZq SbaMfWUB/kaGTFXVxurqeLywtInhVWU= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-100-NG747utYMuCWLgLKoV8T9g-1; Mon, 21 Oct 2019 13:19:26 -0400 Received: by mail-wm1-f72.google.com with SMTP id a81so2686521wma.4 for ; Mon, 21 Oct 2019 10:19:26 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=ZQ4ZgG9TZwaoH32cvIGrU1puQ+zxTQMSWsYhoWbFM94=; b=lfQH7bovJ+98fqNpWlMyPSkRLJXgytrTnqIf0j2wZBXRFCE6OgFq20PElo46wPI85Y PIJbr/NdkrsRK5V96Do1cRBgjW55EiLiaAj5eC64QwGEn855/+ZeS5eZW4VI021npUXi 4hGKwSINe6w+F/FC7yNTlGv/tgDsRy5moc1hQmmtrZdJDJBGwIB0uISLT6IM4ObX69jl Cpw4qnZEVzBZWSlNkgph+RkhOffj0gzzz3w3AQSQdx2BzCKFyDGJkNpBeuW+bTW8h2xv 7BlXftVDAzb98jQBPzpMf3eBHMTGXgm5v28U1yPIv5M+BiLXsriD+nddIw5OvHugEqVJ ensA== X-Gm-Message-State: APjAAAUWKDP7jyJURKuW/TUqD5YcRHmCMKA7zIJ5/grZK/H4zUJdiU2o txKGOkUxGNZ/sBhs1Hqxgl9V7kTFKCC6QiY/xMrA3B4mMbD4K540YpQRedng8fGr6ndKXETPieO KvwHYHshziGfG X-Received: by 2002:a5d:55c2:: with SMTP id i2mr21237308wrw.176.1571678365203; Mon, 21 Oct 2019 10:19:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqwn+hmNFID2QYON+fCZnmzYBRLH0NvpK4WHWp2htMPngrJs4EO/dokmj+LpS6VrVo7uojOB4Q== X-Received: by 2002:a5d:55c2:: with SMTP id i2mr21237285wrw.176.1571678364813; Mon, 21 Oct 2019 10:19:24 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id a9sm21227261wmf.14.2019.10.21.10.19.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 10:19:24 -0700 (PDT) From: Lorenzo Bianconi To: dev@openvswitch.org Date: Mon, 21 Oct 2019 19:19:15 +0200 Message-Id: X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-MC-Unique: NG747utYMuCWLgLKoV8T9g-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] Add DNSSL support to OVN 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 the possibility to specify a DNSSL option to Router Advertisement packets. DNS Search list can be specified using 'dnssl' tag in the ipv6_ra_configs column of logical router port table Signed-off-by: Lorenzo Bianconi --- controller/pinctrl.c | 62 +++++++++++++++++++++++++++++++++++++++++++- northd/ovn-northd.c | 4 +++ ovn-nb.xml | 4 +++ tests/ovn.at | 30 ++++++++++++++------- 4 files changed, 89 insertions(+), 11 deletions(-) diff --git a/controller/pinctrl.c b/controller/pinctrl.c index 5bc4b35e7..b522e3359 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -2194,6 +2194,7 @@ struct ipv6_ra_config { struct lport_addresses prefixes; struct in6_addr rdnss; bool has_rdnss; + struct ds dnssl; }; struct ipv6_ra_state { @@ -2214,6 +2215,17 @@ struct nd_rdnss_opt { const ovs_be128 dns[0]; }; +/* DNSSL option RFC 6106 */ +#define ND_OPT_DNSSL 31 +#define ND_DNSSL_OPT_LEN 8 +struct ovs_nd_dnssl { + u_int8_t type; /* ND_OPT_DNSSL */ + u_int8_t len; /* >= 2 */ + ovs_be16 reserved; + ovs_be32 lifetime; + char dnssl[0]; +}; + static void init_ipv6_ras(void) { @@ -2225,6 +2237,7 @@ ipv6_ra_config_delete(struct ipv6_ra_config *config) { if (config) { destroy_lport_addresses(&config->prefixes); + ds_destroy(&config->dnssl); free(config); } } @@ -2263,6 +2276,7 @@ ipv6_ra_update_config(const struct sbrec_port_binding *pb) nd_ra_min_interval_default(config->max_interval)); 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); const char *address_mode = smap_get(&pb->options, "ipv6_ra_address_mode"); if (!address_mode) { @@ -2308,6 +2322,11 @@ ipv6_ra_update_config(const struct sbrec_port_binding *pb) } config->has_rdnss = !!rdnss; + const char *dnssl = smap_get(&pb->options, "ipv6_ra_dnssl"); + if (dnssl) { + ds_put_buffer(&config->dnssl, dnssl, strlen(dnssl)); + } + return config; fail: @@ -2366,6 +2385,44 @@ packet_put_ra_rdnss_opt(struct dp_packet *b, uint8_t num, prev_l4_size + size)); } +static void +packet_put_ra_dnssl_opt(struct dp_packet *b, ovs_be32 lifetime, + char *dnssl_list) +{ + char *t0, *r0 = dnssl_list, dnssl[255] = {}; + size_t prev_l4_size = dp_packet_l4_size(b); + struct ip6_hdr *nh = dp_packet_l3(b); + size_t size = 8; + int i = 0; + + while ((t0 = strtok_r(r0, ",", &r0))) { + char *t1, *r1 = t0; + + size += strlen(t0) + 2; + while ((t1 = strtok_r(r1, ".", &r1))) { + dnssl[i++] = strlen(t1); + memcpy(&dnssl[i], t1, strlen(t1)); + i += strlen(t1); + } + dnssl[i++] = 0; + } + size = ROUND_UP(size, 8); + nh->ip6_plen = htons(prev_l4_size + size); + + struct ovs_nd_dnssl *nd_dnssl = dp_packet_put_uninit(b, size); + nd_dnssl->type = ND_OPT_DNSSL; + nd_dnssl->len = size / 8; + nd_dnssl->reserved = 0; + nd_dnssl->lifetime = lifetime; + memcpy(&nd_dnssl->dnssl[0], dnssl, 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) @@ -2374,7 +2431,7 @@ ipv6_ra_send(struct rconn *swconn, struct ipv6_ra_state *ra) return ra->next_announce; } - uint64_t packet_stub[128 / 8]; + uint64_t packet_stub[512 / 8]; struct dp_packet packet; dp_packet_use_stub(&packet, packet_stub, sizeof packet_stub); compose_nd_ra(&packet, ra->config->eth_src, ra->config->eth_dst, @@ -2393,6 +2450,9 @@ ipv6_ra_send(struct rconn *swconn, struct ipv6_ra_state *ra) if (ra->config->has_rdnss) { packet_put_ra_rdnss_opt(&packet, 1, 0xffffffff, &ra->config->rdnss); } + if (ra->config->dnssl.length) { + packet_put_ra_dnssl_opt(&packet, 0xffffffff, ra->config->dnssl.string); + } uint64_t ofpacts_stub[4096 / 8]; struct ofpbuf ofpacts = OFPBUF_STUB_INITIALIZER(ofpacts_stub); diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index d1de36e08..dbb279052 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -6489,6 +6489,10 @@ copy_ra_to_sb(struct ovn_port *op, const char *address_mode) if (rdnss) { smap_add(&options, "ipv6_ra_rdnss", rdnss); } + const char *dnssl = smap_get(&op->nbrp->ipv6_ra_configs, "dnssl"); + if (dnssl) { + smap_add(&options, "ipv6_ra_dnssl", dnssl); + } smap_add(&options, "ipv6_ra_src_eth", op->lrp_networks.ea_s); diff --git a/ovn-nb.xml b/ovn-nb.xml index f1f9b969e..6f2e7dc72 100644 --- a/ovn-nb.xml +++ b/ovn-nb.xml @@ -1889,6 +1889,10 @@ IPv6 address of RDNSS server announced in RA packets + + + DNS Search List announced in RA packets + diff --git a/tests/ovn.at b/tests/ovn.at index 80d38ea4c..daf8335cf 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -12538,14 +12538,15 @@ construct_expected_ra() { local mtu=$1 local ra_mo=$2 local rdnss=$3 - local ra_prefix_la=$4 + local dnssl=$4 + local ra_prefix_la=$5 local slla=0101${src_mac} local mtu_opt="" if test $mtu != 0; then mtu_opt=05010000${mtu} fi - shift 4 + shift 5 local prefix="" while [[ $# -gt 0 ]] ; do @@ -12559,8 +12560,12 @@ construct_expected_ra() { if test $rdnss != 0; then rdnss_opt=19030000ffffffff${rdnss} fi + local dnssl_opt="" + if test $dnssl != 0; then + dnssl_opt=1f030000ffffffff${dnssl} + fi - local ra=ff${ra_mo}ffff0000000000000000${slla}${mtu_opt}${prefix}${rdnss_opt} + local ra=ff${ra_mo}ffff0000000000000000${slla}${mtu_opt}${prefix}${rdnss_opt}${dnssl_opt} local icmp=8600XXXX${ra} local ip_len=$(expr ${#icmp} / 2) @@ -12595,28 +12600,33 @@ ra_test() { } # Baseline test with no MTU -ra_test 0 00 0 c0 40 aef00000000000000000000000000000 +ra_test 0 00 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 c0 40 aef00000000000000000000000000000 +ra_test 000005dc 00 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 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 00 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 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 00 $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" +dnssl=02616102626202636300000000000000 +ra_test 000005dc 00 $dns_addr $dnssl c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 -# Test a different address mode now +## 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 80 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 80 $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 c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 +ra_test 000005dc 40 $dns_addr $dnssl c0 40 aef00000000000000000000000000000 30 fd0f0000000000000000000000000000 OVN_CLEANUP([hv1],[hv2]) AT_CLEANUP