From patchwork Tue Mar 11 09:19:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 329000 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3C58B2C00BD for ; Tue, 11 Mar 2014 20:19:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752697AbaCKJTj (ORCPT ); Tue, 11 Mar 2014 05:19:39 -0400 Received: from mail.us.es ([193.147.175.20]:34650 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752382AbaCKJTh (ORCPT ); Tue, 11 Mar 2014 05:19:37 -0400 Received: (qmail 653 invoked from network); 11 Mar 2014 10:19:35 +0100 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 11 Mar 2014 10:19:35 +0100 Received: (qmail 6273 invoked by uid 507); 11 Mar 2014 09:19:35 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.1/18572. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-97.6/7.5):. Processed in 2.153695 secs); 11 Mar 2014 09:19:35 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-97.6 required=7.5 tests=BAYES_50,RCVD_IN_BRBL, RCVD_IN_BRBL_LASTEXT,RCVD_IN_PBL,RCVD_IN_RP_RNBL,RCVD_IN_SORBS_DUL, RDNS_DYNAMIC, SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Spam-ASN: AS3209 88.64.0.0/12 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 11 Mar 2014 09:19:33 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/412/antivirus2); Tue, 11 Mar 2014 10:19:32 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus2) Received: (qmail 17157 invoked from network); 11 Mar 2014 10:19:32 +0100 Received: from dslb-088-075-177-069.pools.arcor-ip.net (HELO localhost.localdomain) (pneira@us.es@88.75.177.69) by mail.us.es with SMTP; 11 Mar 2014 10:19:32 +0100 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org, kaber@trash.net Subject: [PATCH RFC 1/9] net: rename fp->bpf_func to fp->run_filter Date: Tue, 11 Mar 2014 10:19:12 +0100 Message-Id: <1394529560-3490-2-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394529560-3490-1-git-send-email-pablo@netfilter.org> References: <1394529560-3490-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch is a cleanup / rename for the function that actually performs the filtering from bpf_func to a generic run_filter. This change was introduced to generalize the socket filtering infrastructure. Signed-off-by: Pablo Neira Ayuso --- arch/arm/net/bpf_jit_32.c | 6 +++--- arch/powerpc/net/bpf_jit_comp.c | 6 +++--- arch/s390/net/bpf_jit_comp.c | 6 +++--- arch/sparc/net/bpf_jit_comp.c | 6 +++--- arch/x86/net/bpf_jit_comp.c | 6 +++--- include/linux/filter.h | 6 +++--- net/core/filter.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index 271b5e9..65bd347 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -924,7 +924,7 @@ void bpf_jit_compile(struct sk_filter *fp) /* there are 2 passes here */ bpf_jit_dump(fp->len, alloc_size, 2, ctx.target); - fp->bpf_func = (void *)ctx.target; + fp->run_filter = (void *)ctx.target; out: kfree(ctx.offsets); return; @@ -932,7 +932,7 @@ out: void bpf_jit_free(struct sk_filter *fp) { - if (fp->bpf_func != sk_run_filter) - module_free(NULL, fp->bpf_func); + if (fp->run_filter != sk_run_filter) + module_free(NULL, fp->run_filter); kfree(fp); } diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c index 555034f..6491d72 100644 --- a/arch/powerpc/net/bpf_jit_comp.c +++ b/arch/powerpc/net/bpf_jit_comp.c @@ -688,7 +688,7 @@ void bpf_jit_compile(struct sk_filter *fp) /* Function descriptor nastiness: Address + TOC */ ((u64 *)image)[0] = (u64)code_base; ((u64 *)image)[1] = local_paca->kernel_toc; - fp->bpf_func = (void *)image; + fp->run_filter = (void *)image; } out: kfree(addrs); @@ -697,7 +697,7 @@ out: void bpf_jit_free(struct sk_filter *fp) { - if (fp->bpf_func != sk_run_filter) - module_free(NULL, fp->bpf_func); + if (fp->run_filter != sk_run_filter) + module_free(NULL, fp->run_filter); kfree(fp); } diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 708d60e..23089df 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -876,7 +876,7 @@ void bpf_jit_compile(struct sk_filter *fp) } if (jit.start) { set_memory_ro((unsigned long)header, header->pages); - fp->bpf_func = (void *) jit.start; + fp->run_filter = (void *) jit.start; } out: kfree(addrs); @@ -884,10 +884,10 @@ out: void bpf_jit_free(struct sk_filter *fp) { - unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK; + unsigned long addr = (unsigned long)fp->run_filter & PAGE_MASK; struct bpf_binary_header *header = (void *)addr; - if (fp->bpf_func == sk_run_filter) + if (fp->run_filter == sk_run_filter) goto free_filter; set_memory_rw(addr, header->pages); module_free(NULL, header); diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c index 01fe994..ee1cd30 100644 --- a/arch/sparc/net/bpf_jit_comp.c +++ b/arch/sparc/net/bpf_jit_comp.c @@ -808,7 +808,7 @@ cond_branch: f_offset = addrs[i + filter[i].jf]; if (image) { bpf_flush_icache(image, image + proglen); - fp->bpf_func = (void *)image; + fp->run_filter = (void *)image; } out: kfree(addrs); @@ -817,7 +817,7 @@ out: void bpf_jit_free(struct sk_filter *fp) { - if (fp->bpf_func != sk_run_filter) - module_free(NULL, fp->bpf_func); + if (fp->run_filter != sk_run_filter) + module_free(NULL, fp->run_filter); kfree(fp); } diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 4ed75dd..bfadd14 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -771,7 +771,7 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i]; if (image) { bpf_flush_icache(header, image + proglen); set_memory_ro((unsigned long)header, header->pages); - fp->bpf_func = (void *)image; + fp->run_filter = (void *)image; } out: kfree(addrs); @@ -781,7 +781,7 @@ out: static void bpf_jit_free_deferred(struct work_struct *work) { struct sk_filter *fp = container_of(work, struct sk_filter, work); - unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK; + unsigned long addr = (unsigned long)fp->run_filter & PAGE_MASK; struct bpf_binary_header *header = (void *)addr; set_memory_rw(addr, header->pages); @@ -791,7 +791,7 @@ static void bpf_jit_free_deferred(struct work_struct *work) void bpf_jit_free(struct sk_filter *fp) { - if (fp->bpf_func != sk_run_filter) { + if (fp->run_filter != sk_run_filter) { INIT_WORK(&fp->work, bpf_jit_free_deferred); schedule_work(&fp->work); } else { diff --git a/include/linux/filter.h b/include/linux/filter.h index e568c8e..6c5d597 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -27,8 +27,8 @@ struct sk_filter atomic_t refcnt; unsigned int len; /* Number of filter blocks */ struct rcu_head rcu; - unsigned int (*bpf_func)(const struct sk_buff *skb, - const struct sock_filter *filter); + unsigned int (*run_filter)(const struct sk_buff *skb, + const struct sock_filter *filter); union { struct sock_filter insns[0]; struct work_struct work; @@ -70,7 +70,7 @@ static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen, print_hex_dump(KERN_ERR, "JIT code: ", DUMP_PREFIX_OFFSET, 16, 1, image, proglen, false); } -#define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns) +#define SK_RUN_FILTER(FILTER, SKB) (*FILTER->run_filter)(SKB, FILTER->insns) #else #include static inline void bpf_jit_compile(struct sk_filter *fp) diff --git a/net/core/filter.c b/net/core/filter.c index ad30d62..0f63e67 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -645,7 +645,7 @@ static int __sk_prepare_filter(struct sk_filter *fp) { int err; - fp->bpf_func = sk_run_filter; + fp->run_filter = sk_run_filter; err = sk_chk_filter(fp->insns, fp->len); if (err)