From patchwork Mon Apr 15 17:26:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiong Wang X-Patchwork-Id: 1085826 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=none (p=none dis=none) header.from=netronome.com 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="hgVYZkU1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44jb646W9cz9s9N for ; Tue, 16 Apr 2019 03:27:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727985AbfDOR0s (ORCPT ); Mon, 15 Apr 2019 13:26:48 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38208 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727964AbfDOR0p (ORCPT ); Mon, 15 Apr 2019 13:26:45 -0400 Received: by mail-wr1-f67.google.com with SMTP id k11so23035158wro.5 for ; Mon, 15 Apr 2019 10:26:44 -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=MpCitH7OitwdS3gEZKicgK34bxZPlB54bkEREbm5EmI=; b=hgVYZkU1VQccgkXXo3AG63bkgg41x9wm9w2OorzWerLWjDFmbl+bi5iquy4xDNYeaU RZG3MfTQkVQgekOIy/Np3sqfnZnm5TkvvWNuuLz61VV9l653Ooqvrm6l1c6Kv7MQ6cJm gjADICaOsjJqyRDDaQd+0POrVTVDoimtaHRYGaFsT+SokNL8DrS0DuvXh+55C5J7FjOs 6NdH6HX9eJeqLJ8RrZbWU2dJ+bstZ0qVW0wv9UMkhahSFzphORdqS5+vB8Gq+E9tWLkk J+pZ2Q13oxKKXciu/YdLQDANDBBiYqRc/7j2Fyj0k7A2Aj+mDIYHgrW7fUW3bQuORa7w n6qw== 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=MpCitH7OitwdS3gEZKicgK34bxZPlB54bkEREbm5EmI=; b=E+iMsmjhYLXGJV6m9OXGZCzV5Kqg8bhINWmIeaC3ZPo1BRTjx2/59VXf04T/yhZ8MU 6aN6eORN95MqtNiAPFT3/JNSbuzl/eTirgUrJXcl2M13A8tIpoJvLzIDwaL0WJbdfabn tigbJsbGE3pDSZnZ/o4YhdFE+UHhR4xi5zDkbgVGPYGvNG+XJMjkzxlG2dHV7M3Izbzs sQK/NBbSOvwZ70we+MEv7TaAcdzVu1LbHqaReLsQt3B+tKTalSXbWvOfe3lGAL5ncCuX KVW6WCBvukEtUmboZepCbUifOiTcvx+EYMRlno7JHZoYPynVrfomJ/XIgwUsXYDr/GGJ huuQ== X-Gm-Message-State: APjAAAUzvnQuYQlb5Desah5oMGobGQ6sSwJOhFQ61HuWFy4hZ8SZHNIR VETweK/geeYmSSLzr1fJ2UjFtw== X-Google-Smtp-Source: APXvYqzSj0NqAivAVT89Q7Lh1tNCDtSzP5a4oPosEbgN7u38qYgEaAFA46urjcfT8gdtovRlC7pJCw== X-Received: by 2002:adf:f102:: with SMTP id r2mr32977826wro.136.1555349204047; Mon, 15 Apr 2019 10:26:44 -0700 (PDT) Received: from cbtest28.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id v190sm27094232wme.18.2019.04.15.10.26.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Apr 2019 10:26:43 -0700 (PDT) From: Jiong Wang To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, oss-drivers@netronome.com, Jiong Wang Subject: [PATCH v4 bpf-next 07/15] libbpf: add "prog_flags" to bpf_program/bpf_prog_load_attr/bpf_load_program_attr Date: Mon, 15 Apr 2019 18:26:17 +0100 Message-Id: <1555349185-12508-8-git-send-email-jiong.wang@netronome.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555349185-12508-1-git-send-email-jiong.wang@netronome.com> References: <1555349185-12508-1-git-send-email-jiong.wang@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org libbpf doesn't allow passing "prog_flags" during bpf program load in a couple of load related APIs, "bpf_load_program_xattr", "load_program" and "bpf_prog_load_xattr". It makes sense to allow passing "prog_flags" which is useful for customizing program loading. Reviewed-by: Jakub Kicinski Signed-off-by: Jiong Wang --- tools/lib/bpf/bpf.c | 1 + tools/lib/bpf/bpf.h | 1 + tools/lib/bpf/libbpf.c | 3 +++ tools/lib/bpf/libbpf.h | 1 + 4 files changed, 6 insertions(+) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 955191c..f79ec49 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -254,6 +254,7 @@ int bpf_load_program_xattr(const struct bpf_load_program_attr *load_attr, if (load_attr->name) memcpy(attr.prog_name, load_attr->name, min(strlen(load_attr->name), BPF_OBJ_NAME_LEN - 1)); + attr.prog_flags = load_attr->prog_flags; fd = sys_bpf_prog_load(&attr, sizeof(attr)); if (fd >= 0) diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index bc30783..a983442 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -86,6 +86,7 @@ struct bpf_load_program_attr { const void *line_info; __u32 line_info_cnt; __u32 log_level; + __u32 prog_flags; }; /* Flags to direct loading requirements */ diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index e5b77ad..e0affd0 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -182,6 +182,7 @@ struct bpf_program { void *line_info; __u32 line_info_rec_size; __u32 line_info_cnt; + __u32 prog_flags; }; enum libbpf_map_type { @@ -1876,6 +1877,7 @@ load_program(struct bpf_program *prog, struct bpf_insn *insns, int insns_cnt, load_attr.line_info_rec_size = prog->line_info_rec_size; load_attr.line_info_cnt = prog->line_info_cnt; load_attr.log_level = prog->log_level; + load_attr.prog_flags = prog->prog_flags; if (!load_attr.insns || !load_attr.insns_cnt) return -EINVAL; @@ -3320,6 +3322,7 @@ int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr, expected_attach_type); prog->log_level = attr->log_level; + prog->prog_flags = attr->prog_flags; if (!first_prog) first_prog = prog; } diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index c5ff005..5abc237 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -320,6 +320,7 @@ struct bpf_prog_load_attr { enum bpf_attach_type expected_attach_type; int ifindex; int log_level; + int prog_flags; }; LIBBPF_API int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr,