Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1721399pxb; Sat, 23 Jan 2021 03:36:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJwerj1sF7HU1ZcrBVYCq9DLtzCzlxC3GXq+5PhI6xBa5drEp+u4e3jAlynPyIo9p327e6+C X-Received: by 2002:a17:906:3101:: with SMTP id 1mr6638ejx.115.1611401801997; Sat, 23 Jan 2021 03:36:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611401801; cv=none; d=google.com; s=arc-20160816; b=HbubUSC08e6EutzF4FLi97c5GbKOJF2IfqD1AZp8lveFRI73QyBg06Pf1S4HM/J9n9 ITqUrrtWMO+CHkn9oE6fzXxg9YHx3ZtYLN/zNMsg+cvdbUKC4vOZP9Rz26/TSLH3+UyS RRNNfn+dQZlcl8LJIWR0uZJ2GB0Dbey63CSxNs48sGkeTA7G+RNp0ECYVRKZfizQGtBG 3wrTIRPg2GN+eYYTmQ34CjozGUwm5LTTT41akLyIIS4Ve4XYjBdqSjhH/qYcydY0rmr2 5VTsZ2FSk8N/MNPurMGP7pWmQjtwNa33UyhQBoClZ4OLhMClnMXdpEd26kldF0WLuUaI fiKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=tCJVoQC4xBY3BGtp3Oi80kGjpZ26JA6I+lIE3EpCRh0=; b=zsdyt+9E+v5Krz6R8G5/SLyajD1WNloDyIht3cLgLkpUKHK2Lx2FfrBn5p+e+tUyM4 la8ciq2F95vTMxmEXJPjjFiKp8XADL/aoOKFxa/TT0iep3A56E+x1Tf0XjPy6Q5wG3OV yQE3DzVAMeBDw0tytVNJlPxYJlix3Qu23dEmy8N3fKzJsH/hEImOhPmyockGSIBJ/r0U vPQa0A4usLHBFf8RiovIWTTnGOa7wgJZJ9tBlQbHWVZRZcDv9jFVfcyxEf9T1zhQb2bM VQT1Xfnx6OjCVGM5iS7zAdU4TQzYtoqrOjuEtPczx9nn3go5ZahoQRFDZMzzRpiBHzO9 2oOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hytw3ian; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c26si4026204ejm.600.2021.01.23.03.35.48; Sat, 23 Jan 2021 03:36:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hytw3ian; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726609AbhAWLWQ (ORCPT + 99 others); Sat, 23 Jan 2021 06:22:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726451AbhAWLWP (ORCPT ); Sat, 23 Jan 2021 06:22:15 -0500 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94FB1C06174A; Sat, 23 Jan 2021 03:21:34 -0800 (PST) Received: by mail-ej1-x62f.google.com with SMTP id 6so11369584ejz.5; Sat, 23 Jan 2021 03:21:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version; bh=tCJVoQC4xBY3BGtp3Oi80kGjpZ26JA6I+lIE3EpCRh0=; b=hytw3ianpw4z4IdU1YPAg0GhJMxNxjd110yTuneOWwxJVJgn/u/pVLYBbA9IDChGFY n+/EsGqL5uVQAq4K+H29xyPc1NSJBTpSxx8gxnorZ9paSAxRjT8sr9Vvi9hrGZJfJCaD /9kEUj8uh+Wy+S0F9BCsvlyhpzo+ywNfZvppRQFllw7eK41yzQPJ/0+t8OJOfR7y8aGe fsziO0cikKu5iR9boDrBab3Z4vEIfbjCTBo8XuqRNkDg6pIEs77UsyW5aTdVYG+j6n9B 8Y7fXo/Pz/UByPlTEfiDe9U5ZX1I2siZjr09MOhwvx5NSiq0hV9cLCiQfMuCpjvFPSDm nd8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version; bh=tCJVoQC4xBY3BGtp3Oi80kGjpZ26JA6I+lIE3EpCRh0=; b=Qak0ABrONvP0oHhyv1cfrR0+CMB6eeuxFYT/s90Q7Ahg6oqHXLnTNas689Pq+c3rQC DcJokuxWlIKpvsEfC232woR2A6eMLMfxc+fFtM8S0LCg6C7n+Eoc5+xZM/7EYyJSFhkx xTCbNq7R4ZhB2lP+3WGc5OtzLPrgHb1kVeXZutBJudAn/PzQB1/HFgYaKMaWzRML0Ybu VIjvUOCJrPg0Pj3Mv/TiffhGGcBhKx8Z8RmvXSU/3fNkjIc30rAye1tfTfqOxLWtwyJg VGjBfuESTcT64PlNUh/cJc5h0b/8QHftl4rdy2teGRmQNVJAVIvskkhmI6wjODmIOt1l ZFYA== X-Gm-Message-State: AOAM532c098OczLT+GOm6l21Q0oe270PZHKQT9i9BRL6UsKF+grOpZcb zQ05M/IOWYJj5FD1eEKUq4DoEaHWUOJNjQ== X-Received: by 2002:a17:906:19c3:: with SMTP id h3mr408122ejd.429.1611400893038; Sat, 23 Jan 2021 03:21:33 -0800 (PST) Received: from localhost (cpc158799-hari22-2-0-cust25.20-2.cable.virginm.net. [82.3.12.26]) by smtp.gmail.com with ESMTPSA id a11sm7064797edt.26.2021.01.23.03.21.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 03:21:32 -0800 (PST) Date: Sat, 23 Jan 2021 03:21:32 -0800 (PST) X-Google-Original-Date: Sat, 23 Jan 2021 10:56:48 +0000 From 3920487b3156cc2f90ebbb7d018c9f3f34637d62 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui To: linux-kernel@vger.kernel.org Cc: krisman@collabora.com, linux-arch@vger.kernel.org, kernel@collabora.com, yshuiv7@gmail.com Subject: [PATCH] ptrace: restore the previous single step reporting behavior Message-ID: <877do3gaq9.fsf@m5Zedd9JOGzJrf0> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Commit 64eb35f701f04b30706e21d1b02636b5d31a37d2 changed when single step is reported. Specifically, the report_single_step is changed so that single steps are only reported when both SYSCALL_EMU and _TIF_SINGLESTEP are set, while previously they are reported when _TIF_SINGLESTEP is set without _TIF_SYSCALL_EMU being set. This behavior change breaks rr [1] This commit restores the old behavior. [1]: https://github.com/rr-debugger/rr/issues/2793 Signed-off-by: Yuxuan Shui =2D-- kernel/entry/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/entry/common.c b/kernel/entry/common.c index 90533f34ea99c..ad3b17fcde782 100644 =2D-- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -220,7 +220,7 @@ static inline bool rep:ort_single_step(unsigned long wo= rk) */ static inline bool report_single_step(unsigned long work) { =2D if (!(work & SYSCALL_WORK_SYSCALL_EMU)) + if (!!(work & SYSCALL_WORK_SYSCALL_EMU)) return false; =20 return !!(current_thread_info()->flags & _TIF_SINGLESTEP); =2D-=20 2.30.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEL6EJkr0WlitWahBy06RAW+bMF/QFAmAMBrMACgkQ06RAW+bM F/SE6w/+LKNStNWKuVgglb2MGrIdELiwmsxyXVsjKQVZ0+9qnYtrWzq+l+tXzbaH erPZaiQiDBaUw98qlv+d6/Bhkj8iJgMP9NghCjw24BaIfYSoyDYA+YiKRp941m4s pRGfNon3pdAN3Z7K2a6ZNUqSALB0zFsOdqaS95kV9iU/h07ISiRjneYXuUzFDMkL /5J4zWj3Ut0P3/2HU3u7JekplTa/EKPKXF8CuBzFygQ5yaFl5mRiAUZP+LDzbJXq 8xdy7FhLBI6Aj5Yz7XDSde5aLYp62LhQi9WSv6SCCAYrntH7UqwrsLRpATv84HlF 8heFxZw5wYSZSgo7iWxHURZ7FXiZIxdyoRuS4ZzT9NfwlW5yjbgZZoQHmUEkbRdM neSBSvh/7w3vwvNIkxhX2Ga+VH+9X3zS6WlJOGpSq2+HnzBsDsFFld7lvsmxKV7L RmSXFoJfQ5KsDJlASoWk7IsNr+1ch9uSZxAzz5345pETZLzdxvwY+G9D6BtSqw47 dm0id9NRGAsn59npB53IxGN/f+u3bH+nODBkZB8FLa+FBxHa52PBkJ5BWrpV/kpU 0wP8dHKHnWZa2DxwpLBdV6QjtQD3X9NhjWRlEAvQwltpL04jqQp5tVeFW2Nu0Dtd WgiT+4zVvwbPecZ8DhbBEubzA3PQ597utf3zTPQOxrTpTg4Msl4= =OVRe -----END PGP SIGNATURE----- --=-=-=--