From nobody Sat Feb 7 12:35:09 2026 Received: from smtp-fw-52004.amazon.com (smtp-fw-52004.amazon.com [52.119.213.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CC5513C66C; Tue, 9 Apr 2024 18:22:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.119.213.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712686930; cv=none; b=Pyl1if8ASfsAXDeI8bnJxn49vbyJsKeEQRgQ3cDqLGApADwLthDjue4xNZCgayYW+F3qVrXPUAxYui1GAuW1CUqWjkatOU7layuOoNVu42qvzgfjraqxETG9c2+hX+l86yufCFdz+fUvXFUOe+sNQkxZw97qaLtgOzke4Dob68I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712686930; c=relaxed/simple; bh=QkafSvTNtQW6+3b2nz2VphYjP8TdVziVHIwU42lTGFA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fknXq315nUaoD9+XIr9W4HkOYj4wFftqcNkSLT78Z3+2/nyBt/nroGioDz5znsCTVfLVCXrz7jRQIqBdvLXsiV07+jXFGhyKsphzCVb8jmaCJAlZeT6qJzaDpfOhcSF/dZJhTiAMT43Oe8jcNbvqz6f/U1TR5IZK+ZuVz5LVC6s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com; spf=pass smtp.mailfrom=amazon.co.uk; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b=vqm93Fco; arc=none smtp.client-ip=52.119.213.154 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="vqm93Fco" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1712686929; x=1744222929; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wRWEzqpiRSCXXr8eSFs9h45pzjeKz7V1Hyw7h+XDODc=; b=vqm93FcocA4Kr1cJ9uIvQcFzrqedHG9AO98SPe8CqXTT+BqkeqK/6iSC akfMxV4hw9/uREvgWJrWOHDb/yQNS8YvHFwCbLrpMKso9gGX9i5tAceZk H7MjorYDvvQuz3JDhw2n8CvxrUNLQ3nUuKoMmIAcudXB6bBm1/EhDLahU 0=; X-IronPort-AV: E=Sophos;i="6.07,190,1708387200"; d="scan'208";a="197485156" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.43.8.2]) by smtp-border-fw-52004.iad7.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2024 18:12:41 +0000 Received: from EX19MTAEUA002.ant.amazon.com [10.0.10.100:10210] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.9.204:2525] with esmtp (Farcaster) id b7737256-4eaa-42cb-880c-4086fe57a52b; Tue, 9 Apr 2024 18:12:39 +0000 (UTC) X-Farcaster-Flow-ID: b7737256-4eaa-42cb-880c-4086fe57a52b Received: from EX19D036EUC002.ant.amazon.com (10.252.61.191) by EX19MTAEUA002.ant.amazon.com (10.252.50.126) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 18:12:39 +0000 Received: from bcd074994f7f.amazon.com (10.95.97.144) by EX19D036EUC002.ant.amazon.com (10.252.61.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 18:12:34 +0000 From: Sudan Landge To: , , , , , , , , , , CC: , , , Subject: [PATCH v4 1/5] virt: vmgenid: rearrange code to make review easier Date: Tue, 9 Apr 2024 19:11:50 +0100 Message-ID: <20240409181154.9962-2-sudanl@amazon.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240409181154.9962-1-sudanl@amazon.com> References: <20240409181154.9962-1-sudanl@amazon.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: EX19D031UWC003.ant.amazon.com (10.13.139.252) To EX19D036EUC002.ant.amazon.com (10.252.61.191) Content-Type: text/plain; charset="utf-8" Rearrage the functions of vmgenid to make the next commit, which re-implements vmgenid as a platform driver, easier to review. Signed-off-by: Sudan Landge --- drivers/virt/vmgenid.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/virt/vmgenid.c b/drivers/virt/vmgenid.c index b67a28da4702..a167ccfad299 100644 --- a/drivers/virt/vmgenid.c +++ b/drivers/virt/vmgenid.c @@ -21,6 +21,20 @@ struct vmgenid_state { u8 this_id[VMGENID_SIZE]; }; =20 +static void vmgenid_notify(struct acpi_device *device, u32 event) +{ + struct vmgenid_state *state =3D acpi_driver_data(device); + char *envp[] =3D { "NEW_VMGENID=3D1", NULL }; + u8 old_id[VMGENID_SIZE]; + + memcpy(old_id, state->this_id, sizeof(old_id)); + memcpy(state->this_id, state->next_id, sizeof(state->this_id)); + if (!memcmp(old_id, state->this_id, sizeof(old_id))) + return; + add_vmfork_randomness(state->this_id, sizeof(state->this_id)); + kobject_uevent_env(&device->dev.kobj, KOBJ_CHANGE, envp); +} + static int vmgenid_add(struct acpi_device *device) { struct acpi_buffer parsed =3D { ACPI_ALLOCATE_BUFFER }; @@ -65,25 +79,12 @@ static int vmgenid_add(struct acpi_device *device) return ret; } =20 -static void vmgenid_notify(struct acpi_device *device, u32 event) -{ - struct vmgenid_state *state =3D acpi_driver_data(device); - char *envp[] =3D { "NEW_VMGENID=3D1", NULL }; - u8 old_id[VMGENID_SIZE]; - - memcpy(old_id, state->this_id, sizeof(old_id)); - memcpy(state->this_id, state->next_id, sizeof(state->this_id)); - if (!memcmp(old_id, state->this_id, sizeof(old_id))) - return; - add_vmfork_randomness(state->this_id, sizeof(state->this_id)); - kobject_uevent_env(&device->dev.kobj, KOBJ_CHANGE, envp); -} - static const struct acpi_device_id vmgenid_ids[] =3D { { "VMGENCTR", 0 }, { "VM_GEN_COUNTER", 0 }, { } }; +MODULE_DEVICE_TABLE(acpi, vmgenid_ids); =20 static struct acpi_driver vmgenid_driver =3D { .name =3D "vmgenid", @@ -97,7 +98,6 @@ static struct acpi_driver vmgenid_driver =3D { =20 module_acpi_driver(vmgenid_driver); =20 -MODULE_DEVICE_TABLE(acpi, vmgenid_ids); MODULE_DESCRIPTION("Virtual Machine Generation ID"); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Jason A. Donenfeld "); --=20 2.34.1 From nobody Sat Feb 7 12:35:09 2026 Received: from smtp-fw-52002.amazon.com (smtp-fw-52002.amazon.com [52.119.213.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30DDD156C66; Tue, 9 Apr 2024 18:13:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.119.213.150 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712686405; cv=none; b=R92gMvuGZi0DOQPU7XeX8GfiO6UO7YvjliaR4ONlX1G5+6xog35z4AnsE5mjmKBezlM+aGsub8fAHC5nrJbt3B9KrTvmB6iZ4e4DlvJyJMakAxfalp5C5aiQ3XT3FYqdYGpRN+hpJ++o24woVC2Btza2y+hT/Walcfz/76r23Tc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712686405; c=relaxed/simple; bh=os22hnONWugy2tpOAKxDCjc6v65N851yUDHEbBVCfUs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XEqlmKbNF2REWMQXwu3sl843xO3rdghTFLZ1VOqgkk1ARfyZM3cZ0EgpjRV3kSpeyqEfVR4uZTSccbKk0TZ+5lqzc62UmmOTe425lZJZojglgOJjfiGgDnz6gDCRtgYk7bUe22pk+Gz8HSwvUfZ5lU00gxsEKahKV7z0N+FG/VI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com; spf=pass smtp.mailfrom=amazon.co.uk; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b=ZKrgookd; arc=none smtp.client-ip=52.119.213.150 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="ZKrgookd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1712686403; x=1744222403; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9WK4Ks0kdU/PfCY29WwFv1CSYBPCLT37R4CWQ0Ev6+c=; b=ZKrgookdjmrGHAol3EHIWCyYqx5ar6hx2ARbkyG37UUAxtcwk89wkQqU fJ0Pj/amPJKpd2rK2dutn3rUtiZBPL/T6WksLkCunIoV664d9ij3AT2fU MZB2PPIQ3MOQ/AiGgeB4lsJ8FJCy7BUOzlc1v2qtwBKVoJC92Pv89tg+v Y=; X-IronPort-AV: E=Sophos;i="6.07,190,1708387200"; d="scan'208";a="625423153" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO smtpout.prod.us-east-1.prod.farcaster.email.amazon.dev) ([10.43.8.6]) by smtp-border-fw-52002.iad7.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2024 18:13:04 +0000 Received: from EX19MTAEUB001.ant.amazon.com [10.0.43.254:4228] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.26.56:2525] with esmtp (Farcaster) id 942f6115-7a50-47d4-88f3-52c850573cea; Tue, 9 Apr 2024 18:13:03 +0000 (UTC) X-Farcaster-Flow-ID: 942f6115-7a50-47d4-88f3-52c850573cea Received: from EX19D036EUC002.ant.amazon.com (10.252.61.191) by EX19MTAEUB001.ant.amazon.com (10.252.51.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 18:13:02 +0000 Received: from bcd074994f7f.amazon.com (10.95.97.144) by EX19D036EUC002.ant.amazon.com (10.252.61.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 18:12:58 +0000 From: Sudan Landge To: , , , , , , , , , , CC: , , , Subject: [PATCH v4 2/5] virt: vmgenid: change implementation to use a platform driver Date: Tue, 9 Apr 2024 19:11:51 +0100 Message-ID: <20240409181154.9962-3-sudanl@amazon.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240409181154.9962-1-sudanl@amazon.com> References: <20240409181154.9962-1-sudanl@amazon.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: EX19D037UWC004.ant.amazon.com (10.13.139.254) To EX19D036EUC002.ant.amazon.com (10.252.61.191) Content-Type: text/plain; charset="utf-8" Re-implement vmgenid as a platform driver in preparation for adding devicetree bindings support in next commits. Signed-off-by: Sudan Landge --- drivers/virt/vmgenid.c | 97 +++++++++++++++++++++++++++++------------- 1 file changed, 67 insertions(+), 30 deletions(-) diff --git a/drivers/virt/vmgenid.c b/drivers/virt/vmgenid.c index a167ccfad299..c028e2064fdd 100644 --- a/drivers/virt/vmgenid.c +++ b/drivers/virt/vmgenid.c @@ -7,9 +7,10 @@ * information to random.c. */ =20 +#include #include #include -#include +#include #include =20 ACPI_MODULE_NAME("vmgenid"); @@ -21,9 +22,9 @@ struct vmgenid_state { u8 this_id[VMGENID_SIZE]; }; =20 -static void vmgenid_notify(struct acpi_device *device, u32 event) +static void vmgenid_notify(struct device *device) { - struct vmgenid_state *state =3D acpi_driver_data(device); + struct vmgenid_state *state =3D device->driver_data; char *envp[] =3D { "NEW_VMGENID=3D1", NULL }; u8 old_id[VMGENID_SIZE]; =20 @@ -32,21 +33,36 @@ static void vmgenid_notify(struct acpi_device *device, = u32 event) if (!memcmp(old_id, state->this_id, sizeof(old_id))) return; add_vmfork_randomness(state->this_id, sizeof(state->this_id)); - kobject_uevent_env(&device->dev.kobj, KOBJ_CHANGE, envp); + kobject_uevent_env(&device->kobj, KOBJ_CHANGE, envp); +} + +static void vmgenid_acpi_handler(acpi_handle __always_unused handle, + u32 __always_unused event, void *dev) +{ + vmgenid_notify(dev); +} + +static int setup_vmgenid_state(struct vmgenid_state *state, u8 *next_id) +{ + if (IS_ERR(next_id)) + return PTR_ERR(next_id); + + state->next_id =3D next_id; + memcpy(state->this_id, state->next_id, sizeof(state->this_id)); + add_device_randomness(state->this_id, sizeof(state->this_id)); + return 0; } =20 -static int vmgenid_add(struct acpi_device *device) +static int vmgenid_add_acpi(struct device *dev, + struct vmgenid_state *state) { + struct acpi_device *device =3D ACPI_COMPANION(dev); struct acpi_buffer parsed =3D { ACPI_ALLOCATE_BUFFER }; - struct vmgenid_state *state; union acpi_object *obj; phys_addr_t phys_addr; acpi_status status; int ret =3D 0; - - state =3D devm_kmalloc(&device->dev, sizeof(*state), GFP_KERNEL); - if (!state) - return -ENOMEM; + u8 *virt_addr; =20 status =3D acpi_evaluate_object(device->handle, "ADDR", NULL, &parsed); if (ACPI_FAILURE(status)) { @@ -63,40 +79,61 @@ static int vmgenid_add(struct acpi_device *device) =20 phys_addr =3D (obj->package.elements[0].integer.value << 0) | (obj->package.elements[1].integer.value << 32); - state->next_id =3D devm_memremap(&device->dev, phys_addr, VMGENID_SIZE, M= EMREMAP_WB); - if (IS_ERR(state->next_id)) { - ret =3D PTR_ERR(state->next_id); + + virt_addr =3D (u8 *)devm_memremap(&device->dev, phys_addr, + VMGENID_SIZE, MEMREMAP_WB); + ret =3D setup_vmgenid_state(state, virt_addr); + if (ret) + goto out; + + dev->driver_data =3D state; + status =3D acpi_install_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, + vmgenid_acpi_handler, dev); + if (ACPI_FAILURE(status)) { + dev_err(dev, "Failed to install acpi notify handler"); + ret =3D -ENODEV; + dev->driver_data =3D NULL; goto out; } +out: + ACPI_FREE(parsed.pointer); + return ret; +} =20 - memcpy(state->this_id, state->next_id, sizeof(state->this_id)); - add_device_randomness(state->this_id, sizeof(state->this_id)); +static int vmgenid_add(struct platform_device *pdev) +{ + struct vmgenid_state *state; + struct device *dev =3D &pdev->dev; + int ret =3D 0; =20 - device->driver_data =3D state; + state =3D devm_kmalloc(dev, sizeof(*state), GFP_KERNEL); + if (!state) + return -ENOMEM; + + ret =3D vmgenid_add_acpi(dev, state); + + if (ret) + devm_kfree(dev, state); =20 -out: - ACPI_FREE(parsed.pointer); return ret; } =20 -static const struct acpi_device_id vmgenid_ids[] =3D { +static const struct acpi_device_id vmgenid_acpi_ids[] =3D { { "VMGENCTR", 0 }, { "VM_GEN_COUNTER", 0 }, { } }; -MODULE_DEVICE_TABLE(acpi, vmgenid_ids); - -static struct acpi_driver vmgenid_driver =3D { - .name =3D "vmgenid", - .ids =3D vmgenid_ids, - .owner =3D THIS_MODULE, - .ops =3D { - .add =3D vmgenid_add, - .notify =3D vmgenid_notify - } +MODULE_DEVICE_TABLE(acpi, vmgenid_acpi_ids); + +static struct platform_driver vmgenid_plaform_driver =3D { + .probe =3D vmgenid_add, + .driver =3D { + .name =3D "vmgenid", + .acpi_match_table =3D vmgenid_acpi_ids, + }, }; =20 -module_acpi_driver(vmgenid_driver); +module_platform_driver(vmgenid_plaform_driver) =20 MODULE_DESCRIPTION("Virtual Machine Generation ID"); MODULE_LICENSE("GPL v2"); --=20 2.34.1 From nobody Sat Feb 7 12:35:09 2026 Received: from smtp-fw-6001.amazon.com (smtp-fw-6001.amazon.com [52.95.48.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB481156999; Tue, 9 Apr 2024 18:21:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.95.48.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712686891; cv=none; b=RyXS6okDmyVmOef8OJvrF3HQuVHM6MjVlX/8oJj9nT8wiEnqByYZs1p74srvGBmiEjsWpaClksx8FOUtQRU4zKhQ50l/Km7dY2vLijkytjJXJcx8WKwmYXW9CiWfBK1kIRioAG3R5veaRcLNw29YSwk2L3qh9CQb8hnc0O4sUk0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712686891; c=relaxed/simple; bh=EcZlkq4mhkJTecvlYLJiT9xew1ftS1oIMx4P6vr0rwc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sDaTO5E695RZKEMLCt2Plawj3DtvgkLRKDVX4vDzyr6sm6uukVQrXEcvHcDZzumWryMMbaKq4AH0W/oTuegEgENsaZXM8X1FWkkjm0aq5M8c/+cq5GGI3Sh7RNTvBWMWwlZPZtaG6kpKD7mlOzyRBb6h1BJrHyOrfHaeCv2cICE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com; spf=pass smtp.mailfrom=amazon.co.uk; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b=t9nDgE42; arc=none smtp.client-ip=52.95.48.154 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="t9nDgE42" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1712686891; x=1744222891; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JxlOcBDU6r908oKknpBe0s7bQqLQWVDeva8VVC0aQbE=; b=t9nDgE42rKpWI4WEOFm+GZ8TtFDmb0xJpIoo5/3WooqFXtRAAmq9y3bp moMl4wkYqEXS05QvLc0V3jeFVS3v4CgKSB8y7AJp+6yYB4m1wWOSmh8gU Wa8eImkQkSUw0YAQPauD9XfBiO3pAtxX0HCeMgfyzV61e4g+aBbXg0w5p A=; X-IronPort-AV: E=Sophos;i="6.07,190,1708387200"; d="scan'208";a="388585344" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.43.8.2]) by smtp-border-fw-6001.iad6.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2024 18:13:29 +0000 Received: from EX19MTAEUB002.ant.amazon.com [10.0.10.100:4817] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.26.56:2525] with esmtp (Farcaster) id d21595e7-51f4-4c2a-9b93-72cbdcceb447; Tue, 9 Apr 2024 18:13:26 +0000 (UTC) X-Farcaster-Flow-ID: d21595e7-51f4-4c2a-9b93-72cbdcceb447 Received: from EX19D036EUC002.ant.amazon.com (10.252.61.191) by EX19MTAEUB002.ant.amazon.com (10.252.51.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 18:13:26 +0000 Received: from bcd074994f7f.amazon.com (10.95.97.144) by EX19D036EUC002.ant.amazon.com (10.252.61.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 18:13:21 +0000 From: Sudan Landge To: , , , , , , , , , , CC: , , , Subject: [PATCH v4 3/5] virt: vmgenid: enable driver regardless of ACPI config Date: Tue, 9 Apr 2024 19:11:52 +0100 Message-ID: <20240409181154.9962-4-sudanl@amazon.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240409181154.9962-1-sudanl@amazon.com> References: <20240409181154.9962-1-sudanl@amazon.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: EX19D041UWB004.ant.amazon.com (10.13.139.143) To EX19D036EUC002.ant.amazon.com (10.252.61.191) Content-Type: text/plain; charset="utf-8" Since with next commits vmgenid driver will support both ACPI and devicetree, and since either one of CONFIG_ACPI or CONFIG_OF will always be enabled, there is no need for the driver compilation to depend on ACPI/OF. So, remove ACPI dependency for compiling the driver. Signed-off-by: Sudan Landge --- drivers/virt/Kconfig | 1 - drivers/virt/vmgenid.c | 16 +++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/virt/Kconfig b/drivers/virt/Kconfig index 40129b6f0eca..d8c848cf09a6 100644 --- a/drivers/virt/Kconfig +++ b/drivers/virt/Kconfig @@ -16,7 +16,6 @@ if VIRT_DRIVERS config VMGENID tristate "Virtual Machine Generation ID driver" default y - depends on ACPI help Say Y here to use the hypervisor-provided Virtual Machine Generation ID to reseed the RNG when the VM is cloned. This is highly recommended if diff --git a/drivers/virt/vmgenid.c b/drivers/virt/vmgenid.c index c028e2064fdd..3d93e3fb94c4 100644 --- a/drivers/virt/vmgenid.c +++ b/drivers/virt/vmgenid.c @@ -36,13 +36,15 @@ static void vmgenid_notify(struct device *device) kobject_uevent_env(&device->kobj, KOBJ_CHANGE, envp); } =20 -static void vmgenid_acpi_handler(acpi_handle __always_unused handle, - u32 __always_unused event, void *dev) +static void __maybe_unused +vmgenid_acpi_handler(acpi_handle __always_unused handle, + u32 __always_unused event, void *dev) { vmgenid_notify(dev); } =20 -static int setup_vmgenid_state(struct vmgenid_state *state, u8 *next_id) +static int __maybe_unused +setup_vmgenid_state(struct vmgenid_state *state, u8 *next_id) { if (IS_ERR(next_id)) return PTR_ERR(next_id); @@ -53,9 +55,10 @@ static int setup_vmgenid_state(struct vmgenid_state *sta= te, u8 *next_id) return 0; } =20 -static int vmgenid_add_acpi(struct device *dev, - struct vmgenid_state *state) +static int vmgenid_add_acpi(struct device __maybe_unused *dev, + struct vmgenid_state __maybe_unused *state) { +#if IS_ENABLED(CONFIG_ACPI) struct acpi_device *device =3D ACPI_COMPANION(dev); struct acpi_buffer parsed =3D { ACPI_ALLOCATE_BUFFER }; union acpi_object *obj; @@ -98,6 +101,9 @@ static int vmgenid_add_acpi(struct device *dev, out: ACPI_FREE(parsed.pointer); return ret; +#else + return -EINVAL; +#endif } =20 static int vmgenid_add(struct platform_device *pdev) --=20 2.34.1 From nobody Sat Feb 7 12:35:09 2026 Received: from smtp-fw-9105.amazon.com (smtp-fw-9105.amazon.com [207.171.188.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 07FE615698F; Tue, 9 Apr 2024 18:13:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=207.171.188.204 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712686439; cv=none; b=gClMfjX1iQe/be2E1RVQhctvrj+XsbCVBEtssLNYhv7zbAJp5UMmQFHNW8DFV+umT06CcHDAaS7c0qdtM+/afqToP9jEPd7BGOjiGI/uzlS7Ol0eANNiXxv6kfRa+7/CFFx969VXGjYOyQBPbGE6L2VGNZ6S+1r1i3fPMe+N0yM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712686439; c=relaxed/simple; bh=dn+lAleatEKuaifZlrvPWySPzKxUqpTQLCOmlh50Oqs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gliYxARDd1Wjp9NaGASf1KAFzVDh96O9012VyFfELYJnJK+FsIEfJRdkYCN09CEGa8VcvKZeC+NFJ13VMePsnfJ60s/ZJY4U9h8EcoYiEIOHlK0XNOwvuMKamZqBYX65lUX2iOHZHGVScFYUxj6FAy8nZ4xvVKqFVKECNGUayE8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com; spf=pass smtp.mailfrom=amazon.co.uk; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b=Jx2zim+w; arc=none smtp.client-ip=207.171.188.204 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="Jx2zim+w" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1712686438; x=1744222438; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lgg88BB+Hs9vOysnsDN018CMkG589f+hMJJXDN4bMMc=; b=Jx2zim+wakIDVX/jJ1LibA7jt68z7WrSvFqb88+9OGXssT9OfH4Q61wL WB4ygXFesj3675sMWTraPGn+ZE7W7/ItLn4RwH1okNjO5XX7KQ1ClETxi jK6Lh1wS6sjWMxXu6OgKiTqKzIZUFu1Ilze9n592wd9hTCSMwyjKCzI8r U=; X-IronPort-AV: E=Sophos;i="6.07,190,1708387200"; d="scan'208";a="717886588" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.25.36.210]) by smtp-border-fw-9105.sea19.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2024 18:13:51 +0000 Received: from EX19MTAEUC001.ant.amazon.com [10.0.43.254:63192] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.37.241:2525] with esmtp (Farcaster) id fb9eff58-1fec-4c4d-b18f-fd659df80343; Tue, 9 Apr 2024 18:13:50 +0000 (UTC) X-Farcaster-Flow-ID: fb9eff58-1fec-4c4d-b18f-fd659df80343 Received: from EX19D036EUC002.ant.amazon.com (10.252.61.191) by EX19MTAEUC001.ant.amazon.com (10.252.51.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 18:13:50 +0000 Received: from bcd074994f7f.amazon.com (10.95.97.144) by EX19D036EUC002.ant.amazon.com (10.252.61.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 18:13:45 +0000 From: Sudan Landge To: , , , , , , , , , , CC: , , , Subject: [PATCH v4 4/5] dt-bindings: rng: Add vmgenid support Date: Tue, 9 Apr 2024 19:11:53 +0100 Message-ID: <20240409181154.9962-5-sudanl@amazon.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240409181154.9962-1-sudanl@amazon.com> References: <20240409181154.9962-1-sudanl@amazon.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: EX19D039UWB004.ant.amazon.com (10.13.138.57) To EX19D036EUC002.ant.amazon.com (10.252.61.191) Content-Type: text/plain; charset="utf-8" Virtual Machine Generation ID driver was introduced in commit af6b54e2b5ba ("virt: vmgenid: notify RNG of VM fork and supply generation ID"), as an ACPI only device. VMGenID specification http://go.microsoft.com/fwlink/?LinkId=3D260709 defin= es a mechanism for the BIOS/hypervisors to communicate to the virtual machine that it is executed with a different configuration (e.g. snapshot execution or creation from a template). The guest operating system can use the notification for various purposes such as re-initializing its random number generator etc. As per the specs, hypervisor should provide a globally unique identified, or GUID via ACPI. This patch tries to mimic the mechanism to provide the same functionality which is for a hypervisor/BIOS to notify the virtual machine when it is executed with a different configuration. As part of this support the devicetree bindings requires the hypervisors or BIOS to provide a memory address which holds the GUID and an IRQ which is used to notify when there is a change in the GUID. The memory exposed in the DT should follow the rules defined in the vmgenid spec mentioned above. *Reason for this change*: Chosing ACPI or devicetree is an intrinsic part of an hypervisor design. Without going into details of why a hypervisor would choose DT over ACPI, we would like to highlight that the hypervisors that have chose devicetree and now want to make use of the vmgenid functionality cannot do so today because vmgenid is an ACPI only device. This forces these hypervisors to change their design which could have undesirable impacts on their use-cases, test-scenarios etc. vmgenid exposes to the guest a 16-byte cryptographically random number, the value of which changes every time it starts executing from a new configuration (snapshot, backup, etc.). During initialization, the device exposes to the guest the address of the generation ID and an interrupt number, which the device will use to notify the guest when the generation ID changes. These attributes can be trivially communicated via device tree bindings. We believe that adding a devicetree binding for vmgenid is a simpler alternative way to expose the device to the guest than forcing the hypervisors to implement ACPI. More references to vmgenid specs: - https://www.qemu.org/docs/master/specs/vmgenid.html - https://learn.microsoft.com/en-us/windows/win32/hyperv_v2/virtual- machine-generation-identifier Signed-off-by: Sudan Landge Reviewed-by: Rob Herring --- .../bindings/rng/microsoft,vmgenid.yaml | 49 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 50 insertions(+) create mode 100644 Documentation/devicetree/bindings/rng/microsoft,vmgenid= .yaml diff --git a/Documentation/devicetree/bindings/rng/microsoft,vmgenid.yaml b= /Documentation/devicetree/bindings/rng/microsoft,vmgenid.yaml new file mode 100644 index 000000000000..8f20dee93e7e --- /dev/null +++ b/Documentation/devicetree/bindings/rng/microsoft,vmgenid.yaml @@ -0,0 +1,49 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/rng/microsoft,vmgenid.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Virtual Machine Generation ID + +maintainers: + - Jason A. Donenfeld + +description: + Firmwares or hypervisors can use this devicetree to describe an + interrupt and a shared resource to inject a Virtual Machine Generation I= D. + Virtual Machine Generation ID is a globally unique identifier (GUID) and + the devicetree binding follows VMGenID specification defined in + http://go.microsoft.com/fwlink/?LinkId=3D260709. + +properties: + compatible: + const: microsoft,vmgenid + + reg: + description: + Specifies a 16-byte VMGenID in endianness-agnostic hexadecimal forma= t. + maxItems: 1 + + interrupts: + description: + Interrupt used to notify that a new VMGenID is available. + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +additionalProperties: false + +examples: + - | + #include + rng@80000000 { + compatible =3D "microsoft,vmgenid"; + reg =3D <0x80000000 0x1000>; + interrupts =3D ; + }; + +... diff --git a/MAINTAINERS b/MAINTAINERS index aea47e04c3a5..243607744b7e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18476,6 +18476,7 @@ M: "Theodore Ts'o" M: Jason A. Donenfeld S: Maintained T: git https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git +F: Documentation/devicetree/bindings/rng/microsoft,vmgenid.yaml F: drivers/char/random.c F: drivers/virt/vmgenid.c =20 --=20 2.34.1 From nobody Sat Feb 7 12:35:09 2026 Received: from smtp-fw-52004.amazon.com (smtp-fw-52004.amazon.com [52.119.213.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5FCDE4C85; Tue, 9 Apr 2024 18:24:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.119.213.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712687065; cv=none; b=l+1rcCCCAuicuPeh/zhShtdSGO69QvC2cYo2Mr1Sswg+Uvfh1JpVaKQrIg4209e9Ro6RcvqzqzaCa1ARU+VQbV0IR6ANBXoYs7qJZ+/PvNdcSnbAubvnC6puzqEJi2dti1nbnD+BSlUSwYHkDASOjq5BhXJblmpDLnUFE48yVD8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712687065; c=relaxed/simple; bh=jW2XOtO9vH3fyORTD0njVKSTagn7WFaKPY/etiNC/h4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IxKHWbxQ5WLXtT+XnK1bDX8vboSJ74TnJPVOGZuYBFR6jcSXGiw5+ez5vq6I5CKuuLhtbHHfvzKOfi5muEZVnl7CyvLsJ4c+skDUUvG5PBJI/Uj1Ekl1SRWTn3QZqxp7ews3Fvvtu8N8AIwFmiWRob7XgJ8AUBtzmc0KyDUYgck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com; spf=pass smtp.mailfrom=amazon.co.uk; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b=qWLNTnOS; arc=none smtp.client-ip=52.119.213.154 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="qWLNTnOS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1712687064; x=1744223064; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6UmcuCQ72fp6Cahtrj1U+7eJO6P8w7duBJ8wqAOb/u0=; b=qWLNTnOSCUj3nb9ZIXaXZfm8XXhMQQsc5IJ8Q+ITs1CQ92S+dzXnPgAd GD3SEKPj9mO8RqhcdxjDkWEUex8DiaN/1HSnZylJS7swpvVR2W6u2ng5q ap1Wepp1cLH0LTMq0Hz3aNXuttv0SRS0YH8HttZUDVv2Nn/tTTMG/55Sx k=; X-IronPort-AV: E=Sophos;i="6.07,190,1708387200"; d="scan'208";a="197485460" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev) ([10.43.8.2]) by smtp-border-fw-52004.iad7.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2024 18:14:15 +0000 Received: from EX19MTAEUA001.ant.amazon.com [10.0.10.100:64023] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.25.48:2525] with esmtp (Farcaster) id 916869e4-5faf-4241-98ad-4ec9d41da4dc; Tue, 9 Apr 2024 18:14:13 +0000 (UTC) X-Farcaster-Flow-ID: 916869e4-5faf-4241-98ad-4ec9d41da4dc Received: from EX19D036EUC002.ant.amazon.com (10.252.61.191) by EX19MTAEUA001.ant.amazon.com (10.252.50.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 18:14:13 +0000 Received: from bcd074994f7f.amazon.com (10.95.97.144) by EX19D036EUC002.ant.amazon.com (10.252.61.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 18:14:08 +0000 From: Sudan Landge To: , , , , , , , , , , CC: , , , Subject: [PATCH v4 5/5] virt: vmgenid: add support for devicetree bindings Date: Tue, 9 Apr 2024 19:11:54 +0100 Message-ID: <20240409181154.9962-6-sudanl@amazon.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240409181154.9962-1-sudanl@amazon.com> References: <20240409181154.9962-1-sudanl@amazon.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: EX19D039UWB003.ant.amazon.com (10.13.138.93) To EX19D036EUC002.ant.amazon.com (10.252.61.191) Content-Type: text/plain; charset="utf-8" Extend the vmgenid platform driver to support devicetree bindings. With this support, hypervisors can send vmgenid notifications to the virtual machine without the need to enable ACPI. The bindings are located at: Documentation/devicetree/bindings/rng/microsoft,vmgenid.yaml Signed-off-by: Sudan Landge --- drivers/virt/vmgenid.c | 53 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/drivers/virt/vmgenid.c b/drivers/virt/vmgenid.c index 3d93e3fb94c4..e1ad74116c0c 100644 --- a/drivers/virt/vmgenid.c +++ b/drivers/virt/vmgenid.c @@ -2,12 +2,13 @@ /* * Copyright (C) 2022 Jason A. Donenfeld . All Rights Res= erved. * - * The "Virtual Machine Generation ID" is exposed via ACPI and changes whe= n a + * The "Virtual Machine Generation ID" is exposed via ACPI or DT and chang= es when a * virtual machine forks or is cloned. This driver exists for shepherding = that * information to random.c. */ =20 #include +#include #include #include #include @@ -20,6 +21,7 @@ enum { VMGENID_SIZE =3D 16 }; struct vmgenid_state { u8 *next_id; u8 this_id[VMGENID_SIZE]; + int irq; }; =20 static void vmgenid_notify(struct device *device) @@ -43,6 +45,14 @@ vmgenid_acpi_handler(acpi_handle __always_unused handle, vmgenid_notify(dev); } =20 +static __maybe_unused irqreturn_t +vmgenid_of_irq_handler(int __always_unused irq, void *dev) +{ + vmgenid_notify(dev); + + return IRQ_HANDLED; +} + static int __maybe_unused setup_vmgenid_state(struct vmgenid_state *state, u8 *next_id) { @@ -106,6 +116,35 @@ static int vmgenid_add_acpi(struct device __maybe_unus= ed *dev, #endif } =20 +static int vmgenid_add_of(struct platform_device *pdev, + struct vmgenid_state *state) +{ + u8 *virt_addr; + int ret =3D 0; + + virt_addr =3D (u8 *)devm_platform_get_and_ioremap_resource(pdev, 0, NULL); + if (IS_ERR(virt_addr)) + return PTR_ERR(virt_addr); + + ret =3D setup_vmgenid_state(state, virt_addr); + if (ret) + return ret; + + ret =3D platform_get_irq(pdev, 0); + if (ret < 0) + return ret; + + state->irq =3D ret; + pdev->dev.driver_data =3D state; + + ret =3D devm_request_irq(&pdev->dev, state->irq, vmgenid_of_irq_handler, + IRQF_SHARED, "vmgenid", &pdev->dev); + if (ret) + pdev->dev.driver_data =3D NULL; + + return ret; +} + static int vmgenid_add(struct platform_device *pdev) { struct vmgenid_state *state; @@ -116,7 +155,10 @@ static int vmgenid_add(struct platform_device *pdev) if (!state) return -ENOMEM; =20 - ret =3D vmgenid_add_acpi(dev, state); + if (dev->of_node) + ret =3D vmgenid_add_of(pdev, state); + else + ret =3D vmgenid_add_acpi(dev, state); =20 if (ret) devm_kfree(dev, state); @@ -124,6 +166,12 @@ static int vmgenid_add(struct platform_device *pdev) return ret; } =20 +static const struct of_device_id vmgenid_of_ids[] =3D { + { .compatible =3D "microsoft,vmgenid", }, + { }, +}; +MODULE_DEVICE_TABLE(of, vmgenid_of_ids); + static const struct acpi_device_id vmgenid_acpi_ids[] =3D { { "VMGENCTR", 0 }, { "VM_GEN_COUNTER", 0 }, @@ -136,6 +184,7 @@ static struct platform_driver vmgenid_plaform_driver = =3D { .driver =3D { .name =3D "vmgenid", .acpi_match_table =3D vmgenid_acpi_ids, + .of_match_table =3D vmgenid_of_ids, }, }; =20 --=20 2.34.1