From patchwork Wed Sep 22 10:18:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12510011 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=-17.3 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,USER_AGENT_SANE_1 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 85D31C433F5 for ; Wed, 22 Sep 2021 10:18:40 +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 37792611C9 for ; Wed, 22 Sep 2021 10:18:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 37792611C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.192441.342878 (Exim 4.92) (envelope-from ) id 1mSzKi-0006cc-1S; Wed, 22 Sep 2021 10:18:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 192441.342878; Wed, 22 Sep 2021 10:18:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mSzKh-0006cV-Ua; Wed, 22 Sep 2021 10:18:31 +0000 Received: by outflank-mailman (input) for mailman id 192441; Wed, 22 Sep 2021 10:18:31 +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 1mSzKh-0006cJ-FB for xen-devel@lists.xenproject.org; Wed, 22 Sep 2021 10:18:31 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.111.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6e99877e-1b8e-11ec-b96a-12813bfff9fa; Wed, 22 Sep 2021 10:18:30 +0000 (UTC) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2107.outbound.protection.outlook.com [104.47.17.107]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-32-4xuDO56rM0qlH9jh8_4EFA-2; Wed, 22 Sep 2021 12:18:28 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB4190.eurprd04.prod.outlook.com (2603:10a6:803:4b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.15; Wed, 22 Sep 2021 10:18:26 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::4d37:ec64:4e90:b16b%7]) with mapi id 15.20.4544.013; Wed, 22 Sep 2021 10:18:26 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM0PR06CA0132.eurprd06.prod.outlook.com (2603:10a6:208:ab::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Wed, 22 Sep 2021 10:18:25 +0000 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: 6e99877e-1b8e-11ec-b96a-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1632305909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mKNtSH+m7Ctv8L/JFGkCYRCWB0Q8bcvCLMU0buPXpMY=; b=FdPbRCnNparaOijdU1QBj3W4YpoJnoaBNmo5zA3Mshu5LlowSD5oa4D97EH8RqrxRIoGb9 I9JhfxpiY75EiCSgy4jV1G9zqNtTWx87WzaIVou1I1wOmNm9f6ayK0c8FWXkO/XfvW02jR oNa5fw8Mx61y8BFNodtVFNxwU6uek2c= X-MC-Unique: 4xuDO56rM0qlH9jh8_4EFA-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CjNCycKGV86L/ODvBIkFk1QMP8CJdyHhMCiR3RMebb3eb5WGurjawSgLjjwg7bbj1zIyrAbKkFU2bZN6Z/lnPjxSnmucDdoJ6BZifdPx7GqLTKiycQnWydGxBDQXcwHnXT4hpR3zecS8ArXiJwVoM6MnLSsEEuMQQwwEH/R6VWyUAW/+y0xlfcxsP2GUnaZ2cWZzfp9D0f7jRMyam2HZzxZrs1qIvwpDLLBukD///tGOWCp/buR/qNCsRuHZijVJ9miBcDTTZZtDvsiXiqtm2srIXAPS/qIeKw+3JNurc5eKWV/DtYtEshmjxw+reewsAe5MnjZkVr0IGOFiI2H85A== 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; bh=mKNtSH+m7Ctv8L/JFGkCYRCWB0Q8bcvCLMU0buPXpMY=; b=SbeNcyePJ6wZtaGaJMb2cXRq1Useh6PufGpSoDvHCUX7x8iA6OrGGrLdfse6AJz93pdGXAH1ddyKQKAHWgPbrA4AH99ur+l76Y1Fa/VXF1vY7Q1cd8Liy62kq9tyzs8yEDhTbVsH+po2swU7WA782HKlx3uk1EiC9PwII05Vp+bc7nSbHzXmhfQrvIeOtBM9wraaQdTyBgEL5pATVEPe5EhH0BNZMg8wNGmml6vvzpBt2TX4RbCufa0qcHh5Kje15/XvI9+7sUhymthiCbHHJ8qQq07ri9CHWraPcyNim5U719TXB2T3if/XmLotqtO0UNXkF0kbZ4MRGdg/6GN1Xw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 3/3] xen/privcmd: drop "pages" parameter from xen_remap_pfn() From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , "xen-devel@lists.xenproject.org" , lkml References: <0f0db6fa-2604-9a0d-1138-0063b5a39a87@suse.com> Message-ID: <036ad8a2-46f9-ac3d-6219-bdc93ab9e10b@suse.com> Date: Wed, 22 Sep 2021 12:18:25 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 In-Reply-To: <0f0db6fa-2604-9a0d-1138-0063b5a39a87@suse.com> Content-Language: en-US X-ClientProxiedBy: AM0PR06CA0132.eurprd06.prod.outlook.com (2603:10a6:208:ab::37) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa92bbca-4f8f-4de0-4489-08d97db250a6 X-MS-TrafficTypeDiagnostic: VI1PR04MB4190: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x/dREiUX63gOXj3JmwHyqFFVDYH6WmNYUbQe4/Xkte5PjMylVy4+bokdrN8qgG0ZaOKcko29gxjkEbXSPLvH1FOpaMwq5b157Maz6RXDB2OPPJniuthixKFR+Vr7mw3pl+R2jIUzZM8oyzEwfYXwE5qQFPkIuyd5j80XGtYSvCShPrnq/CIKLaLr1WQgzBYU5/5oVYpyrcegXtmAljeh20gUzk/qB4yFZzyqTkfuyyQ6sP44nDfBinK08fsT5+bcgvwLKtbpoR/CzgBKVPeFroC2euluY0i33G84q12o3K5Ma+RnTXrN/y4l/Gah5Sfo1lPcOr1BTGuI65wq+mokMYnq3ImvSyE+XvBP8F5lMBb+R0i3fnnWATjcY+3prx93MUA9GjHscx8vDZNNbHLPobzGWMmPlESb/SAk1S+JyztJEPZK20mfw2HBd6dYvDNvQsrTXIHExbFz0QkhduiWsDL1iWuJQgJx/ywRpvMg1DSanPW364+2G6KsMxtoFj4Qs2UjYfl/XXIQtQC/Q1vDJoitUf6fK2XGs4XN3MpFaEnFP5X+kTx12SesEz96LBfJigvqnF7gT7xVmboPdCQbtVWIXchY1N0I/YVErzDMv+g3fAcwYHtOORsIV1HHfvrdtmA4JamagiQVjN/8yBIxEs60K+X9W0dsJIiTX8eV13WzdxptJZ54DDjcWrtiHIzfsMWCYdU05eYBMqpOQs6e6YmAsSqWzzGXi6DAQ9GSchY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(54906003)(83380400001)(508600001)(31686004)(5660300002)(66476007)(2906002)(66556008)(956004)(2616005)(36756003)(38100700002)(66946007)(86362001)(8936002)(316002)(26005)(4326008)(110136005)(8676002)(16576012)(186003)(6486002)(31696002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?ivFlYL/tusLOSj4pV0oYeXNuDifF?= =?utf-8?q?LO4JbDxmyJiDMxMcCU/bBnT2pki8dgKrKSvU3JzdPYPSV+QTCX01Ddmfy9izjEVsa?= =?utf-8?q?XKaOAUt25ByTpnRagXdaSgNM4MW+4BPT9wrpYZbLsPuyg51t0CB2nmcuw3p5PKOzR?= =?utf-8?q?ljHkuobhll8SsNKglw7l5JB4zQtZ4ww64X4iiOpeb0xn0rjZ5FCIsZyn8dD2uf6Ge?= =?utf-8?q?qa/9cbwAILQMekrxYzYui6ulBF/wXPsfkYyHIlmtza9HMYESFNeQjNM7Fymmi8lNh?= =?utf-8?q?PyLMZ/BplR6LpUK5wwN6B/gtrkLwL7I3g47h/aOc+4jBX/0duaedGQEM5Oc4DgASL?= =?utf-8?q?Sas59UqKz0MdfOQI47Vui/uiEchkRIwfRc5WSq0R7+X8IHFbt8Wih2TcvcrX53/hg?= =?utf-8?q?5oczvPdXJgQAqYfupwRax6Rv7squdMGBzrXpDvViJqp3oofQO+yQiiYGnLSf+KN0c?= =?utf-8?q?qjqGo71YtYiLjCbVzODy0DRXZqR9b0f7xl88k4fV+22rS0NGN5KldH8aCJs3o6Lm9?= =?utf-8?q?GhKFLhKur7oPJWht3l6k4MvP34NZqdo3uvlezFvLX4VB7p9A9cYMpn07DBnQRf92T?= =?utf-8?q?ZWhZ/cZS5X1cmjWudKwR2n63McSpaCO4lxhpbevCcIDcnSu3St6+cH9W4MeTpHfAE?= =?utf-8?q?fwpMH2yRgsdqmw9LwYwVpme8fLMdyjY93naw0uraFQ8SOjBc+sdec1b5/qWXCinxL?= =?utf-8?q?+ScC/LPFO6BnOOiAvAW9hfz83WuuO5NTDk+MUXBv2nc1YWsKfXsWdCEHjfxr3D8xp?= =?utf-8?q?FE7d+NvptfO+4bVpFriVdtCmTQK0w5JchKq1hy3Kj1VIfFRHNueC9GdbtzUFpFb+n?= =?utf-8?q?CNKfr5AO11V8d6pKrpy8Dph4JsBGamsWS85cm6WWcmDEWQA+9nX7vAjZAzhAE5a5T?= =?utf-8?q?1n3jnln+LAeb5U26mWnkeFT33syhHyX8+BgkXOouR23rtoK2M7qUiqyskD+TocD04?= =?utf-8?q?y62UrFv7Zh4nvhzUbVzO5XrdfsrWj3ur/PmeyCrtxxMaJ+4lREAyas3yyW9PpRUZt?= =?utf-8?q?v8yzhVOKUMFE7u3vlHWEE2W8YVxb2UQc8Kuv10uE+dwxsdvOLOKKvrPD8An7/ckqU?= =?utf-8?q?X74rP6YM4IY2jl4YS3STBuv7XE+iHK8s7f8oe/3r3xvucR3jEoXbrKmjdk1gR0k/H?= =?utf-8?q?NTb4Kkvr0d8Rtds62J1EsYXfsSxaQ7VU++gvKjA8ZbZgNodIXlYN1utoDmSWRhhv4?= =?utf-8?q?hLeCHcqTjIpeQQea669gTLcnt3GyusAA7xYDgYEyYjA/DKQNSH/EUA/TjxtX1kC01?= =?utf-8?q?peWDaKxX0+vf6YHT?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa92bbca-4f8f-4de0-4489-08d97db250a6 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2021 10:18:26.1589 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZX2I0VRntI1n/gqXn52Bnj1vW6lxkkAvmC7BCjfiQ2q+2qsEnebZ+1Fi1MmgH0JcNYvJKVGrE9vnsWvBRnncXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4190 The function doesn't use it and all of its callers say in a comment that their respective arguments are to be non-NULL only in auto-translated mode. Since xen_remap_domain_mfn_array() isn't supposed to be used by non-PV, drop the parameter there as well. It was bogusly passed as non- NULL (PRIV_VMA_LOCKED) by its only caller anyway. For xen_remap_domain_gfn_range(), otoh, it's not clear at all why this wouldn't want / might not need to gain auto-translated support down the road, so the parameter is retained there despite now remaining unused (and the only caller passing NULL); correct a respective comment as well. Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -2398,7 +2398,7 @@ static int remap_area_pfn_pte_fn(pte_t * int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr, xen_pfn_t *pfn, int nr, int *err_ptr, pgprot_t prot, - unsigned int domid, bool no_translate, struct page **pages) + unsigned int domid, bool no_translate) { int err = 0; struct remap_data rmd; --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -257,7 +257,7 @@ static long privcmd_ioctl_mmap(struct fi LIST_HEAD(pagelist); struct mmap_gfn_state state; - /* We only support privcmd_ioctl_mmap_batch for auto translated. */ + /* We only support privcmd_ioctl_mmap_batch for non-auto-translated. */ if (xen_feature(XENFEAT_auto_translated_physmap)) return -ENOSYS; @@ -810,8 +810,7 @@ static long privcmd_ioctl_mmap_resource( kdata.addr & PAGE_MASK, pfns, kdata.num, errs, vma->vm_page_prot, - domid, - vma->vm_private_data); + domid); if (num < 0) rc = num; else if (num != kdata.num) { --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -64,12 +64,12 @@ static inline void xen_destroy_contiguou #if defined(CONFIG_XEN_PV) int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr, xen_pfn_t *pfn, int nr, int *err_ptr, pgprot_t prot, - unsigned int domid, bool no_translate, struct page **pages); + unsigned int domid, bool no_translate); #else static inline int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr, xen_pfn_t *pfn, int nr, int *err_ptr, pgprot_t prot, unsigned int domid, - bool no_translate, struct page **pages) + bool no_translate) { BUG(); return 0; @@ -146,7 +146,7 @@ static inline int xen_remap_domain_gfn_a */ BUG_ON(err_ptr == NULL); return xen_remap_pfn(vma, addr, gfn, nr, err_ptr, prot, domid, - false, pages); + false); } /* @@ -158,7 +158,6 @@ static inline int xen_remap_domain_gfn_a * @err_ptr: Returns per-MFN error status. * @prot: page protection mask * @domid: Domain owning the pages - * @pages: Array of pages if this domain has an auto-translated physmap * * @mfn and @err_ptr may point to the same buffer, the MFNs will be * overwritten by the error codes after they are mapped. @@ -169,14 +168,13 @@ static inline int xen_remap_domain_gfn_a static inline int xen_remap_domain_mfn_array(struct vm_area_struct *vma, unsigned long addr, xen_pfn_t *mfn, int nr, int *err_ptr, - pgprot_t prot, unsigned int domid, - struct page **pages) + pgprot_t prot, unsigned int domid) { if (xen_feature(XENFEAT_auto_translated_physmap)) return -EOPNOTSUPP; return xen_remap_pfn(vma, addr, mfn, nr, err_ptr, prot, domid, - true, pages); + true); } /* xen_remap_domain_gfn_range() - map a range of foreign frames @@ -200,8 +198,7 @@ static inline int xen_remap_domain_gfn_r if (xen_feature(XENFEAT_auto_translated_physmap)) return -EOPNOTSUPP; - return xen_remap_pfn(vma, addr, &gfn, nr, NULL, prot, domid, false, - pages); + return xen_remap_pfn(vma, addr, &gfn, nr, NULL, prot, domid, false); } int xen_unmap_domain_gfn_range(struct vm_area_struct *vma,