From nobody Sat Sep 21 23:06:39 2024 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 3CA04C433EF for ; Mon, 4 Jul 2022 01:41:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232741AbiGDBlH (ORCPT ); Sun, 3 Jul 2022 21:41:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230193AbiGDBlD (ORCPT ); Sun, 3 Jul 2022 21:41:03 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEA8163FB for ; Sun, 3 Jul 2022 18:40:57 -0700 (PDT) X-UUID: 8e59aac5f0134b549cd7c9d5d3303cb3-20220704 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.7,REQID:83713f8e-e021-4666-8692-bb82e3d371e5,OB:0,LO B:0,IP:0,URL:5,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:5 X-CID-META: VersionHash:87442a2,CLOUDID:df526e86-57f0-47ca-ba27-fe8c57fbf305,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:1,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: 8e59aac5f0134b549cd7c9d5d3303cb3-20220704 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 2042083025; Mon, 04 Jul 2022 09:40:53 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.186) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Mon, 4 Jul 2022 09:40:52 +0800 Received: from mszsdtcf10.gcn.mediatek.inc (10.16.4.60) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.3 via Frontend Transport; Mon, 4 Jul 2022 09:40:51 +0800 From: Haibo Li To: Sami Tolvanen CC: , Kees Cook , "Nathan Chancellor" , Nick Desaulniers , Matthias Brugger , Peter Zijlstra , Masami Hiramatsu , "Christophe Leroy" , =?UTF-8?q?Andr=C3=A9=20Almeida?= , Luis Chamberlain , Juergen Gross , Haibo Li , Tiezhu Yang , Aaron Tomlin , Dmitry Torokhov , , , , , Lecopzer Chen Subject: [PATCH v2 1/2] cfi: enable sanitize for cfi.c Date: Mon, 4 Jul 2022 09:40:45 +0800 Message-ID: <20220704014046.34596-2-haibo.li@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220704014046.34596-1-haibo.li@mediatek.com> References: <20220704014046.34596-1-haibo.li@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" currenly,cfi.c is excluded from cfi sanitize because of cfi handler. The side effect is that we can not transfer function pointer to other files which enable cfi sanitize. Enable cfi sanitize for cfi.c and bypass cfi check for __cfi_slowpath_diag Signed-off-by: Haibo Li Signed-off-by: Lecopzer Chen Reviewed-by: Sami Tolvanen --- kernel/Makefile | 3 --- kernel/cfi.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index a7e1f49ab2b3..a997bef1a200 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -40,9 +40,6 @@ KCSAN_SANITIZE_kcov.o :=3D n UBSAN_SANITIZE_kcov.o :=3D n CFLAGS_kcov.o :=3D $(call cc-option, -fno-conserve-stack) -fno-stack-prote= ctor =20 -# Don't instrument error handlers -CFLAGS_REMOVE_cfi.o :=3D $(CC_FLAGS_CFI) - obj-y +=3D sched/ obj-y +=3D locking/ obj-y +=3D power/ diff --git a/kernel/cfi.c b/kernel/cfi.c index 08102d19ec15..6c8ae07b5835 100644 --- a/kernel/cfi.c +++ b/kernel/cfi.c @@ -311,7 +311,7 @@ static inline cfi_check_fn find_check_fn(unsigned long = ptr) return fn; } =20 -void __cfi_slowpath_diag(uint64_t id, void *ptr, void *diag) +void __nocfi __cfi_slowpath_diag(u64 id, void *ptr, void *diag) { cfi_check_fn fn =3D find_check_fn((unsigned long)ptr); =20 --=20 2.25.1 From nobody Sat Sep 21 23:06:39 2024 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 E2C5CC43334 for ; Mon, 4 Jul 2022 01:41:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232853AbiGDBlQ (ORCPT ); Sun, 3 Jul 2022 21:41:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232848AbiGDBlK (ORCPT ); Sun, 3 Jul 2022 21:41:10 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D9776388 for ; Sun, 3 Jul 2022 18:41:08 -0700 (PDT) X-UUID: c6278a1998b143c987f8fec368decef3-20220704 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.7,REQID:122888c9-8868-454d-9d76-772178075191,OB:0,LO B:0,IP:0,URL:5,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:5 X-CID-META: VersionHash:87442a2,CLOUDID:a5b64b63-0b3f-4b2c-b3a6-ed5c044366a0,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:1,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: c6278a1998b143c987f8fec368decef3-20220704 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1762774237; Mon, 04 Jul 2022 09:40:57 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.3; Mon, 4 Jul 2022 09:40:56 +0800 Received: from mszsdtcf10.gcn.mediatek.inc (10.16.4.60) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.3 via Frontend Transport; Mon, 4 Jul 2022 09:40:55 +0800 From: Haibo Li To: Sami Tolvanen CC: , Kees Cook , Nathan Chancellor , Nick Desaulniers , Matthias Brugger , Peter Zijlstra , Masami Hiramatsu , Christophe Leroy , =?UTF-8?q?Andr=C3=A9=20Almeida?= , Luis Chamberlain , Juergen Gross , Haibo Li , Tiezhu Yang , Aaron Tomlin , Dmitry Torokhov , , , , , Lecopzer Chen Subject: [PATCH v2 2/2] cfi: free old cfi shadow asynchronously Date: Mon, 4 Jul 2022 09:40:46 +0800 Message-ID: <20220704014046.34596-3-haibo.li@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220704014046.34596-1-haibo.li@mediatek.com> References: <20220704014046.34596-1-haibo.li@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currenly, it uses synchronize_rcu() to wait old rcu reader to go away in update_shadow.In embedded platform like ARM CA7X, load_module blocks 40~50ms in update_shadow. When there are more than one hundred kernel modules, it blocks several seconds. To accelerate load_module,change synchronize_rcu to call_rcu. Signed-off-by: Haibo Li Signed-off-by: Lecopzer Chen Reviewed-by: Sami Tolvanen --- kernel/cfi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/kernel/cfi.c b/kernel/cfi.c index 6c8ae07b5835..f61439392bf8 100644 --- a/kernel/cfi.c +++ b/kernel/cfi.c @@ -43,6 +43,8 @@ typedef u16 shadow_t; struct cfi_shadow { /* Page index for the beginning of the shadow */ unsigned long base; + /* rcu to free old cfi_shadow asynchronously */ + struct rcu_head rcu; /* An array of __cfi_check locations (as indices to the shadow) */ shadow_t shadow[1]; } __packed; @@ -182,6 +184,13 @@ static void remove_module_from_shadow(struct cfi_shado= w *s, struct module *mod, } } =20 +static void free_shadow(struct rcu_head *rcu) +{ + struct cfi_shadow *old =3D container_of(rcu, struct cfi_shadow, rcu); + + vfree(old); +} + typedef void (*update_shadow_fn)(struct cfi_shadow *, struct module *, unsigned long min_addr, unsigned long max_addr); =20 @@ -211,11 +220,10 @@ static void update_shadow(struct module *mod, unsigne= d long base_addr, =20 rcu_assign_pointer(cfi_shadow, next); mutex_unlock(&shadow_update_lock); - synchronize_rcu(); =20 if (prev) { set_memory_rw((unsigned long)prev, SHADOW_PAGES); - vfree(prev); + call_rcu(&prev->rcu, free_shadow); } } =20 --=20 2.25.1