From patchwork Sat Feb 20 01:44:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 12096547 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C133AC433E0 for ; Sat, 20 Feb 2021 01:45:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E85B64ECA for ; Sat, 20 Feb 2021 01:45:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229884AbhBTBpV (ORCPT ); Fri, 19 Feb 2021 20:45:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229863AbhBTBpU (ORCPT ); Fri, 19 Feb 2021 20:45:20 -0500 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A19EDC061786 for ; Fri, 19 Feb 2021 17:44:40 -0800 (PST) Received: by mail-pg1-x54a.google.com with SMTP id m14so4724361pgr.9 for ; Fri, 19 Feb 2021 17:44:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=WIG7k9z1vYZ8VYEW1iHf41oncCu0hnEz4QoUdkTkx+k=; b=iOdUPSiGq7n29MCOOHxMTG1QabzuEc/lqzj/Bq9NwXdZSQ/AQXuxQXsVdt0PEK8oY1 FMHwpzQZt2BaWX5LNaLqoLhiYhX6WTF8Q6HSRmqyTPqrcibCpnxBXZJPO3Om+AVqksPQ 78c+tc41oe8zQwL9QebEdzCailLkpHUcyc0xPGbesjy3c7X3+6mlFdY9iYDSVS/etlxp pW/J7FbNrM5ksfeHnVwLJdmdpQsdAnhK+vSOLkqMXvls10j7KA+xBLPBFTBKb6kqYKiS Ay2Hf1VztZy4qohIbXZHjeqh8FRv6Yktq231qc6C8enW8pL8tcsoCA/RjoKWLx6iuYEE k0eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=WIG7k9z1vYZ8VYEW1iHf41oncCu0hnEz4QoUdkTkx+k=; b=ZnRmQSUZCQAyJ6Y3VfZyCiji0Kk7Lut2rxLLOh+YdOOmb0kndgQ8DzrOQEoqL28ic9 g8Il0aWeXtLaO6mBDajXdsZPJJ51mLZGA5Qsa4N80h+f1DOUnkGTOZBMnOi240ACW6hV 4fCh7uEYoPsapSw5wf18/VqZqvlhh8MzeCUp42KulKn8tYmBVUrnq9QqjbcZZZ8AOVsB dYwLhKpzXA1QbCp74e7BbfMga9TShOS+YbHtzGyhmXdTw/YHWebk3KGQxM/lL4BWx8dm Q5f2fdJY2CtPX2Sstgi6hNt+Q1D3DAewBpjhzOWpBjV1Fq7Bkgrk+d8q0WOcB+yKLxZK ZQLw== X-Gm-Message-State: AOAM533xLEGEXgW6U0Bs89GT6hePXlGeBLaubj6zMGQwsP8yBf4jfC5o b0ebzWfcggNNuQFCp8LwdUkdv81CNYw= X-Google-Smtp-Source: ABdhPJyDAEU9W4Gc9sSfgLaODM2M+WY2CPc4utQW/M5tVd3AL02DxfLtKhgJ8FcL2sMTozCAjtcqCTSGNO8= Sender: "weiwan via sendgmr" X-Received: from weiwan.svl.corp.google.com ([2620:15c:2c4:201:9433:f9ff:6bb7:ac32]) (user=weiwan job=sendgmr) by 2002:aa7:94aa:0:b029:1eb:7783:69c5 with SMTP id a10-20020aa794aa0000b02901eb778369c5mr4546779pfl.60.1613785480039; Fri, 19 Feb 2021 17:44:40 -0800 (PST) Date: Fri, 19 Feb 2021 17:44:35 -0800 In-Reply-To: <20210220014436.3556492-1-weiwan@google.com> Message-Id: <20210220014436.3556492-2-weiwan@google.com> Mime-Version: 1.0 References: <20210220014436.3556492-1-weiwan@google.com> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog Subject: [PATCH net v2 1/2] virtio: add a new parameter in struct virtqueue From: Wei Wang To: "Michael S . Tsirkin" , Jason Wang , "David S . Miller" , Jakub Kicinski Cc: Willem de Bruijn , virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The new parameter is set to suppress the warning in the interrupt handler when no work needs to be done. This will be used for virtio net driver in the following patch. Signed-off-by: Wei Wang Signed-off-by: Willem de Bruijn --- drivers/virtio/virtio_ring.c | 16 ++++++++++++++++ include/linux/virtio.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 71e16b53e9c1..3c5ac1b26dff 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -105,6 +105,9 @@ struct vring_virtqueue { /* Host publishes avail event idx */ bool event; + /* Suppress warning in interrupt handler */ + bool no_interrupt_check; + /* Head of free buffer list. */ unsigned int free_head; /* Number we've added since last sync. */ @@ -1604,6 +1607,7 @@ static struct virtqueue *vring_create_virtqueue_packed( vq->notify = notify; vq->weak_barriers = weak_barriers; vq->broken = false; + vq->no_interrupt_check = false; vq->last_used_idx = 0; vq->num_added = 0; vq->packed_ring = true; @@ -2037,6 +2041,9 @@ irqreturn_t vring_interrupt(int irq, void *_vq) struct vring_virtqueue *vq = to_vvq(_vq); if (!more_used(vq)) { + if (vq->no_interrupt_check) + return IRQ_HANDLED; + pr_debug("virtqueue interrupt with no work for %p\n", vq); return IRQ_NONE; } @@ -2082,6 +2089,7 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index, vq->notify = notify; vq->weak_barriers = weak_barriers; vq->broken = false; + vq->no_interrupt_check = false; vq->last_used_idx = 0; vq->num_added = 0; vq->use_dma_api = vring_use_dma_api(vdev); @@ -2266,6 +2274,14 @@ bool virtqueue_is_broken(struct virtqueue *_vq) } EXPORT_SYMBOL_GPL(virtqueue_is_broken); +void virtqueue_set_no_interrupt_check(struct virtqueue *_vq, bool val) +{ + struct vring_virtqueue *vq = to_vvq(_vq); + + vq->no_interrupt_check = val; +} +EXPORT_SYMBOL_GPL(virtqueue_set_no_interrupt_check); + /* * This should prevent the device from being used, allowing drivers to * recover. You may need to grab appropriate locks to flush. diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 55ea329fe72a..27b374df78cc 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -84,6 +84,8 @@ unsigned int virtqueue_get_vring_size(struct virtqueue *vq); bool virtqueue_is_broken(struct virtqueue *vq); +void virtqueue_set_no_interrupt_check(struct virtqueue *vq, bool val); + const struct vring *virtqueue_get_vring(struct virtqueue *vq); dma_addr_t virtqueue_get_desc_addr(struct virtqueue *vq); dma_addr_t virtqueue_get_avail_addr(struct virtqueue *vq); From patchwork Sat Feb 20 01:44:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 12096549 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6F99C433E6 for ; Sat, 20 Feb 2021 01:45:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A167F64EB3 for ; Sat, 20 Feb 2021 01:45:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229891AbhBTBpa (ORCPT ); Fri, 19 Feb 2021 20:45:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229863AbhBTBpX (ORCPT ); Fri, 19 Feb 2021 20:45:23 -0500 Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0253C06178A for ; Fri, 19 Feb 2021 17:44:42 -0800 (PST) Received: by mail-qk1-x74a.google.com with SMTP id b5so3832244qka.16 for ; Fri, 19 Feb 2021 17:44:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=lkx/1n1XTmEjSnBjwj9YX++Tm4ZPP9ikGerEFgccbPw=; b=jmc6S+ECED++E0XuxEv8z17lyPmtHSYNRRS9RvglSCdgNoh6zNpBMfjIg6MGjWW4lW qbdIxZ62xIpKUnEI1Fl94n5zszoKigH79rHIbUy9lriOGL/mqGLj0oxORLii8acZI4TP oHwKVRR0MEXoon3fpmnbSSgpv5Jo+sXvCkN5wDFAYu4/8dShgdLK5tpiTkubzVWtv9qS W38tFFQ4gr8kXWSTr2Rg8g5SZlMp4eA3LY0E4Cw8SC3LW9MYoe+Uit+Iqqe0YVWV4UuD d8sExh3ai1EU55MbforNYym9mQ/EUtcSOB6SCerXO6zSH4YbsXixQg0clB/STEO+lRvV nFFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=lkx/1n1XTmEjSnBjwj9YX++Tm4ZPP9ikGerEFgccbPw=; b=mBRaqenQLKLBb6JLr5qxGhT8sS6VA1su4wQXTHYC8noydrBAXiHK3tix3OxXkumvXH 8FjZ9Fn9TUty7tGt1CMP/R/sJCGM9M01jT44MPfDDYch52EQgT9afcnVmhS8HY+8vHdb ffMDHNVJfM6gAbwBQUzPY9djnK7a5Fuq/1YViQqQ/6uss3B9B3F4OGZH+LfAFqdUnJu1 jccBE7HesRi3UT6APpZFUtZHZex3GEV0tOVC8MnfE6i9q60rznJtEIWRCF1QsZa17b+g BEQSg5NoFBhL401hUT0wANIRBwByTn6vS2c4PSRJmIlqai/7/QpDmBrfF0iqYICbIUQd 2utg== X-Gm-Message-State: AOAM531CyWzT/bZYHxBMGt0ygmVLan7a9zmuZt0ArHX8MypCWeakDyfC 0Wibq9RDBG2SEssx9brwgOWddAmTAsc= X-Google-Smtp-Source: ABdhPJyAvTGsGRJ18wIEyOkIPrf0vVCIGlPwIwPrL7MDexokI/IaTm5y7GXiVq3hHSh9IELNEjwh5PS0nY0= Sender: "weiwan via sendgmr" X-Received: from weiwan.svl.corp.google.com ([2620:15c:2c4:201:9433:f9ff:6bb7:ac32]) (user=weiwan job=sendgmr) by 2002:ad4:55c5:: with SMTP id bt5mr11686543qvb.58.1613785482012; Fri, 19 Feb 2021 17:44:42 -0800 (PST) Date: Fri, 19 Feb 2021 17:44:36 -0800 In-Reply-To: <20210220014436.3556492-1-weiwan@google.com> Message-Id: <20210220014436.3556492-3-weiwan@google.com> Mime-Version: 1.0 References: <20210220014436.3556492-1-weiwan@google.com> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog Subject: [PATCH net v2 2/2] virtio-net: suppress bad irq warning for tx napi From: Wei Wang To: "Michael S . Tsirkin" , Jason Wang , "David S . Miller" , Jakub Kicinski Cc: Willem de Bruijn , virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org With the implementation of napi-tx in virtio driver, we clean tx descriptors from rx napi handler, for the purpose of reducing tx complete interrupts. But this could introduce a race where tx complete interrupt has been raised, but the handler found there is no work to do because we have done the work in the previous rx interrupt handler. This could lead to the following warning msg: [ 3588.010778] irq 38: nobody cared (try booting with the "irqpoll" option) [ 3588.017938] CPU: 4 PID: 0 Comm: swapper/4 Not tainted 5.3.0-19-generic #20~18.04.2-Ubuntu [ 3588.017940] Call Trace: [ 3588.017942] [ 3588.017951] dump_stack+0x63/0x85 [ 3588.017953] __report_bad_irq+0x35/0xc0 [ 3588.017955] note_interrupt+0x24b/0x2a0 [ 3588.017956] handle_irq_event_percpu+0x54/0x80 [ 3588.017957] handle_irq_event+0x3b/0x60 [ 3588.017958] handle_edge_irq+0x83/0x1a0 [ 3588.017961] handle_irq+0x20/0x30 [ 3588.017964] do_IRQ+0x50/0xe0 [ 3588.017966] common_interrupt+0xf/0xf [ 3588.017966] [ 3588.017989] handlers: [ 3588.020374] [<000000001b9f1da8>] vring_interrupt [ 3588.025099] Disabling IRQ #38 This patch sets no_interrupt_check in tx vring_virtqueue, when napi-tx is enabled, to suppress the warning in such case. Fixes: 7b0411ef4aa6 ("virtio-net: clean tx descriptors from rx napi") Reported-by: Rick Jones Signed-off-by: Wei Wang Signed-off-by: Willem de Bruijn --- drivers/net/virtio_net.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 508408fbe78f..18b14739d63e 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1303,13 +1303,22 @@ static void virtnet_napi_tx_enable(struct virtnet_info *vi, return; } + /* With napi_tx enabled, free_old_xmit_skbs() could be called from + * rx napi handler. Set no_interrupt_check to suppress bad irq warning + * for IRQ_NONE case from tx complete interrupt handler. + */ + virtqueue_set_no_interrupt_check(vq, true); + return virtnet_napi_enable(vq, napi); } -static void virtnet_napi_tx_disable(struct napi_struct *napi) +static void virtnet_napi_tx_disable(struct virtqueue *vq, + struct napi_struct *napi) { - if (napi->weight) + if (napi->weight) { napi_disable(napi); + virtqueue_set_no_interrupt_check(vq, false); + } } static void refill_work(struct work_struct *work) @@ -1835,7 +1844,7 @@ static int virtnet_close(struct net_device *dev) for (i = 0; i < vi->max_queue_pairs; i++) { xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq); napi_disable(&vi->rq[i].napi); - virtnet_napi_tx_disable(&vi->sq[i].napi); + virtnet_napi_tx_disable(vi->sq[i].vq, &vi->sq[i].napi); } return 0; @@ -2315,7 +2324,7 @@ static void virtnet_freeze_down(struct virtio_device *vdev) if (netif_running(vi->dev)) { for (i = 0; i < vi->max_queue_pairs; i++) { napi_disable(&vi->rq[i].napi); - virtnet_napi_tx_disable(&vi->sq[i].napi); + virtnet_napi_tx_disable(vi->sq[i].vq, &vi->sq[i].napi); } } } @@ -2440,7 +2449,7 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, if (netif_running(dev)) { for (i = 0; i < vi->max_queue_pairs; i++) { napi_disable(&vi->rq[i].napi); - virtnet_napi_tx_disable(&vi->sq[i].napi); + virtnet_napi_tx_disable(vi->sq[i].vq, &vi->sq[i].napi); } }