[RFC PATCH 4/11] relay - Add reserved param to switch-subbuf, in preparation for non-pad write/reserve.

Tom Zanussi
2008-09-29T05:41:23Z

Add reserved param to switch-subbuf, in preparation for non-pad write/reserve.

Because a write/reserve can now cross sub-buffer boundaries, we use
the length returned as a remainder for the new sub-buffer, and use the
reserved param to return a pointer to the reserved space, or NULL if
it couldn't be reserved. This patch also changes write/reserve to
preserve their current behavior despite that change. This all goes
away in a future patch, but is here now so things don't break.

Signed-off-by: Tom Zanussi <zanussi@comcast.net>

---
include/linux/relay.h | 24 ++++++++++++++++--------
kernel/relay.c | 12 +++++++++---
2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/include/linux/relay.h b/include/linux/relay.h
index 18fd269..978fdea 100644
--- a/include/linux/relay.h
+++ b/include/linux/relay.h
@@ -173,13 +173,16 @@ struct rchan_callbacks
* switch_subbuf - sub-buffer switch callback
* @buf: the channel buffer
* @length: size of current event
+ * @reserved: a pointer to the space reserved
*
* Returns either the length passed in or 0 if full.
*
* Performs sub-buffer-switch tasks such as updating filesize,
* waking up readers, etc.
*/
- size_t (*switch_subbuf)(struct rchan_buf *buf, size_t length);
+ size_t (*switch_subbuf)(struct rchan_buf *buf,
+ size_t length,
+ void **reserved);
};

/*
@@ -205,7 +208,8 @@ extern void relay_reset(struct rchan *chan);
extern int relay_buf_full(struct rchan_buf *buf);

extern size_t switch_subbuf_default_callback(struct rchan_buf *buf,
- size_t length);
+ size_t length,
+ void **reserved);

/**
@@ -269,12 +273,14 @@ static inline void relay_write(struct rchan *chan,
{
unsigned long flags;
struct rchan_buf *buf;
+ void *reserved;

local_irq_save(flags);
buf = chan->buf[smp_processor_id()];
+ reserved = buf->data + buf->offset;
if (unlikely(buf->offset + length > chan->subbuf_size))
- length = chan->cb->switch_subbuf(buf, length);
- memcpy(buf->data + buf->offset, data, length);
+ length = chan->cb->switch_subbuf(buf, length, &reserved);
+ memcpy(reserved, data, length);
buf->offset += length;
local_irq_restore(flags);
}
@@ -296,11 +302,13 @@ static inline void __relay_write(struct rchan *chan,
size_t length)
{
struct rchan_buf *buf;
+ void *reserved;

buf = chan->buf[get_cpu()];
+ reserved = buf->data + buf->offset;
if (unlikely(buf->offset + length > buf->chan->subbuf_size))
- length = chan->cb->switch_subbuf(buf, length);
- memcpy(buf->data + buf->offset, data, length);
+ length = chan->cb->switch_subbuf(buf, length, &reserved);
+ memcpy(reserved, data, length);
buf->offset += length;
put_cpu();
}
@@ -321,12 +329,12 @@ static inline void *relay_reserve(struct rchan *chan, size_t length)
void *reserved;
struct rchan_buf *buf = chan->buf[smp_processor_id()];

+ reserved = buf->data + buf->offset;
if (unlikely(buf->offset + length > buf->chan->subbuf_size)) {
- length = chan->cb->switch_subbuf(buf, length);
+ length = chan->cb->switch_subbuf(buf, length, &reserved);
if (!length)
return NULL;
}
- reserved = buf->data + buf->offset;
buf->offset += length;

return reserved;
diff --git a/kernel/relay.c b/kernel/relay.c
index a2e06b0..6c7698a 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -736,13 +736,16 @@ int relay_late_setup_files(struct rchan *chan,
* switch_subbuf_default_callback - switch to a new sub-buffer
* @buf: channel buffer
* @length: size of current event
+ * @reserved: a pointer to the space reserved
*
* Returns either the length passed in or 0 if full.
*
* Performs sub-buffer-switch tasks such as invoking callbacks,
* updating padding counts, waking up readers, etc.
*/
-size_t switch_subbuf_default_callback(struct rchan_buf *buf, size_t length)
+size_t switch_subbuf_default_callback(struct rchan_buf *buf,
+ size_t length,
+ void **reserved)
{
void *old, *new;
size_t old_subbuf, new_subbuf;
@@ -774,6 +777,9 @@ size_t switch_subbuf_default_callback(struct rchan_buf *buf, size_t length)
if (unlikely(relay_event_toobig(buf, length + buf->offset)))
goto toobig;

+ if (reserved)
+ *reserved = buf->data;
+
return length;

toobig:
@@ -860,14 +866,14 @@ void relay_flush(struct rchan *chan)
return;

if (chan->flags & RCHAN_GLOBAL_BUFFER && chan->buf[0]) {
- chan->cb->switch_subbuf(chan->buf[0], 0);
+ chan->cb->switch_subbuf(chan->buf[0], 0, NULL);
return;
}

mutex_lock(&relay_channels_mutex);
for_each_possible_cpu(i)
if (chan->buf[i])
- chan->cb->switch_subbuf(chan->buf[i], 0);
+ chan->cb->switch_subbuf(chan->buf[i], 0, NULL);
mutex_unlock(&relay_channels_mutex);
}
EXPORT_SYMBOL_GPL(relay_flush);
--
1.5.3.5