From patchwork Tue Oct 20 22:20:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarno Rajahalme X-Patchwork-Id: 533523 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9FF1D1402CC for ; Wed, 21 Oct 2015 09:21:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754367AbbJTWVH (ORCPT ); Tue, 20 Oct 2015 18:21:07 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:36837 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754339AbbJTWU5 (ORCPT ); Tue, 20 Oct 2015 18:20:57 -0400 Received: by pacfv9 with SMTP id fv9so34638732pac.3 for ; Tue, 20 Oct 2015 15:20:57 -0700 (PDT) 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=blGobyDC64mvHC0QPemdMbIJkxy/wzZKy7FM0w5y1QM=; b=Q7fEuRWUv9/ylHNbnL3Hkbts8u22e0LTYpfgaCM43LBD2BvHoG+wFwtJeeXJonHnwl DsZltAs3MzuncXycHnE1YG3PQFuradyXpePtnlp7fgSgpEqJ7q5ATgytXH6FWfoYgZ2v zKwcKoAtcC0Ey2MisUGa2aNKk2eRaVx9FIcPX07yuaVrqIvSlVRuSMYdHw7LEN1QGZv+ yJFrUOUPKje0ivjJID2X6uRZtW3BJkxqJjfo7z35X1Xfqgn6D9rDTMtchZMZAqyFjjmp lPBNTLqlEsDmpkNH5yy6Sw1Wy8pRX+6gbIIzDjaZc51SbrAJCFrEb3n0NWysB2GU9J0t MzNg== X-Gm-Message-State: ALoCoQkU/P7k5PNvL1jhswqoUUp4vW6WP87PAkp+1VZ8igliUU+SYBNnvBzNZ/c1Za2wVk5JJH7F X-Received: by 10.68.69.15 with SMTP id a15mr6658296pbu.62.1445379656897; Tue, 20 Oct 2015 15:20:56 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id nz4sm5544866pbb.47.2015.10.20.15.20.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Oct 2015 15:20:56 -0700 (PDT) From: Jarno Rajahalme To: netdev@vger.kernel.org Cc: dev@openvswitch.org, jrajahalme@nicira.com Subject: [RFC PATCH 3/5] netfilter: Allow calling into nat helper without skb_dst. Date: Tue, 20 Oct 2015 15:20:27 -0700 Message-Id: <1445379629-112880-3-git-send-email-jrajahalme@nicira.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445379629-112880-1-git-send-email-jrajahalme@nicira.com> References: <1445379629-112880-1-git-send-email-jrajahalme@nicira.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org NAT checksum recalculation code assumed existence of skb_dst, which becomes a problem for a later patch in the series. Simplify this by removing the checks, 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);