From patchwork Fri Nov 3 06:31:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 833676 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="I5rNKI0W"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ySskQ24ltz9sBd for ; Fri, 3 Nov 2017 17:39:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754167AbdKCGjY (ORCPT ); Fri, 3 Nov 2017 02:39:24 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:50071 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752982AbdKCGiy (ORCPT ); Fri, 3 Nov 2017 02:38:54 -0400 Received: by mail-pf0-f196.google.com with SMTP id i5so1535480pfe.6 for ; Thu, 02 Nov 2017 23:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Q1gumYbF1OdC8hIJB50IfCUyMnm/s0CCzl67Q1mGGOo=; b=I5rNKI0WYxbHOLH79WcZMqIuHgJ0zJaz2d7DD3ZPEX7ik0bAbkvQbRikWDjCLZBqJN fKByz06/mYAmp1tnvMz9Kxse8tTaQcD6cMftkazWVQ+uqQxXEroRlba/hfjKEFVuQyMK q89b0wTCWTRSonYKG8l/ELdC/h0Hul01D9aCjH/eADscgIyH+TLr3cx2aGYDl1eQGk7h EdFNS8Ycs+HVurhMc9XITGfHRnBkmRZCRqVc7AIHSbFfejIBNr/lCY70NK7Jzp6sHsoA TYWfgWT/MZGBPUMytOp9L/ZEVzlvk34F/ND5muRkEWyi3jxUs1IhA10LBpwHq+2954kM Gxiw== 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=Q1gumYbF1OdC8hIJB50IfCUyMnm/s0CCzl67Q1mGGOo=; b=QhnaH2L8TtNivqPEPoxUuQYJKiEJFQM1oSCBUM2TeiWziAI+oINZHNqndLfhJodfA1 SNI7uvdoqs2X+GI01tAoSztgniBTqKirwPqwT/QliMdNwcigJZDviUHnjOFDvbQmxTbP DLcJEKfIWPOsflNuYCLPKDLowx/3rFNII4amGIIwSzzGr6i2CxmLBkiTJDKX2sPF4peV 8R/XAX6jbjjzgdviWfrF280O0okybYnOxOnDpTXf0wTVDfB+9moRzzfJBManwlkI/TSz rwNWA6f3Zld4zcXvfbiSsh6roEuM075XTzLsjCSMYREnlBm3ki/1DFKIyxjXmWCeX+43 VVOw== X-Gm-Message-State: AMCzsaW/E03rWyniz1kBIwNAms4JlT44Zbs7C6HSKSdU4y+ngzfNXM/f cnD2hurw5hzwFY7oisk7/4s9qohm X-Google-Smtp-Source: ABhQp+Rpd8/74whpHxacdY0zjqG3FdnHdO0cw2utZzK5GnoM3RVNh7Vx5IVPcsf2KQh0EHn/CeEb6g== X-Received: by 10.84.132.42 with SMTP id 39mr5726656ple.382.1509691133991; Thu, 02 Nov 2017 23:38:53 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id 62sm8456357pfw.129.2017.11.02.23.38.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Nov 2017 23:38:53 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, alexei.starovoitov@gmail.com, daniel@iogearbox.net, Jakub Kicinski Subject: [PATCH net-next 12/15] nfp: bpf: move program prepare and free into offload.c Date: Thu, 2 Nov 2017 23:31:06 -0700 Message-Id: <20171103063109.9441-13-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171103063109.9441-1-jakub.kicinski@netronome.com> References: <20171103063109.9441-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Most of offload/translation prepare logic will be moved to offload.c. To help git generate more reasonable diffs move nfp_prog_prepare() and nfp_prog_free() functions there as a first step. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- drivers/net/ethernet/netronome/nfp/bpf/jit.c | 33 ------------------------ drivers/net/ethernet/netronome/nfp/bpf/main.h | 5 ++++ drivers/net/ethernet/netronome/nfp/bpf/offload.c | 33 ++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c index ff150c27f411..2eddbb45fd60 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c @@ -77,17 +77,6 @@ nfp_meta_has_prev(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) return meta->l.prev != &nfp_prog->insns; } -static void nfp_prog_free(struct nfp_prog *nfp_prog) -{ - struct nfp_insn_meta *meta, *tmp; - - list_for_each_entry_safe(meta, tmp, &nfp_prog->insns, l) { - list_del(&meta->l); - kfree(meta); - } - kfree(nfp_prog); -} - static void nfp_prog_push(struct nfp_prog *nfp_prog, u64 insn) { if (nfp_prog->__prog_alloc_len == nfp_prog->prog_len) { @@ -2127,28 +2116,6 @@ static int nfp_translate(struct nfp_prog *nfp_prog) return nfp_fixup_branches(nfp_prog); } -static int -nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog, - unsigned int cnt) -{ - unsigned int i; - - for (i = 0; i < cnt; i++) { - struct nfp_insn_meta *meta; - - meta = kzalloc(sizeof(*meta), GFP_KERNEL); - if (!meta) - return -ENOMEM; - - meta->insn = prog[i]; - meta->n = i; - - list_add_tail(&meta->l, &nfp_prog->insns); - } - - return 0; -} - /* --- Optimizations --- */ static void nfp_bpf_opt_reg_init(struct nfp_prog *nfp_prog) { diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h index df56f40fea7c..b77231a134b9 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/main.h +++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h @@ -173,6 +173,11 @@ struct nfp_bpf_result { unsigned int n_instr; }; +int +nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog, + unsigned int cnt); +void nfp_prog_free(struct nfp_prog *nfp_prog); + int nfp_bpf_jit(struct bpf_prog *filter, void *prog, unsigned int prog_start, unsigned int prog_done, diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c index f4b9a46c844d..3eeee200051e 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c @@ -51,6 +51,39 @@ #include "../nfp_net_ctrl.h" #include "../nfp_net.h" +int +nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog, + unsigned int cnt) +{ + unsigned int i; + + for (i = 0; i < cnt; i++) { + struct nfp_insn_meta *meta; + + meta = kzalloc(sizeof(*meta), GFP_KERNEL); + if (!meta) + return -ENOMEM; + + meta->insn = prog[i]; + meta->n = i; + + list_add_tail(&meta->l, &nfp_prog->insns); + } + + return 0; +} + +void nfp_prog_free(struct nfp_prog *nfp_prog) +{ + struct nfp_insn_meta *meta, *tmp; + + list_for_each_entry_safe(meta, tmp, &nfp_prog->insns, l) { + list_del(&meta->l); + kfree(meta); + } + kfree(nfp_prog); +} + static int nfp_net_bpf_offload_prepare(struct nfp_net *nn, struct bpf_prog *prog, struct nfp_bpf_result *res,