Serge E. Hallyn wrote:
quoted text
> Quoting Oren Laadan (orenl@cs.columbia.edu):
>> Infrastructure to handle objects that may be shared and referenced by
>> multiple tasks or other objects, e..g open files, memory address space
>> etc.
>>
>> The state of shared objects is saved once. On the first encounter, the
>> state is dumped and the object is assigned a unique identifier (objref)
>> and also stored in a hash table (indexed by its physical kenrel address).
>> >From then on the object will be found in the hash and only its identifier
>> is saved.
>>
>> On restart the identifier is looked up in the hash table; if not found
>> then the state is read, the object is created, and added to the hash
>> table (this time indexed by its identifier). Otherwise, the object in
>> the hash table is used.
>>
>> Signed-off-by: Oren Laadan <orenl@cs.columbia.edu>
> 
> Acked-by: Serge Hallyn <serue@us.ibm.com>
> 
> Thanks, Oren, I actually think this is quite nice and readable.
> 
> Though three questions below.  First one is, since you've mentioned
> having multiple threads doing checkpoint, won't you need some locking?

yes.

quoted text
> I assume that's coming in later patches if/when needed?

yes.

[...]

quoted text
>> +++ b/checkpoint/objhash.c
>> @@ -0,0 +1,237 @@
>> +/*
>> + *  Checkpoint-restart - object hash infrastructure to manage shared objects
>> + *
>> + *  Copyright (C) 2008 Oren Laadan
>> + *
>> + *  This file is subject to the terms and conditions of the GNU General Public
>> + *  License.  See the file COPYING in the main directory of the Linux
>> + *  distribution for more details.
>> + */
>> +
>> +#include <linux/kernel.h>
>> +#include <linux/file.h>
>> +#include <linux/hash.h>
>> +#include <linux/checkpoint.h>
>> +
>> +struct cr_objref {
>> +	int objref;
>> +	void *ptr;
>> +	unsigned short type;
> 
> What is the point of the 'type'?
> 
> By that I mean: is it meant to catch bugs in the implementation, or bad
> checkpoint images?

The hash table is maintained in the kernel during checkpoint/restart,
adding shared objects to the hash table when they are first seen. An
object can be a 'struct file', 'struct mm_struct', etc.

When an object is added, it's reference count is incremented to ensure
that the pointer is still valid for as long as it's in the hash table.
Similarly, when we remove an object from the hash, we need to decrement
the reference count. This is done in cr_obj_ref_grab(), cr_obj_ref_drop().

There are different functions to inc/dec the reference count of objects
of different types. '->type' keeps track of the type of the object, so
we know which function to call. (At this point, we only track shared
'struct file' so it isn't that clear from the code).

quoted text
> 
>> +	unsigned short flags;
>> +	struct hlist_node hash;
>> +};
>> +
>> +struct cr_objhash {
>> +	struct hlist_head *head;
>> +	int objref_index;
> 
> What exactly will objref_index be used for?  I don't see any real
> usage here or in your later patches.
> 

'objref_index' is a counter used to assign unique identifiers (objref)
to objects as they are added to the hash table. It is incremented with
every object that joins the hash table (and the old value is used as
the objref of that object). It is used in cr_obj_new().

quoted text
>> +};
>> +
>> +#define CR_OBJHASH_NBITS  10
>> +#define CR_OBJHASH_TOTAL  (1UL << CR_OBJHASH_NBITS)
>> +
>> +static void cr_obj_ref_drop(struct cr_objref *obj)
>> +{
>> +	switch (obj->type) {
>> +	case CR_OBJ_FILE:
>> +		fput((struct file *) obj->ptr);
>> +		break;
>> +	default:
>> +		BUG();
>> +	}
>> +}
>> +
>> +static void cr_obj_ref_grab(struct cr_objref *obj)
>> +{
>> +	switch (obj->type) {
>> +	case CR_OBJ_FILE:
>> +		get_file((struct file *) obj->ptr);
>> +		break;
>> +	default:
>> +		BUG();
>> +	}
>> +}
>> +

[...]

quoted text
>> +static struct cr_objref *cr_obj_new(struct cr_ctx *ctx, void *ptr, int objref,
>> +				    unsigned short type, unsigned short flags)
>> +{
>> +	struct cr_objref *obj;
>> +
>> +	obj = kmalloc(sizeof(*obj), GFP_KERNEL);
>> +	if (obj) {
>> +		int i;
>> +
>> +		obj->ptr = ptr;
>> +		obj->type = type;
>> +		obj->flags = flags;
>> +
>> +		if (objref) {
>> +			/* use 'objref' to index (restart) */
>> +			obj->objref = objref;
>> +			i = hash_ptr((void *) objref, CR_OBJHASH_NBITS);
>> +		} else {
>> +			/* use 'ptr' to index, assign objref (checkpoint) */
>> +			obj->objref = ctx->objhash->objref_index++;;
>> +			i = hash_ptr(ptr, CR_OBJHASH_NBITS);
>> +		}
>> +
>> +		hlist_add_head(&obj->hash, &ctx->objhash->head[i]);
>> +		cr_obj_ref_grab(obj);
>> +	}
>> +	return obj;
>> +}

[...]

Oren.

--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/