From patchwork Wed Apr 19 22:17:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atish Patra X-Patchwork-Id: 13217481 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 554E3C6FD18 for ; Wed, 19 Apr 2023 22:19:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C69E900022; Wed, 19 Apr 2023 18:18:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 34F0D900003; Wed, 19 Apr 2023 18:18:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12BA4900022; Wed, 19 Apr 2023 18:18:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id F2DEC900003 for ; Wed, 19 Apr 2023 18:18:45 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B7A6C1A0241 for ; Wed, 19 Apr 2023 22:18:45 +0000 (UTC) X-FDA: 80699556210.30.A1AA316 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by imf28.hostedemail.com (Postfix) with ESMTP id ECE62C0010 for ; Wed, 19 Apr 2023 22:18:43 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=Ynw03ruO; spf=pass (imf28.hostedemail.com: domain of atishp@rivosinc.com designates 209.85.215.181 as permitted sender) smtp.mailfrom=atishp@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681942724; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CQCEa95xde61G0+g1spWAS5gSK9slN4MB0K1b9QrdE8=; b=wr5uPFdRZZFbvZreZ+meu8iW1rnAK9Bh38ctHQ1281C8p2Bk1LgLhR44CwxmlTPx6oJCyJ nTNHZNVnchlaWWsvCRr/PbEzw6+UytAEPit7I+uwmlrqVW0qu0pmt779gg6tFf3CpzaBOE Zv1KyNd8sqqzCsxNPZ+xOmq2AubOtwk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681942724; a=rsa-sha256; cv=none; b=wMOyWgk6c+qZxboqQ8hjgTmvMM0tnPnSgkWcinEsNgYYloTDHOPA8dl9apErvWtfKEWhTD X7qUtOStLobBmKvr/XJmdLuvW8Z+4RmszLFzdwt6bzLnlht97PaLAoFZQjhrs0QVslLkC+ 85fMRq+pK0Ult7qXPpInQy+RG0jAdbI= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=Ynw03ruO; spf=pass (imf28.hostedemail.com: domain of atishp@rivosinc.com designates 209.85.215.181 as permitted sender) smtp.mailfrom=atishp@rivosinc.com; dmarc=none Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-52079a12451so209689a12.3 for ; Wed, 19 Apr 2023 15:18:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1681942723; x=1684534723; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CQCEa95xde61G0+g1spWAS5gSK9slN4MB0K1b9QrdE8=; b=Ynw03ruOG3PNfgG00HUUd7HJCh15VY3aEZKHBX+JvWIZqAaPdtZJFMNC9sQ+7tdyNf gQij1krIXgqHn6c3FKneR90d+ObOiz01SLEvx89Co8mtqMDidl42AKlK9b8IeRrjhkVj wFMRWmBw0WyiUKSEW2tAX/U5AjDnycCzdvc7/5XQe2CDXdqSpATkNcRDmxBB2iAZSbfO Qe8Etb6nnDF5lWA9UfVwL0EYoHqQHL5jKdNdyJEbe8jXSsaw1PcWzy6qONpwtJLTmV1a iWDDSsLQLNxRbxPSgzzxgbkJX9sxpOs3jDYDbGE18ziPonHZ9Lw5ZRGoMLwBsGOpngcC aTQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681942723; x=1684534723; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CQCEa95xde61G0+g1spWAS5gSK9slN4MB0K1b9QrdE8=; b=TvAc7SZCiR6TQqGBNQJoyFLOXkvkrVY1BiTU4GZk1bB0YLNoSDTWNu6hqTWJ6YyO7O NVL+IB3Hr5Wx99BOW2nwfof4ZuxNltOx7WH7KSbPXM4yC0sEXL4j8VvcFdSGJxb3mgBz akT8Cl5DNmGOdckPb8bofQ00WdO/MG1K2ELd3J9Tb9NDsDeb1DVv1KmBu1o+0oSGyoPW 95hRdUyPNlDs0TbmWWtOH/vRjRYy+tdwIebpRvvpSCocwVTn05L/ZVU5Z4vCNRLxf5+Z jkhSXZnxqIlbrTrx2aHS8EyJzvZf0r9eUk/enbQ4oUuKFz2RWCaA0aWMrF936VNvubZ6 5J4A== X-Gm-Message-State: AAQBX9crJdwYYFgkWzIy6C5bA299DFSf+WLVSAJmS95W4C20QYc9W0TJ kE3HWWsihZQIvdGtNGMa4KvCeA== X-Google-Smtp-Source: AKy350a8Ym8XHInuF0mFeXBc2+oA8kajjJCNeYyHi0F4HD8cqx1mngs6rpkeTwZ7fiAYwBWCbSvEDg== X-Received: by 2002:a17:902:ba89:b0:1a9:2693:2e29 with SMTP id k9-20020a170902ba8900b001a926932e29mr1536823pls.42.1681942722916; Wed, 19 Apr 2023 15:18:42 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id jn11-20020a170903050b00b00196807b5189sm11619190plb.292.2023.04.19.15.18.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 15:18:42 -0700 (PDT) From: Atish Patra To: linux-kernel@vger.kernel.org Cc: Atish Patra , Alexandre Ghiti , Andrew Jones , Andrew Morton , Anup Patel , Atish Patra , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Suzuki K Poulose , Will Deacon , Marc Zyngier , Sean Christopherson , linux-coco@lists.linux.dev, Dylan Reid , abrestic@rivosinc.com, Samuel Ortiz , Christoph Hellwig , Conor Dooley , Greg Kroah-Hartman , Guo Ren , Heiko Stuebner , Jiri Slaby , kvm-riscv@lists.infradead.org, kvm@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, Mayuresh Chitale , Palmer Dabbelt , Paolo Bonzini , Paul Walmsley , Rajnesh Kanwal , Uladzislau Rezki Subject: [RFC 33/48] RISC-V: KVM: Hookup TVM VCPU init/destroy Date: Wed, 19 Apr 2023 15:17:01 -0700 Message-Id: <20230419221716.3603068-34-atishp@rivosinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230419221716.3603068-1-atishp@rivosinc.com> References: <20230419221716.3603068-1-atishp@rivosinc.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: ECE62C0010 X-Rspamd-Server: rspam09 X-Stat-Signature: qnguck5fg5fnmh544msyog58goox1h1a X-HE-Tag: 1681942723-754302 X-HE-Meta: U2FsdGVkX1+2cM0ByS3RHy/QuYwwXWobIVk4IIMoZFz2y46bt75d+Z/62mkMeZS30E8BL4lgqsteObsE8dN1oRzeiD6M11L3KKDQa0H5OoCJtAMmw/dw3AnkdMqP//Hnb/ylnxeCCglH7X9lncbyXaiItNdMLVnJtTsCGmz99/bNLGbUpdMwBGRv1byvbrGeOX+OFuo3fIf5D5JoCkyXzi+bz2HnLjrxfBk8WjBcTPoYtsjKMe3eb7fOGGoTYVcdGN88z8PsF9PrIa8+rz3P9B8kY1MotQCIAaG9HguWHy3fsUVb3/kXiUix/Oon4LSNFruWNHQh0vsbqZRJAFZ7ipD65DTlF/+4vvvN4qPwgH3ZoNEL1N1E8OM72uXDPbk4zdbSd/tNTsshfrlpqBnSX1aCTFR7PWtGhh8KOt0D95oDxK092AGFSJnYrCFNd5MnSNbHlr/UwV9U5I4eFHw01NIRPmuQIjHlWMkBr9dwXRmt6TPwwfEJaq1SZxo3FLGFY71m0mlDlxp0m+jEpfjcIhI7sMIYHVNtoFX/8M7i/XhIrWc1P0mGrFV/f9IA4wp0n418gEWKrHPzY2a2IPnqT316jXwzTTTHkONQWNrNOj0etHigwRpG4ObxmbUUlZqal7MczR+ZM0e9CR2ZoWyZoHdXppXJzLXVrIel4a8DklyryY6VWmmtkzqQvjrxdtJ9qBNUGorURIgIZUwxHVw3dc4EKfgYx3gsqH2QJ4Aji/OGLatRLhN+ojOijhUBwyCYYPT5ZqavHg1Aywzy9xrkD9EsnL+l7o/DA4miVWDYeQvzx9IBbnvzeQL33DPD/IuQdKX1rWP9tqQLYNom7nJqzFstosnJH0t+ZvVH4o5tEe7HAykM6KYVrDb2JY5GElWiQRT+Bls9N+HcxhaNFjq6sD5OL39ixLHoWsUDn0v3wLZedatBYl9mBfu4nIG0nJDO/umrOrSz48S7TNDumC1 xFZicTDN bPtCdJDLfoGa5iTvYNnSkiTsp1XsfWbpmSnHpUw0iiQ3OeIq5MwPTPE9Zh/DdV/RQd4F9Rql1LJHGPVP7SWXVXQYuntzvgA9YXAIshStoxDaQJkL9vY03el9XIS0CrQBHiXtSq3lWd6ZqeMz79g9jRTu5GJgiPrA/pIa9lMswz9NAJEpQxuwQXs/Ioxf/ep7o/jB3Y9ktLOQD03tAsCMkZY1K2bb3pF4yut5WO2RjvjmO++yE/iUIyiFVSF4AEITu8MfYGAyxhJhSS47VYs8HyvTl2/oKiyGwoGark8k8I5bu1xCIJyuYABOPjfUmnW0DnLa03DQjyFAfCYhJvkQ5BqPrdLWpcDGp5eH3YVydYvMENFR0ulUvLYE7dQ+hH3ZYxvDxS+e7Pkl1YmNM4QtGhg9zO4H38hyDJOJzl8a8xlTTVm2KFSNqBWsGL8tbjiGIlWWdAlehKwJ6FUGMxYjnF/W/2Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The TVM VCPU create function requires the vcpu id which is generated after the arch_create_vcpu returns. Thus, TVM vcpu init can not be invoked from the arch_create_vcpu. Invoke it in post create for now. However, post create doesn't return any error which is problematic as vcpu creation can fail from TSM side. Signed-off-by: Atish Patra --- arch/riscv/kvm/vcpu.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 65f87e1..005c7c9 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -218,6 +218,17 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) { + int rc; + /* + * TODO: Ideally it should be invoked in vcpu_create. but vcpu_idx + * is allocated after returning create_vcpu. Find a better place to do it + */ + if (unlikely(is_cove_vcpu(vcpu))) { + rc = kvm_riscv_cove_vcpu_init(vcpu); + if (rc) + pr_err("%s: cove vcpu init failed %d\n", __func__, rc); + } + /** * vcpu with id 0 is the designated boot cpu. * Keep all vcpus with non-zero id in power-off state so that @@ -237,6 +248,9 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) kvm_riscv_vcpu_pmu_deinit(vcpu); + if (unlikely(is_cove_vcpu(vcpu))) + kvm_riscv_cove_vcpu_destroy(vcpu); + /* Free unused pages pre-allocated for G-stage page table mappings */ kvm_mmu_free_memory_cache(&vcpu->arch.mmu_page_cache); }