From patchwork Mon Sep 27 11:42:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 12519637 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7A1DC433F5 for ; Mon, 27 Sep 2021 11:43:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A48BC60F6C for ; Mon, 27 Sep 2021 11:43:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234228AbhI0Lou (ORCPT ); Mon, 27 Sep 2021 07:44:50 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:50202 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234368AbhI0Loe (ORCPT ); Mon, 27 Sep 2021 07:44:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1632742977; x=1664278977; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=8sJKongyv38X9dKpS1HAiSrvranGdK7ToL3Rs+JN/9o=; b=eJ/XVhP3d6LugbJgG+uJePqmSExBXQETQBZ3hnOolMY3+YWnMh1LPNvx khAqlV/h7OK8e4aN5NMhnGDt5ex/Gvni4XFkzGQg4NTNzhObHankGelEx SjrJbMMgTFDSdNjnc2EmT9aWI/dKCfDv1KU1HRccWoe+Ftx4C4VH9Ywf6 a32aPJcg4QcDq8p9pNLctF11/vO3LHFlew1eHn1Lb0vTdsHsM74eEmcXh HxDDKtv2Ki/ivZzUki1isX1GSyZv5A+tAHLmpNXBjyr4tnmeEG0ovuTN9 UsNUl1yT14H0ZKfUw8T5wgjmM9gmsRAxI8dOgIVUKPKqItnpAoJpG1g+g w==; X-IronPort-AV: E=Sophos;i="5.85,326,1624291200"; d="scan'208";a="292706608" Received: from mail-bn8nam12lp2177.outbound.protection.outlook.com (HELO NAM12-BN8-obe.outbound.protection.outlook.com) ([104.47.55.177]) by ob1.hgst.iphmx.com with ESMTP; 27 Sep 2021 19:42:55 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CO3ofSJq6YnNf5ksQOGj25ar2Wa6bVk3AW42ZfzIedwfMSgMtv0tj0qQHIJnqejzWL249rjdaiQy5q+/o9QT/njXiTSJ7MIqX+iw1zkEBcGUqJcLJWJf2yCoE/UyLhyO6/M59czYH8SpXTC7LTKV8bcC0BjF6nQimexQpyrLwAQKv1cs1j1c6y7XPyg1UbQn360RFutgoJIVpL5rEtJq0e3iVbEDzZZOewi20U/kGFMQrsY9x9wmJcNL+Jsl0oW3kkc7NBFO4xAPpSkrtTKqgg+aWewdQp6GU96knEF4N+qYJVQJqT2QjBakpJZp15ULtfRGVrLXKofMP8iJI0HPNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=IxOKTE7vBtafxQW3/p1xsg+vDHiANbdGFrid+hSkks4=; b=Hp8Ll5RzNXVWPLbHUumk1Gtcj31X+zCC96NIjbHINZF3jmRtPlQdaVmBciOiv8YIcITKMLm0Px+tQmWxDHioKz2hwb2bP0HaVk9vBM2UyhBRCMPC0JdPyln4+fLK/Wteq7lOHz6gQqrJ62Ug9w6pd7X19u6lOGqZmZKhLywQ9K4Mfi8yTAiOXURJNyzJlRR297VzSdHzi2etOJqqYVbESbNEi71LWxmmBDifxip0g2OXtNzfk09THTZ5iQhJOuwm0Y4fXhtSqDcubWueGAoyWXKQadUuJZuVFzTVBgAj1luWoEEwM8CPm4SpL+5hmatYEc6fGwL5CTmNujSHnugljw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IxOKTE7vBtafxQW3/p1xsg+vDHiANbdGFrid+hSkks4=; b=b+ZQsWz49HkT6n6Pn3AkiEMcdICfxX+UP2D0m4WNqe7K2fcXdVb+Ij/MUT5z+YarmAc60QnDU8jhEkjl6nlLvdHixECOeBGLKdbwv1nP93oHqexzWZLvRU4OTZrxOmJ6l8hamUidygRdOwxBaiugFUMp2Jeu+4rTnKxmYpzrof8= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=wdc.com; Received: from CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) by CO6PR04MB7841.namprd04.prod.outlook.com (2603:10b6:5:358::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Mon, 27 Sep 2021 11:42:55 +0000 Received: from CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::6830:650b:8265:af0b]) by CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::6830:650b:8265:af0b%6]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 11:42:54 +0000 From: Anup Patel To: Will Deacon Cc: Paolo Bonzini , Atish Patra , Alistair Francis , Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Anup Patel Subject: [PATCH v9 3/8] riscv: Implement Guest/VM arch functions Date: Mon, 27 Sep 2021 17:12:22 +0530 Message-Id: <20210927114227.1089403-4-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927114227.1089403-1-anup.patel@wdc.com> References: <20210927114227.1089403-1-anup.patel@wdc.com> X-ClientProxiedBy: MA1PR01CA0173.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:d::14) To CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) MIME-Version: 1.0 Received: from wdc.com (122.179.75.205) by MA1PR01CA0173.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.14 via Frontend Transport; Mon, 27 Sep 2021 11:42:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94cc3f79-aa59-4d20-af3d-08d981abf1b6 X-MS-TrafficTypeDiagnostic: CO6PR04MB7841: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nTQ3FBm3+3LCWFU1yWOCwHGTzPE46JV+pl35u/ecGnEYjbWgF9og/6dtElpxxMC5QpvGXdowUfDoLuMGDmZYQpX/LOKqvaTNXeMC9SmgCeURWJlCT/21eIiauAqCKgpJOxFbms3NXoK25FlfsVIurDyprTRjOJgyT3ck22sAuGeUZ14+OfGUBn9op59lhI8sYi7u/k9vsjoo9nkXKpUd0d6AN2dtJ9rjJ9664dIYeXhT6GbsT+JdVTEThOgmIp13rasAp2Hi22xWGiL8lzxjHeGv8dl+7YOgPrloYa8PftOC4kS2hePiW83g074Db4+2Wjh1QoOacalh9EFrwXy5HWxAOxByGRR+CIdAelWSLcdGONZ2bW7vaP4KPZTRlhdSX9xgLSkmQ8vgPhnhJHk67+0qahcYX413c7FFVObemlRNQrw3ti2pG4kGacUnktOHji/blyq5Ildms+KNTL2AYvfiKBwB/SggIH9D/+OXtEH7bXosHItm0VhUdIFFluO+JfX6adETTCoLGe3yM7LuvnZH8Q4VHoBuqjudUFHn25aXZNzWGw1L8PNgN4uJ2PQrKCDEu9lItr0QXYvEaggnlRPIKAmPn0VdeAv43z4+hACwuJsexDCQFnPL8Fc3PQAT4BaHILxIvSQ/uLYzENGUkOVJk/nPuH6WeHd7RaM8W0oPAzsxbUvOhzaujNuIQ3f7nL3N3TLtfbgc9NEqdnKKvw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR04MB7812.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(54906003)(316002)(5660300002)(1076003)(66556008)(83380400001)(66946007)(66476007)(36756003)(38100700002)(38350700002)(55016002)(86362001)(508600001)(6916009)(44832011)(8886007)(6666004)(2906002)(8676002)(956004)(2616005)(7696005)(8936002)(4326008)(26005)(52116002)(186003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gVY97NcZAO1H4adtfFH6Rl8HSufciIlpGWH4gR7cIcvextXSEE3KrqcbKAFOuuWjeRXkd6zPFbyqUfw0VQAH0kdATTc3iKFHzgTEFzuqD4gVAKNd3nfIf5ctfHLu/RiDefJzaeDEyhGlThxyAtcqJo482NsMYmhEwHsMGsCdrIkrLx9R0aAlXnvyDD0GYFhK/qpcL/kTKXIxuZDjd/Uwbph26DmcJ6jznpFEt7mVpslP1JrwZT4CAScAMsIFCJb1aI+fr0+MSMXKjNs6lackkBuX3zRKXrbDp9rraJWZj7SRQYbqLjCq7ybTxmJ8uRVSEOgTtUzDKPZkW5wbPPM2vb+5jRwCU4VpGGkgPdfCKyHjEgETJW7s3NwIOxDpsgFQjWApIiDcxYYdHdxcb22ulOUUdKZaGBpBjIAI+wAVkgn14UAmcyauZmz8nnE8vq9GMCy3LZXu7ilX1zaXW2bRx0OLnlUQWKgLG66rYTKbAtU0liwIA8DJLy6CLzBN5moJBVFPdMGXPbC6qNVbjobmtxEccsD9v61aMGO+z4pGpTWAXYUbQSLetZM9U+ssGlZes4skySHKhCx2jC19V74xilDpnEJjdATs39nM4xrnFdK/fuNUc7dTLoUW5wYLqwauSMz5iKY/KphC2e+U0bShD1djkAs2aaxXvEHlCuu/N75SYn5NUUdXmSO6gULzjbNFMhU6nnwCiJ/zYru+Mbe/XZa/BlQb2fEhLhp9wn220cSpgJcNjmKapX2nSIL+f/uHHpRyvx/EahYuLmXCRI6tvglW21gFRU7mNJYMAP7CE4dkTbEnAZs3rqt2P0YhVRc/WvODXO5NyxhXfaKgBVBKRqH7CVUkNE2kdUhxfabqoLQgnk8J0byWvY7eV1R9iPCuyWX7EqkcscGUbuSpPoDkCCZIYndBxP5C84OJcek95oJUOAuUhyjwZOxP6zn6YvhXIXz03sYTtNCG5kRGXgJRXlOCOlubZ35kRdAkkfYBYPIIJtNYLIkX2Mh1vm4yuzd2zHbXkLRN5ezcUV3DhtSk4C1Tv5QpnE9xk6GQPwu4qJMc4YZz2A7Kd9zcOUeBdQ+UwI6KuNudk9WcEIpaSDH96E1WSWNubhwO3diR8hD3zGcLwk588XcdYroAWGHJrUZSZysH/qDoyp5SwP0NOR8uR9R2tR6aGgJ7Z1zFhY8YdYQlmkcweWfPaQEuaYTG6HTfe6HYUjAvpEp912VQqq819wLO171+q9oWeH3NVDZEIazENNWHTgcZCvJIxscabIaSNnJhHMo+H1oYm4AeUwci7yfWUXLUgzfOoaHSBwax2KI0GX8oIzqYayZSwl0kgKfm X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94cc3f79-aa59-4d20-af3d-08d981abf1b6 X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 11:42:54.7344 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YihqQyUiEHG2Xutk/SpJFqSIehFn7t6XB5X6lfkVkstLq4GVV5plYhlKIPeGFjhS8iFIxQqo9X4dEt6JUKG8uQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB7841 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This patch implements all kvm__arch_ Guest/VM arch functions. These functions mostly deal with: 1. Guest/VM RAM initialization 2. Updating terminals on character read 3. Loading kernel and initrd images Firmware loading is not implemented currently because initially we will be booting kernel directly without any bootloader. In future, we will certainly support firmware loading. Signed-off-by: Anup Patel --- riscv/include/kvm/kvm-arch.h | 15 +++++ riscv/kvm.c | 125 +++++++++++++++++++++++++++++++++-- 2 files changed, 134 insertions(+), 6 deletions(-) diff --git a/riscv/include/kvm/kvm-arch.h b/riscv/include/kvm/kvm-arch.h index 469fe4f..529d5b3 100644 --- a/riscv/include/kvm/kvm-arch.h +++ b/riscv/include/kvm/kvm-arch.h @@ -53,6 +53,21 @@ struct kvm; struct kvm_arch { + /* + * We may have to align the guest memory for virtio, so keep the + * original pointers here for munmap. + */ + void *ram_alloc_start; + u64 ram_alloc_size; + + /* + * Guest addresses for memory layout. + */ + u64 memory_guest_start; + u64 kern_guest_start; + u64 initrd_guest_start; + u64 initrd_size; + u64 dtb_guest_start; }; static inline bool riscv_addr_in_ioport_region(u64 phys_addr) diff --git a/riscv/kvm.c b/riscv/kvm.c index e816ef5..84e0277 100644 --- a/riscv/kvm.c +++ b/riscv/kvm.c @@ -1,5 +1,7 @@ #include "kvm/kvm.h" #include "kvm/util.h" +#include "kvm/8250-serial.h" +#include "kvm/virtio-console.h" #include "kvm/fdt.h" #include @@ -19,33 +21,144 @@ bool kvm__arch_cpu_supports_vm(void) void kvm__init_ram(struct kvm *kvm) { - /* TODO: */ + int err; + u64 phys_start, phys_size; + void *host_mem; + + phys_start = RISCV_RAM; + phys_size = kvm->ram_size; + host_mem = kvm->ram_start; + + err = kvm__register_ram(kvm, phys_start, phys_size, host_mem); + if (err) + die("Failed to register %lld bytes of memory at physical " + "address 0x%llx [err %d]", phys_size, phys_start, err); + + kvm->arch.memory_guest_start = phys_start; } void kvm__arch_delete_ram(struct kvm *kvm) { - /* TODO: */ + munmap(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size); } void kvm__arch_read_term(struct kvm *kvm) { - /* TODO: */ + serial8250__update_consoles(kvm); + virtio_console__inject_interrupt(kvm); } void kvm__arch_set_cmdline(char *cmdline, bool video) { - /* TODO: */ } void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size) { - /* TODO: */ + /* + * Allocate guest memory. We must align our buffer to 64K to + * correlate with the maximum guest page size for virtio-mmio. + * If using THP, then our minimal alignment becomes 2M. + * 2M trumps 64K, so let's go with that. + */ + kvm->ram_size = min(ram_size, (u64)RISCV_MAX_MEMORY(kvm)); + kvm->arch.ram_alloc_size = kvm->ram_size + SZ_2M; + kvm->arch.ram_alloc_start = mmap_anon_or_hugetlbfs(kvm, hugetlbfs_path, + kvm->arch.ram_alloc_size); + + if (kvm->arch.ram_alloc_start == MAP_FAILED) + die("Failed to map %lld bytes for guest memory (%d)", + kvm->arch.ram_alloc_size, errno); + + kvm->ram_start = (void *)ALIGN((unsigned long)kvm->arch.ram_alloc_start, + SZ_2M); + + madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size, + MADV_MERGEABLE); + + madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size, + MADV_HUGEPAGE); } +#define FDT_ALIGN SZ_4M +#define INITRD_ALIGN 8 bool kvm__arch_load_kernel_image(struct kvm *kvm, int fd_kernel, int fd_initrd, const char *kernel_cmdline) { - /* TODO: */ + void *pos, *kernel_end, *limit; + unsigned long guest_addr, kernel_offset; + ssize_t file_size; + + /* + * Linux requires the initrd and dtb to be mapped inside lowmem, + * so we can't just place them at the top of memory. + */ + limit = kvm->ram_start + min(kvm->ram_size, (u64)SZ_256M) - 1; + +#if __riscv_xlen == 64 + /* Linux expects to be booted at 2M boundary for RV64 */ + kernel_offset = 0x200000; +#else + /* Linux expects to be booted at 4M boundary for RV32 */ + kernel_offset = 0x400000; +#endif + + pos = kvm->ram_start + kernel_offset; + kvm->arch.kern_guest_start = host_to_guest_flat(kvm, pos); + file_size = read_file(fd_kernel, pos, limit - pos); + if (file_size < 0) { + if (errno == ENOMEM) + die("kernel image too big to fit in guest memory."); + + die_perror("kernel read"); + } + kernel_end = pos + file_size; + pr_debug("Loaded kernel to 0x%llx (%zd bytes)", + kvm->arch.kern_guest_start, file_size); + + /* Place FDT just after kernel at FDT_ALIGN address */ + pos = kernel_end + FDT_ALIGN; + guest_addr = ALIGN(host_to_guest_flat(kvm, pos), FDT_ALIGN); + pos = guest_flat_to_host(kvm, guest_addr); + if (pos < kernel_end) + die("fdt overlaps with kernel image."); + + kvm->arch.dtb_guest_start = guest_addr; + pr_debug("Placing fdt at 0x%llx - 0x%llx", + kvm->arch.dtb_guest_start, + host_to_guest_flat(kvm, limit)); + + /* ... and finally the initrd, if we have one. */ + if (fd_initrd != -1) { + struct stat sb; + unsigned long initrd_start; + + if (fstat(fd_initrd, &sb)) + die_perror("fstat"); + + pos = limit - (sb.st_size + INITRD_ALIGN); + guest_addr = ALIGN(host_to_guest_flat(kvm, pos), INITRD_ALIGN); + pos = guest_flat_to_host(kvm, guest_addr); + if (pos < kernel_end) + die("initrd overlaps with kernel image."); + + initrd_start = guest_addr; + file_size = read_file(fd_initrd, pos, limit - pos); + if (file_size == -1) { + if (errno == ENOMEM) + die("initrd too big to fit in guest memory."); + + die_perror("initrd read"); + } + + kvm->arch.initrd_guest_start = initrd_start; + kvm->arch.initrd_size = file_size; + pr_debug("Loaded initrd to 0x%llx (%llu bytes)", + kvm->arch.initrd_guest_start, + kvm->arch.initrd_size); + } else { + kvm->arch.initrd_size = 0; + } + return true; }