From patchwork Thu Aug 26 17:26:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12460347 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 D2729C432BE for ; Thu, 26 Aug 2021 17:30:07 +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 7D58B6103E for ; Thu, 26 Aug 2021 17:30:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7D58B6103E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:39296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJJCY-0003Kf-OF for qemu-devel@archiver.kernel.org; Thu, 26 Aug 2021 13:30:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJJ9m-00065g-Jt for qemu-devel@nongnu.org; Thu, 26 Aug 2021 13:27:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJJ9l-0007RY-27 for qemu-devel@nongnu.org; Thu, 26 Aug 2021 13:27:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629998832; 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=KDBZg389G66cuuXg1cBtciC2SPgn2cHOhDyJJyO+H/o=; b=hFIT9Z21/C0brBsPFrjPF9B9oteA8KUwxGK6VNC3R7nE0gMK57X8LeXuoILVDzL+ricB03 T8bSiVwPm0R0oOeoOCQ1cwOgjQ7+qC/QHEpy6AP/5J1ix/o3c8n0xAxCIat/L4nY2eZu6x pst5383L3sMXZH4+wqTyEGxorSKNCvw= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-376-e2xJz4alOUCjfOsF6f2zLQ-1; Thu, 26 Aug 2021 13:27:11 -0400 X-MC-Unique: e2xJz4alOUCjfOsF6f2zLQ-1 Received: by mail-wr1-f70.google.com with SMTP id v18-20020adfe2920000b029013bbfb19640so1066809wri.17 for ; Thu, 26 Aug 2021 10:27: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:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KDBZg389G66cuuXg1cBtciC2SPgn2cHOhDyJJyO+H/o=; b=svYjLJEhr62Qu2Aonje0pAOTjzo76ba3zDAh/s8ddWneC4rYoQ/nmcsas/PeJnHMUO i5XSkFfYMGXVW6jEP5aZRu/cvLQ4rbHT2OGkBKbF+ppjaMUWkiQ3BeJy1TVowX29nJRw EmOGs1lek8hxowFIYdAT09ZZti8DbN1M++Fq48Bl7Mclc1vSgSzlScDq1NMj88XEt6r7 AND54C+//jmJ0gZgt6KXBW48UKDI25zuGpFLE438Fn5VkVhZSloRlcFv3x5bhMBC1R46 T8Eej7BDLSpFs2+AcaDYK9dbQORuB3cgAZUU+gStIDCAlQN1wcDom2gXFqFyMMRuGrrH 5aDA== X-Gm-Message-State: AOAM531hiP4TR9d24+clDOBB9/DtaqaTdgIHCvduITJz6WvHdGFv39pi QuU3QjkepNMQIif66c1yL6p/3oz73RZpKN+1277mBG4wQKIiKubmtTSNpXlS7umEi7JS67f2b98 zWe3U4kJvqppnavWrC28WkJIPkk1diDDbiycnyR4N9iHULHDyaVc1eRFB/V1tm/xY X-Received: by 2002:a7b:c92b:: with SMTP id h11mr4831153wml.62.1629998829541; Thu, 26 Aug 2021 10:27:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyR0d2R747B2ykwsUpswHtUeBjMLaGGar4KOKo5H4tP6yWonqaC+Xx2wx0tbFSZjG34mFrQ7Q== X-Received: by 2002:a7b:c92b:: with SMTP id h11mr4831127wml.62.1629998829257; Thu, 26 Aug 2021 10:27:09 -0700 (PDT) Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id x21sm2244941wmi.15.2021.08.26.10.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 10:27:08 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/3] hw/virtio: Remove NULL check in virtio_free_region_cache() Date: Thu, 26 Aug 2021 19:26:57 +0200 Message-Id: <20210826172658.2116840-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210826172658.2116840-1-philmd@redhat.com> References: <20210826172658.2116840-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.742, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: "Michael S. Tsirkin" , Jason Wang , Cornelia Huck , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" virtio_free_region_cache() is called within call_rcu(), always with a non-NULL argument. Ensure new code keep it that way by replacing the NULL check by an assertion. Add a comment this function is called within call_rcu(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefano Garzarella Reviewed-by: Stefan Hajnoczi --- hw/virtio/virtio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index a5214bca612..3a1f6c520cb 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -133,12 +133,10 @@ struct VirtQueue QLIST_ENTRY(VirtQueue) node; }; +/* Called within call_rcu(). */ static void virtio_free_region_cache(VRingMemoryRegionCaches *caches) { - if (!caches) { - return; - } - + assert(caches != NULL); address_space_cache_destroy(&caches->desc); address_space_cache_destroy(&caches->avail); address_space_cache_destroy(&caches->used);