From nobody Sat May 18 11:46:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1653910532; cv=none; d=zohomail.com; s=zohoarc; b=E0v/zNk4cPucy6RDtQNWrU+8msWGXOOw//dO0dhN0v62eOh1i1XM6aP7XzFK8+Am5VgdDtiVU524oX6kHqA5b+8I/L9NgWERswKA7uAr6F3W/XxO3XyFoa/wZMDWuyjMaEEPpbUGqC2bmwAn89EHRozYoVGMNC/z8j6AepwUQck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653910532; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=VtWEzLh+t2xI23/ZsFZwEDqX/MxDCN5dV6zj7JYIqG0=; b=dsDwnzGz419N7OfK8uydQOr+54d6U/yB6k3Fh6urR0dpaiR0QfgVbL9BQAq2asX2bWpujnrvp99TuFUkKMSy0c59XEf2+Bgn60kS2FVwlXHxritXsMQGVuwgns1/A8OgmDOTFlXwfaS2uJIxXw8sRJFf2pR/EbRTz1X6CLGe2t0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1653910532377778.0909996391476; Mon, 30 May 2022 04:35:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.338515.563295 (Exim 4.92) (envelope-from ) id 1nvdft-0005wT-Cs; Mon, 30 May 2022 11:35:05 +0000 Received: by outflank-mailman (output) from mailman id 338515.563295; Mon, 30 May 2022 11:35:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nvdft-0005wM-95; Mon, 30 May 2022 11:35:05 +0000 Received: by outflank-mailman (input) for mailman id 338515; Mon, 30 May 2022 11:35:03 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nvdfr-0005wG-Qs for xen-devel@lists.xenproject.org; Mon, 30 May 2022 11:35:03 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8b21b729-e00c-11ec-bd2c-47488cf2e6aa; Mon, 30 May 2022 13:35:02 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D410E21B63; Mon, 30 May 2022 11:35:01 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 86F9213A84; Mon, 30 May 2022 11:35:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id NmJ9H+WrlGLPdQAAMHmgww (envelope-from ); Mon, 30 May 2022 11:35:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8b21b729-e00c-11ec-bd2c-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1653910501; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=VtWEzLh+t2xI23/ZsFZwEDqX/MxDCN5dV6zj7JYIqG0=; b=XehnlzPLjv36KTNOB9J4ShMSmsMYHbhrrdLdVbWTzeBLyw+C7WdzQRfn0FE4QjFefjXu+V 9LpbUM5fdnYDbmN8XOeZr5O/vfu9gTM3n57PlUU7GaV/dDb35M/Sxs+tvFZQ772zKoJ726 nP0Rlld/SRDHZdIltFFXqS4Qj1FkTfk= From: Juergen Gross To: xen-devel@lists.xenproject.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Juergen Gross , Wei Liu , Paul Durrant , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jan Beulich Subject: [PATCH] xen/netback: fix incorrect usage of RING_HAS_UNCONSUMED_REQUESTS() Date: Mon, 30 May 2022 13:34:59 +0200 Message-Id: <20220530113459.20124-1-jgross@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1653910533818100001 Content-Type: text/plain; charset="utf-8" Commit 6fac592cca60 ("xen: update ring.h") missed to fix one use case of RING_HAS_UNCONSUMED_REQUESTS(). Reported-by: Jan Beulich Fixes: 6fac592cca60 ("xen: update ring.h") Signed-off-by: Juergen Gross Acked-by: Wei Liu Reviewed-by: Jan Beulich --- drivers/net/xen-netback/netback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/ne= tback.c index 0f7fd159f0f2..d93814c14a23 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -828,7 +828,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *q= ueue, break; } =20 - work_to_do =3D RING_HAS_UNCONSUMED_REQUESTS(&queue->tx); + work_to_do =3D XEN_RING_NR_UNCONSUMED_REQUESTS(&queue->tx); if (!work_to_do) break; =20 --=20 2.35.3