From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77D8BC432C3 for ; Tue, 26 Nov 2019 10:10:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44C612089D for ; Tue, 26 Nov 2019 10:10:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nRF5Tm8j" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728060AbfKZKKY (ORCPT ); Tue, 26 Nov 2019 05:10:24 -0500 Received: from mail-pj1-f66.google.com ([209.85.216.66]:33658 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727959AbfKZKKW (ORCPT ); Tue, 26 Nov 2019 05:10:22 -0500 Received: by mail-pj1-f66.google.com with SMTP id r67so301773pjb.0; Tue, 26 Nov 2019 02:10:21 -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=8RYu51EDNv1nof9QqLb6ITvPij8Y0e1oqvT4ZWA3MBk=; b=nRF5Tm8jxrFWVSKwm9O8IM/CbmQqEsu5rCN9Jyr5Imv6QqQfq9VRMYS7YLJ5wUJCxh qIt9XGVC1HAjJFjMFfh2wiMDJ1RsUshx7jiDLkSxPCruk/EpIJA5uWjo33nVwjrwg7KQ iqAIss99ASYM2cGrf4dQrhfnPWjiHbnNJiSrsXNoPQPG99KrN1YdAAsafpM+Mau9iN3X g3ZrKf6tLLLyKSYyX6wrhJ2QDhD4/HkK2AbM4EASZg5bK2CrlgHNsZiMnfc8ye1r2Vti 5CmHfDMSNkWzgKkbp2IsgZJrdCp3p41Vbh3TvrO36cyVwu+Ef5NXYan++ww4AzfpXKdS H29w== 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=8RYu51EDNv1nof9QqLb6ITvPij8Y0e1oqvT4ZWA3MBk=; b=brzmhjnzkG/oZgTi5ewQlG8PZ3tOjWZ9z6oTRi35ZL7fRfj+ZskZEswm/udsu3++4D t7xxHeefc3cawLh0Tt9spWPtWAGJyJl7UXCDrT9YCcpwc4OtDS761v7Mc6eES5EG+Tpa bs2AHmx8JRUnPE3XuJjSzxT+BV35xw34cAPmRfqi7ueEwTk9YRSB3Mxsy9ohgfDUl0tc VMTmeJIwt++HYyD/mw211xK8TRUGOFxVR6gbM4KyFj4CAVIUhNJWNGKbmrDTjwBGvFGX fddQORFQvRj5DI5AT37tBTYR/FygjFTf+rnkI4vzgw/dN8f8WMjfexa4UV8peiLD7Oxi B0uw== X-Gm-Message-State: APjAAAWJTgKBAxW+j4AgDiozhA5qYdYC7ZSWs3pkY+NHM0x1rEec+xig ikTnADtB8ZBn1GCnODybciI= X-Google-Smtp-Source: APXvYqxADjKHatHur+fxT/01AG/vZgD9nSsRNGb2AyFD7GjgVAPzN1abgIppTbaJ/3338My3voR1ig== X-Received: by 2002:a17:90a:650c:: with SMTP id i12mr5948361pjj.28.1574763021275; Tue, 26 Nov 2019 02:10:21 -0800 (PST) Received: from localhost.localdomain ([222.151.198.97]) by smtp.gmail.com with ESMTPSA id h9sm12059065pgk.84.2019.11.26.02.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 02:10:20 -0800 (PST) From: Prashant Bhole To: "Michael S . Tsirkin" , Jason Wang , qemu-devel@nongnu.org Cc: "David S . Miller" , Alexei Starovoitov , Daniel Borkmann , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , netdev@vger.kernel.org, kvm@vger.kernel.org, Prashant Bhole Subject: [RFC 3/3] virtio-net: add support for offloading an ebpf map Date: Tue, 26 Nov 2019 19:09:14 +0900 Message-Id: <20191126100914.5150-4-prashantbhole.linux@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191126100914.5150-1-prashantbhole.linux@gmail.com> References: <20191126100914.5150-1-prashantbhole.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jason Wang This change is a part of XDP offload feature. It handles offloading of eBPF map from the guest. A command handler for VIRTIO_NET_CTRL_EBPF now checks for subcommand VIRTIO_NET_CTRL_EBPF_MAP and. The control buffer consists of struct virtio_net_ctrl_ebpf_map followed by map key/value or key/key pair. Map manipulation is done using libbpf APIs. Signed-off-by: Jason Wang Co-developed-by: Prashant Bhole Signed-off-by: Prashant Bhole --- hw/net/Makefile.objs | 2 + hw/net/virtio-net.c | 88 +++++++++++++++++++++ include/standard-headers/linux/virtio_net.h | 23 ++++++ 3 files changed, 113 insertions(+) diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs index 7907d2c199..5928497a01 100644 --- a/hw/net/Makefile.objs +++ b/hw/net/Makefile.objs @@ -52,3 +52,5 @@ common-obj-$(CONFIG_ROCKER) += rocker/rocker.o rocker/rocker_fp.o \ obj-$(call lnot,$(CONFIG_ROCKER)) += rocker/qmp-norocker.o common-obj-$(CONFIG_CAN_BUS) += can/ + +virtio-net.o-libs := $(LIBBPF_LIBS) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 7cc1bd1654..3c49273796 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1011,6 +1011,92 @@ static int virtio_net_handle_offloads(VirtIONet *n, uint8_t cmd, } } +static int virtio_net_handle_ebpf_map(VirtIONet *n, struct iovec *iov, + unsigned int iov_cnt) +{ +#ifdef CONFIG_LIBBPF + struct virtio_net_ctrl_ebpf_map *ctrl = NULL; + struct bpf_create_map_attr map_attr = {}; + uint8_t *key, *val; + uint32_t buf_len; + int fd, err = 0; + size_t s; + + s = iov_to_buf(iov, iov_cnt, 0, &buf_len, sizeof(buf_len)); + if (s != sizeof(buf_len)) { + goto err; + } + + ctrl = malloc(sizeof(*ctrl) + buf_len); + if (!ctrl) { + goto err; + } + + s = iov_to_buf(iov, iov_cnt, 0, ctrl, sizeof(*ctrl) + buf_len); + if (s != (sizeof(*ctrl) + buf_len)) { + error_report("Invalid map control buffer"); + goto err; + } + + key = ctrl->buf; + val = ctrl->buf + ctrl->key_size; + + switch (ctrl->cmd) { + case VIRTIO_NET_BPF_CMD_CREATE_MAP: + map_attr.map_type = ctrl->map_type; + map_attr.map_flags = ctrl->map_flags; + map_attr.key_size = ctrl->key_size; + map_attr.value_size = ctrl->value_size; + map_attr.max_entries = ctrl->max_entries; + fd = bpf_create_map_xattr(&map_attr); + if (fd < 0) { + goto err; + } + ctrl->map_fd = fd; + break; + case VIRTIO_NET_BPF_CMD_FREE_MAP: + close(ctrl->map_fd); + break; + case VIRTIO_NET_BPF_CMD_LOOKUP_ELEM: + err = bpf_map_lookup_elem(ctrl->map_fd, key, val); + break; + case VIRTIO_NET_BPF_CMD_GET_FIRST: + err = bpf_map_get_next_key(ctrl->map_fd, NULL, val); + break; + case VIRTIO_NET_BPF_CMD_GET_NEXT: + err = bpf_map_get_next_key(ctrl->map_fd, key, val); + break; + case VIRTIO_NET_BPF_CMD_UPDATE_ELEM: + err = bpf_map_update_elem(ctrl->map_fd, key, val, ctrl->flags); + break; + case VIRTIO_NET_BPF_CMD_DELETE_ELEM: + err = bpf_map_delete_elem(ctrl->map_fd, key); + default: + error_report("map operation not implemented %d", ctrl->cmd); + goto err; + } + + if (err) { + goto err; + } + + s = iov_from_buf(iov, iov_cnt, 0, ctrl, sizeof(*ctrl) + buf_len); + if (s != sizeof(*ctrl) + buf_len) { + error_report("failed to write map operation result"); + goto err; + } + + free(ctrl); + return VIRTIO_NET_OK; + +err: + if (ctrl) { + free(ctrl); + } +#endif + return VIRTIO_NET_ERR; +} + static int virtio_net_handle_ebpf_prog(VirtIONet *n, struct iovec *iov, unsigned int iov_cnt) { @@ -1053,6 +1139,8 @@ static int virtio_net_handle_ebpf(VirtIONet *n, uint8_t cmd, { if (cmd == VIRTIO_NET_CTRL_EBPF_PROG) { return virtio_net_handle_ebpf_prog(n, iov, iov_cnt); + } else if (cmd == VIRTIO_NET_CTRL_EBPF_MAP) { + return virtio_net_handle_ebpf_map(n, iov, iov_cnt); } return VIRTIO_NET_ERR; diff --git a/include/standard-headers/linux/virtio_net.h b/include/standard-headers/linux/virtio_net.h index 83292c81bc..cca234e0e8 100644 --- a/include/standard-headers/linux/virtio_net.h +++ b/include/standard-headers/linux/virtio_net.h @@ -281,11 +281,34 @@ struct virtio_net_ctrl_ebpf_prog { uint8_t insns[0]; }; +struct virtio_net_ctrl_ebpf_map { + __virtio32 buf_len; + __virtio32 cmd; + __virtio32 map_type; + __virtio32 key_size; + __virtio32 value_size; + __virtio32 max_entries; + __virtio32 map_flags; + __virtio32 map_fd; + __virtio64 flags; + uint8_t buf[0]; +}; + #define VIRTIO_NET_CTRL_EBPF 6 #define VIRTIO_NET_CTRL_EBPF_PROG 1 + #define VIRTIO_NET_CTRL_EBPF_MAP 2 /* Commands for VIRTIO_NET_CTRL_EBPF_PROG */ #define VIRTIO_NET_BPF_CMD_SET_OFFLOAD 1 #define VIRTIO_NET_BPF_CMD_UNSET_OFFLOAD 2 +/* Commands for VIRTIO_NET_CTRL_EBPF_MAP */ +#define VIRTIO_NET_BPF_CMD_CREATE_MAP 1 +#define VIRTIO_NET_BPF_CMD_FREE_MAP 2 +#define VIRTIO_NET_BPF_CMD_UPDATE_ELEM 3 +#define VIRTIO_NET_BPF_CMD_LOOKUP_ELEM 4 +#define VIRTIO_NET_BPF_CMD_DELETE_ELEM 5 +#define VIRTIO_NET_BPF_CMD_GET_FIRST 6 +#define VIRTIO_NET_BPF_CMD_GET_NEXT 7 + #endif /* _LINUX_VIRTIO_NET_H */ -- 2.20.1