From patchwork Thu Jan 18 21:00:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125036 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp294733lja; Thu, 18 Jan 2018 13:01:23 -0800 (PST) X-Google-Smtp-Source: ACJfBotTdMCWjt22Ot4N7WtZwF5Mk3X6k2KgtwyLkYLv+P1aUbYtKAW/Tzqq5J39IH9+j7jwDqCS X-Received: by 10.98.248.75 with SMTP id c11mr4140376pfm.54.1516309283660; Thu, 18 Jan 2018 13:01:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309283; cv=none; d=google.com; s=arc-20160816; b=v8lmQk9l3z4Y1cWcVLgJTKO9e6ZNTujzWmZJjB6twTIHQGNM1w44BXbx2Inb3WHUiY WMP4Y/lE1lOcHjurKjN0SUIQHFeSS6uyB3IdxGKfsgvOLHkLuzRvldqpo2An0kQ77deE u1vbJ2Mf70H72upGgZmvUPedghGmPePCX/hqUjkgJ/UOk6DAi1zxkUL1iWS0qYgdoQng 7jdXKuouryeSz0FgxxKMNw5JYbUi+6N3b8XHe0j6PUA2G+btTUT4YpCo8Xcdoi5i7Nrs XZKdMFJr5n3rOL1ST6vJwIMcbnChOUbVRBtrwiZMe4efC+Pkwlv5LvLox5unEXQC/YUC 4F2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=4W1FYj+9otT/7EbRhW71kBlrPvEeN8qHDPj/WznE5xI=; b=LFAcVtpU3wGkOEhttPgzcXXcq+GlOScEl9P3io9rz4Xqsoy7C/lsoAP91L3eepzlPE dGE2GV9CtBHsyorAK3Tm252BrH/thOGArR9oWMbkQgvxmrFKKZHNzxfzeAVsLpiOwSw6 WL35itzJ07SLJALSvyAK3hrXic+DiCfdE7trJYZbfUNN9vwVXSrTPzxotxL6UAH1InSY z9b/VAQNKKR/Y9wMegFTJ9tz1IcCMdYTEkWHMI39WdVFDg2FaEVcTu60hv8s4t7DND+1 /tw+ppUMjrOrxfjCLgCUwE8PflK5CJS2EvuIThH9DOQREejqH064wnQpsQ/5LM7BsrXW 9h7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=bgbHzSVy; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c16si4933770pgu.706.2018.01.18.13.01.23; Thu, 18 Jan 2018 13:01:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=bgbHzSVy; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754895AbeARVBW (ORCPT + 10 others); Thu, 18 Jan 2018 16:01:22 -0500 Received: from mail-by2nam01on0100.outbound.protection.outlook.com ([104.47.34.100]:31312 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754812AbeARVBS (ORCPT ); Thu, 18 Jan 2018 16:01:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=4W1FYj+9otT/7EbRhW71kBlrPvEeN8qHDPj/WznE5xI=; b=bgbHzSVykdSHbgjlu4Pwp5xtSA8oRJrotsF1l5Qf17pzY20AMRMKSwIbk+yFQV/0NbMA/+XO+F7p+hmNnBHIPaxazyI1WXAzw3Of8HkX32K1EElJbtThCs8i2Wq/iOkcQ1cift753LD+DrRuWkPxnGj30vhOr1UFldXYJbnml/Q= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0805.namprd21.prod.outlook.com (10.167.105.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.428.7; Thu, 18 Jan 2018 21:01:14 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 21:01:14 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Sumit Semwal , Bjorn Helgaas , Sasha Levin Subject: [added to the 4.1 stable tree] PCI: Don't update VF BARs while VF memory space is enabled Thread-Topic: [added to the 4.1 stable tree] PCI: Don't update VF BARs while VF memory space is enabled Thread-Index: AQHTkJ9P8H/crcVYpEOMmL+NbuQVFQ== Date: Thu, 18 Jan 2018 21:00:03 +0000 Message-ID: <20180118205908.3220-77-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.98.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0805; 7:NVcq4Sxii20iuYvtHmZB5WTn1XvWeEacHMEcjZUvPm5N+cGIEYJVnNPBT+uAcvG+mnuODYV5hWLYDOYza04i7vHXtf3J7deQdoqZWK+oYvtt3VUWayazD2TfCJIss+Eg7yYeGfixMJYi1uXiC5g549t9xIhmK4Rwu03FK/EmTu5bvyZ9UINq3XS28At4wKGmDVQrHU/80+dLJWlE+HeVw3JEYXlgoUqsIle+Igxj7xx8FZmaqtxeF5l1WCE/9tYd x-ms-office365-filtering-correlation-id: e5ab53f9-85ed-472a-1f91-08d55eb69c37 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB0805; x-ms-traffictypediagnostic: DM5PR2101MB0805: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(211936372134217)(153496737603132)(104084551191319); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231046)(2400067)(944501161)(3002001)(6055026)(61426038)(61427038)(6041282)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0805; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB0805; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(39380400002)(366004)(376002)(346002)(396003)(189003)(199004)(2906002)(2900100001)(6512007)(86362001)(305945005)(97736004)(68736007)(10090500001)(2501003)(6666003)(7736002)(105586002)(5250100002)(2950100002)(5660300001)(6116002)(36756003)(6486002)(26005)(86612001)(54906003)(4326008)(3280700002)(3846002)(6346003)(6436002)(15650500001)(3660700001)(10290500003)(478600001)(107886003)(76176011)(66066001)(1076002)(81156014)(99286004)(81166006)(106356001)(53936002)(102836004)(22452003)(110136005)(59450400001)(14454004)(316002)(72206003)(25786009)(6506007)(8676002)(8936002)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0805; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: SXiM5QEX+csruGc5JT1B6kL6fqQ0Q3TJtuVUh9Ps64ebz4yEewsZv1eJ6zQHpZ+RXZIaHmZ06ArCbH26PQIpgw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5ab53f9-85ed-472a-1f91-08d55eb69c37 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 21:00:03.9941 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0805 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sumit Semwal This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ Upstream commit 546ba9f8f22f71b0202b6ba8967be5cc6dae4e21 ] If we update a VF BAR while it's enabled, there are two potential problems: 1) Any driver that's using the VF has a cached BAR value that is stale after the update, and 2) We can't update 64-bit BARs atomically, so the intermediate state (new lower dword with old upper dword) may conflict with another device, and an access by a driver unrelated to the VF may cause a bus error. Warn about attempts to update VF BARs while they are enabled. This is a programming error, so use dev_WARN() to get a backtrace. Signed-off-by: Bjorn Helgaas Reviewed-by: Gavin Shan Signed-off-by: Sasha Levin --- drivers/pci/iov.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 06959425cdea..846d4f604ebd 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -564,6 +564,7 @@ void pci_iov_update_resource(struct pci_dev *dev, int resno) struct resource *res = dev->resource + resno; int vf_bar = resno - PCI_IOV_RESOURCES; struct pci_bus_region region; + u16 cmd; u32 new; int reg; @@ -575,6 +576,13 @@ void pci_iov_update_resource(struct pci_dev *dev, int resno) if (!iov) return; + pci_read_config_word(dev, iov->pos + PCI_SRIOV_CTRL, &cmd); + if ((cmd & PCI_SRIOV_CTRL_VFE) && (cmd & PCI_SRIOV_CTRL_MSE)) { + dev_WARN(&dev->dev, "can't update enabled VF BAR%d %pR\n", + vf_bar, res); + return; + } + /* * Ignore unimplemented BARs, unused resource slots for 64-bit * BARs, and non-movable resources, e.g., those described via