From patchwork Thu Feb 9 15:26:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 13134743 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C42F2C61DA4 for ; Thu, 9 Feb 2023 15:26:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=871fxAlqpzCJukKPzPj8lQJ6B0v1FMYnNrO99CSPw8M=; b=wcMLMjfqGvk0Pt 7fnzgBFmk77Nhik2eebsZXitXS3EUbsppisiuas4cyFj52kCErkcLo9k3apknlhX0ljh+4SKinrGi CTovlUUxJk8UAzrHS9xeXVUx9zFvbjun7/i7Gq+EVeLhPmIx4/0kfO8OTjQ4ewgvL6MEOthq3ygLF nuwp8Q/xblOBwWIovOq7dzis5U9E7m7CcnYzsWledX9kjk1R6PDL+nvUTuyxAa0bZLLeGV7SRRcqk iVZkvTSNmIvwUi1FaypzDk1pjTCrryIAIkwt6NMiQMLGqSJLWznIKZXva69gHeSj37NM91tOHZsMF EtblJbDcXQFhNELXGuVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQ8ot-002Cfr-On; Thu, 09 Feb 2023 15:26:43 +0000 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQ8oo-002CZ4-EZ for linux-riscv@lists.infradead.org; Thu, 09 Feb 2023 15:26:41 +0000 Received: by mail-ej1-x62b.google.com with SMTP id p26so7347482ejx.13 for ; Thu, 09 Feb 2023 07:26:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MjCFSk4WAA8Ljs9klJBi/zNOvYCpTeU7cZLgpPDCtHY=; b=mHatL0K0OlmvOi/Dsna6gemWFLkn/gXc6i/Hxh0uv8yWhvw6VxVLMQC7ksCRwY9qL7 J9/3DL1h9d+yiG6o6/hUJ6xmKaYxyTK9aygCV5PxR+cCJavvpwhiV+K6baatD+oKgzZI JNq+aMI1pht9yxhTSqgruCwhrrxgVDVxsNzqyu8R4KHQRx78Oym3ajfB1+WBPzA6I0J0 eahngtH7VuSmCZ1//agFOCa2pk2UbqoJODLy6GAcWK3YW45LdnTcK4JwurPP8Eil3LYI IiVlmUiTJd8k96XGe6+3QcORVmSe5NFH6WeLOJQDMDQFpw7Eo3MvvCBziIA1LmEV8ncZ uNZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MjCFSk4WAA8Ljs9klJBi/zNOvYCpTeU7cZLgpPDCtHY=; b=EhnMQ4ZGNscF9aO5aL7Pkpoi2k7hAwS4xeoqZRWtAuIYR2+n/IN8PKsyTHmcHtxH4Y 09WW5ZOpZ5+NYPs9dag/FJ7Q61N24jhlPHZXaRzGDN4OBhlTnLd0vgqe46uE8wv5DZgD bGf0VWmuzuaXAHSF+C/tyKhKIwcVv0hcTUT5lRcN6hSguZFtQviKtpXWgoLVPfwzGnkf b3ghgKUlDLlBT2ZXIbPxLJhnidag5x78lY5Xg4BtcknZql38O7RZ9fQRJw4RxWHR/Kd5 cXtNR9S5o3l9bp6gFLqDv3mnUHIOsbPuGVXsWLi3C3quzKYdjtL0fBrDv+Iw+62jsE+S GC+g== X-Gm-Message-State: AO0yUKUK9BIWB3+UiAd0rbibdUOUwgoGYYjsL/hgSx0hc/yYSrOxdeOj bfVP6Gulf74uW8v1N/cQ9n5/y/TQlPpuSOco X-Google-Smtp-Source: AK7set929OJJb82VxrPGtyC9qRXC5KXbucIopdXttwcGhYbnhonZDv6ahTvsM1iS4YICbWHS0P8tIA== X-Received: by 2002:a17:906:1e8c:b0:88d:f759:15b0 with SMTP id e12-20020a1709061e8c00b0088df75915b0mr12626077ejj.45.1675956390223; Thu, 09 Feb 2023 07:26:30 -0800 (PST) Received: from localhost (cst2-173-16.cust.vodafone.cz. [31.30.173.16]) by smtp.gmail.com with ESMTPSA id gl11-20020a170906e0cb00b0084d381d0528sm984769ejb.180.2023.02.09.07.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 07:26:29 -0800 (PST) From: Andrew Jones To: linux-riscv@lists.infradead.org, kvm-riscv@lists.infradead.org, devicetree@vger.kernel.org Cc: 'Anup Patel ' , 'Palmer Dabbelt ' , 'Paul Walmsley ' , 'Krzysztof Kozlowski ' , 'Atish Patra ' , 'Heiko Stuebner ' , 'Jisheng Zhang ' , 'Rob Herring ' , 'Albert Ou ' , 'Conor Dooley ' Subject: [PATCH v4 0/8] RISC-V: Apply Zicboz to clear_page Date: Thu, 9 Feb 2023 16:26:20 +0100 Message-Id: <20230209152628.129914-1-ajones@ventanamicro.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230209_072638_617317_79ECA308 X-CRM114-Status: GOOD ( 19.28 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org When the Zicboz extension is available we can more rapidly zero naturally aligned Zicboz block sized chunks of memory. As pages are always page aligned and are larger than any Zicboz block size will be, then clear_page() appears to be a good candidate for the extension. While cycle count and energy consumption should also be considered, we can be pretty certain that implementing clear_page() with the Zicboz extension is a win by comparing the new dynamic instruction count with its current count[1]. Doing so we see that the new count is just over a quarter of the old count (see patch4's commit message for more details). For those of you who reviewed v1[2], you may be looking for the memset() patches. As pointed out in v1, and a couple follow-up emails, it's not clear that patching memset() is a win yet. When I get a chance to test on real hardware with a comprehensive benchmark collection then I can post the memset() patches separately (assuming the benchmarks show it's worthwhile). Based on riscv-linux/for-next plus the dependencies listed below. Dependencies: https://lore.kernel.org/all/20230108163356.3063839-1-conor@kernel.org/ https://lore.kernel.org/all/20230105192610.1940841-1-heiko@sntech.de/ The patches are also available here https://github.com/jones-drew/linux/commits/riscv/zicboz-v4 To test over QEMU this branch may be used to enable Zicboz https://gitlab.com/jones-drew/qemu/-/commits/riscv/zicboz To test running a KVM guest with Zicboz this kvmtool branch may be used https://github.com/jones-drew/kvmtool/commits/riscv/zicboz Thanks, drew [1] I ported the functions under test to userspace and linked them with a test program. Then, I ran them under gdb with a script[3] which counted instructions by single stepping. [2] https://lore.kernel.org/all/20221027130247.31634-1-ajones@ventanamicro.com/ [3] https://gist.github.com/jones-drew/487791c956ceca8c18adc2847eec9c60 v4: - Rebased on latest for-next which allowed dropping one dependency - Added "RISC-V: alternatives: Support patching multiple insns in assembly" since I needed to use more than one instruction in an ALTERNATIVE call from assembly. I can post this patch separately as a fix if desired. - Improved the dt-binding patch commit message [Conor] - Picked up some tags from Conor and Rob (I kept Conor's a-b on the clear_page patch, even though there are several changes to it, because I interpreted the a-b as "OK by me to implement a Zicboz clear_page") - Added "RISC-V: cpufeature: Put vendor_id to work", which was necessary for how I wanted to use ALTERNATIVE in clear_page. - Fallback to memset when the Zicboz block size is too big for the Zicboz implementation of clear_page [Palmer] - Use lw without la in clear_page impl [Palmer] - Implement a Duff device for clear_page using the new 'vendor_id' alternatives support [drew] v3: - CC'ed DT list - Improved commit message of DT bindings patch to point out relationship with cbom-block-size - Picked up an a-b from Conor v2: - s/blksz/block_size/, improved commit message for "RISC-V: Add Zicboz detection and block size parsing", isa ext sorting [Conor] - Added dt binding patch [Heiko] - Picked up r-b's from Conor, Heiko, and Anup - Moved config symbol and CBO_zero() introduction to "RISC-V: Use Zicboz in clear_page when available" and improved its commit message and implementation (unrolled four times) [drew] - Dropped memset() patches [drew] - Rebased on ae4d39f75308 ("Merge patch "RISC-V: fix incorrect type of ARCH_CANAAN_K210_DTB_SOURCE"") plus the dependencies Andrew Jones (8): RISC-V: alternatives: Support patching multiple insns in assembly RISC-V: Factor out body of riscv_init_cbom_blocksize loop dt-bindings: riscv: Document cboz-block-size RISC-V: Add Zicboz detection and block size parsing RISC-V: cpufeature: Put vendor_id to work RISC-V: Use Zicboz in clear_page when available RISC-V: KVM: Provide UAPI for Zicboz block size RISC-V: KVM: Expose Zicboz to the guest .../devicetree/bindings/riscv/cpus.yaml | 5 ++ arch/riscv/Kconfig | 13 ++++ arch/riscv/include/asm/alternative-macros.h | 6 +- arch/riscv/include/asm/cacheflush.h | 3 +- arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/include/asm/insn-def.h | 4 ++ arch/riscv/include/asm/page.h | 6 +- arch/riscv/include/uapi/asm/kvm.h | 2 + arch/riscv/kernel/cpu.c | 1 + arch/riscv/kernel/cpufeature.c | 31 +++++++- arch/riscv/kernel/setup.c | 2 +- arch/riscv/kvm/vcpu.c | 11 +++ arch/riscv/lib/Makefile | 1 + arch/riscv/lib/clear_page.S | 71 +++++++++++++++++++ arch/riscv/mm/cacheflush.c | 64 ++++++++++------- 15 files changed, 187 insertions(+), 34 deletions(-) create mode 100644 arch/riscv/lib/clear_page.S