From patchwork Mon Jan 11 15:56:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 566009 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 166781402DE for ; Tue, 12 Jan 2016 02:58:00 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=MZd0Htsi; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933717AbcAKP5n (ORCPT ); Mon, 11 Jan 2016 10:57:43 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34428 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933700AbcAKP5h (ORCPT ); Mon, 11 Jan 2016 10:57:37 -0500 Received: by mail-pf0-f195.google.com with SMTP id 65so3749643pfd.1; Mon, 11 Jan 2016 07:57:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5xc6Qmm2eBs3Mk5kuFeP03vLO5VWrNxQ8YVi1p+FBR4=; b=MZd0Htsi2v4YymGxqFaQ6fGFgVDl+GPGwLLd/7Jx+yVPh7N3+l5vNp48QzWYBboDYc yxCRw1YsSAsyesUHMhqoWaFG8h0hucJPNnVq1VXRhTYuKGgbTZxTHXgY2p2lLzgVYkcu e0WFZbkN8r2dSxmR+p5aYHuwEboSkxTit1JXPWeStq4WWOVdP7frdJN8RNkF0a3adTvD L+0687F+BBuYZpLvT1HagO6LzZ34cb1IMR6XOE3Fx2rMIa77D03AiJ5spGvxZBJT5t9+ +i3eeql+ZR1DeFr6Pa7qx7qXRmp8cLAFfEffWYG2Ne0CbNiOY0zAPM8Ee8vQjYcosdIs HPEw== X-Received: by 10.98.74.91 with SMTP id x88mr26993178pfa.99.1452527857317; Mon, 11 Jan 2016 07:57:37 -0800 (PST) Received: from localhost ([103.192.227.7]) by smtp.gmail.com with ESMTPSA id a18sm24263232pfj.40.2016.01.11.07.57.36 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 11 Jan 2016 07:57:36 -0800 (PST) From: Ming Lei To: linux-kernel@vger.kernel.org, Alexei Starovoitov Cc: "David S. Miller" , netdev@vger.kernel.org, Daniel Borkmann , Martin KaFai Lau , Ming Lei Subject: [PATCH 7/9] sample/bpf: introduces helpers for percpu array example Date: Mon, 11 Jan 2016 23:56:59 +0800 Message-Id: <1452527821-12276-8-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452527821-12276-1-git-send-email-tom.leiming@gmail.com> References: <1452527821-12276-1-git-send-email-tom.leiming@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patches introduces helpers for using percpu array. Signed-off-by: Ming Lei --- samples/bpf/bpf_helpers.h | 5 +++++ samples/bpf/libbpf.c | 42 ++++++++++++++++++++++++++++++++++++++++++ samples/bpf/libbpf.h | 5 +++++ 3 files changed, 52 insertions(+) diff --git a/samples/bpf/bpf_helpers.h b/samples/bpf/bpf_helpers.h index 7ad19e1..9996f38 100644 --- a/samples/bpf/bpf_helpers.h +++ b/samples/bpf/bpf_helpers.h @@ -39,6 +39,11 @@ static int (*bpf_redirect)(int ifindex, int flags) = (void *) BPF_FUNC_redirect; static int (*bpf_perf_event_output)(void *ctx, void *map, int index, void *data, int size) = (void *) BPF_FUNC_perf_event_output; +static void *(*bpf_map_lookup_elem_percpu)(void *map, void *key, unsigned cpu) = + (void *) BPF_FUNC_map_lookup_elem_percpu; +static int (*bpf_map_update_elem_percpu)(void *map, void *key, void *value, + unsigned long long flags, unsigned cpu) = + (void *) BPF_FUNC_map_update_elem_percpu; /* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions diff --git a/samples/bpf/libbpf.c b/samples/bpf/libbpf.c index 65a8d48..2a240c6 100644 --- a/samples/bpf/libbpf.c +++ b/samples/bpf/libbpf.c @@ -43,6 +43,20 @@ int bpf_update_elem(int fd, void *key, void *value, unsigned long long flags) return syscall(__NR_bpf, BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr)); } +int bpf_update_elem_percpu(int fd, void *key, void *value, + unsigned long long flags, unsigned cpu) +{ + union bpf_attr attr = { + .map_fd = fd, + .key = ptr_to_u64(key), + .value = ptr_to_u64(value), + .flags = flags, + .cpu = cpu + }; + + return syscall(__NR_bpf, BPF_MAP_UPDATE_ELEM_PERCPU, &attr, sizeof(attr)); +} + int bpf_lookup_elem(int fd, void *key, void *value) { union bpf_attr attr = { @@ -54,6 +68,34 @@ int bpf_lookup_elem(int fd, void *key, void *value) return syscall(__NR_bpf, BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr)); } +int bpf_lookup_elem_percpu(int fd, void *key, void *value, unsigned cpu) +{ + union bpf_attr attr = { + .map_fd = fd, + .key = ptr_to_u64(key), + .value = ptr_to_u64(value), + .cpu = cpu, + }; + + return syscall(__NR_bpf, BPF_MAP_LOOKUP_ELEM_PERCPU, &attr, sizeof(attr)); +} + +int bpf_lookup_elem_allcpu(int fd, void *key, void *value_percpu, void *value, + int (*handle_one_cpu)(unsigned, void *, void *)) +{ + unsigned cpu; + int ret; + + for (cpu = 0; cpu < sysconf(_SC_NPROCESSORS_CONF); cpu++) { + ret = bpf_lookup_elem_percpu(fd, key, value_percpu, cpu); + if (!ret) + ret = handle_one_cpu(cpu, value_percpu, value); + if (ret) + return ret; + } + return 0; +} + int bpf_delete_elem(int fd, void *key) { union bpf_attr attr = { diff --git a/samples/bpf/libbpf.h b/samples/bpf/libbpf.h index 014aacf..e94484d 100644 --- a/samples/bpf/libbpf.h +++ b/samples/bpf/libbpf.h @@ -8,6 +8,11 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, int max_entries); int bpf_update_elem(int fd, void *key, void *value, unsigned long long flags); int bpf_lookup_elem(int fd, void *key, void *value); +int bpf_update_elem_percpu(int fd, void *key, void *value, + unsigned long long flags, unsigned cpu); +int bpf_lookup_elem_percpu(int fd, void *key, void *value, unsigned cpu); +int bpf_lookup_elem_allcpu(int fd, void *key, void *value_percpu, void *value, + int (*handle_one_cpu)(unsigned, void *, void *)); int bpf_delete_elem(int fd, void *key); int bpf_get_next_key(int fd, void *key, void *next_key);