Received: by 10.223.185.116 with SMTP id b49csp6297415wrg; Wed, 28 Feb 2018 07:10:10 -0800 (PST) X-Google-Smtp-Source: AH8x226t7mAas8BKH3mdgwdZxxNX4TL7FlwUnk4rnb8p2MjweD8Rc/bURL35dqD6B+qz7/c220HO X-Received: by 10.98.13.24 with SMTP id v24mr17924530pfi.89.1519830610772; Wed, 28 Feb 2018 07:10:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519830610; cv=none; d=google.com; s=arc-20160816; b=GEfB6nkoup/4NdNuKtMoMZKaE3xo4EkguV4nBy13pA2m/OJ5KkDfiyZyprQe2bNO1H FPnyFMcylz+0lf94+yOT//g+BX2wh/Cbl/NPpXm8Dm+zKaWZ685vpUwVMIR31gaKDKAD bFe7DWLy1GUJSpgf79SzxPoqW678NoLX2B1cbqd11DPVyPImGV93ZtafVTF8URk4quZQ q5deBA17tU59ebyQpTiUIeBTbtMbtlZVJGhNFEHzguiia+ovOlrSQ6IYogu7YURGGA0o ks0KmQTAdQXAskJ1nI0lBiQjrWfdO6wgOsSXcuYke2pfwpzOJlLoGFtNjHrDxUfOqqPG 6Q/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=+44llQI3n/IiHXow+B0vZRgh0/pyJzvCC6x4OCb77bs=; b=MMeT9g2pnrUyJz2XZO/gJaW/8uiDFM3YOpVVNmGdg09d0/94gSe88/+SPGjtpaOhnm VfAb7ZipOWseTq06ypJalwg+Vmeya74VMXFMzDAwsKTr4ZwbIXkmSEFyipXxtk9YMWBC 1LeLpSrT8byQAyqyHAXEbjH312gJ4V7x1g7yVjGSlh0AR2jZk47oUbmBiGsUo7GY8vgw 2nL4FK8ZP3xH4gbI2xbByay6SXGE9m4lxM06TZyuwMKIvheFgltiNA9PgfDt3RNScaEV AlTRPbbcND81VOOUrLoL0TJzJeeoRrIuyGD4Ou4Q56YAeUtncGCnMNr8A0/3n0moEjrC cVxA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p1si1138975pgc.280.2018.02.28.07.09.51; Wed, 28 Feb 2018 07:10:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932276AbeB1PHM (ORCPT + 99 others); Wed, 28 Feb 2018 10:07:12 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57918 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932250AbeB1PHJ (ORCPT ); Wed, 28 Feb 2018 10:07:09 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1F1A8402290A; Wed, 28 Feb 2018 15:07:08 +0000 (UTC) Received: from localhost (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2838213AEF5; Wed, 28 Feb 2018 15:07:07 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: linux-kernel@vger.kernel.org Cc: arnd@arndb.de, bhe@redhat.com, slp@redhat.com, mst@redhat.com, somlo@cmu.edu, xiaolong.ye@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v16 11/11] RFC: fw_cfg: do DMA read operation Date: Wed, 28 Feb 2018 16:06:15 +0100 Message-Id: <20180228150615.17317-12-marcandre.lureau@redhat.com> In-Reply-To: <20180228150615.17317-1-marcandre.lureau@redhat.com> References: <20180228150615.17317-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 28 Feb 2018 15:07:08 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 28 Feb 2018 15:07:08 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'marcandre.lureau@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Modify fw_cfg_read_blob() to use DMA if the device supports it. Return errors, because the operation may fail. So far, only one call in fw_cfg_register_dir_entries() is using kmalloc'ed buf and is thus clearly eligible to DMA read. Initially, I didn't implement DMA read to speed up boot time, but as a first step before introducing DMA write (since read operations were already presents). Even more, I didn't realize fw-cfg entries were being read by the kernel during boot by default. But actally fw-cfg entries are being populated during module probe. I knew DMA improved a lot bios boot time (the main reason the DMA interface was added afaik). Let see the time it would take to read the whole ACPI tables (128kb allocated) # time cat /sys/firmware/qemu_fw_cfg/by_name/etc/acpi/tables/raw - with DMA: sys 0m0.003s - without DMA (-global fw_cfg.dma_enabled=off): sys 0m7.674s FW_CFG_FILE_DIR (0x19) is the only "file" that is read during kernel boot to populate sysfs qemu_fw_cfg directory, and it is quite small (1-2kb). Since it does not expose itself, in order to measure the time it takes to read such small file, I took a comparable sized file of 2048 bytes and exposed it (-fw_cfg test,file=file with a modified read_raw enabling DMA) # perf stat -r 100 cat /sys/firmware/qemu_fw_cfg/by_name/test/raw >/dev/null - with DMA: 0.636037 task-clock (msec) # 0.141 CPUs utilized ( +- 1.19% ) - without DMA: 6.430128 task-clock (msec) # 0.622 CPUs utilized ( +- 0.22% ) That's a few msec saved during boot by enabling DMA read (the gain would be more substantial if other & bigger fw-cfg entries are read by others from sysfs, unfortunately, it's not clear if we can always enable DMA there) Signed-off-by: Marc-André Lureau --- drivers/firmware/qemu_fw_cfg.c | 68 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index 14fedbeca724..db1cba4f99bd 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c @@ -66,7 +66,6 @@ static void fw_cfg_sel_endianness(u16 key) iowrite16(key, fw_cfg_reg_ctrl); } -#ifdef CONFIG_CRASH_CORE static inline bool fw_cfg_dma_enabled(void) { return (fw_cfg_rev & FW_CFG_VERSION_DMA) && fw_cfg_reg_dma; @@ -124,14 +123,49 @@ static ssize_t fw_cfg_dma_transfer(void *address, u32 length, u32 control) return ret; } -#endif + +/* with acpi & dev locks taken */ +static ssize_t fw_cfg_read_blob_dma(u16 key, + void *buf, loff_t pos, size_t count) +{ + ssize_t ret; + + if (pos == 0) { + ret = fw_cfg_dma_transfer(buf, count, key << 16 + | FW_CFG_DMA_CTL_SELECT + | FW_CFG_DMA_CTL_READ); + } else { + fw_cfg_sel_endianness(key); + ret = fw_cfg_dma_transfer(NULL, pos, FW_CFG_DMA_CTL_SKIP); + if (ret < 0) + return ret; + ret = fw_cfg_dma_transfer(buf, count, + FW_CFG_DMA_CTL_READ); + } + + return ret; +} + +/* with acpi & dev locks taken */ +static ssize_t fw_cfg_read_blob_io(u16 key, + void *buf, loff_t pos, size_t count) +{ + fw_cfg_sel_endianness(key); + while (pos-- > 0) + ioread8(fw_cfg_reg_data); + ioread8_rep(fw_cfg_reg_data, buf, count); + return count; +} /* read chunk of given fw_cfg blob (caller responsible for sanity-check) */ static ssize_t fw_cfg_read_blob(u16 key, - void *buf, loff_t pos, size_t count) + void *buf, loff_t pos, size_t count, + ssize_t (*readfn)(u16 key, void *buf, + loff_t pos, size_t count)) { u32 glk = -1U; acpi_status status; + ssize_t ret; /* If we have ACPI, ensure mutual exclusion against any potential * device access by the firmware, e.g. via AML methods: @@ -145,14 +179,19 @@ static ssize_t fw_cfg_read_blob(u16 key, } mutex_lock(&fw_cfg_dev_lock); - fw_cfg_sel_endianness(key); - while (pos-- > 0) - ioread8(fw_cfg_reg_data); - ioread8_rep(fw_cfg_reg_data, buf, count); + + /* fallback to IO if DMA is not available */ + if (readfn == fw_cfg_read_blob_dma && !fw_cfg_dma_enabled()) { + readfn = fw_cfg_read_blob_io; + } + + ret = readfn(key, buf, pos, count); + mutex_unlock(&fw_cfg_dev_lock); acpi_release_global_lock(glk); - return count; + + return ret; } #ifdef CONFIG_CRASH_CORE @@ -286,7 +325,7 @@ static int fw_cfg_do_platform_probe(struct platform_device *pdev) /* verify fw_cfg device signature */ if (fw_cfg_read_blob(FW_CFG_SIGNATURE, sig, - 0, FW_CFG_SIG_SIZE) < 0 || + 0, FW_CFG_SIG_SIZE, fw_cfg_read_blob_io) < 0 || memcmp(sig, "QEMU", FW_CFG_SIG_SIZE) != 0) { fw_cfg_io_cleanup(); return -ENODEV; @@ -470,7 +509,9 @@ static ssize_t fw_cfg_sysfs_read_raw(struct file *filp, struct kobject *kobj, if (count > entry->size - pos) count = entry->size - pos; - return fw_cfg_read_blob(entry->select, buf, pos, count); + /* do not use DMA, virt_to_phys(buf) might not be ok */ + return fw_cfg_read_blob(entry->select, buf, pos, count, + fw_cfg_read_blob_io); } static struct bin_attribute fw_cfg_sysfs_attr_raw = { @@ -636,7 +677,7 @@ static int fw_cfg_register_dir_entries(void) size_t dir_size; ret = fw_cfg_read_blob(FW_CFG_FILE_DIR, &files_count, - 0, sizeof(files_count)); + 0, sizeof(files_count), fw_cfg_read_blob_io); if (ret < 0) return ret; @@ -648,7 +689,7 @@ static int fw_cfg_register_dir_entries(void) return -ENOMEM; ret = fw_cfg_read_blob(FW_CFG_FILE_DIR, dir, - sizeof(files_count), dir_size); + sizeof(files_count), dir_size, fw_cfg_read_blob_dma); if (ret < 0) goto end; @@ -699,7 +740,8 @@ static int fw_cfg_sysfs_probe(struct platform_device *pdev) goto err_probe; /* get revision number, add matching top-level attribute */ - err = fw_cfg_read_blob(FW_CFG_ID, &rev, 0, sizeof(rev)); + err = fw_cfg_read_blob(FW_CFG_ID, &rev, 0, sizeof(rev), + fw_cfg_read_blob_io); if (err < 0) goto err_probe; -- 2.16.1.73.g5832b7e9f2