From patchwork Fri Sep 18 16:20:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 305051 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_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 F04AAC43463 for ; Fri, 18 Sep 2020 16:26:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 484A621D24 for ; Fri, 18 Sep 2020 16:26:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="I5QHkSZa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 484A621D24 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJJDn-0002RT-9s for qemu-devel@archiver.kernel.org; Fri, 18 Sep 2020 12:26:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJJ7V-000529-Jv for qemu-devel@nongnu.org; Fri, 18 Sep 2020 12:20:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45034) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJJ7P-0005ZG-Oc for qemu-devel@nongnu.org; Fri, 18 Sep 2020 12:20:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600446014; 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: in-reply-to:in-reply-to:references:references; bh=Msq8goiUIrREy947KknDtEH1ZqD2k0E/AfsZQGv/SGY=; b=I5QHkSZaHlKk+/2sSP77MqnXyWO7yTsOMnpAQrMVfQuGua3fPzneWNLkdkK7C4/n9ZAbNh XXk6P9Y/OmbUPYCmoA0QTxrRzDGM3+pa5kF/UhtZhrOyVv1LzhwFlnrpZDFw5ju5UkA+hT WYKlz3gfysa5fEAOhvbnJuDmNhse5no= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-AnfN_2rcMBuAKsYqbB7ITg-1; Fri, 18 Sep 2020 12:20:11 -0400 X-MC-Unique: AnfN_2rcMBuAKsYqbB7ITg-1 Received: by mail-wm1-f69.google.com with SMTP id a7so2245111wmc.2 for ; Fri, 18 Sep 2020 09:20:11 -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:references :mime-version:content-disposition:in-reply-to; bh=Msq8goiUIrREy947KknDtEH1ZqD2k0E/AfsZQGv/SGY=; b=Jevpug76S7co2rQlXwxl/g2OCPcmHrj26UiRRKapj+D2PKpNyXrRCVkJrN5dkLh0xe SAfPhxX1lfl7Hi2UIAchvAMLetiQE2fEf52KA5MFEDp0Rz8H0o651tyfRjG/hQ9c6Hp2 HFPd2sRUKpd62fEgs4hEI279dp/PpGURvjD8C62HSj9cTJJM00S4+zXPx2fayUkw1ZKR +dFU1KRNiXRWCnR9y1tFDD1CFUowcWYvR3yNroqC6i8zDB3viHx2FLOcTRZEA68eZkr0 GcENE84rfyPolCWxq4Op5rj30jDlvo3ggvEN1E+EnnYUj1IVdurtdFWt5w31e3I5sv6w fHZg== X-Gm-Message-State: AOAM532DddzKed9kh1BH6DqoCDJPCVSKJzLRCHC3m4BHDfG9gDC11wXQ n9ZV2NlN+2CuCYwRZetlgFRCHYFEblb4Y+7VB4l8ZTZcbYdWBrIni37rWPjlCBTQXteR2fiGs4N 5YbqDUmMd7h1bcFY= X-Received: by 2002:a1c:f208:: with SMTP id s8mr16979335wmc.85.1600446009655; Fri, 18 Sep 2020 09:20:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymlaLUhEcBc2Kkg7rrEvpgtXS1Urt7OPkfWifR+13AjZ97NNKcWZHs+CGELURdy1kMd5MovA== X-Received: by 2002:a1c:f208:: with SMTP id s8mr16979322wmc.85.1600446009489; Fri, 18 Sep 2020 09:20:09 -0700 (PDT) Received: from redhat.com (bzq-109-65-116-225.red.bezeqint.net. [109.65.116.225]) by smtp.gmail.com with ESMTPSA id z127sm6019969wmc.2.2020.09.18.09.20.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2020 09:20:08 -0700 (PDT) Date: Fri, 18 Sep 2020 12:20:07 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 04/15] virtio-mem: detach the element from the virtqueue when error occurs Message-ID: <20200918161836.318893-5-mst@redhat.com> References: <20200918161836.318893-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200918161836.318893-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=63.128.21.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/18 00:20:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Li Qiang , David Hildenbrand Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Li Qiang If error occurs while processing the virtio request we should call 'virtqueue_detach_element' to detach the element from the virtqueue before free the elem. Signed-off-by: Li Qiang Message-Id: <20200816142245.17556-1-liq3ea@163.com> Fixes: 910b25766b ("virtio-mem: Paravirtualized memory hot(un)plug") Acked-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/virtio-mem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 8fbec77ccc..7c8ca9f28b 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -318,6 +318,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq) if (iov_to_buf(elem->out_sg, elem->out_num, 0, &req, len) < len) { virtio_error(vdev, "virtio-mem protocol violation: invalid request" " size: %d", len); + virtqueue_detach_element(vq, elem, 0); g_free(elem); return; } @@ -327,6 +328,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq) virtio_error(vdev, "virtio-mem protocol violation: not enough space" " for response: %zu", iov_size(elem->in_sg, elem->in_num)); + virtqueue_detach_element(vq, elem, 0); g_free(elem); return; } @@ -348,6 +350,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq) default: virtio_error(vdev, "virtio-mem protocol violation: unknown request" " type: %d", type); + virtqueue_detach_element(vq, elem, 0); g_free(elem); return; }