From patchwork Thu May 28 17:31:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1299947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=fywnfw4w; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49Xvsb1fjzz9sRK for ; Fri, 29 May 2020 03:32:33 +1000 (AEST) Received: from localhost ([::1]:54290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeMOM-0001o3-6m for incoming@patchwork.ozlabs.org; Thu, 28 May 2020 13:32:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeMNo-0001k6-Cq for qemu-devel@nongnu.org; Thu, 28 May 2020 13:31:56 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:22491 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jeMNn-0006ZN-5D for qemu-devel@nongnu.org; Thu, 28 May 2020 13:31:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590687111; h=from:from: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; bh=kU2svaZnrFOGWDjc7Q+D6Mn9iKCVlh3hTcGdEw3fjr0=; b=fywnfw4wRYtz8A5jSno24mtRWWA7c5T43n+aDLK8BBfWkTRS0FsVRcpBNgI+fAE8CSB4nj wLQtqOVsgELhKOPkFhSYSZtnCHcsEx7s3g4zI5W1gqWaUIwmTjhyuWW/eL5eQk21JfrUka qsURc88AIrgZTeNhQkOLKvgzYLsaFsw= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-99-JP-h2zBXPP6MA_jiWFArWQ-1; Thu, 28 May 2020 13:31:49 -0400 X-MC-Unique: JP-h2zBXPP6MA_jiWFArWQ-1 Received: by mail-wr1-f70.google.com with SMTP id e1so10389807wrm.3 for ; Thu, 28 May 2020 10:31:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kU2svaZnrFOGWDjc7Q+D6Mn9iKCVlh3hTcGdEw3fjr0=; b=kHAADedlIxNxmOTdaM8bu6h9BvSE1glJW5PlPXo8sKVpx7uP1tgWnO1SeLA0SJf0F1 3M8tI45IhmxLVdAUVjY/f2RVUqIVF1mbjPM8BXyTsHdi3yw+EboIdCmZeDdQYboS1G/H NbcI1XbymTe4Sn8hQoUmFwHQlJJxelpnoc07PjgwJ8wNH7goWIL8ErqUpzcjT5LwLfeR wt5Q//xnTHb8qN0vBdvVYU+RZQbMerXxTjHbXtHe/8VAIvqiMd/iI761VwvfGwH8sFvI fehJ70HflvUhS/pTIxP3dgiWiIyFZxvq6NPtDsJXPPl8NQul5ByyPnEPECBWhA5rZUci CBGg== X-Gm-Message-State: AOAM532IjsvUA9n3fqCJuUZcXGxDnHOxrdIj9sfRQpvypOjZlRKYukII +i+/+RqxKNy4H9az3PVwqLyX+vN/kLWUuPI93qWCzorrGhbBY9VhUp/rNnDOsXi09uofUIrXCpg h1wU/H0CQfuld4Ko= X-Received: by 2002:a1c:b7d5:: with SMTP id h204mr4393453wmf.100.1590687108468; Thu, 28 May 2020 10:31:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzki1XaUYQYFBsTVxwEg48tCV2CFYEOyjBLGLVimwR1QQjXzmjdDGWM98ePxq7AkxCPi/NgpQ== X-Received: by 2002:a1c:b7d5:: with SMTP id h204mr4393431wmf.100.1590687108141; Thu, 28 May 2020 10:31:48 -0700 (PDT) Received: from localhost.localdomain (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id u4sm7321052wmb.48.2020.05.28.10.31.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2020 10:31:47 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 1/5] hw/nvram/fw_cfg: Add the FW_CFG_DATA_GENERATOR interface Date: Thu, 28 May 2020 19:31:37 +0200 Message-Id: <20200528173141.17495-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200528173141.17495-1-philmd@redhat.com> References: <20200528173141.17495-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 03:11:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Laszlo Ersek , Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The FW_CFG_DATA_GENERATOR allows any object to produce blob of data consumable by the fw_cfg device. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laszlo Ersek --- v7: addressed Laszlo's comments - fixed typos in description - return size_t instead of ssize_t; 0 for error - do not use 1-letter variable names - do not open-code 'fw_cfg-data-generator' - cast g_memdup() size argument as 'guint' - improved documentation --- docs/specs/fw_cfg.txt | 9 ++++++- include/hw/nvram/fw_cfg.h | 52 +++++++++++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 31 +++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) diff --git a/docs/specs/fw_cfg.txt b/docs/specs/fw_cfg.txt index 8f1ebc66fa..bc16daa38a 100644 --- a/docs/specs/fw_cfg.txt +++ b/docs/specs/fw_cfg.txt @@ -219,7 +219,7 @@ To check the result, read the "control" field: = Externally Provided Items = -As of v2.4, "file" fw_cfg items (i.e., items with selector keys above +Since v2.4, "file" fw_cfg items (i.e., items with selector keys above FW_CFG_FILE_FIRST, and with a corresponding entry in the fw_cfg file directory structure) may be inserted via the QEMU command line, using the following syntax: @@ -230,6 +230,13 @@ Or -fw_cfg [name=],string= +Since v5.1, QEMU allows some objects to generate fw_cfg-specific content, +the content is then associated with a "file" item using the 'gen_id' option +in the command line, using the following syntax: + + -object ,id=,[generator-specific-options] \ + -fw_cfg [name=],gen_id= + See QEMU man page for more documentation. Using item_name with plain ASCII characters only is recommended. diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 25d9307018..8fbf2446c1 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -9,11 +9,43 @@ #define TYPE_FW_CFG "fw_cfg" #define TYPE_FW_CFG_IO "fw_cfg_io" #define TYPE_FW_CFG_MEM "fw_cfg_mem" +#define TYPE_FW_CFG_DATA_GENERATOR_INTERFACE "fw_cfg-data-generator" #define FW_CFG(obj) OBJECT_CHECK(FWCfgState, (obj), TYPE_FW_CFG) #define FW_CFG_IO(obj) OBJECT_CHECK(FWCfgIoState, (obj), TYPE_FW_CFG_IO) #define FW_CFG_MEM(obj) OBJECT_CHECK(FWCfgMemState, (obj), TYPE_FW_CFG_MEM) +#define FW_CFG_DATA_GENERATOR_CLASS(class) \ + OBJECT_CLASS_CHECK(FWCfgDataGeneratorClass, (class), \ + TYPE_FW_CFG_DATA_GENERATOR_INTERFACE) +#define FW_CFG_DATA_GENERATOR_GET_CLASS(obj) \ + OBJECT_GET_CLASS(FWCfgDataGeneratorClass, (obj), \ + TYPE_FW_CFG_DATA_GENERATOR_INTERFACE) + +typedef struct FWCfgDataGeneratorClass { + /*< private >*/ + InterfaceClass parent_class; + /*< public >*/ + + /** + * get_data: + * @obj: the object implementing this interface + * + * Returns: pointer to start of the generated item data + * + * The returned pointer is a QObject weak reference, @obj owns + * the reference and may free it at any time in the future. + */ + const void *(*get_data)(Object *obj); + /** + * get_length: + * @obj: the object implementing this interface + * + * Returns: the size of the generated item data in bytes + */ + size_t (*get_length)(Object *obj); +} FWCfgDataGeneratorClass; + typedef struct fw_cfg_file FWCfgFile; #define FW_CFG_ORDER_OVERRIDE_VGA 70 @@ -263,6 +295,26 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data, size_t len); +/** + * fw_cfg_add_from_generator: + * @s: fw_cfg device being modified + * @filename: name of new fw_cfg file item + * @gen_id: name of object implementing FW_CFG_DATA_GENERATOR interface + * @errp: pointer to a NULL initialized error object + * + * Add a new NAMED fw_cfg item with the content generated from the + * @gen_id object. The data generated by the @gen_id object/ is copied + * into the data structure of the fw_cfg device. + * The next available (unused) selector key starting at FW_CFG_FILE_FIRST + * will be used; also, a new entry will be added to the file directory + * structure residing at key value FW_CFG_FILE_DIR, containing the item name, + * data size, and assigned selector key value. + * + * Returns: the size of the device tree image on success, or 0 on errors. + */ +size_t fw_cfg_add_from_generator(FWCfgState *s, const char *filename, + const char *gen_id, Error **errp); + FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, AddressSpace *dma_as); FWCfgState *fw_cfg_init_io(uint32_t iobase); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 8dd50c2c72..6d2fa13042 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1032,6 +1032,31 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename, return NULL; } +size_t fw_cfg_add_from_generator(FWCfgState *s, const char *filename, + const char *gen_id, Error **errp) +{ + FWCfgDataGeneratorClass *klass; + Object *obj; + size_t size; + + obj = object_resolve_path_component(object_get_objects_root(), gen_id); + if (!obj) { + error_setg(errp, "Cannot find object ID %s", gen_id); + return 0; + } + if (!object_dynamic_cast(obj, TYPE_FW_CFG_DATA_GENERATOR_INTERFACE)) { + error_setg(errp, "Object '%s' is not a '%s' subclass", + TYPE_FW_CFG_DATA_GENERATOR_INTERFACE, gen_id); + return 0; + } + klass = FW_CFG_DATA_GENERATOR_GET_CLASS(obj); + size = klass->get_length(obj); + fw_cfg_add_file(s, filename, g_memdup(klass->get_data(obj), (guint)size), + size); + + return size; +} + static void fw_cfg_machine_reset(void *opaque) { MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); @@ -1333,12 +1358,18 @@ static const TypeInfo fw_cfg_mem_info = { .class_init = fw_cfg_mem_class_init, }; +static const TypeInfo fw_cfg_data_generator_interface_info = { + .name = TYPE_FW_CFG_DATA_GENERATOR_INTERFACE, + .parent = TYPE_INTERFACE, + .class_size = sizeof(FWCfgDataGeneratorClass), +}; static void fw_cfg_register_types(void) { type_register_static(&fw_cfg_info); type_register_static(&fw_cfg_io_info); type_register_static(&fw_cfg_mem_info); + type_register_static(&fw_cfg_data_generator_interface_info); } type_init(fw_cfg_register_types) From patchwork Thu May 28 17:31:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1299948 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hs1Cw86y; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49Xvsb1hPCz9sRY for ; Fri, 29 May 2020 03:32:33 +1000 (AEST) Received: from localhost ([::1]:54280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeMOM-0001na-1J for incoming@patchwork.ozlabs.org; Thu, 28 May 2020 13:32:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeMNp-0001l9-N7 for qemu-devel@nongnu.org; Thu, 28 May 2020 13:31:57 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:33263 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jeMNo-0006a0-PQ for qemu-devel@nongnu.org; Thu, 28 May 2020 13:31:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590687115; h=from:from: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; bh=pNWcMMGvcPsGIqzvnJg0g/df4+AMY8fbfR6SYbmn6mQ=; b=hs1Cw86y/TC3Vuv7QJCyeoG1IxIpevXkacLLEasNJOXzGT9OJ0RpRQ8OQkFaYPN4SSuZNd GIop8i6hm0xHgb/p0UnBtpLjBccKjK8o0cNh3B76hJMJfKLUXyMZQM/LtcWHv8Nyol1a9M +rFpSuJf/gRpEplvqfEu+T2FTKZdglo= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-279-j3Sab-S_PbqY20_qhVCLRQ-1; Thu, 28 May 2020 13:31:54 -0400 X-MC-Unique: j3Sab-S_PbqY20_qhVCLRQ-1 Received: by mail-wr1-f72.google.com with SMTP id w4so7203577wrl.13 for ; Thu, 28 May 2020 10:31:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pNWcMMGvcPsGIqzvnJg0g/df4+AMY8fbfR6SYbmn6mQ=; b=Q7Puw/RYO0FakxJ/8lJSLXMX5O7Lk3xTgUFIleyothuHk99AoqE9BGNgPSCCXl058e 78J1kCpFBoaSiDalrHPgEGnx2wQRCwXJV6Kd0sZWygOle8e+E7M0zXRY8dwkEaxwqnDS BbTf8GldzatFqMOtxaEo83DxdrID+iSnUhR3uSIU0kXWnwyKxKrfP00MHvrKBl8zSf30 tTTz9KnwT04mRzlQiNvDU0bGQCQPfx5B643KDEPqCnY/vNdAUigoDk5frV3NF0FgONjS rBAvsGiugR1Ee6C/gw9PDnkQEMFb0SqG+cGrseP8rnXLPMekrz66/dFigtSELKotzwCp eMRg== X-Gm-Message-State: AOAM531zJL77WrhJI4LosxVkQU4bnAmH+wbM54I1nlCVeWYvceG5xoEL sGD2jtVblkDqSthdVvzrtOPtsyBomMItg8M/WwXM6pUmR/OoHmg/IAGu8P2a4nG3LgOqVqr+kGX 5E4GcXCjb+Jv3dI8= X-Received: by 2002:a05:6000:1292:: with SMTP id f18mr4606425wrx.208.1590687112989; Thu, 28 May 2020 10:31:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwO2PL3PDOqvmlVAOsQOD8a0pCjdbrwzn8ZaEdr/CRUizS2/QXcJqOpuhKQ3iQYfr4QOivhGA== X-Received: by 2002:a05:6000:1292:: with SMTP id f18mr4606412wrx.208.1590687112757; Thu, 28 May 2020 10:31:52 -0700 (PDT) Received: from localhost.localdomain (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id h7sm7784915wml.24.2020.05.28.10.31.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2020 10:31:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 2/5] softmmu/vl: Let -fw_cfg option take a 'gen_id' argument Date: Thu, 28 May 2020 19:31:38 +0200 Message-Id: <20200528173141.17495-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200528173141.17495-1-philmd@redhat.com> References: <20200528173141.17495-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 03:11:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Laszlo Ersek , Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The 'gen_id' argument refers to a QOM object able to produce data consumable by the fw_cfg device. The producer object must implement the FW_CFG_DATA_GENERATOR interface. Signed-off-by: Philippe Mathieu-Daudé --- v7: - renamed 'blob_id' -> 'gen_id' (danpb) - update comment in code (lersek) - fixed CODING_STYLE (lersek) - use Laszlo's if (SUM(options)) != 1 { error } form --- softmmu/vl.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index ae5451bc23..cdb1d187ed 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -489,6 +489,11 @@ static QemuOptsList qemu_fw_cfg_opts = { .name = "string", .type = QEMU_OPT_STRING, .help = "Sets content of the blob to be inserted from a string", + }, { + .name = "gen_id", + .type = QEMU_OPT_STRING, + .help = "Sets id of the object generating the fw_cfg blob " + "to be inserted", }, { /* end of list */ } }, @@ -2020,7 +2025,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp) { gchar *buf; size_t size; - const char *name, *file, *str; + const char *name, *file, *str, *gen_id; FWCfgState *fw_cfg = (FWCfgState *) opaque; if (fw_cfg == NULL) { @@ -2030,14 +2035,13 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp) name = qemu_opt_get(opts, "name"); file = qemu_opt_get(opts, "file"); str = qemu_opt_get(opts, "string"); + gen_id = qemu_opt_get(opts, "gen_id"); - /* we need name and either a file or the content string */ - if (!(nonempty_str(name) && (nonempty_str(file) || nonempty_str(str)))) { - error_setg(errp, "invalid argument(s)"); - return -1; - } - if (nonempty_str(file) && nonempty_str(str)) { - error_setg(errp, "file and string are mutually exclusive"); + /* we need the name, and exactly one of: file, content string, gen_id */ + if (!nonempty_str(name) || + nonempty_str(file) + nonempty_str(str) + nonempty_str(gen_id) != 1) { + error_setg(errp, "name, plus exactly one of file," + " string and gen_id, are needed"); return -1; } if (strlen(name) > FW_CFG_MAX_FILE_PATH - 1) { @@ -2052,6 +2056,8 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp) if (nonempty_str(str)) { size = strlen(str); /* NUL terminator NOT included in fw_cfg blob */ buf = g_memdup(str, size); + } else if (nonempty_str(gen_id)) { + return fw_cfg_add_from_generator(fw_cfg, name, gen_id, errp); } else { GError *err = NULL; if (!g_file_get_contents(file, &buf, &size, &err)) { From patchwork Thu May 28 17:31:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1299950 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZQGQ/fX3; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49Xvvv3fLnz9sRK for ; Fri, 29 May 2020 03:34:35 +1000 (AEST) Received: from localhost ([::1]:35296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeMQL-0005og-8t for incoming@patchwork.ozlabs.org; Thu, 28 May 2020 13:34:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeMNu-0001ro-1K for qemu-devel@nongnu.org; Thu, 28 May 2020 13:32:02 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:38689 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jeMNt-0006bj-8N for qemu-devel@nongnu.org; Thu, 28 May 2020 13:32:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590687120; h=from:from: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; bh=TddrJguzfrgaRLDyn9iGC2VgogValgksso5e1JtaPfc=; b=ZQGQ/fX3Fb5tKbyhT4XfyW761090XhrgnTsvHhyR5/JinyY8w+eALPOteD3Io5ssO4oBVe EyUN46D9WeYBpZ3j6Bj9/aPYxZRroeRDTq6SjsYsxHqEI1RckpGn7PZycIM75SlnT6K5gJ KpP6uH4Ln4ULaPwlr5JwY3A0KQnE9zg= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-87-jjIXJNAhNKGPi4mOUFJDDA-1; Thu, 28 May 2020 13:31:59 -0400 X-MC-Unique: jjIXJNAhNKGPi4mOUFJDDA-1 Received: by mail-wm1-f71.google.com with SMTP id f62so1236296wme.3 for ; Thu, 28 May 2020 10:31:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TddrJguzfrgaRLDyn9iGC2VgogValgksso5e1JtaPfc=; b=bJubmDppVtb3aUXXZk34eKOAHqG5pvCEw0aQaHP8UXPcaV+SnWgyDfMQEcNWdExIEY a2lxoIAV2jIqumnUUGMfBLwN004hTxQp/n4i2DZQfggPUse0a4su1ybh/SroXX7DQq0H Rp3/mMHh6dT7oelZWzDqjWgRmfE3uA+ied8QJn5ndrZZ/91JKFhY/XmCl6eyplIt1K0Q eLgQs2Kdi0kgwH5Gxr9RV5FCCsjBXh7nflRyUThtX+QinFHlOuplP4YlDmyUE1If8W7V aBkJrlHS9fw6WlX1niKteV6H/W8d2K82IuwKth9bgnXraehCq3/ziPau+YP7p2ZzJqPZ 1CGg== X-Gm-Message-State: AOAM532TAx72QVth6IUC4IGT0YTEbY7b9XtzvwBNOlipgQMvvXj1xJhs 6rG/paQQy1uuFrUGBTIF20oY2TpUltg+NH2WRwLS7xvuISKslMkkTqGnylIMejW+yz0NN8sPiZy 00yUKBIqUxGy5RiQ= X-Received: by 2002:a5d:6a89:: with SMTP id s9mr2364363wru.15.1590687117763; Thu, 28 May 2020 10:31:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNeNgWBqPsZnE7gm4tx+jJtKg01QrNUTp0Qgr4IMdi7C0TLrnyvoknGnzEE2HFtbNgmLdbAA== X-Received: by 2002:a5d:6a89:: with SMTP id s9mr2364339wru.15.1590687117612; Thu, 28 May 2020 10:31:57 -0700 (PDT) Received: from localhost.localdomain (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id y207sm8403040wmd.7.2020.05.28.10.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2020 10:31:57 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v7 3/5] softmmu/vl: Allow -fw_cfg 'gen_id' option to use the 'etc/' namespace Date: Thu, 28 May 2020 19:31:39 +0200 Message-Id: <20200528173141.17495-4-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200528173141.17495-1-philmd@redhat.com> References: <20200528173141.17495-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 03:11:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Laszlo Ersek , Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" User-generated fw_cfg keys should be prefixed with "opt/". However FW_CFG_DATA_GENERATOR keys are generated by QEMU, so allow the "etc/" namespace in this specific case. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laszlo Ersek --- v7: reword commit description and added comment in code --- softmmu/vl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index cdb1d187ed..d5423eaf2b 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2049,7 +2049,13 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp) FW_CFG_MAX_FILE_PATH - 1); return -1; } - if (strncmp(name, "opt/", 4) != 0) { + if (!nonempty_str(gen_id)) { + /* + * In this particular case where the content is populated + * internally, the "etc/" namespace protection is relaxed, + * so do not emit a warning. + */ + } else if (strncmp(name, "opt/", 4) != 0) { warn_report("externally provided fw_cfg item names " "should be prefixed with \"opt/\""); } From patchwork Thu May 28 17:31:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1299952 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=RZDJ3dWp; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49Xvxl25Fmz9sRY for ; Fri, 29 May 2020 03:36:11 +1000 (AEST) Received: from localhost ([::1]:41722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeMRt-0008Uz-1n for incoming@patchwork.ozlabs.org; Thu, 28 May 2020 13:36:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeMO4-000258-Gh for qemu-devel@nongnu.org; Thu, 28 May 2020 13:32:12 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:44537 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jeMO3-0006dr-47 for qemu-devel@nongnu.org; Thu, 28 May 2020 13:32:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590687129; h=from:from: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; bh=kekca5TgxhCTuA3iWE5rHj7nsO0dupRjp/t2vrZeRK4=; b=RZDJ3dWp7l4lc8H4F3q0NKY6P6Kkcu8eKvSH+kmhI8gaCCJMGQTSibuMy3BuheymM8Kmc3 emGDTcvF490t5pyD4K849R+p3X2GiAKeAoLKQ7I16TWCA5QROzM0x6lkEAdsrFR1LMOfSF kMv/aRS6wt9UNDxkM0un1BdP4GReWFQ= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-274-_LXV9mj1M-6yc-6ugOujjw-1; Thu, 28 May 2020 13:32:04 -0400 X-MC-Unique: _LXV9mj1M-6yc-6ugOujjw-1 Received: by mail-wr1-f69.google.com with SMTP id y7so12828430wrd.12 for ; Thu, 28 May 2020 10:32:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kekca5TgxhCTuA3iWE5rHj7nsO0dupRjp/t2vrZeRK4=; b=G8kr6Mo03vE7kK16eCIYYCG7IFKxdxOVVPRy7xRu8EXPAL2YRvs+0XPYuzFSlsKGQd EeFM+OF8Btyy8WpkVzh5EH/J7G8/v5VmZZnJHZ3P1DPFbCm6XrLl5zjCyqzOhihr6g/z ao20h0TErmNWYRlOCftWtrwPHuCfmp9LkDRSvDQVVkbZdKc1bMVJhba8ejFBD+3XJE6v 0Q+ZakkkY93wiXgtfCjm5h3lqZnAASw/6e0yDinuTjIMJ9vF/gt3kX/GlOlSrY9mWKhX 1P7IAeZKftXY8HknPGHaaqzsDaAKKekaqpJ8anG16JSZbDJuMIeumWh2nd2UQ97np3o4 rWYQ== X-Gm-Message-State: AOAM532FfEbwwB2Olim3nqcvi0qcLK+T/aihdFSk4YtKf17v9fDA/yWw JjPoTC/lkwjjmO5huuImcPAmfnUJeyGfsSo4/kkA9Hbb4K7MmoAxZs61uUtY5P0Aa9y+9QkNxgL h3O+8ZfSiNUQAzn4= X-Received: by 2002:adf:e2c9:: with SMTP id d9mr4499823wrj.227.1590687122709; Thu, 28 May 2020 10:32:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCR+XP9GZCWEFHntH0IImBUe06vsnB3EZU4XdWvfrgyWmk0qvjChUNte4mWsMBMMqLbjChZw== X-Received: by 2002:adf:e2c9:: with SMTP id d9mr4499797wrj.227.1590687122378; Thu, 28 May 2020 10:32:02 -0700 (PDT) Received: from localhost.localdomain (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id 186sm2203453wma.45.2020.05.28.10.32.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2020 10:32:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 4/5] crypto: Add tls-cipher-suites object Date: Thu, 28 May 2020 19:31:40 +0200 Message-Id: <20200528173141.17495-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200528173141.17495-1-philmd@redhat.com> References: <20200528173141.17495-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 06:31:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Laszlo Ersek , Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Example of use to dump: $ qemu-system-x86_64 -S \ -object tls-cipher-suites,id=mysuite,priority=@SYSTEM \ -trace qcrypto\* 1590664444.197123:qcrypto_tls_cipher_suite_priority priority: @SYSTEM 1590664444.197219:qcrypto_tls_cipher_suite_info data:[0x13, 0x02] version:TLS1.3 name:TLS_AES_256_GCM_SHA384 1590664444.197228:qcrypto_tls_cipher_suite_info data:[0x13, 0x03] version:TLS1.3 name:TLS_CHACHA20_POLY1305_SHA256 1590664444.197233:qcrypto_tls_cipher_suite_info data:[0x13, 0x01] version:TLS1.3 name:TLS_AES_128_GCM_SHA256 1590664444.197236:qcrypto_tls_cipher_suite_info data:[0x13, 0x04] version:TLS1.3 name:TLS_AES_128_CCM_SHA256 1590664444.197240:qcrypto_tls_cipher_suite_info data:[0xc0, 0x30] version:TLS1.2 name:TLS_ECDHE_RSA_AES_256_GCM_SHA384 1590664444.197245:qcrypto_tls_cipher_suite_info data:[0xcc, 0xa8] version:TLS1.2 name:TLS_ECDHE_RSA_CHACHA20_POLY1305 1590664444.197250:qcrypto_tls_cipher_suite_info data:[0xc0, 0x14] version:TLS1.0 name:TLS_ECDHE_RSA_AES_256_CBC_SHA1 1590664444.197254:qcrypto_tls_cipher_suite_info data:[0xc0, 0x2f] version:TLS1.2 name:TLS_ECDHE_RSA_AES_128_GCM_SHA256 1590664444.197258:qcrypto_tls_cipher_suite_info data:[0xc0, 0x13] version:TLS1.0 name:TLS_ECDHE_RSA_AES_128_CBC_SHA1 1590664444.197261:qcrypto_tls_cipher_suite_info data:[0xc0, 0x2c] version:TLS1.2 name:TLS_ECDHE_ECDSA_AES_256_GCM_SHA384 1590664444.197266:qcrypto_tls_cipher_suite_info data:[0xcc, 0xa9] version:TLS1.2 name:TLS_ECDHE_ECDSA_CHACHA20_POLY1305 1590664444.197270:qcrypto_tls_cipher_suite_info data:[0xc0, 0xad] version:TLS1.2 name:TLS_ECDHE_ECDSA_AES_256_CCM 1590664444.197274:qcrypto_tls_cipher_suite_info data:[0xc0, 0x0a] version:TLS1.0 name:TLS_ECDHE_ECDSA_AES_256_CBC_SHA1 1590664444.197278:qcrypto_tls_cipher_suite_info data:[0xc0, 0x2b] version:TLS1.2 name:TLS_ECDHE_ECDSA_AES_128_GCM_SHA256 1590664444.197283:qcrypto_tls_cipher_suite_info data:[0xc0, 0xac] version:TLS1.2 name:TLS_ECDHE_ECDSA_AES_128_CCM 1590664444.197287:qcrypto_tls_cipher_suite_info data:[0xc0, 0x09] version:TLS1.0 name:TLS_ECDHE_ECDSA_AES_128_CBC_SHA1 1590664444.197291:qcrypto_tls_cipher_suite_info data:[0x00, 0x9d] version:TLS1.2 name:TLS_RSA_AES_256_GCM_SHA384 1590664444.197296:qcrypto_tls_cipher_suite_info data:[0xc0, 0x9d] version:TLS1.2 name:TLS_RSA_AES_256_CCM 1590664444.197300:qcrypto_tls_cipher_suite_info data:[0x00, 0x35] version:TLS1.0 name:TLS_RSA_AES_256_CBC_SHA1 1590664444.197304:qcrypto_tls_cipher_suite_info data:[0x00, 0x9c] version:TLS1.2 name:TLS_RSA_AES_128_GCM_SHA256 1590664444.197308:qcrypto_tls_cipher_suite_info data:[0xc0, 0x9c] version:TLS1.2 name:TLS_RSA_AES_128_CCM 1590664444.197312:qcrypto_tls_cipher_suite_info data:[0x00, 0x2f] version:TLS1.0 name:TLS_RSA_AES_128_CBC_SHA1 1590664444.197316:qcrypto_tls_cipher_suite_info data:[0x00, 0x9f] version:TLS1.2 name:TLS_DHE_RSA_AES_256_GCM_SHA384 1590664444.197320:qcrypto_tls_cipher_suite_info data:[0xcc, 0xaa] version:TLS1.2 name:TLS_DHE_RSA_CHACHA20_POLY1305 1590664444.197325:qcrypto_tls_cipher_suite_info data:[0xc0, 0x9f] version:TLS1.2 name:TLS_DHE_RSA_AES_256_CCM 1590664444.197329:qcrypto_tls_cipher_suite_info data:[0x00, 0x39] version:TLS1.0 name:TLS_DHE_RSA_AES_256_CBC_SHA1 1590664444.197333:qcrypto_tls_cipher_suite_info data:[0x00, 0x9e] version:TLS1.2 name:TLS_DHE_RSA_AES_128_GCM_SHA256 1590664444.197337:qcrypto_tls_cipher_suite_info data:[0xc0, 0x9e] version:TLS1.2 name:TLS_DHE_RSA_AES_128_CCM 1590664444.197341:qcrypto_tls_cipher_suite_info data:[0x00, 0x33] version:TLS1.0 name:TLS_DHE_RSA_AES_128_CBC_SHA1 1590664444.197345:qcrypto_tls_cipher_suite_count count: 29 Signed-off-by: Philippe Mathieu-Daudé --- v7: - Use Laszlo's loop with enum mode (lersek) - Convert debug printf to trace events (danpb) - Use buildsys CONFIG_GNUTLS instead of C ifdef'ry (danpb) --- include/crypto/tls-cipher-suites.h | 38 +++++++++ crypto/tls-cipher-suites.c | 127 +++++++++++++++++++++++++++++ crypto/Makefile.objs | 1 + crypto/trace-events | 5 ++ 4 files changed, 171 insertions(+) create mode 100644 include/crypto/tls-cipher-suites.h create mode 100644 crypto/tls-cipher-suites.c diff --git a/include/crypto/tls-cipher-suites.h b/include/crypto/tls-cipher-suites.h new file mode 100644 index 0000000000..20a7c74edf --- /dev/null +++ b/include/crypto/tls-cipher-suites.h @@ -0,0 +1,38 @@ +/* + * QEMU TLS Cipher Suites + * + * Copyright (c) 2019 Red Hat, Inc. + * + * Author: Philippe Mathieu-Daudé + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef QCRYPTO_TLSCIPHERSUITES_H +#define QCRYPTO_TLSCIPHERSUITES_H + +#include "qom/object.h" +#include "crypto/tlscreds.h" + +#define TYPE_QCRYPTO_TLS_CIPHER_SUITES "tls-cipher-suites" +#define QCRYPTO_TLS_CIPHER_SUITES(obj) \ + OBJECT_CHECK(QCryptoTLSCipherSuites, (obj), TYPE_QCRYPTO_TLS_CIPHER_SUITES) + +/* + * IANA registered TLS ciphers: + * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4 + */ +typedef struct { + uint8_t data[2]; +} QEMU_PACKED IANA_TLS_CIPHER; + +typedef struct QCryptoTLSCipherSuites { + /* */ + QCryptoTLSCreds parent_obj; + + /* */ + IANA_TLS_CIPHER *cipher_list; + unsigned cipher_count; +} QCryptoTLSCipherSuites; + +#endif /* QCRYPTO_TLSCIPHERSUITES_H */ diff --git a/crypto/tls-cipher-suites.c b/crypto/tls-cipher-suites.c new file mode 100644 index 0000000000..f02a041f9a --- /dev/null +++ b/crypto/tls-cipher-suites.c @@ -0,0 +1,127 @@ +/* + * QEMU TLS Cipher Suites + * + * Copyright (c) 2019 Red Hat, Inc. + * + * Author: Philippe Mathieu-Daudé + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qom/object_interfaces.h" +#include "qemu/error-report.h" +#include "crypto/tlscreds.h" +#include "crypto/tls-cipher-suites.h" +#include "trace.h" + +static void parse_cipher_suites(QCryptoTLSCipherSuites *s, + const char *priority_name, Error **errp) +{ + int ret; + const char *err; + gnutls_priority_t pcache; + enum { M_ENUMERATE, M_GENERATE, M_DONE } mode; + + assert(priority_name); + trace_qcrypto_tls_cipher_suite_priority(priority_name); + ret = gnutls_priority_init(&pcache, priority_name, &err); + if (ret < 0) { + error_setg(errp, "Syntax error using priority '%s': %s", + priority_name, gnutls_strerror(ret)); + return; + } + + for (mode = M_ENUMERATE; mode < M_DONE; mode++) { + size_t i; + + for (i = 0;; i++) { + int ret; + unsigned idx; + const char *name; + IANA_TLS_CIPHER cipher; + gnutls_protocol_t protocol; + + ret = gnutls_priority_get_cipher_suite_index(pcache, i, &idx); + if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { + break; + } + if (ret == GNUTLS_E_UNKNOWN_CIPHER_SUITE) { + continue; + } + + name = gnutls_cipher_suite_info(idx, (unsigned char *)&cipher, + NULL, NULL, NULL, &protocol); + if (name == NULL) { + continue; + } + + if (mode == M_GENERATE) { + const char *version; + + version = gnutls_protocol_get_name(protocol); + trace_qcrypto_tls_cipher_suite_info(cipher.data[0], + cipher.data[1], + version, name); + s->cipher_list[s->cipher_count] = cipher; + } + s->cipher_count++; + } + + if (mode == M_ENUMERATE) { + if (s->cipher_count == 0) { + break; + } + s->cipher_list = g_new(IANA_TLS_CIPHER, s->cipher_count); + s->cipher_count = 0; + } + } + trace_qcrypto_tls_cipher_suite_count(s->cipher_count); + gnutls_priority_deinit(pcache); +} + +static void qcrypto_tls_cipher_suites_complete(UserCreatable *uc, Error **errp) +{ + QCryptoTLSCreds *s = QCRYPTO_TLS_CREDS(uc); + + if (!s->priority) { + error_setg(errp, "'priority' property is not set"); + return; + } + parse_cipher_suites(QCRYPTO_TLS_CIPHER_SUITES(s), s->priority, errp); +} + +static void qcrypto_tls_cipher_suites_finalize(Object *obj) +{ + QCryptoTLSCipherSuites *s = QCRYPTO_TLS_CIPHER_SUITES(obj); + + g_free(s->cipher_list); +} + +static void qcrypto_tls_cipher_suites_class_init(ObjectClass *oc, void *data) +{ + UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); + + ucc->complete = qcrypto_tls_cipher_suites_complete; +} + +static const TypeInfo qcrypto_tls_cipher_suites_info = { + .parent = TYPE_QCRYPTO_TLS_CREDS, + .name = TYPE_QCRYPTO_TLS_CIPHER_SUITES, + .instance_size = sizeof(QCryptoTLSCipherSuites), + .instance_finalize = qcrypto_tls_cipher_suites_finalize, + .class_size = sizeof(QCryptoTLSCredsClass), + .class_init = qcrypto_tls_cipher_suites_class_init, + .interfaces = (InterfaceInfo[]) { + { TYPE_USER_CREATABLE }, + { } + } +}; + +static void qcrypto_tls_cipher_suites_register_types(void) +{ + type_register_static(&qcrypto_tls_cipher_suites_info); +} + +type_init(qcrypto_tls_cipher_suites_register_types); diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index c2a371b0b4..1c1b5e21ff 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -13,6 +13,7 @@ crypto-obj-y += cipher.o crypto-obj-$(CONFIG_AF_ALG) += afalg.o crypto-obj-$(CONFIG_AF_ALG) += cipher-afalg.o crypto-obj-$(CONFIG_AF_ALG) += hash-afalg.o +crypto-obj-$(CONFIG_GNUTLS) += tls-cipher-suites.o crypto-obj-y += tlscreds.o crypto-obj-y += tlscredsanon.o crypto-obj-y += tlscredspsk.o diff --git a/crypto/trace-events b/crypto/trace-events index 9e594d30e8..c07a752b50 100644 --- a/crypto/trace-events +++ b/crypto/trace-events @@ -21,3 +21,8 @@ qcrypto_tls_creds_x509_load_cert_list(void *creds, const char *file) "TLS creds # tlssession.c qcrypto_tls_session_new(void *session, void *creds, const char *hostname, const char *authzid, int endpoint) "TLS session new session=%p creds=%p hostname=%s authzid=%s endpoint=%d" qcrypto_tls_session_check_creds(void *session, const char *status) "TLS session check creds session=%p status=%s" + +# tls-cipher-suites.c +qcrypto_tls_cipher_suite_priority(const char *name) "priority: %s" +qcrypto_tls_cipher_suite_info(uint8_t data0, uint8_t data1, const char *version, const char *name) "data:[0x%02x, 0x%02x] version:%s name:%s" +qcrypto_tls_cipher_suite_count(unsigned count) "count: %u" From patchwork Thu May 28 17:31:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1299951 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=L4dhNb/r; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49XvxH5dzKz9sRK for ; Fri, 29 May 2020 03:35:47 +1000 (AEST) Received: from localhost ([::1]:39516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeMRV-0007WZ-HF for incoming@patchwork.ozlabs.org; Thu, 28 May 2020 13:35:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeMO4-00024D-6H for qemu-devel@nongnu.org; Thu, 28 May 2020 13:32:12 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:44360 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jeMO3-0006eC-By for qemu-devel@nongnu.org; Thu, 28 May 2020 13:32:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590687130; h=from:from: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; bh=zXuTo3is2py9vIRdq7hNRL5VkVqGS5UwbURK4RrjWrY=; b=L4dhNb/r7y7KfMv0RpQuxwcPiYO5oQRhvrdsfoXBqpzwLGm5H559jY1ax6jkmVLt+7fHFF ITq7J3xDXfL7RV0kANwUKRB+QY6dPQzVBcmQr/kyLSt4m2L0sSANNPBpDkb6RKOqNd5mTh b51gs2vqEsYBd8I5Mzt1UtiCg6O0dNU= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-500-syp0XlBwO6qziLVWO15znw-1; Thu, 28 May 2020 13:32:08 -0400 X-MC-Unique: syp0XlBwO6qziLVWO15znw-1 Received: by mail-wm1-f69.google.com with SMTP id k185so1224811wme.8 for ; Thu, 28 May 2020 10:32:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zXuTo3is2py9vIRdq7hNRL5VkVqGS5UwbURK4RrjWrY=; b=RYTnkulqZSWTXtuQDv8mm2jirdA3PWd38m3W/xdTy2lfaTK5burv65r/TZi1ozq+jV 8uDgY2/nqk1eiT1fKOPbLGVTVfoR6abI3WRb+s1R3B/Td9IyidEsuah6jFF3804Er56o +SFEKAaCgoS4a20HBAeLNARy8dgRYqtX4qvKSWzeEzpuodgmdX93bEzahUKCQ9CtZEIh Dacjtq0+TWZeZJt3o9ZuH8z9WxsMnPcbcpX7Tsr/6vLHIugQRlIgANWEurz5GHB3u6EW B0th0MRS9ThvMenbVn5oYPpeWCvH8S9D400BKe2rTa0ObnjIdrFemwj6BfP60dR7NqdP eaIw== X-Gm-Message-State: AOAM531FBiliCbrOyGQTxOqeWLVCRS+k6wv6ofUj2hKG1/O57HwfDrY+ Zhhonvl0jTLNLFJWu2XYgZa08TtSk9MdzmC5KsgFwPm9fVO99rPr4ivyiQkKjmdSQfkazhN+/vE Ywx2yx44KgWjL/y0= X-Received: by 2002:a5d:4c8f:: with SMTP id z15mr4500723wrs.19.1590687127411; Thu, 28 May 2020 10:32:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9eMzt0M3yERQ1wZqJtS9xffsyZ1dtSCc0hb4pWDej9wB3YQICPxlR2oziok2otvn5PuhjsQ== X-Received: by 2002:a5d:4c8f:: with SMTP id z15mr4500703wrs.19.1590687127162; Thu, 28 May 2020 10:32:07 -0700 (PDT) Received: from localhost.localdomain (71.red-88-21-204.staticip.rima-tde.net. [88.21.204.71]) by smtp.gmail.com with ESMTPSA id u13sm6565317wrp.53.2020.05.28.10.32.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2020 10:32:06 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 5/5] crypto/tls-cipher-suites: Produce fw_cfg consumable blob Date: Thu, 28 May 2020 19:31:41 +0200 Message-Id: <20200528173141.17495-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200528173141.17495-1-philmd@redhat.com> References: <20200528173141.17495-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 01:51:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Laszlo Ersek , Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since our format is consumable by the fw_cfg device, we can implement the FW_CFG_DATA_GENERATOR interface. Acked-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daudé --- crypto/tls-cipher-suites.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/crypto/tls-cipher-suites.c b/crypto/tls-cipher-suites.c index f02a041f9a..d6ea0ed190 100644 --- a/crypto/tls-cipher-suites.c +++ b/crypto/tls-cipher-suites.c @@ -14,6 +14,7 @@ #include "qemu/error-report.h" #include "crypto/tlscreds.h" #include "crypto/tls-cipher-suites.h" +#include "hw/nvram/fw_cfg.h" #include "trace.h" static void parse_cipher_suites(QCryptoTLSCipherSuites *s, @@ -99,11 +100,28 @@ static void qcrypto_tls_cipher_suites_finalize(Object *obj) g_free(s->cipher_list); } +static const void *qcrypto_tls_cipher_suites_get_data(Object *obj) +{ + QCryptoTLSCipherSuites *s = QCRYPTO_TLS_CIPHER_SUITES(obj); + + return s->cipher_list; +} + +static size_t qcrypto_tls_cipher_suites_get_length(Object *obj) +{ + QCryptoTLSCipherSuites *s = QCRYPTO_TLS_CIPHER_SUITES(obj); + + return s->cipher_count * sizeof(IANA_TLS_CIPHER); +} + static void qcrypto_tls_cipher_suites_class_init(ObjectClass *oc, void *data) { UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); + FWCfgDataGeneratorClass *fwgc = FW_CFG_DATA_GENERATOR_CLASS(oc); ucc->complete = qcrypto_tls_cipher_suites_complete; + fwgc->get_data = qcrypto_tls_cipher_suites_get_data; + fwgc->get_length = qcrypto_tls_cipher_suites_get_length; } static const TypeInfo qcrypto_tls_cipher_suites_info = { @@ -115,6 +133,7 @@ static const TypeInfo qcrypto_tls_cipher_suites_info = { .class_init = qcrypto_tls_cipher_suites_class_init, .interfaces = (InterfaceInfo[]) { { TYPE_USER_CREATABLE }, + { TYPE_FW_CFG_DATA_GENERATOR_INTERFACE }, { } } };