From patchwork Thu Jun 10 09:52:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Rydberg X-Patchwork-Id: 55178 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 435C4B7D83 for ; Thu, 10 Jun 2010 19:53:18 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OMeRm-0000rn-8D; Thu, 10 Jun 2010 10:53:14 +0100 Received: from smtp-out21.han.skanova.net ([195.67.226.208]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OMeRj-0000oL-Mf for kernel-team@lists.ubuntu.com; Thu, 10 Jun 2010 10:53:11 +0100 Received: from alnilam (90.237.163.108) by smtp-out21.han.skanova.net (8.5.114) id 4BC6D3500167BBA4; Thu, 10 Jun 2010 11:53:11 +0200 Received: by alnilam (sSMTP sendmail emulation); Thu, 10 Jun 2010 11:53:09 +0200 From: "Henrik Rydberg" To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3] UBUNTU: (evdev) Convert to dynamic event buffer (rev4) Date: Thu, 10 Jun 2010 11:52:58 +0200 Message-Id: <1276163579-22224-3-git-send-email-rydberg@euromail.se> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1276163579-22224-2-git-send-email-rydberg@euromail.se> References: <1276163579-22224-1-git-send-email-rydberg@euromail.se> <1276163579-22224-2-git-send-email-rydberg@euromail.se> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Allocate the event buffer dynamically, and prepare to compute the buffer size in a separate function. This patch defines the size computation to be identical to the current code, and does not contain any logical changes. Signed-off-by: Henrik Rydberg --- drivers/input/evdev.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 7117589..463bf1b 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -10,7 +10,7 @@ #define EVDEV_MINOR_BASE 64 #define EVDEV_MINORS 32 -#define EVDEV_BUFFER_SIZE 64 +#define EVDEV_MIN_BUFFER_SIZE 64 #include #include @@ -34,7 +34,8 @@ struct evdev { struct mutex mutex; struct device dev; int head; - struct input_event buffer[EVDEV_BUFFER_SIZE]; + unsigned int bufsize; + struct input_event *buffer; }; struct evdev_client { @@ -75,7 +76,7 @@ static void evdev_event(struct input_handle *handle, /* dev->event_lock held */ evdev->buffer[evdev->head] = event; - evdev->head = (evdev->head + 1) & (EVDEV_BUFFER_SIZE - 1); + evdev->head = (evdev->head + 1) & (evdev->bufsize - 1); rcu_read_lock(); @@ -122,6 +123,7 @@ static void evdev_free(struct device *dev) struct evdev *evdev = container_of(dev, struct evdev, dev); input_put_device(evdev->handle.dev); + kfree(evdev->buffer); kfree(evdev); } @@ -340,7 +342,7 @@ static int evdev_fetch_next_event(struct evdev_client *client, have_event = client->head != client->tail; if (have_event) { *event = evdev->buffer[client->tail++]; - client->tail &= EVDEV_BUFFER_SIZE - 1; + client->tail &= evdev->bufsize - 1; } spin_unlock_irq(&dev->event_lock); @@ -793,6 +795,11 @@ static void evdev_cleanup(struct evdev *evdev) } } +static int evdev_compute_buffer_size(struct input_dev *dev) +{ + return EVDEV_MIN_BUFFER_SIZE; +} + /* * Create new evdev device. Note that input core serializes calls * to connect and disconnect so we don't need to lock evdev_table here. @@ -837,6 +844,14 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev, evdev->dev.release = evdev_free; device_initialize(&evdev->dev); + evdev->bufsize = evdev_compute_buffer_size(dev); + evdev->buffer = kcalloc(evdev->bufsize, sizeof(struct input_event), + GFP_KERNEL); + if (!evdev->buffer) { + error = -ENOMEM; + goto err_free_evdev; + } + error = input_register_handle(&evdev->handle); if (error) goto err_free_evdev;