Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ssd1322: Support 180 rotation #41

Merged
merged 1 commit into from Sep 29, 2019
Merged

ssd1322: Support 180 rotation #41

merged 1 commit into from Sep 29, 2019

Conversation

@ngwese
Copy link
Member

@ngwese ngwese commented Sep 19, 2019

This is is a reworking of the commit from #39 - focusing on the functional change and removing the whitespace and line ordering changes (those changes and the insertion of the license text are best addressed as part of a separate commit).

@ngwese ngwese requested a review from simonvanderveldt Sep 19, 2019
@tehn
tehn approved these changes Sep 19, 2019
@ngwese ngwese merged commit 52077fd into norns-4.14.y Sep 29, 2019
1 check passed
1 check passed
ci/circleci: build Your tests passed on CircleCI!
Details
@ngwese ngwese deleted the screen-rotation branch Sep 29, 2019
@simonvanderveldt
Copy link
Member

@simonvanderveldt simonvanderveldt commented Oct 7, 2019

As mentioned in #40:
Validated that norns still works as before and that we can now configure the display rotation to make the norns shield work correctly :)

ngwese pushed a commit that referenced this pull request Oct 16, 2019
[ Upstream commit 60034d3 ]

There is a potential deadlock in rxrpc_peer_keepalive_dispatch() whereby
rxrpc_put_peer() is called with the peer_hash_lock held, but if it reduces
the peer's refcount to 0, rxrpc_put_peer() calls __rxrpc_put_peer() - which
the tries to take the already held lock.

Fix this by providing a version of rxrpc_put_peer() that can be called in
situations where the lock is already held.

The bug may produce the following lockdep report:

============================================
WARNING: possible recursive locking detected
5.2.0-next-20190718 #41 Not tainted
--------------------------------------------
kworker/0:3/21678 is trying to acquire lock:
00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at: spin_lock_bh
/./include/linux/spinlock.h:343 [inline]
00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at:
__rxrpc_put_peer /net/rxrpc/peer_object.c:415 [inline]
00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at:
rxrpc_put_peer+0x2d3/0x6a0 /net/rxrpc/peer_object.c:435

but task is already holding lock:
00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at: spin_lock_bh
/./include/linux/spinlock.h:343 [inline]
00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at:
rxrpc_peer_keepalive_dispatch /net/rxrpc/peer_event.c:378 [inline]
00000000aa5eecdf (&(&rxnet->peer_hash_lock)->rlock){+.-.}, at:
rxrpc_peer_keepalive_worker+0x6b3/0xd02 /net/rxrpc/peer_event.c:430

Fixes: 330bdcf ("rxrpc: Fix the keepalive generator [ver #2]")
Reported-by: syzbot+72af434e4b3417318f84@syzkaller.appspotmail.com
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Marc Dionne <marc.dionne@auristor.com>
Reviewed-by: Jeffrey Altman <jaltman@auristor.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants