{"id":2219499,"url":"http://patchwork.ozlabs.org/api/patches/2219499/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260403054029.3789616-10-aleksandr.loktionov@intel.com/","project":{"id":46,"url":"http://patchwork.ozlabs.org/api/projects/46/?format=json","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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260403054029.3789616-10-aleksandr.loktionov@intel.com>","list_archive_url":null,"date":"2026-04-03T05:40:27","name":"[iwl-net,9/10] ice: select inner TCP dummy packet when matching on ip_proto TCP without explicit L4 field","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"942e9f3ea3d8ada07515f06bdb4e5e30ae3d5f20","submitter":{"id":75597,"url":"http://patchwork.ozlabs.org/api/people/75597/?format=json","name":"Loktionov, Aleksandr","email":"aleksandr.loktionov@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260403054029.3789616-10-aleksandr.loktionov@intel.com/mbox/","series":[{"id":498590,"url":"http://patchwork.ozlabs.org/api/series/498590/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=498590","date":"2026-04-03T05:40:19","name":"ice: bug fixes -- no link, tc-flower, VF rate","version":1,"mbox":"http://patchwork.ozlabs.org/series/498590/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2219499/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219499/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=t4NFyoKS;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137])\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 4fn6yp3Nnbz1yD3\n\tfor ; Fri, 03 Apr 2026 16:41:06 +1100 (AEDT)","from localhost (localhost [127.0.0.1])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id 4195140ED2;\n\tFri, 3 Apr 2026 05:40:47 +0000 (UTC)","from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id gd7KvsZwrOrB; Fri, 3 Apr 2026 05:40:46 +0000 (UTC)","from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id 5BB8440F22;\n\tFri, 3 Apr 2026 05:40:46 +0000 (UTC)","from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133])\n by lists1.osuosl.org (Postfix) with ESMTP id 48BD22CC\n for ; Fri, 3 Apr 2026 05:40:45 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp2.osuosl.org (Postfix) with ESMTP id 2F3764008E\n for ; Fri, 3 Apr 2026 05:40:45 +0000 (UTC)","from smtp2.osuosl.org ([127.0.0.1])\n by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id ky0EpA3RolgA for ;\n Fri, 3 Apr 2026 05:40:44 +0000 (UTC)","from mgamail.intel.com (mgamail.intel.com [198.175.65.20])\n by smtp2.osuosl.org (Postfix) with ESMTPS id 32F3B40071\n for ; Fri, 3 Apr 2026 05:40:44 +0000 (UTC)","from fmviesa007.fm.intel.com ([10.60.135.147])\n by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 02 Apr 2026 22:40:44 -0700","from amlin-019-225.igk.intel.com ([10.102.19.225])\n by fmviesa007.fm.intel.com with ESMTP; 02 Apr 2026 22:40:42 -0700"],"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= ","DKIM-Filter":["OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5BB8440F22","OpenDKIM Filter v2.11.0 smtp2.osuosl.org 32F3B40071"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1775194846;\n\tbh=TdeNy7N9W6WBC8wkNMMCO8o38qXpLli/GBi4Mfjwm9A=;\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=t4NFyoKShZiKkol/0uHbSoxwhP4P3e8b84hS14D9dlyZlNjHfh9cEZwY5x1itcCdU\n\t sYVSGCIyWEEWjbwLj400sB0b5wwjhrohiCUZb5HhCBcr8Q4P2UwgGWPZruBIWdRA8Z\n\t cnA4qDmlbhAw1BJXvcieTKfCWtK8M18t/YdzkP/74fD+VSHxGZS0Wym22yX7w8W7kA\n\t SBIL/nDxdacroGnd5jd+HwSbs9SaFf5cCZE9Qi4kN67oISDLKKVuV1IYf6XwvIrbUA\n\t 1CFJep6i/vH7f14cQT3QXAy0NrKDyKDRmGrjV8apt94g23/0OwF0AJvF8Se/lUH2e+\n\t rtWqvkXIKvIVw==","Received-SPF":"Pass (mailfrom) identity=mailfrom; client-ip=198.175.65.20;\n helo=mgamail.intel.com; envelope-from=aleksandr.loktionov@intel.com;\n receiver=","DMARC-Filter":"OpenDMARC Filter v1.4.2 smtp2.osuosl.org 32F3B40071","X-CSE-ConnectionGUID":["oNb3kHqXQaSv0PrHzOJbYw==","qzKWIIJ5RJmmQg5Xc7kKVg=="],"X-CSE-MsgGUID":["dkZ8FkSATwCIIATKeve+7g==","sioIDpPGTyOwgpU8b/YsFg=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11747\"; a=\"75981756\"","E=Sophos;i=\"6.23,157,1770624000\"; d=\"scan'208\";a=\"75981756\"","E=Sophos;i=\"6.23,157,1770624000\"; d=\"scan'208\";a=\"223904948\""],"X-ExtLoop1":"1","From":"Aleksandr Loktionov ","To":"intel-wired-lan@lists.osuosl.org, anthony.l.nguyen@intel.com,\n aleksandr.loktionov@intel.com","Cc":"netdev@vger.kernel.org, Michal Swiatkowski ","Date":"Fri, 3 Apr 2026 07:40:27 +0200","Message-ID":"<20260403054029.3789616-10-aleksandr.loktionov@intel.com>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260403054029.3789616-1-aleksandr.loktionov@intel.com>","References":"<20260403054029.3789616-1-aleksandr.loktionov@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=1775194845; x=1806730845;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=F7RgWTesnS6mroPwa/SCLsP5F6li6P4/GknCZnn6Uf4=;\n b=U/ORBjVTtOEUt5qw3K8v8KkfPkuf9wqw2F4+oAaLeKT5bB7r7p7Tdy0/\n xaICskDlCj5WEkKFiUrKWlrbpji3c49gmoQ/cAM1XUCp2ctkZxJE17P9L\n 0HXUWuChIcAuWPR2XKKDmRo8ayMnO4eSX6FCCin68PTueWFPtMiuQ+x1q\n qmPCuvR7gvlaF3v7HSuhrTBpHVPHF1AoMNBTrz74Ym86o/MS220YugXxG\n uf/QgZUsMd2DzQRxZVhBD5sVBk+BovhLM4yTQI61FuHjV62aHQIUrDYeT\n L5jwFoegjOxoYhnWDl34/BQD6s+sV/xSA3SG+zQlqTNVd6Vvvm6Dl8HeV\n g==;","X-Mailman-Original-Authentication-Results":["smtp2.osuosl.org;\n dmarc=pass (p=none dis=none)\n header.from=intel.com","smtp2.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=U/ORBjVT"],"Subject":"[Intel-wired-lan] [PATCH iwl-net 9/10] ice: select inner TCP dummy\n packet when matching on ip_proto TCP without explicit L4 field","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 ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" "},"content":"When building an advanced switch rule, ice_find_dummy_packet()\nselects the template packet type based on the lookup element\nlist. It currently checks for ICE_TCP_IL to select the inner\nTCP template, but ignores the case where the user matches on\nICE_IPV4_IL with protocol == IPPROTO_TCP without specifying a\nTCP L4 field. In that case the default UDP template is chosen,\ncausing the rule to fail.\n\nExtend the check to also match ICE_IPV4_IL with TCP protocol\nfield fully masked, fixing tc-flower rules such as:\n tc filter add dev vxlan100 ingress protocol ip prio 0 \\\\\n flower ip_proto tcp action mirred egress redirect dev eth0\n\nFixes: e33163a40d1a (\"ice: switch: convert packet template match code to rodata\")\nCc: stable@vger.kernel.org\nSigned-off-by: Michal Swiatkowski \nSigned-off-by: Aleksandr Loktionov \n---\n drivers/net/ethernet/intel/ice/ice_switch.c | 5 ++++-\n 1 file changed, 4 insertions(+), 1 deletion(-)","diff":"diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c\nindex bb0f990..c2ac870 100644\n--- a/drivers/net/ethernet/intel/ice/ice_switch.c\n+++ b/drivers/net/ethernet/intel/ice/ice_switch.c\n@@ -5587,7 +5587,10 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \tfor (i = 0; i < lkups_cnt; i++) {\n \t\tif (lkups[i].type == ICE_UDP_ILOS)\n \t\t\tmatch |= ICE_PKT_INNER_UDP;\n-\t\telse if (lkups[i].type == ICE_TCP_IL)\n+\t\telse if (lkups[i].type == ICE_TCP_IL ||\n+\t\t\t (lkups[i].type == ICE_IPV4_IL &&\n+\t\t\t lkups[i].h_u.ipv4_hdr.protocol == IPPROTO_TCP &&\n+\t\t\t lkups[i].m_u.ipv4_hdr.protocol == 0xFF))\n \t\t\tmatch |= ICE_PKT_INNER_TCP;\n \t\telse if (lkups[i].type == ICE_IPV6_OFOS)\n \t\t\tmatch |= ICE_PKT_OUTER_IPV6;\n","prefixes":["iwl-net","9/10"]}