From patchwork Sat Mar 25 22:04:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 74988 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp628592vqo; Sat, 25 Mar 2023 15:12:17 -0700 (PDT) X-Google-Smtp-Source: AKy350b37zU3CwP2tss3KgkPb7v0K4A6G9Ny5HyJUrI8bV/5qyUFwXtt6UxIScDkTt5xefFsP86M X-Received: by 2002:a17:90b:1e0f:b0:234:ac93:d715 with SMTP id pg15-20020a17090b1e0f00b00234ac93d715mr7506220pjb.45.1679782337707; Sat, 25 Mar 2023 15:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679782337; cv=none; d=google.com; s=arc-20160816; b=qzIq4WNk0rFEvoVkiHjgyzgwob3cHpAoRLShMVNbLeGyJI3WP5G1bOh0QBnU6GufaK q/zzVTCi7A3B7GEQrsajoNohZSECdcaXHrgsMN1wjv0QGdK4VizL9izfkJo/eLY3OOlu BhHDrO7S338zSaS7HeKSkCbknqdNsDoBta4p2X3SYzGDp1YS8YO/Fo2JrCL/9VduP1Jt YRtNfk52VKWVarspsThFZH5xNQ50TA8ZqSHD8RHtfSQN88MktW9IV94FHTWVJMQr0CHY JzXj3P/FntSlhVJkijWfqHyzZT6QKkrzEkwOF1OHgOlNWxDcq6mMlXneWWdvKXqhsxB5 srAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:subject:from:cc:to :in-reply-to:content-language:user-agent:mime-version:date :message-id:dkim-signature; bh=qj2eKpHg24lBwg8Ceng11FmHD2L6ZT5DPMiSeVXYd5I=; b=fJHvMsPthHTwrinktB9P1Dv5tcyRTKUgUZ4yRB9N3ANsr+LOayPvo1zufnDJYx0Q4X O6Zy55Pwl9SOYB9QFUz6XtIlJDpkApAIAUWwK7hE7zVwGHzWurrpBCeFrdDwsWcz5yOp 4GKIdxKLk1GHWn136FU/eju4n/v5tJFwe9PKrza7nl1tF/h+/XPyurCESH+f3JNg1DND TT5NrbpO2Y49lwPQuX46mRXykvYNICcyY594R/GQCB/rkOF8nBcvivL1PerHTQRI4MLm qEdTBSbsLWiujOTskGiEVjmvyapkrOI3maoGstUFx4kyDmGq8GHYdJaXRcRGh8q2OEGB HgYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Ycs9Ovje; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y13-20020a17090a2b4d00b00233c7c617e7si2785845pjc.101.2023.03.25.15.12.05; Sat, 25 Mar 2023 15:12:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Ycs9Ovje; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231667AbjCYWIK (ORCPT + 99 others); Sat, 25 Mar 2023 18:08:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229488AbjCYWII (ORCPT ); Sat, 25 Mar 2023 18:08:08 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 670122D41; Sat, 25 Mar 2023 15:08:07 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id C3AAE5FD02; Sun, 26 Mar 2023 01:08:05 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1679782085; bh=qj2eKpHg24lBwg8Ceng11FmHD2L6ZT5DPMiSeVXYd5I=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=Ycs9Ovje0B4OKkIJ/clxG6LEDH4VwyLuA93Gz+OTctkXltwnvYo2Q2uVRttVOm+9C HDugKuMhCSpaOUXlwcRksXnHep9dGd5bwA1JmgJUR884hfeiRYSNjTvjjEwtb8zDKE zMNlR5KdIgu0MLluBcpoBcO2jyPCyXxvzJoozSTVQGJ+d3/LBXPoM8eysq/Z59KDnf 4/KqvCV+XcFFnVsWW7GJv2GjgyUAA8o0DAjNdYe7hv9Xazgmy8zzou24aYJSyaI6Tc om1v483NxzYV56k53Fr6ISmAqYsNBXgTUdTL4X7m7JaLg/RRk4k0zViw5AtX7mzOYt Ipz8sBJjAduXg== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Sun, 26 Mar 2023 01:08:05 +0300 (MSK) Message-ID: <1ea0c407-814f-38a0-1fb7-4f146e5643ba@sberdevices.ru> Date: Sun, 26 Mar 2023 01:04:50 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US In-Reply-To: To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [PATCH net-next v5 2/2] virtio/vsock: check argument to avoid no effect call X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/25 18:14:00 #21009230 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761379444456579996?= X-GMAIL-MSGID: =?utf-8?q?1761379444456579996?= Both of these functions have no effect when input argument is 0, so to avoid useless spinlock access, check argument before it. Signed-off-by: Arseniy Krasnov Reviewed-by: Stefano Garzarella --- net/vmw_vsock/virtio_transport_common.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 9e87c7d4d7cf..312658c176bd 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -302,6 +302,9 @@ u32 virtio_transport_get_credit(struct virtio_vsock_sock *vvs, u32 credit) { u32 ret; + if (!credit) + return 0; + spin_lock_bh(&vvs->tx_lock); ret = vvs->peer_buf_alloc - (vvs->tx_cnt - vvs->peer_fwd_cnt); if (ret > credit) @@ -315,6 +318,9 @@ EXPORT_SYMBOL_GPL(virtio_transport_get_credit); void virtio_transport_put_credit(struct virtio_vsock_sock *vvs, u32 credit) { + if (!credit) + return; + spin_lock_bh(&vvs->tx_lock); vvs->tx_cnt -= credit; spin_unlock_bh(&vvs->tx_lock);