From patchwork Fri Sep 14 19:54:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 970073 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="aG+adCH8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42BmTD6RcGz9s3l for ; Sat, 15 Sep 2018 05:55:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728045AbeIOBLE (ORCPT ); Fri, 14 Sep 2018 21:11:04 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:43035 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728031AbeIOBLE (ORCPT ); Fri, 14 Sep 2018 21:11:04 -0400 Received: by mail-pf1-f195.google.com with SMTP id j26-v6so4755995pfi.10 for ; Fri, 14 Sep 2018 12:55:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=n2b/aaVqdsOssV1NfiL7wO8EwqRy3mAFndQDH/wDvS8=; b=aG+adCH8Jknphiq4tJ++dOyVhVrO/4OcBz5C1XoGcpj8N9HzUT4NhZhz042hPRnhGA odm6PwJpOtbe4Z2iKDcmlySu/b36Pzsn+A3FSfObIkk9GbFpvoCIXD2pmrVcwucTmpbo svqeifSCxYzqM3eAADcg/MD4xgqJ8f29OaF1afD8FKYmidKbgWL6m5KkSgVNaAEyo18n LmbwhkfQPcCg9aFr1sTbnDh2MvyfXsauMPsICKrGzYDMNiE4Pel0NG39Kdhg+TEZZeQf KbHkp0j15MH27i9bwRvRxoLC0Bt67oYyJr5v1D4F7wqg4anycfQ2Z4TNOxNqVz6DeRlI SDzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n2b/aaVqdsOssV1NfiL7wO8EwqRy3mAFndQDH/wDvS8=; b=Zv7kyRFtPUxSj0hG55f7NYkbqK0IcBiYgvD/n/3jdfjx6NUQ38rD1BEHgbh1AeP48O tp+Acc+ErudVStzBxEr9d5dmkR0+dwiN+mgoE2uHqqGhz+qgKi3+LmZW4AYPo833OmdI TndMH/ODblXt9RfNr6t9wSlGECCWAxDRhLFdNWZwxiM1ZTqgZ2v0N52lrpvfY15RAlT4 sJ4l0pNrH+PBOhPxcol9sm1oj3AfPxfq8N6W37x8h4VbbTk30iXL1xUKWrzmhh/ojUU1 6yFn71R3YVnkGTRCJUdT0kdPJKEIdOQT7R4PoyY2qIhNXzEvsPDIo1vWDnuAn9fHcpg3 CfhA== X-Gm-Message-State: APzg51ApumcYklMk/fyOR9FWfyLe6BA1y0hpa3NhtqSSggbXu7+GEq1x /6Rq3qS9yfp3d1Rn1ON0qOHgLw== X-Google-Smtp-Source: ANB0VdZJYy1Ly2zXegcmw4ZDpEu5yMzxz6Se/4ni47eeuDDr+tuVRWVdS4b9J6f3H8adtknyXFJMmQ== X-Received: by 2002:a63:9b09:: with SMTP id r9-v6mr13248317pgd.324.1536954906359; Fri, 14 Sep 2018 12:55:06 -0700 (PDT) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z8-v6sm9394338pfe.163.2018.09.14.12.55.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Sep 2018 12:55:05 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com Cc: devel@linuxdriverproject.org, netdev@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v2 1/2] PCI: hv: support reporting serial number as slot information Date: Fri, 14 Sep 2018 12:54:56 -0700 Message-Id: <20180914195457.20433-2-sthemmin@microsoft.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180914195457.20433-1-sthemmin@microsoft.com> References: <20180914195457.20433-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The Hyper-V host API for PCI provides a unique "serial number" which can be used as basis for sysfs PCI slot table. This can be useful for cases where userspace wants to find the PCI device based on serial number. When an SR-IOV NIC is added, the host sends an attach message with serial number. The kernel doesn't use the serial number, but it is useful when doing the same thing in a userspace driver such as the DPDK. By having /sys/bus/pci/slots/N it provides a direct way to find the matching PCI device. There maybe some cases where serial number is not unique such as when using GPU's. But the PCI slot infrastructure will handle that. This has a side effect which may also be useful. The common udev network device naming policy uses the slot information (rather than PCI address). Signed-off-by: Stephen Hemminger --- drivers/pci/controller/pci-hyperv.c | 37 +++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index c00f82cc54aa..ee80e79db21a 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -89,6 +89,9 @@ static enum pci_protocol_version_t pci_protocol_version; #define STATUS_REVISION_MISMATCH 0xC0000059 +/* space for 32bit serial number as string */ +#define SLOT_NAME_SIZE 11 + /* * Message Types */ @@ -494,6 +497,7 @@ struct hv_pci_dev { struct list_head list_entry; refcount_t refs; enum hv_pcichild_state state; + struct pci_slot *pci_slot; struct pci_function_description desc; bool reported_missing; struct hv_pcibus_device *hbus; @@ -1457,6 +1461,34 @@ static void prepopulate_bars(struct hv_pcibus_device *hbus) spin_unlock_irqrestore(&hbus->device_list_lock, flags); } +/* + * Assign entries in sysfs pci slot directory. + * + * Note that this function does not need to lock the children list + * because it is called from pci_devices_present_work which + * is serialized with hv_eject_device_work because they are on the + * same ordered workqueue. Therefore hbus->children list will not change + * even when pci_create_slot sleeps. + */ +static void hv_pci_assign_slots(struct hv_pcibus_device *hbus) +{ + struct hv_pci_dev *hpdev; + char name[SLOT_NAME_SIZE]; + int slot_nr; + + list_for_each_entry(hpdev, &hbus->children, list_entry) { + if (hpdev->pci_slot) + continue; + + slot_nr = PCI_SLOT(wslot_to_devfn(hpdev->desc.win_slot.slot)); + snprintf(name, SLOT_NAME_SIZE, "%u", hpdev->desc.ser); + hpdev->pci_slot = pci_create_slot(hbus->pci_bus, slot_nr, + name, NULL); + if (!hpdev->pci_slot) + pr_warn("pci_create slot %s failed\n", name); + } +} + /** * create_root_hv_pci_bus() - Expose a new root PCI bus * @hbus: Root PCI bus, as understood by this driver @@ -1480,6 +1512,7 @@ static int create_root_hv_pci_bus(struct hv_pcibus_device *hbus) pci_lock_rescan_remove(); pci_scan_child_bus(hbus->pci_bus); pci_bus_assign_resources(hbus->pci_bus); + hv_pci_assign_slots(hbus); pci_bus_add_devices(hbus->pci_bus); pci_unlock_rescan_remove(); hbus->state = hv_pcibus_installed; @@ -1742,6 +1775,7 @@ static void pci_devices_present_work(struct work_struct *work) */ pci_lock_rescan_remove(); pci_scan_child_bus(hbus->pci_bus); + hv_pci_assign_slots(hbus); pci_unlock_rescan_remove(); break; @@ -1858,6 +1892,9 @@ static void hv_eject_device_work(struct work_struct *work) list_del(&hpdev->list_entry); spin_unlock_irqrestore(&hpdev->hbus->device_list_lock, flags); + if (hpdev->pci_slot) + pci_destroy_slot(hpdev->pci_slot); + memset(&ctxt, 0, sizeof(ctxt)); ejct_pkt = (struct pci_eject_response *)&ctxt.pkt.message; ejct_pkt->message_type.type = PCI_EJECTION_COMPLETE;