From patchwork Fri Jan 8 15:42:51 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: 12006881 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.8 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 333D9C433E0 for ; Fri, 8 Jan 2021 15:43:16 +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 D68032399C for ; Fri, 8 Jan 2021 15:43:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D68032399C 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.63658.112987 (Exim 4.92) (envelope-from ) id 1kxtuq-0006rs-Vg; Fri, 08 Jan 2021 15:43:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 63658.112987; Fri, 08 Jan 2021 15:43: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 1kxtuq-0006rl-Sb; Fri, 08 Jan 2021 15:43:04 +0000 Received: by outflank-mailman (input) for mailman id 63658; Fri, 08 Jan 2021 15:43: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 1kxtup-0006rg-B2 for xen-devel@lists.xenproject.org; Fri, 08 Jan 2021 15:43:03 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 4fe9f5ec-85cf-4428-9039-6ba052aff971; Fri, 08 Jan 2021 15:43: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: 4fe9f5ec-85cf-4428-9039-6ba052aff971 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1610120581; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=WsJ3R8q1Abzlwfy+PdIyuVuydrWf3tcHCXWVi7aeHcI=; b=iSY1zHhOlwEvkf3mwEjMR6ZBw5/LZkqZRWt1PfPbozQh7CPeL1ajedKH 8eP/VeFVt+aU2cbKFr8cpTHyD0sEQ7XXS8PIqM84U6I8yEEpTqMREfWcc uawu83ai9F7uPhCUU4MoYWxJfG6JRDZJxwvl3PBA5XFbOvI5ikqWMNsvW o=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com IronPort-SDR: JjGHQIxNuPDdRCZSpBaIPnet1/VdDZbFA+05YDXmrAkooj13g9OxxV4YNXRX6ZiUAj6d9PiqRK +VRiYN6xI7OVanWWoHpZsOOBoa3JCaLiFIq8+Y3zlEY8LGSE+gZ8CMnHc6BQQrUHx9pibU5hr1 U9ZU8tch83DFCeDSGrheTdqF5Xyqrbh2Cuegqkt8TZhthALsdgAcDWoNm68kNbyWfd74S74DEG B4b2ADbAM0+Stg5biqYsYSRGWTRuyJ/K1HahbGH/dPDuvnYq0M4pojlnLCyvLa5SEte0cPZMs8 ins= X-SBRS: 5.2 X-MesageID: 34710529 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.79,331,1602561600"; d="scan'208";a="34710529" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CM79NhvrqSHcreiMv4ZUxrz5rj1Qh8gxCrd5S79HIWbfbe2RaAq2TUyTmX5eiLKoooK4p+V+hHsr/EG6KUA85va1yjyjNKMHtbp4Rm3BWI2EcDFNmkMbXFcg5IFdovRMr3Q/PQP3aZW8nW+bztRQEeGySC8uAH6Fpr6ctZUgRWrLpdPNoMIxII/WZuKAXGYOqxxEumCZov6lhDpT+QHUxB1Cb00flPTp6npmlcj70RmRpMMN0VGmy9VOyP9GGnbA1W6dbbvqLoFn/cN9PoTZfyO+dfCiyWibYgV/T/Ykf1s/vqvF1koO9+9YLCgjCuNl6w5k8IQL+mV5aCbDjuEjRA== 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=ioQvLmuZDFBIvpdNm1+N34wjN2JNIwr0H4alDw1pBkY=; b=eKYP1D6SuwdouLznHHQqR5r6ZLBzwT+4XX5isiIO66xkVBiNk8OL/KZsKMtyezYiHXFOKymMvuNO4SzjLgDM7vO2sXsucHsUpP8uPpgcJX/rTs0inG0r7MR6ootO3L0ofaA2hqhppg0ii89D6gXiXgA+6kTa08Q6BFf7H/BojN04ckUN5pnJcDZUXPRhtk0bXRYew0kpfvyFzly77jl+jwII6aWtHGl+fDvXh+vVlHEMxG6ohgXyIw0wLMs9noiZkkOmwGfPYJjRaX5mOkFMPKwv0V/PBdfv1ax805dwpyleysqASc4Fjpq4BaOV7UuohuTl6owWOffZ1ITxasDIvg== 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=ioQvLmuZDFBIvpdNm1+N34wjN2JNIwr0H4alDw1pBkY=; b=LB6eNdoAl/XiBQ6ci+h8ugR2mILdxxtSIOlLrpFdLFYsaE6sphhw4p3oax0ZgQ7FcNroip4ntidL5LqNZOeuvwzGSckY1RuD+PbWnahB0x5WWUpLS1pSms4AICiwckWZklo2rCZRczVUVkb8rWbgzivOD3FrEZJah5wrr2hUiUU= From: Roger Pau Monne To: CC: Roger Pau Monne , Jan Beulich , Andrew Cooper , Wei Liu Subject: [PATCH] x86/hypercall: fix gnttab hypercall args conditional build on pvshim Date: Fri, 8 Jan 2021 16:42:51 +0100 Message-ID: <20210108154251.59952-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.29.2 X-ClientProxiedBy: LO2P123CA0091.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:139::6) 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: f877c3ec-c1db-4ccc-b55b-08d8b3ec125c X-MS-TrafficTypeDiagnostic: DM6PR03MB5322: X-LD-Processed: 335836de-42ef-43a2-b145-348c2ee9ca5b,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hJjo2DGRP8CMlDX9zwLMGWq9n0AbA923SsqlgIsgOfml+HKOkCe38foZFaY2Hnjdv6sO6oXR/Sjnv97+8ewz4zFmyA5dV0QSYRdi66lnP60J2+Sp3s00O9noqnDdQ5UBTpVvAAj3rF6D44UXztWNwFH1x30o/zRiqRedVmnToRlU1dMDlJizBKqYG5c+5k4jBO/ZtRwyRgbR4Ed0HbtyZy4dhI1q5TK/YXtmipUZLKIMWOy+6vGU3GaWyWwFK9JHFSTBQScCtFuaCpw6htIUScMuzRaUhpYElJfAOCw4iLxMyWVqxqDwgEFjS4fPK8vROMUcVmjeEArn1+YJ8Xdy5AXjDDupU8AREVH79FCLl5QocwTarzA3UhzoJwefYgCYHq+8wzDEUJWRL3hmyI1f2g== 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)(39860400002)(346002)(376002)(366004)(136003)(396003)(54906003)(86362001)(5660300002)(2616005)(36756003)(6666004)(478600001)(83380400001)(6916009)(956004)(26005)(1076003)(316002)(8676002)(66476007)(8936002)(6486002)(66556008)(4326008)(66946007)(16526019)(186003)(6496006)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?aunWY4Qdm5O75rPTBg+wVSaQoVGcSW?= =?utf-8?q?pSwFTZOUnMQxEltb3L3jKytw8/2ghAgS2uHfRAD4Ry1NE+X1noTlW0SrLUqzAqDZ1?= =?utf-8?q?owPAIUg+dyKLgW59v32J16K6z//zHEULsdjz+K9MrYq0SwoMQw90j5a85AceQKsGt?= =?utf-8?q?CU9kqm04o1FqgfyehYyYOs7hiKEyAN5Q92GS7ph3shtcz9oGJey0c2znDx3xE5FIh?= =?utf-8?q?YM7OJgSlhhglBvNrOlSk+ufNXLY61MfxAnMAhKMbitU/czq1PZ0uBsub569XcM3R+?= =?utf-8?q?Ptf4HoWrjPrdhoVVyi85L03MrzgggCcHP48wE4/swYi6bNzQ+g8zj4rdZgSeRVrqO?= =?utf-8?q?Nsvm7p1o7bDv+Q7jlqC/fXs6/qW3bRhu7fFCEsO8Y5TKoNLPz0DjH2xj8c+1Zj4HX?= =?utf-8?q?mSROEEioGtEjDFruVU4HTwT1J7+z8R+GK+NTWdLvxCPpKq/dr1NBR1Nq7AyZGH2DI?= =?utf-8?q?yl47an59w/hGk08gv1/nTh30ll6CwFxNOLgX9UMretKOfczo6d9AiRxM4K85RXOsw?= =?utf-8?q?aJ+Y3boxRLp3YnjnMKoOXqy9lbY9EsiMxD3F7joWYelpIPK7duHYW89InHa7g8xH0?= =?utf-8?q?CNT8bX8p1H48rtFUYZhW4X7gXI1r6VSTe/pNdPJ7Mb9RRY+mDCPJbG+y9aLT+NVdE?= =?utf-8?q?UmJKfVv4OhSnSuXmxxIXKNyc3zF64RjacPSTqUDUwqxCpyYiCHwv9fpmZYDXbDLj4?= =?utf-8?q?swdvy9Uj7eK1O/TORVeKOOwbgeTACG7K/vPpZBMARj/KtHEUfVlN6UmDF4lwbs+jY?= =?utf-8?q?JBdUPfQoWAGGrm+O2gxqvIxqheoDLxI95jKdZTvC48mPKnwPwfO0KWl/eLgGBzvvo?= =?utf-8?q?xmKusBF6E2DD1XZYH5bdUo15RJaiE8Q2QacHYdMkApAVtjI0QEdfftyvzarnw3q2K?= =?utf-8?q?BXGcAfjmLV5OgYnLMxf9Usveszqc3TBqlmrRxYqmGApZsXZzZ14rk6IIhKmXjyGYE?= =?utf-8?q?RWBITNOZ7ZkJfaPCw9I?= X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2021 15:42:57.3181 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-Network-Message-Id: f877c3ec-c1db-4ccc-b55b-08d8b3ec125c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NCVE6/t3uSCa4BSowpbNFyrgnVFuE7n0dyjGviQlm6B0CXyJxFLENT53nGdK7TkGWUbnBS5jH4gF9tOc+8MNig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB5322 X-OriginatorOrg: citrix.com A pvshim build doesn't require the grant table functionality built in, but it does require knowing the number of arguments the hypercall has so the hypercall parameter clobbering works properly. Instead of also setting the argument count for the gnttab case if PV shim functionality is enabled, just drop all of the conditionals from hypercall_args_table, as a hypercall having a NULL handler won't get to use that information anyway. Note this hasn't been detected by osstest because the tools pvshim build is done without debug enabled, so the hypercall parameter clobbering doesn't happen. Fixes: d2151152dd2 ('xen: make grant table support configurable') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- Changesa since v1: - Drop all preprocessor conditionals --- xen/arch/x86/hypercall.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c index dd00983005..14da9bc4ad 100644 --- a/xen/arch/x86/hypercall.c +++ b/xen/arch/x86/hypercall.c @@ -47,9 +47,7 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(xen_version, 2), ARGS(console_io, 3), ARGS(physdev_op_compat, 1), -#ifdef CONFIG_GRANT_TABLE ARGS(grant_table_op, 3), -#endif ARGS(vm_assist, 2), COMP(update_va_mapping_otherdomain, 4, 5), ARGS(vcpu_op, 3), @@ -65,17 +63,11 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = ARGS(sysctl, 1), ARGS(domctl, 1), ARGS(kexec_op, 2), -#ifdef CONFIG_ARGO ARGS(argo_op, 5), -#endif ARGS(xenpmu_op, 2), -#ifdef CONFIG_HVM ARGS(hvm_op, 2), ARGS(dm_op, 3), -#endif -#ifdef CONFIG_HYPFS ARGS(hypfs_op, 5), -#endif ARGS(mca, 1), ARGS(arch_1, 1), };