From patchwork Thu Jul 3 07:52:12 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: 33012 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f69.google.com (mail-qg0-f69.google.com [209.85.192.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7BBA5203AC for ; Thu, 3 Jul 2014 07:52:41 +0000 (UTC) Received: by mail-qg0-f69.google.com with SMTP id j107sf13675592qga.0 for ; Thu, 03 Jul 2014 00:52:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=U5dVcN9Pk1AaW/gsnRUcEZy3dX7uZj7Pnctr8JwEWdw=; b=eFEf+09Q8RCWts+LjdV3RO+huTzbvdKTEmB6PDPXtM6WpinLeoigrYUQy6m3w64oJj oqKde3tqBYpd45rRfGn+dLP2G8jKuESgTeOZuUrwE7d4meLOzQKRKDxf6FVDA3lI8iF4 HBsCkwXXhHCyS1U83++jEi2WBxScy9fKl8qGOxlO1ES85Jbx4aQ8+EcESOnBnDSd94Xd y3y71otEc2mk1QSjCVwQBP/SeJZHB5fhU3QyjyO3unSHRclHql63FXMkR8Ilqz8or/qi TBJZxbVb3nQnUelsuiNIbJMjsYiQ43Vr76u9gPET4p47PT5ewupRuTDxlLHB0U5Yxk/e 5NVA== X-Gm-Message-State: ALoCoQkvFKfC0trhdJH/chN4SZwmXRJxSuubZykm2i7NsfMolRTVcZ6vDJUYyJKjaNZJmNXyIvfG X-Received: by 10.224.113.199 with SMTP id b7mr1616361qaq.9.1404373961349; Thu, 03 Jul 2014 00:52:41 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.28.4 with SMTP id 4ls446272qgy.98.gmail; Thu, 03 Jul 2014 00:52:41 -0700 (PDT) X-Received: by 10.221.25.210 with SMTP id rj18mr2316987vcb.5.1404373961251; Thu, 03 Jul 2014 00:52:41 -0700 (PDT) Received: from mail-ve0-x22f.google.com (mail-ve0-x22f.google.com [2607:f8b0:400c:c01::22f]) by mx.google.com with ESMTPS id p10si9457104vck.17.2014.07.03.00.52.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Jul 2014 00:52:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c01::22f as permitted sender) client-ip=2607:f8b0:400c:c01::22f; Received: by mail-ve0-f175.google.com with SMTP id jx11so12598884veb.34 for ; Thu, 03 Jul 2014 00:52:41 -0700 (PDT) X-Received: by 10.58.208.170 with SMTP id mf10mr2345458vec.22.1404373961142; Thu, 03 Jul 2014 00:52:41 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp353204vcb; Thu, 3 Jul 2014 00:52:40 -0700 (PDT) X-Received: by 10.66.102.102 with SMTP id fn6mr3145464pab.6.1404373960200; Thu, 03 Jul 2014 00:52:40 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dn5si22217434pbd.25.2014.07.03.00.52.39; Thu, 03 Jul 2014 00:52:39 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756767AbaGCHwa (ORCPT + 27 others); Thu, 3 Jul 2014 03:52:30 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:58669 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756056AbaGCHw2 (ORCPT ); Thu, 3 Jul 2014 03:52:28 -0400 Received: by mail-pd0-f174.google.com with SMTP id y10so13349657pdj.19 for ; Thu, 03 Jul 2014 00:52:27 -0700 (PDT) X-Received: by 10.68.132.42 with SMTP id or10mr3054184pbb.80.1404373947871; Thu, 03 Jul 2014 00:52:27 -0700 (PDT) Received: from gup76.hsd1.ca.comcast.net ([98.234.176.204]) by mx.google.com with ESMTPSA id nj8sm35379696pbc.39.2014.07.03.00.52.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Jul 2014 00:52:27 -0700 (PDT) From: Zi Shen Lim To: "David S. Miller" Cc: Zi Shen Lim , Alexei Starovoitov , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] net: filter: move load_pointer() into filter.h Date: Thu, 3 Jul 2014 00:52:12 -0700 Message-Id: <1404373932-10929-1-git-send-email-zlim.lnx@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: zlim.lnx@gmail.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c01::22f as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , load_pointer() is already a static inline function. Let's move it into filter.h so BPF JIT implementations can reuse this function. Signed-off-by: Zi Shen Lim --- 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 | 9 --------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/include/linux/filter.h b/include/linux/filter.h index a7e3c48..2288e31 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 *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..1c726ea 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