From patchwork Tue Aug 28 15:43:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 1381811 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id EC762DF283 for ; Tue, 28 Aug 2012 15:45:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752900Ab2H1Pox (ORCPT ); Tue, 28 Aug 2012 11:44:53 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:56281 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753093Ab2H1Pou (ORCPT ); Tue, 28 Aug 2012 11:44:50 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr13so9582872pbb.19 for ; Tue, 28 Aug 2012 08:44:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=EnX+kP7HuNpfJKoECo48xwnB8ObfDU3iluKSweNC6Hk=; b=CJmhAwlxL92bTCTpnnLqpvz8E8QkW19AHE47Knr+XFh/hfloKMCECZxQTqfg80VMn2 J4qOW+2HncBWnxbJ5Jnd/FE/L0JGGObh6XwaRI94+522m7uq1YW6g8XQVHw/dIOxLTIv kKrqxt0M3Uj8Mjl9cUtNuGprQxSL0crGknSaM5FztldlmXFOAhyTHo6h6qJq038lfdPW eXJCa8EvFumM1CrbvszVXlVkXYbMO51gooIGeJEPmou7KbsurZoskfip6QJJv1lCYFcv EmBCKY2cq+NFlu4neu/3GJRmN02xN3hCD7TSIRZfgaFfB9xBnv192Ah9PxE3E90DHtKd Padg== Received: by 10.68.228.132 with SMTP id si4mr36118926pbc.57.1346168690604; Tue, 28 Aug 2012 08:44:50 -0700 (PDT) Received: from localhost.localdomain ([58.250.81.2]) by mx.google.com with ESMTPS id tq4sm17276577pbc.11.2012.08.28.08.44.44 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Aug 2012 08:44:48 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas Cc: Jiang Liu , Don Dutile , Yinghai Lu , Kenji Kaneshige , Yijing Wang , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH 4/5] PCI/IOV: simplify code by hotplug safe pci_get_domain_bus_and_slot() Date: Tue, 28 Aug 2012 23:43:57 +0800 Message-Id: <1346168638-32724-5-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346168638-32724-1-git-send-email-jiang.liu@huawei.com> References: <1346168638-32724-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Following code has a race window between pci_find_bus() and pci_get_slot() if PCI hotplug operation happens between them which removes the pci_bus. So use PCI hotplug safe interface pci_get_domain_bus_and_slot() instead, which also reduces code complexity. struct pci_bus *pci_bus = pci_find_bus(domain, busno); struct pci_dev *pci_dev = pci_get_slot(pci_bus, devfn); Signed-off-by: Jiang Liu --- drivers/pci/iov.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index aeccc91..b0fe771 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -152,15 +152,11 @@ failed1: static void virtfn_remove(struct pci_dev *dev, int id, int reset) { char buf[VIRTFN_ID_LEN]; - struct pci_bus *bus; struct pci_dev *virtfn; struct pci_sriov *iov = dev->sriov; - bus = pci_find_bus(pci_domain_nr(dev->bus), virtfn_bus(dev, id)); - if (!bus) - return; - - virtfn = pci_get_slot(bus, virtfn_devfn(dev, id)); + virtfn = pci_get_domain_bus_and_slot(pci_domain_nr(dev->bus), + virtfn_bus(dev, id), virtfn_devfn(dev, id)); if (!virtfn) return;