From patchwork Wed Apr 8 01:03:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 459078 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 BAFBD14012C for ; Wed, 8 Apr 2015 11:04:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753184AbbDHBD5 (ORCPT ); Tue, 7 Apr 2015 21:03:57 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:34532 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752909AbbDHBDz (ORCPT ); Tue, 7 Apr 2015 21:03:55 -0400 Received: by pdbqa5 with SMTP id qa5so39648740pdb.1 for ; Tue, 07 Apr 2015 18:03:55 -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=j7LuA+xSAsrhqw+2E0qMdxl5QEottOrYkfNOcMif+ig=; b=TE22nLPCykUxlIDO0hzVZshofSYtewlwSFrYvVKHCzz3Q28XBBrkQOvpONfLps6Lru 5+40sojHZzo6SSC5B6JsW1YwGcu1R9thf6YiSZa5Rmj3yLIklgwena0+akvjhlmU6Gto gwRada4QVSx5AEhQLHpYsUaG7VpJ78cfZj5mN5gUvapUiwgfr37nzkoQv7WTrhrpV4zZ 2jvt7O+GN28eFxa0h7TyOW10W0fd/1i8MBFsGs1Xz5vlyfRAC1m+OwVkrZ2hjU0RcxEU Suc4qwvC+VNWYC5WcLMqs9384T1e5q69jSPJF3DJc+xjtG1JaJ7HtlG/61YXImVqm3z/ VzSg== X-Gm-Message-State: ALoCoQmQa3zAlTdlQaI1+Jbl8GxN2EpEyWsSxtraZysnGd8evNKqYE4YoCGkljmeeXIi3aFsreTQ X-Received: by 10.68.239.65 with SMTP id vq1mr41324988pbc.49.1428455035129; Tue, 07 Apr 2015 18:03:55 -0700 (PDT) Received: from localhost.localdomain ([12.229.56.227]) by mx.google.com with ESMTPSA id li10sm9118032pbc.33.2015.04.07.18.03.54 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 07 Apr 2015 18:03:54 -0700 (PDT) From: Alexei Starovoitov To: "David S. Miller" Cc: Daniel Borkmann , Jiri Pirko , Jamal Hadi Salim , netdev@vger.kernel.org Subject: [PATCH v2 net-next 1/2] net: introduce skb_postpush_rcsum() helper Date: Tue, 7 Apr 2015 18:03:44 -0700 Message-Id: <1428455025-5945-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 --- skb_postpush_rcsum() is also used in the next patch. include/linux/skbuff.h | 7 +++++++ net/core/filter.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 36f3f43c0117..3c5b191869bb 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2586,6 +2586,13 @@ static inline void skb_postpull_rcsum(struct sk_buff *skb, skb->csum = csum_sub(skb->csum, csum_partial(start, len, 0)); } +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; }