From patchwork Sat Nov 7 00:06:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarno Rajahalme X-Patchwork-Id: 541186 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C57811401B5 for ; Sat, 7 Nov 2015 11:07:00 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nicira_com.20150623.gappssmtp.com header.i=@nicira_com.20150623.gappssmtp.com header.b=xGPdcVue; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757789AbbKGAG7 (ORCPT ); Fri, 6 Nov 2015 19:06:59 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34905 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757394AbbKGAGS (ORCPT ); Fri, 6 Nov 2015 19:06:18 -0500 Received: by pasz6 with SMTP id z6so141368531pas.2 for ; Fri, 06 Nov 2015 16:06:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nicira_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kubopqqdiDaEpXG1Mx3qTAPfcMb1Pa5WaF4eZXDJppk=; b=xGPdcVueNQCWx2rAaZbSR+71sN5t9pM2lQyNB/6BBMttx+WLLQl1cwdrkiAxIqSiii xAruOqDi03IV+X3clH4TPmVzQJR/YMHMPxRZc1BFYA58z1OGzmLxwjbvPnYg7OeoEUgq yFhVK4MQXmsh8veJKrYPqskBKXWHkbXAXESs8Af0iCjcf06gerLqZCKBAJr5uNCFses+ jGminNEwP/QsAn9z3RLB73Kft6jCVtStWM7lb8EIGaA1aD82dNsKFZ+vVGTSEpBK/Dz4 PkujJn6+nKQmzUtHhu7JfegC2UakaNZ20WddetzpqFTlycja3tOlk+A6V2XSgaXzo8zf IBNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kubopqqdiDaEpXG1Mx3qTAPfcMb1Pa5WaF4eZXDJppk=; b=RLMZJTh+C6S1R7iTFqsbA8ur/8G6XD5AAbJGMwuut7GLEA/fjgJWrhabwUZeFWev52 Jd6ucWw9qhW016TMntw1dMR4ATHjgzshDJLDiJu8nI+PQSXzClNiC3vpXr3Bo2VIvH9V vUl9O3iiOIae+SPUnlNm03mu8ErQfUlplExhf1JWFuu5+wp/dDnWqBWzsz6OxuCoZli4 MOf/FfOuSG+yUjRWqvG00aBM1v98RCbMZ0s+dNKFhd5vvN+iU4BYMIkxhTqqm8vebd78 0yZUFauMNgJMMnsGk/bRGDb/niWq8LQeF04h1gl89eggTcGqpCz1Q37q4Tiu7U4RZGex becw== X-Gm-Message-State: ALoCoQnYyKZ7n/WVTgtM7mK5GUmh0bEeoL+AV/cMB744+ASbddb6LcTAK1RMvqd25hQYapQG3qMW X-Received: by 10.66.235.40 with SMTP id uj8mr991010pac.151.1446854778438; Fri, 06 Nov 2015 16:06:18 -0800 (PST) Received: from sc9-mailhost3.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id l16sm2160090pbq.22.2015.11.06.16.06.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Nov 2015 16:06:18 -0800 (PST) From: Jarno Rajahalme To: netdev@vger.kernel.org Cc: netfilter-devel@vger.kernel.org, dev@openvswitch.org, jrajahalme@nicira.com Subject: [RFC PATCH net-next v2 3/8] netfilter: Allow calling into nat helper without skb_dst. Date: Fri, 6 Nov 2015 16:06:03 -0800 Message-Id: <1446854768-38299-4-git-send-email-jrajahalme@nicira.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446854768-38299-1-git-send-email-jrajahalme@nicira.com> References: <1446854768-38299-1-git-send-email-jrajahalme@nicira.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org NAT checksum recalculation code assumes existence of skb_dst, which becomes a problem for a later patch in the series ("openvswitch: Interface with NAT."). Simplify this by removing the check on skb_dst, as the checksum will be dealt with later in the stack. Suggested-by: Pravin Shelar Signed-off-by: Jarno Rajahalme --- net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 29 ++++++++--------------------- net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 29 ++++++++--------------------- 2 files changed, 16 insertions(+), 42 deletions(-) diff --git a/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c b/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c index 5075b7e..f8aad03 100644 --- a/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c +++ b/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c @@ -127,28 +127,15 @@ static void nf_nat_ipv4_csum_recalc(struct sk_buff *skb, u8 proto, void *data, __sum16 *check, int datalen, int oldlen) { - const struct iphdr *iph = ip_hdr(skb); - struct rtable *rt = skb_rtable(skb); - if (skb->ip_summed != CHECKSUM_PARTIAL) { - if (!(rt->rt_flags & RTCF_LOCAL) && - (!skb->dev || skb->dev->features & NETIF_F_V4_CSUM)) { - skb->ip_summed = CHECKSUM_PARTIAL; - skb->csum_start = skb_headroom(skb) + - skb_network_offset(skb) + - ip_hdrlen(skb); - skb->csum_offset = (void *)check - data; - *check = ~csum_tcpudp_magic(iph->saddr, iph->daddr, - datalen, proto, 0); - } else { - *check = 0; - *check = csum_tcpudp_magic(iph->saddr, iph->daddr, - datalen, proto, - csum_partial(data, datalen, - 0)); - if (proto == IPPROTO_UDP && !*check) - *check = CSUM_MANGLED_0; - } + const struct iphdr *iph = ip_hdr(skb); + + skb->ip_summed = CHECKSUM_PARTIAL; + skb->csum_start = skb_headroom(skb) + skb_network_offset(skb) + + ip_hdrlen(skb); + skb->csum_offset = (void *)check - data; + *check = ~csum_tcpudp_magic(iph->saddr, iph->daddr, datalen, + proto, 0); } else inet_proto_csum_replace2(check, skb, htons(oldlen), htons(datalen), true); diff --git a/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c b/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c index 238e70c..e0be97e 100644 --- a/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c +++ b/net/ipv6/netfilter/nf_nat_l3proto_ipv6.c @@ -131,28 +131,15 @@ static void nf_nat_ipv6_csum_recalc(struct sk_buff *skb, u8 proto, void *data, __sum16 *check, int datalen, int oldlen) { - const struct ipv6hdr *ipv6h = ipv6_hdr(skb); - struct rt6_info *rt = (struct rt6_info *)skb_dst(skb); - if (skb->ip_summed != CHECKSUM_PARTIAL) { - if (!(rt->rt6i_flags & RTF_LOCAL) && - (!skb->dev || skb->dev->features & NETIF_F_V6_CSUM)) { - skb->ip_summed = CHECKSUM_PARTIAL; - skb->csum_start = skb_headroom(skb) + - skb_network_offset(skb) + - (data - (void *)skb->data); - skb->csum_offset = (void *)check - data; - *check = ~csum_ipv6_magic(&ipv6h->saddr, &ipv6h->daddr, - datalen, proto, 0); - } else { - *check = 0; - *check = csum_ipv6_magic(&ipv6h->saddr, &ipv6h->daddr, - datalen, proto, - csum_partial(data, datalen, - 0)); - if (proto == IPPROTO_UDP && !*check) - *check = CSUM_MANGLED_0; - } + const struct ipv6hdr *ipv6h = ipv6_hdr(skb); + + skb->ip_summed = CHECKSUM_PARTIAL; + skb->csum_start = skb_headroom(skb) + skb_network_offset(skb) + + (data - (void *)skb->data); + skb->csum_offset = (void *)check - data; + *check = ~csum_ipv6_magic(&ipv6h->saddr, &ipv6h->daddr, + datalen, proto, 0); } else inet_proto_csum_replace2(check, skb, htons(oldlen), htons(datalen), true);