From nobody Mon Apr 18 09:33:49 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1380311E4983; Mon, 18 Apr 2022 09:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KhhZj6B9xz3CXd; Mon, 18 Apr 2022 09:33:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650274430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r34sLK4SIS31iHEiyciZFVylhFqj15d25m5t8lnxwvg=; b=cueqfm9fz5qTi6IxdKQOy9MUMqZs4+lMU9zXBnMVER1Q0VUBwku3IOw9M2KZY4J1bG2Qg/ hT8DYnE+Sejr64zcZ8qH/F2XvhPN1bG9J1llRL3kYKDZliMzgXAu1FWFk6fvK0Zs25DDke rvbLl2FMCWt3FOEgzXVBgbBO6aXFwt0LPRuiKDV/ZfmRkg10vQkoWBA/NjJo/B6MFxUnj0 wfAKV0lKx8k7WYQs9VkjOfGGd7DEtskrSWTONpOoJHqqDjQjB79/qA5KTr7dl6dGr9mTrv PWc6a4ZKGKGWETcDIiKIkziJpahZv3Pt8MZl6SqhBzyUQ3DGWq2URMcW/YBUmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B32371052E; Mon, 18 Apr 2022 09:33:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23I9Xn2D018486; Mon, 18 Apr 2022 09:33:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23I9XneN018485; Mon, 18 Apr 2022 09:33:49 GMT (envelope-from git) Date: Mon, 18 Apr 2022 09:33:49 GMT Message-Id: <202204180933.23I9XneN018485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bfa2e8f84086 - stable/13 - LinuxKPI: skbuff: dev_kfree_skb_irq() and improvements List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bfa2e8f84086071187c975e71024346d50d89654 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650274430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r34sLK4SIS31iHEiyciZFVylhFqj15d25m5t8lnxwvg=; b=Lwdoa1L1AJ8dEIyehabPeIjFxO7S6U4BoVYZzY9TGpWI8Ez54+RCLP8O6Px7YoT7p9Z9GI IU3lXzB2dBiv+IVW0RpEPGZin9BHVzUxYzGcrGm8BOKpOQK8VlRiEhmx2rPfyrj60JnIUb mku37kk2qhfM5D068PRGGbDNSErR9DKmcKu39NKQAzkYyx9Tj01TIZsQ/5HvNLyTYb4gv6 XjRknSXYX7eKecIx4JDrFj2BzJp4Hzv6RL1ObaFVEB6ZUq11gzWBjaLhLsCWYF3CCD6cwd kukT6gnTb1KR4HV2Z5A3ZlPKdMuEaI/pkvdRx+3f1tNUVcLIw+ro2NaewURvgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650274430; a=rsa-sha256; cv=none; b=Ki+liVgfDc0UX5XfmEXHLXXW6VJET1wHqV5HvSg31jyPT90MdTQ/vVvOiehmGouPrkb3Pc FDEuvPyoAqzyzwxjDyAEfacam0G+MbzBA5kx3kNFaI70QTajIHsHXUEJybAZr+vKV55Udm KivIGP7sUXK50l7qM5HbgMlktx21yRnNU5KuZCriQ6Jz+X9jir6M3+kTDScyrQfI9JZrHf xZivQHAUOhG939nuftqRoAhnSvSe5odnmdoO7wMmAxguiSkH208LymVq8xAqJ2N+zYY8y1 lz9MojD/ePF//HZMfVYDyW2c+Uh4Y0qAAfIIR8QmCo0gpTN0BozO28TwDvjdkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bfa2e8f84086071187c975e71024346d50d89654 commit bfa2e8f84086071187c975e71024346d50d89654 Author: Bjoern A. Zeeb AuthorDate: 2022-04-15 12:25:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-04-18 09:32:57 +0000 LinuxKPI: skbuff: dev_kfree_skb_irq() and improvements While it is currently unclear if we will have to defer work in dev_kfree_skb_irq() to call dev_kfree_skb(). We only have one caller which seems to be fine on FreeBSD by calling it directly for now. While here shortcut skb_put()/skb_put_data() saving us work if there are no adjustments to do. Also adjust the logging in skb_is_gso() to avoid getting spammed by it. Sponsored by: The FreeBSD Foundation (cherry picked from commit 952643ea452655a8e80d1b5e1cc2cae35cb73870) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 79d65c0169b3..2b1b66844640 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -231,7 +231,8 @@ static inline void dev_kfree_skb_irq(struct sk_buff *skb) { SKB_TRACE(skb); - SKB_TODO(); + SKB_IMPROVE("Do we have to defer this?"); + dev_kfree_skb(skb); } /* -------------------------------------------------------------------------- */ @@ -331,6 +332,8 @@ skb_put(struct sk_buff *skb, size_t len) skb, skb->tail, len, skb->end, skb->head, skb->data, skb->len)); s = skb_tail_pointer(skb); + if (len == 0) + return (s); skb->tail += len; skb->len += len; #ifdef SKB_DEBUG @@ -350,6 +353,8 @@ skb_put_data(struct sk_buff *skb, const void *buf, size_t len) SKB_TRACE2(skb, buf); s = skb_put(skb, len); + if (len == 0) + return (s); memcpy(s, buf, len); return (s); } @@ -752,7 +757,7 @@ static inline bool skb_is_gso(struct sk_buff *skb) { SKB_TRACE(skb); - SKB_TODO(); + SKB_IMPROVE("Really a TODO but get it away from logging"); return (false); }