From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm2-f10.google.com (mail-wm2-f10.google.com [74.125.225.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E49D13F3294 for ; Tue, 4 Aug 2026 18:21:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.138 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785867676; cv=none; b=ZpelqLWRdS/dCAjgtFT3MrGhjRU0E0emo/XMQ8UtrPI7BMgAEpbSDo9kR42CV8oamIh2/+in7BZGds1062Om4EH19vwQ59pVy8gukmJZYucHEXuefH+9Y6dhWVHXI8g8or8AMt248m8DTekuYuMj1A2ukpOqN/L/juq2OMGd3bI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785867676; c=relaxed/simple; bh=a8SmrdPBOhFaVHGjIGE+nJ9mAE15TX2//Td5MPkPBig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YoGn1/KqJbVYIaeuUG3M5Sz32gDt9d9/HAEW75HY3s2t3hBV0KfxrqSPHWkgOM7OaZ24Q6y5tWsceQMq050LJcVBIcE2yw3bPe0h7EWqhBjkCbrkjsWH0a1RqK5cDemEKdOIiZQGi+ho1PuyMFr5cnuBsBOlb1ph7QMZpz2T+9w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ovn.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=74.125.225.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ovn.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm2-f10.google.com with SMTP id 5b1f17b1804b1-495482c36b8so337215e9.0 for ; Tue, 04 Aug 2026 11:21:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785867673; x=1786472473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=UdazOxfVZCXEswc4NNw89vK46WEsQsXKDlpQ9L9kFsc=; b=Mrx7TRKv/Fksgl7XjKN+U8VW0LR6FXAmALo2CuTtpeCK9+OfXIWSrr1NBolFp8fRDm y7+bLvxG4JMqP/Bb9rI4hMk/ahrjGlaadbUt58tbeXo94ZRFUV46sQwPqBKUS1wJHmSv WCdrF2NyoAavrt1ttoKXUETfHbpb6/AUJ4tH49WUFNzBqd539iBPK6S1pYHGrxNFI7qZ aHW2+BQqjROFvthzsq1/EH9cud8bBDf1YAR6X2g5qwAkpiEX550abaroJvufqMrgXtxh 2E3PpXHnD64lu2wUl8QZNR8VVBT578ktzodgQFDYCUGRUvewS8wVV5sn5JRCgUn+7CwU 3inA== X-Gm-Message-State: AOJu0Yy3Nq779qMNefsxYouMbRtt1WvkHkfyX3uq2X+Zcersj3mI7mu7 z9h+eIPIYNslv3zSdrGGOvrY3M+OCu9v+WitteW/VJGtdZfO0HU8GmCY/v6BniIOs/I= X-Gm-Gg: AR+sD13Pj9VWZ+aBemZ2QOd96PhMqGa08DGP3TgczTgHecXIMAzFYTxeOVQlok8K6Jo FYmTg7xHpZBfLWBtIF47O6wqU2vKkCj341Ef+7CtTBwafZ11E8B0EgFd+x01kcGZTPyVA/HsCTd hnBfQMxJLsj6eH2LB3o+ZDtclGy9iOpDWpcnNLZ0hJqCEij58vB7i2xUBQx/OXVb4Z2SGNkOmaF W6m/MG6jPcNIhFsgP+MCSjVbHrM5TVqnF0pYwSI97zK/qGd5vYBub5b8lC4zggkut6eW7mhoRgF CuJj5+krAXWzXesSl7kZc4D+SarlwubY3w/QsciMxDWPEcRd15kZvEDTOyhgS73OWGe3Tfu/GnS Cbiy0Xz8OFGs49wjWEU8vkrG3WeNc4aMe5IjJZowcX7BT8AJKkBefs42A2Y0EFr1ZC/PVJ9t517 J0yjGmpqC8SWLg1MPPzmVWrDtSeTpgujCRbGeRCFdcRMohOCPFcxiaHOsvNA9r8JYVc0Hz2bR9U jtARF6rnFDsFpP0WBbi+hrkQYKeNw== X-Received: by 2002:a05:600c:4444:b0:493:a438:7f98 with SMTP id 5b1f17b1804b1-4994e7d4057mr1992825e9.18.1785867673003; Tue, 04 Aug 2026 11:21:13 -0700 (PDT) Received: from im-t490s.redhat.com (78-80-108-129.customers.tmcz.cz. [78.80.108.129]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4994e4bf5c1sm4946925e9.2.2026.08.04.11.21.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 11:21:12 -0700 (PDT) From: Ilya Maximets To: netdev@vger.kernel.org Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Aaron Conole , Eelco Chaudron , David Ahern , Ido Schimmel , Shuah Khan , Kuniyuki Iwashima , Nikolay Aleksandrov , Fernando Fernandez Mancera , Antoine Tenart , linux-kernel@vger.kernel.org, dev@openvswitch.org, linux-kselftest@vger.kernel.org, Ilya Maximets Subject: [PATCH net-next 3/6] openvswitch: vport: remove infrastructure for separate modules Date: Tue, 4 Aug 2026 20:20:37 +0200 Message-ID: <20260804182049.2289754-4-i.maximets@ovn.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260804182049.2289754-1-i.maximets@ovn.org> References: <20260804182049.2289754-1-i.maximets@ovn.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Since removal of legacy tunnel vport types only the built-in ones remain. So, there is no need for the extra infrastructure for dynamic module loading. Can be reinstated in the future if we need a new vport type. Note: It is technically possible that someone has an out-of-tree module named vport-type-N that implements a different vport type. At this time we're not aware of anyone doing that. People running out-of-tree modules normally just have an out-of-tree openvswitch module as a whole. And there are actually no supported out-of-tree implementations of the openvswitch module known to the community. Signed-off-by: Ilya Maximets --- net/openvswitch/datapath.c | 6 +----- net/openvswitch/vport.c | 25 +++---------------------- net/openvswitch/vport.h | 9 +-------- 3 files changed, 5 insertions(+), 35 deletions(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 57c83f05fead..34a15ef76a70 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -2331,7 +2331,6 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info) return -ENOMEM; ovs_lock(); -restart: dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex); err = -ENODEV; if (!dp) @@ -2363,11 +2362,8 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info) vport = new_vport(&parms); err = PTR_ERR(vport); - if (IS_ERR(vport)) { - if (err == -EAGAIN) - goto restart; + if (IS_ERR(vport)) goto exit_unlock_free; - } err = ovs_vport_cmd_fill_info(vport, reply, genl_info_net(info), info->snd_portid, info->snd_seq, 0, diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index ada316a61726..29ebeb164bdc 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -57,7 +57,7 @@ static struct hlist_head *hash_bucket(const struct net *net, const char *name) return &dev_table[hash & (VPORT_HASH_BUCKETS - 1)]; } -int __ovs_vport_ops_register(struct vport_ops *ops) +int ovs_vport_ops_register(struct vport_ops *ops) { int err = -EEXIST; struct vport_ops *o; @@ -73,7 +73,6 @@ int __ovs_vport_ops_register(struct vport_ops *ops) ovs_unlock(); return err; } -EXPORT_SYMBOL_GPL(__ovs_vport_ops_register); void ovs_vport_ops_unregister(struct vport_ops *ops) { @@ -81,7 +80,6 @@ void ovs_vport_ops_unregister(struct vport_ops *ops) list_del(&ops->list); ovs_unlock(); } -EXPORT_SYMBOL_GPL(ovs_vport_ops_unregister); /** * ovs_vport_locate - find a port that has already been created @@ -210,14 +208,9 @@ struct vport *ovs_vport_add(const struct vport_parms *parms) if (ops) { struct hlist_head *bucket; - if (!try_module_get(ops->owner)) - return ERR_PTR(-EAFNOSUPPORT); - vport = ops->create(parms); - if (IS_ERR(vport)) { - module_put(ops->owner); + if (IS_ERR(vport)) return vport; - } bucket = hash_bucket(ovs_dp_get_net(vport->dp), ovs_vport_name(vport)); @@ -225,18 +218,7 @@ struct vport *ovs_vport_add(const struct vport_parms *parms) return vport; } - /* Unlock to attempt module load and return -EAGAIN if load - * was successful as we need to restart the port addition - * workflow. - */ - ovs_unlock(); - request_module("vport-type-%d", parms->type); - ovs_lock(); - - if (!ovs_vport_lookup(parms)) - return ERR_PTR(-EAFNOSUPPORT); - else - return ERR_PTR(-EAGAIN); + return ERR_PTR(-EAFNOSUPPORT); } /** @@ -250,7 +232,6 @@ struct vport *ovs_vport_add(const struct vport_parms *parms) void ovs_vport_del(struct vport *vport) { hlist_del_rcu(&vport->hash_node); - module_put(vport->ops->owner); vport->ops->destroy(vport); } diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index 636788b59907..930f1ccc8558 100644 --- a/net/openvswitch/vport.h +++ b/net/openvswitch/vport.h @@ -116,7 +116,6 @@ struct vport_parms { * before an RCU grace period has elapsed. * @send: Send a packet on the device. * zero for dropped packets or negative for error. - * @owner: Module that implements this vport type. * @list: List entry in the global list of vport types. */ struct vport_ops { @@ -127,7 +126,6 @@ struct vport_ops { void (*destroy)(struct vport *); int (*send)(struct sk_buff *skb); - struct module *owner; struct list_head list; }; @@ -191,12 +189,7 @@ static inline const char *ovs_vport_name(struct vport *vport) return vport->dev->name; } -int __ovs_vport_ops_register(struct vport_ops *ops); -#define ovs_vport_ops_register(ops) \ - ({ \ - (ops)->owner = THIS_MODULE; \ - __ovs_vport_ops_register(ops); \ - }) +int ovs_vport_ops_register(struct vport_ops *ops); void ovs_vport_ops_unregister(struct vport_ops *ops); void ovs_vport_send(struct vport *vport, struct sk_buff *skb, u8 mac_proto); -- 2.55.0