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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 7CB8EC43381 for ; Fri, 19 Feb 2021 16:40:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 610A0614A7 for ; Fri, 19 Feb 2021 16:40:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230172AbhBSQkM (ORCPT ); Fri, 19 Feb 2021 11:40:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42416 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230158AbhBSQkF (ORCPT ); Fri, 19 Feb 2021 11:40:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613752719; 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: in-reply-to:in-reply-to:references:references; bh=yLHUSgztqphVGzpy64DPiEubzzxMBP24dAWW1jTd1qU=; b=F+R+ZxmpH1BikF+m3MqF6HzgHnn3rk7+07sCj/NRhmrGnI5Bo0AeYTRz1W3iaEv/0QJlMY DoEhkGFQwCdYQpAswOQ2jaJJ/3N49V99+plkBn68nLLkOL+rGCzhJ+9R70PBuytq3UDqqj 1S9PHnDotPlj5ESukM9B8m4kDR0hC1w= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-135-rOrCZLYtOvm5wdANcEFjzA-1; Fri, 19 Feb 2021 11:38:35 -0500 X-MC-Unique: rOrCZLYtOvm5wdANcEFjzA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F6C1107ACC7; Fri, 19 Feb 2021 16:38:33 +0000 (UTC) Received: from gondolin (ovpn-113-92.ams2.redhat.com [10.36.113.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id A82FB1970D; Fri, 19 Feb 2021 16:38:31 +0000 (UTC) Date: Fri, 19 Feb 2021 17:38:28 +0100 From: Cornelia Huck To: Heiko Carstens , Vasily Gorbik , Christian Borntraeger Cc: Halil Pasic , Pierre Morel , linux-s390@vger.kernel.org, virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH v2] virtio/s390: implement virtio-ccw revision 2 correctly Message-ID: <20210219173828.6a2ab5d4.cohuck@redhat.com> In-Reply-To: <20210216110645.1087321-1-cohuck@redhat.com> References: <20210216110645.1087321-1-cohuck@redhat.com> Organization: Red Hat GmbH MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org I was thinking of queuing this, but maybe it is quicker to pick it into the s390 tree directly and save us the extra pull request dance? Especially as this is a stable-worthy bugfix. On Tue, 16 Feb 2021 12:06:45 +0100 Cornelia Huck wrote: > CCW_CMD_READ_STATUS was introduced with revision 2 of virtio-ccw, > and drivers should only rely on it being implemented when they > negotiated at least that revision with the device. > > However, virtio_ccw_get_status() issued READ_STATUS for any > device operating at least at revision 1. If the device accepts > READ_STATUS regardless of the negotiated revision (which some > implementations like QEMU do, even though the spec currently does > not allow it), everything works as intended. While a device > rejecting the command should also be handled gracefully, we will > not be able to see any changes the device makes to the status, > such as setting NEEDS_RESET or setting the status to zero after > a completed reset. > > We negotiated the revision to at most 1, as we never bumped the > maximum revision; let's do that now and properly send READ_STATUS > only if we are operating at least at revision 2. > > Cc: stable@vger.kernel.org > Fixes: 7d3ce5ab9430 ("virtio/s390: support READ_STATUS command for virtio-ccw") > Reviewed-by: Halil Pasic > Signed-off-by: Cornelia Huck > --- > > v1->v2: > tweak patch description and cc:stable > > --- > drivers/s390/virtio/virtio_ccw.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c > index 5730572b52cd..54e686dca6de 100644 > --- a/drivers/s390/virtio/virtio_ccw.c > +++ b/drivers/s390/virtio/virtio_ccw.c > @@ -117,7 +117,7 @@ struct virtio_rev_info { > }; > > /* the highest virtio-ccw revision we support */ > -#define VIRTIO_CCW_REV_MAX 1 > +#define VIRTIO_CCW_REV_MAX 2 > > struct virtio_ccw_vq_info { > struct virtqueue *vq; > @@ -952,7 +952,7 @@ static u8 virtio_ccw_get_status(struct virtio_device *vdev) > u8 old_status = vcdev->dma_area->status; > struct ccw1 *ccw; > > - if (vcdev->revision < 1) > + if (vcdev->revision < 2) > return vcdev->dma_area->status; > > ccw = ccw_device_dma_zalloc(vcdev->cdev, sizeof(*ccw));