From nobody Tue Sep 20 18:13:53 2022 X-Original-To: dev-commits-src-main@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 4MX8nG0qNKz4d1WM; Tue, 20 Sep 2022 18:13:54 +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 4MX8nG0Jfvz3y73; Tue, 20 Sep 2022 18:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663697634; 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=LSGN0r2PWO6iO91OsDXCQ88xcsHrh+PVGBTTUnIrW9c=; b=x43BrmEjUqNy2aZzhdCHCC2aSFhpLvcIdPO32cnjXfNFiZkMD2ML9fXLncPIBp3ZGXsZi7 l344i/Su3HGa8Cch3Y3jyQHpGcoX/n9cWafKD7vHT2wfFSsBWjjzLuJKDuUzk2WtUOen0Z b0yo30amMARO82JDWW5+FCpj76qCt9AJbfqOHoQ/ZHUTrdmKXl8OAyseTIQWRU+mDf72Y2 KdH8rfIf9dzEft4CLyGCqvt7mUyXj8yvWxd4YZslfHditIOwpFfygLzQp/+DjlSicwY0/s dr+LMZeRqiqq/+Q1G47vWSQIYwlES3CWsy/gkKueSmPCwK0IE67ecw17OIqdKQ== 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 4MX8nF6V81zp1b; Tue, 20 Sep 2022 18:13:53 +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 28KIDrLo022730; Tue, 20 Sep 2022 18:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28KIDrxd022729; Tue, 20 Sep 2022 18:13:53 GMT (envelope-from git) Date: Tue, 20 Sep 2022 18:13:53 GMT Message-Id: <202209201813.28KIDrxd022729@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: f0b0f28f35e7 - main - linuxkpi: Add down_read_killable() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f0b0f28f35e79d8777f4ba89d5065d3665b43866 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663697634; 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=LSGN0r2PWO6iO91OsDXCQ88xcsHrh+PVGBTTUnIrW9c=; b=VrBvQ9i+jAypmphx/wk9pEY7z/84KFyQLyAERBtf3iU3DU7AFZVtrxNpx+93W1V3JVxx7t ZiV41bql55cpWQbnyxpgS0zHRuX8jty9zLw/08qajFoY1LtctqisAIAi2LVq28r2j+espf J/u4RdIGCvkWATcvtrQpTsRrH2cBDmul6hRcBdW8f29UGgEDa6y2OwkTrbsXeY/wTaZgkQ wd1NlVEmrXDc5wu27l8oFd4gh+L0g/hZUhL2VDDUEylsOOXCAMyJxTeB/9xOorFhl+nsVw LNQZZrrCBJxTSgzr7atXnPStltK/H5oWjcMkFb7mY9qtiOjhqW7KohMokjguKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663697634; a=rsa-sha256; cv=none; b=pWgckFuKqpsVRppxHpqgEA+k1Uiwp2ipd8WC5nGkrU2+cLdjdRFguAOS9Zna3J7z1ERV3N Y92buPUCqtQD0F01waNW7/pNC5Np4Zn9LbJO7Zx6n+Akn06D9G8dvzRiLPM0+HVe4MW7FQ xRh8Rb0MSdOCU8KkHQ5gYdeX+6D4zGcaDYf3LLNXpVXFo/Zjo3qPz0/r+88Jlj5PdwMCCI PQWf3T6dOzjUPETdI89T4sA1wVHSwK2WfMclnLCZjK16cne1PC/5Kt8JxsEpfasHhVaH6L Uud4bgw2tTZ1pb3oCsqJnV5vlBsLF+Ttojq1bTSwtKh/e1KvP0cYzY4OGruOhQ== 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=f0b0f28f35e79d8777f4ba89d5065d3665b43866 commit f0b0f28f35e79d8777f4ba89d5065d3665b43866 Author: Jake Freeland AuthorDate: 2022-09-20 17:35:19 +0000 Commit: Emmanuel Vadot CommitDate: 2022-09-20 17:39:32 +0000 linuxkpi: Add down_read_killable() Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D36528 Sponsored by: Google, Inc. (GSoC 2022) --- sys/compat/linuxkpi/common/include/linux/rwsem.h | 2 ++ sys/compat/linuxkpi/common/src/linux_lock.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/rwsem.h b/sys/compat/linuxkpi/common/include/linux/rwsem.h index fc3580bc186e..a08668ed6e1e 100644 --- a/sys/compat/linuxkpi/common/include/linux/rwsem.h +++ b/sys/compat/linuxkpi/common/include/linux/rwsem.h @@ -46,6 +46,7 @@ struct rw_semaphore { #define down_read(_rw) sx_slock(&(_rw)->sx) #define up_read(_rw) sx_sunlock(&(_rw)->sx) #define down_read_trylock(_rw) !!sx_try_slock(&(_rw)->sx) +#define down_read_killable(_rw) linux_down_read_killable(_rw) #define down_write_trylock(_rw) !!sx_try_xlock(&(_rw)->sx) #define down_write_killable(_rw) linux_down_write_killable(_rw) #define downgrade_write(_rw) sx_downgrade(&(_rw)->sx) @@ -80,6 +81,7 @@ linux_init_rwsem(struct rw_semaphore *rw, const char *name) sx_init_flags(&rw->sx, name, SX_NOWITNESS); } +extern int linux_down_read_killable(struct rw_semaphore *); extern int linux_down_write_killable(struct rw_semaphore *); #endif /* _LINUXKPI_LINUX_RWSEM_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_lock.c b/sys/compat/linuxkpi/common/src/linux_lock.c index b04a7738d036..0e9a2fecaf7d 100644 --- a/sys/compat/linuxkpi/common/src/linux_lock.c +++ b/sys/compat/linuxkpi/common/src/linux_lock.c @@ -159,6 +159,19 @@ linux_mutex_lock_interruptible(mutex_t *m) return (error); } +int +linux_down_read_killable(struct rw_semaphore *rw) +{ + int error; + + error = -sx_slock_sig(&rw->sx); + if (error != 0) { + linux_schedule_save_interrupt_value(current, error); + error = -EINTR; + } + return (error); +} + int linux_down_write_killable(struct rw_semaphore *rw) {