Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp3569639ybc; Mon, 18 Nov 2019 17:45:30 -0800 (PST) X-Google-Smtp-Source: APXvYqx34lmw1cZ19UaJoLLeGOEGGD0mLllmLlegMDICoGNgdn0NM5hsWu6feK3E3pDQjCTQOhRT X-Received: by 2002:a17:907:216e:: with SMTP id rl14mr31116155ejb.291.1574127930730; Mon, 18 Nov 2019 17:45:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574127930; cv=none; d=google.com; s=arc-20160816; b=I25RKdehqAjpPgIbqoPX2uY6Px3gmfIv/h5z6vs5AVU+bB/t/Nkqlfx4WQ/Rw6SVGl X8ADkze4yoe++u7IPtL9ihCp6Jp5o/JApyjgwae4q8wqJXg1kgKv+rlnfxIHByyoXhqw TTUbCYCOHp76edpvMNmOUpOqM5kGkP7GHEdzr49RzSFdyPNY5JT8a73zxJutf2C8zz5E TqNx2JLVDATjfTLwn3upbLtdaZ0Mknzi/9uH124o1ODvrRPAtBsSbot30dgnK/DBPqYs Mbf9FKvLu1rMhxxQpfWCmf/GUkGpUEAvoNNw1UdOuSkHlsmAe50Ec+bbl/05xoXByZQ1 9YSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:mime-version :message-id:date:dkim-signature; bh=cGWE/qyVtF0Xm0XRgmS6v65MJoSNg2ouKO2ndi7seNg=; b=sRnOk/2a+P+6nIIj2FeAfrSzLPTCuZPL8u633JUzq/xy5vo32FCLA/MspVpmT4vKBL ryiQ44gE2nLxm28d+LoywUTwwffQXZ3a5r9aH4ZucEaM+wPkDtZXqUCliLKktBaGdTBh Bk+xM7HgumBUiG80zPAeDvG9bZrodsqPopMo73M2P9b8+EWVThwm7FINQVG/ltPJWS2+ FntZGE9jbcBoQSH6x33VvHK6Cn6duDzDMqAUyIPHHB1swKQ/RF7pnb0bNbElkcTcz4Kf yQHo/Hjee9HEowQQ44EX4cPuuLLmgDv0R0FRMyuHDjQ280t8zhywBJA5Xff8FiZLY/ND r6vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="bY/KO6kx"; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id br3si12814734ejb.436.2019.11.18.17.45.06; Mon, 18 Nov 2019 17:45:30 -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=@google.com header.s=20161025 header.b="bY/KO6kx"; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727031AbfKSBoF (ORCPT + 99 others); Mon, 18 Nov 2019 20:44:05 -0500 Received: from mail-pl1-f201.google.com ([209.85.214.201]:50504 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726761AbfKSBoF (ORCPT ); Mon, 18 Nov 2019 20:44:05 -0500 Received: by mail-pl1-f201.google.com with SMTP id c18so12175501plo.17 for ; Mon, 18 Nov 2019 17:44:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=cGWE/qyVtF0Xm0XRgmS6v65MJoSNg2ouKO2ndi7seNg=; b=bY/KO6kxybSTMKllU0VSmuUp+hH40TarSc/VXouqS7EBfHj591iNMpKxkqYuVxFYHx RvL8p5NL+w33OCuaho+ZKJsPc4VJZuOx8JnxfZiYvZIu3CDdSIHY8/ep7GUTHBZQPKHv N6vRZOcQeGBrbAcztIl7TsIzRJeiQkfdPF3u3dTu2+vMg2A99GH/vkECiIa10i0L124M jcTZVaX0jLsElwKI6XDWBJVmHXRlzIYfEGjIkNfrKlU43Ixu4zekvM2oc4M/AGLTMoIn cIXJ50FH0992QNNkzwQ64vWbxzxzzaamsnZBqfoRrO0YmEmXORQz6zb/1yXwDM7Il87G FUEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=cGWE/qyVtF0Xm0XRgmS6v65MJoSNg2ouKO2ndi7seNg=; b=qQtW8qdZVCWgtftEUX0MAgK4fR51EOrbReCOgWLbr+Fs2pRSCzMYF5LSPqxmsMe2V+ 4c5b2l/YlZLKVibt/djJc+dGzjvG2lqFBiRbMbTUwGlVZhdquGzETX55RX5SccEoqEhO CifGO30HwShl4ULFffnMrigvnnvxSgZ6ZPQoGGLgZCLVpNUm6fkXqO6nivdyd5ExXCy3 OoIINkPEPI5xbsx7MZrtOBB8LiohNaA4gswqn9vNOOFgHxpTSo+T5hm/F7BAOlekrO4D lS6dz7MgCLOYZn8zadDhgUEEl6b91xl6ItmB9u4AwMbTsoMntP9VEY8042mtw7l3KGav RcdA== X-Gm-Message-State: APjAAAV4P1mc5smL/nUg7Oia2vRYq9VSttUA5D7ms+MzXbUphCKvt67m IJFr/EvsYx+Dfd9C+0eKo8tIYvqZLCQY X-Received: by 2002:a63:e26:: with SMTP id d38mr2621764pgl.44.1574127844187; Mon, 18 Nov 2019 17:44:04 -0800 (PST) Date: Mon, 18 Nov 2019 17:43:48 -0800 Message-Id: <20191119014357.98465-1-brianvv@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.24.0.432.g9d3f5f5b63-goog Subject: [PATCH bpf-next 0/9] add bpf batch ops to process more than 1 elem From: Brian Vazquez To: Brian Vazquez , Alexei Starovoitov , Daniel Borkmann , "David S . Miller" Cc: Yonghong Song , Stanislav Fomichev , Petar Penkov , Willem de Bruijn , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, Brian Vazquez Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch series introduce batch ops that can be added to bpf maps to lookup/lookup_and_delete/update/delete more than 1 element at the time, this is specially useful when syscall overhead is a problem and in case of hmap it will provide a reliable way of traversing them. The implementation inclues a generic approach that could potentially be used by any bpf map and adds it to arraymap, it also includes the specific implementation of hashmaps which are traversed using buckets instead of keys. The bpf syscall subcommands introduced are: BPF_MAP_LOOKUP_BATCH BPF_MAP_LOOKUP_AND_DELETE_BATCH BPF_MAP_UPDATE_BATCH BPF_MAP_DELETE_BATCH The UAPI attribute is: struct { /* struct used by BPF_MAP_*_BATCH commands */ __aligned_u64 in_batch; /* start batch, * NULL to start from beginning */ __aligned_u64 out_batch; /* output: next start batch */ __aligned_u64 keys; __aligned_u64 values; __u32 count; /* input/output: * input: # of key/value * elements * output: # of filled elements */ __u32 map_fd; __u64 elem_flags; __u64 flags; } batch; in_batch and out_batch are only used for lookup and lookup_and_delete since those are the only two operations that attempt to traverse the map. update/delete batch ops should provide the keys/values that user wants to modify. Here are the previous discussions on the batch processing: - https://lore.kernel.org/bpf/20190724165803.87470-1-brianvv@google.com/ - https://lore.kernel.org/bpf/20190829064502.2750303-1-yhs@fb.com/ - https://lore.kernel.org/bpf/20190906225434.3635421-1-yhs@fb.com/ Changelog since RFC: - Change batch to in_batch and out_batch to support more flexible opaque values to iterate the bpf maps. - Remove update/delete specific batch ops for htab and use the generic implementations instead. Brian Vazquez (6): bpf: add bpf_map_{value_size,update_value,map_copy_value} functions bpf: add generic support for lookup and lookup_and_delete batch ops bpf: add generic support for update and delete batch ops bpf: add lookup and updated batch ops to arraymap tools/bpf: sync uapi header bpf.h selftests/bpf: add batch ops testing to array bpf map Yonghong Song (3): bpf: add batch ops to all htab bpf map libbpf: add libbpf support to batch ops selftests/bpf: add batch ops testing for hmap and hmap_percpu include/linux/bpf.h | 21 + include/uapi/linux/bpf.h | 21 + kernel/bpf/arraymap.c | 2 + kernel/bpf/hashtab.c | 244 ++++++++ kernel/bpf/syscall.c | 571 ++++++++++++++---- tools/include/uapi/linux/bpf.h | 21 + tools/lib/bpf/bpf.c | 61 ++ tools/lib/bpf/bpf.h | 14 + tools/lib/bpf/libbpf.map | 4 + .../map_lookup_and_delete_batch_array.c | 119 ++++ .../map_lookup_and_delete_batch_htab.c | 257 ++++++++ 11 files changed, 1215 insertions(+), 120 deletions(-) create mode 100644 tools/testing/selftests/bpf/map_tests/map_lookup_and_delete_batch_array.c create mode 100644 tools/testing/selftests/bpf/map_tests/map_lookup_and_delete_batch_htab.c -- 2.24.0.432.g9d3f5f5b63-goog