From patchwork Wed Mar 7 14:28:30 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: 882635 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]) by ozlabs.org (Postfix) with ESMTP id 3zxGGl0DR3z9sfK; Thu, 8 Mar 2018 01:28:47 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1eta3f-0008D1-Dl; Wed, 07 Mar 2018 14:28:43 +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 1eta3c-0008Ao-1w for kernel-team@lists.ubuntu.com; Wed, 07 Mar 2018 14:28:40 +0000 Received: from mail-wm0-f71.google.com ([74.125.82.71]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1eta3b-00024W-Qa for kernel-team@lists.ubuntu.com; Wed, 07 Mar 2018 14:28:39 +0000 Received: by mail-wm0-f71.google.com with SMTP id v21so1219954wmh.9 for ; Wed, 07 Mar 2018 06:28:39 -0800 (PST) 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=Wn/9+MziDxjA5ku6qDHfzLHpZAFdFiq/SDK0udQgyco=; b=UrW6dbghr6cXfCWzRuFdnTwm3aX6su4h2YTHnvSjdfKT7XJG0vHSc0FJXH0oYNYre2 NDEtBXl69r5lQHalq1KN4ozuGKUI4XthbeOLGe5wehz6PJdIAS1fax9/E7ecR6rjroHe 0Lpz3k3hXMk+th6Ie7DggSUgnV99Oald2M9Tbv/Wxv4ODFdxrJkGslHnQmLR4+jVI0/y 9UwYhGjn5c1baLKlZHpFJAahSB78ZHTk8uPv5BIe3r8vqRxlp1IxpU96b/7IG/7l0ET2 QoNFQxhpJS9OrqEXB1fCTR4jEbAOiRxve3MmSX0+Dv4l1SpZ2LC9JjFC19DlogMnFaYJ zDFg== X-Gm-Message-State: APf1xPAWfFS3PRSA+WAa5wEFdIHb8G6u/mkvxNl33bQ/wOot86wYHvj9 uqhP2JgUYf4HW2WPZ894omq4SpBbLIxlBmvYE/TGXwdIpYcTqMOO+wSWxJ87zF13lTN73Bpc/jF tg8Lf99wP1OkR8rbnF4y/7p+UbhnfUzzasJ4Ja5PM X-Received: by 10.223.195.147 with SMTP id p19mr20395200wrf.224.1520432919199; Wed, 07 Mar 2018 06:28:39 -0800 (PST) X-Google-Smtp-Source: AG47ELtI8kGESpwZVBBjrnS/EAr3mxO4CWqaOD6/iewVCf1QwdNhFqWVwlYWBK+ZySD8tlsFQ1JyJQ== X-Received: by 10.223.195.147 with SMTP id p19mr20395194wrf.224.1520432919006; Wed, 07 Mar 2018 06:28:39 -0800 (PST) Received: from localhost.localdomain ([37.220.133.201]) by smtp.gmail.com with ESMTPSA id 4sm10124603wmz.31.2018.03.07.06.28.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Mar 2018 06:28:37 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [azure:x][PATCH v2 3/4] Revert "UBUNTU: SAUCE: vmbus: don't need to check interrupt mask on read side" Date: Wed, 7 Mar 2018 11:28:30 -0300 Message-Id: <1520432911-4667-4-git-send-email-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520432911-4667-1-git-send-email-marcelo.cerri@canonical.com> References: <1520432911-4667-1-git-send-email-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" BugLink: http://bugs.launchpad.net/bugs/1748662 This reverts commit 6bd427c166e666fa299c89081c7077f9aed81146. Signed-off-by: Marcelo Henrique Cerri --- drivers/hv/ring_buffer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/hv/ring_buffer.c b/drivers/hv/ring_buffer.c index 2f80666583c4..12eb8caa4263 100644 --- a/drivers/hv/ring_buffer.c +++ b/drivers/hv/ring_buffer.c @@ -423,6 +423,10 @@ void hv_pkt_iter_close(struct vmbus_channel *channel) */ virt_mb(); + /* If host has disabled notifications then skip */ + if (rbi->ring_buffer->interrupt_mask) + return; + if (rbi->ring_buffer->feature_bits.feat_pending_send_sz) { u32 pending_sz = READ_ONCE(rbi->ring_buffer->pending_send_sz);