From patchwork Wed Mar 30 13:49:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 109029 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DF859A050D; Wed, 30 Mar 2022 15:50:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E2BC42901; Wed, 30 Mar 2022 15:50:32 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 2A48342900 for ; Wed, 30 Mar 2022 15:50:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648648230; 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=X4Knv4FUdDPrJJ+Usnkm4yrb/flozyZqOJSx7cpuJVs=; b=EcsolGbB3suYkKfB0QgANCiaunLXI53TutBdSJO/4v72l6/FaX8dlsR020s9NrF+C8ooVl K53VQ6XfV0Ahner25+QFvRZbFsc1d5YtcNdDup9TWB4SwG0zVG0gq8PX2w5JuAdYkcGlFl 9QPAkvUA/Lh3WUYQow2GTFwD71h3Z0E= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-86-lSYhuMGrPb6EZ8jTYa9WaQ-1; Wed, 30 Mar 2022 09:50:29 -0400 X-MC-Unique: lSYhuMGrPb6EZ8jTYa9WaQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D1DBF3C23FA3; Wed, 30 Mar 2022 13:50:28 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.195.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8664F40D1B9B; Wed, 30 Mar 2022 13:50:27 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: maxime.coquelin@redhat.com, chenbo.xia@intel.com, jiayu.hu@intel.com, yuanx.wang@intel.com, xuan.ding@intel.com Subject: [RFC PATCH v2 6/9] vhost: annotate need reply handling Date: Wed, 30 Mar 2022 15:49:53 +0200 Message-Id: <20220330134956.18927-7-david.marchand@redhat.com> In-Reply-To: <20220330134956.18927-1-david.marchand@redhat.com> References: <20220328121758.26632-1-david.marchand@redhat.com> <20220330134956.18927-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org When a reply from the slave is required (VHOST_USER_NEED_REPLY flag), a spinlock is taken before sending the message. This spinlock is released if an error occurs when sending the message, and once a reply is received. A problem is that this lock is taken under a branch and annotating conditionally held locks is not supported. The code seems currently correct and, while we may rework the code, it is easier to simply skip checks on slave_req_lock for those helpers. Signed-off-by: David Marchand --- lib/vhost/vhost_user.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 0cfa2d6f82..273cce5e41 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -2854,6 +2854,7 @@ send_vhost_reply(struct virtio_net *dev, int sockfd, struct vhu_msg_context *ctx static int send_vhost_slave_message(struct virtio_net *dev, struct vhu_msg_context *ctx) + RTE_NO_ANNOTATED_LOCK_CHECK { int ret; @@ -3165,6 +3166,7 @@ vhost_user_msg_handler(int vid, int fd) static int process_slave_message_reply(struct virtio_net *dev, const struct vhu_msg_context *ctx) + RTE_NO_ANNOTATED_LOCK_CHECK { struct vhu_msg_context msg_reply; int ret;