From patchwork Tue Sep 7 12:04: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: 12478437 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.2 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_SANE_1 autolearn=unavailable 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 416CAC433EF for ; Tue, 7 Sep 2021 12:04:42 +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 D7EE06008E for ; Tue, 7 Sep 2021 12:04:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D7EE06008E 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.180902.327766 (Exim 4.92) (envelope-from ) id 1mNZq4-0003rM-PV; Tue, 07 Sep 2021 12:04:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180902.327766; Tue, 07 Sep 2021 12:04: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 1mNZq4-0003rF-MV; Tue, 07 Sep 2021 12:04:32 +0000 Received: by outflank-mailman (input) for mailman id 180902; Tue, 07 Sep 2021 12:04: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 1mNZq3-0003r7-AZ for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:04:31 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.109.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c166c816-0fd3-11ec-b0eb-12813bfff9fa; Tue, 07 Sep 2021 12:04:30 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2055.outbound.protection.outlook.com [104.47.8.55]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-15-1WTDrmR2MLyfRnbNaWU5jw-1; Tue, 07 Sep 2021 14:04:28 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB3120.eurprd04.prod.outlook.com (2603:10a6:802:e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.25; Tue, 7 Sep 2021 12:04:27 +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.4500.014; Tue, 7 Sep 2021 12:04:27 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM0PR04CA0096.eurprd04.prod.outlook.com (2603:10a6:208:be::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Tue, 7 Sep 2021 12:04:26 +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: c166c816-0fd3-11ec-b0eb-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016269; 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=YUjiZ+FcARWZPfFdze9B3FWeG4LoDQIbpj7UKsZHujs=; b=Qg/AlsS5lskTedWM7PBZtc1T9M3UnlHNgaXHI5xEZiSzMq4mgEMA/4Tfkd06ub5k7A1nym EzneuDDEenGhF9w9DpmDJBZcWb8yfhEUN98MKruMkhMVJIy3IRs/85Zohq4lhwj2fpqFCn qq0gYMMRPR/L0MyPW66A9eFqRyNkYRI= X-MC-Unique: 1WTDrmR2MLyfRnbNaWU5jw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hWqVnRoSMtkkKoLxFIHeXIgiaJovVpi2T/C6/AsZB7qDEw+xtIrewTpygFBpQZZoseK8rv/oXPeqB/Kza9pJ90bRay4WbZJj7ouIFUIA8vcb/6Q9ZGxjOThcrIIGWqZGjuqEo7RoLMYwhGcZbyvUu28tXdCKByKfWxZMD8a0CTqjWYKz1pu1b4r42ZD4nZOJy9EdJv+9mAK18zwcpqqbMkYXrwHVoY90wnTudnjsEwyz7cCtferfkASLjI4MFjnMq6vxo7WfJr4FgGcQ+vZyfr0D1iJZv01FvTd2ko959+vhmP6sUAuO3C8hIc/CZB81u+pTlRYutm4XWuZzGmkDJw== 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=YUjiZ+FcARWZPfFdze9B3FWeG4LoDQIbpj7UKsZHujs=; b=P/sUORgtT+v0e8U6tOn4IUxrHCYqaVhHrluOs2tQ+UpS42gjQBgVMNtpDnx9DGQHxpUC0onhjzDLvMQMEXKU4ytjm6SUeW8tcXIEF0azjIWi4sDVwQU67lYxbLsF+m0DrXo5T+8fltnBWNvJzwcnOwroomHg9EGY81/Ygjgb9tWq7BJiXssn3FFbywMjF9Jl7u+BBnrECVbegyPrEUE9vtXVBZzJqDvQmik+bI5pP4wcbvWeNdWKLYnyim7nJTGIbZq+I8lJI1vQ1pz27lm+AnxS6LJ5TO3IRV/dqLadTHtTLOjFwN/Ktxs0sBXMmLdH2IKAUmXxYSYzAmv1NyBeNA== 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: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 01/12] swiotlb-xen: avoid double free From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: Date: Tue, 7 Sep 2021 14:04:25 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: AM0PR04CA0096.eurprd04.prod.outlook.com (2603:10a6:208:be::37) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 921de9e7-79f6-4e70-1d37-08d971f7a410 X-MS-TrafficTypeDiagnostic: VI1PR04MB3120: 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:4714; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cTKXp63JMT+BOej5u6mmIeFwoZz5HLopoCNNDmsPAfAJMiZxsA7fw2XDuaefcIvO/z9fhrHpmzco/sPf+qbyEWQg2kNkrv2VEjOuVlrroyMfcvfE2I072EhTZ1sYwOAc1jeqdzuboiL5weYhMRsPIXWe+DIR2ju2+eV2gX4NzVHEYcxK8AkcxTiQh3EWAWkNO8R8vcTAQL/f2fMwEKP4lGofC0XzX/eIOLDHvw/pRPFI2ActBVdpN3zwUA82e26DNpRS8NrPCkA7DK00nB9WbruRgOrp51QMku8GZG1lx0MhjqfqrJKVaQ3b+rTLsh5EoKVGfmNYXAVg2gHNsrHNi0qshYakSNwtE8mIYZxNvmtXSIqEIFYN+/gP9sHzd5Ww0lctLsRQaCuKlXMqNpPC663xQC9eXQstM2YVJ+W4J/Z6n3UbLvecHEpc0gBz/2gOKgBt97MEmkrGnDeIXhlKq6QIKAwxWBJmE0apSNBNLGqGHbfkdTSfJHN9vBPz3LHEg4NhZ5vwOF1+SoOybfIeL4a9wXdbtQUJP7s0WxoU7yHZlpmA/KAvYbnxx4rOJDOh8QTU+NxyXwnN0xWQemY7TAslj8ZaxC+dVtzeDeRk8wBSeKHml5NqiBusXJpiUX5VjwvtW9/D2f01BHWq9iRGvuBywI4/e3nz4tikmbBjWksPB+xjrhKgnvo6msIQwlogf8IsKWSeMjRmMhRHvCFrj/JYibGZmYHfIFLdDz5BGHI= 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:(39860400002)(136003)(396003)(376002)(366004)(346002)(6486002)(956004)(38100700002)(2616005)(86362001)(316002)(16576012)(83380400001)(26005)(186003)(36756003)(4326008)(2906002)(66946007)(66476007)(478600001)(66556008)(5660300002)(8676002)(31686004)(110136005)(54906003)(8936002)(4744005)(31696002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?wqnt9sMW9EFYyha1brPLzFnHip3Y?= =?utf-8?q?Ft2h+1G+b2M+ULaBRSzZ8k1Oied3M1PZjGT0KMO0s6bs12J6VfRnhyvaKNaXHdVqY?= =?utf-8?q?tcG+Z7rkHGzHG4EAWcS76wEdukHBZKl1V8MVLCP2tbojTGzPsZu1JFgiYFIJF9bEg?= =?utf-8?q?DbFBdhnBjXuW7K+/CnwhoOwYG47S1r1TgNer1YA6I9nV4OMXhbt1rsmQf3SCy9hjL?= =?utf-8?q?MZVse1cg/XaOyI//xMoco5gcSgiYiwVBmrkWy7j22L4b9VaCa4C2F/wjU8mXMTWjX?= =?utf-8?q?U4PRjjDflvLLkPCH4ze05EmMZ0O5iZ31/R3btJczJLRgP0Vd9VVFp+I9K4MLHWJYy?= =?utf-8?q?1zGHqiZ4IBrNbKHnv8ipj2/aPKxeTfaAa/Zr8/yU8naEMvUVAxsMFhhVidf5bIEri?= =?utf-8?q?L58/+lkBLd3drqoxt41Sw9Ql+z+SybXg7ZE4OudrYLfgKSjbDoUhtRLuXH63Vxp/E?= =?utf-8?q?OG2qRb41et2EubWcEjUlPo1zI6G4wogU450uuVbOMlXzAysXnqidOjMzYNI996kW8?= =?utf-8?q?BcBe3lETn33nqF5gJw2Ir3b0mtezMHqXT0yRCWHk0K1Zcv/rON4HSuHnWhe4EOvgm?= =?utf-8?q?mOrFjeG1m0slmyug4qLvOHwYd0t1kyEF31LLMp3smB6yfAn3coYhW7d5T1MWz0eJz?= =?utf-8?q?Gpq9RgPeYcrDNtrkwxXfW74M+B4TzDCPKYabDNJNJXW52eut2Phcc5TySio+ElAlv?= =?utf-8?q?fK8dLyhDYRKNSA/21lVcrxcqZgV7YVcmbZ8plvyRhTLMKHxWzOX5ZUC9tjYDhXdYs?= =?utf-8?q?kmkhc9kCL0KhnKimlQgN6toZGRwTv5TajXF1OO3vdE2hSUbAg79AzsN0gPpCa3ah0?= =?utf-8?q?D/GeV7rhe8uwaRbbvdqF9TxaWk+0Ut/mwMvgqNv+6Iy5gr6GAKjmaOtSzNuDU4oAG?= =?utf-8?q?ABhu0Z4ZjPtGNbc5tN13/NMnEmV0MN2FYojBoGPxooKkgrkakIBBr72fZUfpumUZW?= =?utf-8?q?446mk/t+KAqlZz0JVCjNZP5ChdxshMVnC2cBSIdfL1N5QDDu6MjTeFrrqMHtUGdYt?= =?utf-8?q?34twfQxGSLdZ/LiiBct9aA97nA62I01AvfoC1tvxVlTSFTsy+wOu7ZBJ7X1sN49gB?= =?utf-8?q?N0FmsnJBtsgpNeGcNZuZFc3QPJzhHXjPe2VDlaXNo4P05wy6lEwlLq4GnyIkUuTJm?= =?utf-8?q?5Mb41keay22mzS3v7USg9clD698CVUO2rLjUPkcA4eEPQsCK7ByNl5QpWRkn2G5a6?= =?utf-8?q?NWMGmhVo2WDxHwnm4jgtQTKnGqNzRAnyGFHy0WENjVWAG8SzkZU1bnjyZ9mtOD9I9?= =?utf-8?q?rNAZYcDqmM+yfsrP?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 921de9e7-79f6-4e70-1d37-08d971f7a410 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:04:27.4045 (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: fxmyLLc2/qK2sEN83kbQC4/qg3WM3+6UGQu1CSP/kkah2+uudkIas1308gmuLjq4QwRWerOTYZ0iL0+NKi/ObQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3120 Of the two paths leading to the "error" label in xen_swiotlb_init() one didn't allocate anything, while the other did already free what was allocated. Fixes: b82776005369 ("xen/swiotlb: Use the swiotlb_late_init_with_tbl to init Xen-SWIOTLB late when PV PCI is used") Signed-off-by: Jan Beulich Cc: stable@vger.kernel.org Reviewed-by: Christoph Hellwig Reviewed-by: Stefano Stabellini --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -216,7 +216,6 @@ error: goto retry; } pr_err("%s (rc:%d)\n", xen_swiotlb_error(m_ret), rc); - free_pages((unsigned long)start, order); return rc; } From patchwork Tue Sep 7 12:04:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478439 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.2 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_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 8DE25C433F5 for ; Tue, 7 Sep 2021 12:05:06 +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 3997C6109F for ; Tue, 7 Sep 2021 12:05:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3997C6109F 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.180904.327778 (Exim 4.92) (envelope-from ) id 1mNZqR-0004MB-2K; Tue, 07 Sep 2021 12:04:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180904.327778; Tue, 07 Sep 2021 12:04:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZqQ-0004M2-VA; Tue, 07 Sep 2021 12:04:54 +0000 Received: by outflank-mailman (input) for mailman id 180904; Tue, 07 Sep 2021 12:04:54 +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 1mNZqQ-0004LY-07 for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:04:54 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.111.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ceef2456-0fd3-11ec-b0eb-12813bfff9fa; Tue, 07 Sep 2021 12:04:53 +0000 (UTC) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2056.outbound.protection.outlook.com [104.47.5.56]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-20-OVm-SvxQOwytzB7hKxUMTg-1; Tue, 07 Sep 2021 14:04:51 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB3120.eurprd04.prod.outlook.com (2603:10a6:802:e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.25; Tue, 7 Sep 2021 12:04:50 +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.4500.014; Tue, 7 Sep 2021 12:04:50 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM8P191CA0025.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:21a::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Tue, 7 Sep 2021 12:04:49 +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: ceef2456-0fd3-11ec-b0eb-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016292; 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=SEuCaucOQlDfG0ryFHeKwBYGR4l7zA4FQQ51ni9uTXg=; b=mE8Q40nkht5RRzywnbwG8Em7tR5ztaY36D8bh8eDJx3ti+QNg/2jz3+5aWN90rNG2BWQQ4 JnH2rneP9KzAM2A23f6DuS4njDyndwcSOFnWMijHXVD2IC8PNcmvTEQoERg4DwdDOHxSpo RQI2h8YxC7Lj+bs75fdOvDnrJaLsJaU= X-MC-Unique: OVm-SvxQOwytzB7hKxUMTg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ab66C7ASTuno/bPzTb+Y8j3ccwUmyogXm6TzavZcrj3O1j2UW3/wnCZ2nP7GBM07+2VMSttopQsZL3M1bHVqu7tYUEc+WDliNoW3BEUNO1f3gSgOCS0+r4X8aR1pqBDedp6HXO5lezubR1Qv4MoVNJ6U5m66mAh9u5rwABNHjN97tTcsImXOvOGMxQaL0G6vppdK9UXiit4v+bsC+xZTNqamqSnLFR4NX24Sp1wQagy2O/N3o2z1rjcO/G9h81mXo6cqOaPKhdeaM9qWKHn+7FcGNJ4XIwWNYOOY4i9Cu7iIXKsoLRk2/feUE6vaX/DozkY0GVkKtbtO3ctu0PuZwg== 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=SEuCaucOQlDfG0ryFHeKwBYGR4l7zA4FQQ51ni9uTXg=; b=SnzjV8laz/8YNs2cwweqzy/rW8YYs7YM4WCrzowBIoCakPCYY+0oeCSI7xq3kRikMLDC3MrN+iQMP1/pdCtPr68kh09M70foN3neAhMkreiYVR/1OFnmjH19h/svH8ThHFvZnlKn0YSAsKZUO5UZKV0Tg6pgOqY8uQJcg0Nwud0p1ODIupEDs0jXE9JVcJV9hWLf6CqgtfTn7euXlaaCN/apVUgPzGzAFdNQ47YtHGlfTRnTEYpttBBeWdJn/V2wdxmD4hKGUJersUgoS7PBpVV9JzP7GxyIgkGKUSyV0IAy2+rET1Mwh6R1diHaZTeBPLsRM2mCXAQPm8K3Of0uEw== 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: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 02/12] swiotlb-xen: fix late init retry From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: <778299d6-9cfd-1c13-026e-25ee5d14ecb3@suse.com> Date: Tue, 7 Sep 2021 14:04:47 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: AM8P191CA0025.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:21a::30) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3b9b8ee7-e96f-4f6f-ef01-08d971f7b176 X-MS-TrafficTypeDiagnostic: VI1PR04MB3120: 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:901; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gHKbMa/EKtBsFLeDT/7oxzcuXl2CWZ7i5ag6WT3vzfBLj/BZf/2wiynVdBsFfwBjFR8lQyxcbcVHC6zaa5fEomBY28TpP9BkKol0kSN2t05LNKCBlzRCQHnpkqdZNfUgrB92kN+ecLHTh0c/sKEB+zzLxg/SdGpLLNLzv05WUAH664MZ2+mjagQjxzpIqoT+ex3jeN4FoV4HI1iraFb+h+vkXDcQ0aAlK1qnOwLlINYy5m8bk0a+Rey0hL1ZCPNZsPOsF3FWqNsBegKdzu8In7CBbf9+4M/gw+qeHApI9IdCOxZEcvupHWonzSDqCt3Ux6tVNuHtsmfCwRqN9gPtBmRGhWf2YcXJU+o3mPkEqnDaQqC9HTQ4MWEo8RoEMNMT9e+E+TCC54PZ0F2oZS7n1WMOiwt1dja85SH0tgpW4H76/S5R7YmkzNrqWu7LJX9ELS6BELc576RDYpNThRd5/wPznTRkg31Nkfl8/H6VEm7yvcvzwuKAGJAjSzPMldSlV6Pook/oYzXJTgAciuqe12AVk2/OkTetVci1y4EYys/V31S2h3OCNkDIrSjuXS0OBgSAjhZfsFeHd6sLR60RQTGUBIW0CXsB0nq2gaNRKed11EBrqj+D9eI5LL5jw9Sqg5orY35MkRgJLb7thjlFxctCQr2sHBrOi2lstKm0ndzy693fT0/f5ccUvZ4kGTzsHI+mVYQQpcXzTT3CwbC7T+58N4IXA6aSlcEBVqXjYwE= 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:(39860400002)(136003)(396003)(376002)(366004)(346002)(6486002)(956004)(38100700002)(2616005)(86362001)(316002)(16576012)(26005)(186003)(36756003)(4326008)(2906002)(66946007)(66476007)(478600001)(66556008)(5660300002)(8676002)(31686004)(110136005)(54906003)(8936002)(4744005)(31696002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?UPTyr7wXmsPeaRztyCuVeOXNxUW8?= =?utf-8?q?3yQGaL0PSse5WQTMFsHqnLirSfGhtvGuFXCJJUIwOczKrTMfRVX281p33zj+WvyOc?= =?utf-8?q?qSU7aFJ8456xoN3uqD823ylilD2wBbUlwCYQNuFJQV7xvM4r3dtzAUsdki2qF3rl6?= =?utf-8?q?cG8Az3r4T3JbmXF3UBBXqg65SS85Z+UTW7jDTTU6vPU1YAuKSq/lOVv1dprwuhsEE?= =?utf-8?q?m8Wh5gaauLZEJFkrfdG4mcO1Zy08XZ6jblPOanMnsVdSMZt1pDo3UGDBdR7xQ5Mes?= =?utf-8?q?yHyQNHYoLG2m34AltdJ283CKsxPof37n2v5+y2+AQtLga3k2CCVIeBkHLBTDBIvtf?= =?utf-8?q?S9RxwZ/5RW6sYEwAL49DLduZwlICtGNs7ASLYOMcCBi7BialstjgNDUYuZnbPT+6k?= =?utf-8?q?hCmI8CLE85bSK+ljNUSLPboEnMk2x5nMMWDrQlaxD1KAjK8azgT+jVhn3xsp6pPsw?= =?utf-8?q?jDJ6AMNpUnIJaMIvTr5g5pSUE0EJWaj9wpbZxEKEXTDIs+qbzqt4mrXtllFExl6fi?= =?utf-8?q?ygd1ReeBHQrRASBqkWF6n5QlYmsUzYVG7NN86QFQ2+qdqk5hkKwI49VD+7T895/pe?= =?utf-8?q?2WCHEO83XIcRTmq6rZmjZ5+kosxc8+8Dtp+0LXhbLKFlnqwEkCR5g5rZVdA4qiIvH?= =?utf-8?q?2M401V2TBc7Os6PwO7MTbahGOTc8mu2GPSe2bJKsYSbZeXlymCnNxqbI4aSo+2mHF?= =?utf-8?q?ExYgIhrDss6SPv5f02zUSPcYGH1ug+ZZTxNyrMcWwlnMNiOeWN3b0dZHMMm2o3iKZ?= =?utf-8?q?HqviyNa4O4vlC8pzC5L+MFkIuhJQWwpvBzjcchVs5ts1kjQWJwsNGszbthVfqGU0I?= =?utf-8?q?OoyzpRFmW5Veo+GHJ4JR9kuHeCSgNAJAeE8RL2ooetwDfDScsn9tMPHTEIyAdpaK3?= =?utf-8?q?pbdORh9cCzwH9DuSPQLx1/5hKsy16hFeHY4rvajwe7rwuQ/kLguw8to22v7W90Cna?= =?utf-8?q?Kj6N+/SbMDMIi7jPeLOJo6D+WU0v7c/2OvKSeV8HqlkGnO9fy017TVx+AH5pNknc7?= =?utf-8?q?h8g15jtzr7bE3K18TXcximcKiW8iA6FcIDrudZoFTXdmJo9Xoe3xoHseJY3M8j6/z?= =?utf-8?q?/2f7MeykkAB+VwYmfnOJ7z7YjyEk0R7E5E4hdBOB88uGM4j+siTI+PHy8JCuy46Yi?= =?utf-8?q?43zOhzsFv+zRvNxfvNG8AZfQeg86XSe2nY+CPcnwB5gNcE7goEoF3kRhrDqISJoHw?= =?utf-8?q?cYn1vfuIoj8Zc6GPM8QrqPf9NI46OdD0kzBcSRn10IC0FWkfpAGlLfHYZ6v8Q+PHZ?= =?utf-8?q?u5ejZzKVIfyDuDRj?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b9b8ee7-e96f-4f6f-ef01-08d971f7b176 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:04:49.8957 (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: 5ekgPaTEnMDnoeOJ1xNV7KeNLMYISrN0W5UEYEoDo1ZcyumwM/eujCiVHt1UJcgqcmtKVMpXXX7Az4pqdMNEXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3120 The commit referenced below removed the assignment of "bytes" from xen_swiotlb_init() without - like done for xen_swiotlb_init_early() - adding an assignment on the retry path, thus leading to excessively sized allocations upon retries. Fixes: 2d29960af0be ("swiotlb: dynamically allocate io_tlb_default_mem") Signed-off-by: Jan Beulich Cc: stable@vger.kernel.org Reviewed-by: Christoph Hellwig --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -211,8 +211,8 @@ error: if (repeat--) { /* Min is 2MB */ nslabs = max(1024UL, (nslabs >> 1)); - pr_info("Lowering to %luMB\n", - (nslabs << IO_TLB_SHIFT) >> 20); + bytes = nslabs << IO_TLB_SHIFT; + pr_info("Lowering to %luMB\n", bytes >> 20); goto retry; } pr_err("%s (rc:%d)\n", xen_swiotlb_error(m_ret), rc); From patchwork Tue Sep 7 12:05:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478441 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.2 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_SANE_1 autolearn=unavailable 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 9AA8CC433EF for ; Tue, 7 Sep 2021 12:05:34 +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 52FC36109F for ; Tue, 7 Sep 2021 12:05:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 52FC36109F 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.180913.327788 (Exim 4.92) (envelope-from ) id 1mNZqt-00053R-Fk; Tue, 07 Sep 2021 12:05:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180913.327788; Tue, 07 Sep 2021 12:05:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZqt-00053I-CR; Tue, 07 Sep 2021 12:05:23 +0000 Received: by outflank-mailman (input) for mailman id 180913; Tue, 07 Sep 2021 12:05:21 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZqr-00052s-Lz for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:05:21 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.109.102]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1f79e998-0a83-4c1e-9023-9908260c0db0; Tue, 07 Sep 2021 12:05:20 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2169.outbound.protection.outlook.com [104.47.17.169]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-29-YepnUYaDOWWKxsgoltrgHw-2; Tue, 07 Sep 2021 14:05:18 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0401MB2607.eurprd04.prod.outlook.com (2603:10a6:800:58::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17; Tue, 7 Sep 2021 12:05:14 +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.4500.014; Tue, 7 Sep 2021 12:05:14 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM4PR0902CA0012.eurprd09.prod.outlook.com (2603:10a6:200:9b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Tue, 7 Sep 2021 12:05:13 +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: 1f79e998-0a83-4c1e-9023-9908260c0db0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016319; 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=Um9DC69BNNgCMREa9h68z95lfy848yTwNtWb0Y+Y3VA=; b=BLW+c6Ug5Z+zwhNlk/YpH1Q5i3ASw5QY84r1mcs4V6bYiJNU3laJcKVtZIcl9oHP82ScLK D6QboYd6vhvPJmcv3SUaHQRdGWS9Re/r+c1fbB2PtjmXLTcpUhBY0Ybj5wAy3vYlms8A4s /nzD33dXTk8000D6soOGjq/zKYoyX1Q= X-MC-Unique: YepnUYaDOWWKxsgoltrgHw-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kmPC5szowPAPAcKQtrFxAUEPkIW1vldLPfpE1mITFMGlnxYUxjnG45p7jkouAGh+wah6/yS2nWVTiLx1AcU8Y8RiO7EOptLW3e7FAl4HxRQCc8W3qOn2P5VHL6z+yMvC3Fjh96JzeY2r7pTi3UrAM1Imi4IfPI/BhP48+N2rQ+XGf/aof+O4JoGzWaUL6Wr/50ZmSHR51GyxH4Z8NXmiJPdKnRlctIOc51w2stDm1Hbzpin6FtL9YpAIEllPB9hrUTpkaxxwbCD4vpMW2MNTpXh133deEewqx3wCAmNVt6nQwfeHweNYOrDhppT65RN3EoA+7L/l98bkFdAJAr0tlA== 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=Um9DC69BNNgCMREa9h68z95lfy848yTwNtWb0Y+Y3VA=; b=B8vpRUnG/Yg1Rfe5G/aeQCNwpoFRYh3m/0Ei3R4L/33fYRBEtoZHj6vQGFmiZnmwCUHPXWkgZXNNKYNuRX07zeIdO+kVlaTLa1LwOfcPIseu4wsmPl1LNI1PFxBCCYstSXlUPQwQoRM9MkjwouML6cO4BB2khl1FyyycQyA6aZMXjC5dCd/HsuXfIxEsxcsPd7HrsPBJ1RuPNdE3HumwE7GXzqAVKqK/KNrqlEw5wFu/NowcBdBOCVH0hQZogcaeQsO6v+yQUioD0e92VgI5piJMLqMDdomrIzBXpi50ZMyUrIRP/ylR6STk2P9AE70SofFB5UaoL6bbxISXih0hUA== 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: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 03/12] swiotlb-xen: maintain slab count properly From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: Date: Tue, 7 Sep 2021 14:05:12 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: AM4PR0902CA0012.eurprd09.prod.outlook.com (2603:10a6:200:9b::22) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79499601-472e-4206-729e-08d971f7c017 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2607: 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: vHNpV0PXcxqG0FHlMMXWRRspYP4aGcfX0qZtXuA4lZfbuknabNCkJ5tPA1iWVKHTuBhzCg1elOcIHInoUVlhvCh8TDG3yER7hDUDYLfh5B3Bu1B2ARpsO0ZDp5fDZwxQU+4bhDslrr2LVX/rvFvDQ8SXNb4HKjUgF0cvP/IQXq/olNTlFv+Hv4KAHlo03RRwTjx9w+ANl2ZhBZceAZWvqSW2p6IhXqW2o2pTFNERMUboGucFuljw0sMuf8oGrYC7QCsXEJ+i1Aa9lK+iUk6remTJ5x8XqxdyiBC2KF/8WaM1msnuAeYrcozBSFlGNcyxYgDsXHTN3lSGJp+KFGeXQ4wN1+xb7NdTpKaeqXP5kgTTnXnoU75Vw6HQz5ttFj5krhauYFnxmxvmscakJOXCX78IadnivoLvlHxZtqw7vNp3SXrx0swFVxKDOAdFHfJNBRDsd2+dTX+zXoZgKNWmioOCa9U5ySGPpAjkNZNRLijTvPPrSEAHc/0THG1lPeYSZzPKYW7aR79A0v66g/F7yXew239RTf3ev4/hDcdu5o3GCPLIWZOCKBhYj0EbhpoC62ycUUpUsyzcNMHSMopE/2x+jLgpD1CULyLbtlkrrkioe6SwU8S7Qqz75rZNmZkYtLZGkd05mzNYpfuipP6js0a+GQtmDgKnyBuTvcdkbv0wZg/z4un2Q3NTc+QPcYlBQsnHsp8xVWB+SA3gEBbNUdRRv5o2X/+jSRl5WXuIJCA= 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:(39860400002)(366004)(346002)(136003)(376002)(396003)(186003)(83380400001)(66476007)(6486002)(31686004)(66946007)(66556008)(26005)(110136005)(54906003)(316002)(16576012)(36756003)(478600001)(2906002)(8936002)(4326008)(86362001)(2616005)(38100700002)(31696002)(956004)(5660300002)(8676002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?ceyRGLFFJ4lsY3S1KPk9rmwbpOCh?= =?utf-8?q?s1lyU/DXnq3Jc+Nv5e9iecsVkbEitm+9RSgvhbVjzog3NBvjXml7O1TnuQnLgFxvt?= =?utf-8?q?m2LVHoN15VAiCixEq+ERol6EPLJoy99PlKFiW6+zvvNCeYpVUKJR9YuYzhvLnWhGX?= =?utf-8?q?kjv+YAY4S3XqU57GcbS29gDQ4r9WM13en9Gm85klSn2ihydcUF9HVL1Vk8gKBorth?= =?utf-8?q?+XwpZwQwfOI27Qjw3R19+Tb11Httu2WCFPTWHpe4Z4UcJNn23IigFUZx8YKFJfojm?= =?utf-8?q?FoBCUZ27pixlWiXZ2u8qcMuLg+fsVSsyBienJaEbE0ZIobWHyv+K9sZT6M1RVQEXi?= =?utf-8?q?TDuHBcl70BeMQQZW/DKF0fU+1vOsdMAIGHMnEs9zfGZsSKdYglLAXuboU12vVvpr8?= =?utf-8?q?YwJuEP9i17JKPkvB16Eohq1ipmKk8Byo+CiaYIXeFRZMfWgcg5H1zTWUHW2UM6IkH?= =?utf-8?q?mOLceYJv4UPmUbItW2tx/YpecrCrG7gKDRWQBfXMviu9YK6lNJ0WsJ6krlHb25zUm?= =?utf-8?q?WU+51nK6fJhZcgLa+dAtIQezt4WtwNNrnPAWdPUR8VZjRrozveHkYtCmhd2Tznmqp?= =?utf-8?q?ayt6oOaKaCCWQbvnQgROS7XVWCCL2Nkw5P+40BxXzakJvIa+uHSwrjfvQuOvmw5D2?= =?utf-8?q?4WSnvGPfzhNPTtqQ1hgFkJdaNRuGJs7QT3cibcof+0Ol5bCbmuJND8DTsnl8yAB6Y?= =?utf-8?q?mRoATWbHy4jydsRLKH8inpOpA6RkYB3+4rwYp/Qr1MiCz3SdZJzK2Ym/93hWuyIvq?= =?utf-8?q?lT8v6ORvIi3La+UzggssJ9j2hLeM6jN/T+53ErJ3HPohWZbDDaRFO5PyGFIz+7oI+?= =?utf-8?q?ZVv4zJshxsRx3srpqn5e2AMPv4UJ417DkK7FXiFDVKFvxJQ80r5BMeoRPoIxn1uPd?= =?utf-8?q?TCVQpasWhDvv1z1jjYSR7KNT+hr2nNB2H4SZAPNMJZ+FPne8zZvR93ZKH7XQCbbkE?= =?utf-8?q?3cc82KlPmIPru6Ar0pvsPCsEYJ21ZsAOiiJTs3DFZuzdkghPSNzStJoOLI14z5uJN?= =?utf-8?q?HD3Ux7RWv43X1rlP3yvBcU0PIIMdfjykEQ6fRZ8LxJnMiBp0HfFEfWu7GZ1qDu2++?= =?utf-8?q?oBtwO4zS92C+pJqaxSfUfUNWBr94b5Ca45FaHnyWYfB3QmNcsvLvEk0r53xIKjTYo?= =?utf-8?q?/vq+QH4q09vELZW5G0lCEK45wtHdgCe1l9mR/2ppBhWk4nCqKzoBqJDdHJ4gckciH?= =?utf-8?q?6TavGfopJRMcrnT/e0Ou+U0FVdbjXgnwdDWVDSr40u+Hjagl0OfzuLIvLEK6P338G?= =?utf-8?q?siqgyig5RUhpYJUT?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79499601-472e-4206-729e-08d971f7c017 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:05:14.5097 (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: gc8lOrYo7lU2SoL0ccxfi4KFlLO0RxF1duDS9OWQ17m+Aeln5lzfSr5X8ZswULPYs9TvK/ffQPO5cctfDvWSmQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2607 Generic swiotlb code makes sure to keep the slab count a multiple of the number of slabs per segment. Yet even without checking whether any such assumption is made elsewhere, it is easy to see that xen_swiotlb_fixup() might alter unrelated memory when calling xen_create_contiguous_region() for the last segment, when that's not a full one - the function acts on full order-N regions, not individual pages. Align the slab count suitably when halving it for a retry. Add a build time check and a runtime one. Replace the no longer useful local variable "slabs" by an "order" one calculated just once, outside of the loop. Re-use "order" for calculating "dma_bits", and change the type of the latter as well as the one of "i" while touching this anyway. Signed-off-by: Jan Beulich Reviewed-by: Christoph Hellwig Reviewed-by: Stefano Stabellini --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -106,27 +106,26 @@ static int is_xen_swiotlb_buffer(struct static int xen_swiotlb_fixup(void *buf, unsigned long nslabs) { - int i, rc; - int dma_bits; + int rc; + unsigned int order = get_order(IO_TLB_SEGSIZE << IO_TLB_SHIFT); + unsigned int i, dma_bits = order + PAGE_SHIFT; dma_addr_t dma_handle; phys_addr_t p = virt_to_phys(buf); - dma_bits = get_order(IO_TLB_SEGSIZE << IO_TLB_SHIFT) + PAGE_SHIFT; + BUILD_BUG_ON(IO_TLB_SEGSIZE & (IO_TLB_SEGSIZE - 1)); + BUG_ON(nslabs % IO_TLB_SEGSIZE); i = 0; do { - int slabs = min(nslabs - i, (unsigned long)IO_TLB_SEGSIZE); - do { rc = xen_create_contiguous_region( - p + (i << IO_TLB_SHIFT), - get_order(slabs << IO_TLB_SHIFT), + p + (i << IO_TLB_SHIFT), order, dma_bits, &dma_handle); } while (rc && dma_bits++ < MAX_DMA_BITS); if (rc) return rc; - i += slabs; + i += IO_TLB_SEGSIZE; } while (i < nslabs); return 0; } @@ -210,7 +209,7 @@ retry: error: if (repeat--) { /* Min is 2MB */ - nslabs = max(1024UL, (nslabs >> 1)); + nslabs = max(1024UL, ALIGN(nslabs >> 1, IO_TLB_SEGSIZE)); bytes = nslabs << IO_TLB_SHIFT; pr_info("Lowering to %luMB\n", bytes >> 20); goto retry; @@ -245,7 +244,7 @@ retry: memblock_free(__pa(start), PAGE_ALIGN(bytes)); if (repeat--) { /* Min is 2MB */ - nslabs = max(1024UL, (nslabs >> 1)); + nslabs = max(1024UL, ALIGN(nslabs >> 1, IO_TLB_SEGSIZE)); bytes = nslabs << IO_TLB_SHIFT; pr_info("Lowering to %luMB\n", bytes >> 20); goto retry; From patchwork Tue Sep 7 12:05:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478443 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.2 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_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 5E265C433F5 for ; Tue, 7 Sep 2021 12:05:47 +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 094AB6008E for ; Tue, 7 Sep 2021 12:05:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 094AB6008E 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.180916.327800 (Exim 4.92) (envelope-from ) id 1mNZr8-0005UP-OX; Tue, 07 Sep 2021 12:05:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180916.327800; Tue, 07 Sep 2021 12:05:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZr8-0005Tw-LE; Tue, 07 Sep 2021 12:05:38 +0000 Received: by outflank-mailman (input) for mailman id 180916; Tue, 07 Sep 2021 12:05:38 +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 1mNZr8-0005SV-3f for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:05:38 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.109.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e906bd04-0fd3-11ec-b0eb-12813bfff9fa; Tue, 07 Sep 2021 12:05:37 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2172.outbound.protection.outlook.com [104.47.17.172]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-31-Yget3GjuOLGL9PuuNgD8PA-1; Tue, 07 Sep 2021 14:05:35 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0401MB2607.eurprd04.prod.outlook.com (2603:10a6:800:58::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17; Tue, 7 Sep 2021 12:05:34 +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.4500.014; Tue, 7 Sep 2021 12:05:34 +0000 Received: from [10.156.60.236] (37.24.206.209) by FR0P281CA0015.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.6 via Frontend Transport; Tue, 7 Sep 2021 12:05:33 +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: e906bd04-0fd3-11ec-b0eb-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016336; 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=DxJykJMCxYkJPMtlwaWjGcuTROCQKWVJPc/aqT8Eh6U=; b=Qqu5Oz1sA54M2K4Aae9GH0tQHO4H7xzdoYjjHAnCzWtw7/R4rMbAreS8CdJV6ETbUDhXaj l9w+bJ36CWazF/pfbxaFRz2Dk/noc5Z6iu/i7jHd0PAKnZnoYdddAryOmTzBbiFIFauijf Ghy0HL5p5/FiQKQqmvUi1Y81hwb21W8= X-MC-Unique: Yget3GjuOLGL9PuuNgD8PA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cKFu6bKu5CqvQSsZeH90PTEjoTPDza5A2H7ptd3U9Ujy947lmUS7J7zarX/yebFT2r5weYEr8lIatS5LGhPg2zOjQwTIZQE8y8YaIGX1dZHIaM/J9joZTKEO9i3dNn/5nk+uzdaIKHEad0GzZmATYPIcpmBg+W2D4adXutXdMNq/2yh+YkWo/m9o0xiKBY00pVH27Oa4MoMze2m5zk9BPcqIwXpl8W40PSkqHrN4WxJcq7MvnjGB+Vl1BPJ6kf0uJwFAGoaUc5dxXC5vwYVnYteO7BLsG6Rk9Cf1XajP9ETMFT2jKq1qKZk9CLnVHuc+KYF2WQkqUsnjSr2agYETcA== 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=DxJykJMCxYkJPMtlwaWjGcuTROCQKWVJPc/aqT8Eh6U=; b=CtXfxloLrJf41/XtEmZDN/7JY/k3ELuF3QgwEngr7bj2W61JXzXipKAJSXG+YqhWSeHRnO9yVVaELJUZ2AdRYhve5uT/0U9cr8Tf/tA+fd/N+WrL1JdEHSfoXd4X0S/64YD1J3/sAVKBOIGVTkHhrdWj0jCzTsj4CiYkqIss/c2XxK9pS2fuxCofiQfaxhOvR97+PK7QVUjaNlskqLyhdZ/nLmRRpRSMuhUfpwzmxYO0EUHjjZpp8sLsbKg+Jpx5PZh9LlmIzrOVfnydcmeHHkp7iVhKQfBrWVKsVQSkiJ7dNNgSE1pnSySVFgIHFYjlyEp1mcgYn+VoP9LygBUMxA== 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: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 04/12] swiotlb-xen: ensure to issue well-formed XENMEM_exchange requests From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: <397bf325-f81e-e104-6142-e8c9c4955475@suse.com> Date: Tue, 7 Sep 2021 14:05:32 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: FR0P281CA0015.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::20) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2721335c-c207-4d39-3699-08d971f7cbd0 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2607: 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:949; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1AXwpce2ZTGO0h99O41c6qeudTOS+SRO5wPXSIxeSQqn5xKaa/HDMhF7EzO7rOdJPRMv2vJE1sNwkZFL8qbuK8uNsuYMLyJdsfF87d0WYUjUjM9miel40AeQk+cbBAerKT0JKnXLIgPdRTsiipsSTcGPJV9lZN7N3Oe14dMHC/XLleob+6brqFCytjBJrW6A9/yycffL6tDeuxCBHAS0XBzDRKSNdePmn/kDCYYMvubYBHb+6AYctCdtlsC/UeIaC2TStMc37mPlDLv0juBwLbPW7OzIrWUNSJxUvzztahnzfzd43TTmAZaWACfgUSULu7MmBia4ca5AkAWk6M1zXvQ5fa8qbyFKpEM34Opcfh6vtboKa+BUHeUC4Irl7HQdCX++AU6rEie4b8aaSsvSGjUxcJq3dWzCmYf1oalVs61CHP6qcglBAghz4pDtdZdOisHlKtrfhUb+kA2TOzgipqZ19ThXMilurWRYOI4pj9lLVqB0CHYMQjtDKpHibxDoNdWc8zMT+LghZIYcqELm6I9OLL6GVH29IEZi1Bj15pMSxpO60L3aWOXB4bJN26W1xhuMBdWzufo6mGvbs7bdhe2SxpMh2Og0pHiVYPiWkxptBa2ZYSzWofFykcKWPuhnktvSf+obPEBLGBG68hKCiyK3Yb51hz2bRTFKIvYsPKX213vg+HAcIkRjP/7ZENrZaP7ydwuEKG7SMwuD+pYImGcDcZsbI+D0BSySFIZ0Ow8= 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:(39860400002)(366004)(346002)(136003)(376002)(396003)(186003)(83380400001)(66476007)(6486002)(31686004)(66946007)(66556008)(26005)(110136005)(54906003)(316002)(16576012)(36756003)(478600001)(2906002)(8936002)(4326008)(86362001)(2616005)(38100700002)(31696002)(956004)(5660300002)(8676002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?QjWUfdjsa8Ds6SRWj1uButH9pGfR?= =?utf-8?q?mHm53HqtrBcNBWvtz0tccahM4W+vq3R1Nu2yr0I3mZ9EZ06Oq+FatpK+ImkZzBGg7?= =?utf-8?q?BuHN+jvZiVFGWY33XHf9FWaYYedJPcqaO4qHpFEDLD80W6Pj0FCbs80VRHigvVbzk?= =?utf-8?q?1EZ3FaIocTyQtM01yRb5OsalXLMAWgAzORLdLc8NV3GdZ9MsE8hsxu8iStSFNo2M4?= =?utf-8?q?e/OjAPjqiU5Y0+WTTnHstYmuG3qzOFy2RRZyigWUw8uURqShD9GeABbZD3S9wtRrE?= =?utf-8?q?fSHERQAdUT4+fJSdPTZAhw1VDQYgek7sceI0N9nE9dPu++4/XeTjVSxUx68WgZPlz?= =?utf-8?q?yImfJVuKqpIwlc9W1762GC6hvpqjVShy3Ux2QpsHRL/F67n3550lEqDRgkww9rLKY?= =?utf-8?q?JOEqKwfasQ29j1miZBB0KyjuOWGctQSHFdoMD5iZtXb4jTYtay1FBi/QJpHZhJGxO?= =?utf-8?q?epKv4L0T41iMnq587jvUTW6djBIJZPCBrXcuLv6y5K+gxtpQy4kf7z5caNuWMnSF4?= =?utf-8?q?CK5LyfxV3phxGXRcQ5tYhpkPdw5LI9qHcLQWFmU76r44m50N7eNIHRPpxMC7clt7L?= =?utf-8?q?zGfQn8NH2ihGBtXCqbEl3gllLPEZZFhOfrbbHqPdzHWmk89AC5HF6el9ubMieQXv4?= =?utf-8?q?4RzT/p4Rqum6Is5fjs2XduhHHKWObZITF0PxSB9XfL//KDXB1ElIXC9S30833ANcL?= =?utf-8?q?VIU1CfLta6qMhfq64Sn4pglsMBRQYeU+6nbT9ajNIeD0dUWU3fW+HaE/p5+QbAesS?= =?utf-8?q?YVzDrFb2+D900SFMXaOuVyLoxf8dC7Rv3OxhvRNzTjYpC03lcj/6B87rQ84XbpWW7?= =?utf-8?q?vc4WAHZPRWOvF/IG6mqRol3JnmQXXfQu/GZAJIrV2+wUc8sJ7TITXFTP9p6C3SvYT?= =?utf-8?q?evmYSbXHyM8ByuzDqmc3YBU9UjdvK/GX3p4Zo3NMsqoVtLsOCVliKs2wKJ68T/hMI?= =?utf-8?q?4Fv7vRTec97N9l8+GUbMOn3WrH79dzoWAjTFnBBCAMV0ZnzJaO7PxwhOvQSXg/XFC?= =?utf-8?q?XR1qepclS4O03thBsIVyceB8BTgqgHVC5pzB618NpEMcjTaRsV6UfoQS0gqz4vfOZ?= =?utf-8?q?lrIFDP7X/PmMiUXToMDqk1k9+MZJFCOTs3FHp805R8FFZzQsp3B+1FDylPeUpBwKa?= =?utf-8?q?zDvALqsZKVdcrY1x+zORfERP/VQWZHr4Xsl0AzCdzrf5VVuZYj/CRrhOyFNPGIdpq?= =?utf-8?q?dNYvMh9pZbs7AiNJ6YLzZRM5lA/bk1NqMOlAly6T2NFfRMgDCFQ8QOyre1IYTAe5L?= =?utf-8?q?HqbtM0mrGv1R0ZK6?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2721335c-c207-4d39-3699-08d971f7cbd0 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:05:34.1086 (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: 9EeDANFU13xO+PQ/cQU5CxtYQasUAhqSGaUyX2pGNe+3fdUmKBirWBvRaL+rEloewYWIohN+bVIM7JdbyIpM1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2607 While the hypervisor hasn't been enforcing this, we would still better avoid issuing requests with GFNs not aligned to the requested order. Signed-off-by: Jan Beulich --- I wonder how useful it is to include the alignment in the panic() message. I further wonder how useful it is to wrap "bytes" in PAGE_ALIGN(), when it is a multiple of a segment's size anyway (or at least was supposed to be, prior to "swiotlb-xen: maintain slab count properly"). --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -231,10 +231,10 @@ retry: /* * Get IO TLB memory from any location. */ - start = memblock_alloc(PAGE_ALIGN(bytes), PAGE_SIZE); + start = memblock_alloc(PAGE_ALIGN(bytes), IO_TLB_SEGSIZE << IO_TLB_SHIFT); if (!start) - panic("%s: Failed to allocate %lu bytes align=0x%lx\n", - __func__, PAGE_ALIGN(bytes), PAGE_SIZE); + panic("%s: Failed to allocate %lu bytes align=%#x\n", + __func__, PAGE_ALIGN(bytes), IO_TLB_SEGSIZE << IO_TLB_SHIFT); /* * And replace that memory with pages under 4GB. From patchwork Tue Sep 7 12:05:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478445 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.2 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_SANE_1 autolearn=unavailable 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 23AF1C433F5 for ; Tue, 7 Sep 2021 12:06:13 +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 C263160238 for ; Tue, 7 Sep 2021 12:06:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C263160238 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.180921.327810 (Exim 4.92) (envelope-from ) id 1mNZrY-0006C9-27; Tue, 07 Sep 2021 12:06:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180921.327810; Tue, 07 Sep 2021 12:06: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 1mNZrX-0006C0-V9; Tue, 07 Sep 2021 12:06:03 +0000 Received: by outflank-mailman (input) for mailman id 180921; Tue, 07 Sep 2021 12:06:02 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZrW-0006BD-A7 for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:06:02 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.111.102]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a7f0c699-b15d-4fbb-909d-2d8db2c1a257; Tue, 07 Sep 2021 12:06:01 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2059.outbound.protection.outlook.com [104.47.0.59]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-2-5mGp0lRPMUSPJGnZU8v3Vg-1; Tue, 07 Sep 2021 14:05:59 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0401MB2335.eurprd04.prod.outlook.com (2603:10a6:800:2e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Tue, 7 Sep 2021 12:05:56 +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.4500.014; Tue, 7 Sep 2021 12:05:56 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM4P190CA0023.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 12:05:55 +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: a7f0c699-b15d-4fbb-909d-2d8db2c1a257 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016360; 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=NjKaEaYjLVTnjJRE9LIByPoKIietul+QbtKOuyICMWI=; b=cUwoMCB0JoLefXLknZuXXBQIJi2/XEdAFclZm/Zcllba9pufqDSwOkqt7B6Z6tDzIFr9Wo lY8bLPEjAe8CE6xWUSU8qbz1dTLBNvcB7o7MgOAiwK40kEPiH7dRZ48efHrTxDjmoJBBrt NrUWPAdnctsWyXyBt+auDKifvhMtPbQ= X-MC-Unique: 5mGp0lRPMUSPJGnZU8v3Vg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bNH5CqiSQp2WP6YKX8CS01lPsyYKYZT7W5c0oUP9S5nU8vKEtvfKQLRsQBoz7OMNWFWiz6mObGWAbr6J26UOBx5OrdEebihoh+kiAhdSz/NhDUK7SZS978VbN3Y1l+azXLJqgivXL2N/WcsiWyWH72DqZvj8AD2Xudo4VcPxQyVTsFTkEfN+zTfrjuZNmU/dfeWarcNsjWkjOzDozapymktu+CyTRKajKP4lXanUY2r4CjxTJV4G7XAFcyrhKBPs5zVr+QTyQVMi9yP6Mc7If81xBOqpk6e5kQ7VHiyZ+d0Q8cs1nyqVM9ia3jxcUwikI3uElc6m8bUOftFU6i4uuw== 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=NjKaEaYjLVTnjJRE9LIByPoKIietul+QbtKOuyICMWI=; b=Nys53cUyRC4XUlRou/gwDBTvIY3i4CX8U2pwSSON9XCInlyMsBEGQj9YeSpo1MKluf09GQxJvzjxvbtcMCR/Zp6Yl+kOV0hHphSkcwySrlozoJvVq4g/gfQhjj5dC2iY1QgoUgM390KQG3oML5vbCHA4ix95aPI+U0+rLdwEDbspS9ZQleRwtKsDnpQ8sIwq9L8gGtKjY4JJddUn6HcOM+tzifnuOe8MoCUCUOeoDKBHKVtcE46N3yaJ0MKO5gUjXoJQcR3FVD4lqFa0PewzidXcmx9SpVq/M7fk/v1kcq+sMHnLds9ppVZHfI85nlj8boDrfGXDOn4SA2moeAMApg== 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: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 05/12] swiotlb-xen: suppress certain init retries From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: <56477481-87da-4962-9661-5e1b277efde0@suse.com> Date: Tue, 7 Sep 2021 14:05:54 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: AM4P190CA0023.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::33) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f04244bf-cb78-4275-9e76-08d971f7d90e X-MS-TrafficTypeDiagnostic: VI1PR0401MB2335: 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:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +XXOKh8+bG+9GNKJSyR8gXikRgeL++Ny28srIttNOVOeijUGZBfzPwMh+z0MLJBFgQQ7kgTuADnedHnaBZL5ahrRWrzf3Wp2r1paBEBVQutU9HOHLX6S/e6DBWJWKyrRPM5KFUY7ihst2GiruxreH0bHM9VWvZUM4QT+asbyJtaRUWZHNNSgrP3IYAEQVjVbUBXWUs4QyNLEU9OhF8i7fuUtQYK2ULLbpG95a0oAaow87Q1aeS1BmXDCB7CYwRN/tpT0fxYGN0jN/HiZ0EZqjF3F9k0PPacX7myFAglxZPcq7/mo7r1sdKTj9XgAHnaSoXewSUYkJOsxf7v184X+uJEhg2j5fNYsLxkBqhmMwpYvt5Xu1O07KxQn5imA6LAIFlQlNvcUqdF1HuPeJ3uZuEqP/VwIVi4glJ8kieRBKFxRxFohcLd/BUhkwE84aQ/AFy6gaAVWAniYnVhRAzvMLbbgLZLuNri2iGsf+pLcuLiXWtR3946qFQKidWdrjv/eD5SAyOCe8ihKlpLQR9cf8Mntt3ktVG7aOK+fH+AURt7gb2KNbFiUFGUEobDyDufRv0pUMbgQHa6sVfZtw7ZkjHQrlqLkn74guDwBDxjsJRn98l850b6F1Cghc9y4XmYCMuEmR+1qAMQPIMTJA+m7d/ANDqXy5tv447enrN1fn65Cdx+jZ1iyIPBOE8TXD3Q/ybzo/UbI11Yog7LitPVnhOtvoFcZtxEiNpmGCzPfnzE= 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:(39860400002)(376002)(366004)(136003)(396003)(346002)(2616005)(8676002)(5660300002)(38100700002)(54906003)(110136005)(83380400001)(956004)(66476007)(66556008)(66946007)(4744005)(26005)(316002)(6486002)(31686004)(8936002)(16576012)(36756003)(4326008)(2906002)(478600001)(186003)(86362001)(31696002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?EbQ7L2tYDn46Okr8jANN0BpD8G8v?= =?utf-8?q?PmO22gujkK3T8w86srMkUjoNIMUqOml+II/7oLxPtZEo5H52qNsoUcev0gcWQYg2u?= =?utf-8?q?rfuFpgGYRMca6+pCzzsHoFRGNpe+bSWH9VxNilhezwrSRIWcCsY1/LH8uc9pDZPBF?= =?utf-8?q?iSfgOlHKO5risHyef3cMF/VFt7mBRPhjdGp3sKGmly2M4CJactrA7oH3EL0dwdOdW?= =?utf-8?q?ZDnKXT2gxPqB3pnFKGq3K3C8P+7iKRqhDqr5wIXhJTHkg0Q28vX6cWNhXeDXBkp+e?= =?utf-8?q?kWEguG/xm07nUNfs/6ZW42soRbq9/TUiNTt/g/TzO1IvXUGPhpSv+Wtfcm7HWpYM2?= =?utf-8?q?Ihx9ERFR8e9dgG9oq3e9kxgfw9grVEo40TFynYufxHYHg45GQuHAzHErLYd3MyJsD?= =?utf-8?q?z9ELy5Aa4Sxv5znlbL0WNbG9p9WSCBFD65JRazC0o1VxC7HNPSD85PtqpzF59zAdw?= =?utf-8?q?m97goC3Ok51TWfafXpdne6hC7rguQFciEzRFmn+DYkhYllTot4g9eim5XsRx2ls2n?= =?utf-8?q?NW7qpM7+odpE/cAApiHF0YrD2VOv0cCp9KY0KV97IjtQ8D4Lso/n5T3qsaI81JtCA?= =?utf-8?q?L+KK0GT774iIN3ZO72Y2kPuGtuwvIuNpCG/WTGdCXdHCyposm27R4RD8m/T3Fdc1E?= =?utf-8?q?f5w5cqmpiUWtb/B5aaMnOIM0wEKngWXGziss4Kpph7axbFG6+6NflYxokOBxXfulC?= =?utf-8?q?pFGtIafNOM2rfplCDWkNnmQRTj6L1m7Kru6L8Vj3RaenuQjNxrk3sDbkCIaFZKjRo?= =?utf-8?q?3ES/WxlYUiEAcF6UQArB+U4pcQGbhMfqSLHr6jKp/RJ3PSn894b6t6LkFkakHa6OI?= =?utf-8?q?x409JsYMXplra6a0f8NvWK0VpuGz295yePvs76HXnsIFIO+Qv7gPwbPGf3jZSbkpn?= =?utf-8?q?cpBheis/gPZ0OT5IkcVdp9/k/cZXeWDr+STFsO4GDygTb3kA7mC7pzeduRgdHlwsR?= =?utf-8?q?eWZoqH8pnhhF7g+0r/e6X/xwIFQeWGfoqZvKpTONqRodCO0I0CMl4WnU4Wes3vvU8?= =?utf-8?q?9nnFBMDTD3AW9oJhG4x8+9/X6IBBQNeX5h41t+LdoyYS3TeWaZaqFYdaZx6LFreow?= =?utf-8?q?c379FZuD6j45LJ95PGea46IRlS13duCXfsPVL2QXExErv0gWOGq97rRldm4CO/jxi?= =?utf-8?q?VHV3TLN65IOMrs5NsCaKYyxtq3l+A25t3cpOTwo4tg/xKTenoU13heTw25Tmdm5Io?= =?utf-8?q?E3L47UjuuDt5WMj2V1qPHSPKrAhht9mnph0qYa8aDPI3Wn8j4IwfjvVvww4WJllM1?= =?utf-8?q?ljpGL55qNYjwmzUi?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f04244bf-cb78-4275-9e76-08d971f7d90e X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:05:56.3159 (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: aanrS8Dgx2smsMpI0qTYptKbqhrbXgSx90Dq+sCf5bekkXCEYkwfljdlYZqNb2Whgr2xX0DrgEcWMDg0QGCsiA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2335 Only on the 2nd of the paths leading to xen_swiotlb_init()'s "error" label it is useful to retry the allocation; the first one did already iterate through all possible order values. Signed-off-by: Jan Beulich Reviewed-by: Christoph Hellwig Reviewed-by: Stefano Stabellini --- I'm not convinced of the (lack of) indentation of the label, but I made the new one matzch the existing one. --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -184,7 +184,7 @@ retry: order--; } if (!start) - goto error; + goto exit; if (order != get_order(bytes)) { pr_warn("Warning: only able to allocate %ld MB for software IO TLB\n", (PAGE_SIZE << order) >> 20); @@ -214,6 +214,7 @@ error: pr_info("Lowering to %luMB\n", bytes >> 20); goto retry; } +exit: pr_err("%s (rc:%d)\n", xen_swiotlb_error(m_ret), rc); return rc; } From patchwork Tue Sep 7 12:06:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478447 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.2 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_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 3B3B5C433F5 for ; Tue, 7 Sep 2021 12:06:58 +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 DFAD360238 for ; Tue, 7 Sep 2021 12:06:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DFAD360238 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.180934.327821 (Exim 4.92) (envelope-from ) id 1mNZsH-0006xY-Ei; Tue, 07 Sep 2021 12:06:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180934.327821; Tue, 07 Sep 2021 12:06:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZsH-0006xR-Bm; Tue, 07 Sep 2021 12:06:49 +0000 Received: by outflank-mailman (input) for mailman id 180934; Tue, 07 Sep 2021 12:06:47 +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 1mNZsF-0006wJ-Nn for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:06:47 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.109.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0f8a6625-0fd4-11ec-b0eb-12813bfff9fa; Tue, 07 Sep 2021 12:06:42 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2059.outbound.protection.outlook.com [104.47.0.59]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-25-Gwi4fgkDP9eCN2J82GTPhw-1; Tue, 07 Sep 2021 14:06:40 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0401MB2335.eurprd04.prod.outlook.com (2603:10a6:800:2e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Tue, 7 Sep 2021 12:06:39 +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.4500.014; Tue, 7 Sep 2021 12:06:38 +0000 Received: from [10.156.60.236] (37.24.206.209) by PR1PR01CA0018.eurprd01.prod.exchangelabs.com (2603:10a6:102::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Tue, 7 Sep 2021 12:06:38 +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: 0f8a6625-0fd4-11ec-b0eb-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016401; 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=YMBMI5yUqKk+WNG37WLHu6TzQ77qqIKUpYH+tOuAlHI=; b=LnltSzSpfkqB1ibig/iG80wXL18RO73FeO25lVZsLxex56VSyOmH4QOhOCVtUDNH6ScK+W SQyvcRT21WXI+N4QkR1CfJsqAa9Gfeo/mpZpB93u/WcGvxLrAe1/WVw07zH01AlTGkc7Ma MeCTxdk/dHUFpg6kdaO30u2aQPj2dIY= X-MC-Unique: Gwi4fgkDP9eCN2J82GTPhw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R5vf+Dc/6u6YP3qATr/SVEHIz9bTHZ3VENpfiCtFFWXEH8JhbC3SvAzFgo2AsPHCnSqewi4aCG0TsaossKwDSp4vcwkPZiED6I60CRCdCnz8xe2+9fTkd9FGszqFOno38UG7/3kg5Po47bKu0MzzbDJk1nO+HTBbCYybDfPb8xwOdq1jsX+b2MBCgsMHvCDZH+izbK5C0wBzUshPCtqTlbONfFdfFslSVP++oOywbU8wga++rYbtRgHbVeKFNsR6S+tRH+FBsStCjK2glfGyPOUp7tlJd3ncF3jzDn6pvv5M8lKHYukNiMnPUaDZjg67Bb1+HaGB+4hUjNPW8DM0ww== 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=YMBMI5yUqKk+WNG37WLHu6TzQ77qqIKUpYH+tOuAlHI=; b=Da6k5Ye+k2Vi9VLypqWRuZSkQeyMNC+cSSE39zUAiLRkduFYRJ3Bx5HXYpzuxn6z/Tk7Gnf/UK4K2r9WKArxDnvYrRrqoMfgPGrPsTvDoRcchKHZCaphgXPD0w+fXVBrx/fgw2JQDHbp0MW5OY87SxLN5sFoiroofFTW7R1E0Vm8KrvWpfbyzjmRXGi2smY9IEx1eE3dDobPr75vbuDhKPLLDN3K1ehhTyeytv/IWfTFIcsnu0TKeDRWia52VdW7I5R8beUl4Tyc/+AucGSR3VPHqVio0yMVJEqMEnzSv7HD2CFLKfI+LCi9w5374GCATCSnxc71nuf/1v0RU2ifdA== 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: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 06/12] swiotlb-xen: limit init retries From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: <984fa426-2b7b-4b77-5ce8-766619575b7f@suse.com> Date: Tue, 7 Sep 2021 14:06:37 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: PR1PR01CA0018.eurprd01.prod.exchangelabs.com (2603:10a6:102::31) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e87e0e46-93b6-442d-684d-08d971f7f265 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2335: 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:2000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6p+jxvZNvlchQnDd2qOjDZwFxL66V8vytE1+ZIOz6IgenMe4qgcjUe2VdKNwxqWWpLmxNEO5itjH8OxfIp8DFLXER0IjypKgRhABvRwDn8jh42qUTzm1R+jdDvtBezSvx07I8YMpvzR3kXvZ5VLOu0QfEGNa21xb9gd8Y6brn7Kz1P5EKPdnj2xtXXvF35oHvaWdQV1iy2G94lY8JfW+PIGvRddoJqYS8LHMu+W50VF+IGO+CFdt4bkua/aDTBtnCYoiVrptQR6f8nBqnEP/xgL4ZyXPe2gQ6YaGvb+jhb5ha5eSH+3M9ctVX2ppJ+9twQGNwtEwSPFpWkl/1PDLmcT+ndTFg9Rp4osmZXpd0pF3SQbdp83JFPNST9s8Ik4Tr6xh+YktesFbg6qZNqrec9yBPDqT8PqTByhVzvko9xDAAEhzGtoW+uItXp1fiI6QKxMAaTC9x8C1WhA2DvRew+fNCR04p845+JOSXgpZDB+NmM4aBaKMuHH5lf1vLCkQom3BVDZNn/A3CoXiRLxIjEOQD1ctXk35BEBu2PeIpUxKp5fGXvJe2iw+zLl9DI360OHCsOI8EuubFxDe5bESM9RLe+1EC6xYEgROXhIW64IIcm0VxcfcoJq05iFOt7JSRAyS0GVoWxz+zyaAYe3M/wVcfkmhi6bMYMhxHOofggi0Ej/aKfwNi8cl1eunZJWXFAW4JXx/YSAd+7sxKdz6Kw== 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:(39860400002)(376002)(366004)(136003)(396003)(346002)(2616005)(8676002)(5660300002)(38100700002)(54906003)(110136005)(83380400001)(956004)(66476007)(66556008)(66946007)(4744005)(26005)(316002)(6486002)(31686004)(8936002)(16576012)(36756003)(4326008)(2906002)(478600001)(186003)(86362001)(31696002)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?ITwMsYyJrMfUXb3uHX3Q6iCmMARx?= =?utf-8?q?wKW/V0GyDGAqS4nDiun0sg+5MqMAa9R/px0vrp1eIJMlMBEMnfccLRfeQlkahvHvm?= =?utf-8?q?g1jBwUr4UXYK9f60kLPtELm9payA3ezDxSWkOrrqKKYnY1q3zI++OO6DZYFku1Doc?= =?utf-8?q?UitxzhejuyLPFa53Y+nRqoG82pLJRh2gMigSuun5T9DBCzPYgqAWGtySYdlL5M8LF?= =?utf-8?q?g9pfQ0A7c7c8drCUh1lSAtuTkJrBkkgD+7Q43m8RgMBGNvo3HANWAFgd5EfncFDVC?= =?utf-8?q?fZPAj29tvJWK/+SVguZeAa4Ka7je7dc8p9d28T+hJmvZUqCN7W04PXp0W5tvtg8Ww?= =?utf-8?q?yrL+P3DrK2cN4LP22ptroAJYoV9vlSSVX6rlymLCQL+c00CUz3LjqEFuwFKOywhLQ?= =?utf-8?q?kBk6IdbHuizWP5tw7s0YNJCojv0EKtxTvwqrwY7WJN9gsi4Vmo8aNo0ewpWGzaP1s?= =?utf-8?q?0Vs2MeWUZFYU2a6/i9b+cECUJqFsZZE90uVDET9km4o74vdxGjSOuANAg+Ox1+SZ7?= =?utf-8?q?4LcT5/+zNI/rOvp/JMqhxbtv267PYoKgs9tTi455srsoN3VOTwvgxVEQjow4ofx7t?= =?utf-8?q?OmYWWwA7PCQVAOVgiKBjjosZv1EF5cHiSjuLpNNcJEg4xpugoMxUJ9clcgbyyyp94?= =?utf-8?q?QQxzolfK6TaYgzgd18neG3Z9T65oQDw30RB8UzuMHKz2N9BzAoC5F0H1wU3G6pHrm?= =?utf-8?q?pmyBmt2BKjFImgr6SK1LrSh6dLulTZg0iwx8PLXHKFj8znfmScLnd4qtL18+8fStN?= =?utf-8?q?Ly60kIKssXyyd0JJWlNFdvmzHaj3sZ8VxaUHcyzf4gKA2SDfsNHUoKxTvmpd/F9et?= =?utf-8?q?2QUSwPq8VgV0O5V8GLXdjKPAATEC0XEK1K6ilDOBFGtZmJ4VLYlCbCG7V6Fjge/VY?= =?utf-8?q?gdKqmF6Q4udk5Fyp/AOyBcyp8/fL7Hhy78TQcp6vrR/Dx/PwuZgRCZH1+JFWYDY44?= =?utf-8?q?s4TxmkduGxk4mMPyIn8XFoGhaFs5w8MSRhKAmQ7l1y7EWERfbU7+AdUSf9MyYRbKP?= =?utf-8?q?YsonAlTCm79xqpy6uZFbtiOeBRmEGhBTXq9njT4bjEV/JHxmyMtgN4MZ8wmOOwnZj?= =?utf-8?q?tqKQS6oBOyDmcbfwW6jqA1J2s65xtV8BOx+KmOahAD9srcU8uIi+qdv1gcpWz5E9U?= =?utf-8?q?GVEmqehcOSvTRVXeM1BeULXiDBmFIj5zInmM+KTMACNuh0eI/zc/VyuM7PAfKjVms?= =?utf-8?q?0HInvjmWwt+qf822Y13dPNj56knqbWK60QOb6d18WvADFcBANdJhD8VY3lNsPOeRW?= =?utf-8?q?ZU7k3yVq0sCVDFF6?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e87e0e46-93b6-442d-684d-08d971f7f265 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:06:38.8548 (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: Ph2AurSgsXAZiupuP2pvXbNulkvCbwBmtN+9q0Zh1ffPH8Wymh+4lbKcDL4jZkQDrkFawmyk3YKAt4Eu+kBM1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2335 Due to the use of max(1024, ...) there's no point retrying (and issuing bogus log messages) when the number of slabs is already no larger than this minimum value. Signed-off-by: Jan Beulich Reviewed-by: Christoph Hellwig Reviewed-by: Stefano Stabellini --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -207,7 +207,7 @@ retry: swiotlb_set_max_segment(PAGE_SIZE); return 0; error: - if (repeat--) { + if (nslabs > 1024 && repeat--) { /* Min is 2MB */ nslabs = max(1024UL, ALIGN(nslabs >> 1, IO_TLB_SEGSIZE)); bytes = nslabs << IO_TLB_SHIFT; @@ -243,7 +243,7 @@ retry: rc = xen_swiotlb_fixup(start, nslabs); if (rc) { memblock_free(__pa(start), PAGE_ALIGN(bytes)); - if (repeat--) { + if (nslabs > 1024 && repeat--) { /* Min is 2MB */ nslabs = max(1024UL, ALIGN(nslabs >> 1, IO_TLB_SEGSIZE)); bytes = nslabs << IO_TLB_SHIFT; From patchwork Tue Sep 7 12:06:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478449 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.2 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_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 E4FF6C433EF for ; Tue, 7 Sep 2021 12:07:11 +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 9AACD60698 for ; Tue, 7 Sep 2021 12:07:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9AACD60698 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.180935.327833 (Exim 4.92) (envelope-from ) id 1mNZsV-0007MU-OB; Tue, 07 Sep 2021 12:07:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180935.327833; Tue, 07 Sep 2021 12:07:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZsV-0007MN-Km; Tue, 07 Sep 2021 12:07:03 +0000 Received: by outflank-mailman (input) for mailman id 180935; Tue, 07 Sep 2021 12:07:01 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZsT-0007LE-GV for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:07:01 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.111.102]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c7167cc5-da60-41dd-964f-0f0b7ed46926; Tue, 07 Sep 2021 12:07:00 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2058.outbound.protection.outlook.com [104.47.0.58]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-6-sqoC9y0uOUmyMVzmjdz1SQ-2; Tue, 07 Sep 2021 14:06:59 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0401MB2335.eurprd04.prod.outlook.com (2603:10a6:800:2e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Tue, 7 Sep 2021 12:06:56 +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.4500.014; Tue, 7 Sep 2021 12:06:56 +0000 Received: from [10.156.60.236] (37.24.206.209) by PR0P264CA0063.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 12:06:56 +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: c7167cc5-da60-41dd-964f-0f0b7ed46926 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016419; 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=yfSrUDJsXrUgIa8eiGS6wO+C14mV3RvK021zMRjhrHg=; b=Zq8NCV1PhIRAR6RayonpC9+VvN4XjM8PkzIxG6ZLTq09Ggxv3aIn0GWpSISijyvN1/tV3l HmgsHSV/TaB8cXjkuQa49gI27c4OMmcMcp4XDy6wIa2EzsR1mQ6HOIfNsqpZmdRCqVWA6C v8w5wXZUFHxMnb2eLFFE8ubNwGIZBS0= X-MC-Unique: sqoC9y0uOUmyMVzmjdz1SQ-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jWmrHmi+ZMHC3LYMtzJur7+Dw2pd9sVEpZFYIwzl1En8ZFIaMuvsyXDu46b6O63Xri3ktnl3NG4vEpo2X1NCj+edcilG4n7L8fqrFK3Lg5sPwvvpcEMleoMqsRQXf7gTN8ZR++aOFpoLKWzvFe9WvldIB01WEOVOJOdTLjOGdylsdinh2m88P3Tl9a/wlaN2YtVK2NODSaULwDrGCIaYxaio5NoXg2GOBP+MiTWza1oKNGCbWILjuodfrE0lZsuuVPuT52OOpILXMXlCIKvXLYjOe/8WHc1ruEmLs/SzzlU7GgGNdiOv5UQHlxhqVzNDXXf5vRl9yoShbaCeJwWAkQ== 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=yfSrUDJsXrUgIa8eiGS6wO+C14mV3RvK021zMRjhrHg=; b=csNV5nHeNahFGwpU/LYDwy+AT9eP940y29k4YQXmrHVGKLzZG69WDnDPOUtKSLNFRJ45kWRZrH0F0tKhvqFWP9Gsrp4ICQq+I4bxESlQjOfXueGoE5RwmJYVqec3j7dn/11Dj0zuVRnhY4QFIkKGzmwn0A9lGuHrZ7XIwIeQROa9Bou8FpTAsbUaV6ofOsK7OJmI7XiCvHYaqMoQjaS1nHXO57rVItI0QfbN60php0A5+IxAU4M5U93Q6uQmwG8a5AVDmocy4GggdRzdWAF1JbOttbCBfe5hGS26QOEhdyL0HlDQHCwTaYetM3+wE5KmZB7f0hfHMq98EbjQmgqGpw== 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: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 07/12] swiotlb-xen: drop leftover __ref From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: <7cd163e1-fe13-270b-384c-2708e8273d34@suse.com> Date: Tue, 7 Sep 2021 14:06:55 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: PR0P264CA0063.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::27) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6d92d3fb-5473-4882-8cd6-08d971f7fd10 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2335: 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:2887; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X+TnSCKrSsUpHDy62Y4a7n1mHtJ9sHiN2ncLWbETlk/iczTyLciNrb5Q889LTvUlcTFTCatHa/e1EqPzGeQDQpSD+Y1AKhG6Hm24253horOclA2vhn884oXNKEvO9qcIIl8MPmtoatQAbIBjnu9cJRRtb0/ej/lKc5QCx+RcL6RZOQ7+ftwD762dJdvnoSSOeijFyC4Kk6njhHLs+2De3ZLT1GzhybjWv9hupmX9FDFWnRRm7x3D54pT57k3nQt9MqwL2td8mMaX8WPZ8Dpgc1XX2K8BaXZtRu0aMHtBzu8bxWFxTMZUPKCxTZUpqznBthXzUJQ36AdPzD21Jp0CSFz6S+ppSSinkIpVQkWttj+vYttUyddhDV23uNXZws1qy5f6FeLi8cuIrDaxOQwoUFgs4b+X2DYo05kJem9wJeERmpwUMo+GDleGFRqFDXVCbXDug2mEqhBXxifoahtCFOI286Ufw6W7W0+5zytY4VE0bRuHgrAz8LkVRydX3GYHdDIaCxURPWCuHzzbglGi1C5KDTxAXt+qd3q2Qdyp/3wcPAPQOFtloxJJnpeERFIcSVwbxX4oqVJnbddgS61tY+iUGPZZkgupsx4wQ00xAa4Od43WB168COO+sKbqmoa+Gglbu7X0GE2BBtbihFP17xWyzSH5cQFcpVdmVBehNxbioptTeRvXZggT+enSjf2d+31gIvnt7Mi1uN+fqZO0uDIs6NavEMlbVuKnX9ygZ+Y= 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:(39860400002)(376002)(366004)(136003)(396003)(346002)(2616005)(8676002)(5660300002)(38100700002)(54906003)(110136005)(956004)(66476007)(66556008)(66946007)(4744005)(26005)(316002)(6486002)(31686004)(8936002)(16576012)(36756003)(4326008)(2906002)(478600001)(186003)(86362001)(31696002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?gW6Kcgr01T9YtoHrjaAqI5AeriA9?= =?utf-8?q?oLOHB5BybXU8BpNG495WsRTCO7ENCsRSHGugV6xoleWDCEFM93j4elX+IrN3Jmumw?= =?utf-8?q?6n/XzwGsKeIx/KZE11HNumsz5lP/9cWgxCa75e0YRXhqEBEL6+WK7WEe/DOQu+aHs?= =?utf-8?q?oIDM5sfR5Cjc6hLJ15R1AtYuoQQpwMisqqkFX7q80neuHylWL3bjbcR6eYQQQjchh?= =?utf-8?q?bJUP5EqMkAeFg2JePyh9aYiCj7tRQpChQ+liXB1wZGatIm3oqZ+f7IlFxe02MsNIu?= =?utf-8?q?s3NpaIdCwc3FrUScHvxuN4eNBQ6U0VkIQJ3JDQt+tMRv9O+Q0QCaqtsBSMWyRff+r?= =?utf-8?q?Q/R+CZY6BLuRUpQ4jAAh3cqaHk29yuD09DZrp1OdB+233PvVntjB99FfGeZtHD4iv?= =?utf-8?q?NYBRLIBbweR6XSwc6DbsV+/5dC1IkNSQe0XjLi4wFPTtq0wA5i31qDav5bR+JRoOZ?= =?utf-8?q?+7JdmYjCcAqwHAVWppLgpwDcwtl79lPTGvSRn15YAQ0SiS0a1w3cuwij4nMJMIxLh?= =?utf-8?q?OTftos/LAycWClwX4Qkiorx4S0uDdozMaTrzG8jAMQQoucYd0Cir7b4kWwZrETkjJ?= =?utf-8?q?qQwPz7LUcS3T7knUpIj29/UpmdYI4lzorg7l9+a6qZ+6o70de8vOrBM3naUCnz2w5?= =?utf-8?q?ngYfCIg6nEZoOxVRqTNHu+9qli9au+xyDD1VuRiEKWV+bVTB9tn2EuINze0vFqdbv?= =?utf-8?q?G+I85BBFLfdq7vA/rUdpzFkXj+T+7Hb8lWN7jQMSmBf70pR40Kq+/hm/7xftYnc1n?= =?utf-8?q?EUK6cGSCoVyS/YNnOC6CNbWZem3KoGyEAgE08W4KvjIvfhNEeh4aJcIg1GG7UFPPl?= =?utf-8?q?WaguASo3H6975Gny+dTGUP+stXNseOClllasWMquDq3iWieCUsgubeacZz7UGcyD4?= =?utf-8?q?PbuQ8dImsFqB+IMYmLVk4V6Dek1CnGn/i2ReXTjFKX1ivi6TjTArIvLKklxyCVr1k?= =?utf-8?q?KtgDwejTkmafRIVB3zJxBzX7SUsOhZy8zwc6T5ECbmlH8D1Ethk8SHXtB+R0ggfQf?= =?utf-8?q?ixnuCVeydkWSfPUmJDrll72vyP7OF24DiuFmvys4BJIDRaAL4U9JCeH/bKXaMmNdD?= =?utf-8?q?vB9gza2BD76Cw2Ym8v5Rs5ZewgFvSq7hFWn12dmYebVGH2zNpzs9Wxybt+yC7Fhgg?= =?utf-8?q?xKchIe5Jel/+xDIlFueKGPOsdmCmK1akIdo0ixXiLXrny1Vp7V9qVvlj2BtV+nG68?= =?utf-8?q?hMoLdfLmsIs5EtxPhjTxAj3Uh+oD1Avg1z8VnG61zT6zpueodSA9C4Hs9FhhGM1mn?= =?utf-8?q?SgXSbmwbylLEBmaH?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d92d3fb-5473-4882-8cd6-08d971f7fd10 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:06:56.7266 (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: v3JjegjrSVa7Eyffa0vq6FD1jmgD626Xg9ETA8SXF6JHGDsF+T5u/SkYZ9MAPiV1vclz+c5K8UFXntF15X7vlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2335 Commit a98f565462f0 ("xen-swiotlb: split xen_swiotlb_init") should not only have added __init to the split off function, but also should have dropped __ref from the one left. Signed-off-by: Jan Beulich Reviewed-by: Christoph Hellwig Reviewed-by: Stefano Stabellini --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -154,7 +154,7 @@ static const char *xen_swiotlb_error(enu #define DEFAULT_NSLABS ALIGN(SZ_64M >> IO_TLB_SHIFT, IO_TLB_SEGSIZE) -int __ref xen_swiotlb_init(void) +int xen_swiotlb_init(void) { enum xen_swiotlb_err m_ret = XEN_SWIOTLB_UNKNOWN; unsigned long bytes = swiotlb_size_or_default(); From patchwork Tue Sep 7 12:07:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478451 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.2 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_SANE_1 autolearn=unavailable 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 D3CA2C433EF for ; Tue, 7 Sep 2021 12:07: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 896A260238 for ; Tue, 7 Sep 2021 12:07:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 896A260238 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.180946.327844 (Exim 4.92) (envelope-from ) id 1mNZsx-00088p-0s; Tue, 07 Sep 2021 12:07:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180946.327844; Tue, 07 Sep 2021 12:07:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZsw-00088i-U3; Tue, 07 Sep 2021 12:07:30 +0000 Received: by outflank-mailman (input) for mailman id 180946; Tue, 07 Sep 2021 12:07:30 +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 1mNZsw-00086X-9p for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:07:30 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.111.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2a423eb0-0fd4-11ec-b0eb-12813bfff9fa; Tue, 07 Sep 2021 12:07:26 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2054.outbound.protection.outlook.com [104.47.0.54]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-10-wO4pVYOwOfOPYqiRTM-_GQ-1; Tue, 07 Sep 2021 14:07:24 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0401MB2335.eurprd04.prod.outlook.com (2603:10a6:800:2e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Tue, 7 Sep 2021 12:07:23 +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.4500.014; Tue, 7 Sep 2021 12:07:23 +0000 Received: from [10.156.60.236] (37.24.206.209) by PR2PR09CA0010.eurprd09.prod.outlook.com (2603:10a6:101:16::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 12:07:22 +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: 2a423eb0-0fd4-11ec-b0eb-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016445; 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=n7mzpWDSKQyeB1Y7K6PB6/ey7zolLxcOfxP5VRC4xpg=; b=SErut9zMOtkNGyzk/89jVwytfHcYzg+NPNOFJpwQ/WeP7lygv3MgD1ZTMW/C1KHGrllcPA k5baRR3ABtSG6pY6EBke79DMgymDIRXYPJnQUYCXlxyYK3JXOxuV9DYpzmaDhDV/Ayzfr3 oIMGYDbPPqwMmWYC0dhhMeBtjakQw5o= X-MC-Unique: wO4pVYOwOfOPYqiRTM-_GQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aTIxY8KEDICOriuKX5SuLtaLX8doPexdNM9CYmFxBEanU/cMmnEH74KVzYL39rSFD4cTK9jSwCf4ro+4qMbDkqqBLCOfMNGCux8PMyFvz+3NkZ/exWTw03IZyKMARPSGHmzocZ+YFv8HHvBAAwuxxZbO8mABTODP4EP5WWfk48N/foFbOGqUk0zrhDI3RhKPTgkV79ysNrU+2aYboDr/x9c27H5xTUK3hSOjV8HqIkjw6D2V2cLVL434+YGsBjElA/0ihK3DbZ4gBWofHjC4WAuufdkWFesQopamHg5dOqP/cJsKm6SJZVllpT/O+4hcO70T9szY3ZnX1siBGXbzUQ== 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=n7mzpWDSKQyeB1Y7K6PB6/ey7zolLxcOfxP5VRC4xpg=; b=bncueqn56HBLtcSH4vHgtaTxs9jKY+re9pppPYPvwbY4YDfvfW6CztYMvYRehgdwJm+YeuRjF0/y9b/kURFHgknYzLDHx1eYCTWmkrd9srrvXilKQIQI0hMH2Z0Yy1ANZo51f77VNnCNZS2p9CDgbP2m0ImH07hJFBtgxUnyOnpK6r3PhuXXV/WgCLAm5ettm1nm1vudbQ+GDSrBPOYlxALXuDiAYgxlcCNH3Q0cllH6xTyFwlCR66dG1heQVXIuOAt63n22daKJhdmYCaxZY3srkXpYSvqdCeym07RAkvGUMU77E6gjpmoiAUoIE5IFKdw7yYSRtAXn5hFNysynwA== 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: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 08/12] swiotlb-xen: arrange to have buffer info logged From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: <2e3c8e68-36b2-4ae9-b829-bf7f75d39d47@suse.com> Date: Tue, 7 Sep 2021 14:07:21 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: PR2PR09CA0010.eurprd09.prod.outlook.com (2603:10a6:101:16::22) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aafa5b43-f735-4db3-d08a-08d971f80cd2 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2335: 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:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ALtpvWS75rPd7bTQjpiRwarOVxM9LjLzQJ6rf1JxZt1AVwxcvXpcn45dkxiQKB5ZUE+Dfd4K/QpZyDhhp7N+7Zt703ARx9ZdTLUl0hnpDQTsfpdZ8G97B5IP4PAkoN9Zazpzlxligg9aiCWyR4dJmmyvWppWuubxIxPnBHwiACKW+RGTiDLgTr2KBybIb7slboF4jAW+p9+usuzzYMw2fXMnu/835pKx69fVXcNpLFPpFoKrttRnK7WwGgB2G8fSPBZ7oErBw37nJpIiIk8xVCCDlIdPVHbzeiaSJACMLlBlzvM2yobefjCmEnXr+JaYzcAs4PqT5YIbSUGxa/d8LkTMbFNOZ7yhEACe+8oSkfSo0hfDJirqV7Cp4HoZ+xGPkg5rIjaVWJlNripn3uqwSak6XQVF5/MqlFl+nXwE6lXwpmdPPuQOI2FDKPnOYgyhji1HM8NSX+veqqZnFfPBSyZhKk1MEyGZ8dqzk+hJmyhW7MX6KmRSTs/2pRbbrgoJb8AYA9Bs5OjBo8RF1YovTwjE/hXZZb6f3FCwn7pPfa3dgfW8+me43jsnV27UdJCXt1hwCxVyLYIrxd0doxV1bL2eYL3JW/fmJL8knD6+JeSSk5wvmN8Bu+V49zfnznuSnmVTG75b1u/Hj9Gz21QFNvvt5xIUI38olM787kdrmOWXQKp+TyHZZDRHDxtQgbyYbygJHhIBvtPKzgiP6kEaax7UrrxC66jl5eJv1OJfcA0= 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:(39860400002)(376002)(366004)(136003)(396003)(346002)(2616005)(8676002)(5660300002)(38100700002)(54906003)(110136005)(956004)(66476007)(66556008)(66946007)(4744005)(26005)(316002)(6486002)(31686004)(8936002)(16576012)(36756003)(4326008)(2906002)(478600001)(186003)(86362001)(31696002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?3qhR3FGSbjQzsj0PCONQL3puwZlb?= =?utf-8?q?EzviiQO1+VLsVI0fpvVK0vrZzvnJXxZxI3lWDOJzj0X6XNy1npdVMgp2/7ezzm4qo?= =?utf-8?q?tTd2q6Bv3VGD0daLepefjfNLm79AYGdCybQX2tpMhlCxCYtYBMLWhBvhzBL7M9N2F?= =?utf-8?q?ZAOwp4BO6AYPE+BEfnMTbK85L2auNNCrzTXqQko8O4MhWbDmSHAyt1V2gZIX2ixzP?= =?utf-8?q?DwYXvbOJl/uUp2g3CtTu28+AFSTkqufl+2gqWDKw8nGN4NxCA4o/8Ua9JGafH8hol?= =?utf-8?q?raasSgIogj4Fo9sikBui3cKhNCQxTW4hh2Ri/xOzDQ4+V3qhfzVfIikfKeUA1HjgU?= =?utf-8?q?t4lVwCrkmNMTZPBodrEUCQSI9XhEuNLh6+HFsm34wZoHbRj1FpEIIbTZ/QTPUJQi5?= =?utf-8?q?T9ZRLji/AcAQtHAACRDUgT7zFAb0bjBZrGsFr6esCn/mwNNXKYfZoP14aP9VG4mMs?= =?utf-8?q?vyM50DH1Aqjbxq7kN52wwMtY57r95JQ9BBwAEKKZjEfHBSXZXZpIHENDB/v/358xD?= =?utf-8?q?vI79jY9Jdwm97iJt9jR55vyna6TN/wQnfms0TdSdyK0/rc9OCIf8DKClp70+N33+8?= =?utf-8?q?ZrAWdru+rprNNXpcIn9sUW2PlzRlTZqQCqUs0rEI7LKxhsviFePUnEvE72abhtjdx?= =?utf-8?q?ljwQ3UojMqoKUeNI+6z0X/OQzNWDkIOSPGnX9rn2g71XR35FIAwIrk6KnIepUIEG8?= =?utf-8?q?BLawSqNdDBM8nUQ/Ill99d6ZEakcL7HMSwfbk4Y5o728kz1TnDAkjIXHd1sToMyY9?= =?utf-8?q?2fRca+bNM9rMAIG97hAMiDHL3mwUq1DRcLZZmI1sBKpK841rMv7SBql/K/eZYAc35?= =?utf-8?q?b0cAd2AYKI7voRxPWs7R+AIortTJQCuAgVDtk3P+k/LVsfRdGlF1JtD9v1obrM7qZ?= =?utf-8?q?syufKOCdjEuGCh/kpE9jeZ+ErjXFT1kXPf9A6UXsYf9Nx9E1FijewVnyYzyOefVtg?= =?utf-8?q?8WpT/EzgmgP4rzWFgR5igpB3JO+i9d3P2NGvwvqhE/ra0k4KT00TIHPXf5/yALw5I?= =?utf-8?q?g/2PK9LIqFe8OZ+gOFdX0G6iZ81arjyDwLmAbeGEfb1W7r9+tr9t5VsvjyaKWMZWV?= =?utf-8?q?PZR2Njt/ubv8XX/2oHe93G1eoHa9kj7pF+ytrEFcFpSHK2z7AKJa5nBsb0x319Lmn?= =?utf-8?q?3m0Shy76yycV62Nxrib37R8My1CQm7/L0dRqzHzrWETptjzbjvmHxGhVp2NbbVJA7?= =?utf-8?q?jpF/JTe9OhgEJqTRyNpYeDI4FB8d/vjlad2K3h5TRoorcBUZhClMFZ0qsoioEpPl5?= =?utf-8?q?cbx/+29amJxrDzSd?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: aafa5b43-f735-4db3-d08a-08d971f80cd2 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:07:23.1625 (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: mZFC7s4D4ydJmgfgHq1eN5JHKDnRLeCTZaomrg8SF5gCbPA7ZyH/63UPSSxFvPLLe9wPZN3GKpUD02THWyXLHw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2335 I consider it unhelpful that address and size of the buffer aren't put in the log file; it makes diagnosing issues needlessly harder. The majority of callers of swiotlb_init() also passes 1 for the "verbose" parameter. Signed-off-by: Jan Beulich Reviewed-by: Christoph Hellwig Acked-by: Stefano Stabellini --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -253,7 +253,7 @@ retry: panic("%s (rc:%d)", xen_swiotlb_error(XEN_SWIOTLB_EFIXUP), rc); } - if (swiotlb_init_with_tbl(start, nslabs, false)) + if (swiotlb_init_with_tbl(start, nslabs, true)) panic("Cannot allocate SWIOTLB buffer"); swiotlb_set_max_segment(PAGE_SIZE); } From patchwork Tue Sep 7 12:07:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478453 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.2 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_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 23FBFC433FE for ; Tue, 7 Sep 2021 12:08:08 +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 D19D96056B for ; Tue, 7 Sep 2021 12:08:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D19D96056B 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.180953.327855 (Exim 4.92) (envelope-from ) id 1mNZtP-0000PX-Eu; Tue, 07 Sep 2021 12:07:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180953.327855; Tue, 07 Sep 2021 12:07:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZtP-0000PQ-Aq; Tue, 07 Sep 2021 12:07:59 +0000 Received: by outflank-mailman (input) for mailman id 180953; Tue, 07 Sep 2021 12:07:57 +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 1mNZtN-0000ML-Sa for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:07:57 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.109.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 38d5356a-0fd4-11ec-b0eb-12813bfff9fa; Tue, 07 Sep 2021 12:07:52 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2050.outbound.protection.outlook.com [104.47.0.50]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-25-mTLXMExqNMKKhs3PsuV5vQ-1; Tue, 07 Sep 2021 14:07:50 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0401MB2335.eurprd04.prod.outlook.com (2603:10a6:800:2e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Tue, 7 Sep 2021 12:07:49 +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.4500.014; Tue, 7 Sep 2021 12:07:49 +0000 Received: from [10.156.60.236] (37.24.206.209) by PR0P264CA0247.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Tue, 7 Sep 2021 12:07:48 +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: 38d5356a-0fd4-11ec-b0eb-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016471; 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=/5oNHcbLsqo9M2lUcfhAAuumf4VaC3DcQDQUojVuRYU=; b=G9E91MBOpVZjxwi18BVIxBH8gw+UsdRqt/pYQuVCDK2SKrJYE14LIndIDn+v9/t5oDx5NV rfJO8Mq6MFvU03WtBz4se15bUdbwPNxKsw66rMm15z4h5AJXHuNNcOEIAKA7MpIyPrSScW vUE4/n0++y/m5L6GfPYpls5wEFCAwWE= X-MC-Unique: mTLXMExqNMKKhs3PsuV5vQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nbjHdUoBL+11rFy2gY9B7/5mScKhF6tDW8jzwh1MY89QgITtmyPuTtKBW0xg0Vu5cMuSraCSMBABO1E2hXH+30s+8L6rwE2hVLfRVeNDJx/I/zvguIlsa3RWLK1qaiZf43GUfrhsA+On0iuek9DjDTbnx2mL+TgUGnQPXjw2orNJ3zCLRz1ML/2WdmiyQ3uhws1+F1ngN0cWzsSwnk6uv4+opDLPzCW4OwKNmKTIP42kGvU4XDG5toyu7ES825sr59QPhB+buDuo9v8t8OWS8QbsAcUKg0KNL3ibMPAeblCDggQV3uRWL2ocXD7wyJb1BJOigXbJy5nPdRB3iQHxwg== 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=/5oNHcbLsqo9M2lUcfhAAuumf4VaC3DcQDQUojVuRYU=; b=OYZsiqHbMNHHvzMyUyXzyeazn7kelTM4uQq6MtiiWZxOX6jf2C5kbafG/gmmVLOt0qu2gDfVbiTdyDWPRsrfuBXYTEV1BuHWocO2tolkw2gvouu7XIdzHPaEuS0Vr8Mn3yrx3eQFA6fcNA5lZglT9DtdoZsg3t1gO04cdF/Hu+hjJg++yxteefVe98DrGI6Wm3U4fnVsL4/XjcLDI2HtzFaQ1KR0E9JUVnAISYO/5Y7dj35MUZMpsmnUlcSUrDpC0tvcd1GtzOBglkN0mR2firbjOfEct+BCrCfZR9XJgVCoOj+B1dUKIGIY/UxJtUg6GtvnJwwh0b9Yeqbe4OIYqQ== 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: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 09/12] swiotlb-xen: drop DEFAULT_NSLABS From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: <15259326-209a-1d11-338c-5018dc38abe8@suse.com> Date: Tue, 7 Sep 2021 14:07:47 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: PR0P264CA0247.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100::19) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef7924f7-8733-4ea4-740e-08d971f81c50 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2335: 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:626; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P0wJiu3kiYlboYr2V/LGfu1A/YJF5KRBBcMhqlGVoTiAr0Vu5FfvfS8TSTyBnK1SyjAtdi3AIWl4NwOE3poSa+zGquSb/JwTvR3yeTkOKcRauRful66g22/Klc4GTLEfGu/VeZqi2Lnrpt04Bywau/h1f874QuFscuwt+0tsKwMeMmmGoBVW3MernkWTi98XvfS8BM0o1rcIWaVrNTZszjhlncLspkrs8fI4dGGy/wbhCdJIHchJN1Ql9o4SvjTX2DAELjMIUcg4euHK/PEMUpSM9b3oZrB8gkozpNyohgHb9HNklrIGGeEDDbwVNHfplXTD/lr1luNtFY9d8a8Pxfzlc9fYiQjcDp+83eZMqvaneoLypJM+WETb86IA6WWN2Rj6fmq+JI0sIPOTTKUbgb/cMKQRY3FFeNRBXj/jcYvaMraRbgQvTrUHpZ/xR3rPdx3LJWLkzzVMx3wy2KoarEzQtBu+oElfcSqxal+hc/HiPhetAFqC2zKml92pyFS6WYS7xEemWZl4GA7eF+AZ6XCOqoUtSzAvlbpNI3GBYb2vMEnal2ltc6IQWncRlaPTjMEUgSkFVhZMqk14pHSyylv5/oLGi86ZrmyqYjl4Bo2M7W/yPaDfhBAR7ILdSp1J21z1qoY0IuVyM1I5OJDsyCQCq0VcNsaIjBL70K7oZ/eqWC3J45us2gxG6eEiohB6YZJGylwRaKCOidfwVcqUAe5sv2Oj/sR2LZNjC1dKCLU= 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:(39860400002)(376002)(366004)(136003)(396003)(346002)(2616005)(8676002)(5660300002)(38100700002)(54906003)(110136005)(956004)(66476007)(66556008)(66946007)(4744005)(26005)(316002)(6486002)(31686004)(8936002)(16576012)(36756003)(4326008)(2906002)(478600001)(186003)(86362001)(31696002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?i7QrYwFt/VXeXIRjL4Kcbv8qAqyv?= =?utf-8?q?EGwRznmJVs77y1rS5c6z73NLscbP40C3O/E+VRsXafGIql6HnlvK5pk+FyFb9pc0w?= =?utf-8?q?QtkE0jKvb023gPMrZwQj4LnLKWHD0UlNn6LTXZPmPcPmNViu4LDCRX/HLtpcSU3Ss?= =?utf-8?q?yEePk/reDc8n0sOITnitSZUtBxlpRpGaHZEcLLADY97ShkK3Ag8DA+UUujNOdioLJ?= =?utf-8?q?BOiswPCsHw8rF/tDDmgP3YVTEAir5xGsE7oLD6HnLVeD7kVapNa6aCPrsvs9JQSQP?= =?utf-8?q?2FcbL1hjmtyiEqP46b23RfqEQU04IMlufxWtv7QcKTi6MtpjmLXS8ChRynht3pgmo?= =?utf-8?q?DEwrkdVcqFAqXgKh3cyfTZu2xahlmrChxkNPt/t2BUyGoDsFthuOL6tJ+hxWYB8aS?= =?utf-8?q?JqeCQR8TlJvZjHb2alJ711N1+z6oHTlH+lRCXF/kkjEZPcsaUOIsblj41CT0042WN?= =?utf-8?q?kE66juUjm1AZrqpg5RnQ2kUFKzBwAm4dTYHr1Y+IwXxShoah4py5Ihl+EIotJwe5n?= =?utf-8?q?/4BCqsbM4vE402tqNjJOjfDM28po/pwptrAb8tfMUCuW3ybi1INeclfH29HKt6Ufn?= =?utf-8?q?l0R9uMyoR7eHws3jTgy6nLD/0fd64lEkUXwlMmiPXL6NpLMUK/h54N/XWtaZreGVm?= =?utf-8?q?m8gH3CZz41uoz1Qvmq7Bm7FtUn+Oc3JTtEaS+1ajyTsVTxW8OFzlo8x7dt5zeX1lZ?= =?utf-8?q?W+c9pkIhzXDH9mQba1OzfcManr3W9BONG/xDNE/jB+X0vYjNF2bR5ZdFvlasCj8Cm?= =?utf-8?q?BPFSKgihs5/mWDEU7hs4JzpGOMhPdTRCmvfA32F2WOOiENhJOM09G3+W00AT5Jv38?= =?utf-8?q?SKT3M+sRnaWxNNku9vJow3obr8t2rfWVocK2/0gdwWpnYBPCPTwWMxIFY0tbjW3dQ?= =?utf-8?q?pW/M1OVw5OuV3KKgUa85LOV1U+pvjZHYi8yxdfWGApEiM+VvNUVVVxCX2yyKBdArS?= =?utf-8?q?vFLO+XCdpwIgUdgBY32yACLjzRU3sI3/uno4NDjcrcDJUxVxGU4/HNHj8JwJMz2LR?= =?utf-8?q?W+WjikZecg34Meemi6d0aW40U/vEop0kcWaqVvkKU0+I7w1bhSYpj+gKMLnhDqJI/?= =?utf-8?q?rpPbWRwx2zxnNP3eVQF6yOcPpz9qjYLQNe3y/19H5ao8kVmllGjwt0BYvl7ZyudHy?= =?utf-8?q?NEOQ3TIrb9AfVtuNnUDTs4bJDehapTj/sP7AXEGqyh6ccqZLpT5B6807sldH57BvK?= =?utf-8?q?ApdLyx/WCyB5RVpcG9RnSIbOHV+oMSI+W4Z2ESyKj7iqC3YEIiT/tUSyh4haYpCig?= =?utf-8?q?caQNQuviBwl0CqEP?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef7924f7-8733-4ea4-740e-08d971f81c50 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:07:49.1837 (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: 8BKWMzefbSY0LRJXWx2Zs2vQu7Is952TijJ4DX9+OI2nh3NvAJsJ3ZUUGA7RR2sYEu0sj7615QNzEj5OnFIiUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2335 It was introduced by 4035b43da6da ("xen-swiotlb: remove xen_set_nslabs") and then not removed by 2d29960af0be ("swiotlb: dynamically allocate io_tlb_default_mem"). Signed-off-by: Jan Beulich Reviewed-by: Christoph Hellwig Reviewed-by: Stefano Stabellini --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -152,8 +152,6 @@ static const char *xen_swiotlb_error(enu return ""; } -#define DEFAULT_NSLABS ALIGN(SZ_64M >> IO_TLB_SHIFT, IO_TLB_SEGSIZE) - int xen_swiotlb_init(void) { enum xen_swiotlb_err m_ret = XEN_SWIOTLB_UNKNOWN; From patchwork Tue Sep 7 12:10:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478461 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.2 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_SANE_1 autolearn=unavailable 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 ABAC4C433F5 for ; Tue, 7 Sep 2021 12:11:03 +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 551486056B for ; Tue, 7 Sep 2021 12:11:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 551486056B 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.180959.327866 (Exim 4.92) (envelope-from ) id 1mNZwA-0001rq-TF; Tue, 07 Sep 2021 12:10:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180959.327866; Tue, 07 Sep 2021 12:10:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZwA-0001rj-PF; Tue, 07 Sep 2021 12:10:50 +0000 Received: by outflank-mailman (input) for mailman id 180959; Tue, 07 Sep 2021 12:10:49 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZw9-0001rd-1V for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:10:49 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.109.102]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8d632e29-a0bc-4e46-a45d-add1b6fb1d7f; Tue, 07 Sep 2021 12:10:48 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2051.outbound.protection.outlook.com [104.47.6.51]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-29-31Ji2ZHLOkaVTUI_6HUsoA-1; Tue, 07 Sep 2021 14:10:46 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VE1PR04MB6670.eurprd04.prod.outlook.com (2603:10a6:803:120::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Tue, 7 Sep 2021 12:10:43 +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.4500.014; Tue, 7 Sep 2021 12:10:43 +0000 Received: from [10.156.60.236] (37.24.206.209) by PR2P264CA0034.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101:1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 12:10:43 +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: 8d632e29-a0bc-4e46-a45d-add1b6fb1d7f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016647; 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=buzMPiRLo4X6mtdDWgXjttrreVWYxdvGTL8smO8qNkM=; b=fBP9BQnQq/B2VvsrqCbDJBR75WwH+Yb7QuCUbkRCnCZUBHrxpEKlNUr+xVT3eHQZa5okiX tFWVza7/7ASznenRlGQyjOa8bOUbRopuqgISsibDWZw15hB7MbLJ5qvyLZ3hPO4cMW4Sx+ G8p00F6wdTEgyckR0aIM+/boXZKrWyk= X-MC-Unique: 31Ji2ZHLOkaVTUI_6HUsoA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lGFfI5pOHudYsCXPNFmYDflsm9wZBoUuRnhxbfea8ryF/O+5IwR8zKXWSRGFWOwt+jw6mGeb/3FK7u7SyNedIIqp0XeK83N/3JWWnnOKlb7tfu0GMQF92SL4KU8XXEj9clG0A5xyBj6PJR21apusrWdeeLfpjh6TO++TkAM1HCL44GXusdnqIXiBAifFj5JF/VmlI2z+qeNLphnP36jIakOheXpdL6PDyNrOxVLBWe1SJeVgYBoqIhPhvLvmyB7c2GCTqp+BG1GQtnVpOzeMUJPjOK7zpbDRlYH/Ny7y5ag1Qo5ER9yWPCs1YRlLR70FALd/WFdiUuXx6kVt81wpVQ== 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=buzMPiRLo4X6mtdDWgXjttrreVWYxdvGTL8smO8qNkM=; b=ij9RxK0H9a9ZGFFPKH1dMfbKGuWzcdP5uWCEzVXHlVphkaKNR9maympd/yaX1aG7nP7qMMIetnnELaisC1V7ge/Uy0oBkLk0RNhA9wZKxJJPTK3quY8unFsMBDgJWHWxw5rSZ/iUxFKuXiGoZmVLS94ZHfmdo8WaiEjy9dRghuyH6wWhkG2YHN/iSZu/eU2i0H8GN6a66vZbq9TX0H4Qo19eXQRjGcNaheckmnp0FNCZhDN0yz0zQeFkt8KzzAwnlDpBKdwJ6M1/G3wdKkFOiMgQniG3lEt1MCBNfMTW9/EUe5vqqTKC7IikwPCPmLge9rXzGYQS3aiVZznu3eIXKA== 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 10/12] xen-pcifront: this module is PV-only From: Jan Beulich To: Bjorn Helgaas Cc: Stefano Stabellini , "xen-devel@lists.xenproject.org" , Juergen Gross , Boris Ostrovsky , "linux-pci@vger.kernel.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: Date: Tue, 7 Sep 2021 14:10:41 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: PR2P264CA0034.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101:1::22) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1227db84-abb6-4da7-c80d-08d971f88451 X-MS-TrafficTypeDiagnostic: VE1PR04MB6670: 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:1775; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m7EAqm6GcEk0ur7TGJ1KZyyN8K3PN89uiz3gqAxJ9J1nOzPj2hc8dOnXprwzfy3gXqZqq5vHI5U4ZazQ5KwdXarQm6nASmvbcN6iTnjqzSOSwJIG5Gjif7Fqh0MuFMptCyiJYlNVci9h7ONjQZUeUkV8MIp4hRs1qAmKdPeoiJEvU6WFVQrvNI/y4aceIRe66/51smGTNj5QgCyu5ddAqGI+s4ocP4aySnEveTPusykjEU4j1khnETIBOt+77m1yVKsh+3FZBIPeQ8asEJZzu4vvDg5ShEdEy4eeJt9pJZcDJkavQih/ADDcO53BX0qJsydcvg1fizVKHSHuI8te0roO22eH68tPlZ/aaGpKhnes9p0IV+7js0K8p+Zoi7rYcbtLbWCN9LB9Cygyg+aCf6rR5Ket8izPO5S6DqaR+XXwZ8iFCQY/qQ/ogoE6Gpk2KQeT4XBeBI296RPD4hD6Q2keaGKze4Hmv2r5DzGgWIr76ofsaRrT8hc1MXfVNgG/SfWpZB1p8cJICfXGbyBQJFRzoVwbTMchqs/reHC8xO4CoqTPL63+DdYNiuQeQGbDxN8xezIRvx8PCngE77q1Y9jneDON/sQb+PtU9cc8/s7e2fLFOtqFdgyL7j/fvmsOBzu+lT0gQeyIxBhQ0tRgzfp0vN8WyP79S/Js8TibzmlICrFcvzxPIrLjn9CbHD3eqG4FHBEY2FX802K/bShGnNJH/EOcTuPiZf5Xg2iOj7g= 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:(346002)(376002)(396003)(136003)(366004)(39860400002)(31686004)(8676002)(2616005)(316002)(5660300002)(4326008)(6916009)(8936002)(478600001)(31696002)(66556008)(66476007)(38100700002)(66946007)(54906003)(186003)(4744005)(86362001)(2906002)(6486002)(36756003)(26005)(16576012)(956004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?3gDPPmr26zMoU/7VCGYuP/Fp0ThE?= =?utf-8?q?okppHIC11q60YUYMjajKv3TqOXp2AiQcg7c1tDX7FiBuOXxQLE6KO3brndltvkgp4?= =?utf-8?q?mRc+7CMJEVYabJhX2py9GhBbw4Vw8Xxu4at/cu+6u3+xZEGyIVXfwph3wxdIrcKwT?= =?utf-8?q?neQlTaNM0bBo5fgs9Kz/vB0jkYNjyVYNPHH7x6tG1XEXVE775xBVz2juP9n1LgUVx?= =?utf-8?q?rhNYhkdPM/Co2F2bCFA6ufqufxowaEDsbnh4INf9Vy0e0nXj9LxrSy6uTU4zLHe+9?= =?utf-8?q?YqeRGuE5cSMv/0Xu6iSW8PUQ4TVdPUEc5Mm0r6O0oWC05rcLcvp4oTFnIaSGo5nkT?= =?utf-8?q?W9X0mjUDvS95+ZCsXOn31CBrZwjbUfh+4g9Czta1XBqwrcibH1p5svgXsPqNSRwSu?= =?utf-8?q?z/tBSWWzPJc4dvlevCqaIXpjjAtDShyW6uAP/5A4V+k7e2VsccIBCkt9BX2LiXAgF?= =?utf-8?q?K2SvEjay6ZfRqFZ8h5NFU/iS1DI6hiPD68UpavykD2A+xUOs9lzsJjLAL2hgCQUDp?= =?utf-8?q?rDww7OW39NLG1ACOSvq1uptfWpXj50rTbrVxW47UFZ7eHgIqIRE3Hyo76vxyEDHS2?= =?utf-8?q?NHtTEaUC68SGEbX/XaZ6IeiLGGAm+zU9W3XTh+En2twCoswWTyF8gtLGBE3x2cvfw?= =?utf-8?q?hvzFU7TIdWtIZdU4ysAu6mDC+hxecCJt8hU5Vp+atHhIGQEx+0bY0dCKdMsRklAzW?= =?utf-8?q?6SIq3V3U0896vpyT/7daW4EhaNnKueyBllJRviFuoo+GdckzjV4mYju+qlNEffNlC?= =?utf-8?q?okwatvHcc7N7lG0YZap52TSIJdaJnJ7OQUYG0taBTvCgg76GaaJMLM15xX3OGCPFu?= =?utf-8?q?9O64i1A0MHmIxV5ZA491ie7SubVkiZnd6dKfcaC30hGFmobBIhCIyFAXNDsB/T7dF?= =?utf-8?q?GsTDVTblSNcYnKaNo5V1VnkqywYRCm3BAXuTaQ53C4hwtbo7pA6lniXmczeM7+Usw?= =?utf-8?q?kE19RE4tfkheuUBEn4Q/XqaSov9Dni9v9RWrFv2IepCuinrqgGipYDmZE8Z2MJVWR?= =?utf-8?q?Au9fHGjbNcxIC6ATsaon+vS1LmmbFoYhXDxcBHfLN6D2JvydCNNDqACKD14DSIGZw?= =?utf-8?q?R+QetPJxTyFUEVIbbLMRxj+Rgt7+YT+/ejQbCz0SFGGWst8y6+P9EZRDvkL+7TwJZ?= =?utf-8?q?Z7gDbPj5M1EPC5HOWz1Ia/szSaKYEEgTBtfz9ptz1iuDYr/u4A7LoDZlJ8KD5bR9t?= =?utf-8?q?GPvAGE2lJLO7oPhFcqGHboH6u5RFydR8LgrvoONJIbKz5RxVbryVNtDaBh6Im1Twy?= =?utf-8?q?r3j3aEdy9lofUnsF?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1227db84-abb6-4da7-c80d-08d971f88451 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:10:43.6715 (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: F5oVfv4KKz7Sfl7MsVyluQn1Kj7eJyGUHCjIUpIYyXZBezIo2cWXP/iZ3IgskLgXkzW8iTWz8Tcmd7aQhGvW/w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6670 It's module init function does a xen_pv_domain() check first thing. Hence there's no point building it in non-PV configurations. Signed-off-by: Jan Beulich Reviewed-by: Stefano Stabellini --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -110,7 +110,7 @@ config PCI_PF_STUB config XEN_PCIDEV_FRONTEND tristate "Xen PCI Frontend" - depends on X86 && XEN + depends on XEN_PV select PCI_XEN select XEN_XENBUS_FRONTEND default y From patchwork Tue Sep 7 12:11:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478463 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.2 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_SANE_1 autolearn=unavailable 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 D8CEDC433F5 for ; Tue, 7 Sep 2021 12:11:30 +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 7F6F5606A5 for ; Tue, 7 Sep 2021 12:11:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7F6F5606A5 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.180963.327877 (Exim 4.92) (envelope-from ) id 1mNZwg-0002fk-5O; Tue, 07 Sep 2021 12:11:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180963.327877; Tue, 07 Sep 2021 12:11:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZwg-0002fd-26; Tue, 07 Sep 2021 12:11:22 +0000 Received: by outflank-mailman (input) for mailman id 180963; Tue, 07 Sep 2021 12:11:20 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZwe-0002fQ-18 for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:11:20 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.109.102]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 87c36d05-5fb5-4f85-871f-79f0948e0ee3; Tue, 07 Sep 2021 12:11:19 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2055.outbound.protection.outlook.com [104.47.6.55]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-25-aRu3o9_mMI6z_lWB0iMeiQ-2; Tue, 07 Sep 2021 14:11:17 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VE1PR04MB6670.eurprd04.prod.outlook.com (2603:10a6:803:120::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Tue, 7 Sep 2021 12:11:16 +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.4500.014; Tue, 7 Sep 2021 12:11:16 +0000 Received: from [10.156.60.236] (37.24.206.209) by PR2P264CA0047.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101:1::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 12:11:15 +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: 87c36d05-5fb5-4f85-871f-79f0948e0ee3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016678; 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=w/4sgXZWL5TyOKqIEB0uUbPnSshL/83p3qgV1ftBS1M=; b=G5E0+El9twSdJ4JPdIdcA6T7uJI4xcnrZK5TsXLmAxVPKfRIQkejBObU2Nsl/R9ywrZ4gc 9YIgDm/IXnIrq48RFo79xmthC05uop5obhm8MOVFToq4iYByQ2b13VxTVeSuEWc5sd3N2q growQoEhAbP33xGtkECN4tB1ibE5spg= X-MC-Unique: aRu3o9_mMI6z_lWB0iMeiQ-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=By2MW81/o1kLuXrOUuM8q6oL3Ze9TE5xrmCWM8vczKO7aSWDhmJFL4M24jRQdjpV91rymu43Qyb6txMna7daDikJY5AKBxfzMV1G7lfA3un0sjyNuzyJLkOteTjvD9p4my5SAmsBMNJy3RTDF8Vwnv1CCAKcTd7Nxk13p/8d7sxUP8fb781Nnsuk7u3tFjAjNDv81uFKDQLy9pU3rIRAV8RfGyYO+nyjWHI0GMsEpVbvNGER4PnG6gCuM2DshNeq2+MT+eofI1D3tkdImsxMsngg8eMGasNmRC0oIK2L2t3b5fqJcl+s9fFp1rmbzxhbexhOzcvwb2I3c1y+o0BISQ== 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=w/4sgXZWL5TyOKqIEB0uUbPnSshL/83p3qgV1ftBS1M=; b=lHmvz+NiNzSTlSrLOMxEGmfUSa6GiUMaikp6c9ZxF5uOa+1a8WReH4Xgfh1Ce8K68q4U3nLG+dQf6E9yy7lcD3D4tUMeF9bX2GN5KzgIXNyhx8kdljvnADorvItx1U/+/WxiYMrGNxsMyBVnF0YoHmsxkSlh06YnC1+m9cOmaXCFLiujSwxs7uTnhpytwdpUIHGkI4OroIlZgCq22RNf1h1kfWrF8OZbRGGo4RoTniRC7nhSOjnJfhsFp8ErY6s7Bp7Yizb45IEpc6uKGXLZ0yQOv5/fFB4ZqbY1HI0ZWXcaWBy6Kt351euSCasqdQ+Xzsjpsa9INTXZsDkhAFGSUw== 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: lists.xenproject.org; dkim=none (message not signed) header.d=none;lists.xenproject.org; dmarc=none action=none header.from=suse.com; Subject: [PATCH 11/12] xen/pci-swiotlb: reduce visibility of symbols From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: <75591cef-95e8-c694-fd11-283800499e4e@suse.com> Date: Tue, 7 Sep 2021 14:11:14 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: PR2P264CA0047.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101:1::35) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b96239a-338c-4c83-a97d-08d971f897c1 X-MS-TrafficTypeDiagnostic: VE1PR04MB6670: 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:2582; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c6jtTYYeSeyA8Xs2NV5x4j7yK4F1HAeNdMSka5OVZXiMXj22vesIRzMd4/kz7xRK7qeOeP5IwQFI6EqYyXPILPJwqNnN9lvRsUYihsVtrICJ3zbM1CULB4bbn+ej5gugNzviDieOLUG10NPU525CzdrHB9Xgrwbo12Joo3JrBLxqB8gHVpmbQK0vxxb6cPjGhZ0urjrYSbApUmM7k7nFp5AMrcvFjIb+hlkDfaC2QxwjWRY09Rxt9fd9knGkaE4B6llaNKYoZ36tIFTvt/VH1OjictbFgOMoRLvPL8ItQacZ4fXVBaHkjk6/da31yp8PrArZi29sw5NmtH1Qv3fXg/5Jic9ogCLi0XwMwuCJ4HI9eded5XtvAEoFu5KyaIrQu5qouKAm9LxV2mmQ+lGUSimCnJZEjMuFu2XLFDR2edH+WLeJOfCvoZV8EOHUEK03r9ediEQSxhQKyffIlJAOJIMuVjgoR/w353zN3BtMKfwLK9x+XNASDwCsWwGL3ddIS8rCDvx/NtW1WFM1aiEvxw2+krqkwgO7Pn1CSXPxf8Gdkye/8CrPALf4gobyMbOYx8PydoDPu9QlLS/IYFae+iTqocbHnl1/8jW17dFiv9ccv7V48YjrvuBjLuUMjjXnM2YxeYcRHnR8XiqzKTr1fPU3PIVfTww9K0AE9Mk/af9ur36LKadfKkqxmlzaAu8DbsT4Wcm3ahbZ5WLgLEUZbxADiaUvu44Tgqi8c7OiSsI= 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:(346002)(376002)(396003)(136003)(366004)(39860400002)(31686004)(8676002)(2616005)(316002)(5660300002)(4326008)(8936002)(478600001)(31696002)(66556008)(66476007)(38100700002)(66946007)(54906003)(83380400001)(186003)(86362001)(2906002)(110136005)(6486002)(36756003)(26005)(16576012)(956004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?awR0sWDHvLP0QhrS77e5IlqgsCb0?= =?utf-8?q?cpWDhTS/NSyzfT/y7UwMwrNytWvr/wqCbFjrV2Y6xVkZbXnxFvlq6cSbro2XPYs40?= =?utf-8?q?68N+je0JKuL3IDcVaY+BJwUE92O5YbZ9s3SUR3lvx7EXNsmLz+r3LyXp9oseOXijv?= =?utf-8?q?+nUQ68/zjem8aZGCqUWn3qiMSj0kN7RZ+MU6aLDBKkj1Z70OcwfoAe3RUPA/aVToa?= =?utf-8?q?XbfI2hSq8bPrA2f9BDD+Rm6ZqaBtK7zkOMM49OmhU+Cakc5iVnuVL9D5LNOCKtmh1?= =?utf-8?q?eZr21evf48cDSn0yOt+PAOUwZYgAXkDkLdIUrICVzH1bEVdL+yq+BTX6xRpRIEGGC?= =?utf-8?q?usU33cjjQHv0vT5N8ZooBuewMXRTLjx/ZmMzOSiDvq/BCHng1kB8UTSbc69YmzhdC?= =?utf-8?q?dWXVLzkK3VgYxxnmsZv0bMnc1nIXlm2d9m655WYZhy5wa5QMIBy5Ae45SqJ1E4Y+6?= =?utf-8?q?fe5F4wexO5ZVmesbXQUHZeMeVDzWQ/dmJPZmskIoZRhem3VUdqmWTRbHrvickx/dC?= =?utf-8?q?JyuKNKZ33LTb49Nplug3+zxxi1BcnWqoc6UCS4rVz207GQpYJCIBDQLzWipfL0C5C?= =?utf-8?q?pFlMwWyAMPDP+z8wNkhVvnxA2fuXYrn3uDZF7RJqdC1hZnOxtwZqp0oToDmwtggTN?= =?utf-8?q?fd52FyJrNECnGRlopu3KaSknydEQfYAiPEe5FUCQ/yCEHL4CFYFiYe6w6QurIQX5+?= =?utf-8?q?nDUXkr49i/9nWOnpom2SOda7yzlpPq/Jwb/a6T/Q/zifNb2PGVzOD9OVc/nplzLmm?= =?utf-8?q?fAaN9B1uznfHjsMeO/CYJNngT5Xo4Q5CtBk8JBSHnUK8SaPegZtu9yNMr+IvzFBsU?= =?utf-8?q?SCrxOXZzssJ966tgk2+RwrMTjXueEwmvQjjtEC0l4fEF0K/Wy1b8RTHJdVPNpHXdu?= =?utf-8?q?P9g5zgC//0GY4b4gggil1ht8tug8LYq4swhlvETG9NUVav8BUefiixdaCxKwfVF4s?= =?utf-8?q?k11jbQL5onflbQST/wuY3aqKBEnQ8NnbEkuLzzoFtF+wTvC0rWRyU76u4n3SVQmNF?= =?utf-8?q?NI6KCbiCU7FnMuk5jxtruwdfJWU0/36FruMglBwlKE6h5dbNofKu9DEk4Qe8qMyTb?= =?utf-8?q?3n8te2K2/eip5CGdjnZu1CFZCMhirGBQngV6agpmRv7LyCmeaG9FDQiXwvd8Wy3ar?= =?utf-8?q?12bUL7MLEeDEr0njJ1/D0x909nQRPYpfx3RVdyJWK5no57dzzJYiQCNk6QSLWDSwN?= =?utf-8?q?JFLNS7jlqX0U/of2TNatRkCLXwwXJkjN0/bpf6GLJgjztJsKC5v6UJGl1hsCBzl5t?= =?utf-8?q?LH5sz3/K5EI9w1ma?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b96239a-338c-4c83-a97d-08d971f897c1 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:11:16.2704 (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: qEfTjpzl4JcI18fHOhFc1nlSIL4QhKp3jrj0zwtijI0hb4Whbz4NLgrnIg4zOSGvgSYcNJGY8iOXwgUlRxDadg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6670 xen_swiotlb and pci_xen_swiotlb_init() are only used within the file defining them, so make them static and remove the stubs. Otoh pci_xen_swiotlb_detect() has a use (as function pointer) from the main pci-swiotlb.c file - convert its stub to a #define to NULL. Signed-off-by: Jan Beulich Reviewed-by: Christoph Hellwig --- a/arch/x86/include/asm/xen/swiotlb-xen.h +++ b/arch/x86/include/asm/xen/swiotlb-xen.h @@ -3,14 +3,10 @@ #define _ASM_X86_SWIOTLB_XEN_H #ifdef CONFIG_SWIOTLB_XEN -extern int xen_swiotlb; extern int __init pci_xen_swiotlb_detect(void); -extern void __init pci_xen_swiotlb_init(void); extern int pci_xen_swiotlb_init_late(void); #else -#define xen_swiotlb (0) -static inline int __init pci_xen_swiotlb_detect(void) { return 0; } -static inline void __init pci_xen_swiotlb_init(void) { } +#define pci_xen_swiotlb_detect NULL static inline int pci_xen_swiotlb_init_late(void) { return -ENXIO; } #endif --- a/arch/x86/xen/pci-swiotlb-xen.c +++ b/arch/x86/xen/pci-swiotlb-xen.c @@ -18,7 +18,7 @@ #endif #include -int xen_swiotlb __read_mostly; +static int xen_swiotlb __read_mostly; /* * pci_xen_swiotlb_detect - set xen_swiotlb to 1 if necessary @@ -56,7 +56,7 @@ int __init pci_xen_swiotlb_detect(void) return xen_swiotlb; } -void __init pci_xen_swiotlb_init(void) +static void __init pci_xen_swiotlb_init(void) { if (xen_swiotlb) { xen_swiotlb_init_early(); From patchwork Tue Sep 7 12:13:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12478465 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.2 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_SANE_1 autolearn=unavailable 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 8F274C433F5 for ; Tue, 7 Sep 2021 12:13:37 +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 35BB0606A5 for ; Tue, 7 Sep 2021 12:13:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 35BB0606A5 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.180970.327888 (Exim 4.92) (envelope-from ) id 1mNZyi-0003Tx-L1; Tue, 07 Sep 2021 12:13:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 180970.327888; Tue, 07 Sep 2021 12:13:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNZyi-0003Tq-I4; Tue, 07 Sep 2021 12:13:28 +0000 Received: by outflank-mailman (input) for mailman id 180970; Tue, 07 Sep 2021 12:13:28 +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 1mNZyi-0003Tk-30 for xen-devel@lists.xenproject.org; Tue, 07 Sep 2021 12:13:28 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.111.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 014c1066-0fd5-11ec-b0eb-12813bfff9fa; Tue, 07 Sep 2021 12:13:27 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2056.outbound.protection.outlook.com [104.47.12.56]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-36-hmssEa00Mkes3R_235iJ3A-1; Tue, 07 Sep 2021 14:13:25 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB4943.eurprd04.prod.outlook.com (2603:10a6:803:51::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Tue, 7 Sep 2021 12:13:23 +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.4500.014; Tue, 7 Sep 2021 12:13:23 +0000 Received: from [10.156.60.236] (37.24.206.209) by PR2P264CA0039.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101:1::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 12:13:22 +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: 014c1066-0fd5-11ec-b0eb-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1631016806; 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=Oa3ZLU03Swba0gYvsSEjRU1XJu+IDpj/E8M5qxMYmhM=; b=m/81AvXjwZBlj8QjxuUQXwqF4l1qlxXQC9MUfuQyClDi11QVIQC0sr6VEvsZECn5zSNien 8CR2EnqavAKyN8HSWQ0SzWuMHUwLZEBOCoEda58aoQ92gToAB73+WeBfnRhXI89W7G3zQN dIXuV48KDNbZEEfGxtlEl6jSEg9B230= X-MC-Unique: hmssEa00Mkes3R_235iJ3A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fNrCjBtaCc9xrRgcZFD6TBodIymGQhEGSbmgii+q0J6PhiCvr9GbbJuWLbKnB3UY3AiS6gQ5Am15OL6bQ72vSLi2Rl1pS8ygiZUy5fMJMJVBNo2vBeKgD6GNJIz3oOyzOaErWXlx6+qgAOHM/xHdcCyoRl6IYlrUuChkpjOj0n5Rj6KfDry0tDdAKzdxfTNdOb6dKDkyJxySSyrIBoIfwxRYutrJtc3Q/aK+iAzkkavz7qe9K0/tLz0FRWkwNU9FG9wpXeT5QPqJdyzA5QyvjxQjYwE6qAKcmugli7NzsvX4mPCPxSOQc5d4354ZWCK25rcy1PWGw0+gBnOwlHiiTw== 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=Oa3ZLU03Swba0gYvsSEjRU1XJu+IDpj/E8M5qxMYmhM=; b=JqLWdpRvPxsIWlGroRzDRKNQZLUS8rpC0Vt0vtXK9VxNpou54LoVMXTNImYpMRQsMha8Rnu0VWQu/QXCRXHObhYJf/5cVSuax64pcn4CdXJvC8tutebA/iyv3dHmt53PcQCAaU9jiVmnmLcTIxGdVKS4MVkkHCNFq/3WKbQqNGwFI2BkvLEbHty+BpXyG+1nyMntSXhfxiMfXt0jNTqAGgeUkzxX0zb8BZMQswUdfkIzmdJEQCuNjT/yjE1W2+Ww9jhD/V42Gy+RZ73oPjffsxbLGy1UoXVyvOK2fmCXIhRkZ9csNBnXLy4ilnn1SM8GGzLCc83VzFDfMlGMHABSwQ== 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: alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=none action=none header.from=suse.com; Subject: [PATCH 12/12] swiotlb-xen: this is PV-only on x86 From: Jan Beulich To: Juergen Gross , Boris Ostrovsky Cc: Stefano Stabellini , lkml , "xen-devel@lists.xenproject.org" , the arch/x86 maintainers , Thomas Gleixner , Ingo Molnar , Borislav Petkov References: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Message-ID: <004feaef-f3bb-e4bb-fb10-f205a9f69f28@suse.com> Date: Tue, 7 Sep 2021 14:13:21 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <588b3e6d-2682-160c-468e-44ca4867a570@suse.com> Content-Language: en-US X-ClientProxiedBy: PR2P264CA0039.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101:1::27) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b7774d84-fc14-4235-a792-08d971f8e396 X-MS-TrafficTypeDiagnostic: VI1PR04MB4943: 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:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8vr/cvpjrHj9i7Ab2anwybJQtqfCUkLxrZeWoopggiJjivFTbp2KsRgQ7A2tgPQ4E3dOZgyqMef+rxP0r5Pb/k/MdvSyLCv19bNVwzU3Wav/jqlnxpDcGNZf3oWI1zJ3821MhF2+GsIRFmZ/FRgc5TPAN+qcGGolJ296uFSTODOP4iBS41fSKYHrj0vKL2X+GH7hfLfocq4UG1yP75NCkcuUnP143Qeew0LxdElKLrcDQxoS/xWKZIbYj2Y4C+/R0nnB+NinOvshRjrymlEpD+/SpI3HUe5CU41rLje5eigEnujEG2jzV4ZHmh52GxX1FvrPUjf+I6wc+Ku1mf8MfzLHuT0W5aTkGHbGouuR8v3wfT3wWlsGfvDUwv3lRZv637OQuIIjQUvQHcItHz4iz+Ku+OOZ3QW1NSSBWI2u9rgrpiIMziD6/CXdNzDSSLOHvQ8nS9zDmWKra/zxTOeFyjw/xbxYT+vppVOHSpgnlFuWkvMKlsMUU5tTJ/xAJhPGttvOw4enrLTTEkhBRXyowPNlNQA6FsMcs0Tw1wm9/3QNA50+/aY1IMKRzau7FjZnj9WACrpOg633GLU2QDw/Qm521l1aI5Tyy/Maf0tW5F7gp/P1lPDMv90nJd4Bv6cdIK7hNEBlgIJCEFTYlPX/bkJRjCPs8p3zDNxcMeQ46w65dAX/NcfTtC5Vs+2X4NB9t9aHqIb8A4os50DK35X5H9nqR2plZG9dVJ5LvUOkGkM= 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:(346002)(396003)(136003)(366004)(376002)(39860400002)(2906002)(110136005)(16576012)(956004)(4326008)(316002)(66556008)(66476007)(66946007)(5660300002)(83380400001)(2616005)(54906003)(478600001)(6486002)(31686004)(86362001)(31696002)(186003)(8936002)(8676002)(26005)(36756003)(38100700002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?WaFblDO+7WWIziOck89nAHAqpQ83?= =?utf-8?q?Svw3ltCRFTDKFQlA+BNHNyWCUyStFPTpneEP7BCulB4YCPDjwgFuF9Nkz+P0/U4Im?= =?utf-8?q?9/PSZUO7j39DLNeuPyZI6IzDdHoyvJeGO08mqExIYgAJc4mvBqqRXHznPrNMDZ1hi?= =?utf-8?q?3wbeuNEM3VUbV6L16UdHemjZNwdtu/VxMfio8sySHtZcWEo1K/lWt24F/TcxFLHcu?= =?utf-8?q?aTpcmYiBSxKRucpUoSYWoqSiGb79iNtmD4wbIgzfTlGEpbOOtPoCxO0+EnfB+8c8Q?= =?utf-8?q?ZXbPbYzNEdvSh9tfojuC8jfVayl7BzuBSNcm8zcfCgy7/GgX2DA3ymW1/BRUoigB1?= =?utf-8?q?ypJGTLxjN7cF6j9wFdPf57yWLPfWUR0nT6X26xGJUJtizXUY36FGnu95Lp9kVpuOg?= =?utf-8?q?P8S/5Qi18aItHnNIpYudVOtR2GqBlRSb+zB69nYHXaSrn2vspaYW3SSxezejtNsTs?= =?utf-8?q?SQnFf+MeBIGrm6ZDHrtAZOEgaCYoZGCQ+At/TxvUAKXdNg5LoTEn4OPXuO2H96dFA?= =?utf-8?q?wXNfT5lKQn0VpJ2zr5uJfa646GrlsSiJk44E/HBSChr4hnJrlCQfqzIRyYYjh58S8?= =?utf-8?q?cfZFCH//7ZKPYUdidFCj3JxQ9lqdNRerZD7C/KiFtSXnZXcQ/tFcm9uuss75b9Uen?= =?utf-8?q?Fwao7MhF13mv2Uu1tdCwHi6jBaDYLmfvUTlrvbk4R/yO1dGFIarP9OxH62iFDUCfM?= =?utf-8?q?Lg6AjDk6szdX9AeocyCXTjTKkUb+deASqsh5tXMPo/QW7qcG7IjmmS/cp9hmU4zqj?= =?utf-8?q?OiTS9Al3uVz+7dYJwI+mtw0pFqeQec3g+DZptm8fZLNNacLcNFHWalZV7i0tk4h9B?= =?utf-8?q?mn5u3k/alHB/Im0Zg2zLYE5kcsHcMfhrKovI0+cFgXmKs47OtijsFh23fd1nZkpYW?= =?utf-8?q?BR4z5cKf1yV0ZaiZtXm7btKxFXsjQENLvlDlJsfTQig5UGUg1TqlDnIgia+bzo8XJ?= =?utf-8?q?Dbrn6pgpA/cFBvP7/EuGgEjVyasYTuMZvTm1VmME2E5ELA4KQ32gtAj+Hq75dXTBq?= =?utf-8?q?uHwUewjSBCuoKLR7UnysxwYuT0XXVIibHZ2SVtQzEUbo7CkilqQ5XKGQZChOIcLSk?= =?utf-8?q?KexYnzjngtz5A+dkesmskKOWDosZ0uYQNFkVBIQFgKns8u1y8Ot2nCuRt0xKKSroT?= =?utf-8?q?Sbq3Ie28zAc9ckPNCjcpBbirzId4odpQZxHanux6JzgI6+Y07JAUq/WT0IlBjqvvW?= =?utf-8?q?vyXikT6+dpJtVfCe11++XUXIHOfUH69p6yJzJZ9cZsDkglmFvVEmdbK0RxdTVeJSQ?= =?utf-8?q?ptHiGlsOMnlgHSNX?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7774d84-fc14-4235-a792-08d971f8e396 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 12:13:23.5014 (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: XXdSfbCYvgXozurmPaARtxlnRGuVKssWDwgdeKOzKQHuirdoSSd5NUtLJsjbmk5WNeJhUNtDrNo0pK29j9rxJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4943 The code is unreachable for HVM or PVH, and it also makes little sense in auto-translated environments. On Arm, with xen_{create,destroy}_contiguous_region() both being stubs, I have a hard time seeing what good the Xen specific variant does - the generic one ought to be fine for all purposes there. Still Arm code explicitly references symbols here, so the code will continue to be included there. Instead of making PCI_XEN's "select" conditional, simply drop it - SWIOTLB_XEN will be available unconditionally in the PV case anyway, and is - as explained above - dead code in non-PV environments. This in turn allows dropping the stubs for xen_{create,destroy}_contiguous_region(), the former of which was broken anyway - it failed to set the DMA handle output. Signed-off-by: Jan Beulich Reviewed-by: Christoph Hellwig Reviewed-by: Stefano Stabellini --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2605,7 +2605,6 @@ config PCI_OLPC config PCI_XEN def_bool y depends on PCI && XEN - select SWIOTLB_XEN config MMCONF_FAM10H def_bool y --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -177,6 +177,7 @@ config XEN_GRANT_DMA_ALLOC config SWIOTLB_XEN def_bool y + depends on XEN_PV || ARM || ARM64 select DMA_OPS select SWIOTLB --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -46,19 +46,7 @@ extern unsigned long *xen_contiguous_bit int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, unsigned int address_bits, dma_addr_t *dma_handle); - void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order); -#else -static inline int xen_create_contiguous_region(phys_addr_t pstart, - unsigned int order, - unsigned int address_bits, - dma_addr_t *dma_handle) -{ - return 0; -} - -static inline void xen_destroy_contiguous_region(phys_addr_t pstart, - unsigned int order) { } #endif #if defined(CONFIG_XEN_PV)