From nobody Thu Jan 27 17:42:32 2022 X-Original-To: dev-commits-src-all@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 7225E19838FA; Thu, 27 Jan 2022 17:42:33 +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 4Jl7G116j2z4tK2; Thu, 27 Jan 2022 17:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643305353; 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=7dpaf4Z5zEFHlM5m1RHTPVXALI2RxkmSTdtF+7neIMc=; b=NIleDoJZegtozBNxSRflm9HMPsKF/52iTJ0IGxshWa+78cQlvM0fpyWKg5bTg3Nn5REUKo w8mMD4pPERwmV+jB3hVWqJ2CSpnisNsrfR73dQlfDCBVNu8GBeOxTRHE7k4INAbQfEO7w5 C6jo0dQmp5kiHjibVkc3jNs9dRyN1IiG5SxuaM3kwpYJ2aGqgWB5Y3zeK2xpoUeQvcZTiQ CeE1y5YPxO2Bc3AxgqRBRGjy2MKT/mHtYrfscgS2lU4yxgn6tAAZDW8YbAnjK84wH3fuSM 43vdWB6nRi6+2Tu4ObOP6hYTx84Lj6/2QBrxrBs2alT6pgzaX2Tc6W91w7K/Bw== 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 F020E1B1A4; Thu, 27 Jan 2022 17:42:32 +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 20RHgWds007169; Thu, 27 Jan 2022 17:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20RHgWKV007168; Thu, 27 Jan 2022 17:42:32 GMT (envelope-from git) Date: Thu, 27 Jan 2022 17:42:32 GMT Message-Id: <202201271742.20RHgWKV007168@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 6abb5043a67a - main - rtsock: always set m_pkthdr.rcvif when queueing on netisr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6abb5043a67acb8604f600ef7620bea61dde249f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643305353; 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=7dpaf4Z5zEFHlM5m1RHTPVXALI2RxkmSTdtF+7neIMc=; b=ppZyJLf5+VYEiZ9DtfH2SIk9/i59ZSHOYhAyG8Vi5zX+rrQlJtolwinBJcU1wIff3dtFhY tpmjWZjiuMX/Cc5kClXFa9xoZ9SZTuUcOHqkMiQpyz53jmzn8Rn/gwwLjIlGuu19BRU9Fs 5wdEL7kGFQaEonG3Mcm7Oar+sV9iorKKG0BtcKH0zLvX2ezlj8aljb0inxqfixNwi3KDYx QiR3egBtzPBKO4MbuHE9UbbYZiWIkBdR6KCkn5qvRmLjFCZQB7nqnaoPCyUvBGrNi4Ti66 5t5cUpIFvqTbP6xVyq+yBZztFbX/B5jGGwsvzR7503s460FJEsCXjU75LMc/Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643305353; a=rsa-sha256; cv=none; b=l7rcC9aaK1r7JnB+78YA4NSHGiQQfAbnBNduzxfrMKr0jTT1QFM4DOnDdiW4b4jHt99N/P nkY231iR/iKU3woGpx0h5YGjSi6rXPZiaMGC3a95BSGfMvneKZWQ29WhjRyXJ8j6I40Eqq ln5pJA9FLDR70wkMoO8wH9sQ7LIJkqf3SYu05LTUSOoEqS+vHArrx4sGKC91mBGtRJbgKa HeDPqm/jDvSnhqmObW5ltouzuY4I//W8boQz2qzta7t5kwowOHnDHgN4BMgPRHGSA5h6+F 79DoNtiDE3LXbPqd28R6vvqIj8WNhTPPbvV0GIHyFVmlxmQquLmsduVKeW5CQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6abb5043a67acb8604f600ef7620bea61dde249f commit 6abb5043a67acb8604f600ef7620bea61dde249f Author: Gleb Smirnoff AuthorDate: 2022-01-27 17:41:31 +0000 Commit: Gleb Smirnoff CommitDate: 2022-01-27 17:41:31 +0000 rtsock: always set m_pkthdr.rcvif when queueing on netisr netisr uses global workstreams and after dequeueing an mbuf it uses rcvif to get the VNET of the mbuf. Of course, this is not needed when kernel is compiled without VIMAGE. It came out that routing socket does not set rcvif if compiled without VIMAGE. Make this assignment not depending on VIMAGE option. Fixes: 6871de9363e5 --- sys/net/rtsock.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 9ab07b374ea2..c5f842de2b7e 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -2169,14 +2169,12 @@ rt_dispatch(struct mbuf *m, sa_family_t saf) *(unsigned short *)(tag + 1) = saf; m_tag_prepend(m, tag); } -#ifdef VIMAGE if (V_loif) m->m_pkthdr.rcvif = V_loif; else { m_freem(m); return; } -#endif netisr_queue(NETISR_ROUTE, m); /* mbuf is free'd on failure. */ }