From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DE14C433FE for ; Mon, 17 Jan 2022 16:23:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241078AbiAQQXb (ORCPT ); Mon, 17 Jan 2022 11:23:31 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:10596 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237650AbiAQQXa (ORCPT ); Mon, 17 Jan 2022 11:23:30 -0500 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 20HFWXNh012384; Mon, 17 Jan 2022 16:23:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=1QLlsI03ZBSQdQUeNmbd3oQ1oY9zw4gqBO103kVXstM=; b=du7skKjrVdl/aIiiRwA8RpO2uVsl+Xq4Rjn9fGVqlfnUPEjyg476SNhgKSnmK0R8XQcD 9yg88nW98RIJe39Yal+Ow2xuqfxEIvWuSw2zOYYwQjnYIivu6B0RZC9JoWp466qpuHwo BZpQ94xd6PNwyfRS0WW+fiWhwr3cR3KSoM3Ju3KWZg6solazi5uJAhsXH3gfD6rxPPBc 3jJEq7DMoGvtAUKyEvtpzRw39+fTHwWUlHx0Jki/6ooJV2Eh7srGU7WI8BnqKLH+vqkT FFry2yvIB/cYHoPePFxhv5bDUoQM9XMRnXTX3eG/CRwEjqQ5cIn74vfgi27sLzV8vivL hw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3dn8whmwpt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Jan 2022 16:23:30 +0000 Received: from m0098399.ppops.net (m0098399.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 20HFwRc8022887; Mon, 17 Jan 2022 16:23:29 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 3dn8whmwna-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Jan 2022 16:23:29 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 20HGD9ED009482; Mon, 17 Jan 2022 16:23:26 GMT Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by ppma06ams.nl.ibm.com with ESMTP id 3dknhj5wk9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Jan 2022 16:23:26 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 20HGNNZe41288008 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Jan 2022 16:23:23 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 723074C046; Mon, 17 Jan 2022 16:23:23 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 58A654C040; Mon, 17 Jan 2022 16:23:22 +0000 (GMT) Received: from [9.171.80.201] (unknown [9.171.80.201]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 17 Jan 2022 16:23:22 +0000 (GMT) Message-ID: Date: Mon, 17 Jan 2022 17:25:05 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [PATCH v2 14/30] KVM: s390: pci: add basic kvm_zdev structure Content-Language: en-US To: Matthew Rosato , linux-s390@vger.kernel.org Cc: alex.williamson@redhat.com, cohuck@redhat.com, schnelle@linux.ibm.com, farman@linux.ibm.com, borntraeger@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com, frankja@linux.ibm.com, david@redhat.com, imbrenda@linux.ibm.com, vneethv@linux.ibm.com, oberpar@linux.ibm.com, freude@linux.ibm.com, thuth@redhat.com, pasic@linux.ibm.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20220114203145.242984-1-mjrosato@linux.ibm.com> <20220114203145.242984-15-mjrosato@linux.ibm.com> From: Pierre Morel In-Reply-To: <20220114203145.242984-15-mjrosato@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Jsbm6cF3yZ-m3HJM2p6-QNEtdb3Qw45D X-Proofpoint-GUID: sU7SPIFaOpZrP9tpFbFMFERvM8NEtdHp X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-17_07,2022-01-14_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 clxscore=1011 lowpriorityscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 impostorscore=0 priorityscore=1501 phishscore=0 adultscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201170102 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 1/14/22 21:31, Matthew Rosato wrote: > This structure will be used to carry kvm passthrough information related to > zPCI devices. > > Signed-off-by: Matthew Rosato > --- > arch/s390/include/asm/kvm_pci.h | 29 +++++++++++++++++++++ > arch/s390/include/asm/pci.h | 3 +++ > arch/s390/kvm/Makefile | 2 +- > arch/s390/kvm/pci.c | 46 +++++++++++++++++++++++++++++++++ > 4 files changed, 79 insertions(+), 1 deletion(-) > create mode 100644 arch/s390/include/asm/kvm_pci.h > create mode 100644 arch/s390/kvm/pci.c > > diff --git a/arch/s390/include/asm/kvm_pci.h b/arch/s390/include/asm/kvm_pci.h > new file mode 100644 > index 000000000000..aafee2976929 > --- /dev/null > +++ b/arch/s390/include/asm/kvm_pci.h > @@ -0,0 +1,29 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * KVM PCI Passthrough for virtual machines on s390 > + * > + * Copyright IBM Corp. 2021 > + * > + * Author(s): Matthew Rosato > + */ > + > + One blank line too much. Otherwise, look good to me. Reviewed-by: Pierre Morel > +#ifndef ASM_KVM_PCI_H > +#define ASM_KVM_PCI_H > + > +#include > +#include > +#include > +#include > +#include > + > +struct kvm_zdev { > + struct zpci_dev *zdev; > + struct kvm *kvm; > +}; > + > +int kvm_s390_pci_dev_open(struct zpci_dev *zdev); > +void kvm_s390_pci_dev_release(struct zpci_dev *zdev); > +void kvm_s390_pci_attach_kvm(struct zpci_dev *zdev, struct kvm *kvm); > + > +#endif /* ASM_KVM_PCI_H */ > diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h > index f3cd2da8128c..9b6c657d8d31 100644 > --- a/arch/s390/include/asm/pci.h > +++ b/arch/s390/include/asm/pci.h > @@ -97,6 +97,7 @@ struct zpci_bar_struct { > }; > > struct s390_domain; > +struct kvm_zdev; > > #define ZPCI_FUNCTIONS_PER_BUS 256 > struct zpci_bus { > @@ -190,6 +191,8 @@ struct zpci_dev { > struct dentry *debugfs_dev; > > struct s390_domain *s390_domain; /* s390 IOMMU domain data */ > + > + struct kvm_zdev *kzdev; /* passthrough data */ > }; > > static inline bool zdev_enabled(struct zpci_dev *zdev) > diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile > index b3aaadc60ead..a26f4fe7b680 100644 > --- a/arch/s390/kvm/Makefile > +++ b/arch/s390/kvm/Makefile > @@ -11,5 +11,5 @@ ccflags-y := -Ivirt/kvm -Iarch/s390/kvm > > kvm-objs := $(common-objs) kvm-s390.o intercept.o interrupt.o priv.o sigp.o > kvm-objs += diag.o gaccess.o guestdbg.o vsie.o pv.o > - > +kvm-$(CONFIG_PCI) += pci.o > obj-$(CONFIG_KVM) += kvm.o > diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c > new file mode 100644 > index 000000000000..1c33bc7bf2bd > --- /dev/null > +++ b/arch/s390/kvm/pci.c > @@ -0,0 +1,46 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * s390 kvm PCI passthrough support > + * > + * Copyright IBM Corp. 2021 > + * > + * Author(s): Matthew Rosato > + */ > + > +#include > +#include > +#include > + > +int kvm_s390_pci_dev_open(struct zpci_dev *zdev) > +{ > + struct kvm_zdev *kzdev; > + > + kzdev = kzalloc(sizeof(struct kvm_zdev), GFP_KERNEL); > + if (!kzdev) > + return -ENOMEM; > + > + kzdev->zdev = zdev; > + zdev->kzdev = kzdev; > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(kvm_s390_pci_dev_open); > + > +void kvm_s390_pci_dev_release(struct zpci_dev *zdev) > +{ > + struct kvm_zdev *kzdev; > + > + kzdev = zdev->kzdev; > + WARN_ON(kzdev->zdev != zdev); > + zdev->kzdev = 0; > + kfree(kzdev); > +} > +EXPORT_SYMBOL_GPL(kvm_s390_pci_dev_release); > + > +void kvm_s390_pci_attach_kvm(struct zpci_dev *zdev, struct kvm *kvm) > +{ > + struct kvm_zdev *kzdev = zdev->kzdev; > + > + kzdev->kvm = kvm; > +} > +EXPORT_SYMBOL_GPL(kvm_s390_pci_attach_kvm); > -- Pierre Morel IBM Lab Boeblingen