From patchwork Tue Jul 31 21:08:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiuyu Xiao X-Patchwork-Id: 951828 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="CdTW9w7n"; 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 41g8Jt5Q4cz9s8T for ; Wed, 1 Aug 2018 07:12:14 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E81C61036; Tue, 31 Jul 2018 21:09:36 +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 37C77FEB for ; Tue, 31 Jul 2018 21:09:35 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com [209.85.160.67]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 6060E7BB for ; Tue, 31 Jul 2018 21:09:32 +0000 (UTC) Received: by mail-pl0-f67.google.com with SMTP id z7-v6so7696573plo.9 for ; Tue, 31 Jul 2018 14:09:32 -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=CdTW9w7nwH8ufilGxvk8c5rO/jwsHodv78W94+KZ1EXNNP6kqymLY+nWY5fCmFfmG8 P4QVWABndVBt7BQRIevWosg/GbOO39ynggXwtQZLtNmhfKhpacziSv+2ndNppt6f5KWF gYar31qu2sneZEo2go49/VBV2I8EXsVxhPRmzNCab70KfrPwxowUfZfA1FCuKhT6TA2Q r47/n6o46PKrI1bLanGosz6Ilx0p6VTfDmvvqkX3Ri4cdDbAr094sONYtx5Yhd61nukq w9iXiYxV7iSmx55gFgeF7l2vwwBa6MltgxLkcapnhONzligj10fZCkk2DwFEhZVYuTMP pPXA== 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=rdbRN2E3/8Plz871qY07WtX1yl2QIx/WwAdp6F7hqewibWr/K9ULOWc+pVjLkb+WTb mF/iF8Rd5z5sxpLUz1ibNzGe06w17QS10Ym9H/4NxWq5MY5W6FL1zOx6d/5NrAJg+IH3 MasaLefhYAgzVL5V+nMrO6n+QSTo18q5qjdTI+ZXmv+ZQ1eNyLP+B7Phe6qRJRUrQbj5 XKCGKby9E8hpAQQtoDm7Oei8Av/IWqNhIeUb76meWW8GPs68HMHL+BE4u76YhQjR1Swm dHLgampFtuEDsxFmSu4W2j8tiF0wAqrSj9bnLH4kOMXQtjyHHuTr5UefiivBFZVTjePC m5gQ== X-Gm-Message-State: AOUpUlFzvhY0yH0+1tnH59+eYzXbO70k8o28NsE9vr8UNRpyWd9L6uJo FXVGKfCpGM9UiY0dRC04y3hbY6RF X-Google-Smtp-Source: AAOMgpc3pTUoYvbxIqziLvIZzuUVE6LeqccF3teOThl+nRzphEi344xjWujv3rghGFgCUThdVEkcow== X-Received: by 2002:a17:902:a989:: with SMTP id bh9-v6mr22244938plb.245.1533071371447; Tue, 31 Jul 2018 14:09:31 -0700 (PDT) Received: from vm1.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id s66-v6sm40894996pfe.53.2018.07.31.14.09.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Jul 2018 14:09:31 -0700 (PDT) From: Qiuyu Xiao To: ovs-dev@openvswitch.org Date: Tue, 31 Jul 2018 14:08:48 -0700 Message-Id: <20180731210854.31682-4-qiuyu.xiao.qyx@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180731210854.31682-1-qiuyu.xiao.qyx@gmail.com> References: <20180731210854.31682-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 v4 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; }