From patchwork Fri Apr 23 12:35:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 12220317 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 C20BDC433B4 for ; Fri, 23 Apr 2021 12:36:21 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 30FF361459 for ; Fri, 23 Apr 2021 12:36:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30FF361459 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.116274.221924 (Exim 4.92) (envelope-from ) id 1lZv2S-0007T7-CE; Fri, 23 Apr 2021 12:36:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 116274.221924; Fri, 23 Apr 2021 12:36:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lZv2S-0007T0-99; Fri, 23 Apr 2021 12:36:04 +0000 Received: by outflank-mailman (input) for mailman id 116274; Fri, 23 Apr 2021 12:36:03 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lZv2Q-0007Sv-Sl for xen-devel@lists.xenproject.org; Fri, 23 Apr 2021 12:36:03 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 729c0ee4-b5fb-412c-a264-9c47c3d5ba39; Fri, 23 Apr 2021 12:36:01 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 729c0ee4-b5fb-412c-a264-9c47c3d5ba39 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1619181361; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=Rfc1denkeZVgxSQhXB4BJUgVfeefJB/UQ8Q+7eKNtNE=; b=Px0Ti/Anq/4cfgQqgfFF6ZkU7Q4Pf1QOCSN55ggjtActFy/xSH9JWX0s 2y/tf013egpPK3j9fVwIwSLDYxSrm+UD3mE4aELvi77ATdQx+20K1itD1 ewNLiIWk0CuhV+LSzYkzd834na/Ikx/az8/jJWb7c3Xw7eqHg0mj+gsUz E=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com IronPort-SDR: 8Y1ulFjG6P7RoyBPt9OTBxbZMIz88jgJG+wLykEt2BDn6lY0LNXVmK8mpN1jWffJkDnyNSVGkf Zxo+uTuUGfNeSgRbNIvxvKAhfKo5gTvRYoJke5rBf7oAfn55ngMjZUZzHMwnc6d8nsFZ1HXD2x 3mav5d2v4XZtSczExCUWRiycsKBOLBT5QM7RLqKDDPNCr9sfbHD2wuTqhOyotocKsaYnVm5rKI 30r/NWtwR2GeutEgvCoYf9k4gcwT5PZTyDH8BMSmn1cGDQMBz6IILvKs4wJ5uV/ovwmjAszTg2 abk= X-SBRS: 5.2 X-MesageID: 42271113 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-HdrOrdr: A9a23:x0sl/KFZrKi0mKgkpLqFs5HXdLJzesId70hD6mlaY3VuE/Cwvc aogfgdyFvIkz4XQn4tgpStP6OHTHPa+/dOkOwsFJ2lWxTrv3btEZF64eLZsl/dMgD36+I178 ddWodkDtmYNzdHpOLbxCX9LNo62tmA98mT6dv263t2VwllZ+VBwm5Ce2KmO3Z7TgVHGpY1fa D0jqArmxOadWkKdcP+P3EZXoH41rr2vaj7ah0LDQNP0njssRqU7tfBfSSw71M1SDVU2444/W zEiQDix6mqvv2h0DDd0nLe9Jhas8vaxtxPLsqKjcQeNzP24zzCWK1RH5uYsjgzoPKm9VYtl/ jBqxotJN5L8H/KcnqrrRaF4XiH7AoT X-IronPort-AV: E=Sophos;i="5.82,245,1613451600"; d="scan'208";a="42271113" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NEpLnxMYh6/SqAIc5xjHz6Lb8x+hbRsTcec2RoWLhX9Kh0v1Grl1R1IIdEYAEw/N0s4FeI7ocvunqB4YgaOrnYJey5tIsyfgjuR5c62qLnI+ENeEH9FPc6Dwh9YFMWXIsFkC6NgK2qhorASz+JThSvUpTT+2F65PPtc9GgEAMVVQw4WiV1J3VxKsvAAP3rpiLEiccG38aFADKLcTOBdErnnA7oAX5RNIpZz1EqKEEQB3M4Yv4X0II7XwZUXP6GRFl2nBkabqI2zhL8OPkfDN7yN92XehPykkcN6eao2ItobmcUouJTU9a8vt6wk0FU01uaJDml9ZyaqLAblKXdx+cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cZe+cT31ELMpAI5wRhUxQJ32tZ0HEcPvLlt0pK2KRTk=; b=N5u4ZVhyGZzdstP/svaWUWS03zMFSXsIRe8KC3yPb4QuxPgSeJUMY1siZaiqX8pI5h6KYBWAZolo993SOie1uBmAVl4x0DidpIsvyn6i+J87EeSlSdnM+AujxQR3dbcJfn9bcJ3gtYPUMxaPc9xz8ln4Xue5b13HidNLoA3kXx3MxAiDQToBiuOXolvTOBtrOjzqYqmiotzsREzQ2oRpajMM+DtIWABBypIT1/UPY+5HOm+oivY37U255hx8HITwxhtmjciAax8PrDSzrxCFqHKpWrQyiaPw94VgnhB1z7czlNZD+6MWc+9jv7OitiftRDv0s6glvbVEkaMpGHwsSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cZe+cT31ELMpAI5wRhUxQJ32tZ0HEcPvLlt0pK2KRTk=; b=cx7Z5rMnrS2l2Z0XQitr4FSQGPMsb07XjWeb0e4JC/IwwdBoM+dvn4D4HTO+sIrv0ibv5hj33q5x84zeoqE7gl9tTKGznAKJjFg91W8fpo6YSQFGfjQdjNo2kIw6mAJ5CZqrZ35zSESibEcNoIkbwmtXD4cx6D2OrRkjSyUPN1s= From: Roger Pau Monne To: CC: Roger Pau Monne , Jan Beulich , Andrew Cooper , Wei Liu Subject: [PATCH] x86/oprofile: remove compat accessors usage from backtrace Date: Fri, 23 Apr 2021 14:35:09 +0200 Message-ID: <20210423123509.9354-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.30.1 X-ClientProxiedBy: MR2P264CA0116.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:33::32) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 13f503c9-087a-4083-43a3-08d9065458d5 X-MS-TrafficTypeDiagnostic: DM5PR03MB2634: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1013; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EXhajx4H6RhcgjPPwqOL4rNgU+J4iEwBfjg90oL8TcGM3EKgUSuiGN/6T31OEhFsVeQxaWxO7Chh9DlXsoKpe6OrlY6nkuadD6GEu+9Ma9BFYNdpS9a3u0B7btdQP0DVSoJymfzMv8VOzreEb9yMtkEEZ5oFs1LcN8IurM6romwRgcsRfiMQZgEC4SjEAv7dOliuCuKKo8oNQaRBiqZTMR8RFtCF3pBwDzCJqyk+JNLQ1T7WNzobaeOEsGFm/E5lbiPEfBA2D6v9nr9Zp2+P77eQScaH3FpF2iRXBh2eRfrgXb7+ljqgNHrCF6uX/7+hfqUaHwWT/qer5x9dRplPlIMlFExee2b+Vpn9c0K00ilDvu9rewoIGdNhy9vsvq1fUw0qT4DHRhhrhdWyVaGPoTa2St7lYOGeXXbOoP2GZSN8OGTOen5RmQW8ChzYU5O1TQAoxO2j4Uh5yl1r1mwJVvc1Rk8XIWPxzRIin9tYa0mOADBipEosJpNlS/4b0U9qB89lExamo0AlGqyPJm3XYvJml4n3m6ibzANkFBItKtfyeBeGMKrfWbgcYX8xJ6qjwHvFcE1JHcWw+kxoIapttQbLuSAs9+SEVI8p1VHutXQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(136003)(39860400002)(366004)(346002)(376002)(26005)(316002)(956004)(16526019)(5660300002)(1076003)(6666004)(66556008)(38100700002)(8676002)(186003)(2616005)(2906002)(54906003)(4326008)(36756003)(66476007)(66946007)(6496006)(83380400001)(6916009)(86362001)(6486002)(478600001)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?NiEmPdOEr4mCg0N098sAi5Ruj9T4is?= =?utf-8?q?xBv821qsbbKVKaYnDzQr717jLGXLa6gSym6ltHiEr9QP37BZwBq2Ih7Qf81G8snU0?= =?utf-8?q?DrpyF+rAAaN2C1EfDpXK/V08+km6c0NY9RlMS7LbW0m3wv4ASGmJPgcptR50seEXT?= =?utf-8?q?6LEMjO/lVxozoPGYvZhpNThUVv+jqDRw5KWQO1cpdIOFzg+V6U0PFr4KJwOIeuqFe?= =?utf-8?q?Db+/Qn/zeqh42ts7rRPq/hYIJ97gCS+InJbccpYaRVyt/Dix/YImt7HDBWajYui6w?= =?utf-8?q?ZbcimBpsUH5waxuJUFH7Q3AkDVWhzOSqUIMlT9kEiL1FhEnKzX7E9d2JeNWDuR51z?= =?utf-8?q?2MhPyd1K4rOqCjFhJsc76RDvBC50lVgoOveeWc8LyxVNOE/lSmCQ3iA8Y5h+wb/HR?= =?utf-8?q?zlArPhulnn/BG4HoScSwWxLxod480sd4fTeIgQPzSDzjgRi6kHv9KD5RLfdlXndTq?= =?utf-8?q?uRPHjrzG4RjlJULXv4CsoHaN2msERL7UoGn4jD/SSApig8MDoMk/IFrGrouL2syDr?= =?utf-8?q?ctxyPhLUnFkLu9NnzyVDXXsYzkOTiy0U2eL6DEmwVeXa7Bos2DrmqbM+qzlfefZpR?= =?utf-8?q?D3xL80xqEKRFaTYUClrueBIRV3EKBpkcNtvvjZzM7DRc7GKm3YDdX46L7lhxX/5Ly?= =?utf-8?q?IErnj2sF2uZt2vvIe5ZK8Qo6eKYH9p6b6Zpdhvj2UdQi3ki5PuOefURMgh+x2Ogm2?= =?utf-8?q?2hX72cfwiJKapbwQFKSTuOhvyHPRNTn8eH4kHRQhFALaKyRqPfEo05aj8LtN8ROdf?= =?utf-8?q?n+hQkPdxjTeZHBCSya8cQZI6x0qn4qtJVKrvoukx5ckfMgkdg6G/Q8TQB91qqmrEc?= =?utf-8?q?eHuNjoldK/DoMhGouTdtr+dwyZYEbgJRebxipXjVKIJ7rAvUtFsP6pwD+itJ1FtoK?= =?utf-8?q?wIHfOd7ldBdJ/0zDmgJkKD+Y7A/SdVUs9BjTOsUFYW6Q0R16GYR9hV9fTV/GGP3UA?= =?utf-8?q?J7qbaJEwvlr/DglXgZxSUhyOn3Bd2ApBRuUTDSoLB+HZffvLCzHWcBJNU8EURZHyr?= =?utf-8?q?3vOgfsCpxS7XzJMECQQNrAiXR7yLQdftpHoSxzTvw0FnhN889y1nhv3c667QZvEW3?= =?utf-8?q?jBI84tRfhn1Gj0IFnzfggv527jBTgo96GikDp3wYrJF408D7ar478DCfcX/XTOxmt?= =?utf-8?q?t/zwpuzT1A73IReKz15K7ygrGgtMjQnGv1iOrsU4bKjON6iI28uDdMdBevk1+/jmK?= =?utf-8?q?V/jfPYOiD+gR1W78f88kNpGFNUMQRTb+e9/LjEn/Eob/Ec/UcE3yKh2eaNTKsdnbl?= =?utf-8?q?D38Ptim+iifXwQ?= X-MS-Exchange-CrossTenant-Network-Message-Id: 13f503c9-087a-4083-43a3-08d9065458d5 X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2021 12:35:58.8988 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4k3kCSy6j+X/Pb2mlwccQrLqEnc/d61nwW3I94TtNGHgy1jcdYgxVt3ETI67tDqZ4S/QjzTNVNj38qb/g8BRwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2634 X-OriginatorOrg: citrix.com Remove the unneeded usage of the compat layer to copy frame pointers from guest address space. Instead just use raw_copy_from_guest. Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- Just build tested. Note sure I'm missing something, since using the compat layer here was IMO much more complicated than just using the raw accessors. --- xen/arch/x86/oprofile/backtrace.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/oprofile/backtrace.c b/xen/arch/x86/oprofile/backtrace.c index bd5d1b0f6ce..45f7fb65fa2 100644 --- a/xen/arch/x86/oprofile/backtrace.c +++ b/xen/arch/x86/oprofile/backtrace.c @@ -20,7 +20,6 @@ struct __packed frame_head { unsigned long ret; }; typedef struct frame_head frame_head_t; -DEFINE_XEN_GUEST_HANDLE(frame_head_t); struct __packed frame_head_32bit { uint32_t ebp; @@ -43,7 +42,6 @@ dump_hypervisor_backtrace(struct vcpu *vcpu, const struct frame_head *head, return head->ebp; } -#ifdef CONFIG_COMPAT static inline int is_32bit_vcpu(struct vcpu *vcpu) { if (is_hvm_vcpu(vcpu)) @@ -51,7 +49,6 @@ static inline int is_32bit_vcpu(struct vcpu *vcpu) else return is_pv_32bit_vcpu(vcpu); } -#endif static struct frame_head * dump_guest_backtrace(struct vcpu *vcpu, const struct frame_head *head, @@ -59,34 +56,17 @@ dump_guest_backtrace(struct vcpu *vcpu, const struct frame_head *head, { frame_head_t bufhead; -#ifdef CONFIG_COMPAT if ( is_32bit_vcpu(vcpu) ) { - DEFINE_COMPAT_HANDLE(frame_head32_t); - __compat_handle_const_frame_head32_t guest_head = - { .c = (unsigned long)head }; frame_head32_t bufhead32; - /* Also check accessibility of one struct frame_head beyond */ - if (!compat_handle_okay(guest_head, 2)) - return 0; - if (__copy_from_compat(&bufhead32, guest_head, 1)) + if (raw_copy_from_guest(&bufhead32, head, sizeof(bufhead32))) return 0; bufhead.ebp = (struct frame_head *)(unsigned long)bufhead32.ebp; bufhead.ret = bufhead32.ret; } - else -#endif - { - XEN_GUEST_HANDLE_PARAM(const_frame_head_t) guest_head = - const_guest_handle_from_ptr(head, frame_head_t); - - /* Also check accessibility of one struct frame_head beyond */ - if (!guest_handle_okay(guest_head, 2)) - return 0; - if (__copy_from_guest(&bufhead, guest_head, 1)) - return 0; - } + else if (raw_copy_from_guest(&bufhead, head, sizeof(bufhead))) + return 0; if (!xenoprof_add_trace(vcpu, bufhead.ret, mode)) return 0;