Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3379147pxt; Tue, 10 Aug 2021 02:08:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzKzZZ39r4HYwKfX0ZRrfG0uTOcXxW0cXN98Ckvq1qxD1G7sCm20kAAHYcm6uetacbzyiH X-Received: by 2002:a92:8702:: with SMTP id m2mr460417ild.250.1628586523051; Tue, 10 Aug 2021 02:08:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628586523; cv=none; d=google.com; s=arc-20160816; b=TMEbHdp2DD+b7nxmCGSqIzE+euzNLg1OL6tdMQ0PSg/e0KuB2JGRjPQc1F6oPhaLXd 5+HynIyIv/6gKOsuwCfYA5c14wwg5/XlvVULOVCSlkqB0N5Hu5KlCOjT4Sq1b+f8qvQ2 5C9v6foKnTsGHk+B9CCv7+K6EcTBECK68N4i1qK5EgLdrg06rxiYcBUBU/feJCFcbJFW p6l3DGiNqNkNey3xgojkXYk72fd0pLz3wX/jVHU4c7BeGQuUwal1uxuv3xTWbdrieyDS 7Q6tvbTa0fKoF9mPnJAf6z8HtLZh4Kc5ehglJ4VUyorCo6UWMxLHxEUdz494bpwMM8lf JTSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UoTdKc8xQcpuqJCQbnZhCpggYCQWNrmUGoUzXjzEDmY=; b=E+4CZ7P1QYzP8ZH+E1wNVLE/Tvko3bG5lZrWkaRczE+EEN4+H4N4vesYhCVUFdzfo9 2LaZpVgc/mOvuR0UH0R32zTcg2Du3wF3KVL30vNB0YCreIeNRvQIxYKuX7et+rngLG6v kOuVfrr9CfWPPP6N8jQIPizI9AIVUQmri8XA41txngiYs8IO3I0Y1N/kBF6xZezpP0mp O90HUfUvYlyaJIDSakLRAqZpggig0hvqdwN6E889M67RDrvUCedJxzkQxWYVYB4ymGZo YHtknJQ7bI9CtDS/HuOoB2FuyTUE8QMCpNUbT2xtAzSjBdwPcPsS6CPHy+tgXaW/VfcY 6gtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=d8Za2stb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r6si22918484iov.48.2021.08.10.02.08.31; Tue, 10 Aug 2021 02:08:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=d8Za2stb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236886AbhHJGlJ (ORCPT + 99 others); Tue, 10 Aug 2021 02:41:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52462 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236783AbhHJGlG (ORCPT ); Tue, 10 Aug 2021 02:41:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628577644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UoTdKc8xQcpuqJCQbnZhCpggYCQWNrmUGoUzXjzEDmY=; b=d8Za2stbpURjiVfyMBfAActAlETlteZNW0eqbvdFMFklmNimp7mg1Y1Ln2BNq7v2Q/cUXg Q1fAiL+4sApq866pT+Hj1+75N01oJZn9WH/zH+itoaUpGaEMskm6B2LJxBAit3n2YSi9L+ V4GaVE1PP12Iz5N4Ivfr3E/Cki9/+xA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-535-KOFtFEg3NL2O0jXq3Kj2sw-1; Tue, 10 Aug 2021 02:40:40 -0400 X-MC-Unique: KOFtFEg3NL2O0jXq3Kj2sw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A774087122E; Tue, 10 Aug 2021 06:40:38 +0000 (UTC) Received: from jtoppins.rdu.csb (unknown [10.22.8.144]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6355E100EB3D; Tue, 10 Aug 2021 06:40:37 +0000 (UTC) From: Jonathan Toppins To: netdev@vger.kernel.org, joe@perches.com, leon@kernel.org Cc: Jay Vosburgh , Veaceslav Falico , Andy Gospodarek , "David S. Miller" , Jakub Kicinski , linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 2/2] bonding: combine netlink and console error messages Date: Tue, 10 Aug 2021 02:40:31 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There seems to be no reason to have different error messages between netlink and printk. It also cleans up the function slightly. v2: - changed the printks to reduce object code slightly - emit a single error message based on if netlink or sysfs is attempting to enslave Signed-off-by: Jonathan Toppins --- drivers/net/bonding/bond_main.c | 49 +++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 3ba5f4871162..eaa82a668c8e 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1712,6 +1712,20 @@ void bond_lower_state_changed(struct slave *slave) netdev_lower_state_changed(slave->dev, &info); } +#define BOND_NL_ERR(bond_dev, extack, errmsg) do { \ + if (extack) \ + NL_SET_ERR_MSG(extack, errmsg); \ + else \ + netdev_err(bond_dev, "Error: %s\n", errmsg); \ +} while (0) + +#define SLAVE_NL_ERR(bond_dev, slave_dev, extack, errmsg) do { \ + if (extack) \ + NL_SET_ERR_MSG(extack, errmsg); \ + else \ + slave_err(bond_dev, slave_dev, "Error: %s\n", errmsg); \ +} while (0) + /* enslave device to bond device */ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, struct netlink_ext_ack *extack) @@ -1725,9 +1739,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, if (slave_dev->flags & IFF_MASTER && !netif_is_bond_master(slave_dev)) { - NL_SET_ERR_MSG(extack, "Device with IFF_MASTER cannot be enslaved"); - netdev_err(bond_dev, - "Error: Device with IFF_MASTER cannot be enslaved\n"); + BOND_NL_ERR(bond_dev, extack, + "Device with IFF_MASTER cannot be enslaved"); return -EPERM; } @@ -1739,15 +1752,13 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, /* already in-use? */ if (netdev_is_rx_handler_busy(slave_dev)) { - NL_SET_ERR_MSG(extack, "Device is in use and cannot be enslaved"); - slave_err(bond_dev, slave_dev, - "Error: Device is in use and cannot be enslaved\n"); + SLAVE_NL_ERR(bond_dev, slave_dev, extack, + "Device is in use and cannot be enslaved"); return -EBUSY; } if (bond_dev == slave_dev) { - NL_SET_ERR_MSG(extack, "Cannot enslave bond to itself."); - netdev_err(bond_dev, "cannot enslave bond to itself.\n"); + BOND_NL_ERR(bond_dev, extack, "Cannot enslave bond to itself."); return -EPERM; } @@ -1756,8 +1767,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, if (slave_dev->features & NETIF_F_VLAN_CHALLENGED) { slave_dbg(bond_dev, slave_dev, "is NETIF_F_VLAN_CHALLENGED\n"); if (vlan_uses_dev(bond_dev)) { - NL_SET_ERR_MSG(extack, "Can not enslave VLAN challenged device to VLAN enabled bond"); - slave_err(bond_dev, slave_dev, "Error: cannot enslave VLAN challenged slave on VLAN enabled bond\n"); + SLAVE_NL_ERR(bond_dev, slave_dev, extack, + "Can not enslave VLAN challenged device to VLAN enabled bond"); return -EPERM; } else { slave_warn(bond_dev, slave_dev, "enslaved VLAN challenged slave. Adding VLANs will be blocked as long as it is part of bond.\n"); @@ -1775,8 +1786,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, * enslaving it; the old ifenslave will not. */ if (slave_dev->flags & IFF_UP) { - NL_SET_ERR_MSG(extack, "Device can not be enslaved while up"); - slave_err(bond_dev, slave_dev, "slave is up - this may be due to an out of date ifenslave\n"); + SLAVE_NL_ERR(bond_dev, slave_dev, extack, + "Device can not be enslaved while up"); return -EPERM; } @@ -1815,17 +1826,15 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, bond_dev); } } else if (bond_dev->type != slave_dev->type) { - NL_SET_ERR_MSG(extack, "Device type is different from other slaves"); - slave_err(bond_dev, slave_dev, "ether type (%d) is different from other slaves (%d), can not enslave it\n", - slave_dev->type, bond_dev->type); + SLAVE_NL_ERR(bond_dev, slave_dev, extack, + "Device type is different from other slaves"); return -EINVAL; } if (slave_dev->type == ARPHRD_INFINIBAND && BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) { - NL_SET_ERR_MSG(extack, "Only active-backup mode is supported for infiniband slaves"); - slave_warn(bond_dev, slave_dev, "Type (%d) supports only active-backup mode\n", - slave_dev->type); + SLAVE_NL_ERR(bond_dev, slave_dev, extack, + "Only active-backup mode is supported for infiniband slaves"); res = -EOPNOTSUPP; goto err_undo_flags; } @@ -1839,8 +1848,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, bond->params.fail_over_mac = BOND_FOM_ACTIVE; slave_warn(bond_dev, slave_dev, "Setting fail_over_mac to active for active-backup mode\n"); } else { - NL_SET_ERR_MSG(extack, "Slave device does not support setting the MAC address, but fail_over_mac is not set to active"); - slave_err(bond_dev, slave_dev, "The slave device specified does not support setting the MAC address, but fail_over_mac is not set to active\n"); + SLAVE_NL_ERR(bond_dev, slave_dev, extack, + "Slave device does not support setting the MAC address, but fail_over_mac is not set to active"); res = -EOPNOTSUPP; goto err_undo_flags; } -- 2.27.0