From nobody Mon Feb 9 17:35:41 2026 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