From patchwork Tue Jan 31 09:20:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiang W X-Patchwork-Id: 1734779 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=tz9/s+0w; 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=KvXczBab; 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 4P5hG05YDDz23gV for ; Tue, 31 Jan 2023 21:32:56 +1100 (AEDT) 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=nOPbngtQfbiyNQQNmsPPfvJceH7tKBj1qsji6t7v+EM=; b=tz9/s+0wh/lbvh XJ4wjY+S9Str3dNo6sufrFHuagiuVXswUGxdxsWgtilytmJ6FVR3yCMu42u041cNt1VC0rwOyaI1s G54PPnncXcMCOgQ43eV8hclFCTzb97dPeu0GpjqUX7hMX3FBsHWwe+Yo80Pp5vY7XiLMeejroVyhd /aLZf95ZqZjtWvaCN6zCn1pO9E8yhMXLbVe/mlvEO9pAVZbx1eV4UaMzY9cr+zWjJHItIPomOjqDy bdEoSRNCZ0SCb/zXacom/+YwvK/rxYzuyceqVkFaIjJ8JPf8Zjzhw5DHAFIxUWKRteCet360t1wcs asbCDg7bSFiUGMYjAsTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pMnwK-007R05-Tc; Tue, 31 Jan 2023 10:32:36 +0000 Received: from m126.mail.126.com ([220.181.12.26]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pMnHi-0078z3-HD for opensbi@lists.infradead.org; Tue, 31 Jan 2023 09:50:40 +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=XPPgW X95TvnZ+q32Hg8WSWCU2Qb0b6CNmOfPrdYGvas=; b=KvXczBabJvFpAz+uQbFNG SPs/s67P0vzBTT/aBFzOIU8rptuDvkTdnKnttqsthx/wvsKpL37hYXUeY2R5kd83 GimCzpFsbIkh7sWXa2bUipc+F4SbkyOaohg5SmmqnyP/3DEPsR8vcQENwH4GrjgD 7q5n9s0FVeEn+z39GrGTa4= Received: from x390.lan (unknown [210.22.74.155]) by zwqz-smtp-mta-g0-1 (Coremail) with SMTP id _____wDHP85V3dhjDFYFAg--.29655S3; Tue, 31 Jan 2023 17:20:25 +0800 (CST) From: Xiang W To: opensbi@lists.infradead.org Cc: Xiang W Subject: [PATCH 1/3] lib: sbi: Optimize sbi_tlb Date: Tue, 31 Jan 2023 17:20:06 +0800 Message-Id: <20230131092008.51078-2-wxjstz@126.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230131092008.51078-1-wxjstz@126.com> References: <20230131092008.51078-1-wxjstz@126.com> MIME-Version: 1.0 X-CM-TRANSID: _____wDHP85V3dhjDFYFAg--.29655S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Cry3uw48WF18Wry5XF1fZwb_yoW8Kw1xpF yjyF1qyrs2qrW8K397Aa1DuF1rGrZ2yrZrGrW2y34Fvr4Dt3WrJF97Jryjv3Z3JrW3Ka1Y v392vryfCF15JrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pR1lksUUUUU= X-Originating-IP: [210.22.74.155] X-CM-SenderInfo: pz0m23b26rjloofrz/1tbiIR4IOmIxlP8eCwAAsg X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230131_015038_924037_DEB5F33F X-CRM114-Status: UNSURE ( 9.92 ) 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: Originally, the process and sync of sbi_tlb need to wait for each other. Evasion by atomic addition and subtraction. Signed-off-by: Xiang W --- lib/sbi/sbi_tlb.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 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 Originally, the process and sync of sbi_tlb need to wait for each other. Evasion by atomic addition and subtraction. Signed-off-by: Xiang W --- lib/sbi/sbi_tlb.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/sbi/sbi_tlb.c b/lib/sbi/sbi_tlb.c index 4c142ea..685b8ea 100644 --- a/lib/sbi/sbi_tlb.c +++ b/lib/sbi/sbi_tlb.c @@ -215,7 +215,7 @@ static void tlb_entry_process(struct sbi_tlb_info *tinfo) { u32 rhartid; struct sbi_scratch *rscratch = NULL; - unsigned long *rtlb_sync = NULL; + atomic_t *rtlb_sync = NULL; tinfo->local_fn(tinfo); @@ -225,7 +225,7 @@ static void tlb_entry_process(struct sbi_tlb_info *tinfo) continue; rtlb_sync = sbi_scratch_offset_ptr(rscratch, tlb_sync_off); - while (atomic_raw_xchg_ulong(rtlb_sync, 1)) ; + atomic_sub_return(rtlb_sync, 1); } } @@ -257,10 +257,10 @@ static void tlb_process(struct sbi_scratch *scratch) static void tlb_sync(struct sbi_scratch *scratch) { - unsigned long *tlb_sync = + atomic_t *tlb_sync = sbi_scratch_offset_ptr(scratch, tlb_sync_off); - while (!atomic_raw_xchg_ulong(tlb_sync, 0)) { + while (atomic_read(tlb_sync) > 0) { /* * While we are waiting for remote hart to set the sync, * consume fifo requests to avoid deadlock. @@ -343,6 +343,7 @@ static int tlb_update(struct sbi_scratch *scratch, u32 remote_hartid, void *data) { int ret; + atomic_t *tlb_sync; struct sbi_fifo *tlb_fifo_r; struct sbi_tlb_info *tinfo = data; u32 curr_hartid = current_hartid(); @@ -387,6 +388,9 @@ static int tlb_update(struct sbi_scratch *scratch, curr_hartid, remote_hartid); } + tlb_sync = sbi_scratch_offset_ptr(scratch, tlb_sync_off); + atomic_add_return(tlb_sync, 1); + return 0; } @@ -413,7 +417,7 @@ int sbi_tlb_init(struct sbi_scratch *scratch, bool cold_boot) { int ret; void *tlb_mem; - unsigned long *tlb_sync; + atomic_t *tlb_sync; struct sbi_fifo *tlb_q; const struct sbi_platform *plat = sbi_platform_ptr(scratch); @@ -455,7 +459,7 @@ int sbi_tlb_init(struct sbi_scratch *scratch, bool cold_boot) tlb_q = sbi_scratch_offset_ptr(scratch, tlb_fifo_off); tlb_mem = sbi_scratch_offset_ptr(scratch, tlb_fifo_mem_off); - *tlb_sync = 0; + tlb_sync->counter = 0; sbi_fifo_init(tlb_q, tlb_mem, SBI_TLB_FIFO_NUM_ENTRIES, SBI_TLB_INFO_SIZE); From patchwork Tue Jan 31 09:20:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiang W X-Patchwork-Id: 1734692 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=vtmAmQz2; 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=W2V/njAd; 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 4P5ffq4FNGz23gV for ; Tue, 31 Jan 2023 20:20:51 +1100 (AEDT) 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=qR9uoxgNigtjVAuXhM17sku3KoXpGoKwIOf6XIZ7JzI=; b=vtmAmQz217CcDV gwxLJVnh2H26DJ1QxkLIaQDByRYQsIWBPQPyHFYRZ5/LfPDQ83r36YDcdUS0Ot/PZgo6VW01qNFcZ x/fphM9/7gorPvwCqATKmDeybrgwya/fQR+WPiVZ91wRe6Za4aq3qBMVUjSyLhoo77p30QaMdQVOm nw4xroDeleJzDlftYSyZp6z24NpDd3it/CYP6mQ/3FfzAPecQB0bZ/ONJR/ybky+jiBjuj91uzEbm A2AUh2Q6GHlz3lX0Bld9Cpx8btmc4qAlTWO0hlIiOxnxIMDNOQ0x3pGjVRg3yOek9+4eUsA0MCsqS LyxIRjTBfTbjBqDU2NfQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pMmog-006xKn-El; Tue, 31 Jan 2023 09:20:38 +0000 Received: from m126.mail.126.com ([220.181.12.29]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pMmod-006xIj-JX for opensbi@lists.infradead.org; Tue, 31 Jan 2023 09:20:37 +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=EtSe/ BMHTVov842dShpU9+GzSDDUJrjpJDb9QBWhjhU=; b=W2V/njAd8+UITEqCgzTTu 9X7fhj796BTQO+qD0qEIS2dlvrxKmcjQl3llO24IKpP6ZEVvP8GtgAIfmr2PHHo2 z3aAH4Y////1PmOWN76/8B6l653Ww7bOh36BLQTQ9oCLd+ZYJc86DBNrMfNID7nZ trU9QQhL1uELfVO+I3u8UE= Received: from x390.lan (unknown [210.22.74.155]) by zwqz-smtp-mta-g0-1 (Coremail) with SMTP id _____wDHP85V3dhjDFYFAg--.29655S4; Tue, 31 Jan 2023 17:20:26 +0800 (CST) From: Xiang W To: opensbi@lists.infradead.org Cc: Xiang W Subject: [PATCH 2/3] lib: sbi: Optimize sbi_ipi Date: Tue, 31 Jan 2023 17:20:07 +0800 Message-Id: <20230131092008.51078-3-wxjstz@126.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230131092008.51078-1-wxjstz@126.com> References: <20230131092008.51078-1-wxjstz@126.com> MIME-Version: 1.0 X-CM-TRANSID: _____wDHP85V3dhjDFYFAg--.29655S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7Zr13JFWftrW5ZF13CF4rZrb_yoW8tFykpF yDWFZ0yw4IqryxXasxXa1UXa13W392qr17WrZrGa4xXryDWFyrGF1rGr1Ut3W5WFyfJa4Y qw4jvryFkFWUArJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zNsjjLUUUUU= X-Originating-IP: [210.22.74.155] X-CM-SenderInfo: pz0m23b26rjloofrz/1tbiJh4IOlpD8AYpggADsN X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230131_012036_005227_71965D17 X-CRM114-Status: GOOD ( 11.71 ) 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: the original sbI_ipi will be processed by hart by hart, after optimization, send ipi first and finally wait together. Signed-off-by: Xiang W --- lib/sbi/sbi_ipi.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 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 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 the original sbI_ipi will be processed by hart by hart, after optimization, send ipi first and finally wait together. Signed-off-by: Xiang W --- lib/sbi/sbi_ipi.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/lib/sbi/sbi_ipi.c b/lib/sbi/sbi_ipi.c index 1bcc2e4..57d62a0 100644 --- a/lib/sbi/sbi_ipi.c +++ b/lib/sbi/sbi_ipi.c @@ -31,7 +31,7 @@ static unsigned long ipi_data_off; static const struct sbi_ipi_device *ipi_dev = NULL; static const struct sbi_ipi_event_ops *ipi_ops_array[SBI_IPI_EVENT_MAX]; -static int sbi_ipi_send(struct sbi_scratch *scratch, u32 remote_hartid, +static int sbi_ipi_update(struct sbi_scratch *scratch, u32 remote_hartid, u32 event, void *data) { int ret; @@ -75,6 +75,21 @@ static int sbi_ipi_send(struct sbi_scratch *scratch, u32 remote_hartid, return 0; } +static int sbi_ipi_sync(struct sbi_scratch *scratch, u32 event) +{ + const struct sbi_ipi_event_ops *ipi_ops; + + if ((SBI_IPI_EVENT_MAX <= event) || + !ipi_ops_array[event]) + return SBI_EINVAL; + ipi_ops = ipi_ops_array[event]; + + if (ipi_ops->sync) + ipi_ops->sync(scratch); + + return 0; +} + /** * As this this function only handlers scalar values of hart mask, it must be * set to all online harts if the intention is to send IPIs to all the harts. @@ -93,18 +108,34 @@ int sbi_ipi_send_many(ulong hmask, ulong hbase, u32 event, void *data) return rc; m &= hmask; - /* Send IPIs */ + /* update IPIs */ for (i = hbase; m; i++, m >>= 1) { if (m & 1UL) - sbi_ipi_send(scratch, i, event, data); + sbi_ipi_update(scratch, i, event, data); + } + + /* sync IPIs */ + for (i = hbase; m; i++, m >>= 1) { + if (m & 1UL) + sbi_ipi_sync(scratch, event); } } else { + /* update IPIs */ + hbase = 0; + while (!sbi_hsm_hart_interruptible_mask(dom, hbase, &m)) { + for (i = hbase; m; i++, m >>= 1) { + if (m & 1UL) + sbi_ipi_update(scratch, i, event, data); + } + hbase += BITS_PER_LONG; + } + + /* sync IPIs */ hbase = 0; while (!sbi_hsm_hart_interruptible_mask(dom, hbase, &m)) { - /* Send IPIs */ for (i = hbase; m; i++, m >>= 1) { if (m & 1UL) - sbi_ipi_send(scratch, i, event, data); + sbi_ipi_sync(scratch, event); } hbase += BITS_PER_LONG; } From patchwork Tue Jan 31 09:20:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiang W X-Patchwork-Id: 1734693 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=2+OyQl0H; 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=kcG+8sco; 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 4P5ffr2QNJz23gV for ; Tue, 31 Jan 2023 20:20:52 +1100 (AEDT) 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=oQUR5kAEWr3u7ODY+oX3qkZ5uWRtEHxYxDNtzU20AL4=; b=2+OyQl0HjA66eB cT/Nk5Lm3uGtxH47kserep+5pfFpbbhK+mIGHQTkqpmTdnVW43BlOn9ZCXQeJ4/kgk9AfJRsAkKBc wumKHIjgP95/Z0x+Hbdiow4DUK7/bNbe1u6yW8mjbph+U6VIcmb4R3UgSB2K+htp8c/HvZZdHMSwo G6HqtaddeXeHQtGPtoSyV6yG2rHOPnvclQAR2UfBFOVNK6jCOUPt11Ar8gHU+qyH2Ggb1lS+Emn2C qPDaajXecxoyao6nuN0jKA3PItb0SPE3PJULA/YrdVBjB2FwlXQvqWkLgO2doLZRHuHcZB/mV+SnD b+GXw4XkPMRd0VY9x3Vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pMmof-006xKT-LT; Tue, 31 Jan 2023 09:20:37 +0000 Received: from m126.mail.126.com ([220.181.12.29]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pMmoc-006xIk-DG for opensbi@lists.infradead.org; Tue, 31 Jan 2023 09:20:36 +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=ZDpXp RqccTpo7JPRo+U0V4KWNJpB2gfZRhVRyFNnA/A=; b=kcG+8scocIido7Hr6oFP/ JMEAUNKNH6nj3zGp++ZH28JHKYaFCfj+LiEtHbczHr4piY8J3o0rIbTjPVuHbmVk vFj5oJCeSDo6jMnevhXoCbmEkdOf2uBS0uuLFMR6gxnw9M0y1fRe0QnZOfZvF4sf LbQcIHsQwamMFIuDzMnXZ4= Received: from x390.lan (unknown [210.22.74.155]) by zwqz-smtp-mta-g0-1 (Coremail) with SMTP id _____wDHP85V3dhjDFYFAg--.29655S5; Tue, 31 Jan 2023 17:20:26 +0800 (CST) From: Xiang W To: opensbi@lists.infradead.org Cc: Xiang W Subject: [PATCH 3/3] lib: sbi: rename function of sbi_ipi Date: Tue, 31 Jan 2023 17:20:08 +0800 Message-Id: <20230131092008.51078-4-wxjstz@126.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230131092008.51078-1-wxjstz@126.com> References: <20230131092008.51078-1-wxjstz@126.com> MIME-Version: 1.0 X-CM-TRANSID: _____wDHP85V3dhjDFYFAg--.29655S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tr43Jw17JFyUCF1xAr15twb_yoW8trW3pF 9xAFnFkw4xtryUK39rAw40gr93tr4vqFZ7urW7ta4FqF4DArn8tF93Jw1jyr95Jr93Kw1a vwsFvrW8CF12qrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zR4q2_UUUUU= X-Originating-IP: [210.22.74.155] X-CM-SenderInfo: pz0m23b26rjloofrz/1tbiJh4IOlpD8AYpggABsP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230131_012034_815965_BA41DB80 X-CRM114-Status: GOOD ( 10.66 ) 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: Renamed some functions and reused some code Signed-off-by: Xiang W --- lib/sbi/sbi_tlb.c | 27 ++++++++++ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/lib/sbi/sbi_tlb.c b/lib/sbi/sbi_tlb.c index 685b8ea..c82f53a 100644 --- a/lib/sbi/sbi_tlb.c +++ b/lib/sbi/sbi_tlb.c @@ -211,7 +211,7 @@ static void tlb_pmu_incr_fw_ctr(struct sbi_tlb_info [...] 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 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 Renamed some functions and reused some code Signed-off-by: Xiang W --- lib/sbi/sbi_tlb.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/lib/sbi/sbi_tlb.c b/lib/sbi/sbi_tlb.c index 685b8ea..c82f53a 100644 --- a/lib/sbi/sbi_tlb.c +++ b/lib/sbi/sbi_tlb.c @@ -211,7 +211,7 @@ static void tlb_pmu_incr_fw_ctr(struct sbi_tlb_info *data) sbi_pmu_ctr_incr_fw(SBI_PMU_FW_HFENCE_VVMA_ASID_SENT); } -static void tlb_entry_process(struct sbi_tlb_info *tinfo) +static void tlb_process_helper(struct sbi_tlb_info *tinfo) { u32 rhartid; struct sbi_scratch *rscratch = NULL; @@ -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 int 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)) { - tlb_entry_process(&tinfo); - deq_count++; - if (deq_count > count) - break; - + if (!sbi_fifo_dequeue(tlb_fifo, &tinfo)) { + tlb_process_helper(&tinfo); + return 0; } + + return -1; } 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; @@ -383,7 +376,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); }