From patchwork Thu Jul 21 00:22:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brenden Blanco X-Patchwork-Id: 650956 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 3rvvdG0PBcz9t4k for ; Thu, 21 Jul 2016 10:23:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=plumgrid-com.20150623.gappssmtp.com header.i=@plumgrid-com.20150623.gappssmtp.com header.b=NY39f8rR; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753786AbcGUAXL (ORCPT ); Wed, 20 Jul 2016 20:23:11 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:34676 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753695AbcGUAXJ (ORCPT ); Wed, 20 Jul 2016 20:23:09 -0400 Received: by mail-pa0-f47.google.com with SMTP id fi15so22971347pac.1 for ; Wed, 20 Jul 2016 17:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=plumgrid-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mRvySSsn7I2g3XqiE5TAbq7jcpEI1WNb578Xo6Mgs2I=; b=NY39f8rRE0YW3I5M5IUlyIS8iwDmFK/avS5ilHkgacIDdKJi6KmgIJfINWePssHftw Zel6tGiczGDKT7GrmCfDimyIPtjjmnHAM7V0bLN3ijK7VIMbJw0bMKo4LityE6kbB3Vt 47GtaVDeJ1rYyUjpStvxeezLkqMxYZnFdhrtkJrltXjLSicu+++VvXd8LrteYzYaGMQA dctVBa04sRSAFl6YoP5jQrRIH8ofAVtjLHF0c97DtvJGp+OO3T08HMHylLvOoEd7Fid1 vlihJL5wv18jElnSOuXORhMotqqt2ekkvMVQqahq0cUq5if37BDsd9Sj9eP0ZWrNA0wD wdCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mRvySSsn7I2g3XqiE5TAbq7jcpEI1WNb578Xo6Mgs2I=; b=OijEQNS6tFeT/xXjwbPSWsgbRY69ovS2fu8/4s7b5nVDn6Bvt2d2ujhN8H5F8BT4bd gNu9etI9QIXI84xvpFI8BaszCTU6+uvPpxgR527FEh3HQ8G8w0l6yxPL7nsg8jDsCNZA gxTPOcuOS0KNjQnF1KF7yXrMxEmNrOZJWpUf9bc9LumMx7LlbhB43gtlCd6VxKp71apM F8FjTvhgNk2HioexyFTRHAmcUmF81dJOvT3jjuYUCgrsFB+qLwTJy0C8cLVlL0HhbODL kwTk8bV6SAstex2hspf2mjjA6BzKbzTQdavWGDovzcN/HgoPqpuNjL2YReAydOwn1yTa yrbA== X-Gm-Message-State: ALyK8tKVyS586S9MU4W4ILZSujdMjwya+N+bRH9NOdlebFGOYAdZkxbB4D/Nt0gR3TVsLaR9 X-Received: by 10.66.25.78 with SMTP id a14mr78816021pag.11.1469060588484; Wed, 20 Jul 2016 17:23:08 -0700 (PDT) Received: from iovisor-test1.plumgrid.com ([12.97.19.201]) by smtp.gmail.com with ESMTPSA id l128sm1773651pfl.21.2016.07.20.17.23.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jul 2016 17:23:08 -0700 (PDT) From: Brenden Blanco To: davem@davemloft.net, netdev@vger.kernel.org Cc: Brenden Blanco , Daniel Borkmann , Alexei Starovoitov , Tariq Toukan Subject: [PATCH net-next 3/3] bpf: make xdp sample variable names more meaningful Date: Wed, 20 Jul 2016 17:22:35 -0700 Message-Id: <1469060555-20250-4-git-send-email-bblanco@plumgrid.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1469060555-20250-1-git-send-email-bblanco@plumgrid.com> References: <1469060555-20250-1-git-send-email-bblanco@plumgrid.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The naming choice of index is not terribly descriptive, and dropcnt is in fact incorrect for xdp2. Pick better names for these: ipproto and rxcnt. Signed-off-by: Brenden Blanco Acked-by: Alexei Starovoitov --- samples/bpf/xdp1_kern.c | 12 ++++++------ samples/bpf/xdp2_kern.c | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/samples/bpf/xdp1_kern.c b/samples/bpf/xdp1_kern.c index e7dd8ac..2197421 100644 --- a/samples/bpf/xdp1_kern.c +++ b/samples/bpf/xdp1_kern.c @@ -14,7 +14,7 @@ #include #include "bpf_helpers.h" -struct bpf_map_def SEC("maps") dropcnt = { +struct bpf_map_def SEC("maps") rxcnt = { .type = BPF_MAP_TYPE_PERCPU_ARRAY, .key_size = sizeof(u32), .value_size = sizeof(long), @@ -49,7 +49,7 @@ int xdp_prog1(struct xdp_md *ctx) long *value; u16 h_proto; u64 nh_off; - u32 index; + u32 ipproto; nh_off = sizeof(*eth); if (data + nh_off > data_end) @@ -77,13 +77,13 @@ int xdp_prog1(struct xdp_md *ctx) } if (h_proto == htons(ETH_P_IP)) - index = parse_ipv4(data, nh_off, data_end); + ipproto = parse_ipv4(data, nh_off, data_end); else if (h_proto == htons(ETH_P_IPV6)) - index = parse_ipv6(data, nh_off, data_end); + ipproto = parse_ipv6(data, nh_off, data_end); else - index = 0; + ipproto = 0; - value = bpf_map_lookup_elem(&dropcnt, &index); + value = bpf_map_lookup_elem(&rxcnt, &ipproto); if (value) *value += 1; diff --git a/samples/bpf/xdp2_kern.c b/samples/bpf/xdp2_kern.c index 38fe7e1..e012888 100644 --- a/samples/bpf/xdp2_kern.c +++ b/samples/bpf/xdp2_kern.c @@ -14,7 +14,7 @@ #include #include "bpf_helpers.h" -struct bpf_map_def SEC("maps") dropcnt = { +struct bpf_map_def SEC("maps") rxcnt = { .type = BPF_MAP_TYPE_PERCPU_ARRAY, .key_size = sizeof(u32), .value_size = sizeof(long), @@ -65,7 +65,7 @@ int xdp_prog1(struct xdp_md *ctx) long *value; u16 h_proto; u64 nh_off; - u32 index; + u32 ipproto; nh_off = sizeof(*eth); if (data + nh_off > data_end) @@ -93,17 +93,17 @@ int xdp_prog1(struct xdp_md *ctx) } if (h_proto == htons(ETH_P_IP)) - index = parse_ipv4(data, nh_off, data_end); + ipproto = parse_ipv4(data, nh_off, data_end); else if (h_proto == htons(ETH_P_IPV6)) - index = parse_ipv6(data, nh_off, data_end); + ipproto = parse_ipv6(data, nh_off, data_end); else - index = 0; + ipproto = 0; - value = bpf_map_lookup_elem(&dropcnt, &index); + value = bpf_map_lookup_elem(&rxcnt, &ipproto); if (value) *value += 1; - if (index == 17) { + if (ipproto == IPPROTO_UDP) { swap_src_dst_mac(data); rc = XDP_TX; }