| Message ID | 20221119225650.1044591-17-alobakin@pm.me (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | treewide: fix object files shared between several modules | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
Hi Alexander, > From: Alexander Lobakin <alobakin@pm.me> > Sent: Saturday, November 19, 2022 11:10 PM > To: linux-kbuild@vger.kernel.org > Cc: Alexander Lobakin <alobakin@pm.me>; Masahiro Yamada > <masahiroy@kernel.org>; Nicolas Schier <nicolas@fjasle.eu>; Jens Axboe > <axboe@kernel.dk>; Boris Brezillon <bbrezillon@kernel.org>; Borislav Petkov > <bp@alien8.de>; Tony Luck <tony.luck@intel.com>; Miquel Raynal > <miquel.raynal@bootlin.com>; Vladimir Oltean <vladimir.oltean@nxp.com>; > Alexandre Belloni <alexandre.belloni@bootlin.com>; Derek Chickles > <dchickles@marvell.com>; Ioana Ciornei <ioana.ciornei@nxp.com>; Salil Mehta > <salil.mehta@huawei.com>; Sunil Goutham <sgoutham@marvell.com>; Grygorii > Strashko <grygorii.strashko@ti.com>; Daniel Scally <djrscally@gmail.com>; > Hans de Goede <hdegoede@redhat.com>; Mark Brown <broonie@kernel.org>; Andy > Shevchenko <andriy.shevchenko@linux.intel.com>; NXP Linux Team <linux- > imx@nxp.com>; netdev@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [PATCH 16/18] net: hns3: fix mixed module-builtin object > > With CONFIG_HNS3_HCLGE=y and CONFIG_HNS3_HCLGEVF=m, objects from > hns3/hns3_common are linked into a module and into vmlinux even > though the expected CFLAGS are different between builtins and > modules. > This is the same situation as fixed by > commit 637a642f5ca5 ("zstd: Fixing mixed module-builtin objects"). > There's also no need to duplicate such big piece of object code into > two modules. > > Introduce the new module, hclge_common, to provide the common > functions to both hclge and hclgevf. > > Fixes: eaa5607db377 ("net: hns3: refactor hclge_cmd_send with new > hclge_comm_cmd_send API") > Fixes: 1bfd6682e9b5 ("net: hns3: create new set of common rss get APIs for > PF and VF rss module") > Fixes: 287db5c40d15 ("net: hns3: create new set of common tqp stats APIs > for PF and VF reuse") > Suggested-by: Masahiro Yamada <masahiroy@kernel.org> > Signed-off-by: Alexander Lobakin <alobakin@pm.me> > --- > drivers/net/ethernet/hisilicon/Kconfig | 5 ++++ > drivers/net/ethernet/hisilicon/hns3/Makefile | 13 +++++---- > .../hns3/hns3_common/hclge_comm_cmd.c | 27 +++++++++++++------ > .../hns3/hns3_common/hclge_comm_cmd.h | 8 ------ > .../hns3/hns3_common/hclge_comm_rss.c | 17 ++++++++++++ > .../hns3/hns3_common/hclge_comm_tqp_stats.c | 5 ++++ > .../hisilicon/hns3/hns3pf/hclge_main.c | 2 ++ > .../hisilicon/hns3/hns3vf/hclgevf_main.c | 2 ++ > 8 files changed, 58 insertions(+), 21 deletions(-) > > diff --git a/drivers/net/ethernet/hisilicon/Kconfig > b/drivers/net/ethernet/hisilicon/Kconfig > index 3312e1d93c3b..9d2be93d0378 100644 > --- a/drivers/net/ethernet/hisilicon/Kconfig > +++ b/drivers/net/ethernet/hisilicon/Kconfig > @@ -100,11 +100,15 @@ config HNS3 > > if HNS3 > > +config HNS3_HCLGE_COMMON > + tristate > + This change does not looks right to me. We do not intend to expose these common files via kconfig and as a separate module. I would need time to address this in a different way. Please do not merge this change into the mainline! Thanks Salil > config HNS3_HCLGE > tristate "Hisilicon HNS3 HCLGE Acceleration Engine & Compatibility > Layer Support" > default m > depends on PCI_MSI > depends on PTP_1588_CLOCK_OPTIONAL > + select HNS3_HCLGE_COMMON > help > This selects the HNS3_HCLGE network acceleration engine & its > hardware > compatibility layer. The engine would be used in Hisilicon hip08 > family of > @@ -123,6 +127,7 @@ config HNS3_HCLGEVF > tristate "Hisilicon HNS3VF Acceleration Engine & Compatibility Layer > Support" > depends on PCI_MSI > depends on HNS3_HCLGE > + select HNS3_HCLGE_COMMON > help > This selects the HNS3 VF drivers network acceleration engine & its > hardware > compatibility layer. The engine would be used in Hisilicon hip08 > family of > diff --git a/drivers/net/ethernet/hisilicon/hns3/Makefile > b/drivers/net/ethernet/hisilicon/hns3/Makefile > index 6efea4662858..09d0e442b7fb 100644 > --- a/drivers/net/ethernet/hisilicon/hns3/Makefile > +++ b/drivers/net/ethernet/hisilicon/hns3/Makefile > @@ -13,17 +13,20 @@ obj-$(CONFIG_HNS3) += hnae3.o > obj-$(CONFIG_HNS3_ENET) += hns3.o > hns3-objs = hns3_enet.o hns3_ethtool.o hns3_debugfs.o > > +obj-$(CONFIG_HNS3_HCLGE_COMMON) += hclge_common.o > +hclge_common-objs := \ > + hns3_common/hclge_comm_cmd.o \ > + hns3_common/hclge_comm_rss.o \ > + hns3_common/hclge_comm_tqp_stats.o > + > hns3-$(CONFIG_HNS3_DCB) += hns3_dcbnl.o > > obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o > > -hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_mbx.o > hns3vf/hclgevf_devlink.o \ > - hns3_common/hclge_comm_cmd.o hns3_common/hclge_comm_rss.o > hns3_common/hclge_comm_tqp_stats.o > +hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_mbx.o > hns3vf/hclgevf_devlink.o > > obj-$(CONFIG_HNS3_HCLGE) += hclge.o > hclge-objs = hns3pf/hclge_main.o hns3pf/hclge_mdio.o hns3pf/hclge_tm.o \ > - hns3pf/hclge_mbx.o hns3pf/hclge_err.o hns3pf/hclge_debugfs.o > hns3pf/hclge_ptp.o hns3pf/hclge_devlink.o \ > - hns3_common/hclge_comm_cmd.o hns3_common/hclge_comm_rss.o > hns3_common/hclge_comm_tqp_stats.o > - > + hns3pf/hclge_mbx.o hns3pf/hclge_err.o hns3pf/hclge_debugfs.o > hns3pf/hclge_ptp.o hns3pf/hclge_devlink.o > > hclge-$(CONFIG_HNS3_DCB) += hns3pf/hclge_dcb.o > diff --git > a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c > b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c > index f671a63cecde..ff76ae425829 100644 > --- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c > @@ -33,7 +33,7 @@ static void hclge_comm_cmd_config_regs(struct > hclge_comm_hw *hw, > } > } > > -void hclge_comm_cmd_init_regs(struct hclge_comm_hw *hw) > +static void hclge_comm_cmd_init_regs(struct hclge_comm_hw *hw) > { > hclge_comm_cmd_config_regs(hw, &hw->cmq.csq); > hclge_comm_cmd_config_regs(hw, &hw->cmq.crq); > @@ -48,6 +48,7 @@ void hclge_comm_cmd_reuse_desc(struct hclge_desc *desc, > bool is_read) > else > desc->flag &= cpu_to_le16(~HCLGE_COMM_CMD_FLAG_WR); > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_reuse_desc, HNS3_HCLGE_COMMON); > > static void hclge_comm_set_default_capability(struct hnae3_ae_dev *ae_dev, > bool is_pf) > @@ -72,9 +73,10 @@ void hclge_comm_cmd_setup_basic_desc(struct hclge_desc > *desc, > if (is_read) > desc->flag |= cpu_to_le16(HCLGE_COMM_CMD_FLAG_WR); > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_setup_basic_desc, HNS3_HCLGE_COMMON); > > -int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev, > - struct hclge_comm_hw *hw, bool en) > +static int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev, > + struct hclge_comm_hw *hw, bool en) > { > struct hclge_comm_firmware_compat_cmd *req; > struct hclge_desc desc; > @@ -99,7 +101,7 @@ int hclge_comm_firmware_compat_config(struct > hnae3_ae_dev *ae_dev, > return hclge_comm_cmd_send(hw, &desc, 1); > } > > -void hclge_comm_free_cmd_desc(struct hclge_comm_cmq_ring *ring) > +static void hclge_comm_free_cmd_desc(struct hclge_comm_cmq_ring *ring) > { > int size = ring->desc_num * sizeof(struct hclge_desc); > > @@ -186,7 +188,7 @@ hclge_comm_parse_capability(struct hnae3_ae_dev > *ae_dev, bool is_pf, > set_bit(caps_map[i].local_bit, ae_dev->caps); > } > > -int hclge_comm_alloc_cmd_queue(struct hclge_comm_hw *hw, int ring_type) > +static int hclge_comm_alloc_cmd_queue(struct hclge_comm_hw *hw, int > ring_type) > { > struct hclge_comm_cmq_ring *ring = > (ring_type == HCLGE_COMM_TYPE_CSQ) ? &hw->cmq.csq : > @@ -204,9 +206,10 @@ int hclge_comm_alloc_cmd_queue(struct hclge_comm_hw > *hw, int ring_type) > return ret; > } > > -int hclge_comm_cmd_query_version_and_capability(struct hnae3_ae_dev > *ae_dev, > - struct hclge_comm_hw *hw, > - u32 *fw_version, bool is_pf) > +static int > +hclge_comm_cmd_query_version_and_capability(struct hnae3_ae_dev *ae_dev, > + struct hclge_comm_hw *hw, > + u32 *fw_version, bool is_pf) > { > struct hclge_comm_query_version_cmd *resp; > struct hclge_desc desc; > @@ -474,6 +477,7 @@ int hclge_comm_cmd_send(struct hclge_comm_hw *hw, > struct hclge_desc *desc, > > return ret; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_send, HNS3_HCLGE_COMMON); > > static void hclge_comm_cmd_uninit_regs(struct hclge_comm_hw *hw) > { > @@ -510,6 +514,7 @@ void hclge_comm_cmd_uninit(struct hnae3_ae_dev *ae_dev, > hclge_comm_free_cmd_desc(&cmdq->csq); > hclge_comm_free_cmd_desc(&cmdq->crq); > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_uninit, HNS3_HCLGE_COMMON); > > int hclge_comm_cmd_queue_init(struct pci_dev *pdev, struct hclge_comm_hw > *hw) > { > @@ -548,6 +553,7 @@ int hclge_comm_cmd_queue_init(struct pci_dev *pdev, > struct hclge_comm_hw *hw) > hclge_comm_free_cmd_desc(&hw->cmq.csq); > return ret; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_queue_init, HNS3_HCLGE_COMMON); > > int hclge_comm_cmd_init(struct hnae3_ae_dev *ae_dev, struct hclge_comm_hw > *hw, > u32 *fw_version, bool is_pf, > @@ -618,3 +624,8 @@ int hclge_comm_cmd_init(struct hnae3_ae_dev *ae_dev, > struct hclge_comm_hw *hw, > > return ret; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_init, HNS3_HCLGE_COMMON); > + > +MODULE_AUTHOR("Huawei Tech. Co., Ltd."); > +MODULE_DESCRIPTION("HCLGE Common module"); > +MODULE_LICENSE("GPL"); > diff --git > a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h > b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h > index b1f9383b418f..b16438d3885b 100644 > --- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h > @@ -441,17 +441,9 @@ static inline u32 hclge_comm_read_reg(u8 __iomem > *base, u32 reg) > #define hclge_comm_read_dev(a, reg) \ > hclge_comm_read_reg((a)->io_base, reg) > > -void hclge_comm_cmd_init_regs(struct hclge_comm_hw *hw); > -int hclge_comm_cmd_query_version_and_capability(struct hnae3_ae_dev > *ae_dev, > - struct hclge_comm_hw *hw, > - u32 *fw_version, bool is_pf); > -int hclge_comm_alloc_cmd_queue(struct hclge_comm_hw *hw, int ring_type); > int hclge_comm_cmd_send(struct hclge_comm_hw *hw, struct hclge_desc *desc, > int num); > void hclge_comm_cmd_reuse_desc(struct hclge_desc *desc, bool is_read); > -int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev, > - struct hclge_comm_hw *hw, bool en); > -void hclge_comm_free_cmd_desc(struct hclge_comm_cmq_ring *ring); > void hclge_comm_cmd_setup_basic_desc(struct hclge_desc *desc, > enum hclge_opcode_type opcode, > bool is_read); > diff --git > a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c > b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c > index e23729ac3bb8..b266e69b3675 100644 > --- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c > @@ -62,6 +62,7 @@ int hclge_comm_rss_init_cfg(struct hnae3_handle *nic, > > return 0; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_rss_init_cfg, HNS3_HCLGE_COMMON); > > void hclge_comm_get_rss_tc_info(u16 rss_size, u8 hw_tc_map, u16 > *tc_offset, > u16 *tc_valid, u16 *tc_size) > @@ -78,6 +79,7 @@ void hclge_comm_get_rss_tc_info(u16 rss_size, u8 > hw_tc_map, u16 *tc_offset, > tc_offset[i] = (hw_tc_map & BIT(i)) ? rss_size * i : 0; > } > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_tc_info, HNS3_HCLGE_COMMON); > > int hclge_comm_set_rss_tc_mode(struct hclge_comm_hw *hw, u16 *tc_offset, > u16 *tc_valid, u16 *tc_size) > @@ -113,6 +115,7 @@ int hclge_comm_set_rss_tc_mode(struct hclge_comm_hw > *hw, u16 *tc_offset, > > return ret; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_tc_mode, HNS3_HCLGE_COMMON); > > int hclge_comm_set_rss_hash_key(struct hclge_comm_rss_cfg *rss_cfg, > struct hclge_comm_hw *hw, const u8 *key, > @@ -143,6 +146,7 @@ int hclge_comm_set_rss_hash_key(struct > hclge_comm_rss_cfg *rss_cfg, > > return 0; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_hash_key, HNS3_HCLGE_COMMON); > > int hclge_comm_set_rss_tuple(struct hnae3_ae_dev *ae_dev, > struct hclge_comm_hw *hw, > @@ -185,11 +189,13 @@ int hclge_comm_set_rss_tuple(struct hnae3_ae_dev > *ae_dev, > rss_cfg->rss_tuple_sets.ipv6_fragment_en = req->ipv6_fragment_en; > return 0; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_tuple, HNS3_HCLGE_COMMON); > > u32 hclge_comm_get_rss_key_size(struct hnae3_handle *handle) > { > return HCLGE_COMM_RSS_KEY_SIZE; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_key_size, HNS3_HCLGE_COMMON); > > void hclge_comm_get_rss_type(struct hnae3_handle *nic, > struct hclge_comm_rss_tuple_cfg *rss_tuple_sets) > @@ -207,6 +213,7 @@ void hclge_comm_get_rss_type(struct hnae3_handle *nic, > else > nic->kinfo.rss_type = PKT_HASH_TYPE_NONE; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_type, HNS3_HCLGE_COMMON); > > int hclge_comm_parse_rss_hfunc(struct hclge_comm_rss_cfg *rss_cfg, > const u8 hfunc, u8 *hash_algo) > @@ -225,6 +232,7 @@ int hclge_comm_parse_rss_hfunc(struct > hclge_comm_rss_cfg *rss_cfg, > return -EINVAL; > } > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_parse_rss_hfunc, HNS3_HCLGE_COMMON); > > void hclge_comm_rss_indir_init_cfg(struct hnae3_ae_dev *ae_dev, > struct hclge_comm_rss_cfg *rss_cfg) > @@ -234,6 +242,7 @@ void hclge_comm_rss_indir_init_cfg(struct hnae3_ae_dev > *ae_dev, > for (i = 0; i < ae_dev->dev_specs.rss_ind_tbl_size; i++) > rss_cfg->rss_indirection_tbl[i] = i % rss_cfg->rss_size; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_rss_indir_init_cfg, HNS3_HCLGE_COMMON); > > int hclge_comm_get_rss_tuple(struct hclge_comm_rss_cfg *rss_cfg, int > flow_type, > u8 *tuple_sets) > @@ -267,6 +276,7 @@ int hclge_comm_get_rss_tuple(struct hclge_comm_rss_cfg > *rss_cfg, int flow_type, > > return 0; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_tuple, HNS3_HCLGE_COMMON); > > static void > hclge_comm_append_rss_msb_info(struct hclge_comm_rss_ind_tbl_cmd *req, > @@ -321,6 +331,7 @@ int hclge_comm_set_rss_indir_table(struct hnae3_ae_dev > *ae_dev, > } > return 0; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_indir_table, HNS3_HCLGE_COMMON); > > int hclge_comm_set_rss_input_tuple(struct hnae3_handle *nic, > struct hclge_comm_hw *hw, bool is_pf, > @@ -353,6 +364,7 @@ int hclge_comm_set_rss_input_tuple(struct hnae3_handle > *nic, > "failed to configure rss input, ret = %d.\n", ret); > return ret; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_input_tuple, HNS3_HCLGE_COMMON); > > void hclge_comm_get_rss_hash_info(struct hclge_comm_rss_cfg *rss_cfg, u8 > *key, > u8 *hfunc) > @@ -376,6 +388,7 @@ void hclge_comm_get_rss_hash_info(struct > hclge_comm_rss_cfg *rss_cfg, u8 *key, > if (key) > memcpy(key, rss_cfg->rss_hash_key, HCLGE_COMM_RSS_KEY_SIZE); > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_hash_info, HNS3_HCLGE_COMMON); > > void hclge_comm_get_rss_indir_tbl(struct hclge_comm_rss_cfg *rss_cfg, > u32 *indir, u16 rss_ind_tbl_size) > @@ -388,6 +401,7 @@ void hclge_comm_get_rss_indir_tbl(struct > hclge_comm_rss_cfg *rss_cfg, > for (i = 0; i < rss_ind_tbl_size; i++) > indir[i] = rss_cfg->rss_indirection_tbl[i]; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_indir_tbl, HNS3_HCLGE_COMMON); > > int hclge_comm_set_rss_algo_key(struct hclge_comm_hw *hw, const u8 hfunc, > const u8 *key) > @@ -429,6 +443,7 @@ int hclge_comm_set_rss_algo_key(struct hclge_comm_hw > *hw, const u8 hfunc, > > return 0; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_algo_key, HNS3_HCLGE_COMMON); > > static u8 hclge_comm_get_rss_hash_bits(struct ethtool_rxnfc *nfc) > { > @@ -507,6 +522,7 @@ int hclge_comm_init_rss_tuple_cmd(struct > hclge_comm_rss_cfg *rss_cfg, > > return 0; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_init_rss_tuple_cmd, HNS3_HCLGE_COMMON); > > u64 hclge_comm_convert_rss_tuple(u8 tuple_sets) > { > @@ -523,3 +539,4 @@ u64 hclge_comm_convert_rss_tuple(u8 tuple_sets) > > return tuple_data; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_convert_rss_tuple, HNS3_HCLGE_COMMON); > diff --git > a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c > b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c > index f3c9395d8351..6f1ba82f83e7 100644 > --- > a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c > +++ > b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c > @@ -26,6 +26,7 @@ u64 *hclge_comm_tqps_get_stats(struct hnae3_handle > *handle, u64 *data) > > return buff; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_tqps_get_stats, HNS3_HCLGE_COMMON); > > int hclge_comm_tqps_get_sset_count(struct hnae3_handle *handle) > { > @@ -33,6 +34,7 @@ int hclge_comm_tqps_get_sset_count(struct hnae3_handle > *handle) > > return kinfo->num_tqps * HCLGE_COMM_QUEUE_PAIR_SIZE; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_tqps_get_sset_count, HNS3_HCLGE_COMMON); > > u8 *hclge_comm_tqps_get_strings(struct hnae3_handle *handle, u8 *data) > { > @@ -56,6 +58,7 @@ u8 *hclge_comm_tqps_get_strings(struct hnae3_handle > *handle, u8 *data) > > return buff; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_tqps_get_strings, HNS3_HCLGE_COMMON); > > int hclge_comm_tqps_update_stats(struct hnae3_handle *handle, > struct hclge_comm_hw *hw) > @@ -99,6 +102,7 @@ int hclge_comm_tqps_update_stats(struct hnae3_handle > *handle, > > return 0; > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_tqps_update_stats, HNS3_HCLGE_COMMON); > > void hclge_comm_reset_tqp_stats(struct hnae3_handle *handle) > { > @@ -113,3 +117,4 @@ void hclge_comm_reset_tqp_stats(struct hnae3_handle > *handle) > memset(&tqp->tqp_stats, 0, sizeof(tqp->tqp_stats)); > } > } > +EXPORT_SYMBOL_NS_GPL(hclge_comm_reset_tqp_stats, HNS3_HCLGE_COMMON); > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > index 987271da6e9b..39a7ab51be31 100644 > --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > @@ -13133,6 +13133,8 @@ static void __exit hclge_exit(void) > module_init(hclge_init); > module_exit(hclge_exit); > > +MODULE_IMPORT_NS(HNS3_HCLGE_COMMON); No, we don’t want this. > + > MODULE_LICENSE("GPL"); > MODULE_AUTHOR("Huawei Tech. Co., Ltd."); > MODULE_DESCRIPTION("HCLGE Driver"); > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c > b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c > index db6f7cdba958..5d0a8801a375 100644 > --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c > @@ -3452,6 +3452,8 @@ static void __exit hclgevf_exit(void) > module_init(hclgevf_init); > module_exit(hclgevf_exit); > > +MODULE_IMPORT_NS(HNS3_HCLGE_COMMON); > + > MODULE_LICENSE("GPL"); > MODULE_AUTHOR("Huawei Tech. Co., Ltd."); > MODULE_DESCRIPTION("HCLGEVF Driver"); > -- > 2.38.1 >
From: Salil Mehta <salil.mehta@huawei.com> Date: Tue, 22 Nov 2022 12:39:04 +0000 > Hi Alexander, > > > From: Alexander Lobakin <alobakin@pm.me> > > Sent: Saturday, November 19, 2022 11:10 PM > > To: linux-kbuild@vger.kernel.org [...] > > diff --git a/drivers/net/ethernet/hisilicon/Kconfig > > b/drivers/net/ethernet/hisilicon/Kconfig > > index 3312e1d93c3b..9d2be93d0378 100644 > > --- a/drivers/net/ethernet/hisilicon/Kconfig > > +++ b/drivers/net/ethernet/hisilicon/Kconfig > > @@ -100,11 +100,15 @@ config HNS3 > > > > if HNS3 > > > > +config HNS3_HCLGE_COMMON > > + tristate > > + > > > This change does not looks right to me. We do not intend to expose these ...does not looks right to me -- because? The "wrong" line? > common files via kconfig and as a separate module. I would need time to > address this in a different way. I'm curious how 40 Kb of shared code can be addressed differently :D This Kconfig opt is hidden, it can only be selected by some other symbol -- in this case, by the PF and VF HCLGE options. Nothing gets exposed in a way it shouldn't be. Lemme guess, some cross-OS "shared code" in the OOT nobody in the upstream cares about (for good), how familiar :D IIRC ZSTD folks also weren't happy at first. > > Please do not merge this change into the mainline! > > > Thanks > Salil > > > > > config HNS3_HCLGE > > tristate "Hisilicon HNS3 HCLGE Acceleration Engine & Compatibility > > Layer Support" > > default m > > depends on PCI_MSI > > depends on PTP_1588_CLOCK_OPTIONAL > > + select HNS3_HCLGE_COMMON [...] > > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > > b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > > index 987271da6e9b..39a7ab51be31 100644 > > --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > > @@ -13133,6 +13133,8 @@ static void __exit hclge_exit(void) > > module_init(hclge_init); > > module_exit(hclge_exit); > > > > +MODULE_IMPORT_NS(HNS3_HCLGE_COMMON); > > > No, we don't want this. I can export the common functions globally, without a namespace if you prefer ._. > > > > > + > > MODULE_LICENSE("GPL"); > > MODULE_AUTHOR("Huawei Tech. Co., Ltd."); > > MODULE_DESCRIPTION("HCLGE Driver"); Thanks, Olek
Hi Alexander, > From: Alexander Lobakin <alobakin@mailbox.org> > Sent: Wednesday, November 23, 2022 10:08 PM > To: Salil Mehta <salil.mehta@huawei.com> > > From: Salil Mehta <salil.mehta@huawei.com> > Date: Tue, 22 Nov 2022 12:39:04 +0000 > > > Hi Alexander, > > > > > From: Alexander Lobakin <alobakin@pm.me> > > > Sent: Saturday, November 19, 2022 11:10 PM > > > To: linux-kbuild@vger.kernel.org > > [...] > > > > diff --git a/drivers/net/ethernet/hisilicon/Kconfig > > > b/drivers/net/ethernet/hisilicon/Kconfig > > > index 3312e1d93c3b..9d2be93d0378 100644 > > > --- a/drivers/net/ethernet/hisilicon/Kconfig > > > +++ b/drivers/net/ethernet/hisilicon/Kconfig > > > @@ -100,11 +100,15 @@ config HNS3 > > > > > > if HNS3 > > > > > > +config HNS3_HCLGE_COMMON > > > + tristate > > > + > > > > > > This change does not looks right to me. We do not intend to expose these > > ...does not looks right to me -- because? The "wrong" line? Agreed. Not very helpful. Sorry about that :( > > common files via kconfig and as a separate module. I would need time to > > address this in a different way. > > I'm curious how 40 Kb of shared code can be addressed differently :D > This Kconfig opt is hidden, it can only be selected by some other > symbol -- in this case, by the PF and VF HCLGE options. Nothing gets > exposed in a way it shouldn't be. There is a discussion to unify the VF and PF HCLGE driver for HNS3. This is to reduce the overhead of adding/maintaining features in both of the drivers. > Lemme guess, some cross-OS "shared code" in the OOT nobody in the > upstream cares about (for good), how familiar :D IIRC ZSTD folks > also weren't happy at first. We have HNAE interfacing layer above HCLGE, if any such out-of-tree code maintains the sanctity of that interface then there should not be an issue at HCLGE. These functions are never going to get directly used by such out-of-tree code. This is by design. > > Please do not merge this change into the mainline! > > > > > > Thanks > > Salil > > > > > > > > > config HNS3_HCLGE > > > tristate "Hisilicon HNS3 HCLGE Acceleration Engine & Compatibility > > > Layer Support" > > > default m > > > depends on PCI_MSI > > > depends on PTP_1588_CLOCK_OPTIONAL > > > + select HNS3_HCLGE_COMMON > > [...] > > > > diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > > > b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > > > index 987271da6e9b..39a7ab51be31 100644 > > > --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > > > +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c > > > @@ -13133,6 +13133,8 @@ static void __exit hclge_exit(void) > > > module_init(hclge_init); > > > module_exit(hclge_exit); > > > > > > +MODULE_IMPORT_NS(HNS3_HCLGE_COMMON); > > > > > > No, we don't want this. > > I can export the common functions globally, without a namespace > if you prefer ._. I was wondering if we could detect below condition in the Makefile itself and not depend upon separate namespace? "With CONFIG_HNS3_HCLGE=y and CONFIG_HNS3_HCLGEVF=m " Thanks Salil.
diff --git a/drivers/net/ethernet/hisilicon/Kconfig b/drivers/net/ethernet/hisilicon/Kconfig index 3312e1d93c3b..9d2be93d0378 100644 --- a/drivers/net/ethernet/hisilicon/Kconfig +++ b/drivers/net/ethernet/hisilicon/Kconfig @@ -100,11 +100,15 @@ config HNS3 if HNS3 +config HNS3_HCLGE_COMMON + tristate + config HNS3_HCLGE tristate "Hisilicon HNS3 HCLGE Acceleration Engine & Compatibility Layer Support" default m depends on PCI_MSI depends on PTP_1588_CLOCK_OPTIONAL + select HNS3_HCLGE_COMMON help This selects the HNS3_HCLGE network acceleration engine & its hardware compatibility layer. The engine would be used in Hisilicon hip08 family of @@ -123,6 +127,7 @@ config HNS3_HCLGEVF tristate "Hisilicon HNS3VF Acceleration Engine & Compatibility Layer Support" depends on PCI_MSI depends on HNS3_HCLGE + select HNS3_HCLGE_COMMON help This selects the HNS3 VF drivers network acceleration engine & its hardware compatibility layer. The engine would be used in Hisilicon hip08 family of diff --git a/drivers/net/ethernet/hisilicon/hns3/Makefile b/drivers/net/ethernet/hisilicon/hns3/Makefile index 6efea4662858..09d0e442b7fb 100644 --- a/drivers/net/ethernet/hisilicon/hns3/Makefile +++ b/drivers/net/ethernet/hisilicon/hns3/Makefile @@ -13,17 +13,20 @@ obj-$(CONFIG_HNS3) += hnae3.o obj-$(CONFIG_HNS3_ENET) += hns3.o hns3-objs = hns3_enet.o hns3_ethtool.o hns3_debugfs.o +obj-$(CONFIG_HNS3_HCLGE_COMMON) += hclge_common.o +hclge_common-objs := \ + hns3_common/hclge_comm_cmd.o \ + hns3_common/hclge_comm_rss.o \ + hns3_common/hclge_comm_tqp_stats.o + hns3-$(CONFIG_HNS3_DCB) += hns3_dcbnl.o obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o -hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_mbx.o hns3vf/hclgevf_devlink.o \ - hns3_common/hclge_comm_cmd.o hns3_common/hclge_comm_rss.o hns3_common/hclge_comm_tqp_stats.o +hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_mbx.o hns3vf/hclgevf_devlink.o obj-$(CONFIG_HNS3_HCLGE) += hclge.o hclge-objs = hns3pf/hclge_main.o hns3pf/hclge_mdio.o hns3pf/hclge_tm.o \ - hns3pf/hclge_mbx.o hns3pf/hclge_err.o hns3pf/hclge_debugfs.o hns3pf/hclge_ptp.o hns3pf/hclge_devlink.o \ - hns3_common/hclge_comm_cmd.o hns3_common/hclge_comm_rss.o hns3_common/hclge_comm_tqp_stats.o - + hns3pf/hclge_mbx.o hns3pf/hclge_err.o hns3pf/hclge_debugfs.o hns3pf/hclge_ptp.o hns3pf/hclge_devlink.o hclge-$(CONFIG_HNS3_DCB) += hns3pf/hclge_dcb.o diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c index f671a63cecde..ff76ae425829 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c @@ -33,7 +33,7 @@ static void hclge_comm_cmd_config_regs(struct hclge_comm_hw *hw, } } -void hclge_comm_cmd_init_regs(struct hclge_comm_hw *hw) +static void hclge_comm_cmd_init_regs(struct hclge_comm_hw *hw) { hclge_comm_cmd_config_regs(hw, &hw->cmq.csq); hclge_comm_cmd_config_regs(hw, &hw->cmq.crq); @@ -48,6 +48,7 @@ void hclge_comm_cmd_reuse_desc(struct hclge_desc *desc, bool is_read) else desc->flag &= cpu_to_le16(~HCLGE_COMM_CMD_FLAG_WR); } +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_reuse_desc, HNS3_HCLGE_COMMON); static void hclge_comm_set_default_capability(struct hnae3_ae_dev *ae_dev, bool is_pf) @@ -72,9 +73,10 @@ void hclge_comm_cmd_setup_basic_desc(struct hclge_desc *desc, if (is_read) desc->flag |= cpu_to_le16(HCLGE_COMM_CMD_FLAG_WR); } +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_setup_basic_desc, HNS3_HCLGE_COMMON); -int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev, - struct hclge_comm_hw *hw, bool en) +static int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev, + struct hclge_comm_hw *hw, bool en) { struct hclge_comm_firmware_compat_cmd *req; struct hclge_desc desc; @@ -99,7 +101,7 @@ int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev, return hclge_comm_cmd_send(hw, &desc, 1); } -void hclge_comm_free_cmd_desc(struct hclge_comm_cmq_ring *ring) +static void hclge_comm_free_cmd_desc(struct hclge_comm_cmq_ring *ring) { int size = ring->desc_num * sizeof(struct hclge_desc); @@ -186,7 +188,7 @@ hclge_comm_parse_capability(struct hnae3_ae_dev *ae_dev, bool is_pf, set_bit(caps_map[i].local_bit, ae_dev->caps); } -int hclge_comm_alloc_cmd_queue(struct hclge_comm_hw *hw, int ring_type) +static int hclge_comm_alloc_cmd_queue(struct hclge_comm_hw *hw, int ring_type) { struct hclge_comm_cmq_ring *ring = (ring_type == HCLGE_COMM_TYPE_CSQ) ? &hw->cmq.csq : @@ -204,9 +206,10 @@ int hclge_comm_alloc_cmd_queue(struct hclge_comm_hw *hw, int ring_type) return ret; } -int hclge_comm_cmd_query_version_and_capability(struct hnae3_ae_dev *ae_dev, - struct hclge_comm_hw *hw, - u32 *fw_version, bool is_pf) +static int +hclge_comm_cmd_query_version_and_capability(struct hnae3_ae_dev *ae_dev, + struct hclge_comm_hw *hw, + u32 *fw_version, bool is_pf) { struct hclge_comm_query_version_cmd *resp; struct hclge_desc desc; @@ -474,6 +477,7 @@ int hclge_comm_cmd_send(struct hclge_comm_hw *hw, struct hclge_desc *desc, return ret; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_send, HNS3_HCLGE_COMMON); static void hclge_comm_cmd_uninit_regs(struct hclge_comm_hw *hw) { @@ -510,6 +514,7 @@ void hclge_comm_cmd_uninit(struct hnae3_ae_dev *ae_dev, hclge_comm_free_cmd_desc(&cmdq->csq); hclge_comm_free_cmd_desc(&cmdq->crq); } +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_uninit, HNS3_HCLGE_COMMON); int hclge_comm_cmd_queue_init(struct pci_dev *pdev, struct hclge_comm_hw *hw) { @@ -548,6 +553,7 @@ int hclge_comm_cmd_queue_init(struct pci_dev *pdev, struct hclge_comm_hw *hw) hclge_comm_free_cmd_desc(&hw->cmq.csq); return ret; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_queue_init, HNS3_HCLGE_COMMON); int hclge_comm_cmd_init(struct hnae3_ae_dev *ae_dev, struct hclge_comm_hw *hw, u32 *fw_version, bool is_pf, @@ -618,3 +624,8 @@ int hclge_comm_cmd_init(struct hnae3_ae_dev *ae_dev, struct hclge_comm_hw *hw, return ret; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_cmd_init, HNS3_HCLGE_COMMON); + +MODULE_AUTHOR("Huawei Tech. Co., Ltd."); +MODULE_DESCRIPTION("HCLGE Common module"); +MODULE_LICENSE("GPL"); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h index b1f9383b418f..b16438d3885b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h @@ -441,17 +441,9 @@ static inline u32 hclge_comm_read_reg(u8 __iomem *base, u32 reg) #define hclge_comm_read_dev(a, reg) \ hclge_comm_read_reg((a)->io_base, reg) -void hclge_comm_cmd_init_regs(struct hclge_comm_hw *hw); -int hclge_comm_cmd_query_version_and_capability(struct hnae3_ae_dev *ae_dev, - struct hclge_comm_hw *hw, - u32 *fw_version, bool is_pf); -int hclge_comm_alloc_cmd_queue(struct hclge_comm_hw *hw, int ring_type); int hclge_comm_cmd_send(struct hclge_comm_hw *hw, struct hclge_desc *desc, int num); void hclge_comm_cmd_reuse_desc(struct hclge_desc *desc, bool is_read); -int hclge_comm_firmware_compat_config(struct hnae3_ae_dev *ae_dev, - struct hclge_comm_hw *hw, bool en); -void hclge_comm_free_cmd_desc(struct hclge_comm_cmq_ring *ring); void hclge_comm_cmd_setup_basic_desc(struct hclge_desc *desc, enum hclge_opcode_type opcode, bool is_read); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c index e23729ac3bb8..b266e69b3675 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c @@ -62,6 +62,7 @@ int hclge_comm_rss_init_cfg(struct hnae3_handle *nic, return 0; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_rss_init_cfg, HNS3_HCLGE_COMMON); void hclge_comm_get_rss_tc_info(u16 rss_size, u8 hw_tc_map, u16 *tc_offset, u16 *tc_valid, u16 *tc_size) @@ -78,6 +79,7 @@ void hclge_comm_get_rss_tc_info(u16 rss_size, u8 hw_tc_map, u16 *tc_offset, tc_offset[i] = (hw_tc_map & BIT(i)) ? rss_size * i : 0; } } +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_tc_info, HNS3_HCLGE_COMMON); int hclge_comm_set_rss_tc_mode(struct hclge_comm_hw *hw, u16 *tc_offset, u16 *tc_valid, u16 *tc_size) @@ -113,6 +115,7 @@ int hclge_comm_set_rss_tc_mode(struct hclge_comm_hw *hw, u16 *tc_offset, return ret; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_tc_mode, HNS3_HCLGE_COMMON); int hclge_comm_set_rss_hash_key(struct hclge_comm_rss_cfg *rss_cfg, struct hclge_comm_hw *hw, const u8 *key, @@ -143,6 +146,7 @@ int hclge_comm_set_rss_hash_key(struct hclge_comm_rss_cfg *rss_cfg, return 0; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_hash_key, HNS3_HCLGE_COMMON); int hclge_comm_set_rss_tuple(struct hnae3_ae_dev *ae_dev, struct hclge_comm_hw *hw, @@ -185,11 +189,13 @@ int hclge_comm_set_rss_tuple(struct hnae3_ae_dev *ae_dev, rss_cfg->rss_tuple_sets.ipv6_fragment_en = req->ipv6_fragment_en; return 0; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_tuple, HNS3_HCLGE_COMMON); u32 hclge_comm_get_rss_key_size(struct hnae3_handle *handle) { return HCLGE_COMM_RSS_KEY_SIZE; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_key_size, HNS3_HCLGE_COMMON); void hclge_comm_get_rss_type(struct hnae3_handle *nic, struct hclge_comm_rss_tuple_cfg *rss_tuple_sets) @@ -207,6 +213,7 @@ void hclge_comm_get_rss_type(struct hnae3_handle *nic, else nic->kinfo.rss_type = PKT_HASH_TYPE_NONE; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_type, HNS3_HCLGE_COMMON); int hclge_comm_parse_rss_hfunc(struct hclge_comm_rss_cfg *rss_cfg, const u8 hfunc, u8 *hash_algo) @@ -225,6 +232,7 @@ int hclge_comm_parse_rss_hfunc(struct hclge_comm_rss_cfg *rss_cfg, return -EINVAL; } } +EXPORT_SYMBOL_NS_GPL(hclge_comm_parse_rss_hfunc, HNS3_HCLGE_COMMON); void hclge_comm_rss_indir_init_cfg(struct hnae3_ae_dev *ae_dev, struct hclge_comm_rss_cfg *rss_cfg) @@ -234,6 +242,7 @@ void hclge_comm_rss_indir_init_cfg(struct hnae3_ae_dev *ae_dev, for (i = 0; i < ae_dev->dev_specs.rss_ind_tbl_size; i++) rss_cfg->rss_indirection_tbl[i] = i % rss_cfg->rss_size; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_rss_indir_init_cfg, HNS3_HCLGE_COMMON); int hclge_comm_get_rss_tuple(struct hclge_comm_rss_cfg *rss_cfg, int flow_type, u8 *tuple_sets) @@ -267,6 +276,7 @@ int hclge_comm_get_rss_tuple(struct hclge_comm_rss_cfg *rss_cfg, int flow_type, return 0; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_tuple, HNS3_HCLGE_COMMON); static void hclge_comm_append_rss_msb_info(struct hclge_comm_rss_ind_tbl_cmd *req, @@ -321,6 +331,7 @@ int hclge_comm_set_rss_indir_table(struct hnae3_ae_dev *ae_dev, } return 0; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_indir_table, HNS3_HCLGE_COMMON); int hclge_comm_set_rss_input_tuple(struct hnae3_handle *nic, struct hclge_comm_hw *hw, bool is_pf, @@ -353,6 +364,7 @@ int hclge_comm_set_rss_input_tuple(struct hnae3_handle *nic, "failed to configure rss input, ret = %d.\n", ret); return ret; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_input_tuple, HNS3_HCLGE_COMMON); void hclge_comm_get_rss_hash_info(struct hclge_comm_rss_cfg *rss_cfg, u8 *key, u8 *hfunc) @@ -376,6 +388,7 @@ void hclge_comm_get_rss_hash_info(struct hclge_comm_rss_cfg *rss_cfg, u8 *key, if (key) memcpy(key, rss_cfg->rss_hash_key, HCLGE_COMM_RSS_KEY_SIZE); } +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_hash_info, HNS3_HCLGE_COMMON); void hclge_comm_get_rss_indir_tbl(struct hclge_comm_rss_cfg *rss_cfg, u32 *indir, u16 rss_ind_tbl_size) @@ -388,6 +401,7 @@ void hclge_comm_get_rss_indir_tbl(struct hclge_comm_rss_cfg *rss_cfg, for (i = 0; i < rss_ind_tbl_size; i++) indir[i] = rss_cfg->rss_indirection_tbl[i]; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_get_rss_indir_tbl, HNS3_HCLGE_COMMON); int hclge_comm_set_rss_algo_key(struct hclge_comm_hw *hw, const u8 hfunc, const u8 *key) @@ -429,6 +443,7 @@ int hclge_comm_set_rss_algo_key(struct hclge_comm_hw *hw, const u8 hfunc, return 0; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_set_rss_algo_key, HNS3_HCLGE_COMMON); static u8 hclge_comm_get_rss_hash_bits(struct ethtool_rxnfc *nfc) { @@ -507,6 +522,7 @@ int hclge_comm_init_rss_tuple_cmd(struct hclge_comm_rss_cfg *rss_cfg, return 0; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_init_rss_tuple_cmd, HNS3_HCLGE_COMMON); u64 hclge_comm_convert_rss_tuple(u8 tuple_sets) { @@ -523,3 +539,4 @@ u64 hclge_comm_convert_rss_tuple(u8 tuple_sets) return tuple_data; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_convert_rss_tuple, HNS3_HCLGE_COMMON); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c index f3c9395d8351..6f1ba82f83e7 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c @@ -26,6 +26,7 @@ u64 *hclge_comm_tqps_get_stats(struct hnae3_handle *handle, u64 *data) return buff; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_tqps_get_stats, HNS3_HCLGE_COMMON); int hclge_comm_tqps_get_sset_count(struct hnae3_handle *handle) { @@ -33,6 +34,7 @@ int hclge_comm_tqps_get_sset_count(struct hnae3_handle *handle) return kinfo->num_tqps * HCLGE_COMM_QUEUE_PAIR_SIZE; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_tqps_get_sset_count, HNS3_HCLGE_COMMON); u8 *hclge_comm_tqps_get_strings(struct hnae3_handle *handle, u8 *data) { @@ -56,6 +58,7 @@ u8 *hclge_comm_tqps_get_strings(struct hnae3_handle *handle, u8 *data) return buff; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_tqps_get_strings, HNS3_HCLGE_COMMON); int hclge_comm_tqps_update_stats(struct hnae3_handle *handle, struct hclge_comm_hw *hw) @@ -99,6 +102,7 @@ int hclge_comm_tqps_update_stats(struct hnae3_handle *handle, return 0; } +EXPORT_SYMBOL_NS_GPL(hclge_comm_tqps_update_stats, HNS3_HCLGE_COMMON); void hclge_comm_reset_tqp_stats(struct hnae3_handle *handle) { @@ -113,3 +117,4 @@ void hclge_comm_reset_tqp_stats(struct hnae3_handle *handle) memset(&tqp->tqp_stats, 0, sizeof(tqp->tqp_stats)); } } +EXPORT_SYMBOL_NS_GPL(hclge_comm_reset_tqp_stats, HNS3_HCLGE_COMMON); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 987271da6e9b..39a7ab51be31 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -13133,6 +13133,8 @@ static void __exit hclge_exit(void) module_init(hclge_init); module_exit(hclge_exit); +MODULE_IMPORT_NS(HNS3_HCLGE_COMMON); + MODULE_LICENSE("GPL"); MODULE_AUTHOR("Huawei Tech. Co., Ltd."); MODULE_DESCRIPTION("HCLGE Driver"); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index db6f7cdba958..5d0a8801a375 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -3452,6 +3452,8 @@ static void __exit hclgevf_exit(void) module_init(hclgevf_init); module_exit(hclgevf_exit); +MODULE_IMPORT_NS(HNS3_HCLGE_COMMON); + MODULE_LICENSE("GPL"); MODULE_AUTHOR("Huawei Tech. Co., Ltd."); MODULE_DESCRIPTION("HCLGEVF Driver");
With CONFIG_HNS3_HCLGE=y and CONFIG_HNS3_HCLGEVF=m, objects from hns3/hns3_common are linked into a module and into vmlinux even though the expected CFLAGS are different between builtins and modules. This is the same situation as fixed by commit 637a642f5ca5 ("zstd: Fixing mixed module-builtin objects"). There's also no need to duplicate such big piece of object code into two modules. Introduce the new module, hclge_common, to provide the common functions to both hclge and hclgevf. Fixes: eaa5607db377 ("net: hns3: refactor hclge_cmd_send with new hclge_comm_cmd_send API") Fixes: 1bfd6682e9b5 ("net: hns3: create new set of common rss get APIs for PF and VF rss module") Fixes: 287db5c40d15 ("net: hns3: create new set of common tqp stats APIs for PF and VF reuse") Suggested-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Alexander Lobakin <alobakin@pm.me> --- drivers/net/ethernet/hisilicon/Kconfig | 5 ++++ drivers/net/ethernet/hisilicon/hns3/Makefile | 13 +++++---- .../hns3/hns3_common/hclge_comm_cmd.c | 27 +++++++++++++------ .../hns3/hns3_common/hclge_comm_cmd.h | 8 ------ .../hns3/hns3_common/hclge_comm_rss.c | 17 ++++++++++++ .../hns3/hns3_common/hclge_comm_tqp_stats.c | 5 ++++ .../hisilicon/hns3/hns3pf/hclge_main.c | 2 ++ .../hisilicon/hns3/hns3vf/hclgevf_main.c | 2 ++ 8 files changed, 58 insertions(+), 21 deletions(-) -- 2.38.1