From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59CBAC433F5 for ; Thu, 7 Apr 2022 01:24:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238283AbiDGB0O (ORCPT ); Wed, 6 Apr 2022 21:26:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239666AbiDGBT0 (ORCPT ); Wed, 6 Apr 2022 21:19:26 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0BB01AE19A; Wed, 6 Apr 2022 18:14:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CF6C9B82692; Thu, 7 Apr 2022 01:14:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F6EDC385A8; Thu, 7 Apr 2022 01:14:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649294090; bh=s/wM9yw1sAuIFJAp3+xxsTnu7j5+IlJj2gurHg09ouM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MBauZixEz6txklnhEftxCdpEjKUczEmBADysQ4Cx2o4BEXP5tm0Gh4rzydc3MMXBQ sE9RRsqDrgycRk38aghqYqRS47Nvh2PanGVceXAwjGTsFMMBPNM76v2aeq0gAb8Uh+ inP5DVN8Kkphodg6DBT8YPyC+W4x1x/XgX8OF+CN22m2CBwK/3hZ1CCJO+hxGVswh4 aJGTC8FsdL8StMLW/O8RIceg5vyxMvVC3GNuXGImDUE7P2Zu6K9TEkMMHVQY+KO9uU 42s1xSMosJK5NCmwcvExXH8fNUtxbfEpvkrzDCY+Eu5IbrOHldRwXgLjXG5Ap529qt dz1EwbirGCmog== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhu Lingshan , "Michael S . Tsirkin" , Sasha Levin , jasowang@redhat.com, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 15/25] vhost_vdpa: don't setup irq offloading when irq_num < 0 Date: Wed, 6 Apr 2022 21:14:03 -0400 Message-Id: <20220407011413.114662-15-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407011413.114662-1-sashal@kernel.org> References: <20220407011413.114662-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhu Lingshan [ Upstream commit cce0ab2b2a39072d81f98017f7b076f3410ef740 ] When irq number is negative(e.g., -EINVAL), the virtqueue may be disabled or the virtqueues are sharing a device irq. In such case, we should not setup irq offloading for a virtqueue. Signed-off-by: Zhu Lingshan Link: https://lore.kernel.org/r/20220222115428.998334-3-lingshan.zhu@intel.com Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin --- drivers/vhost/vdpa.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index e4d60009d908..04578aa87e4d 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -97,8 +97,11 @@ static void vhost_vdpa_setup_vq_irq(struct vhost_vdpa *v, u16 qid) return; irq = ops->get_vq_irq(vdpa, qid); + if (irq < 0) + return; + irq_bypass_unregister_producer(&vq->call_ctx.producer); - if (!vq->call_ctx.ctx || irq < 0) + if (!vq->call_ctx.ctx) return; vq->call_ctx.producer.token = vq->call_ctx.ctx; -- 2.35.1