From patchwork Fri Feb 3 20:38:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 723919 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 3vFTGs28Hfz9s2s for ; Sat, 4 Feb 2017 07:38:45 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="G8zMWfE+"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752442AbdBCUie (ORCPT ); Fri, 3 Feb 2017 15:38:34 -0500 Received: from mail-pf0-f181.google.com ([209.85.192.181]:34303 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752293AbdBCUia (ORCPT ); Fri, 3 Feb 2017 15:38:30 -0500 Received: by mail-pf0-f181.google.com with SMTP id e4so8232496pfg.1 for ; Fri, 03 Feb 2017 12:38:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8JeAOhwFUrYJs+1zhAV717Marvz2ct4PnApi04Hzqsg=; b=G8zMWfE+lj1dT5UHNR7MU6ZBrQ3xhNRqTmRNuMbT8bS2QPObyyfPVvefVuyNp1me9Q QMDeqAbm79nPieXYR+GRiRoDvLFsTcD10jqzqCa7jDWpX8ZaAPJAulSzYMKQwrNXSthM Hgf7SI5YYmu9AwFfG5cFtoaxHJFETr2QF8Yrs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8JeAOhwFUrYJs+1zhAV717Marvz2ct4PnApi04Hzqsg=; b=LEuP/sdW0FIUpLYgAlz3Y9ZknovEq6ckoKiiOVD3x4zYJEB3t/RvUeXr3n7HE30gCk qct748b5UHVXIcJJUDn4P5DQUwmRPLcS8evEUXoYzFN8PbxScaR6Qe8WzGa+75EREmGq N/krKQFcC69enaUmys5SDE+9KTsYXkn2LfB0AwZsd8KTYcMBUVWra+L7CWqfCQH4g1Tk ahTsfGn7Yh6UFKj3a5JMwyUgcIIAHj0Zk/CgBnqFVNF4BfcDZLC5n1mxjHQ2B8Gkomgs qagJGBE1iJQcV5PpNV8kNa4Vs0K3AGofUrgYPVHgur+RDp5WYnI1iJGmWuyxo5z3Zkyw P9/g== X-Gm-Message-State: AIkVDXL5JgUYFcezRvsV5fx+Q5EVL52YvmML5ZgYDjRNxsoHXL9a8KWCB/ZPvUAbM2MYgzPl X-Received: by 10.99.248.17 with SMTP id n17mr20174108pgh.17.1486154310003; Fri, 03 Feb 2017 12:38:30 -0800 (PST) Received: from kenny.it.cumulusnetworks.com. ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id j192sm69237492pfc.60.2017.02.03.12.38.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Feb 2017 12:38:29 -0800 (PST) From: David Ahern To: netdev@vger.kernel.org, alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: roopa@cumulusnetworks.com, David Ahern Subject: [RFC PATCH net-next 1/2] bpf: Save original ebpf instructions Date: Fri, 3 Feb 2017 12:38:22 -0800 Message-Id: <1486154303-32278-2-git-send-email-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1486154303-32278-1-git-send-email-dsa@cumulusnetworks.com> References: <1486154303-32278-1-git-send-email-dsa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Similar to classic bpf, support saving original ebpf instructions Signed-off-by: David Ahern --- include/linux/filter.h | 5 ++++- kernel/bpf/syscall.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/include/linux/filter.h b/include/linux/filter.h index e4eb2546339a..86b1e3624463 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -391,7 +391,10 @@ struct compat_sock_fprog { struct sock_fprog_kern { u16 len; - struct sock_filter *filter; + union { + struct sock_filter *filter; + struct bpf_insn *insn; + }; }; struct bpf_binary_header { diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 08a4d287226b..95e640a3ed99 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -694,11 +694,43 @@ static void bpf_prog_uncharge_memlock(struct bpf_prog *prog) free_uid(user); } +static int bpf_prog_store_orig_insn(struct bpf_prog *prog) +{ + u32 isize = bpf_prog_insn_size(prog); + struct sock_fprog_kern *fkprog; + + prog->orig_prog = kmalloc(sizeof(*fkprog), GFP_KERNEL); + if (!prog->orig_prog) + return -ENOMEM; + + fkprog = prog->orig_prog; + fkprog->len = prog->len; + + fkprog->insn = kmemdup(prog->insnsi, isize, GFP_KERNEL | __GFP_NOWARN); + if (!fkprog->insn) { + kfree(prog->orig_prog); + return -ENOMEM; + } + + return 0; +} + +static void bpf_release_orig_insn(struct bpf_prog *fp) +{ + struct sock_fprog_kern *fprog = fp->orig_prog; + + if (fprog) { + kfree(fprog->insn); + kfree(fprog); + } +} + static void __bpf_prog_put_rcu(struct rcu_head *rcu) { struct bpf_prog_aux *aux = container_of(rcu, struct bpf_prog_aux, rcu); free_used_maps(aux); + bpf_release_orig_insn(aux->prog); bpf_prog_uncharge_memlock(aux->prog); bpf_prog_free(aux->prog); } @@ -885,6 +917,10 @@ static int bpf_prog_load(union bpf_attr *attr) if (err < 0) goto free_prog; + err = bpf_prog_store_orig_insn(prog); + if (err < 0) + goto free_prog; + /* run eBPF verifier */ err = bpf_check(&prog, attr); if (err < 0)