From patchwork Mon Nov 20 04:55:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 839432 X-Patchwork-Delegate: bpf@iogearbox.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="w6b8uCWC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ygGfD6hGJz9s0g for ; Mon, 20 Nov 2017 15:56:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751260AbdKTE4v (ORCPT ); Sun, 19 Nov 2017 23:56:51 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:36433 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751128AbdKTE4K (ORCPT ); Sun, 19 Nov 2017 23:56:10 -0500 Received: by mail-pg0-f68.google.com with SMTP id k190so1750158pga.3 for ; Sun, 19 Nov 2017 20:56:10 -0800 (PST) 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=VSUHg0DeJ26k+Dhd6HaInYpIivzHJv2103G2egw25ek=; b=w6b8uCWCxvPmOfAJhFxqK2kjVyx2WRFEkzabEHbTC1Q8SSES2BIYNba4bh6DiWRmjH 65tt7jPtL/iGhmBIGz2qSK8uDUUyuzZlYDX4QjG+3hkZYo69D+gAnXKi+tAO1OR5i9xn aHlmvDhyG7sQotP/nDRJbU7tL9mwzB2QIpmYk1iVJaR6YAcezS87XZJzc05LgsTusMAP PecV21o1P9ZXKti2yG+NvyjHvXcnJx0RPEU6hHK8OZf7Um6N4BR2XZzJQ2KKlZWT6wng L30tkgCj7BzrQMZr/kpPladxZMwsenQhZVJiMOUJoe7XgtB1LxJmPF7x6T6WWmzC+y4/ P15w== 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=VSUHg0DeJ26k+Dhd6HaInYpIivzHJv2103G2egw25ek=; b=Qxv8jzzS79cosPMd90pNiKW4Fd7z34nqy7gmD8j3pCecJr3SxlPFBPaNSFe6gnlXP0 FP9owh3bk88seIo5hJT10k7N9S09orzMEulc9eY6UOoeUwDKOgJFYVcQGcXoGJqcSSkh BzHraYZGlApVRspTfZnne5cToSpCpkmbRpi6OCb+hVfOQeYU+8sAGVSStlp4WxHoqwFk VlLJsenyCGiojWZOfl7lXVbXyk7nVgpvds7GxYDmHUqkDw/G6lZeANA78DWGQXL01xRD jKAl5gwcvSXh5vEKgDtElEnQ+DXiSGpF4meiokXWp52Ej664rkiOQlPKKEVQwzd1Moui 5Nkw== X-Gm-Message-State: AJaThX7uyEoukyTtfZuq6EixCnsu3fayTjtXhlk7KKoCT8LA+U1oSQEM J7s7oOPRy4xO2TRcGtlA41W5fuS+ X-Google-Smtp-Source: AGs4zMYvcmfpOS9Is/o8I5BPkx+TUxmg3LPlVmm7cemSKVgK2ANNLhSfEVrRHLVV4TURXuBu39oKxg== X-Received: by 10.99.96.210 with SMTP id u201mr12211102pgb.294.1511153769431; Sun, 19 Nov 2017 20:56:09 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id e8sm17598270pfk.6.2017.11.19.20.56.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Nov 2017 20:56:08 -0800 (PST) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: alexei.starovoitov@gmail.com, daniel@iogearbox.net, Jakub Kicinski Subject: [PATCH net 03/10] bpf: offload: rename the ifindex field Date: Sun, 19 Nov 2017 20:55:15 -0800 Message-Id: <20171120045522.2188-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171120045522.2188-1-jakub.kicinski@netronome.com> References: <20171120045522.2188-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org bpf_target_prog seems long and clunky, rename it to prog_ifindex. We don't want to call this field just ifindex, because maps may need a similar field in the future and bpf_attr members for programs and maps are unnamed. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet Acked-by: Alexei Starovoitov Acked-by: Daniel Borkmann --- include/uapi/linux/bpf.h | 2 +- kernel/bpf/offload.c | 2 +- kernel/bpf/syscall.c | 4 ++-- tools/include/uapi/linux/bpf.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index e880ae6434ee..3f626df42516 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -262,7 +262,7 @@ union bpf_attr { __u32 kern_version; /* checked when prog_type=kprobe */ __u32 prog_flags; char prog_name[BPF_OBJ_NAME_LEN]; - __u32 prog_target_ifindex; /* ifindex of netdev to prep for */ + __u32 prog_ifindex; /* ifindex of netdev to prep for */ }; struct { /* anonymous struct used by BPF_OBJ_* commands */ diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index ac187f9ee182..a778e5df7e26 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -29,7 +29,7 @@ int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr) init_waitqueue_head(&offload->verifier_done); rtnl_lock(); - offload->netdev = __dev_get_by_index(net, attr->prog_target_ifindex); + offload->netdev = __dev_get_by_index(net, attr->prog_ifindex); if (!offload->netdev) { rtnl_unlock(); kfree(offload); diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 09badc37e864..8e9d065bb7cd 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -1118,7 +1118,7 @@ struct bpf_prog *bpf_prog_get_type_dev(u32 ufd, enum bpf_prog_type type, EXPORT_SYMBOL_GPL(bpf_prog_get_type_dev); /* last field in 'union bpf_attr' used by this command */ -#define BPF_PROG_LOAD_LAST_FIELD prog_target_ifindex +#define BPF_PROG_LOAD_LAST_FIELD prog_ifindex static int bpf_prog_load(union bpf_attr *attr) { @@ -1181,7 +1181,7 @@ static int bpf_prog_load(union bpf_attr *attr) atomic_set(&prog->aux->refcnt, 1); prog->gpl_compatible = is_gpl ? 1 : 0; - if (attr->prog_target_ifindex) { + if (attr->prog_ifindex) { err = bpf_prog_offload_init(prog, attr); if (err) goto free_prog; diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index e880ae6434ee..3f626df42516 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -262,7 +262,7 @@ union bpf_attr { __u32 kern_version; /* checked when prog_type=kprobe */ __u32 prog_flags; char prog_name[BPF_OBJ_NAME_LEN]; - __u32 prog_target_ifindex; /* ifindex of netdev to prep for */ + __u32 prog_ifindex; /* ifindex of netdev to prep for */ }; struct { /* anonymous struct used by BPF_OBJ_* commands */