From patchwork Thu Mar 9 02:07:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro MIKI X-Patchwork-Id: 124870 X-Patchwork-Delegate: maxime.coquelin@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 3096841E34; Thu, 9 Mar 2023 03:07:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE30C427F5; Thu, 9 Mar 2023 03:07:47 +0100 (CET) Received: from corp-ob08.yahoo-corp.jp (corp-ob08.yahoo-corp.jp [183.79.94.93]) by mails.dpdk.org (Postfix) with ESMTP id 2BD3140ED7 for ; Thu, 9 Mar 2023 03:07:42 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01lp2176.outbound.protection.outlook.com [104.47.23.176]) by corp-ob08.yahoo-corp.jp (Postfix) with ESMTPS id DAA3619FB18B; Thu, 9 Mar 2023 11:07:40 +0900 (JST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jRrVOk/yKM/BhgTvS6j9AVhtoQUmQI2zIa5rZc7LrMx10sIy1YBp26AA2pwdyAB3P5VhiUqCd90gzNO5BIwuDbWpbkcBMUy9jZv6HITBRRwuAxQ5UDVKbMF8u6mU8alBD2ajFzTQY0zhs0+kAcrYrWOzRv1OLUNe08BMMDpZnlx73Vr7gLxe2dkrat8OeNk9qpdByKnTVTxugv/EIHKpgb8Uf81ubvoLvRce4iuaFg51Kia42yFLk/3z+xgJ8fdJL974nQrBzlV1d8GGPBG2mj72CANWtfpsRkUQzbBk+o4EuMxgMFn4VplZUsBKkPE74A+2WL4FNgOPRrBGUTBJFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RSThWn3W9RkhmPqI7UNxIwmH9L9jQ3G6Zdt//Chc8ms=; b=fGjzHypSbKQkgiWwfizU0ghptLH3U8JPoAnefpf3gTfYvOm5cLx5jbJRZ3NmJbVZIMaPEAORXr9gYnSOm8LiyUwD+eSLHcLtnLvSrOU70K/JR1p8AVn+H+AhcbG+ksZ64r4SJ9x32CMRU1vY1zP7GpjBoC8XTtB6J3T4fUTFV0CIbKjawKWmUzOK8NZqzxCBzWIv9VZApaxREzv5MhTbGH8L5HYpmbXoVaNTDJKKenSEhKD/abR7jPypdnH9p+z/Ag8M6RhoAv+xnoEF+CYLPEtyejQUy9g6m03WjOU9EHm2V1xV/Vy77FRuRJW6wIqJC06750513TYSewfJcmFQ7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=yahoo-corp.jp; dmarc=pass action=none header.from=yahoo-corp.jp; dkim=pass header.d=yahoo-corp.jp; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo-corp.jp; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RSThWn3W9RkhmPqI7UNxIwmH9L9jQ3G6Zdt//Chc8ms=; b=bdSfEUeS2tUmQplqfqNRUoQHzU24+Y8C4THVQE3IzT2JoJAfXfmQTTZGoHZqjWzQxTyjKEQ+4DOzQXBQQn0gY6obwTN0f6JEXB1+LMvtBDZGskKHq/77yPnLnmKkJg+ZesxzC0ePp+3ijaiBUHc2/MI0JkDCXInyLGoSvmVpFec= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=yahoo-corp.jp; Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) by OS3PR01MB9914.jpnprd01.prod.outlook.com (2603:1096:604:1ee::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.18; Thu, 9 Mar 2023 02:07:38 +0000 Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::61fe:e4c3:a819:6ce6]) by TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::61fe:e4c3:a819:6ce6%7]) with mapi id 15.20.6178.019; Thu, 9 Mar 2023 02:07:38 +0000 From: Nobuhiro MIKI To: maxime.coquelin@redhat.com, chenbo.xia@intel.com Cc: dev@dpdk.org, Nobuhiro MIKI Subject: [PATCH 1/2] vhost: fix constants to follow new naming convension Date: Thu, 9 Mar 2023 11:07:20 +0900 Message-Id: <20230309020721.22164-2-nmiki@yahoo-corp.jp> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230309020721.22164-1-nmiki@yahoo-corp.jp> References: <20230309020721.22164-1-nmiki@yahoo-corp.jp> X-ClientProxiedBy: TYAPR01CA0080.jpnprd01.prod.outlook.com (2603:1096:404:2c::20) To TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY2PR01MB4107:EE_|OS3PR01MB9914:EE_ X-MS-Office365-Filtering-Correlation-Id: e600986c-ed97-447a-ebaf-08db20430ecf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6EmLtXo7uk0D/6HU8AP/C5MjDmbHC+urC/MPqKKqG115lFXcsL25rDseefhw3r6rj80nE5d5vDOpYuBH3ikCqIZAFYsMTPWY1cwhCwClARVOuY0twCcdKateqJuAXRjFFRxOgZImpSg5Q9wmZPZWGT4HCNnatyqSeHjk8+V4/K1nY/bRhCbkAQci6WdXSDienve5fMeKwCFamsPQRntIX+oUFRsNjZ3mxhd9XLaMBDpcP4Mcqsp5hVSBA5CHHvu8P+xPCtt1qWvyQR1pnDgByiy4FM9W2K81lXP7zAzJNdtlBnyQhK57xXx8VABKiiq9rvKkCpnPDG3LUqryBqLteCdsi/Z3toDHrHHpCcMqOro32SCcG/v+12a2Dx4BHwLiJdMd5lqEet3zWGSe1cCZx66ybk9FHTW0DU4EYacXB2ondxwTukv+XxcdyblE4KCHvWzi8Rvfn8c8txVMsJmlLymvURGIqsB5hKCQVzC5V/yx0niJZMZVM2nBTqBxlYJn4Z1I7XuiNUY36/TWQp9zPl277b9ykIJ8uMLp3z3Y2x2LQw0/SjlvlvXNZHWDlsE3k+Eq/vmEwkx12Yz17weQjYGkMTjwFwv0I6I/SxhKxthUwiqWuVIIGqbLpu9vKJryEYqt88L0s2wub5O3Yp6s/UEdQBGngUmB0NqFpsFbF1es3GxgzS81ZxOxmf/pK4c+ooHoPp+ki4fFkNv9EwJVPA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TY2PR01MB4107.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(366004)(346002)(136003)(396003)(376002)(451199018)(107886003)(6666004)(2616005)(4326008)(8676002)(66946007)(66556008)(66476007)(86362001)(6486002)(966005)(52116002)(5660300002)(316002)(36756003)(38350700002)(2906002)(38100700002)(83380400001)(82960400001)(8936002)(186003)(41300700001)(478600001)(1076003)(6506007)(6512007)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ln5dH69DHTSV/aUFJtIksQU5ZA5OHYqTuYnQQqQXIUERyJgLK8ktfzPImP/R6VsC7QTcs8Kzl9yiHnhAlPKbbZRN0LVBfeZjMvoFsoMizbnDGBPE5JCMxDu4NctT8O1A3BYgllOLReXV/SLJx7ZYsay4qsvcHDtxLi+/zhLQhBJaNOQl3uza1Ay+A5oBeaiBodBiY+OaNVRTx7k+G7qffvkYFXXXgp7aCz5anp+jM1t78yYf/9X87AA9nUKSVZzdZtf0YmJgRpmlgFn2553DxP+8UdSb2MHJSWC4aYC2/U/hFViS/3Rtl4y2BGahJwmF0IF/Vf+wi6Dm3e4WONm44kNjFVcq6y2nTAYY5v2KYpEnFlrDKzvdzGsYVE/2ybdq3xeKZGDLZmoNIt0ynoKiswmaz0rGK6OoIzMN5z1YrPsFQ72MEcEw7rsxSMP3UNvFl+IU+rwf7/J2rUzb267XhPlQR20Nm9RMXfzO4EBA36Vv/HQWS0o6q8wLMXO3fan2YfxkJU1+c/9CVG0UrFeiKcE8CCyFd2tGZw8uVnzJzviiMSTWP87U76yvfR68AEESVkNAPsnZsGJj3Kj3UH3R7OJZQnkK3Bvz0Bv9VjrrEyTGpm+J3jO4X+wRIgIgYGJDPvZ7ViLbgkOOMjOyYR1RFdixUKVrLFZfpJO9mo+ViWPPwkTKvYkP1y+oXMSc/GG7m1nkZtLlYpcIy8s/bbr02Ypb+vbmLRDsC5Nh9pfc6jUU1pEmZ13BQtjrC7/oR10SmgqcG04xzETngbWrEZ5jc6m63/zJtVJ3g6mmPTfCz/hk4M3r1Umq7Hkx8HKh70CQSZW5wLtANO8atYililGWrLwMsa96bcip6ioLebYQV8zWwyNAyenC0kfrbAjr8No3oopyhc6wSFsee0q0KCawp7VALAULLrz+pyn/n3T+yMLcx+Wl6vF2MitNzrNlt3Z0zWyCKK0M970uGpb6ZqZfuKOGRsg2EuY0zQq8rJtSAPkfBIoeOcu364rbQHWQzAvmf5Y2zS/smd6mu1AsdkzqxsqYUtvc9ZnC8kSlL18WjPxtuOj0FyQ6T0H7gcJx15Ks23qHfhyW2v1dZD+fok945/EXr5c/kuCV87cTk0kq5socmHhCyP3iKa77MUZm6fWji2g7TWmvs4iuo6FDynML5oewDggLhfq+n9l8HJuST3rRwBupKeI41MnhBN7YV4d54PhiAOIdZXUcFytR3WdzBgIXPgAm26X+klOz3QGjjAGF5O07/JYsOznW17oWJOSYsETMMS88JOni2yz2xr8b7R3+DX+V4ToO0Ea35DgPwdJa9TrwtyVKMcjqEosqiFrnwn7Mjlil7qsTqzEHnVKjoa5UvCxnDQ1Q0VMkOT4VdzH1yFf6HtDI8bJ44oQFKQmgmF79d2hrQYILUjmvtnbK0J0mJ3tVQKjdufFg2G/fwpx4HS8xA7/yMPd3xuWrMMWo6Pir7v8QWTU+Rk1geGZmVZVCJ0DFeTl2taTDa6VqQN8G21VM28X6amme6K6HMcol5WTL/1FZCMTUz+xUAj7JiflPlxg/fEsjYrtCeufKBchbc1nCfwTKQzSJ4l1i2KIi X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: e600986c-ed97-447a-ebaf-08db20430ecf X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB4107.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2023 02:07:38.7868 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uTzjeIH6TDW33woAgcb4VVAbqa5fl62AvgkjSiiusks7FKx1JKGqysrPNMlP28veZ3/54lgAKLEyOzNi6ujsAA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9914 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 DPDK apps (e.g. dpdk-skeleton) output this name during negotiation. But, it is not consistent when debugging using QEMU as a front-end, for example. This is because QEMU already follows new naming convention [1]. Some type names and variable names, such as VhostUserSlaveRequest, are still in old naming convension. But, in this patch we only focus on constants. [1] https://qemu-project.gitlab.io/qemu/interop/vhost-user.html Signed-off-by: Nobuhiro MIKI --- drivers/vdpa/ifc/ifcvf_vdpa.c | 4 ++-- drivers/vdpa/mlx5/mlx5_vdpa.c | 4 ++-- drivers/vdpa/sfc/sfc_vdpa_ops.c | 4 ++-- lib/vhost/rte_vhost.h | 8 ++++---- lib/vhost/vhost_user.c | 14 +++++++------- lib/vhost/vhost_user.h | 14 +++++++------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index 4a87673682fc..fe4d278c5380 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -1315,8 +1315,8 @@ ifcvf_get_vdpa_features(struct rte_vdpa_device *vdev, uint64_t *features) #define VDPA_SUPPORTED_PROTOCOL_FEATURES \ (1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK | \ - 1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ | \ - 1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD | \ + 1ULL << VHOST_USER_PROTOCOL_F_BACKEND_REQ | \ + 1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD | \ 1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER | \ 1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD | \ 1ULL << VHOST_USER_PROTOCOL_F_MQ | \ diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c index f8dfa9513311..f1737f82a8ae 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c @@ -37,8 +37,8 @@ (1ULL << VIRTIO_NET_F_MTU)) #define MLX5_VDPA_PROTOCOL_FEATURES \ - ((1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \ - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \ + ((1ULL << VHOST_USER_PROTOCOL_F_BACKEND_REQ) | \ + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD) | \ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \ (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD) | \ (1ULL << VHOST_USER_PROTOCOL_F_MQ) | \ diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c index 6401d4e16f25..e88c7eeaa609 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c @@ -21,8 +21,8 @@ /* These protocol features are needed to enable notifier ctrl */ #define SFC_VDPA_PROTOCOL_FEATURES \ ((1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK) | \ - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \ - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \ + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_REQ) | \ + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD) | \ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \ (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD) | \ (1ULL << VHOST_USER_PROTOCOL_F_MQ)) diff --git a/lib/vhost/rte_vhost.h b/lib/vhost/rte_vhost.h index a395843fe96d..ed255fc6c51f 100644 --- a/lib/vhost/rte_vhost.h +++ b/lib/vhost/rte_vhost.h @@ -80,8 +80,8 @@ extern "C" { #define VHOST_USER_PROTOCOL_F_NET_MTU 4 #endif -#ifndef VHOST_USER_PROTOCOL_F_SLAVE_REQ -#define VHOST_USER_PROTOCOL_F_SLAVE_REQ 5 +#ifndef VHOST_USER_PROTOCOL_F_BACKEND_REQ +#define VHOST_USER_PROTOCOL_F_BACKEND_REQ 5 #endif #ifndef VHOST_USER_PROTOCOL_F_CRYPTO_SESSION @@ -96,8 +96,8 @@ extern "C" { #define VHOST_USER_PROTOCOL_F_CONFIG 9 #endif -#ifndef VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD -#define VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD 10 +#ifndef VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD +#define VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD 10 #endif #ifndef VHOST_USER_PROTOCOL_F_HOST_NOTIFIER diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 9e361082dc9b..cd4104ea5ce0 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -2846,7 +2846,7 @@ VHOST_MESSAGE_HANDLER(VHOST_USER_GET_QUEUE_NUM, vhost_user_get_queue_num, false) VHOST_MESSAGE_HANDLER(VHOST_USER_SET_VRING_ENABLE, vhost_user_set_vring_enable, false) \ VHOST_MESSAGE_HANDLER(VHOST_USER_SEND_RARP, vhost_user_send_rarp, false) \ VHOST_MESSAGE_HANDLER(VHOST_USER_NET_SET_MTU, vhost_user_net_set_mtu, false) \ -VHOST_MESSAGE_HANDLER(VHOST_USER_SET_SLAVE_REQ_FD, vhost_user_set_req_fd, true) \ +VHOST_MESSAGE_HANDLER(VHOST_USER_SET_BACKEND_REQ_FD, vhost_user_set_req_fd, true) \ VHOST_MESSAGE_HANDLER(VHOST_USER_IOTLB_MSG, vhost_user_iotlb_msg, false) \ VHOST_MESSAGE_HANDLER(VHOST_USER_GET_CONFIG, vhost_user_get_config, false) \ VHOST_MESSAGE_HANDLER(VHOST_USER_SET_CONFIG, vhost_user_set_config, false) \ @@ -3143,7 +3143,7 @@ vhost_user_msg_handler(int vid, int fd) case VHOST_USER_SET_VRING_ENABLE: case VHOST_USER_SEND_RARP: case VHOST_USER_NET_SET_MTU: - case VHOST_USER_SET_SLAVE_REQ_FD: + case VHOST_USER_SET_BACKEND_REQ_FD: if (!(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED)) { vhost_user_lock_all_queue_pairs(dev); unlock_required = 1; @@ -3307,7 +3307,7 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm) int ret; struct vhu_msg_context ctx = { .msg = { - .request.slave = VHOST_USER_SLAVE_IOTLB_MSG, + .request.slave = VHOST_USER_BACKEND_IOTLB_MSG, .flags = VHOST_USER_VERSION, .size = sizeof(ctx.msg.payload.iotlb), .payload.iotlb = { @@ -3334,7 +3334,7 @@ rte_vhost_slave_config_change(int vid, bool need_reply) { struct vhu_msg_context ctx = { .msg = { - .request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG, + .request.slave = VHOST_USER_BACKEND_CONFIG_CHANGE_MSG, .flags = VHOST_USER_VERSION, .size = 0, } @@ -3366,7 +3366,7 @@ static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev, int ret; struct vhu_msg_context ctx = { .msg = { - .request.slave = VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG, + .request.slave = VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG, .flags = VHOST_USER_VERSION | VHOST_USER_NEED_REPLY, .size = sizeof(ctx.msg.payload.area), .payload.area = { @@ -3410,9 +3410,9 @@ int rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable) if (!(dev->features & (1ULL << VIRTIO_F_VERSION_1)) || !(dev->features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) || !(dev->protocol_features & - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ)) || + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_REQ)) || !(dev->protocol_features & - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD)) || + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD)) || !(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER))) return -ENOTSUP; diff --git a/lib/vhost/vhost_user.h b/lib/vhost/vhost_user.h index 8ecca6859707..8e418414ba94 100644 --- a/lib/vhost/vhost_user.h +++ b/lib/vhost/vhost_user.h @@ -18,9 +18,9 @@ (1ULL << VHOST_USER_PROTOCOL_F_RARP) | \ (1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK) | \ (1ULL << VHOST_USER_PROTOCOL_F_NET_MTU) | \ - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \ + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_REQ) | \ (1ULL << VHOST_USER_PROTOCOL_F_CRYPTO_SESSION) | \ - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \ + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD) | \ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \ (1ULL << VHOST_USER_PROTOCOL_F_PAGEFAULT) | \ (1ULL << VHOST_USER_PROTOCOL_F_STATUS)) @@ -47,7 +47,7 @@ typedef enum VhostUserRequest { VHOST_USER_SET_VRING_ENABLE = 18, VHOST_USER_SEND_RARP = 19, VHOST_USER_NET_SET_MTU = 20, - VHOST_USER_SET_SLAVE_REQ_FD = 21, + VHOST_USER_SET_BACKEND_REQ_FD = 21, VHOST_USER_IOTLB_MSG = 22, VHOST_USER_GET_CONFIG = 24, VHOST_USER_SET_CONFIG = 25, @@ -63,10 +63,10 @@ typedef enum VhostUserRequest { } VhostUserRequest; typedef enum VhostUserSlaveRequest { - VHOST_USER_SLAVE_NONE = 0, - VHOST_USER_SLAVE_IOTLB_MSG = 1, - VHOST_USER_SLAVE_CONFIG_CHANGE_MSG = 2, - VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG = 3, + VHOST_USER_BACKEND_NONE = 0, + VHOST_USER_BACKEND_IOTLB_MSG = 1, + VHOST_USER_BACKEND_CONFIG_CHANGE_MSG = 2, + VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG = 3, } VhostUserSlaveRequest; typedef struct VhostUserMemoryRegion { From patchwork Thu Mar 9 02:07:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro MIKI X-Patchwork-Id: 124868 X-Patchwork-Delegate: maxime.coquelin@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 C239341E34; Thu, 9 Mar 2023 03:07:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9F1E240ED7; Thu, 9 Mar 2023 03:07:44 +0100 (CET) Received: from corp-ob07.yahoo-corp.jp (corp-ob07.yahoo-corp.jp [183.79.94.94]) by mails.dpdk.org (Postfix) with ESMTP id 730E1410EE for ; Thu, 9 Mar 2023 03:07:42 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01lp2177.outbound.protection.outlook.com [104.47.23.177]) by corp-ob07.yahoo-corp.jp (Postfix) with ESMTPS id 20CE619FB187; Thu, 9 Mar 2023 11:07:41 +0900 (JST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JB54cr5t5HQMowUtPRzqht9HXOBo/4PwWRn73eGigwX0znCN2WSMt0nkZ7c5Wx2ZzaUfD06SCHgQ55yV3/oReW/UQgIhzTBHtzp25hDPSgIVgLzWwhBhDUnK4xVrzh/4xMb5g3sCR/aJ8BAinlgs5FiLPdyo4LnhalniGgbDzQ57i1pJ92WvltE73MvtxvWXYq7eK7BLR6Zot2ArnnNxXng3LvPBROlPT6AuCKwMen8gpB3yHeUpymTsjsJIu63ldvKtyRLH8FoWjSYPt4xl8bNIHMBhdRipm8QNaQ6getRJmGtLyw6tRorq6Va5nGjKpwAK+YgvSKv69HKBka5Yrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=90Ak4xau+rtlgLsW1hDPH4y9nE9FRfAX5xwLC7kHA3Q=; b=XsyIHsUhJw7360OOqxM17nG8N0sKqCe85YErtIqxJentPXdFKi6NPKMeeVqhY6mG+GJ8My7alifP4aYnkUqsQWZG/dvtACcI82+leeNW7WREK+PITz8GnQL7efaLaDIiC1WoSCywDWT4xdJ1y01OHD8w1qUzUKGjZt8pCNLnK1ORGLzNQbPos3RA27yRyVxrN646PN0MWj6miTlm9e+6fJZNrqQmBmx/V3gf4ygOXzjiigVVaBrcoYFBnhai6vQCBkepub8gIeW4L7o0aJV6rGDZMrtD+EuW1mCS5KxiojXA0ceTiVXSuXkwku3zbSfDnQihHJtHmitwDETbHr5RpQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=yahoo-corp.jp; dmarc=pass action=none header.from=yahoo-corp.jp; dkim=pass header.d=yahoo-corp.jp; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo-corp.jp; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=90Ak4xau+rtlgLsW1hDPH4y9nE9FRfAX5xwLC7kHA3Q=; b=KYQEZzqEfZTCQdMMQfIzBoeqJbbAKI0UUscEsBni6G/p+EmHMocs6DEVggQYLs8+EDWL0tzjb7UPV8Pon0rL7N6/UvRA020SBSwWXIMctEowPYYPMnCs315PIQ40mLt//dICUS/8Yu0RHB1+PV9xHwb+cx11OZ0ePeaUFJhBum8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=yahoo-corp.jp; Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) by OS3PR01MB9914.jpnprd01.prod.outlook.com (2603:1096:604:1ee::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.18; Thu, 9 Mar 2023 02:07:39 +0000 Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::61fe:e4c3:a819:6ce6]) by TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::61fe:e4c3:a819:6ce6%7]) with mapi id 15.20.6178.019; Thu, 9 Mar 2023 02:07:39 +0000 From: Nobuhiro MIKI To: maxime.coquelin@redhat.com, chenbo.xia@intel.com Cc: dev@dpdk.org, Nobuhiro MIKI Subject: [PATCH 2/2] vhost: refactor to follow new naming convention Date: Thu, 9 Mar 2023 11:07:21 +0900 Message-Id: <20230309020721.22164-3-nmiki@yahoo-corp.jp> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230309020721.22164-1-nmiki@yahoo-corp.jp> References: <20230309020721.22164-1-nmiki@yahoo-corp.jp> X-ClientProxiedBy: TYAPR01CA0080.jpnprd01.prod.outlook.com (2603:1096:404:2c::20) To TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY2PR01MB4107:EE_|OS3PR01MB9914:EE_ X-MS-Office365-Filtering-Correlation-Id: 6114486d-4494-4a0b-97d9-08db20430f1e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qCxJ4r0y1HcATqvNksWXSMrSXmnfvXzE75zKY9fMZ9KjoN2rLLvMnCRg3PXBm4HKW08a3nUxoSSa716OYZLhpdTW6JK1C2XcDyI8h/6GexMIcZwl8DtXwegu+TH0qMtJt1mIUvxc5mZ/uVuW1jM8MJQlqEWk+ek0KYv96iMpJ7FA5WECT4r0EPpA7bNGntmnE3Wom6hgyS4Yn42ZckLeXwE7f2yKeniRIQizBdU/lRv8AvBv3ht7xste63OUWAsaI7LL4enxxE8HAoi7roQgQjM0wpauI9Azm0Ekvml3QucchRIJh5RSqFezInclbveozTU4Fi4hiwJ+tUvpJxb8nuNvfA6ebqqSVf++Hr/7jwLCzlt1N9kOW+hQDV1j0nk1caFvSyn1+nfmcRVTUbvjvFzA18NeIym0zRLreBM2xBPII8CW24ecygQGVi4rMG7fA928BZaIXvUd5X6WTIRd3Vdv7EXQrajKMwWQzSzqhfPe+dBaMEiafVFn6C4EjZxedFifMuEXv87nKOJ/9/qJm9dxBuHmygQcVZRYnP3LFKA4flmxsCxBFZuFt9Aq/hckIqP1gHxZeo0PQbF3R6gi5MD1XR6oL08lym0p3QPPTysQGscVI1N9ICU0/pc1mBm8zZS+hV9BS9iE83yVJRF8RMUlmC6jWskLJm+aRce6TRT7dd9c9lGozcZvbp+lzwd6VX/GdNrP3TV4gKQ9XJMvRNqULW5Ln7DWq1z4Rv1n3x+BF4Wa45bDOGqmE+QkSUYC X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TY2PR01MB4107.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(366004)(346002)(136003)(396003)(376002)(451199018)(107886003)(6666004)(2616005)(4326008)(8676002)(66946007)(66556008)(66476007)(86362001)(6486002)(52116002)(5660300002)(316002)(36756003)(38350700002)(2906002)(38100700002)(83380400001)(82960400001)(8936002)(186003)(41300700001)(478600001)(1076003)(6506007)(6512007)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EVDGNyDMeJNhQVzKIW7ZoFJgIAz0asMlbW/3xk7CdVjtob5OsdPs3Y/M+WjxU2cdRRe1UWhaVfv3yYCoZJPzdtXHzPsk/+Oy1E2tImiwLMXTWc8+wCm5f7dFGRAj6XjlBF4ZA2WyrCC5y7u817VBzU/9SK1+eHImhZ6oP5C6l1DQrW8ZRKwTgEo9BMNblELCxgsyq+v9+PR4RdiysULrsRDz9c7UqXSATixqB8f7djq11QaZyVvbpHsM7gYkiGDA/p+BDUOOSXaXebu9BNMbyoNBJPjGkVrfbzfTOxylj2P+A5p8nPZ24H2oDju6hAqY9685swIHlNiIE2XU/f5ajTyG1iUUSaBmlz0W780MKeNLhswpyZrLxfaeLBoqilkav2JvhcIwnzdi1DWV+xqrlLQAYLSQ8hpgCd2mbsrIagkAzytsWqmdwFFK2rL02/+h8XBcFPs/suTsAo1KEsVOsuGL/6eXgObYrx29KLva2LwOo3d+fBMS12Or+pUgRSQn9+poV+9nLwfzmYJJgD6iE8htRDkjj/bU2nqqpTaFsHwUblnICOZuCKBpV+gBv2SFzGPuHC7LbuHzleFN52p0CufpjVkfUo8PVQsR2jyegM3JLqtu8MNH+eub43xoqQW31604DqZ8xM1rJlSSaUDh2WR5E0ifNs6c1hW76q1TCCc12x0BFTfR3i7W9dqnM4vawhQxosN86Xx/u8aHcIyw6MUGEvaxvIRT8C/BHO3uqh17sRlQYHe+6KVfvN/7AZ34VcEcya66amrvELCUrm+Eet1SC696HT9QhtMREF9jNv9c+/J2SmF0z7UJCqyROkO0u9G+q8q1qel+gW1kN2SbDlzQ0OZYYBgD3ggFxQ95AgH7RtXRPNbw+2ZQDXfZGpoZl560fwYx8fP/pXdI529xCImYVN7wBtHtj2mac7H00G9NQGcAIxNZnER0t6ST8XieY7FpF4Xg+bWV8eBA6uBb2dHmdHKkeikoQbjtuWZc3NWLcWBEbMcGUK67Gh3Gs52kI+dUWzTcxaVTAQm01LTZuMVk3gWta18iPcLcR38a1WyQK9j4WbVIe5tLNO9DMHDeRJUu1BiNZcvb+6lPlgnrXGTqhMwlp+pMWgIMhpzbyULjZBjDRxf0v/n4hlaF0SmrSz3tuApRcIWO9zsP471JcIcxwJ95fxPcp6HF4PuRjE87DvQqP8JWEPscGSSvS7kNP3I6xB/hB2c2E1NWipjTDn8Yy+Xa1v/bUNWnq24PG+a1xK+FPM7rM8Je8B1PyyE9NJARdwDLmH+V7slkoGsEJTItY49zaLgO2Cmz4SdSvbqCYkvQmHheI6hkGrYWefNNs6fEFypjjvCAKhLuOQrprKl+K6ZAgPKpJK8FAnuex7lfZXCdatC5zvMehEOEJSJzZtzvMvYgOdOOvnkAxQGYM5QYUhTQ7uCKI2/VCVmIGARRvhoiCoURln9iHI+2/EI97Z2i88c0nSyHYI6BmlYtlTzh3MVr613//3SWsg9fHypO/26swbfKxBDINaA5BdHO/kKTyhKFTya/15zbSylJ7ApCkeSqAd5cauUoY54ytetOz7Iwx1rsdRqufAwQAzX5 X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 6114486d-4494-4a0b-97d9-08db20430f1e X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB4107.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2023 02:07:39.4586 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sf15yTkuYkunTqS5rn2CVIS6Q7npZEz5rjk8FFcZha2aKVZg7MYLNrXmRlyDPbgiX0KGJTzteFQiBoVNwP6VRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9914 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 Simply replace '_slave_' with '_backend_'. Signed-off-by: Nobuhiro MIKI --- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +- lib/vhost/rte_vhost.h | 2 +- lib/vhost/version.map | 2 +- lib/vhost/vhost.c | 4 +-- lib/vhost/vhost.h | 4 +-- lib/vhost/vhost_user.c | 62 +++++++++++++++++------------------ lib/vhost/vhost_user.h | 6 ++-- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index fe4d278c5380..e4133568c1aa 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -605,7 +605,7 @@ virtio_interrupt_handler(struct ifcvf_internal *internal) int vid = internal->vid; int ret; - ret = rte_vhost_slave_config_change(vid, 1); + ret = rte_vhost_backend_config_change(vid, 1); if (ret) DRV_LOG(ERR, "failed to notify the guest about configuration space change."); } diff --git a/lib/vhost/rte_vhost.h b/lib/vhost/rte_vhost.h index ed255fc6c51f..cc2ec99c315c 100644 --- a/lib/vhost/rte_vhost.h +++ b/lib/vhost/rte_vhost.h @@ -1066,7 +1066,7 @@ rte_vhost_get_vdpa_device(int vid); */ __rte_experimental int -rte_vhost_slave_config_change(int vid, bool need_reply); +rte_vhost_backend_config_change(int vid, bool need_reply); /** * Retrieve names of statistics of a Vhost virtqueue. diff --git a/lib/vhost/version.map b/lib/vhost/version.map index d779a5cf3a0a..d322a4a888cd 100644 --- a/lib/vhost/version.map +++ b/lib/vhost/version.map @@ -68,7 +68,7 @@ EXPERIMENTAL { global: rte_vhost_crypto_driver_start; - rte_vhost_slave_config_change; + rte_vhost_backend_config_change; rte_vhost_async_channel_register; rte_vhost_async_channel_unregister; rte_vhost_submit_enqueue_burst; diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 358672bb176b..ef3794381751 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -701,9 +701,9 @@ vhost_new_device(void) dev->vid = i; dev->flags = VIRTIO_DEV_BUILTIN_VIRTIO_NET; - dev->slave_req_fd = -1; + dev->backend_req_fd = -1; dev->postcopy_ufd = -1; - rte_spinlock_init(&dev->slave_req_lock); + rte_spinlock_init(&dev->backend_req_lock); return i; } diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index a31d810531d7..8fdab13c7097 100644 --- a/lib/vhost/vhost.h +++ b/lib/vhost/vhost.h @@ -499,8 +499,8 @@ struct virtio_net { uint32_t max_guest_pages; struct guest_page *guest_pages; - int slave_req_fd; - rte_spinlock_t slave_req_lock; + int backend_req_fd; + rte_spinlock_t backend_req_lock; int postcopy_ufd; int postcopy_listening; diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index cd4104ea5ce0..1ce1a5924f74 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -226,9 +226,9 @@ vhost_backend_cleanup(struct virtio_net *dev) dev->inflight_info = NULL; } - if (dev->slave_req_fd >= 0) { - close(dev->slave_req_fd); - dev->slave_req_fd = -1; + if (dev->backend_req_fd >= 0) { + close(dev->backend_req_fd); + dev->backend_req_fd = -1; } if (dev->postcopy_ufd >= 0) { @@ -2257,11 +2257,11 @@ vhost_user_set_protocol_features(struct virtio_net **pdev, { struct virtio_net *dev = *pdev; uint64_t protocol_features = ctx->msg.payload.u64; - uint64_t slave_protocol_features = 0; + uint64_t backend_protocol_features = 0; rte_vhost_driver_get_protocol_features(dev->ifname, - &slave_protocol_features); - if (protocol_features & ~slave_protocol_features) { + &backend_protocol_features); + if (protocol_features & ~backend_protocol_features) { VHOST_LOG_CONFIG(dev->ifname, ERR, "received invalid protocol features.\n"); return RTE_VHOST_MSG_RESULT_ERR; } @@ -2458,14 +2458,14 @@ vhost_user_set_req_fd(struct virtio_net **pdev, if (fd < 0) { VHOST_LOG_CONFIG(dev->ifname, ERR, - "invalid file descriptor for slave channel (%d)\n", fd); + "invalid file descriptor for backend channel (%d)\n", fd); return RTE_VHOST_MSG_RESULT_ERR; } - if (dev->slave_req_fd >= 0) - close(dev->slave_req_fd); + if (dev->backend_req_fd >= 0) + close(dev->backend_req_fd); - dev->slave_req_fd = fd; + dev->backend_req_fd = fd; return RTE_VHOST_MSG_RESULT_OK; } @@ -2931,46 +2931,46 @@ 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) +send_vhost_backend_message(struct virtio_net *dev, struct vhu_msg_context *ctx) { - return send_vhost_message(dev, dev->slave_req_fd, ctx); + return send_vhost_message(dev, dev->backend_req_fd, ctx); } static int -send_vhost_slave_message_process_reply(struct virtio_net *dev, struct vhu_msg_context *ctx) +send_vhost_backend_message_process_reply(struct virtio_net *dev, struct vhu_msg_context *ctx) { struct vhu_msg_context msg_reply; int ret; - rte_spinlock_lock(&dev->slave_req_lock); - ret = send_vhost_slave_message(dev, ctx); + rte_spinlock_lock(&dev->backend_req_lock); + ret = send_vhost_backend_message(dev, ctx); if (ret < 0) { VHOST_LOG_CONFIG(dev->ifname, ERR, "failed to send config change (%d)\n", ret); goto out; } - ret = read_vhost_message(dev, dev->slave_req_fd, &msg_reply); + ret = read_vhost_message(dev, dev->backend_req_fd, &msg_reply); if (ret <= 0) { if (ret < 0) VHOST_LOG_CONFIG(dev->ifname, ERR, - "vhost read slave message reply failed\n"); + "vhost read backend message reply failed\n"); else VHOST_LOG_CONFIG(dev->ifname, INFO, "vhost peer closed\n"); ret = -1; goto out; } - if (msg_reply.msg.request.slave != ctx->msg.request.slave) { + if (msg_reply.msg.request.backend != ctx->msg.request.backend) { VHOST_LOG_CONFIG(dev->ifname, ERR, "received unexpected msg type (%u), expected %u\n", - msg_reply.msg.request.slave, ctx->msg.request.slave); + msg_reply.msg.request.backend, ctx->msg.request.backend); ret = -1; goto out; } ret = msg_reply.msg.payload.u64 ? -1 : 0; out: - rte_spinlock_unlock(&dev->slave_req_lock); + rte_spinlock_unlock(&dev->backend_req_lock); return ret; } @@ -3307,7 +3307,7 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm) int ret; struct vhu_msg_context ctx = { .msg = { - .request.slave = VHOST_USER_BACKEND_IOTLB_MSG, + .request.backend = VHOST_USER_BACKEND_IOTLB_MSG, .flags = VHOST_USER_VERSION, .size = sizeof(ctx.msg.payload.iotlb), .payload.iotlb = { @@ -3318,7 +3318,7 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm) }, }; - ret = send_vhost_message(dev, dev->slave_req_fd, &ctx); + ret = send_vhost_message(dev, dev->backend_req_fd, &ctx); if (ret < 0) { VHOST_LOG_CONFIG(dev->ifname, ERR, "failed to send IOTLB miss message (%d)\n", @@ -3330,11 +3330,11 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm) } int -rte_vhost_slave_config_change(int vid, bool need_reply) +rte_vhost_backend_config_change(int vid, bool need_reply) { struct vhu_msg_context ctx = { .msg = { - .request.slave = VHOST_USER_BACKEND_CONFIG_CHANGE_MSG, + .request.backend = VHOST_USER_BACKEND_CONFIG_CHANGE_MSG, .flags = VHOST_USER_VERSION, .size = 0, } @@ -3347,10 +3347,10 @@ rte_vhost_slave_config_change(int vid, bool need_reply) return -ENODEV; if (!need_reply) { - ret = send_vhost_slave_message(dev, &ctx); + ret = send_vhost_backend_message(dev, &ctx); } else { ctx.msg.flags |= VHOST_USER_NEED_REPLY; - ret = send_vhost_slave_message_process_reply(dev, &ctx); + ret = send_vhost_backend_message_process_reply(dev, &ctx); } if (ret < 0) @@ -3358,7 +3358,7 @@ rte_vhost_slave_config_change(int vid, bool need_reply) return ret; } -static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev, +static int vhost_user_backend_set_vring_host_notifier(struct virtio_net *dev, int index, int fd, uint64_t offset, uint64_t size) @@ -3366,7 +3366,7 @@ static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev, int ret; struct vhu_msg_context ctx = { .msg = { - .request.slave = VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG, + .request.backend = VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG, .flags = VHOST_USER_VERSION | VHOST_USER_NEED_REPLY, .size = sizeof(ctx.msg.payload.area), .payload.area = { @@ -3384,7 +3384,7 @@ static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev, ctx.fd_num = 1; } - ret = send_vhost_slave_message_process_reply(dev, &ctx); + ret = send_vhost_backend_message_process_reply(dev, &ctx); if (ret < 0) VHOST_LOG_CONFIG(dev->ifname, ERR, "failed to set host notifier (%d)\n", ret); @@ -3444,7 +3444,7 @@ int rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable) goto disable; } - if (vhost_user_slave_set_vring_host_notifier(dev, i, + if (vhost_user_backend_set_vring_host_notifier(dev, i, vfio_device_fd, offset, size) < 0) { ret = -EFAULT; goto disable; @@ -3453,7 +3453,7 @@ int rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable) } else { disable: for (i = q_start; i <= q_last; i++) { - vhost_user_slave_set_vring_host_notifier(dev, i, -1, + vhost_user_backend_set_vring_host_notifier(dev, i, -1, 0, 0); } } diff --git a/lib/vhost/vhost_user.h b/lib/vhost/vhost_user.h index 8e418414ba94..cd8610129789 100644 --- a/lib/vhost/vhost_user.h +++ b/lib/vhost/vhost_user.h @@ -62,12 +62,12 @@ typedef enum VhostUserRequest { VHOST_USER_GET_STATUS = 40, } VhostUserRequest; -typedef enum VhostUserSlaveRequest { +typedef enum VhostUserBackendRequest { VHOST_USER_BACKEND_NONE = 0, VHOST_USER_BACKEND_IOTLB_MSG = 1, VHOST_USER_BACKEND_CONFIG_CHANGE_MSG = 2, VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG = 3, -} VhostUserSlaveRequest; +} VhostUserBackendRequest; typedef struct VhostUserMemoryRegion { uint64_t guest_phys_addr; @@ -137,7 +137,7 @@ struct vhost_user_config { typedef struct VhostUserMsg { union { uint32_t master; /* a VhostUserRequest value */ - uint32_t slave; /* a VhostUserSlaveRequest value*/ + uint32_t backend; /* a VhostUserBackendRequest value*/ } request; #define VHOST_USER_VERSION_MASK 0x3