From patchwork Fri Dec 17 08:08:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parav Pandit X-Patchwork-Id: 12683871 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F7ABC433EF for ; Fri, 17 Dec 2021 08:08:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233507AbhLQIIr (ORCPT ); Fri, 17 Dec 2021 03:08:47 -0500 Received: from mail-dm6nam12on2050.outbound.protection.outlook.com ([40.107.243.50]:62561 "EHLO NAM12-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233453AbhLQIIq (ORCPT ); Fri, 17 Dec 2021 03:08:46 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TxZTmG3h2XmAIjWwWn0MNlSq0mbznKwjrztKtga7rzdHP49On3vhPtrjzMuYAy/uWXIVgVgpCC25OwTqi8pWjhBWrVgEU+YvRLvT4CLjapVIZDWWVvOU160vaoM45w3jPvQTv3ugvSeTxTf7t/wQLSsA+j7HKxaQQaJnaRDxZjiyHu7MKjrEQe/9h2bHqIp2HwbYs36Cq7pPggHt/1FCWkLPoVI1T92lQJuB+jZyPnJXiB5a/7H559JkZ3NPaOjPnSTAX6sw1RJsFp8Jny/Pv2C667ci3d+ppkiBjBd9G+xagauuGJkKhbydBp42sezjzhf/3RcKcbXG2Xh07c49Iw== 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=3z5matWWMtkiXlET9YFz6SGwVny+giDkwB9AzgXq2lg=; b=CJGOfvalR6QIOitXwu9IALrHhmTi9/+3yDuYFLci1P7jDg7c5n7pO4S73/H+3cX6PLKwiIHoztLlrChXxR1e3aj14KBtxlaTVwhf/EOV8UDS82rxa7to2GZJtfskpb35iCy97GvmshQ0896D4FSDWQAYH6WUbgezqq2RfZT1cybuTCMc+A8+DAsLevEiKZdJsxy6Nj9KqENAO45DHvznE8+bEN5nX0huTWCKecVvzVokvIlbVOmBXqqJ5/GzNRpTVFSL0ZQQNjZG/wyKzyyreQULgKLje9+cfGv83L10oNIlCTwIwTvvlTPfwwAy4zPfc+Rj1AICU7xE9bk4eHDUHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=lists.linux-foundation.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3z5matWWMtkiXlET9YFz6SGwVny+giDkwB9AzgXq2lg=; b=WPM3F6Ve9UVM/ugYtG7HD/dI8Zi4TzIPpMr45aCA9NC/t9+pQ4o76riNN0czr9iGxMt94cfjVgSW2FkOfuCajfsm5eQGJu2n43gY0lNB2PbAutsVy2r0Aaw+wrGWla2NtpWCzp2uNbW+Yj4dpsNcdSyt/xTgTnHmgGA66iWHDB27NSlbS23rAyLOO1M3kgUjKzg/5NyVIUk1J+Jys80lAIeT+pRwd16KXKgw//tEGf9fwlGKI4OZKWunq8RaKzGqqqKF4/ec3oSsi1da7r5pFo1UlmuiKJTR3x6Av33XQLJykQHMsaAUifxvWEJirQzRpLwH97yX/fooegI1YzHvrg== Received: from DM5PR13CA0031.namprd13.prod.outlook.com (2603:10b6:3:7b::17) by MWHPR12MB1133.namprd12.prod.outlook.com (2603:10b6:300:d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Fri, 17 Dec 2021 08:08:45 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:3:7b:cafe::6f) by DM5PR13CA0031.outlook.office365.com (2603:10b6:3:7b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.8 via Frontend Transport; Fri, 17 Dec 2021 08:08:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.235) by DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4801.14 via Frontend Transport; Fri, 17 Dec 2021 08:08:44 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 17 Dec 2021 08:08:41 +0000 Received: from sw-mtx-036.mtx.labs.mlnx (172.20.187.6) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.986.9; Fri, 17 Dec 2021 00:08:40 -0800 From: Parav Pandit To: , , CC: , , , Parav Pandit Subject: [iproute2-next v2 1/4] vdpa: Update kernel headers Date: Fri, 17 Dec 2021 10:08:24 +0200 Message-ID: <20211217080827.266799-2-parav@nvidia.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211217080827.266799-1-parav@nvidia.com> References: <20211217080827.266799-1-parav@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b1e5a68d-9955-4759-c278-08d9c134723a X-MS-TrafficTypeDiagnostic: MWHPR12MB1133:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:820; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yhq7HqgrdIy+7W2KeF4s2ocmCuLNy0xC19a2L4/jZnumxKRt4++NLV+kEjIlEWyw2o9MbKDTRFV8KEcNJmPTi1eZGJzBJYOVDM9S/trMDomlFrwijtmjcaCR6ZV93YAvAHbxR8auTvv6XmmstbGRoM4ItrKml1i+wMFJJhPsjnuS4bHa/KDqGQ00qT/yhmfWzmsPDm4HmSYD0UCQCz5uOOdfujmrNghDoWVvcWVFGUiL03Yc7sTUZdG2fuWHjo0hhodZUR3s1elUf20f3IZJdHFSH7S1w83O9Z04hpts5nLHZals6X+FX+8HWxENaTjasY9O1TGG/cQsa3VeWZ718HlmlufNL7ezSGemLMQctiiVH8TbdJyJxvRMUgZPljTRkSUpAMosFIWkaf0Bz2eZWLkCWloBGgm2FFvhavYb7v7Dr1CEQ26dXOTgIScg8Mb7DQ8qQJNEaWV2JyM1nNgSCGfgsbmVXeS6l471PJZkdPTF245v8MXk0o6aorJ8cKq2+bHCTAeYMOaDHU6vXxBaL1/hZZj55rdk6r1FVjag1uwgFLCb1WkUgXu7k4MkLH/XpOEmqq03vakTu5XEz773BkTT26BECAPBaZUpWCa7O8DaeADtUmxCMYQNEtRYPaXGvIFOgWaoNB4r8Hf0SexRTivuPmclX7THHCqg0R7z+tM3uqMatX1hfG807p8rVXXGfCbkAobEvboDbvy8NVWxEnV9u4Yn2YDlCC3k4pAyt+MiMzs/ykxcjPWqvuz4wvMj1M6TWGnoGT5MkQozJTeXVsFEomm6ir4ccSFJCzsa3pIXuKXT37CUf3fivuLw0tRyzU3SqSDRAbffIxGFH4abJg== X-Forefront-Antispam-Report: CIP:12.22.5.235;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:mail.nvidia.com;PTR:InfoNoRecords;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(54906003)(15650500001)(47076005)(110136005)(4326008)(356005)(81166007)(34020700004)(1076003)(70206006)(86362001)(186003)(316002)(16526019)(36860700001)(70586007)(83380400001)(36756003)(8936002)(336012)(40460700001)(508600001)(6666004)(8676002)(107886003)(5660300002)(2906002)(426003)(26005)(82310400004)(2616005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2021 08:08:44.7455 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b1e5a68d-9955-4759-c278-08d9c134723a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[12.22.5.235];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1133 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com Update kernel headers to commit: ad69dd0bf26b ("vdpa: Introduce query of device config layout") Signed-off-by: Parav Pandit --- include/uapi/linux/virtio_net.h | 81 +++++++++++++++++++++++++++++++++ vdpa/include/uapi/linux/vdpa.h | 7 +++ 2 files changed, 88 insertions(+) create mode 100644 include/uapi/linux/virtio_net.h diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h new file mode 100644 index 00000000..d52965cf --- /dev/null +++ b/include/uapi/linux/virtio_net.h @@ -0,0 +1,81 @@ +#ifndef _LINUX_VIRTIO_NET_H +#define _LINUX_VIRTIO_NET_H +/* This header is BSD licensed so anyone can use the definitions to implement + * compatible drivers/servers. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of IBM nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ + +/* The feature bitmap for virtio net */ +#define VIRTIO_NET_F_CSUM 0 /* Host handles pkts w/ partial csum */ +#define VIRTIO_NET_F_GUEST_CSUM 1 /* Guest handles pkts w/ partial csum */ +#define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS 2 /* Dynamic offload configuration. */ +#define VIRTIO_NET_F_MTU 3 /* Initial MTU advice */ +#define VIRTIO_NET_F_MAC 5 /* Host has given MAC address. */ +#define VIRTIO_NET_F_GUEST_TSO4 7 /* Guest can handle TSOv4 in. */ +#define VIRTIO_NET_F_GUEST_TSO6 8 /* Guest can handle TSOv6 in. */ +#define VIRTIO_NET_F_GUEST_ECN 9 /* Guest can handle TSO[6] w/ ECN in. */ +#define VIRTIO_NET_F_GUEST_UFO 10 /* Guest can handle UFO in. */ +#define VIRTIO_NET_F_HOST_TSO4 11 /* Host can handle TSOv4 in. */ +#define VIRTIO_NET_F_HOST_TSO6 12 /* Host can handle TSOv6 in. */ +#define VIRTIO_NET_F_HOST_ECN 13 /* Host can handle TSO[6] w/ ECN in. */ +#define VIRTIO_NET_F_HOST_UFO 14 /* Host can handle UFO in. */ +#define VIRTIO_NET_F_MRG_RXBUF 15 /* Host can merge receive buffers. */ +#define VIRTIO_NET_F_STATUS 16 /* virtio_net_config.status available */ +#define VIRTIO_NET_F_CTRL_VQ 17 /* Control channel available */ +#define VIRTIO_NET_F_CTRL_RX 18 /* Control channel RX mode support */ +#define VIRTIO_NET_F_CTRL_VLAN 19 /* Control channel VLAN filtering */ +#define VIRTIO_NET_F_CTRL_RX_EXTRA 20 /* Extra RX mode control support */ +#define VIRTIO_NET_F_GUEST_ANNOUNCE 21 /* Guest can announce device on the + * network */ +#define VIRTIO_NET_F_MQ 22 /* Device supports Receive Flow + * Steering */ +#define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */ + +#define VIRTIO_NET_F_HASH_REPORT 57 /* Supports hash report */ +#define VIRTIO_NET_F_RSS 60 /* Supports RSS RX steering */ +#define VIRTIO_NET_F_RSC_EXT 61 /* extended coalescing info */ +#define VIRTIO_NET_F_STANDBY 62 /* Act as standby for another device + * with the same MAC. + */ +#define VIRTIO_NET_F_SPEED_DUPLEX 63 /* Device set linkspeed and duplex */ + +#ifndef VIRTIO_NET_NO_LEGACY +#define VIRTIO_NET_F_GSO 6 /* Host handles pkts w/ any GSO type */ +#endif /* VIRTIO_NET_NO_LEGACY */ + +#define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ +#define VIRTIO_NET_S_ANNOUNCE 2 /* Announcement is needed */ + +/* supported/enabled hash types */ +#define VIRTIO_NET_RSS_HASH_TYPE_IPv4 (1 << 0) +#define VIRTIO_NET_RSS_HASH_TYPE_TCPv4 (1 << 1) +#define VIRTIO_NET_RSS_HASH_TYPE_UDPv4 (1 << 2) +#define VIRTIO_NET_RSS_HASH_TYPE_IPv6 (1 << 3) +#define VIRTIO_NET_RSS_HASH_TYPE_TCPv6 (1 << 4) +#define VIRTIO_NET_RSS_HASH_TYPE_UDPv6 (1 << 5) +#define VIRTIO_NET_RSS_HASH_TYPE_IP_EX (1 << 6) +#define VIRTIO_NET_RSS_HASH_TYPE_TCP_EX (1 << 7) +#define VIRTIO_NET_RSS_HASH_TYPE_UDP_EX (1 << 8) + +#endif /* _LINUX_VIRTIO_NET_H */ diff --git a/vdpa/include/uapi/linux/vdpa.h b/vdpa/include/uapi/linux/vdpa.h index 37ae26b6..b7eab069 100644 --- a/vdpa/include/uapi/linux/vdpa.h +++ b/vdpa/include/uapi/linux/vdpa.h @@ -17,6 +17,7 @@ enum vdpa_command { VDPA_CMD_DEV_NEW, VDPA_CMD_DEV_DEL, VDPA_CMD_DEV_GET, /* can dump */ + VDPA_CMD_DEV_CONFIG_GET, /* can dump */ }; enum vdpa_attr { @@ -32,6 +33,12 @@ enum vdpa_attr { VDPA_ATTR_DEV_VENDOR_ID, /* u32 */ VDPA_ATTR_DEV_MAX_VQS, /* u32 */ VDPA_ATTR_DEV_MAX_VQ_SIZE, /* u16 */ + VDPA_ATTR_DEV_MIN_VQ_SIZE, /* u16 */ + + VDPA_ATTR_DEV_NET_CFG_MACADDR, /* binary */ + VDPA_ATTR_DEV_NET_STATUS, /* u8 */ + VDPA_ATTR_DEV_NET_CFG_MAX_VQP, /* u16 */ + VDPA_ATTR_DEV_NET_CFG_MTU, /* u16 */ /* new attributes must be added above here */ VDPA_ATTR_MAX, From patchwork Fri Dec 17 08:08:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parav Pandit X-Patchwork-Id: 12683873 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49D70C433F5 for ; Fri, 17 Dec 2021 08:08:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233601AbhLQIIs (ORCPT ); Fri, 17 Dec 2021 03:08:48 -0500 Received: from mail-dm6nam12on2074.outbound.protection.outlook.com ([40.107.243.74]:12672 "EHLO NAM12-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233543AbhLQIIr (ORCPT ); Fri, 17 Dec 2021 03:08:47 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q0yhhegD6pNhFh0LfzFVV6KCVFQ7zxeHu0PvvF2jOvE2OZFkCd8c6uSDxrqZOcqeL+qtzLvlSX48RXU0LgnwO0gfy6/lpV4E0DsgAVyAJlYBGQGIXk7XYBm5sqXUpaYU+usmb9XFQJhLx/ViaapRUk1+E+XkE3FN4W2tbuhq5rUM7amEs+pGMDFGq+S7RkJ7ckkaA8vEugHA4braE2P0SHUSs4TQyLoi2f9emY7CSb12FwVvxmIe0UKt7bbRj4LfVuA/4jwN0Bg39TOWWPDeJFyb3R4ykiZPyI4LBMFTPQoZQxAdke0UflvhGngXX7hoZ1Kzz1mUF/r//Avs8UMwsg== 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=f0KZufUdK2sovcS1Zm6o1rRDABipt2NsDh5b+7TYjXg=; b=YrM4TiVylaeK4ieA2FsO168dyeVYY/sebRYZ0QTuPTHMfjvRIfGjQb9dYEVm9BNjwkgL/NflHEN+s3IHPrx7JnBJJIs73npJRvr6wG5wvv1H9NU2bhQDx0kgXJmB2sOdAirmV8uwj+LLzVwvbjYb+3JaNGAuLt+22mkaIRneV0uoDwOn2V0sLyIckVx8vaeT1nzg2ah0Ekq6ZkBW/kSXCfhluPL9ACegOzhkULSlfcHkVPOljWy2htJcjFQsE3Ia8hc4nu8ahbvL2g8mI7VUGtJCaeMvvl//tlaPJ6yaac/i1N1BjifmwZlELX/qrMwHWn20Dwlj/UOGQlulTpKypg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=lists.linux-foundation.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f0KZufUdK2sovcS1Zm6o1rRDABipt2NsDh5b+7TYjXg=; b=aasPyhfaSFiz9H6Hq6CrrFIqt8+Gj9r1QmE+Ko+gSCYzm5rBVNU5Yqw+JN0YPaNham8tCBhoUUOz/0s78m5wQrsjslMqxnKEpFUftJoqs+oLD9Ylgj0KoppRB485kMvjXoOAvDrWDAhDVlREaHkmfL/5JBCl2fTt0AjfKGuN6Kn1TpqCSYgfxiWth4zmTr1GxhqOJNO/j9G3Vxm33DecAYIVbHDEmluieNPqo+Sm7t6aNKU3AviQ6YRhk27UejZWQokFqxDOrgv2joP/NKPQfTfkQVL9R+Fas5NT7yu9hXeQQXqFi8K32+Vx+Pd7YwEUHrppZo8zy0g9/2HHDMUuow== Received: from DM5PR13CA0037.namprd13.prod.outlook.com (2603:10b6:3:7b::23) by BN8PR12MB3635.namprd12.prod.outlook.com (2603:10b6:408:46::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Fri, 17 Dec 2021 08:08:45 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:3:7b:cafe::51) by DM5PR13CA0037.outlook.office365.com (2603:10b6:3:7b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.7 via Frontend Transport; Fri, 17 Dec 2021 08:08:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.235) by DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4801.14 via Frontend Transport; Fri, 17 Dec 2021 08:08:45 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 17 Dec 2021 08:08:44 +0000 Received: from sw-mtx-036.mtx.labs.mlnx (172.20.187.6) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.986.9; Fri, 17 Dec 2021 00:08:41 -0800 From: Parav Pandit To: , , CC: , , , Parav Pandit Subject: [iproute2-next v2 2/4] vdpa: Enable user to query vdpa device config layout Date: Fri, 17 Dec 2021 10:08:25 +0200 Message-ID: <20211217080827.266799-3-parav@nvidia.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211217080827.266799-1-parav@nvidia.com> References: <20211217080827.266799-1-parav@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 01cecd92-1e0b-47b9-91ca-08d9c13472ce X-MS-TrafficTypeDiagnostic: BN8PR12MB3635:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:483; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b4y29tRwCwaVF3MEuLy0Vkvzmb+B912ijzE4izoyjJ8m/E/I1oagnJWL+sygEMCwVe8QPf3bZHBpt6XY4abhuFyeQ+J7CQPiE0SGcWelNEsk+t+yt4yxmCKbZB8upkBzrZh1Nb7lW6EVe7hzm711NLy//OjtaiT9SM9ZW6b/CUsTeH+rKrm88TjblnBJAYZy+Iqin+h+xx4gbikTZ78xgZPcgGx2DQttVHZAjgViz1Z3lTSB2ZLLuG4oC7y8nhMqRFLTeMHMMN+rrP5nC2uYxbGS++8XnOCsL6MF6VXmzZdK/MJSh8sZjkuX2iVBRKuHVl7Aq2ByQdEPkC/NlUjplh2Z20gaCi/NIRcENc/KZ7qaAUIAgnTrrh0betgvFN+ZT4GCX+UCduvGSTqFF05zCnV7aGSY6s3AvwrO+8VzH37Smc3KislKQBuQlsVp8atO70IMqO5ibjJ4kUJ8t4+uX5RWaMVXnbuClOgXnTr+dsvun8BnQ7lOOFVR6Eg8LkKNH3eHj9AxqfrNIUiKmB+p5YBnjguOZkETHgnBWf4/qvmyQJA73aPIWZfyANcVQyd3n4vCExnBlOYgmDSUrX2QJxbB/PJ2N/IywxXXgzIgn4b8+h0o8B18mhxunG/pIqlNNp2JZiBCp+ricpS3CazFhyMy7RtmZH9splU8eleb8hGz4LBhNamaLFkmIEo8cYc2fhbKw450C+unzMjHxYGl4KIV/+svZzqBwxhpC5KGYlbuk9BhlpiLV3ckiX349Gp7AGXRYC24A0HrSyljCb1uQzVMlxMgWl97a6INjzIqz42NLAJLGcksegGTsQ6NB2plyJIEOQuMpCTjqkIZeFR/vg== X-Forefront-Antispam-Report: CIP:12.22.5.235;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:mail.nvidia.com;PTR:InfoNoRecords;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700001)(336012)(81166007)(8676002)(5660300002)(186003)(2906002)(426003)(82310400004)(316002)(2616005)(16526019)(36756003)(107886003)(47076005)(40460700001)(26005)(70206006)(34020700004)(6666004)(8936002)(4326008)(1076003)(54906003)(110136005)(70586007)(356005)(86362001)(36860700001)(508600001)(83380400001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2021 08:08:45.6986 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01cecd92-1e0b-47b9-91ca-08d9c13472ce X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[12.22.5.235];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3635 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com Query the device configuration layout whenever kernel supports it. An example of configuration layout of vdpa device of type network: $ vdpa dev add name bar mgmtdev vdpasim_net $ vdpa dev config show bar: mac 00:35:09:19:48:05 link up link_announce false mtu 1500 $ vdpa dev config show -jp { "config": { "bar": { "mac": "00:35:09:19:48:05", "link ": "up", "link_announce ": false, "mtu": 1500, } } } Signed-off-by: Parav Pandit --- changelog: v1->v2: - added man page --- man/man8/vdpa-dev.8 | 21 +++++++++ vdpa/vdpa.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) diff --git a/man/man8/vdpa-dev.8 b/man/man8/vdpa-dev.8 index 36433519..5d3a3f26 100644 --- a/man/man8/vdpa-dev.8 +++ b/man/man8/vdpa-dev.8 @@ -36,6 +36,10 @@ vdpa-dev \- vdpa device configuration .B vdpa dev del .I DEV +.ti -8 +.B vdpa dev config show +.RI "[ " DEV " ]" + .SH "DESCRIPTION" .SS vdpa dev show - display vdpa device attributes @@ -65,6 +69,18 @@ Name of the management device to use for device addition. .I "DEV" - specifies the vdpa device to delete. +.SS vdpa dev config show - Show configuration of specific device or all devices. + +.PP +.I "DEV" +- specifies the vdpa device to show its configuration. +If this argument is omitted all devices configuration is listed. + +.in +4 +Format is: +.in +2 +VDPA_DEVICE_NAME + .SH "EXAMPLES" .PP vdpa dev show @@ -86,6 +102,11 @@ vdpa dev del foo .RS 4 Delete the vdpa device named foo which was previously created. .RE +.PP +vdpa dev config show foo +.RS 4 +Shows the vdpa device configuration of device named foo. +.RE .SH SEE ALSO .BR vdpa (8), diff --git a/vdpa/vdpa.c b/vdpa/vdpa.c index 7fdb36b9..ba704254 100644 --- a/vdpa/vdpa.c +++ b/vdpa/vdpa.c @@ -6,9 +6,11 @@ #include #include #include +#include #include #include #include "mnl_utils.h" +#include #include "version.h" #include "json_print.h" @@ -413,6 +415,7 @@ static void cmd_dev_help(void) fprintf(stderr, "Usage: vdpa dev show [ DEV ]\n"); fprintf(stderr, " vdpa dev add name NAME mgmtdev MANAGEMENTDEV\n"); fprintf(stderr, " vdpa dev del DEV\n"); + fprintf(stderr, "Usage: vdpa dev config COMMAND [ OPTIONS ]\n"); } static const char *device_type_name(uint32_t type) @@ -520,6 +523,111 @@ static int cmd_dev_del(struct vdpa *vdpa, int argc, char **argv) return mnlu_gen_socket_sndrcv(&vdpa->nlg, nlh, NULL, NULL); } +static void pr_out_dev_net_config(struct nlattr **tb) +{ + SPRINT_BUF(macaddr); + uint16_t val_u16; + + if (tb[VDPA_ATTR_DEV_NET_CFG_MACADDR]) { + const unsigned char *data; + uint16_t len; + + len = mnl_attr_get_payload_len(tb[VDPA_ATTR_DEV_NET_CFG_MACADDR]); + data = mnl_attr_get_payload(tb[VDPA_ATTR_DEV_NET_CFG_MACADDR]); + + print_string(PRINT_ANY, "mac", "mac %s ", + ll_addr_n2a(data, len, 0, macaddr, sizeof(macaddr))); + } + if (tb[VDPA_ATTR_DEV_NET_STATUS]) { + val_u16 = mnl_attr_get_u16(tb[VDPA_ATTR_DEV_NET_STATUS]); + print_string(PRINT_ANY, "link ", "link %s ", + (val_u16 & VIRTIO_NET_S_LINK_UP) ? "up" : "down"); + print_bool(PRINT_ANY, "link_announce ", "link_announce %s ", + (val_u16 & VIRTIO_NET_S_ANNOUNCE) ? true : false); + } + if (tb[VDPA_ATTR_DEV_NET_CFG_MAX_VQP]) { + val_u16 = mnl_attr_get_u16(tb[VDPA_ATTR_DEV_NET_CFG_MAX_VQP]); + print_uint(PRINT_ANY, "max_vq_pairs", "max_vq_pairs %d ", + val_u16); + } + if (tb[VDPA_ATTR_DEV_NET_CFG_MTU]) { + val_u16 = mnl_attr_get_u16(tb[VDPA_ATTR_DEV_NET_CFG_MTU]); + print_uint(PRINT_ANY, "mtu", "mtu %d ", val_u16); + } +} + +static void pr_out_dev_config(struct vdpa *vdpa, struct nlattr **tb) +{ + uint32_t device_id = mnl_attr_get_u32(tb[VDPA_ATTR_DEV_ID]); + + pr_out_vdev_handle_start(vdpa, tb); + switch (device_id) { + case VIRTIO_ID_NET: + pr_out_dev_net_config(tb); + break; + default: + break; + } + pr_out_vdev_handle_end(vdpa); +} + +static int cmd_dev_config_show_cb(const struct nlmsghdr *nlh, void *data) +{ + struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh); + struct nlattr *tb[VDPA_ATTR_MAX + 1] = {}; + struct vdpa *vdpa = data; + + mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb); + if (!tb[VDPA_ATTR_DEV_NAME] || !tb[VDPA_ATTR_DEV_ID]) + return MNL_CB_ERROR; + pr_out_dev_config(vdpa, tb); + return MNL_CB_OK; +} + +static int cmd_dev_config_show(struct vdpa *vdpa, int argc, char **argv) +{ + uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; + struct nlmsghdr *nlh; + int err; + + if (argc <= 0) + flags |= NLM_F_DUMP; + + nlh = mnlu_gen_socket_cmd_prepare(&vdpa->nlg, VDPA_CMD_DEV_CONFIG_GET, + flags); + if (argc > 0) { + err = vdpa_argv_parse_put(nlh, vdpa, argc, argv, + VDPA_OPT_VDEV_HANDLE); + if (err) + return err; + } + + pr_out_section_start(vdpa, "config"); + err = mnlu_gen_socket_sndrcv(&vdpa->nlg, nlh, cmd_dev_config_show_cb, vdpa); + pr_out_section_end(vdpa); + return err; +} + +static void cmd_dev_config_help(void) +{ + fprintf(stderr, "Usage: vdpa dev config show [ DEV ]\n"); +} + +static int cmd_dev_config(struct vdpa *vdpa, int argc, char **argv) +{ + if (!argc) + return cmd_dev_config_show(vdpa, argc - 1, argv + 1); + + if (matches(*argv, "help") == 0) { + cmd_dev_config_help(); + return 0; + } else if (matches(*argv, "show") == 0) { + return cmd_dev_config_show(vdpa, argc - 1, argv + 1); + } + fprintf(stderr, "Command \"%s\" not found\n", *argv); + return -ENOENT; +} + static int cmd_dev(struct vdpa *vdpa, int argc, char **argv) { if (!argc) @@ -535,6 +643,8 @@ static int cmd_dev(struct vdpa *vdpa, int argc, char **argv) return cmd_dev_add(vdpa, argc - 1, argv + 1); } else if (matches(*argv, "del") == 0) { return cmd_dev_del(vdpa, argc - 1, argv + 1); + } else if (matches(*argv, "config") == 0) { + return cmd_dev_config(vdpa, argc - 1, argv + 1); } fprintf(stderr, "Command \"%s\" not found\n", *argv); return -ENOENT; From patchwork Fri Dec 17 08:08:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parav Pandit X-Patchwork-Id: 12683875 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F513C433F5 for ; Fri, 17 Dec 2021 08:08:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233624AbhLQIIu (ORCPT ); Fri, 17 Dec 2021 03:08:50 -0500 Received: from mail-bn8nam11on2088.outbound.protection.outlook.com ([40.107.236.88]:22145 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233543AbhLQIIt (ORCPT ); Fri, 17 Dec 2021 03:08:49 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cvmM+vdO29aMclVVAY9guKoaDRToqzN6STo8rxCQ8knK57FPz63cMJrSeKp4ubIp6sSXhXpvn4D10lxemKTXZU5eV/iPC7sqjhWfhMHa6yZ1IkEa/WW9v+18OeITuwtd6u7N+ad22+QlTTRN9H6T2TYOzLTqQgcjArAYl2NCUeZbW9jzotRT/WP7CPqWzRdx4uq13vIJYBrMFQp+Dc6vBTCc0HC/xVWKr8OOkic6gCz0LyqvwaHLyZTQbNUaFhXxjKiT+MPQb6oH4XlXpyQE0MLAcCJNe10zNpA7Ny6KK3ezIA+/bwqoWC07sbEDPMqrQ07RsRgoyyc6anhXQic0bA== 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=h07mXzYdi4TBMoea5nxyjBJeizkU0AsttHto9/x77eg=; b=Hl46BppavOHZn+h35QHxZZ1K+VPchh1VnhKwhLEDdNQhz5hrGPaCloehavNHthH2bHD2wftAE/N8O1hbl/RCvd2g2F9JvYpjJ1r5jYsj/0t/qVvmsfvvjqEXbKPif9AQb/itzW7u+/S50miAdZpNL0oaa2mILmwbst17UsAfqJltAu9kxmsO4vSvtAfibmSFnxsw9dHGN8Ry2Z4hKub7w69zTQg7YgOg2iCgWT1R83O2X9aThnNkIEh83UT/kIrHonvqxrjTbbe8z/CSkzVrUDzgl7x75lxVhWOefXaBPqyBrYmIIFvxYZ0WcMShQ8Jh+XpIAi1fLJS1Gq7YYNupdA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=lists.linux-foundation.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h07mXzYdi4TBMoea5nxyjBJeizkU0AsttHto9/x77eg=; b=Nlia548BagKfmREj383Hvz4hebW0tYlix2jP8oGw48QLk6Podi0GvggajBzPR3RC+dIsv7tyV4VfGtZdi2Q17HARgI5R4gjauONidTQw0xfSV/C9f7F/vcOmPxziQlORYqEpevmz+UKlMAv16dUlNo/hzdm5O7jAoD/oPoq0tNzri/84pt5vhX+31mm8VOuZLRs3MIVy44hAcALf3lTIRkw5Uovvw6bxR19QQftmD5GXGaXa3dY/ASTZzy+VLjGACEjOxzdvUk0n4KeviOC/0/lMITQCKpeaIVn5CcvY2PCDt+q8j65Gk3tiaKJnb3PdeJfchv7vzzQWBODIdYE6tQ== Received: from DM5PR13CA0039.namprd13.prod.outlook.com (2603:10b6:3:7b::25) by BYAPR12MB3638.namprd12.prod.outlook.com (2603:10b6:a03:dc::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14; Fri, 17 Dec 2021 08:08:46 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:3:7b:cafe::58) by DM5PR13CA0039.outlook.office365.com (2603:10b6:3:7b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.8 via Frontend Transport; Fri, 17 Dec 2021 08:08:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.235) by DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4801.14 via Frontend Transport; Fri, 17 Dec 2021 08:08:46 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 17 Dec 2021 08:08:45 +0000 Received: from sw-mtx-036.mtx.labs.mlnx (172.20.187.6) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.986.9; Fri, 17 Dec 2021 00:08:42 -0800 From: Parav Pandit To: , , CC: , , , Parav Pandit Subject: [iproute2-next v2 3/4] vdpa: Enable user to set mac address of vdpa device Date: Fri, 17 Dec 2021 10:08:26 +0200 Message-ID: <20211217080827.266799-4-parav@nvidia.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211217080827.266799-1-parav@nvidia.com> References: <20211217080827.266799-1-parav@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a681cf2-0a7a-45f2-3e07-08d9c134731d X-MS-TrafficTypeDiagnostic: BYAPR12MB3638:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9JzEVstuTuCBxAwYun6XU0ilfLrTOBhtOR554RpET6L0RHBMimfn23D5WPLeeTFTI7VAW0CUXc6CL62/6+hgZ0284Lc9EZW2Z1lNf8225MwScENCeBF1imb9LNN3YEgsKdXVcoi7zWreT0Za+Q0k598d3jvdFukNdZnSHPOIYUGIBHwopTRsUq2kKLm8FM9ymAcq50NoZOwEHqBd3RT7ijd+BKZMsot0oe4qY0Hl2UC5ymm4jqmcSKIAjzeXtj0jkkxol3GRfqedm0R4+EJU62TV4nKizzRdbB16QX7kt1wnNuUeIboVUkK29EmnwC3k7lhowLEK2VCWnLL6WKSYpC2j92YLCZ1rjwZ08bvHJ9Bt80ear9ZEb5yD66QokNCOOICmLMkQiJM1xJCFa0kiVvH8l8eh0iUJJRoPoDddv2LTTRcH1sDeErfrDv0Ojfo6Fu5AIx7wXlHo0LuSIdXVDMM3BvytWTqiqC4/FUr1BdXWUQFT5qYIwS2W5460JEk5JGJuAfgijg5vh+BDdkYcugT/gwB89Jmb7sSHOd5mWhxA5HhcaBPPfsOKKuI/7Unw/WmfQk6oGh07IU5LctKgU4EiARN/egx4gOW7OqZowBTxrIBuC9C+l1sq/i9IzyiXNNB7ivshJP344SBXdo4OM/nS9+tUQHDBn84f/9JpWZ98oltj+nVp3S5IUpf5cP4rDAZGR1FU/BaaQvhvcZGa3z9D3Uk+1JUb+p8TeydQ/PhFNe4YKT/CftzbNMn9f4rLYNe60me+b+dbyGLnNZRwXxGanvCfZnvSz3BvGjmC8BQIq8t1yoL+wnpYH7vreZJ+TW963FWGcRXM3kSqdZtR0w== X-Forefront-Antispam-Report: CIP:12.22.5.235;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:mail.nvidia.com;PTR:InfoNoRecords;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700001)(70206006)(2906002)(36756003)(82310400004)(186003)(316002)(16526019)(86362001)(426003)(83380400001)(6666004)(336012)(26005)(1076003)(5660300002)(36860700001)(34020700004)(4326008)(8936002)(54906003)(81166007)(70586007)(110136005)(40460700001)(47076005)(356005)(2616005)(107886003)(8676002)(508600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2021 08:08:46.2142 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a681cf2-0a7a-45f2-3e07-08d9c134731d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[12.22.5.235];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3638 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com vdpa: Enable user to set mtu of the vdpa device Implement mtu setting for vdpa device. $ vdpa mgmtdev show vdpasim_net: supported_classes net Add the device with specified mac address: $ vdpa dev add name bar mgmtdev vdpasim_net mac 00:11:22:33:44:55 View the config after setting: $ vdpa dev config show bar: mac 00:11:22:33:44:55 link up link_announce false mtu 1500 Signed-off-by: Parav Pandit --- changelog: v1->v2: - use strcmp() instead of matches() - added man page --- man/man8/vdpa-dev.8 | 11 ++++++++++ vdpa/vdpa.c | 52 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/man/man8/vdpa-dev.8 b/man/man8/vdpa-dev.8 index 5d3a3f26..5c5ac469 100644 --- a/man/man8/vdpa-dev.8 +++ b/man/man8/vdpa-dev.8 @@ -31,6 +31,7 @@ vdpa-dev \- vdpa device configuration .I NAME .B mgmtdev .I MGMTDEV +.RI "[ mac " MACADDR " ]" .ti -8 .B vdpa dev del @@ -63,6 +64,11 @@ Name of the new vdpa device to add. .BI mgmtdev " MGMTDEV" Name of the management device to use for device addition. +.PP +.BI mac " MACADDR" +- specifies the mac address for the new vdpa device. +This is applicable only for the network type of vdpa device. This is optional. + .SS vdpa dev del - Delete the vdpa device. .PP @@ -98,6 +104,11 @@ vdpa dev add name foo mgmtdev vdpa_sim_net Add the vdpa device named foo on the management device vdpa_sim_net. .RE .PP +vdpa dev add name foo mgmtdev vdpa_sim_net mac 00:11:22:33:44:55 +.RS 4 +Add the vdpa device named foo on the management device vdpa_sim_net with mac address of 00:11:22:33:44:55. +.RE +.PP vdpa dev del foo .RS 4 Delete the vdpa device named foo which was previously created. diff --git a/vdpa/vdpa.c b/vdpa/vdpa.c index ba704254..63d464d1 100644 --- a/vdpa/vdpa.c +++ b/vdpa/vdpa.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -20,6 +21,7 @@ #define VDPA_OPT_VDEV_MGMTDEV_HANDLE BIT(1) #define VDPA_OPT_VDEV_NAME BIT(2) #define VDPA_OPT_VDEV_HANDLE BIT(3) +#define VDPA_OPT_VDEV_MAC BIT(4) struct vdpa_opts { uint64_t present; /* flags of present items */ @@ -27,6 +29,7 @@ struct vdpa_opts { char *mdev_name; const char *vdev_name; unsigned int device_id; + char mac[ETH_ALEN]; }; struct vdpa { @@ -136,6 +139,21 @@ static int vdpa_argv_str(struct vdpa *vdpa, int argc, char **argv, return 0; } +static int vdpa_argv_mac(struct vdpa *vdpa, int argc, char **argv, char *mac) +{ + int alen; + + if (argc <= 0 || *argv == NULL) { + fprintf(stderr, "String parameter expected\n"); + return -EINVAL; + } + + alen = ll_addr_a2n(mac, ETH_ALEN, *argv); + if (alen < 0) + return -EINVAL; + return 0; +} + struct vdpa_args_metadata { uint64_t o_flag; const char *err_msg; @@ -183,13 +201,16 @@ static void vdpa_opts_put(struct nlmsghdr *nlh, struct vdpa *vdpa) if ((opts->present & VDPA_OPT_VDEV_NAME) || (opts->present & VDPA_OPT_VDEV_HANDLE)) mnl_attr_put_strz(nlh, VDPA_ATTR_DEV_NAME, opts->vdev_name); + if (opts->present & VDPA_OPT_VDEV_MAC) + mnl_attr_put(nlh, VDPA_ATTR_DEV_NET_CFG_MACADDR, + sizeof(opts->mac), opts->mac); } static int vdpa_argv_parse(struct vdpa *vdpa, int argc, char **argv, - uint64_t o_required) + uint64_t o_required, uint64_t o_optional) { + uint64_t o_all = o_required | o_optional; struct vdpa_opts *opts = &vdpa->opts; - uint64_t o_all = o_required; uint64_t o_found = 0; int err; @@ -233,6 +254,15 @@ static int vdpa_argv_parse(struct vdpa *vdpa, int argc, char **argv, NEXT_ARG_FWD(); o_found |= VDPA_OPT_VDEV_MGMTDEV_HANDLE; + } else if ((strcmp(*argv, "mac") == 0) && + (o_all & VDPA_OPT_VDEV_MAC)) { + NEXT_ARG_FWD(); + err = vdpa_argv_mac(vdpa, argc, argv, opts->mac); + if (err) + return err; + + NEXT_ARG_FWD(); + o_found |= VDPA_OPT_VDEV_MAC; } else { fprintf(stderr, "Unknown option \"%s\"\n", *argv); return -EINVAL; @@ -246,11 +276,11 @@ static int vdpa_argv_parse(struct vdpa *vdpa, int argc, char **argv, static int vdpa_argv_parse_put(struct nlmsghdr *nlh, struct vdpa *vdpa, int argc, char **argv, - uint64_t o_required) + uint64_t o_required, uint64_t o_optional) { int err; - err = vdpa_argv_parse(vdpa, argc, argv, o_required); + err = vdpa_argv_parse(vdpa, argc, argv, o_required, o_optional); if (err) return err; vdpa_opts_put(nlh, vdpa); @@ -386,7 +416,7 @@ static int cmd_mgmtdev_show(struct vdpa *vdpa, int argc, char **argv) flags); if (argc > 0) { err = vdpa_argv_parse_put(nlh, vdpa, argc, argv, - VDPA_OPT_MGMTDEV_HANDLE); + VDPA_OPT_MGMTDEV_HANDLE, 0); if (err) return err; } @@ -413,7 +443,7 @@ static int cmd_mgmtdev(struct vdpa *vdpa, int argc, char **argv) static void cmd_dev_help(void) { fprintf(stderr, "Usage: vdpa dev show [ DEV ]\n"); - fprintf(stderr, " vdpa dev add name NAME mgmtdev MANAGEMENTDEV\n"); + fprintf(stderr, " vdpa dev add name NAME mgmtdev MANAGEMENTDEV [ mac MACADDR ]\n"); fprintf(stderr, " vdpa dev del DEV\n"); fprintf(stderr, "Usage: vdpa dev config COMMAND [ OPTIONS ]\n"); } @@ -483,7 +513,7 @@ static int cmd_dev_show(struct vdpa *vdpa, int argc, char **argv) nlh = mnlu_gen_socket_cmd_prepare(&vdpa->nlg, VDPA_CMD_DEV_GET, flags); if (argc > 0) { err = vdpa_argv_parse_put(nlh, vdpa, argc, argv, - VDPA_OPT_VDEV_HANDLE); + VDPA_OPT_VDEV_HANDLE, 0); if (err) return err; } @@ -502,7 +532,8 @@ static int cmd_dev_add(struct vdpa *vdpa, int argc, char **argv) nlh = mnlu_gen_socket_cmd_prepare(&vdpa->nlg, VDPA_CMD_DEV_NEW, NLM_F_REQUEST | NLM_F_ACK); err = vdpa_argv_parse_put(nlh, vdpa, argc, argv, - VDPA_OPT_VDEV_MGMTDEV_HANDLE | VDPA_OPT_VDEV_NAME); + VDPA_OPT_VDEV_MGMTDEV_HANDLE | VDPA_OPT_VDEV_NAME, + VDPA_OPT_VDEV_MAC); if (err) return err; @@ -516,7 +547,8 @@ static int cmd_dev_del(struct vdpa *vdpa, int argc, char **argv) nlh = mnlu_gen_socket_cmd_prepare(&vdpa->nlg, VDPA_CMD_DEV_DEL, NLM_F_REQUEST | NLM_F_ACK); - err = vdpa_argv_parse_put(nlh, vdpa, argc, argv, VDPA_OPT_VDEV_HANDLE); + err = vdpa_argv_parse_put(nlh, vdpa, argc, argv, VDPA_OPT_VDEV_HANDLE, + 0); if (err) return err; @@ -597,7 +629,7 @@ static int cmd_dev_config_show(struct vdpa *vdpa, int argc, char **argv) flags); if (argc > 0) { err = vdpa_argv_parse_put(nlh, vdpa, argc, argv, - VDPA_OPT_VDEV_HANDLE); + VDPA_OPT_VDEV_HANDLE, 0); if (err) return err; } From patchwork Fri Dec 17 08:08:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parav Pandit X-Patchwork-Id: 12683877 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67916C433FE for ; Fri, 17 Dec 2021 08:08:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233660AbhLQIIz (ORCPT ); Fri, 17 Dec 2021 03:08:55 -0500 Received: from mail-bn8nam11on2080.outbound.protection.outlook.com ([40.107.236.80]:15745 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233643AbhLQIIu (ORCPT ); Fri, 17 Dec 2021 03:08:50 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KG/2dmZkZvnu2XKSIVFOGBgHBcK8rUA7BbzCTgtLe/Cda/VNXLhnSMIye0brZYQD7k4UjGOiS4+xcnXlEzXFeZyPw0A/LHLudyV/ZogrxK7ieBUh48MowbkDmGXvrxO4UfC/hTLf3ZoQUod8YHYUxgz2fxNcsck6XTeLU6EBTTjkWwGuuVRLsn0Fm/xto71carjtQmg0VUogUQH1G4pqzuLBWp1veNaT+o2oZLRCC/XM0dLDKYNE7DpVuFtQus1huvXS9K+opNC2m7ORD3ihcvDHF9EqcQeG13+D3f5CEE+FU9J3TMfB/wvbio0QVuvJ1FaeDB5Brsjd+GLAiYXzUQ== 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=r3rTsevlOJ2SY3QEZxp9KkCgmpC9E6kYwZSWQ+XLqPM=; b=bAmYvxAB0IOrvSJ5yYvTHmGo+RZ3cH08ptm9DpH+0hbWBJR13dCSLnGMdB/FCSFGgPJrxCbZffC9C0fBKckDYO8b+M3WwMlQ6TauN+bd/F8Ru6n/XHC+gWo8iDh9Ym63dhKMiyw9xViXRwNd1/dl4+F1m0oX/d8qApv3DL0l55TCGzDqr3LLwBSS/f0ooDCgwmTfwahk7qurbfwVSdsvmNbzHeklZmIYwE0JfF4F7tIf39Ii2HNJ+r5+HjrETaxDbzC3PiQF/fJHbNuv+VbiDfEQWpaGOSJY7v2sFiKLDY2Uu+7+kHY7qjsstnCYCPG+fCxRp5cF4MGyCF4K+KqfdQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=lists.linux-foundation.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r3rTsevlOJ2SY3QEZxp9KkCgmpC9E6kYwZSWQ+XLqPM=; b=RvPnBrhwGS52Wbnh/J6Hi9Rx3PD8JJvGJCJ7UN38ESwbxGGGncBFtk4dqIiB1Udn9JE5A5M7aSwfa1rF6Af5AsrOIXHuqJrVwlD/vu665UW88QvU+dQ6m0iegkx/8wBkdjj/2Syihv/LJQKnx0udbaXVhTjdbvuLNQE3o5en+9A+2RNWpUqK/TtbTgAT6qGe3Br3wFRUmE7OQt8HPkZZPZHT6crVIYHqTCWBPfUXi02BI60/lFkkvm4rCTza8kToWkYCiC2Ax6AXqVgX2+Lk2UqsLMjpu+njIxfxKamBgKciwZSNCzWFncYdW5lOKJzgm4A+fvyso5QLoZYCfCETAw== Received: from DM5PR13CA0039.namprd13.prod.outlook.com (2603:10b6:3:7b::25) by MWHPR12MB1261.namprd12.prod.outlook.com (2603:10b6:300:10::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Fri, 17 Dec 2021 08:08:47 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:3:7b:cafe::58) by DM5PR13CA0039.outlook.office365.com (2603:10b6:3:7b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.8 via Frontend Transport; Fri, 17 Dec 2021 08:08:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.235) by DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4801.14 via Frontend Transport; Fri, 17 Dec 2021 08:08:46 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 17 Dec 2021 08:08:45 +0000 Received: from sw-mtx-036.mtx.labs.mlnx (172.20.187.6) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.986.9; Fri, 17 Dec 2021 00:08:43 -0800 From: Parav Pandit To: , , CC: , , , Parav Pandit Subject: [iproute2-next v2 4/4] vdpa: Enable user to set mtu of the vdpa device Date: Fri, 17 Dec 2021 10:08:27 +0200 Message-ID: <20211217080827.266799-5-parav@nvidia.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211217080827.266799-1-parav@nvidia.com> References: <20211217080827.266799-1-parav@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a4e84153-5ed9-42a7-8606-08d9c1347388 X-MS-TrafficTypeDiagnostic: MWHPR12MB1261:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iZDzilkuHYwkFmcgfgM4hmcEfOtn5XAZhUQbNmZe67kEYiUEhcVGwHqiaEOyYiZwHRGgYNwcU2Dpt9i0MFe49mqckmk5ndrMwowvG111nH2iQM1oM7XdFJ6hn7vn5SmcLfOAiiTTXvC2XYbkzAW3lyskwL2hmWuFg9r6tSZeyboNJntCsOtWMSVAV3ZOuD1z2pqqAFPlnucnxzHIR1pPUTE+hBmtO5WRnfjBo+mKIxlG2nbK3aJunOVNvRlGb+DTliTeeJwqyPSt3R7UB5JrmOAMPhOpFfb+1dwjjQRhNu78r2m/dBtTj2WK3F2r/aPm7DcDETnwM2QNhfqJ/ql9hONoHjSJtKYSNHf5jnoUDPiod5y8Hu/90mRVxVmKbaJ5JaoeKB3+LZ+gUwKstR2SyVxU6pF4CxOFrnvTvmdZ5jboeH8XBdTwToaSpHv8uIGd86vdqDB81w3Cv9Kc7asl8l85wk9fAPB3K0Ewf59BRMYIyVsPnV+fFOyR5eqvp62jIyVAsyQ3JuJmibu1VZJBx75kVTjc/ZkLL7XzjU8qGA4WJRBKfk29RvqsIjAz/h96Np8JcubcqmPTpzMH2ufadMHRXIP/RNIySdllWtP/GAX92+wm1tZEvxwBLCJYg1J37werZDLRW5mFYfy79wIDGTLculvw1hJFDtdegYag3GNpDUny9lH2he/qdJNpLYFS9xOo6nIarITr96Lp19xFSojuozrBW6qGH8NsS8X3sz4FguqCl13SyEwC5APj7iPS2ECWViFcafYX3bA6o3qkA5cv8ymiVKsLgf3ySwkVpsX/ZRSHTWzeJfJ/Rtq/9K0J X-Forefront-Antispam-Report: CIP:12.22.5.235;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:mail.nvidia.com;PTR:InfoNoRecords;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(356005)(186003)(70206006)(82310400004)(81166007)(16526019)(2616005)(70586007)(47076005)(316002)(2906002)(83380400001)(54906003)(508600001)(110136005)(40460700001)(8676002)(426003)(6666004)(34020700004)(4326008)(1076003)(336012)(107886003)(86362001)(26005)(36860700001)(36756003)(5660300002)(8936002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2021 08:08:46.9016 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a4e84153-5ed9-42a7-8606-08d9c1347388 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[12.22.5.235];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1261 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com Implement mtu setting for vdpa device. $ vdpa mgmtdev show vdpasim_net: supported_classes net Add the device with mac address and mtu: $ vdpa dev add name bar mgmtdev vdpasim_net mac 00:11:22:33:44:55 mtu 9000 In above command only mac address or only mtu can also be set. View the config after setting: $ vdpa dev config show bar: mac 00:11:22:33:44:55 link up link_announce false mtu 9000 Signed-off-by: Parav Pandit --- changelog: v1->v2: - use get_u16 - use strcmp() instead of matches() - added man page --- man/man8/vdpa-dev.8 | 10 ++++++++++ vdpa/vdpa.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/man/man8/vdpa-dev.8 b/man/man8/vdpa-dev.8 index 5c5ac469..aa21ae3a 100644 --- a/man/man8/vdpa-dev.8 +++ b/man/man8/vdpa-dev.8 @@ -32,6 +32,7 @@ vdpa-dev \- vdpa device configuration .B mgmtdev .I MGMTDEV .RI "[ mac " MACADDR " ]" +.RI "[ mtu " MTU " ]" .ti -8 .B vdpa dev del @@ -69,6 +70,10 @@ Name of the management device to use for device addition. - specifies the mac address for the new vdpa device. This is applicable only for the network type of vdpa device. This is optional. +.BI mtu " MTU" +- specifies the mtu for the new vdpa device. +This is applicable only for the network type of vdpa device. This is optional. + .SS vdpa dev del - Delete the vdpa device. .PP @@ -109,6 +114,11 @@ vdpa dev add name foo mgmtdev vdpa_sim_net mac 00:11:22:33:44:55 Add the vdpa device named foo on the management device vdpa_sim_net with mac address of 00:11:22:33:44:55. .RE .PP +vdpa dev add name foo mgmtdev vdpa_sim_net mac 00:11:22:33:44:55 mtu 9000 +.RS 4 +Add the vdpa device named foo on the management device vdpa_sim_net with mac address of 00:11:22:33:44:55 and mtu of 9000 bytes. +.RE +.PP vdpa dev del foo .RS 4 Delete the vdpa device named foo which was previously created. diff --git a/vdpa/vdpa.c b/vdpa/vdpa.c index 63d464d1..f048e470 100644 --- a/vdpa/vdpa.c +++ b/vdpa/vdpa.c @@ -22,6 +22,7 @@ #define VDPA_OPT_VDEV_NAME BIT(2) #define VDPA_OPT_VDEV_HANDLE BIT(3) #define VDPA_OPT_VDEV_MAC BIT(4) +#define VDPA_OPT_VDEV_MTU BIT(5) struct vdpa_opts { uint64_t present; /* flags of present items */ @@ -30,6 +31,7 @@ struct vdpa_opts { const char *vdev_name; unsigned int device_id; char mac[ETH_ALEN]; + uint16_t mtu; }; struct vdpa { @@ -154,6 +156,17 @@ static int vdpa_argv_mac(struct vdpa *vdpa, int argc, char **argv, char *mac) return 0; } +static int vdpa_argv_u16(struct vdpa *vdpa, int argc, char **argv, + uint16_t *result) +{ + if (argc <= 0 || *argv == NULL) { + fprintf(stderr, "number expected\n"); + return -EINVAL; + } + + return get_u16(result, *argv, 10); +} + struct vdpa_args_metadata { uint64_t o_flag; const char *err_msg; @@ -204,6 +217,8 @@ static void vdpa_opts_put(struct nlmsghdr *nlh, struct vdpa *vdpa) if (opts->present & VDPA_OPT_VDEV_MAC) mnl_attr_put(nlh, VDPA_ATTR_DEV_NET_CFG_MACADDR, sizeof(opts->mac), opts->mac); + if (opts->present & VDPA_OPT_VDEV_MTU) + mnl_attr_put_u16(nlh, VDPA_ATTR_DEV_NET_CFG_MTU, opts->mtu); } static int vdpa_argv_parse(struct vdpa *vdpa, int argc, char **argv, @@ -263,6 +278,15 @@ static int vdpa_argv_parse(struct vdpa *vdpa, int argc, char **argv, NEXT_ARG_FWD(); o_found |= VDPA_OPT_VDEV_MAC; + } else if ((strcmp(*argv, "mtu") == 0) && + (o_all & VDPA_OPT_VDEV_MTU)) { + NEXT_ARG_FWD(); + err = vdpa_argv_u16(vdpa, argc, argv, &opts->mtu); + if (err) + return err; + + NEXT_ARG_FWD(); + o_found |= VDPA_OPT_VDEV_MTU; } else { fprintf(stderr, "Unknown option \"%s\"\n", *argv); return -EINVAL; @@ -443,7 +467,7 @@ static int cmd_mgmtdev(struct vdpa *vdpa, int argc, char **argv) static void cmd_dev_help(void) { fprintf(stderr, "Usage: vdpa dev show [ DEV ]\n"); - fprintf(stderr, " vdpa dev add name NAME mgmtdev MANAGEMENTDEV [ mac MACADDR ]\n"); + fprintf(stderr, " vdpa dev add name NAME mgmtdev MANAGEMENTDEV [ mac MACADDR ] [ mtu MTU ]\n"); fprintf(stderr, " vdpa dev del DEV\n"); fprintf(stderr, "Usage: vdpa dev config COMMAND [ OPTIONS ]\n"); } @@ -533,7 +557,7 @@ static int cmd_dev_add(struct vdpa *vdpa, int argc, char **argv) NLM_F_REQUEST | NLM_F_ACK); err = vdpa_argv_parse_put(nlh, vdpa, argc, argv, VDPA_OPT_VDEV_MGMTDEV_HANDLE | VDPA_OPT_VDEV_NAME, - VDPA_OPT_VDEV_MAC); + VDPA_OPT_VDEV_MAC | VDPA_OPT_VDEV_MTU); if (err) return err;