From nobody Sun Sep 28 17:48:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1757609614; cv=none; d=zohomail.com; s=zohoarc; b=NooMACy9PXS++RdtFl5VBVf+gfvp59/YEDLo4Q36ZJYnYn+dstKaybvwSCZzdNqEAb6V+cnDWuBAm+nhGWWkR2jLrgTpr6TqCjAv7scoLAGtJxSHQZ+rGfcS3BztBKJ7FrqPkVMryT+mdhN0JpBWQTwUURDWlUfVI+sSM7Mjk8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757609614; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0ooFnJ5mdkGdKd3/GRUX63tfFBQ1KtWG9Z6i7YLvLkY=; b=ae1FyxGEAhM2b59dlp3g9GjWPBuVswmKVxVkhyfjcLpRimES5W3AY9H7gtXp4qzRvz/8ZmIl/Er1luwosCR5YrScXjW1y8j7IzTw8RnQe7ckJjwwa2I1/MU7QuOgfoxRCRyHipYh+IaAjq+Qa0Kgpu1WmWJDwTQcBgXyHPzIG+E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1757609614144827.5700639939228; Thu, 11 Sep 2025 09:53:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwkVx-00030r-J8; Thu, 11 Sep 2025 12:51:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uwkVu-0002lm-Fw for qemu-devel@nongnu.org; Thu, 11 Sep 2025 12:51:14 -0400 Received: from forwardcorp1d.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uwkVq-0004AP-1K for qemu-devel@nongnu.org; Thu, 11 Sep 2025 12:51:13 -0400 Received: from mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net [IPv6:2a02:6b8:c42:94a9:0:640:a3fa:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id D067B8071F; Thu, 11 Sep 2025 19:51:05 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:b3c::1:2f]) by mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 2pOVKM0Fka60-Byp6w9Sg; Thu, 11 Sep 2025 19:51:05 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1757609465; bh=0ooFnJ5mdkGdKd3/GRUX63tfFBQ1KtWG9Z6i7YLvLkY=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=YEdZtwt6tow/fGXn8U6O/iHwapH9MA5uTsOFR/BAF32TrX+3HmsA9Thb5ZsoXfEet T1aKEI5r6AsthSKwqwZXsS455XiVNtG24JohO+28hAXJylAzVzeXVCsN57trHqfBfG 4zLN6nG8Mdcxd4HI8Mg0nkxREwT6S08mWUdnpPkY= Authentication-Results: mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: jasowang@redhat.com Cc: qemu-devel@nongnu.org, vsementsov@yandex-team.ru, leiyang@redhat.com, steven.sistare@oracle.com, yc-core@yandex-team.ru, davydov-max@yandex-team.ru Subject: [PATCH v4 2/8] net/tap: rework tap_set_sndbuf() Date: Thu, 11 Sep 2025 19:50:55 +0300 Message-ID: <20250911165101.1637608-3-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250911165101.1637608-1-vsementsov@yandex-team.ru> References: <20250911165101.1637608-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=178.154.239.200; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1d.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1757609614947116600 Content-Type: text/plain; charset="utf-8" First, follow common recommendations to avoid error propagation: add return value. Second, keep NetdevTapOptions related logic in tap.c, and make tap_set_sndbuf a simple system call wrapper, more like other functions in tap-linux.c Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap-bsd.c | 3 ++- net/tap-linux.c | 19 +++++-------------- net/tap-solaris.c | 3 ++- net/tap-stub.c | 3 ++- net/tap.c | 10 +++++++--- net/tap_int.h | 4 +--- 6 files changed, 19 insertions(+), 23 deletions(-) diff --git a/net/tap-bsd.c b/net/tap-bsd.c index b4c84441ba..3bfc1cc577 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -198,8 +198,9 @@ error: } #endif /* __FreeBSD__ */ =20 -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) +bool tap_set_sndbuf(int fd, int sndbuf, Error **errp) { + return true; } =20 int tap_probe_vnet_hdr(int fd, Error **errp) diff --git a/net/tap-linux.c b/net/tap-linux.c index 22ec2f45d2..c46f488c08 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -138,23 +138,14 @@ int tap_open(char *ifname, int ifname_size, int *vnet= _hdr, * Ethernet NICs generally have txqueuelen=3D1000, so 1Mb is * a good value, given a 1500 byte MTU. */ -#define TAP_DEFAULT_SNDBUF 0 - -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) +bool tap_set_sndbuf(int fd, int sndbuf, Error **errp) { - int sndbuf; - - sndbuf =3D !tap->has_sndbuf ? TAP_DEFAULT_SNDBUF : - tap->sndbuf > INT_MAX ? INT_MAX : - tap->sndbuf; - - if (!sndbuf) { - sndbuf =3D INT_MAX; - } - - if (ioctl(fd, TUNSETSNDBUF, &sndbuf) =3D=3D -1 && tap->has_sndbuf) { + if (ioctl(fd, TUNSETSNDBUF, &sndbuf) =3D=3D -1) { error_setg_errno(errp, errno, "TUNSETSNDBUF ioctl failed"); + return false; } + + return true; } =20 int tap_probe_vnet_hdr(int fd, Error **errp) diff --git a/net/tap-solaris.c b/net/tap-solaris.c index 51b7830bef..2932c2de39 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -202,8 +202,9 @@ int tap_open(char *ifname, int ifname_size, int *vnet_h= dr, return fd; } =20 -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) +bool tap_set_sndbuf(int fd, int sndbuf, Error **errp) { + return true; } =20 int tap_probe_vnet_hdr(int fd, Error **errp) diff --git a/net/tap-stub.c b/net/tap-stub.c index 38673434cb..326e76843e 100644 --- a/net/tap-stub.c +++ b/net/tap-stub.c @@ -33,8 +33,9 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, return -1; } =20 -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) +bool tap_set_sndbuf(int fd, int sndbuf, Error **errp) { + return true; } =20 int tap_probe_vnet_hdr(int fd, Error **errp) diff --git a/net/tap.c b/net/tap.c index e023c5f67f..2ffd8c9907 100644 --- a/net/tap.c +++ b/net/tap.c @@ -690,9 +690,13 @@ static bool net_init_tap_one(const NetdevTapOptions *t= ap, NetClientState *peer, TAPState *s =3D net_tap_fd_init(peer, model, name, fd, vnet_hdr); int vhostfd; =20 - tap_set_sndbuf(s->fd, tap, &err); - if (err) { - error_propagate(errp, err); + /* 0 means no limit, so set INT_MAX. Same is the default */ + int sndbuf =3D + (tap->has_sndbuf && tap->sndbuf) ? MIN(tap->sndbuf, INT_MAX) : INT= _MAX; + + /* Ignore error when sndbuf was not requested */ + if (!tap_set_sndbuf(s->fd, sndbuf, tap->has_sndbuf ? errp : NULL) + && tap->has_sndbuf) { goto failed; } =20 diff --git a/net/tap_int.h b/net/tap_int.h index 8857ff299d..08e4a592a0 100644 --- a/net/tap_int.h +++ b/net/tap_int.h @@ -26,14 +26,12 @@ #ifndef NET_TAP_INT_H #define NET_TAP_INT_H =20 -#include "qapi/qapi-types-net.h" - int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required, int mq_required, Error **errp); =20 ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen); =20 -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp); +bool tap_set_sndbuf(int fd, int sndbuf, Error **errp); int tap_probe_vnet_hdr(int fd, Error **errp); int tap_probe_has_ufo(int fd); int tap_probe_has_uso(int fd); --=20 2.48.1