mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 08:43:31 +00:00

Commit b35108a51c
("jiffies: Define secs_to_jiffies()") introduced
secs_to_jiffies(). As the value here is a multiple of 1000, use
secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication.
This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with
the following Coccinelle rules:
@@ constant C; @@
- msecs_to_jiffies(C * 1000)
+ secs_to_jiffies(C)
@@ constant C; @@
- msecs_to_jiffies(C * MSEC_PER_SEC)
+ secs_to_jiffies(C)
Link: https://lkml.kernel.org/r/20241210-converge-secs-to-jiffies-v3-18-ddfefd7e9f2a@linux.microsoft.com
Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andrew Lunn <andrew+netdev@lunn.ch>
Cc: Anna-Maria Behnsen <anna-maria@linutronix.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Daniel Mack <daniel@zonque.org>
Cc: David Airlie <airlied@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dick Kennedy <dick.kennedy@broadcom.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Florian Fainelli <florian.fainelli@broadcom.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: Jack Wang <jinpu.wang@cloud.ionos.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: James Smart <james.smart@broadcom.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Jeff Johnson <jjohnson@kernel.org>
Cc: Jeff Johnson <quic_jjohnson@quicinc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Jeroen de Borst <jeroendb@google.com>
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Joe Lawrence <joe.lawrence@redhat.com>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Jozsef Kadlecsik <kadlec@netfilter.org>
Cc: Julia Lawall <julia.lawall@inria.fr>
Cc: Kalle Valo <kvalo@kernel.org>
Cc: Louis Peens <louis.peens@corigine.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Miroslav Benes <mbenes@suse.cz>
Cc: Naveen N Rao <naveen@kernel.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Nicolas Palix <nicolas.palix@imag.fr>
Cc: Oded Gabbay <ogabbay@kernel.org>
Cc: Ofir Bitton <obitton@habana.ai>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Praveen Kaligineedi <pkaligineedi@google.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Roger Pau Monné <roger.pau@citrix.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: Shailend Chand <shailend@google.com>
Cc: Simona Vetter <simona@ffwll.ch>
Cc: Simon Horman <horms@kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
212 lines
5.3 KiB
C
212 lines
5.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright (C) 2017 Joe Lawrence <joe.lawrence@redhat.com>
|
|
*/
|
|
|
|
/*
|
|
* livepatch-shadow-mod.c - Shadow variables, buggy module demo
|
|
*
|
|
* Purpose
|
|
* -------
|
|
*
|
|
* As a demonstration of livepatch shadow variable API, this module
|
|
* introduces memory leak behavior that livepatch modules
|
|
* livepatch-shadow-fix1.ko and livepatch-shadow-fix2.ko correct and
|
|
* enhance.
|
|
*
|
|
* WARNING - even though the livepatch-shadow-fix modules patch the
|
|
* memory leak, please load these modules at your own risk -- some
|
|
* amount of memory may leaked before the bug is patched.
|
|
*
|
|
*
|
|
* Usage
|
|
* -----
|
|
*
|
|
* Step 1 - Load the buggy demonstration module:
|
|
*
|
|
* insmod samples/livepatch/livepatch-shadow-mod.ko
|
|
*
|
|
* Watch dmesg output for a few moments to see new dummy being allocated
|
|
* and a periodic cleanup check. (Note: a small amount of memory is
|
|
* being leaked.)
|
|
*
|
|
*
|
|
* Step 2 - Load livepatch fix1:
|
|
*
|
|
* insmod samples/livepatch/livepatch-shadow-fix1.ko
|
|
*
|
|
* Continue watching dmesg and note that now livepatch_fix1_dummy_free()
|
|
* and livepatch_fix1_dummy_alloc() are logging messages about leaked
|
|
* memory and eventually leaks prevented.
|
|
*
|
|
*
|
|
* Step 3 - Load livepatch fix2 (on top of fix1):
|
|
*
|
|
* insmod samples/livepatch/livepatch-shadow-fix2.ko
|
|
*
|
|
* This module extends functionality through shadow variables, as a new
|
|
* "check" counter is added to the dummy structure. Periodic dmesg
|
|
* messages will log these as dummies are cleaned up.
|
|
*
|
|
*
|
|
* Step 4 - Cleanup
|
|
*
|
|
* Unwind the demonstration by disabling the livepatch fix modules, then
|
|
* removing them and the demo module:
|
|
*
|
|
* echo 0 > /sys/kernel/livepatch/livepatch_shadow_fix2/enabled
|
|
* echo 0 > /sys/kernel/livepatch/livepatch_shadow_fix1/enabled
|
|
* rmmod livepatch-shadow-fix2
|
|
* rmmod livepatch-shadow-fix1
|
|
* rmmod livepatch-shadow-mod
|
|
*/
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/workqueue.h>
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
|
|
MODULE_DESCRIPTION("Buggy module for shadow variable demo");
|
|
|
|
/* Allocate new dummies every second */
|
|
#define ALLOC_PERIOD 1
|
|
/* Check for expired dummies after a few new ones have been allocated */
|
|
#define CLEANUP_PERIOD (3 * ALLOC_PERIOD)
|
|
/* Dummies expire after a few cleanup instances */
|
|
#define EXPIRE_PERIOD (4 * CLEANUP_PERIOD)
|
|
|
|
/*
|
|
* Keep a list of all the dummies so we can clean up any residual ones
|
|
* on module exit
|
|
*/
|
|
static LIST_HEAD(dummy_list);
|
|
static DEFINE_MUTEX(dummy_list_mutex);
|
|
|
|
struct dummy {
|
|
struct list_head list;
|
|
unsigned long jiffies_expire;
|
|
};
|
|
|
|
static __used noinline struct dummy *dummy_alloc(void)
|
|
{
|
|
struct dummy *d;
|
|
int *leak;
|
|
|
|
d = kzalloc(sizeof(*d), GFP_KERNEL);
|
|
if (!d)
|
|
return NULL;
|
|
|
|
d->jiffies_expire = jiffies + secs_to_jiffies(EXPIRE_PERIOD);
|
|
|
|
/* Oops, forgot to save leak! */
|
|
leak = kzalloc(sizeof(*leak), GFP_KERNEL);
|
|
if (!leak) {
|
|
kfree(d);
|
|
return NULL;
|
|
}
|
|
|
|
pr_info("%s: dummy @ %p, expires @ %lx\n",
|
|
__func__, d, d->jiffies_expire);
|
|
|
|
return d;
|
|
}
|
|
|
|
static __used noinline void dummy_free(struct dummy *d)
|
|
{
|
|
pr_info("%s: dummy @ %p, expired = %lx\n",
|
|
__func__, d, d->jiffies_expire);
|
|
|
|
kfree(d);
|
|
}
|
|
|
|
static __used noinline bool dummy_check(struct dummy *d,
|
|
unsigned long jiffies)
|
|
{
|
|
return time_after(jiffies, d->jiffies_expire);
|
|
}
|
|
|
|
/*
|
|
* alloc_work_func: allocates new dummy structures, allocates additional
|
|
* memory, aptly named "leak", but doesn't keep
|
|
* permanent record of it.
|
|
*/
|
|
|
|
static void alloc_work_func(struct work_struct *work);
|
|
static DECLARE_DELAYED_WORK(alloc_dwork, alloc_work_func);
|
|
|
|
static void alloc_work_func(struct work_struct *work)
|
|
{
|
|
struct dummy *d;
|
|
|
|
d = dummy_alloc();
|
|
if (!d)
|
|
return;
|
|
|
|
mutex_lock(&dummy_list_mutex);
|
|
list_add(&d->list, &dummy_list);
|
|
mutex_unlock(&dummy_list_mutex);
|
|
|
|
schedule_delayed_work(&alloc_dwork, secs_to_jiffies(ALLOC_PERIOD));
|
|
}
|
|
|
|
/*
|
|
* cleanup_work_func: frees dummy structures. Without knownledge of
|
|
* "leak", it leaks the additional memory that
|
|
* alloc_work_func created.
|
|
*/
|
|
|
|
static void cleanup_work_func(struct work_struct *work);
|
|
static DECLARE_DELAYED_WORK(cleanup_dwork, cleanup_work_func);
|
|
|
|
static void cleanup_work_func(struct work_struct *work)
|
|
{
|
|
struct dummy *d, *tmp;
|
|
unsigned long j;
|
|
|
|
j = jiffies;
|
|
pr_info("%s: jiffies = %lx\n", __func__, j);
|
|
|
|
mutex_lock(&dummy_list_mutex);
|
|
list_for_each_entry_safe(d, tmp, &dummy_list, list) {
|
|
|
|
/* Kick out and free any expired dummies */
|
|
if (dummy_check(d, j)) {
|
|
list_del(&d->list);
|
|
dummy_free(d);
|
|
}
|
|
}
|
|
mutex_unlock(&dummy_list_mutex);
|
|
|
|
schedule_delayed_work(&cleanup_dwork, secs_to_jiffies(CLEANUP_PERIOD));
|
|
}
|
|
|
|
static int livepatch_shadow_mod_init(void)
|
|
{
|
|
schedule_delayed_work(&alloc_dwork, secs_to_jiffies(ALLOC_PERIOD));
|
|
schedule_delayed_work(&cleanup_dwork, secs_to_jiffies(CLEANUP_PERIOD));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void livepatch_shadow_mod_exit(void)
|
|
{
|
|
struct dummy *d, *tmp;
|
|
|
|
/* Wait for any dummies at work */
|
|
cancel_delayed_work_sync(&alloc_dwork);
|
|
cancel_delayed_work_sync(&cleanup_dwork);
|
|
|
|
/* Cleanup residual dummies */
|
|
list_for_each_entry_safe(d, tmp, &dummy_list, list) {
|
|
list_del(&d->list);
|
|
dummy_free(d);
|
|
}
|
|
}
|
|
|
|
module_init(livepatch_shadow_mod_init);
|
|
module_exit(livepatch_shadow_mod_exit);
|