From patchwork Fri Apr 10 23:33:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 460271 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 4DB801402EC for ; Sat, 11 Apr 2015 09:33:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932785AbbDJXd1 (ORCPT ); Fri, 10 Apr 2015 19:33:27 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:36188 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932164AbbDJXd0 (ORCPT ); Fri, 10 Apr 2015 19:33:26 -0400 Received: by pdea3 with SMTP id a3so37209960pde.3 for ; Fri, 10 Apr 2015 16:33:26 -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; bh=0v2ewMkmCOZoKS/G3yjFeavXOc7pLmLjqyZ9KkmCZac=; b=f+9dB7ZqF1VpjTAwBuhPvoiOYbG9IQ7MBcZ9s4EJKL+l2WiR6sU6QUEi6ZtL8NMLFn U/frOq0Bz6fAK2QnUqOAaGIv1yzkEONklx1CnsyQzzznZxfnZ00yrjMk7TRxVy8WuAG2 kUKqxVE81/pIEElR6a0iEeT5bUrMOtSyRgn2FyJpSAbAeyQU7XKS+KqeCp5kwv5YX6GV BvIn79NIXuztfjXScGBOyYWkaLQttqqyhClWd2/+6c89VOLCpGgQVgO2oGs/YJCcWYj6 vLlFwTZ9JKaoIjyvv7gkcChns0y8K3fnxV8v0GouHNH0fVB8khcSRsI4CO7s9axzoCqw gnTg== X-Gm-Message-State: ALoCoQktevdz5/UQaqXrxkjEY0HgAjfNe6IOQZS5QoOawr85A8K77wYGS9b1wpF8B3yajDieY+0Q X-Received: by 10.70.8.130 with SMTP id r2mr6688216pda.4.1428708805906; Fri, 10 Apr 2015 16:33:25 -0700 (PDT) Received: from localhost.localdomain ([12.229.56.227]) by mx.google.com with ESMTPSA id je11sm130684pbd.65.2015.04.10.16.33.24 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Apr 2015 16:33:25 -0700 (PDT) From: Alexei Starovoitov To: "David S. Miller" Cc: Eric Dumazet , Daniel Borkmann , Thomas Graf , Jiri Pirko , Jamal Hadi Salim , netdev@vger.kernel.org Subject: [PATCH v4 net-next 1/2] net: introduce skb_postpush_rcsum() helper Date: Fri, 10 Apr 2015 16:33:11 -0700 Message-Id: <1428708792-5872-1-git-send-email-ast@plumgrid.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org similar to skb_postpull_rcsum() introduce skb_postpush_rcsum() helper Signed-off-by: Alexei Starovoitov Acked-by: Daniel Borkmann --- next patch is also using skb_postpush_rcsum() include/linux/skbuff.h | 13 +++++++++++++ net/core/filter.c | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 0991259643d6..049c2db872e0 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2592,6 +2592,19 @@ static inline void skb_postpull_rcsum(struct sk_buff *skb, skb->csum = csum_sub(skb->csum, csum_partial(start, len, 0)); } +/** + * skb_postpush_rcsum - update checksum for skb after push + * @skb: buffer to update + * @start: start of data after push + * @len: length of data pushed + */ +static inline void skb_postpush_rcsum(struct sk_buff *skb, + const void *start, unsigned int len) +{ + if (skb->ip_summed == CHECKSUM_COMPLETE) + skb->csum = csum_add(skb->csum, csum_partial(start, len, 0)); +} + unsigned char *skb_pull_rcsum(struct sk_buff *skb, unsigned int len); /** diff --git a/net/core/filter.c b/net/core/filter.c index b669e75d2b36..e5872704c28b 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -1213,8 +1213,8 @@ static u64 bpf_skb_store_bytes(u64 r1, u64 r2, u64 r3, u64 r4, u64 flags) /* skb_store_bits cannot return -EFAULT here */ skb_store_bits(skb, offset, ptr, len); - if (BPF_RECOMPUTE_CSUM(flags) && skb->ip_summed == CHECKSUM_COMPLETE) - skb->csum = csum_add(skb->csum, csum_partial(ptr, len, 0)); + if (BPF_RECOMPUTE_CSUM(flags)) + skb_postpush_rcsum(skb, ptr, len); return 0; }