From nobody Wed Dec 24 08:05:16 2025 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C844A33CFB; Sun, 28 Jan 2024 19:59:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706471951; cv=none; b=gCGm9yfIGLqCjxveXTqc8wyumQ17x2DAJfn7GlISRS0wtxtaiZBvZuWiHIsiTaO1eR6+GRgHoyOImGyxEJmPCkM+0S7P1wCjAtLh+p8AFaeBX2gkm74zsS/tid3PsgjrPQagOV9oorWGiOevjF20OHictLkZOcZnKscl3ENDCMY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706471951; c=relaxed/simple; bh=xF3J6jCvUQtURZ7L2KsxmlWYDYKsUMhbFtAA6LF2qU0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=W0noIHuiQGYkBjKp8PkWOWHt5biiRetCutS+BLXlcmf8jenQEXGg2BxDxeGyZcMgCh9VadstTkmKb3zRMzD4wBEM2vx7tr9p/EFDYbN5ttGQck7PYjoJshW4NwrjX6TEbPCwhhAjxxBkncIHeW+OpXl8L6hglmTPwnejsKwe1Kc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=WwnbHydI; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="WwnbHydI" Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40SHC5aL014725; Sun, 28 Jan 2024 19:58:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=Kue5UtYNqVo27GejmfvK/ioKg/AvcIJT+0Q3VwI6xEI=; b=WwnbHydIKQDtSPYeEH/9pq4KlNU6EVH5G9ocxKrvcd95p9eee+a7BQNGdk3Y4S/C4TsM bo+8I7oY3KrEO5VMNDCtMs68c2et/08lopkOy2XEKmbCr2jhUep3iTedg4zXijd9uUYq X3XPcvrFb1fTEktJMNv2LCjKfrQ28NG4jW4CL7gqydhRsNpaBi42ozx+4z4NGFVtl3yB +gpHD8Rcf6uH+dSF757lZb6hTFufbQslnQLXj7CzXA5YcETizlqFrUAh5LY3hqrgEwHP 7ICg+gBdNvGrgCJYELhoOkTkVe1zF3AcGnfvikE5nmd7yAbOa79pzKOYE5URpvfZxyH1 4w== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3vw5nm3mh8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 28 Jan 2024 19:58:59 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 40SHKPFH008234; Sun, 28 Jan 2024 19:58:58 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3vwdnkm49h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 28 Jan 2024 19:58:58 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 40SJwtsr17564356 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 28 Jan 2024 19:58:55 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E7DB220043; Sun, 28 Jan 2024 19:58:54 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D846520040; Sun, 28 Jan 2024 19:58:54 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTPS; Sun, 28 Jan 2024 19:58:54 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 55669) id A9B58E0325; Sun, 28 Jan 2024 20:58:54 +0100 (CET) From: Alexander Gordeev To: Frederic Weisbecker , Ingo Molnar , Michael Ellerman , Heiko Carstens , Vasily Gorbik Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 1/5] sched/vtime: remove confusing arch_vtime_task_switch() declaration Date: Sun, 28 Jan 2024 20:58:50 +0100 Message-Id: <443aebea9128f7f455c76479f161bb6a2c956db5.1706470223.git.agordeev@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Xdm9EPwlQclTuCPhjcDowUQiCDyHI0k7 X-Proofpoint-ORIG-GUID: Xdm9EPwlQclTuCPhjcDowUQiCDyHI0k7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-25_14,2024-01-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=799 mlxscore=0 clxscore=1015 bulkscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 lowpriorityscore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401280151 Content-Type: text/plain; charset="utf-8" Callback arch_vtime_task_switch() is only defined when CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is selected. Yet, the function prototype forward declaration is present for CONFIG_VIRT_CPU_ACCOUNTING_GEN variant. Remove it. Signed-off-by: Alexander Gordeev Reviewed-by: Frederic Weisbecker --- include/linux/vtime.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/vtime.h b/include/linux/vtime.h index 3684487d01e1..593466ceebed 100644 --- a/include/linux/vtime.h +++ b/include/linux/vtime.h @@ -18,7 +18,6 @@ extern void vtime_account_idle(struct task_struct *tsk); #endif /* !CONFIG_VIRT_CPU_ACCOUNTING */ =20 #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN -extern void arch_vtime_task_switch(struct task_struct *tsk); extern void vtime_user_enter(struct task_struct *tsk); extern void vtime_user_exit(struct task_struct *tsk); extern void vtime_guest_enter(struct task_struct *tsk); --=20 2.40.1 From nobody Wed Dec 24 08:05:16 2025 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FED13C48F; Sun, 28 Jan 2024 19:59:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706471954; cv=none; b=bUUYSwGlFonzkbZCWow95RN8mmbrfYNHcuYmjjGbTePoAKDji3F44MC3+e5le959Lk//2rIHRZ5sTCrZs8l1snrjoLwwZGjl5nUxDaV/z0vungQ+5zQNnhSYC2ORX8xbTWgTPICbD036AwszBNqETqr1MeY/DG7C5q2emMTSDF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706471954; c=relaxed/simple; bh=nRcNqmBon+kQBI7q2Pqwiddl5KFQ2+3C0N2v7bv9oIs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ADgcOgyAreIOAN+h4eT87tGGZGsCj1M3cqCFF3zN1o0H4o1YMUYPi+7rSeXnkzBUQHyrZl+HKIOb3SYxvcotbK86353wIYUSlk5PYzgsgb2K5RE4TLbaa/Ag4cfQB22gw+vMLQYHZALKVUM21IZu7o0syNw/3uEHtCaOiCcjhF8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=L5FiS1Fm; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="L5FiS1Fm" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40SFWAuW018738; Sun, 28 Jan 2024 19:59:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=aAvGPWexv33Ic6RaT+kurh2+S+cJ+Jft7H9B2hhNlZ0=; b=L5FiS1Fmcud1c7xM8cmIjS1UnK4glAIUshlWJwQYqhFE6I4z7Zg1iQPXbnLVOrBxbGZc M/MeZ7EW4sM83GY3TdBtzjWVem0AKC1ijW5lMH6HZzRDKvVjpowpuTlLQLhdDpjv9K4X HtYWRW9dM78EcE5tg/cQlDGk9VDPcd3ZG3609B5CK/2+pQ+1LhdY6lNjHpmbk1ncMmHJ 4BPAsFKOnCO9WzT0+NGhussuvACqHo+wFz1ultb6+ZiJMIpRRvFW15L65dyTMFOXxJMo c8w7jVOWAJMteSi1VU2MKoAkol3XEHGlHYJILX7a36oUr9mpv7ajQABaO6SIrA/pgH2W IA== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3vwsnb37je-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 28 Jan 2024 19:58:59 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 40SJfuWp017772; Sun, 28 Jan 2024 19:58:58 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3vwchycdj7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 28 Jan 2024 19:58:58 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 40SJwtLH197250 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 28 Jan 2024 19:58:55 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 053AC2004F; Sun, 28 Jan 2024 19:58:55 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E5F032004D; Sun, 28 Jan 2024 19:58:54 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTPS; Sun, 28 Jan 2024 19:58:54 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 55669) id AC026E0788; Sun, 28 Jan 2024 20:58:54 +0100 (CET) From: Alexander Gordeev To: Frederic Weisbecker , Ingo Molnar , Michael Ellerman , Heiko Carstens , Vasily Gorbik Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 2/5] sched/vtime: get rid of generic vtime_task_switch() implementation Date: Sun, 28 Jan 2024 20:58:51 +0100 Message-Id: <1f519a8c86cf13bc4acd18ed5d8d1705d1554083.1706470223.git.agordeev@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: jVsGMArMDf6g_jru9SgAUNE_2wp0z2K0 X-Proofpoint-GUID: jVsGMArMDf6g_jru9SgAUNE_2wp0z2K0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-25_14,2024-01-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 adultscore=0 suspectscore=0 spamscore=0 malwarescore=0 mlxlogscore=649 clxscore=1015 mlxscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401280151 Content-Type: text/plain; charset="utf-8" The generic vtime_task_switch() implementation gets built only if __ARCH_HAS_VTIME_TASK_SWITCH is not defined, but requires an architecture to implement arch_vtime_task_switch() callback at the same time, which is confusing. Further, arch_vtime_task_switch() is implemented for 32-bit PowerPC architecture only and vtime_task_switch() generic variant is rather superfluous. Simplify the whole vtime_task_switch() wiring by moving the existing generic implementation to PowerPC. Signed-off-by: Alexander Gordeev Reviewed-by: Frederic Weisbecker --- arch/powerpc/include/asm/cputime.h | 13 ------------- arch/powerpc/kernel/time.c | 22 ++++++++++++++++++++++ kernel/sched/cputime.c | 13 ------------- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/arch/powerpc/include/asm/cputime.h b/arch/powerpc/include/asm/= cputime.h index 4961fb38e438..aff858ca99c0 100644 --- a/arch/powerpc/include/asm/cputime.h +++ b/arch/powerpc/include/asm/cputime.h @@ -32,23 +32,10 @@ #ifdef CONFIG_PPC64 #define get_accounting(tsk) (&get_paca()->accounting) #define raw_get_accounting(tsk) (&local_paca->accounting) -static inline void arch_vtime_task_switch(struct task_struct *tsk) { } =20 #else #define get_accounting(tsk) (&task_thread_info(tsk)->accounting) #define raw_get_accounting(tsk) get_accounting(tsk) -/* - * Called from the context switch with interrupts disabled, to charge all - * accumulated times to the current process, and to prepare accounting on - * the next process. - */ -static inline void arch_vtime_task_switch(struct task_struct *prev) -{ - struct cpu_accounting_data *acct =3D get_accounting(current); - struct cpu_accounting_data *acct0 =3D get_accounting(prev); - - acct->starttime =3D acct0->starttime; -} #endif =20 /* diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index df20cf201f74..c0fdc6d94fee 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -354,6 +354,28 @@ void vtime_flush(struct task_struct *tsk) acct->hardirq_time =3D 0; acct->softirq_time =3D 0; } + +/* + * Called from the context switch with interrupts disabled, to charge all + * accumulated times to the current process, and to prepare accounting on + * the next process. + */ +void vtime_task_switch(struct task_struct *prev) +{ + if (is_idle_task(prev)) + vtime_account_idle(prev); + else + vtime_account_kernel(prev); + + vtime_flush(prev); + + if (!IS_ENABLED(CONFIG_PPC64)) { + struct cpu_accounting_data *acct =3D get_accounting(current); + struct cpu_accounting_data *acct0 =3D get_accounting(prev); + + acct->starttime =3D acct0->starttime; + } +} #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ =20 void __no_kcsan __delay(unsigned long loops) diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index af7952f12e6c..aa48b2ec879d 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -424,19 +424,6 @@ static inline void irqtime_account_process_tick(struct= task_struct *p, int user_ */ #ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE =20 -# ifndef __ARCH_HAS_VTIME_TASK_SWITCH -void vtime_task_switch(struct task_struct *prev) -{ - if (is_idle_task(prev)) - vtime_account_idle(prev); - else - vtime_account_kernel(prev); - - vtime_flush(prev); - arch_vtime_task_switch(prev); -} -# endif - void vtime_account_irq(struct task_struct *tsk, unsigned int offset) { unsigned int pc =3D irq_count() - offset; --=20 2.40.1 From nobody Wed Dec 24 08:05:16 2025 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C841533CD6; Sun, 28 Jan 2024 19:59:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706471951; cv=none; b=D+dAZJK5ymgn/3ROsdDi1+LaHwxGRN0tthpbVYEu3t98Dg4DSfVjDHpXqsb7Mg560CczCYnEW3Znh7DurpqO4CUOW+w69IuJgSr85ZrEuK+K5eLB4bLpvMMiqq8y51cgmRCeOxH2FuY7w9A+knMhxLwVVoeYAclT6zA1pnr2/lU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706471951; c=relaxed/simple; bh=AvzOX+YLvgoEfFY+O1q34caaqKaHWvjS5dkviD8ygF0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oELiCO+Pllu1lJVqIHltsJ7bcspszcrX6pYd9PoDKo2g0BQyncSz/NkyCSr/5jQs1SGoEH4DLnRpwBnJmukzKCP/i9Epr6kAV7m/5vh2lMs2KBbVmm4wt5OA2wl2tnzTKtjmVOMwWD/WXRecpKokKhsT9pMAN5Ava78QMUwvXbo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=Rt5FgHJf; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="Rt5FgHJf" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40SHskIM017315; Sun, 28 Jan 2024 19:58:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=HqWJnNirYD2mZc4aShg2yzFvukCr30wCusQwz3eGeQw=; b=Rt5FgHJf79Sz6qvHnfL0WMT6E1GZVRsEFUcwgKXZHENG1yTjO82kFu7NysqUYTL07P+4 D6GzR8AB6//RCtCGhQfbnIbS9toGUxEczyBRVsAw1db7AOREBy95tXGi3j6EOkOBzJ0D KdUMP+O7PbDAoX3hL8loG4W1T+uwIoxld6h4k/XDrxFk0jBR/yqoAvJkkEajULvXdm7i VkhAiHS26g1XWTkdOWTjGz+E8jKoS5gWnZ1mU1afWWGQHOeml+kFiL5wYFoqXG4wki9n j7D37piEa7ZxK6Q2gNBW+t6TZNrZUnS74OVL8v1LLwDXyd8GB+IQ6428ZA1JoP34r322 gw== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3vwr6m4a94-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 28 Jan 2024 19:58:59 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 40SHKPFI008234; Sun, 28 Jan 2024 19:58:58 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3vwdnkm49g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 28 Jan 2024 19:58:58 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 40SJwtkx13042222 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 28 Jan 2024 19:58:55 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0CCFA2004D; Sun, 28 Jan 2024 19:58:55 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EEF9B20043; Sun, 28 Jan 2024 19:58:54 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTPS; Sun, 28 Jan 2024 19:58:54 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 55669) id AE3A5E079D; Sun, 28 Jan 2024 20:58:54 +0100 (CET) From: Alexander Gordeev To: Frederic Weisbecker , Ingo Molnar , Michael Ellerman , Heiko Carstens , Vasily Gorbik Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 3/5] s390/vtime: remove unused __ARCH_HAS_VTIME_TASK_SWITCH leftover Date: Sun, 28 Jan 2024 20:58:52 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Xt6cwiIK9tVwUe-fhmMhvVLPErmDmlky X-Proofpoint-ORIG-GUID: Xt6cwiIK9tVwUe-fhmMhvVLPErmDmlky X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-25_14,2024-01-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 spamscore=0 mlxlogscore=656 phishscore=0 malwarescore=0 adultscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401280151 Content-Type: text/plain; charset="utf-8" __ARCH_HAS_VTIME_TASK_SWITCH macro is not used anymore. Signed-off-by: Alexander Gordeev Acked-by: Heiko Carstens Reviewed-by: Frederic Weisbecker --- arch/s390/include/asm/vtime.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/s390/include/asm/vtime.h b/arch/s390/include/asm/vtime.h index fe17e448c0c5..561c91c1a87c 100644 --- a/arch/s390/include/asm/vtime.h +++ b/arch/s390/include/asm/vtime.h @@ -2,8 +2,6 @@ #ifndef _S390_VTIME_H #define _S390_VTIME_H =20 -#define __ARCH_HAS_VTIME_TASK_SWITCH - static inline void update_timer_sys(void) { S390_lowcore.system_timer +=3D S390_lowcore.last_update_timer - S390_lowc= ore.exit_timer; --=20 2.40.1 From nobody Wed Dec 24 08:05:16 2025 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3125F3CF44; Sun, 28 Jan 2024 19:59:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706471955; cv=none; b=h7Bhvkf/cN7FqT3McNRiBUS66YPvU0BDse+yZOQnkS6icXESTkdTChSnrXS3YDB30+WR/XsazO6wl2e+Zd/0Pv7ZnX06U9N8j9p4j6+ccIs8u9r/fl2F+CQqsON8WMeqoGZhUNuGeYKuBUADU2qrRJUqBmgChavYp0FopBu4rUQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706471955; c=relaxed/simple; bh=JSOh7uJNDrp6PVMXwFFyTSGlmh4q/M6AINvsVmt+3oo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ukDd6tAdnBQb2xTeT7FSq8XZBmLyDuPSb/XPCjg/YWMN1z47M635xuopMxW+Y1HlDyFvCWqhQ2vYL85BRygAY6BKodTSsAPOQQqrUstlWKdxg/pXjRYgwzj6TVt+nHZiTQmWuCRlYArD0Z3nPn9rntG5coXV7/fHCPIP3fU80wg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=EmD8AmkF; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="EmD8AmkF" Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40SIOZ3Q026214; Sun, 28 Jan 2024 19:58:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=vWUzhYOc7X86FwVTZQTxEXaT99ntUXq8iH3H0R74AWw=; b=EmD8AmkFsVGQwvl4g6lRfMoW3XzaaAVg3MA9Y3UHc4V3u5VvkmqNhrwUoSz+MQ7khwF/ I+UMBrplraS1a9WWSWkHJMbgnwhGf87JipichHMUgxHlfbwQdoZ0SfgckN7N6zzPHZCA sFK/2C6OnLIutHmT6vn4IFp7X78OGBkTooQjA6MTAWixUIofymTCdSDynivAE4dcgv7m wAlyUpATNdKnZPRYP0/9hKzfQxxdkytDCyiZ43KTJZtmBKZVNfbhOaY/HkQplJlkCART g5VThWXWjbFUSuVdeXdyqixL9JRStfP+qlkCpIr1eflRdmiDCqOB32VCO3V77yV9yii0 fQ== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3vwu6qhrwa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 28 Jan 2024 19:58:59 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 40SIHe7v010887; Sun, 28 Jan 2024 19:58:58 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3vweck3ve4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 28 Jan 2024 19:58:58 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 40SJwtfG12190304 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 28 Jan 2024 19:58:55 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 029C22004B; Sun, 28 Jan 2024 19:58:55 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E5BFA20040; Sun, 28 Jan 2024 19:58:54 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTPS; Sun, 28 Jan 2024 19:58:54 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 55669) id B0A4CE0827; Sun, 28 Jan 2024 20:58:54 +0100 (CET) From: Alexander Gordeev To: Frederic Weisbecker , Ingo Molnar , Michael Ellerman , Heiko Carstens , Vasily Gorbik Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 4/5] s390/irq,nmi: do not include header Date: Sun, 28 Jan 2024 20:58:53 +0100 Message-Id: <966148629217b56139f40c38ffbb45ca229bd489.1706470223.git.agordeev@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: ZuVfL-7qioT-9fAqTgVQFx1el86fRp9S X-Proofpoint-GUID: ZuVfL-7qioT-9fAqTgVQFx1el86fRp9S X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-25_14,2024-01-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 spamscore=0 suspectscore=0 mlxscore=0 mlxlogscore=726 malwarescore=0 adultscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401280151 Content-Type: text/plain; charset="utf-8" update_timer_sys() and update_timer_mcck() are inlines used for CPU time accounting from the interrupt and machine-check handlers. These routines are specific to s390 architecture, but declared via header, which in turn inludes . Avoid the extra loop and include header directly. Signed-off-by: Alexander Gordeev Acked-by: Heiko Carstens --- arch/s390/kernel/irq.c | 1 + arch/s390/kernel/nmi.c | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index 6f71b0ce1068..259496fe0ef9 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "entry.h" =20 DEFINE_PER_CPU_SHARED_ALIGNED(struct irq_stat, irq_stat); diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c index 9ad44c26d1a2..4422a27faace 100644 --- a/arch/s390/kernel/nmi.c +++ b/arch/s390/kernel/nmi.c @@ -32,6 +32,7 @@ #include #include #include +#include #include =20 struct mcck_struct { --=20 2.40.1 From nobody Wed Dec 24 08:05:16 2025 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C848D33CFC; Sun, 28 Jan 2024 19:59:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706471951; cv=none; b=rs8MSf9VgmsuzOaQR9C7+nwZDoGFkvAxqIj8GKhsJTz+Te2zkUo0pdOws81CwtjJ8Cbr8QP4wiMxtZDFmhLZpnYvHjuzAxsxukaWGHbhx/+I6HsRcGkACCKVIrfbaGtY4tU7FwOhkuSB27QSWJVH2BBhNxoxN92DAuJzn5dBbew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706471951; c=relaxed/simple; bh=+LAYmQFi5BW50XdmxpqctlvWtS9od0aDr8/h/M7PYTU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CUBpE+C5UjqTIdYHuEGyLPGFKa7Ma8uFBPM4WPYDTbJ5W6/RiiNeOEm51LfS70nQvwzu6VG17GRFmpZi6wXOM7S4gpYejSDb/a2LtdJiJIym2eiIsdUEy03Ig5CTqL08zsJ1vRkJOIPFiXkyFZm09Uj9vwiY0qHNeDQWHCy1cno= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=sY1zb8vB; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="sY1zb8vB" Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40SEUaic022216; Sun, 28 Jan 2024 19:58:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=Ty6vjLOwPP33OPQjO3uFsILZSqZnowDhF4Yj7NgqsI0=; b=sY1zb8vBP/MJfDvvMQ1ngSiGOkh5zbG89sLqCvUh6r2rFh5nIXOUqLbWINVhejLcUqrj 01lrTm3/kaJfVNS7VQXm5vU1bEGGfMoi6adQiO66cGiHsCQYg8SEn+NcNbSrY3x+ur2g j+jzWpWTXGcBx66kLHsAcNSliHPfIwsxrKCZotvfg7ggifIMOMxtHwLL1BadmosmZh7F r0a36Ktwp5spT9odHM7qP7NWeBg/c7DDbaxW3mOf3Y29v/K0QnMYAVFLBJ4rO9a8A6W+ iQjPjzHfozGXAP6Al1LGAcvnsZSCxQmnZJNzY/9eZHn1mh69CHt8/xGV86qXZLbgcB3Q zQ== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3vw5nm3mh4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 28 Jan 2024 19:58:58 +0000 Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 40SIopO6007189; Sun, 28 Jan 2024 19:58:58 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3vwev1urnj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 28 Jan 2024 19:58:58 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 40SJwtrr34013692 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 28 Jan 2024 19:58:55 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 33AA820043; Sun, 28 Jan 2024 19:58:55 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2334520040; Sun, 28 Jan 2024 19:58:55 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTPS; Sun, 28 Jan 2024 19:58:55 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 55669) id B30D5E098B; Sun, 28 Jan 2024 20:58:54 +0100 (CET) From: Alexander Gordeev To: Frederic Weisbecker , Ingo Molnar , Michael Ellerman , Heiko Carstens , Vasily Gorbik Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 5/5] sched/vtime: do not include header Date: Sun, 28 Jan 2024 20:58:54 +0100 Message-Id: <2402f44309e1c9705501bdc9b798e8fe6d73f905.1706470223.git.agordeev@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Vc4e6bh2MHI0qSI1BxnPS8gjiOEC6MYu X-Proofpoint-ORIG-GUID: Vc4e6bh2MHI0qSI1BxnPS8gjiOEC6MYu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-25_14,2024-01-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=514 mlxscore=0 clxscore=1011 bulkscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 lowpriorityscore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401280151 Content-Type: text/plain; charset="utf-8" There is no architecture-specific code or data left that generic needs to know about. Thus, avoid the inclusion of header. Signed-off-by: Alexander Gordeev Reviewed-by: Frederic Weisbecker --- include/asm-generic/vtime.h | 1 - include/linux/vtime.h | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 include/asm-generic/vtime.h diff --git a/include/asm-generic/vtime.h b/include/asm-generic/vtime.h deleted file mode 100644 index b1a49677fe25..000000000000 --- a/include/asm-generic/vtime.h +++ /dev/null @@ -1 +0,0 @@ -/* no content, but patch(1) dislikes empty files */ diff --git a/include/linux/vtime.h b/include/linux/vtime.h index 593466ceebed..29dd5b91dd7d 100644 --- a/include/linux/vtime.h +++ b/include/linux/vtime.h @@ -5,10 +5,6 @@ #include #include =20 -#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE -#include -#endif - /* * Common vtime APIs */ --=20 2.40.1