/*
 * Stream Parser
 *
 * Copyright (c) 2016 Tom Herbert <tom@herbertland.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2
 * as published by the Free Software Foundation.
 */

#ifndef __NET_STRPARSER_H_
#define __NET_STRPARSER_H_

#include <linux/skbuff.h>
#include <net/sock.h>

#define STRP_STATS_ADD(stat, count) ((stat) += (count))
#define STRP_STATS_INCR(stat) ((stat)++)

struct strp_stats {
	unsigned long long rx_msgs;
	unsigned long long rx_bytes;
	unsigned int rx_mem_fail;
	unsigned int rx_need_more_hdr;
	unsigned int rx_msg_too_big;
	unsigned int rx_msg_timeouts;
	unsigned int rx_bad_hdr_len;
};

struct strp_aggr_stats {
	unsigned long long rx_msgs;
	unsigned long long rx_bytes;
	unsigned int rx_mem_fail;
	unsigned int rx_need_more_hdr;
	unsigned int rx_msg_too_big;
	unsigned int rx_msg_timeouts;
	unsigned int rx_bad_hdr_len;
	unsigned int rx_aborts;
	unsigned int rx_interrupted;
	unsigned int rx_unrecov_intr;
};

struct strparser;

/* Callbacks are called with lock held for the attached socket */
struct strp_callbacks {
	int (*parse_msg)(struct strparser *strp, struct sk_buff *skb);
	void (*rcv_msg)(struct strparser *strp, struct sk_buff *skb);
	int (*read_sock_done)(struct strparser *strp, int err);
	void (*abort_parser)(struct strparser *strp, int err);
};

struct strp_rx_msg {
	int full_len;
	int offset;
};

static inline struct strp_rx_msg *strp_rx_msg(struct sk_buff *skb)
{
	return (struct strp_rx_msg *)((void *)skb->cb +
		offsetof(struct qdisc_skb_cb, data));
}

/* Structure for an attached lower socket */
struct strparser {
	struct sock *sk;

	u32 rx_stopped : 1;
	u32 rx_paused : 1;
	u32 rx_aborted : 1;
	u32 rx_interrupted : 1;
	u32 rx_unrecov_intr : 1;

	struct sk_buff **rx_skb_nextp;
	struct timer_list rx_msg_timer;
	struct sk_buff *rx_skb_head;
	unsigned int rx_need_bytes;
	struct delayed_work rx_delayed_work;
	struct work_struct rx_work;
	struct strp_stats stats;
	struct strp_callbacks cb;
};

/* Must be called with lock held for attached socket */
static inline void strp_pause(struct strparser *strp)
{
	strp->rx_paused = 1;
}

/* May be called without holding lock for attached socket */
void strp_unpause(struct strparser *strp);

static inline void save_strp_stats(struct strparser *strp,
				   struct strp_aggr_stats *agg_stats)
{
	/* Save psock statistics in the mux when psock is being unattached. */

#define SAVE_PSOCK_STATS(_stat) (agg_stats->_stat +=		\
				 strp->stats._stat)
	SAVE_PSOCK_STATS(rx_msgs);
	SAVE_PSOCK_STATS(rx_bytes);
	SAVE_PSOCK_STATS(rx_mem_fail);
	SAVE_PSOCK_STATS(rx_need_more_hdr);
	SAVE_PSOCK_STATS(rx_msg_too_big);
	SAVE_PSOCK_STATS(rx_msg_timeouts);
	SAVE_PSOCK_STATS(rx_bad_hdr_len);
#undef SAVE_PSOCK_STATS

	if (strp->rx_aborted)
		agg_stats->rx_aborts++;
	if (strp->rx_interrupted)
		agg_stats->rx_interrupted++;
	if (strp->rx_unrecov_intr)
		agg_stats->rx_unrecov_intr++;
}

static inline void aggregate_strp_stats(struct strp_aggr_stats *stats,
					struct strp_aggr_stats *agg_stats)
{
#define SAVE_PSOCK_STATS(_stat) (agg_stats->_stat += stats->_stat)
	SAVE_PSOCK_STATS(rx_msgs);
	SAVE_PSOCK_STATS(rx_bytes);
	SAVE_PSOCK_STATS(rx_mem_fail);
	SAVE_PSOCK_STATS(rx_need_more_hdr);
	SAVE_PSOCK_STATS(rx_msg_too_big);
	SAVE_PSOCK_STATS(rx_msg_timeouts);
	SAVE_PSOCK_STATS(rx_bad_hdr_len);
	SAVE_PSOCK_STATS(rx_aborts);
	SAVE_PSOCK_STATS(rx_interrupted);
	SAVE_PSOCK_STATS(rx_unrecov_intr);
#undef SAVE_PSOCK_STATS

}

void strp_done(struct strparser *strp);
void strp_stop(struct strparser *strp);
void strp_check_rcv(struct strparser *strp);
int strp_init(struct strparser *strp, struct sock *csk,
	      struct strp_callbacks *cb);
void strp_data_ready(struct strparser *strp);

#endif /* __NET_STRPARSER_H_ */
><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Manuel Lauss &lt;manuel.lauss@gmail.com&gt;</td><td class='right'>2017-01-24 10:12:00 -0800</td></tr>
<tr><th>committer</th><td>Dmitry Torokhov &lt;dmitry.torokhov@gmail.com&gt;</td><td class='right'>2017-01-24 10:27:34 -0800</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net/xfrm/xfrm_hash.h?id=3f5c34c6d4688b3b7e1dbc7bbc68a2f03a0d6b0c'>3f5c34c6d4688b3b7e1dbc7bbc68a2f03a0d6b0c</a> (<a href='/cgit.cgi/linux/net-next.git/patch/net/xfrm/xfrm_hash.h?id=3f5c34c6d4688b3b7e1dbc7bbc68a2f03a0d6b0c'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?id=3f5c34c6d4688b3b7e1dbc7bbc68a2f03a0d6b0c'>b9387d85890c4466d9cf3d3145c95e0b07235234</a> /<a href='/cgit.cgi/linux/net-next.git/tree/net/xfrm/xfrm_hash.h?id=3f5c34c6d4688b3b7e1dbc7bbc68a2f03a0d6b0c'>net/xfrm/xfrm_hash.h</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net/xfrm/xfrm_hash.h?id=62ed8ceda1699acae01b666497f004bfd3d67a6f'>62ed8ceda1699acae01b666497f004bfd3d67a6f</a> (<a href='/cgit.cgi/linux/net-next.git/diff/net/xfrm/xfrm_hash.h?id=3f5c34c6d4688b3b7e1dbc7bbc68a2f03a0d6b0c&amp;id2=62ed8ceda1699acae01b666497f004bfd3d67a6f'>diff</a>)</td></tr></table>
<div class='commit-subject'>Input: wm97xx - make missing platform data non-fatal</div><div class='commit-msg'>Commit 6480af4915d6 ("power_supply: wm97xx_battery: use
power_supply_get_drvdata") made wm97xx platform data mandatory, although
it's still optional.

This patch fixes an oops during driver probe on one of my MIPS boards with
a wm9712.

Signed-off-by: Manuel Lauss &lt;manuel.lauss@gmail.com&gt;
Reviewed-by: Robert Jarzmik &lt;robert.jarzmik@free.fr&gt;
Acked-by: Charles Keepax &lt;ckeepax@opensource.wolfsonmicro.com&gt;
Signed-off-by: Dmitry Torokhov &lt;dmitry.torokhov@gmail.com&gt;</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=3f5c34c6d4688b3b7e1dbc7bbc68a2f03a0d6b0c'>Diffstat</a> (limited to 'net/xfrm/xfrm_hash.h')</div><table summary='diffstat' class='diffstat'> were prepared prior to the merge window, but we waited for
  4.10-rc1 to have a stable merge base after all the prerequisites were
  merged.

  Quoting Jan on the overall changes in these patches:

     "So I'd like all these 6 patches to go for rc2. The first three
      patches fix invalidation of exceptional DAX entries (a bug which
      is there for a long time) - without these patches data loss can
      occur on power failure even though user called fsync(2). The other
      three patches change locking of DAX faults so that -&gt;iomap_begin()
      is called in a more relaxed locking context and we are safe to
      start a transaction there for ext4"

  These have received a build success notification from the kbuild
  robot, and pass the latest libnvdimm unit tests. There have not been
  any -next releases since -rc1, so they have not appeared there"

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  ext4: Simplify DAX fault path
  dax: Call -&gt;iomap_begin without entry lock during dax fault
  dax: Finish fault completely when loading holes
  dax: Avoid page invalidation races and unnecessary radix tree traversals
  mm: Invalidate DAX radix tree entries only if appropriate
  ext2: Return BH_New buffers for zeroed blocks
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=4759d386d55fef452d692bf101167914437e848e'>Diffstat</a> (limited to 'net/ncsi/Kconfig')</div><table summary='diffstat' class='diffstat'>