From patchwork Wed Feb 28 15:59:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larysa Zaremba X-Patchwork-Id: 207911 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3446965dyb; Wed, 28 Feb 2024 08:12:18 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVbyOvqoZguSPGjzXirTOH4cNwBpNXfDqG14JqdKO/arn+6Qsk7GtArzJgQ11uGsiOlbbKsoeBNk2P9l6eKvEObRq9dUQ== X-Google-Smtp-Source: AGHT+IGLhUvewiLmKpkNtEM6KP/bquUpzJFokDPeyw7orH8sJyA55sDqDxE7NUMaH539ZHzqmFCz X-Received: by 2002:a17:906:eb59:b0:a3f:d2f3:d226 with SMTP id mc25-20020a170906eb5900b00a3fd2f3d226mr114615ejb.17.1709136738741; Wed, 28 Feb 2024 08:12:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709136738; cv=pass; d=google.com; s=arc-20160816; b=fXU248C15LLJvUJe4RLSTwj9axKGjfzB6k+UkLHFFu7GUR07liWQQrAKAFzDblzBtp t7MDkak9MvGAQdD/MVa0pyX8nu8OpXNMrDPYh15ML8YwhfRG5A2rad5y3pSeJ5JC1mdt ZGjF6vmABoOiPc0/nyypVC16QhhjkNGnMzwpIpR6dGy1s4wVoWd/bR0UEelSkO7RiSjc bDbjlqS6REppxsFJUdvx8nWoF45fxrSkqYa6PEAzkXb54K7wVWMcm99lwEWJQcTQMnyB HxgGhjTrrVoxGocifHJAE5FtbPn2zfNylloya+hcnULa2UQWRZNrD0eqA7cApTqKQ49v M/GQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=l6jluIBiYyAZT+5MxIjbRkWwNlF/wEafoYy7rn3oXQI=; fh=XF5dR1hZ6bmHhiCesO+5NPfXhTaDjas2E0STvyrxXLQ=; b=EsYwCrHt4AdQgItQRUr0zBEYFJ7eskcr+I4KTjzhLWYMp5bD+jIJ0PrSWsxQYdd+UC lB7pH0fnnLMSPe+nazJTen4rCggD4vZiQW+2yZa1dKIppmhFjULwlcrP74WDbChgfixZ mMyw+kPR2RuO59j7Loyu+szoQByh4aoVi6GR6GSdLbUIh4S/5G7XaVtau3F3axUvmQH5 P0IQ8TBLYjOfthHFdtrBtHLJ2SFAvA8hzRn01FvoxRdYQH4603qUsclou9SDkMpj/IFI 4pAitbWbYpdgKnomXrNOLhijKuz+qBCprxx7hpjKXIsy/m1ypNdDg6I+G1vVVVivAH1z hv3Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aoCYPUHg; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-85320-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85320-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id h6-20020a1709066d8600b00a431d6cc657si1724683ejt.782.2024.02.28.08.12.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 08:12:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-85320-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=aoCYPUHg; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-85320-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85320-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id EA22B1F2B735 for ; Wed, 28 Feb 2024 16:05:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F2F391649C8; Wed, 28 Feb 2024 16:04:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="aoCYPUHg" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B40515F316; Wed, 28 Feb 2024 16:04:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709136266; cv=none; b=k23oYlnQ6VLkPtZ56vygT0N+VIHTMktz8kI/sBWmHBjzdIxZ9WAjYTGGOReV+c3SAf3rK+Ct+Mb4OT2kEsZGh8Hc6Nc+jGB146GUxTCz6CBWSTLvqL2DX+9u2V1yOlrg63zsaXA+tmOqRzroT701fl6Qx+XPnsK83QUiJxZrqR4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709136266; c=relaxed/simple; bh=Bjrp1tTlD6ezzWfPdYM+Tqz2X4qeW6q9D/krqY8Q3+k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hq4p5Rv0eAxEuAQdD4ph+cgjhfAVpYjdzPKPkoZun0P/R3PxE1G2t8oIXkPdw7M3zPcCN6zZm6VxWTPwVZ7EvifiioP/A6YoUBpm1qXpPE5Wb1PIwZ0aBv+BDpDDRfFXMdMwEHCrE2pLpBwN+qaRkjs1qj1SHI84HGYfHczmQ5c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=aoCYPUHg; arc=none smtp.client-ip=198.175.65.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709136264; x=1740672264; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Bjrp1tTlD6ezzWfPdYM+Tqz2X4qeW6q9D/krqY8Q3+k=; b=aoCYPUHgwnZd05PMTrhcI8yQ9mIdLjJsI6ae/CC9rk8IQ8vuSSXjp2qJ h9nTrctbQqVGZYkZBSiig4jKXwlO4uCFQolEJJrfnm/ssvKQYn8Wizqmd wlpVpojaNy9P1GOxwUSc9HjgRWsSCKQrS3xfGJ4ie7d2dGzF643maEafq G+rVJ0e0z4YgXqzNb7cQd7Z4TYMzrV5fYlrKuanSoqvdy4z19s4pf+kFM T+YGHD/Xk++4V1HN7gTKIUCdd2dLcOBFOeJuGC9ULvH5wfSpfBdFvbHwx Zj9IxzjqPWVLR7K30uu8bmBmBzGiJYZ3PUW6rsAq0I7U/Qt/ZUjEA4hdZ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10998"; a="3706637" X-IronPort-AV: E=Sophos;i="6.06,190,1705392000"; d="scan'208";a="3706637" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2024 08:04:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,190,1705392000"; d="scan'208";a="7527818" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by orviesa009.jf.intel.com with ESMTP; 28 Feb 2024 08:04:18 -0800 Received: from lincoln.igk.intel.com (lincoln.igk.intel.com [10.102.21.235]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 87BD536825; Wed, 28 Feb 2024 16:04:15 +0000 (GMT) From: Larysa Zaremba To: intel-wired-lan@lists.osuosl.org Cc: Larysa Zaremba , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Mateusz Pacuszka , Tony Nguyen , Lukasz Plachno , Jakub Buchocki , Pawel Kaminski , Przemek Kitszel , Michal Swiatkowski , Mateusz Polchlopek , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Pawel Chmielewski , Jesse Brandeburg Subject: [PATCH iwl-net 5/5] ice: Implement VF LLDP TX support for VF Date: Wed, 28 Feb 2024 16:59:49 +0100 Message-ID: <20240228155957.408036-6-larysa.zaremba@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240228155957.408036-1-larysa.zaremba@intel.com> References: <20240228155957.408036-1-larysa.zaremba@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792159764958298846 X-GMAIL-MSGID: 1792159764958298846 From: Mateusz Pacuszka Add option to enable transmit LLDP on single trusted VF via a sysfs entry, for example: echo '1' > /sys/class/net//device/virtfn0/transmit_lldp Signed-off-by: Mateusz Pacuszka Co-developed-by: Jakub Buchocki Signed-off-by: Jakub Buchocki Signed-off-by: Larysa Zaremba --- drivers/net/ethernet/intel/ice/ice_lib.c | 3 + drivers/net/ethernet/intel/ice/ice_sriov.c | 4 + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 163 ++++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_vf_lib.h | 14 ++ 4 files changed, 184 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index 19f08f2e0139..32b1ed74bfa4 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -2062,6 +2062,9 @@ void ice_dis_sw_lldp(struct ice_pf *pf) if (vsi && vsi->rx_lldp_ena) ice_cfg_sw_lldp(vsi, false, false); + + if (vf->transmit_lldp) + ice_handle_vf_tx_lldp(vf, false); } } diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c index a94a1c48c3de..0fe07330cc1a 100644 --- a/drivers/net/ethernet/intel/ice/ice_sriov.c +++ b/drivers/net/ethernet/intel/ice/ice_sriov.c @@ -832,6 +832,10 @@ static int ice_create_vf_entries(struct ice_pf *pf, u16 num_vfs) vf->vfdev = vfdev; vf->vf_sw_id = pf->first_sw; + err = ice_init_vf_sysfs(vf); + if (err) + goto err_free_entries; + pci_dev_get(vfdev); /* set default number of MSI-X */ diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c index 2de6ef3661cf..244d0ac7c9c4 100644 --- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c @@ -577,6 +577,165 @@ void ice_ena_all_vfs_rx_lldp(struct ice_pf *pf) } } +static bool ice_is_transmit_lldp_enabled(struct ice_pf *pf) +{ + struct ice_vf *vf; + unsigned int bkt; + + ice_for_each_vf(pf, bkt, vf) { + if (vf->transmit_lldp) + return true; + } + + return false; +} + +/** + * ice_handle_vf_tx_lldp - enable/disable LLDP TX on VF + * @vf: VF to configure Tx LLDP for + * @ena: Enable or disable Tx LLDP switch rule + * + * Configure Tx filters for VF to transmit LLDP + */ +int ice_handle_vf_tx_lldp(struct ice_vf *vf, bool ena) +{ + void (*allow_override)(struct ice_vsi_ctx *ctx); + struct ice_vsi *vsi, *main_vsi; + struct ice_pf *pf = vf->pf; + struct device *dev; + bool prev_ena; + + dev = ice_pf_to_dev(pf); + vsi = ice_get_vf_vsi(vf); + main_vsi = ice_get_main_vsi(pf); + if (!vsi || !main_vsi) + return -ENOENT; + + if (ena && test_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags)) { + dev_err(dev, "Transmit LLDP VF is only allowed when FW LLDP Agent is disabled"); + return -EPERM; + } + + if (ena && ice_is_transmit_lldp_enabled(pf)) { + dev_err(dev, "Only a single VF per port is allowed to transmit LLDP packets, ignoring the settings"); + return -EPERM; + } + + allow_override = ena ? ice_vsi_ctx_set_allow_override + : ice_vsi_ctx_clear_allow_override; + prev_ena = vsi->info.sec_flags & ICE_AQ_VSI_SEC_FLAG_ALLOW_DEST_OVRD; + + if (ice_vsi_update_security(vsi, allow_override)) + return -ENOENT; + + /* If VF can transmit LLDP, then PF cannot and vice versa */ + allow_override = ena ? ice_vsi_ctx_clear_allow_override + : ice_vsi_ctx_set_allow_override; + + if (ice_vsi_update_security(main_vsi, allow_override)) { + allow_override = prev_ena ? ice_vsi_ctx_set_allow_override + : ice_vsi_ctx_clear_allow_override; + ice_vsi_update_security(vsi, allow_override); + return -ENOENT; + } + + vf->transmit_lldp = ena; + return 0; +} + +static ssize_t ice_transmit_lldp_vf_attr_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct ice_vf *vf = ice_get_vf_by_dev(dev); + + if (!vf) + return -ENOENT; + + return sysfs_emit(buf, "%u\n", vf->transmit_lldp); +} + +static ssize_t ice_transmit_lldp_vf_attr_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct pci_dev *vfdev = container_of(dev, struct pci_dev, dev); + struct ice_vf *vf = ice_get_vf_by_dev(dev); + struct pci_dev *pdev = vfdev->physfn; + struct ice_pf *pf; + bool ena; + int err; + + if (!vf) + return -ENOENT; + + pf = pci_get_drvdata(pdev); + if (!pf) + return -ENOENT; + + err = kstrtobool(buf, &ena); + if (err) + return -EINVAL; + + if (ena == vf->transmit_lldp) { + dev_dbg(dev, "Transmit LLDP value already set for VF %d", + vf->vf_id); + return count; + } + + err = ice_handle_vf_tx_lldp(vf, ena); + if (err) + return err; + + return count; +} + +static int ice_init_vf_transmit_lldp_sysfs(struct ice_vf *vf) +{ + struct device_attribute tmp = __ATTR(transmit_lldp, 0644, + ice_transmit_lldp_vf_attr_show, + ice_transmit_lldp_vf_attr_store); + + vf->transmit_lldp_attr = tmp; + + return device_create_file(&vf->vfdev->dev, &vf->transmit_lldp_attr); +} + +/** + * ice_init_vf_sysfs - Initialize sysfs entries for a VF + * @vf: VF to init sysfs for + * + * Initialize sysfs entries (accessible from the host) for a VF + */ +int ice_init_vf_sysfs(struct ice_vf *vf) +{ + struct device *dev = ice_pf_to_dev(vf->pf); + int err = 0; + + if (!vf->vfdev) { + dev_err(dev, "%s: no vfdev", __func__); + return -ENOENT; + } + + err = ice_init_vf_transmit_lldp_sysfs(vf); + if (err) + dev_err(dev, "could not init transmit_lldp sysfs entry, err: %d", + err); + + return err; +} + +static int ice_vf_apply_tx_lldp(struct ice_vf *vf) +{ + if (!vf->transmit_lldp) + return 0; + + /* Disable it so it can be applied again. */ + vf->transmit_lldp = false; + + return ice_handle_vf_tx_lldp(vf, true); +} + /** * ice_vf_rebuild_host_cfg - host admin configuration is persistent across reset * @vf: VF to rebuild host configuration on @@ -607,6 +766,10 @@ static void ice_vf_rebuild_host_cfg(struct ice_vf *vf) dev_err(dev, "failed to rebuild spoofchk configuration for VF %d\n", vf->vf_id); + if (ice_vf_apply_tx_lldp(vf)) + dev_err(dev, "failed to rebuild transmit LLDP configuration for VF %d\n", + vf->vf_id); + /* rebuild aggregator node config for main VF VSI */ ice_vf_rebuild_aggregator_node_cfg(vsi); } diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.h b/drivers/net/ethernet/intel/ice/ice_vf_lib.h index 81f734f2ae41..63e53591541e 100644 --- a/drivers/net/ethernet/intel/ice/ice_vf_lib.h +++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.h @@ -104,9 +104,11 @@ struct ice_vf { struct ice_vlan port_vlan_info; /* Port VLAN ID, QoS, and TPID */ struct virtchnl_vlan_caps vlan_v2_caps; struct ice_mbx_vf_info mbx_info; + struct device_attribute transmit_lldp_attr; u8 pf_set_mac:1; /* VF MAC address set by VMM admin */ u8 trusted:1; u8 spoofchk:1; + u8 transmit_lldp:1; u8 link_forced:1; u8 link_up:1; /* only valid if VF link is forced */ /* VSI indices - actual VSI pointers are maintained in the PF structure @@ -234,6 +236,8 @@ void ice_reset_all_vfs(struct ice_pf *pf); struct ice_vsi *ice_get_vf_ctrl_vsi(struct ice_pf *pf, struct ice_vsi *vsi); void ice_ena_all_vfs_rx_lldp(struct ice_pf *pf); int ice_ena_vf_rx_lldp(struct ice_vf *vf); +int ice_init_vf_sysfs(struct ice_vf *vf); +int ice_handle_vf_tx_lldp(struct ice_vf *vf, bool ena); #else /* CONFIG_PCI_IOV */ static inline struct ice_vf *ice_get_vf_by_id(struct ice_pf *pf, u16 vf_id) { @@ -313,6 +317,16 @@ ice_get_vf_ctrl_vsi(struct ice_pf *pf, struct ice_vsi *vsi) static inline void ice_ena_all_vfs_rx_lldp(struct ice_pf *pf) { } + +static inline int ice_handle_vf_tx_lldp(struct ice_vf *vf, bool ena) +{ + return -EOPNOTSUPP; +} + +static inline int ice_init_vf_sysfs(struct ice_vf *vf) +{ + return 0; +} #endif /* !CONFIG_PCI_IOV */ #endif /* _ICE_VF_LIB_H_ */