From patchwork Sat Dec 4 08:52:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1563504 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=outlook.com header.i=@outlook.com header.a=rsa-sha256 header.s=selector1 header.b=OcbE/eil; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J5k3x16MLz9s1l for ; Sat, 4 Dec 2021 19:53:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E3BA7405D7; Sat, 4 Dec 2021 08:52:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XC9iCCDLiIc2; Sat, 4 Dec 2021 08:52:56 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id DAC9F40376; Sat, 4 Dec 2021 08:52:55 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A6674C001E; Sat, 4 Dec 2021 08:52:55 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3D9DEC0012 for ; Sat, 4 Dec 2021 08:52:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 255CE6080B for ; Sat, 4 Dec 2021 08:52:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=outlook.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VZB9VkbjMr6n for ; Sat, 4 Dec 2021 08:52:52 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from AUS01-ME3-obe.outbound.protection.outlook.com (mail-me3aus01olkn2081b.outbound.protection.outlook.com [IPv6:2a01:111:f403:7004::81b]) by smtp3.osuosl.org (Postfix) with ESMTPS id A37D5607FC for ; Sat, 4 Dec 2021 08:52:52 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EpNOW9nns54jZol7JBVRI0/Tov31KbM6IxwFKyvUSOWfGy4Y4ZH9YudMJ6yiZY1I1HeQh5RgFC0ridP3B6mbPh84kQzxIow1Doe+F/SSgiOJoy4oeEPdZJwanFf61HreZScvcPGACsRd3DWi/7psOlQtY8Cn+h7Y1gEGHSeqvVnN/01wFt3XVrlc22pwVuMXJsw9OK4VFjIgPDJ0yx6lFyU7LPe42sUJqtthU0FA+PtQP0TXFHyfcS+v2b+Dw/0staT34QscEbqG7HCTjJzLJ8of0m33Z1OTIpEkvTyg4nnr5Q9OfoeWf5OLSq25jxRd23F1hEbeFOx2YCqzcFGXLQ== 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=xfv2P889+2DtuJoUo0HdqEo4N7qPf5PBhPMGphYOn1A=; b=cdL2qePsyMYg927qugOEgniaRDU4DNmvZzdos1+smlq43Hl01kmCIY5vwDCll8cOjlmFwAZ9uAGrS+R1Hquqs4XBT//xyfQlMdSaNj9UGwNTWgws0wDSht8xPxjFblOcXDqo0fA4IMFVqPVhVCrjdLcoalM443PuJKEWQSwalU82yxcUmjI4XkmfdV9C5NElofJNQne29HddJyCGTH9P+tp+EX3OetsHmTpkq7BgXBbxhOTltbqD3I+j2PnNHBkdY+FBoOeQuUHI8JE7Zgt61u7dOt1srqUC6SsvKoJEY4kSUGB3NpqDgEUlzLPjHEaw8EZTaz8VhsezajuDMIHUww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xfv2P889+2DtuJoUo0HdqEo4N7qPf5PBhPMGphYOn1A=; b=OcbE/eilAouxPXg97SUC+0bKg1rkH0ZtJqsDXx3VVyMrJbZTz4G1ROREWN+II36IWzNGYS2toi4IbvE7A6cS4XZLQMW1ki+QFtQziTqTH2+TLD18xD2/kZmlveTSARkZQLZnQKacfIbU8UuOlF3uHHorGauuCtf4VNZ6bhw3Cig76OJSY/L7qusXnStebNru7lXNzy0/f01tYFPnBZkwsQBF+0G2OhSLWnND+ZiZFAHAC+1qZlqt2L7m5hh4YBzVE7C2uy89PZ5GYo2hpwT9HpOVAJnJMfsb4lI5zAd3K1zJAZww2qBmzWm4KSXRlLfaj5BYdLohGzr4UO5RkH7dnw== Received: from MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:15b::24) by MEYP282MB3532.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:17c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.21; Sat, 4 Dec 2021 08:52:46 +0000 Received: from MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM ([fe80::81a0:500:1358:af50]) by MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM ([fe80::81a0:500:1358:af50%5]) with mapi id 15.20.4755.020; Sat, 4 Dec 2021 08:52:46 +0000 From: lin huang To: "dev@openvswitch.org" Thread-Topic: [PATCH v3] netdev-vport : Fix userspace tunnel ioctl(SIOCGIFINDEX) info logs. Thread-Index: AQHX4TMIgbIsgv93YUWKYmxdLqtDJawiFiZh Date: Sat, 4 Dec 2021 08:52:46 +0000 Message-ID: References: In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: f9cb46cb-02f1-483b-37d9-9a45d698c163 x-tmn: [CSh4cj4Bvu8zeIBUuMDR1nxDiVfpJgZH] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c8016326-15a9-4420-09fd-08d9b7037149 x-ms-traffictypediagnostic: MEYP282MB3532: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: jqJ51jMkdNZiELCxCbsaIVf7bfcTKju6YA5o4xoNIvtfGv+Le3EOuacVyRRdiHAFjBuGMFq8RHsp2EWqgoyKNOmpUNfT3WmXin4cEuoHpr/LTuirdRRGC0iDuAG5vR4qB01Ef21n7AcSPLrgWro+2503o8eRhPdgn6nL7Tjq8gH5rE0uc7jbgwnba7Q01H89k/ZLPwmQIQ79ipAYddhVzV78pQtc0fP722iEySC7vTelEPvtaw7X8yMuchZcjTFRFDyK2Qa63f/U8SrQfGkyDF/5N8dsdOagdbbzq0tXLD96jSptynQR6Z/DpUm7boZyUh0sZwjtXvNrKg9fXTM72RNwYHwYyQ5NRzovAVFUNkMNeFkJ+i1VB5a25qobsGgvGzoup4XUXYPeTXlWPAIdm1Etir6ppiVrhq+MlOid3RVxG1dHBnL5/0QVnwRt9+11nWKae4jIG6f7EaIo0m/s7K3SceU2Yb/MDaCckxegMvwddQYy85ezLy9sGwsXXxHK4RAWStH7nXfIq/05ZLq+PabareWbyX3YaizUYE5usBBOlh9QMOz68pUBQ96CFj57cQPpejrs61kWv6+oBW3uBA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: jAiRB9tV6So78BILYJQDBz8nUzmQaOsxRoRaWaZzQ6wPMm+TuRZCuwncXrhZOnoouJT7TaOP2VQURA49B2vbhsjf08tGqIS8CX9h9oN5rPzLPbnRF70viBrSWP+FuQt8UMxjvI7s16yR7cpG603tNPtWEdff42fKrrkPiO35fsnCd41O+m+OMuGy78DK+Aqqpzmp9g9Vnt5bVnKO71Q6uNg5LLVMBx83xmA4pw3XRHre0v1SSPCiBi6Wxp3ISkDuT5k+7IOVqcn2PM44VDqEdlQU7SLq9D0En8/1a6JdYOlnSiuLYoMU6nKbPCcH6aqo5RtPcEuDKEyk7+sjW75RAuVagapULoYxIB7A8awm5EJF9KuVqXMqOSPCCgC27yi4VzrvJqZHibJknAt3wCdahqSKU07E+vAJK5a6QoAFrMzPsOL9wStD0Djp2bbQHyvFO4KHwJUcmoEQ9C7313EiOJkwHcSTqzDGmERbCIdyuhWTlA0mPdtWVUk9jLCK9zilojc37atqAHIK0EU4/YI9Fh6Q3JDvyt2gElHaUrOHhsD8D1ZFuU7Ne1aXImZa+VNyowijb3ZLwz0yn97sOLo9xXGVgg8Sa0yUVOI9Zfvw+Mi01Nr4Nmi1J3uQhlKFmao9Y8ya5CmTEpU2/x+Q6peUwyqH+6sxv4dJC2zBx2Lx86KFbdWofu8Ljwah8pXtptSAez4+CYYcl+rKhP7wTYSFfAeHYzOqkhX2RFC2CwEP2e0D8lyre9L4iaRhXi6oLwi4QcpfD1F1A7LHQj91SpTGeUR+dNPPYJ1E1lsiExr/iuLE7sLD6msSBWfIIYYxIyNcUTsSMI398mVo4Fad1JpyPEXtuNfzAqbFnE+wU2j8KZV1nlZuLlhbLUkZXOPTACH7P+1MeD46Xt13nqXyIjNf1nBL7MDbgzeaQG2O041MxsspzOeUhQ0I2JGTnMsQ2nXS MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: c8016326-15a9-4420-09fd-08d9b7037149 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Dec 2021 08:52:46.2407 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MEYP282MB3532 Cc: "i.maximets" Subject: [ovs-dev] =?eucgb2312_cn?b?u9i4tDogW1BBVENIIHYzXSBuZXRkZXYtdnBvcnQgOiBG?= =?eucgb2312_cn?b?aXggdXNlcnNwYWNlIHR1bm5lbCBpb2N0bChTSU9DR0lGSU5ERVgpIGluZm8gbG9n?= =?eucgb2312_cn?b?cy4=?= X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" hi all, pls review my code. Regards, Lin Huang diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 499c029..f0ff02b 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -1151,8 +1151,10 @@ netdev_vport_get_ifindex(const struct netdev *netdev_) { char buf[NETDEV_VPORT_NAME_BUFSIZE]; const char *name = netdev_vport_get_dpif_port(netdev_, buf, sizeof(buf)); + const char *dpif_type = netdev_get_dpif_type(netdev_); - return linux_get_ifindex(name); + return (dpif_type && !strcmp(dpif_type, "system") + ? linux_get_ifindex(name) : -ENODEV); } #define NETDEV_VPORT_GET_IFINDEX netdev_vport_get_ifindex diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 5223aa8..513ef7e 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -2052,6 +2052,8 @@ iface_do_create(const struct bridge *br, goto error; } + netdev_set_dpif_type(netdev, br->ofproto->type); + error = iface_set_netdev_config(iface_cfg, netdev, errp); if (error) { goto error;