From patchwork Tue Jul 7 16:25:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1324490 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B1SV43mSPz9sDX for ; Wed, 8 Jul 2020 02:25:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9E6CF890F3; Tue, 7 Jul 2020 16:25:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NooJNqUcxzWk; Tue, 7 Jul 2020 16:25:43 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 455CA890DC; Tue, 7 Jul 2020 16:25:43 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 25B4AC0893; Tue, 7 Jul 2020 16:25:43 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 52A00C016F for ; Tue, 7 Jul 2020 16:25:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3FB8788254 for ; Tue, 7 Jul 2020 16:25:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XTxKbc_ufJ5f for ; Tue, 7 Jul 2020 16:25:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay12.mail.gandi.net (relay12.mail.gandi.net [217.70.178.232]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8CB218822A for ; Tue, 7 Jul 2020 16:25:40 +0000 (UTC) Received: from sigfpe.attlocal.net (75-54-222-30.lightspeed.rdcyca.sbcglobal.net [75.54.222.30]) (Authenticated sender: blp@ovn.org) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 9F8B0200008; Tue, 7 Jul 2020 16:25:36 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Tue, 7 Jul 2020 09:25:25 -0700 Message-Id: <20200707162529.2571215-1-blp@ovn.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH v3 0/4] Use more sensitive terminology. 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" There's no value in risking turning people away from OVS due to insensitive terminology choices. We can do better. v1->v2: Rebase. v2->v3: Fix some new instances of "slave" that had crept in (thanks Ilya!). Drop a patch that I had accidentally appended in v2. Ben Pfaff (4): Eliminate use of term "slave" in bond, LACP, and bundle contexts. Use primary/secondary, not master/slave, as names for OpenFlow roles. conntrack: Rename "master" connection to "primary" connection. Eliminate "whitelist" and "blacklist" terms. Documentation/howto/ipsec.rst | 2 +- Documentation/howto/selinux.rst | 8 +- Documentation/topics/bonding.rst | 177 ++-- Documentation/topics/datapath.rst | 2 +- Documentation/topics/design.rst | 110 +-- Documentation/topics/ovsdb-replication.rst | 9 +- Documentation/topics/porting.rst | 4 +- Makefile.am | 10 +- NEWS | 7 +- build-aux/automake.mk | 2 +- ...ab-whitelist => initial-tab-allowed-files} | 0 ...fety-blacklist => thread-safety-forbidden} | 0 datapath/Makefile.am | 2 +- datapath/linux/Modules.mk | 2 +- ...heck-whitelist => export-check-allow-list} | 0 debian/changelog | 2 +- debian/ifupdown.sh | 4 +- include/openflow/nicira-ext.h | 22 +- include/openflow/openflow-1.2.h | 6 +- include/openflow/openflow-1.4.h | 8 +- include/openvswitch/automake.mk | 2 +- include/openvswitch/meta-flow.h | 14 +- include/openvswitch/ofp-actions.h | 28 +- include/openvswitch/ofp-connection.h | 6 +- include/openvswitch/ofp-errors.h | 9 +- lib/bundle.c | 100 +-- lib/bundle.h | 4 +- lib/cfm.c | 2 +- lib/conntrack-private.h | 10 +- lib/conntrack.c | 74 +- lib/ct-dpif.c | 6 +- lib/ct-dpif.h | 2 +- lib/daemon.man | 2 +- lib/daemon.xml | 2 +- lib/dpif-netdev.c | 40 +- lib/dpif-provider.h | 4 +- lib/dpif.c | 18 +- lib/dpif.h | 4 +- lib/lacp.c | 542 ++++++------ lib/lacp.h | 23 +- lib/lldp/lldp-const.h | 16 +- lib/lldp/lldpd-structs.h | 10 +- lib/mac-learning.c | 17 +- lib/mac-learning.h | 2 +- lib/meta-flow.xml | 2 +- lib/netdev-linux.c | 22 +- lib/netlink-conntrack.c | 6 +- lib/ofp-actions.c | 84 +- lib/ofp-connection.c | 94 ++- lib/ovs-actions.xml | 35 +- lib/ovsdb-idl.h | 4 +- lib/rtnetlink.c | 16 +- lib/rtnetlink.h | 6 +- lib/unixctl.c | 6 +- manpages.mk | 3 - ofproto/bond.c | 786 +++++++++--------- ofproto/bond.h | 28 +- ofproto/connmgr.c | 72 +- ofproto/connmgr.h | 4 +- ofproto/ofproto-dpif-rid.h | 4 +- ofproto/ofproto-dpif-sflow.c | 2 +- ofproto/ofproto-dpif-xlate.c | 23 +- ofproto/ofproto-dpif.c | 45 +- ofproto/ofproto-dpif.h | 2 +- ofproto/ofproto-provider.h | 12 +- ofproto/ofproto.c | 42 +- ofproto/ofproto.h | 10 +- ovsdb/ovsdb-server.c | 8 +- ovsdb/replication.c | 72 +- ovsdb/replication.h | 10 +- tests/bundle.at | 48 +- tests/lacp.at | 130 +-- tests/ofp-actions.at | 28 +- tests/ofp-print.at | 49 +- tests/ofproto-dpif.at | 24 +- tests/ofproto-macros.at | 4 +- tests/ofproto.at | 138 +-- tests/ovs-ofctl.at | 56 +- tests/system-kmod-macros.at | 6 +- tests/system-traffic.at | 6 +- tests/system-userspace-macros.at | 6 +- tests/test-bundle.c | 112 +-- tests/test-classifier.c | 3 +- utilities/checkpatch.py | 8 +- utilities/ovs-ofctl.8.in | 8 +- vswitchd/bridge.c | 69 +- vswitchd/ovs-vswitchd.8.in | 42 +- vswitchd/ovs-vswitchd.c | 2 +- vswitchd/vswitch.xml | 62 +- 89 files changed, 1776 insertions(+), 1737 deletions(-) rename build-aux/{initial-tab-whitelist => initial-tab-allowed-files} (100%) rename build-aux/{thread-safety-blacklist => thread-safety-forbidden} (100%) rename datapath/linux/compat/build-aux/{export-check-whitelist => export-check-allow-list} (100%)