From patchwork Fri Jun 8 18:39:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 926980 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 412WR53N7pz9s31; Sat, 9 Jun 2018 04:39:29 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fRMID-0007Qg-LZ; Fri, 08 Jun 2018 18:39:21 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fRMIC-0007QZ-Lb for kernel-team@lists.ubuntu.com; Fri, 08 Jun 2018 18:39:20 +0000 Received: from mail-qk0-f200.google.com ([209.85.220.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fRMIC-0007b0-Bj for kernel-team@lists.ubuntu.com; Fri, 08 Jun 2018 18:39:20 +0000 Received: by mail-qk0-f200.google.com with SMTP id p190-v6so13477926qkc.17 for ; Fri, 08 Jun 2018 11:39:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=WEW3B6xI+WXp5QyMFD7YVYSxciDBEb9k5xUt1c7J8dw=; b=N3Xd1xq5ry04MFHb0gKAIXAa+H5yXDCTozrD9gNL6pU023vo2c3rFe5vb/UFTD4qND L+oEp+93xdFEprX993/BPH0aJxxG4t6X1BR5yk+l2u4kHTeshVbUCKXXcZSaLtLMBj2y AJcC+nyseMcWyptVicVdRsc/tZEqhXVGUGJ7JAk5J8InyJLIXaXGCsIXTgKNpOfsezgZ fQkLK+LXR3HxlWRmXngKE4gw+6fEEZ1d3V2C1sQ/roKKrHusC+QqviOUODXKcSkdJcQK D4Zc0K0BEPtRrIXpTXuzKGmN1W1YaofzruN5+l1sNAs6g50G+9bEyO7dxi3JCzoneIT5 Wm8Q== X-Gm-Message-State: APt69E3G6ogKEZcftLQZxGrkcNIZ/4jlLbG1CwnIv8FKsrzAQ8GkDNIJ 6ZP8Iu/mO8zPlBwCFkmyL2naKdNcckus4NV13Tk5IWplV+boJuP1C54/BSJXK05BcOFIkYv/5Th +gm/KgOxviN405AnmX212HDaOJioodFU/M5HNRVRt X-Received: by 2002:ac8:3f74:: with SMTP id w49-v6mr6920053qtk.84.1528483159039; Fri, 08 Jun 2018 11:39:19 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKOT4SDmsTLXm32VAjXyL03lVGa4ZUzTEzg1lIZ8YXX1ukWeX/qeo3Bim340UJET/DvO1q0qw== X-Received: by 2002:ac8:3f74:: with SMTP id w49-v6mr6920044qtk.84.1528483158818; Fri, 08 Jun 2018 11:39:18 -0700 (PDT) Received: from localhost.localdomain ([179.97.166.78]) by smtp.gmail.com with ESMTPSA id k2-v6sm35111688qkl.95.2018.06.08.11.39.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jun 2018 11:39:17 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH 1/3] PCI: hv: Fix a comment typo in _hv_pcifront_read_config() Date: Fri, 8 Jun 2018 15:39:09 -0300 Message-Id: <20180608183911.24395-2-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608183911.24395-1-marcelo.cerri@canonical.com> References: <20180608183911.24395-1-marcelo.cerri@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Dexuan Cui BugLink: http://bugs.launchpad.net/bugs/1758378 Comment in _hv_pcifront_read_config() contains a typo, fix it. No functional change. Signed-off-by: Dexuan Cui [lorenzo.pieralisi@arm.com: changed commit log] Signed-off-by: Lorenzo Pieralisi Acked-by: Haiyang Zhang Cc: Vitaly Kuznetsov Cc: Stephen Hemminger Cc: K. Y. Srinivasan (cherry picked from commit df3f2159f4e4146d40b244725ce79ed921530b99) Signed-off-by: Marcelo Henrique Cerri --- drivers/pci/host/pci-hyperv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c index ebfd32f142cd..f5fe4c38aee2 100644 --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c @@ -666,7 +666,7 @@ static void _hv_pcifront_read_config(struct hv_pci_dev *hpdev, int where, break; } /* - * Make sure the write was done before we release the spinlock + * Make sure the read was done before we release the spinlock * allowing consecutive reads/writes. */ mb(); From patchwork Fri Jun 8 18:39:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 926981 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 412WR73tzFz9ry1; Sat, 9 Jun 2018 04:39:31 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fRMIG-0007Rb-PQ; Fri, 08 Jun 2018 18:39:24 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fRMIE-0007R4-Qv for kernel-team@lists.ubuntu.com; Fri, 08 Jun 2018 18:39:22 +0000 Received: from mail-qt0-f199.google.com ([209.85.216.199]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fRMIE-0007bB-GS for kernel-team@lists.ubuntu.com; Fri, 08 Jun 2018 18:39:22 +0000 Received: by mail-qt0-f199.google.com with SMTP id d14-v6so13000031qtn.3 for ; Fri, 08 Jun 2018 11:39:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=dpVjxGH0rjSSUJukpXotlZhSkXcdtKNz9Ye7ylV942c=; b=qQ30Qn3tku1IYf8ncc9BRwSoRgzYBFB5TVo978YgZK45WsuyAKt6o7myupaqghVLM4 Qxwb9s1WYbsOWY4L4fUq2GFQCvoi9HjjBW52MxlXVfaO+FEwM79SfL8hU5L11von0N+J zXsAuc2Nf7MbqQIwHYgRdsmtSGmmB2J08yVEzWlyIsP3V8raMsczTaHEOmM23e6re8rT b7ofBNaBiFscCVTYrg8+bo2YRgof8RBcQX7a0Herq0s845RB+bGyoJJTYh54SRYBgW2p WlhhSXjSta4+AaWl40AoG0ISlyghJQGJoanH+aBilI1CFn+b2pEtpSn26B3S77kesVx/ zXYA== X-Gm-Message-State: APt69E3Q5pkc50/aILI/hiFnpj5nqEodCqWawg9kYmKkiGihkD2UoLkb mNWB+Kf0ZeXvz330vs1yQqCZQNP2128DQTjvwdGPust83689Ksa1bK4v904HpKgHR9hY/MaWIQl JvmB6YPvkSrXI5XAfF9whX97H5ynh04j45ReGGgVW X-Received: by 2002:a37:be44:: with SMTP id o65-v6mr6114486qkf.439.1528483161240; Fri, 08 Jun 2018 11:39:21 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLtQLJ/KcwfRlj1OAONAryRz4Fx8qbY3lshjmNkWqCzM9Wr4rBrpYEFn5o2apcLa0pHzsVQlA== X-Received: by 2002:a37:be44:: with SMTP id o65-v6mr6114474qkf.439.1528483161012; Fri, 08 Jun 2018 11:39:21 -0700 (PDT) Received: from localhost.localdomain ([179.97.166.78]) by smtp.gmail.com with ESMTPSA id k2-v6sm35111688qkl.95.2018.06.08.11.39.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jun 2018 11:39:19 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH 2/3] PCI: hv: Remove the bogus test in hv_eject_device_work() Date: Fri, 8 Jun 2018 15:39:10 -0300 Message-Id: <20180608183911.24395-3-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608183911.24395-1-marcelo.cerri@canonical.com> References: <20180608183911.24395-1-marcelo.cerri@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Dexuan Cui BugLink: http://bugs.launchpad.net/bugs/1758378 When kernel is executing hv_eject_device_work(), hpdev->state value must be hv_pcichild_ejecting; any other value would consist in a bug, therefore replace the bogus check with an explicit WARN_ON() on the condition failure detection. Signed-off-by: Dexuan Cui [lorenzo.pieralisi@arm.com: updated commit log] Signed-off-by: Lorenzo Pieralisi Reviewed-by: Michael Kelley Acked-by: Haiyang Zhang Cc: Vitaly Kuznetsov Cc: Jack Morgenstein Cc: Stephen Hemminger Cc: K. Y. Srinivasan (cherry picked from commit fca288c0153b2b97114b9081bc3c33c3735145b6) Signed-off-by: Marcelo Henrique Cerri --- drivers/pci/host/pci-hyperv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c index f5fe4c38aee2..5eb7954ee584 100644 --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c @@ -1854,10 +1854,7 @@ static void hv_eject_device_work(struct work_struct *work) hpdev = container_of(work, struct hv_pci_dev, wrk); - if (hpdev->state != hv_pcichild_ejecting) { - put_pcichild(hpdev, hv_pcidev_ref_pnp); - return; - } + WARN_ON(hpdev->state != hv_pcichild_ejecting); /* * Ejection can come before or after the PCI bus has been set up, so From patchwork Fri Jun 8 18:39:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 926982 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 412WR95Pqdz9ry1; Sat, 9 Jun 2018 04:39:33 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fRMIJ-0007Sx-0j; Fri, 08 Jun 2018 18:39:27 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fRMIH-0007Rl-2E for kernel-team@lists.ubuntu.com; Fri, 08 Jun 2018 18:39:25 +0000 Received: from mail-qk0-f198.google.com ([209.85.220.198]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fRMIG-0007bb-Nv for kernel-team@lists.ubuntu.com; Fri, 08 Jun 2018 18:39:24 +0000 Received: by mail-qk0-f198.google.com with SMTP id i64-v6so13880426qkh.14 for ; Fri, 08 Jun 2018 11:39:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ZViEggJe3wyPr1XwJbN5Re2qWwba+YUhODiCEeLj+sY=; b=rmgABgVjJ0CM9+YXnG3XVsvJ/38z5dvK3wlHz0V+/bHz0Iq59xB6AXux07VX4ZHrTp BCo6/cfpXNrIR9+UZ4vngRxqfWbxLjMG3zWoaZG+REWaOoARE8mHXW+orqbxd1ZsYaox 0/YA+YC3C1eXgcNbeYftlnog0oB1MdyJ+b+7aUaBy4hdTl8BVb8LoeeqJfqqn7/Ux63K ILjDEaj+zuqH1sxNTh/cybizvoKjVQ/81k+ngXDQTMD32Tuu8RoO06Y6Z1YcxQKuUoeP 1ImcMnrnlSNOwKPYELVWYrL+A+ZIHflqnNCS63+2J0rzpDPcgNheO8HAeNtCecw/GGwp H/VA== X-Gm-Message-State: APt69E1EV0ptU0KlFDJqFypfDA2XKaz2kSyCtUJaf/ce4Eti38UD4ocy 3xZqSlyeKN+xCael4y7ANUroQFlyESThTvh+lzkwEoXVUA4KWyJK4sOT8ygREJ3iENFBGnqipU9 sEt9H2G9nH2VSj+qZNJo6IKcIg68PPjdmksWf8hrC X-Received: by 2002:a37:5687:: with SMTP id k129-v6mr2588604qkb.163.1528483163476; Fri, 08 Jun 2018 11:39:23 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIdasUG/JPGVqhcYwpD9CJwRYdc8HOVCYjzUPc/j9Q/QwGXMAcdueEoh+RD3h0uV4TohPn6JA== X-Received: by 2002:a37:5687:: with SMTP id k129-v6mr2588592qkb.163.1528483163248; Fri, 08 Jun 2018 11:39:23 -0700 (PDT) Received: from localhost.localdomain ([179.97.166.78]) by smtp.gmail.com with ESMTPSA id k2-v6sm35111688qkl.95.2018.06.08.11.39.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jun 2018 11:39:22 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH 3/3] PCI: hv: Only queue new work items in hv_pci_devices_present() if necessary Date: Fri, 8 Jun 2018 15:39:11 -0300 Message-Id: <20180608183911.24395-4-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608183911.24395-1-marcelo.cerri@canonical.com> References: <20180608183911.24395-1-marcelo.cerri@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Dexuan Cui BugLink: http://bugs.launchpad.net/bugs/1758378 If there is pending work in hv_pci_devices_present() we just need to add the new dr entry into the dr_list. Add a check to detect pending work items and update the code to skip queuing work if pending work items are detected. Signed-off-by: Dexuan Cui [lorenzo.pieralisi@arm.com: updated commit log] Signed-off-by: Lorenzo Pieralisi Reviewed-by: Michael Kelley Acked-by: Haiyang Zhang Cc: Vitaly Kuznetsov Cc: Jack Morgenstein Cc: Stephen Hemminger Cc: K. Y. Srinivasan (cherry picked from commit 948373b3ed1bcf05a237c24675b84804315aff14) Signed-off-by: Marcelo Henrique Cerri --- drivers/pci/host/pci-hyperv.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c index 5eb7954ee584..f7d36c03486c 100644 --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c @@ -1801,6 +1801,7 @@ static void hv_pci_devices_present(struct hv_pcibus_device *hbus, struct hv_dr_state *dr; struct hv_dr_work *dr_wrk; unsigned long flags; + bool pending_dr; dr_wrk = kzalloc(sizeof(*dr_wrk), GFP_NOWAIT); if (!dr_wrk) @@ -1824,11 +1825,21 @@ static void hv_pci_devices_present(struct hv_pcibus_device *hbus, } spin_lock_irqsave(&hbus->device_list_lock, flags); + /* + * If pending_dr is true, we have already queued a work, + * which will see the new dr. Otherwise, we need to + * queue a new work. + */ + pending_dr = !list_empty(&hbus->dr_list); list_add_tail(&dr->list_entry, &hbus->dr_list); spin_unlock_irqrestore(&hbus->device_list_lock, flags); - get_hvpcibus(hbus); - queue_work(hbus->wq, &dr_wrk->wrk); + if (pending_dr) { + kfree(dr_wrk); + } else { + get_hvpcibus(hbus); + queue_work(hbus->wq, &dr_wrk->wrk); + } } /**