From patchwork Thu Oct 20 09:46:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13012932 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id ECBBCC4332F for ; Thu, 20 Oct 2022 09:47:40 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.426329.674694 (Exim 4.92) (envelope-from ) id 1olS96-0001P7-0b; Thu, 20 Oct 2022 09:47:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 426329.674694; Thu, 20 Oct 2022 09:47: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 1olS95-0001P0-Tr; Thu, 20 Oct 2022 09:47:23 +0000 Received: by outflank-mailman (input) for mailman id 426329; Thu, 20 Oct 2022 09:47:22 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olS94-0001OM-7T for xen-devel@lists.xenproject.org; Thu, 20 Oct 2022 09:47:22 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 2fb0b786-505c-11ed-91b5-6bf2151ebd3b; Thu, 20 Oct 2022 11:47:20 +0200 (CEST) Received: from mail-co1nam11lp2168.outbound.protection.outlook.com (HELO NAM11-CO1-obe.outbound.protection.outlook.com) ([104.47.56.168]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 20 Oct 2022 05:47:14 -0400 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) by BN9PR03MB6027.namprd03.prod.outlook.com (2603:10b6:408:118::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31; Thu, 20 Oct 2022 09:47:12 +0000 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254]) by SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254%3]) with mapi id 15.20.5723.034; Thu, 20 Oct 2022 09:47:12 +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: 2fb0b786-505c-11ed-91b5-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1666259240; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=k+2bCajRjmdDUI5qrAEiOOQGkBMftTHfCURovph7k1o=; b=LnxzfAGxx1riSzwyFeeHy3USPtqi7xDTZw8jr/BBRqrlXkqmQsG0p+Jg TPTygZCZtH9BtyfkpqxnY8Ln+/yHX4atutAo9VHYVz4OKMdI30nP7F4X/ APgjYJvEaSxNwwEzMavaBGCluIl/UTnri1tAlRe6AI44Ga0me4u7Dq1Rd o=; X-IronPort-RemoteIP: 104.47.56.168 X-IronPort-MID: 82251983 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:GB87FKt5VlT2QyFHe7keYX5qM+fnVFhfMUV32f8akzHdYApBsoF/q tZmKTqPPKrZamChL90gaYXk800FvZbSyIM1SARpqSxkRHxD+JbJXdiXEBz9bniYRiHhoOCLz O1FM4Wdc5pkJpP4jk3wWlQ0hSAkjclkfpKlVKiefHgZqTZMEE8JkQhkl/MynrlmiN24BxLlk d7pqojUNUTNNwRcawr40Ire7kIy1BjOkGlA5AZnPaoT5Aa2e0Q9V/rzG4ngdxMUfaEMdgKKb 76r5K20+Grf4yAsBruN+losWhRXKlJ6FVHmZkt+A8BOsDAbzsAB+v9T2M4nQVVWk120c+VZk 72hg3ASpTABZcUgkMxFO/VR/roX0aduoNcrKlDn2SCfItGvn9IBDJyCAWlvVbD09NqbDklE5 8M/NwofSCuMuPqw/oDkasRQt+A8eZyD0IM34hmMzBn/JNN/GNXoZPyP4tVVmjAtmspJAPDSI dIDbiZiZwjBZBsJPUoLDJU5n6GjgXyXnz9w8QrJ4/ZopTWNilUvgNABM/KMEjCObd9SkUuC4 HrP4kzyAw0ANczZwj2Amp6prr+Vx36iCdJJfFG+3vBFgn3Q13wJMTw5UlKAs/WhyUGHUc0Kf iT4/QJr98De7neDXtT7GhG1vnOAlhodQMZLVf037hmXzajZ6BrfAXILJhZebPQ2uclwQiYlv mJlhPvsDD1r9baSEHSU8+7NqSvoYHZFa2gfeSUDUA0JpcH5p50+hQ7OSdAlF7OpitryGnf7x DXiQDUCuoj/RPUjj82TlW0rSRr1znQVZmbZPjnqY18= IronPort-HdrOrdr: A9a23:O0cap6GA4b6rjBAGpLqFc5HXdLJyesId70hD6qkvc3Fom52j/f xGws5x6faVslkssb8b6LK90c67MAnhHP9OkPIs1NKZMDUO11HYSL2KgbGD/9SkIVyGygc/79 YeT0EBMqyWMbESt6+TjmiF+pQbsaG6GciT9JvjJhxWPGRXgs9bnmRE4lHxKDwKeOAKP+tOKL Osou584xawc3Ueacq2QlEDQuj4vtXO0LbrewQPCRIL4BSHyWrA0s+zLzGomjMlFx9fy7Yr9m bI1yT/+6WYqvm+jjvRzXXa4Zh6kMbojvFDGMuPoM4ILSiEsHfgWK1RH5m5+BwlquCm71gn1P HKvhcbJsx2r0jce2mkyCGdrjXI4XIL0TvP2FWYiXzsrYjSXzQhEfdMgopfb1/w91cglMsU6t MG40up875sST/QliX04NbFEztwkFCvnHYkmekPy1RCTIolbqNLp4B3xjIZLH45JlO11GkbKp guMCmFj8wmMW9yLkqp9FWH+ebcEUjaRXy9Mws/Us/86UkloJk29Tpb+CUlpAZxyHsMceg72w 36CNUYqFg3dL5xUUtcPpZ0fSLlMB27fTv8dESvHH/AKIYrf1rwlr+f2sRH2AjtQu1C8KcP X-IronPort-AV: E=Sophos;i="5.95,198,1661832000"; d="scan'208";a="82251983" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AkLc7JC6jujAjdgfgOurSt+BWDRq/Y/fb8lCwrKfBHPNEpLkZADGD/5vfcFlS4KEpTLYuxFLY+DzKv8EFQxw/+akNhIktN4Yo9VMh+WnrIPS7W6CBZb5o5w24Lw6WwpdnYxPtAq2ywRBgkjZtA85Fm+kIwcyW4+akqepCm9YMH3p6cQ2eeJSN8M9lENT/wBnp4TWVcHG1DqWwAubzAzq73bzqmwZFXM/GgXxRx/5T/cTrRbuc35vWiiZsDy7EQUY9qD46ROUe7Kr8uJDJAWt6fN3OUtsM7XFQ1MtLwHzua9UFbhUsmfUsPgtRX6JU+JTjFDR0WQl6DFntWEoYk3D0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=p+XSJ9rQmd5UfBXKliHWuNtxPvSFy2AGFgwTxJdAwX0=; b=JnSgcLVh1Q2d4kzwxlN6yMfOxkkEpP6bvdkPJSMWEby3y4fhlCLcfDP0Eo5ZKP2CrfXLRK9aQVrh/+X0RpMAN27BzKN2uAEbNxjcUC7+UAyE72+m1eLTJUyjWHE3o36mJt9qbFNv6xxzLtPIHc+GsEpkyJcx4vACZ2vs0lbqv0afy6KW8tI2CuK0eTyRb7t4tZPEXGcXNwFqGh4QaaB7lpRHsT9AvONJZshSsxhV/6c8C73UgIbhJt5S5aWmX7abEv4BSjt5NbMJt7GOmhJQY4I02/8XQ/YWEo3KZ4sFqantzAcd+b+5Wm5Fb9OBFSnfso+w6vdpPxzFDI2K5wgxBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p+XSJ9rQmd5UfBXKliHWuNtxPvSFy2AGFgwTxJdAwX0=; b=VuJ9L4nEyskamt3uqgjoeN/6kAVKzENa+5G8PcixXa5LT0PPULI+wn8L6tVuo3iZYruznxFg3iOkQQz56bYMvnC1Rs9qDdIgMZ3d54vw6b/A3JFLUZhXTCVZ6Qn1rFrdYeHX0dG7qtZ51urOoe5a6U8FRlbII0t9vRQYhXta0Mw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Wei Liu , Anthony PERARD Subject: [PATCH for-4.17 1/6] test/vpci: add dummy cfcheck define Date: Thu, 20 Oct 2022 11:46:44 +0200 Message-Id: <20221020094649.28667-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221020094649.28667-1-roger.pau@citrix.com> References: <20221020094649.28667-1-roger.pau@citrix.com> X-ClientProxiedBy: LO2P123CA0048.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600::36) To SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR03MB6360:EE_|BN9PR03MB6027:EE_ X-MS-Office365-Filtering-Correlation-Id: 5094f796-e799-4b1f-b0c4-08dab2801041 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fWyr9+hYLYclK/mh5Crgy7OsQP9xMVHe3gV2guGn8GaAXgheKq8rB2tChqqn2IkC3RZI86PLG5WOOV9Cl7Ge9KR1pCA5CGo48RjkpVv6BjbpHRZlBKENeGroaI4vzkdR4afinJn/gWJko7fAcwS1zpBjNIM/7VvbngkThNxGomJYCy62L3vCQrRHds36NxI1i2vA+yFAZrFW3DV4PdIdg8DXRoUn+mGrSLbV46AVh/x8SHKhpou5djLm/eQPcgNA07puUJ0ZNcV3KEyh1hT7U7bupserpT8dK91jRPkPbQednhITIVhyT3rx7mGh3Y57BDBIlQuy/Q8HLGW7ZgjAVP1ArrgTYDsEpNtVkw/HfbX3iOIQlrrEm3+c7CEf/3rRArIVQ4aERKSTf/nJy6aXtFPNVnrnA907kDS3NF5hI//Zw7yN0iXpBTrFqGCsILHyGHNKqNUnzqOJX6spO5JcMNOs5NKhGx52epGKuGSocjrg+EWFOD2BZBScnCHNSRzTGUb93ZYO4P1q9Ha5uYbshMolSdW5q9Pb39iJAKU7MzWEmRB+1TinXoR2AVBzROHr0gc6hmiT34l3/6+Z2QMfM1mW2Xj3JgMBwdFbM+Ua3LwQEBTwF47bZNs1gHZ28PCZT2pFb31ZAUmmYuNjNvcDc18hWOzxGqXxiwHE+d/mPEbciUhqs3ImV0zbNnmcDOuoKInSusv56DhFWAgXchOJ8A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR03MB6360.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(396003)(366004)(376002)(346002)(451199015)(316002)(54906003)(6916009)(6506007)(186003)(36756003)(2906002)(41300700001)(1076003)(2616005)(4744005)(6512007)(5660300002)(83380400001)(8936002)(26005)(6666004)(8676002)(86362001)(66946007)(66556008)(66476007)(4326008)(107886003)(38100700002)(82960400001)(478600001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Kr8jzl1VCVXva2ESAIfXmo3Ojvv5?= =?utf-8?q?GQ4wpf5U8BmfHyU9LUGI2cv6kQrMfRgr43KJ1Jud8u0IdLQe4LKS0bZ72XkCVS5IV?= =?utf-8?q?s7gqv3qxbfbaSP0BQs8EUiaInpfu6VJsUnHKNW8jcUXJY+QbW+TcqHKt/FMezjlwX?= =?utf-8?q?j8uQmog6VBSy7bG4y8YGf4zFXnY11ooSqxmrp4j4Vp3sJQb7Svi1mbn35b5GCdfqS?= =?utf-8?q?U4Bx6btJwjpwcUN5X5hKvGAyf1fsDtsw3YJRZTA4NS2gMJCLuU3lg9hYKBEBrMmh/?= =?utf-8?q?zmVURTykVMVvvMPkxMSXf9OGLpRwTYtZMTn1XKLqob0v0jKCQWqWlEt4/L6D9tfFM?= =?utf-8?q?6frHgD6GyPfVYog02UFGZo1TAxPKVe/nDaigJ8Xrmsc4ouWLeBHr7Ji74ez+OvCOa?= =?utf-8?q?t1Pjt8ZVh0PkS4Asc/QGulAGHGD285vEyJP3e8YB7LyIIE74I8zY44Eb/GaXUrlqb?= =?utf-8?q?gZgtjT+BvSmCIXZrLNSf1uz728Q5z7HCEO4q65zKbyjaE2d9Hl6CDNWm9Jc+axwFX?= =?utf-8?q?oybwkoNJ3krDxrT8p34I6KCg4EEhgsh8NgxXd4O0LvZEc3qY4dB+JdfQDjrRBfXIc?= =?utf-8?q?wwtsEC7V0EkGOrbycb5dEoCXvIYxMYnD7cd8nQwC93nh4BQoJRt2ZtGQfDeg8ugRP?= =?utf-8?q?yD7kd7VHWIUdT77knatJNeuF+SwMFVIdzdOTcrTcNFatZ0GuPtWZXVa3GijHsuurQ?= =?utf-8?q?3zDC9sWDo2IdJ5oysrPBy3L/jkp16F9QP9L8MQVhmOTzNnRBygMwIMN4TOfFeIyrH?= =?utf-8?q?Wi/wsFAfLTsn2U4BzXkHwf1TKw4QqmhA0tzmn6v81QiWL0Fc3Pblx2zDx2lhVT9ec?= =?utf-8?q?yJm5/cYaOMDCjN2FgoJFHnM6+eBs/BjiAvV/1V4E+ihS2SP+xoo5b0Dv5COpRte3a?= =?utf-8?q?vmzuiB4xHsg1l5iYechw1Tzrbk+Y8cpnet1TsazygIM1lCi2u/dy7TahhROgTBwJv?= =?utf-8?q?zdLlL/CiOcIFjfktuu1+QEkySSdln2QH1HwJIxfU7yF+ZR0T7n1h7LwMJMnqfW+d/?= =?utf-8?q?4fl+fWm/Q77+QhUEBUNwsqSfNYpjZ5RY4afXenS9Dhb9SMPyUzj4KZGXL1kdnOGhn?= =?utf-8?q?DFL6S4zb/OkJgV/h5fBZA6T8DToMQVHs3TgJbxE8FO0ulYsxP/L67i3T9qmiIF4o6?= =?utf-8?q?qLZ6/0DJo0iKF8ldFE8CHL3NXhUUgEQfk339MxmPez2bJcy6H94WUOwW0U5sIW/Yx?= =?utf-8?q?7ftEp9MkrFPBcyb8SXBfz5eTtZGQEzV7UPcQkCFOOhBAQT4VedsF1pOdVrcC9eIjl?= =?utf-8?q?rQckkwW5TOsY9CKSDtyrNgj8muROIpGG4Tcn3mvUcZ1+1UvF1LplLueeMZTD377O/?= =?utf-8?q?Y3abUBxF6GYJFItlnBsc/nzVyST/T/Kw1J49QRQLbIeqvZaRwHnGT/QaCLt/Q6nTN?= =?utf-8?q?OYfcwT3YGRE8fyhxH+haj0Kmb63dPYF+irOr8xPcm5BsuwFwUAQHp/nVOW5Z7SJce?= =?utf-8?q?BJgUdtVrMXycARpcijB/EGicyJm3oNUjX4IpwANsmpQV1wOdhkHpE/XUJNah1rAeU?= =?utf-8?q?Ajq49/hip0AH?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5094f796-e799-4b1f-b0c4-08dab2801041 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB6360.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 09:47:12.5598 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zNrWa3syDppKynSHPDi47cp01up5rWLVhFwbjZtfjn7QmYftG07CeO4dzE4GYvYLjC5k+qyU4TVHt7NvtB5hIQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR03MB6027 Some vpci functions got the cfcheck attribute added, but that's not defined in the user-space test harness, so add a dummy define in order for the harness to build. Fixes: 4ed7d5525f ('xen/vpci: CFI hardening') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Acked-by: Anthony PERARD --- tools/tests/vpci/emul.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/tests/vpci/emul.h b/tools/tests/vpci/emul.h index 2e1d3057c9..386b15eb86 100644 --- a/tools/tests/vpci/emul.h +++ b/tools/tests/vpci/emul.h @@ -37,6 +37,7 @@ #define prefetch(x) __builtin_prefetch(x) #define ASSERT(x) assert(x) #define __must_check __attribute__((__warn_unused_result__)) +#define cf_check #include "list.h" From patchwork Thu Oct 20 09:46:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13012931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A9443C433FE for ; Thu, 20 Oct 2022 09:47:40 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.426330.674705 (Exim 4.92) (envelope-from ) id 1olS97-0001fa-ES; Thu, 20 Oct 2022 09:47:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 426330.674705; Thu, 20 Oct 2022 09:47:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olS97-0001fT-BS; Thu, 20 Oct 2022 09:47:25 +0000 Received: by outflank-mailman (input) for mailman id 426330; Thu, 20 Oct 2022 09:47:24 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olS95-0001OM-Sc for xen-devel@lists.xenproject.org; Thu, 20 Oct 2022 09:47:23 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 310f8e5b-505c-11ed-91b5-6bf2151ebd3b; Thu, 20 Oct 2022 11:47:22 +0200 (CEST) Received: from mail-sn1anam02lp2049.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.57.49]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 20 Oct 2022 05:47:20 -0400 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) by BN9PR03MB6027.namprd03.prod.outlook.com (2603:10b6:408:118::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31; Thu, 20 Oct 2022 09:47:17 +0000 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254]) by SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254%3]) with mapi id 15.20.5723.034; Thu, 20 Oct 2022 09:47:17 +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: 310f8e5b-505c-11ed-91b5-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1666259242; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=QkS8LmF8sq5TWLGpZ9BwE7SA8QxQS8KMGl/B93RqDpo=; b=FVXwRsZccfOBim01fYO9lK7FI9LFmLIlJErQMnlHWkz+3fSx/7ojCkCT CEawNYPIWe8odwMBh5Isos+F08kgcAHWfxAc4geBQvs1XG67GdMfZBYYc RTszJO/FakzvOEJ4fy4VdtjHz3D+zs/QKeYRgEtykYWIj1VFiVV6Jl9x+ g=; X-IronPort-RemoteIP: 104.47.57.49 X-IronPort-MID: 83565863 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:+6RAi6y20m/RSUo74j56t+c5xyrEfRIJ4+MujC+fZmUNrF6WrkVRy mpMXmuEMv+LMzbyc9B/ao+/o09QsZLXmN9kHlFtryAxQypGp/SeCIXCJC8cHc8wwu7rFxs7s ppEOrEsCOhuExcwcz/0auCJQUFUjP3OHPykYAL9EngZbRd+Tys8gg5Ulec8g4p56fC0GArIs t7pyyHlEAbNNwVcbyRFtspvlDs15K6o4WtC5gRnDRx2lAS2e0c9Xcp3yZ6ZdxMUcqEMdsamS uDKyq2O/2+x13/B3fv8z94X2mVTKlLjFVDmZkh+AsBOsTAbzsAG6Y4pNeJ0VKtio27hc+ada jl6ncfYpQ8BZsUgkQmGOvVSO3kW0aZuoNcrLZUj2CA6IoKvn3bEmp1T4E8K0YIw9vkoJEZ39 uMhLzEQPjCqrbq/mfG0Rbw57igjBJGD0II3nFhFlWucNtB/BJfJTuPN+MNS2yo2ioZWB/HCa sEFaD1pKhPdfxlIPVRRA5U79AuqriCnL3sE9xTI+uxrsgA/zyQouFTpGMDSddGQA91cg26Tp 37c/nS/CRYfXDCa4Wreryzx1rGU9c/9cMENOPrj8r1RvG3N9FNKKloRcgS9//bs3yZSXPoac ST44BEGvaU0sUCmUNT5dxm5u2Kf+A4RXcJKFO834x3LzbDbiy6GAkAUQzgHb8Yp3PLaXhQv3 16N2sjvXDVpubjNE3aFrO/I/HW1JDQfKnIEaWkcVwwZ7tL/oYY1yBXSUtJkF63zhdrwcd3t/ w23QOEFr+17paY2O2+TpDgrXxrESkD1czMI IronPort-HdrOrdr: A9a23:Q8pEvKP9U+Lgh8BcT1r155DYdb4zR+YMi2TDiHoddfUFSKalfp 6V98jztSWatN/eYgBDpTnmAtj7fZq8z+8P3WB1B9uftWbdyQ+Vxe1ZjbcKhgeQYhEWldQtqp uIDZIOb+EYZGIS5aia3OD7KadZ/DDuytHVuQ609QYJcegFUdAC0+8vYTzrb3GeCTM2c6YRJd 653I5qtjCgcXMYYoCSAWQEZfHKo5numIj9aRALKhY74E3W5AnYoILSIly95FMzQjlPybAt/S zslBH43Lyqt7WexgXH32HewpxKkJ/Ky8dFBuaLls8JQw+cwzqAVcBEYfmvrTo1qOag5BIDl8 TNmQ4pO4BJ53bYbgiO0G7Q8jil9Axrx27pyFeej3emi9f+XigGB81Igp8cWgfF6mI71esMnJ 5j7ia8jd56HBnAlCPy65zjTBdxjHe5pnIkjKo6k2Ffa40Dc7VcxLZvsX+9KK1wUh4S1bpXUd WHVKrnlbZrmBKhHjrkV1BUsZORti9ZJGbEfqAA0vbloQS+0koJjXfw//Zv7kvoxKhNNaWs2N 60Q5iA7Is+KPP+TZgNcNvpEvHHfVDlcFbrDF+4B2jBOeUuB0/twqSHk4ndotvaM6A18A== X-IronPort-AV: E=Sophos;i="5.95,198,1661832000"; d="scan'208";a="83565863" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FN0k2f0SLt+yLEzYvl0FcivMxOLn9YFP+fUBcFXm4BZ7+UjGHR5zOhDuzINvW56WbYhV7tjUMzt9nAOkuNjCr/uPtktUT76iHFZez7AVnilmS2FfaCQzR6OcMtMK3KWy5Fl2nFACYgvDnbWDMPkcEdgQg1lC52KYJ3PS5iFpeC5NVdCBua0Re2+UniEf6HRzAWRqfgPPEF7uI0JIH3RZULWgGhJ42nQK3m2Zllxnf5NeaiUgF2FS6Gu1Ssrx6I/V314N3vNK8fAQTOnKSlHZcv98wmlt4wNRedehFxGX5oQSdirpiteaBzGqLDjBWb/YZ4LYzPWpiU2g0zdwXW6btQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=c55b8Y3FjLXBmFEK2e5vgOav21j93/W+nW7shNB4ico=; b=BZWSDVUQtLN/IGapOPy0aPwsHHx98HU6Oz1RA5CjdFfBe0btMVQY3m1ZCr5vchD//1eydWM8sAt9qP483ILCn1nbgUrjlM4gxFoVmQdiy4gPxPYJrFif9sWTAiNdkZx8bYEyxeJf/8jXAoAlLiTOC4HNxlj6DjvsoX+/ykvl9RoPV3FJJSzNcGMHy5pzkGtlwOm00v43x15fEhtprMZv0pED4U8R1wTq0IKP5bxVBwy5bT9shtSjW+wPBGcSKxscpIhKungsf2TZuaKHKDM+0Ampm0SxM7tALbHscypguXf+7MiJpdOx2bHfcQMP2nNHPUCDjxeVe4HfXdoj+t0T+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=c55b8Y3FjLXBmFEK2e5vgOav21j93/W+nW7shNB4ico=; b=TMkSEZ7HbEsEYS4WWlKyZvwqRIRTjidz0QwrWSU+hfF2uWT9xzdfcueDr9pPGdMcsyeyB7Fm1Y/u23zgdJzNR6hh8u+oDBfxNACXViXE5Ipxp4MJZ6ecTW5cSIATELIO5FP0gGUdygvUC+O4tLIfF9wUPI6QAowGlmlLsywM4Iw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Wei Liu , Anthony PERARD Subject: [PATCH for-4.17 2/6] test/vpci: fix vPCI test harness to provide pci_get_pdev() Date: Thu, 20 Oct 2022 11:46:45 +0200 Message-Id: <20221020094649.28667-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221020094649.28667-1-roger.pau@citrix.com> References: <20221020094649.28667-1-roger.pau@citrix.com> X-ClientProxiedBy: LO2P265CA0129.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9f::21) To SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR03MB6360:EE_|BN9PR03MB6027:EE_ X-MS-Office365-Filtering-Correlation-Id: b946d289-54f6-499c-2921-08dab2801363 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LPrOBerhvRfX8ELjtef5u+RS3zO56K5+LchbSJ1ERN88/SPq6BhqvscIGigf7TwHVWzaqSl3GqP3Et/8T3KyCnKFrw+jQty5Z+XklESexvIZacM9FVa4jJQ/MB3vrs2KUioRC9aOijK0LeYoVFQDW/9E70I/UrPY71BIDTWIH3O515sSUxlq5v/sapIFH8imm298ne+HOB/Hrtiwoxhxhb6pVbqW439Jy2LM0Lxvkx9JSspqJmeKwg+/uSwgh50qCg1qy5+rA0/aLtxuEbnR/hSpLl6KoHO/y3++Q0r3/6KNxBQd2a7cZ36Gls+FoZIRaEdvIHvgZYh9x5GLATOCVPzITZx0UaZQCMrgNilMHxLuQexzaKHbocV3GTNzzXvgoBxGgnj+sW8FhNpHD6ARSc8dxX5G0T8s3irwZ9c+pbzc16dXkKMOFa5wiQyFzqrixUrTiIurOs1YHjdvKE0LnwnJFwzmcABEICVEJDxR/C4HVu7L+XI/99N5XPpuyTowerugJmZNSKsVy0pDGRuAmPZHjumQjFcJTDMKv/4TuBEbfN3UeZWsplkzF4nWTqMJGSo89lOAN88mRizF4wBzUCJiZAZ/TnNBDybKCED6tis8XsW1vJT4Fi6oha8I7cAHSk+tT5SwCP8qioS61rDLMpIoYwxfHp6c9BgXVFgmJ81FKcvvfNrpwKQlpfDoVkl7oTwpvTH43GgGb6prWi1J6g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR03MB6360.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(396003)(366004)(376002)(346002)(451199015)(316002)(54906003)(6916009)(6506007)(186003)(36756003)(2906002)(41300700001)(1076003)(2616005)(4744005)(6512007)(5660300002)(83380400001)(8936002)(26005)(6666004)(8676002)(86362001)(66946007)(66556008)(66476007)(4326008)(107886003)(38100700002)(82960400001)(478600001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?SMvnCT77ZtG4RvjJaCuOl1Fo4pw2?= =?utf-8?q?kay9s25CURvyanZhLzdvvrjdx0w68PX75nL9LQEsh0FFwYKFaVWzVdqGFaFWSdPNI?= =?utf-8?q?bdEL2+w/TmfJLhr2SjxKwLp1JhKPiR9ylR5eK2jhHECr9c8z+lDV496inOuZXeMJC?= =?utf-8?q?EddxsgouXkgaEdzhH/dKHNUYg2Zgtmhzbu2FBXuGMTltcb4ok0XFvVF5EKFY4YFmm?= =?utf-8?q?wmPzRn4UKh5OyXtu9T+1s2U/nILey73ncWIAS8ND2Ft82/YqHzd79TEVCRUQy1JQc?= =?utf-8?q?v4nK+3A2oSJeAxAPqNOeVnOCWAX2pmaW6SnikH+ChrOh/UzNYhyYMSnEhhtgwQEIO?= =?utf-8?q?xO8yNrAUKH2gJzeOCiygJEiN2G8PxmoS+eGYQfvQxWATlfggVqzNjLYj979RITvIC?= =?utf-8?q?uJCnGpydV+TWgaoeGsUSQkJJB5JsVuDnfBPC3ZW4pXYDPLokjaXtJq0rkh/L+QULP?= =?utf-8?q?cNrSfMA9dv+cpNuTubEu+PiWEolKvMSZzeRb501u2V6MIhs8Nuxk/a6WtGeuNLxWv?= =?utf-8?q?kWbYndYHbfXNciK8vswiVKFKPfTps33kU1TIckYQdnW99/qmUXAHqQSQ3uPGHMAjl?= =?utf-8?q?W2M8g4SJW2lcu5KGV89lgKi1uuGEdHpKldNIu0rkREJN6fOKbiq0FLZMSpXqdxNWy?= =?utf-8?q?HQ1dc0XuCUiCrMJN3Eojs3ch4NqJ2BPAr67WeDBpILJ4KOBl09dp2H6EhzLIJSM9r?= =?utf-8?q?wMkurxC4pk9YwgvxjYZM4kpVql2QNdcFLUC3Gp9UCosxaRCLq/Zgst758d14MCzfY?= =?utf-8?q?PnLUPAikTt4jkS4H6HsF8JM7e5f9SdQuLcAIklVVXYJ5u8SasHRD2lXamgb7CUSJn?= =?utf-8?q?qV8F3dJZ0mNd27zn/aC0BSYOf2JA0yfFk0eMvc9rt+/vjuqmqWm1nxNZ0dh96wHaJ?= =?utf-8?q?oF/2VBPDZMOOzSjpqft2wd7PZ9j3jQwlkebTiWIzMaiRXr/Gn05qbz1tbTwKAOfKH?= =?utf-8?q?8VAY3vLSyr5vXevwT+1XpTkla2NEe0ygy/BAfpkZPRKrIrojgLoDSb98X79pf/ObN?= =?utf-8?q?WfEt+ktFzxTaegw+NnnfMmtyjKBSm4klOCHaHBu3eMHia8Z8jf58xtaljGF4l2JMz?= =?utf-8?q?x0xtQHP1L4jXMp1UvD9ucv74e033G7a964TX3jBqsCbwSiCNvLyQzDKzsfym9z7m3?= =?utf-8?q?oT0t4N6RlGu4HuJUqHOaOutq9pwGk4aK0un69r43SdTYJsgkNNDeQD/8bTD31aIju?= =?utf-8?q?irY+5vjaHDWYyEXEN0Q6P1z/0ek6awwSg8ZI+Z0CHkMEaBGxssSaMvdF4GLfr49H9?= =?utf-8?q?tpie5hhIiWEMF5ScB6kdAzLvnZzcbFwLpxHQ8FVEXNQ4+OPHJ+n3M1lPNNLTSD/9U?= =?utf-8?q?AT5J2OMs14YTeVn5M6VCa5AlP9jaR4LT8Tpw50kE4hYh5eq2gGe0hseBJ5Ydb9ZXh?= =?utf-8?q?bCqSc4LmJ5t72IMMYkM5zXTyPitxuzJMHEQy1/EQCRoyl3GzFBWvyiy2Ca9ahzdEe?= =?utf-8?q?aiyWRUzy66DkU66h2YsqjxWZ894fxYEyedGVeV6cSnAmrtu7Mg3FnE2H+uuayPnQy?= =?utf-8?q?ayOfNuUV04zl?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: b946d289-54f6-499c-2921-08dab2801363 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB6360.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 09:47:17.8419 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8WcJTDQp2pBbNm5ANZnAyQ0wsBzAkhlGSfiohPMfyrVVRrtR6AUiVjN6zu2Hr8nyuCWlBo1uWUwXde1ukR2jPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR03MB6027 Instead of pci_get_pdev_by_domain(), which is no longer present in the hypervisor. While there add parentheses around the define value. Fixes: a37f9ea7a6 ('PCI: fold pci_get_pdev{,_by_domain}()') Signed-off-by: Roger Pau Monné Acked-by: Anthony PERARD --- tools/tests/vpci/emul.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/vpci/emul.h b/tools/tests/vpci/emul.h index 386b15eb86..f03e3a56d1 100644 --- a/tools/tests/vpci/emul.h +++ b/tools/tests/vpci/emul.h @@ -92,7 +92,7 @@ typedef union { #define xmalloc(type) ((type *)malloc(sizeof(type))) #define xfree(p) free(p) -#define pci_get_pdev_by_domain(...) &test_pdev +#define pci_get_pdev(...) (&test_pdev) #define pci_get_ro_map(...) NULL #define test_bit(...) false From patchwork Thu Oct 20 09:46:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13012933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DA7CFC4321E for ; Thu, 20 Oct 2022 09:47:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.426331.674716 (Exim 4.92) (envelope-from ) id 1olS9A-0001xz-Mx; Thu, 20 Oct 2022 09:47:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 426331.674716; Thu, 20 Oct 2022 09:47: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 1olS9A-0001xq-Js; Thu, 20 Oct 2022 09:47:28 +0000 Received: by outflank-mailman (input) for mailman id 426331; Thu, 20 Oct 2022 09:47:27 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olS99-0001OM-A5 for xen-devel@lists.xenproject.org; Thu, 20 Oct 2022 09:47:27 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 33ca61dd-505c-11ed-91b5-6bf2151ebd3b; Thu, 20 Oct 2022 11:47:25 +0200 (CEST) Received: from mail-sn1anam02lp2049.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.57.49]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 20 Oct 2022 05:47:25 -0400 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) by BN9PR03MB6027.namprd03.prod.outlook.com (2603:10b6:408:118::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31; Thu, 20 Oct 2022 09:47:23 +0000 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254]) by SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254%3]) with mapi id 15.20.5723.034; Thu, 20 Oct 2022 09:47:23 +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: 33ca61dd-505c-11ed-91b5-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1666259245; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=QaWL9ZH+AlYfB57gC9TTJMbJfyVyxNkJBtusLwT0/kY=; b=G7O6tOvScYEECQCUwIalDplOWJOISIN3OEjBLLIdmXqgcCYQQDCbYAF4 bfzzqkG2ORI6vLIDV1fQbWrWI87tD9HhwdJXC07WdyBBPWlmIQlgWH1/L PSH1vYeKXETYKP+a4sZyH+4CvKdvmZMiJUA4N2RbY+/WNZgBgYAc+v+6+ M=; X-IronPort-RemoteIP: 104.47.57.49 X-IronPort-MID: 83565866 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:lkx/z6JoCmKKfgjdFE+Rq5QlxSXFcZb7ZxGr2PjKsXjdYENS3mQGy 2JJXGuDMquNZmH9eopwbY208R4AucTdnNZnSwRlqX01Q3x08seUXt7xwmUcnc+xBpaaEB84t ZV2hv3odp1coqr0/0/1WlTZhSAgk/vOHtIQMcacUghpXwhoVSw9vhxqnu89k+ZAjMOwRgiAo rsemeWGULOe82MyYz98B56r8ks15q2q4mtA5zTSWNgQ1LPgvyhNZH4gDfnZw0vQGuF8AuO8T uDf+7C1lkuxE8AFU47Nfh7TKyXmc5aKVeS8oiM+t5uK23CukhcawKcjXMfwXG8M49m/c3Kd/ /0W3XC4YV9B0qQhA43xWTEAe811FfUuFLMqvRFTGCFcpqHLWyKE/hlgMK05FaYZ/vkpHzx3z qE/BDZXYDKel8e3zL3uH4GAhux7RCXqFKU2nyk6iAr/VLMhS52FRLjW79hF2jt2ntpJAfvVe 8seb3xocQjEZBpMfFwQDfrSns/x3iW5L2Ie9Q3T+ftfD2v7lWSd1JD3N9XYYJqSTNh9lUeEv GPWuW/+B3n2MfTPkmfbryLy2IcjmwukaNpPGr7/7sVamUGcxUkcKBYyCAG09KzRZkmWHog3x 1Yv0jojq+0++VKmSvH5XgakuziUsxgEQd1SHuYmrgaXxcLpDx2xA2EFSntaboUvssYzHWYuz gXRw4KvAiFzurqIT37b7q2TsT65JSkSKykFeDMASgwGpdLkpenfky7yczqqK4bt5vWdJN066 2niQPQW71nLsfM26g== IronPort-HdrOrdr: A9a23:POP50KlD7TikpDLkIrQHCH8EMgXpDfO3imdD5ihNYBxZY6Wkfp +V8cjzhCWftN9OYhodcLC7V5Voj0msl6KdhrNhR4tKPTOWw1dASbsP0WKM+UyFJ8STzI5gPO JbAtFD4b7LfCdHZLjBkW6F+r8bqbHokZxAx92ut0uFJTsaF52IhD0JbzpzfHcGJzWvUvECZe ehD4d81kydUEVSSv7+KmgOXuDFqdGOvJX6YSQeDxpizAWVlzun5JPzDhDdh34lInty6IZn1V KAvx3y562lvf3+4hjA11XL55ATvNf60NNMCOGFl8BQADTxjQSDYphnRtS5zXkIidDqzGxvvM jHoh8mMcg2w3TNflutqR+o4AXk2CZG0Q6W9XaoxV/Y5eDpTjMzDMRMwahDdAHC1kYmtNZglI pWwmOwrfNsfF/9tRW4w+KNewBhl0Kyr3Znu/UUlWZjXYwXb6IUhZAD/XlSDIwLEEvBmc0a+d FVfY/hDcttABKnhyizhBgu/DXsZAV4Iv6+eDlMhiTPuAIm30yQzCMjtb4idzk7hdAAoqJ/lp T525RT5c9zp/AtHNNA7Z86MK2K40z2MGbx2TGpUCPaPZBCHU7xgLjKx5hwzN2WWfUzvegPcd L6IRhliVI= X-IronPort-AV: E=Sophos;i="5.95,198,1661832000"; d="scan'208";a="83565866" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XFLiqwF97r76+iujKXTPn0bxpXq49FfqTelivfw7CL2t22ZS3MPPuxK7YAA+lHSUFjb+jM9ZZWqvpBvaHhnj3wTZFTp2BjkGTfugqYVXzj0tm8pXGUtnng9My4a1/rQN/uql2boYFVz71WSufGGW9cHtE6r9jFkEfW0xvsDpAx25KrcOMERNTGfs9lzhgOR6j6U2Y+nbtrufeaEhV96HSkcyiUoohf/nOnN7cO8OOYM+u8Qda/O8aOSfuRo+A2BypKN21UMIwK20vJM2HhdZ4shznSaHCX7H8sUId0oapvhh8f0pK+PPZAPt+qtijC9UlTyRzwTg0u/STPp2KNZsiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SYCSSJNqrhzg2jhEg2bewEOFbQS4tBVFIatzBZKv8Rw=; b=XPioA4wE6GNz6TDoJIP4UU1vZay1gIhwQi20bph8EaUHIggHloBrf4mbUZ0TsMHYObcRYj8KSsn5HMSXvPviNnuQqgSK592KO1YCPQnIK613PCFjRdCgOz/DUKDWWs3C1vcNmW/30vxJxYO4jJmiIL7Llfp63QAxglCv0BrX4ZdyYdfkhRJ8VAJBTsY2ObWwEjtx+Xh8lBxoBmki0KQr5V8BBmTsgDM4YROdY0L5DVPxolVtV+E55vyFHTsiMUI844F28fYv4xFTci2ZIyDZgTAgGNvwfmLnuVXrhIwnOIt2ilMdJGAoUFTXVSZWTgzLlX/C0gSsKUGqSWovirpHtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SYCSSJNqrhzg2jhEg2bewEOFbQS4tBVFIatzBZKv8Rw=; b=l+DgvREwbBU6/NpEIlRSDA2L9Wt9P6JbtL3BMjba9Dxa2YLmycWyDYW6Ep3EWup113p5imaRyjWjBQTh05yJYJMV1Buz+lsBcWys+zDRnWLvU6EKTO824klAGEOzWbedj9YJe/tRXt5WeGkBfEtGqqm7ayMG9swxuJW54P7DPpQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [PATCH for-4.17 3/6] vpci: don't assume that vpci per-device data exists unconditionally Date: Thu, 20 Oct 2022 11:46:46 +0200 Message-Id: <20221020094649.28667-4-roger.pau@citrix.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221020094649.28667-1-roger.pau@citrix.com> References: <20221020094649.28667-1-roger.pau@citrix.com> X-ClientProxiedBy: LO4P123CA0670.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:351::16) To SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR03MB6360:EE_|BN9PR03MB6027:EE_ X-MS-Office365-Filtering-Correlation-Id: 11ec937f-f5d4-4542-000a-08dab2801680 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tv/SyzQeRxu/R2Ber9AaOVw41H8SEKQk4zMR3auy+FDhy3HTxycFwa5cRP9kGzPsFUs2hQcyMUqnn41ZUvo48un1Lh5BpdQwvmPm8lapLgA6HGP5syVr0lzm9u2Ibf6nN9Bj6gYQihhwfz435uPvhnEcWPlDxu+4q1z4BFff/C22znLVqOWi41Chbnss9FGiNlB+g58Y5spuLmaVIlfX68Zz0NItD/c53sZ3D1uQtkEY2GOxhrU9ZQlHkHs8db2N2pK2sFcxkacyZDU6d8+fkiIGriMU82Kv+CPBTa3FFtJ5vJzvCFJx2Bz3tSxXOuKNb4R1ht8n2Un2PP/1DkF9Ta2Fg58m1q6KuHr/rdFGHozcs/uJLnzmISZGsONFGqUyOwNRq7586Iv2/iRIBmkyy42Bya3qst7JWKqTSPUUdoLZGndDbO23HghplTNaG7zdtjkT/S9cgXxjTX48qGzuvzLBMj9fgv1GCVit6RrBGrbZugS9RlhzwNIDfLXlqAsiIkva5BCW3WzoLrkNKzwdQNDp4csnZ2RV9oPH/RQcLR779ij6jVHDdrN1wLoGHTe7jhQqWRzlbOlbQM7pX+xGc2YkuoR0Tp5a9/XFQvm85gj2iqnM+NU46lV7mOQ2sY+Fb5hadYyKo73Q2Yjnzk6zPd7UN5NiFBjOe5GCSkrUWmlbCloHSi8HF1uEMglmiha53l8MstDoJ+pe7a26/mMcYw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR03MB6360.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(396003)(366004)(376002)(346002)(451199015)(316002)(6916009)(6506007)(186003)(36756003)(2906002)(41300700001)(1076003)(2616005)(6512007)(5660300002)(83380400001)(8936002)(26005)(6666004)(8676002)(86362001)(66946007)(66556008)(66476007)(4326008)(107886003)(38100700002)(82960400001)(478600001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?PO2ai/lgh3CmpDXVgc7rRqd4r+eC?= =?utf-8?q?CI4r3TcIrLPArHaSUF8fTqi6yt3xtTN6LmWHvykcGrZDlBojvnqU8nusXbYhgzHvN?= =?utf-8?q?fv7HNhefJOs+ON7GB3fR78fjGPP9vCZ7RIEKfimDWL6mLNoE5LPILzkUKMnvAJNwr?= =?utf-8?q?/+4G5cVsGed9Jxfu1DFEv1mUToVjJWsPhY64xTaU2oRY5Dzz4jr91zarheg1ZN7s1?= =?utf-8?q?ZzkLesNG7x1vKFoRuZ5xPch/fddBiFqThJ8V8LEggFo7AvSkQ9mMGwG+Qv6XQCOqu?= =?utf-8?q?cF77VVYijV+6jkVZcmn/jiza2pD1igKT8nyfo3GSRRLg+cb0aQnhPYIV3nDkJbi2f?= =?utf-8?q?4cP7CCA+CGzB5Fi2b7Gkx6uimY4tFqlvm47HnRmP/vYvtuNM+6E/gfa8UlVoRJvYL?= =?utf-8?q?HyEavg35q02UVixbth7h+oBoon30Dpvf+Q0BG8BHJe7a7xJvCo19qAKd86OoNoDYd?= =?utf-8?q?EeFV6oZSpqu+5nzLnWYdtWNSnBz3be140VuWZnMDZu3LNpxY/BJzqFiEUMpDawgkZ?= =?utf-8?q?PjsK1rKL3iFcLMhJAb+jy+dbppMbL9yauL9KRykOBs6WGv5S4ueva+7BjQXOtDGUk?= =?utf-8?q?pno3Oe0Db2hmUjEghU6cXj8NzOhk5muSfdTUmH+EbmAVRc2y6SGK/Ri1TRBhBDMxL?= =?utf-8?q?3CzKShHRiGv6sfHD+ZFPqBD5Lt0H1MzSmB4/IFdRIJ8cRg3C/kG58rV4RPnd48HyM?= =?utf-8?q?7EtXcggO4WdU4ux5PiprjXFzKVdeBEIX/hdpfucr5A9R9zKYjH5U6qrZQSzm4/zCU?= =?utf-8?q?cj4jEsroGVI83roJE1aMAuJgk5cYS5LTMhidaY79FDcRtEzIZk9gWvNeJeDZ/k4PN?= =?utf-8?q?K2R8Stq3GGPnLzTurXaojA9GkpKxY2f+tOGQFJSSo73zaECiLwxX/fabk3yXFNFRb?= =?utf-8?q?SdT/ix0Sco/WAWW3/1l6k7QRGUU0IEGUBS04QgXAXV9rmwFM+v1FwogkptKSoQHuf?= =?utf-8?q?iKmDCt2j2FpjCE8LDLjoeTURpUPQFgxpYzXayj9GwH931JU6sWCon6cYgyPMqHy+y?= =?utf-8?q?s570gBM4FSKeX1/YGsIKs+o31SX+uJf1XOM1+K84ZwYCA2qC9k2yH1+c2nFbL9Tde?= =?utf-8?q?Hb81VhFaAzi2CgQBeMFT1dK+JguKazksy5dfibEsY8WSG1sXzeFGmPvU8EIFQC0+h?= =?utf-8?q?bbE+1eArlyHDqw5DRQI+GOB2mYv2I3otZXYbRwrfxt0CvkhaOcwfbzvtWBUHgz9E/?= =?utf-8?q?deXhkFP1qh7cCmsQQj781IL1sOh4G2Y0MBAXTLLZxYP3sQzJlehqpomBmNz7/hjiB?= =?utf-8?q?AibBIkq7QvjRLadK4zW0RaxZE5eXxzTBn+ftNJOkc8R5u5ByOceSeaBMrXlBgNjZy?= =?utf-8?q?rF/uU8C0s0PLrWJ87fLZXoifYtarJAUoP9RUbOcoGuw6zWQS00yPDg3NrcfGjiMWc?= =?utf-8?q?//Ax9F6UUB/jJR4D0UqZfBtqNMF3eyi/uTN6MskGnGH5pCNn7Rrlmt8YnEv0OkEuM?= =?utf-8?q?l2c2G8TWALzqTt3uw8HQs8w1m/+nvx5cemofz+D7YbCrEe/hiTxn8Wa/oP3nvBYzp?= =?utf-8?q?cUSrcKEzSbvc?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11ec937f-f5d4-4542-000a-08dab2801680 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB6360.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 09:47:23.2047 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nT9vngJV517BOFpx84wI3HHxwz44bQckXOk80yg56jFgVUC41PGWlkpe2hVpjg1lE0pogWX1PuZCWTz3nXB5yg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR03MB6027 It's possible for a device to be assigned to a domain but have no vpci structure if vpci_process_pending() failed and called vpci_remove_device() as a result. The unconditional accesses done by vpci_{read,write}() and vpci_remove_device() to pdev->vpci would then trigger a NULL pointer dereference. Add checks for pdev->vpci presence in the affected functions. Fixes: 9c244fdef7 ('vpci: add header handlers') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/vpci/vpci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c index 3467c0de86..647f7af679 100644 --- a/xen/drivers/vpci/vpci.c +++ b/xen/drivers/vpci/vpci.c @@ -37,7 +37,7 @@ extern vpci_register_init_t *const __end_vpci_array[]; void vpci_remove_device(struct pci_dev *pdev) { - if ( !has_vpci(pdev->domain) ) + if ( !has_vpci(pdev->domain) || !pdev->vpci ) return; spin_lock(&pdev->vpci->lock); @@ -326,7 +326,7 @@ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int size) /* Find the PCI dev matching the address. */ pdev = pci_get_pdev(d, sbdf); - if ( !pdev ) + if ( !pdev || !pdev->vpci ) return vpci_read_hw(sbdf, reg, size); spin_lock(&pdev->vpci->lock); @@ -436,7 +436,7 @@ void vpci_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int size, * Passthrough everything that's not trapped. */ pdev = pci_get_pdev(d, sbdf); - if ( !pdev ) + if ( !pdev || !pdev->vpci ) { vpci_write_hw(sbdf, reg, size, data); return; From patchwork Thu Oct 20 09:46:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13012934 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A1710C43219 for ; Thu, 20 Oct 2022 09:47:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.426332.674727 (Exim 4.92) (envelope-from ) id 1olS9F-0002KG-W3; Thu, 20 Oct 2022 09:47:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 426332.674727; Thu, 20 Oct 2022 09:47:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olS9F-0002K9-Si; Thu, 20 Oct 2022 09:47:33 +0000 Received: by outflank-mailman (input) for mailman id 426332; Thu, 20 Oct 2022 09:47:32 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olS9E-0001OM-9g for xen-devel@lists.xenproject.org; Thu, 20 Oct 2022 09:47:32 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 36ca03f2-505c-11ed-91b5-6bf2151ebd3b; Thu, 20 Oct 2022 11:47:30 +0200 (CEST) Received: from mail-co1nam11lp2168.outbound.protection.outlook.com (HELO NAM11-CO1-obe.outbound.protection.outlook.com) ([104.47.56.168]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 20 Oct 2022 05:47:30 -0400 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) by BN9PR03MB6027.namprd03.prod.outlook.com (2603:10b6:408:118::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.31; Thu, 20 Oct 2022 09:47:28 +0000 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254]) by SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254%3]) with mapi id 15.20.5723.034; Thu, 20 Oct 2022 09:47:28 +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: 36ca03f2-505c-11ed-91b5-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1666259250; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=zhU/cvtVTG1/4sJCeeB/wJONeiOC1F2tMr7LlQSVZm8=; b=HvjoCCAEghT5bIRMmUTqbW7LISMZ5DR9HTO9HG1w71nboM7PQRWhPZbP kELS92xSkgfKrAu/Tj89axsAWBBUjhV6l9lw5RsJ/k0FqZ5QDZbUY6tcr 1XD2Fuwz8rTITr+QOH6hP1H9h9ZMlAPcKfX64yZBop2zabtvj/PUtSVSR o=; X-IronPort-RemoteIP: 104.47.56.168 X-IronPort-MID: 83565871 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:EQJS/K4b1k08hWOIvF9hhgxRtELGchMFZxGqfqrLsTDasY5as4F+v modWj+CMvaKYmH2f99+ad+//EsHu8PdytNgTwZtqHsyHi5G8cbLO4+Ufxz6V8+wwm8vb2o8t plDNYOQRCwQZiWBzvt4GuG59RGQ7YnRGvymTras1hlZHWdMUD0mhQ9oh9k3i4tphcnRKw6Ws Jb5rta31GWNglaYCUpJrfPewP9TlK6q4mlB5gZmPakjUGL2zBH5MrpOfcldEFOgKmVkNrbSb /rOyri/4lTY838FYj9yuu+mGqGiaue60Tmm0hK6aYD76vRxjnVaPpIAHOgdcS9qZwChxLid/ jnvWauYEm/FNoWU8AgUvoIx/ytWZcWq85efSZSzXFD6I+QrvBIAzt03ZHzaM7H09c5oKztAq 8ZfEAk1ZzW7ls7twpmCc9hF05FLwMnDZOvzu1lG5BSAVLMNZsmGRK/Ho9hFwD03m8ZCW+7EY NYUYiZuaxKGZABTPlAQC9Q1m+LAanvXKmUE7g7K4/dppTGNnGSd05C0WDbRUsaNSshP2F6Ru 0rN/njjAwFcP9uaodaA2iL327GSzXyiMG4UPKL/3MRXg2fN/Vc4Cjw/V1mcruKkpGfrDrqzL GRRoELCt5Ma5EGtC9XwQRC8iHqFpQIHHcpdFfUg7wOAwbaS5ByWblXoVRZEYd0i8cQxHDoj0 wbQm8uzXGI/9rqIVXia67GY6yuoPjQYJnMDYilCShYZ597ko8c4iRenostfLZNZR+bdQVnYq w1mZgBn71nPpabnD5mGwG0= IronPort-HdrOrdr: A9a23:uud85ap6qzRjBQVQjMXfHrQaV5uwL9V00zEX/kB9WHVpm5Oj+v xGzc5w6farsl0ssREb9uxo9pPwI080kqQFm7X5XI3SJzUO3VHFEGgM1/qH/9SNIU3DH6tmpN 5dmstFeaLN5CZB/KHHCWCDer5PoeVvsprY/ds2p00dMT2CAJsQijuRZDzrcXGfE2J9dOcE/d enl7x6jgvlXU5SQtWwB3EDUeSGj9rXlKj+aRpDIxI88gGBgR6h9ba/SnGjr18jegIK5Y1n3X nOkgT/6Knmm/anyiXE32uWy5hNgtPuxvZKGcTJoMkILTfHjBquee1aKvS/lQFwhNvqxEchkd HKrRtlF8Nv60nJdmXwmhfp0xmI6kda11bSjXujxVfzq83wQzw3T+Bbg5hCTxff4008+Plhza NixQuixtZqJCKFuB64y8nDVhlsmEbxi2Eli/Qvg3tWVpZbQKNNrLYY4FheHP47bW/HAbgcYa dT5fznlbdrmQvwVQGYgoAv+q3nYp0LJGbIfqBY0fblkAS/nxhCvjklLYIk7zU9HakGOul5Dt T/Q9pVfY51P74rhNpGdYE8qOuMexjwqEH3QRWvCGWiMp07EFTwjLOyyIkJxYiRCe81Jd0J6d /8bG8= X-IronPort-AV: E=Sophos;i="5.95,198,1661832000"; d="scan'208";a="83565871" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RGCC6ZWd2XotCbco2NAAFVjsEK6yOR8geiHqFqm9PLLj9dQ/qH2dBrGgNejOPStM55yUx0p08A2Zx35zK2LKJ17MzxIWdLrqnaSD+3pWbNIvoR6hF+M8zzgFTydVtoznltdvvLJ/f+WkPgSPeBMLKcjn75a3GdTBRnG1vpXTcamjSrodJOKstoWlBI2oXTZ7dfUu23OIOytPOer9TYzl+WtlLLkoy/S8JqwM5lBDoEE+8XleMky7pwi8WkkUgpXr1+0r79McbtgGoXoDzf2ZlyGBPg5buPmaWvp4imG9x11PqWXaO9t58w+7bJzZc/dn6WPPq6kh5IHGs4E7lOcAwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tcNqGycumZluqS1dv81OQzz4p9zUec8vGdrHjobcML0=; b=fu0+v4n25iLXRhQYOYLizZ2ZIk7x9zCHtXyYR4Bpd34cu7hiTncXYtBpt/BVwBe/5lAEUVdJz16TC8ltP8u2xalc6romO8LZewN3A6LpTwG4F6Xp6jTcvUWX56grkaob+oG06t+cls68bq01z3F7z5W+0Jrx94K87rX9hmLAI+XgcDU1AoRGCXtDSF6H/dvTfFVrGHxXXUE5pm8thZPi+2SveavIB+kCRxuIpZoMMqjFZDik6YZ+D7c5O+fQFOadSWBipZiWIuwA2i8vmEdSN/Bmg2ec2Urhpv9JI8KncxmPdE/DHByIA0TWQ0ersD0jNHGsR8hOCcXnfbfcGCMNXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tcNqGycumZluqS1dv81OQzz4p9zUec8vGdrHjobcML0=; b=wiyew6rYX/0calNxVHMkPtpAJZfqga+i0fYoSdFdJvEsGZMOLUD31DHG0m5IXuhO3R5Ppem+W44T5IY9kCBqz0IpEtxi+vVhmXjlcsOEuBqZGSSxGylY6OMEj8OlE40KKMaB69bfBGJzYevOAqOIATFrHJY+9dW4d+aIQfioZMU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [PATCH for-4.17 4/6] vpci: introduce a local vpci_bar variable to modify_decoding() Date: Thu, 20 Oct 2022 11:46:47 +0200 Message-Id: <20221020094649.28667-5-roger.pau@citrix.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221020094649.28667-1-roger.pau@citrix.com> References: <20221020094649.28667-1-roger.pau@citrix.com> X-ClientProxiedBy: LO4P123CA0657.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:316::6) To SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR03MB6360:EE_|BN9PR03MB6027:EE_ X-MS-Office365-Filtering-Correlation-Id: b079895e-1c0c-4144-01ca-08dab2801955 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Husm1w+74Z8vtSAkUXxYbjiwCKvF58/5YtxE1kmZ3zXt/opOkLB1DwwO8APeMDK8hG+7M/CpMtQcsXoxJ9jPMSmStL4Es1MxhsoMSvOnaZ356tRHpJEuzv4dxvpwGekI9ZizoKRaxWTEYUsIHHOJ8pc8h3adiLJzBjYGoG//avFP21SrK0gTlmKoDjfU5xyTSYcNWKOLNDbgaS0KjSKmz79CMvL3ytDLc4sFvd5v8kAT3fYNq2q4y+NyjraxkLa2fcTv5dM0YAr9lXALiE4riZPZqWfhxjQx2MKAymgleAory+FGz0LRSou7Y98CufEjZzM1SeKt1DZ+kY+Nhew3G5iy7OEygKteHtsNi8V83q2ifHlGJGz8aM+Jj8sQV8sbJLnB1Ff7GCWqv1MeYE99MC8k+gIQnimiW5S7Y4DeId0UyOSBkcKOiyRU+suVRkInV9sN4Z3zujk4iMzU1S0NZG3ekWLQwwDWXqUifRf4vAlKXpJa7dKGwG/7IkXbEHEAJT0GFBVeNUODoDzxpNcgSCUBMQg8RbgAOYVXYRwHQjuRvaip/U2MbH8e0VnIm3MIyVaZhfdHNtp3Kw1bpakPCahPn3SigGEFndFvM/PAcD3NZigbWPDbmwOdRw4WtIZ3WZfS2asA+s95t4OTCFKznROWInqLkFx8mWvOmxf78v2P1FJoqfQxHPEoLtv8VNo0RYH1mu4Ax0xO6iZ2llg4Wg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR03MB6360.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(396003)(366004)(376002)(346002)(451199015)(316002)(6916009)(6506007)(186003)(36756003)(2906002)(41300700001)(1076003)(2616005)(6512007)(5660300002)(83380400001)(8936002)(26005)(6666004)(8676002)(86362001)(66946007)(66556008)(66476007)(4326008)(107886003)(38100700002)(82960400001)(478600001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?xmTfKLlANNoOIF4sfEOarMBnXebh?= =?utf-8?q?7j43mQtIzVxgf8mHjcZT2br5rdu84ltAydU2Isybs+JRbyMSYRyTmaHzu+8yUY+cY?= =?utf-8?q?D+FGjlAG65grzU6+H03tR+LUzsIOcelWgs94gdQ53Q+b9CS1lmcTdM+1g6EvInGde?= =?utf-8?q?1p3MyxZxQJrQ7SXfSI4u2um+aHjzKgsgBzWaSTS6t87X6+Gr0Dq3SObFaL5h3673S?= =?utf-8?q?0YQ8jUoQx8OwAtqckq+iwXHa3qW0WCq7GPe3BfF1zcoy+x79d0sZZXNIGfpY5q+1C?= =?utf-8?q?sfeTnduoVvDXijPnR8joe2rWdTlA47K1Zl2OpQsyKb9sREKg5s0uO9K8PJWaYbs80?= =?utf-8?q?oPbNzZs0D8NL+N3JTIRBPcWxEuSD7jfDykRfdlfqa4/kH1NU169PZdwV+Bb2cf45J?= =?utf-8?q?aRo1Di11jadnFayIc8Azy55wt5OMcfWrnxlEU05B6lflEIU5TZEqZnRSebpQqu7oo?= =?utf-8?q?539pLYHH8qtGbjDjih2JvscqnbdqvUBn54xsNSeLvVvLvvD9mZyckikxCKCBidSOW?= =?utf-8?q?2CJ6wzm1XdTzz1d3aDJoJmJ9ZNIMTDZm4Ci5f1GIlDMGVZp9aMZCk9oyOZt5CtQ9h?= =?utf-8?q?5ltg+vtc5W92snu1nr7fQERjU4XLOaDEJfy7pnxyqd2LTtVkktbzZNcuEXKAO0b/w?= =?utf-8?q?CTCpXN3LOrujIstpBd70u3lSHIyo8GOilXHCBMC1FI/ibGjNTLoihFA1ZFmK8CqWT?= =?utf-8?q?n8XxcJqvtzJl67xllBFpAfR1eEfbl4Z3j8j4Mq6NVFbBeU4lT0Mo0ZqStCeNaJgrA?= =?utf-8?q?1FkjzIP2S5d+Am10n3U/lP6WRi+4iHn5d1/VAfeDreVYuaOu8d+ZDqHSZZvUHy7vd?= =?utf-8?q?Q0yjdZMAsZ4bTZN0bRwIBkZUrZHMfJI4JR8A+D0z+5m3ZZf61hpgSUclllABzmBHD?= =?utf-8?q?8carwsxsF+b+44+QpeZZbJqpH5E1W57sd+LestiNx+DHzTjqikrzR64WlOoVLmYLU?= =?utf-8?q?m1KFwiiKzpF/Ly378FFBhOZGjQcMMagO+wtQ/3Tvci7Y/21QrumbElJCvXXPFDsHo?= =?utf-8?q?2YQADBaod+LF5xzwslfdRtwt+Aost+0+qkuqWVlRZzZ/i33ZM0L7CXWquZiyH6yi8?= =?utf-8?q?dso0lL6RIWaebXaqQelEG1LGOoHsx73KsrQseggnt1pWIgSej880C1Jnwb+Td6lFS?= =?utf-8?q?qEH7Xt2GZPVCmWyH25YVGcfHByZMy0ta1cK3AollRhYGwe3iAJElzaUA07Dt2UpIc?= =?utf-8?q?5o5sMGYmmdAerUU215DE5bjzplSVdjBol1FWF4eMtZXwGdU2au6GPw66tX8ejZ0de?= =?utf-8?q?TfUiw3bYpBNFzXP+Eu7Pd9A+AF3b4VVFkEJJ42MpWEG+C2ec8NNIzCQruudArINFD?= =?utf-8?q?yaUCpBMfVM7ntT1JTu0b1nTX0Dgp01nRddc9h7vxECradgKFTzHBEQIH4IS3zjfW8?= =?utf-8?q?9TegUhO0GJgH1TQZJWAPSn0saGypNdiDA4iEy5sAoVSbAl7JPfBVg9jbDW7Nkk5TZ?= =?utf-8?q?MMXkNAQ9vt78InoM5VMkKowp/t/nkIEu1QsCmp0prOmAHUWP297WKNU3Apwi1AB6H?= =?utf-8?q?Yr0pZiLSJxmR?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: b079895e-1c0c-4144-01ca-08dab2801955 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB6360.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 09:47:27.9405 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LzHyw9acq0WVBKaqn3/Rt4UxQ6AyxoymcKHmlAq85Oe5rxHO175byHxv0g61nIEhBaGS2VABoEULLRViFED7lA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR03MB6027 This is done to shorten line length in the function in preparation for adding further usages of the vpci_bar data structure. No functional change. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/drivers/vpci/header.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index a1c928a0d2..eb9219a49a 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -103,24 +103,26 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, for ( i = 0; i < ARRAY_SIZE(header->bars); i++ ) { - if ( !MAPPABLE_BAR(&header->bars[i]) ) + struct vpci_bar *bar = &header->bars[i]; + + if ( !MAPPABLE_BAR(bar) ) continue; - if ( rom_only && header->bars[i].type == VPCI_BAR_ROM ) + if ( rom_only && bar->type == VPCI_BAR_ROM ) { unsigned int rom_pos = (i == PCI_HEADER_NORMAL_NR_BARS) ? PCI_ROM_ADDRESS : PCI_ROM_ADDRESS1; - uint32_t val = header->bars[i].addr | + uint32_t val = bar->addr | (map ? PCI_ROM_ADDRESS_ENABLE : 0); - header->bars[i].enabled = header->rom_enabled = map; + bar->enabled = header->rom_enabled = map; pci_conf_write32(pdev->sbdf, rom_pos, val); return; } if ( !rom_only && - (header->bars[i].type != VPCI_BAR_ROM || header->rom_enabled) ) - header->bars[i].enabled = map; + (bar->type != VPCI_BAR_ROM || header->rom_enabled) ) + bar->enabled = map; } if ( !rom_only ) From patchwork Thu Oct 20 09:46:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13012936 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 74859C4332F for ; Thu, 20 Oct 2022 09:47:55 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.426338.674738 (Exim 4.92) (envelope-from ) id 1olS9Q-00034o-CT; Thu, 20 Oct 2022 09:47:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 426338.674738; Thu, 20 Oct 2022 09:47:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olS9Q-00034F-8U; Thu, 20 Oct 2022 09:47:44 +0000 Received: by outflank-mailman (input) for mailman id 426338; Thu, 20 Oct 2022 09:47:42 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olS9O-0001OM-LX for xen-devel@lists.xenproject.org; Thu, 20 Oct 2022 09:47:42 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3bd0cd0f-505c-11ed-91b5-6bf2151ebd3b; Thu, 20 Oct 2022 11:47:40 +0200 (CEST) Received: from mail-sn1anam02lp2046.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.57.46]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 20 Oct 2022 05:47:35 -0400 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) by DM6PR03MB5003.namprd03.prod.outlook.com (2603:10b6:5:1e7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30; Thu, 20 Oct 2022 09:47:33 +0000 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254]) by SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254%3]) with mapi id 15.20.5723.034; Thu, 20 Oct 2022 09:47: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: 3bd0cd0f-505c-11ed-91b5-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1666259260; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=kAAdyrIBV5b3v2jo4pvSozj+LaxTfiauFnyu5tTM1Vc=; b=WveUFgk3MacFGc9jXE4J8aoR7hOMzlEmZ6xlRJNjPaQVGKA8CLzESx35 +Pds3++lWKX6Mkhd+RAhz8U/UVtLp3HzEF1M5UmbpVQUAK8lkbksQXXMU t8Oiukuq/5SHHRM5gY5o5D9VVW68Yuvdca0G8NuGxMt/Bj26S8k+RdApT c=; X-IronPort-RemoteIP: 104.47.57.46 X-IronPort-MID: 85669458 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:6Qrc/q+z+0uZkUohKUhuDrUDpX+TJUtcMsCJ2f8bNWPcYEJGY0x3z TAWWW7VbqzfN2P2Kdtwa4rnoEpTup/QyINrHFFt+yA8E34SpcT7XtnIdU2Y0wF+jCHgZBk+s 5hBMImowOQcFCK0SsKFa+C5xZVE/fjUAOC6UIYoAwgpLSd8UiAtlBl/rOAwh49skLCRDhiE/ Nj/uKUzAnf8s9JPGj9Suv/rRC9H5qyo4mpA5ARmPJingXeF/5UrJMNHTU2OByOQrrl8RoaSW +vFxbelyWLVlz9F5gSNy+uTnuUiG9Y+DCDW4pZkc/HKbitq/0Te5p0TJvsEAXq7vh3S9zxHJ HehgrTrIeshFvWkdO3wyHC0GQkmVUFN0OevzXRSLaV/ZqAJGpfh66wGMa04AWEX0sxbOzpPr N86EyEuNEuMn+iR5+34WOY506zPLOGzVG8ekldJ6GmDSM0AGNXESaiM4sJE1jAtgMwIBezZe 8cSdTtoalLHfgFLPVAUTpk5mY9EhFGmK2Ee9A3T+PVxvza7IA9ZidABNPLPfdOHX4NNl1uwr WPa5WXpRBodMbRzzBLVryzy17OSzUsXXqoWGYPmz+M33Ge0nEtUSz85bwO5jb6Q3xvWt9V3b hZ8FjAVhbg/8gmnQ8fwWzW8oWWYpVgMVtxICeo45QqRjK3O7G6xBGIJUzpAY9wOr9ItSHoh0 Vrht8vgGDhHoLCTD3WH+d+pQSiaPCEUKSoZY3YNSwIAu4PnuNtr0kyJSct/GqmoiNGzASv33 z2BsCk5gfMUkNIP0KK4u1vAhlpAu6T0c+L83S2PNkrN0++zTNXNi1CAgbQD0ct9EQ== IronPort-HdrOrdr: A9a23:NsT4SqDTjDKO3KTlHeg3sceALOsnbusQ8zAXPh9KJCC9I/bzqy nxpp8mPH/P5wr5lktQ++xoX5PwO080lKQFmrX5WI3PYOCIghrNEGgP1+vfKnjbalTDH41mpN hdmtZFebrN5DFB5K6VgTVQUexQuOVvmJrY+ds2pE0dKD2CBZsQjDuQXW2gYzBLrUR9dOwEPa vZwvACiyureHwRYMj+Ln4ZX9Lbr9mOsJ79exYJCzMu9QHL1FqTmfbHOind+i1bfyJEwL8k/2 SAuwvl5p+7u/X+7hPHzWfc47lfhdOk4NpeA86njNQTN1zX+0+VTbUkf4fHkCE+oemp5lpvuN 7Qoy04N8A20H/VdnHdm2qZ5yDQlBIVr1Pyw16RhnXu5ebjQighNsZHjYVFNjPE9ksJprhHoe 529lPck6ASIQLLnSz76dSNfQptjFCIrX0rlvNWp2BDULEZdKRaoeUkjQ5o+a87bWzHAb0cYa hT5Jm23ocXTbraVQGSgoBX+q3iYpxpdS32AXTruaSuokprdT5CvgklLfck7wc9HaIGOud5Dt v/Q9VVfcl1P6krhIJGdZM8qJiMexvwaCOJFl6uCnLaM4xCE07xivfMkcYIDaeRCdc18Kc= X-IronPort-AV: E=Sophos;i="5.95,198,1661832000"; d="scan'208";a="85669458" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ewCm6bVX+99uBKN8XM7piXtfqoikl5qLfZIyF2++Uo6deKJWtzGTOmigtD0Poz5Q4tmp8R1jXfXazv+YVTI6Bvvtv688SIZQAiBxns2tMJ8ONFi37rKw7eN+tUwzxHDzTUzf+CiB8NVCrehLs1tBjhZQyUt1rVVE/CeF4b4NTIYTTeZa11VyVsfPFv4AjaHunXQmlTuWLFR4/HReaNNaaVdGPGHQEIQPG9P55bRgPfgMywR9a5IeRstha2S29oy48/OTBqmo0iI6ldo1FPfx20DJTys6u+7OO0qwC4ZLN4kN3qxmZw6h+FRzPzbaVZd8DxdJxQp0uoxY+P8Njxdq2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9VZPXsMkn9fam+VCRpitzkT4VDEDmOwmP7P5aKFDPN0=; b=hWOziJ2QIKMOBTjxZ2TIF3ewzHIDw2VxS5P3+wNL9G597BHst7lPh6bNsvjHtWBsfxgpl3AiPXzsR4hrJJTmvbOCr34ea0hco5Aywxqro3vdfsaEMhuW54sIqTlQzK/G7PXnsX/qk/2THLqn14QqCM2nns2KlemaujWf/4Nsyej766wTSkFmU6txBesclrZV9ZvjpVapA/PjuLWVU6H2oEYXb8tUk/E0/MZ8t2blBbkfFIast8Bd9JScrD1rU2+KPQT+bmokOFm80yco+IdnOUI7DGz/2RwycpXHgeh5X4SnRNJ4ozVpBemqrIR+MzSlPzBw2QICJVUl350cDv9dDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9VZPXsMkn9fam+VCRpitzkT4VDEDmOwmP7P5aKFDPN0=; b=hWSnJSh/DUmE0/xyx1yvjg+s4Q5UaiMU6hT+VQoxQb1zJ0I5U8VinqRP8Xv0mFc3m6pvIOKtRMFHcedQi/6WBBVxlwVcKQ2E1G0rM3aUjnDHnaAL27t8vOGmSOHnC3ilKKQUUXwq1Mr6D0i78BkEVlPOI0C0Igly0a+Rn2vJ76U= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Jan Beulich , Paul Durrant Subject: [PATCH for-4.17 5/6] pci: do not disable memory decoding for devices Date: Thu, 20 Oct 2022 11:46:48 +0200 Message-Id: <20221020094649.28667-6-roger.pau@citrix.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221020094649.28667-1-roger.pau@citrix.com> References: <20221020094649.28667-1-roger.pau@citrix.com> X-ClientProxiedBy: LO6P123CA0011.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:338::15) To SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR03MB6360:EE_|DM6PR03MB5003:EE_ X-MS-Office365-Filtering-Correlation-Id: 52381660-6420-42e6-bec5-08dab2801c6b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uyJStD2AI4yE3GZ70vKKl16j59nhd0djgGI06h4MT9GsSnOGny1yIXk8nPHEi04lAoBci8uc08Z1GScLIxWhdVqFJxEvBljgyi6d10qSIt3W3jH4BIVdaVDPDxomu5u1YBaRx63783E1Hs4No90HuADssmY6xBYBRsDuT9b/HPiB3vKWzg4MRBKTKKyuHzPjHVqgrdpPXrI8YKp4yFiPS9r1vN64e3zVfQJC0iKdzD9/FXoouyAFJTyd7uSxzH+aHwyJ5D0GaH10DgFhi4VcLa35SwnsioKrnrzs+rlXLcP0GEov8QldH0Z7MoQDjAbo85nQhrqvhbx7EqKIWJ+CSfKMKBeO8/tDSbiYJ/Hn/O/TMNRFxzfq8r0Rac/om5GA8bBkz5jTyX+eCj8sZx54DjutA/ytggm1MJ3CwinIwTuUZgViJu4BK0PloH8gJ9OYj4WmorkpUEDYnnsw/o4FTJ2zcTM1srWQruWT0fAdAL6wuv/5uqvcjsJ0kprdxfzkrilTZ4fMu4uV5Vj+WsB3vxEkHZlf0UaiAKz7J6FqDAdaGnTrXf2UbzSuna5iQm1/uwf+tuZTaVBCS+bdqfnWqaJkUtohHeHIloK94gcYfru74ez4uJHN9ZCqbyzeO6lVhas4aDjKk6PJKnET6zsra37cBBudgTf6HheaamlPLEbA7J9Uf2FeFWFcg6BbAx/TEu4poK/CjQP9gQpppJqQUA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR03MB6360.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(346002)(396003)(136003)(366004)(376002)(39860400002)(451199015)(6666004)(41300700001)(6512007)(8936002)(6506007)(6486002)(478600001)(54906003)(4326008)(6916009)(8676002)(36756003)(186003)(86362001)(1076003)(66476007)(38100700002)(82960400001)(2616005)(26005)(83380400001)(316002)(66946007)(2906002)(5660300002)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?dMxVR/2aue9R8wFucsBNk/aOII+R?= =?utf-8?q?ZMXaEPi3wcFab3kJ9Qn2idbZjqT5mf99MZ/f7JFXeBRK65Yp71f0jxNjrtdF4vXM1?= =?utf-8?q?20O/7pfbrydQMvkNSPTMRQi4I66faVDN+xb6fhb2xBYsNGDroYPf4ty1hI9W4IpS6?= =?utf-8?q?cis5C7blWnj0Sc58N/3/2xU/0ye2dFLi9Ed1oQ5u5317aLR7oembXoyFbm40l4LUA?= =?utf-8?q?PD1k/56AYaVxHrbZSPoEiZkCkbF8i1lZwa4mpdQr3dMxRtfnQDJI3Pu58ktpXiaKA?= =?utf-8?q?+Lj1R9OJ+ubSE6N92gshNzjlTUA0Iv2Fujv13LsvJrCOgTzczuVJpcw+IZm6TUupQ?= =?utf-8?q?6LggvlTab4u7xToGSMz40Je4fjgfB77Nre02+JGge7Dgb2eu/iMx961USeFE9AXDy?= =?utf-8?q?3J/B23ZA5Ro1DTLUfKR8By0JCD1d7ruRqGWe5Owugj+BTPBuqyXy0qWXMgHZyBMda?= =?utf-8?q?JadrvUojLhS1wabKOrpwfNXNms3iJFf7HdW5uG10cPqIt+vV+V2liVrtBsTOabYAP?= =?utf-8?q?OY9O2UBtY0K2IhzcTvrg1HUTikzyJVspZbjUADQCPItlpDD8aZGBi9TQXHz4JHlx/?= =?utf-8?q?nOFUeI3fBr0FgklcFGXucEz5cVBPKGW7moH2xtVV4iZ7Tyimd2c4oAPCayyKSsad1?= =?utf-8?q?cvbO2y+RhrJLtYLZKBf2WFywwpSUj+TcQkmpAOPsWWZR4sFZzdS+z0ybeWVDkkPeL?= =?utf-8?q?Xn1xac7BooznxS2q+PizTHwzx5Sd5EvgKJCQDKTzvhOKZIkmvnYodcQsVXkGoHjP7?= =?utf-8?q?e0yUQIxH7K5OXMMsGAUjOorSmKxnMfT/giLZdsBQHDcx6BSi8zwer5RpW9ZJfMUN9?= =?utf-8?q?KAJ/9wrGD6ohUiLAVVyIkgdaO3vm1cXN7WzTTKwXNqx3gctzgLBO4xhItUXbSxlpH?= =?utf-8?q?/4TAXt80x7tHg3ZmR/4dwH4l60YRBPi8Us5Fz8d091hgqD7ENdgLFSEZhZMZ7wj7M?= =?utf-8?q?Manj8OEp0AtW5dSre1HL9EKed8RiAzEstPM8uwytvjTEFR3wap/uApMzBiO5L0oF5?= =?utf-8?q?kJmLprWLt7QEKowg5xTwAP3IAoxxV+vIbmhZYwOcspCkCap1goSKEnYbwiGVRxn7C?= =?utf-8?q?63sjSodUkz68YEdVnTtamm6vww4xEY/Kxh/2eTv89i8ue5BmkGIBbQl7+/xMHeCIf?= =?utf-8?q?EzZlCtH7SAi4u/k3YDVI+vTFXjTlSEunLqm1vxBf1o4EcHrFOyXSJmnV03Efyp8Ut?= =?utf-8?q?D+rYcTo0ceEkBc6IIQaC/7xcJikCXA0Wb0jmRo2A0VSIfKtEZs2nxi425X/k8Nme/?= =?utf-8?q?txQbm3MmyibjK1ODQoRknRi6jJ0nf1kBAlMpoTZPbCc6zQNzsb0MsXihX/lCxDgL+?= =?utf-8?q?L9pQMGkXWKiuEkjglm2/Lpfx/REkTsgosTMn1LIFcgY+fL38iXV/QgH+xqLifVXLe?= =?utf-8?q?xXHfWDSAY0+I3EgKWHu6OoqyoUJtKymcxxoDUEv5OEwBL93+2uQKjMtK/PvFWaRcl?= =?utf-8?q?MlMbA6AupFLqXt2G/PsrRouHdgo5RkcYy5+2zb8RvQLI20P8KvYSuIV7jcG98J+pq?= =?utf-8?q?U2y3qSYDQLAa?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52381660-6420-42e6-bec5-08dab2801c6b X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB6360.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 09:47:33.1539 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /4gznc2WFS4AHSZ/JBKcm58c/OcN5PINwncwcO9OmCVXFQi0RZqzYBINZ6TI/g+unO/cl1rdp8oY7PCNM5dcNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB5003 Commit 75cc460a1b added checks to ensure the position of the BARs from PCI devices don't overlap with regions defined on the memory map. When there's a collision memory decoding is left disabled for the device, assuming that dom0 will reposition the BAR if necessary and enable memory decoding. While this would be the case for devices being used by dom0, devices being used by the firmware itself that have no driver would usually be left with memory decoding disabled by dom0 if that's the state dom0 found them in, and thus firmware trying to make use of them will not function correctly. The initial intent of 75cc460a1b was to prevent vPCI from creating MMIO mappings on the dom0 p2m over regions that would otherwise already have mappings established. It's my view now that we likely went too far with 75cc460a1b, and Xen disabling memory decoding of devices (as buggy as they might be) is harmful, and reduces the set of hardware on which Xen works. This commits reverts most of 75cc460a1b, and instead adds checks to vPCI in order to prevent misplaced BARs from being added to the hardware domain p2m. Signaling on whether BARs are mapped is tracked in the vpci structure, so that misplaced BARs are not mapped, and thus Xen won't attempt to unmap them when memory decoding is disabled. This restores the behavior of Xen for PV dom0 to the state it was previous to 75cc460a1b, while also introducing a more contained fix for the vPCI BAR mapping issues. Fixes: 75cc460a1b ('xen/pci: detect when BARs are not suitably positioned') Signed-off-by: Roger Pau Monné --- AT Citrix we have a system with a device with the following BARs: BAR [0xfe010, 0xfe010] -> in a EfiMemoryMappedIO region BAR [0, 0x1fff] -> not positioned, outside host bridge window And memory decoding enabled by the firmware. With the current code (or any of the previous fix proposals), Xen would still disable memory decoding for the device, and the system will freeze when attempting to set EFI vars. I'm afraid the best solution to avoid regressions caused by 75cc460a1b is the proposal here. --- xen/drivers/passthrough/pci.c | 69 ----------------------------------- xen/drivers/vpci/header.c | 22 ++++++++++- 2 files changed, 20 insertions(+), 71 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 149f68bb6e..b42acb8d7c 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -233,9 +233,6 @@ static void check_pdev(const struct pci_dev *pdev) PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_REC_MASTER_ABORT | \ PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY) u16 val; - unsigned int nbars = 0, rom_pos = 0, i; - static const char warn[] = XENLOG_WARNING - "%pp disabled: %sBAR [%#lx, %#lx] overlaps with memory map\n"; if ( command_mask ) { @@ -254,8 +251,6 @@ static void check_pdev(const struct pci_dev *pdev) switch ( pci_conf_read8(pdev->sbdf, PCI_HEADER_TYPE) & 0x7f ) { case PCI_HEADER_TYPE_BRIDGE: - nbars = PCI_HEADER_BRIDGE_NR_BARS; - rom_pos = PCI_ROM_ADDRESS1; if ( !bridge_ctl_mask ) break; val = pci_conf_read16(pdev->sbdf, PCI_BRIDGE_CONTROL); @@ -272,75 +267,11 @@ static void check_pdev(const struct pci_dev *pdev) } break; - case PCI_HEADER_TYPE_NORMAL: - nbars = PCI_HEADER_NORMAL_NR_BARS; - rom_pos = PCI_ROM_ADDRESS; - break; - case PCI_HEADER_TYPE_CARDBUS: /* TODO */ break; } #undef PCI_STATUS_CHECK - - /* Check if BARs overlap with other memory regions. */ - val = pci_conf_read16(pdev->sbdf, PCI_COMMAND); - if ( !(val & PCI_COMMAND_MEMORY) || pdev->ignore_bars ) - return; - - pci_conf_write16(pdev->sbdf, PCI_COMMAND, val & ~PCI_COMMAND_MEMORY); - for ( i = 0; i < nbars; ) - { - uint64_t addr, size; - unsigned int reg = PCI_BASE_ADDRESS_0 + i * 4; - int rc = 1; - - if ( (pci_conf_read32(pdev->sbdf, reg) & PCI_BASE_ADDRESS_SPACE) != - PCI_BASE_ADDRESS_SPACE_MEMORY ) - goto next; - - rc = pci_size_mem_bar(pdev->sbdf, reg, &addr, &size, - (i == nbars - 1) ? PCI_BAR_LAST : 0); - if ( rc < 0 ) - /* Unable to size, better leave memory decoding disabled. */ - return; - if ( size && !pci_check_bar(pdev, maddr_to_mfn(addr), - maddr_to_mfn(addr + size - 1)) ) - { - /* - * Return without enabling memory decoding if BAR position is not - * in IO suitable memory. Let the hardware domain re-position the - * BAR. - */ - printk(warn, - &pdev->sbdf, "", PFN_DOWN(addr), PFN_DOWN(addr + size - 1)); - return; - } - - next: - ASSERT(rc > 0); - i += rc; - } - - if ( rom_pos && - (pci_conf_read32(pdev->sbdf, rom_pos) & PCI_ROM_ADDRESS_ENABLE) ) - { - uint64_t addr, size; - int rc = pci_size_mem_bar(pdev->sbdf, rom_pos, &addr, &size, - PCI_BAR_ROM); - - if ( rc < 0 ) - return; - if ( size && !pci_check_bar(pdev, maddr_to_mfn(addr), - maddr_to_mfn(addr + size - 1)) ) - { - printk(warn, &pdev->sbdf, "ROM ", PFN_DOWN(addr), - PFN_DOWN(addr + size - 1)); - return; - } - } - - pci_conf_write16(pdev->sbdf, PCI_COMMAND, val); } static void apply_quirks(struct pci_dev *pdev) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index eb9219a49a..4d7f8f4a30 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -121,7 +121,9 @@ static void modify_decoding(const struct pci_dev *pdev, uint16_t cmd, } if ( !rom_only && - (bar->type != VPCI_BAR_ROM || header->rom_enabled) ) + (bar->type != VPCI_BAR_ROM || header->rom_enabled) && + pci_check_bar(pdev, _mfn(PFN_DOWN(bar->addr)), + _mfn(PFN_DOWN(bar->addr + bar->size - 1))) ) bar->enabled = map; } @@ -234,9 +236,25 @@ static int modify_bars(const struct pci_dev *pdev, uint16_t cmd, bool rom_only) if ( !MAPPABLE_BAR(bar) || (rom_only ? bar->type != VPCI_BAR_ROM - : (bar->type == VPCI_BAR_ROM && !header->rom_enabled)) ) + : (bar->type == VPCI_BAR_ROM && !header->rom_enabled)) || + /* Skip BARs already in the requested state. */ + bar->enabled == !!(cmd & PCI_COMMAND_MEMORY) ) continue; + /* + * Only do BAR position checks for the hardware domain, for guests it's + * assumed that the hardware domain has changed the position of any + * problematic BARs. + */ + if ( is_hardware_domain(pdev->domain) && + !pci_check_bar(pdev, _mfn(start), _mfn(end)) ) + { + printk(XENLOG_G_WARNING + "%pp: not mapping BAR [%lx, %lx] invalid position\n", + &pdev->sbdf, start, end); + continue; + } + rc = rangeset_add_range(mem, start, end); if ( rc ) { From patchwork Thu Oct 20 09:46:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13012937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CF825C43219 for ; Thu, 20 Oct 2022 09:47:55 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.426340.674749 (Exim 4.92) (envelope-from ) id 1olS9R-0003Rv-Rs; Thu, 20 Oct 2022 09:47:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 426340.674749; Thu, 20 Oct 2022 09:47:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olS9R-0003Qm-Kx; Thu, 20 Oct 2022 09:47:45 +0000 Received: by outflank-mailman (input) for mailman id 426340; Thu, 20 Oct 2022 09:47:43 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olS9P-0001OM-H0 for xen-devel@lists.xenproject.org; Thu, 20 Oct 2022 09:47:43 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3db54171-505c-11ed-91b5-6bf2151ebd3b; Thu, 20 Oct 2022 11:47:42 +0200 (CEST) Received: from mail-sn1anam02lp2043.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.57.43]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 20 Oct 2022 05:47:39 -0400 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) by DM6PR03MB5003.namprd03.prod.outlook.com (2603:10b6:5:1e7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30; Thu, 20 Oct 2022 09:47:38 +0000 Received: from SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254]) by SJ0PR03MB6360.namprd03.prod.outlook.com ([fe80::9f90:6ba5:5b44:c254%3]) with mapi id 15.20.5723.034; Thu, 20 Oct 2022 09:47: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: 3db54171-505c-11ed-91b5-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1666259262; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=CW2Sjpzu+EEGZpXFIVYipeQNHkgG59ttaeRSs3lrE/g=; b=c2Xbyv/S7A1T+mKZu+VnK2Gu/JE+oeZP3u03hKehieRCpwnbYC7NsjwL iAKunzI3zfM/CHn9ZZt2fDjkYPg+flP35cqZcPzxYSHQ09fmW1zuzjjqT RB9n7K1l/wXugjbPXV0xTIFaUID/O1QBtD4xfee0ZwDpLBZ7RyokKaBDf 8=; X-IronPort-RemoteIP: 104.47.57.43 X-IronPort-MID: 85669466 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:f1ROfapG/MSzAn/xKsJYQKlFlU1eBmJiZBIvgKrLsJaIsI4StFCzt garIBmEM6uJNGP9e9BwOt+wp0gD6JfVz4BgTARq/ikxQXsV9JuZCYyVIHmrMnLJJKUvbq7FA +Y2MYCccZ9uHhcwgj/3b9ANeFEljfngqoLUUbKCYGYpLeNdYH9JoQp5nOIkiZJfj9G8Agec0 fv/uMSaM1K+s9JOGjt8B5mr9VU+4ZwehBtC5gZkPKgR5AeH/5UoJMl3yZ+ZfiOQrrZ8RoZWd 86bpJml82XQ+QsaC9/Nut4XpWVTH9Y+lSDX4pZnc/DKbipq/0Te4Y5iXBYoUm9Fii3hojxE4 I4lWapc6+seFvakdOw1C3G0GszlVEFM0OevzXOX6aR/w6BaGpdFLjoH4EweZOUlFuhL7W5mr NNIBB8/aFe6t8Hu7569EbZVqe4AM5y+VG8fkikIITDxK98DGcqGeIOToNhS0XE3m9xEGuvYa 4wBcz1zYR/cYhpJfFAKFJY5m+TujX76G9FagAvN+exrvC6Ok0oti9ABM/KMEjCObd9SkUuC4 HrP4kzyAw0ANczZwj2Amp6prr+Sw32qBNxMfFG+3uNBsFqQgVEQMhQ9dFy2/NeQsBaXRM0Kf iT4/QJr98De7neDXtT7GhG1vnOAlhodQMZLVf037hmXzajZ6BrfAXILJgOtc/Qjvc4yACcsj 1aPltaxXzh36uXJEjSa66ueqi60NW4NN2geaCQYTAwDpd7+vIU0iRGJRdFmeEKosuDI9fjL6 2jihEADa38716bnC43TEYj7vg+R IronPort-HdrOrdr: A9a23:rE/ohal2o5r048uXgmWY41TMPJDpDfO3imdD5ihNYBxZY6Wkfp +V8cjzhCWftN9OYhodcLC7V5Voj0msl6KdhrNhR4tKPTOWw1dASbsP0WKM+UyFJ8STzI5gPO JbAtFD4b7LfCdHZLjBkW6F+r8bqbHokZxAx92ut0uFJTsaF52IhD0JbzpzfHcGJzWvUvECZe ehD4d81kydUEVSSv7+KmgOXuDFqdGOvJX6YSQeDxpizAWVlzun5JPzDhDdh34lInty6IZn1V KAvx3y562lvf3+4hjA11XL55ATvNf60NNMCOGFl8BQADTxjQSDYphnRtS5zXkIidDqzGxvvM jHoh8mMcg2w3TNflutqR+o4AXk2CZG0Q6W9XaoxV/Y5eDpTjMzDMRMwahDdAHC1kYmtNZglI pWwmOwrfNsfF/9tRW4w+KNewBhl0Kyr3Znu/UUlWZjXYwXb6IUhZAD/XlSDIwLEEvBmc0a+d FVfY/hDcttABKnhyizhBgu/DXsZAV4Iv6+eDlMhiTPuAIm30yQzCMjtb4idzk7hdAAoqJ/lp T525RT5c9zp/AtHNNA7Z86MK2K40z2MGbx2TGpUCPaPZBCHU7xgLjKx5hwzN2WWfUzvegPcd L6IRhliVI= X-IronPort-AV: E=Sophos;i="5.95,198,1661832000"; d="scan'208";a="85669466" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PbKTDR6ps1JcwFL/ihu0dhIjFZL/m/MUetodNn7mEeGkzx4MITqqBlipbLZi33s8ds6YNbhrINqqgIA43C11FdEnkM22LSH87ig283d4VyLZ71tW4CZgfhapx78IOE6QgFstXcEx9r7hIR7HkZFWx5p22Hfl8EUwmP3Ztq/Ij6IERFlgVVYwFIiYw9+PPBS55qBJZJijfgLyAnjzULoAUqmr0zU4hj2jXgVd8+I3Fjyldy/Ze1It4QZxawDSxnT8YCI6m8muantJVLrYxYsH/oUrjBSiIJoBSON3W2hv5CSmv83lbyfIHUH9Pb/nmBdWxYLn/pvncKS+rM0K2CdaGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=978VHNm8HL9oE714Wo1de7N2hjymmg8SC4PEXMhjlqM=; b=WytDwgb09+7FH+9KS6eKm2RmTZEDXSaVqXwaXA6vl5B3Q58EW0h2jYQFss8/koCS9MhGp7QMgsxVJY77TLWGpuX/EGcX/SIyy+QhzbeDDtwnJKs6j/6YmvPqTrSYbNghRm5aCho+jke6goQmDwqcaqSy1y4k3hcAVIW/Yg/2fjVGMdTpxV/dB1P62s40Ax12Fw3DplSv9JpyOpEs0wrPJElrti2PcIiXDXp4eBpXm/tQ1ZiIQt7BcUYdYBuJuk1ZiUqVSxrrGBHR9kO+05VAARsYeQZAvrgtZOdRTyIaKqm41NVlOs71bFWvA3QSj15roSCaxleDj0DWqTICGjay2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=978VHNm8HL9oE714Wo1de7N2hjymmg8SC4PEXMhjlqM=; b=p6jYpCGjkYoZ8WKlZhMYiJM3u4h/x0VlVA0I8ASPoRnDibZDTPr+NNEYaSqqqjstwifdTsaJETkwrtGE8wdASHm2+JfNrD9zNGM9HNMUp2o+VpYTSSpd5TvWU1NhXKEHUdFXu2yKUSQbK47TVH7jFk9WZ+dpcGNyA/YtWblMjKc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [PATCH for-4.17 6/6] vpci: refuse BAR writes only if the BAR is mapped Date: Thu, 20 Oct 2022 11:46:49 +0200 Message-Id: <20221020094649.28667-7-roger.pau@citrix.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221020094649.28667-1-roger.pau@citrix.com> References: <20221020094649.28667-1-roger.pau@citrix.com> X-ClientProxiedBy: LO4P123CA0115.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:192::12) To SJ0PR03MB6360.namprd03.prod.outlook.com (2603:10b6:a03:395::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR03MB6360:EE_|DM6PR03MB5003:EE_ X-MS-Office365-Filtering-Correlation-Id: 778ec23d-40d9-47cf-f873-08dab2801f6d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5y+vkFWCOT/9Gxr51dmne/8q3Ly+4u92aF6lTTBk36oKt8L0UKwHrmB/cRWLtCVYOuKp7YSRWfEogkeXtKGEdcbJle/Iz+lp3TzZeoctCB6ycitItSBLyOZ+B4RBfGwYwwGAaxabPbOIcRBVgCT/YABNsBX0JSkTcOLcbqCr+bZluv5qrD03leCghcVLHgsBD4Fp5TDBSPNMV37U7RSdeWBv6H9orDqzZZF2R+hTuUdJs/8Q9eneLbek3a1aVLPD0SZnQEoMgjgM2qL/Dr/E1KrygcytOLt0MFJV2a8vJeX7Dbt9ROJGQFNWA2/4knehKfKhjiOoabYaOHDgUC2MEqxWC43HjgNFJYhKlx/EifXqRYNxPm3+jp3gjU9ZCQEkpcTt/EugEykXR1LsmmczQ7uqkStJG+7I7WYo9xjyHF7BtIj8KlcOObB4b4bqlBCaIlntKZAtx0AMp6YvsUDh6SnLe5Fga1qmKdBU0qZif6J5LoCIJWRRV9v8b8lc39S0SPcfjOx5SFN+4JBq0H4/pe+PPQyPPZhtt/aB0J2ftZfntLjSIc+UGeRJ6Bs/70ZKOEfxgXRhseL0ExjE5IyxR9y1FWwaxynXi2wbvZBt9pbQrzi4W3MCffAjPEQ0ep0iRxAEl9aUIwHTAT54j8EAh/qteGw8nFs13rhEmc9DUqoTe0Pi+B82MVzZgKRF2wb+62iywc3e/grMaGjiVjaCdg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR03MB6360.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(346002)(396003)(136003)(366004)(376002)(39860400002)(451199015)(6666004)(41300700001)(6512007)(107886003)(8936002)(6506007)(6486002)(478600001)(4326008)(6916009)(8676002)(36756003)(186003)(86362001)(1076003)(66476007)(38100700002)(82960400001)(2616005)(26005)(83380400001)(316002)(66946007)(2906002)(5660300002)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?jVdedgmk9GCQ5/tol5gBjDOCtXYs?= =?utf-8?q?581H5J3R6qpHjuz3jrU2oWwrwoDVyl99Zil+obYIFL41BD8XgcNYMJsFn1cqXnzJa?= =?utf-8?q?PuoIKP6fIQ2GHrjfa4ltF5e9Z02Denabpj/CNXuHCNkP191RtIsnJ5ms5eJWml0N+?= =?utf-8?q?m9/OYoeaeAtIhfOdJStyYhfWwtVyPM5lZn+WgxWyX/uxQlaGi4mrdj0yuLtHjOlh2?= =?utf-8?q?PNUzbIQ/kzGeisQmPAlaVfLVTKBhRmXqUWBY7W/8NxdF5LQkX6XBLVF5RZdndgCaS?= =?utf-8?q?cKpO0NGNvE/JkSC0KsjmTA4j40ePFWLFd/HzoDdxlQnJQT349UlckT/xLqQykmeKQ?= =?utf-8?q?PTL+ssrgnG7lw1paThrqyKybMysEDfwu3hpGyvZnwErMUDBo+asUBPx0LkLqzu5yO?= =?utf-8?q?Rde/k9NEU/S+Nw66IGWUdsMlGtsrVxCS9FSgbRd1MwUZWmPS4PtAHp8FQUs4ttm7t?= =?utf-8?q?pyAfV813rByU2FEk6rhIAYQY/Yz2Se86VSuklPec6mpkcqVE95o3krp4wkQDZbebH?= =?utf-8?q?akj+tnxWR5Z1uYhIFKZypiSHbJOtIKZp3gCd1xCx9f+y3lQMJi51NPJvnWfAXTsom?= =?utf-8?q?I1JXUeFxv21AEVTdEFFLmxJg4SBo66faFD2QhTxRaqOkZW+eWs7vAddHD3TEdTL+l?= =?utf-8?q?BypPoJnwazeCLMSFZcZIXOXxTPdH2sILKSnzILG5RftUwWGMNLaimscA38EzZQPBw?= =?utf-8?q?MOZv06dx2wlpv/Y9nvI5zTGbWes+ITs9lydTgZXQb5gj/TekOu2+kUOnAc2Tdfhq2?= =?utf-8?q?FemLwBv4nOtJdjn/drvxaLUDpVZSWeWBn33PdIx0YIjMdEU6o2RROXXadi5KnViLA?= =?utf-8?q?IpO7mQ/PGTGHnebCjjANN+cz1hmJrUjhVXVAJn864yGRmdOCETGvdrDw847vhO6V4?= =?utf-8?q?WVIdCEjH9ngAvlqf9yPTg/PThJIxJglSQaA2T995/Sl02PhOqelKycQ6KZ7KmxBhB?= =?utf-8?q?OqgXNZ0np7ObO/+ssi+CbP2VT/vj1d6C2oHBL6DQqSxaxP/40fBKweMRTXJl9ZOBw?= =?utf-8?q?Vgdh9JHrC01RG0J9rGuQLfw+TJUun2l6/9c4MGZOKAYZe5SqpltMjPn1lZpZ5ZvRJ?= =?utf-8?q?H2AqZpvvXEgTtmXDNs2WlAIvw+YLHKq+S16EAezYXJG4zFpX38Bs2NY2TQUCKPqyu?= =?utf-8?q?fGOJIb0bJSmmXf9xrUNKhmEX/6TLtgJnrsgjOoZ3LdNs4FcAhdhIhIPCx0Z2c0idW?= =?utf-8?q?WjfRo1HQMr5m25zH9NYF5vvQskCKEK5OSCusisllXTdR3OP/5fbmVWMfYHpYeAZTf?= =?utf-8?q?M8E6oqN3b3Qv3f5yDz22yyaQargDiJa+jJ5IZLb57BzvmpzaGOW7LVoZMoopWelki?= =?utf-8?q?WypKAXwWNzGfoz256bT6dLHixOBkGyxAtjcSVHA/8j9w6JW+gPWQ3DoxfbAYppqvF?= =?utf-8?q?B6ccFQ9K8CUq4fKHw7B/BqR+5hHfWQ5jJXVJK5zDWz53a+cJQgj7bw7XM3B69NuWX?= =?utf-8?q?LWvzwF6Bd8sRPG612f8W93fd/jXlaKLa5bti5Hj62M7oYm7KoeJ33q6/x0tbzT372?= =?utf-8?q?+KGkqXMRaz2U?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 778ec23d-40d9-47cf-f873-08dab2801f6d X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB6360.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 09:47:38.1548 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: g780mqa9nZWzkJC/j/dTr0mxyGd9O5vTTS1ETmOuskuS+SLJxUIDgwlSC3cfQC9NCZ14Crb2OXNW7rHjqUD9RQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB5003 Writes to the BARs are ignored if memory decoding is enabled for the device, and the same happen with ROM BARs if the write is an attempt to change the position of the BAR without disabling it first. The reason of ignoring such writes is a limitation in Xen, as it would need to unmap the BAR, change the address, and remap the BAR at the new position, which the current logic doesn't support. Some devices however seem to have the memory decoding bit hardcoded to enabled, and attempts to disable it don't get reflected on the command register. This causes issues for well behaved guests that disable memory decoding and then try to size the BARs, as vPCI will think memory decoding is still enabled and ignore the write. Since vPCI doesn't explicitly care about whether the memory decoding bit is disabled as long as the BAR is not mapped in the guest p2m use the information in the vpci_bar to check whether the BAR is mapped, and refuse writes only based on that information. Signed-off-by: Roger Pau Monné --- xen/drivers/vpci/header.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c index 4d7f8f4a30..4b39737b76 100644 --- a/xen/drivers/vpci/header.c +++ b/xen/drivers/vpci/header.c @@ -388,7 +388,7 @@ static void cf_check bar_write( else val &= PCI_BASE_ADDRESS_MEM_MASK; - if ( pci_conf_read16(pdev->sbdf, PCI_COMMAND) & PCI_COMMAND_MEMORY ) + if ( bar->enabled ) { /* If the value written is the current one avoid printing a warning. */ if ( val != (uint32_t)(bar->addr >> (hi ? 32 : 0)) ) @@ -425,7 +425,7 @@ static void cf_check rom_write( uint16_t cmd = pci_conf_read16(pdev->sbdf, PCI_COMMAND); bool new_enabled = val & PCI_ROM_ADDRESS_ENABLE; - if ( (cmd & PCI_COMMAND_MEMORY) && header->rom_enabled && new_enabled ) + if ( rom->enabled && new_enabled ) { gprintk(XENLOG_WARNING, "%pp: ignored ROM BAR write with memory decoding enabled\n",