Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp5248765rdb; Wed, 13 Dec 2023 03:31:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IGVpAApTekB3zvJTq/G0RDS3X3l8E9Jhy6pIBP5jD0kb7TnC4PqFM1MSmR1W1daw1wbErvL X-Received: by 2002:a9d:7acd:0:b0:6d9:d67f:736f with SMTP id m13-20020a9d7acd000000b006d9d67f736fmr7800339otn.36.1702467082079; Wed, 13 Dec 2023 03:31:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702467082; cv=none; d=google.com; s=arc-20160816; b=XQewKrZYGuVUPhexz7dM83bdnOL1O7VIaOnb6SJKmokWMo+RNYp4fR48xt6qYiuQqQ 84n63+UNmJsFkhkaXqAljEIEpzyVsT8N5RfCiWURJXEvczG68q6agJRkNPxglXeylM5B nGbOQ1TEdrWxlAGmr8Cp9GExHWjKIA6oYXC7FBpPGs9GVJ/larsU+s+p5fh9EusRSZqx 4paVF6z6cqGyS5CT8UlBupqNqXUG6zGSTFErYE0CGMK7Znp47EPOoGWDm4EMQEZYTZrp LQi8qrwagdl0Slk94IecxsLuckoTCumb3itLkG7fMBjn5/gpU9JWELqJoxSAVUe5bLbS iuJA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=STIuknlAbzpwO/rIOH5sD+tSI+LhexZmjxtNMhZWYis=; fh=QtEizEezWMPccSW0U8o1LFLT1SqErEb68UiNokAWV6o=; b=wy63s0P6zr9I6xWbWe7VtwCGvoAO/bEscOR5IAADV8GDXkQlW19ZgbGu/VFtwRnnnK slASuFtWLDYmhMyecaPAplnwjQmEt21V9smHZfuO6o/7OSo9YdeARBv+e5LcjrGR9i5N u8p6D//v+nJNJAG6xFl7srwwytMhaZs/JNvSgTWUVt0EO4/5DhRgTj1d9NUWaQAxBmzG y8DwpfIB+eJ2Og4IqQwxwnb99/S05sDdNRPh9K6AjJamih7FPo5bXrZyHLAnan2Lbgl9 swe8sqoPrLqH//ywdHm4Mx0J4THObq3dBO9vl7k03auVFJgtXvYRSBvvYVfnZ3v01R2C HXYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=WG3yGMf2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id b12-20020a63eb4c000000b005be1ee5be76si9173776pgk.373.2023.12.13.03.31.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 03:31:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=WG3yGMf2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 3A5EC804305A; Wed, 13 Dec 2023 03:31:16 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233411AbjLMLax (ORCPT + 99 others); Wed, 13 Dec 2023 06:30:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232736AbjLMLav (ORCPT ); Wed, 13 Dec 2023 06:30:51 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFAC1A5; Wed, 13 Dec 2023 03:30:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702467058; x=1734003058; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=jY+jItOHug8fOIfc4VC5HBRpAmrVmd7Jl4V3nFTVHdQ=; b=WG3yGMf2lE1RcOLivchDzIfslCzKhIku7ST0yPhWzbfTcer2+ZhdTYvw kxTvI7APyWuxXLwmgrrl/QG5cHn3xa/xC6zHyUFCbqtCeK21mbLz7Tioe QCjfm54B7Y2xUcF5QMLBE+QgpPNvC6DGTgg9P3AVysz8drq+Mg12ZEUtB u73Kiqfg0uwvs8qlUwpvnq2D2cyeHURl+csck8MckBrdMdi6Ygqto+BwX +O4TMaSOJVwE0CxaFnd28JS/t+IOfCUPjyDoRMY37bSmBKfZyfdZtui28 QxVo7PdJ/yJAhRvQ5y6oXobwibV5Pwebt89ic6bluCZd77otz5dGZNW5+ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10922"; a="375103849" X-IronPort-AV: E=Sophos;i="6.04,272,1695711600"; d="scan'208";a="375103849" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 03:30:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10922"; a="844279378" X-IronPort-AV: E=Sophos;i="6.04,272,1695711600"; d="scan'208";a="844279378" Received: from newjersey.igk.intel.com ([10.102.20.203]) by fmsmga004.fm.intel.com with ESMTP; 13 Dec 2023 03:30:36 -0800 From: Alexander Lobakin To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Alexander Lobakin , Maciej Fijalkowski , Michal Kubiak , Larysa Zaremba , Alexander Duyck , Yunsheng Lin , David Christensen , Jesper Dangaard Brouer , Ilias Apalodimas , Paul Menzel , netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v7 00/12] net: intel: start The Great Code Dedup + Page Pool for iavf Date: Wed, 13 Dec 2023 12:28:23 +0100 Message-ID: <20231213112835.2262651-1-aleksander.lobakin@intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 13 Dec 2023 03:31:16 -0800 (PST) Here's a two-shot: introduce Intel Ethernet common library (libie) and switch iavf to Page Pool. Details are in the commit messages; here's a summary: Not a secret there's a ton of code duplication between two and more Intel ethernet modules. Before introducing new changes, which would need to be copied over again, start decoupling the already existing duplicate functionality into a new module, which will be shared between several Intel Ethernet drivers. The first name that came to my mind was "libie" -- "Intel Ethernet common library". Also this sounds like "lovelie" (-> one word, no "lib I E" pls) and can be expanded as "lib Internet Explorer" :P The series is only the beginning. From now on, adding every new feature or doing any good driver refactoring will remove much more lines than add for quite some time. There's a basic roadmap with some deduplications planned already, not speaking of that touching every line now asks: "can I share this?". The final destination is very ambitious: have only one unified driver for at least i40e, ice, iavf, and idpf with a struct ops for each generation. That's never gonna happen, right? But you still can at least try. PP conversion for iavf lands within the same series as these two are tied closely. libie will support Page Pool model only, so that a driver can't use much of the lib until it's converted. iavf is only the example, the rest will eventually be converted soon on a per-driver basis. That is when it gets really interesting. Stay tech. Alexander Lobakin (12): page_pool: make sure frag API fields don't span between cachelines page_pool: don't use driver-set flags field directly net: intel: introduce Intel Ethernet common library iavf: kill "legacy-rx" for good iavf: drop page splitting and recycling page_pool: constify some read-only function arguments page_pool: add DMA-sync-for-CPU inline helper libie: add Rx buffer management (via Page Pool) iavf: pack iavf_ring more efficiently iavf: switch to Page Pool libie: add common queue stats iavf: switch queue stats to libie MAINTAINERS | 3 +- drivers/net/ethernet/intel/Kconfig | 6 + drivers/net/ethernet/intel/Makefile | 1 + drivers/net/ethernet/intel/i40e/i40e_common.c | 253 ------- drivers/net/ethernet/intel/i40e/i40e_main.c | 1 + .../net/ethernet/intel/i40e/i40e_prototype.h | 7 - drivers/net/ethernet/intel/i40e/i40e_txrx.c | 72 +- drivers/net/ethernet/intel/i40e/i40e_type.h | 88 --- drivers/net/ethernet/intel/iavf/iavf.h | 2 +- drivers/net/ethernet/intel/iavf/iavf_common.c | 253 ------- .../net/ethernet/intel/iavf/iavf_ethtool.c | 234 +------ drivers/net/ethernet/intel/iavf/iavf_main.c | 42 +- .../net/ethernet/intel/iavf/iavf_prototype.h | 7 - drivers/net/ethernet/intel/iavf/iavf_txrx.c | 624 ++++-------------- drivers/net/ethernet/intel/iavf/iavf_txrx.h | 174 +---- drivers/net/ethernet/intel/iavf/iavf_type.h | 90 --- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 17 +- .../net/ethernet/intel/ice/ice_lan_tx_rx.h | 316 --------- drivers/net/ethernet/intel/ice/ice_main.c | 1 + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 74 +-- drivers/net/ethernet/intel/libie/Kconfig | 9 + drivers/net/ethernet/intel/libie/Makefile | 7 + drivers/net/ethernet/intel/libie/rx.c | 179 +++++ drivers/net/ethernet/intel/libie/stats.c | 121 ++++ include/linux/net/intel/libie/rx.h | 259 ++++++++ include/linux/net/intel/libie/stats.h | 179 +++++ include/net/page_pool/helpers.h | 34 +- include/net/page_pool/types.h | 19 +- net/core/page_pool.c | 42 +- 29 files changed, 1058 insertions(+), 2056 deletions(-) create mode 100644 drivers/net/ethernet/intel/libie/Kconfig create mode 100644 drivers/net/ethernet/intel/libie/Makefile create mode 100644 drivers/net/ethernet/intel/libie/rx.c create mode 100644 drivers/net/ethernet/intel/libie/stats.c create mode 100644 include/linux/net/intel/libie/rx.h create mode 100644 include/linux/net/intel/libie/stats.h --- From v6[0]: * #04: resolve ethtool_puts() Git conflict (Jakub); * #06: pick RB from Ilias; * no functional changes. From v5[1]: * drop Page Pool DMA shortcut: will pick up Eric's more global DMA sync optimization[1] and expand it to cover both IOMMU and direct DMA a bit later (Yunsheng); * drop per-queue Page Pool Ethtool stats: they are now exported via generic Netlink interface (Jakub); * #01: leave a comment why exactly this alignment (Jakub, Yunsheng); * #08: make use of page_pool_params::netdev when calculating PP params; * #08: rename ``libie_rx_queue`` -> ``libie_buf_queue``. From v4[3]: * make use of Jakub's &page_pool_params split; * #01: prevent frag fields from spanning into 2 cachelines after splitting &page_pool_params into fast and slow; * #02-03: bring back the DMA sync shortcut, now as a per-page flag (me, Yunsheng); * #04: let libie have its own Kconfig to stop further bloating of poor intel/Kconfig; * #06: merge page split-reuse-recycle drop into one commit (Alex); * #07: decouple constifying of several Page Pool function arguments into a separate commit, constify some more; * #09: stop abusing internal PP fields in the driver code (Yunsheng); * #09: calculate DMA sync size (::max_len) correctly: within one page, not one buffer (Yunsheng); * #10: decouple rearranging &iavf_ring into separate commit, optimize it even more; * #11: let the driver get back to the last descriptor to process after an skb allocation fail, don't drop it (Alex); * #11: stop touching unrelated stuff like watchdog timeout etc. (Alex); * fix "Return:" in the kdoc (now `W=12 C=1` is clean), misc typos. From v3[4]: * base on the latest net-next, update bloat-o-meter and perf stats; * split generic PP optimizations into a separate series; * drop "optimize hotpath a bunch" commit: a lot of [controversial] changes in one place, worth own series (Alex); * 02: pick Rev-by (Alex); * 03: move in-place recycling removal here from the dropped patch; * 05: new, add libie Rx buffer API separatelly from IAVF changes; * 05-06: use new "hybrid" allocation API from[5] to reduce memory usage when a page can fit more than 1 truesize (also asked by David); * 06: merge with "always use order-0 page" commit to reduce diffs and simplify things (Alex); * 09: fix page_alloc_fail counter. From v2[6]: * 0006: fix page_pool.h include in OcteonTX2 files (Jakub, Patchwork); * no functional changes. From v1[7]: * 0006: new (me, Jakub); * 0008: give the helpers more intuitive names (Jakub, Ilias); * -^-: also expand their kdoc a bit for the same reason; * -^-: fix kdoc copy-paste issue (Patchwork, Jakub); * 0011: drop `inline` from C file (Patchwork, Jakub). [0] https://lore.kernel.org/netdev/20231207172010.1441468-1-aleksander.lobakin@intel.com [1] https://lore.kernel.org/netdev/20231124154732.1623518-1-aleksander.lobakin@intel.com [2] https://lore.kernel.org/netdev/20221115182841.2640176-1-edumazet@google.com [3] https://lore.kernel.org/netdev/20230705155551.1317583-1-aleksander.lobakin@intel.com [4] https://lore.kernel.org/netdev/20230530150035.1943669-1-aleksander.lobakin@intel.com [5] https://lore.kernel.org/netdev/20230629120226.14854-1-linyunsheng@huawei.com [6] https://lore.kernel.org/netdev/20230525125746.553874-1-aleksander.lobakin@intel.com [7] https://lore.kernel.org/netdev/20230516161841.37138-1-aleksander.lobakin@intel.com -- 2.43.0