Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp184862imu; Mon, 10 Dec 2018 19:08:17 -0800 (PST) X-Google-Smtp-Source: AFSGD/VEUqHOEwd6KD7mtYvOOtgKNptICBJU9ddcQGbIj53JZNu0GTSKnLJz2Vlm9kVEYFBeeHy9 X-Received: by 2002:a17:902:503:: with SMTP id 3mr14610336plf.233.1544497697313; Mon, 10 Dec 2018 19:08:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544497696; cv=none; d=google.com; s=arc-20160816; b=Gin/hfd6deu3GU144vw5KvaxSH/1W6K/wh0XcOvMc4jTyue18hNJDLRiTEm/FfIQWX EQZAH1wWr3ZYZ71MeaT5Si2pthTspTRecHx0ILGs2e9345iWXdttvf9lqzy9LNI8vIOq gJdC1gbbNLdD7wQ2CLEGmFdwkrU0XRnsFYTtrCQ3/EJaZlvy5g081b4Ad/55/+oosrBS ZxvFSGGJeSDHBNNVps+rcChRUmWnSLFK0OkGDqpALHJLRT28mGsB0Q+QFaiVm/7pmCue 8JZso2wfTsQGhFpXuFXB7yOZrWblq5K8Y0uJa8Xz4CNydaJZPIPyrgE/tKuQQRR+4n8N qsvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=X8Oju/qNEdc3Exga3962tvQrW783ic9eTzPhr8jEUt0=; b=TvNr0dicYzAU+gsCGqVpDVvp+6futnTb7hJy7dMGnGjXAp43/PIt4jxrHCUIHiKSFG loZ48gDRl1SeKTVyXDimp2z1bD6qbzWqaKW28wXSShS11tAELWS7KFCiYR4u0borDRH2 U6iTTsSXtM9X4ZxE9x7UirfHwzgbzoQzF5v38x8Q3peP0t//pEl8a/fo8DjAQHL5ZX2w CCdmp1KO0lee77+1DcoWLLeJwY6QMkjbf+s9ZHK1a8dTqSpSttjm/qSuO88tsbBjc9LZ 3p1ICPt7rYf0RSYLk1xmoR9zCKxJsry3+MFjIrpwn8ToCO1B883rZz6nlzM+nzom0UvU hyqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IRvH5pvm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ca6si12081821plb.141.2018.12.10.19.07.38; Mon, 10 Dec 2018 19:08:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IRvH5pvm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730230AbeLJXnT (ORCPT + 99 others); Mon, 10 Dec 2018 18:43:19 -0500 Received: from mail-it1-f195.google.com ([209.85.166.195]:40804 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730198AbeLJXnO (ORCPT ); Mon, 10 Dec 2018 18:43:14 -0500 Received: by mail-it1-f195.google.com with SMTP id h193so805726ita.5; Mon, 10 Dec 2018 15:43:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X8Oju/qNEdc3Exga3962tvQrW783ic9eTzPhr8jEUt0=; b=IRvH5pvm3yl2B5Jj9ZIJMcno3yvTAhD+t5/cU4+CSzk8+M2F97uYEBFu+r13MDMjHw 7sMywOtOf6NxtbhE8TH6KsqQI274ujaRwHiRSnPWmsZKzzNLVGcUO0SYMRyhJv7zEpUj yeLt2/Det2fkfGaaQqSCX/kWWqPgYq8AooRM3O3WJKudja1eXQgYvu/5NvWOkD43jkGj +U2ydS/Yg8q6vqA2LMUT6koQZBXjkPfelai0mWLutK+P5IzmT4RB/2kNVkkFs5Hc0v5t kQKd/ukYzaDY2qdSsXF/ATEBaiW6qUiRE6O12kTWlxPrPPWNuD1wEidio2tlGJXdwXNF jtgA== 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:mime-version:content-transfer-encoding; bh=X8Oju/qNEdc3Exga3962tvQrW783ic9eTzPhr8jEUt0=; b=ZpvVGiBpXsq4BRNLvgIW7FyoLQBOujbv/EJfpLRzHibZcTThcvnm11aFh3ro28ZBW9 H33aD9qG8s4d4uz8fNKYQuUtr+MX2m+Abw//EVoVnMX6WsyzeXs8JwQtaE1g01MCN+DC ldzM163BzsuH4aHVzCn5+LEKtS1EB9JRk3eoJ0g19tYolDMZ2+MAYo5dRc4jFDtubxdx 5kaXoux2YePJ+4CXb02bXwUaj1NoGgMWY5kLf3PUqn/2fCv/Oed489Ah59S9b+JEEikm bhDwQ/kGaj6zUBVYK9jbEGLIwb24AleUHlLxQTgh9BVPcjbSQCQq7m0bSK19C6t8BCHi 9vyg== X-Gm-Message-State: AA+aEWafI6PCmimXzPiErvZeF8vdmc27kXv/rMh/vzEKkn1p1enbj7df ltJQpHi9Gvl6YeHJ+J9OqQ9MTSdIboI= X-Received: by 2002:a24:3a09:: with SMTP id m9mr378320itm.98.1544485392899; Mon, 10 Dec 2018 15:43:12 -0800 (PST) Received: from tower.thefacebook.com ([2620:10d:c090:200::4:375a]) by smtp.gmail.com with ESMTPSA id e68sm625346ite.7.2018.12.10.15.43.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 15:43:12 -0800 (PST) From: Roman Gushchin X-Google-Original-From: Roman Gushchin To: netdev@vger.kernel.org Cc: kernel-team@fb.com, linux-kernel@vger.kernel.org, Yonghong Song , Martin Lau , Roman Gushchin , Alexei Starovoitov , Daniel Borkmann Subject: [PATCH v2 bpf-next 3/3] selftests/bpf: add btf annotations for cgroup_local_storage maps Date: Mon, 10 Dec 2018 15:43:02 -0800 Message-Id: <20181210234302.31327-4-guro@fb.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181210234302.31327-1-guro@fb.com> References: <20181210234302.31327-1-guro@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add btf annotations to cgroup local storage maps (per-cpu and shared) in the network packet counting example. Signed-off-by: Roman Gushchin Cc: Alexei Starovoitov Cc: Daniel Borkmann --- tools/testing/selftests/bpf/netcnt_prog.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/testing/selftests/bpf/netcnt_prog.c b/tools/testing/selftests/bpf/netcnt_prog.c index 1198abca1360..9f741e69cebe 100644 --- a/tools/testing/selftests/bpf/netcnt_prog.c +++ b/tools/testing/selftests/bpf/netcnt_prog.c @@ -16,12 +16,18 @@ struct bpf_map_def SEC("maps") percpu_netcnt = { .value_size = sizeof(struct percpu_net_cnt), }; +BPF_ANNOTATE_KV_PAIR(percpu_netcnt, struct bpf_cgroup_storage_key, + struct percpu_net_cnt); + struct bpf_map_def SEC("maps") netcnt = { .type = BPF_MAP_TYPE_CGROUP_STORAGE, .key_size = sizeof(struct bpf_cgroup_storage_key), .value_size = sizeof(struct net_cnt), }; +BPF_ANNOTATE_KV_PAIR(netcnt, struct bpf_cgroup_storage_key, + struct net_cnt); + SEC("cgroup/skb") int bpf_nextcnt(struct __sk_buff *skb) { -- 2.19.2