mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-12 15:24:00 +08:00
rxrpc: Move some miscellaneous bits out into their own file
Move some miscellaneous bits out into their own file to make it easier to split the call handling. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
8f7e6e75d3
commit
8e688d9c16
@ -12,6 +12,7 @@
|
||||
#ifndef _NET_RXRPC_H
|
||||
#define _NET_RXRPC_H
|
||||
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/rxrpc.h>
|
||||
|
||||
struct rxrpc_call;
|
||||
|
@ -18,7 +18,8 @@ af-rxrpc-y := \
|
||||
ar-recvmsg.o \
|
||||
ar-security.o \
|
||||
ar-skbuff.o \
|
||||
ar-transport.o
|
||||
ar-transport.o \
|
||||
misc.o
|
||||
|
||||
af-rxrpc-$(CONFIG_PROC_FS) += ar-proc.o
|
||||
af-rxrpc-$(CONFIG_SYSCTL) += sysctl.o
|
||||
|
@ -19,74 +19,6 @@
|
||||
#include <net/af_rxrpc.h>
|
||||
#include "ar-internal.h"
|
||||
|
||||
/*
|
||||
* How long to wait before scheduling ACK generation after seeing a
|
||||
* packet with RXRPC_REQUEST_ACK set (in jiffies).
|
||||
*/
|
||||
unsigned int rxrpc_requested_ack_delay = 1;
|
||||
|
||||
/*
|
||||
* How long to wait before scheduling an ACK with subtype DELAY (in jiffies).
|
||||
*
|
||||
* We use this when we've received new data packets. If those packets aren't
|
||||
* all consumed within this time we will send a DELAY ACK if an ACK was not
|
||||
* requested to let the sender know it doesn't need to resend.
|
||||
*/
|
||||
unsigned int rxrpc_soft_ack_delay = 1 * HZ;
|
||||
|
||||
/*
|
||||
* How long to wait before scheduling an ACK with subtype IDLE (in jiffies).
|
||||
*
|
||||
* We use this when we've consumed some previously soft-ACK'd packets when
|
||||
* further packets aren't immediately received to decide when to send an IDLE
|
||||
* ACK let the other end know that it can free up its Tx buffer space.
|
||||
*/
|
||||
unsigned int rxrpc_idle_ack_delay = 0.5 * HZ;
|
||||
|
||||
/*
|
||||
* Receive window size in packets. This indicates the maximum number of
|
||||
* unconsumed received packets we're willing to retain in memory. Once this
|
||||
* limit is hit, we should generate an EXCEEDS_WINDOW ACK and discard further
|
||||
* packets.
|
||||
*/
|
||||
unsigned int rxrpc_rx_window_size = 32;
|
||||
|
||||
/*
|
||||
* Maximum Rx MTU size. This indicates to the sender the size of jumbo packet
|
||||
* made by gluing normal packets together that we're willing to handle.
|
||||
*/
|
||||
unsigned int rxrpc_rx_mtu = 5692;
|
||||
|
||||
/*
|
||||
* The maximum number of fragments in a received jumbo packet that we tell the
|
||||
* sender that we're willing to handle.
|
||||
*/
|
||||
unsigned int rxrpc_rx_jumbo_max = 4;
|
||||
|
||||
static const char *rxrpc_acks(u8 reason)
|
||||
{
|
||||
static const char *const str[] = {
|
||||
"---", "REQ", "DUP", "OOS", "WIN", "MEM", "PNG", "PNR", "DLY",
|
||||
"IDL", "-?-"
|
||||
};
|
||||
|
||||
if (reason >= ARRAY_SIZE(str))
|
||||
reason = ARRAY_SIZE(str) - 1;
|
||||
return str[reason];
|
||||
}
|
||||
|
||||
static const s8 rxrpc_ack_priority[] = {
|
||||
[0] = 0,
|
||||
[RXRPC_ACK_DELAY] = 1,
|
||||
[RXRPC_ACK_REQUESTED] = 2,
|
||||
[RXRPC_ACK_IDLE] = 3,
|
||||
[RXRPC_ACK_PING_RESPONSE] = 4,
|
||||
[RXRPC_ACK_DUPLICATE] = 5,
|
||||
[RXRPC_ACK_OUT_OF_SEQUENCE] = 6,
|
||||
[RXRPC_ACK_EXCEEDS_WINDOW] = 7,
|
||||
[RXRPC_ACK_NOSPACE] = 8,
|
||||
};
|
||||
|
||||
/*
|
||||
* propose an ACK be sent
|
||||
*/
|
||||
|
@ -25,12 +25,6 @@
|
||||
#include <net/net_namespace.h>
|
||||
#include "ar-internal.h"
|
||||
|
||||
const char *rxrpc_pkts[] = {
|
||||
"?00",
|
||||
"DATA", "ACK", "BUSY", "ABORT", "ACKALL", "CHALL", "RESP", "DEBUG",
|
||||
"?09", "?10", "?11", "?12", "VERSION", "?14", "?15"
|
||||
};
|
||||
|
||||
/*
|
||||
* queue a packet for recvmsg to pass to userspace
|
||||
* - the caller must hold a lock on call->lock
|
||||
|
@ -478,13 +478,6 @@ int rxrpc_reject_call(struct rxrpc_sock *);
|
||||
/*
|
||||
* ar-ack.c
|
||||
*/
|
||||
extern unsigned int rxrpc_requested_ack_delay;
|
||||
extern unsigned int rxrpc_soft_ack_delay;
|
||||
extern unsigned int rxrpc_idle_ack_delay;
|
||||
extern unsigned int rxrpc_rx_window_size;
|
||||
extern unsigned int rxrpc_rx_mtu;
|
||||
extern unsigned int rxrpc_rx_jumbo_max;
|
||||
|
||||
void __rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool);
|
||||
void rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool);
|
||||
void rxrpc_process_call(struct work_struct *);
|
||||
@ -550,8 +543,6 @@ void rxrpc_UDP_error_handler(struct work_struct *);
|
||||
/*
|
||||
* ar-input.c
|
||||
*/
|
||||
extern const char *rxrpc_pkts[];
|
||||
|
||||
void rxrpc_data_ready(struct sock *);
|
||||
int rxrpc_queue_rcv_skb(struct rxrpc_call *, struct sk_buff *, bool, bool);
|
||||
void rxrpc_fast_process_packet(struct rxrpc_call *, struct sk_buff *);
|
||||
@ -636,6 +627,21 @@ void __exit rxrpc_destroy_all_transports(void);
|
||||
struct rxrpc_transport *rxrpc_find_transport(struct rxrpc_local *,
|
||||
struct rxrpc_peer *);
|
||||
|
||||
/*
|
||||
* misc.c
|
||||
*/
|
||||
extern unsigned int rxrpc_requested_ack_delay;
|
||||
extern unsigned int rxrpc_soft_ack_delay;
|
||||
extern unsigned int rxrpc_idle_ack_delay;
|
||||
extern unsigned int rxrpc_rx_window_size;
|
||||
extern unsigned int rxrpc_rx_mtu;
|
||||
extern unsigned int rxrpc_rx_jumbo_max;
|
||||
|
||||
extern const char *rxrpc_pkts[];
|
||||
extern const s8 rxrpc_ack_priority[];
|
||||
|
||||
extern const char *rxrpc_acks(u8 reason);
|
||||
|
||||
/*
|
||||
* sysctl.c
|
||||
*/
|
||||
|
89
net/rxrpc/misc.c
Normal file
89
net/rxrpc/misc.c
Normal file
@ -0,0 +1,89 @@
|
||||
/* Miscellaneous bits
|
||||
*
|
||||
* Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
|
||||
* Written by David Howells (dhowells@redhat.com)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public Licence
|
||||
* as published by the Free Software Foundation; either version
|
||||
* 2 of the Licence, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <net/sock.h>
|
||||
#include <net/af_rxrpc.h>
|
||||
#include "ar-internal.h"
|
||||
|
||||
/*
|
||||
* How long to wait before scheduling ACK generation after seeing a
|
||||
* packet with RXRPC_REQUEST_ACK set (in jiffies).
|
||||
*/
|
||||
unsigned int rxrpc_requested_ack_delay = 1;
|
||||
|
||||
/*
|
||||
* How long to wait before scheduling an ACK with subtype DELAY (in jiffies).
|
||||
*
|
||||
* We use this when we've received new data packets. If those packets aren't
|
||||
* all consumed within this time we will send a DELAY ACK if an ACK was not
|
||||
* requested to let the sender know it doesn't need to resend.
|
||||
*/
|
||||
unsigned int rxrpc_soft_ack_delay = 1 * HZ;
|
||||
|
||||
/*
|
||||
* How long to wait before scheduling an ACK with subtype IDLE (in jiffies).
|
||||
*
|
||||
* We use this when we've consumed some previously soft-ACK'd packets when
|
||||
* further packets aren't immediately received to decide when to send an IDLE
|
||||
* ACK let the other end know that it can free up its Tx buffer space.
|
||||
*/
|
||||
unsigned int rxrpc_idle_ack_delay = 0.5 * HZ;
|
||||
|
||||
/*
|
||||
* Receive window size in packets. This indicates the maximum number of
|
||||
* unconsumed received packets we're willing to retain in memory. Once this
|
||||
* limit is hit, we should generate an EXCEEDS_WINDOW ACK and discard further
|
||||
* packets.
|
||||
*/
|
||||
unsigned int rxrpc_rx_window_size = 32;
|
||||
|
||||
/*
|
||||
* Maximum Rx MTU size. This indicates to the sender the size of jumbo packet
|
||||
* made by gluing normal packets together that we're willing to handle.
|
||||
*/
|
||||
unsigned int rxrpc_rx_mtu = 5692;
|
||||
|
||||
/*
|
||||
* The maximum number of fragments in a received jumbo packet that we tell the
|
||||
* sender that we're willing to handle.
|
||||
*/
|
||||
unsigned int rxrpc_rx_jumbo_max = 4;
|
||||
|
||||
const char *rxrpc_pkts[] = {
|
||||
"?00",
|
||||
"DATA", "ACK", "BUSY", "ABORT", "ACKALL", "CHALL", "RESP", "DEBUG",
|
||||
"?09", "?10", "?11", "?12", "VERSION", "?14", "?15"
|
||||
};
|
||||
|
||||
const s8 rxrpc_ack_priority[] = {
|
||||
[0] = 0,
|
||||
[RXRPC_ACK_DELAY] = 1,
|
||||
[RXRPC_ACK_REQUESTED] = 2,
|
||||
[RXRPC_ACK_IDLE] = 3,
|
||||
[RXRPC_ACK_PING_RESPONSE] = 4,
|
||||
[RXRPC_ACK_DUPLICATE] = 5,
|
||||
[RXRPC_ACK_OUT_OF_SEQUENCE] = 6,
|
||||
[RXRPC_ACK_EXCEEDS_WINDOW] = 7,
|
||||
[RXRPC_ACK_NOSPACE] = 8,
|
||||
};
|
||||
|
||||
const char *rxrpc_acks(u8 reason)
|
||||
{
|
||||
static const char *const str[] = {
|
||||
"---", "REQ", "DUP", "OOS", "WIN", "MEM", "PNG", "PNR", "DLY",
|
||||
"IDL", "-?-"
|
||||
};
|
||||
|
||||
if (reason >= ARRAY_SIZE(str))
|
||||
reason = ARRAY_SIZE(str) - 1;
|
||||
return str[reason];
|
||||
}
|
Loading…
Reference in New Issue
Block a user