From nobody Fri Jun 17 19:37:32 2022 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 8915585A94D; Fri, 17 Jun 2022 19:37:33 +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 4LPq7d0gJ7z3PnQ; Fri, 17 Jun 2022 19:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494653; 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=jZ6qk6YNP/0n9bkPCDCQx5h1ll8HPFkIGVTbCR3JH34=; b=b3nNkb2AUCjRDdMgN8YaQhlJyQmycAa6Vjd274RbP0A3a8cSwGIBOjWF4+ZVjznO3BcG35 vuEIZFRiU+bj3E5t5fmFXCyLT+N+9zHHObBHecpXXSDHcUNAoFfJNGfyb9uWivEO9T+6kq QnWLg2CxUgUcPwSyWRY5UEzBLhqRSyUmi1qvQ6/2Y2+zOgmiiaBuLXvAr/jkDzC+v5b44M db6vc/Ni0E8iVc7tuPhCefRS9PSTd77cJ0Cu9MbMEXL+rh0gFKmVyd48C4lu/jDGZhCXTk NaEIseS2NreuxHkNaqLCADd7Y9aOU3atlwf2e5DcXw4CIbQE3ZGmJwKCp1marA== 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 7AAF425D00; Fri, 17 Jun 2022 19:37:32 +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 25HJbWr5013489; Fri, 17 Jun 2022 19:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJbWFD013488; Fri, 17 Jun 2022 19:37:32 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:37:32 GMT Message-Id: <202206171937.25HJbWFD013488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: b6b070eed27e - stable/13 - linux(4): Replace copyin() by fueword32() in handle_futex_death(). 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b6b070eed27e67562e67db42d825638ad3f5d72a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494653; 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=jZ6qk6YNP/0n9bkPCDCQx5h1ll8HPFkIGVTbCR3JH34=; b=DLsqWF/i+oJ67pY2PXFmtMXBiEbn067lYnZqN3fmrLR7Wbhf+ArJnC071kXtrR2qvZ4kUF aR8hxmn4skM/3dHPmUT9uVAvdkoOfHakCuKn1Gp2YjRcQ61VHp7ukIL17gCLGVarWCU0sr 6NuViuxje2YBVxPyHJSjXgpC7VJxNgEy9PJ4muzbHo4nf71cOl2aXsCWB4VKF3+o0x6asB zZpEJQ0PnostyI4bcjlRRLwlgIRUfoOUbxpiySIwOJU+CCEZAcgruXaongIsOZzPgp1616 dcxCgqZK+eZpeDTf8YgiPZ5sILAknk7iOjW4bckEiU5Ky6F1Yc0ANfSqYmjR8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494653; a=rsa-sha256; cv=none; b=rbFDs0fW6IVXz542xWlI8z0Lb+DupANB2tJcZ8dJcMYx6MpxhMbAg8RtVzUbWmnsjLFYHk +cpl5aWtrjAXEra3V/Xu7W6HS4OSulOGSmlw5u7m/FeZL0i1h2leOSSrNOIgBQYrG/KGmp aP3UzGHlvfAxkDkEZtifGpMVK1QSCT3c5bp17v2t5J7A0ByK90nN43HRLVI/yJPIHvIUv7 1pWnB7kz+mokD3UfXdPCzV1bZGagIxgkqhtUzYEdmPiRnsS6V5rScN42WoYEG9Lrqfexfr UlgoDqwV7QadWv0q2qzyaEFbsEtMWEpvMCAXwvaEbJ3hjsKZtsoWlYeWB9iqdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b6b070eed27e67562e67db42d825638ad3f5d72a commit b6b070eed27e67562e67db42d825638ad3f5d72a Author: Dmitry Chagin AuthorDate: 2021-07-29 09:48:59 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:19 +0000 linux(4): Replace copyin() by fueword32() in handle_futex_death(). According to fetch(9) fueword facility designed to fetch atomically small amount of data from user space. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D31239 MFC after: 2 weeks (cherry picked from commit cb01cc4a1020d7916bcf0f1e774156745c387409) --- sys/compat/linux/linux_futex.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index df6c7cdbf74a..9dab78a75af2 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -101,7 +101,6 @@ LIN_SDT_PROBE_DEFINE0(futex, linux_futex, unimplemented_cmp_requeue_pi); LIN_SDT_PROBE_DEFINE1(futex, linux_futex, unknown_operation, "int"); LIN_SDT_PROBE_DEFINE0(futex, linux_set_robust_list, size_error); LIN_SDT_PROBE_DEFINE1(futex, linux_get_robust_list, copyout_error, "int"); -LIN_SDT_PROBE_DEFINE1(futex, handle_futex_death, copyin_error, "int"); LIN_SDT_PROBE_DEFINE1(futex, fetch_robust_entry, copyin_error, "int"); LIN_SDT_PROBE_DEFINE1(futex, release_futexes, copyin_error, "int"); @@ -705,11 +704,9 @@ handle_futex_death(struct linux_emuldata *em, uint32_t *uaddr, int error; retry: - error = copyin(uaddr, &uval, 4); - if (error) { - LIN_SDT_PROBE1(futex, handle_futex_death, copyin_error, error); + error = fueword32(uaddr, &uval); + if (error != 0) return (EFAULT); - } if ((uval & FUTEX_TID_MASK) == em->em_tid) { mval = (uval & FUTEX_WAITERS) | FUTEX_OWNER_DIED; nval = casuword32(uaddr, uval, mval);