From patchwork Fri Mar 1 14:50:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1906736 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TmWHL5N0yz23fC for ; Sat, 2 Mar 2024 01:50:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A0A6961764; Fri, 1 Mar 2024 14:50:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 jmoK_dtwD15R; Fri, 1 Mar 2024 14:50:45 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 870A461753 Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 870A461753; Fri, 1 Mar 2024 14:50:44 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 66A23C0037; Fri, 1 Mar 2024 14:50:43 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 25DC8C0DD4 for ; Fri, 1 Mar 2024 14:50:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 7022B41C3B for ; Fri, 1 Mar 2024 14:50:39 +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 YwnmB4UmHl4W for ; Fri, 1 Mar 2024 14:50:36 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=217.70.183.199; helo=relay9-d.mail.gandi.net; envelope-from=horms@ovn.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 738CF400FD Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=ovn.org DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 738CF400FD Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by smtp2.osuosl.org (Postfix) with ESMTPS id 738CF400FD for ; Fri, 1 Mar 2024 14:50:36 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 1CD49FF805 for ; Fri, 1 Mar 2024 14:50:33 +0000 (UTC) From: Simon Horman Date: Fri, 01 Mar 2024 14:50:30 +0000 MIME-Version: 1.0 Message-Id: <20240301-dei-t1-v2-1-10ee89c17b89@ovn.org> References: <20240301-dei-t1-v2-0-10ee89c17b89@ovn.org> In-Reply-To: <20240301-dei-t1-v2-0-10ee89c17b89@ovn.org> To: ovs-dev@openvswitch.org Cc: X-Mailer: b4 0.12.3 X-GND-Sasl: horms@ovn.org Subject: [ovs-dev] [PATCH v2 1/5] vswitch.xml: Use member wording for bonds. 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" Since the patch-set that included [1] there has been a policy of using the term member for bonds, LACP, and bundle contexts. This is consistent with the more recently adopted policy of using the inclusive naming word list v1 [2, 3]. This patch addresses two instances where the term member should be used in vswitch.xml. It does not address instances of alternative wording that require code updates, which can addressed as follow-up activity. [1] 91fc374a9c5a ("Eliminate use of term "slave" in bond, LACP, and bundle contexts.") [2] df5e5cf4318a ("Documentation: Add section on inclusive language.") [3] https://inclusivenaming.org/word-lists/ Signed-off-by: Simon Horman Acked-by: Eelco Chaudron --- vswitchd/vswitch.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 612ba41e3b24..8a1b607d71b9 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -2159,7 +2159,7 @@ - If a slave interface with this name exists in the bond and + If a member interface with this name exists in the bond and is up, it will be made active. Relevant only when is active-backup or if balance-tcp falls back @@ -6291,7 +6291,7 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \ and avoids recirculation of packet in datapath. It is supported only for balance-tcp bond mode in netdev datapath. The new action gives higher performance by using bond buckets instead of post - recirculation flows for selection of slave port from bond. By default + recirculation flows for selection of member port from bond. By default this new action is disabled, however it can be enabled by setting in table. From patchwork Fri Mar 1 14:50:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1906731 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TmWH71g6Mz23fC for ; Sat, 2 Mar 2024 01:50:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1207F835C6; Fri, 1 Mar 2024 14:50:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vg3AFgI_ERuZ; Fri, 1 Mar 2024 14:50:39 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org BC8758354B Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id BC8758354B; Fri, 1 Mar 2024 14:50:39 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7EA22C0072; Fri, 1 Mar 2024 14:50:39 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3DD56C0037 for ; Fri, 1 Mar 2024 14:50:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1E5C041C3D for ; Fri, 1 Mar 2024 14:50:38 +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 0ou905JASJmC for ; Fri, 1 Mar 2024 14:50:36 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=217.70.183.199; helo=relay9-d.mail.gandi.net; envelope-from=horms@ovn.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 785E741C22 Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=ovn.org DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 785E741C22 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by smtp2.osuosl.org (Postfix) with ESMTPS id 785E741C22 for ; Fri, 1 Mar 2024 14:50:36 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 8A78DFF810 for ; Fri, 1 Mar 2024 14:50:34 +0000 (UTC) From: Simon Horman Date: Fri, 01 Mar 2024 14:50:31 +0000 MIME-Version: 1.0 Message-Id: <20240301-dei-t1-v2-2-10ee89c17b89@ovn.org> References: <20240301-dei-t1-v2-0-10ee89c17b89@ovn.org> In-Reply-To: <20240301-dei-t1-v2-0-10ee89c17b89@ovn.org> To: ovs-dev@openvswitch.org Cc: X-Mailer: b4 0.12.3 X-GND-Sasl: horms@ovn.org Subject: [ovs-dev] [PATCH v2 2/5] Documentation: Update to refer to main repository. 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" Recently OVS adopted a policy of using the inclusive naming word list v1 [1, 2]. This patch addresses the use of the term master repository by using the term main repository instead. This is as distinct from addressing the use of a master branch, which remains as a follow-up task. [1] df5e5cf ("Documentation: Add section on inclusive language.") [2] https://inclusivenaming.org/word-lists/ Signed-off-by: Simon Horman Acked-by: Eelco Chaudron --- Documentation/internals/committer-grant-revocation.rst | 2 +- Documentation/intro/install/dpdk.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/internals/committer-grant-revocation.rst b/Documentation/internals/committer-grant-revocation.rst index c011df4aec0a..7231762d8f19 100644 --- a/Documentation/internals/committer-grant-revocation.rst +++ b/Documentation/internals/committer-grant-revocation.rst @@ -26,7 +26,7 @@ OVS Committer Grant/Revocation Policy ===================================== An OVS committer is a participant in the project with the ability to commit -code directly to the master repository. Commit access grants a broad ability to +code directly to the main repository. Commit access grants a broad ability to affect the progress of the project as presented by its most important artifact, the code and related resources that produce working binaries of Open vSwitch. As such it represents a significant level of trust in an individual's diff --git a/Documentation/intro/install/dpdk.rst b/Documentation/intro/install/dpdk.rst index 65156966e088..c92e598d7ae8 100644 --- a/Documentation/intro/install/dpdk.rst +++ b/Documentation/intro/install/dpdk.rst @@ -33,7 +33,7 @@ userspace. The :doc:`releases FAQ ` lists support for the required versions of DPDK for each version of Open vSwitch. If building OVS and - DPDK outside of the master build tree users should consult this list + DPDK outside of the main build tree users should consult this list first. Build requirements From patchwork Fri Mar 1 14:50:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1906732 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TmWH867gCz23fC for ; Sat, 2 Mar 2024 01:50:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E81DA4195A; Fri, 1 Mar 2024 14:50:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gBJLbFfXIi4B; Fri, 1 Mar 2024 14:50:40 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org BB36F417C1 Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id BB36F417C1; Fri, 1 Mar 2024 14:50:40 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 47271C0DD6; Fri, 1 Mar 2024 14:50:40 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 49B08C0072 for ; Fri, 1 Mar 2024 14:50:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3A233415A1 for ; Fri, 1 Mar 2024 14:50:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EhMg1Abfwbgo for ; Fri, 1 Mar 2024 14:50:37 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2001:4b98:dc4:8::229; helo=relay9-d.mail.gandi.net; envelope-from=horms@ovn.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org E2F9B417C1 Authentication-Results: smtp4.osuosl.org; dmarc=none (p=none dis=none) header.from=ovn.org DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E2F9B417C1 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by smtp4.osuosl.org (Postfix) with ESMTPS id E2F9B417C1 for ; Fri, 1 Mar 2024 14:50:36 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3927AFF811 for ; Fri, 1 Mar 2024 14:50:35 +0000 (UTC) From: Simon Horman Date: Fri, 01 Mar 2024 14:50:32 +0000 MIME-Version: 1.0 Message-Id: <20240301-dei-t1-v2-3-10ee89c17b89@ovn.org> References: <20240301-dei-t1-v2-0-10ee89c17b89@ovn.org> In-Reply-To: <20240301-dei-t1-v2-0-10ee89c17b89@ovn.org> To: ovs-dev@openvswitch.org Cc: X-Mailer: b4 0.12.3 X-GND-Sasl: horms@ovn.org Subject: [ovs-dev] [PATCH v2 3/5] netdev-linux: Rename sturct nedev_linux field as is_lag_primary 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" Recently OVS adopted a policy of using the inclusive naming word list v1 [1, 2]. This patch partially addresses the use of the term master in the context of LAG devices by using the term primary instead: the is_lag_master field of struct netdev_linux is renamed is_lag_primary. A related comment is also updated. No functional change intended. [1] df5e5cf ("Documentation: Add section on inclusive language.") [2] https://inclusivenaming.org/word-lists/ Signed-off-by: Simon Horman Acked-by: Eelco Chaudron --- lib/netdev-linux-private.h | 2 +- lib/netdev-linux.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/netdev-linux-private.h b/lib/netdev-linux-private.h index 188e8438a320..8e572e3b3b14 100644 --- a/lib/netdev-linux-private.h +++ b/lib/netdev-linux-private.h @@ -105,7 +105,7 @@ struct netdev_linux { uint64_t rx_dropped; /* Packets dropped while recv from kernel. */ /* LAG information. */ - bool is_lag_master; /* True if the netdev is a LAG master. */ + bool is_lag_primary; /* True if the netdev is a LAG primary. */ int numa_id; /* NUMA node id. */ diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index bf91ef462efb..1f996454d8f6 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -885,7 +885,7 @@ netdev_linux_update__(struct netdev_linux *dev, } if (change->primary && netdev_linux_kind_is_lag(change->primary)) { - dev->is_lag_master = true; + dev->is_lag_primary = true; } dev->ifindex = change->if_index; @@ -3703,8 +3703,9 @@ netdev_linux_get_block_id(struct netdev *netdev_) netdev_linux_update_via_netlink(netdev); } - /* Only assigning block ids to linux netdevs that are LAG masters. */ - if (netdev->is_lag_master) { + /* Only assigning block ids to linux netdevs that are + * LAG primary members. */ + if (netdev->is_lag_primary) { block_id = netdev->ifindex; } ovs_mutex_unlock(&netdev->mutex); @@ -6903,7 +6904,7 @@ netdev_linux_update_via_netlink(struct netdev_linux *netdev) changed = true; } if (change->primary && netdev_linux_kind_is_lag(change->primary)) { - netdev->is_lag_master = true; + netdev->is_lag_primary = true; } if (changed) { netdev_change_seq_changed(&netdev->up); From patchwork Fri Mar 1 14:50:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1906734 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TmWHG5Hccz23fC for ; Sat, 2 Mar 2024 01:50:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5A47241E8F; Fri, 1 Mar 2024 14:50:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uDfULN9naTnS; Fri, 1 Mar 2024 14:50:43 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B941A41E15 Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id B941A41E15; Fri, 1 Mar 2024 14:50:42 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 21E14C0DDD; Fri, 1 Mar 2024 14:50:42 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2B41FC0037 for ; Fri, 1 Mar 2024 14:50:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 71E00416DB for ; Fri, 1 Mar 2024 14:50:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CiDiE71AnE1S for ; Fri, 1 Mar 2024 14:50:37 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2001:4b98:dc4:8::229; helo=relay9-d.mail.gandi.net; envelope-from=horms@ovn.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 4A52E40741 Authentication-Results: smtp4.osuosl.org; dmarc=none (p=none dis=none) header.from=ovn.org DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4A52E40741 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by smtp4.osuosl.org (Postfix) with ESMTPS id 4A52E40741 for ; Fri, 1 Mar 2024 14:50:37 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 8A7F5FF812 for ; Fri, 1 Mar 2024 14:50:35 +0000 (UTC) From: Simon Horman Date: Fri, 01 Mar 2024 14:50:33 +0000 MIME-Version: 1.0 Message-Id: <20240301-dei-t1-v2-4-10ee89c17b89@ovn.org> References: <20240301-dei-t1-v2-0-10ee89c17b89@ovn.org> In-Reply-To: <20240301-dei-t1-v2-0-10ee89c17b89@ovn.org> To: ovs-dev@openvswitch.org Cc: X-Mailer: b4 0.12.3 X-GND-Sasl: horms@ovn.org Subject: [ovs-dev] [PATCH v2 4/5] netdev-linux: Rename local variables as primary_*. 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" Recently OVS adopted a policy of using the inclusive naming word list v1 [1, 2]. This patch partially addresses the use of the term master in the context of LAG devices by using the term primary instead: the local variables master_netdev and master_name are renamed as primary_netdev and primary_name. Related comments are also updated. No functional change intended. [1] df5e5cf ("Documentation: Add section on inclusive language.") [2] https://inclusivenaming.org/word-lists/ Signed-off-by: Simon Horman Acked-by: Eelco Chaudron --- lib/netdev-linux.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index 1f996454d8f6..1e904d8e6310 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -686,26 +686,26 @@ netdev_linux_update_lag(struct rtnetlink_change *change) lag = shash_find_data(&lag_shash, change->ifname); if (!lag) { - struct netdev *master_netdev; - char master_name[IFNAMSIZ]; + struct netdev *primary_netdev; + char primary_name[IFNAMSIZ]; uint32_t block_id; int error = 0; - if (!if_indextoname(change->master_ifindex, master_name)) { + if (!if_indextoname(change->master_ifindex, primary_name)) { return; } - master_netdev = netdev_from_name(master_name); - if (!master_netdev) { + primary_netdev = netdev_from_name(primary_name); + if (!primary_netdev) { return; } - /* If LAG master is not attached to ovs, ingress block on LAG - * members shoud not be updated. */ - if (!master_netdev->auto_classified && - is_netdev_linux_class(master_netdev->netdev_class)) { - block_id = netdev_get_block_id(master_netdev); + /* If LAG primary member is not attached to ovs, + * ingress block on LAG members should not be updated. */ + if (!primary_netdev->auto_classified && + is_netdev_linux_class(primary_netdev->netdev_class)) { + block_id = netdev_get_block_id(primary_netdev); if (!block_id) { - netdev_close(master_netdev); + netdev_close(primary_netdev); return; } @@ -715,7 +715,7 @@ netdev_linux_update_lag(struct rtnetlink_change *change) /* delete ingress block in case it exists */ tc_add_del_qdisc(change->if_index, false, 0, TC_INGRESS); - /* LAG master is linux netdev so add member to same block. */ + /* LAG primary is linux netdev so add member to same block. */ error = tc_add_del_qdisc(change->if_index, true, block_id, TC_INGRESS); if (error) { @@ -726,7 +726,7 @@ netdev_linux_update_lag(struct rtnetlink_change *change) } } - netdev_close(master_netdev); + netdev_close(primary_netdev); } } else if (change->master_ifindex == 0) { /* Check if this was a lag member that has been removed. */ From patchwork Fri Mar 1 14:50:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1906735 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TmWHH4C2Tz23l2 for ; Sat, 2 Mar 2024 01:50:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 19ECF61745; Fri, 1 Mar 2024 14:50:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 5qkmfNvH4Aig; Fri, 1 Mar 2024 14:50:44 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 958866173C Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 958866173C; Fri, 1 Mar 2024 14:50:43 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C4424C0DDC; Fri, 1 Mar 2024 14:50:42 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5882CC0037 for ; Fri, 1 Mar 2024 14:50:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 3B0CA41C40 for ; Fri, 1 Mar 2024 14:50:39 +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 Q_HJ9J76NlMX for ; Fri, 1 Mar 2024 14:50:38 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=217.70.183.199; helo=relay9-d.mail.gandi.net; envelope-from=horms@ovn.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org D9ADE41C3B Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=ovn.org DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D9ADE41C3B Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by smtp2.osuosl.org (Postfix) with ESMTPS id D9ADE41C3B for ; Fri, 1 Mar 2024 14:50:37 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 04EF2FF80C; Fri, 1 Mar 2024 14:50:35 +0000 (UTC) From: Simon Horman Date: Fri, 01 Mar 2024 14:50:34 +0000 MIME-Version: 1.0 Message-Id: <20240301-dei-t1-v2-5-10ee89c17b89@ovn.org> References: <20240301-dei-t1-v2-0-10ee89c17b89@ovn.org> In-Reply-To: <20240301-dei-t1-v2-0-10ee89c17b89@ovn.org> To: ovs-dev@openvswitch.org X-Mailer: b4 0.12.3 X-GND-Sasl: horms@ovn.org Subject: [ovs-dev] [PATCH v2 5/5] utilities: Use localhost as sample hostname. 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" Recently OVS adopted a policy of using the inclusive naming word list v1 [1, 2]. This patch addresses the use of the term master in the context of a hostname used in documentation of the kernel_delay utility. It does so by using localhost as the hostname instead. [1] df5e5cf ("Documentation: Add section on inclusive language.") [2] https://inclusivenaming.org/word-lists/ Cc: Eelco Chaudron Signed-off-by: Simon Horman Acked-by: Eelco Chaudron --- utilities/usdt-scripts/kernel_delay.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utilities/usdt-scripts/kernel_delay.rst b/utilities/usdt-scripts/kernel_delay.rst index e2e43752d202..0f6f916a71e2 100644 --- a/utilities/usdt-scripts/kernel_delay.rst +++ b/utilities/usdt-scripts/kernel_delay.rst @@ -553,7 +553,7 @@ First the containers need to be started: .. code-block:: console - [core@sno-master ~]$ sudo podman run -it --rm \ + [core@localhost ~]$ sudo podman run -it --rm \ -e PS1='[(DEBUG)\u@\h \W]\$ ' \ --privileged --network=host --pid=host \ -v /lib/modules:/lib/modules:ro \ @@ -562,14 +562,14 @@ First the containers need to be started: -v /:/mnt/rootdir \ quay.io/fedora/fedora:38-x86_64 - [(DEBUG)root@sno-master /]# + [(DEBUG)root@localhost /]# Next add the ``linux_delay.py`` dependencies: .. code-block:: console - [(DEBUG)root@sno-master /]# dnf install -y bcc-tools perl-interpreter \ + [(DEBUG)root@localhost /]# dnf install -y bcc-tools perl-interpreter \ python3-pytz python3-psutil @@ -578,7 +578,7 @@ version: .. code-block:: console - [(DEBUG)root@sno-master home]# rpm -i \ + [(DEBUG)root@localhost home]# rpm -i \ openvswitch2.17-debuginfo-2.17.0-67.el8fdp.x86_64.rpm \ openvswitch2.17-debugsource-2.17.0-67.el8fdp.x86_64.rpm \ kernel-devel-4.18.0-372.41.1.el8_6.x86_64.rpm @@ -588,7 +588,7 @@ Now the tool can be started. Here the above ``bridge_run()`` example is used: .. code-block:: console - [(DEBUG)root@sno-master home]# ./kernel_delay.py --start-trigger up:bridge_run --stop-trigger ur:bridge_run + [(DEBUG)root@localhost home]# ./kernel_delay.py --start-trigger up:bridge_run --stop-trigger ur:bridge_run # Start sampling (trigger@75279117343513) @2023-06-15T11:44:07.628372 (11:44:07 UTC) # Stop sampling (trigger@75279117443980) @2023-06-15T11:44:07.628529 (11:44:07 UTC) # Triggered sample dump, stop-start delta 100,467 ns @2023-06-15T11:44:07.628569 (11:44:07 UTC)