From patchwork Fri May 28 15:10:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Rydberg X-Patchwork-Id: 102911 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 o4SFBLpJ026923 for ; Fri, 28 May 2010 15:11:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932484Ab0E1PLW (ORCPT ); Fri, 28 May 2010 11:11:22 -0400 Received: from ch-smtp03.sth.basefarm.net ([80.76.149.214]:44387 "EHLO ch-smtp03.sth.basefarm.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751691Ab0E1PLW (ORCPT ); Fri, 28 May 2010 11:11:22 -0400 Received: from c83-248-196-134.bredband.comhem.se ([83.248.196.134]:60303 helo=alnilam) by ch-smtp03.sth.basefarm.net with smtp (Exim 4.68) (envelope-from ) id 1OI1DE-0008Nz-Bz; Fri, 28 May 2010 17:11:07 +0200 Received: by alnilam (sSMTP sendmail emulation); Fri, 28 May 2010 17:11:04 +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 Date: Fri, 28 May 2010 17:10:33 +0200 Message-Id: <1275059434-2110-3-git-send-email-rydberg@euromail.se> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1275059434-2110-2-git-send-email-rydberg@euromail.se> References: <1275059434-2110-1-git-send-email-rydberg@euromail.se> <1275059434-2110-2-git-send-email-rydberg@euromail.se> X-Originating-IP: 83.248.196.134 X-Scan-Result: No virus found in message 1OI1DE-0008Nz-Bz. X-Scan-Signature: ch-smtp03.sth.basefarm.net 1OI1DE-0008Nz-Bz eb6e4d1951090ada3a8f1e15a804aff0 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]); Fri, 28 May 2010 15:11:23 +0000 (UTC) diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 8edea95..ea652cc 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]; + int bufsize; + struct input_event *buffer; rwlock_t buffer_lock; /* protects access to buffer only */ }; @@ -78,7 +79,7 @@ static void evdev_event(struct input_handle *handle, write_unlock(&evdev->buffer_lock); evdev->head++; - evdev->head &= EVDEV_BUFFER_SIZE - 1; + evdev->head &= evdev->bufsize - 1; rcu_read_lock(); @@ -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); } @@ -336,7 +338,7 @@ static int evdev_fetch_next_event(struct evdev *evdev, *event = evdev->buffer[client->tail]; read_unlock_irq(&evdev->buffer_lock); client->tail++; - client->tail &= EVDEV_BUFFER_SIZE - 1; + client->tail &= evdev->bufsize - 1; } return have_event; @@ -788,6 +790,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. @@ -833,6 +840,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;