From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 26D4BA00C2; Tue, 8 Mar 2022 10:44:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B9CBE4068E; Tue, 8 Mar 2022 10:44:56 +0100 (CET) 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 653164068B for ; Tue, 8 Mar 2022 10:44:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646732694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HpFmgDAGr32zCcbNH9ALA+FeBO7svXkC9q0QRHKClj0=; b=JWZHZ7FyHeJ8aW5UK6hr2AhVvR8mjco6DAANr8sjNInOXMW9m2NvYPibv7m0aVGxAIqMme 62nRPAbI5PCrIIqbsbDY2+f75opMjGuJUBgmlPw/O3rYDY6TLgIlEorOhX7Nz28XkIe2Js Y4BZ8XFtaG+zz07oJ++slPq40i2bHaA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-670-PUYO3zOHPu6pzawp7e7e2Q-1; Tue, 08 Mar 2022 04:44:53 -0500 X-MC-Unique: PUYO3zOHPu6pzawp7e7e2Q-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB516800050; Tue, 8 Mar 2022 09:44:52 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.194.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5659B1057067; Tue, 8 Mar 2022 09:44:27 +0000 (UTC) From: David Marchand To: dev@dpdk.org, roy.fan.zhang@intel.com, Maxime Coquelin , Chenbo Xia , Christophe Fontaine Subject: [PATCH v2] vhost: fix external message handlers Date: Tue, 8 Mar 2022 10:44:22 +0100 Message-Id: <20220308094422.25685-1-david.marchand@redhat.com> In-Reply-To: <20220307181101.10394-1-david.marchand@redhat.com> References: <20220307181101.10394-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 Following a rework, external message handlers were receiving a pointer to a vhost_user message (as stated in the API), but lost the ability to interact with fds attached to the message. Restore the original layout and put a build check and reminders. Bugzilla ID: 953 Fixes: 5e0099dc709e ("vhost: remove payload size limitation") Reported-by: Fan Zhang Signed-off-by: David Marchand --- Changes since v1: - fixed build with clang, --- lib/vhost/vhost_user.c | 8 ++++---- lib/vhost/vhost_user.h | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 723c6890c3..589b950458 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -3023,8 +3023,8 @@ vhost_user_msg_handler(int vid, int fd) handled = false; if (dev->extern_ops.pre_msg_handle) { - ret = (*dev->extern_ops.pre_msg_handle)(dev->vid, - (void *)&ctx.msg); + RTE_BUILD_BUG_ON(offsetof(struct vhu_msg_context, msg) != 0); + ret = (*dev->extern_ops.pre_msg_handle)(dev->vid, &ctx); switch (ret) { case RTE_VHOST_MSG_RESULT_REPLY: send_vhost_reply(dev, fd, &ctx); @@ -3069,8 +3069,8 @@ vhost_user_msg_handler(int vid, int fd) skip_to_post_handle: if (ret != RTE_VHOST_MSG_RESULT_ERR && dev->extern_ops.post_msg_handle) { - ret = (*dev->extern_ops.post_msg_handle)(dev->vid, - (void *)&ctx.msg); + RTE_BUILD_BUG_ON(offsetof(struct vhu_msg_context, msg) != 0); + ret = (*dev->extern_ops.post_msg_handle)(dev->vid, &ctx); switch (ret) { case RTE_VHOST_MSG_RESULT_REPLY: send_vhost_reply(dev, fd, &ctx); diff --git a/lib/vhost/vhost_user.h b/lib/vhost/vhost_user.h index be53669f3b..c946cc2ef4 100644 --- a/lib/vhost/vhost_user.h +++ b/lib/vhost/vhost_user.h @@ -152,10 +152,13 @@ typedef struct VhostUserMsg { /* Nothing should be added after the payload */ } __rte_packed VhostUserMsg; -struct vhu_msg_context { +/* Note: this structure and VhostUserMsg can't be changed carelessly as + * external message handlers rely on them. + */ +struct __rte_packed vhu_msg_context { + VhostUserMsg msg; int fds[VHOST_MEMORY_MAX_NREGIONS]; int fd_num; - VhostUserMsg msg; }; #define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64) -- 2.23.0