From nobody Tue Apr 16 16:09:13 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=1678804093; cv=none; d=zohomail.com; s=zohoarc; b=mYSbEVSz9VDKHb2M/bam9QDKRoNOyTr07GFnwvL/4WaJXe/IqdI19M/5RXtohta/5OFaVtn29hqvtgg7NeAlH6/w2TFxZ3wIrMvq4jIoqfkNZXixZBulv+Kf8lFbkcZDbr1224cV0V7XJLMY0wv/HYSyQNKPfJ0fT5Lnh7atZQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678804093; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n8TxNKtpI04XLAnLEmz7M3NSUXuLRT6vG3gdFIDxCXU=; b=Ve0j0vxH/q4SqzbY94wLx553oUrjBIT3G/iCvu3NWxS7g4XQL2I8QBIVHvF0PLBooGJru94yjLjR7WE+Dphp/sHr8exvS0ealBlSaeZMkhEAIIqKJFJa4WVXcpjHkiR6X25btQ7v1ba5Bj3/WiGNnCqNFBtw5HzuJOw8ExPfzp8= 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 1678804092992660.3417566752305; Tue, 14 Mar 2023 07:28:12 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.509662.785858 (Exim 4.92) (envelope-from ) id 1pc5d3-0003Qh-RU; Tue, 14 Mar 2023 14:27:53 +0000 Received: by outflank-mailman (output) from mailman id 509662.785858; Tue, 14 Mar 2023 14:27:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pc5d3-0003Qa-OM; Tue, 14 Mar 2023 14:27:53 +0000 Received: by outflank-mailman (input) for mailman id 509662; Tue, 14 Mar 2023 14:27:52 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pc5d2-0003Pt-JL for xen-devel@lists.xenproject.org; Tue, 14 Mar 2023 14:27:52 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 660bc775-c274-11ed-b464-930f4c7d94ae; Tue, 14 Mar 2023 15:27:50 +0100 (CET) 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-out2.suse.de (Postfix) with ESMTPS id 21FA21F899; Tue, 14 Mar 2023 14:27:50 +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 D7DEC13A26; Tue, 14 Mar 2023 14:27:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id itxPM2WEEGSlHQAAMHmgww (envelope-from ); Tue, 14 Mar 2023 14:27:49 +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: 660bc775-c274-11ed-b464-930f4c7d94ae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1678804070; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n8TxNKtpI04XLAnLEmz7M3NSUXuLRT6vG3gdFIDxCXU=; b=TEKm+kbgBv5DNKUVg3fZVCjzh4vkguPjGhL+guVf0uW/1MQ3c4bjHWJmBRM27+NYVtaBmX sT9vW4z1vPpy6G3G/6ScEW8hEFfY0ksYLNNh2M8vmtkYhI3oK4SwXcpNajGIcuJ4Vm/qRn pIbfX21rDC/9PIkVGDg7vXXuGPjZi+0= From: Juergen Gross To: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Cc: Juergen Gross , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Jens Axboe , xen-devel@lists.xenproject.org Subject: [PATCH v2 1/4] xen/blkback: fix white space code style issues Date: Tue, 14 Mar 2023 15:27:38 +0100 Message-Id: <20230314142741.24917-2-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230314142741.24917-1-jgross@suse.com> References: <20230314142741.24917-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1678804094826100003 Signed-off-by: Juergen Gross Acked-by: Roger Pau Monn=C3=A9 --- drivers/block/xen-blkback/blkback.c | 2 +- drivers/block/xen-blkback/common.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkbac= k/blkback.c index a5cf7f1e871c..6e2163aaf362 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -891,7 +891,7 @@ static int xen_blkbk_map(struct xen_blkif_ring *ring, out: for (i =3D last_map; i < num; i++) { /* Don't zap current batch's valid persistent grants. */ - if(i >=3D map_until) + if (i >=3D map_until) pages[i]->persistent_gnt =3D NULL; pages[i]->handle =3D BLKBACK_INVALID_HANDLE; } diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback= /common.h index a28473470e66..9a13a6b420a6 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h @@ -296,7 +296,7 @@ struct xen_blkif_ring { struct work_struct free_work; /* Thread shutdown wait queue. */ wait_queue_head_t shutdown_wq; - struct xen_blkif *blkif; + struct xen_blkif *blkif; }; =20 struct xen_blkif { @@ -315,7 +315,7 @@ struct xen_blkif { atomic_t drain; =20 struct work_struct free_work; - unsigned int nr_ring_pages; + unsigned int nr_ring_pages; bool multi_ref; /* All rings for this device. */ struct xen_blkif_ring *rings; @@ -329,7 +329,7 @@ struct seg_buf { }; =20 struct grant_page { - struct page *page; + struct page *page; struct persistent_gnt *persistent_gnt; grant_handle_t handle; grant_ref_t gref; --=20 2.35.3 From nobody Tue Apr 16 16:09:13 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=1678804094; cv=none; d=zohomail.com; s=zohoarc; b=Uub+khAUGRlLi5GpAHZzcRbhUuAhVCfBu6j5GLYWFTGIrjRWO9bR2lSuHZNuGf+dne1M5GXy48JYGjbQc+ZwDbGcGty8yBs9ZVzftAQQ5MX/X9kZZuIZoR1M26a5NTpmJOe8Rz/XxBNa9irBMIvf/mmTbT4F/Q/CCY8sAaoBq5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678804094; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FqlDj5UjmiMEvoSqLoc8v4qWW4pHq8z/st4qCe4e2C4=; b=SIDmSfSmsRnIQSgUV8LThsQfLkD2mwvtKbIBpClRpxSnaLkrAtE4UpKSTzAhA5kVc67w3f97mHQNpsrTtslxD257bFZKszwLFdSBBfsaX/TJikBkGlPVQgC+RnlA2F2foMZfm4x6YrktPJwQpwJ9PuMYelba5zucwA1ZFld+0qI= 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 16788040943248.525062549823247; Tue, 14 Mar 2023 07:28:14 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.509663.785868 (Exim 4.92) (envelope-from ) id 1pc5d9-0003k2-7u; Tue, 14 Mar 2023 14:27:59 +0000 Received: by outflank-mailman (output) from mailman id 509663.785868; Tue, 14 Mar 2023 14:27:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pc5d9-0003jv-3P; Tue, 14 Mar 2023 14:27:59 +0000 Received: by outflank-mailman (input) for mailman id 509663; Tue, 14 Mar 2023 14:27:57 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pc5d7-0003Pt-Hv for xen-devel@lists.xenproject.org; Tue, 14 Mar 2023 14:27:57 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [2001:67c:2178:6::1d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 695cc9be-c274-11ed-b464-930f4c7d94ae; Tue, 14 Mar 2023 15:27:56 +0100 (CET) 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-out2.suse.de (Postfix) with ESMTPS id B1A161F899; Tue, 14 Mar 2023 14:27:55 +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 7913413A26; Tue, 14 Mar 2023 14:27:55 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 799bHGuEEGSwHQAAMHmgww (envelope-from ); Tue, 14 Mar 2023 14:27:55 +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: 695cc9be-c274-11ed-b464-930f4c7d94ae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1678804075; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FqlDj5UjmiMEvoSqLoc8v4qWW4pHq8z/st4qCe4e2C4=; b=XedR/elBQfI+Fz7FgpPVP+ZbOWuN0G/kycE+YIYHG4ucOgb2jqbq/RsT3P01YYQc+jh+sD p7AUUWfpWVa3R7aQTs5LIveOP60zG+VFTOWn/LG+1mrwU+jRNEANIJTd2m81lRdJqETmfr 76hrkOJfJyw/GrSMrGqgR2qjN60oV4I= From: Juergen Gross To: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Cc: Juergen Gross , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Jens Axboe , xen-devel@lists.xenproject.org Subject: [PATCH v2 2/4] xen/blkback: remove stale prototype Date: Tue, 14 Mar 2023 15:27:39 +0100 Message-Id: <20230314142741.24917-3-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230314142741.24917-1-jgross@suse.com> References: <20230314142741.24917-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1678804096965100001 There is no function xen_blkif_purge_persistent(), so remove its prototype from common.h. Signed-off-by: Juergen Gross Acked-by: Roger Pau Monn=C3=A9 --- drivers/block/xen-blkback/common.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback= /common.h index 9a13a6b420a6..fab8a8dee0da 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h @@ -384,7 +384,6 @@ void xen_blkif_xenbus_fini(void); =20 irqreturn_t xen_blkif_be_int(int irq, void *dev_id); int xen_blkif_schedule(void *arg); -int xen_blkif_purge_persistent(void *arg); void xen_blkbk_free_caches(struct xen_blkif_ring *ring); =20 int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt, --=20 2.35.3 From nobody Tue Apr 16 16:09:13 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=1678804098; cv=none; d=zohomail.com; s=zohoarc; b=VQ1KqkNk0k9oiyrqLJyZA14uCLcii3FTHkp/ree8Omo92ZfEOhSLYXhvXwYWO/ibIAhWU839k2/bdxd4MBPTYdwF7m3gvrIMC7U5EYVKClr5/vgpAs81pZ2ydFoULXQjZCCGQIffs/Xp+qHT4Bg63vup6QrC5H36ipmUxkqbQ1s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678804098; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YQkdvt8NYukRjF+Ds3SdGmmVwPLCu/YYxvWBQMre+ic=; b=YugiDzVjT5xCoNjnuqTqPbsqRxrozfGqosaA8yBMcQ4G0mOsGh0wkOkRsL6neIpvBuGhev0rqQ3H3Zo0MCosYtXKu3yUg+CVnVO05upnW1JMgZamrycSrj/KFT7OQoJgxax/agKc2AvQ1kZB2zXwGe+IUmvlB3N4mqlcnYWbiWk= 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 167880409846410.50503300374146; Tue, 14 Mar 2023 07:28:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.509665.785888 (Exim 4.92) (envelope-from ) id 1pc5dE-0004O8-N9; Tue, 14 Mar 2023 14:28:04 +0000 Received: by outflank-mailman (output) from mailman id 509665.785888; Tue, 14 Mar 2023 14:28:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pc5dE-0004Nv-Jh; Tue, 14 Mar 2023 14:28:04 +0000 Received: by outflank-mailman (input) for mailman id 509665; Tue, 14 Mar 2023 14:28:03 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pc5dD-0003Pt-7P for xen-devel@lists.xenproject.org; Tue, 14 Mar 2023 14:28:03 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [2001:67c:2178:6::1d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6cb6f4ca-c274-11ed-b464-930f4c7d94ae; Tue, 14 Mar 2023 15:28:01 +0100 (CET) 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-out2.suse.de (Postfix) with ESMTPS id 53B531F895; Tue, 14 Mar 2023 14:28: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 1DC2613A26; Tue, 14 Mar 2023 14:28:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id GtPwBXGEEGS5HQAAMHmgww (envelope-from ); Tue, 14 Mar 2023 14:28: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: 6cb6f4ca-c274-11ed-b464-930f4c7d94ae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1678804081; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YQkdvt8NYukRjF+Ds3SdGmmVwPLCu/YYxvWBQMre+ic=; b=Os78CKbilJv7eTocbxp/zCyP54ecpzEQVxmoyhyCICAh5f6ie6ajyuECtWEdMY97EN5YCj frkhMXCBsUzGFenYjiPfQBJ7JVV7QRo8acDq6jU6tI91dZ8qcW6x50/+Suyy2NjSWA6c21 WES7bQWWs6pBRl05EfZgMa46Fp89GYE= From: Juergen Gross To: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Cc: Juergen Gross , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Jens Axboe , xen-devel@lists.xenproject.org Subject: [PATCH v2 3/4] xen/blkback: simplify free_persistent_gnts() interface Date: Tue, 14 Mar 2023 15:27:40 +0100 Message-Id: <20230314142741.24917-4-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230314142741.24917-1-jgross@suse.com> References: <20230314142741.24917-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1678804100130100001 The interface of free_persistent_gnts() can be simplified, as there is only a single caller of free_persistent_gnts() and the 2nd and 3rd parameters are easily obtainable via the ring pointer, which is passed as the first parameter anyway. Signed-off-by: Juergen Gross Acked-by: Roger Pau Monn=C3=A9 --- drivers/block/xen-blkback/blkback.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkbac= k/blkback.c index 6e2163aaf362..243712b59a05 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -239,9 +239,9 @@ static void put_persistent_gnt(struct xen_blkif_ring *r= ing, atomic_dec(&ring->persistent_gnt_in_use); } =20 -static void free_persistent_gnts(struct xen_blkif_ring *ring, struct rb_ro= ot *root, - unsigned int num) +static void free_persistent_gnts(struct xen_blkif_ring *ring) { + struct rb_root *root =3D &ring->persistent_gnts; struct gnttab_unmap_grant_ref unmap[BLKIF_MAX_SEGMENTS_PER_REQUEST]; struct page *pages[BLKIF_MAX_SEGMENTS_PER_REQUEST]; struct persistent_gnt *persistent_gnt; @@ -249,6 +249,9 @@ static void free_persistent_gnts(struct xen_blkif_ring = *ring, struct rb_root *ro int segs_to_unmap =3D 0; struct gntab_unmap_queue_data unmap_data; =20 + if (RB_EMPTY_ROOT(root)) + return; + unmap_data.pages =3D pages; unmap_data.unmap_ops =3D unmap; unmap_data.kunmap_ops =3D NULL; @@ -277,9 +280,11 @@ static void free_persistent_gnts(struct xen_blkif_ring= *ring, struct rb_root *ro =20 rb_erase(&persistent_gnt->node, root); kfree(persistent_gnt); - num--; + ring->persistent_gnt_c--; } - BUG_ON(num !=3D 0); + + BUG_ON(!RB_EMPTY_ROOT(&ring->persistent_gnts)); + BUG_ON(ring->persistent_gnt_c !=3D 0); } =20 void xen_blkbk_unmap_purged_grants(struct work_struct *work) @@ -631,12 +636,7 @@ int xen_blkif_schedule(void *arg) void xen_blkbk_free_caches(struct xen_blkif_ring *ring) { /* Free all persistent grant pages */ - if (!RB_EMPTY_ROOT(&ring->persistent_gnts)) - free_persistent_gnts(ring, &ring->persistent_gnts, - ring->persistent_gnt_c); - - BUG_ON(!RB_EMPTY_ROOT(&ring->persistent_gnts)); - ring->persistent_gnt_c =3D 0; + free_persistent_gnts(ring); =20 /* Since we are shutting down remove all pages from the buffer */ gnttab_page_cache_shrink(&ring->free_pages, 0 /* All */); --=20 2.35.3 From nobody Tue Apr 16 16:09:13 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=1678804107; cv=none; d=zohomail.com; s=zohoarc; b=DlP7unebmhkoqdn/BaMEEmaJFCr5ddrM0LixLRB8OPSbPMJiJF56txEhJGwU1xgANoRCTjGFdiEAV/YZMg0LT62LB7rEyZZCJXwKUrHytDDLSPGD0UJuPAHXqDDFQO/30rCCcEYIoF3FKXM+nRvwwRsL3Y7PFje/UtXzXlpGTTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678804107; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1zEkV0KKFS11XXVqEf9jhtR2fN1YoNqxonAwEeQxw4s=; b=fMLeN/bhM1aE3q5L8uLO0ehBW/dC39530DGX/zBO8QkwV8PJnyAJpTR+g9NZ48Ur+NM0Ar6LrDsg7a3QJ+D4lnT10Ps/yi2+E5kZlcw+3LH9GTxrUkhysn/GPqGhrn37DYWGBHFDcJkl2fWizCgM7JodxH1Iq85AAhIdLWahiC0= 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 1678804107964227.60732233336478; Tue, 14 Mar 2023 07:28:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.509666.785898 (Exim 4.92) (envelope-from ) id 1pc5dK-0004qo-V7; Tue, 14 Mar 2023 14:28:10 +0000 Received: by outflank-mailman (output) from mailman id 509666.785898; Tue, 14 Mar 2023 14:28:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pc5dK-0004qa-S9; Tue, 14 Mar 2023 14:28:10 +0000 Received: by outflank-mailman (input) for mailman id 509666; Tue, 14 Mar 2023 14:28:09 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pc5dJ-0003Pt-7s for xen-devel@lists.xenproject.org; Tue, 14 Mar 2023 14:28:09 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 700b305f-c274-11ed-b464-930f4c7d94ae; Tue, 14 Mar 2023 15:28:07 +0100 (CET) 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 E472721C64; Tue, 14 Mar 2023 14:28:06 +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 B523C13A26; Tue, 14 Mar 2023 14:28:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id c7PSKnaEEGTJHQAAMHmgww (envelope-from ); Tue, 14 Mar 2023 14:28:06 +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: 700b305f-c274-11ed-b464-930f4c7d94ae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1678804086; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1zEkV0KKFS11XXVqEf9jhtR2fN1YoNqxonAwEeQxw4s=; b=l0QTSYHFh/JivXw+osBjNn21s5R3lRFmR9Oj6r6PZGQHRM/5+BKk1Sp64V6BCAy3lzvs5R 3aBOzw9tLKmQUHC1MoAelABg3epuWR5hZqVejuwdUvX3Jo3NZBAGkqcs3WcZteYXX1tXnv L/PKbobwmaT70QsnpbQXKm3/cbaKuFA= From: Juergen Gross To: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Cc: Juergen Gross , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Jens Axboe , xen-devel@lists.xenproject.org Subject: [PATCH v2 4/4] xen/blkback: move blkif_get_x86_*_req() into blkback.c Date: Tue, 14 Mar 2023 15:27:41 +0100 Message-Id: <20230314142741.24917-5-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230314142741.24917-1-jgross@suse.com> References: <20230314142741.24917-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1678804112342100001 There is no need to have the functions blkif_get_x86_32_req() and blkif_get_x86_64_req() in a header file, as they are used in one place only. So move them into the using source file and drop the inline qualifier. While at it fix some style issues, and simplify the code by variable reusing and using min() instead of open coding it. Instead of using barrier() use READ_ONCE() for avoiding multiple reads of nr_segments. Signed-off-by: Juergen Gross Acked-by: Roger Pau Monn=C3=A9 --- V2: - add const, use unsigned int for loop counters (Roger Pau Monn=C3=A9) --- drivers/block/xen-blkback/blkback.c | 104 ++++++++++++++++++++++++++++ drivers/block/xen-blkback/common.h | 96 ------------------------- 2 files changed, 104 insertions(+), 96 deletions(-) diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkbac= k/blkback.c index 243712b59a05..ab6308b2d328 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -1072,7 +1072,111 @@ static void end_block_io_op(struct bio *bio) bio_put(bio); } =20 +static void blkif_get_x86_32_req(struct blkif_request *dst, + const struct blkif_x86_32_request *src) +{ + unsigned int i, n; + + dst->operation =3D READ_ONCE(src->operation); + + switch (dst->operation) { + case BLKIF_OP_READ: + case BLKIF_OP_WRITE: + case BLKIF_OP_WRITE_BARRIER: + case BLKIF_OP_FLUSH_DISKCACHE: + dst->u.rw.nr_segments =3D READ_ONCE(src->u.rw.nr_segments); + dst->u.rw.handle =3D src->u.rw.handle; + dst->u.rw.id =3D src->u.rw.id; + dst->u.rw.sector_number =3D src->u.rw.sector_number; + n =3D min_t(unsigned int, BLKIF_MAX_SEGMENTS_PER_REQUEST, + dst->u.rw.nr_segments); + for (i =3D 0; i < n; i++) + dst->u.rw.seg[i] =3D src->u.rw.seg[i]; + break; + + case BLKIF_OP_DISCARD: + dst->u.discard.flag =3D src->u.discard.flag; + dst->u.discard.id =3D src->u.discard.id; + dst->u.discard.sector_number =3D src->u.discard.sector_number; + dst->u.discard.nr_sectors =3D src->u.discard.nr_sectors; + break; + + case BLKIF_OP_INDIRECT: + dst->u.indirect.indirect_op =3D src->u.indirect.indirect_op; + dst->u.indirect.nr_segments =3D + READ_ONCE(src->u.indirect.nr_segments); + dst->u.indirect.handle =3D src->u.indirect.handle; + dst->u.indirect.id =3D src->u.indirect.id; + dst->u.indirect.sector_number =3D src->u.indirect.sector_number; + n =3D min(MAX_INDIRECT_PAGES, + INDIRECT_PAGES(dst->u.indirect.nr_segments)); + for (i =3D 0; i < n; i++) + dst->u.indirect.indirect_grefs[i] =3D + src->u.indirect.indirect_grefs[i]; + break; + + default: + /* + * Don't know how to translate this op. Only get the + * ID so failure can be reported to the frontend. + */ + dst->u.other.id =3D src->u.other.id; + break; + } +} =20 +static void blkif_get_x86_64_req(struct blkif_request *dst, + struct blkif_x86_64_request *src) +{ + int i, n; + + dst->operation =3D READ_ONCE(src->operation); + + switch (dst->operation) { + case BLKIF_OP_READ: + case BLKIF_OP_WRITE: + case BLKIF_OP_WRITE_BARRIER: + case BLKIF_OP_FLUSH_DISKCACHE: + dst->u.rw.nr_segments =3D READ_ONCE(src->u.rw.nr_segments); + dst->u.rw.handle =3D src->u.rw.handle; + dst->u.rw.id =3D src->u.rw.id; + dst->u.rw.sector_number =3D src->u.rw.sector_number; + n =3D min_t(int, BLKIF_MAX_SEGMENTS_PER_REQUEST, + dst->u.rw.nr_segments); + for (i =3D 0; i < n; i++) + dst->u.rw.seg[i] =3D src->u.rw.seg[i]; + break; + + case BLKIF_OP_DISCARD: + dst->u.discard.flag =3D src->u.discard.flag; + dst->u.discard.id =3D src->u.discard.id; + dst->u.discard.sector_number =3D src->u.discard.sector_number; + dst->u.discard.nr_sectors =3D src->u.discard.nr_sectors; + break; + + case BLKIF_OP_INDIRECT: + dst->u.indirect.indirect_op =3D src->u.indirect.indirect_op; + dst->u.indirect.nr_segments =3D + READ_ONCE(src->u.indirect.nr_segments); + dst->u.indirect.handle =3D src->u.indirect.handle; + dst->u.indirect.id =3D src->u.indirect.id; + dst->u.indirect.sector_number =3D src->u.indirect.sector_number; + n =3D min(MAX_INDIRECT_PAGES, + INDIRECT_PAGES(dst->u.indirect.nr_segments)); + for (i =3D 0; i < n; i++) + dst->u.indirect.indirect_grefs[i] =3D + src->u.indirect.indirect_grefs[i]; + break; + + default: + /* + * Don't know how to translate this op. Only get the + * ID so failure can be reported to the frontend. + */ + dst->u.other.id =3D src->u.other.id; + break; + } +} =20 /* * Function to copy the from the ring buffer the 'struct blkif_request' diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback= /common.h index fab8a8dee0da..40f67bfc052d 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h @@ -394,100 +394,4 @@ int xen_blkbk_barrier(struct xenbus_transaction xbt, struct xenbus_device *xen_blkbk_xenbus(struct backend_info *be); void xen_blkbk_unmap_purged_grants(struct work_struct *work); =20 -static inline void blkif_get_x86_32_req(struct blkif_request *dst, - struct blkif_x86_32_request *src) -{ - int i, n =3D BLKIF_MAX_SEGMENTS_PER_REQUEST, j; - dst->operation =3D READ_ONCE(src->operation); - switch (dst->operation) { - case BLKIF_OP_READ: - case BLKIF_OP_WRITE: - case BLKIF_OP_WRITE_BARRIER: - case BLKIF_OP_FLUSH_DISKCACHE: - dst->u.rw.nr_segments =3D src->u.rw.nr_segments; - dst->u.rw.handle =3D src->u.rw.handle; - dst->u.rw.id =3D src->u.rw.id; - dst->u.rw.sector_number =3D src->u.rw.sector_number; - barrier(); - if (n > dst->u.rw.nr_segments) - n =3D dst->u.rw.nr_segments; - for (i =3D 0; i < n; i++) - dst->u.rw.seg[i] =3D src->u.rw.seg[i]; - break; - case BLKIF_OP_DISCARD: - dst->u.discard.flag =3D src->u.discard.flag; - dst->u.discard.id =3D src->u.discard.id; - dst->u.discard.sector_number =3D src->u.discard.sector_number; - dst->u.discard.nr_sectors =3D src->u.discard.nr_sectors; - break; - case BLKIF_OP_INDIRECT: - dst->u.indirect.indirect_op =3D src->u.indirect.indirect_op; - dst->u.indirect.nr_segments =3D src->u.indirect.nr_segments; - dst->u.indirect.handle =3D src->u.indirect.handle; - dst->u.indirect.id =3D src->u.indirect.id; - dst->u.indirect.sector_number =3D src->u.indirect.sector_number; - barrier(); - j =3D min(MAX_INDIRECT_PAGES, INDIRECT_PAGES(dst->u.indirect.nr_segments= )); - for (i =3D 0; i < j; i++) - dst->u.indirect.indirect_grefs[i] =3D - src->u.indirect.indirect_grefs[i]; - break; - default: - /* - * Don't know how to translate this op. Only get the - * ID so failure can be reported to the frontend. - */ - dst->u.other.id =3D src->u.other.id; - break; - } -} - -static inline void blkif_get_x86_64_req(struct blkif_request *dst, - struct blkif_x86_64_request *src) -{ - int i, n =3D BLKIF_MAX_SEGMENTS_PER_REQUEST, j; - dst->operation =3D READ_ONCE(src->operation); - switch (dst->operation) { - case BLKIF_OP_READ: - case BLKIF_OP_WRITE: - case BLKIF_OP_WRITE_BARRIER: - case BLKIF_OP_FLUSH_DISKCACHE: - dst->u.rw.nr_segments =3D src->u.rw.nr_segments; - dst->u.rw.handle =3D src->u.rw.handle; - dst->u.rw.id =3D src->u.rw.id; - dst->u.rw.sector_number =3D src->u.rw.sector_number; - barrier(); - if (n > dst->u.rw.nr_segments) - n =3D dst->u.rw.nr_segments; - for (i =3D 0; i < n; i++) - dst->u.rw.seg[i] =3D src->u.rw.seg[i]; - break; - case BLKIF_OP_DISCARD: - dst->u.discard.flag =3D src->u.discard.flag; - dst->u.discard.id =3D src->u.discard.id; - dst->u.discard.sector_number =3D src->u.discard.sector_number; - dst->u.discard.nr_sectors =3D src->u.discard.nr_sectors; - break; - case BLKIF_OP_INDIRECT: - dst->u.indirect.indirect_op =3D src->u.indirect.indirect_op; - dst->u.indirect.nr_segments =3D src->u.indirect.nr_segments; - dst->u.indirect.handle =3D src->u.indirect.handle; - dst->u.indirect.id =3D src->u.indirect.id; - dst->u.indirect.sector_number =3D src->u.indirect.sector_number; - barrier(); - j =3D min(MAX_INDIRECT_PAGES, INDIRECT_PAGES(dst->u.indirect.nr_segments= )); - for (i =3D 0; i < j; i++) - dst->u.indirect.indirect_grefs[i] =3D - src->u.indirect.indirect_grefs[i]; - break; - default: - /* - * Don't know how to translate this op. Only get the - * ID so failure can be reported to the frontend. - */ - dst->u.other.id =3D src->u.other.id; - break; - } -} - #endif /* __XEN_BLKIF__BACKEND__COMMON_H__ */ --=20 2.35.3