From nobody Fri May 17 20:07:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696832192; cv=none; d=zohomail.com; s=zohoarc; b=b/Lytusl9Cm65Unh9dNZM/Scmd9RHVwB0Zp4+FIhC+RG8YuzjYmkmm477VuPGYPEv447aEfzvqFTjs4WmDoirAjhOGMzE1AOJMJsfxG4Q3cuRQExErMqVeGyWopbowe+kq04TcOAsTiJ0vlZX+MwyzBp6OA5z1jlfK7IsfQEoA4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696832192; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=C/1ePbcBB8Uz0B+0Begvyi1qtAYmZ4EhUM+N9mhL7YA=; b=a3lnLE6TagN6X3OvOTcpOief/QW6vF0GAY4LaYCWgq3kM1eBWiIy0QfK0gTGEl4ZUKmBftPFkQKNykzdyCW7zjoYCjNmYUoCUKOtMgEwb8T9FnMVGUtL930a+BMFdZnEYPHYDW1Tiam0MS01seLlCtCTu6fEyTzWhMw5OIZnsEA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1696832192827275.4263785588464; Sun, 8 Oct 2023 23:16:32 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-421-ryFYl-7rOd-RcYaZqZEcNg-1; Mon, 09 Oct 2023 02:16:29 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 95E5481D783; Mon, 9 Oct 2023 06:16:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48FC720268C8; Mon, 9 Oct 2023 06:16:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AE73119465A3; Mon, 9 Oct 2023 06:16:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3117C194658C for ; Mon, 9 Oct 2023 06:16:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2067B215671F; Mon, 9 Oct 2023 06:16:25 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 18F5C215670B for ; Mon, 9 Oct 2023 06:16:25 +0000 (UTC) Received: from us-smtp-inbound-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EEF428002B2 for ; Mon, 9 Oct 2023 06:16:24 +0000 (UTC) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-363-AHlabAHWM1uQz-B6WwzudQ-1; Mon, 09 Oct 2023 02:16:22 -0400 Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-9936b3d0286so741533166b.0 for ; Sun, 08 Oct 2023 23:16:22 -0700 (PDT) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id cw11-20020a170906c78b00b0099e12a49c8fsm6446477ejb.173.2023.10.08.23.16.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 23:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696832191; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=C/1ePbcBB8Uz0B+0Begvyi1qtAYmZ4EhUM+N9mhL7YA=; b=VAfyrD83/vzHYpLXw26eaxW62OfB9kX+XrfJDZFFF1orzAm/rne/k5KbiCpK0p4kDcim5C 7A2wJTvhhtaDAz4R4tgOyHQp3DmE0tpsgGKTMuqQUnHtRbl3ep0sdpAV1IjcEl6H6g9aZU Dfj21GdhPdK6nNG5G/02AYTULqjOR5Y= X-MC-Unique: ryFYl-7rOd-RcYaZqZEcNg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: AHlabAHWM1uQz-B6WwzudQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696832181; x=1697436981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C/1ePbcBB8Uz0B+0Begvyi1qtAYmZ4EhUM+N9mhL7YA=; b=xLGMSUfFnJsQyQ/kpJmynlbMxilYVsCN0LH3bKjoGRSchyLp/cJFJ7LCSNIeg2L65s Vh/9wU2VL+hL0ujCg0MuYdkv8NneR/3jJlQb0m6wCEl9rleqMJnLiWiqKmUYg/mlcgow Md9JPbSEuP3t6mAnPcdWaDfIj2p1ekFJYF9dtlVv3CuHozi6dKJjS6ckjjLEgfXuzDFO dbb8A325iVEjHGheMLzBxh80M0JRpiwKfNJtw+wr5pTMQNEGgNGZktiA//D8Tprwrv+6 kR3XFnKCxhs9FNXnmwEHVmGYUeSJvDOrL8R9IMwrMORTJXta15gvVps+xBa5mj0qhQzw 1LGQ== X-Gm-Message-State: AOJu0Yyj01mbFBZmnAg8N+s2DIfRdrmcwhPcQx9bVjNtavnI07BvPr14 RRIb5N0ttBtgbKeztgVyLNpo6MhY0JEtM2pF1ws= X-Google-Smtp-Source: AGHT+IF7jP9IhCzFLQ0J4BuLN78dHdCjJSJdCh/Fgv78J5jzmY9Od01gi6L26M+yD0ZDIUtJmgxaJQ== X-Received: by 2002:a17:906:2da:b0:9b7:1e26:e2ea with SMTP id 26-20020a17090602da00b009b71e26e2eamr12074674ejk.41.1696832181264; Sun, 08 Oct 2023 23:16:21 -0700 (PDT) From: Andrew Melnychenko To: libvir-list@redhat.com Subject: [RFC PATCH 1/4] qemu_monitor: Added QEMU's "request-ebpf" support. Date: Mon, 9 Oct 2023 09:16:11 +0300 Message-ID: <20231009061616.1663330-2-andrew@daynix.com> In-Reply-To: <20231009061616.1663330-1-andrew@daynix.com> References: <20231009061616.1663330-1-andrew@daynix.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yan@daynix.com, yuri.benditovich@daynix.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: daynix.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696832193376100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Added code for monitor and monitor_json. The "request-ebpf" return's eBPF binary object encoded in base64. The function qemuMonitorGetEbpf() returns a decoded blob. QEMU provides eBPF that can be loaded and passed to it from Libvirt. QEMU requires exact eBPF program/maps, so it can be retrieved using QAPI. To load eBPF program - administrative capabilities are required, so Libvirt= may load it and pass it to the QEMU instance. For now, there is only "RSS"(Receive Side Scaling) for virtio-net eBPF prog= ram and maps. Signed-off-by: Andrew Melnychenko --- src/qemu/qemu_monitor.c | 23 +++++++++++++++++++++++ src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 21 +++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 +++ 4 files changed, 50 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 320729f067..07596c78ee 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4512,3 +4512,26 @@ qemuMonitorGetStatsByQOMPath(virJSONValue *arr, =20 return NULL; } + +void * +qemuMonitorGetEbpf(qemuMonitor *mon, const char *ebpfName, size_t *size) +{ + QEMU_CHECK_MONITOR_NULL(mon); + g_autoptr(virJSONValue) reply =3D NULL; + const char *ebpfBase64 =3D NULL; + void *ebpfObject =3D NULL; + + if (ebpfName =3D=3D NULL || size =3D=3D NULL) + return NULL; + + reply =3D qemuMonitorJSONGetEbpf(mon, ebpfName); + + if (reply =3D=3D NULL) + return NULL; + + ebpfBase64 =3D virJSONValueObjectGetString(reply, "object"); + + ebpfObject =3D g_base64_decode(ebpfBase64, size); + + return ebpfObject; +} diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 6c590933aa..15f32f105c 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1579,3 +1579,6 @@ qemuMonitorExtractQueryStats(virJSONValue *info); virJSONValue * qemuMonitorGetStatsByQOMPath(virJSONValue *arr, char *qom_path); + +void * +qemuMonitorGetEbpf(qemuMonitor *mon, const char *ebpfName, size_t *size); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8152eea9a0..a7d0865ddc 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8851,3 +8851,24 @@ qemuMonitorJSONQueryStats(qemuMonitor *mon, =20 return virJSONValueObjectStealArray(reply, "return"); } + + +virJSONValue * +qemuMonitorJSONGetEbpf(qemuMonitor *mon, const char *ebpfName) +{ + g_autoptr(virJSONValue) cmd =3D NULL; + g_autoptr(virJSONValue) reply =3D NULL; + + if (!(cmd =3D qemuMonitorJSONMakeCommand("request-ebpf", + "s:id", ebpfName, NULL))) + return NULL; + + if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) + return NULL; + + /* return empty hash */ + if (qemuMonitorJSONHasError(reply, "CommandNotFound")) + return NULL; + + return virJSONValueObjectStealObject(reply, "return"); +} diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 06023b98ea..6a2fc963ba 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -825,3 +825,6 @@ qemuMonitorJSONQueryStats(qemuMonitor *mon, qemuMonitorQueryStatsTargetType target, char **vcpus, GPtrArray *providers); + +virJSONValue * +qemuMonitorJSONGetEbpf(qemuMonitor *mon, const char *ebpfName); --=20 2.42.0 From nobody Fri May 17 20:07:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696832201; cv=none; d=zohomail.com; s=zohoarc; b=XY1QbJG/2e1meAEsq8vp6AGmbMdXs1LHiaujacVbnvIn7334yr6W2N6c9GdSlfbWcHnCLojP4hegVls4fT91FWd1i4mwyf08KMU883J1JKHxCr3pLVSYL+Yhd6I66+T9CgzHZsYM4PHAACrqH9nmbJWPpHwt0ueX/yVfCgaymMI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696832201; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=N2b8NE4/X+MRzNqvf1YiqMPPLPnfttC7yb68JWeyUb0=; b=MFfQsIfVxzLlzjjxXcFTVnal5yCZdrx98kgXkU4WFMWZWIqY9VXkPf+O8G2ZYxqSktT+nWGS7cmKhHTYcqzo/oAKgUlPKGk9uq7RvAMdC85YtbFI1kgFOR+Qt6wr94+pUgOoAR8nGnbrtfNn4ruZw3mrahs5dJ/np9+SD+Q4LCA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1696832201550849.2256432445466; Sun, 8 Oct 2023 23:16:41 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-690-0nja2TNWN2mL47su97xyJA-1; Mon, 09 Oct 2023 02:16:31 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D810D3C170AD; Mon, 9 Oct 2023 06:16:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF1D563F50; Mon, 9 Oct 2023 06:16:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E94C319466F1; Mon, 9 Oct 2023 06:16:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 70836194658C for ; Mon, 9 Oct 2023 06:16:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 50DE840C6EC1; Mon, 9 Oct 2023 06:16:26 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 48FC040C6EC0 for ; Mon, 9 Oct 2023 06:16:26 +0000 (UTC) Received: from us-smtp-inbound-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 22DC1185A79C for ; Mon, 9 Oct 2023 06:16:26 +0000 (UTC) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-44-O9J3-9KUP0mRnAXLPengHA-1; Mon, 09 Oct 2023 02:16:23 -0400 Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-99c1c66876aso750733266b.2 for ; Sun, 08 Oct 2023 23:16:23 -0700 (PDT) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id cw11-20020a170906c78b00b0099e12a49c8fsm6446477ejb.173.2023.10.08.23.16.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 23:16:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696832200; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=N2b8NE4/X+MRzNqvf1YiqMPPLPnfttC7yb68JWeyUb0=; b=EB8XKTOkc25iSgNQxbBebbanqAJGbej1G6DFbfnjpuDjVjc75Wt/mlfESB4PFhJS1v+933 LrJKdVTXw+vHaj4YHXcBlKUnRqKKPDay9qoHGbNPHAQ/UB+mC3eMiSBBRZEBP8Gwsy6Iue VF1HMkP3toxksw5EqKfLrWOV2pEEpBU= X-MC-Unique: 0nja2TNWN2mL47su97xyJA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: O9J3-9KUP0mRnAXLPengHA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696832182; x=1697436982; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N2b8NE4/X+MRzNqvf1YiqMPPLPnfttC7yb68JWeyUb0=; b=YJq8CVIzfNbwJNGMXqQhOy8qhsyzi6ib7eGFXeD5DYitRP7y8WX89/g0T59pWhZHy5 M6nZ4oIasmFf7GERFHj0528DHIbwDXKOg2drpdA3YiP5V3j7TOHv8SSGXXNujIewbIAz Tg2hkWcZiFeWUDLUb35D9uR35i3X2Eb++lA0fxevg8SGR92jFJRPGF5s85jKyFQwwoGH OdH5q9B5qkhx3QkYX5SxyzZYPNwUqECMsUnHkUFBUSKmpLqH/4GeMY++QZ90tFnyjyLy ztJGkJx6TgJisyo+QCDKCQEIU0oJ4B0wNVoIL90YKr6aymyjt8uJ2NiqMcYTqbJHNyI2 bp2Q== X-Gm-Message-State: AOJu0YyoWf9co/HGzrWeIaGexvNbWBdgLvp5JxhBFywPIJPj0ZbUssgi xXcOu005oGHjA9h39lNzpO45+zO71m0989HPOLE= X-Google-Smtp-Source: AGHT+IGxfTCogYSajXqTpZuFiwP5xv8RulVDJnwWn+W3iRm0jmlnt0JRnZ/DkysO4h0r3lnaS7udGw== X-Received: by 2002:a17:906:5341:b0:9a1:f21e:cdff with SMTP id j1-20020a170906534100b009a1f21ecdffmr13932487ejo.23.1696832182236; Sun, 08 Oct 2023 23:16:22 -0700 (PDT) From: Andrew Melnychenko To: libvir-list@redhat.com Subject: [RFC PATCH 2/4] qemu_capabilities: Added new capability ebpf_rss_fds for QEMU. Date: Mon, 9 Oct 2023 09:16:12 +0300 Message-ID: <20231009061616.1663330-3-andrew@daynix.com> In-Reply-To: <20231009061616.1663330-1-andrew@daynix.com> References: <20231009061616.1663330-1-andrew@daynix.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yan@daynix.com, yuri.benditovich@daynix.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: daynix.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696832203458100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Also, added logic for retrieving eBPF objects from QEMU. eBPF objects stored in the hash table during runtime. eBPF objects cached encoded in base64 in the .xml cache file. Signed-off-by: Andrew Melnychenko --- src/qemu/qemu_capabilities.c | 181 +++++++++++++++++++++++++++++++++++ src/qemu/qemu_capabilities.h | 4 + 2 files changed, 185 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3a1bfbf74d..d9b5d6fb22 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -698,6 +698,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 450 */ "run-with.async-teardown", /* QEMU_CAPS_RUN_WITH_ASYNC_TEARD= OWN */ "virtio-blk-vhost-vdpa", /* QEMU_CAPS_DEVICE_VIRTIO_BLK_VHOS= T_VDPA */ + "virtio-net.ebpf_rss_fds", /* QEMU_CAPS_VIRTIO_NET_EBPF_RSS_= FDS */ ); =20 =20 @@ -789,6 +790,9 @@ struct _virQEMUCaps { virQEMUCapsAccel kvm; virQEMUCapsAccel hvf; virQEMUCapsAccel tcg; + + /* Hash of ebpf objects virQEMUEbpfOBjectData */ + GHashTable *ebpfObjects; }; =20 struct virQEMUCapsSearchData { @@ -796,6 +800,18 @@ struct virQEMUCapsSearchData { const char *binaryFilter; }; =20 +struct virQEMUEbpfOBjectData { + void *ebpfData; + size_t ebpfSize; +}; + +void virQEMUEbpfOBjectDataDestroy(gpointer data) { + if (!data) + return; + struct virQEMUEbpfOBjectData *object =3D data; + g_free(object->ebpfData); + g_free(data); +} =20 static virClass *virQEMUCapsClass; static void virQEMUCapsDispose(void *obj); @@ -836,6 +852,19 @@ const char *virQEMUCapsArchToString(virArch arch) } =20 =20 +const void * +virQEMUCapsGetEbpf(virQEMUCaps *qemuCaps, const char *id, size_t *size) +{ + struct virQEMUEbpfOBjectData *object =3D virHashLookup(qemuCaps->ebpfO= bjects, id); + + if (!object) + return NULL; + + *size =3D object->ebpfSize; + return object->ebpfData; +} + + /* Checks whether a domain with @guest arch can run natively on @host. */ bool @@ -1426,6 +1455,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsVirtioBlk[] =3D { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[= ] =3D { { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, { "rss", QEMU_CAPS_VIRTIO_NET_RSS, NULL }, + { "ebpf_rss_fds", QEMU_CAPS_VIRTIO_NET_EBPF_RSS_FDS, NULL }, }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPCIeRootPo= rt[] =3D { @@ -1804,6 +1834,8 @@ virQEMUCapsNew(void) qemuCaps->invalidation =3D true; qemuCaps->flags =3D virBitmapNew(QEMU_CAPS_LAST); =20 + qemuCaps->ebpfObjects =3D virHashNew(virQEMUEbpfOBjectDataDestroy); + return qemuCaps; } =20 @@ -1984,6 +2016,8 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps) ret->hypervCapabilities =3D g_memdup(qemuCaps->hypervCapabilities, sizeof(virDomainCapsFeatureHyperv)); =20 + ret->ebpfObjects =3D g_hash_table_ref(qemuCaps->ebpfObjects); + return g_steal_pointer(&ret); } =20 @@ -2026,6 +2060,8 @@ void virQEMUCapsDispose(void *obj) =20 g_free(qemuCaps->hypervCapabilities); =20 + g_hash_table_unref(qemuCaps->ebpfObjects); + virQEMUCapsAccelClear(&qemuCaps->kvm); virQEMUCapsAccelClear(&qemuCaps->hvf); virQEMUCapsAccelClear(&qemuCaps->tcg); @@ -4541,6 +4577,46 @@ virQEMUCapsValidateArch(virQEMUCaps *qemuCaps, xmlXP= athContextPtr ctxt) } =20 =20 +static int +virQEMUCapsParseEbpfObjects(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt) +{ + g_autofree xmlNodePtr *nodes =3D NULL; + size_t i; + int n; + + if ((n =3D virXPathNodeSet("./ebpf", ctxt, &nodes)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to parse qemu cached eBPF object")); + return -1; + } + + for (i =3D 0; i < n; i++) { + g_autofree char *id =3D NULL; + g_autofree char *ebpf =3D NULL; + struct virQEMUEbpfOBjectData *ebpfObject =3D NULL; + + if (!(id =3D virXMLPropString(nodes[i], "id"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("missing eBPF object ID in QEMU capabilities = cache")); + return -1; + } + + if (!(ebpf =3D virXMLNodeContentString(nodes[i]))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s %s", + _("can't get eBPF base64 data from cache for ID= : "), id); + return -1; + } + + ebpfObject =3D g_malloc(sizeof(*ebpfObject)); + ebpfObject->ebpfData =3D g_base64_decode(ebpf, &ebpfObject->ebpfSi= ze); + + virHashAddEntry(qemuCaps->ebpfObjects, id, ebpfObject); + } + + return 0; +} + + /* * Parsing a doc that looks like * @@ -4688,6 +4764,8 @@ virQEMUCapsLoadCache(virArch hostArch, if (skipInvalidation) qemuCaps->invalidation =3D false; =20 + virQEMUCapsParseEbpfObjects(qemuCaps, ctxt); + return 0; } =20 @@ -4925,6 +5003,32 @@ virQEMUCapsFormatHypervCapabilities(virQEMUCaps *qem= uCaps, } =20 =20 +static int +virQEMUCapsFormatEbpfObjectsIterator(void *payload, const char *name, void= *opaque) +{ + virBuffer *buf =3D opaque; + struct virQEMUEbpfOBjectData *object =3D payload; + g_autofree char *objectBase64 =3D NULL; + + if (!buf || !object) + return 0; + + objectBase64 =3D g_base64_encode(object->ebpfData, object->ebpfSize); + if (!objectBase64) + return 0; + + virBufferAsprintf(buf, "\n", name); + virBufferAdjustIndent(buf, 2); + + virBufferAddStr(buf, objectBase64); + virBufferAddLit(buf, "\n"); + + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); + + return 0; +} + char * virQEMUCapsFormatCache(virQEMUCaps *qemuCaps) { @@ -5015,6 +5119,8 @@ virQEMUCapsFormatCache(virQEMUCaps *qemuCaps) if (qemuCaps->kvmSupportsSecureGuest) virBufferAddLit(&buf, "\n"); =20 + virHashForEach(qemuCaps->ebpfObjects, virQEMUCapsFormatEbpfObjectsIter= ator, &buf); + virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "\n"); =20 @@ -5437,6 +5543,79 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) } =20 =20 +static int +virQEMUCapsProbeQMPEbpfObject(virQEMUCaps *qemuCaps, const char *id, + qemuMonitor *mon) +{ + void *ebpfObject =3D NULL; + size_t size =3D 0; + + if (!id) + return -1; + + ebpfObject =3D qemuMonitorGetEbpf(mon, id, &size); + if(ebpfObject =3D=3D NULL) + return -1; + + struct virQEMUEbpfOBjectData *object =3D g_malloc(sizeof(*object)); + object->ebpfData =3D ebpfObject; + object->ebpfSize =3D size; + + virHashAddEntry(qemuCaps->ebpfObjects, id, object); + + return 0; +} + +static void virQEMUCapsProbeQMPSchemaEbpf(virQEMUCaps *qemuCaps, GHashTabl= e* schema, qemuMonitor *mon) { + if (schema =3D=3D NULL) + return; + + virJSONValue *requestSchema =3D virHashLookup(schema, "request-ebpf"); + if (!requestSchema) + return; + + const char *argType =3D virJSONValueObjectGetString(requestSchema, "ar= g-type"); + if (!argType) + return; + + virJSONValue *argSchema =3D virHashLookup(schema, argType); + if (!argSchema) + return; + + /* Get member id type*/ + virJSONValue *members =3D virJSONValueObjectGetArray(argSchema, "membe= rs"); + if (!members) + return; + + /* Find "id" type */ + virJSONValue *idSchema =3D NULL; + for (size_t i =3D 0; (idSchema =3D virJSONValueArrayGet(members, i)) != =3D NULL; ++i) { + const char *name =3D virJSONValueObjectGetString(idSchema, "name"); + if (strncmp(name, "id", 3) =3D=3D 0) + break; + } + + if (!idSchema) + return; + + const char *ebpfIds =3D virJSONValueObjectGetString(idSchema, "type"); + virJSONValue *ebpfIdsSchema =3D virHashLookup(schema, ebpfIds); + if (!ebpfIdsSchema) + return; + + virJSONValue *ebpfIdsArray =3D virJSONValueObjectGetArray(ebpfIdsSchem= a, "values"); + if (!ebpfIdsArray) + return; + + /* Try to request every eBPF */ + virJSONValue *id =3D NULL; + for (size_t i =3D 0; (id =3D virJSONValueArrayGet(ebpfIdsArray, i)) != =3D NULL; ++i) { + const char *name =3D virJSONValueGetString(id); + virQEMUCapsProbeQMPEbpfObject(qemuCaps, name, mon); + } +} + + static int virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qemuCaps, qemuMonitor *mon) @@ -5466,6 +5645,8 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qe= muCaps, virQEMUCapsSet(qemuCaps, cmd->flag); } =20 + virQEMUCapsProbeQMPSchemaEbpf(qemuCaps, schema, mon); + return 0; } =20 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3c4f7f625b..164dc003d0 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -677,6 +677,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 450 */ QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN, /* asynchronous teardown -run-with = async-teardown=3Don|off */ QEMU_CAPS_DEVICE_VIRTIO_BLK_VHOST_VDPA, /* virtio-blk-vhost-vdpa block= driver */ + QEMU_CAPS_VIRTIO_NET_EBPF_RSS_FDS, /* virtio-net ebpf_rss_fds feature = */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; @@ -895,3 +896,6 @@ int virQEMUCapsProbeQMPMachineTypes(virQEMUCaps *qemuCaps, virDomainVirtType virtType, qemuMonitor *mon); + +const void * +virQEMUCapsGetEbpf(virQEMUCaps *qemuCaps, const char *id, size_t *size); --=20 2.42.0 From nobody Fri May 17 20:07:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696832195; cv=none; d=zohomail.com; s=zohoarc; b=jRszkyRVChHg/VFWxUjiGqMZQf0HxOIiClHJA026TBw4zFb5dSxEcVStIMLTKdeX8u5PjMMPmt7xj2fhEascto1BaBkkeSOxqTR6J2X8rtcW8djSIyyof1fpAwGFgeAa0jLvxUkb+bdCt+ZdunnUSrGw7+G/8VAsotS/mX39vmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696832195; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UO8SbMmUq5CrUoap3fcaksm7b9cYjvbUGYRV1m632As=; b=ZKe/r3fxBO80ipMNf8Pc/plbrK77FzFuUnxDE7BXTVZb/rabb0PGtrCyiSgrGUBWoIOGuWDAdMtFIV8kEkIto6xq6qgTFDrV4THnr6wCd/ne82doQLJeQdTKskgE9c802ZR96o/KKxnpwXU5dt+Vuj0AbibY7jf0Dw3ffKvp2mw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1696832195160715.7123062870128; Sun, 8 Oct 2023 23:16:35 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-629-ux5Ulw_5PBaWzNVlOmPKLw-1; Mon, 09 Oct 2023 02:16:30 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 70CE081D88D; Mon, 9 Oct 2023 06:16:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A21B40C6EA8; Mon, 9 Oct 2023 06:16:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 232051946595; Mon, 9 Oct 2023 06:16:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 75353194658C for ; Mon, 9 Oct 2023 06:16:27 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 474A040C6EBF; Mon, 9 Oct 2023 06:16:27 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 407B640C6EC0 for ; Mon, 9 Oct 2023 06:16:27 +0000 (UTC) Received: from us-smtp-inbound-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 232D7185A73B for ; Mon, 9 Oct 2023 06:16:27 +0000 (UTC) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-79-67C_gkztN3y8j5s2a-YxQw-1; Mon, 09 Oct 2023 02:16:24 -0400 Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-9b2cee40de8so902983866b.1 for ; Sun, 08 Oct 2023 23:16:24 -0700 (PDT) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id cw11-20020a170906c78b00b0099e12a49c8fsm6446477ejb.173.2023.10.08.23.16.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 23:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696832194; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UO8SbMmUq5CrUoap3fcaksm7b9cYjvbUGYRV1m632As=; b=aozGK+jHjK2QORu7cD380FSdBVyYUL2zJk88Cn+Wg2tSXGaXmHyncTwaIjLBnnus6Al0W9 FyK/HQbefzkp6uLXASQRqy05tClDZyzJQHG2sNZQSDMq8BH2hcWPDswNX3p8e4BdgNrgCv v9WbxF+UxbYQR2qvQ4G6rWGtexNZ5bo= X-MC-Unique: ux5Ulw_5PBaWzNVlOmPKLw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 67C_gkztN3y8j5s2a-YxQw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696832183; x=1697436983; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UO8SbMmUq5CrUoap3fcaksm7b9cYjvbUGYRV1m632As=; b=Lk0ao4g32BoEJJCqRuXaF6D3Nj97uPeyO+ohWoLYvqQNq5JDOlNqOuceKLsgk4DQW8 9zBkUq8GakobBQBU5QUk48C9/8+wF9lcXSNKGqjYP4N+gnb4IVMnr6hnFFs8JbWNuRUh 4jTUsiHTsQTnEEeY/o2Fo6RXlYBPqaWIrcAdWLc4jRm0TvXHWc9h2cmGoB7yWBrB+EOH qesIXdpusI3VdDK553RI4AUsVSvEXmxN4VlIal/1QUUcVnhjhHLsktgptgGbZGeJgbe5 JcnpQR9+uywslFOuG7AsHxB2uR4xr8mmAdGbgCXgDiLkMknF8SKbPS6Cekzd0H2+ugfa ZWtA== X-Gm-Message-State: AOJu0YwBi/2EFaKsemWgu72vx2ZT9ex59F15Sbn2DpPbBaK62jlJGf+g HGOZUYIGuforykpKlUt7z1qtiRR6zA1L9we/4xw= X-Google-Smtp-Source: AGHT+IFEEnO412A1rGjk/lA4h5bRk/1MH1BXP1lnvhLVcw59qkN+bAYk3ylW/tY+ry6ifwDgU1ynEw== X-Received: by 2002:a17:906:c106:b0:9b8:df8e:cbd0 with SMTP id do6-20020a170906c10600b009b8df8ecbd0mr7766831ejc.37.1696832183205; Sun, 08 Oct 2023 23:16:23 -0700 (PDT) From: Andrew Melnychenko To: libvir-list@redhat.com Subject: [RFC PATCH 3/4] qemu_interface: Added routine for loading the eBPF objects. Date: Mon, 9 Oct 2023 09:16:13 +0300 Message-ID: <20231009061616.1663330-4-andrew@daynix.com> In-Reply-To: <20231009061616.1663330-1-andrew@daynix.com> References: <20231009061616.1663330-1-andrew@daynix.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yan@daynix.com, yuri.benditovich@daynix.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: daynix.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696832197339100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Also, added dependencies for libbpf with bpf option. Signed-off-by: Andrew Melnychenko --- meson.build | 6 ++++++ meson_options.txt | 1 + src/qemu/meson.build | 1 + src/qemu/qemu_interface.c | 42 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_interface.h | 4 ++++ 5 files changed, 54 insertions(+) diff --git a/meson.build b/meson.build index de23fbda1e..b68e916246 100644 --- a/meson.build +++ b/meson.build @@ -1381,6 +1381,11 @@ if yajl_dep.found() conf.set('WITH_YAJL', 1) endif =20 +bpf_version =3D '1.1.0' +bpf_dep =3D dependency('libbpf', version: '>=3D' + bpf_version, required: = get_option('bpf')) +if bpf_dep.found() + conf.set('WITH_BPF', 1) +endif =20 # generic build dependencies checks =20 @@ -2269,6 +2274,7 @@ libs_summary =3D { 'udev': udev_dep.found(), 'xdr': xdr_dep.found(), 'yajl': yajl_dep.found(), + 'bpf': bpf_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 7c428a9eb0..092b2efe06 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -44,6 +44,7 @@ option('udev', type: 'feature', value: 'auto', descriptio= n: 'udev support') option('wireshark_dissector', type: 'feature', value: 'auto', description:= 'wireshark support') option('wireshark_plugindir', type: 'string', value: '', description: 'wir= eshark plugins directory for use when installing wireshark plugin') option('yajl', type: 'feature', value: 'auto', description: 'yajl support') +option('bpf', type: 'feature', value: 'auto', description: 'qemu libbpf su= pport') =20 =20 # build driver options diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 64c62e584f..afd9133ae0 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -105,6 +105,7 @@ if conf.has('WITH_QEMU') selinux_dep, src_dep, xdr_dep, + bpf_dep, ], include_directories: [ conf_inc_dir, diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 8856bb95a8..a3a43a43c5 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -36,6 +36,7 @@ =20 #include #include +#include =20 #define VIR_FROM_THIS VIR_FROM_QEMU =20 @@ -763,3 +764,44 @@ qemuInterfaceOpenVhostNet(virDomainObj *vm, virDomainAuditNetDevice(vm->def, net, vhostnet_path, vhostfdSize); return 0; } + + +int qemuInterfaceLoadEbpf(const void *ebpfObject, size_t ebpfSize, void **= retLibbpfObj, int *fds, int nfds) { + int err =3D 0; + int i =3D 0; + + struct bpf_object *obj =3D bpf_object__open_mem(ebpfObject, ebpfSize, = NULL); + err =3D libbpf_get_error(obj); + if(err) { + return -1; + } + + struct bpf_program *prog; + struct bpf_map *map; + + err =3D bpf_object__load(obj); + if (err) { + return -1; + } + + bpf_object__for_each_program(prog, obj) { + fds[i] =3D bpf_program__fd(prog); + ++i; + } + + bpf_object__for_each_map(map, obj) { + fds[i] =3D bpf_map__fd(map); + ++i; + } + + *retLibbpfObj =3D obj; + + return i; +} + + +void qemuInterfaceCloseEbpf(void *libbpfObj) +{ + if(libbpfObj) + bpf_object__close(libbpfObj); +} diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h index 6eed3e6bd7..dbc1fd625c 100644 --- a/src/qemu/qemu_interface.h +++ b/src/qemu/qemu_interface.h @@ -55,3 +55,7 @@ int qemuInterfaceOpenVhostNet(virDomainObj *def, =20 int qemuInterfacePrepareSlirp(virQEMUDriver *driver, virDomainNetDef *net); + +int qemuInterfaceLoadEbpf(const void *ebpfObject, size_t ebpfSize, void **= retLibbpfObj, int *fds, int nfds); + +void qemuInterfaceCloseEbpf(void *libbpfObj); --=20 2.42.0 From nobody Fri May 17 20:07:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1696832198; cv=none; d=zohomail.com; s=zohoarc; b=ds3cKvmecq/zeu6fj5xl4jM1BQKfvGkQ0FkmvEr1s1Jif0fglEV4Xb6J/fmhopaUTd9khTQAgql1AR3iDo8f9BJbDwhTiEUJRYNyNg/Ob5nMXns5aC7k2KSK18F4HzUck52APYAb30Pst7eFU/5EIxiZCuJB6wXUJ+b18lSDWzc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696832198; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lQzL+qMYPskOipvsA5zfhSw7/XbIqWgW6TnFec4XVNM=; b=aUrxPfqVNCN8pgX+9JYIui+p7myhhcI2dnRJx/BzDixafPQz01wwL67eHUIyhgdKeVKV6foe3az0EDP7ODq4dWKxGtsqfDWM7UjEncUptfkbcYPLSzubdvGZIU9AZwadBh9LZ8oa7x95Ristix3e7/is+aUN/ifRw3bjyBuEAwg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1696832198293773.8686347092432; Sun, 8 Oct 2023 23:16:38 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-553-V1MDtamxMAy5ZAfxec8RVA-1; Mon, 09 Oct 2023 02:16:35 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9493E3816C87; Mon, 9 Oct 2023 06:16:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 821BF2027045; Mon, 9 Oct 2023 06:16:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5A23A1946595; Mon, 9 Oct 2023 06:16:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6DAEC194658C for ; Mon, 9 Oct 2023 06:16:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5E23347AD4A; Mon, 9 Oct 2023 06:16:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 565274026FB for ; Mon, 9 Oct 2023 06:16:32 +0000 (UTC) Received: from us-smtp-inbound-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 34D053816C82 for ; Mon, 9 Oct 2023 06:16:32 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-487-WlV7YRHSO82pUx5hB75EyA-2; Mon, 09 Oct 2023 02:16:25 -0400 Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-9b9ad5760b9so704271266b.3 for ; Sun, 08 Oct 2023 23:16:25 -0700 (PDT) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id cw11-20020a170906c78b00b0099e12a49c8fsm6446477ejb.173.2023.10.08.23.16.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 23:16:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696832197; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lQzL+qMYPskOipvsA5zfhSw7/XbIqWgW6TnFec4XVNM=; b=S1HyXqxw+h9hCudfy5CC/h5+9UnvrAV9BLRtSwGOxj6n3rVLQ6edjDw/ZuY3ajaOtpZ8Dz w3YuiCbYnmKfIo9+FEG30kYm7JEit8OcjGGFchTGo6X0gHaYYCYnCRaRucb1Ah/DCMXcBe Vu7E3ctRBSprT15kKcPlmNzCQGfiIp8= X-MC-Unique: V1MDtamxMAy5ZAfxec8RVA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: WlV7YRHSO82pUx5hB75EyA-2 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696832184; x=1697436984; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lQzL+qMYPskOipvsA5zfhSw7/XbIqWgW6TnFec4XVNM=; b=EJRtJhfpG/2jQxhVUmBpyV805Ut1yK8+qUwGawd9tZJcCxWyHYVmw142L644UjHEr0 raDjBxmKimtjpC9CD4O0ydyskBjPEC9lgx1zuRRe6gSAMOSDBxJ/DkCoTdw1hHdRrsG2 ykTNjzPMym8CniNB8aA1kQYYaOIq2wOLgSQQa3Q08sA8SmC3ZxPIlpuiUcoJhqGfUPyr ywcUBEVO3ZVCsyUVd3bM6COiNjGwzrSI6yVN8TwO2BdoOZsD6A7QJodkYKoZRNd4XzvK cefI5aicZ/WBOqlzlzDWxV53rSs3qNNqbtOGyZrpqU5yrUNIR/4nOFxAAx7eIxocJ5/6 Sh5w== X-Gm-Message-State: AOJu0YwkAAG43OfQE2/3mEYcb21d/zBEAVyDDd9ZQxzBB4jxyu4ih02m XIaHPnZ9iDPTd75tN0noZS71alvwHaE2kjfFesc= X-Google-Smtp-Source: AGHT+IEhcgoDkWPZJ4E/qsbDrhlBkc6pBqY9VeOj4ex+apQQwisefZSTVeCoA2qiUfcyOium50RCCg== X-Received: by 2002:a17:906:518c:b0:9ae:7081:402e with SMTP id y12-20020a170906518c00b009ae7081402emr13448249ejk.64.1696832184196; Sun, 08 Oct 2023 23:16:24 -0700 (PDT) From: Andrew Melnychenko To: libvir-list@redhat.com Subject: [RFC PATCH 4/4] qemu_command: Added "ebpf_rss_fds" support for virtio-net. Date: Mon, 9 Oct 2023 09:16:14 +0300 Message-ID: <20231009061616.1663330-5-andrew@daynix.com> In-Reply-To: <20231009061616.1663330-1-andrew@daynix.com> References: <20231009061616.1663330-1-andrew@daynix.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yan@daynix.com, yuri.benditovich@daynix.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: daynix.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1696832199411100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Added logic for loading the "RSS" eBPF program. eBPF file descriptors passed to the QEMU. Signed-off-by: Andrew Melnychenko --- src/qemu/qemu_command.c | 53 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.c | 4 ++++ src/qemu/qemu_domain.h | 3 +++ 3 files changed, 60 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8a7b80719f..ca6cb1bc7a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3786,6 +3786,23 @@ qemuBuildLegacyNicStr(virDomainNetDef *net) NULLSTR_EMPTY(net->info.alias)); } =20 +static char *qemuBuildEbpfRssArg(virDomainNetDef *net) { + qemuDomainNetworkPrivate *netpriv =3D QEMU_DOMAIN_NETWORK_PRIVATE(net); + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + size_t nfds; + GSList *n; + + if (netpriv->ebpfrssfds) { + nfds =3D 0; + for (n =3D netpriv->ebpfrssfds; n; n =3D n->next) { + virBufferAsprintf(&buf, "%s:", qemuFDPassDirectGetPath(n->data= )); + nfds++; + } + } + virBufferTrim(&buf, ":"); + + return virBufferContentAndReset(&buf); +} =20 virJSONValue * qemuBuildNicDevProps(virDomainDef *def, @@ -3871,6 +3888,11 @@ qemuBuildNicDevProps(virDomainDef *def, "T:failover", failover, NULL) < 0) return NULL; + if (net->driver.virtio.rss =3D=3D VIR_TRISTATE_SWITCH_ON && virQEM= UCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_EBPF_RSS_FDS)){ + g_autofree char *ebpf =3D qemuBuildEbpfRssArg(net); + if (virJSONValueObjectAdd(&props, "S:ebpf_rss_fds", ebpf, NULL= ) < 0) + return NULL; + } } else { if (virJSONValueObjectAdd(&props, "s:driver", virDomainNetGetModelString(n= et), @@ -4152,6 +4174,33 @@ qemuBuildWatchdogDevProps(const virDomainDef *def, } =20 =20 +static void qemuOpenEbpfRssFds(virDomainNetDef *net, + virQEMUCaps *qemuCaps) { + const void *ebpfRSSObject =3D NULL; + size_t ebpfRSSObjectSize =3D 0; + int fds[16]; + int nfds =3D 0; + qemuDomainNetworkPrivate *netpriv =3D QEMU_DOMAIN_NETWORK_PRIVATE(net); + + netpriv->libbpfRSSObject =3D NULL; + netpriv->ebpfrssfds =3D NULL; + + /* Add ebpf values */ + if (net->driver.virtio.rss =3D=3D VIR_TRISTATE_SWITCH_ON && virQEMUCap= sGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_EBPF_RSS_FDS)) { + ebpfRSSObject =3D virQEMUCapsGetEbpf(qemuCaps, "rss", &ebpfRSSObje= ctSize); + nfds =3D qemuInterfaceLoadEbpf(ebpfRSSObject, ebpfRSSObjectSize, &= netpriv->libbpfRSSObject, fds, 16); + + if (nfds > 0) { + for (int i =3D 0; i < nfds; ++i) { + g_autofree char *name =3D g_strdup_printf("ebpfrssfd-%s-%u= ", net->info.alias, i); + netpriv->ebpfrssfds =3D g_slist_prepend(netpriv->ebpfrssfd= s, qemuFDPassDirectNew(name, fds + i)); + } + netpriv->ebpfrssfds =3D g_slist_reverse(netpriv->ebpfrssfds); + } + } +} + + static int qemuBuildWatchdogCommandLine(virCommand *cmd, const virDomainDef *def, @@ -8735,6 +8784,10 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, qemuFDPassDirectTransferCommand(netpriv->slirpfd, cmd); qemuFDPassTransferCommand(netpriv->vdpafd, cmd); =20 + qemuOpenEbpfRssFds(net, qemuCaps); + for (n =3D netpriv->ebpfrssfds; n; n =3D n->next) + qemuFDPassDirectTransferCommand(n->data, cmd); + if (!(hostnetprops =3D qemuBuildHostNetProps(vm, net))) goto cleanup; =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index eec7bed28b..c696482f29 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -38,6 +38,7 @@ #include "qemu_checkpoint.h" #include "qemu_validate.h" #include "qemu_namespace.h" +#include "qemu_interface.h" #include "viralloc.h" #include "virlog.h" #include "virerror.h" @@ -1078,6 +1079,7 @@ qemuDomainNetworkPrivateClearFDs(qemuDomainNetworkPri= vate *priv) g_clear_pointer(&priv->vdpafd, qemuFDPassFree); g_slist_free_full(g_steal_pointer(&priv->vhostfds), (GDestroyNotify) q= emuFDPassDirectFree); g_slist_free_full(g_steal_pointer(&priv->tapfds), (GDestroyNotify) qem= uFDPassDirectFree); + g_slist_free_full(g_steal_pointer(&priv->ebpfrssfds), (GDestroyNotify)= qemuFDPassDirectFree); } =20 =20 @@ -1089,6 +1091,8 @@ qemuDomainNetworkPrivateDispose(void *obj G_GNUC_UNUS= ED) qemuSlirpFree(priv->slirp); =20 qemuDomainNetworkPrivateClearFDs(priv); + + qemuInterfaceCloseEbpf(priv->libbpfRSSObject); } =20 =20 diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index a3fc6acaaa..5e155b77cc 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -431,6 +431,9 @@ struct _qemuDomainNetworkPrivate { GSList *tapfds; /* qemuFDPassDirect */ GSList *vhostfds; /* qemuFDPassDirect */ qemuFDPass *vdpafd; + + void *libbpfRSSObject; + GSList *ebpfrssfds; /* qemuFDPassDirect eBPF RSS fds from helper */ }; =20 =20 --=20 2.42.0