From patchwork Sat May 29 15:57:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Rydberg X-Patchwork-Id: 103075 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4TFwT1x010186 for ; Sat, 29 May 2010 16:00:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757549Ab0E2QA3 (ORCPT ); Sat, 29 May 2010 12:00:29 -0400 Received: from ch-smtp01.sth.basefarm.net ([80.76.149.212]:45312 "EHLO ch-smtp01.sth.basefarm.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757547Ab0E2QA3 (ORCPT ); Sat, 29 May 2010 12:00:29 -0400 Received: from c83-248-196-134.bredband.comhem.se ([83.248.196.134]:43595 helo=alnilam) by ch-smtp01.sth.basefarm.net with smtp (Exim 4.68) (envelope-from ) id 1OIOQN-0006lC-5J; Sat, 29 May 2010 17:58:15 +0200 Received: by alnilam (sSMTP sendmail emulation); Sat, 29 May 2010 17:58:08 +0200 From: "Henrik Rydberg" To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, Jiri Kosina , Mika Kuoppala , Benjamin Tissoires , Rafi Rubin , Henrik Rydberg Subject: [PATCH 2/3] input: evdev: convert to dynamic event buffer (rev2) Date: Sat, 29 May 2010 17:57:43 +0200 Message-Id: <1275148664-6238-3-git-send-email-rydberg@euromail.se> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1275148664-6238-2-git-send-email-rydberg@euromail.se> References: <1275148664-6238-1-git-send-email-rydberg@euromail.se> <1275148664-6238-2-git-send-email-rydberg@euromail.se> X-Originating-IP: 83.248.196.134 X-Scan-Result: No virus found in message 1OIOQN-0006lC-5J. X-Scan-Signature: ch-smtp01.sth.basefarm.net 1OIOQN-0006lC-5J 4d48ffcf38f32ac79e73892f0d04e124 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 29 May 2010 16:00:30 +0000 (UTC) diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 9cbed21..327f821 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 @@ -35,7 +35,8 @@ struct evdev { struct device dev; int head; int next_head; - struct input_event buffer[EVDEV_BUFFER_SIZE]; + int bufsize; + struct input_event *buffer; }; struct evdev_client { @@ -73,7 +74,7 @@ static void evdev_event(struct input_handle *handle, event.value = value; /* lock-less write, interrupts disabled locally */ - evdev->next_head = (evdev->head + 1) & (EVDEV_BUFFER_SIZE - 1); + evdev->next_head = (evdev->head + 1) & (evdev->bufsize - 1); smp_wmb(); evdev->buffer[evdev->head] = event; smp_wmb(); @@ -125,6 +126,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); } @@ -354,7 +356,7 @@ static int evdev_fetch_next_event(struct evdev *evdev, goto repeat; } - client->tail = (client->tail + 1) & (EVDEV_BUFFER_SIZE - 1); + client->tail = (client->tail + 1) & (evdev->bufsize - 1); return 1; } @@ -803,6 +805,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. @@ -847,6 +854,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 = kzalloc(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;