From patchwork Mon Mar 22 22:50:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Vagin X-Patchwork-Id: 12156285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6E46C433C1 for ; Mon, 22 Mar 2021 22:55:14 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3743961984 for ; Mon, 22 Mar 2021 22:55:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3743961984 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uGldS0LBNXZ3zOgphb2UoZyYLWtapd6k+3oa4QbneR8=; b=bCAwMtpjevr5YBloh0ZOFRy0f Drp9O5hylm7lNsfBgAfxzHOyNYkpDLHcpElaXvde3tLmd7N9m2Hao4kjZbPUrdncQo0TnGJX1SKh7 tglbCq1yBwvm7CoX9zaby1Mr9hWv5cltmdoOC5ZT3j3M8YG4jnlekxZhsmyOH0lyTsEmpfiT6GDpa RPKK0DRgLqfFyBdp2to0a5WxDilXgOsj9mNP1rpqTMfoPPaNEJJtgT0afsqzo7Q8JwKlfP2fxO8Vc 6/pDLE7LH/V+bN/vGDD4Vc2Xalk8iyFvjmwG7FdnvEASFKC/ztxjAJKg+tJXJfkJA2tisU5Wpgg5F Pt0ZVBN/g==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lOTQP-00ClCw-IU; Mon, 22 Mar 2021 22:53:29 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lOTQD-00Cl9E-Bq for linux-arm-kernel@lists.infradead.org; Mon, 22 Mar 2021 22:53:19 +0000 Received: by mail-pf1-x431.google.com with SMTP id l3so12254658pfc.7 for ; Mon, 22 Mar 2021 15:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r+51m+w++y282pEpZcxM+4YOYzwIDkEbVJ47KIbTcl4=; b=QfXGEo5ueK2zr6oSJZYJYzRNkYnWQhD8Sox7sDDDttvRWM3EmyOUol7F4aqSEgP9NP GHQnkPJruXk3pdfbHAo3tir2mS9ZA+cqMqUYRBtFasSBiTyNXM6kW5xisTwJ4HKI0/SG Uhh0LjBwDYD72X3FfxRExA1v97vyHlTnxd8Twrvz/8nr5vPakPsWmkvzpeDp1FJzmMut ndWh0ftdPenGyc2vKPW3wQPc7/rAEs2LD5kFnJsANnSapLQ/Hp5PT+1MbvPgSryZe3FR bBzJrrxt8kQtMJG2L0bksMtfdja64mazMcYG7Hi2tzHeSn76MoHgnEYU1Piswjozpi5E rybw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r+51m+w++y282pEpZcxM+4YOYzwIDkEbVJ47KIbTcl4=; b=CaCqupg0FTqNxejpMZJeS2Rfxf/NAsZQa0pXb7YEn8eADs/jqOW5mUc56CIAGy4LFB 09q4SPQgDcp/bwbnQYFpHYeqvyHXrGE9mTNF0+w3H9fhYiC6dNzm/ihEpeVUJQxc1ff/ OOyl2ed41rotBZN0t+mfWAN/nktKVbG4gFO5KVb7H4OWcfKr97UmG4KPFWFEtoNdQpZd BMT30TOzcqD1Gepu7Ps8K8M9D9OQ3yeW12piKUb4T8J6GsB2Hk5eZUCN87RcldWOZm7X 0vvw4cLGDw+Ib7w5iTWYLp7ATCeqiSvVAEDPKtMtK5y7bUA2AtiEZSgkTWA6UplqbmG7 c+Dg== X-Gm-Message-State: AOAM532SOUC/GqlK9nrvBd9/XJGivxlFAjKEFN7IPfjjdZn1AO9AzIMb xyF4R8sEkzIgpvlnXNv4MWw= X-Google-Smtp-Source: ABdhPJxcPnFhka+fUqaouhyTukjRJoxO4TigJeQgAm0gNpQv6Kfi5Gbox/7siMadBCOwpDd+Ln8aUA== X-Received: by 2002:a05:6a00:72b:b029:218:6603:a6a9 with SMTP id 11-20020a056a00072bb02902186603a6a9mr1900419pfm.78.1616453595715; Mon, 22 Mar 2021 15:53:15 -0700 (PDT) Received: from laptop.hsd1.wa.comcast.net ([2601:600:8500:5f14:d627:c51e:516e:a105]) by smtp.gmail.com with ESMTPSA id j13sm8878211pfn.103.2021.03.22.15.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 15:53:14 -0700 (PDT) From: Andrei Vagin To: Will Deacon , Catalin Marinas Cc: Oleg Nesterov , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Andrei Vagin , Dave Martin , Keno Fischer Subject: [PATCH 1/4] arm64: expose orig_x0 in the user_pt_regs structure Date: Mon, 22 Mar 2021 15:50:50 -0700 Message-Id: <20210322225053.428615-2-avagin@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210322225053.428615-1-avagin@gmail.com> References: <20210322225053.428615-1-avagin@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210322_225317_599024_15D7171A X-CRM114-Status: GOOD ( 14.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org orig_x0 is recorded at the start of the syscall entry and then it is used for resetting the argument back to its original value during syscall restarts. If orig_x0 isn't available from user-space, this makes it tricky to manage arguments of restarted system calls. Cc: Keno Fischer Signed-off-by: Andrei Vagin --- arch/arm64/include/asm/ptrace.h | 2 +- arch/arm64/include/uapi/asm/ptrace.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index e58bca832dff..d4cdf98ac003 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -183,9 +183,9 @@ struct pt_regs { u64 sp; u64 pc; u64 pstate; + u64 orig_x0; }; }; - u64 orig_x0; #ifdef __AARCH64EB__ u32 unused2; s32 syscallno; diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h index 758ae984ff97..3c118c5b0893 100644 --- a/arch/arm64/include/uapi/asm/ptrace.h +++ b/arch/arm64/include/uapi/asm/ptrace.h @@ -90,6 +90,7 @@ struct user_pt_regs { __u64 sp; __u64 pc; __u64 pstate; + __u64 orig_x0; }; struct user_fpsimd_state {