From nobody Tue Jan 24 08:54:17 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1LPQ1PNPz30xBJ; Tue, 24 Jan 2023 08:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1LPQ0Mq7z3hKf; Tue, 24 Jan 2023 08:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tQeyWWmPriEMXBsYGIRnJrW73y53zqr2K8foMx+ke8Q=; b=YEdMRE1X/t+1hBInFUnrGP2u9h6O6UZVHWHJD4g3nB/t+zqkj1l4XvnIfudbsXGQRxagCU iXAzvZ7bptPpuztrrvihnFMPQFEzGiF4t+j7ifMoIBAgX5/AanXMgbbuGfKpHihJMWJPbF 1c2MNe41DAyWh0jVdkAcbQqFBNorppZ5CjJl32wMtdYCKGWFmZBjfBRcf48CY9F07Gxb9L l+yhul0NZdPVMP/UCTvDzEgJOs8KQvZI9LfI/PjyP1xSF6gEyslKklKTC3S7yKi4I8Meou qPap8H+WmmEfLiehMC7VanXYfGe4/SXmP7ZnMeRPmsQwzeHLfmwTp9XrkRb81w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tQeyWWmPriEMXBsYGIRnJrW73y53zqr2K8foMx+ke8Q=; b=W5B3L8YqBUiFVLGKoylotIXU/VoSKc6BwrETqXn+QjflyoRZDEVPF6iYifV8Z1wUjdpVnr SbLaFeuOg0LRIix3hPl8+te3ti9En3KNGVWtjriPLqlqGjHAyb7XLgIwoBLlrOVqiBt4PY z6qTyg/Lv/kisdjz8adP8fqRzVWctguiA71rdBukG+iWdU8CXccAftELHL+Ge9Nyz+hp8x nsndvGqSIeT7FEOBZ0hq/y3XyM+1x1p2zxJ+CHh4RtpSVYKcuaqqr6EMZ0A89qSL6pvQ3q pC0fkXGtIgzf6pJgz5k8Mq06BOEcyJzPH7thnE9qDdl3mDIbdx5fdsPuud7dGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674550458; a=rsa-sha256; cv=none; b=jTB3QNshi199ClAzAGWZagO2ZjiNOHoo83WY5v6dmqDAyTa1Pi9cJzizwQHs3Qeq/iuLkb +ypjxvCpC6THMCInwGSSX9QpJVaYBLPnKoc1ocUs5G0rZx+oWeHaOWN/bnlPg4BGrargNV AHkvmro1fliFOw6BsQ5vjXJEBwvBfLhxy2BS1IE5xco8/wJXQJQnKH4H0dm+LL+fxW8t9u eK6Lap+gkG+wASyco3ZRuzfUi1aZv4J2nFwv4J3ghdBRpKqzK81lp0asiSpYNqcMi55c9v wqXrny4Nc5qeIlQpVnqK6gK8BzUaNyW7tft2R1TnwKR+xj30eKstte+TNJOy9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1LPP6ZV0z13MG; Tue, 24 Jan 2023 08:54:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30O8sH8F036307; Tue, 24 Jan 2023 08:54:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O8sHa2036306; Tue, 24 Jan 2023 08:54:17 GMT (envelope-from git) Date: Tue, 24 Jan 2023 08:54:17 GMT Message-Id: <202301240854.30O8sHa2036306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 04c127d58d05 - stable/13 - linuxkpi: Update `struct irq_work` List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 04c127d58d055891657f13ef988ba3dd0ee657f4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=04c127d58d055891657f13ef988ba3dd0ee657f4 commit 04c127d58d055891657f13ef988ba3dd0ee657f4 Author: Jean-Sébastien Pédron AuthorDate: 2022-11-11 17:32:58 +0000 Commit: Emmanuel Vadot CommitDate: 2023-01-24 09:08:01 +0000 linuxkpi: Update `struct irq_work` The previous `llnode` field is moved inside another field `node`. This `node` field is a `struct __call_single_node` in Linux. Here, we simply add an anonymous struct with the `llnode` field inside. That field's new name is `llist` now. V2: Use an anonymous union to keep the structure backward compatible with drivers using the previous `llnode` field. This was suggested by wufl@ and hselasky@. Thank you! Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D36955 (cherry picked from commit f021c5c4a1770987f01530fa59e5ccba3759c0ab) --- sys/compat/linuxkpi/common/include/linux/irq_work.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/irq_work.h b/sys/compat/linuxkpi/common/include/linux/irq_work.h index 9e2bd31ddb71..3fbc7690b798 100644 --- a/sys/compat/linuxkpi/common/include/linux/irq_work.h +++ b/sys/compat/linuxkpi/common/include/linux/irq_work.h @@ -52,7 +52,12 @@ typedef void (*irq_work_func_t)(struct irq_work *); struct irq_work { struct task irq_task; irq_work_func_t func; - struct llist_node llnode; + union { + struct llist_node llnode; + struct { + struct llist_node llist; + } node; + }; }; extern struct taskqueue *linux_irq_work_tq;