From patchwork Sat May 17 08:37:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Wang <00107082@163.com> X-Patchwork-Id: 890986 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 945DD15E8B; Sat, 17 May 2025 08:38:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747471142; cv=none; b=nOR2eh4yO50TYfMGBK3OkGBcFVYrFCZz1eyLgPp4SoIcdvE6FHdE1atSZUM9m8uB5O2DAbZUfQffny80xqNwa+rgvRHh76ocPHN5cAX4/7QE8P9dIWj/zPZBH3RaTJaoyROc1K7dM9k8bsnrbDT+g5KHZ8dsadolERbMhRmlcKw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747471142; c=relaxed/simple; bh=vLs4lfZ1RYhKkMrkUZsTV9xrJHeP9pjbbhQzv2P+yNU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=qInoWpxsNpLbavM8y4LYpciCbSYCw19Pl5Zv2jvBrL0Cv4im3oa1LOqdcvhKDihCSOBty5Uo1BZ6VW7raKhGS9DF7E8ycLleAc4Ao8Gopz6sy4i3X44aZD6UdeRObd3cJqd9ui3y6FwD0Bx1vcr8styx6kg7FXh8qE4YlGPjcG8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=K9GmWED9; arc=none smtp.client-ip=220.197.31.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="K9GmWED9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=gP kutBVLb1FxgqM0uGljWj9qW8F+OJFnhi6A4WUBkpg=; b=K9GmWED9jx6rLzkxhh 6kK9eNz7Z+kn4juiDCh8yXILQ2OczGtQ3q1aUSuq5MbsBXZJ+jf6DiwfDQfktTRG xJ/rq8TLu4IdeN6UVO/rPDK2atKl8BqwEIUcs7C8vDSAWTwAdVsHloKk4RTNtszM gRzVXXV6ycYLCSfgHYgEJOkFI= Received: from localhost.localdomain (unknown []) by gzsmtp5 (Coremail) with SMTP id QCgvCgDHj+XgSihogwvuAw--.23581S4; Sat, 17 May 2025 16:37:58 +0800 (CST) From: David Wang <00107082@163.com> To: gregkh@linuxfoundation.org, mathias.nyman@intel.com Cc: oneukum@suse.com, stern@rowland.harvard.edu, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, David Wang <00107082@163.com> Subject: [PATCH v3 2/2] USB: xhci: use urb hcpriv mempool for private data Date: Sat, 17 May 2025 16:37:50 +0800 Message-Id: <20250517083750.6097-1-00107082@163.com> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: QCgvCgDHj+XgSihogwvuAw--.23581S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxCryUCFWDGw45Jr13CrWrGrg_yoW5CFykpF 4rXa40kr1rtr47XFZ8Jr1DA3WfJw4vgF92gFWxC345ursFy3srG342yFWF9rnIqrykCrnI vF1vqrWrGw1UGFUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pE89N7UUUUU= X-CM-SenderInfo: qqqrilqqysqiywtou0bp/xtbBkBdQqmgoSSslywABsw --- Changes since v2: 1. WARN when xhci_urb_free_priv is called somehow. --- xhci keeps alloc/free private data for each enqueue/dequeue cycles, when using a USB webcam, allocation rate is ~250/s; when using a USB mic, allocation rate reaches ~1k/s; The more usb device in use, the higher allocation rate. URB objects have longer lifecycle than private data, hand over ownership of private data to urb can save lots of memory allocations over time. Signed-off-by: David Wang <00107082@163.com> --- drivers/usb/host/xhci-mem.c | 1 + drivers/usb/host/xhci-ring.c | 3 +-- drivers/usb/host/xhci.c | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index d698095fc88d..b19e41cf1c4c 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -1745,6 +1745,7 @@ struct xhci_command *xhci_alloc_command_with_ctx(struct xhci_hcd *xhci, void xhci_urb_free_priv(struct urb_priv *urb_priv) { + WARN_ONCE(1, "xhci private data should be managed by urb"); kfree(urb_priv); } diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 423bf3649570..8fa3f71fdb29 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -821,7 +821,6 @@ static void xhci_giveback_urb_in_irq(struct xhci_hcd *xhci, struct xhci_td *cur_td, int status) { struct urb *urb = cur_td->urb; - struct urb_priv *urb_priv = urb->hcpriv; struct usb_hcd *hcd = bus_to_hcd(urb->dev->bus); if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) { @@ -831,7 +830,7 @@ static void xhci_giveback_urb_in_irq(struct xhci_hcd *xhci, usb_amd_quirk_pll_enable(); } } - xhci_urb_free_priv(urb_priv); + urb_free_hcpriv(urb); usb_hcd_unlink_urb_from_ep(hcd, urb); trace_xhci_urb_giveback(urb); usb_hcd_giveback_urb(hcd, urb, status); diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 90eb491267b5..071a7680b36e 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1552,7 +1552,7 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag else num_tds = 1; - urb_priv = kzalloc(struct_size(urb_priv, td, num_tds), mem_flags); + urb_priv = urb_hcpriv_mempool_zalloc(urb, struct_size(urb_priv, td, num_tds), mem_flags); if (!urb_priv) return -ENOMEM; @@ -1626,8 +1626,7 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag if (ret) { free_priv: - xhci_urb_free_priv(urb_priv); - urb->hcpriv = NULL; + urb_free_hcpriv(urb); } spin_unlock_irqrestore(&xhci->lock, flags); return ret; @@ -1789,8 +1788,7 @@ static int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) return ret; err_giveback: - if (urb_priv) - xhci_urb_free_priv(urb_priv); + urb_free_hcpriv(urb); usb_hcd_unlink_urb_from_ep(hcd, urb); spin_unlock_irqrestore(&xhci->lock, flags); usb_hcd_giveback_urb(hcd, urb, -ESHUTDOWN);