| Message ID | 20210901130821.6c81da7e.alex.williamson@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show
Return-Path: <kvm-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level:
X-Spam-Status: No, score=-22.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
INCLUDES_PATCH,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,
SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no
version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
by smtp.lore.kernel.org (Postfix) with ESMTP id C35E8C432BE
for <kvm@archiver.kernel.org>; Wed, 1 Sep 2021 19:09:09 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
by mail.kernel.org (Postfix) with ESMTP id 9DD4C61054
for <kvm@archiver.kernel.org>; Wed, 1 Sep 2021 19:09:09 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1346134AbhIATKF (ORCPT <rfc822;kvm@archiver.kernel.org>);
Wed, 1 Sep 2021 15:10:05 -0400
Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:44696 "EHLO
us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK)
by vger.kernel.org with ESMTP id S1344577AbhIATJW (ORCPT
<rfc822;kvm@vger.kernel.org>); Wed, 1 Sep 2021 15:09:22 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1630523304;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=PXaMY1BIToeB6M9mMoUesG2shI0UqdheUpIVd2ug/yA=;
b=PP4O3bGU/hdTHNxYOH3j+NGt5HZ92ybEfDcbdFc3gmQTRJ+lidaljGkS5e2V7pASWJmNWG
VJ5Lqjj3WeYaME5x0zBlKXaQXIny9GMLwZj17ckw1mEslDtRt3zlJqFNEwFe/J2nIK2agF
xLnZjz3V6sbkvecrjQC0+ed79T6zN2o=
Received: from mail-oo1-f71.google.com (mail-oo1-f71.google.com
[209.85.161.71]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-552-WoxhcRtZNx-Ujn5uC2ZGTA-1; Wed, 01 Sep 2021 15:08:23 -0400
X-MC-Unique: WoxhcRtZNx-Ujn5uC2ZGTA-1
Received: by mail-oo1-f71.google.com with SMTP id
u5-20020a4a97050000b029026a71f65966so320713ooi.2
for <kvm@vger.kernel.org>; Wed, 01 Sep 2021 12:08:23 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version
:content-transfer-encoding;
bh=PXaMY1BIToeB6M9mMoUesG2shI0UqdheUpIVd2ug/yA=;
b=nQLvbieM9k9zf3eZtTH9aUm+4xyzBEFoagtYmvM2fMvCkazanLEPPMvx7yoBvr+3Hz
SvDRKEQBeoYwx+Z+WEwIMcuRmfl+ZgqSUdWD5cpBRm1s6j2Yr2xVmWKuBVXCmgI221Hy
gwoe9nuMkmo1ppQe1ogpCyTbKRH64ZQdEDn/ju0v7RfMiDCquognBwfXWuUqWCT8Fcvd
fDA8K3S2FHwBqQ8D25rgYtBjcQTSA12DaEcvXH31RoRDcnXmQD2Ttc+FlYdKze5d6Oio
lJwvkfQ7d6ZvVulzUs27KT6+lqqdAZPu7MxHHtv57db6+DcSfEaLR+xhgJKJ/nWCvYIe
mZ4w==
X-Gm-Message-State: AOAM530DR/4YbS/ov/Lc4TubrWzUYzlSspkwA6fgnWiTK1SU+GZsAQm+
XQpqLAMSeeGxt87ec9tefKyLspFLLjwKCKAQLXKPmlL7kAfddQ+fIY0yn+KhnMEarKoy+S7ODOz
K65uAt6gKB9AG
X-Received: by 2002:a9d:60c6:: with SMTP id b6mr848927otk.2.1630523303092;
Wed, 01 Sep 2021 12:08:23 -0700 (PDT)
X-Google-Smtp-Source:
ABdhPJz76t98luQNVDliUDl8PwEH4Izeu5b6kp1nlRZx+Gwr7e3XpnRmUBkAIbF3ehk8NSXWzRHq7w==
X-Received: by 2002:a9d:60c6:: with SMTP id b6mr848899otk.2.1630523302856;
Wed, 01 Sep 2021 12:08:22 -0700 (PDT)
Received: from redhat.com ([198.99.80.109])
by smtp.gmail.com with ESMTPSA id
bj27sm73079oib.58.2021.09.01.12.08.21
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 01 Sep 2021 12:08:22 -0700 (PDT)
Date: Wed, 1 Sep 2021 13:08:21 -0600
From: Alex Williamson <alex.williamson@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>, <kvm@vger.kernel.org>,
Jason Gunthorpe <jgg@nvidia.com>,
Max Gurtovoy <mgurtovoy@nvidia.com>,
Yishai Hadas <yishaih@nvidia.com>,
Christoph Hellwig <hch@lst.de>,
Anthony Yznaga <anthony.yznaga@oracle.com>,
Cai Huoqing <caihuoqing@baidu.com>,
Tony Krowiak <akrowiak@linux.ibm.com>,
Dave Airlie <airlied@linux.ie>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: [GIT PULL] VFIO update for v5.15-rc1
Message-ID: <20210901130821.6c81da7e.alex.williamson@redhat.com>
X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
|
| Series |
[GIT,PULL] VFIO update for v5.15-rc1
|
expand
|
The pull request you sent on Wed, 1 Sep 2021 13:08:21 -0600:
> git://github.com/awilliam/linux-vfio.git tags/vfio-v5.15-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/89b6b8cd92c068cd1bdf877ec7fb1392568ef35d
Thank you!
Hi Linus, There's a conflict here with the drm tree, where I see Dave's pull request is already in flight. Stephen provided the correct resolution here[1], applying the vfio_pci.c changes from the drm tree to the new vfio_pci_core.c file. Thanks! [1]https://lore.kernel.org/all/20210827165540.30567055@canb.auug.org.au/ The following changes since commit c500bee1c5b2f1d59b1081ac879d73268ab0ff17: Linux 5.14-rc4 (2021-08-01 17:04:17 -0700) are available in the Git repository at: git://github.com/awilliam/linux-vfio.git tags/vfio-v5.15-rc1 for you to fetch changes up to ea870730d83fc13a5fa2bd0e175176d7ac8a400a: Merge branches 'v5.15/vfio/spdx-license-cleanups', 'v5.15/vfio/dma-valid-waited-v3', 'v5.15/vfio/vfio-pci-core-v5' and 'v5.15/vfio/vfio-ap' into v5.15/vfio/next (2021-08-26 11:08:50 -0600) ---------------------------------------------------------------- VFIO update for v5.15-rc1 - Fix dma-valid return WAITED implementation (Anthony Yznaga) - SPDX license cleanups (Cai Huoqing) - Split vfio-pci-core from vfio-pci and enhance PCI driver matching to support future vendor provided vfio-pci variants (Yishai Hadas, Max Gurtovoy, Jason Gunthorpe) - Replace duplicated reflck with core support for managing first open, last close, and device sets (Jason Gunthorpe, Max Gurtovoy, Yishai Hadas) - Fix non-modular mdev support and don't nag about request callback support (Christoph Hellwig) - Add semaphore to protect instruction intercept handler and replace open-coded locks in vfio-ap driver (Tony Krowiak) - Convert vfio-ap to vfio_register_group_dev() API (Jason Gunthorpe) ---------------------------------------------------------------- Alex Williamson (1): Merge branches 'v5.15/vfio/spdx-license-cleanups', 'v5.15/vfio/dma-valid-waited-v3', 'v5.15/vfio/vfio-pci-core-v5' and 'v5.15/vfio/vfio-ap' into v5.15/vfio/next Anthony Yznaga (1): vfio/type1: Fix vfio_find_dma_valid return Cai Huoqing (2): vfio: platform: reset: Convert to SPDX identifier vfio-pci/zdev: Remove repeated verbose license text Christoph Hellwig (2): vfio/mdev: turn mdev_init into a subsys_initcall vfio/mdev: don't warn if ->request is not set Jason Gunthorpe (16): vfio: Use config not menuconfig for VFIO_NOIOMMU vfio/samples: Remove module get/put vfio/mbochs: Fix missing error unwind of mbochs_used_mbytes vfio: Provide better generic support for open/release vfio_device_ops vfio/samples: Delete useless open/close vfio/fsl: Move to the device set infrastructure vfio/platform: Use open_device() instead of open coding a refcnt scheme vfio/pci: Change vfio_pci_try_bus_reset() to use the dev_set vfio/pci: Reorganize VFIO_DEVICE_PCI_HOT_RESET to use the device set vfio/mbochs: Fix close when multiple device FDs are open vfio/ap,ccw: Fix open/close when multiple device FDs are open vfio/gvt: Fix open/close when multiple device FDs are open vfio: Remove struct vfio_device_ops open/release vfio/ap_ops: Convert to use vfio_register_group_dev() vfio: Use select for eventfd vfio: Use kconfig if XX/endif blocks instead of repeating 'depends on' Max Gurtovoy (11): vfio: Introduce a vfio_uninit_group_dev() API call vfio/pci: Rename vfio_pci.c to vfio_pci_core.c vfio/pci: Rename vfio_pci_private.h to vfio_pci_core.h vfio/pci: Rename vfio_pci_device to vfio_pci_core_device vfio/pci: Rename ops functions to fit core namings vfio/pci: Include vfio header in vfio_pci_core.h vfio/pci: Split the pci_driver code out of vfio_pci_core.c vfio/pci: Move igd initialization to vfio_pci.c PCI: Add 'override_only' field to struct pci_device_id PCI / VFIO: Add 'override_only' support for VFIO PCI sub system vfio/pci: Introduce vfio_pci_core.ko Tony Krowiak (2): s390/vfio-ap: r/w lock for PQAP interception handler function pointer s390/vfio-ap: replace open coded locks for VFIO_GROUP_NOTIFY_SET_KVM notification Yishai Hadas (3): vfio/pci: Make vfio_pci_regops->rw() return ssize_t vfio/pci: Move to the device set infrastructure vfio/pci: Move module parameters to vfio_pci.c Documentation/PCI/pci.rst | 1 + Documentation/driver-api/vfio.rst | 4 +- MAINTAINERS | 1 + arch/s390/include/asm/kvm_host.h | 8 +- arch/s390/kvm/kvm-s390.c | 32 +- arch/s390/kvm/priv.c | 15 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 8 +- drivers/pci/pci-driver.c | 28 +- drivers/s390/cio/vfio_ccw_ops.c | 8 +- drivers/s390/crypto/vfio_ap_ops.c | 282 ++- drivers/s390/crypto/vfio_ap_private.h | 6 +- drivers/vfio/Kconfig | 31 +- drivers/vfio/fsl-mc/Kconfig | 3 +- drivers/vfio/fsl-mc/vfio_fsl_mc.c | 159 +- drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 6 +- drivers/vfio/fsl-mc/vfio_fsl_mc_private.h | 7 - drivers/vfio/mdev/Kconfig | 1 - drivers/vfio/mdev/mdev_core.c | 6 +- drivers/vfio/mdev/vfio_mdev.c | 33 +- drivers/vfio/pci/Kconfig | 40 +- drivers/vfio/pci/Makefile | 8 +- drivers/vfio/pci/vfio_pci.c | 2397 +------------------- drivers/vfio/pci/vfio_pci_config.c | 70 +- drivers/vfio/pci/vfio_pci_core.c | 2158 ++++++++++++++++++ drivers/vfio/pci/vfio_pci_igd.c | 23 +- drivers/vfio/pci/vfio_pci_intrs.c | 42 +- drivers/vfio/pci/vfio_pci_rdwr.c | 18 +- drivers/vfio/pci/vfio_pci_zdev.c | 11 +- drivers/vfio/platform/Kconfig | 6 +- drivers/vfio/platform/reset/Kconfig | 4 +- .../vfio/platform/reset/vfio_platform_bcmflexrm.c | 10 +- drivers/vfio/platform/vfio_platform_common.c | 86 +- drivers/vfio/platform/vfio_platform_private.h | 1 - drivers/vfio/vfio.c | 144 +- drivers/vfio/vfio_iommu_type1.c | 8 +- include/linux/mdev.h | 9 +- include/linux/mod_devicetable.h | 6 + include/linux/pci.h | 29 + include/linux/vfio.h | 26 +- .../linux/vfio_pci_core.h | 96 +- samples/vfio-mdev/mbochs.c | 40 +- samples/vfio-mdev/mdpy.c | 40 +- samples/vfio-mdev/mtty.c | 40 +- scripts/mod/devicetable-offsets.c | 1 + scripts/mod/file2alias.c | 17 +- 45 files changed, 3005 insertions(+), 2964 deletions(-) create mode 100644 drivers/vfio/pci/vfio_pci_core.c rename drivers/vfio/pci/vfio_pci_private.h => include/linux/vfio_pci_core.h (56%)