From patchwork Mon Aug 6 18:04:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiuyu Xiao X-Patchwork-Id: 954123 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="JRn1hVct"; 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 41klvw1B7rz9rxx for ; Tue, 7 Aug 2018 04:06:36 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E6125CD4; Mon, 6 Aug 2018 18:05:09 +0000 (UTC) X-Original-To: ovs-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 2B871CD8 for ; Mon, 6 Aug 2018 18:05:08 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D21CB735 for ; Mon, 6 Aug 2018 18:05:07 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id y10-v6so7234797pfn.8 for ; Mon, 06 Aug 2018 11:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cQQ9s4z5DFdsnWgfilrxx2WTQnFxyAin2IzETYn9hKc=; b=JRn1hVct++ZzFzdADBibpacJKDG3b3I3UOtklyoKELo5qPngXZ/oDTDLBFwCSmbloV M9N0hzptJYL8zqyPCx9Sdr2/K9qbNQ1eYB5JsTj5eSOVqbyUeLiJLCf3PKxWD+GF08r1 bJOAfbR9KXT3KTqmbX4GjlHMs38c1J5cVNwB2bq6cgrT8RB4bA+gJYymzzvTu86a6bgv PRgHRhLVkobavLztK4C7kSa6XrodbAm/6WYSg4Yov9a6F+brmkTA9iecHltYqboOxgzo ab2UYafs6LMUCy/nWwZ9Q6vEmqYBCJqRBZzDmqf8CbFnSSNE3kTKIXyxTGJ/eW3BkCJY 0E3w== 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:in-reply-to :references; bh=cQQ9s4z5DFdsnWgfilrxx2WTQnFxyAin2IzETYn9hKc=; b=rCTmYW+5df4Rijanwakwoz28OLjac7F/fRoFdClqeJANo9WmuhqAKLBudbmhsV5pPM +bSLHcDK6KIGL9E+X+Ggle4mAvbXyeZf+KDt1KDnrJhj5ExSbY6tj5VNqvTFFwd0x3pC wbBSJpbH1+hvZJhdLaJVvoeQLcv17tTBk+KLJqvWcI/TyGnOcZQ7UUA2l4o9q642adwn /F3Wqhj4kS2hYAh+9UYRvKSy3Imsr3M1Mgj2BLF0wMZYVP0dfvcJTjpfo+FCh/Owxjgw u8VWHRZf7g6nSlk885w5dydQ6VKrfO19yJSitdD/KuV1QJUmwd3s+7iZw2p8j6Nrf7eT CWbQ== X-Gm-Message-State: AOUpUlE3oOxH44qTZBE11FsKjbE28tFlhnYuaL9rPhdkciDK80QzIhHs BhZHLFBdakKhsMlF4pj1UJhjehyq X-Google-Smtp-Source: AAOMgpe6Cu4qJhE+uBU0BVsNehu1t+eSYbqLlFv3EXrmuSzdd/+DvN38uDQ6sCny6awPI5iGCGXzPA== X-Received: by 2002:a63:214f:: with SMTP id s15-v6mr15466494pgm.267.1533578707304; Mon, 06 Aug 2018 11:05:07 -0700 (PDT) Received: from vm1.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id p64-v6sm23453965pfa.47.2018.08.06.11.05.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Aug 2018 11:05:06 -0700 (PDT) From: Qiuyu Xiao To: ovs-dev@openvswitch.org Date: Mon, 6 Aug 2018 11:04:33 -0700 Message-Id: <20180806180439.16559-4-qiuyu.xiao.qyx@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180806180439.16559-1-qiuyu.xiao.qyx@gmail.com> References: <20180806180439.16559-1-qiuyu.xiao.qyx@gmail.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 Subject: [ovs-dev] [PATCH v5 3/9] datapath: add transport ports in route lookup for stt 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 This patch adds transport ports information for route lookup so that IPsec can select stt tunnel traffic to do encryption. Signed-off-by: Qiuyu Xiao Reviewed-by: Greg Rose Tested-by: Greg Rose --- datapath/linux/compat/stt.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/datapath/linux/compat/stt.c b/datapath/linux/compat/stt.c index fc7e74f6d..8d16c1f2e 100644 --- a/datapath/linux/compat/stt.c +++ b/datapath/linux/compat/stt.c @@ -972,7 +972,8 @@ err_free_rt: static struct rtable *stt_get_rt(struct sk_buff *skb, struct net_device *dev, struct flowi4 *fl, - const struct ip_tunnel_key *key) + const struct ip_tunnel_key *key, + __be16 dport, __be16 sport) { struct net *net = dev_net(dev); @@ -983,6 +984,8 @@ static struct rtable *stt_get_rt(struct sk_buff *skb, fl->flowi4_tos = RT_TOS(key->tos); fl->flowi4_mark = skb->mark; fl->flowi4_proto = IPPROTO_TCP; + fl->fl4_dport = dport; + fl->fl4_sport = sport; return ip_route_output_key(net, fl); } @@ -1009,14 +1012,14 @@ netdev_tx_t ovs_stt_xmit(struct sk_buff *skb) tun_key = &tun_info->key; - rt = stt_get_rt(skb, dev, &fl, tun_key); + sport = udp_flow_src_port(net, skb, 1, USHRT_MAX, true); + rt = stt_get_rt(skb, dev, &fl, tun_key, dport, sport); if (IS_ERR(rt)) { err = PTR_ERR(rt); goto error; } df = tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0; - sport = udp_flow_src_port(net, skb, 1, USHRT_MAX, true); skb->ignore_df = 1; stt_xmit_skb(skb, rt, fl.saddr, tun_key->u.ipv4.dst, @@ -1818,20 +1821,22 @@ int ovs_stt_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb) struct stt_dev *stt_dev = netdev_priv(dev); struct net *net = stt_dev->net; __be16 dport = stt_dev->dst_port; + __be16 sport; struct flowi4 fl4; struct rtable *rt; if (ip_tunnel_info_af(info) != AF_INET) return -EINVAL; - rt = stt_get_rt(skb, dev, &fl4, &info->key); + sport = udp_flow_src_port(net, skb, 1, USHRT_MAX, true); + rt = stt_get_rt(skb, dev, &fl4, &info->key, dport, sport); if (IS_ERR(rt)) return PTR_ERR(rt); ip_rt_put(rt); info->key.u.ipv4.src = fl4.saddr; - info->key.tp_src = udp_flow_src_port(net, skb, 1, USHRT_MAX, true); + info->key.tp_src = sport; info->key.tp_dst = dport; return 0; }