From owner-svn-src-all@freebsd.org Sat Jan 11 06:06:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5EA241FEB17; Sat, 11 Jan 2020 06:06:14 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47vq9L1hzfz4cTk; Sat, 11 Jan 2020 06:06:14 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: by mail-qk1-f196.google.com with SMTP id a203so4093449qkc.3; Fri, 10 Jan 2020 22:06:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=EElFlyyGLpfYNs+4KoYP45TBV9jcnPVh2up1K0flSYQ=; b=IwS8pAEZSPfnptPImpc2gxRUCw1q6Ozobo0iG8Hz63EV1sGYlR8zEoDwjVSkBSOR7e 85YT4ZTqB7+BLmXRj8iz1wHBkm5HUAmEazlwtT29FLwSESQe9SqS02Mk1GrpL5YMOj2j nGXJqRhPvQz+LBNUAv00FLB27jrhlIfh19Mb3oybJGi3RHHy+XbIjvJhp1wvacuhQVt3 NAWn2gq0cBKCx/qJyDRv60uWuwIZohCFgbKzerw1ltSmwMUr/ibRwSFiFnC5vPwfoWvL 131W5aEW2MXt8F5XeUiNMjMrgCycPIwbdv2dOrKHhcfbvaknz9/Pr3NZq9ZqhOtc/Sg1 vEqg== X-Gm-Message-State: APjAAAVmEd62Nzv2xjMDSLbpei+YJC2tVLSk5eD79yOwtrg1vfXi6hB3 egTBXnYIexrK2GFNsh7kKuZ9sCdH X-Google-Smtp-Source: APXvYqxTItSV9u/yKzMYuhY+wvqwHQ9JrUd46ab3o1/A8VkAGroyUQ1AJVlYcsJqjVJ8yJ4MCxKtxA== X-Received: by 2002:ae9:ef4b:: with SMTP id d72mr6473100qkg.27.1578722772845; Fri, 10 Jan 2020 22:06:12 -0800 (PST) Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com. [209.85.160.176]) by smtp.gmail.com with ESMTPSA id k9sm2193465qtq.75.2020.01.10.22.06.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Jan 2020 22:06:12 -0800 (PST) Received: by mail-qt1-f176.google.com with SMTP id w47so4121706qtk.4; Fri, 10 Jan 2020 22:06:12 -0800 (PST) X-Received: by 2002:ac8:5149:: with SMTP id h9mr5648108qtn.123.1578722772210; Fri, 10 Jan 2020 22:06:12 -0800 (PST) MIME-Version: 1.0 References: <202001102122.00ALM37Q063532@repo.freebsd.org> In-Reply-To: <202001102122.00ALM37Q063532@repo.freebsd.org> From: Ryan Libby Date: Fri, 10 Jan 2020 22:06:01 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r356613 - head/sys/dev/virtio/network To: Gleb Smirnoff Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 47vq9L1hzfz4cTk X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2020 06:06:14 -0000 On Fri, Jan 10, 2020 at 1:22 PM Gleb Smirnoff wrote: > > Author: glebius > Date: Fri Jan 10 21:22:03 2020 > New Revision: 356613 > URL: https://svnweb.freebsd.org/changeset/base/356613 > > Log: > Add pfil(9) hook to vtnet(4). > > The patch could be simplier, using only the second chunk to > vtnet_rxq_eof(), that passes full mbufs to pfil(9). Packet > filter would m_free() them in case of returning PFIL_DROPPED. > > However, we pretend to be a hardware driver, so we first try > to pass a memory buffer via PFIL_MEMPTR feature. This is mostly > done for debugging purposes, so that one can experiment in bhyve > with packet filters utilizing same features as a true driver. > > Modified: > head/sys/dev/virtio/network/if_vtnet.c > head/sys/dev/virtio/network/if_vtnetvar.h > > Modified: head/sys/dev/virtio/network/if_vtnet.c > ============================================================================== > --- head/sys/dev/virtio/network/if_vtnet.c Fri Jan 10 20:53:58 2020 (r356612) > +++ head/sys/dev/virtio/network/if_vtnet.c Fri Jan 10 21:22:03 2020 (r356613) > @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); > > #include > #include > +#include > #include > #include > #include > @@ -935,6 +936,7 @@ static int > vtnet_setup_interface(struct vtnet_softc *sc) > { > device_t dev; > + struct pfil_head_args pa; > struct ifnet *ifp; > > dev = sc->vtnet_dev; > @@ -1038,6 +1040,12 @@ vtnet_setup_interface(struct vtnet_softc *sc) > > DEBUGNET_SET(ifp, vtnet); > > + pa.pa_version = PFIL_VERSION; > + pa.pa_flags = PFIL_IN; > + pa.pa_type = PFIL_TYPE_ETHERNET; > + pa.pa_headname = ifp->if_xname; > + sc->vtnet_pfil = pfil_head_register(&pa); > + > return (0); > } > > @@ -1773,9 +1781,11 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) > struct vtnet_softc *sc; > struct ifnet *ifp; > struct virtqueue *vq; > - struct mbuf *m; > + struct mbuf *m, *mr; > struct virtio_net_hdr_mrg_rxbuf *mhdr; > int len, deq, nbufs, adjsz, count; > + pfil_return_t pfil; > + bool pfil_done; > > sc = rxq->vtnrx_sc; > vq = rxq->vtnrx_vq; > @@ -1812,6 +1822,35 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) > adjsz = sizeof(struct virtio_net_hdr_mrg_rxbuf); > } > > + /* > + * If we have enough data in first mbuf, run it through > + * pfil as a memory buffer before dequeueing the rest. > + */ > + if (PFIL_HOOKED_IN(sc->vtnet_pfil) && > + len - adjsz >= ETHER_HDR_LEN + max_protohdr) { > + pfil = pfil_run_hooks(sc->vtnet_pfil, > + m->m_data + adjsz, ifp, > + len - adjsz | PFIL_MEMPTR | PFIL_IN, NULL); Hi Gleb, gcc wants (len - adjsz) paranthesized. https://ci.freebsd.org/job/FreeBSD-head-amd64-gcc/12838/ --- if_vtnet.o --- /workspace/src/sys/dev/virtio/network/if_vtnet.c: In function 'vtnet_rxq_eof': /workspace/src/sys/dev/virtio/network/if_vtnet.c:1833:12: error: suggest parentheses around arithmetic in operand of '|' [-Werror=parentheses] len - adjsz | PFIL_MEMPTR | PFIL_IN, NULL); ~~~~^~~~~~~ > + switch (pfil) { > + case PFIL_REALLOCED: > + mr = pfil_mem2mbuf(m->m_data + adjsz); > + vtnet_rxq_input(rxq, mr, hdr); > + /* FALLTHROUGH */ > + case PFIL_DROPPED: > + case PFIL_CONSUMED: > + vtnet_rxq_discard_buf(rxq, m); > + if (nbufs > 1) > + vtnet_rxq_discard_merged_bufs(rxq, > + nbufs); > + continue; > + default: > + KASSERT(pfil == PFIL_PASS, > + ("Filter returned %d!\n", pfil)); > + }; > + pfil_done = true; > + } else > + pfil_done = false; > + > if (vtnet_rxq_replace_buf(rxq, m, len) != 0) { > rxq->vtnrx_stats.vrxs_iqdrops++; > vtnet_rxq_discard_buf(rxq, m); > @@ -1841,6 +1880,19 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) > */ > memcpy(hdr, mtod(m, void *), sizeof(struct virtio_net_hdr)); > m_adj(m, adjsz); > + > + if (PFIL_HOOKED_IN(sc->vtnet_pfil) && pfil_done == false) { > + pfil = pfil_run_hooks(sc->vtnet_pfil, &m, ifp, PFIL_IN, > + NULL); > + switch (pfil) { > + case PFIL_DROPPED: > + case PFIL_CONSUMED: > + continue; > + default: > + KASSERT(pfil == PFIL_PASS, > + ("Filter returned %d!\n", pfil)); > + } > + } > > vtnet_rxq_input(rxq, m, hdr); > > > Modified: head/sys/dev/virtio/network/if_vtnetvar.h > ============================================================================== > --- head/sys/dev/virtio/network/if_vtnetvar.h Fri Jan 10 20:53:58 2020 (r356612) > +++ head/sys/dev/virtio/network/if_vtnetvar.h Fri Jan 10 21:22:03 2020 (r356613) > @@ -136,6 +136,7 @@ struct vtnet_softc { > struct ifnet *vtnet_ifp; > struct vtnet_rxq *vtnet_rxqs; > struct vtnet_txq *vtnet_txqs; > + pfil_head_t vtnet_pfil; > > uint32_t vtnet_flags; > #define VTNET_FLAG_SUSPENDED 0x0001 > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"