From nobody Thu Feb 17 15:53:50 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 1C81B19CB731; Thu, 17 Feb 2022 15:53:51 +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 4Jzzrt50PRz3w0j; Thu, 17 Feb 2022 15:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645113230; 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=Nvyhh+mJL7dz3NPN8pyola1dL42PXzkOjBAXItqhm/w=; b=OCZUtcHmY1TOTJNxRyrpbXfhHLMcopbB4UHHTXGPRmSIJqA5MLrdUO+SsjiGLK7fDKcyjQ ixlJZJI1hY/4QKfCy+TDBl3zRrSn1rd9QdA0b6lDenrNOeXOAB8+AR9b8SJTXfFrUkB8Mz 6/wm6uEDQLvLbFkjV9/xsjAsB6e4UigyKTS2PXYYboAPu7IVlyWY3i5rheBCWsQnWk13rI bG3ppW9YE503/n+sbPjsonr/Go1R2WKRSVLuBd7osaYTAEc/05tM8ci7Ncv7kBOjkjGzlP CpGCqaMMAXLBhMeQocuvy9s4dum4nne73fxZRzOSFSYxEZvVRo8yqZyYu331+w== 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 780564BB8; Thu, 17 Feb 2022 15:53:50 +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 21HFroZ7022230; Thu, 17 Feb 2022 15:53:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HFro1v022228; Thu, 17 Feb 2022 15:53:50 GMT (envelope-from git) Date: Thu, 17 Feb 2022 15:53:50 GMT Message-Id: <202202171553.21HFro1v022228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 20daa209e449 - stable/13 - linux: implement set_upcall on aarch64 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: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 20daa209e4499bb0ba84f75d6fa8dc709fe14624 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645113230; 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=Nvyhh+mJL7dz3NPN8pyola1dL42PXzkOjBAXItqhm/w=; b=jozv+VJQASnbIVq4Hqaa+cs7zl64PWpxrawno5yT2qj9dBRn8C81ZiLAcU34j88Wmlx0ND uJNcStyTnZwJrLtncOLphbL8P56R7U5svEeHk9CiRZLqjWpsF1jblFfUB0ycOjGHwcjP7h 9Wh622om+HIcbXnAKxEovePMhvBuXGXnZ6ZQQ8V7An27GDhR3enTIjvHzl6KWyZjsZunUq 2gE+rhiORjcvs1WouW70O9qEEhf17nFdnDjcTr+tiDAHwBQ0VL1RUK4w1efGkf8sJzGvYh RyAGp9GLFitmjl0aCXCGTVc1LVMBHqVGJoznSm/jlFnoshpZYpiS1nw1dLe86Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645113230; a=rsa-sha256; cv=none; b=LWz/aRsITbGYtJA0Q8ShEUrZ/PPxmcyOyysHaSSpCrZqF2h7Q3n/JU9m+H5x1ZH0uSFsDy F8c0yz0+O/6CLYOhu2hhMR5w8YIqiOzjcu9+Exl7fQauAlNyJGSn2HIPPLFREztiVsKZXU Z09ut8p2+27m9bpSlUSlo/K6KCEe2uNOFcplYZKsmDBJlsleqWAQRajRYF4LP3OvPxSBIc qYwr8f8vjz5Ggcg12jW0KYGJtv2dy0F1pApoSAWkMWjxVqPVdxTVw3o32QAFn+EQauZQJC QfpwnfWkf6vT9UjoSdOo6wdZBBUYA7VkSHuCiGvUmixoeN7l4jG4hiwI6V2phA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=20daa209e4499bb0ba84f75d6fa8dc709fe14624 commit 20daa209e4499bb0ba84f75d6fa8dc709fe14624 Author: Edward Tomasz Napierala AuthorDate: 2021-06-15 12:01:02 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-14 00:08:11 +0000 linux: implement set_upcall on aarch64 This fixes "git diff" (git-1:2.25.1-1ubuntu3). Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D30509 (cherry picked from commit e505c3066bbdb96dd28ff4634a315346490b9b33) --- sys/arm64/linux/linux_machdep.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index 711ccb4fd63d..80597a2922a7 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); /* DTrace probes */ -LIN_SDT_PROBE_DEFINE0(machdep, linux_set_upcall, todo); LIN_SDT_PROBE_DEFINE0(machdep, linux_mmap2, todo); LIN_SDT_PROBE_DEFINE0(machdep, linux_rt_sigsuspend, todo); LIN_SDT_PROBE_DEFINE0(machdep, linux_sigaltstack, todo); @@ -84,13 +83,19 @@ linux_execve(struct thread *td, struct linux_execve_args *uap) return (error); } -/* LINUXTODO: implement (or deduplicate) arm64 linux_set_upcall */ int linux_set_upcall(struct thread *td, register_t stack) { - LIN_SDT_PROBE0(machdep, linux_set_upcall, todo); - return (EDOOFUS); + if (stack) + td->td_frame->tf_sp = stack; + + /* + * The newly created Linux thread returns + * to the user space by the same path that a parent does. + */ + td->td_frame->tf_x[0] = 0; + return (0); } /* LINUXTODO: deduplicate arm64 linux_mmap2 */