From patchwork Thu Jul 3 14:56:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Shen Lim X-Patchwork-Id: 366906 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 8832E140140 for ; Fri, 4 Jul 2014 00:57:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758808AbaGCO5J (ORCPT ); Thu, 3 Jul 2014 10:57:09 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:50857 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758616AbaGCO5G (ORCPT ); Thu, 3 Jul 2014 10:57:06 -0400 Received: by mail-pd0-f176.google.com with SMTP id ft15so344579pdb.21 for ; Thu, 03 Jul 2014 07:57:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=7rCDgSH2Na/R+fAWsGZXDIk9TTwQDHWRFJ0j7N2T8k4=; b=y5RXSbEpdvvjf1JvIQd6veJwbDoQRkdF4A4xeNRCiyoMYk4+ycGqih301RwYOgEG35 Lsagh3SzKHZyKxBtePLTWBX8sTKd7yxzR4VDYCiYMS2YN0pobIhjO+EZz5k17hMEqDWk eZn/iIdTfCNGAUctGRTVHGY2nEM808ggtCrWEIViClO9Ad65whwJMHzuPlaYVLL9YhhF JDxUxNf70xVlYxFBkuj46iWYiTrmhRN8rULJfxEwiTy0RLJhI3RXfwaO0qoO8rzsGgRH By4XV9dMAV0FpTAyzphtkd81YW9y9J4MAxieQWP6EuEK+mvP0M/RlGIfVxpy5+4itAUz xRPw== X-Received: by 10.70.102.44 with SMTP id fl12mr4577723pdb.125.1404399426168; Thu, 03 Jul 2014 07:57:06 -0700 (PDT) Received: from gup76.hsd1.ca.comcast.net ([98.234.176.204]) by mx.google.com with ESMTPSA id pn4sm41354020pbb.7.2014.07.03.07.57.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Jul 2014 07:57:05 -0700 (PDT) From: Zi Shen Lim To: "David S. Miller" Cc: Zi Shen Lim , Daniel Borkmann , Alexei Starovoitov , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCHv2 net-next] net: filter: move load_pointer() into filter.h Date: Thu, 3 Jul 2014 07:56:54 -0700 Message-Id: <1404399414-32099-1-git-send-email-zlim.lnx@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org load_pointer() is already a static inline function. Let's move it into filter.h so BPF JIT implementations can reuse this function. Since we're exporting this function, let's also rename it to bpf_load_pointer() for clarity. Signed-off-by: Zi Shen Lim Reviewed-by: Daniel Borkmann Acked-by: Alexei Starovoitov --- v1->v2: * Renamed to more specific name of bpf_load_pointer(), as suggested by Daniel. This patch is based on discussion with Alexei in the context of reusing load_pointer for upcoming arm64 BPF JIT compiler. [1] Compile tested on x86_64 and arm64. [1] https://lkml.org/lkml/2014/7/3/14 include/linux/filter.h | 13 +++++++++++++ net/core/filter.c | 15 +++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/include/linux/filter.h b/include/linux/filter.h index a7e3c48..b885dcb 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -6,6 +6,7 @@ #include #include +#include #include #include @@ -406,6 +407,18 @@ static inline u16 bpf_anc_helper(const struct sock_filter *ftest) } } +void *bpf_internal_load_pointer_neg_helper(const struct sk_buff *skb, + int k, unsigned int size); + +static inline void *bpf_load_pointer(const struct sk_buff *skb, int k, + unsigned int size, void *buffer) +{ + if (k >= 0) + return skb_header_pointer(skb, k, size, buffer); + + return bpf_internal_load_pointer_neg_helper(skb, k, size); +} + #ifdef CONFIG_BPF_JIT #include #include diff --git a/net/core/filter.c b/net/core/filter.c index 1dbf646..87af1e3 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -84,15 +84,6 @@ void *bpf_internal_load_pointer_neg_helper(const struct sk_buff *skb, int k, uns return NULL; } -static inline void *load_pointer(const struct sk_buff *skb, int k, - unsigned int size, void *buffer) -{ - if (k >= 0) - return skb_header_pointer(skb, k, size, buffer); - - return bpf_internal_load_pointer_neg_helper(skb, k, size); -} - /** * sk_filter - run a packet through a socket filter * @sk: sock associated with &sk_buff @@ -537,7 +528,7 @@ load_word: * BPF_R0 - 8/16/32-bit skb data converted to cpu endianness */ - ptr = load_pointer((struct sk_buff *) (unsigned long) CTX, off, 4, &tmp); + ptr = bpf_load_pointer((struct sk_buff *) (unsigned long) CTX, off, 4, &tmp); if (likely(ptr != NULL)) { BPF_R0 = get_unaligned_be32(ptr); CONT; @@ -547,7 +538,7 @@ load_word: LD_ABS_H: /* BPF_R0 = ntohs(*(u16 *) (skb->data + imm32)) */ off = IMM; load_half: - ptr = load_pointer((struct sk_buff *) (unsigned long) CTX, off, 2, &tmp); + ptr = bpf_load_pointer((struct sk_buff *) (unsigned long) CTX, off, 2, &tmp); if (likely(ptr != NULL)) { BPF_R0 = get_unaligned_be16(ptr); CONT; @@ -557,7 +548,7 @@ load_half: LD_ABS_B: /* BPF_R0 = *(u8 *) (skb->data + imm32) */ off = IMM; load_byte: - ptr = load_pointer((struct sk_buff *) (unsigned long) CTX, off, 1, &tmp); + ptr = bpf_load_pointer((struct sk_buff *) (unsigned long) CTX, off, 1, &tmp); if (likely(ptr != NULL)) { BPF_R0 = *(u8 *)ptr; CONT;