From patchwork Wed Sep 5 05:14:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrell Ball X-Patchwork-Id: 966216 X-Patchwork-Delegate: jpettit@nicira.com 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="WqoyR8Ni"; 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 424sMx0kkXz9s3Z for ; Wed, 5 Sep 2018 15:15:08 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 7BCC7C23; Wed, 5 Sep 2018 05:15:05 +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 3E0A3AD7 for ; Wed, 5 Sep 2018 05:15:04 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id E53EE8B for ; Wed, 5 Sep 2018 05:15:03 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id v66-v6so2791821pgb.10 for ; Tue, 04 Sep 2018 22:15:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=DKHfoWX86UC8tCpmO9UcVoZlKpuSu8oXTkyHvGbgRGs=; b=WqoyR8Niawd6KC9YoMmSnUEvX1p1GrWTBOfqdtWCDBct+ykpCerrJhYtM+tBUMXDCB POqNuzhJoXm+MQj6wAQtUMMjSltA+zgG9xRCgXvbPXRAwOAY8gr9GxOUnP5mDcq0tvcf z2qD4JdeJujP3osUZC1KhyJn50fJ6qWQePShJKjXZBcjC3Pye81yFB8R0JVhpzmJ1mlz 2LDiqhnnbZgZNNet9FqwLL3q31Y4AAWUyDyzYSC+YiUctSSW0PG/rsWJiOaHDvCQSngO gctZkWHD4Kad6uSg2SrlkzxKY19IqjcO6wt7JbECpxcuL9zZ28EljxVyeWYrHQksBj5R WG1g== 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; bh=DKHfoWX86UC8tCpmO9UcVoZlKpuSu8oXTkyHvGbgRGs=; b=JyiLfvZRpM9kzGiVc+4c1Zf28vf7DDEDDXOQ6O9TadvXAtjI9ok94P24yVoGaDYXHJ hWW5CzD3NZVHbBlMFJzsJujuYuZhbbw7FBZa9dIY+m2b9DtvGPcdTW2aIwj/HotcTjGJ wFAcWhu6nzfS4YJL5+AIwnnt71/1/GonRHIdO2oV83VeDjk2cr6em7/kfj2o5b71291Y Abu/dTaPRi6TvCe5qK7+AlpFO0cIwYftj46U++ELvzgp7LW0aIFPkgnvUzHmQVF7oVZU doa8kxTogJ2JmyaVcMFAXYP1uCZrZampFiSl/k+gdlA872Xk9K88V7r6zkx7QzK/B8F8 tDrQ== X-Gm-Message-State: APzg51ARtJpTCZ0AdRyNoWl4171a6tZRHrSgOC6ULvGOILi1+Jt6ZKDM Nb+shB512Gt6OWPWSr4rN/I= X-Google-Smtp-Source: ANB0VdbgcoOJe7nxdtxEb4L/ynM/nhuegLM6iDLt9yuIzRF2XLro9c97i38NI5QC8ZYYPIBMEgGp8Q== X-Received: by 2002:a63:2a0b:: with SMTP id q11-v6mr33573743pgq.36.1536124503572; Tue, 04 Sep 2018 22:15:03 -0700 (PDT) Received: from ubuntu.localdomain (8.sub-174-214-5.myvzw.com. [174.214.5.8]) by smtp.gmail.com with ESMTPSA id 3-v6sm1298999pfq.10.2018.09.04.22.15.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Sep 2018 22:15:02 -0700 (PDT) From: Darrell Ball To: dlu998@gmail.com, dev@openvswitch.org Date: Tue, 4 Sep 2018 22:14:45 -0700 Message-Id: <1536124490-86810-1-git-send-email-dlu998@gmail.com> X-Mailer: git-send-email 1.9.1 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [patch v2 1/6] conntrack: Handle self nat case. 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 Handle the 'unusual case' that the user requests natting to self. This defaults to the legacy case, where a single conntrack entry is used rather than having a separate reverse entry and can lead to referencing freed memory in nat clean. To handle this case, we only mark the conntrack entry as un_nat type when we know we have a un_nat conn entry. Also, a now unused api is removed. Needs backporting to 2.8. Fixes: 286de2729955 ("dpdk: Userspace Datapath: Introduce NAT Support.") Signed-off-by: Darrell Ball --- lib/conntrack.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index be8debb..15984d2 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -852,7 +852,7 @@ conn_not_found(struct conntrack *ct, struct dp_packet *pkt, struct conn *conn_for_un_nat_copy, const char *helper, const struct alg_exp_node *alg_exp, - enum ct_alg_ctl_type ct_alg_ctl) + enum ct_alg_ctl_type ct_alg_ctl, bool *nat) { struct conn *nc = NULL; @@ -932,7 +932,7 @@ conn_not_found(struct conntrack *ct, struct dp_packet *pkt, *nc = *conn_for_un_nat_copy; ct_rwlock_unlock(&ct->resources_lock); } - conn_for_un_nat_copy->conn_type = CT_CONN_TYPE_UN_NAT; + *nat = true; conn_for_un_nat_copy->nat_info = NULL; conn_for_un_nat_copy->alg = NULL; nat_packet(pkt, nc, ctx->icmp_related); @@ -1013,6 +1013,7 @@ create_un_nat_conn(struct conntrack *ct, struct conn *conn_for_un_nat_copy, struct conn *nc = xmemdup(conn_for_un_nat_copy, sizeof *nc); nc->key = conn_for_un_nat_copy->rev_key; nc->rev_key = conn_for_un_nat_copy->key; + nc->conn_type = CT_CONN_TYPE_UN_NAT; uint32_t un_nat_hash = conn_key_hash(&nc->key, ct->hash_basis); unsigned un_nat_conn_bucket = hash_to_bucket(un_nat_hash); ct_lock_lock(&ct->buckets[un_nat_conn_bucket].lock); @@ -1135,12 +1136,6 @@ check_orig_tuple(struct conntrack *ct, struct dp_packet *pkt, } static bool -is_un_nat_conn_valid(const struct conn *un_nat_conn) -{ - return un_nat_conn->conn_type == CT_CONN_TYPE_UN_NAT; -} - -static bool conn_update_state_alg(struct conntrack *ct, struct dp_packet *pkt, struct conn_lookup_ctx *ctx, struct conn *conn, const struct nat_action_info_t *nat_action_info, @@ -1253,6 +1248,7 @@ process_one(struct conntrack *ct, struct dp_packet *pkt, const struct alg_exp_node *alg_exp = NULL; struct alg_exp_node alg_exp_entry; + bool nat = false; if (OVS_UNLIKELY(create_new_conn)) { @@ -1268,7 +1264,7 @@ process_one(struct conntrack *ct, struct dp_packet *pkt, conn = conn_not_found(ct, pkt, ctx, commit, now, nat_action_info, &conn_for_un_nat_copy, helper, alg_exp, - ct_alg_ctl); + ct_alg_ctl, &nat); } write_ct_md(pkt, zone, conn, &ctx->key, alg_exp); @@ -1288,7 +1284,7 @@ process_one(struct conntrack *ct, struct dp_packet *pkt, ct_lock_unlock(&ct->buckets[bucket].lock); - if (is_un_nat_conn_valid(&conn_for_un_nat_copy)) { + if (nat) { create_un_nat_conn(ct, &conn_for_un_nat_copy, now, !!alg_exp); }