Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp645117pxu; Tue, 5 Jan 2021 23:54:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwXkePqASWDc0B0BGy6dr+EOZrr6o2/cQs8Iunk1tqFebenjuQPrCL14oPolBb7FY8ua0UO X-Received: by 2002:a17:906:15c7:: with SMTP id l7mr2110562ejd.226.1609919693695; Tue, 05 Jan 2021 23:54:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609919693; cv=none; d=google.com; s=arc-20160816; b=ukhloGH1tSG5tPQ7IcvOwsY0rGLTVWrygz5G2UN0uXgCZtgFv5Yt4Vd7YzyCwSN8zI sPTkHUxHVET5Xt5+JE4C+N1DoMr3fHCX5hd1cKgErvDS4Xs0NAx9l2UYEjgsM8q+pkzV nCH9Ygb7oMgwpJNyf+/JgmZUUFa6cUWhGutMW+GF/pq8qJyr/+dJyNMSyV/wD1XR0EVY l4GYl9cJ76CJmPASrH71HYxq9MXKXjxKizo8TWj2R2CdSy9igt3CtOoKdlxs9arWIzSy CM4EoeHH00yMx9MmzKimUBGl3rCneW5pmTz+2bZ+yC7pI/PYwWFZ/CFJGoygz6tgMHMk Iwig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=4SPZsumvRQLHVU5VzVsFDuzbn1X8riiW1wpIPuRXnvo=; b=ULBeJWR3pH7YU9by3fvjv57gvuz/DuCPsed8WyxnaVH/SATp9tcsiwbRKcKC5qmVZh igFr0zv+ew75T2OvPiDDaqu2BJIV+bmktxdAAjB/kdpgws3NtPPHhO8UkgqlcqiZZvBs ShwxBGKMUw1XpHp2z2XkKH4IO+GNz9WLz7jvmq3cMN6+QBXcZvYYEJe53+9TtfAlWMFQ F6JYVDZj4ygurI9AhbVoPAO7y/kl8Xf/KW2t4mxaVIYXcqkeiNDAt+ul+PhxRB6oAZiK 6fE6LCioJ1KWIL+qw4KkKtuIU/KCeXxzc2H1zf4Uvg0vns5Fkq6a1vtvufGEia7yI0Mh QcVg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ox13si664973ejb.70.2021.01.05.23.54.30; Tue, 05 Jan 2021 23:54:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726999AbhAFHw4 (ORCPT + 99 others); Wed, 6 Jan 2021 02:52:56 -0500 Received: from mga12.intel.com ([192.55.52.136]:15660 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726223AbhAFHwz (ORCPT ); Wed, 6 Jan 2021 02:52:55 -0500 IronPort-SDR: 8zu9SXGMG9TbNqSddIhW2EiWfvnMkAeHUOSLVMTHV/DjgplF76byP38ASmumcO9SyRipEHy4dM IsS0yM5NMHaQ== X-IronPort-AV: E=McAfee;i="6000,8403,9855"; a="156433444" X-IronPort-AV: E=Sophos;i="5.78,479,1599548400"; d="scan'208";a="156433444" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2021 23:52:15 -0800 IronPort-SDR: h3iPjkVJUlGvVp51D8gxw3ghKx2k94dmbBR8iFqRbNSmQodBqIH4nGd0BxH6kIS89NANVUpx8l 7ZFsS4CvQk3Q== X-IronPort-AV: E=Sophos;i="5.78,479,1599548400"; d="scan'208";a="398132419" Received: from shsi6026.sh.intel.com (HELO localhost) ([10.239.147.88]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2021 23:52:12 -0800 From: shuo.a.liu@intel.com To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Greg Kroah-Hartman , "H . Peter Anvin" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Yu Wang , Reinette Chatre , Shuo Liu Subject: [PATCH v7 10/18] virt: acrn: Introduce PCI configuration space PIO accesses combiner Date: Wed, 6 Jan 2021 15:50:47 +0800 Message-Id: <20210106075055.47226-11-shuo.a.liu@intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210106075055.47226-1-shuo.a.liu@intel.com> References: <20210106075055.47226-1-shuo.a.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shuo Liu A User VM can access its virtual PCI configuration spaces via port IO approach, which has two following steps: 1) writes address into port 0xCF8 2) put/get data in/from port 0xCFC To distribute a complete PCI configuration space access one time, HSM need to combine such two accesses together. Combine two paired PIO I/O requests into one PCI I/O request and continue the I/O request distribution. Signed-off-by: Shuo Liu Reviewed-by: Reinette Chatre Cc: Greg Kroah-Hartman --- drivers/virt/acrn/acrn_drv.h | 2 + drivers/virt/acrn/ioreq.c | 76 ++++++++++++++++++++++++++++++++++++ include/uapi/linux/acrn.h | 15 +++++++ 3 files changed, 93 insertions(+) diff --git a/drivers/virt/acrn/acrn_drv.h b/drivers/virt/acrn/acrn_drv.h index 7e89e4944d0f..97a7f31cd681 100644 --- a/drivers/virt/acrn/acrn_drv.h +++ b/drivers/virt/acrn/acrn_drv.h @@ -154,6 +154,7 @@ extern rwlock_t acrn_vm_list_lock; * @default_client: The default I/O request client * @ioreq_buf: I/O request shared buffer * @ioreq_page: The page of the I/O request shared buffer + * @pci_conf_addr: Address of a PCI configuration access emulation */ struct acrn_vm { struct list_head list; @@ -168,6 +169,7 @@ struct acrn_vm { struct acrn_ioreq_client *default_client; struct acrn_io_request_buffer *ioreq_buf; struct page *ioreq_page; + u32 pci_conf_addr; }; struct acrn_vm *acrn_vm_create(struct acrn_vm *vm, diff --git a/drivers/virt/acrn/ioreq.c b/drivers/virt/acrn/ioreq.c index ed22b1c4775d..b469f273e20c 100644 --- a/drivers/virt/acrn/ioreq.c +++ b/drivers/virt/acrn/ioreq.c @@ -220,6 +220,80 @@ int acrn_ioreq_client_wait(struct acrn_ioreq_client *client) return 0; } +static bool is_cfg_addr(struct acrn_io_request *req) +{ + return ((req->type == ACRN_IOREQ_TYPE_PORTIO) && + (req->reqs.pio_request.address == 0xcf8)); +} + +static bool is_cfg_data(struct acrn_io_request *req) +{ + return ((req->type == ACRN_IOREQ_TYPE_PORTIO) && + ((req->reqs.pio_request.address >= 0xcfc) && + (req->reqs.pio_request.address < (0xcfc + 4)))); +} + +/* The low 8-bit of supported pci_reg addr.*/ +#define PCI_LOWREG_MASK 0xFC +/* The high 4-bit of supported pci_reg addr */ +#define PCI_HIGHREG_MASK 0xF00 +/* Max number of supported functions */ +#define PCI_FUNCMAX 7 +/* Max number of supported slots */ +#define PCI_SLOTMAX 31 +/* Max number of supported buses */ +#define PCI_BUSMAX 255 +#define CONF1_ENABLE 0x80000000UL +/* + * A PCI configuration space access via PIO 0xCF8 and 0xCFC normally has two + * following steps: + * 1) writes address into 0xCF8 port + * 2) accesses data in/from 0xCFC + * This function combines such paired PCI configuration space I/O requests into + * one ACRN_IOREQ_TYPE_PCICFG type I/O request and continues the processing. + */ +static bool handle_cf8cfc(struct acrn_vm *vm, + struct acrn_io_request *req, u16 vcpu) +{ + int offset, pci_cfg_addr, pci_reg; + bool is_handled = false; + + if (is_cfg_addr(req)) { + WARN_ON(req->reqs.pio_request.size != 4); + if (req->reqs.pio_request.direction == ACRN_IOREQ_DIR_WRITE) + vm->pci_conf_addr = req->reqs.pio_request.value; + else + req->reqs.pio_request.value = vm->pci_conf_addr; + is_handled = true; + } else if (is_cfg_data(req)) { + if (!(vm->pci_conf_addr & CONF1_ENABLE)) { + if (req->reqs.pio_request.direction == + ACRN_IOREQ_DIR_READ) + req->reqs.pio_request.value = 0xffffffff; + is_handled = true; + } else { + offset = req->reqs.pio_request.address - 0xcfc; + + req->type = ACRN_IOREQ_TYPE_PCICFG; + pci_cfg_addr = vm->pci_conf_addr; + req->reqs.pci_request.bus = + (pci_cfg_addr >> 16) & PCI_BUSMAX; + req->reqs.pci_request.dev = + (pci_cfg_addr >> 11) & PCI_SLOTMAX; + req->reqs.pci_request.func = + (pci_cfg_addr >> 8) & PCI_FUNCMAX; + pci_reg = (pci_cfg_addr & PCI_LOWREG_MASK) + + ((pci_cfg_addr >> 16) & PCI_HIGHREG_MASK); + req->reqs.pci_request.reg = pci_reg + offset; + } + } + + if (is_handled) + ioreq_complete_request(vm, vcpu, req); + + return is_handled; +} + static bool in_range(struct acrn_ioreq_range *range, struct acrn_io_request *req) { @@ -380,6 +454,8 @@ static int acrn_ioreq_dispatch(struct acrn_vm *vm) ioreq_complete_request(vm, i, req); continue; } + if (handle_cf8cfc(vm, req, i)) + continue; spin_lock_bh(&vm->ioreq_clients_lock); client = find_ioreq_client(vm, req); diff --git a/include/uapi/linux/acrn.h b/include/uapi/linux/acrn.h index 96ebc879b8d0..66c43bd1e1b3 100644 --- a/include/uapi/linux/acrn.h +++ b/include/uapi/linux/acrn.h @@ -21,6 +21,7 @@ #define ACRN_IOREQ_TYPE_PORTIO 0 #define ACRN_IOREQ_TYPE_MMIO 1 +#define ACRN_IOREQ_TYPE_PCICFG 2 #define ACRN_IOREQ_DIR_READ 0 #define ACRN_IOREQ_DIR_WRITE 1 @@ -41,6 +42,18 @@ struct acrn_pio_request { __u32 value; }; +/* Need keep same header fields with pio_request */ +struct acrn_pci_request { + __u32 direction; + __u32 reserved[3]; + __u64 size; + __u32 value; + __u32 bus; + __u32 dev; + __u32 func; + __u32 reg; +}; + /** * struct acrn_io_request - 256-byte ACRN I/O request * @type: Type of this request (ACRN_IOREQ_TYPE_*). @@ -49,6 +62,7 @@ struct acrn_pio_request { * @reserved0: Reserved fields. * @reqs: Union of different types of request. Byte offset: 64. * @reqs.pio_request: PIO request data of the I/O request. + * @reqs.pci_request: PCI configuration space request data of the I/O request. * @reqs.mmio_request: MMIO request data of the I/O request. * @reqs.data: Raw data of the I/O request. * @reserved1: Reserved fields. @@ -108,6 +122,7 @@ struct acrn_io_request { __u32 reserved0[14]; union { struct acrn_pio_request pio_request; + struct acrn_pci_request pci_request; struct acrn_mmio_request mmio_request; __u64 data[8]; } reqs; -- 2.28.0