From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> To: shuah <shuah@kernel.org>, valentina.manea.m@gmail.com, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] usbip: vhci_hcd: slighly simplify code in 'vhci_urb_dequeue()' Date: Mon, 23 Mar 2020 17:56:46 +0100 [thread overview] Message-ID: <2fb983be-2a42-1b89-447a-a7415ffc7335@wanadoo.fr> (raw) In-Reply-To: <c8e319c8-cd65-2c2c-df5d-e75908ca63b7@kernel.org> Le 23/03/2020 à 17:48, shuah a écrit : > On 3/21/20 9:29 AM, Christophe JAILLET wrote: >> The allocation of 'unlink' can be moved before a spin_lock. >> This slighly simplifies the error handling if the memory allocation >> fails, > > slightly (spelling nit) > >> aligns the code structure with what is done in 'vhci_tx_urb()' and >> reduces >> potential lock contention. >> > > Are you seeing any problems or is this a potential lock contention? > If you are seeing issues, please share the problem seen. > No, the issue is just theoretical. > >> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> >> --- >> drivers/usb/usbip/vhci_hcd.c | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c >> index 65850e9c7190..b909a634260c 100644 >> --- a/drivers/usb/usbip/vhci_hcd.c >> +++ b/drivers/usb/usbip/vhci_hcd.c >> @@ -905,17 +905,16 @@ static int vhci_urb_dequeue(struct usb_hcd >> *hcd, struct urb *urb, int status) >> /* tcp connection is alive */ >> struct vhci_unlink *unlink; >> - spin_lock(&vdev->priv_lock); >> - > > This change might simplify the error path, however it could > open a race window with the unlink activity during > vhci_shutdown_connection() when the connection is being taken > down. It would be safer to hold both locks as soon as the > connection check is done. My proposal was just a small clean-up (from my point of view at least). If it can have some side effects, please, just consider it as a NACK. CJ > >> /* setup CMD_UNLINK pdu */ >> unlink = kzalloc(sizeof(struct vhci_unlink), GFP_ATOMIC); >> if (!unlink) { >> - spin_unlock(&vdev->priv_lock); >> spin_unlock_irqrestore(&vhci->lock, flags); >> usbip_event_add(&vdev->ud, VDEV_EVENT_ERROR_MALLOC); >> return -ENOMEM; >> } >> + spin_lock(&vdev->priv_lock); >> + >> unlink->seqnum = atomic_inc_return(&vhci_hcd->seqnum); >> if (unlink->seqnum == 0xffff) >> pr_info("seqnum max\n"); >> > > thanks, > -- Shuah >
WARNING: multiple messages have this Message-ID (diff)
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> To: linux-kernel@vger.kernel.org Cc: linux-usb@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] usbip: vhci_hcd: slighly simplify code in 'vhci_urb_dequeue()' Date: Mon, 23 Mar 2020 17:56:46 +0100 [thread overview] Message-ID: <2fb983be-2a42-1b89-447a-a7415ffc7335@wanadoo.fr> (raw) Message-ID: <20200323165646.qcQF6KroeiwqFOLEEwM7EmPF9Moljfo9e9rJyISdFcE@z> (raw) In-Reply-To: <c8e319c8-cd65-2c2c-df5d-e75908ca63b7@kernel.org> Le 23/03/2020 à 17:48, shuah a écrit : > On 3/21/20 9:29 AM, Christophe JAILLET wrote: >> The allocation of 'unlink' can be moved before a spin_lock. >> This slighly simplifies the error handling if the memory allocation >> fails, > > slightly (spelling nit) > >> aligns the code structure with what is done in 'vhci_tx_urb()' and >> reduces >> potential lock contention. >> > > Are you seeing any problems or is this a potential lock contention? > If you are seeing issues, please share the problem seen. > No, the issue is just theoretical. > >> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> >> --- >> drivers/usb/usbip/vhci_hcd.c | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c >> index 65850e9c7190..b909a634260c 100644 >> --- a/drivers/usb/usbip/vhci_hcd.c >> +++ b/drivers/usb/usbip/vhci_hcd.c >> @@ -905,17 +905,16 @@ static int vhci_urb_dequeue(struct usb_hcd >> *hcd, struct urb *urb, int status) >> /* tcp connection is alive */ >> struct vhci_unlink *unlink; >> - spin_lock(&vdev->priv_lock); >> - > > This change might simplify the error path, however it could > open a race window with the unlink activity during > vhci_shutdown_connection() when the connection is being taken > down. It would be safer to hold both locks as soon as the > connection check is done. My proposal was just a small clean-up (from my point of view at least). If it can have some side effects, please, just consider it as a NACK. CJ > >> /* setup CMD_UNLINK pdu */ >> unlink = kzalloc(sizeof(struct vhci_unlink), GFP_ATOMIC); >> if (!unlink) { >> - spin_unlock(&vdev->priv_lock); >> spin_unlock_irqrestore(&vhci->lock, flags); >> usbip_event_add(&vdev->ud, VDEV_EVENT_ERROR_MALLOC); >> return -ENOMEM; >> } >> + spin_lock(&vdev->priv_lock); >> + >> unlink->seqnum = atomic_inc_return(&vhci_hcd->seqnum); >> if (unlink->seqnum == 0xffff) >> pr_info("seqnum max\n"); >> > > thanks, > -- Shuah >
next prev parent reply other threads:[~2020-03-23 16:56 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-21 15:29 [PATCH] usbip: vhci_hcd: slighly simplify code in 'vhci_urb_dequeue()' Christophe JAILLET 2020-03-23 16:48 ` shuah 2020-03-23 16:56 ` Christophe JAILLET [this message] 2020-03-23 16:56 ` Christophe JAILLET
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=2fb983be-2a42-1b89-447a-a7415ffc7335@wanadoo.fr \ --to=christophe.jaillet@wanadoo.fr \ --cc=gregkh@linuxfoundation.org \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=shuah@kernel.org \ --cc=valentina.manea.m@gmail.com \ /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: linkBe 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).