From patchwork Tue Apr 11 04:56:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiang W X-Patchwork-Id: 1767506 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=zUusY4RP; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.a=rsa-sha256 header.s=s110527 header.b=osIE6z0o; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PwYX3146dz1yZZ for ; Tue, 11 Apr 2023 14:58:43 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CgdHC1IHwNeiB/3UpZr+O5yIKsupVcW7tYSDithW7S4=; b=zUusY4RP+KKHn6 eLbMJbkAH/1okRsoitQnosLyoWwa+1vLHvhhZ2HcRLsrNJ3rWn4DJE44fBt3ftFMcY8SAFh9AMIFO 9a2B54c327ZLd1Rl1XpbRhuTIZm3TESUsK/gaWDoVKPAUTCCouEAaeZMDSYEE+Ri9xTenaMOOzUwu qbUffUVfcUuT+bPw7x5l5DVsJxro3B6nl0CbEJ4GqKAktwbgEtGuAXhxsWi7L6BWp5wEo2Mz4AP72 t7BUNia9pWR45tUbZMdwpMMVm34VRQYx7WlK9lak4OQGflzYWpbdzaHstHGsN4XpaVcGKL6jeR8gx IqLZGlFkprHeRD5YL08g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pm65P-00GQHd-0A; Tue, 11 Apr 2023 04:58:31 +0000 Received: from m126.mail.126.com ([220.181.12.28]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pm65M-00GQG7-0p for opensbi@lists.infradead.org; Tue, 11 Apr 2023 04:58:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=eAgcw 5jfLwH2yzjayFVdW4oS+JaAM3O+AAQL7lv3T20=; b=osIE6z0oxy68+pLormUNw B+RSiSnpmFdd9er/oTMylmfghxgXEy+S9xFRc1O3pg5AC4cdfasVIA4LHiRDhBP0 nBcG0FbuhqHnFSld2BYM903mVh7qfX9b8P3UC3zKf+T5iQxhyP77vk2OfUZjMeH+ iElaYWm6hBJAKquZpq+eME= Received: from x390.lan (unknown [58.247.140.64]) by zwqz-smtp-mta-g2-0 (Coremail) with SMTP id _____wDX39uH6DRkw4GXBA--.8700S5; Tue, 11 Apr 2023 12:56:40 +0800 (CST) From: Xiang W To: opensbi@lists.infradead.org Cc: Xiang W , anup@brainfault.org Subject: [PATCH v5 3/4] sbi: tlb: Simplify to tlb_process_count/tlb_process function Date: Tue, 11 Apr 2023 12:56:20 +0800 Message-Id: <20230411045621.60331-4-wxjstz@126.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411045621.60331-1-wxjstz@126.com> References: <20230411045621.60331-1-wxjstz@126.com> MIME-Version: 1.0 X-CM-TRANSID: _____wDX39uH6DRkw4GXBA--.8700S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7KFWkWFy7Gr47XrWrKryxGrg_yoW8Zr1rpF 9xAFnFyr48K34Ut397Jw4xWryfGr4vyFZ29ry7K3sYqF4DAF15tr93Jw1jyF95Jr9akw4Y qwsFvrWxCF17XrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zR9Xo7UUUUU= X-Originating-IP: [58.247.140.64] X-CM-SenderInfo: pz0m23b26rjloofrz/1tbiFwhOOlpEGDWKbQAAs- X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230410_215828_611458_350C4600 X-CRM114-Status: UNSURE ( 9.70 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: tlb_process_count is only used when count=1, so refactor to tlb_process_once and add the return value to be reused in tlb_process Signed-off-by: Xiang W --- lib/sbi/sbi_tlb.c | 23 ++++++++ 1 file changed, 8 insertions(+), 15 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [wxjstz[at]126.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [220.181.12.28 listed in wl.mailspike.net] X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org tlb_process_count is only used when count=1, so refactor to tlb_process_once and add the return value to be reused in tlb_process Signed-off-by: Xiang W Reviewed-by: Anup Patel Tested-by: Anup Patel --- lib/sbi/sbi_tlb.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/lib/sbi/sbi_tlb.c b/lib/sbi/sbi_tlb.c index d950c45..60ca8c6 100644 --- a/lib/sbi/sbi_tlb.c +++ b/lib/sbi/sbi_tlb.c @@ -229,30 +229,23 @@ static void tlb_entry_process(struct sbi_tlb_info *tinfo) } } -static void tlb_process_count(struct sbi_scratch *scratch, int count) +static bool tlb_process_once(struct sbi_scratch *scratch) { struct sbi_tlb_info tinfo; - unsigned int deq_count = 0; struct sbi_fifo *tlb_fifo = sbi_scratch_offset_ptr(scratch, tlb_fifo_off); - while (!sbi_fifo_dequeue(tlb_fifo, &tinfo)) { + if (!sbi_fifo_dequeue(tlb_fifo, &tinfo)) { tlb_entry_process(&tinfo); - deq_count++; - if (deq_count > count) - break; - + return true; } + + return false; } static void tlb_process(struct sbi_scratch *scratch) { - struct sbi_tlb_info tinfo; - struct sbi_fifo *tlb_fifo = - sbi_scratch_offset_ptr(scratch, tlb_fifo_off); - - while (!sbi_fifo_dequeue(tlb_fifo, &tinfo)) - tlb_entry_process(&tinfo); + while (tlb_process_once(scratch)); } static void tlb_sync(struct sbi_scratch *scratch) @@ -265,7 +258,7 @@ static void tlb_sync(struct sbi_scratch *scratch) * While we are waiting for remote hart to set the sync, * consume fifo requests to avoid deadlock. */ - tlb_process_count(scratch, 1); + tlb_process_once(scratch); } return; @@ -380,7 +373,7 @@ static int tlb_update(struct sbi_scratch *scratch, * TODO: Introduce a wait/wakeup event mechanism to handle * this properly. */ - tlb_process_count(scratch, 1); + tlb_process_once(scratch); sbi_dprintf("hart%d: hart%d tlb fifo full\n", curr_hartid, remote_hartid); }