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);