Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2193301/?format=api
{ "id": 2193301, "url": "http://patchwork.ozlabs.org/api/patches/2193301/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260205024327.233346-1-kmta1236@gmail.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/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": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260205024327.233346-1-kmta1236@gmail.com>", "list_archive_url": null, "date": "2026-02-05T02:43:27", "name": "[v2] ice: fix race condition in TX timestamp ring cleanup", "commit_ref": null, "pull_url": null, "state": "under-review", "archived": false, "hash": "05c5821e7f513f7ceb3b9a12401b8ac7c03e7dcb", "submitter": { "id": 92580, "url": "http://patchwork.ozlabs.org/api/people/92580/?format=api", "name": "Keita Morisaki", "email": "kmta1236@gmail.com" }, "delegate": { "id": 109701, "url": "http://patchwork.ozlabs.org/api/users/109701/?format=api", "username": "anguy11", "first_name": "Anthony", "last_name": "Nguyen", "email": "anthony.l.nguyen@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260205024327.233346-1-kmta1236@gmail.com/mbox/", "series": [ { "id": 491078, "url": "http://patchwork.ozlabs.org/api/series/491078/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=491078", "date": "2026-02-05T02:43:27", "name": "[v2] ice: fix race condition in TX timestamp ring cleanup", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/491078/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2193301/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2193301/checks/", "tags": {}, "related": [], "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=vEyJXzpN;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.138; helo=smtp1.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 4f61kd6999z1xvm\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 05 Feb 2026 13:43:53 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 2526781E0E;\n\tThu, 5 Feb 2026 02:43:51 +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 NaZ0dwgA2Efw; Thu, 5 Feb 2026 02:43:49 +0000 (UTC)", "from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 574DD81509;\n\tThu, 5 Feb 2026 02:43:49 +0000 (UTC)", "from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133])\n by lists1.osuosl.org (Postfix) with ESMTP id DD52E17A\n for <intel-wired-lan@lists.osuosl.org>; Thu, 5 Feb 2026 02:43:47 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp2.osuosl.org (Postfix) with ESMTP id CAE894048F\n for <intel-wired-lan@lists.osuosl.org>; Thu, 5 Feb 2026 02:43:47 +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 1N7Ve3QCeUzv for <intel-wired-lan@lists.osuosl.org>;\n Thu, 5 Feb 2026 02:43:47 +0000 (UTC)", "from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com\n [IPv6:2607:f8b0:4864:20::62e])\n by smtp2.osuosl.org (Postfix) with ESMTPS id 1DFE440422\n for <intel-wired-lan@lists.osuosl.org>; Thu, 5 Feb 2026 02:43:46 +0000 (UTC)", "by mail-pl1-x62e.google.com with SMTP id\n d9443c01a7336-2a9042df9a2so2523945ad.2\n for <intel-wired-lan@lists.osuosl.org>; Wed, 04 Feb 2026 18:43:46 -0800 (PST)", "from dpc2500057.. (fsb6a9315e.tkyc502.ap.nuro.jp. [182.169.49.94])\n by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2a9338acfe8sm36559315ad.42.2026.02.04.18.43.44\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 04 Feb 2026 18:43:45 -0800 (PST)" ], "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 smtp1.osuosl.org 574DD81509", "OpenDKIM Filter v2.11.0 smtp2.osuosl.org 1DFE440422" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1770259429;\n\tbh=Uq//eKnU0VIy+iDlWT3coRvXqAavfDjJ0UDudhoedEQ=;\n\th=From:To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive:\n\t List-Post:List-Help:List-Subscribe:From;\n\tb=vEyJXzpNiiTN1oxyZ6sU7wmmmKvOn7xlK3EV9v9V6LVz/Bw7nUzgqVEtcrhH22mzG\n\t YnetVpGtSbrrpD5Gwm72tKrsDs1o/Hrq0prI0M1snojyFQEdy2oPvIvprMuzedBRCY\n\t Hq6Bd0Ri74zoqLsAovD5H38Fz5+RFH8nQJPJ/NonIwwxlPtHwlFkgTkeVkIZLbBr+Z\n\t EKLAG36oThjD8uW6waubHAPp1wHhdRIpM0Kl/Xhj8OvdKA9+8SlaQr+ak0bSf+DpTI\n\t ZAxfjRAt4MqlWstg0O9uNwvcWk4/AnW1cz2H5L5ZYdNLJ2P1r/11qqayIU/52bLnfX\n\t CCGA/ze+qF2iQ==", "Received-SPF": "Pass (mailfrom) identity=mailfrom;\n client-ip=2607:f8b0:4864:20::62e; helo=mail-pl1-x62e.google.com;\n envelope-from=kmta1236@gmail.com; receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp2.osuosl.org 1DFE440422", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1770259426; x=1770864226;\n h=content-transfer-encoding:mime-version:message-id:date:subject:cc\n :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date\n :message-id:reply-to;\n bh=Uq//eKnU0VIy+iDlWT3coRvXqAavfDjJ0UDudhoedEQ=;\n b=mu6t8sz87riEQmQppUPW4mCTrHEpH/BcHmCyaqYUkIJQHnM6PsFC61m1evhKQOx5+q\n 8KT15LA3vaswd4BVvMPSNiMeln6lXhleosUlCxu2J6SA9dmBDEvvMCF9T4D0ynW3HL6k\n 4rtlnGwOFpx+zG4UK439FcYWZB4T3Y8OIrb6h7kXykRLBokj70f/xbuKlKiO7WUmkjNR\n DnRdf+13ll+u5TCZlJoLxHcnVqLwiiIYpt1kbAlMiMBBUJo2AIkIqJ27TBrnEkZNhWNt\n M0+yazJuSk4hJZsN5fPInrQ/PKU2Lbd4NonvH7ExZ+rQfKCldwOyfz2ZJxJ7G+wR7BjX\n W/tQ==", "X-Forwarded-Encrypted": "i=1;\n AJvYcCWd48y2rV38zfAM9UY3IFZ93vf352KrfiP4I947nUnpv2yNWFRRyoArW2wic2xtbGmRCe7oXXtbDXYhePDGYQw=@lists.osuosl.org", "X-Gm-Message-State": "AOJu0YyiYOeFayUHNCrBYmKYXwGXojIDor+YmEQAl/52/CeBun9xkKRa\n czBLB/RVoaP6ViMPv53S85PUkFMEX9PZQ67TV2l1VS6qaYzKN0qSMYDA", "X-Gm-Gg": "AZuq6aKOTdUcyLe0Ps1QUaPsUjcCbGJKUaMXleavlIDEV0t5v+z9CkmgvE7GLKuMuXi\n CMfn5XhJua6nuZ/5n7eAVyz+rvSAZPXnnnLPXGBbNryei67B6Km7MOKkVYeXiWX9q3ttpLD7/SS\n 7reAmBoYGdolIiIvnMmCOAIwj+bbJnJe985SmTmJW1eJI74lWeyjboGCPybvVnUjdGjfADXQSJu\n aSnRioyKMu+yvKlxoPHxVT80v5NkOSjiGEwI+8rCp3jjBKgc9jE2bFNLmtsQrSfqdcqNPnrQdtz\n +Ph/0TWXfnlYE67IAxdebt+1sMn51g+szqIAecQ0Do4CXjeLAjh9AnWqJvVKwAgZNTkLU/8oxB6\n bitxiTemya52dDMKYSn+rRtcXNKw9tSJ614ihea9Uoj/KHBmGfgpPtj9cdh+2rvWKm9IvB4YWkK\n oqsS8wL2BaqcvZ2lBwyu+PQ+e2lVdFrihxgV1uskFhOn1gvkx+mfd75S2zZNmDexoA2XQzvC3h0\n t8cAf3NjU8=", "X-Received": "by 2002:a17:903:4b0d:b0:2a7:f369:4de8 with SMTP id\n d9443c01a7336-2a933fddab3mr51965225ad.42.1770259426114;\n Wed, 04 Feb 2026 18:43:46 -0800 (PST)", "From": "Keita Morisaki <kmta1236@gmail.com>", "To": "tony.nguyen@intel.com,\n\tprzemyslaw.kitszel@intel.com", "Cc": "andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com,\n kuba@kernel.org, pabeni@redhat.com, paul.greenwalt@intel.com,\n maciej.fijalkowski@intel.com, aleksandr.loktionov@intel.com,\n alice.michael@intel.com, intel-wired-lan@lists.osuosl.org,\n netdev@vger.kernel.org, Keita Morisaki <kmta1236@gmail.com>", "Date": "Thu, 5 Feb 2026 11:43:27 +0900", "Message-Id": "<20260205024327.233346-1-kmta1236@gmail.com>", "X-Mailer": "git-send-email 2.34.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Original-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20230601; t=1770259426; x=1770864226; darn=lists.osuosl.org;\n h=content-transfer-encoding:mime-version:message-id:date:subject:cc\n :to:from:from:to:cc:subject:date:message-id:reply-to;\n bh=Uq//eKnU0VIy+iDlWT3coRvXqAavfDjJ0UDudhoedEQ=;\n b=m7yA+buncSiJjbtKATxW/GmDt21b0micy2kc5A9MGb5FROhjqN8+Y81t6amqg6YvSl\n cPrEzNKofVcwk/Aq9vZ6u2TGf0F/lRB6Nl+sVutMFzW+SRVENq/ttJncD3UUsvNwdVBK\n 3/xZyx2XkHp2BzuL6bxC4O6xFvMfrhWXYXj8V4aDsZHPnjlwHlWrHUlrJkZJfa41Z0bz\n BqbOlFmxQkzUQ6RtlqZPMAN2t0p/YLMCD7e1Kb/H/9wHqcm4gohxbLWAoE7o5x8wcPdK\n bva9vjZlCzWAWiZiQvtxzJxVMMUHPuMd40A0eT2d7OkE7LzjZAVa1ApQeu85Lz6MBiA9\n AtfQ==", "X-Mailman-Original-Authentication-Results": [ "smtp2.osuosl.org;\n dmarc=pass (p=none dis=none)\n header.from=gmail.com", "smtp2.osuosl.org;\n dkim=pass (2048-bit key,\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20230601 header.b=m7yA+bun" ], "Subject": "[Intel-wired-lan] [PATCH v2] ice: fix race condition in TX\n timestamp ring cleanup", "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": "Fix a race condition between ice_free_tx_tstamp_ring() and ice_tx_map()\nthat can cause a NULL pointer dereference.\n\nice_free_tx_tstamp_ring currently clears the ICE_TX_FLAGS_TXTIME flag\nafter NULLing the tstamp_ring. This could allow a concurrent ice_tx_map\ncall on another CPU to dereference the tstamp_ring, which could lead to\na NULL pointer dereference.\n\n CPU A:ice_free_tx_tstamp_ring() | CPU B:ice_tx_map()\n --------------------------------|---------------------------------\n tx_ring->tstamp_ring = NULL |\n | ice_is_txtime_cfg() -> true\n | tstamp_ring = tx_ring->tstamp_ring\n | tstamp_ring->count // NULL deref!\n flags &= ~ICE_TX_FLAGS_TXTIME |\n\nFix by:\n1. Reordering ice_free_tx_tstamp_ring() to clear the flag before\n NULLing the pointer, with smp_wmb() to ensure proper ordering.\n2. Adding smp_rmb() in ice_tx_map() after the flag check to order the\n flag read before the pointer read, using READ_ONCE() for the\n pointer, and adding a NULL check as a safety net.\n3. Converting tx_ring->flags from u8 to DECLARE_BITMAP() and using\n atomic bitops (set_bit(), clear_bit(), test_bit()) for all flag\n operations throughout the driver:\n - ICE_TX_RING_FLAGS_XDP\n - ICE_TX_RING_FLAGS_VLAN_L2TAG1\n - ICE_TX_RING_FLAGS_VLAN_L2TAG2\n - ICE_TX_RING_FLAGS_TXTIME\n\nFixes: ccde82e909467 (\"ice: add E830 Earliest TxTime First Offload support\")\nSigned-off-by: Keita Morisaki <kmta1236@gmail.com>\nReviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>\n---\nChanges in v2:\n- Convert tx_ring->flags from u8 to DECLARE_BITMAP() and use atomic\n bitops (set_bit(), clear_bit(), test_bit()) for all flag operations\n instead of WRITE_ONCE() for flag updates\n- Rename flags from ICE_TX_FLAGS_RING_* to ICE_TX_RING_FLAGS_* to\n distinguish from per-packet flags (ICE_TX_FLAGS_*)\n\n drivers/net/ethernet/intel/ice/ice.h | 4 ++--\n drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_lib.c | 4 ++--\n drivers/net/ethernet/intel/ice/ice_txrx.c | 23 ++++++++++++++------\n drivers/net/ethernet/intel/ice/ice_txrx.h | 16 +++++++++-----\n 5 files changed, 31 insertions(+), 18 deletions(-)\n\n\nbase-commit: 18f7fcd5e69a04df57b563360b88be72471d6b62", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex 00f75d87c73f9..5baeca824cd99 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -753,7 +753,7 @@ static inline bool ice_is_xdp_ena_vsi(struct ice_vsi *vsi)\n \n static inline void ice_set_ring_xdp(struct ice_tx_ring *ring)\n {\n-\tring->flags |= ICE_TX_FLAGS_RING_XDP;\n+\tset_bit(ICE_TX_RING_FLAGS_XDP, ring->flags);\n }\n \n /**\n@@ -778,7 +778,7 @@ static inline bool ice_is_txtime_ena(const struct ice_tx_ring *ring)\n */\n static inline bool ice_is_txtime_cfg(const struct ice_tx_ring *ring)\n {\n-\treturn !!(ring->flags & ICE_TX_FLAGS_TXTIME);\n+\treturn test_bit(ICE_TX_RING_FLAGS_TXTIME, ring->flags);\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\nindex 9fc8681cc58ea..bd74344271f3f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n@@ -943,7 +943,7 @@ ice_tx_prepare_vlan_flags_dcb(struct ice_tx_ring *tx_ring,\n \t\t/* if this is not already set it means a VLAN 0 + priority needs\n \t\t * to be offloaded\n \t\t */\n-\t\tif (tx_ring->flags & ICE_TX_FLAGS_RING_VLAN_L2TAG2)\n+\t\tif (test_bit(ICE_TX_RING_FLAGS_VLAN_L2TAG2, tx_ring->flags))\n \t\t\tfirst->tx_flags |= ICE_TX_FLAGS_HW_OUTER_SINGLE_VLAN;\n \t\telse\n \t\t\tfirst->tx_flags |= ICE_TX_FLAGS_HW_VLAN;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex d47af94f31a99..55ff0708d136e 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -1412,9 +1412,9 @@ static int ice_vsi_alloc_rings(struct ice_vsi *vsi)\n \t\tring->count = vsi->num_tx_desc;\n \t\tring->txq_teid = ICE_INVAL_TEID;\n \t\tif (dvm_ena)\n-\t\t\tring->flags |= ICE_TX_FLAGS_RING_VLAN_L2TAG2;\n+\t\t\tset_bit(ICE_TX_RING_FLAGS_VLAN_L2TAG2, ring->flags);\n \t\telse\n-\t\t\tring->flags |= ICE_TX_FLAGS_RING_VLAN_L2TAG1;\n+\t\t\tset_bit(ICE_TX_RING_FLAGS_VLAN_L2TAG1, ring->flags);\n \t\tWRITE_ONCE(vsi->tx_rings[i], ring);\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex ad76768a42323..564e4e33ecbc3 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -190,9 +190,10 @@ void ice_free_tstamp_ring(struct ice_tx_ring *tx_ring)\n void ice_free_tx_tstamp_ring(struct ice_tx_ring *tx_ring)\n {\n \tice_free_tstamp_ring(tx_ring);\n+\tclear_bit(ICE_TX_RING_FLAGS_TXTIME, tx_ring->flags);\n+\tsmp_wmb();\t/* order flag clear before pointer NULL */\n \tkfree_rcu(tx_ring->tstamp_ring, rcu);\n-\ttx_ring->tstamp_ring = NULL;\n-\ttx_ring->flags &= ~ICE_TX_FLAGS_TXTIME;\n+\tWRITE_ONCE(tx_ring->tstamp_ring, NULL);\n }\n \n /**\n@@ -405,7 +406,7 @@ static int ice_alloc_tstamp_ring(struct ice_tx_ring *tx_ring)\n \ttx_ring->tstamp_ring = tstamp_ring;\n \ttstamp_ring->desc = NULL;\n \ttstamp_ring->count = ice_calc_ts_ring_count(tx_ring);\n-\ttx_ring->flags |= ICE_TX_FLAGS_TXTIME;\n+\tset_bit(ICE_TX_RING_FLAGS_TXTIME, tx_ring->flags);\n \treturn 0;\n }\n \n@@ -1519,13 +1520,20 @@ ice_tx_map(struct ice_tx_ring *tx_ring, struct ice_tx_buf *first,\n \t\treturn;\n \n \tif (ice_is_txtime_cfg(tx_ring)) {\n-\t\tstruct ice_tstamp_ring *tstamp_ring = tx_ring->tstamp_ring;\n-\t\tu32 tstamp_count = tstamp_ring->count;\n-\t\tu32 j = tstamp_ring->next_to_use;\n+\t\tstruct ice_tstamp_ring *tstamp_ring;\n+\t\tu32 tstamp_count, j;\n \t\tstruct ice_ts_desc *ts_desc;\n \t\tstruct timespec64 ts;\n \t\tu32 tstamp;\n \n+\t\tsmp_rmb();\t/* order flag read before pointer read */\n+\t\ttstamp_ring = READ_ONCE(tx_ring->tstamp_ring);\n+\t\tif (unlikely(!tstamp_ring))\n+\t\t\tgoto ring_kick;\n+\n+\t\ttstamp_count = tstamp_ring->count;\n+\t\tj = tstamp_ring->next_to_use;\n+\n \t\tts = ktime_to_timespec64(first->skb->tstamp);\n \t\ttstamp = ts.tv_nsec >> ICE_TXTIME_CTX_RESOLUTION_128NS;\n \n@@ -1553,6 +1561,7 @@ ice_tx_map(struct ice_tx_ring *tx_ring, struct ice_tx_buf *first,\n \t\ttstamp_ring->next_to_use = j;\n \t\twritel_relaxed(j, tstamp_ring->tail);\n \t} else {\n+ring_kick:\n \t\twritel_relaxed(i, tx_ring->tail);\n \t}\n \treturn;\n@@ -1812,7 +1821,7 @@ ice_tx_prepare_vlan_flags(struct ice_tx_ring *tx_ring, struct ice_tx_buf *first)\n \t */\n \tif (skb_vlan_tag_present(skb)) {\n \t\tfirst->vid = skb_vlan_tag_get(skb);\n-\t\tif (tx_ring->flags & ICE_TX_FLAGS_RING_VLAN_L2TAG2)\n+\t\tif (test_bit(ICE_TX_RING_FLAGS_VLAN_L2TAG2, tx_ring->flags))\n \t\t\tfirst->tx_flags |= ICE_TX_FLAGS_HW_OUTER_SINGLE_VLAN;\n \t\telse\n \t\t\tfirst->tx_flags |= ICE_TX_FLAGS_HW_VLAN;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h\nindex e440c55d9e9f0..d35ffdc3dc84d 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.h\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.h\n@@ -181,6 +181,14 @@ enum ice_rx_dtype {\n \tICE_RX_DTYPE_SPLIT_ALWAYS\t= 2,\n };\n \n+enum ice_tx_ring_flags {\n+\tICE_TX_RING_FLAGS_XDP,\n+\tICE_TX_RING_FLAGS_VLAN_L2TAG1,\n+\tICE_TX_RING_FLAGS_VLAN_L2TAG2,\n+\tICE_TX_RING_FLAGS_TXTIME,\n+\tICE_TX_RING_FLAGS_NBITS,\n+};\n+\n struct ice_pkt_ctx {\n \tu64 cached_phctime;\n \t__be16 vlan_proto;\n@@ -333,11 +341,7 @@ struct ice_tx_ring {\n \tu32 txq_teid;\t\t\t/* Added Tx queue TEID */\n \t/* CL4 - 4th cacheline starts here */\n \tstruct ice_tstamp_ring *tstamp_ring;\n-#define ICE_TX_FLAGS_RING_XDP\t\tBIT(0)\n-#define ICE_TX_FLAGS_RING_VLAN_L2TAG1\tBIT(1)\n-#define ICE_TX_FLAGS_RING_VLAN_L2TAG2\tBIT(2)\n-#define ICE_TX_FLAGS_TXTIME\t\tBIT(3)\n-\tu8 flags;\n+\tDECLARE_BITMAP(flags, ICE_TX_RING_FLAGS_NBITS);\n \tu8 dcb_tc;\t\t\t/* Traffic class of ring */\n \tu16 quanta_prof_id;\n } ____cacheline_internodealigned_in_smp;\n@@ -349,7 +353,7 @@ static inline bool ice_ring_ch_enabled(struct ice_tx_ring *ring)\n \n static inline bool ice_ring_is_xdp(struct ice_tx_ring *ring)\n {\n-\treturn !!(ring->flags & ICE_TX_FLAGS_RING_XDP);\n+\treturn test_bit(ICE_TX_RING_FLAGS_XDP, ring->flags);\n }\n \n enum ice_container_type {\n", "prefixes": [ "v2" ] }