From patchwork Tue Jul 13 15:37:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Melnichenko X-Patchwork-Id: 1504704 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=daynix-com.20150623.gappssmtp.com header.i=@daynix-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=Yrkz6mRO; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GPPtQ2wPvz9sXN for ; Wed, 14 Jul 2021 01:38:37 +1000 (AEST) Received: from localhost ([::1]:46812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3KUT-0001rC-Ss for incoming@patchwork.ozlabs.org; Tue, 13 Jul 2021 11:38:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3KU4-0001pl-Gy for qemu-devel@nongnu.org; Tue, 13 Jul 2021 11:38:08 -0400 Received: from mail-lf1-x12d.google.com ([2a00:1450:4864:20::12d]:42926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3KU2-0003Ln-6g for qemu-devel@nongnu.org; Tue, 13 Jul 2021 11:38:08 -0400 Received: by mail-lf1-x12d.google.com with SMTP id 8so39328377lfp.9 for ; Tue, 13 Jul 2021 08:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VZcva1w0YsTCDAr5AsPAqXS01llpV02/KrLMUdw59do=; b=Yrkz6mROgPZnD4oQfhgzBSL4zNcvfT9fr405tdQhVhwkf2lDc7yNwjLaKpqtetQIor ZI8F8M+LJdpREwXU1Z9g9YJMnL6qSgagRV2zPIj8XqpZj7jxkVobqm+v3Q1qQyxF5qPP 0O5WS90OFES/QLM/iv4GnQ/6RHvzrk4eMebwjnEcCv2HxuZnz82RGFFHLZGAYbSScFi+ N7DtHAxt1pR0eGHzecQROoVkIrlq6pSCRH1G2EtsogDJRwfrhHrLHMEVCTgS4QbrEB06 eMdkQKN4XGE9r/CefumEwZgRKF7KbwXmXCpI0tZIyFTPWxUqA3q9HiytVO5Yn5u8dMFK mmJg== 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=VZcva1w0YsTCDAr5AsPAqXS01llpV02/KrLMUdw59do=; b=sZO5WeJoLzTS/nQjZkzvL042i+8yxwskZkstdYksS2XcnbsScFG+2+HU4ZsFyKZf/z w0iBStZse+9cCYUmruzH3ZenjaQDT/JkZEDosfxiNQ6XcRyfzBWvCnH9EepiZ+UEydRW A2VVYR/QU83vF6c8Z2pF9SiwaicqWe9QBtEFhrLW1zRxfriD5SOD2QtyLSfeKb7laFzl VZmu/gcKXlzFva4q75bOLk4GVFsnyuJoCxSzrJdNiGsncPkVS4X33wP42TYauaq0OWKo Z/EjPlY1oldVaAxYJYKZGc6znKlTac8J/5xV9frjWCoAazV8MlTlCU/cvpvU8LA83Mo6 D/BQ== X-Gm-Message-State: AOAM531r08nZDlia2QzTKKNezBqoDncY29Ijq4VY44Q/PbFoWHz5W3vu pvdXO8CDyBWor5ARtJlr6iFwjw== X-Google-Smtp-Source: ABdhPJzsRYAsnlheCqGL7cPOAN8TPEPJkF86V8rz17d5jzuGXwnPyunDJIBDfwEQgzX/y+IdLXmkLA== X-Received: by 2002:a19:f716:: with SMTP id z22mr3988587lfe.13.1626190684811; Tue, 13 Jul 2021 08:38:04 -0700 (PDT) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id i5sm131447lfv.246.2021.07.13.08.38.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jul 2021 08:38:04 -0700 (PDT) From: Andrew Melnychenko To: mst@redhat.com, yuri.benditovich@daynix.com, jasowang@redhat.com, armbru@redhat.com, eblake@redhat.com, berrange@redhat.com Subject: [PATCH 2/5] virtio-net: Added property to load eBPF RSS with fds. Date: Tue, 13 Jul 2021 18:37:55 +0300 Message-Id: <20210713153758.323614-3-andrew@daynix.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210713153758.323614-1-andrew@daynix.com> References: <20210713153758.323614-1-andrew@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::12d; envelope-from=andrew@daynix.com; helo=mail-lf1-x12d.google.com X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yan@daynix.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" eBPF RSS program and maps now may be passed during initialization. Initially was implemented for libvirt to launch qemu without permissions. Signed-off-by: Andrew Melnychenko --- hw/net/virtio-net.c | 77 ++++++++++++++++++++++++++++++++-- include/hw/virtio/virtio-net.h | 1 + 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index bd7958b9f0..0602b1772e 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -41,6 +41,7 @@ #include "sysemu/sysemu.h" #include "trace.h" #include "monitor/qdev.h" +#include "monitor/monitor.h" #include "hw/pci/pci.h" #include "net_rx_pkt.h" #include "hw/virtio/vhost.h" @@ -1223,14 +1224,81 @@ static void virtio_net_detach_epbf_rss(VirtIONet *n) virtio_net_attach_ebpf_to_backend(n->nic, -1); } -static bool virtio_net_load_ebpf(VirtIONet *n) +static int virtio_net_get_ebpf_rss_fds(char *str, char *fds[], int nfds) { - if (!virtio_net_attach_ebpf_to_backend(n->nic, -1)) { - /* backend does't support steering ebpf */ + char *ptr = str; + char *cur = NULL; + size_t len = strlen(str); + int i = 0; + + for (; i < nfds && ptr < str + len;) { + cur = strchr(ptr, ':'); + + if (cur == NULL) { + fds[i] = g_strdup(ptr); + } else { + fds[i] = g_strndup(ptr, cur - ptr); + } + + i++; + if (cur == NULL) { + break; + } else { + ptr = cur + 1; + } + } + + return i; +} + +static bool virtio_net_load_ebpf_fds(VirtIONet *n) +{ + char *fds_strs[EBPF_RSS_MAX_FDS]; + int fds[EBPF_RSS_MAX_FDS]; + int nfds; + int ret = false; + Error *errp; + int i = 0; + + if (n == NULL || !n->ebpf_rss_fds) { return false; } - return ebpf_rss_load(&n->ebpf_rss); + nfds = virtio_net_get_ebpf_rss_fds(n->ebpf_rss_fds, + fds_strs, EBPF_RSS_MAX_FDS); + for (i = 0; i < nfds; i++) { + fds[i] = monitor_fd_param(monitor_cur(), fds_strs[i], &errp); + } + + if (nfds == EBPF_RSS_MAX_FDS) { + ret = ebpf_rss_load_fds(&n->ebpf_rss, fds[0], fds[1], fds[2], fds[3]); + } + + if (!ret) { + for (i = 0; i < nfds; i++) { + close(fds[i]); + } + } + + for (i = 0; i < nfds; i++) { + g_free(fds_strs[i]); + } + + return ret; +} + +static bool virtio_net_load_ebpf(VirtIONet *n) +{ + bool ret = true; + + if (virtio_net_attach_ebpf_to_backend(n->nic, -1)) { + if (!(n->ebpf_rss_fds + && virtio_net_load_ebpf_fds(n))) { + ret = ebpf_rss_load(&n->ebpf_rss); + } + } + + return ret; } static void virtio_net_unload_ebpf(VirtIONet *n) @@ -3605,6 +3673,7 @@ static Property virtio_net_properties[] = { VIRTIO_NET_F_RSS, false), DEFINE_PROP_BIT64("hash", VirtIONet, host_features, VIRTIO_NET_F_HASH_REPORT, false), + DEFINE_PROP_STRING("ebpf_rss_fds", VirtIONet, ebpf_rss_fds), DEFINE_PROP_BIT64("guest_rsc_ext", VirtIONet, host_features, VIRTIO_NET_F_RSC_EXT, false), DEFINE_PROP_UINT32("rsc_interval", VirtIONet, rsc_timeout, diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index 824a69c23f..993f2f3036 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -213,6 +213,7 @@ struct VirtIONet { VirtioNetRssData rss_data; struct NetRxPkt *rx_pkt; struct EBPFRSSContext ebpf_rss; + char *ebpf_rss_fds; }; void virtio_net_set_netclient_name(VirtIONet *n, const char *name,