Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2221404/?format=api
{ "id": 2221404, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2221404/?format=api", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/1.0/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260409120003.2719-11-marcin.szycik@linux.intel.com>", "date": "2026-04-09T12:00:03", "name": "[iwl-next,v2,10/10] ice: use ACL for ntuple rules that conflict with FDir", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "7cffecd13d256184762eb842ad3d0b66b3669f0d", "submitter": { "id": 82782, "url": "http://patchwork.ozlabs.org/api/1.0/people/82782/?format=api", "name": "Marcin Szycik", "email": "marcin.szycik@linux.intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260409120003.2719-11-marcin.szycik@linux.intel.com/mbox/", "series": [ { "id": 499287, "url": "http://patchwork.ozlabs.org/api/1.0/series/499287/?format=api", "date": "2026-04-09T11:59:53", "name": "Add ACL support", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/499287/mbox/" } ], "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2221404/checks/", "tags": {}, "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@legolas.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256\n header.s=default header.b=hjduMez3;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.136; helo=smtp3.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fs0R716qfz1yCv\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 09 Apr 2026 23:00:35 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id AC20860890;\n\tThu, 9 Apr 2026 13:00:31 +0000 (UTC)", "from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id Ga8hA14355ts; Thu, 9 Apr 2026 13:00:30 +0000 (UTC)", "from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id D067F608C0;\n\tThu, 9 Apr 2026 13:00:30 +0000 (UTC)", "from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138])\n by lists1.osuosl.org (Postfix) with ESMTP id 44E981F6\n for <intel-wired-lan@lists.osuosl.org>; Thu, 9 Apr 2026 13:00:29 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp1.osuosl.org (Postfix) with ESMTP id 36E8181E5C\n for <intel-wired-lan@lists.osuosl.org>; Thu, 9 Apr 2026 13:00:29 +0000 (UTC)", "from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id oBNoedT2AJ-6 for <intel-wired-lan@lists.osuosl.org>;\n Thu, 9 Apr 2026 13:00:28 +0000 (UTC)", "from mgamail.intel.com (mgamail.intel.com [192.198.163.19])\n by smtp1.osuosl.org (Postfix) with ESMTPS id 5C53581B14\n for <intel-wired-lan@lists.osuosl.org>; Thu, 9 Apr 2026 13:00:28 +0000 (UTC)", "from orviesa002.jf.intel.com ([10.64.159.142])\n by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 09 Apr 2026 06:00:22 -0700", "from irvmail002.ir.intel.com ([10.43.11.120])\n by orviesa002.jf.intel.com with ESMTP; 09 Apr 2026 06:00:19 -0700", "from gond.igk.intel.com (gond.igk.intel.com [10.123.220.52])\n by irvmail002.ir.intel.com (Postfix) with ESMTP id AF41E2FC57;\n Thu, 9 Apr 2026 14:00:18 +0100 (IST)" ], "X-Virus-Scanned": [ "amavis at osuosl.org", "amavis at osuosl.org" ], "X-Comment": "SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=<UNKNOWN> ", "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 smtp3.osuosl.org D067F608C0", "OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5C53581B14" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1775739630;\n\tbh=U+AvPkcwmGpLWoOxWjOz4hJK93FfVtCD11FMzz4v4Pk=;\n\th=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id:\n\t List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:\n\t From;\n\tb=hjduMez3HWirgcfEe0253TCOXwOYB/Y8kAUI+2Q57CpmwaM87Uxkx6Q0eFkcGTyI9\n\t KwZ6R0cj3cctT5kiehdoGQhrO/QcwmNGUgpZIcNUD4SusmnnEK0lFF65FsWuvlyM+6\n\t vEVGL8PMcTSqopP5vhMUZsbZM+8X4y+E9xifell2wG1YzKOuwkZB32CBh78m8KQ0ic\n\t MCF6XO5MDu/8wWe0o03qChTxwLJdWYZLZWtpSRNnuRMotQv8tdcRF9N28b+akm7DVg\n\t PdhbHK7N0AkpcbP98jPEqucrHBF7VR6k5WFa3WK/Z1F3X9jQe/EyKdeUEhCIem9K5+\n\t 5kNyMpJHlAXqQ==", "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=192.198.163.19;\n helo=mgamail.intel.com; envelope-from=marcin.szycik@linux.intel.com;\n receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp1.osuosl.org 5C53581B14", "X-CSE-ConnectionGUID": [ "+mYhIqwRTauEWILTVEtxOw==", "OPdIi8ZhTM+KRWyRyxHrtw==" ], "X-CSE-MsgGUID": [ "1hQg5O8rRxqzIOq96vh64Q==", "JnYADzj5TticgxMhHSKKEQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11753\"; a=\"75777543\"", "E=Sophos;i=\"6.23,169,1770624000\"; d=\"scan'208\";a=\"75777543\"", "E=Sophos;i=\"6.23,169,1770624000\"; d=\"scan'208\";a=\"259208144\"" ], "X-ExtLoop1": "1", "From": "Marcin Szycik <marcin.szycik@linux.intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Cc": "netdev@vger.kernel.org, sandeep.penigalapati@intel.com,\n ananth.s@intel.com,\n alexander.duyck@gmail.com, Marcin Szycik <marcin.szycik@linux.intel.com>,\n Lukasz Czapnik <lukasz.czapnik@intel.com>,\n Aleksandr Loktionov <aleksandr.loktionov@intel.com>", "Date": "Thu, 9 Apr 2026 14:00:03 +0200", "Message-ID": "<20260409120003.2719-11-marcin.szycik@linux.intel.com>", "X-Mailer": "git-send-email 2.49.0", "In-Reply-To": "<20260409120003.2719-1-marcin.szycik@linux.intel.com>", "References": "<20260409120003.2719-1-marcin.szycik@linux.intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Original-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1775739628; x=1807275628;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=RMRl9YrSm+l/Tb6MM0krI2qwrH8y6HxojXkgpB/gqE8=;\n b=U6PfVPWI4fy1d2vq4aLc1uCx9mBoNAQQfaobcg8KFzGrCzohc9Da0wHh\n saMgsL7TQs1Ec3RlpyP07osBkY3bqtHPZByxZukoMPZG0rPYCQ3rPALXW\n mQoS+oayl12alpQczVt1wDB+wVRDUdxJeRZA7FdXN8KZyDqIqVoRuM1tx\n 4BwY6UTLhiXlb2LU0BIGrK1jE5y1I3QVyNClYLviFW/YPWUvMcmJ+jSdV\n 7/E4eBB6p6Q0C9q2xbwbmVXkWvIfBri/N4UqR5NgOSDTd0aAAYGc1x+e2\n TiHkSQjd7iJNluUlSei096tO0DJH8k0oeAM7/ZGyb+Sp7lsbYxdbAg5Rt\n A==;", "X-Mailman-Original-Authentication-Results": [ "smtp1.osuosl.org;\n dmarc=none (p=none dis=none)\n header.from=linux.intel.com", "smtp1.osuosl.org;\n dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com\n header.a=rsa-sha256 header.s=Intel header.b=U6PfVPWI" ], "Subject": "[Intel-wired-lan] [PATCH iwl-next v2 10/10] ice: use ACL for ntuple\n rules that conflict with FDir", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Lukasz Czapnik <lukasz.czapnik@intel.com>\n\nFlow Director can keep only one input set per flow type. After ACL\nsupport was added for ethtool ntuple rules, the driver still only\nselected ACL for rules with partial masks.\n\nThat leaves a gap for rules with full masks that still require a\ndifferent input set than the one already programmed for Flow Director.\nSuch rules go through the FDir path, build a different extraction\nsequence and then fail because the existing FDir profile cannot be\nreused.\n\nDetect this case before programming the rule. Build the candidate IP\nflow segment, compare it with the active non-tunneled FDir profile and,\nwhen the input sets differ, offload the rule through ACL if ACL is\navailable.\n\nRefactor the IP flow segment setup into a helper so the same logic can\nbe used both by the extraction-sequence configuration path and by the\nconflict check.\n\nSigned-off-by: Lukasz Czapnik <lukasz.czapnik@intel.com>\nSigned-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>\nReviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>\n---\nv2:\n* Add this patch\n---\n .../ethernet/intel/ice/ice_ethtool_ntuple.c | 154 ++++++++++++------\n 1 file changed, 107 insertions(+), 47 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c b/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c\nindex 21d4f4e3a1d0..13073387376e 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c\n@@ -1425,6 +1425,102 @@ ice_set_fdir_vlan_seg(struct ice_flow_seg_info *seg,\n \treturn 0;\n }\n \n+/**\n+ * ice_set_fdir_ip_flow_seg - set IP flow segment based on ethtool flow type\n+ * @fsp: pointer to ethtool Rx flow specification\n+ * @seg: flow segment for programming\n+ * @perfect_fltr: valid on success; returns true if perfect fltr, false if not\n+ *\n+ * Return: 0 on success and errno in case of error.\n+ */\n+static int ice_set_fdir_ip_flow_seg(struct ethtool_rx_flow_spec *fsp,\n+\t\t\t\t struct ice_flow_seg_info *seg,\n+\t\t\t\t bool *perfect_fltr)\n+{\n+\tswitch (fsp->flow_type & ~FLOW_EXT) {\n+\tcase TCP_V4_FLOW:\n+\t\treturn ice_set_fdir_ip4_seg(seg, &fsp->m_u.tcp_ip4_spec,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_TCP, perfect_fltr);\n+\tcase UDP_V4_FLOW:\n+\t\treturn ice_set_fdir_ip4_seg(seg, &fsp->m_u.tcp_ip4_spec,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_UDP, perfect_fltr);\n+\tcase SCTP_V4_FLOW:\n+\t\treturn ice_set_fdir_ip4_seg(seg, &fsp->m_u.tcp_ip4_spec,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_SCTP,\n+\t\t\t\t\t perfect_fltr);\n+\tcase IPV4_USER_FLOW:\n+\t\treturn ice_set_fdir_ip4_usr_seg(seg, &fsp->m_u.usr_ip4_spec,\n+\t\t\t\t\t\tperfect_fltr);\n+\tcase TCP_V6_FLOW:\n+\t\treturn ice_set_fdir_ip6_seg(seg, &fsp->m_u.tcp_ip6_spec,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_TCP, perfect_fltr);\n+\tcase UDP_V6_FLOW:\n+\t\treturn ice_set_fdir_ip6_seg(seg, &fsp->m_u.tcp_ip6_spec,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_UDP, perfect_fltr);\n+\tcase SCTP_V6_FLOW:\n+\t\treturn ice_set_fdir_ip6_seg(seg, &fsp->m_u.tcp_ip6_spec,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_SCTP,\n+\t\t\t\t\t perfect_fltr);\n+\tcase IPV6_USER_FLOW:\n+\t\treturn ice_set_fdir_ip6_usr_seg(seg, &fsp->m_u.usr_ip6_spec,\n+\t\t\t\t\t\tperfect_fltr);\n+\tdefault:\n+\t\treturn -EOPNOTSUPP;\n+\t}\n+}\n+\n+/**\n+ * ice_fdir_has_input_set_conflict - Check conflict with existing FD filters\n+ * @pf: PF structure\n+ * @fsp: pointer to ethtool Rx flow specification\n+ *\n+ * Checks if adding this filter to Flow Director would cause an input set\n+ * mismatch with existing filters for the same flow type by building\n+ * the segment and comparing with existing profiles.\n+ *\n+ * Return: true if there's a conflict (use ACL), false otherwise (can use FD)\n+ */\n+static bool ice_fdir_has_input_set_conflict(struct ice_pf *pf,\n+\t\t\t\t\t struct ethtool_rx_flow_spec *fsp)\n+{\n+\tstruct ice_flow_seg_info *test_seg, *old_seg;\n+\tbool perfect_fltr, conflict = false;\n+\tstruct ice_fd_hw_prof *hw_prof;\n+\tstruct ice_hw *hw = &pf->hw;\n+\tenum ice_fltr_ptype flow;\n+\tint err;\n+\n+\tflow = ice_ethtool_flow_to_fltr(fsp->flow_type & ~FLOW_EXT);\n+\tif (flow >= ICE_FLTR_PTYPE_MAX || !hw->fdir_prof ||\n+\t !hw->fdir_prof[flow]) {\n+\t\treturn false;\n+\t}\n+\n+\thw_prof = hw->fdir_prof[flow];\n+\told_seg = hw_prof->fdir_seg[ICE_FD_HW_SEG_NON_TUN];\n+\n+\tif (!old_seg || hw->fdir_fltr_cnt[flow] == 0)\n+\t\treturn false;\n+\n+\ttest_seg = kzalloc_obj(*test_seg);\n+\tif (!test_seg)\n+\t\treturn false;\n+\n+\terr = ice_set_fdir_ip_flow_seg(fsp, test_seg, &perfect_fltr);\n+\tif (err) {\n+\t\tkfree(test_seg);\n+\t\treturn false;\n+\t}\n+\n+\t/* Compare the test segment with the existing segment */\n+\tif (memcmp(old_seg, test_seg, sizeof(*test_seg)) != 0)\n+\t\tconflict = true;\n+\n+\tkfree(test_seg);\n+\n+\treturn conflict;\n+}\n+\n /**\n * ice_cfg_fdir_xtrct_seq - Configure extraction sequence for the given filter\n * @pf: PF structure\n@@ -1455,57 +1551,16 @@ ice_cfg_fdir_xtrct_seq(struct ice_pf *pf, struct ethtool_rx_flow_spec *fsp,\n \t\treturn -ENOMEM;\n \t}\n \n-\tswitch (fsp->flow_type & ~FLOW_EXT) {\n-\tcase TCP_V4_FLOW:\n-\t\tret = ice_set_fdir_ip4_seg(seg, &fsp->m_u.tcp_ip4_spec,\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_TCP,\n-\t\t\t\t\t &perfect_filter);\n-\t\tbreak;\n-\tcase UDP_V4_FLOW:\n-\t\tret = ice_set_fdir_ip4_seg(seg, &fsp->m_u.tcp_ip4_spec,\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_UDP,\n-\t\t\t\t\t &perfect_filter);\n-\t\tbreak;\n-\tcase SCTP_V4_FLOW:\n-\t\tret = ice_set_fdir_ip4_seg(seg, &fsp->m_u.tcp_ip4_spec,\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_SCTP,\n-\t\t\t\t\t &perfect_filter);\n-\t\tbreak;\n-\tcase IPV4_USER_FLOW:\n-\t\tret = ice_set_fdir_ip4_usr_seg(seg, &fsp->m_u.usr_ip4_spec,\n-\t\t\t\t\t &perfect_filter);\n-\t\tbreak;\n-\tcase TCP_V6_FLOW:\n-\t\tret = ice_set_fdir_ip6_seg(seg, &fsp->m_u.tcp_ip6_spec,\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_TCP,\n-\t\t\t\t\t &perfect_filter);\n-\t\tbreak;\n-\tcase UDP_V6_FLOW:\n-\t\tret = ice_set_fdir_ip6_seg(seg, &fsp->m_u.tcp_ip6_spec,\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_UDP,\n-\t\t\t\t\t &perfect_filter);\n-\t\tbreak;\n-\tcase SCTP_V6_FLOW:\n-\t\tret = ice_set_fdir_ip6_seg(seg, &fsp->m_u.tcp_ip6_spec,\n-\t\t\t\t\t ICE_FLOW_SEG_HDR_SCTP,\n-\t\t\t\t\t &perfect_filter);\n-\t\tbreak;\n-\tcase IPV6_USER_FLOW:\n-\t\tret = ice_set_fdir_ip6_usr_seg(seg, &fsp->m_u.usr_ip6_spec,\n-\t\t\t\t\t &perfect_filter);\n-\t\tbreak;\n-\tcase ETHER_FLOW:\n+\tif ((fsp->flow_type & ~FLOW_EXT) == ETHER_FLOW) {\n \t\tret = ice_set_ether_flow_seg(dev, seg, &fsp->m_u.ether_spec);\n \t\tif (!ret && (fsp->m_ext.vlan_etype || fsp->m_ext.vlan_tci)) {\n-\t\t\tif (!ice_fdir_vlan_valid(dev, fsp)) {\n+\t\t\tif (!ice_fdir_vlan_valid(dev, fsp))\n \t\t\t\tret = -EINVAL;\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t\tret = ice_set_fdir_vlan_seg(seg, &fsp->m_ext);\n+\t\t\telse\n+\t\t\t\tret = ice_set_fdir_vlan_seg(seg, &fsp->m_ext);\n \t\t}\n-\t\tbreak;\n-\tdefault:\n-\t\tret = -EINVAL;\n+\t} else {\n+\t\tret = ice_set_fdir_ip_flow_seg(fsp, seg, &perfect_filter);\n \t}\n \tif (ret)\n \t\tgoto err_exit;\n@@ -2241,6 +2296,11 @@ int ice_add_ntuple_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)\n \tif (pf->hw.acl_tbl && ice_is_acl_filter(fsp))\n \t\treturn ice_acl_add_rule_ethtool(vsi, cmd);\n \n+\t/* Check if this would cause input set conflict with existing FD filters\n+\t */\n+\tif (pf->hw.acl_tbl && ice_fdir_has_input_set_conflict(pf, fsp))\n+\t\treturn ice_acl_add_rule_ethtool(vsi, cmd);\n+\n \tret = ice_cfg_fdir_xtrct_seq(pf, fsp, &userdata);\n \tif (ret)\n \t\treturn ret;\n", "prefixes": [ "iwl-next", "v2", "10/10" ] }