Skip to content

Commit

Permalink
run a codespell pass to fix several typos
Browse files Browse the repository at this point in the history
  • Loading branch information
jhk098 committed Apr 2, 2021
1 parent 75477cd commit 2356656
Show file tree
Hide file tree
Showing 44 changed files with 117 additions and 117 deletions.
2 changes: 1 addition & 1 deletion LINUX/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ On the receiver, you should see about 14.88 Mpps
use the kernel network stack on the other endpoint. This is not a missing
feature, as the native veth datapath is implemented using netmap pipes, and
it does not make sense (in terms of performance) for pipes to support
conversion betweeen netmap buffers and skbuffs.
conversion between netmap buffers and skbuffs.

* pkt-gen traffic does not flow across a Linux bridge.
Check that source MAC is not 00:00:00:00:00:00 (pkt-gen default), nor
Expand Down
2 changes: 1 addition & 1 deletion LINUX/archlinux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ build() {
echo "SRCPKGDEST=$SRCPKGDEST"
echo "PKGDEST=$PKGDEST"
echo "BUILDDIR=$BUILDDIR"
# We force some makepkg variables, trying to ovverride yaourt default behaviour,
# We force some makepkg variables, trying to override yaourt default behaviour,
# which is to download sources in $srcdir/../linux instead of the place where
# makepkg is invoked
SRCDEST=$NESTEDDIR SRCPKGDEST=$NESTEDDIR PKGDEST=$NESTEDDIR BUILDDIR=$NESTEDDIR \
Expand Down
8 changes: 4 additions & 4 deletions LINUX/configure
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ Available options:
--help print this message
--kernel-dir= path to configured kernel directory
--kernel-sources= path to full kernel sources
--kernel-version= specifiy the kernel version
--kernel-version= specify the kernel version
(assuming everything is in the default place)
--kernel-opts= additional options to pass to kernel make
(you can call this several times)
Expand Down Expand Up @@ -577,7 +577,7 @@ EOF
}

configh=netmap_linux_config.h
# succes/failure actions are expected to write some macros
# success/failure actions are expected to write some macros
# in netma_linux_config.h. The following functions can be
# used to simplify the task.

Expand Down Expand Up @@ -1014,7 +1014,7 @@ for w in $DISABLED_WARNINGS; do
done

message " NOTE " <<EOF
Running some preliminary tests to customize the build enviroment.
Running some preliminary tests to customize the build environment.
EOF
run_preliminary_tests

Expand Down Expand Up @@ -1047,7 +1047,7 @@ else
There were problems copying the sources of driver $1.
If you need this driver, please check that the $1@src variable
points to the correct path contaning the driver sources.
points to the correct path containing the driver sources.
Disabling $1.
EOF
Expand Down
2 changes: 1 addition & 1 deletion LINUX/default-config.mak.in_
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ i40e@prepare := $(if $(filter $(i40e@v),2.12.6 2.14.13),@SRCDIR@/intel-fix.sh i4
# some additional, driver-specific configuration
stmmac@conf := CONFIG_STMMAC_ETH

# set all the default versions (can be overrided by --select-version=)
# set all the default versions (can be overridden by --select-version=)
$(eval $(call default,ixgbe,5.3.8))
$(eval $(call default,ixgbevf,4.3.2))
$(eval $(call default,e1000e,3.4.0.2))
Expand Down
2 changes: 1 addition & 1 deletion LINUX/if_virtio_net_netmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ virtio_net_netmap_txsync(struct netmap_kring *kring, int flags)
virtqueue_kick(vq);

/* Update hwcur depending on where we stopped. */
kring->nr_hwcur = nm_i; /* note we migth break early */
kring->nr_hwcur = nm_i; /* note we might break early */
}
out:
if (interrupts && vq->num_free < 32)
Expand Down
2 changes: 1 addition & 1 deletion LINUX/if_vmxnet3_netmap_v2.h
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ vmxnet3_netmap_tq_config_tx_buf(struct vmxnet3_tx_queue *tq,
PNMB(na, slot + si, &paddr);

tbi->map_type = VMXNET3_MAP_NONE;
/* the buffer length will get overriden by the actual
/* the buffer length will get overridden by the actual
packet length on transmit */
tbi->len = NETMAP_BUF_SIZE(na);
tbi->dma_addr = (dma_addr_t)paddr;
Expand Down
2 changes: 1 addition & 1 deletion LINUX/ixgbe_netmap_linux.h
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ ixgbe_netmap_reg(struct netmap_adapter *na, int onoff)
} else {
nm_clear_native_flags(na);
}
/* XXX SRIOV migth need another 2sec wait */
/* XXX SRIOV might need another 2sec wait */
if (netif_running(adapter->netdev))
NM_IXGBE_UP(adapter); /* also enables intr */
clear_bit(NM_IXGBE_RESETTING, &adapter->state);
Expand Down
4 changes: 2 additions & 2 deletions LINUX/netmap_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ nm_os_csum_ipv4(struct nm_iphdr *iph)
}

/* Compute and insert a TCP/UDP checksum over IPv4: 'iph' points to the IPv4
* header, 'data' points to the TCP/UDP header, 'datalen' is the lenght of
* header, 'data' points to the TCP/UDP header, 'datalen' is the length of
* TCP/UDP header + payload.
*/
void
Expand All @@ -391,7 +391,7 @@ nm_os_csum_tcpudp_ipv4(struct nm_iphdr *iph, void *data,
}

/* Compute and insert a TCP/UDP checksum over IPv6: 'ip6h' points to the IPv6
* header, 'data' points to the TCP/UDP header, 'datalen' is the lenght of
* header, 'data' points to the TCP/UDP header, 'datalen' is the length of
* TCP/UDP header + payload.
*/
void
Expand Down
2 changes: 1 addition & 1 deletion LINUX/netmap_ptnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ ptnet_irqs_init(struct ptnet_info *pi)
pi->msix_entries = kzalloc(sizeof(*pi->msix_entries) * pi->num_rings,
GFP_KERNEL);
if (!pi->msix_entries) {
pr_err("%s: Failed to allocate msix entires\n", __func__);
pr_err("%s: Failed to allocate msix entries\n", __func__);
return -ENOMEM;
}

Expand Down
12 changes: 6 additions & 6 deletions LINUX/scripts/np
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function need {
[ -n "$v" -a -d "$v${2:+/$2}" ] || error "Variable $1 not set or not valid"
}

## The following enviroment variables must be set:
## The following environment variables must be set:
##
## GITDIR: the absolute path of the netmap linux
## git repository, containing all the required netmap-*
Expand Down Expand Up @@ -223,8 +223,8 @@ function get-src()

##
## extend <patch> <version>
## checks wether the range of applicability of the
## given <patch> can be extented to include <version>.
## checks whether the range of applicability of the
## given <patch> can be extended to include <version>.
## It returns 0 on success and 1 on failure.
function extend()
{
Expand Down Expand Up @@ -280,7 +280,7 @@ function minimize()
# the original patches (in tmp-patches) are ordered by version number.
# We consider one patch in turn (the 'pivot') and try
# to extend its range to cover the range of the next
# patch. If this succedes, the merged patch is the new
# patch. If this succeeds, the merged patch is the new
# pivot, otherwise the current pivot is output and the
# next patch becomes the new pivot. The process
# is repeated until there are no more patches to consider.
Expand All @@ -306,7 +306,7 @@ function minimize()
# the patch in its final location
out=$(scripts/vers vanilla $drv $ple -c $pre -c -S4)
cp $pivot final-patches/$out
# the new pivot becames the next patch (if any)
# the new pivot becomes the next patch (if any)
pivot=$1
pre=$nre
ple=$nle
Expand Down Expand Up @@ -428,7 +428,7 @@ function check-patch()
local v1=$(scripts/vers $_patch -s -p -C)
# extract the right version
local v2=$(scripts/vers $_patch -s -C)
# extract the uncoverted right version (might be 99999)
# extract the unconverted right version (might be 99999)
local end=$(scripts/vers $_patch -s)
# extract the driver name
local driver=$(scripts/vers $_patch -s -p -p)
Expand Down
2 changes: 1 addition & 1 deletion LINUX/veth_netmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ veth_netmap_attach(struct ifnet *ifp)
na.nm_dtor = veth_netmap_dtor;
na.num_tx_rings = na.num_rx_rings = 1;
netmap_attach_ext(&na, sizeof(struct netmap_veth_adapter),
0 /* do not ovveride reg */);
0 /* do not override reg */);
}

/* end of file */
2 changes: 1 addition & 1 deletion LINUX/virtio_netmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ virtio_netmap_txsync(struct netmap_kring *kring, int flags)
virtqueue_kick(vq);

/* Update hwcur depending on where we stopped. */
kring->nr_hwcur = nm_i; /* note we migth break early */
kring->nr_hwcur = nm_i; /* note we might break early */
}
out:
/* Ask the hypervisor for notifications, possibly only when it has
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ Netmap is able to send packets at very high rates, and for simple
packet transmission and reception, speed generally not limited by
the CPU but by other factors (link speed, bus or NIC hw limitations).

For a physical link, the maximum numer of packets per second can
For a physical link, the maximum number of packets per second can
be computed with the formula:

pps = line_rate / (672 + 8 * pkt_size)
Expand Down
4 changes: 2 additions & 2 deletions README.ptnetmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ support the virtio-net header.
Netmap is a framework for high performance network I/O. It exposes an
hardware-independent API which allows userspace application to directly interact
with NIC hardware rings, in order to receive and transmit Ethernet frames.
Rings are always accessed in the context of system calls and NIC interrups
Rings are always accessed in the context of system calls and NIC interrupts
are used to notify applications about NIC processing completion.
The performance boost of netmap w.r.t. traditional socket API primarily comes
from: (i) batching, since it is possible to send/receive hundreds of packets
Expand Down Expand Up @@ -227,5 +227,5 @@ A number of device registers are used for configuration (number of rings and
slots, device MAC address, supported features, ...) while "kick" registers
are used for guest-to-host notifications.
The ptnetmap kthread infrastructure, moreover, has been already extended to
suppor an arbitrary number of rings, where currently each ring is served
support an arbitrary number of rings, where currently each ring is served
by a different kernel thread.
8 changes: 4 additions & 4 deletions WINDOWS/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ which also build the standard netmap test program, pkt-gen.
ports. Performance is similar to that on FreeBSD and Linux:
20Mpps on switch ports, over 100 Mpps on pipes.

To load the module, do the following (as adminstrator)
To load the module, do the following (as administrator)

(cd Output-Win8.1Release/netmap-pkg; ./nm-loader l)

Expand All @@ -42,7 +42,7 @@ which also build the standard netmap test program, pkt-gen.
netmap:ethXX

as the port name. XX is the Windows "interface index" that
can be shown with the followin command (or many other ways):
can be shown with the following command (or many other ways):

netsh int ipv4 show interfaces

Expand Down Expand Up @@ -82,7 +82,7 @@ a) Build with command line tools and MsBuild.exe

make clean # will clean output directories

The output will be found in the directory ./Output-<choosen build type>
The output will be found in the directory ./Output-<chosen build type>

Please look at the makefile to select different configurations

Expand Down Expand Up @@ -161,7 +161,7 @@ native netmap mode available on FreeBSD and Linux).
pkt-gen-b -i vale0:a{1 -f rx

NETMAP to HOST ring about 2.3 Mpps if dropped, 1.8Mpps to windump
(replace the '5' with the inteface index from
(replace the '5' with the interface index from
netsh int ipv4 show interfaces

pkt-gen-b -i netmap:eth5^ -f tx # on one vm
Expand Down
2 changes: 1 addition & 1 deletion WINDOWS/includes/net/ethernet.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#define M_HASFCS M_PROTO5 /* FCS included at end of frame */

/*
* Ethernet CRC32 polynomials (big- and little-endian verions).
* Ethernet CRC32 polynomials (big- and little-endian versions).
*/
#define ETHER_CRC_POLY_LE 0xedb88320
#define ETHER_CRC_POLY_BE 0x04c11db6
Expand Down
6 changes: 3 additions & 3 deletions WINDOWS/nm-ndis/filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ Routine Description:
Arguments:
FilterModuleContext - pointer to the filter context stucture
FilterModuleContext - pointer to the filter context structure
PauseParameters - additional information about the pause
Return Value:
Expand Down Expand Up @@ -545,7 +545,7 @@ Routine Description:
Arguments:
FilterModuleContext - pointer to the filter context stucture.
FilterModuleContext - pointer to the filter context structure.
RestartParameters - additional information about the restart operation.
Return Value:
Expand Down Expand Up @@ -1838,7 +1838,7 @@ Routine Description:
calls the NdisFCancelSendNetBufferLists to propagate the cancel operation.
If your driver does not queue any send NBLs, you may omit this routine.
NDIS will propagate the cancelation on your behalf more efficiently.
NDIS will propagate the cancellation on your behalf more efficiently.
Arguments:
Expand Down
4 changes: 2 additions & 2 deletions apps/dedup/dedup.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ dedup_fresh_packet(struct dedup *d, const struct netmap_slot *s)
rfi -= d->fifo_size;

fs = d->fifo_slot + rfi;
ND("checking %lu %lu: lenghts %u %u buf %d", fi, rfi, fs->len, s->len,
ND("checking %lu %lu: lengths %u %u buf %d", fi, rfi, fs->len, s->len,
fs->buf_idx);

if (fs->len != s->len)
Expand Down Expand Up @@ -302,7 +302,7 @@ dedup_push_in(struct dedup *d, const struct timeval *now)
if (out_space == 0)
break;

/* if the FIFO is full, remove and possibily send
/* if the FIFO is full, remove and possibly send
* the oldest packet
*/
if (dedup_fifo_full(d)) {
Expand Down
2 changes: 1 addition & 1 deletion apps/lb/lb.c
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ init_groups(void)
* when the need to drop arises, we roll it back to head.
*/
struct morefrag {
uint16_t last_flag; /* for intput rings */
uint16_t last_flag; /* for input rings */
uint32_t last_hash; /* for input rings */
uint32_t shadow_head; /* for output rings */
};
Expand Down
2 changes: 1 addition & 1 deletion apps/pkt-gen/pkt-gen.c
Original file line number Diff line number Diff line change
Expand Up @@ -3149,7 +3149,7 @@ main(int arc, char **argv)

if (g.virt_header) {
/* Set the virtio-net header length, since the user asked
* for it explicitely. */
* for it explicitly. */
set_vnet_hdr_len(&g);
} else {
/* Check whether the netmap port we opened requires us to send
Expand Down
18 changes: 9 additions & 9 deletions apps/tlem/tlem.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ In order to get good and predictable performance, it is important
that threads are pinned to a single core, and it is preferable that
prod() and cons() for each direction share the cache as much as possible.
Putting them on two hyperthreads of the same core seems to give
good results but that shoud be investigated further.
good results but that should be investigated further.

It also seems useful to use a scheduler (SCHED_FIFO or SCHED_RR)
that gives more predictable cycles to the CPU, as well as try
Expand Down Expand Up @@ -100,7 +100,7 @@ prod()

q-c_reorder (set with the -R command line option) decides
whether the packet should be temporary hold to emulate
packet reordering. To hold a packet, it shuld set
packet reordering. To hold a packet, it should set
q->cur_hold_delay to a non-zero value. The packet will
reenter the stream once the cur_hold_delay has expired.

Expand Down Expand Up @@ -546,7 +546,7 @@ ec_next(int i)

/* if fname is NULL tlem will run standalone, i.e., in server mode
* with no possibility for clients to change the configuration.
* Otherwise, the first tlem instance that successully locks the
* Otherwise, the first tlem instance that successfully locks the
* first four bytes of the configuration file becomes the server.
* Clients write-lock the rest of the file, to guarantee mutual
* exclusive configuration updates among them.
Expand Down Expand Up @@ -663,7 +663,7 @@ ec_allowclients()
return 0;
}

static void ec_activate(struct _qs *q); // foward
static void ec_activate(struct _qs *q); // forward
static int
ec_init(struct _qs *q, struct _ecs *ec, int server)
{
Expand Down Expand Up @@ -863,7 +863,7 @@ struct arp_cmd_q {
uint64_t tail ALIGN_CACHE; /* private to the producer */
};

/* consumer: extract a new command. The command slot is not immediatly
/* consumer: extract a new command. The command slot is not immediately
* released, so that at most ARP_CMD_QSIZE messages are read for each
* cons() loop.
*/
Expand Down Expand Up @@ -1193,7 +1193,7 @@ setaffinity(int i)
}
maxprio = sched_get_priority_max(SCHED_RR);
if (maxprio < 0) {
ED("Unable to retrive max RR priority, using 10");
ED("Unable to retrieve max RR priority, using 10");
maxprio = 10;
}
bzero(&p, sizeof(p));
Expand Down Expand Up @@ -1774,7 +1774,7 @@ cons_update_macs(struct pipe_args *pa, void *pkt)
injected = 1;
}
}
/* copy negated dst into eh (either brodcast or unicast) */
/* copy negated dst into eh (either broadcast or unicast) */
*(uint32_t *)eh = ~e->eth1;
*(uint16_t *)((char *)eh + 4) = ~e->eth2;
/* copy local MAC address into source */
Expand Down Expand Up @@ -2238,7 +2238,7 @@ set_max(const char *arg, struct _qs *q)
return 0;
}

/* otions that can be specified for each direction */
/* options that can be specified for each direction */
struct dir_opt {
char opt;
int flags;
Expand Down Expand Up @@ -2434,7 +2434,7 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;

/* map the session area and auto-detect wether we are server or client */
/* map the session area and auto-detect whether we are server or client */
ecf = ec_map(sfname, &server);
if (ecf == NULL)
exit(1);
Expand Down
Loading

0 comments on commit 2356656

Please sign in to comment.