From patchwork Fri Apr 12 21:59:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiong Wang X-Patchwork-Id: 1084961 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="As6J63d8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44gsJz18pkz9s8m for ; Sat, 13 Apr 2019 08:00:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727264AbfDLWAT (ORCPT ); Fri, 12 Apr 2019 18:00:19 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:43811 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727250AbfDLWAQ (ORCPT ); Fri, 12 Apr 2019 18:00:16 -0400 Received: by mail-wr1-f67.google.com with SMTP id k17so9057587wrx.10 for ; Fri, 12 Apr 2019 15:00:15 -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=33/0vLDNV+/fkdAJJtAOFzRJSQIBJATreCk8IP7/Y7g=; b=As6J63d8ugwdyObljS0PPYV0EnjNNkhhD8QpjYbzD50y0RivvBVWKZCwnty/QzQn8Q k3MXdLXXH4ZHC4tx0Frbl94xQoTEZeNeohp/9z5A3kPkrq28qYGDZc3asPClCkbTRF49 LekKAOgwYvMGOJq7GUG4HiONbvFlzpYIEZz9kvSXb/TCX6qZL6I/pQ7M4P5TGdo14Vxo c4aB7/mSzJZ1wZZgpSvPq/c1wdFjqGC6UlokE5l3ZNmG/0Bx/4PQWlQ+4YlBaVBZbK7Z wSqfTRTVc47woqYO/FgDM1FfwB0TnVFhYrpfziBBnOTMesWQzwvzE62ezbMLKwXHatu7 XLjg== 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=33/0vLDNV+/fkdAJJtAOFzRJSQIBJATreCk8IP7/Y7g=; b=Bj4jCKWvK+KW0XkBfrkm+E1gDNPWp+DZjEztfj6c+StX//cuHYHaCcVxFeaS+izgA9 HCJm/csX+3Vbyua9BtWfSzS4DofdAenYQLP2nKe3wJKIRusKC4AmKSlX02Epr6CClMGr roT4S1FgSxZKBq2tkallrd1XgOXlfq4EWRGGheSf8XAxLNKVIFOCWWwgD21x026yy0Ms 7ujF/EvO8ChTnrqfuxK3bCvZxWmawSUtOP8loArCs6F4el4v2NnWqV5YYq/8IzwiMOdT YHt+4ELJiXLAONMHKXzeDLQcy+Jqdt9+tRKrvqUONhXTZnDUi+H4bXGuseA5c54Oqzii mf+A== X-Gm-Message-State: APjAAAVnU09Cc7snTfHfdW1onDBcUzYHQHoOid8e46MC/F760zdtYYTf O4QVdC94gR2sJmf/9Wv61ZIV3g== X-Google-Smtp-Source: APXvYqzd1Efb/GBemCc+bWtHozRU0zvlJT+Mw0RxvPX+qFpZu8DXXsFZaQUd4R5UiYukyqidtygPfg== X-Received: by 2002:a5d:4750:: with SMTP id o16mr34176244wrs.206.1555106414206; Fri, 12 Apr 2019 15:00:14 -0700 (PDT) Received: from cbtest28.netronome.com ([217.38.71.146]) by smtp.gmail.com with ESMTPSA id f1sm8490764wml.28.2019.04.12.15.00.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Apr 2019 15:00:13 -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 v3 bpf-next 11/19] libbpf: add "prog_flags" to bpf_program/bpf_prog_load_attr/bpf_load_program_attr Date: Fri, 12 Apr 2019 22:59:44 +0100 Message-Id: <1555106392-20117-12-git-send-email-jiong.wang@netronome.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555106392-20117-1-git-send-email-jiong.wang@netronome.com> References: <1555106392-20117-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. Signed-off-by: Jiong Wang Reviewed-by: Jakub Kicinski --- 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,