From nobody Thu Aug 18 09:10:03 2022 X-Original-To: dev-commits-src-all@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 4M7fGz2FQ2z4YwgJ; Thu, 18 Aug 2022 09:10:03 +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 4M7fGz1n67z3PRs; Thu, 18 Aug 2022 09:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660813803; 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=PhKH86DqEor7j2XpFwEL5j1kxzc3Rc/24rnaUPTZDj8=; b=sutFHKLD/kTj7Izf5O6jiMfNj8DG9rd4IGo4U/87Z5p1AT0FVm4AtjgSc0PVzNGPKNs4B2 do4TtBizQosmkWnO4DgAfDzKbMbIlBhtNjng4jshvyenC12nw22A1qDdpmIezeyNMm5cxb NmWTM49MTjKMtoxRp1LJ54m+kGr7SNjRScRhj7BAEIpQjIyaicCg+xxE91Jbx2y76lwYAI 66Cp5umX3cd0+Xd3bTDhVJfUCLo88SjnFCUTrWUir5UfdTxSL0jmOLPALwULjmRoTC+la2 KsiDd8dH2oM7E413zvEN/qhPXxqSDUmeVcmJu6Tfyv7PQ5VxnUUEx1eoddDz5w== 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 4M7fGz0tT2z1N6v; Thu, 18 Aug 2022 09:10:03 +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 27I9A3Wu016596; Thu, 18 Aug 2022 09:10:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27I9A3MZ016593; Thu, 18 Aug 2022 09:10:03 GMT (envelope-from git) Date: Thu, 18 Aug 2022 09:10:03 GMT Message-Id: <202208180910.27I9A3MZ016593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 1a6874e3a411 - main - linuxkpi: Add refcount_dec_and_test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 1a6874e3a411c7876bee55bc631119a2e1cd09a2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660813803; 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=PhKH86DqEor7j2XpFwEL5j1kxzc3Rc/24rnaUPTZDj8=; b=BcCIZHIVow9SjXETdvu9t5Q8W/PIHRgknCsRTwITO4VbsFQZ0fObwysrkI8OcwaWmu92z0 yl4WBzc+wqUaLvBVE1AEEpriwgBF6eKW5loje8ZERaDgvAXhlV6nk11Q3O3z37sDvw3hFH jUJYFzx8cnuZ2Rduxer0XCB9W8EQ/zNfS4hn3uJxbN9PmUYzuAx66K0RDy//elLMxEACRK TdkLh46pYf5vp7r28jr2oC2kOhDnLBR77PVFUsHMAsNTMpOim8AEG1dncSil4RT8rMHbQH dyWAcoA27/ZDsoy8drdoSiMWaP4Bg851lpReMZrVYRBhO0JHmyg/wVaIZRlzbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660813803; a=rsa-sha256; cv=none; b=FTNsHhD53OOCOwE7SnL89g3ZwVTYzGacP+T5vi2WGjfAGDuUxh1JSYzxemmsmEGT8ygyCC apN+5MetukWBBFEXG07nebJI6fU332mb/jTh1N5pUG35K68YHbxTu+XW1pDVMThF1zODPS jizYjGYgeKUSscbnHR8D3Szb1VWtLrJu/cjAQm2G6uq3aJAh1NTiWjOdRhnQHNY+ixGXEj /K4+4ixjyw+Jg0RuStyTGaTlNpBlQzhnk6uF7Iu0cKrr6L4wyiENcs7F+R/XIBPiGwZsWv 2DgSq5WOaQUxAIxOGBtPEGQYneMTIDftH34fRmHlLZLICEFXRvF9g7tyuDTe9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=1a6874e3a411c7876bee55bc631119a2e1cd09a2 commit 1a6874e3a411c7876bee55bc631119a2e1cd09a2 Author: Emmanuel Vadot AuthorDate: 2022-08-09 09:03:34 +0000 Commit: Emmanuel Vadot CommitDate: 2022-08-18 07:46:25 +0000 linuxkpi: Add refcount_dec_and_test In Linux this takes a refcount_t argument but in linuxkpi struct kref uses an atomic_t for the refcount and code in drm directly uses this function with a kref so use an atomic_t here. Reviewed by: bz Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D36099 --- sys/compat/linuxkpi/common/include/linux/kref.h | 1 + sys/compat/linuxkpi/common/include/linux/refcount.h | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/kref.h b/sys/compat/linuxkpi/common/include/linux/kref.h index 2c59794f4ddc..3b5645bf139b 100644 --- a/sys/compat/linuxkpi/common/include/linux/kref.h +++ b/sys/compat/linuxkpi/common/include/linux/kref.h @@ -43,6 +43,7 @@ #include struct kref { + /* XXX In Linux this is a refcount_t */ atomic_t refcount; }; diff --git a/sys/compat/linuxkpi/common/include/linux/refcount.h b/sys/compat/linuxkpi/common/include/linux/refcount.h index 7c055fb32029..6a49da530c0a 100644 --- a/sys/compat/linuxkpi/common/include/linux/refcount.h +++ b/sys/compat/linuxkpi/common/include/linux/refcount.h @@ -79,4 +79,15 @@ refcount_dec_and_lock_irqsave(refcount_t *ref, spinlock_t *lock, return (false); } +/* + * struct kref uses atomic_t and not refcount_t so + * we differ from Linux here. + */ +static inline bool +refcount_dec_and_test(atomic_t *r) +{ + + return (atomic_dec_and_test(r)); +} + #endif /* __LINUXKPI_LINUX_REFCOUNT_H__ */