From patchwork Fri Jul 2 09:58:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 469501 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1221117jao; Fri, 2 Jul 2021 02:59:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNzoLluh1CxhBZ7ykhM5qSJ9Mb83unNHNpyqAPtRl1v1GoUFtLH7c+3QfMuJU+kESgMcDH X-Received: by 2002:a17:906:fad5:: with SMTP id lu21mr4523463ejb.469.1625219986026; Fri, 02 Jul 2021 02:59:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625219986; cv=none; d=google.com; s=arc-20160816; b=A2Q95mlVBHGapJuViTcbcbhpTDxfHX2hKxRLJiqIN99zXSkYP5lMmSpG2QTYlmu8s7 0td5Z94x+Y36oP4ld76pbXPlEmpDlzPwu1wcOEFg1MpUzrqRMVF+tvNRabRGSdlMwIWa vMXb/EQJgrX9qClBcxLD0TDVD/+fzS6VXasqKxuCWY0pCh6wohtpos3eOTgP5t2KRxyC b+9OfPKvEaWuF9dXD9gnfFU30XxQCZBVWwaowkBMUZAhh1Rnh+sjZhgpWQT6fjqp0yAI FissIsAwMNU+E/3SC+bTzLNJ2BTRScyASuHmCZJFmmhEGXIwmMF9S39aPB1Bi7FTml8G eOGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=Qn+YBxovqhzUQz0Z22P5sWbwpbB9jcveU72LRkJ+oZo=; b=qh5fFraP7xiDT80timhVrEA6CS2D+V54SIyw3d1p53JkY6l+RhlYxlMw4t7YrIBuaY 7p+az1L+HxvUt2yHMXOHDHwwZ1l77uYbE5Z+hWrx25LPybc/k47TqQehyC8AJ6viU+Ny iaa3QCyx4nrmVFzNmV5JBaEVhLWT7if/wj4epJYNqAozprfzDqkl2NrAG+lUpQ6PZsXp 4vcSLeCMFAvhu6Xuk63c2SOBLX9MhjscJLMOTQhanndu51ySGMFNG94fg/iUayTm3Ipl ZRyiSzsaC0Ps7LXMNfkuBLkX4BEh6pkwd0yEj6ef0f+8tEE3NZtIVm9MstBIB39QU0iN opTw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n8si2978451edy.1.2021.07.02.02.59.45; Fri, 02 Jul 2021 02:59:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-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-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231823AbhGBKCL (ORCPT + 3 others); Fri, 2 Jul 2021 06:02:11 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3344 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231782AbhGBKCI (ORCPT ); Fri, 2 Jul 2021 06:02:08 -0400 Received: from fraeml736-chm.china.huawei.com (unknown [172.18.147.207]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4GGVf84Wgdz6GBC9; Fri, 2 Jul 2021 17:49:04 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml736-chm.china.huawei.com (10.206.15.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 2 Jul 2021 11:59:35 +0200 Received: from A2006125610.china.huawei.com (10.47.85.147) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 2 Jul 2021 10:59:28 +0100 From: Shameer Kolothum To: , , CC: , , , , , , , , Subject: [RFC v2 2/4] hisi_acc_vfio_pci: Override ioctl method to limit BAR2 region size Date: Fri, 2 Jul 2021 10:58:47 +0100 Message-ID: <20210702095849.1610-3-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20210702095849.1610-1-shameerali.kolothum.thodi@huawei.com> References: <20210702095849.1610-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.85.147] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org HiSilicon ACC VF device BAR2 region consists of both functional register space and migration control register space. From a security point of view, it's not advisable to export the migration control region to Guest. Hence, hide the migration region and report only the functional register space. Signed-off-by: Shameer Kolothum --- drivers/vfio/pci/hisi_acc_vfio_pci.c | 42 +++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/vfio/pci/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisi_acc_vfio_pci.c index a9e173098ab5..d57cf6d7adaf 100644 --- a/drivers/vfio/pci/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisi_acc_vfio_pci.c @@ -12,6 +12,46 @@ #include #include +static long hisi_acc_vfio_pci_ioctl(struct vfio_device *core_vdev, unsigned int cmd, + unsigned long arg) +{ + struct vfio_pci_core_device *vdev = + container_of(core_vdev, struct vfio_pci_core_device, vdev); + + if (cmd == VFIO_DEVICE_GET_REGION_INFO) { + struct pci_dev *pdev = vdev->pdev; + struct vfio_region_info info; + unsigned long minsz; + + minsz = offsetofend(struct vfio_region_info, offset); + + if (copy_from_user(&info, (void __user *)arg, minsz)) + return -EFAULT; + + if (info.argsz < minsz) + return -EINVAL; + + if (info.index == VFIO_PCI_BAR2_REGION_INDEX) { + info.offset = VFIO_PCI_INDEX_TO_OFFSET(info.index); + + /* + * ACC VF dev BAR2 region(64K) consists of both functional + * register space and migration control register space. + * Report only the first 32K(functional region) to Guest. + */ + info.size = pci_resource_len(pdev, info.index) / 2; + + info.flags = VFIO_REGION_INFO_FLAG_READ | + VFIO_REGION_INFO_FLAG_WRITE | + VFIO_REGION_INFO_FLAG_MMAP; + + return copy_to_user((void __user *)arg, &info, minsz) ? + -EFAULT : 0; + } + } + return vfio_pci_core_ioctl(core_vdev, cmd, arg); +} + static int hisi_acc_vfio_pci_open(struct vfio_device *core_vdev) { struct vfio_pci_core_device *vdev = @@ -33,7 +73,7 @@ static const struct vfio_device_ops hisi_acc_vfio_pci_ops = { .name = "hisi-acc-vfio-pci", .open = hisi_acc_vfio_pci_open, .release = vfio_pci_core_release, - .ioctl = vfio_pci_core_ioctl, + .ioctl = hisi_acc_vfio_pci_ioctl, .read = vfio_pci_core_read, .write = vfio_pci_core_write, .mmap = vfio_pci_core_mmap,