From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B19AF72 for ; Sat, 14 Aug 2021 14:56:18 +0000 (UTC) Received: by mail-ej1-f48.google.com with SMTP id bq25so13701082ejb.11 for ; Sat, 14 Aug 2021 07:56:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tImfbxVWdTlhcDIkyDpmWJXKvDRSXiEiMFTfwAJNv9k=; b=EHOLnNLMMlJR/Uf4G7WZg2ue5EzYgozA1tZhnmkGZL5aUZNrMjUNaGz7u/HQFPrn8c GDxhbqm255pZS5aMxsgSHYKHdfCtFw8ipL0j/u5frb2Lrq7MHJi6rvj+X9/gkH6iDFLU hRC13RHdoKz3gyqxy4jY6XRXsutm8rz74PBKwdG5HCEPWdynaxmqCwlUck5pk+ZVxWJ5 kh6ebzSSnO3dnfgQ5qM6xstAczJlXPk+huM+m/DMsQT6yjFjgjVwZEEdzhRSZ6cSvZZA 4KjRQg5bPAx+cT06RkY65jihFJo0ugC00qH+ATWkNKe2zMVFwziGFmZ6Q1X9/KFQQv6w nIJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tImfbxVWdTlhcDIkyDpmWJXKvDRSXiEiMFTfwAJNv9k=; b=gp0mQODtqW76Gjyz+93OgemOoOvIKSvUXlscZRB4pCr4Is5zQmF2YpC7AfxyxgsWJK k6mAc9tnjiLVLbTCbMtVe55ivAteNzIC0TJKJHKyuWfZq07gt85uwPFAz0mpHezeNSIJ DV0l8dG6dNh1Tul6SVJ0ASfI0xxQnsmZwAG5rxz0PwZL/+KRA6D6v9wupQ+10oI4fb6t K0N2AONIFqjnPcsQMxOwpIlEepOSDPMv46B1zT5m34Q5+7eUC5tX24tqsbeVg7U7DLNb Zjtdg+Rm8oQ5eUAdgHIL6sJY6p1XCo56oyPbr595OvTjP5s6vXXntH7x+NX3N9AjiLit B3Sg== X-Gm-Message-State: AOAM530z+VVF9yfyjeF973VdA7eZcfv5UKqWMEERqdUIW+ftMoyAUfGX nNa+/lHgNqxIaZZGg5kPjaA= X-Google-Smtp-Source: ABdhPJy9N0iCyoePDC+ZEuwq4QPMU8YnqadyfCQ5pwETUuEVCcgbCTrHajg881i0eJusf9tYz2gnpg== X-Received: by 2002:a17:906:b052:: with SMTP id bj18mr7840960ejb.55.1628952977036; Sat, 14 Aug 2021 07:56:17 -0700 (PDT) Received: from localhost.localdomain (host-79-22-109-211.retail.telecomitalia.it. [79.22.109.211]) by smtp.gmail.com with ESMTPSA id v23sm2336373edy.21.2021.08.14.07.56.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Aug 2021 07:56:16 -0700 (PDT) From: "Fabio M. De Francesco" To: Johan Hovold , Alex Elder , Greg Kroah-Hartman , greybus-dev@lists.linaro.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: "Fabio M. De Francesco" Subject: [PATCH] staging: greybus: Convert uart.c from IDR to XArray Date: Sat, 14 Aug 2021 16:56:13 +0200 Message-Id: <20210814145613.6493-1-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.32.0 Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Convert greybus/uart.c from IDR to XArray. The abstract data type XArray is more memory-efficient, parallelisable, and cache friendly. It takes advantage of RCU to perform lookups without locking. Furthermore, IDR is deprecated because XArray has a better (cleaner and more consistent) API. Signed-off-by: Fabio M. De Francesco --- drivers/staging/greybus/uart.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c index 73f01ed1e5b7..7c19156534ca 100644 --- a/drivers/staging/greybus/uart.c +++ b/drivers/staging/greybus/uart.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -33,6 +33,7 @@ #include "gbphy.h" #define GB_NUM_MINORS 16 /* 16 is more than enough */ +#define GB_RANGE_MINORS XA_LIMIT(0, GB_NUM_MINORS) #define GB_NAME "ttyGB" #define GB_UART_WRITE_FIFO_SIZE PAGE_SIZE @@ -67,7 +68,7 @@ struct gb_tty { }; static struct tty_driver *gb_tty_driver; -static DEFINE_IDR(tty_minors); +static DEFINE_XARRAY(tty_minors); static DEFINE_MUTEX(table_lock); static int gb_uart_receive_data_handler(struct gb_operation *op) @@ -77,6 +78,7 @@ static int gb_uart_receive_data_handler(struct gb_operation *op) struct tty_port *port = &gb_tty->port; struct gb_message *request = op->request; struct gb_uart_recv_data_request *receive_data; + u16 recv_data_size; int count; unsigned long tty_flags = TTY_NORMAL; @@ -341,8 +343,8 @@ static struct gb_tty *get_gb_by_minor(unsigned int minor) { struct gb_tty *gb_tty; - mutex_lock(&table_lock); - gb_tty = idr_find(&tty_minors, minor); + xa_lock(&table_lock); + gb_tty = xa_load(&tty_minors, minor); if (gb_tty) { mutex_lock(&gb_tty->mutex); if (gb_tty->disconnected) { @@ -353,19 +355,19 @@ static struct gb_tty *get_gb_by_minor(unsigned int minor) mutex_unlock(&gb_tty->mutex); } } - mutex_unlock(&table_lock); + xa_unlock(&table_lock); return gb_tty; } static int alloc_minor(struct gb_tty *gb_tty) { int minor; + int ret; - mutex_lock(&table_lock); - minor = idr_alloc(&tty_minors, gb_tty, 0, GB_NUM_MINORS, GFP_KERNEL); - mutex_unlock(&table_lock); - if (minor >= 0) - gb_tty->minor = minor; + ret = xa_alloc(&tty_minors, &minor, gb_tty, GB_RANGE_MINORS, GFP_KERNEL); + if (ret) + return ret; + gb_tty->minor = minor; return minor; } @@ -374,9 +376,7 @@ static void release_minor(struct gb_tty *gb_tty) int minor = gb_tty->minor; gb_tty->minor = 0; /* Maybe should use an invalid value instead */ - mutex_lock(&table_lock); - idr_remove(&tty_minors, minor); - mutex_unlock(&table_lock); + xa_erase(&tty_minors, minor); } static int gb_tty_install(struct tty_driver *driver, struct tty_struct *tty) @@ -982,7 +982,7 @@ static void gb_tty_exit(void) { tty_unregister_driver(gb_tty_driver); put_tty_driver(gb_tty_driver); - idr_destroy(&tty_minors); + xa_destroy(&tty_minors); } static const struct gbphy_device_id gb_uart_id_table[] = { -- 2.32.0