From patchwork Wed Jan 18 16:43:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugenio Perez Martin X-Patchwork-Id: 45388 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2443184wrn; Wed, 18 Jan 2023 08:50:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXs6kFWxyEi1n2z4GNIzn5iocED1yJr4r+1XjPx2zKiOqKEute0HsDCR0V0TCT/nEJ1LGi40 X-Received: by 2002:a17:902:9891:b0:192:7c38:4842 with SMTP id s17-20020a170902989100b001927c384842mr28442629plp.53.1674060633811; Wed, 18 Jan 2023 08:50:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674060633; cv=none; d=google.com; s=arc-20160816; b=qZ+NArQJVbMsXvFVRqWGSt0QG+36hhIQAs1mAtKSrSxnsF3vUouqJfOvkA2Nd0v/zl oGBkTX6NO153MXPlkUhlRt5cH1xtmSNJN8YnSKFiOj6/DOaaU1mMQEd553Qj/RQAiixZ /ormxvwYsv5RBP+moFcqotQk6CyBPLgHI+J8dTdgaYVTlESvUhPNLVAclzRaqG7MCic7 iDM7uJ6Gqt2ebQR7jKA2EmvJeeZw7TO6xmMagbVjKb2y4uHYSDo2XoSZydRdhYXiNdVA J8wjy/W86h+4KGYUdYg/WJzxLsNZXVNfBXW3TiA2YPdfIKWbFQhokzc+KfP+BaehIF9v HHEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fY7ZFKCSeA1/hO616eCT/ffy6ZcVRsbG6pt4HMxlg40=; b=iNoRemITcpVrKijJzTWaURMxu/TD85Nt/ZBlHVqyWwLSvIpPwgQ5WzhnVew5cEBXrA T0AbKxLruINgcwMyHFScukZDq9IEFWt+34Op34lURJtIp1IPerxF/UX+4u877j7KMEVo vs3zsisVuUSKnh8MhNJCU0/ialwL+klJYQM8tWeHBxC/3n0sO7pbyoFEFtBF817GI4n7 FKIXbqU18vuYq+2YY1yKT67N3V5jimeGsS/R4GcrWAZxSkz8hXrsCfoJXvmfZm7oRQXy mnUDgniDobYGqmFiBpNd4GY9VKdewv6QidQlfsjS0BcytdOFZ56xCUuwCunoufeBGJmk E8SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=L8o2q5Pt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k7-20020a170902ce0700b00192dbc36b89si10403553plg.232.2023.01.18.08.50.22; Wed, 18 Jan 2023 08:50:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=L8o2q5Pt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230062AbjARQqH (ORCPT + 99 others); Wed, 18 Jan 2023 11:46:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbjARQpg (ORCPT ); Wed, 18 Jan 2023 11:45:36 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AFC358661 for ; Wed, 18 Jan 2023 08:44:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674060254; 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=fY7ZFKCSeA1/hO616eCT/ffy6ZcVRsbG6pt4HMxlg40=; b=L8o2q5PtRBhRqyTubSx1OHweuwc5hXIBUqsGUHU2TnVHC8+aNeNkqAS4ICU7WDD/ZwTx1U YIzukUvWq2HGsqREWSv7Mb7Du1k4GL4RuaWVReVA7k5rImSuQy/lB456rurd11fBE/gD+q +/87dZp3FoCRW5IuRvL/XYeoLHQznmw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-211-CsVoZYk3O1W7FhPQcrc4nQ-1; Wed, 18 Jan 2023 11:44:08 -0500 X-MC-Unique: CsVoZYk3O1W7FhPQcrc4nQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2287B1871DA4; Wed, 18 Jan 2023 16:44:06 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.141]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7DC2140EBF6; Wed, 18 Jan 2023 16:44:03 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: mst@redhat.com Cc: leiyang@redhat.com, Laurent Vivier , sgarzare@redhat.com, jasowang@redhat.com, Zhu Lingshan , virtualization@lists.linux-foundation.org, si-wei.liu@oracle.com, linux-kernel@vger.kernel.org, lulu@redhat.com, Gautam Dawar , alvaro.karsz@solid-run.com Subject: [PATCH 1/2] vdpa_sim: not reset state in vdpasim_queue_ready Date: Wed, 18 Jan 2023 17:43:58 +0100 Message-Id: <20230118164359.1523760-2-eperezma@redhat.com> In-Reply-To: <20230118164359.1523760-1-eperezma@redhat.com> References: <20230118164359.1523760-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755379803286728445?= X-GMAIL-MSGID: =?utf-8?q?1755379803286728445?= vdpasim_queue_ready calls vringh_init_iotlb, which resets split indexes. But it can be called after setting a ring base with vdpasim_set_vq_state. Fix it by stashing them. They're still resetted in vdpasim_vq_reset. This was discovered and tested live migrating the vdpa_sim_net device. Fixes: 2c53d0f64c06 ("vdpasim: vDPA device simulator") Signed-off-by: Eugenio Pérez Acked-by: Jason Wang Tested-by: Lei Yang --- drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c index cb88891b44a8..8839232a3fcb 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -66,6 +66,7 @@ static void vdpasim_vq_notify(struct vringh *vring) static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx) { struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx]; + uint16_t last_avail_idx = vq->vring.last_avail_idx; vringh_init_iotlb(&vq->vring, vdpasim->features, vq->num, false, (struct vring_desc *)(uintptr_t)vq->desc_addr, @@ -74,6 +75,7 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx) (struct vring_used *) (uintptr_t)vq->device_addr); + vq->vring.last_avail_idx = last_avail_idx; vq->vring.notify = vdpasim_vq_notify; }