From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) (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 B5174441623 for ; Mon, 7 Sep 2026 21:54:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788818100; cv=none; b=UcpEcwbONa8HXI2Nfqdv7iG3dBQ2wWwBMSSOOi7DpwjQOLRZKm+DuE5yuE+6nGnVzb4YK3SEEtjZS0C+2GXej9DpKdgAyKizys5KuBcieXO2yMi/LJNjB+zFDSatiUKxaOa3YgPCru/24G+JxpoLjVRPcSZ7YRCfJSalVY+49P0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788818100; c=relaxed/simple; bh=cOuGuXTRwRbieXZHpEpUkyizPgeu40kkjKbILhrTpr8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TRkCs98oQVoDWhihlFNKv4ZQge0m+lOPHgxTNpqTLgQwiFPCz43kjLnCht5Zi7oW09O9NJDFRT5usCwbEF2baPu22utR0X4sJddzQX3bwQtiSJ9ymSgU3hYKBkJoIDB/uwZOp6ycMKTvgb6p+Gcpr7BUpKc0rz8S7kmabE/Z9Xk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YmWZmFn2; arc=none smtp.client-ip=209.85.128.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YmWZmFn2" Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-86e7f44b773so41516747b3.2 for ; Mon, 07 Sep 2026 14:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788818087; x=1789422887; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EPMvbjF7fIzIRVphdYEwqQYdJVOJV5Z2qbhmmd1p55E=; b=YmWZmFn28/CK0tr6SSuPRYdhyC/35acZMQr1WQTNnZ84JBn7jLqG1+yGOAikoLkcLj EPnGlTkXXEMLh9/2cPX5BDS9YKntyu24/NvBxKqbjnHT+6Qwb4SjRkSXAKv9yiUzzUe0 YDXRJZzpS4btQvyfVZbuJr/pwxkXwVIePWgTbLFgZ8mH+dlWf9LUQOagjba2+d0liVvO WyW00ba4NGGl/1iNfSnFhoX50mSty659UMQGRFo9Aq2daz1BklMY7qfmmJUWpcMNBgcn 5OIgdnrH4HPKaKKpXUpvWmIgbRXaj4g92N1eoY20CTLX0Nib9sWqLZX8a80d7r0RfuIA 6OTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788818087; x=1789422887; 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=EPMvbjF7fIzIRVphdYEwqQYdJVOJV5Z2qbhmmd1p55E=; b=pBQq5W4sWGtqYpE1iHZOq/VpQW9O+5DdcpZkxE494F7qHTgL5x9Hs33cRTX0va3Mff nEkOMwpBg2Rh4Sb01MzrhDoXuzxL2GtznUHb6aHpJf9NX81OLUmoBCfFL8S0MyZ4DaHo rJtXCii9+jV39JbtkI+JmIBXoRB6oHbWQzgiHvE2qjmZF/rxiOrFxo2mPNR4Jd4Fq7x0 kGY1JZe7mP4Dg8y5dm2RZPt4XQS9e1Iu0+6YM7UieVUroI5/ECccMGnOzVn5fveEvbrs ZjSPB8NAkR5ATVf57RK0xCSidVU21N2k4fDJid5lPFYXyQokpsPPuAYgtcXUTD1YaAeG dtMQ== X-Forwarded-Encrypted: i=1; AKwUvBzK6bJu1QkfV8WbfVYqfYhQm/aXsWeDPZjYiomH4UwW02LNtc5YLvg2dgz9dUdTxwTKPWHcIZA65XiPUcw=@vger.kernel.org X-Gm-Message-State: AFuF++kIv90ig1JEBwkvxI9QLX0hoMdOL9rllTY/iRnErltgqVPVMiNE yERiOrOxma5Yg4q2LLeC4gPxAbcrTS4bNFltRqs23bGhtdqhuDfjKKng X-Gm-Gg: AYBFou2oi5uXTIWrz+X5QmWaj8hCxPLiEjp6kEuqr39wEYmBhkZavN21oXixRCziI31 28WyqaJADpZD9/PfFsdnjEdc6MC4pRRPcEh7NbR2/VvNoVMuPNnk2jaqIU4YeNU4ZwLCVIrm7va 29B7VM2QlzPkfqv2o+M8Xysru8XnC/BajIGVtyzh643d9E9yTeAeEQESr6P3xEas1ucO8qzqlJd nlDmaOCbNgFu0/xRFiJKYXs21lHiRlMo8FsLESwi7sID9YbdIbVYRbJ63Q+uWG3SY20yuKoR7y8 H61XXQce3FeZbTtknQDwCWUD0KPlZuMe2AUarp4BnSO/YeI1aFf4J93GPUK3bnVrhkhRien5bVU HyuKY+FpYhgiJ52dbzoKiQCn4H49nY2AEmJRX1f3CdQpTG2EINAtWCdwLnQtiROV2zImUAHxLUV r3PPR4USkRy5XiyNgpLruGhpTQAwWa97h2SJFYIWbRO9EBonYL1xW5v/zCYSQy5AhpGHawAf5cD NZLslxBq/IiPSbRww== X-Received: by 2002:a05:690c:e29b:10b0:873:5ddf:d864 with SMTP id 00721157ae682-8735ddfdab5mr46438527b3.47.1788818086989; Mon, 07 Sep 2026 14:54:46 -0700 (PDT) Received: from localhost (c-73-105-0-191.hsd1.fl.comcast.net. [73.105.0.191]) by smtp.gmail.com with ESMTPSA id 00721157ae682-8714b62bc77sm78551997b3.39.2026.09.07.14.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 14:54:46 -0700 (PDT) From: Yury Norov X-Google-Original-From: Yury Norov To: Andrew Lunn , Heiner Kallweit , Russell King , Raju Rangoju , Prashanth Kumar K R , Tony Nguyen , Przemek Kitszel , Jian Shen , Jijie Shao , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-usb@vger.kernel.org Cc: Yury Norov , Yury Norov , Rasmus Villemoes , Andrew Morton Subject: [PATCH 6/9] net: avoid copies before linkmode_and() Date: Mon, 7 Sep 2026 17:54:35 -0400 Message-ID: <20260907215439.409858-7-ynorov@nvidia.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260907215439.409858-1-ynorov@nvidia.com> References: <20260907215439.409858-1-ynorov@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Avoid separate linkmode_copy() calls by passing the original source bitmap directly to linkmode_and(). In phy_ethtool_ksettings_set(), also use the return value of linkmode_and() when validating that the requested advertisement contains a supported link mode. Signed-off-by: Yury Norov --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 5 ++--- drivers/net/phy/phy.c | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c index cf881108fa57..5801da6100b8 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c @@ -205,7 +205,6 @@ int hclge_mac_connect_phy(struct hnae3_handle *handle) struct hclge_dev *hdev = vport->back; struct net_device *netdev = hdev->vport[0].nic.netdev; struct phy_device *phydev = hdev->hw.mac.phydev; - __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; int ret; if (!phydev) @@ -223,8 +222,8 @@ int hclge_mac_connect_phy(struct hnae3_handle *handle) return ret; } - linkmode_copy(mask, hdev->hw.mac.supported); - linkmode_and(phydev->supported, phydev->supported, mask); + linkmode_and(phydev->supported, phydev->supported, + hdev->hw.mac.supported); linkmode_copy(phydev->advertising, phydev->supported); /* supported flag is Pause and Asym Pause, but default advertising diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index fce9bc7be330..cd71186cd842 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1160,6 +1160,7 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev, const struct ethtool_link_ksettings *cmd) { __ETHTOOL_DECLARE_LINK_MODE_MASK(advertising); + bool has_advertising; u8 autoneg = cmd->base.autoneg; u8 duplex = cmd->base.duplex; u32 speed = cmd->base.speed; @@ -1167,17 +1168,15 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev, if (cmd->base.phy_address != phydev->mdio.addr) return -EINVAL; - linkmode_copy(advertising, cmd->link_modes.advertising); - /* We make sure that we don't pass unsupported values in to the PHY */ - linkmode_and(advertising, advertising, phydev->supported); + has_advertising = linkmode_and(advertising, cmd->link_modes.advertising, phydev->supported); /* Verify the settings we care about. */ if (autoneg != AUTONEG_ENABLE && autoneg != AUTONEG_DISABLE) return -EINVAL; if (autoneg == AUTONEG_ENABLE && - (linkmode_empty(advertising) || + (!has_advertising || !linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, phydev->supported))) return -EINVAL; -- 2.53.0