Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp2965827ybt; Mon, 29 Jun 2020 11:39:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxevPKGNUIUQlIZN5Z8LkLeo5kHJHqfsqK460o8G1uWZDChC+UdmeWe4A1nLxNia04rCB6Z X-Received: by 2002:aa7:d2d2:: with SMTP id k18mr18517523edr.16.1593455964134; Mon, 29 Jun 2020 11:39:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593455964; cv=none; d=google.com; s=arc-20160816; b=AKvY4gcPncd40lKzIZEI4lvdxLk6rHrDgKgTyFRxhIKKU7MC9CAQ/bB5cQng7qI/88 BW6bVS9B7grm1S9I5RkW+bZmHq2SoBZQ1AatWx+v2/GZriQn/FiEOlG+1QPhK6Q4wP1Q UdvSuwGToh7mMcR1LE65eUmAbmlQkrObF5ksugkZGe0O8W7t8oIaBiTVQufCTpPc9Dyn jPEQaj5X4x5GFuqCeVoHqJKEPSoNuroZIqmKjplrnsRKxBn/RbLatfJYgSdQAOXQVHnN SAiK5jXhBGZa99C1eSSmIHXZPQfbqxCDFRgxl4VoAVELZIa0hHjWjNErGwGAA3651Akv Dsig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=MP6nHbdK8goQAX4LfwrKaAn6puxGPcJQNSuwDHabwfM=; b=ng5jaq7chLfb+ISVKClG1khO+QJjLQDYHfY9iWqb5KGKn55BWDVBZMtvBhb77IxbVo 9zbVv9BQKNWVgCPBY79WtS9A9BzbN/QAtX8HyDciEVAGv6N629aXYYiBZnlEXFCxrWZO E9nTsmu57+Cf3mfU0prZ6tenCs6tm8g/fprNxa/9CeN56Te9ZnUBr3EIKyiILIS51sTE 9KnS2JcfrWpmHRnK9Kj1QtzijE/3Ve6eLfAHBv9golkj4LxPQ09WsD6tepzD83wtf7p8 umZT5GWZVjh7hP6dgysxbPKbRPaxbG8zDtfK8sokiaTthoSs+VaCoEAbNAbrws5xNnFH lABQ== 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=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bt2si248665ejb.597.2020.06.29.11.39.00; Mon, 29 Jun 2020 11:39:24 -0700 (PDT) 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=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727069AbgF2ShM (ORCPT + 99 others); Mon, 29 Jun 2020 14:37:12 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:48392 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726831AbgF2Sf4 (ORCPT ); Mon, 29 Jun 2020 14:35:56 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 05TG488h169400; Mon, 29 Jun 2020 12:10:49 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 31ycgcynfv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jun 2020 12:10:49 -0400 Received: from m0098421.ppops.net (m0098421.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 05TG5V45177075; Mon, 29 Jun 2020 12:10:48 -0400 Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0a-001b2d01.pphosted.com with ESMTP id 31ycgcynes-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jun 2020 12:10:48 -0400 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 05TG5oE8026201; Mon, 29 Jun 2020 16:10:46 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma05fra.de.ibm.com with ESMTP id 31wwr896r7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jun 2020 16:10:46 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 05TGAhBU65470542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 29 Jun 2020 16:10:43 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 356ED4C066; Mon, 29 Jun 2020 16:10:43 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C086B4C04A; Mon, 29 Jun 2020 16:10:40 +0000 (GMT) Received: from oc3016276355.ibm.com (unknown [9.145.79.64]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 29 Jun 2020 16:10:40 +0000 (GMT) Subject: Re: [PATCH v3 1/1] s390: virtio: let arch accept devices without IOMMU feature To: "Michael S. Tsirkin" Cc: linux-kernel@vger.kernel.org, pasic@linux.ibm.com, borntraeger@de.ibm.com, frankja@linux.ibm.com, jasowang@redhat.com, cohuck@redhat.com, kvm@vger.kernel.org, linux-s390@vger.kernel.org, virtualization@lists.linux-foundation.org, thomas.lendacky@amd.com, david@gibson.dropbear.id.au, linuxram@us.ibm.com, heiko.carstens@de.ibm.com, gor@linux.ibm.com References: <1592390637-17441-1-git-send-email-pmorel@linux.ibm.com> <1592390637-17441-2-git-send-email-pmorel@linux.ibm.com> <20200629115651-mutt-send-email-mst@kernel.org> From: Pierre Morel Message-ID: Date: Mon, 29 Jun 2020 18:09:53 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200629115651-mutt-send-email-mst@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-06-29_15:2020-06-29,2020-06-29 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 suspectscore=0 cotscore=-2147483648 mlxscore=0 bulkscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 priorityscore=1501 impostorscore=0 phishscore=0 spamscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006290105 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-06-29 17:57, Michael S. Tsirkin wrote: > On Wed, Jun 17, 2020 at 12:43:57PM +0200, Pierre Morel wrote: >> An architecture protecting the guest memory against unauthorized host >> access may want to enforce VIRTIO I/O device protection through the >> use of VIRTIO_F_IOMMU_PLATFORM. >> >> Let's give a chance to the architecture to accept or not devices >> without VIRTIO_F_IOMMU_PLATFORM. >> >> Signed-off-by: Pierre Morel >> Acked-by: Jason Wang >> Acked-by: Christian Borntraeger >> --- >> arch/s390/mm/init.c | 6 ++++++ >> drivers/virtio/virtio.c | 22 ++++++++++++++++++++++ >> include/linux/virtio.h | 2 ++ >> 3 files changed, 30 insertions(+) >> >> diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c >> index 6dc7c3b60ef6..215070c03226 100644 >> --- a/arch/s390/mm/init.c >> +++ b/arch/s390/mm/init.c >> @@ -45,6 +45,7 @@ >> #include >> #include >> #include >> +#include >> >> pgd_t swapper_pg_dir[PTRS_PER_PGD] __section(.bss..swapper_pg_dir); >> >> @@ -161,6 +162,11 @@ bool force_dma_unencrypted(struct device *dev) >> return is_prot_virt_guest(); >> } >> >> +int arch_needs_virtio_iommu_platform(struct virtio_device *dev) >> +{ >> + return is_prot_virt_guest(); >> +} >> + >> /* protected virtualization */ >> static void pv_init(void) >> { >> diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c >> index a977e32a88f2..aa8e01104f86 100644 >> --- a/drivers/virtio/virtio.c >> +++ b/drivers/virtio/virtio.c >> @@ -167,6 +167,21 @@ void virtio_add_status(struct virtio_device *dev, unsigned int status) >> } >> EXPORT_SYMBOL_GPL(virtio_add_status); >> >> +/* >> + * arch_needs_virtio_iommu_platform - provide arch specific hook when finalizing >> + * features for VIRTIO device dev >> + * @dev: the VIRTIO device being added >> + * >> + * Permits the platform to provide architecture specific functionality when >> + * devices features are finalized. This is the default implementation. >> + * Architecture implementations can override this. >> + */ >> + >> +int __weak arch_needs_virtio_iommu_platform(struct virtio_device *dev) >> +{ >> + return 0; >> +} >> + >> int virtio_finalize_features(struct virtio_device *dev) >> { >> int ret = dev->config->finalize_features(dev); >> @@ -179,6 +194,13 @@ int virtio_finalize_features(struct virtio_device *dev) >> if (!virtio_has_feature(dev, VIRTIO_F_VERSION_1)) >> return 0; >> >> + if (arch_needs_virtio_iommu_platform(dev) && >> + !virtio_has_feature(dev, VIRTIO_F_IOMMU_PLATFORM)) { >> + dev_warn(&dev->dev, >> + "virtio: device must provide VIRTIO_F_IOMMU_PLATFORM\n"); >> + return -ENODEV; >> + } >> + >> virtio_add_status(dev, VIRTIO_CONFIG_S_FEATURES_OK); >> status = dev->config->get_status(dev); >> if (!(status & VIRTIO_CONFIG_S_FEATURES_OK)) { > > Well don't you need to check it *before* VIRTIO_F_VERSION_1, not after? Yes, you are right, Thanks, Pierre -- Pierre Morel IBM Lab Boeblingen