From: Rhett Aultman <rhett.aultman@samsara.com>
To: linux-usb@vger.kernel.org, linux-can <linux-can@vger.kernel.org>
Cc: --cc=Oliver Neukum <oneukum@suse.com>,
Alan Stern <stern@rowland.harvard.edu>,
Marc Kleine-Budde <mkl@pengutronix.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Vincent Mailhol <mailhol.vincent@wanadoo.fr>,
Rhett Aultman <rhett.aultman@samsara.com>
Subject: [PATCH v3 1/2] drivers: usb/core/urb: Add URB_FREE_COHERENT
Date: Fri, 10 Jun 2022 17:33:35 -0400 [thread overview]
Message-ID: <20220610213335.3077375-2-rhett.aultman@samsara.com> (raw)
In-Reply-To: <20220610213335.3077375-1-rhett.aultman@samsara.com>
From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
When allocating URB memory with kmalloc(), drivers can simply set the
URB_FREE_BUFFER flag in urb::transfer_flags and that way, the memory
will be freed in the background when killing the URB (for example with
usb_kill_anchored_urbs()).
However, there are no equivalent mechanism when allocating DMA memory
(with usb_alloc_coherent()).
This patch adds a new flag: URB_FREE_COHERENT. Setting this flag will
cause the kernel to automatically call usb_free_coherent() on the
transfer buffer when the URB is killed, similarly to how
URB_FREE_BUFFER triggers a call to kfree().
In order to have all the flags in numerical order, URB_DIR_IN is
renumbered from 0x0200 to 0x0400 so that URB_FREE_COHERENT can reuse
value 0x0200.
Co-developed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Co-developed-by: Rhett Aultman <rhett.aultman@samsara.com>
Signed-off-by: Rhett Aultman <rhett.aultman@samsara.com>
Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
---
drivers/usb/core/urb.c | 5 ++++-
include/linux/usb.h | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 33d62d7e3929..36c48fb196e0 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -22,6 +22,9 @@ static void urb_destroy(struct kref *kref)
if (urb->transfer_flags & URB_FREE_BUFFER)
kfree(urb->transfer_buffer);
+ else if (urb->transfer_flags & URB_FREE_COHERENT)
+ usb_free_coherent(urb->dev, urb->transfer_buffer_length,
+ urb->transfer_buffer, urb->transfer_dma);
kfree(urb);
}
@@ -504,7 +507,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
/* Check against a simple/standard policy */
allowed = (URB_NO_TRANSFER_DMA_MAP | URB_NO_INTERRUPT | URB_DIR_MASK |
- URB_FREE_BUFFER);
+ URB_FREE_BUFFER | URB_FREE_COHERENT);
switch (xfertype) {
case USB_ENDPOINT_XFER_BULK:
case USB_ENDPOINT_XFER_INT:
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 60bee864d897..945d68ea1d76 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1328,9 +1328,10 @@ extern int usb_disabled(void);
#define URB_NO_INTERRUPT 0x0080 /* HINT: no non-error interrupt
* needed */
#define URB_FREE_BUFFER 0x0100 /* Free transfer buffer with the URB */
+#define URB_FREE_COHERENT 0x0200 /* Free DMA memory of transfer buffer */
/* The following flags are used internally by usbcore and HCDs */
-#define URB_DIR_IN 0x0200 /* Transfer from device to host */
+#define URB_DIR_IN 0x0400 /* Transfer from device to host */
#define URB_DIR_OUT 0
#define URB_DIR_MASK URB_DIR_IN
--
2.30.2
next prev parent reply other threads:[~2022-06-10 21:34 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-03 19:52 [PATCH 001/001] can: gs_usb: gs_usb_open/close( ) fix memory leak Rhett Aultman
2022-06-04 2:11 ` [PATCH] " Vincent Mailhol
2022-06-04 2:26 ` Vincent MAILHOL
2022-06-04 14:08 ` Rhett Aultman
2022-06-04 14:41 ` [RFC PATCH] USB: core: urb: add new transfer flag URB_FREE_COHERENT Vincent Mailhol
2022-06-04 16:40 ` Alan Stern
2022-06-05 2:04 ` Vincent MAILHOL
2022-06-05 6:00 ` Oliver Neukum
2022-06-05 13:45 ` Vincent MAILHOL
2022-06-07 9:49 ` Oliver Neukum
2022-06-07 10:18 ` Vincent MAILHOL
2022-06-07 11:46 ` Oliver Neukum
2022-06-07 12:12 ` Vincent MAILHOL
2022-06-05 2:15 ` [RFC PATCH v2] usb: " Vincent Mailhol
2022-06-04 14:53 ` [PATCH] can: gs_usb: gs_usb_open/close( ) fix memory leak Vincent MAILHOL
2022-06-09 20:47 ` [PATCH v2 0/3] URB_FREE_COHERENT gs_usb memory leak fix Rhett Aultman
2022-06-09 20:47 ` [PATCH v2 1/3] drivers: usb/core/urb: Add URB_FREE_COHERENT Rhett Aultman
2022-06-10 0:18 ` Vincent MAILHOL
2022-06-10 10:46 ` Marc Kleine-Budde
2022-06-09 20:47 ` [PATCH v2 2/3] drivers: usb/core/urb: allow URB_FREE_COHERENT Rhett Aultman
2022-06-09 23:18 ` Vincent Mailhol
2022-06-09 20:47 ` [PATCH v2 3/3] can: gs_usb: fix DMA memory leak on close Rhett Aultman
2022-06-10 0:05 ` Vincent Mailhol
2022-06-10 1:28 ` Vincent Mailhol
2022-06-10 21:33 ` [PATCH v3 0/2] URB_FREE_COHERENT gs_usb memory leak fix Rhett Aultman
2022-06-10 21:33 ` Rhett Aultman [this message]
2022-06-11 15:31 ` [PATCH v3 1/2] drivers: usb/core/urb: Add URB_FREE_COHERENT Marc Kleine-Budde
2022-06-11 16:06 ` Vincent MAILHOL
2022-06-21 13:51 ` Greg Kroah-Hartman
2022-06-21 14:59 ` Vincent MAILHOL
2022-06-21 15:03 ` Greg Kroah-Hartman
2022-06-21 15:54 ` Vincent MAILHOL
2022-06-21 15:11 ` Alan Stern
2022-06-21 15:55 ` Vincent MAILHOL
2022-06-21 16:14 ` Alan Stern
2022-06-21 16:40 ` Vincent MAILHOL
2022-06-21 17:00 ` Greg Kroah-Hartman
2022-06-21 17:14 ` Vincent MAILHOL
2022-06-21 17:46 ` Greg Kroah-Hartman
2022-06-22 9:22 ` David Laight
2022-06-22 9:41 ` Greg Kroah-Hartman
2022-06-22 10:03 ` David Laight
2022-06-22 11:11 ` Oliver Neukum
2022-06-22 10:34 ` Vincent MAILHOL
2022-06-22 12:23 ` Greg Kroah-Hartman
2022-06-22 15:59 ` Vincent MAILHOL
2022-06-22 18:11 ` Rhett Aultman
2022-06-26 8:21 ` Vincent MAILHOL
2022-06-27 19:24 ` Rhett Aultman
2022-06-28 1:09 ` Vincent MAILHOL
2022-07-04 13:02 ` Marc Kleine-Budde
2022-07-04 15:35 ` Rhett Aultman
2022-07-05 7:50 ` Marc Kleine-Budde
2022-06-23 17:30 ` Hongren Zenithal Zheng
2022-06-23 17:45 ` Shuah Khan
2022-06-24 14:43 ` Alan Stern
2022-06-24 16:01 ` Hongren Zenithal Zheng
2022-06-24 16:31 ` Shuah Khan
2022-06-24 18:07 ` Alan Stern
2022-06-27 22:54 ` Shuah Khan
2022-06-28 1:35 ` Alan Stern
2022-07-01 2:10 ` Shuah Khan
2022-08-01 17:42 ` Shuah Khan
2022-08-01 18:28 ` Vincent MAILHOL
2022-08-03 23:44 ` Shuah Khan
2022-06-10 21:33 ` [PATCH v3 2/2] can: gs_usb: fix DMA memory leak on close Rhett Aultman
2022-06-11 15:35 ` Marc Kleine-Budde
2022-06-11 16:03 ` Vincent MAILHOL
2022-06-12 21:28 ` David Laight
2022-06-12 21:33 ` Marc Kleine-Budde
2022-06-14 15:26 ` [PATCH v4 0/1] URB_FREE_COHERENT gs_usb memory leak fix Rhett Aultman
2022-06-14 15:26 ` [PATCH v4 1/1] can: gs_usb: fix DMA memory leak on close Rhett Aultman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220610213335.3077375-2-rhett.aultman@samsara.com \
--to=rhett.aultman@samsara.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mailhol.vincent@wanadoo.fr \
--cc=mkl@pengutronix.de \
--cc=oneukum@suse.com \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).